gentoo resync : 29.06.2020

30 files changed, 247 insertions, 568 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6656c30569a8..b0fd858e7395 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index a5b1c688264c..999fca69c939 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,7 @@
 AUX avidemux-2.7.3-desktop.patch 678 BLAKE2B f903203996fddbe798f990b3092f4a0c578407933df153e05da19aa0a6bbfaa1bbd96f25b61787514c4272f94a0525e5fc5c0171744c2f87b04effc1a2907974 SHA512 68e6a0d3272ecf00aec63f513f50d39b7702eb59ecd85190483a93b03e7461964e9533656f2279bc00312c95418f415d159e15646790a1b0b9eb2ebd7f520b4f
+AUX avidemux-2.7.4-qt-5.15.patch 523 BLAKE2B 3fdbf41edb47f2827a2bb25d553b6adc9cc872c032762754ce182d75496f705be2e33b210587f436b7d30e1ff3db88fd1596bb5b85b011924244b9fe806816d1 SHA512 c651d4bf4f60d85c068ed1c7733481ea57f9528656bea50193e80006d8102100cb881737553a93dd9d1bfcf8216abb08463f494bebef5fec3fb217099c1c91fb
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
 EBUILD avidemux-2.7.3.ebuild 3830 BLAKE2B afde6461c3fbc56adc755c281070cfea51c21a93670675da2fcc7e21901370d2cfb666a38b2e592bd8746514de882286cb5f76e3736942b62670c30dfaee67ee SHA512 87670a0162268554bbe029d772c0a2a546a6db5765c1cec98bc4c70e78e17bedb8c8e855ba15eb2e733e9fd45112d3b045749cfc35c025a748eda98050549f93
-EBUILD avidemux-2.7.4-r1.ebuild 3640 BLAKE2B 261db989383e3a46061c5ef0ac65bb7d9b9f26be4cd151c51650fc7680ffb4765cec1a4d2f6a9061159c4fe748d605fe57e895bec5cd93c549bceb2d33b242fb SHA512 432821297e1cfa49fe1542585eddf8359bdeb1f3a20152ec35705d07f70cdc64cb0806a19aa38ea419d0ba98190015dbcc282a02c4dd5cf053423c5eefe75a41
+EBUILD avidemux-2.7.4-r1.ebuild 3649 BLAKE2B 7fafaf9d9a09be73cc6ad399522be034e8b208d1036e8b1c8c4b673d9bfa0ccec64b119ed7bf0823c81861cbad5e415c9b23394d2800e75cdb4feb7b1d0f6880 SHA512 b01a8cde8608f3c94af74673d1b1c8fb9b7233b1e77afd7b7631701b5ae8145435aa116a01c69cbd6addb005c25e62bc5e8421b8bdb4b757c71e3d30f4b0ce85
 MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-2.7.4-r1.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
index cc9638e1c582..ce223b81cf34 100644
--- a/media-video/avidemux/avidemux-2.7.4-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-
 inherit cmake desktop qmake-utils xdg
 
 DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
@@ -17,7 +16,8 @@ SLOT="2.7"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
 
-COMMON_DEPEND="
+BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
+DEPEND="
 	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
 	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
 	opengl? ( virtual/opengl:0 )
@@ -30,10 +30,7 @@ COMMON_DEPEND="
 	)
 	vaapi? ( x11-libs/libva:0= )
 "
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	nls? ( virtual/libintl:0 )
 	!<media-video/avidemux-${PV}
 "
@@ -42,6 +39,8 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
 S="${WORKDIR}/avidemux2-${PV}"
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-qt-5.15.patch
+
 	processes="buildCli:avidemux/cli"
 	use qt5 && processes+=" buildQt4:avidemux/qt4"
 
diff --git a/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch b/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch
new file mode 100644
index 000000000000..5c92a561fd7c
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch
@@ -0,0 +1,11 @@
+diff -ur avidemux2-2.7.4.orig/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp avidemux2-2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp
+--- a/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp	2019-08-14 19:11:18.000000000 +0200
++++ b/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp	2020-05-30 20:45:53.304702855 +0200
+@@ -8,6 +8,7 @@
+ ***************************************************************************///
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRubberBand>
+ #include <QBoxLayout>
+ #include <QSizeGrip>
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index b0c62803a5cc..5cf67d50c7b1 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,14 +1,8 @@
-AUX handbrake-1.2.2-backport-hardware-configure.patch 6394 BLAKE2B 64009363b658bea4aaa588339e0f596790eaf584a377b0c76ad5fded84652fa4fc93ef626e5e221b1a742b1cbc34f8a97e2f92bc875fb8e018a34c93948ede3c SHA512 62d8c54ca0148fcac76f356dd4588b1cdfdbec7621fe9a8b426a39ee7b2dc1eb3085f17e8c1ebe23f5d45b69e59e52c7c8dd113308598b3f2378bad32dec6bd5
-AUX handbrake-1.2.2-fix-missing-x265-link-flag.patch 357 BLAKE2B 8d59306ef238520326223f18331feea230ae73d0f4a48f54b5c09d07a0a699a4e46ba60b59570347babb85ee30676e7ab083027bfe0fb024f24097823db06045 SHA512 9ca716b290f384db839609d176b6883c4dc1aaf31206b206cfd1f29c85bb134e29fbf72bda1a8589f76e1885019dbdee5a39d8299f7f0a20a6ef8a01868f4845
 AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb531df3f9b3e64aa17a2a3d03cf9d71577ba1961961d3d058dfa383ef3bb5215eba8a2c84231531b35f1a331850070ae0bcc5b5fa1586c67 SHA512 044b0cb7d9302f74e1ef92e37162135b8ac76d96bf7d647c269ef19b5cf2a8771ce0cc76cbc8817b2480cc3e40af6bafd717888a3982b3e679d831519aad4e64
-AUX handbrake-1.3.0-missing-linker-flags.patch 1283 BLAKE2B 83e20def829699eff6ad8473261cdcdb736e0fb395bebc941a75a4ba7384ad4509958f5e900ce57ed04713bd2ac4e10408dea4c93433edefe450fc8d8a710484 SHA512 810b1329ab47eac284fbb9cf9302cdbe453c2ddf2c8fa5665ae6a7b82ca612ef411fa63cb2aae74504b7ef9b513e42f7e8a4e7c058ffd02e2d9268ef3f837a4e
+AUX handbrake-1.3.2-x265-link.patch 585 BLAKE2B aa46591f144e787212194e937ea594f29b55cac79c7bb659010775c09a4c5e1d9b1345047b377a6bfc0db5ee17e57a41670ad72373f0d01d390cf21b1d2c10b4 SHA512 ea13eab2a080f1d0080247f5a25cb09e2d495077caddd2ad3ce473f79d7bc611795dd1e13847cd982b0a19eddfddc96dbdd3deae8928bb9597d1a6627f17396a
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
-DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
-DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4 SHA512 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
-DIST handbrake-1.3.2.tar.bz2 16813741 BLAKE2B b59186f60d12a5478b2a34f736c9450ce6bba98f0606fc42af11c64f55b2324177302d49089003a39d0a8c1d82776211573a7c4ef1b6b6fabdbc35aed2e5cde7 SHA512 857f358a8754b08e55acfddb1431d99cc1035cf52174ab1d5243524fffe60e6cbc7d2a5d5912d55e6dc6b8ec621d503ebd21614a9064706a95c920e72a760f6a
-EBUILD handbrake-1.2.2-r3.ebuild 4053 BLAKE2B cfd4cccdeeaccdb243d14dc2ef8ffb645d69604ddab11eca57ef9c3b59a73ba6ced001f1c3b345fd6baab060408b730377229b0b967a3d7b0e2b3a3c366e4111 SHA512 948b6247b83f802106a8fb17443702f4ccc1018e34179c7df08b9d75b13ea8ae2b7888c6b7035ec00305cd05b17ebb9dcf97c119381d9d8fb5a6ba4b7b160787
-EBUILD handbrake-1.3.0-r2.ebuild 4203 BLAKE2B 89736df13485b16b800b1d8f9a06e8554b7340a007fb95fd88f260a53a76510e21f3b2c63a37cde91bbcbf87999d195d38ef0035dc3bcf8de5da77659e7620fd SHA512 bcea747db43f8fe530771480dd77c84e0cf0e58db32880d908d563a6eb00d3829e31a800662271e6a26249540fbe5123926dce2a75250bedf3e41ef2c293ed21
-EBUILD handbrake-1.3.2.ebuild 4120 BLAKE2B a9467740cca2b941eafa5c0fb01a03ddf459d5af1cd1eba6be890b814e18006888b4bba704d974ab4706280fe22d5ab977cf6570bd6a9d46e8274112d3c0f251 SHA512 61e713ca6e82650cf39dc16154489ebb74118c2bf5e0ec5246a58c04b47a0b057b73dc764b9170729b57bf28485423c26275c2ab7211fd6ef0d605e05fcfcafc
+DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
+EBUILD handbrake-1.3.3.ebuild 4210 BLAKE2B ce314d9b36abaa3585ae77e29857dd00c6a2e1de5ef59a0a25fbff200d19ac6bb01f5b0e19839af3a9dac014493e38346a912acbfe1f660bde0a497a16eee35a SHA512 34e6de849f3536f2a432c54de9f97a1e36fa16a80edc37f2e2ed6d890747d070bad8dd06035cc8d6c1a62da6507eba865c8b5379c28abc2a44ed5d53802f14df
 EBUILD handbrake-9999.ebuild 4141 BLAKE2B 6da162374851a5a0283c9404587e17386913dca3e39c747831007eeb8a102e4d68d828de48e99876c90848679ae0451fb62f5b7c870f676c91de6ef3847a6cbb SHA512 df20db4d5da687c300af75302890028141b9a7acbe7e09dfded90d6454dec6b1579a6ff832e3c7a6ace6377ac88d12cf8902db8e56580162296d18227f48c081
 MISC metadata.xml 1019 BLAKE2B 041873a5db7246fc3a6c6b5544fc4c28b981e6e15996c68c53413fabc46ada335333936e4e6ab160f6fad2b9eafafdb9f37d6651cb692e0d69f814acb02557f5 SHA512 41bb1e4656da0cf4a99fd158da5dcf9ccef2b4355f2cdb8e0017a84d8a65cc21ab382734dd967eaeeaf2d55c11e617e6dabe28eeb0bdd40388e8325a8e4ae42a
diff --git a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch b/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch
deleted file mode 100644
index 0618c9004e96..000000000000
--- a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From c7119499f5a2da7e5be0afd50a6757778fed53e7 Mon Sep 17 00:00:00 2001
-From: Bradley Sepos <bradley@bradleysepos.com>
-Date: Sat, 23 Feb 2019 11:44:34 -0500
-Subject: [PATCH] configure: Enable hardware encoders by default on suitable
- platforms.
-
-Print special encoders status at end of configure output, minor cosmetics.
----
- make/configure.py | 46 +++++++++++++++++++++++++++++-----------------
- 1 file changed, 29 insertions(+), 17 deletions(-)
-
-diff --git a/make/configure.py b/make/configure.py
-index c8bc712fe5..e673c9c5a0 100644
---- a/make/configure.py
-+++ b/make/configure.py
-@@ -1298,36 +1298,37 @@ def createCLI():
-     grp.add_option( '--disable-gtk', default=False, action='store_true', help=h )
- 
-     h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
--
-     grp.add_option( '--disable-gtk-update-checks', default=False, action='store_true', help=h )
- 
-     h = IfHost( 'enable GTK GUI (mingw)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
-     grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', help=h )
- 
-     h = IfHost( 'disable GStreamer (live preview)', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
--
-     grp.add_option( '--disable-gst', default=False, action='store_true', help=h )
- 
--    h = IfHost( 'enable Intel Quick Sync Video (QSV) hardware acceleration. (Windows and Linux only)', '*-*-linux*', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-qsv', default=False, action='store_true', help=h )
-+    h = IfHost( 'Intel Quick Sync Video (QSV) hardware acceleration (Windows and Linux only)', '*-*-linux*', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-qsv', dest="enable_qsv", default=host.match( '*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-qsv', dest="enable_qsv", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--    h = IfHost( 'enable AMD VCE hardware acceleration. (Windows only)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-vce', default=False, action='store_true', help=h )
-+    h = IfHost( 'AMD VCE hardware acceleration (Windows only)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-vce', dest="enable_vce", default=host.match( '*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-vce', dest="enable_vce", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--    h = IfHost( 'enable x265 video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-x265', dest="enable_x265", default=True, action='store_true', help=h )
--    grp.add_option( '--disable-x265', dest="enable_x265", action='store_false' )
-+    h = IfHost( 'x265 video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-x265', dest="enable_x265", default=True, action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-x265', dest="enable_x265", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--    h = IfHost( 'enable FDK AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, action='store_true', help=h )
--    grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false' )
-+    h = IfHost( 'FDK AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--    h = IfHost( 'enable FFmpeg AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-ffmpeg-aac', dest="enable_ffmpeg_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h )
--    grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' )
-+    h = IfHost( 'FFmpeg AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-ffmpeg-aac', dest="enable_ffmpeg_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--    h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
--    grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h )
-+    h = IfHost( 'Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-+    grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
-+    grp.add_option( '--disable-nvenc', dest="enable_nvenc", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
- 
-     cli.add_option_group( grp )
-@@ -1982,6 +1983,17 @@ class Tools:
-     else:
-         nocd = False
- 
-+    stdout.write( '%s\n' % ('-' * 79) )
-+    stdout.write( 'Configured options:\n' )
-+    stdout.write( 'Enable FDK-AAC:    %s\n' % options.enable_fdk_aac )
-+    stdout.write( 'Enable FFmpeg AAC: %s\n' % options.enable_ffmpeg_aac )
-+
-+    if IfHost( True, '*-*-linux*', '*-*-mingw*', none=False ).value is True:
-+        stdout.write( 'Enable NVEnc:      %s\n' % options.enable_nvenc )
-+        stdout.write( 'Enable QSV:        %s\n' % options.enable_qsv )
-+    if IfHost( True, '*-*-mingw*', none=False ).value is True:
-+        stdout.write( 'Enable VCE:        %s\n' % options.enable_vce )
-+
-     stdout.write( '%s\n' % ('-' * 79) )
-     if options.launch:
-         stdout.write( 'Build is finished!\n' )
diff --git a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
deleted file mode 100644
index a999fc325646..000000000000
--- a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Written by: Peter Foley <pefoley2@pefoley.com>
-Gentoo Bug: #552792
-
---- ./test/module.defs.bak	2015-06-21 13:19:40.626249439 -0400
-+++ ./test/module.defs	2015-06-21 13:19:54.919757726 -0400
-@@ -25,6 +25,7 @@
- 
- ifeq (1,$(FEATURE.x265))
-     TEST.GCC.D += USE_X265
-+    TEST.GCC.l += x265
- endif
- 
- TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
diff --git a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch b/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch
deleted file mode 100644
index 598fc7c6efaa..000000000000
--- a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index 92aabcbe8..1f4a1df95 100644
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
- 
- GHB_CFLAGS="$HBINC $GHB_CFLAGS"
- 
--HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
- 
- if test "x$use_fdk_aac" = "xyes" ; then
-     HB_LIBS="$HB_LIBS -lfdk-aac"
-diff --git a/test/module.defs b/test/module.defs
-index ffc00a8b2..62b01ffd5 100644
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux)
- ifeq (1, $(FEATURE.numa))
-     TEST.GCC.l += numa
- endif
-+ifeq (1, $(FEATURE.x265))
-+    TEST.GCC.l += x265
-+endif
- else ifeq ($(HOST.system),kfreebsd)
-     TEST.GCC.l += pthread dl m
- else ifeq ($(HOST.system),freebsd)
diff --git a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
new file mode 100644
index 000000000000..589a204cc195
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
@@ -0,0 +1,12 @@
+diff -Naru a/test/module.defs b/test/module.defs
+--- a/test/module.defs	2020-05-23 17:23:21.912103481 +0200
++++ b/test/module.defs	2020-05-23 17:23:36.106103799 +0200
+@@ -16,7 +16,7 @@
+ TEST.GCC.l = \
+         ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
+         dvdread fribidi \
+-        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
++        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
+         bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
+ 
+ ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
diff --git a/media-video/handbrake/handbrake-1.2.2-r3.ebuild b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
deleted file mode 100644
index 723f649b7e26..000000000000
--- a/media-video/handbrake/handbrake-1.2.2-r3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	app-arch/xz-utils
-	media-libs/speex
-	dev-libs/jansson
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0
-	media-libs/libdvdnav
-	media-libs/libdvdread
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/libvpx
-	nvenc? ( media-libs/nv-codec-headers )
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	>=media-video/ffmpeg-4.1:0=[fdk?]
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		dev-libs/libgudev:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-2.9:0= )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Fix missing x265 link flag
-	"${FILESDIR}/${P}-fix-missing-x265-link-flag.patch"
-
-	# Allow disabling nvenc etc
-	"${FILESDIR}/${P}-backport-hardware-configure.patch"
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	# Libav was replaced in 1.2 with ffmpeg by default
-	# but I've elected to not make people change their use flags for AAC
-	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(use_enable gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
-	einfo "do not use the bundled (and often patched) upstream libraries."
-	einfo ""
-	einfo "Please do not raise bugs with upstream because of these ebuilds,"
-	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-	if use gtk ; then
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.3.0-r2.ebuild b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
deleted file mode 100644
index e7362b5877d8..000000000000
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	app-arch/xz-utils
-	media-libs/speex
-	dev-libs/jansson
-	dev-libs/libxml2
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0
-	>=media-libs/dav1d-0.5.1
-	media-libs/libdvdnav
-	media-libs/libdvdread:=
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	>=media-libs/libvpx-1.8
-	nvenc? ( media-libs/nv-codec-headers )
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	>=media-video/ffmpeg-4.2.1:0=[fdk?]
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-		media-plugins/gst-plugins-gdkpixbuf:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		dev-libs/libgudev:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Fix missing flags
-	"${FILESDIR}/${P}-missing-linker-flags.patch"
-
-	# Use whichever python is set by portage
-	"${FILESDIR}/${P}-dont-search-for-python.patch"
-)
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	# Libav was replaced in 1.2 with ffmpeg by default
-	# but I've elected to not make people change their use flags for AAC
-	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		--disable-flatpak \
-		--disable-gtk4 \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(usex !gtk --disable-gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable numa) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
-	einfo "do not use the bundled (and often patched) upstream libraries."
-	einfo ""
-	einfo "Please do not raise bugs with upstream because of these ebuilds,"
-	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-	if use gtk ; then
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/handbrake-1.3.2.ebuild b/media-video/handbrake/handbrake-1.3.3.ebuild
index e5a5b3021946..f99cf9d397f4 100644
--- a/media-video/handbrake/handbrake-1.3.2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	media-libs/x264:=
 	media-sound/lame
 	sys-libs/zlib
-	>=media-video/ffmpeg-4.2.1:0=[fdk?]
+	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -89,6 +89,9 @@ PATCHES=(
 
 	# Use whichever python is set by portage
 	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
+
+	# Fix x265 linkage... again #724650
+	"${FILESDIR}/${PN}-1.3.2-x265-link.patch"
 )
 
 src_prepare() {
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 26452201675f..e56369ea10ec 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,3 +1,6 @@
+AUX pipewire-0.2.7-fno-common.patch 1235 BLAKE2B 59e5c9376a3097d3427c0f0623827e3163298bb23d1888d3791504928c50850cf59d41392e78d90b07d4f5a481af60d37661a96ca47c61f939a938c54a523839 SHA512 87a67a14289b5dde0ff174e90cb94c3884ea7b3189d00b7c8fc195445a5555fbba0ee8a641edd8e1b5322508082f8c2e52c14a18a392038a9ba9c27ff470bd2b
 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334
-EBUILD pipewire-0.2.7.ebuild 1601 BLAKE2B 0da14c2d7297aed2394df2a5d01385954f4e211766bee36718e564f55c1833cb6db5f04defaf8250bf699e2c56ab37a9b3c9df43abb1898877ec298799288da8 SHA512 c970d4d4d9501878b8e66c6998ee2681d418ea3fc9a645c9a8b6b3ba9486fa01e7d3fdc3ae36d42f79cf67ec243f592e69a9249baa281a0543ca32451180125a
-MISC metadata.xml 449 BLAKE2B c580fa69fbecd1046123d51f0a556bf54e7dd76a7ced768ae31289969a3fcb0c03f301a214da222201bad2cd0bcf68674807e28efcdee27edd9fa6d913cdc146 SHA512 73c4b73b417e92d1bdf802ce38939afdff2ba42bc638e0c6ba42593894755ce6f197678e8676f763bd66bb0b2bb9175c1369c173be3ab64e7323795d3b00bf0c
+DIST pipewire-0.3.6.tar.gz 968858 BLAKE2B 342b935ce1f68282cb6a1684855c7efacf24759359ca2079aade27b7d7d2699135e07c1e52afefb8924d9c8274b4cdbda98cc6c19d8aa0bf14b7202c0e0923f4 SHA512 a8d67bb6135432705d6de026074325f0cae7f01e3fe0b65fa7dafb128e5984ce126f8b4635bfbd9746777514df6f0880a78149fd007c7c1432ac29f95655ddcc
+EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B 3e94b6c00adb56c37e01df3f0adafc7d0d2115b2a27a1da3622245731ee341550f8bc8421e7d85693ca41a0a2ba17c192c06017f59e62bcd758babaf4bedfa20 SHA512 f924725947d243452b8bec1f03f7d113de2d4668ef3db18b2922a4b1695c87d4ac9def44e2d79d38fac3013a09dadb84af11fe8dc9aec4fe0ba475340f17b295
+EBUILD pipewire-0.3.6.ebuild 3307 BLAKE2B 2f7ff2c07b2bfd27dd1bfe64048b60b650bb9515f5df62d929a37103360d6b991ada116a36a9b318a671a4825522e897c482f3a897bdf1c57c42f4e74e89dc2d SHA512 961dee1d057b318f5b1eecccaf7ec9fb0bf38ffb499b86396dc3ee8b34b80a019d1b8675934c82c9d61a58f3ef57e9ac6b50e263d16e016418570dace0bb283c
+MISC metadata.xml 840 BLAKE2B a023f04c07bc9665f1379e6152ab5a831ca1977038e36263b5ab873195f8f8dc13fe8b036637831833b76406dab484ae40df4ff227991c2ec5bfaa87ecbd5e6c SHA512 8d8d7a10d8024d988356859da0430a69fd11e17cc1a854211bf0128f8dc2ce279ae23954bef39345cd0e94248de00388d7c0db5e166d6f4e0553992d3325bce3
diff --git a/media-video/pipewire/files/pipewire-0.2.7-fno-common.patch b/media-video/pipewire/files/pipewire-0.2.7-fno-common.patch
new file mode 100644
index 000000000000..f4f82ba96c08
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.2.7-fno-common.patch
@@ -0,0 +1,47 @@
+Bug: https://bugs.gentoo.org/710796
+
+--- a/spa/plugins/bluez5/a2dp-codecs.h
++++ b/spa/plugins/bluez5/a2dp-codecs.h
+@@ -284,15 +284,15 @@
+         }
+ }
+ 
+-const a2dp_sbc_t bluez_a2dp_sbc;
++extern const a2dp_sbc_t bluez_a2dp_sbc;
+ #if ENABLE_MP3
+-const a2dp_mpeg_t bluez_a2dp_mpeg;
++extern const a2dp_mpeg_t bluez_a2dp_mpeg;
+ #endif
+ #if ENABLE_AAC
+-const a2dp_aac_t bluez_a2dp_aac;
++extern const a2dp_aac_t bluez_a2dp_aac;
+ #endif
+ #if ENABLE_APTX
+-const a2dp_aptx_t bluez_a2dp_aptx;
++extern const a2dp_aptx_t bluez_a2dp_aptx;
+ #endif
+ 
+ #endif
+--- a/spa/plugins/bluez5/bluez5-monitor.c
++++ b/spa/plugins/bluez5/bluez5-monitor.c
+@@ -75,7 +75,7 @@
+ 	struct spa_list transport_list;
+ };
+ 
+-struct spa_handle_factory spa_a2dp_sink_factory;
++extern struct spa_handle_factory spa_a2dp_sink_factory;
+ 
+ static void fill_item(struct spa_bt_monitor *this, struct spa_bt_transport *transport,
+ 		struct spa_pod **result, struct spa_pod_builder *builder)
+--- a/spa/plugins/bluez5/meson.build
++++ b/spa/plugins/bluez5/meson.build
+@@ -1,7 +1,8 @@
+ 
+ bluez5_sources = ['plugin.c',
+ 		  'a2dp-sink.c',
+-                  'bluez5-monitor.c']
++		  'a2dp-codecs.c',
++		  'bluez5-monitor.c']
+ 
+ bluez5lib = shared_library('spa-bluez5',
+ 	bluez5_sources,
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index a5d6bb1343ab..dafe4792ddc3 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -12,4 +12,10 @@
 	<upstream>
 		<remote-id type="github">PipeWire/pipewire</remote-id>
 	</upstream>
+	<use>
+		<flag name="alsa">Install PipeWire alsa device for playback and record</flag>
+		<flag name="jack">Enable SPA JACK plugin and emulation to be able to run JACK applications on top of PipeWire</flag>
+		<flag name="pulseaudio">Enable emulation to be able to run PulseAudio applications on top of PipeWire</flag>
+		<flag name="vulkan">Enable vulkan spa plugin integration</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-video/pipewire/pipewire-0.2.7.ebuild b/media-video/pipewire/pipewire-0.2.7.ebuild
index f8111e7a7281..92f7f268808c 100644
--- a/media-video/pipewire/pipewire-0.2.7.ebuild
+++ b/media-video/pipewire/pipewire-0.2.7.ebuild
@@ -44,6 +44,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-fno-common.patch" )
+
 src_prepare() {
 	spa_use() {
 		if ! use ${1}; then
diff --git a/media-video/pipewire/pipewire-0.3.6.ebuild b/media-video/pipewire/pipewire-0.3.6.ebuild
new file mode 100644
index 000000000000..c6920216b8d5
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.6.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
+	EGIT_BRANCH="work"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="+alsa bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/libsdl2
+	media-libs/libsndfile
+	sys-apps/dbus
+	virtual/libudev
+	bluetooth? (
+		media-libs/sbc
+		net-wireless/bluez:=
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack? ( >=media-sound/jack2-1.9.10:2 )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-sound/pulseaudio
+	)
+	systemd? ( sys-apps/systemd )
+	vulkan? ( media-libs/vulkan-loader )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	spa_use() {
+		if ! in_iuse ${1} || ! use ${1}; then
+			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
+				-i src/daemon/pipewire.conf.in || die
+		fi
+	}
+
+	default
+	spa_use libcamera
+	spa_use rtkit
+	spa_use bluetooth bluez5
+	spa_use jack
+	spa_use vulkan
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dexamples=true # contains required pipewire-media-session
+		-Dman=true
+		-Dspa=true
+		-Dspa-plugins=true
+		--buildtype=$(usex debug debugoptimized plain)
+		# alsa plugin and jack/pulseaudio emulation
+		$(meson_use alsa pipewire-alsa)
+		$(meson_use jack pipewire-jack)
+		$(meson_use pulseaudio pipewire-pulseaudio)
+		# spa-plugins
+		# we install alsa support unconditionally
+		$(meson_use bluetooth bluez5)
+		$(meson_use ffmpeg)
+		$(meson_use jack)
+		$(meson_use vulkan)
+		# libcamera is not packaged
+		# misc
+		$(meson_use doc docs)
+		$(meson_use gstreamer)
+		$(meson_use systemd)
+		$(meson_use test test)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+
+	if use alsa; then
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+}
+
+pkg_postinst() {
+	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
+	elog "by setting DISABLE_RTKIT env var."
+	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
+	elog
+	if use jack; then
+		elog "Please note that even though the libraries for JACK emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
+		elog
+	fi
+	if use pulseaudio; then
+		elog "Please note that even though the libraries for PulseAudio emulation have"
+		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
+		elog
+	fi
+	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
+}
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 2519740557f1..28fdc692e88e 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,6 +1,6 @@
 DIST QMPlay2-src-20.05.02.tar.xz 1553364 BLAKE2B f436a8e970278d47ef1ade86d07fd3460c2628d7f93c238093425779f896c44b3e0c7b4c6a40ffc8b79f1749563016cb62ac853c94b236859287066bfbdbe59f SHA512 b587d80128c334450552b2a6f0fa4c7426409b4d7a7bcca2065f83eab3e2f8b7ecc0df92f50fa276f42c84a201222cae2dd7f5c3f4bbdabf321895212db936b6
 DIST qmplay2-19.12.19.tar.gz 1285009 BLAKE2B e4f644513ac0e7d33574e4b1b157dfe775222df74ba5041099e9bcaa87f8b052880dfd2c19005380783d9ca7b2bdbf7aedb233e12e2af839d40af224981d593e SHA512 a03d70c5bd3b2644810b9ec5fd39bd0340ddcc460646228a2799053a27117a54ead09f046b58ff7e0ae2cd959a92980cf8336a12d49ef297e1de30dd32f604a0
 EBUILD qmplay2-19.12.19-r2.ebuild 3482 BLAKE2B 79cd37a3a6cf4298dccfe958f7a5d2dd39d28dbf07cf60dacaf90a3a750ca5d41261086ce28c5b3ca28acf733eee2bab18c22465c486b614c0791eefe4a5bd51 SHA512 5298d2fb7995031bb24657254dfc89fb3852e02458c9fee7fae621ee4d9852e5920bb4db5ef67d0a476b66f827ec51644c6c7bb23f84a380754b0d4597a63b71
-EBUILD qmplay2-20.05.02.ebuild 3568 BLAKE2B c0bc46703a4c2741f37a0e3bd876cc35e3b91b564ec444043685e38e9dbac280d507a0080558d9d8da7261ae06fef9cbb01363ce432d270d182824c23d977ce5 SHA512 8bf66ca740baa00bf00da12a089ce1b97f6dec21bc8978b47ae0727a9a65d1c6f157ddfd6a37db2932aa277d5287ae72ac2b0fc031ca952fe8230cd9f42309bc
-EBUILD qmplay2-9999.ebuild 3568 BLAKE2B c0bc46703a4c2741f37a0e3bd876cc35e3b91b564ec444043685e38e9dbac280d507a0080558d9d8da7261ae06fef9cbb01363ce432d270d182824c23d977ce5 SHA512 8bf66ca740baa00bf00da12a089ce1b97f6dec21bc8978b47ae0727a9a65d1c6f157ddfd6a37db2932aa277d5287ae72ac2b0fc031ca952fe8230cd9f42309bc
+EBUILD qmplay2-20.05.02.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
+EBUILD qmplay2-9999.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85
 MISC metadata.xml 1822 BLAKE2B d6c18ae3653d2a809609ed350c20796a690ecb69e5f3b9b06d134524596379f8ebfb565b22c584a3fccff153b0771ede17d67c91d029f6e26668ba91e0ee5d79 SHA512 5ed1acf242b8e02dd3f31564000b13dc91c9c25f750ba6f93a296e5fa9c83b48a0a6c92f868a5b088187870af8b3c345ab0c79935e8afcea7f86125ceed80afc
diff --git a/media-video/qmplay2/qmplay2-20.05.02.ebuild b/media-video/qmplay2/qmplay2-20.05.02.ebuild
index 9556ffd4007a..264d28c79f26 100644
--- a/media-video/qmplay2/qmplay2-20.05.02.ebuild
+++ b/media-video/qmplay2/qmplay2-20.05.02.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	sid? ( media-libs/libsidplayfp )
-	shaders? ( media-libs/shaderc )
+	shaders? ( >=media-libs/shaderc-2020.1 )
 	vaapi? (
 		>=media-video/ffmpeg-4.1.3[vaapi]
 		x11-libs/libva[drm,opengl]
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 9556ffd4007a..264d28c79f26 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	sid? ( media-libs/libsidplayfp )
-	shaders? ( media-libs/shaderc )
+	shaders? ( >=media-libs/shaderc-2020.1 )
 	vaapi? (
 		>=media-video/ffmpeg-4.1.3[vaapi]
 		x11-libs/libva[drm,opengl]
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index b43148f0fce9..d170d8ddcc0f 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -2,6 +2,6 @@ AUX rtmpdump-openssl-1.1-v2.patch 8964 BLAKE2B 7ac621cafbbd159a9e143f0c0108c4b08
 AUX rtmpdump-swf_vertification_type_2.patch 545 BLAKE2B e6db03f060ead7122029f15c0cc259e04863c2d5d0d2509a21de69f7fc61c1d3fb0ac062759c52e22e60733acdfb495cb4e6892ba7acb8e1f36ce1fe42f3ccd9 SHA512 5b5b4582b488429f8192b1158903047986d8ebc117c2ed81f7ab18bf59bcf8b8f6bc9a38fae89aff04af2342ca1362288a39516660f2163b94781c838652ad06
 AUX rtmpdump-swf_vertification_type_2_part_2.patch 868 BLAKE2B a5014fdc8bcf2cecbe5120297d4563c7d396e54c34e5f6dddf420fcfdbea4797c865daa0750cb1fa65f7c959d36381ce257ec48b3f4f377ce9ead3b3fe4cf833 SHA512 a0c1c46561384961bbb45962d416664cbd7a4a8c2e16eda4370d9acf76be809541ade182e41320102f252ed4e69dd2d6a0de37ad4085b52a22dc6ff0135d8894
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
-EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2778 BLAKE2B 9e992da54eaad0a8405b97a44f8a05d610030ff5762a587db6aae6a031ccbcb0bb6c8298ec8aad894d6e8c731c9b3ed15380927becbf6f47b4bdf3913853ec48 SHA512 845d378734781425df19b954bf2cf4c2c710661f0134cf7bfdc746fd488b1c51d9a8c63a729e1a4676489b13a0b4f775a5748085daa9bd426ddbbe4bdccfdd71
-EBUILD rtmpdump-9999.ebuild 2785 BLAKE2B 4ee052f08bb7464b2863e14139019d0182b6d0ce381bf9becac48929e9385747aaaea7866c1c848bbfa0807f4aee4fd193cbf6a7eaa624e0e4fc1a2511f32f85 SHA512 aa7f3333948d0503599ff72ac3aebb9ccf2bd0901f69c6f6c2b9d3fb9fefb66ad18c2960070dc9a621cb5f801b62f699c9dcf9fa84c3a61265213b1417432545
+EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2795 BLAKE2B 1719b876e6fa430158036323f3a29e5c47080df2e94876419d7c2bfd67b5a54e86938d0d4b8e3a77486a01de154beb9f759e9a9c402fa4d34234dbe6f1f24de5 SHA512 b3dc94d290e431d443d6ef7b20c149fcf20315dbded2dd2e93e997613a3181a5ce0e2a5bfeb4edfcfca544fbdeb05b18fd66c0acb3de1186715cf9a4e466a658
+EBUILD rtmpdump-9999.ebuild 2802 BLAKE2B 1f5f3de61c20ae9e0431f4aac81185b395cc852ef62eb64993b8e2cd167b34d1990853b3c54047773bac5147adfc0b9ba7fd8f689a80cea63b426af0d23d0a27 SHA512 a4449a69bf67afcd7f03c087667e26c76fe6f17eece0f742e9942d761dee92a15d899781c2e05a10bdeac78c341c2a94a939c6a7baed5435cd8f00454d619b26
 MISC metadata.xml 444 BLAKE2B 97f64854abc028cf6eb902008992a94e434db6de7258b8065666b31af4b92118044e4c3427792782cf7ac7a2eb8bb0fbaee047027ca2f648178cc07f46c6ac88 SHA512 38b9987993f4a3ed479c50aeda81436a8cbec7ad48c1e509fc351a58557c3922fe0834a680cda9996a5c5ca1b0b48377772e3eef775281eb40962f95ac095e7c
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
index 09a4ebf6598d..a3b8a59caac3 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r3.ebuild
@@ -85,7 +85,7 @@ multilib_src_compile() {
 	if ! multilib_is_native_abi; then
 		cd librtmp || die
 	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
 		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
 }
 
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index df14880ddc1b..4e6b50ef0fc2 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -85,7 +85,7 @@ multilib_src_compile() {
 	if ! multilib_is_native_abi; then
 		cd librtmp || die
 	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
 		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
 }
 
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
index 9d661dc3f7ed..fcbdd22a26e2 100644
--- a/media-video/smtube/Manifest
+++ b/media-video/smtube/Manifest
@@ -1,5 +1,3 @@
-DIST smtube-19.6.0.tar.bz2 748844 BLAKE2B 55e662fc85ec44f067cba037c28b26fbfe08439bafea294dfcd1c4187e8df9f1f066780dd80c765dc4e584ba5b3917d8982a46253039b6327a30ff9d842b9e0b SHA512 f61e432b8f99e34ddbd9415064eecf30c9a3a6731d646073253d63690cf531321a7a5038117db981d036d1abfdbd3150df21bc22c9ae75e32c63ade3a859ecef
 DIST smtube-20.1.0.tar.bz2 749306 BLAKE2B 27d8b8c45264311f324d826768c44750373161521e8a3a9778b7b929d2ac437cfbfa9131b772c19d065d6a9e7646a381a2dd52c0e4fdf1d7a202ce982f22d9e2 SHA512 91a3b53c7bf23b567cc9e35f6c12cfc37e4286c0b60938d4ea9e275f1f459db6ff149f3b316b05a4810a62b0f224ee360ecf10f1e5c1d101178a949280eb8e2f
-EBUILD smtube-19.6.0.ebuild 1306 BLAKE2B 8fb0f5bccd487400fd3b26c66c97ab0f1582ff6cbb7ee163795f085d9db74c71da2c4e1b23832f2c0b73343f976bb755bc95ac469f381925f55ca85c8bbc481a SHA512 bd3b4bd7fcf47036a34e54d9a352930f6a1913f38b0af5ecfce420ccb6c8012ec089ea41f57457a7ace1ca79223cbdd709016c410b023dd7e1af0c3241a97b43
-EBUILD smtube-20.1.0.ebuild 1308 BLAKE2B 15e21bebefdb0c52dc0090d52b7246044cc6b84005e02adbce0e4f18b19ceb5c2a4940b4bd5001d27231368d5e0f85f179ea61e702272071f9fc327232984ba1 SHA512 fa5238315c00f9fcc9e4053a48391342916a04a91a0b482d9b3748fdad7105e779207af8807eb92e04ce11f8aefb9a1a6621317e0da4a5882a6fb0b7cc1a1fa1
+EBUILD smtube-20.1.0.ebuild 1306 BLAKE2B 3c8ad51442652631a17c260f16bc67bd52bd3a5ae54d1d7b7b411bff3882bc6011382b748ad3242bfb65f770bbc30c1d01948fe149c355705fb42cfe205a0222 SHA512 84b304fd20588584e7b1af62fbe68e436f7b7468a2d0bbf264a4c3967471b9534152e0bfb2d63c312b422913da87c515869b7c630a37dd11fb3911615182274c
 MISC metadata.xml 553 BLAKE2B 5818030e41958376eb0a4566f79a245d8bd1142dbcbf56aaeb21434e4194d2e8c7208bfd7b7e15b11f688f0e8ef47be2e1748740883a09cce1cda04836a70e24 SHA512 0e833e9f3075e066d059871c97bc951acb2d68152719388b9c1eb92776f50822585c88f662e8c5544ef15861f11bd76e469a34c593c98f3bc76ccf898eb202a6
diff --git a/media-video/smtube/smtube-19.6.0.ebuild b/media-video/smtube/smtube-19.6.0.ebuild
deleted file mode 100644
index 833814a95ebb..000000000000
--- a/media-video/smtube/smtube-19.6.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-inherit desktop l10n qmake-utils
-
-DESCRIPTION="YouTube Browser for SMPlayer"
-HOMEPAGE="http://smplayer.sourceforge.net/smtube"
-SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	|| (
-		media-video/smplayer
-		media-video/mpv
-		media-video/mplayer
-		media-video/vlc
-		media-video/totem
-	)
-"
-
-gen_translation() {
-	"$(qt5_get_bindir)"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	eqmake5 src/${PN}.pro
-	emake
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-install_locale() {
-	insinto /usr/share/${PN}/translations
-	doins src/translations/${PN}_${1}.qm
-	eend $? || die "failed to install $1 translation"
-}
-
-src_install() {
-	dobin ${PN}
-	domenu ${PN}.desktop
-	newicon icons/${PN}_64.png ${PN}.png
-	dodoc Changelog
-
-	l10n_for_each_locale_do install_locale
-}
diff --git a/media-video/smtube/smtube-20.1.0.ebuild b/media-video/smtube/smtube-20.1.0.ebuild
index 6cb45ba9dad7..000bf6ac2613 100644
--- a/media-video/smtube/smtube-20.1.0.ebuild
+++ b/media-video/smtube/smtube-20.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-video/vdrtools-genindex/Manifest b/media-video/vdrtools-genindex/Manifest
index c2bd5bcd3273..35d109e9b22e 100644
--- a/media-video/vdrtools-genindex/Manifest
+++ b/media-video/vdrtools-genindex/Manifest
@@ -1,5 +1,5 @@
 AUX ldflags.diff 410 BLAKE2B 19216fbd738658dcf718697032c2635dc2f091ecfacfedabf82dafbce98abc7a561e508a9cdf0e1f61d4b8cf58c6ecfb8fea2542c6b4a0470300336e99761847 SHA512 dd5b68ce2c0712e84522c336ff15067dc0a95a93696d1349273b160e7013d478d92d78867c9a9bafdf4e1e77ee3ca2e4edf33ea6f960ae86131e104076dd27e6
 DIST genindex-0.1.3.tar.gz 20958 BLAKE2B a7b978e7cab3ee2bdd8ed38490ac9b8ea7c394a55e2209ad4a5bc0c0ba4fd8580f847c9f647e34923acfd65c3da806484c815e98282e3ec02310b15f89cbdffc SHA512 1fb95fa99128a9cc62c684cf44383fbb837918d6911a3a34a107cf62eb73c16275128100d8eedc05c044382910584b2dd1c2dd94ecd3a896363d900e9b185972
 EBUILD vdrtools-genindex-0.1.3-r1.ebuild 484 BLAKE2B b9b90ad613c693afaff4231a7c31292ec3fe702fa6540aa3c468ad6f21429095a1fb476d6061be93790e6d6206ed8674afe0362f42569c54e117ac8f55195394 SHA512 7912206db442a3b213714cff853aab8a108f1c83c6833af725727e915e512e257b1443baa48a7ce7ef485c6ab716fdea98f72be27ac8d5257eb54fdf59d18332
-EBUILD vdrtools-genindex-0.1.3-r2.ebuild 554 BLAKE2B 8c39a81b2675d1a76a4c114f03fcf557c0cfbdc16121c458c06ea887b838d5ec3bed0f464ca9acf79b499512a223a7facddbe94114172b8bed8bc9dd50504f4c SHA512 164c93c3c1c93b526b35bf276f1cc017f51a0ce20bca48420fab4fb38f64bfb0f05cecedec35bc4425b4364b06800221cfb745467aae56268731ebf61effc2fb
+EBUILD vdrtools-genindex-0.1.3-r2.ebuild 553 BLAKE2B bd5ab77374682841db2db7c9648d763c340770e6b5386ecb80f6dcfe134852b83347cf3d610a79e84e8a2b760aa79824023f2fdce77d4d32418229b3d2c163d8 SHA512 160902ba8368fcfead7f4711caa7999a0ffee1a88bf05e6ddde9fba356a496532ecf67a436153cb8705c452e0c9bb3e19e48cf0f0634e36e1bfeb5091d243709
 MISC metadata.xml 365 BLAKE2B 027b911072475ad8825d9fab304fe6f03aa786d5fbbfd5b2611d9f34f899ba60a61dcda5ff6a05c42e09b65be5ccbeace9a0fdc04968d115ba0cf2f180449d4c SHA512 6fab8091df4f66b5c3c09c45a17ed4872143d1763377cd5cd816210c051cb1176950f644b31fdba8988852958fb832c1efceac13a0bba8643a767275c17e0f5b
diff --git a/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild b/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
index d3261210e222..3ec03fcdb001 100644
--- a/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
+++ b/media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.muempf.de/down/${SCRIPT}-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 S=${WORKDIR}/${SCRIPT}-${PV}
 
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index fa08a062448c..c25f0da57f1d 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,5 @@
 DIST yle-dl-20200419.tar.gz 87267 BLAKE2B 2637620758c1a083502eb9468bbe5e7353855051c3379d448f6a4b9adcf8113293e4a7a8887138df68fcfd16938ab3846034a8f57cb9d366467a22c23b53ebaa SHA512 3d064e080e0c9172e15134eaa179ae96240ed9fc74a7a8a9a9aa18049397e0fea62465f5768db488928f23af1fa1195d78a8a4a6bbafcab4bcda6d05cda70ccf
-DIST yle-dl-20200618.tar.gz 84932 BLAKE2B 686849db71eccbf94787bb913c41a43e65bd57b8acdec090af675ffd10dec3929f4d742d040b0e248606e086d76b7699fa11179e449811d36c821c9646e92dbb SHA512 21ffeec2939a10f48a83265df06769337bd78bc121e58f25e05e1607c93c9d2c07cb592fe934496db0f647f9e551bf903a3401a13a2f6708db3e3cb48eaa3260
+DIST yle-dl-20200628.tar.gz 61748 BLAKE2B 1de2d426e8d871aef8d9ad1ee896b28cc79601bd13712a9e646a313ec52cdb2e2e979b74ea612fdab0c309a8fa37e3c1226bac29461410dbc85f976b1277e1ca SHA512 0f6880779392a1f47138a3757cbd08158d6832b35dff15193faa8937338ef791e03f4e5308f71fe0b6f4515092f681f9dad6a41a9ed32254757a44af34486070
 EBUILD yle-dl-20200419.ebuild 1991 BLAKE2B 45b62f2c5c0edc407c076bba5d0124b738d9cb6122c559ddaa9cefdfd5ef44cbd9522d609c9230ff0aa641896414f387a95287b6d1d469a31bdf166a26119fe7 SHA512 19c6ebad053e90841f3ab6132cc702da9d6685e421b6b2af59955e5c7a27c383811850c02c40ad58952788426d9e94c38572510b007e5fa5f41cca0f24380e17
-EBUILD yle-dl-20200618.ebuild 1655 BLAKE2B e2dc93cafd7f8d477f7bacebc9c52a0257862a4085a93a7b734d55d3cd64d0912f962d11c72d28dd0f3e239a832c5f6515fa6d1fdd3acc69cd60f5b6fe1a8fdc SHA512 78a7c2e4948e7d431280bd7c647796682136798a3e9e9132455b656482fd09392e541d2fc57a75a46bad73186fb442ab4da75c54b15047cd80cfc5cc512cf9c5
+EBUILD yle-dl-20200628.ebuild 1541 BLAKE2B 1a080b30a0888c89aeb9c4114ba6536f90f4b2be6028ce18b4de59f13a9cbb1381d38131415ef81b653882b2d141de7dda63c4cf45999e95d91345b55eef0a92 SHA512 f3cfdca67cf5749bff9edbb5fbb9573c64d069e733b17db8c2948bc81ed1163406932801fc90ab79d1e5fe6d241fb35cb122ed90ede1ea8b9da93422dbc579a6
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/yle-dl/yle-dl-20200618.ebuild b/media-video/yle-dl/yle-dl-20200628.ebuild
index bd1cb08e0904..645801818b99 100644
--- a/media-video/yle-dl/yle-dl-20200618.ebuild
+++ b/media-video/yle-dl/yle-dl-20200628.ebuild
@@ -54,6 +54,5 @@ pkg_postinst() {
 	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample"
 	elog ""
 	elog "Optional download engines: "
-	optfeature "php download engine using rtmpdump" "dev-lang/php:*[bcmath,cli,curl,simplexml] media-video/rtmpdump"
 	optfeature "youtube-dl download engine" net-misc/youtube-dl
 }