Merge branch 'edge' into next

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-17 14:32:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-17 14:32:10 +0100
commit: 51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch)
tree: 753b6b08624c34d1ed8414bbe22c45409f7741b9 /media-libs
parent: be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff)
parent: deba8115d2c2af26df42966b91ef04ff4dd79cde (diff)
177 files changed, 3935 insertions, 1178 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c6ea1a23947a..ed1304a15214 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index c07e96e3c4ba..4981e02a301e 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -12,5 +12,5 @@ DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d162
 DIST allegro-5.2.5.0.tar.gz 7849326 BLAKE2B 8d8995b9ad252b81c534099ffd91d81bbdcf4a34f7ca7c4fb7dd97e5c075869c212fa68445a5fe479a675d755ad0414976c11cbc112ecdd61f1fa09704957b21 SHA512 c6341396ad7340233c1297ed122095e5c2d129a32da2350b4bb39c4b74f8d56d57ec4e608defec471d63fff51d786f0a9f3844be82f81cdb3d48d5bc49908b12
 EBUILD allegro-4.4.2-r2.ebuild 2737 BLAKE2B 53d1da512860d07ae86685094c73795eff384dccac3bfdcaa14e766300043289163cf721ff53abcc826070182eb14bef098fcadb2cda4730cd6042ed76116d4c SHA512 947594d6b3dcc1df3cb7359d41ddac48b8095933aa82dc5e064c92534e94d380ff0b65896a5558b82c11b7149c5f4dd552017b247c35b233318a6e5b010cff0c
 EBUILD allegro-4.4.3.1.ebuild 2974 BLAKE2B 528154f76a3881238dc604cddfa85c308d5b03333be69ff946083abb26aa589e44a85b684b4913638f2ca70b6dabd84df392d07bfd806f204c61d61af31263d5 SHA512 45f1829f0cc3cdd3a15f7ff92c6712c4c871e61cacf92ba8be1b0394f20b1649532e0e5a7bda3407218d0203788217383d8c788a72145d7a02965eeacdd8cb3f
-EBUILD allegro-5.2.5.0.ebuild 2815 BLAKE2B f9e0fa04cef9144f57076184248d86aa7a2db28e2c3bb31c34abb7f3a06d1f6130bfc45e041293378b42854fbefdf0cf9718d709b7b1e73b79365d76ddfebf11 SHA512 09fd35132056411a1e45080ecf97563f52df1bcfadc2557d72dc954fbebe27f352cb7d11c54824063a8335fcf6a3f3866b00d52f43123c2b1eacec6373b981f0
+EBUILD allegro-5.2.5.0.ebuild 2817 BLAKE2B 26bc7d624366d775aca8b8d05978c6cbdcabcd40ee68c233d7b8f41c35aa9f1200d3114ea9674bec81f9fa34b6da877caa727c00809e8fb71f51f54c645cd66a SHA512 c4332466c54a64179b190bd2ca18c4db52ecbb2b5b2208257392de89e0987284c66cfa8aeedf8fa5a9eb7e87c23e223919cec83067400116f697036f5454e4d3
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-5.2.5.0.ebuild b/media-libs/allegro/allegro-5.2.5.0.ebuild
index be007eeb7fb5..f461da80f02d 100644
--- a/media-libs/allegro/allegro-5.2.5.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ REQUIRED_USE="X? ( opengl )
 
 RDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dumb? ( >=media-libs/dumb-0.9.3-r2[${MULTILIB_USEDEP}] )
+	dumb? ( >=media-libs/dumb-0.9.3-r2:=[${MULTILIB_USEDEP}] )
 	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
 	gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index e2ded256cd38..5c553a4de1ce 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,6 +1,8 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
+AUX alsa-lib-1.2.2-change-order-of-pcm-devices.patch 2198 BLAKE2B 21db0baeb6bb130c2ed537eaf6509f54fa4970a54ddc90b82217e47e63e1161e76bed54161f5cb19f79d999ccb1079571938bb7591ac378ca13cb94527d6b629 SHA512 3be6b6a50dc570df19e77132b519aba4b5a04fc25056eaaa882c8a32f632389efd358bfe7aec833651acd63e964b1f411f86fcfbb9abf30072ba14f561af3bc5
+AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d018bf476ec327c5734e96adf9f5dfdf97212cb220837f42c93879ef7641d3775c8238fc5fe27a5fc85959d4fca7e0fcd62b69009d895bdd1c SHA512 6f71ab0b4424b684dbd6ba0b2a3ce0de05ec3124ec1c3223ccb35afaff02dfed834af2d42d8d1cb8bb7f2e96051277bbf18ba5687e94f15d753cf1b86cdd33f8
 DIST alsa-lib-1.2.1.2.tar.bz2 1004129 BLAKE2B e8bf117f3036a32b020897f16b9648ac105c499f547ae157508720502722d4e1a651719c86a4e2756ca7a3c573a1f17c02524125ccaad12bcb8c7c71675c898a SHA512 e8286fd55f63ee0d95513279d0885c287533de89b7af6c338413dec5d38ba4f5a15da1a4a4ce36e052614e4b730e3778782dab9979d82958283be17b48604913
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
 EBUILD alsa-lib-1.2.1.2.ebuild 2081 BLAKE2B fd2d0ee1156be52d3c71585e44660bff6b0fc387b04be344dcb6ffe514739e192602b9979c3f58aa38e8a014e2888779b4f185d1c2162b156ece817fdf01238d SHA512 f21334e3525ddbc6621d0b588b73208d88348e51c8b3c89ec645cd322449046c86b30de99accf3f943ddd444aba08d62546376bb22569bd9ba5f8126270a12f3
-EBUILD alsa-lib-1.2.2.ebuild 2091 BLAKE2B 14a56424ba86099d4db40cdeaa9581f6a8ec423b121ad259f60d9eac4325de82b84b835b47a7ffb59e44378ae879ce7a3809f2991340810817f7d6704e48c946 SHA512 2d341e07794bddde8e6dda03407fd664a88aa2f4ac5525355045703a3055e0ff945997e371874ecc81bdcab35f1aa0bbfa6d2acd00ae97b78a6a314767eebda2
+EBUILD alsa-lib-1.2.2-r1.ebuild 2177 BLAKE2B 263db5805070d0c436255435b0ad6d8788f30b01b62dba79adf8705d5736760d9be0bf3f821f212406c9b353416a7125a687ef27a97b44e99fc50b6aa3a57365 SHA512 0f79c21aa74feb187d563c472d95628f7558cd2e80778a861fc220282e7ab2c1949e003a50722af9dbac5798572da2afa70da859e7bf082b7ece76672d91af01
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
index 19216bb87366..4f118f5082fc 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-
-inherit autotools multilib multilib-minimal python-single-r1
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="https://alsa-project.org/"
@@ -13,17 +12,19 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+	"${FILESDIR}/${P}-change-order-of-pcm-devices.patch" #718106
+	"${FILESDIR}/${P}-namehint-add-omit_noargs.patch" #718106
 )
 
 pkg_setup() {
@@ -67,16 +68,13 @@ multilib_src_compile() {
 	if multilib_is_native_abi && use doc; then
 		emake doc
 		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
+			xargs -0 sed -i -e "s:${S}::" || die
 	fi
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-	fi
+	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
+	default
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch
new file mode 100644
index 000000000000..b21e184f8770
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch
@@ -0,0 +1,80 @@
+From 27c7927842a691ef13724cd16fb26264680c6aa2 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Sat, 29 Feb 2020 10:30:37 +0100
+Subject: [PATCH] conf: change the order of PCM devices in alsa.conf
+
+Appearently, some applications use the first device for probe or so.
+
+Fixes: https://github.com/alsa-project/alsa-lib/issues/27
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/conf/alsa.conf | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
+index 0998058..a091b81 100644
+--- a/src/conf/alsa.conf
++++ b/src/conf/alsa.conf
+@@ -119,29 +119,6 @@ defaults.timer.subdevice 0
+ #  PCM interface
+ #
+ 
+-# redirect to load-on-demand extended pcm definitions
+-pcm.cards cards.pcm
+-
+-pcm.default cards.pcm.default
+-pcm.sysdefault cards.pcm.default
+-pcm.front cards.pcm.front
+-pcm.rear cards.pcm.rear
+-pcm.center_lfe cards.pcm.center_lfe
+-pcm.side cards.pcm.side
+-pcm.surround21 cards.pcm.surround21
+-pcm.surround40 cards.pcm.surround40
+-pcm.surround41 cards.pcm.surround41
+-pcm.surround50 cards.pcm.surround50
+-pcm.surround51 cards.pcm.surround51
+-pcm.surround71 cards.pcm.surround71
+-pcm.iec958 cards.pcm.iec958
+-pcm.spdif iec958
+-pcm.hdmi cards.pcm.hdmi
+-pcm.dmix cards.pcm.dmix
+-pcm.dsnoop cards.pcm.dsnoop
+-pcm.modem cards.pcm.modem
+-pcm.phoneline cards.pcm.phoneline
+-
+ pcm.hw {
+ 	@args [ CARD DEV SUBDEV ]
+ 	@args.CARD {
+@@ -323,6 +300,29 @@ pcm.null {
+ 	}
+ }
+ 
++# redirect to load-on-demand extended pcm definitions
++pcm.cards cards.pcm
++
++pcm.default cards.pcm.default
++pcm.sysdefault cards.pcm.default
++pcm.front cards.pcm.front
++pcm.rear cards.pcm.rear
++pcm.center_lfe cards.pcm.center_lfe
++pcm.side cards.pcm.side
++pcm.surround21 cards.pcm.surround21
++pcm.surround40 cards.pcm.surround40
++pcm.surround41 cards.pcm.surround41
++pcm.surround50 cards.pcm.surround50
++pcm.surround51 cards.pcm.surround51
++pcm.surround71 cards.pcm.surround71
++pcm.iec958 cards.pcm.iec958
++pcm.spdif iec958
++pcm.hdmi cards.pcm.hdmi
++pcm.dmix cards.pcm.dmix
++pcm.dsnoop cards.pcm.dsnoop
++pcm.modem cards.pcm.modem
++pcm.phoneline cards.pcm.phoneline
++
+ #
+ #  Control interface
+ #
+-- 
+1.8.3.1
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch
new file mode 100644
index 000000000000..34ffa01f1055
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch
@@ -0,0 +1,108 @@
+From 09e78da4cade7b8fecb8f36717b85c456f2e5487 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Sun, 1 Mar 2020 19:57:06 +0100
+Subject: [PATCH] conf: namehint - add omit_noargs to the hint section
+
+Do not list simple surround devices in the namehint function by default.
+
+Fixes: https://github.com/alsa-project/alsa-lib/issues/27
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/conf/pcm/surround21.conf | 1 +
+ src/conf/pcm/surround40.conf | 1 +
+ src/conf/pcm/surround41.conf | 1 +
+ src/conf/pcm/surround50.conf | 1 +
+ src/conf/pcm/surround51.conf | 1 +
+ src/conf/pcm/surround71.conf | 1 +
+ src/control/namehint.c       | 6 +++++-
+ 7 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/conf/pcm/surround21.conf b/src/conf/pcm/surround21.conf
+index 1cf1b7a..ad19507 100644
+--- a/src/conf/pcm/surround21.conf
++++ b/src/conf/pcm/surround21.conf
+@@ -57,5 +57,6 @@ pcm.!surround21 {
+ 	hint {
+ 		description "2.1 Surround output to Front and Subwoofer speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/conf/pcm/surround40.conf b/src/conf/pcm/surround40.conf
+index 9788ad4..7c61502 100644
+--- a/src/conf/pcm/surround40.conf
++++ b/src/conf/pcm/surround40.conf
+@@ -55,5 +55,6 @@ pcm.!surround40 {
+ 	hint {
+ 		description "4.0 Surround output to Front and Rear speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf
+index 7b4ef3b..cb6c044 100644
+--- a/src/conf/pcm/surround41.conf
++++ b/src/conf/pcm/surround41.conf
+@@ -61,5 +61,6 @@ pcm.!surround41 {
+ 	hint {
+ 		description "4.1 Surround output to Front, Rear and Subwoofer speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/conf/pcm/surround50.conf b/src/conf/pcm/surround50.conf
+index 7d9a9e7..70d5406 100644
+--- a/src/conf/pcm/surround50.conf
++++ b/src/conf/pcm/surround50.conf
+@@ -61,5 +61,6 @@ pcm.!surround50 {
+ 	hint {
+ 		description "5.0 Surround output to Front, Center and Rear speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/conf/pcm/surround51.conf b/src/conf/pcm/surround51.conf
+index e67f007..d0236e4 100644
+--- a/src/conf/pcm/surround51.conf
++++ b/src/conf/pcm/surround51.conf
+@@ -57,5 +57,6 @@ pcm.!surround51 {
+ 	hint {
+ 		description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/conf/pcm/surround71.conf b/src/conf/pcm/surround71.conf
+index a26c3f3..66792dd 100644
+--- a/src/conf/pcm/surround71.conf
++++ b/src/conf/pcm/surround71.conf
+@@ -59,5 +59,6 @@ pcm.!surround71 {
+ 	hint {
+ 		description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/control/namehint.c b/src/control/namehint.c
+index 60c48ae..169bd42 100644
+--- a/src/control/namehint.c
++++ b/src/control/namehint.c
+@@ -287,10 +287,14 @@ static int try_config(snd_config_t *config,
+ 			err = -EINVAL;
+ 			goto __cleanup;
+ 		}
++		if (list->card < 0 &&
++		    snd_config_search(cfg, "omit_noargs", &n) >= 0 &&
++		    snd_config_get_bool(n) > 0)
++			goto __skip_add;
+ 		if (level == 1 &&
+ 		    snd_config_search(cfg, "show", &n) >= 0 &&
+ 		    snd_config_get_bool(n) <= 0)
+-		    	goto __skip_add;
++			goto __skip_add;
+ 		if (buf1 == NULL &&
+ 		    snd_config_search(cfg, "description", &n) >= 0 &&
+ 		    snd_config_get_string(n, &str) >= 0) {
+-- 
+1.8.3.1
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index e93277bb2e03..0b04bf514511 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,5 +1,5 @@
 DIST alsa-topology-conf-1.2.1.tar.bz2 5377 BLAKE2B 95cd1074068ba85e6c6b74d65f7ddc40e182426cff69c7765689edcaca3609a249638c70e5f92c889b3c76ea662e7e43e355af4573acb3fc293026392f614522 SHA512 ed86e7372f887a2e13596ca7456da1db84ff05d01f98d80c403263673d2c0f247834bdc9edbeb62231ca1dc6b9792dade87672d905303a8e0fa462c1fac1b7fd
 DIST alsa-topology-conf-1.2.2.tar.bz2 6346 BLAKE2B 6aea93139e85de3d28ce19319429340eac61bb340c29448dfa14d4fe1d80dc1e5e0c066b33ccab3d9c620efe6b95b095cf1ea52583d7543ca472f1375dc5ad57 SHA512 145ee0e16f7f84d5f97759b1efaa3df9fe35c8b33c7ae863ae1b915f361acd902ad05f59090e1d98b2a4f2ecc14933681592893564fcc45cdbc974899f789b94
 EBUILD alsa-topology-conf-1.2.1.ebuild 508 BLAKE2B b9ee49c419bc7031c0d9ae43c9755b5d6e959c988d4134058be8b60aa5df7242307bf5d09ccc2f726a520dc1680704058a1b5c74e980a4bb3a4b3519784b8613 SHA512 8cb4d00cdc952b1d3e1b6a262e6603ea7fab93624af981eb03cb92a39fee9f35c1f21ea9e993516889892ea7ce7e12c678fac7aea179b1319d16cfe9d9cf8c0c
-EBUILD alsa-topology-conf-1.2.2.ebuild 462 BLAKE2B 05f2490be0486009dd71000f0fa10e12ac5ba221538c49a6073681442ddc3c750b00a85c4a0a4e42284bea7f08fbbee66e81e1ecbf40ebb65b9ed63572328859 SHA512 3ae824894848ca3c9fa2eab3f8ccf5770a1cc370e79a58b4c6a7b49b5d6aba22f3bfcb98d14447dbd8bc696e2b1104a6429781944f5da280adb1f96b84550eab
+EBUILD alsa-topology-conf-1.2.2.ebuild 492 BLAKE2B dadb0aa599341fff13951cedd345c38be4389896ee74f7bca463eacded6949bf1f8a508891ada15e7a07e14b6859dabb8adf327f5de79ff10774e7f8d1b8a125 SHA512 dbc98ed8ec2f3793184082c5a209c08c62bb4de649aab5ac7bc1b42d4c065407ca3c94b753e8b8bf28bd1491317e36a3ce739f3a3d489de86c3a47f58b5c9ff0
 MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
index 75fcab013862..449bf3a78093 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 5c7808f916be..6024f738f53e 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,5 +1,5 @@
 DIST alsa-ucm-conf-1.2.1.2.tar.bz2 14660 BLAKE2B dec3e11d2aef17344eb1a11987eb9b6b53606fe278bf84523cf6a829799b264b6a0bfd0e6af46c7ce834f34584078fbd8e1a78c667c64f51e0ef67e448264705 SHA512 e498c4355a765eb6ecd03f03611c8904f757bf73619a3c8159c044f80a4c3ab5cbd343692c227e13c6da307fc2e35259b4726902d3ab8e03eff11aa1c74027d5
 DIST alsa-ucm-conf-1.2.2.tar.bz2 14608 BLAKE2B ce850415a115f673267f6ab32f176c2ab73aad8bd7cf2be244bfbb7342756c6de2212044cb92b3524dc4189955c8144b134af144b6a15aabf33c06cbcfe1fdf6 SHA512 25e3f341c110772c7cffc8c7745b320f2ddd12fe6460380c088939b5dc67b99ae4ad92e69375179574e0e1c40d14ff49961e86494e223fde009e51590f00ca8f
 EBUILD alsa-ucm-conf-1.2.1.2.ebuild 502 BLAKE2B 1ae7ea2cfbc19b75907a9fc6a0735ad629dde011e7f696cd3d3b18c2fee2e9cd09d0b0ab3e200bb67757716148aa98b3d0e36590cde94ea900162d25bcc522ff SHA512 079df2aa14928f0676bb01129f9c269ff8bf49845903fb9e0aca6709125925a58cdda235e82a122a27c7bbedbe64a7dafc691910059348029532cc826d507ce0
-EBUILD alsa-ucm-conf-1.2.2.ebuild 456 BLAKE2B bd9355874d7ecc8ff8c29d0c00f45af0ff003c0ef0cfbe23b46375bf5968e8aebea9abad8f6be8e186862ff0289d42fc27d4cf40e21e1e075e1a30437540e543 SHA512 85bc2e259bae5f431b2c76fc790659cf8e1b5c2e0767e991ff398dd4a7f270263eae9aec397d5f0f4f28a8d86bf87b2762360ed4c62028b5373ed4b5fb922247
+EBUILD alsa-ucm-conf-1.2.2.ebuild 486 BLAKE2B 456d70f97a19fd26cb183e365f926cbeb4b5e457b60086a385db8f694bced10d6ad9370b6b4860790c4742fb9c1d70398e170c702231827c20a70dddc2f724be SHA512 d013fe3c77ebd5e6680938d4464d0dc8730ec395321450f93b2ca3c186541a65b82df77dfc454479148915cc2971268c8202bf7e88996f48466380a1b200f1bc
 MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
index b4b136ca4fe8..0a96f25d98b8 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/aribb24/Manifest b/media-libs/aribb24/Manifest
index 73bbca251699..ca40f2976b00 100644
--- a/media-libs/aribb24/Manifest
+++ b/media-libs/aribb24/Manifest
@@ -3,6 +3,6 @@ AUX aribb24-1.0.3-fix-default-macros.patch 1511 BLAKE2B 04b32f01928d66389c771f57
 AUX aribb24-1.0.3-reset-control_time.patch 713 BLAKE2B ae8d2bcc787ff12c5bd3374c171785f25b39294c78f8f4f0d2cf610298d0ecc951071b758c33bc1d68230859f032f9e7191a11dd6f7995c4e112a62705a87a54 SHA512 ab9cf73d508d5ae4d570ddf50cb6e914738312951aee49ff010df46d37fc9fd3be67accec518bc43562a12e228fa0d420f005a29c5d17bf1c38bf6bc3a8da090
 DIST aribb24-1.0.3.tar.gz 57378 BLAKE2B 72d5c56a214d63e477ed0bb77e5f20e79ff69fe3712623f54f1369b041622aef1853909f3dfc31685b346c62ef36ffe205bf7a8d2c9f0a2996ae378b025228b7 SHA512 622cc0c3928fd6db0b5ab3921f27348c956af20f8c0133ad5d9bf4de3d199077d9f23cc86ae149a9f0d13c7ee5906ec95de3fb8388207160cebd1f0c59078c8f
 EBUILD aribb24-1.0.3-r1.ebuild 692 BLAKE2B 31de88410fe23acfbfc52aca125563792566e296315b614ae07c0d378176d10722574eca4bb16d775ded48bb3bd2f679f92cb0f5bec2e6db952c77a9385218d5 SHA512 7650c1ccb3cdc429570da6a677b43c0721a41eafbae387908862123dc7f8f7f65283810cb9c91f0b037cf3b1db364b4da9836c37a7768657991b4584ebb91cd4
-EBUILD aribb24-1.0.3-r2.ebuild 858 BLAKE2B 25a2190c0e5cc67a9a98b844faf7458d36ebee97aaed2d4124893ff2883c3eb3785981c1a51a6626d3ff7d5d111fbbd972245d35949cbf784c797a16ed51d1f4 SHA512 c57448387d9ec64217004305b1d602a6391feb87e00d6f311fa48e16194be23b922952d4ec0cbadb42d256e01b52da4d41f7d1060c87a759407c5ffd44bfd220
+EBUILD aribb24-1.0.3-r2.ebuild 854 BLAKE2B a105663d20dea83af10b3c0957eedd9021bdc962cf93cca0df1547f8a7093fb1bc3ce68400d418aa710e510ea4e9aed516f1b785300355fad7cf4c080f1581b0 SHA512 ec92fd6c633a985bb8fbdc432cc74b78dbf8dcaba026f7c90eeade7733dabda87be1875a001e3cb8b44c514ae332d8aec7d43ccafa3d4582a975c6461a28a872
 EBUILD aribb24-1.0.3.ebuild 616 BLAKE2B ce1ecd3b136e91fd0982f9905c99326241293146fa31a13ab4948943200df4f40dd850e8bd0c5c6b0b60d3030f895d544c8352ecafbdc6c8e900080da6a4eebe SHA512 6f40d29f3a3c0b69e2b00ddd754b75648619d23b76549eb8e6fa9e0c3a0fe011be923dc01bc76c6e2ccfd5aee361c38feea3fbae762d3a92ed8b5adc240007cf
 MISC metadata.xml 362 BLAKE2B a58d2df31cfb55e76bec5b2055ae17cbfed0de0a0cc85d8d604ee5c4442539b00d40500722b9a589861f6de1e49ef9fe171bdae2219325c93fc07b735a349949 SHA512 0266c8f4f74468aca028c09b9bd61817f1358022ba11020c5f1829581113c0510c4f59228304fe4a5e76f4a666c640e0afc6e96385bae7c0de98c5d4b8a64d44
diff --git a/media-libs/aribb24/aribb24-1.0.3-r2.ebuild b/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
index 6299b0c19f55..b159ab5764f6 100644
--- a/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
+++ b/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 
 RDEPEND="media-libs/libpng:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 6c40afbe4957..684e1aa08bc7 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -3,7 +3,7 @@ AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316
 DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260
 DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c843ef9d6bf0483ffb750916eaccf9e28b8d80dcc0034572cca4f08479e4db44468c96206ce7b60a2fa9600634 SHA512 e58b32beda36865a5243ec7ed4647cf96e3652a25fd319fc697c08f93487f895070dc66b830700b40b879220c2e3a53b8cdc255ce2e34770ba5e34b36a4f51b4
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
-EBUILD aubio-0.4.7-r1.ebuild 2535 BLAKE2B 18068528d43a0560333558f37a24e2f3cf419c6849f17e2b05468d16674fbe18434829cc2302933a72999b3800dbefa1c68914940564ebcdd50b2dfaa85380d5 SHA512 62cf943d925027d460e8ce96d62a426c31d50e7ee23ee35bb11f52a1e52d40e1a7131616851d2daae61e797e93cdf162ab584a717a2f18d41de5e5d6064fcce5
-EBUILD aubio-0.4.8.ebuild 2538 BLAKE2B c40bd3ca2571a8575f16534d95dd315ae49f91b1478e46b90f2c6e1efa286db1d90eb83057ada627d5c41ec536d35b3d356469b30201ceee7f6ac5947e163de5 SHA512 2ee418860130e370526dbdfaae67c8d8f13c6ab40177362e5b0e34c16b9953a66592832f909ef2e512aef9dd972940d032a1fb304d03e05089595b5d84361c1f
-EBUILD aubio-0.4.9.ebuild 2563 BLAKE2B 112a2774181285b6742243e9d373551985da5cc7559d74ba67b1433a53f968d570d246d42d8d3a63f4802355a75b24b5223766f28417ad81cf372a1f9b6579cc SHA512 61f1d431c87e7f322770e388e5482b758da167c139e620b0473f9f66381482ee7f30f45bdb7cc5be715660b2f9e9c2c3d51c31b07b5db479db8cee63a7760f23
+EBUILD aubio-0.4.7-r1.ebuild 2476 BLAKE2B bbb66cc2cdecae57c6ffd93e92199f06ac35c8b77c52a656e435956b1391a83d4ac117a471532fb99d713516254a8a6c27bf65653528dcd7493d7e1ba0901163 SHA512 d0c1d1ec2f24963f74748d83f490b7100f02682e2f15897686b0acef265175b2b821623d7a10b9f208c2b5007145022c191a764777a57c14ddc2904ae899421e
+EBUILD aubio-0.4.8.ebuild 2480 BLAKE2B 019e89355725965392524f13f48e85f346ba4c563e6c8d075428ac08dc2317f7b32001533c8d5ea9d0c0e391c1eedba989ce9e34f092cadccd39809480f558aa SHA512 644fbed7d586997c01c6a696f4329709115ed5860c0c9ab4e694004f44c22b9095e7b87a109bf908b115931c0d56aa54d41c46c929b60a35975be0247c685ac7
+EBUILD aubio-0.4.9.ebuild 2504 BLAKE2B b3f9e65f3542d02851de50e4c3b5d120f623d7d526fe291af1d2894c1e40aa9c75b0392e941ce159a9d14584104c7f1ddb3c03b20a5770c0f3b58a12817ee523 SHA512 0dd0d11550ffb12adade15a570d1264126c6f63f67266903a26b6723aaee77f0bf00dea59950ab327c50bb9d66a59e6164b9fc22f5badb4b4d41ea4f302f6eee
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.7-r1.ebuild b/media-libs/aubio/aubio-0.4.7-r1.ebuild
index 544e1262ead4..977ee51acd4e 100644
--- a/media-libs/aubio/aubio-0.4.7-r1.ebuild
+++ b/media-libs/aubio/aubio-0.4.7-r1.ebuild
@@ -15,14 +15,11 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
+IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-2.6:0= )
-		libav? ( >=media-video/libav-9:0= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
 	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
diff --git a/media-libs/aubio/aubio-0.4.8.ebuild b/media-libs/aubio/aubio-0.4.8.ebuild
index c0e64da911d4..cb37129ec5ca 100644
--- a/media-libs/aubio/aubio-0.4.8.ebuild
+++ b/media-libs/aubio/aubio-0.4.8.ebuild
@@ -15,14 +15,11 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
+IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-2.6:0= )
-		libav? ( >=media-video/libav-9:0= )
-	)
+	ffmpeg? (  >=media-video/ffmpeg-2.6:0= )
 	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
index b03de834c4f5..117ce73c4de1 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -15,14 +15,11 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0/5"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
+IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-2.6:0= )
-		libav? ( >=media-video/libav-9:0= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
 	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 2d18f08ac2e8..0cd58db5ad44 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-core-2.7.3-permissions.patch 1079 BLAKE2B 64e4b1718ef91051253b0d09a69acbd11fb2467d48a62443b4ccd2ca89feee454d1ed35542c49fbf94c217397bd363e6aefc6a3bf13498af9a57eb6fdf32b5ba SHA512 d9c316b76cedd2119a3fdae1810846358f7addf21258021ba896f0e1dd7d68d27db5f7e97b53e284806482334ccd016833a2f8b24f50cddd28ac6cfdf28dfce3
 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-core-2.7.3.ebuild 2261 BLAKE2B ffa56d146611986405399d2bdf63c08f8011e4b363466e11b32f6bb8196fa9d3cf424a431f23155a5b4e3aa28e4096d32c60301c415b4978e9e3a86bc3f3e6c8 SHA512 6f1550cc931ae91297a835a2be482bffeaea3dc4cf67c169cb1fcf946ed83ac277b220e1ea01cc9cfe9aba449974f6de3ec51472d039df3a46888efdd2fc2d6d
-EBUILD avidemux-core-2.7.4.ebuild 2198 BLAKE2B cac9d85f23bb7c187ee7719394e2afd9fbf8b1e3ff4612301ea3f40aeeecd327769cff30740f2dd18f700cdeb8c61a1eda55b5851918a49f750a13aa18205820 SHA512 117950d2d4aabfde83532c39c37350df73454be9a61f825056188daf92acbea0b117fbaf90bc05d5efe41463b86c7e78ab17f2ab02517ee27ef2ad157febc79d
+EBUILD avidemux-core-2.7.3-r1.ebuild 2265 BLAKE2B 6d1b909ce168db29a92bb68939afa888dda302be61202cfcd2041fd43754b6f4769cb22634aa25ef8dd9bcebf90b1931462bdf10bd10095c081fbe4d2193fd38 SHA512 3a94343262b771030e57447ffb16abd849b4d48beda52d646cddc1a1ce5efa8e4e8644a1d2d7cdb78da23298cb8525ff8ea2bc51f8f21ff75bd692efddb74902
+EBUILD avidemux-core-2.7.4-r1.ebuild 2202 BLAKE2B d045271402de0011830182fa76a50d8b58f35d4857391d6d7c7168ea0d3452e922876a991852713e2e79ce8f85d5a60bf52d2cea82f72ba3306b13597ececfc2 SHA512 af39b9372a05c1785f2badc702cc1d4487eb8d9db597745c0f84f1cf86ba3986d63f929d175e74018221e2a13da028bb26fa7edcf3146be24638f5c4e5aeccf9
 MISC metadata.xml 569 BLAKE2B 19e9f892bf6e5c63f2054dfd44beef6b394fcdeecbb2e91edf01e7e9370b7a32c21529ad566921d46992f14d00943ac69e5f0f55cff8406d48ee84dc6515619c SHA512 58e100ccdc3e1145703d4feef2776bdf4ccfcc44dc9e04f1e79f5ea1b89f6ae59c386794028328f27d8715cd00abb410cb6970f1b72c1646750babf742fe3270
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
index 1ed1591e1a59..1b987f4d1e1d 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
 DEPEND="dev-db/sqlite:3
 	nvenc? ( media-video/nvidia_video_sdk )
 	sdl? ( media-libs/libsdl:0 )
-	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+	system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
 	vaapi? ( x11-libs/libva:0= )
 	vdpau? ( x11-libs/libvdpau:0 )
 	xv? ( x11-libs/libXv:0 )
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
index 1143e35d737b..631c18906fed 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
 DEPEND="dev-db/sqlite:3
 	nvenc? ( media-video/nvidia_video_sdk )
 	sdl? ( media-libs/libsdl:0 )
-	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+	system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
 	vaapi? ( x11-libs/libva:0= )
 	vdpau? ( x11-libs/libvdpau:0 )
 	xv? ( x11-libs/libXv:0 )
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 4f18a7f042f4..0915e8bd59da 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,8 +1,6 @@
-DIST babl-0.1.62.tar.bz2 698161 BLAKE2B 21fdc009e56d40a8ee08509161dcad10c3f5b41c42ab7f2d64f888762a15b3dd4b6723a4caa4aea7c977179007db4b6e39b6ab9fde4c68bb24ea170ccf29dbd3 SHA512 4d2ba25e39b8dcb122913731861fa04cafd97388a1c354afb2188e8582ac78e9e32f838e2be8e9f41ee9ac582081fdee1d79accb60e824b8b2c12995f96a8293
 DIST babl-0.1.66.tar.bz2 706100 BLAKE2B 0de443dd4ea32cd025c8b121f042c24528677f32a6c201f3abedd13fb3a2ce2636d03f4b45eefce2c9f7a86426355af9b584602ca9ebb1a2140ee88f500c2843 SHA512 41534eea6cad21eae704af3fdce4857e9dc2b0efa48a7cfd7f98b23428198e95fc9ca2f30e522abf2fa06e907eaf4f7bbafc048b356cb5890fabcb9be21001b3
 DIST babl-0.1.74.tar.xz 294156 BLAKE2B bb5df4db706f817d9cf8674caed9b758fc1380b9dd33a26b24990eae07543f097c5e5fb68788c02cb2a2c0e68e917bb7a1c68aa0d2f9871dfd3267934291d474 SHA512 97b4a5aad76b7d6dee1835774cee48f866a9513c6454d74c3378068a60359704c1ba106a7542b9ac6a7968b3cf632ed2626b835ec9c7f3fcc6e29968c1e39396
-EBUILD babl-0.1.62.ebuild 1526 BLAKE2B fd0b0a8d90ecd659174bbbea81a30815bf6ba733a549bb9bec26122447c77095f4c40a76e4dc650cbeceab7c2f2cece0ca4f830a05acfa164a5fa64cc14c0abb SHA512 2ce3d9e86d9bee1423c9f9bab80b6c5b385f9be7fa6a0c0fb25c5cfeca46e64708c630c1fda4ce600c3cb61b1a47df3cc4bbcf8637d3fe15b46c95b1c4bcce70
 EBUILD babl-0.1.66.ebuild 1526 BLAKE2B fd0b0a8d90ecd659174bbbea81a30815bf6ba733a549bb9bec26122447c77095f4c40a76e4dc650cbeceab7c2f2cece0ca4f830a05acfa164a5fa64cc14c0abb SHA512 2ce3d9e86d9bee1423c9f9bab80b6c5b385f9be7fa6a0c0fb25c5cfeca46e64708c630c1fda4ce600c3cb61b1a47df3cc4bbcf8637d3fe15b46c95b1c4bcce70
-EBUILD babl-0.1.74.ebuild 1532 BLAKE2B 6df126f9a466e8a35714a913941605bc8f5c7eb6475f48b6088c47d1bb7aac84497d527c72d2237ccb330e38db430cafaebf4b7abf25be855dffec04996f15e7 SHA512 5a3da9dc91a7ea64ef61581a4cba62a5ef6d83ff7eecaa84ad1538aeedee582e163a5828fc1eab5f24683a9db6a6e3829232dfb5e827f401eab4a52c5a28a397
+EBUILD babl-0.1.74.ebuild 1531 BLAKE2B 96d7fdedcedd21ca6a29d2431353cdbcc8ca192f0002565a2371c31eb54a5a4ab2eefdb2494b2eed4492dd16a9dafbb207a2f14be1b58abfdfa33b4985eed73d SHA512 b80760c10d05f679ea6511ee395dc595f14666bcbf6ef9a85733b56ece74592b91d914432eaed23f83ec960bb1fd81d93843386b4d429032a7035e7feab6ef7c
 EBUILD babl-9999.ebuild 1535 BLAKE2B fc17f623aac707e7c8d59277df8d01f3d9442d78288ed12f8eda21141789e8fd8ec7520011b093ccd8147799dfedb25b4b05ac31955bf2a405255b5d86345f2e SHA512 5b6b8a5901afd6408e4c9abc410423922110a923eefb6ca462f723b6fb709d45945abefc44dcdadef0c888efa7dba20373079407c23b191c3eda0e5719ca1c36
 MISC metadata.xml 370 BLAKE2B 18f0dfd3b6fb8f284f888dbcd30d3d4ddce8753e58ef3e92ba0803bd6dadd36962f2f6e57dcd6ccebc547bf43b8972bdaf27e5817c77307172fdb835fe2d9c9e SHA512 9ad9dbdfc25d5a59c0129f1f83615d73bcb9026cc0411a71e9987bca46389fa5f3905a72d22ddac319b1838b770cc5755a2ec312a05db1752e10be5cca08ea38
diff --git a/media-libs/babl/babl-0.1.62.ebuild b/media-libs/babl/babl-0.1.62.ebuild
deleted file mode 100644
index 8a25c0287680..000000000000
--- a/media-libs/babl/babl-0.1.62.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/babl/babl-0.1.74.ebuild b/media-libs/babl/babl-0.1.74.ebuild
index 51a90052f318..3c11ec855b37 100644
--- a/media-libs/babl/babl-0.1.74.ebuild
+++ b/media-libs/babl/babl-0.1.74.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index f1a6a847c1c4..801095346719 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,6 +1,6 @@
 AUX bcg729-4.3.0_beta-cmake-build.patch 135 BLAKE2B c3379f4327ab4f1d2a12ec31f3f0c0a3a15b0c2945da0d707d2d1b308c1860d52914b875504c0967c4b75ae42a4f7766611563c150cd0afb0acfe1369cc72116 SHA512 97fa2a52456809b2c4bac66c4c309b0d95a7a12d43eb102857339e729ede84f9a2cef9050a7232090e7b4e2f3817890d94e565051553f4cec3b7e83e69b2481c
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
-EBUILD bcg729-1.0.4-r1.ebuild 761 BLAKE2B 2d02aecbacfd9ffe8a6ab38de28a8677634c49327d52405c8e9be2b936486a0d1ac86fe8980cae550e765ce18a8ea857345fcaa87cb964f5a7e3adee598446cd SHA512 d625aed5ceacc2ced810b4561f851a54385680a7f51b90c36122f2a302d3b4fe511fb7938651656285b721daa4ee07ad5b8e030e8f7db8c26d2fbc2779816a03
+EBUILD bcg729-1.0.4-r1.ebuild 766 BLAKE2B 6e3b1e2620e6e9e1e2c06cd8180fca64105fd25fb963dfc942aa2fdaebe07f2b9177db67d6bde5a117589bd6c8e8c96882e6348a8aab17eb2b0d3384c3923095 SHA512 cb7e64fa01684d97db56ba1e83f595f5610f5a6893b57f5226659e4807afe8bae80e7124226e906c38441e036c855f2aa02560b893f5bd4d27da8e1d25c341cd
 EBUILD bcg729-1.0.4.ebuild 665 BLAKE2B 61e259c0e136f52ca45d6676e3c13acfb34d27028140ed2e4a487b8fa589985101679df5f5de4664d565fef354f09a1a66d5ce32ee693a817adedbfa48bb7c03 SHA512 cab46d07da0a5c27c2e3d1362701835b9cc970d01b6a069ca908d6194999706d1e04a44775a1468558d3a3dc3534f26ac63290fa39258e474b86de527676a1eb
 EBUILD bcg729-999999.ebuild 722 BLAKE2B b25c170cab5975861a9b8caae9922efda53869c39a74094a5092be074db3c5b4da37f0fcedeb776ed34a154c5e9dbf74cd796d1eb7fb83ca8eec358fc86d97a7 SHA512 9f3d10de5a4010848e067fc21fcabe64fa0de7797e61521be5c8779e55ae676f7d7fc7c72d54d3d134eb978adeb2fc23b95b7129324bbd77f0a8bc196eab84a9
 MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
diff --git a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
index 53c6d19ed726..3664c1d80e52 100644
--- a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV/_/-}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index b6f016535a03..d38829adae73 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,6 +1,9 @@
 AUX chromaprint-1.4.3-cmake.patch 1787 BLAKE2B 596a2ec2e684c3f2a03180fd5420029cca56c07bf3362e2158a99f40c2d4a117b7d17ce6a8afc20647654643ee31569849e8413962168799963acb043bf869fa SHA512 b53dfd1c26f34aedae6964d9e87725872f5b3b4d7f6d5f8162490579f05d863bc27d5bc4f6f2303f95346ace2cd751e6f3a0ee15c34d15eb3088123f472c5338
 AUX chromaprint-1.4.3-test-bigendian.patch 1944 BLAKE2B e8441359f3d830451398c492e0711e6eeb290be75e336099b307e61d327158fbc2e188ffa96201e16fa5d2c1588ab763b79d9881b6f3ba276c6dcdee7de5e4ea SHA512 a6df0cd861c3d9d2c5ae28f50459c6930ddac262e2126e2f3ca4ec05a5e4d790df8cb0d7fc90eb0f4269ea4289958e9777d7d39cf588fea99e4c1d1f9f63bb59
 DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
+DIST chromaprint-1.5.0.tar.gz 615217 BLAKE2B 14bf219c23360028ac232e67b7eb36e3226bb6e19838ef239266a9d826e1bd50d798f69f961bcb78f36baf48630a93f53243f8f9ab6187c403382bab23042630 SHA512 25ab3f7834581a8204ac09614fef6036c801f5f8b7b72a864701ca0de8082b2458a2bd7c075d53451581d770898576411cdcfb23ce609bc82f9d9b395cc1a129
+DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-EBUILD chromaprint-1.4.3.ebuild 1454 BLAKE2B 8e53c5d759093e9a6d86a018f6ad0505e8074425b17d7a9a89e1639e9781849fe6574cf7339be7f6e3905ff7324a3ff2c4d308280eb5e2056858249015d5bd37 SHA512 464b268d990812b40a2636265c56fc03ef4a23cba122e21c11ab039f62fc9103850432bec681f475af2a09987e554debb9ba728a8b0a70875c47247a1fe062a9
+EBUILD chromaprint-1.4.3.ebuild 1344 BLAKE2B 3d972ab4b4912089f91da2ad2f60df3731ec672c633938bc5ae986facf7d4ddf8b916753f44bffca062cc7334a8ff415dd2311c92cac68b01790f2b003595188 SHA512 bfc148cbbb5cf2846b8bf2d162ea77364207a02bd0b8457362cfa788660a94350776cf5ad4ab8b38d299c560b4a432865fa54592504f31412b44f31fee39b4a8
+EBUILD chromaprint-1.5.0.ebuild 1276 BLAKE2B 32373b8684f8cf429f6893eb147a387dbdcda3328a7f204ed5d004943a116320fb1cb601355457d3b7d0a6e350367c78e47f3d31e74730e0272806da1bd3524a SHA512 f745544934e666fdef0683768906b0332ec6d13c625477c9f2f0656dba19fd59691b428c685c80032506ae0d11acc1a214c1d114336c71e76f5f4b836ff89df7
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index ab357f8b267e..81c4f4b78a7a 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -16,13 +16,11 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0/1"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="libav test tools"
+IUSE="test tools"
 RESTRICT="!test? ( test )"
 
-# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
-RDEPEND="
-	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
+# note: use ffmpeg instead of fftw because it's recommended and required for tools
+RDEPEND=">=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
@@ -42,7 +40,7 @@ multilib_src_configure() {
 		-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
 		-DBUILD_TESTS=$(usex test ON OFF)
 		-DFFT_LIB=avfft
-		-DAUDIO_PROCESSOR_LIB=$(usex libav avresample swresample)
+		-DAUDIO_PROCESSOR_LIB="swresample"
 	)
 	cmake_src_configure
 }
diff --git a/media-libs/chromaprint/chromaprint-1.5.0.ebuild b/media-libs/chromaprint/chromaprint-1.5.0.ebuild
new file mode 100644
index 000000000000..443f5af521e7
--- /dev/null
+++ b/media-libs/chromaprint/chromaprint-1.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+GTEST_VERSION="1.10.0"
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
+HOMEPAGE="https://acoustid.org/chromaprint"
+SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/v$(ver_cut 1-2 ${GTEST_VERSION}).x.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test tools"
+RESTRICT="!test? ( test )"
+
+# note: use ffmpeg instead of fftw because it's recommended and required for tools
+RDEPEND=">=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+DOCS=( NEWS.txt README.md )
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+multilib_src_configure() {
+	export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/"
+	local mycmakeargs=(
+		-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DFFT_LIB=avfft
+		-DAUDIO_PROCESSOR_LIB="swresample"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	emake check
+}
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 8e6b9effdb09..3218617bba3e 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -14,7 +14,7 @@ EBUILD dav1d-0.3.0.ebuild 1147 BLAKE2B fbceacf787e296094352daa0382eba35447e6c09a
 EBUILD dav1d-0.3.1.ebuild 1161 BLAKE2B 102cd9d3e438f66ad960b9542650acf2f1171d47c9c321d16dec7a6ffee4662820ced2732087a50b2faf706e891e7c707f8c3f4d163442bddb94db45848faa05 SHA512 610cfdd81df7f852c5fcbe0691e0274a11e1fabd37d51eea85c875ae36905eb54991b8bcf930378b2c640f93e6c175543d8d68ab3ed4e866ddac8cd6331dd05a
 EBUILD dav1d-0.4.0.ebuild 1190 BLAKE2B 4fe099fcc58984942b8a82d7b63396a24e90848acabfcdc8765225afdf708345ddf56529daa4babfccf90b66b9c250b9190b083bc545ccd220b41048ced780c7 SHA512 01fa672b164a9a3ec00c9a591d1511ab182c2d21987af8317636c829890f0cce32633a12818bbd9be7940392ca23bb96fc9b00c3da3664bcb2dbf3a0b392fe87
 EBUILD dav1d-0.5.1.ebuild 1181 BLAKE2B 9ced3e650729cb29eba911bbbfb326170a227ce23a449dab56034d2c978808d591161fc016f298f4817c7d990f16670b84de47016286bfc5e7e7634978ac5897 SHA512 8667a407ba4b026c476933d144363d86862d8a764805b1715abf15e610ff7f62b3f5435629851a218fdf200a63efe91b8ca33284219da42897944dff127788cb
-EBUILD dav1d-0.5.2.ebuild 1179 BLAKE2B a95ef166c90c6b44056202add37d50acfd43bc001a8c3b3092a2e864a1928f69d2a64fdd2b35f69506e561348272a5556019c380b7277c68f8fce8e3f8bb4481 SHA512 cffe6a8a585026cbf3e1ea1e2a1ff1c0a2dd6c23a0e323154718b2bb65a0ab3107acc3bc872a98bd69e2cbacd43f73d61f1600d1341c5ccac89f3755b7e0bf8a
+EBUILD dav1d-0.5.2.ebuild 1175 BLAKE2B 8be48906d6eb61ba878631fda7fd52868d936b7a662237d15ef0e0607223bdefaded31334536d4bf7d06e57ae4d784e44b3e2c7c6484076faefe28303ecff521 SHA512 8e4d96a829b824eb3ab63d391e63aabaf1685ce65bedd1a28e6984bf6322f7a77054b8317450378bfbc0c97da142d2c1daa03d0c5b46120844519942000873f8
 EBUILD dav1d-0.6.0-r1.ebuild 1181 BLAKE2B 837ad26ff0cc9530b85c0e5eac541b626d61cfc38ab032bfaa5e851862dd8a963925e1260805a50c5beb7471aecb5545431cef060aa644256b30151ef103614d SHA512 a3b3862f75cd13dc89e7a5171c5f27cfe311a60ed9f81e9c4ad910de8aedf4aef8f6f8c13cdf53e36b15bc0a2b13590698ef1015dac1a5c13d226bca8b7d6235
 EBUILD dav1d-9999.ebuild 1181 BLAKE2B 0e249792fe05fd2d7c9734b25f88e9116eccd34cfe5c959822070f9f5a2653fed974be6c2ebf7e579ff6eabf0c013237b2076b9297a9acde53e203d90a5d2db4 SHA512 6ee1ec6338b474090ba936710359a7e1fc97d78b52f0e6f2dc76dc8e392cb3f9c0bc202098d702dfe636f776f36aa5cd6818a81403268bf49a7398fa95b95f65
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.5.2.ebuild b/media-libs/dav1d/dav1d-0.5.2.ebuild
index 7fdbb37902d1..62bf16413ec4 100644
--- a/media-libs/dav1d/dav1d-0.5.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.5.2.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index b45f205c630a..603527e70619 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,7 @@
-DIST Image-ExifTool-11.91.tar.gz 4723460 BLAKE2B 186d7f4df45fd67b42a7cc509873e234f8a29c7889daf10608405c2795db2cd7e8be16401d2894b5e0831ace7f96f2e676fdf2ed257e5a2534290cdc2a1ba706 SHA512 5d00ac834f44908346a8b8125064bbfeb1887d5024d04a346a9a679248a45ebaf76c067511a245b96553a3881d1d3b06845cc6a39fef7293b9ad13bc70ebd650
 DIST Image-ExifTool-11.93.tar.gz 4799548 BLAKE2B 29867c0407bed7568d92a4b8a0df1ea1377ad9ea54ea9496d09b5b76d946999db312247d6044c179cb064471f888c50c31bc85ddd44475a78a122eb413d73bba SHA512 e8d9dd34710e3346788e10a3b50e4d2a4ba1aeef1969efeec1ddcb7507378b313554e00587cda9c71a325f7d4d7238c91f743c67051d9cef8a012798551dcc59
 DIST Image-ExifTool-11.95.tar.gz 4802010 BLAKE2B c1486ed0c84d6837b9bcdbdee31af5c4c3038442cac8a516b6b7f079bdfb28858ddee18284fa3a88925cdea70a87c1cd444e35fa99ce1b201af03bf1c084d796 SHA512 9def56bde479312584c60ec847338aa55fb3697b6c0e8f894291f6cd67cd16440b563a3982bcec3d787860ba35046f73089f90065891f6f6d93d46243a08c485
-EBUILD exiftool-11.91.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0
-EBUILD exiftool-11.93.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
+DIST Image-ExifTool-11.98.tar.gz 4804406 BLAKE2B 86bf7fdcc9781fa22e379e3f04ec01b43451978ae33f1c811796ba820198ca417a9ca94b634a8c39acb01604bc8004f47c20e747e6b19f5b4833d29c5cee8fb1 SHA512 d992173a16679b0c3b9fcc466713d5c208e7b161c542535e88088f9695ec14f0ff76ae5fa46d0d6065a8ee366464d0602783170438e2f8fe02d21e458365bbb0
+EBUILD exiftool-11.93.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0
 EBUILD exiftool-11.95.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
+EBUILD exiftool-11.98.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.93.ebuild b/media-libs/exiftool/exiftool-11.93.ebuild
index 58ee12770a1c..556e4d04a9d2 100644
--- a/media-libs/exiftool/exiftool-11.93.ebuild
+++ b/media-libs/exiftool/exiftool-11.93.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://exiftool.org/"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.91.ebuild b/media-libs/exiftool/exiftool-11.98.ebuild
index 556e4d04a9d2..58ee12770a1c 100644
--- a/media-libs/exiftool/exiftool-11.91.ebuild
+++ b/media-libs/exiftool/exiftool-11.98.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://exiftool.org/"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 845120d936bf..30cca15b5062 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,4 +1,4 @@
 DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e SHA512 dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
-EBUILD ffmpegsource-2.23.ebuild 945 BLAKE2B cbc1ac694a3a14ab5134a6a73153a3bff01dc0354eaf718995315fb32f81f039282f1b996599624d3687979e18a679c4a2ef4cdd4ac2138b6625862acb95f640 SHA512 2f32888ff194773f92b42b699036117966654a2ca162b0d04801513d92ee7d5e8a77d4f89605b13bbc499f92a73b654d7b328177321287340c68ea90c9db2386
-EBUILD ffmpegsource-9999.ebuild 932 BLAKE2B 4bca6ecf18d660dadaccbf871fa72c33bcf131c5c767e9b349209aa083ae9cf58e7fda23a6f998193801f34406134a063fdc661988a0c3dac46a310d2d3b1ee5 SHA512 dd7bf03e0abc6be1a75b6c73ac2789a5e94670a350856eac04c78a8a7ded67974f4da32c6c8b685532fe4f0fb831437150d3ac83befcfc43c4b0ae2b2a19f94e
+EBUILD ffmpegsource-2.23.ebuild 883 BLAKE2B 42018ff0d2322a958cd94e99b463328171b78846d7467572d4ba3e82b3dda5dd9c100005c0f8c8de425db5fea5e30ba024a411f9b7fbcab7332874fb01e83201 SHA512 990eef3aa71ca54545cb2bb7ea92640e905c3f630a0b775dc21087691b6fc18f48e9b2b8db8854bac88fe62a8b9cf3f228c7e5424ef4ad7302fce0a4a3f2bf48
+EBUILD ffmpegsource-9999.ebuild 870 BLAKE2B 6ace3df13e77bc530cc237233c2d0723d322d6cd8e9baf263d979e96319083d73700a12598a23da1f8e17c8b592c4bd053a0e8cb749f1de96ebde6c958439451 SHA512 eaaaa9c5be69b5bdfeaabb3ff0c76b6c4c0212d183841c3214d1c98da257cd64b9c2215a9547d028862c25d1ea077bb270c42cbcc32b1a8d805762e4ffbd2b75
 MISC metadata.xml 308 BLAKE2B f8a202e4bf52b16aa495c09b7ab1341093f2bceccc0c5316b77897de97c6896720cdfebfe6078e6aa92f38624ad69070cc478c8c40cd55bb57494ddb7eb9b8a5 SHA512 7ba87927b0f446e7b47a677003380bdf9d75ada3dde1aa363f842efedc48bfaa833c5dad62ebb3a678acafd9dfb814f261beabcee6262f4b2fbbd65044951527
diff --git a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
index 49a76ea15427..09065b7eccb8 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
@@ -12,12 +12,10 @@ SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/4"
 KEYWORDS="amd64 x86"
-IUSE="libav"
 
 RDEPEND="
 	sys-libs/zlib
-	!libav? ( >=media-video/ffmpeg-2.4:0= )
-	libav? ( >=media-video/libav-9:0= )
+	>=media-video/ffmpeg-2.4:0=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-libs/ffmpegsource/ffmpegsource-9999.ebuild b/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
index 1117295b1479..24db4238a967 100644
--- a/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
@@ -12,12 +12,10 @@ EGIT_REPO_URI="https://github.com/FFMS/ffms2.git"
 LICENSE="MIT"
 SLOT="0/4"
 KEYWORDS=""
-IUSE="libav"
 
 RDEPEND="
 	sys-libs/zlib
-	!libav? ( >=media-video/ffmpeg-2.4:0= )
-	libav? ( >=media-video/libav-9:0= )
+	>=media-video/ffmpeg-2.4:0=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 888937951ab9..228bafd37898 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,17 +1,17 @@
 AUX freetype-2.4.11-sizeof-types.patch 1041 BLAKE2B dce55cf1b31d426bb5a59aee20681e1e15ec24ee4468627e3e4f19f3a8fcd2ea89402292db24efffae3a3a0293c929f5e06bac3c87e6762d380b74d68a7ef71a SHA512 0774b7b769d332cbd0e674fad545d1c2b816947188725a7528d749c6311b84bbdc7f8c1a1f2cc947c405f16e8a92e394d77094aad98a6468f154fdedacec0ecc
 AUX freetype-2.7-enable-valid.patch 533 BLAKE2B 64449eceea9c394ee4a0e2dfb1722c95950561003d3d5ae894b4a571614d8ac6b89a895f883e90ed7d4bdbd225d26bb4a09e49e2b93c4354b8acf1358bb1b067 SHA512 bb8caa36cbd941a24347c761e0110f21aad3f783aab7507de831cdde1d2e83032cbca58ccedac94ce2f5233921a63436fc799f0dd615f21009f7f309d15c6863
-DIST freetype-2.10.0.tar.bz2 2743740 BLAKE2B def3e6393a4a26cd063df1cdfa676677547a9f68a95b8f246c79a7ff88d3da842b214770cd60e359d42692d6c002ba4effab03905034aa67a841af4c5d7a7157 SHA512 dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e
 DIST freetype-2.10.1.tar.xz 2378784 BLAKE2B 7c177d3ca9ad923dc9534719529686c4242d87d85bfbc32fa8a12d0be87aceb4960ec84b84e433413312de17ac24a8ed2a9d092efa25a39108d28e2051ada574 SHA512 c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650
+DIST freetype-2.10.2.tar.xz 2404456 BLAKE2B 866bd83c460f83fba93f58d0ae2270ac3833d6eb0b087f7eb860bd6e08f40ece1982b70bbd065b8978e47ff6fb2b46398307d461170cd10285d11f74a9fbadaa SHA512 cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa
 DIST freetype-2.9.1.tar.bz2 1926385 BLAKE2B f165d638e0f49749a2640aabba96aca20441c76028cc18bb2482fd620a29dd368bc55ea020c1e74fa6effe9fed3c59a53c7fdf2dd6021f445032b7007201948e SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
-DIST freetype-doc-2.10.0.tar.bz2 2130601 BLAKE2B 7814b8ad53343dc72f0b11b29224f9755686e504d099c53b76faefd9b38d207222c092ea549b25c7842956f13067a09cce460d33cfff1aace537f0044df627ac SHA512 e0902983030b7b67443ca88f29a8bb72662de706ddff81309c66b6738b26c5d11dbd00eb75795851ddcd9f93ce05981623884afad096c0defd08bd544f5266d6
 DIST freetype-doc-2.10.1.tar.xz 2079092 BLAKE2B 7d2b8ccdfeba71f1dab57f31cfb96a21afbf628ad329f798e9ac25f6e57cc662db67040a9f7c63df2d43b1c0a169c37ca0cd82bfa2d95ef382b16066859dc5b3 SHA512 7260d0d6b1bd04f9940b456b20d8d8157fc528f5b6a5c2028fe57008bee3e8d0434bdf89589e2e521b04e3e2c43627155549091d3aaf06384b654f795458991e
+DIST freetype-doc-2.10.2.tar.xz 2078712 BLAKE2B 9d78d5d7c3806d83f5cb91daa88284445d36a75ce7b598177c83a9efc62faf5d8a0003f8cadee37eb6792711c87dc61d937fcb03f3c450c94276dfdf410c0aa1 SHA512 c54956a56920e651102b75c0efa07212e1d95f3bec219b8364b61d9a71171b11da492170cc861c36f3305f32ad1dee46d0d5a561ccdc6ca36591ae3f619a1d67
 DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
-DIST ft2demos-2.10.0.tar.bz2 237599 BLAKE2B 722e586f412059b8b29a26c832037a860dc1b26afed85b8b0aa5fc71245293f45d19b379c54993f64ba4b8de329799834656d00fc4b6f6610ddd0b08cfd05449 SHA512 d48cbabd5cc673e0af2e0c4056dba95cee8e08092f881958c6908ea2d4da7104ca81b701d47a17640ac36cbdfd8aa274cc26353bb43f026f55c00d565f2ad641
 DIST ft2demos-2.10.1.tar.xz 229228 BLAKE2B 015448f3f246fc7772b10f55037450866323e1b7410cf840fa15fa1da3e6a1c980167bfedbe197b6e6637a8e1dcef1f4fd83174e47f33f090d554fab2c40380c SHA512 f1c06fae3d5653d6d8f8d630e531d47b7be4429b122dc826c80791953e61df7374dfc151f90519fe110f78fcbf592d9dbd9e96c83200730a6f04e42760cc3142
+DIST ft2demos-2.10.2.tar.xz 230672 BLAKE2B dd81e72bb1360f6a952874c183598fffe3eddb4bed4d07715a75810d2e81623b94082b1274f916bf7550615a66ba7a327c5413fca9d470111aeb1fa31ce4dd73 SHA512 912e3c3cbcdfd30fd918897d28240e04eb7248d130fc519e7d1613873a11d275d658ff247c6d517ebecf7a09de0d05f3dc10631411226015e1b147cba9a8a438
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
-EBUILD freetype-2.10.0.ebuild 6721 BLAKE2B c64b739cfd8ff41910a2261bc94144e28de92d3681c8b0cd408d05bfc39843b3397517f05b44e72c6daa024a85fa1e4d12c2fbbf80a5ba29eeade344fbca4844 SHA512 498e09ef79dbf88a4c59c8f15a4cac1939568b4d777b42c91cd2edbb0f4cad9346332a8edae9eb86a43a08a70e814e286605e37b80e5c35b855c7dc351d0d1a4
 EBUILD freetype-2.10.1.ebuild 6715 BLAKE2B 5e0e09f3a6eae8a63429935c9439c399708bb29be75a7498fa13d7cc261de77fc8aac1c0282ecb6a096e5078305b72ff52fb3a257802235ba1a8be85ffc0c752 SHA512 c3ad5724caf8671c065daf247f1131c7497f92884db7fc0296fc6bafb86b713028e4882b9db6e89a53d6f318ac060cdccdb1a8e50e0d393ebd47cd3e5882fb2e
+EBUILD freetype-2.10.2-r1.ebuild 6792 BLAKE2B 2f652670cda49a8ef474dcc3b63c2711c0a49256214301013d53b82615215c7fa53897583df12a0585c4967b8a0fd06d17c93b455c945f6493c5447f4d69be04 SHA512 91f64c79e8065e228cd5b389f1276d499405e0e7486505eebc80ed4916da9ac1de426685ccbe331c4baa6c9223bedc7f84fe5ec520a287689b290d66032d4078
 EBUILD freetype-2.9.1-r3.ebuild 6659 BLAKE2B e60afd962ec321996c11b948912e3d809a9842fad9ffb9e126028eb93640a35a22b918cbd38a977828ace531721aa2e0d0946aae44a1d82ceca2c4c618751ad0 SHA512 70b9bf7943f2e095e1b4e226831d026c0c80fd48c425140927a568cdecb7cafccfc9c9ab68f904514a4542cb08ceff18a4c9ecc624bd5954e5780a6bf5315c53
 EBUILD freetype-2.9.1-r4.ebuild 6669 BLAKE2B dadd3c7643ee9da87dabfce17e5ea8ce9bc2b106385708031e2b2483f64c90620d6f35a0ccaf12174ed4ac33e23841d4a17c6a7db0c7d686e85eaa799156b896 SHA512 1fcece6d60327b7dec038b7e368b18941dfde5527caa41639f78140423be2250518098680137e7b28121e2e65f66ec98122da3724e8cd413a2c0a3f1c2a291bc
-EBUILD freetype-9999.ebuild 6715 BLAKE2B 5e0e09f3a6eae8a63429935c9439c399708bb29be75a7498fa13d7cc261de77fc8aac1c0282ecb6a096e5078305b72ff52fb3a257802235ba1a8be85ffc0c752 SHA512 c3ad5724caf8671c065daf247f1131c7497f92884db7fc0296fc6bafb86b713028e4882b9db6e89a53d6f318ac060cdccdb1a8e50e0d393ebd47cd3e5882fb2e
-MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
+EBUILD freetype-9999.ebuild 6792 BLAKE2B 2f652670cda49a8ef474dcc3b63c2711c0a49256214301013d53b82615215c7fa53897583df12a0585c4967b8a0fd06d17c93b455c945f6493c5447f4d69be04 SHA512 91f64c79e8065e228cd5b389f1276d499405e0e7486505eebc80ed4916da9ac1de426685ccbe331c4baa6c9223bedc7f84fe5ec520a287689b290d66032d4078
+MISC metadata.xml 1459 BLAKE2B 0299ed3326810e7b5dd4138e887b5b7f285a50d7a12b05d5650d552d840b498525801c9f7deef59fdaf71fd3b3ed3dbdd2d736a80a118ef741c54d6946797d0e SHA512 9c8be8c3c6f712a475c41eedde85c001c6429e0a4ffb7b9a177ac777ce934096bb710ee00fc1fa857055cc4ace9a98168cc0dc248e4e4379c4849634011197a8
diff --git a/media-libs/freetype/freetype-2.10.0.ebuild b/media-libs/freetype/freetype-2.10.2-r1.ebuild
index b7e3f1a48692..37247e155193 100644
--- a/media-libs/freetype/freetype-2.10.0.ebuild
+++ b/media-libs/freetype/freetype-2.10.2-r1.ebuild
@@ -7,15 +7,15 @@ inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
 
 if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
-		mirror://nongnu/freetype/${P/_/}.tar.bz2
-		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
-			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
-		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
-			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
+	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
+		mirror://nongnu/freetype/${P/_/}.tar.xz
+		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
+			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
+		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
+			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
@@ -28,6 +28,7 @@ RESTRICT="!bindist? ( bindist )" # bug 541408
 
 RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
@@ -168,6 +169,7 @@ multilib_src_configure() {
 		--disable-freetype-config
 		--enable-biarch-config
 		--enable-shared
+		$(use_with brotli)
 		$(use_with bzip2)
 		$(use_with harfbuzz)
 		$(use_with png)
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index d6f5e68744d3..37247e155193 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -28,6 +28,7 @@ RESTRICT="!bindist? ( bindist )" # bug 541408
 
 RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
@@ -168,6 +169,7 @@ multilib_src_configure() {
 		--disable-freetype-config
 		--enable-biarch-config
 		--enable-shared
+		$(use_with brotli)
 		$(use_with bzip2)
 		$(use_with harfbuzz)
 		$(use_with png)
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index 39066b8a1a07..8ee62c35ac89 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="adobe-cff">Use Adobe CFF as default font-renderer</flag>
+		<flag name="brotli">Enable brotli decompression support via <pkg>app-arch/brotli</pkg></flag>
 		<flag name="cleartype_hinting">New bytecode hinting mode for TrueType fonts that
 			activates subpixel hinting (a.k.a. ClearType hinting) by default</flag>
 		<flag name="bindist">Disable ClearType support (see http://freetype.org/patents.html)</flag>
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 5374c98e05a3..b7a9d9394b7d 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -3,8 +3,13 @@ AUX gd-2.2.5-CVE-2018-5711.patch 3225 BLAKE2B f3e22fa172bb6d07a7bc1da59e25efed81
 AUX gd-2.2.5-CVE-2019-6977.patch 1167 BLAKE2B 7ec6fbd6c7a4841915d968558e8f8c647b873ece655e884661af1afe5732df66520de7b0c096c0faac5af57764fd0a8c6e9e83af155d93c3db74636944ff15d7 SHA512 5214ac4148c618f3fef3bb3b6675e41a76e31465cd8dac326ee99dc1ae4cfe760749997d2941743efa48e79b8dbdb536d6b6d79d9bc4e5363f2c50da52ab5cac
 AUX gd-2.2.5-CVE-2019-6978.patch 7852 BLAKE2B 2d9ced220950994fe3977c0ddbb3bf234fbc0912515ee1eb7e6f98510aabd4163b33ac4f0ccd4336538b20c27dea4f625a3e56ec865fe4bce610f7382415db42 SHA512 2a890d8b0c923e59b3d1b054f92999a48d7fa7065f64fdecc7bf80f719e5e10150a34549059a8edf13fba45c76c68be3ca698f38be0411cb2b9978daa2db3899
 AUX gd-2.2.5-ossfuzz5700.patch 2680 BLAKE2B 55beecdf63e280ab54b83b214d704bccc83a6779b650b4b6f31b3d6989deadaa179d4e733f0b07a4ee8aac5be043879619924ed21c0b6ede300b804783aded31 SHA512 cfac2479729105a9ed0200191b9e9a47e3e1962d4d9b0f811bc94006a79e9ac08ddb6ed424f60e8626c44e7316f0c1747de49e26890d5b454c8206fa22a65530
+AUX gd-2.3.0-disable-flaky-tests.patch 792 BLAKE2B 81d4d56f0365e51fd1f406f3f27cd788a670bc091e13c8d39e8fb8234dd934896d6161940e010e2c0118000a36012bc2f878674a7409bcc19662686afaf99cb3 SHA512 285c542ca60f25597c29c040c95bd1885dbd3c29d3c1af52123646bc06abbd271bd37d4dedc1fc0bb218a84063814c8d8176a30c1da8a19445064469e26a5ea6
+AUX gd-2.3.0-fix-tests-bug722448.patch 2231 BLAKE2B 629caa9cd7dbd63cab93c97466921ee9131c5542618fdb5ce772a9b1bd3fcf2e64f93da999ca9011917cf8e726cae914c76529eca1a24cd2c31f55c4e75aaa7c SHA512 6d66af4e5d70e1e919f81bf0fd7261bd13216da4873927826d5c4925cf1673a9a3e98d588f693bab7505ee02e7a231c19687e27c1efc1a606bab3b3ab20a93dd
+AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244d0b858f520da1835547853d693f7c71621222744fe438f393aaaefa1fc6316ef27442a426af09df95c0faa2 SHA512 24d4774af36ca832504063c8327ff9a84956ae1a48cda3ef6f27d819e8a18b31a9083f2ce6d2587d5acb237d8c96c3d68cfe8eb8350a10715c15d16aca1cf37c
 DIST libgd-2.2.5-ossfuzz5700.dat 30 BLAKE2B 5ddd3d2be2adf05e1e2eb1852cc689be57d4d77c57b471e8b6021877f2fb137d15b4c73445fbb23a9ed585974a96dd154759a48712c1e7b5bdc5750d534aee4a SHA512 2394e92ff7a42c818e13a1ac9ad15bc81aa401adc917366ec8c440bb7f27a63777ab059aa03c501dafef0ac16b462dd23c7fb9f8086ce558203384a98a235fff
 DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855f410965a9e01e1f3f151ae52f072036172b184bd1a4d07b8355bb974bf088bebb0e812175a277bb67926274272bd80a0 SHA512 b3048640ce7828cca7901fadc989e867cfc6d31b44c0f5a1bda54d7428f317c8c8fc6403fef301e193869a95eb46eb7195d47710ec7f8c507ba049cb6cdcb281
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
+DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
 EBUILD gd-2.2.5-r2.ebuild 3143 BLAKE2B 7566cefe70ef129bafc17ed928b0e7c1ccb5b1b05d25b7c6016e08f62ea680ef96e9a9a7a48ed8e0e49b4d3e87e8dbf90810b1b992a4ce0f52bbb703cec9af86 SHA512 581529ce33b146df1711422a3b916d1af1c74e85669d274e8639acaa881f56404f0c4afd62886688d77439a2467c6c9045864413b50b47452742b26b3da1be24
+EBUILD gd-2.3.0.ebuild 2574 BLAKE2B c80be170ccd5e7a17ddb0e6c793833c05aa2703090b1b6e774284e04f1fc4caebdfdd49907d72bd0e8b458fb99ab22628042995894ad930a7a9920c169fda4c0 SHA512 4d5fbcb78a88d0942daa7320da23dd5aca7d0093883d8f1a5224b3d26aff037b346c19c0b1c3b69b41a04b435289b44e25f4db6516ca976de75073f95b142fb3
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/files/gd-2.3.0-disable-flaky-tests.patch b/media-libs/gd/files/gd-2.3.0-disable-flaky-tests.patch
new file mode 100644
index 000000000000..245b3aac4433
--- /dev/null
+++ b/media-libs/gd/files/gd-2.3.0-disable-flaky-tests.patch
@@ -0,0 +1,25 @@
+diff --git a/tests/gdimagecopyresampled/Makemodule.am b/tests/gdimagecopyresampled/Makemodule.am
+index d42eab5..3644213 100644
+--- a/tests/gdimagecopyresampled/Makemodule.am
++++ b/tests/gdimagecopyresampled/Makemodule.am
+@@ -4,8 +4,7 @@ libgd_test_programs += \
+ if HAVE_LIBPNG
+ libgd_test_programs += \
+ 	gdimagecopyresampled/basic \
+-	gdimagecopyresampled/basic_alpha \
+-	gdimagecopyresampled/bug00201
++	gdimagecopyresampled/basic_alpha
+ endif
+ 
+ EXTRA_DIST += \
+diff --git a/tests/gdimagegrayscale/Makemodule.am b/tests/gdimagegrayscale/Makemodule.am
+index c6fec00..2d81a4a 100644
+--- a/tests/gdimagegrayscale/Makemodule.am
++++ b/tests/gdimagegrayscale/Makemodule.am
+@@ -1,6 +1,5 @@
+ if HAVE_LIBPNG
+ libgd_test_programs += \
+-	gdimagegrayscale/basic \
+ 	gdimagegrayscale/bug00386
+ endif
+ 
diff --git a/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch b/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch
new file mode 100644
index 000000000000..eef62fca676b
--- /dev/null
+++ b/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch
@@ -0,0 +1,62 @@
+From ec0b4397698bd358557d33641aac4beb1912f43b Mon Sep 17 00:00:00 2001
+From: wilson chen <willson.chenwx@gmail.com>
+Date: Wed, 15 Apr 2020 00:25:01 +0800
+Subject: [PATCH] Improve test cases for gdImageString16 and gdImageStringUp16
+ (#625)
+
+Fixed #623. wchar_t is 32 bits on 64-bits AIX, which will result in test case failure.
+So we replace wchar_t with unsigned short array.
+---
+ tests/gdimagestring16/gdimagestring16.c     | 6 ++----
+ tests/gdimagestringup16/gdimagestringup16.c | 6 ++----
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/tests/gdimagestring16/gdimagestring16.c b/tests/gdimagestring16/gdimagestring16.c
+index 57eae978..0ca06680 100644
+--- a/tests/gdimagestring16/gdimagestring16.c
++++ b/tests/gdimagestring16/gdimagestring16.c
+@@ -9,9 +9,7 @@ int main()
+ {
+ 	/* Declare the image */
+ 	gdImagePtr im = NULL;
+-	wchar_t *wchr = L"H";
+-	unsigned short *sptr;
+-	sptr = (unsigned short *)wchr;
++	unsigned short s[2] = {'H', 0};
+ 	int foreground;
+ 	int errorcode = 0;
+ 	gdFontPtr fontptr = gdFontGetLarge();
+@@ -20,7 +18,7 @@ int main()
+ 	gdImageColorAllocate(im, 255, 255, 255);
+ 	foreground = gdImageColorAllocate(im, 22, 4, 238);
+ 
+-	gdImageString16(im, fontptr, 2, 2, sptr, foreground);
++	gdImageString16(im, fontptr, 2, 2, s, foreground);
+ 
+ 	if (!gdAssertImageEqualsToFile("gdimagestring16/gdimagestring16_exp.png", im))
+ 		errorcode = 1;
+diff --git a/tests/gdimagestringup16/gdimagestringup16.c b/tests/gdimagestringup16/gdimagestringup16.c
+index c843abec..c24639fd 100644
+--- a/tests/gdimagestringup16/gdimagestringup16.c
++++ b/tests/gdimagestringup16/gdimagestringup16.c
+@@ -9,9 +9,7 @@ int main()
+ {
+ 	/* Declare the image */
+ 	gdImagePtr im = NULL;
+-	wchar_t *wchr = L"H";
+-	unsigned short *sptr;
+-	sptr = (unsigned short *)wchr;
++	unsigned short s[2] = {'H', 0};
+ 	int foreground;
+ 	int errorcode = 0;
+ 	gdFontPtr fontptr = gdFontGetLarge();
+@@ -20,7 +18,7 @@ int main()
+ 	gdImageColorAllocate(im, 255, 255, 255);
+ 	foreground = gdImageColorAllocate(im, 22, 4, 238);
+ 
+-	gdImageStringUp16(im, fontptr, 2, 18, sptr, foreground);
++	gdImageStringUp16(im, fontptr, 2, 18, s, foreground);
+ 
+ 	if (!gdAssertImageEqualsToFile("gdimagestringup16/gdimagestringup16_exp.png", im))
+ 		errorcode = 1;
+
diff --git a/media-libs/gd/files/gd-2.3.0-getlib.patch b/media-libs/gd/files/gd-2.3.0-getlib.patch
new file mode 100644
index 000000000000..91884e93292d
--- /dev/null
+++ b/media-libs/gd/files/gd-2.3.0-getlib.patch
@@ -0,0 +1,81 @@
+From 635dd9a3065ed88e1741e6b963044b80e913f96a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 24 Mar 2020 08:01:01 +0100
+Subject: [PATCH] distribute getlib.sh
+
+---
+ config/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/Makefile.am b/config/Makefile.am
+index 122287ee..6416dda4 100644
+--- a/config/Makefile.am
++++ b/config/Makefile.am
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+-EXTRA_DIST = gdlib.pc.cmake gdlib.pc.in getver.pl
++EXTRA_DIST = gdlib.pc.cmake gdlib.pc.in getlib.sh getver.pl
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = gdlib.pc
+
+diff -ruN a/config/getlib.sh b/config/getlib.sh
+--- a/config/getlib.sh	1970-01-01 00:00:00.000000000 -0000
++++ b/config/getlib.sh	2020-05-05 17:37:31.638896089 -0000
+@@ -0,0 +1,43 @@
++#!/bin/sh
++
++GETVER="${0%/*}/getver.pl"
++GDLIB_MAJOR=$("${GETVER}" MAJOR)
++GDLIB_MINOR=$("${GETVER}" MINOR)
++GDLIB_REVISION=$("${GETVER}" RELEASE)
++
++# Dynamic library version information
++# See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
++
++GDLIB_LT_CURRENT=3
++# This is the version where the soname (current above) changes.  We use it
++# to reset the revision base back to zero.  It's a bit of a pain, but some
++# systems restrict the revision range below to [0..255] (like OS X).
++GDLIB_PREV_MAJOR=2
++GDLIB_PREV_MINOR=2
++# This isn't 100% correct, but it tends to be a close enough approximation
++# for how we manage the codebase.  It's rare to do a release that doesn't
++# modify the library since this project is centered around the library.
++GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION ))
++GDLIB_LT_AGE=0
++
++# The first three fields we feed into libtool and the OS target determines how
++# they get used.  The last two fields we feed into cmake.  We use the same rules
++# as Linux SONAME versioning in libtool, but cmake should handle it for us.
++case $1 in
++CURRENT)
++	printf '%s' "${GDLIB_LT_CURRENT}"
++	;;
++REVISION)
++	printf '%s' "${GDLIB_LT_REVISION}"
++	;;
++AGE)
++	printf '%s' "${GDLIB_LT_AGE}"
++	;;
++VERSION)
++	printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE )).${GDLIB_LT_AGE}.${GDLIB_LT_REVISION}"
++	;;
++SONAME)
++	printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))"
++	;;
++esac
++
+diff --git a/configure.ac b/configure.ac
+index 8996053..86d0bc9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@ AC_CANONICAL_HOST
+ 
+ dnl Keep the libtool version details in an external script so cmake can
+ dnl access the values too.
+-define([lt_gv], [config/getlib.sh ]$1)
++define([lt_gv], [${SHELL} config/getlib.sh ]$1)
+ m4_define([gd_LT_CURRENT], esyscmd(lt_gv(CURRENT)))
+ m4_define([gd_LT_REVISION], esyscmd(lt_gv(REVISION)))
+ m4_define([gd_LT_AGE], esyscmd(lt_gv(AGE)))
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
new file mode 100644
index 000000000000..c4adf18cf67e
--- /dev/null
+++ b/media-libs/gd/gd-2.3.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="Graphics library for fast image creation"
+HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
+SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
+
+LICENSE="gd IJG HPND BSD"
+SLOT="2/3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
+RESTRICT="!test? ( test )"
+
+# fontconfig has prefixed font paths, details see bug #518970
+REQUIRED_USE="prefix? ( fontconfig )"
+
+RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+S="${WORKDIR}/lib${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"
+	"${FILESDIR}/${PN}-2.3.0-getlib.patch"
+	"${FILESDIR}/${P}-fix-tests-bug722448.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
+	if use cpu_flags_x86_sse ; then
+		append-cflags -msse -mfpmath=sse
+	else
+		append-cflags -ffloat-store
+	fi
+
+	# bug 632076, https://github.com/libgd/libgd/issues/278
+	if use arm64 || use ppc64 || use s390 ; then
+		append-cflags -ffp-contract=off
+	fi
+
+	# we aren't actually {en,dis}abling X here ... the configure
+	# script uses it just to add explicit -I/-L paths which we
+	# don't care about on Gentoo systems.
+	local myeconfargs=(
+		--disable-werror
+		--without-x
+		--without-liq
+		$(use_enable static-libs static)
+		$(use_with fontconfig)
+		$(use_with png)
+		$(use_with tiff)
+		$(use_with truetype freetype)
+		$(use_with jpeg)
+		$(use_with webp)
+		$(use_with xpm)
+		$(use_with zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc README.md
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 5d8ad11b47c4..cefec69cb8b9 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -19,13 +19,11 @@ DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e529
 DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
 DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
 DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
-DIST gegl-0.4.20.tar.xz 4826340 BLAKE2B 0d1087ea983d7fbeb7ea1edb572bea97e9b4e01aaabd5225ba07ab5cee3b369f42fe39691209f38d4d2a87d56997d9756449cafdb6288eb0864b49fb13a6a8ef SHA512 140ac1543aa24a23aa685dbd7335f21bcbf3d95c41c1451b2383f6d278842bd9f0c8c980ed27c70c67b2fefe9ba01f2d4bd4b77a1cee38ec1332c12ab3fd718d
 DIST gegl-0.4.22.tar.xz 4826748 BLAKE2B 3b6ddca1dff17d0336614fb02cdf94c7497586f075fa548fef66f9f81f62a8055c58e008b9eed989dd283fa701a07d4e22ee81b85c35a0a55f4a92e51cf6b780 SHA512 3118fb17532bcd5893a77739eaf936f5d1e2020178abc497098d227c25f726679621503ac83e7d14a9883d259247d97b92016174e76a2e6e950be7e26ce251ab
-EBUILD gegl-0.2.0-r6.ebuild 4933 BLAKE2B e903f3ccc6a6ce880125da1ba8169073907b8df184e22ad973af7c59100fd8c4008842af98c97b40f67e1a6989a240565926dc7bc16bd04965de5037b90ed5f5 SHA512 27973726c5eeae364a16d36cd50c5bb4e41975837de6be11f4c90d8084526f0d68d5db29e908befb617b895668fe13b62b6a5af7c80d2762fc1e74c04b439d50
-EBUILD gegl-0.3.34.ebuild 5298 BLAKE2B 704e6d61cadfd3c445d1238690efca0cdabe4ab77d683a8e72b98748567a397e3580cd213da09d603a0f036e60f03771762e911582f95161a922c85234074706 SHA512 cb0b6f3bf173291ee5e0a5aeeadd6b93f6dc6af8245816b6825658ecfdec9d5fd6e65c34b3dca11b19841f336523de35facf51bf005aa6519bdce19af77c8728
-EBUILD gegl-0.4.16.ebuild 4840 BLAKE2B ce62dc04961971073988378d37254886ab44293a313c45887307350d61469d852d3507e06a60b420d1eb68bb4b1aa44b5716ee7ef3dcd5f2de9805e61d35117c SHA512 f839903d2755a30a1b5a80dfd1d0f2e71044aa9622e03ef6dc0ac58ac8aea2b5e57e44d2055e427056203e05d2f160538e85ef66a6841a01385fbdf89c7b0f7b
-EBUILD gegl-0.4.18.ebuild 4870 BLAKE2B c1d0973a20cfc6d8b81a9ea58d8b2be4f2c0139112668fa0d8b7c2505fb4186c51111c0b26b0a1e1dbcf1ae219bcc8d849cc6b91679cf5d7ef0f127b4addc7ea SHA512 2326deb656b9231204ecdeb390ab2b145f7960a4005a5a14785a74671a42b3cd9baa49033691396df9ecb403e890c29ca983ed1b38083bf1086607a27a1d5f35
-EBUILD gegl-0.4.20.ebuild 4850 BLAKE2B ba59ffe459cd9db45e65c7eedbe7439314a91fb5937bb02870ba3ebbab7cac3e1429ce3a3eb1996b2186ce4ac483f64be6b30ec009c01485f9594465173a406a SHA512 aa3f7336bd03666f93dc918aebdb4cce47c2de50220c538a8b537cbfb0ad538ecc87119d3624c7a5a882c6d60e1f89f7db91396c2e2915c0178b778f384f8548
-EBUILD gegl-0.4.22.ebuild 4832 BLAKE2B be321671c4af360cd03364469ccd4b0748c1d02ec0a0e1fbc5ecf2ed3e0d0a98d04b1a1290968b49020f8dba12812009161c91ddd0f9e5ff2056945dea9b0348 SHA512 cda09f80ec7aea0c64412ddabece7a05a30cda33b5de0ff68660bf9dbf0524c363c80f62cfc6ed0124f0092d85d6d30517f1cefb649f0ec4a2fe88a1ade81d9c
-EBUILD gegl-9999.ebuild 4458 BLAKE2B 7890bbb3aebc18f9aebba3798a74036ad80542cb92d7d7fda34df393528294e3a8ebffbc84f84e7a61855af67de6a0c26abcb79646a8954bc5c6e2bdcca71acb SHA512 42171b8a3240c149c5f4971873b22ea8f74f4c69bee804769cd3c4f172a8b19416fe4b43c9209184e05926ef90e25abb2baad30572047c8aeca7d2c3d48930be
+EBUILD gegl-0.2.0-r6.ebuild 4873 BLAKE2B 5bc1189a195da303ebbb13e7e211743cdd711561c399513139dbc098287e9333698fc106cfe2ed1959874e0a740f4a8b25f23134d5962aa6f3aa55bd87276239 SHA512 4c677caf2159ae4300244a84f05e28836c32327ad85abbb812435987756cd704f95557bb779f0a7510edf8263f3422004791ada25b6b9cf5ccc61d77d2e774a8
+EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B a6fc62fd62139fa40fadb7e14ff1160c408e21a5b9e383fa79ddf4232452856c7235e2b74cc5a330ed38f4910b9223225ffaf8efc59f54fdc73c38036a66ac06 SHA512 58fc9363a644ce358c29217783c1beb0b2291605af9f507adcc34f8cff15a582087e03817398dc9c4d442e624a98035c46a27b9d7a440c97f6125286bb36128b
+EBUILD gegl-0.4.16.ebuild 4785 BLAKE2B a5a4eee532e7454cd5c154d2067a339a268d6cb5f2bcf58b602f853ba50f7e64beeeb8dfcb9145b888806e651778dd20c4419bd8885176dde8cbbd000978c38f SHA512 c351367b7445dc6bb360bea700638e1a23026abe8fd4707612325b2ac7096155b10941d8947976eefb76367f0b6b1695c209fb9f188736a4ec4eb3dfd63ae54a
+EBUILD gegl-0.4.18.ebuild 4815 BLAKE2B 071fdd84d129cbe18bb3c01a613d8286aaf5d464ce46e04b39b13368bd9eceba2400ece71a6b2becaece62e7933ea3737f1db58abde220ac6b3addf2d79e3057 SHA512 fe41c1f229eb5c34b0413bce192bd5ca03f2f94fad1a99928fad2e603b5bcbe0e9996b966a05a2f200b2eb2a1f2a29246086993276b8a1d29af471847e06eb51
+EBUILD gegl-0.4.22.ebuild 4775 BLAKE2B 25962f26ff1f60793abcba81873081b6cacc44f2ca4346ce1191428177f1158959d51569f48095fac3d4a373197898ca2f3581a354be58e0748cbcc22032fad7 SHA512 447fefb927f80775160f64d7b814e88c283835d530f99f50387b3f738e1db3b28fa5bf6dee3036bf3f7cb0f9a624e706898b16c9d34ba1378a13128b2a8185f0
+EBUILD gegl-9999.ebuild 4403 BLAKE2B dee34aa59338d92ca82042cb2ac1e2bb1d0f0297387c3aeb553f6d4ff6f64b9bca320c4d48f45e4126b484801337b9391caf18fa77ab090fd28145d5360ec265 SHA512 04bfd2589e01b4ada8e57a0878e3f3a2ef8f0b6c4716b3232f8cf07aa592e70a0049d1518e40c344fcc52466d58270f73530c3079a1151b027156688cacaf838
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index c59288c426bc..5f3add9b4af4 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -18,7 +18,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+IUSE="cairo debug ffmpeg jpeg lensfun cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
 RDEPEND="
 	>=media-libs/babl-0.1.10
@@ -27,10 +27,7 @@ RDEPEND="
 	x11-libs/pango
 	sys-libs/zlib
 	cairo? ( x11-libs/cairo )
-	ffmpeg? (
-		libav? ( >=media-video/libav-12:0= )
-		!libav? ( >=media-video/ffmpeg-4:0= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-4:0= )
 	jpeg? ( virtual/jpeg:0 )
 	openexr? ( media-libs/openexr )
 	png? ( media-libs/libpng:0= )
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index bae946700d0f..af4e531eaabf 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -43,9 +43,7 @@ RDEPEND="
 	x11-libs/pango
 
 	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		>=media-video/ffmpeg-2.8:0=
-	)
+	ffmpeg? ( >=media-video/ffmpeg-2.8:0= )
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 	virtual/jpeg:0=
 	lcms? ( >=media-libs/lcms-2.8:2 )
diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index 66714d0cbf37..e690845d68b8 100644
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	svg? ( cairo )
@@ -43,10 +43,7 @@ RDEPEND="
 	>=x11-libs/gdk-pixbuf-2.32:2
 	x11-libs/pango
 	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index 83da45ee280d..6d4f3f52d4ca 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
 	svg? ( cairo )
 	test? ( introspection )
@@ -47,10 +47,7 @@ RDEPEND="
 	>=x11-libs/gdk-pixbuf-2.32:2
 	>=x11-libs/pango-1.38.0
 	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
diff --git a/media-libs/gegl/gegl-0.4.20.ebuild b/media-libs/gegl/gegl-0.4.20.ebuild
deleted file mode 100644
index 82324d1dfd26..000000000000
--- a/media-libs/gegl/gegl-0.4.20.ebuild
+++ /dev/null
@@ -1,163 +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} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	test? ( introspection )
-	vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.74[introspection?]
-	media-libs/libnsgif
-	>=media-libs/libpng-1.6.0:0=
-	>=sys-libs/zlib-1.2.0
-	virtual/jpeg:0=
-	>=x11-libs/gdk-pixbuf-2.32:2
-	>=x11-libs/pango-1.38.0
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	pdf? ( >=app-text/poppler-0.71.0[cairo] )
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
-	vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
-	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
-	"${FILESDIR}"/${PN}-0.4.18-cltostring_force_utf8.patch
-)
-
-python_check_deps() {
-	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/meson.build || die
-
-	# fix skipping mipmap tests due to executable not found
-	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
-		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
-		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
-	done
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		#  - Disable documentation as the generating is bit automagic
-		#    if anyone wants to work on it just create bug with patch
-		-Ddocs=false
-		-Dexiv2=disabled
-		-Dgdk-pixbuf=enabled
-		-Dgexiv2=disabled
-		#  - There are two checks for dot, one controllable by --with(out)-graphviz
-		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-		-Dgraphviz=disabled
-		-Djasper=disabled
-		-Dlibjpeg=enabled
-		-Dlibpng=enabled
-		#  - libspiro: not in portage main tree
-		-Dlibspiro=disabled
-		-Dlua=disabled
-		-Dmrg=disabled
-		-Dpango=enabled
-		-Dsdl2=disabled
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_feature cairo)
-		$(meson_feature cairo pangocairo)
-		$(meson_feature ffmpeg libav)
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature openexr)
-		$(meson_feature raw libraw)
-		$(meson_feature sdl sdl1)
-		$(meson_feature svg librsvg)
-		$(meson_feature test pygobject)
-		$(meson_feature tiff libtiff)
-		$(meson_feature umfpack)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
-		$(meson_feature vala vapigen)
-		$(meson_feature webp)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/gegl/gegl-0.4.22.ebuild b/media-libs/gegl/gegl-0.4.22.ebuild
index f72e89f41325..b831adcb4064 100644
--- a/media-libs/gegl/gegl-0.4.22.ebuild
+++ b/media-libs/gegl/gegl-0.4.22.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
 	svg? ( cairo )
 	test? ( introspection )
@@ -47,10 +47,7 @@ RDEPEND="
 	>=x11-libs/gdk-pixbuf-2.32:2
 	>=x11-libs/pango-1.38.0
 	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 8207ef8087cd..e48fb86ed8f7 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
 	svg? ( cairo )
 	test? ( introspection )
@@ -47,10 +47,7 @@ RDEPEND="
 	>=x11-libs/gdk-pixbuf-2.32:2
 	>=x11-libs/pango-1.38.0
 	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index fa6ec9b1bdf3..81895e81ad16 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -3,7 +3,7 @@ AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b
 DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
 DIST gexiv2-0.12.0.tar.xz 370816 BLAKE2B 7768cffafedf41948ca6ddd22614f0eb3b44a317a23ade3c8d39d5ec5ff77c0d8c61dd8dcca5108b3403e0e3ec8be6659c16445de27163e8689c6c40f5313566 SHA512 c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9
 EBUILD gexiv2-0.10.10-r1.ebuild 1847 BLAKE2B 6df34b756c2676082fafd030e77a4f3e3616233d6de1e31b1fe6b4ac486d4a9d681e1203da8bb758619b5d52a33107e6b6d9148afc42d46cac612fcc97c3ebad SHA512 e984aee5f691d012ae3324cda44b59b56b756d871d5af79b0e7915c5aef7e98c9ce702c7afcc3276ac732771656372b440ffe04f6c18fe7f553e19af9e3521b3
-EBUILD gexiv2-0.12.0-r1.ebuild 1791 BLAKE2B 695696302c294c47b0b21108ccd46cee932f1b9a27c7972763655f2e35961f0b6644fc60ff15c498a3ae4e0bb095ba93464e25f8aa691e8dbbd1b849e40b51ce SHA512 5fbef4c900ab708e9aafb9b21aeb99c10b28c79d68dbfa5a11f7bef359aa56638b68188dae238cd197b1a04c077c9e719ddbdd52bf9a4594e371c27e6aa30b75
+EBUILD gexiv2-0.12.0-r1.ebuild 1786 BLAKE2B 5238825cfd390b528e54d248eac9e3f2d391c0c5311825fce1a593eb3a6aad96d130f299031ca5849be1e648be5194e4991a8b221f1d598807f4b651e0698c78 SHA512 c88c04f9107527b4971d3ebb48a8ebfc46bdb38e400b3dbd4b9dbda580c3e70f9ef7e881dce8ca77e2b6afe7e61a68d7b31e196d465d283815d978fba12765ce
 EBUILD gexiv2-0.12.0.ebuild 1630 BLAKE2B a5b80844189a30261272c1687ea8dd77fba10a0601d42883839b5798735bf901afe677e33542c83d3a1a6cd472e2891e0c6f79eab96f383ef5a353c54491faab SHA512 2f6f9ac560721c464ecc85f83f2379f58ce1a1d34eafa6465d2d622b61a7916e9ed486572ad0bd63b74430163bbf20cc79389211eb80b3ab1743d007f58820f6
 EBUILD gexiv2-9999.ebuild 1630 BLAKE2B a5b80844189a30261272c1687ea8dd77fba10a0601d42883839b5798735bf901afe677e33542c83d3a1a6cd472e2891e0c6f79eab96f383ef5a353c54491faab SHA512 2f6f9ac560721c464ecc85f83f2379f58ce1a1d34eafa6465d2d622b61a7916e9ed486572ad0bd63b74430163bbf20cc79389211eb80b3ab1743d007f58820f6
 MISC metadata.xml 513 BLAKE2B 7820281c36922b5e68aacb3c3935f7193e2725515f196eaf72f6eba42327a8c8d10ceaed6422fb95cf15b0f1a0d96a168c7a677e42ae847fe050b26c39c39a0b SHA512 deb951010c3342738d8ad5b9e79baa790913f3b906799f9f72f59d4e978f0564fc52f14482bb632ffe817488d154bd8bafe98bc5eea07b7c2da1504867d671b0
diff --git a/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild b/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild
index 62ad07941f48..d6b5842d05a2 100644
--- a/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="LGPL-2.1+ GPL-2"
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index 26121312e70d..c028f3991646 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -3,7 +3,9 @@ AUX glew-2.1.0-mesa-compat.patch 560 BLAKE2B 385adc6854a8b6cece3c1c5fa5452c7cdb5
 DIST glew-1.10.0.tgz 567605 BLAKE2B 18e2b3a4d60b69def1e68778554b43b85c69914daa20b8a64adb2e807df391a2eaff9c6cb2a3c46e5bbbf004655561ae4d2cd8a2fb883a2754f23564993a61b2 SHA512 0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca
 DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa65be866dd7d63ef19ad88b389dd13c2ccf9bafd175d00d18ae94185f890a3d12d61b2445f7fa9d6ba58 SHA512 5b8ca9e97d01d49fde591b0c55683620e0a6ddfaf5e93e03536e6217bbb548adfcd4e945a39ed3cfddac3f239b3272be1b3491f4071689d02c4bfb7e0ec44904
 DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
+DIST glew-2.2.0.tgz 835861 BLAKE2B f403f3ebd5a78d21cf5744e8e6714a0558c7cda57930751afeced966a54bc9634c070eee4d791f5948bfc60b5c03ca5f488559c6372c0953c0ffe1711a3913f3 SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1
 EBUILD glew-1.10.0-r100.ebuild 1919 BLAKE2B 849a2bbe51e9c5a72fab2e21450ae0a2a0feedd688052d9a4782f5faca846d7edafd4102b1d96e8d0f33cce59b21aa64e67bc4fd37da574079161a5df546a9c4 SHA512 7ae0a493de5d57190aca2266f204de6e1014447090f1d21d039a441175d5991886eeaa4b77cc4146a3eaadd15bd2e9a25c378afa15cea52ce7e0e66087aec0fa
 EBUILD glew-1.6.0-r100.ebuild 1892 BLAKE2B 1919a435320a83c0b117831c4267390fa221dda016618ece17da909b2544fdbfffcd0c832fd52b88f5955a4c717c9782489e6843be4d9ec126c23e0f06b286bf SHA512 2e0267dadae76d0c59903f87d12886b4236c1d327266c5541931c75437986d565724f8e88a28df9a516b12d637b42b66ee64aef1b195fed2e1cf3ba161b17db5
 EBUILD glew-2.1.0-r1.ebuild 2496 BLAKE2B 18ea433d149081a8402030e392a215036f987357a15c7695d145516893db718e0bc89c85d25c2f1bc06c1e8ce96d0ecfe029a5bf789b079dd6ddeca6b4c38f69 SHA512 f0922f41700f98819002a5de1846650c69a5337f47a0da2c84ef7d1c7c4793b71124ece9be66e99d011eb80c89b84240b6f39e7a37b61036e54a6ae48d1ace5c
+EBUILD glew-2.2.0.ebuild 2464 BLAKE2B 5958f94db509649dade0f881d30d7017f3c9406f91e9f34b1d1c89b6d804035bc570f58a428f8b1f256156955326f3439293ae9814c543e043dfe70eb8014a2c SHA512 8a2bb89e861fbbacbccec477c20a50e0c6ba7567af1b6b91eafb69f49ccf560821b85b88c0cfbaca8956192e94c1b9d13a6c80a7c106a177bed6068c48a8f10e
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-2.2.0.ebuild b/media-libs/glew/glew-2.2.0.ebuild
new file mode 100644
index 000000000000..bec447dbda58
--- /dev/null
+++ b/media-libs/glew/glew-2.2.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="The OpenGL Extension Wrangler Library"
+HOMEPAGE="http://glew.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+DEPEND="
+	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-2.0.0-install-headers.patch
+	)
+
+	sed -i \
+		-e '/INSTALL/s:-s::' \
+		-e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
+		-e '/^.PHONY: .*\.pc$/d' \
+		Makefile || die
+
+	if ! use static-libs ; then
+		sed -i \
+			-e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
+			-e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
+			-e '/INSTALL.*LIB.STATIC/d' \
+			Makefile || die
+	fi
+
+	# don't do stupid Solaris specific stuff that won't work in Prefix
+	cp config/Makefile.linux config/Makefile.solaris || die
+	# and let freebsd be built as on linux too
+	cp config/Makefile.linux config/Makefile.freebsd || die
+
+	default
+	multilib_copy_sources
+}
+
+glew_system() {
+	# Set the SYSTEM variable instead of probing. #523444 #595280
+	case ${CHOST} in
+	*linux*)          echo "linux" ;;
+	*-freebsd*)       echo "freebsd" ;;
+	*-darwin*)        echo "darwin" ;;
+	*-solaris*)       echo "solaris" ;;
+	mingw*|*-mingw*)  echo "mingw" ;;
+	*) die "Unknown system ${CHOST}" ;;
+	esac
+}
+
+set_opts() {
+	myglewopts=(
+		AR="$(tc-getAR)"
+		STRIP=true
+		CC="$(tc-getCC)"
+		LD="$(tc-getCC) ${LDFLAGS}"
+		SYSTEM="$(glew_system)"
+		M_ARCH=""
+		LDFLAGS.EXTRA=""
+		POPT="${CFLAGS}"
+	)
+}
+
+multilib_src_compile() {
+	set_opts
+	emake \
+		GLEW_PREFIX="${EPREFIX}/usr" \
+		GLEW_DEST="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		"${myglewopts[@]}"
+}
+
+multilib_src_install() {
+	set_opts
+	emake \
+		GLEW_DEST="${ED}/usr" \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+		"${myglewopts[@]}" \
+		install.all
+
+	dodoc README.md
+	if use doc; then
+		docinto html
+		dodoc -r doc
+	fi
+}
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 8b6cf0416186..e81e31ba5bde 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,6 +1,8 @@
 DIST intel-gmmlib-19.3.4.tar.gz 706943 BLAKE2B 12eef2d0bed76e94770295461935b4056f40dab97bb24acf8e700d2b83198bb8a2800ab9155aebba5138a3269d4aefe645390524d34e57706de750f8e967d106 SHA512 77c7cf1cd3e7f0c2476badca6ae7a36504afb4af5f2c2282e790744a9b8ef668f24c4db8be171eef02394966021b5647921c0faf710e26689cebbd879b786a9d
 DIST intel-gmmlib-19.4.1.tar.gz 707375 BLAKE2B 0627889bebf763a8225c691e7ec6a2b3c1f403f62e5d11b557e3578e02b6cc3fe032e8b0d79483f34e9310bcfcd7667c407b1c4e549a2bb414247468b020f796 SHA512 264f111348bbaccd6c14c31ab15c7b02e63def56b0d3effa01067fb5e696d6d3e2ad3d5a9cc3a36f33b835dda12ec3916a31d3a812443de9d5dd815e2e4cde53
+DIST intel-gmmlib-20.1.1.tar.gz 707814 BLAKE2B 49983345d0187114de6622522a1342f978f67347f210a0f5a67c847089268e9f6730f76f365c2e15160c538231f057be68ca3b1dd1c4c5deb0693ab7c94f54f7 SHA512 e16472f24c5d1fb9f56c45ce1aefe6b1799a2c968aab09808115eeb9deda9a7610da989ae2fdc1796d94d05ca09a19ab2e74be62b4192eeee70ead404561a03f
 EBUILD gmmlib-19.3.4.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28
 EBUILD gmmlib-19.4.1.ebuild 832 BLAKE2B ad5129164827dfb589cb81f84f772067ddb1bb3eff42d484ee35265e740f4a68a37c48d8ac9888b4dc5e18fa27ccff9a23a9a9de363e829e0570790ec88d4f15 SHA512 fa254f63c00d6db9cdf6f11dabf2dcad1a1be563d94caaaf3890d610a427d2f014a0103d71d5b8244450d97766ba0741865c278fcb89eed7d7a0055fcc8a6f89
+EBUILD gmmlib-20.1.1.ebuild 815 BLAKE2B 5bd051fa42312dfe39b81a42a8bbaff61beccb1472fe2547beb080ff5017962631fa803791a39244076bda5eebf7909ca1a97257c3a9b97f9f2766859310591a SHA512 154fc95bd6b1832457d0252d5491d8ea2f8cee596fbbdef635be25c4c69bd67b62d6ec7254f223b93efb0d9f2c14ec2a5b9312c80d96ffcad2174e580f3f1dd2
 EBUILD gmmlib-9999.ebuild 832 BLAKE2B c679b2b098ab9b69bca49506c3579417f0bba14abc968eb64f58d7d47dceec272288f7bea7ac076f92fd6416c12adf476db57b4f08e58a63094bc6f7e40bf787 SHA512 3a4bcd7e49d73af846df1abd753e5d8d07920b5c589196217854a0968825763f8c89e16b5b2e4e1432c83af6123f3259f97589a3a45012de3332c8c8c42b2e28
 MISC metadata.xml 322 BLAKE2B 802cb8da9b68866ac616c175586bc3651330ecbfb1b08fe3fad52ec8817e1994f347ae49815869d50296504d9607fcf6c41d40543d8896fafd8d36c4421604f6 SHA512 52324c98984d04659d8ee327850152e41b6146f45a35b147a1fba2043be7ca91e220dd57fc3712e5154b416d04f8a1b0f614259cd9fde8c66ad7734853bb50ec
diff --git a/media-libs/gmmlib/gmmlib-20.1.1.ebuild b/media-libs/gmmlib/gmmlib-20.1.1.ebuild
new file mode 100644
index 000000000000..e92ee3ae73d2
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-20.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+# once upstream makes this optional
+#	local mycmakeargs=(
+#		-DMEDIA_RUN_TEST_SUITE=OFF
+#	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 449701b9ce0d..4e5e8dfad815 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,5 +1,5 @@
 DIST graphene-1.10.0.tar.xz 289452 BLAKE2B 41af96ffcdb2d8ad2fce7a242cef74cead09ce444514f85a97ac609c6518c60cbd5fb44b58b24973fe9a372f898ca99b79cfd776c968d53b72fc20c5d076a230 SHA512 842ac2c9c2046f07f8421b99292cac348276bb1e025250c7e0dc3ec7f90cb33094b765034862f325dd78f93aa5484ad75a4ad6139fe13330d9e41e3a7cb830d0
 DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c
-EBUILD graphene-1.10.0.ebuild 1700 BLAKE2B 60236de4800f8e9444b9fbf8f1bcfe4de29aadd2a575b0c5c66fad2f31236258a86ae2887ef8a767eaf559dd4fe3dd3f2456836d1f9da42dbcf1b21758b406ab SHA512 7ebce8535c4b7e849a70678bb538f9ff4cb770df2ba3a57615894871f4d0932455f051bb716e0f7221bbeb4e9db8d4b4909e5e3e37aa5c9b887907e47402e631
+EBUILD graphene-1.10.0.ebuild 1707 BLAKE2B 959d36339b1189b12d97f2fff7775581fc3948e79fda54e4a26035b8f2f6cb575d70c4da1e1556b4ecdfe80bd5f53bd2ae7962c8f8fe9adedf3d53ee18400e93 SHA512 907b1c22c6b2cc2928ff8eddf53c7a769c9d76cdbd436142fe1c88d7fcbf27bac949d91b2e073aeff590595762d561f6bd33e4b83ebe1e265721dac9a1b0eb52
 EBUILD graphene-1.8.6.ebuild 1839 BLAKE2B eb06a3ebc7e3befed4777fabab55b9a670d5dad677a8cbba50f9afec801e29cc5557dd63a1bde8e4da675d1ececc5c760db8c983ed417c1bfee0fa96872a83ea SHA512 327723ed935545bc2cbbe5590724a2849bbef3e5f72160e4b1f768fbe9c954e39b1d97a7e4a43f81f3b30dff2abf73db66aef3e8b1c1108b0951f7f3a78c98a2
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.10.0.ebuild b/media-libs/graphene/graphene-1.10.0.ebuild
index e0d3b4f6ea8d..672030936169 100644
--- a/media-libs/graphene/graphene-1.10.0.ebuild
+++ b/media-libs/graphene/graphene-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 6a23bfbc5f0d..e79502996aad 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,4 +1,7 @@
 AUX gst-plugins-bad-1.14.5-make43.patch 7736 BLAKE2B b0b1b85e7bce7b267c382bd853b8edbe4b8b3e1e2aed52cba06aa5dbe954c050f21b8d1a47410b18071bb94b1a5c5121b7256557de42f2acd4196c9f8c25efbc SHA512 dff8b0e71ca151c81505e2a27f16ca998a56b2752457ad870d0bfdf610ad463575d29925141890922f588be9fbb3e8bdda7020d87732e30c9101782d6d5fa472
+AUX gst-plugins-bad-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a337eb326e47b9b16fce36938ccfea0b1dbea09213190899843bda338063cfe38589b9badc2676826bcb463cb1c1d90f5dbc19f9 SHA512 ccfd579039d2696e268f7b6fa17930383a765ad472f1e6b5ccc90ee26cbaf9006b584aad3009d8a7882ebbf1533533ae001b4335c781decb0ac93591056c8c30
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
+DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 EBUILD gst-plugins-bad-1.14.5.ebuild 2705 BLAKE2B 7f6071a63b6b0d33e255f2982731f3693fba2a663bd19079e40c1a913a1fc2aefe0a476fe7b9603c85d64c6edf13fdd1952bfd188acb045b3dbbf12b4a1e724e SHA512 801628a4d531b1495e7c8b595c4e053fec91d31a56417cd6e37612bd28de07bdabecae53e9a54f5232b6f401a7608d64762b472640ff120fa3d9e5808bacd51d
+EBUILD gst-plugins-bad-1.16.2.ebuild 2333 BLAKE2B 25a50ff5b5de6923b1d06adb054db790cd5a6711a2e894995de319d1df47a0dbfe8ed117afd7eb3ff1f022f1cbdaf50c64778af460d6336e7339bb6713add2e1 SHA512 2e641f0aa74968fd1d534738e39d9e466b5b81eaaa6911fa92a175c8cbeb8c69baaa718ec521c1e47dab8098b3e75138565dc328daf746c0670e1c905648f345
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.16.2-make43.patch b/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.16.2-make43.patch
new file mode 100644
index 000000000000..f5caac7872d1
--- /dev/null
+++ b/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.16.2-make43.patch
@@ -0,0 +1,200 @@
+diff --git a/common/glib-gen.mak b/common/glib-gen.mak
+index ef93a5f..cc02239 100644
+--- a/common/glib-gen.mak
++++ b/common/glib-gen.mak
+@@ -1,11 +1,13 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_enum_prefix=gst_color_balance
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ %-marshal.h: %-marshal.list
+diff --git a/common/gst-glib-gen.mak b/common/gst-glib-gen.mak
+index 76b2233..5f2b1ed 100644
+--- a/common/gst-glib-gen.mak
++++ b/common/gst-glib-gen.mak
+@@ -1,6 +1,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -8,7 +10,7 @@
+ #glib_gen_decl_banner=GST_EXPORT
+ #glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
+diff --git a/ext/srt/Makefile.in b/ext/srt/Makefile.in
+index 09109c3..e5f2a9d 100644
+--- a/ext/srt/Makefile.in
++++ b/ext/srt/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -794,7 +796,7 @@ noinst_HEADERS = \
+ 	gstsrtsrc.h \
+ 	$(NULL)
+ 
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+diff --git a/ext/srtp/Makefile.in b/ext/srtp/Makefile.in
+index 758db8e..017c075 100644
+--- a/ext/srtp/Makefile.in
++++ b/ext/srtp/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -775,7 +777,7 @@ glib_gen_basename = gstsrtp
+ BUILT_SOURCES = gstsrtp-enumtypes.c gstsrtp-enumtypes.h
+ nodist_libgstsrtp_la_SOURCES = $(BUILT_SOURCES)
+ CLEANFILES = $(BUILT_SOURCES)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+diff --git a/ext/webrtc/Makefile.in b/ext/webrtc/Makefile.in
+index da8fd9a..ec3588f 100644
+--- a/ext/webrtc/Makefile.in
++++ b/ext/webrtc/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -805,7 +807,7 @@ libgstwebrtc_la_LIBADD = \
+ 
+ libgstwebrtc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ libgstwebrtc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ all: all-am
+ 
+ .SUFFIXES:
+diff --git a/gst-libs/gst/interfaces/Makefile.in b/gst-libs/gst/interfaces/Makefile.in
+index ca1bde5..9d54c2e 100644
+--- a/gst-libs/gst/interfaces/Makefile.in
++++ b/gst-libs/gst/interfaces/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -773,7 +775,7 @@ glib_enum_define = GST_PHOTOGRAPHY
+ glib_gen_prefix = gst_photography
+ glib_gen_basename = photography
+ glib_gen_decl_banner = GST_PHOTOGRAPHY_API
+-glib_gen_decl_include = \#include <gst/interfaces/photography-prelude.h>
++glib_gen_decl_include = ${H}include <gst/interfaces/photography-prelude.h>
+ built_sources = \
+ 	photography-enumtypes.c
+ 
+@@ -806,7 +808,7 @@ BUILT_SOURCES = \
+ 	$(built_headers)
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+diff --git a/gst-libs/gst/mpegts/Makefile.in b/gst-libs/gst/mpegts/Makefile.in
+index 7a145cb..91a81cc 100644
+--- a/gst-libs/gst/mpegts/Makefile.in
++++ b/gst-libs/gst/mpegts/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -822,7 +824,7 @@ glib_enum_define = GST_MPEGTS
+ glib_gen_prefix = gst_mpegts
+ glib_gen_basename = gstmpegts
+ glib_gen_decl_banner = GST_MPEGTS_API
+-glib_gen_decl_include = \#include <gst/mpegts/mpegts-prelude.h>
++glib_gen_decl_include = ${H}include <gst/mpegts/mpegts-prelude.h>
+ BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h
+ nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c
+ CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
+@@ -842,7 +844,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
+ @HAVE_INTROSPECTION_TRUE@gir_DATA = $(BUILT_GIRSOURCES)
+ @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/
+ @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+diff --git a/gst-libs/gst/webrtc/Makefile.in b/gst-libs/gst/webrtc/Makefile.in
+index 04146bc..1d0db28 100644
+--- a/gst-libs/gst/webrtc/Makefile.in
++++ b/gst-libs/gst/webrtc/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -761,7 +763,7 @@ glib_enum_define = GST_WEBRTC
+ glib_gen_prefix = gst_webrtc
+ glib_gen_basename = webrtc
+ glib_gen_decl_banner = GST_WEBRTC_API
+-glib_gen_decl_include = \#include <gst/webrtc/webrtc_fwd.h>
++glib_gen_decl_include = ${H}include <gst/webrtc/webrtc_fwd.h>
+ built_sources = webrtc-enumtypes.c
+ built_headers = webrtc-enumtypes.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+@@ -807,7 +809,7 @@ libgstwebrtc_@GST_API_VERSION@_la_LDFLAGS = \
+ 	$(GST_ALL_LDFLAGS) \
+ 	$(GST_LT_LDFLAGS)
+ 
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstWebRTC-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@include_HEADERS))
+ @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@_la_SOURCES)) $(BUILT_SOURCES)
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
new file mode 100644
index 000000000000..168be0bfd904
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit flag-o-matic gstreamer virtualx
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="X bzip2 +introspection +orc vnc wayland"
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+	wayland? (
+		>=dev-libs/wayland-1.11.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.15
+	)
+
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
+)
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
+	gstreamer_multilib_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable bzip2 bz2) \
+		$(use_enable orc) \
+		$(use_enable vnc librfb) \
+		$(use_enable wayland) \
+		--disable-examples \
+		--disable-debug \
+		--without-player-tests \
+		--enable-shm \
+		--enable-ipcpipeline \
+		--disable-gl # eclass probably does this too, but be explicit as it used to be handled in ebuild here; all parts now in gst-plugins-base instead
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	unset DISPLAY
+	# Tests are slower than upstream expects
+	virtx emake check CK_DEFAULT_TIMEOUT=300
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 321b7367ec65..47f25740a7f7 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,5 +1,8 @@
 AUX gst-plugins-base-1.14.5-make43.patch 10992 BLAKE2B 19db9e3d90100863262f2fc632591a0662a79ea118cef8f0c757c62c64bd0f0b3c443c0284b9901404eac96b5b2d0911313f1fc6fdcc247b3eaf6c80167712ff SHA512 d91c9d9677ec820174ea16ebf1aeaccad6db6f3c2caf90ca63a55be3cc7e5dafc1f717ddd9f43089bb4c80bfc1cf93483efab356425aebfcf904e00550591cb2
+AUX gst-plugins-base-1.16.2-make43.patch 12403 BLAKE2B e99167bbb792c5815e8bb726559b63734fcc7489dbde65ab4de48ff17c069b8295059f002d130d5a970461e7333a2bbbd4ac3e20c2a4809e7282b5a13a981964 SHA512 9d65537814310059f21afe43390c858d52d9390b54b6de590b3fd3541e333a7954f9aa9c44a91bcd01b6232dd01f0711c8a19462f9a2cbff82851b4366871502
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
-EBUILD gst-plugins-base-1.14.5-r1.ebuild 6018 BLAKE2B c8939c8cd2c4a29445f40b9b885c947ae4422e6b2e04365ae0454c92e26c00cdecdba81548a096d5e45c3c94dd5d87e3e7e991aefe8413a1c94cfa17f136b947 SHA512 110add7a1069a8286d67bd71c964f328200b4050b69ef5321a2895d7228f1917cb6ee0f1aeaf9f99a844627da73470179f62bc7a9dbcd4c74d34095ad5d20287
+DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
+EBUILD gst-plugins-base-1.14.5-r1.ebuild 6025 BLAKE2B 0b7698e494efef8651973fb3ad48af145c9d7c94afa9964aa5598beacbd64d4e85147caa3b2d89d34925851bcdb3a6558f7e515fd3430c6bc35cf6a82b9adb46 SHA512 e19f197d53cc5758645db08e32e336004433270f897f8253200eac634480ea41ccfe162b625e27a0722e005e35ea05bf6fe9943ab9317803d91de21f6f225bb6
 EBUILD gst-plugins-base-1.14.5.ebuild 6037 BLAKE2B 7a94909cb8e237fb07c2dce50447647b92c6e1fc8fe5d859724f74468a045b8d9a04501c4dc167e8ca222f82a722e56499ed31f0534937c690737ee9ed84a816 SHA512 e9a8b42046bb5e59cc4771b7d033d3691c06ecb83f6b30b151d7f954be76e72432c37f0144d38af04771c77eefdab1b76b80a97780a81aa67e938933f7263867
+EBUILD gst-plugins-base-1.16.2.ebuild 6031 BLAKE2B 51cbc32332fdaa751b9cbcf90c0224d2e715c22fd455fe8d2478688997a6f822294e9c25830a439b804893623f8bda0699f32334afefced9c1c6d9b0dc1dd151 SHA512 7853d32ca7610cecb6ab15f79bdf3d3f6edfd294ef2230436c3367c8b1fb2be106b8dd9caf71ac34d1f3f8fdfd6f6662c061d4f44af8bd5c0d65a0836e6d7451
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch
new file mode 100644
index 000000000000..f8121962918a
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch
@@ -0,0 +1,347 @@
+--- a/common/glib-gen.mak
++++ b/common/glib-gen.mak
+@@ -1,11 +1,13 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_enum_prefix=gst_color_balance
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ %-marshal.h: %-marshal.list
+--- a/common/gst-glib-gen.mak
++++ b/common/gst-glib-gen.mak
+@@ -1,14 +1,16 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
+--- a/gst/encoding/Makefile.in
++++ b/gst/encoding/Makefile.in
+@@ -17,12 +17,14 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+ 
+ 
+ VPATH = @srcdir@
+@@ -638,7 +640,7 @@
+ 	gstsmartencoder.h	\
+ 	gststreamcombinerpad.h
+ 
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ all: all-am
+ 
+ .SUFFIXES:
+--- a/gst-libs/gst/app/Makefile.in
++++ b/gst-libs/gst/app/Makefile.in
+@@ -17,13 +17,15 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+ 
+ 
+ VPATH = @srcdir@
+@@ -618,12 +620,12 @@
+ glib_gen_prefix = __gst_app
+ glib_gen_basename = app
+ glib_gen_decl_banner = GST_APP_API
+-glib_gen_decl_include = \#include <gst/app/app-prelude.h>
++glib_gen_decl_include = $(H)include <gst/app/app-prelude.h>
+ glib_enum_headers = gstappsrc.h
+ built_sources = app-enumtypes.c
+ built_headers = app-enumtypes.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c
+ nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
+ libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+--- a/gst-libs/gst/audio/Makefile.in
++++ b/gst-libs/gst/audio/Makefile.in
+@@ -39,13 +39,15 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+ 
+ 
+ VPATH = @srcdir@
+@@ -784,7 +786,7 @@
+ glib_gen_prefix = gst_audio
+ glib_gen_basename = audio
+ glib_gen_decl_banner = GST_AUDIO_API
+-glib_gen_decl_include = \#include <gst/audio/audio-prelude.h>
++glib_gen_decl_include = $(H)include <gst/audio/audio-prelude.h>
+ built_sources = audio-enumtypes.c
+ built_headers = audio-enumtypes.h
+ lib_LTLIBRARIES = \
+@@ -895,7 +897,7 @@
+ @HAVE_X86_TRUE@	$(GST_LIB_LDFLAGS) \
+ @HAVE_X86_TRUE@	$(GST_ALL_LDFLAGS)
+ 
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ 
+ # Introspection
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir
+--- a/gst-libs/gst/pbutils/Makefile.in
++++ b/gst-libs/gst/pbutils/Makefile.in
+@@ -17,13 +17,15 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+ 
+ 
+ VPATH = @srcdir@
+@@ -664,6 +666,7 @@
+ 	gstdiscoverer.h \
+ 	gstaudiovisualizer.h
+ 
++H := \#
+ 
+ # variables used for enum/marshal generation
+ glib_enum_headers = $(headers_pbutils)
+@@ -671,7 +674,7 @@
+ glib_gen_prefix = pbutils
+ glib_gen_basename = pbutils
+ glib_gen_decl_banner = GST_PBUTILS_API
+-glib_gen_decl_include = \#include <gst/pbutils/pbutils-prelude.h>
++glib_gen_decl_include = $(H)include <gst/pbutils/pbutils-prelude.h>
+ built_headers_configure = \
+ 	gstpluginsbaseversion.h
+ 
+@@ -719,7 +722,7 @@
+ 
+ # DISTCLEANFILES is for files generated by configure
+ DISTCLEANFILES = $(built_headers_configure)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@	$(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \
+--- a/gst-libs/gst/rtp/Makefile.in
++++ b/gst-libs/gst/rtp/Makefile.in
+@@ -17,13 +17,15 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+ 
+ 
+ VPATH = @srcdir@
+@@ -675,8 +677,8 @@
+ glib_enum_headers = $(libgstrtpinclude_HEADERS)
+ glib_gen_basename = gstrtp
+ glib_gen_decl_banner = GST_RTP_API
+-glib_gen_decl_include = \#include <gst/rtp/rtp-prelude.h>
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++glib_gen_decl_include = $(H)include <gst/rtp/rtp-prelude.h>
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@	$(libgstrtpinclude_HEADERS)) \
+--- a/gst-libs/gst/rtsp/Makefile.in
++++ b/gst-libs/gst/rtsp/Makefile.in
+@@ -17,13 +17,15 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+ 
+ 
+ VPATH = @srcdir@
+@@ -679,8 +681,8 @@
+ glib_enum_headers = $(libgstrtspinclude_HEADERS)
+ glib_gen_basename = gstrtsp
+ glib_gen_decl_banner = GST_RTSP_API
+-glib_gen_decl_include = \#include <gst/rtsp/rtsp-prelude.h>
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++glib_gen_decl_include = $(H)include <gst/rtsp/rtsp-prelude.h>
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@	$(libgstrtspinclude_HEADERS)) \
+--- a/gst-libs/gst/tag/Makefile.in
++++ b/gst-libs/gst/tag/Makefile.in
+@@ -17,13 +17,15 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+ 
+ 
+ VPATH = @srcdir@
+@@ -680,12 +682,12 @@
+ glib_gen_prefix = gst_tag
+ glib_gen_basename = tag
+ glib_gen_decl_banner = GST_TAG_API
+-glib_gen_decl_include = \#include <gst/tag/tag-prelude.h>
++glib_gen_decl_include = $(H)include <gst/tag/tag-prelude.h>
+ glib_enum_headers = tag.h gsttagdemux.h
+ built_sources = tag-enumtypes.c
+ built_headers = tag-enumtypes.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ libgsttaginclude_HEADERS = \
+ 	tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h
+ 
+--- a/gst-libs/gst/video/Makefile.in
++++ b/gst-libs/gst/video/Makefile.in
+@@ -39,13 +39,15 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
+ 
+ 
+ VPATH = @srcdir@
+@@ -740,7 +742,7 @@
+ glib_gen_prefix = gst_video
+ glib_gen_basename = video
+ glib_gen_decl_banner = GST_VIDEO_API
+-glib_gen_decl_include = \#include <gst/video/video-prelude.h>
++glib_gen_decl_include = $(H)include <gst/video/video-prelude.h>
+ built_sources = video-enumtypes.c
+ built_headers = video-enumtypes.h
+ lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
+@@ -821,7 +823,7 @@
+ 
+ libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
+ libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@	$(libgstvideo_@GST_API_VERSION@include_HEADERS)) \
+--- a/gst-libs/gst/gl/Makefile.in
++++ b/gst-libs/gst/gl/Makefile.in
+@@ -17,12 +17,14 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=${H}include <gst/foo/foo-prelude.h>
+ 
+ 
+ 
+@@ -863,14 +865,14 @@ glib_enum_define = GST_GL
+ glib_gen_prefix = gst_gl
+ glib_gen_basename = gl
+ glib_gen_decl_banner = GST_GL_API
+-glib_gen_decl_include = \#include <gst/gl/gl-prelude.h>
++glib_gen_decl_include = ${H}include <gst/gl/gl-prelude.h>
+ built_sources = gl-enumtypes.c
+ built_headers = gl-enumtypes.h
+ BUILT_SOURCES = $(built_sources) $(built_headers)
+ CLEANFILES = $(BUILT_SOURCES) $(am__append_27)
+ nodist_libgstgl_@GST_API_VERSION@include_HEADERS = $(built_headers)
+ nodist_libgstgl_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstGL-@GST_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
+ @HAVE_INTROSPECTION_TRUE@	$(gstgl_gir_headers)) $(patsubst \
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
index e632a794eebc..94060e0598b0 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
new file mode 100644
index 000000000000..548dabb5e358
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+	)
+
+	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.15.0:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
+)
+
+src_prepare() {
+	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
+	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
+	default
+}
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	local myconf=()
+	# FIXME: Automagic gbm and x11 wsi
+	if use opengl || use gles2; then
+		myconf+=(
+			--enable-gl
+			$(use_enable egl)
+			$(use_enable gles2)
+			$(use_enable opengl)
+			$(use_enable wayland)
+			$(use_enable X x11)
+		)
+	else
+		myconf+=(
+			--disable-gl
+			--disable-egl
+			--disable-gles2
+			--disable-opengl
+			--disable-wayland
+			--disable-x11
+		)
+	fi
+
+	if use opengl && use X; then
+		# GLX requires desktop OpenGL and X
+		myconf+=( --enable-glx )
+	else
+		myconf+=( --disable-glx )
+	fi
+
+	myconf+=(
+		--disable-cocoa
+		--disable-dispmanx
+		--disable-wgl
+	)
+
+	gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--enable-iso-codes \
+		--enable-zlib \
+		--disable-debug \
+		--disable-examples \
+		--disable-static \
+		"${myconf[@]}"
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+	unset GSETTINGS_BACKEND
+	emake check
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index ea350494c78b..3c71f545d039 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,4 +1,7 @@
 AUX gst-plugins-good-1.14.5-make43.patch 1869 BLAKE2B 93bf7ca4bfc14461b71dab9a458f86aa79d0fe6c3086f307e70822528e7f91f535760c3d1ba00f86090846b587dcc82a94775f94f2365a3729cd52e093c229d5 SHA512 016c2743025f6a55720238304de54c46931b9e3b3249a49ea5d3980de1d53312afe0150cfd7aa11f8772e3b363aecde2c9afd52df447ab37fe636dec3c196069
+AUX gst-plugins-good-1.16.2-make43.patch 1927 BLAKE2B ff38be465f3300f8b6821b37878e0beeee471d359362b9f26f2fa74b9f91cb5d3afd73de5d13f3015883915f21eaf3cfe2c5fb06b7d387e4e268a577c1afb48d SHA512 8c3432a402cbc2bffd617a294a356c3f0bb0dc88593267db82b308817d07f0c0a9e30b205868ad9c7937aee8864420240c4a16cb019b26cce2dcbfb10337e0fe
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
+DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 EBUILD gst-plugins-good-1.14.5.ebuild 1506 BLAKE2B 4f7fa9ec216eba6ba101b8ffdfa9d35151f2c6956bb40fdfbacfc88fe8b800a0cdc5e645fc662f183d41eb569885da7036e5a82cfdb370d15485efc47110c212 SHA512 54bebe46bbede74adcb733677f92f4694cc770edae5cd1e45fe7aa0056cd67e4838a7612215f0ccee160eaa51d274d2fa0a38513cb695805966549d495767b32
+EBUILD gst-plugins-good-1.16.2.ebuild 1512 BLAKE2B 5a9926ceba4f784fc225871cd670482530faed4be13ad68130e67806dfde513db63dc0d4d27734cbbea5c16c32e3cb694675db57b1e0e1631bebda0c63b1cf14 SHA512 23dafeb2140c2833c25420d63997416fb0258133b353a4079e8118507e4a87833c2e6aac52e4b84669e862a56de414ddec4562e713bfcbf9b830f1ee3b4fed0a
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.16.2-make43.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.16.2-make43.patch
new file mode 100644
index 000000000000..b7e43f35c2a1
--- /dev/null
+++ b/media-libs/gst-plugins-good/files/gst-plugins-good-1.16.2-make43.patch
@@ -0,0 +1,57 @@
+--- a/common/glib-gen.mak
++++ b/common/glib-gen.mak
+@@ -1,11 +1,13 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_enum_prefix=gst_color_balance
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ %-marshal.h: %-marshal.list
+--- a/common/gst-glib-gen.mak
++++ b/common/gst-glib-gen.mak
+@@ -1,13 +1,15 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+ #glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
+--- a/sys/v4l2/Makefile.in
++++ b/sys/v4l2/Makefile.in
+@@ -17,6 +17,8 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+ 
++H := \#
++
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+@@ -669,7 +671,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ plugin_LTLIBRARIES = libgstvideo4linux2.la
+-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+ libgstvideo4linux2_la_SOURCES = gstv4l2.c \
+ 				gstv4l2allocator.c \
+ 				gstv4l2colorbalance.c \
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
new file mode 100644
index 000000000000..3c0781272852
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
+)
+
+multilib_src_configure() {
+	# Always enable optional bz2 support for matroska
+	# Always enable optional zlib support for qtdemux and matroska
+	# Many media files require these to work, as some container headers are often
+	# compressed, bug #291154
+	gstreamer_multilib_src_configure \
+		--enable-bz2 \
+		--enable-zlib \
+		--disable-examples \
+		--with-default-audiosink=autoaudiosink \
+		--with-default-visualizer=goom
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index f5f34f90076e..c66f432efd6e 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,4 +1,6 @@
 AUX gst-plugins-ugly-1.14.3-make43.patch 540 BLAKE2B 13b53beb26c0f70233178c974337bde725316fbca2540dda38568935a67e4114e775d53f5c37390ab574caf8a4748dd039be04d6b8c935d1cc17dac8931e2ee8 SHA512 7e3dddb06522dcb031296ccbdc1b09315d30ca974d63c8e552983213d5d11bdc258ca7c659ec874f7c6fa2b81925707805c91a8928085b3950c5eb62fe336e61
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
+DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 EBUILD gst-plugins-ugly-1.14.3.ebuild 1040 BLAKE2B b407e5fd151f84fdad9b7b15fcf3a26911a741fb38fe7e87cc8f85e983b7a98628bfc41ab1db9ebbd72542b0232f268b58c3bd86f90bf384de6ea4728fa1d98f SHA512 2dea55696ecad8c8e71dda5f882908a41eec0b29f127235eda786721052d28cee41a8fadd5b0bc44145b1b71a64829f053a8f45284e1c17854b6ea11c8e92945
+EBUILD gst-plugins-ugly-1.16.2.ebuild 1046 BLAKE2B 966147277fcc230f4515f53ceaa79ab30248bf3e7ade9c86252ac32f6489f4331542f6b2ebb83addcfca6071bb40dc1ba27b7c0992910dff680e9cdfd92fe617 SHA512 bfde5252529633c9b76556f14c2649966d34149bf5ed69282ba3d66abf34987c1775d3dc0e4033def1a11f47f20da120dc4d0597c3a992719ccef3455e06b903
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
new file mode 100644
index 000000000000..20f7b7bd4a75
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-ugly"
+
+inherit gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.3-make43.patch # remove when bumping and switching to Meson
+)
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index f63421ddb08c..38780a01b71f 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,5 +1,7 @@
 AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5cbdb2d4fe085fcf77bd798cb474216b758bff3a70f6b0e3f93d656a6e41b44be6c3f931ed5543e4ca10b51d19b4f4f153bc9 SHA512 f559150ac5e40a2fe259a8346ed085a20df86d93e5292c9dcc024274f12e0beb90266395538943946ca01a2a5f56be3ab32f1f850e1c8c047848aebc13ab2350
 AUX gstreamer-1.14.5-make43.patch 3176 BLAKE2B a221894affd68da53d475c65544cfe825b9ab947fb6b7b13c2b409b71f7fcd7224f94835d293d4ea10da9a7cd271284449c97ebd475166fdda6d54929b816e04 SHA512 89de24659fe954e483d62f938b01dc2de25cbcc039eb6c12e8a0dd1681071a567f4799f0cf615738173304e6d103afc2b569fa81cbbbe61bbca1b0a1e849b9bf
 DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
+DIST gstreamer-1.16.2.tar.xz 3328600 BLAKE2B 9bc12330fc5a7fa3a65e2c03f9d06172d787e9aadb4c2cb7d98f8f7c5850e05535cf23f747bf89514a609447f3894942bcb2fa4a6d3d3406e129e1eb67b49158 SHA512 a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f
 EBUILD gstreamer-1.14.5.ebuild 3546 BLAKE2B 425709e719cdb23f49f7936e411a1d06b102109240287d90b8673885b496a1eb32dd51b735e3c03e6b320d5853b2cb1f51794b10f784df043f6e1d279e34f641 SHA512 4ef500bc764dbf072e54ada340bf2429f332d25a9ac57010afb26b13d5dd60afb398678a59d21cccec6e96468a822530782b1f90bebcb4a0b45a119cb25daeca
+EBUILD gstreamer-1.16.2.ebuild 3470 BLAKE2B 382ce44b3dbbbdcf62b3e37093995376560106a35509ceefdb35aaa779072799590b5fe3e65583deee66fdbe38d9cbac8cc7b08e82641dbdbd4a96b58af30ea6 SHA512 3536aaf84eb291e89bf0a82a1302d1eb2c6fb854899f990749b6d74ad1bf74523d5f03c222e16fc0de2b0babf6b58d2c203e92099b2bcfcc3aa6e0c3eaea447d
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.16.2.ebuild b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
new file mode 100644
index 000000000000..5160237662ac
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 multilib-minimal pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps +introspection nls +orc test unwind"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	unwind? (
+		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+		dev-libs/elfutils[${MULTILIB_USEDEP}]
+	)
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/bison
+	sys-devel/flex
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
+)
+
+src_configure() {
+	if [[ ${CHOST} == *-interix* ]] ; then
+		export ac_cv_lib_dl_dladdr=no
+		export ac_cv_func_poll=no
+	fi
+	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
+		# GCC groks this, but then refers to an implementation (___multi3,
+		# ___udivti3) that don't exist (at least I can't find it), so force
+		# this one to be off, such that we use 2x64bit emulation code.
+		export gst_cv_uint128_t=no
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local completiondir=$(get_bashcompdir)
+	# Set 'libexecdir' to ABI-specific location for the library spawns
+	# helpers from there.
+	# Disable static archives and examples to speed up build time
+	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--disable-benchmarks
+		--disable-debug
+		--disable-examples
+		--disable-static
+		--disable-valgrind
+		--enable-check
+		$(use_with unwind)
+		$(use_with unwind dw)
+		$(multilib_native_use_enable introspection)
+		$(use_enable nls)
+		$(use_enable test tests)
+		--with-bash-completion-dir="${completiondir%/*}"
+		--with-package-name="GStreamer ebuild for Gentoo"
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
+	)
+
+	if use caps ; then
+		myconf+=( --with-ptp-helper-permissions=capabilities )
+	else
+		myconf+=(
+			--with-ptp-helper-permissions=setuid-root
+			--with-ptp-helper-setuid-user=nobody
+			--with-ptp-helper-setuid-group=nobody
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		local x
+		for x in gst libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 85a7168ad784..0e50ccf6fdb5 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,4 +1,4 @@
 AUX hamlib-3.3-format-security.patch 738 BLAKE2B 896d6023f68979400ba8782956da86b9d30878f661eb70ac40f595cf903739f29c11fe4a3d75135333c65148ff8d0e2fb8b81e03ea32520d16b0824e9262be01 SHA512 fea0ed27228de5177f1f849e237a517b32f3efd74efab4dfc858c75ae7339dacf942097016229faaa790396f6627160e0e4716dfb16eb496e91c5d8301134098
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
-EBUILD hamlib-3.3.ebuild 2104 BLAKE2B dc9066dfdd47afc271da4d82854e6f62cb109fec0b630b4f360363eeb24f448ee4c125e4ceafbd8315b0b81b4ec31e1acdeceb3d66fbe38b12bd0bebc76884b7 SHA512 a565f82e8c2d85f3396746ce1c2dadfd9c60ded21732f694fd53f911f8754868998941518769854137f94244138de9f3dd14442534e0ea062d4c80f2d3af6e11
+EBUILD hamlib-3.3.ebuild 2094 BLAKE2B 6efc59674c743530a54fc0d68e8750f5cc7eb3504d74ad1fd160a41e1dd0f3be87fb669c0d7fe6cd9de2001d55ba108cdbbbb5e62ee05c688c80f25a5db0b765 SHA512 ad1af776080acb8a0fe6dd960bbe8f1ace7feff5966b648b29b04d5e6017ba094f2ddeaecbc5b7df8e256689fcd5a4848c67db98cb02263caac66679ed4ce3c5
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild
index 2cde4b103be4..e1f23ef7bc6d 100644
--- a/media-libs/hamlib/hamlib-3.3.ebuild
+++ b/media-libs/hamlib/hamlib-3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-single-r1
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index ee8b3a808bd6..001011051372 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,5 +1,7 @@
 AUX harfbuzz-2.6.1-gcc-9.patch 468 BLAKE2B 5f0b42d7a834f5b59c79adcbc2fb67e9aa1fa97fb6e6e135c7c88d20780d0a75ad8784c5ed3473cad8a1bb5f1c6f3c8475e7984e555eef1720ac9de387f95b83 SHA512 8dec55d5cb97c3aae2e6885cddc06db9629e6e5336ffc1b3cc263c8ad88e499833570210868dfb6e42c0dbf0326f239d1ac4ee1914f6f84712d1f93350da1912
 DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f
+DIST harfbuzz-2.6.5.tar.xz 8510596 BLAKE2B e495fbba7e0cb58918afeb6beb3ebcf936be896ca606cef27dcbfb9b5f10add144f7fcaa50dec35a9f909d7e87deebadb7c9e6bbbadcbd799effd96076786cde SHA512 ae66211f9b4233c1da4b22b703ab4912f684390294c5c88113e6c927d5aeda8960da3ff607a7c7be5968d9fbb5a95b1f6933070d0aab2aa442a3ec8a112cd16f
 EBUILD harfbuzz-2.6.4.ebuild 3031 BLAKE2B 6dc0820449927f7323cedcdb16c843b7d548695f53bb40aa1a57a994897e6cc79d86cd4205c67796a5d3ab07ae7dc42ac215bdf9e33ebb2a62f7e9f33aaf3d73 SHA512 163e5e15ab58531d6ed13484315435a35ae8227366f9f8074519384cfee804aa76d1fd14184efb67ed38aadcf0ff1a7f86faf73d42dc756e5d55b14c8c52f0e3
-EBUILD harfbuzz-9999.ebuild 3048 BLAKE2B 6ae69bc76d59125bb5b8bcba90e0fb34d1829a8092d8d230fd2832bbadcf29561c61fc0b79691bcd3895288cfaaba00c4b656fdf0d112457d1d438e8862cdcf5 SHA512 381341116d281e16702a398ba25fd733a4bb9a269e2d775c348363778f6587a79742688385fd0f058cbf54dce2612fc87aba1416d81e6c4f5323c475b2e2853c
+EBUILD harfbuzz-2.6.5.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4
+EBUILD harfbuzz-9999.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
new file mode 100644
index 000000000000..085525d97eed
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild
@@ -0,0 +1,111 @@
+# 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 flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-fontconfig #609300
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index ba04a2d32be2..085525d97eed 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -11,10 +11,10 @@ DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 
 if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
 	inherit git-r3 autotools
 else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 374945c64553..1257c4fb47b4 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,3 +1,3 @@
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
-EBUILD lensfun-0.3.2-r1.ebuild 1432 BLAKE2B 9d92b2d0a28126b1d410f537f35c6eb662227006640ccc018dbaa0eb9bf0ae6246162bd9c8efa993aa5a42b450694c42dc0af882b6444c6ff88d63dd03bf25e6 SHA512 9aaaca0433f54c54b8daf87e2652289c172d81b493520805081c74be30a64161c7b8931390717e55a6a0d0972a1b1675e0546976e57fadd8e328731c259d5609
+EBUILD lensfun-0.3.2-r1.ebuild 1425 BLAKE2B 37045036e950a9466e1ffcd3abf1d0c32f625d881ee13a5937b8f5e2a145fd4b6bf2ff64c827d246e8c5d7cdd2b08e918a3405de4257e21e4b1d7bc02fd8bf5e SHA512 dfea007fc8988f66f159c8aeaadea6292a37ea9d0f56f088cfd977a0bc9e744326265edd73742f0fa48e0753474a7256dd2813303fc90b0ca1460f4dc47ad3f4
 MISC metadata.xml 612 BLAKE2B e0e745eb0d418ebbd7461736d92c432b48d88823142bc2bebf9765c3b9270124fd4a9718e384fd46acd8667bbb602d10c74435acaedfa0449e3890a186671ea0 SHA512 f61a2e3333e7f8fa5f3a64f93eabccac5bfd6587a195c019a3f2ed786f2d996412921a8308fc48e70b4347f230704b8fc18f0f7274a5e00ab68e0e5667640faa
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index be3d497432b6..528d11db7368 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 cmake-utils
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-single-r1 cmake
 
 DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
 HOMEPAGE="https://lensfun.github.io"
@@ -15,26 +14,29 @@ LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RESTRICT="!test? ( test )"
 
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.40
-	media-libs/libpng:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
+BDEPEND="
 	doc? (
 		app-doc/doxygen
 		dev-python/docutils
-	)"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+	)
+"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.40
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
 
 DOCS=( README.md docs/mounts.txt ChangeLog )
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
 		-DSETUP_PY_INSTALL_PREFIX="${ED}"/usr
 		-DBUILD_LENSTOOL=ON
 		-DBUILD_STATIC=OFF
@@ -43,13 +45,17 @@ src_configure() {
 		-DBUILD_FOR_SSE2=$(usex cpu_flags_x86_sse2)
 		-DBUILD_TESTS=$(usex test)
 	)
-
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	mkdir -p "${T}/db/lensfun" || die
 	cp data/db/* "${T}/db/lensfun/" || die
 
-	XDG_DATA_HOME="${T}/db" cmake-utils_src_test
+	XDG_DATA_HOME="${T}/db" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
 }
diff --git a/media-libs/libaacs/Manifest b/media-libs/libaacs/Manifest
index deaa73a434c8..2446d2533104 100644
--- a/media-libs/libaacs/Manifest
+++ b/media-libs/libaacs/Manifest
@@ -1,3 +1,5 @@
+DIST libaacs-0.10.0.tar.bz2 319890 BLAKE2B b7ea746e72028f718ee630d74360c52627360b503d739e884c213651597e719711b2dc7649ded4164ee35a56e3420de59e420c4ce8fa7b1dbebcd547f5221798 SHA512 4527749c3c78fd270012b3b36e916356a4aeb8f90169e781a00739f01f190121691042607209864e9b676ede9741f614c6003a7dfbb350dc020e1fa94cd6d66e
 DIST libaacs-0.9.0.tar.bz2 316323 BLAKE2B 4fd1ecca0ba5106b1d0195884356a8a8d7163614ebc2fe09f85ed79fa1534b6376951ab90670b3a7d375129e76fae80e3c42f3e1971d0cbcabd6e4e8384bde1a SHA512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6
+EBUILD libaacs-0.10.0.ebuild 996 BLAKE2B 0b67440a4d94a4cb6908ab9b977458de835fd9ea2bc161d00a10d9604c2a085c5b1bf3d6b8d4ec4470bf85f3cb5afc4bd586859635a0a3aa3fda319486e786ec SHA512 72b9bbca677307e8a58183b8cae32eda06af8d82586c95021bcc62f99bbf2d6f2bf22ba3c31c63239e4b6d82a152bb7bbc5469928ce06cc81fcc1e763e5af236
 EBUILD libaacs-0.9.0.ebuild 806 BLAKE2B 1b4852f3be27474d53b4d185defdf8f68802ca9feb0fcafcfdc1b5c39f0033a3fe13d68e71ddc4dd3ab5c6edd79f8270b1dac9588c18435225d0ab57d935eddc SHA512 f8760dbd524681a777f6ac97d003d0b35c0519e2af18231bd0285063950307f1c1583f55bcebd9a33ca400223335600d45ee35e12f39e0f4ea9b420ead6e32b7
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-libs/libaacs/libaacs-0.10.0.ebuild b/media-libs/libaacs/libaacs-0.10.0.ebuild
new file mode 100644
index 000000000000..721e0ec2e382
--- /dev/null
+++ b/media-libs/libaacs/libaacs-0.10.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Open implementation of the Advanced Access Content System (AACS) specification"
+HOMEPAGE="https://www.videolan.org/developers/libaacs.html"
+SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+	>=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+
+DOCS=( ChangeLog KEYDB.cfg README.txt )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-optimizations
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 36581a4ed7a3..6970288b1580 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -4,6 +4,8 @@ AUX libaom-1.0.0-version.patch 403 BLAKE2B 8ab115aecb2251750f964bafea7e74ea8e4ed
 AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
+DIST libaom-2.0.0_rc1.tar.gz 3497410 BLAKE2B e8443e5d390c82912b951d78551f2c7a3e0cffe6aea1b846da29c0264cc9736069110e6701e6dc075964c0375e95f2c1c108c0c980a5ea78d0f970c6f47f4790 SHA512 06a0971e8fcd1d449c4fd2b04569dc32ce6fb8ab6c4a270413997c3aeba7a186e071683686e0fbc1eb1f8d6c2c3afa7f48601bf5530984bc1cf612ab5dd64841
 EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5
-EBUILD libaom-9999.ebuild 2245 BLAKE2B ad771b20662c0d994ad6312a02248091f564c9a8277320ea6776df46d46630df63b9fb8b144cc1b4e9051c4c8fa76d3a819457896af4eaff7ad20fc8112f36ed SHA512 f4f288d79d8f493790790254436acd87937e6bf3d22cb4c050f759fdeedfe711a0792654831dbfe701f8389234757afbc385d686dee4325edd08a3a825e3bda7
+EBUILD libaom-2.0.0_rc1.ebuild 2391 BLAKE2B c3a087f79a756ebbd7b6dfd2bf59afe3d6cb4beb8ba89414f9830c4a515e19a9fcbebe4b879b3a13b2713ef543927840f0bfaed9b3c0b664fddf620cfffcdd9a SHA512 6a001c1c43c863428016fe20b702faf73b9cea9d0b884f050edd4960057dcbcd317b0083fd1cd180eba0e18a7e632b0e2b4ee66bb207ad74d99b5b2d713dee59
+EBUILD libaom-9999.ebuild 2464 BLAKE2B b7ce12113d541280fb7d0ab762970ae6e91bf5fafc05a6457a7e7483faab698d3a354e2a013ee97c011d6870a9e4ddb8530af43d7bba33c901742197385d41e2 SHA512 46fea52aa9dc196e9c740f86164264ac2bf4c5ab4acdbf0e94358c2dfd2c3d14b1417e5f2c3e7b01e622bfe183b3ea3afd9f83d2c45698ff88391f1ea94fa72f
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-2.0.0_rc1.ebuild b/media-libs/libaom/libaom-2.0.0_rc1.ebuild
new file mode 100644
index 000000000000..bcc3c9689fb9
--- /dev/null
+++ b/media-libs/libaom/libaom-2.0.0_rc1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	MY_COMMIT="1e711b0aca6721da83835e3b5ceda07238e8b6ae"
+	#SRC_URI="https://aomedia.googlesource.com/aom/+archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
+	S="${WORKDIR}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/2"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# the PATENTS file is required to be distributed with this package bug #682214
+DOCS=( PATENTS )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 22ed36836856..67c9b166e78a 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -25,9 +25,10 @@ DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
 HOMEPAGE="https://aomedia.org"
 
 LICENSE="BSD-2"
-SLOT="0/0"
+SLOT="0/1.9999"
 IUSE="doc examples"
-IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
 IUSE="${IUSE} cpu_flags_arm_neon"
 
 REQUIRED_USE="
@@ -53,6 +54,7 @@ multilib_src_configure() {
 		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
 		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
 		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=OFF
 		-DENABLE_TOOLS=ON
 		-DENABLE_WERROR=OFF
 
@@ -64,6 +66,7 @@ multilib_src_configure() {
 		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
 		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
 		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
 		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
 		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
 	)
@@ -76,3 +79,7 @@ multilib_src_install() {
 	fi
 	cmake_src_install
 }
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index b7de3b3589e1..8f54ad2f0ed9 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,6 +1,6 @@
 AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
 AUX libde265-1.0.3-use-new-FFMPEG-enum-names.patch 933 BLAKE2B 50f4f65a7c73365bd6f803c4fe85e029188a184dfe8dce5768e47af15cb489705129a5054aaf6bb12d8822de588c6ed10cf8384db7baeb2b4a6fee1a8a96494d SHA512 cf88bd2d40d9726dbe8bd8c3cddacccfef065635cf20751efd30dd30ac706d640be3b06a284a5bc11b457de63206d699405a6da8fb39cd0d5425371f5d538549
 DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4
-EBUILD libde265-1.0.3.ebuild 1660 BLAKE2B 9856962bc2a8234d71e022e4c122b82de6d8b9775e717c0228105bf5c15de6fe538153568e987763913c273c24fcf5275f9109235f73e3ac72f1a527234d3a16 SHA512 2e20a286d98008780a4e5c0c8ebba21c32c41098cf2115dd38cfb4f43bdc3002ea63a24335c16fac8bde7aab7d8002fefe850a4cf2c4ced09b947665ddf94c76
-EBUILD libde265-9999.ebuild 1591 BLAKE2B ed15d6f1b6c081db4f8d88aba07be21a3a167ffb9f0dc3486d3e1eda737104bb2e613fdf5d7bc822952eb722e85be6232089d8bbd6f0834c1750358edc629b49 SHA512 3e617c6721f1ae5b768ba2bb8cfb74081aaee28566dfdaceecb5ab42de66ffd74239121469b3a6c99d8ae3dcc8bda885f2eeeaf57fc1126969fa2515cc6c73b6
+EBUILD libde265-1.0.3.ebuild 1590 BLAKE2B 48de41d7133072b75f48b2fb954390915085931ec6f90daa56d6d437d130795039c682f36a8b053783e29bdbd4faedda8e15d48f0c50df57ba6b754462ca0360 SHA512 431fdd0871422199e7d9278fb21857e5a9a27cb34ba949767526d9f9ada57e65efe5abe3c4fae464e2bf3f021981a786cdeb84a9917032528cf08de4e30b8ac1
+EBUILD libde265-9999.ebuild 1521 BLAKE2B c3795a5d80124f4208d96e1901b69f1286074ce0dbf360b520e6d6e15b40d844980556e8f4da1b0e325712270b816940c680143fea650562637f7f0bc66ad64c SHA512 f2cb046e270197eb0ef2cd4f3e1fbaeac5c089c21fb119c650fa53ca7a85e74c9281e6cb4dd09256e07f94db55569e231a6d58901c6689ed9ff0322e37ec5ba6
 MISC metadata.xml 307 BLAKE2B 785344dd93b51d9103d01c68ba80c44821c36a1f61eeefb0dff56d708da5f6f1991ba142f44b6b652366e320410967deadcf537beaf256995a3a768fce7bee05 SHA512 27b883ff65471f49c87c1b21911172f82058a0492bec54290534fc5229f193a94675223a6b3064c84115eda4035fea6e6f5b5477f924adede2c2a72e55ece273
diff --git a/media-libs/libde265/libde265-1.0.3.ebuild b/media-libs/libde265/libde265-1.0.3.ebuild
index 4e6baba9ecc4..7eec974a733b 100644
--- a/media-libs/libde265/libde265-1.0.3.ebuild
+++ b/media-libs/libde265/libde265-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,12 +20,11 @@ HOMEPAGE="https://github.com/strukturag/libde265"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cpu_flags_x86_sse debug libav qt5 static-libs"
+IUSE="cpu_flags_x86_sse debug qt5 static-libs"
 
 DEPEND="
 	media-libs/libsdl[${MULTILIB_USEDEP}]
-	!libav? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
-	libav? ( media-video/libav:=[${MULTILIB_USEDEP}] )
+	media-video/ffmpeg:=[${MULTILIB_USEDEP}]
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild
index 516a30d1f3d9..7f4f73fb81e2 100644
--- a/media-libs/libde265/libde265-9999.ebuild
+++ b/media-libs/libde265/libde265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,12 +20,11 @@ HOMEPAGE="https://github.com/strukturag/libde265"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cpu_flags_x86_sse debug libav qt5 static-libs"
+IUSE="cpu_flags_x86_sse debug qt5 static-libs"
 
 DEPEND="
 	media-libs/libsdl[${MULTILIB_USEDEP}]
-	!libav? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
-	libav? ( media-video/libav:=[${MULTILIB_USEDEP}] )
+	media-video/ffmpeg:=[${MULTILIB_USEDEP}]
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index b627c9cd1029..dcca3bc9e6d1 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,6 +1,8 @@
 DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
 DIST libdvdnav-6.0.1.tar.bz2 378491 BLAKE2B 1baccf42bab3185584d1abc455f5b972115f1cf74a2b465b41c4858ccb26b351168b565b2dcdd5a15532fbbc090a233ab8e7fa5a3f7f77cbe9de5b22b4d31e11 SHA512 83a015821dacea702eb34abb7a940b9a263918a66fe711fe9a817754f25c2aa0afae3543b4d93673d1c93d3e7914e1b776c10ce50465516f4e3a3d419c15ad9f
+DIST libdvdnav-6.1.0.tar.bz2 370145 BLAKE2B c0bd54d94e58eeddcc422e24ef1b400775f28c0eff516db3cd13a5dfcfe103a122fca59734d73e83784b4f0b7ebebddaacf89709991f1485b55f897bf8de7fc7 SHA512 40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71
 EBUILD libdvdnav-6.0.0.ebuild 1150 BLAKE2B 80f8afd10491a987ef3d478b07bef5b20c750a47772c71434439476aabd9e183d771d2bf74028d409ee286ad37c379140f0188bb9ccef945e44ec0fc71f215ee SHA512 5c100a56027ff7b7a53e570ab26820c7ad53dd161dcd4bb7fbfaf181541b847c7745dcc87adc7abc1a2655ec989869382e7409b3f7327291b719521927fb207d
 EBUILD libdvdnav-6.0.1.ebuild 1177 BLAKE2B 5eefb46001ad2f9e63c32ae559a8a3ed03eae7a17127945ac8f0b3f3005346b15b183a0cec002839bf515e7c5ae778ed3b2ade3e0618000eaf5b325835ca52c0 SHA512 f3bfeae4504208ddeb5aa5f4f66a218b581f2353e919b531e2c5a400b2c08ee8a9582cd7b82b73b08d51d598327922a074542a2311ad2878cb392d41a5c35e9d
+EBUILD libdvdnav-6.1.0.ebuild 1177 BLAKE2B 5eefb46001ad2f9e63c32ae559a8a3ed03eae7a17127945ac8f0b3f3005346b15b183a0cec002839bf515e7c5ae778ed3b2ade3e0618000eaf5b325835ca52c0 SHA512 f3bfeae4504208ddeb5aa5f4f66a218b581f2353e919b531e2c5a400b2c08ee8a9582cd7b82b73b08d51d598327922a074542a2311ad2878cb392d41a5c35e9d
 EBUILD libdvdnav-9999.ebuild 1177 BLAKE2B 5eefb46001ad2f9e63c32ae559a8a3ed03eae7a17127945ac8f0b3f3005346b15b183a0cec002839bf515e7c5ae778ed3b2ade3e0618000eaf5b325835ca52c0 SHA512 f3bfeae4504208ddeb5aa5f4f66a218b581f2353e919b531e2c5a400b2c08ee8a9582cd7b82b73b08d51d598327922a074542a2311ad2878cb392d41a5c35e9d
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
new file mode 100644
index 000000000000..945ffe1f209c
--- /dev/null
+++ b/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for DVD navigation tools"
+HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
+else
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND=">=media-libs/libdvdread-6.0.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+# To get pkg.m4 for eautoreconf #414391
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index aaf5bb7cb984..c3e28f0baa34 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,8 +1,10 @@
 DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
 DIST libdvdread-6.0.1.tar.bz2 404512 BLAKE2B 7db1d9ef6b728ba732d9f3c9e5aef6da5b8a70ee0ef95902c8de231ad64c7ad39a9ff1d01169688d197094b2755e34b1416b9f2d063566cc89984cfd86483a26 SHA512 550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b
 DIST libdvdread-6.0.2.tar.bz2 405298 BLAKE2B 912e9a6731b142efc11a8814163061d3aeb7620aa955a822a505ac3556f82b0cf065a996ed9fab23ba95e6dcde27077ae6439ca259e712219969fb3108b10368 SHA512 e8831a67bbf1a144e9298b59e5462889c8b0197592a3c169523b5d84d9b9c1aaa719ccde2aa98c490e04f2a94c3fa7244b286e8faed674ae8c70400a0ece9c6c
+DIST libdvdread-6.1.0.tar.bz2 391316 BLAKE2B 98a701b467c1f42aa54189ee16c786c6c87623e6dad3d43078f53b0fe16bf5e371f882a0afbd157b4ab622f1e65b84954f79c7186fbc781c53877da01cb1c7f6 SHA512 f34d039d1fbe74076cb3073a3dc6a9f3377e3bd05231a04869ca5faeb96e737750c8e019b908da89e83c14a2df38950a2d61a7c7a6c44c988b710fa875b236b5
 EBUILD libdvdread-6.0.0.ebuild 1120 BLAKE2B af5b9cf20d17d56f243d0c02d1b02a0e73138a88b021dd2ae7f8763edadb7d42a091bd713f9a3c0ea83ffaf35fb8074562017778ef9caf87321c264a12829018 SHA512 a54038c46bfbf00875e5b578d58c169a8db493777034a0fa819c5bbb804ea200e0b7a23ccefbe9a10e68a039c408c9659b88e0e41f2965c6a00fd6cb481b9507
 EBUILD libdvdread-6.0.1.ebuild 1136 BLAKE2B 33c4c015352f6022e0af35590067fb3c4e28fef3f46ee1459775b478600b3d15ab294d97e8cffa23340c96b94aaa0bba0be05fabfdb603a5167a27bc829f412e SHA512 537d8d40bd7c93f872e97c603ecf72d550aa7b2c00268a1cbc3ef070ef16f0d50193138e5ab937dd2c6fba82113787e249b42e3160e2c438c76968c3a9fa0553
 EBUILD libdvdread-6.0.2.ebuild 1170 BLAKE2B 714e13022a3f57401a0e76d8fe38b3b71e5d7e668342f11e80eb6663fdbeb819ba1a25fcd591f162ca396864b60b5a99120546b281005a4f7b426c11d680c66f SHA512 974f980525a044be87e43494a7a489784009fb71a24367ed8de6134d706c42057479b415abdbe436e31aaf4d0c8e6549bee5c227545460b7b41c44d36b0d6e0c
+EBUILD libdvdread-6.1.0.ebuild 1170 BLAKE2B 714e13022a3f57401a0e76d8fe38b3b71e5d7e668342f11e80eb6663fdbeb819ba1a25fcd591f162ca396864b60b5a99120546b281005a4f7b426c11d680c66f SHA512 974f980525a044be87e43494a7a489784009fb71a24367ed8de6134d706c42057479b415abdbe436e31aaf4d0c8e6549bee5c227545460b7b41c44d36b0d6e0c
 EBUILD libdvdread-9999.ebuild 1170 BLAKE2B 714e13022a3f57401a0e76d8fe38b3b71e5d7e668342f11e80eb6663fdbeb819ba1a25fcd591f162ca396864b60b5a99120546b281005a4f7b426c11d680c66f SHA512 974f980525a044be87e43494a7a489784009fb71a24367ed8de6134d706c42057479b415abdbe436e31aaf4d0c8e6549bee5c227545460b7b41c44d36b0d6e0c
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.1.0.ebuild b/media-libs/libdvdread/libdvdread-6.1.0.ebuild
new file mode 100644
index 000000000000..b35ac186b9a4
--- /dev/null
+++ b/media-libs/libdvdread/libdvdread-6.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for DVD navigation tools"
+HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
+else
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/7" # libdvdread.so.VERSION
+IUSE="+css static-libs"
+
+RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS TODO README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_with css libdvdcss)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index b956603ac0ed..846ff9b3e6e2 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,7 +1,5 @@
-AUX libextractor-1.8-CVE-2018-20430.patch 1405 BLAKE2B be8819430f6a608fe90a16f928d041399932202feb0e0c39885ed197e2f33728bfbaa05257e0b8dbab06866b9d03f413eff2d539e09d3be58135074fbbe3e167 SHA512 c2a4ef23dc856c03c885631be27f108337aa5e4d74f8aa1d4010ad9959694ae8d30896102b6c4067dc6ac3719177d4a7e453ef84c54bad37c5f988990f39be12
-AUX libextractor-1.8-CVE-2018-20431.patch 998 BLAKE2B 44e77c7f53c8ea2b134af14aa0810eb3b2ad1abfd689d1261de4bebd4586b9dd6c7c49f3b51f9d01c0bb6cc5c5bf224f668ed689db1b81fe71a8c144502a309d SHA512 3754ce52998329b70e7220efcdf855ac795010b145278c35c86ae558a50533854c06ad83c8f2b1a3e466a1649ce6a293afbbcbe7fded560cd319158387b1296b
 AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951cf548a2f1340ee24c180244f8ba2bbd85c7002c963d06257aac0b0457c2afeda755d0aaacb501280b995001f7bbd49d6de9 SHA512 6411df1498fd3594088b3488e490b25009e9243684b777d35fa26189c20f410b42496b5fb42f762c468df746a9bdcd6a310f645db5ab0bbe3bd121e82aa9d48c
 AUX libextractor-1.9-CVE-2019-15531.patch 518 BLAKE2B 2310c4863dcce5324706a96fb86cff7b72473d0027027bf8f40453cc863296a5c1880577af8a95f0875522da4d5251690c77cd8571e87d5c048f18240b8aee03 SHA512 5b50c20ce0e77f664578e1383e481694388e6200f01e3eef0029296deb3cc35cc76b2277d4a1f879f3f1d1b4d24235d2e17f26eacf0a5b963f1c1433a615eaa2
 DIST libextractor-1.9.tar.gz 8323852 BLAKE2B 71e81e57ce7857b7b7f0180a7b130b0808573d71384c61a1a079b0ce9c02bc4f1386d3b27c68d668b555a692e523a7998d6fbc675d15f8ee26b487b0b5b31927 SHA512 c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149
-EBUILD libextractor-1.9.ebuild 2825 BLAKE2B 2305da642eacc530b6dedf24ca4dc9b3459f5d1d4f2027b45ff8f615af11ccd97ba84c6dc5d466d6ef56d8a7ac3b1bc0debc4a255b788ca5ee95533779554acc SHA512 ce1bb5f376670968bf39b768a2a88e76f1dbc8e0038ea5ae3200c360ba3b30b276a682e15861b5d834cf4ef4b8a69ea3d54aef0b6ec248b74e88dec296233eb8
+EBUILD libextractor-1.9-r1.ebuild 2829 BLAKE2B ebd8669c31784b07344b99742e9f58c7d87d26ccd05c60152223f5eaf95f5a010769b4b66c0037bb5c3e8dd20c0b4e6d9fe6b41f3c757fb13d3ec7d95e29c933 SHA512 907b84592420ba5bfb440ff8e50a407e0c24c15a45f255dc4487488990e5cebe99cc2b475dc1903fd787b57733a5af4b81e0a0748763d03c49761b3883b46428
 MISC metadata.xml 560 BLAKE2B dc882ee2f4322f67c307f2ed919fd25d64505185f8046d94ca2680b060a01ee81a774aba5a96eb86f2a449c503683a2a92b4668e414149ffd109721d3bb7666c SHA512 9a290ce121dfa7d5a96cc3337e936b4cd21755d7becd2ae8fa0ddac07a536c9c05aa2501c5adf136ae454b4a85ded6e0e523fd4be248feec729bbc09f7f7749b
diff --git a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch b/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch
deleted file mode 100644
index d0b5968606ba..000000000000
--- a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b405d707b36e0654900cba78e89f49779efea110 Mon Sep 17 00:00:00 2001
-From: Christian Grothoff <christian@grothoff.org>
-Date: Thu, 20 Dec 2018 22:47:53 +0100
-Subject: fix #5493 (out of bounds read)
-
----
- src/common/convert.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/common/convert.c b/src/common/convert.c
-index c0edf21..2be2108 100644
---- a/src/common/convert.c
-+++ b/src/common/convert.c
-@@ -36,8 +36,8 @@
-  *  string is returned.
-  */
- char *
--EXTRACTOR_common_convert_to_utf8 (const char *input, 
--				  size_t len, 
-+EXTRACTOR_common_convert_to_utf8 (const char *input,
-+				  size_t len,
- 				  const char *charset)
- {
- #if HAVE_ICONV
-@@ -52,7 +52,7 @@ EXTRACTOR_common_convert_to_utf8 (const char *input,
-   i = input;
-   cd = iconv_open ("UTF-8", charset);
-   if (cd == (iconv_t) - 1)
--    return strdup (i);
-+    return strndup (i, len);
-   if (len > 1024 * 1024)
-     {
-       iconv_close (cd);
-@@ -67,11 +67,11 @@ EXTRACTOR_common_convert_to_utf8 (const char *input,
-     }
-   itmp = tmp;
-   finSize = tmpSize;
--  if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == SIZE_MAX)
-+  if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == ((size_t) -1))
-     {
-       iconv_close (cd);
-       free (tmp);
--      return strdup (i);
-+      return strndup (i, len);
-     }
-   ret = malloc (tmpSize - finSize + 1);
-   if (ret == NULL)
--- 
-cgit v1.1
diff --git a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch b/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch
deleted file mode 100644
index 2cd0448ba894..000000000000
--- a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 489c4a540bb2c4744471441425b8932b97a153e7 Mon Sep 17 00:00:00 2001
-From: Christian Grothoff <christian@grothoff.org>
-Date: Thu, 20 Dec 2018 23:02:28 +0100
-Subject: fix #5494
-
----
- ChangeLog                    | 3 ++-
- src/plugins/ole2_extractor.c | 9 +++++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c
-index 53fa1b9..a48b726 100644
---- a/src/plugins/ole2_extractor.c
-+++ b/src/plugins/ole2_extractor.c
-@@ -173,7 +173,7 @@ struct ProcContext
-   EXTRACTOR_MetaDataProcessor proc;
- 
-   /**
--   * Closure for 'proc'.
-+   * Closure for @e proc.
-    */
-   void *proc_cls;
- 
-@@ -213,7 +213,12 @@ process_metadata (gpointer key,
- 
-   if (G_VALUE_TYPE(gval) == G_TYPE_STRING)
-     {
--      contents = strdup (g_value_get_string (gval));
-+      const char *gvals;
-+
-+      gvals = g_value_get_string (gval);
-+      if (NULL == gvals)
-+        return;
-+      contents = strdup (gvals);
-     }
-   else
-     {
--- 
-cgit v1.1
diff --git a/media-libs/libextractor/libextractor-1.9.ebuild b/media-libs/libextractor/libextractor-1.9-r1.ebuild
index 6e14cb63b61a..91c6a2f396fe 100644
--- a/media-libs/libextractor/libextractor-1.9.ebuild
+++ b/media-libs/libextractor/libextractor-1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ DEPEND="
 	apparmor? ( sys-libs/libapparmor )
 	archive? ( app-arch/libarchive:= )
 	bzip2? ( app-arch/bzip2 )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	flac? (
 		media-libs/flac
 		media-libs/libogg
diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest
index dc5f179f153e..e3c68164b168 100644
--- a/media-libs/libgroove/Manifest
+++ b/media-libs/libgroove/Manifest
@@ -3,5 +3,5 @@ AUX libgroove-4.3.0_cflags.patch 1872 BLAKE2B 87a696b844394659d29bf586231519064e
 AUX libgroove-4.3.0_ffmpeg4.patch 2037 BLAKE2B 851cf22e93e2e5700b30c023d24b00db0852b36dd30665d655cdb3402c9d0ee1e286bc1a19988f992d8913560f6f943890cb7c993e2fdb798b23df4a1b0801da SHA512 834f760a7c7b51abda55f65d6fad1ce771d293ace9c7e4e39aaf5bfbc6763f9e3750e0aa3e8e6548893593b5c776bce357d557080b946b3425339367f21f2790
 AUX libgroove-4.3.0_sdl2_include_dir.patch 507 BLAKE2B d96df15e5378f8ab7d2f473c0fe05a210959eeb0ec4548bf7b03b3be701cce263d3c5d91c85834b18b2426e1c3de7845abc5eb069e226429a4d7ae67809f156c SHA512 5c9954680369c9e90a5acda70da36a57ea64ce8f44fcb5a0f962636cbf710ddd968c7c7bff18819671b6b89dc68a0b9513b8223ac7ba9bedf8f005b4485272ac
 DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705
-EBUILD libgroove-4.3.0-r1.ebuild 1152 BLAKE2B 8999342893cb791a789a1df0e513815700a083c2c91a2f4c4f551d482284b409013cd3896382754d3e8653ced4131a11eefe36b3be6a93b1aed9a2d3bb10a2ed SHA512 ca437c9ffb94c74c1befdd9dc44d2ce3373788f6c43acbc0baa1f454a212449865b737c359ea9c0c066ad2a51b4258f1ec6f6c40f2d21522ae9ca4c7be62aadc
+EBUILD libgroove-4.3.0-r1.ebuild 1102 BLAKE2B cdf667d82060e9d7551e4a46bdf3ef334dd5b3c820a6dd14308d3cd2c7c36f4a52d5edfeda453cef4fd8ef8df26e370980164a7afc8e11d4519d6c5502e67a09 SHA512 7e069a066dbbd3cfec6b04a7b8a0217645e2fe4ec6b728e22118912606dccc083ba3d30a72ba47a943aed8621064d890ed6390b89f74a65c213f43d5e6359a55
 MISC metadata.xml 1202 BLAKE2B 4949a299d75c9e9d7bd40df94fbe3fd16c608d0110ddad43fb5717751bb0ed174c7be81b1913ad2313b7b7a8627a3c079bc125e5d50a8a0544ea961e7c89b0cf SHA512 1173c515ba13bec73cd60fc78b5b9936d47563c89cf2968ef49eefca4efa8c75badbc1cdb26cf8cea8c7737e7972f9d236009b829ce5fa9f07875bb7db003ed3
diff --git a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
index f780eb9949c5..1b2a09b839fd 100644
--- a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
+++ b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/andrewrk/libgroove/archive/${PV}.tar.gz -> ${P}.tar.
 LICENSE="MIT"
 SLOT="0/4"
 KEYWORDS="~amd64"
-IUSE="+chromaprint libav +loudness +sound static-libs"
+IUSE="+chromaprint +loudness +sound static-libs"
 
 DEPEND="
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:= )
+	media-video/ffmpeg:=
 	chromaprint? ( media-libs/chromaprint:= )
 	loudness? ( media-libs/libebur128:=[speex(+)] )
 	sound? ( media-libs/libsdl2[sound] )"
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index dbaf3665bcc7..6e8e83c4b50d 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,6 +1,4 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_19.09.tar.xz 1764640 BLAKE2B aa1a93cbbdf17e2b1eb20efed4909c5d86e897796e1e184f1bb5eed50e1eb154f426b420551e25cb220f66059618b6f719c47333b816258eea6e3c30304892b2 SHA512 7f3afbb1c2df6e2dec44485a4eda8609d6b95c1b8e41354cef6b94549f77a506e237c7d43f5472aadf1c0ef2bd88dc24ba0eb493a763ba51871bb287233ae779
 DIST libmediainfo_20.03.tar.xz 1799940 BLAKE2B a0c50ab27e29b010e33334c207872aefc110396401065d3bebdc6cf34aba325453b87e9f1f1ecfe9882bf5f63aaa26f3bbfe3d791cb0c16fa75ca4bb7ff081f0 SHA512 97dd847edf0e290f7ea0153c71a442cc54944bf295f195486f37fa81230cf4463ae2ecc154e73cf75b876b33c038020a9ff082013d57381ab5516a4a2db5ef87
-EBUILD libmediainfo-19.09.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
-EBUILD libmediainfo-20.03.ebuild 1853 BLAKE2B 668269c8a1db1c58e8033ee508ed9e9c55fa64165e6d7b55f967aeb2949ba71dfeb9c50ea2e5c03bdcda020c54857ab057929be9b6b727bc1b74fd41c01a8f05 SHA512 a56f9890c60876c346118f37618cf3a73f9284781a95fdd5130f620220508a41d550cca50cb636edd2a90a8e2d44819dac581f0610dba570a7a34f21ec60d90e
+EBUILD libmediainfo-20.03.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-19.09.ebuild b/media-libs/libmediainfo/libmediainfo-19.09.ebuild
deleted file mode 100644
index 5ec625856e57..000000000000
--- a/media-libs/libmediainfo/libmediainfo-19.09.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils flag-o-matic
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.37[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# tests try to fetch data from online sources
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-	eapply_user
-
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
-	fi
-
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libmediainfo/libmediainfo-20.03.ebuild b/media-libs/libmediainfo/libmediainfo-20.03.ebuild
index 617f561cf174..5ec625856e57 100644
--- a/media-libs/libmediainfo/libmediainfo-20.03.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-20.03.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libmetalink/Manifest b/media-libs/libmetalink/Manifest
index 8f1b0d84e1f4..dfd22eefcf1c 100644
--- a/media-libs/libmetalink/Manifest
+++ b/media-libs/libmetalink/Manifest
@@ -1,3 +1,3 @@
 DIST libmetalink-0.1.3.tar.bz2 327482 BLAKE2B 08bf06323e38793a4ecdd3860236fe8a5b97a2deb6d91a63938197fbfc06e38fd6c8fc9968f6fcd883270339ddeba9821711ca3a8acdce5e096c167cec28c9ad SHA512 2c944a00f9460447ecf961685d7cfa80243fec7ad462dc2339fba0e944d0b92ff42bdf07032f2ee0695f0cd004e4c45bfe21e5246e1355a0d43756605894c632
-EBUILD libmetalink-0.1.3-r1.ebuild 959 BLAKE2B 8cfb429488aa299d2aeb53b7945a3d99a77413abb5802ed2d81e0482392688a63d5fff1c28a33f586f67e67a6ad831848122c693b256a9dcf23efa2015521ef1 SHA512 e787857cb30adc04c1951c45814e2062e2535d4f78fc923e79b6a6e49f662ebef8d2bc4d5d17ecd21f3d9124d29b98b2e746ce5b84bdadcb6835565b175dbb1e
+EBUILD libmetalink-0.1.3-r1.ebuild 964 BLAKE2B bcd309c043b8011c378153a9b7736e5922c3afe32c3568a5b18a8c833a63e07e3540c9f29c415f128e5e55c989e5baf3868942644d2a02fbdf96b3f54ee04fac SHA512 6403afba37f78657355ca2936884c405bb22bdefae5395502526844abd8700fe499d2979e1d40f321b0a8aeae6268472e0002356f418f0654650a571d60f759d
 MISC metadata.xml 246 BLAKE2B 8de378056256c0217da9beda2aaea7afe4967f48fa4b62cf3d8cdf2428791003a6cf4bbef204342dadbfb05e1be7a8914a637de532ca6f8ea9f4f68273cb6f4a SHA512 c7a53354d3381e820c1a7cfdd90850f45dc034c96006ba7d6c9459727fd0f1adf5473a35ab52de8bde5a14b66099cc67333c75953199bcac9e7567dacea2838d
diff --git a/media-libs/libmetalink/libmetalink-0.1.3-r1.ebuild b/media-libs/libmetalink/libmetalink-0.1.3-r1.ebuild
index 1cf2f2700602..6089b55f66f1 100644
--- a/media-libs/libmetalink/libmetalink-0.1.3-r1.ebuild
+++ b/media-libs/libmetalink/libmetalink-0.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="expat static-libs test xml"
 
 RDEPEND="expat? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 0dea35ac2a2d..3734e2f89f31 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -2,9 +2,7 @@ AUX libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch 940 BL
 AUX libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch 2841 BLAKE2B ae03c291a4d0bc46e9e9daeea2760937273e910edf233a32ff257a10f10d81dbf7b91922bcfcd9c472b0c5190dbc1a51b313f092140a89e963702e1981f65291 SHA512 8034b0a332a5adf3c922009262d7cc602e0d16dc3050e967190b69fcec2d77b57378ebff674a058fe8d7ccece4cf74e61c82b54c823d1f75c5501c82e658798b
 AUX libmypaint-1.4.0-drop-python2-requirement-recommendation.patch 1052 BLAKE2B de6af484456b680f6bb5be82d5b2c2a8749bcb7373c2be7fddc39037f45ddc8664cd3291cb2794e96d54d99bd18e2b94e41bdaa5333dc4a121cdaffcf6651f54 SHA512 6a25e66188010955120055d98124e9dc30757e30826386a45e1d8ed1fb3b11d642c7c63fe8b755a3b047fe70a35a0691848573791581cd6a7298b69207e3b56c
 AUX libmypaint-1.4.0-gegl-0.4.14.patch 4198 BLAKE2B dad2b852ed3c8a68cba650993fa923491aecf31ff28784cd26f58486f62b1a66ee27c51320ba225489be66ad222389fabff819eaec1065e42f958bdd4f9b8a92 SHA512 100b0a6b3f2de32b6cee35924904e75a2c8c6ebd1483a8e02087945144ff078d6a570ebef8160c06194eb0965ebc78cd1d16232a85778414a8552926405bc783
-DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
 DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb SHA512 c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19
-EBUILD libmypaint-1.3.0-r1.ebuild 1372 BLAKE2B d3c6855f3d41abbd2140420702035eb9442a062cfc3bb0d0688146e1e0cc88641b2ebbecbaa9fab51931a273c16c65e7f9b204c1a35480dffface59840bea6cf SHA512 d263257420ee02aad0c44f107840e88ead259126fc87e380216b679b04fd17f1ac174b90d00d50808651c50d4b8edd3f6a695900b6da3db0c4ff4a67588a40a3
-EBUILD libmypaint-1.4.0-r1.ebuild 1712 BLAKE2B 2f4b25d83be297f47234c2872f769b130c6d289244b980bfcdcefbfb45424668c4ef02b3596164b843d259ebe2eecbcc6336140899248f179afb1862cf5a0bda SHA512 807a41635fed5dc20437fc821faf630b09265b551236892135f363e99a2dc7a66ec3bf344e88843dff1bf37c2cd1042f409008bea5f298cee45ad77cddb4edce
+EBUILD libmypaint-1.4.0-r1.ebuild 1710 BLAKE2B 1af97fe704b5cf33c215ed3fe597b34b32ff14d0af312a4d94c369fdc014fa12e03dd8e9ce34640d3503028a6a786d1783d7aa185bb570cfaaa75961dc76541e SHA512 966b2a8541310aa6cc570c52058c9321cc6476830f9ce53bc85508d1bd51db393e882ec2a93f9cfba2002210d15a1b83e5d1e894ff077fe8e05ab4c29b03721c
 EBUILD libmypaint-1.4.0.ebuild 1547 BLAKE2B 2c313f5538f415ccd0aed83030f1b99c735131fe912a8873196b4443175b24a4913706a6512e4c81687d8e8913beb669ff823b8ce5ca9748a5e3a2f1ed8ee712 SHA512 5e0ee94cca9d0fecff12c5fbfc3460a417ae4e7a0517d851e035c4fa8321c678ca4f6e52d9cc9b40dfbee9b027ae1884e5509a070cb7f908849da2aec81fb82a
 MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc
diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
deleted file mode 100644
index 38fbc7ccbf6a..000000000000
--- a/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 xdg-utils toolchain-funcs
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Library for making brushstrokes"
-HOMEPAGE="https://github.com/mypaint/libmypaint"
-SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/0"  # first soname component for subslot
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
-IUSE="+gegl introspection nls openmp"
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-c:=
-	gegl? (
-		media-libs/babl
-		media-libs/gegl:0.3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )
-	openmp? ( sys-devel/gcc:*[openmp] )
-	nls? ( sys-devel/gettext )
-	"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	nls? ( dev-util/intltool )
-	"
-RDEPEND="${CDEPEND}
-	!<media-gfx/mypaint-1.2.1
-	"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	xdg_environment_reset
-	eapply_user
-}
-
-src_configure() {
-	tc-ld-disable-gold  # bug 589266
-	econf \
-			--disable-debug \
-			--disable-docs \
-			$(use_enable gegl) \
-			--disable-gperftools \
-			$(use_enable nls i18n) \
-			$(use_enable introspection) \
-			$(use_enable openmp) \
-			--disable-profiling
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
index b41e50a804ae..9ab57d2652e1 100644
--- a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"  # https://github.com/mypaint/libmypaint/wiki/Versioning
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
 IUSE="gegl introspection nls openmp"
 
 CDEPEND="
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index 5cfb4ff1f83c..5c90e9eb9c6d 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,3 +1,3 @@
 DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
-EBUILD libnsgif-0.2.1-r1.ebuild 884 BLAKE2B 94387a3c9a398a2db36d044c4f4887a04891b3824f696e22943c617a213c1fc492fac14f1a6b5850dda0ae9706a3b23013bd9e1018634987a41a592b7552ef4b SHA512 893f6a342110e07cf7183b5ab4508395864735f408666e9731a14a93585dc11a36d8d40fee9fdfd218924b7c75a828512bf48289b9ec64bb562046eafed37051
+EBUILD libnsgif-0.2.1-r1.ebuild 883 BLAKE2B 3cb9521d197a236c202e156bb9ba595589f57532c3ed4e0ed2f18ab3e85a5eb5c1aaf884c2eb71684695b871730eadb8a4f5c781ad392ce84adce33a9031d038 SHA512 a50a9179fdc4811f4b97431ebf5e3d76bff815612f07934abd4810d8c3609b2f735821b1d5a3e7db481176cf3019cbe2d20d1471468467d777490c24f43c8a17
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
index 3d9cf047e07b..230b3b8aac27 100644
--- a/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
+++ b/media-libs/libnsgif/libnsgif-0.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~m68k-mint"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index d580bae02584..fa063a9fa618 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -2,7 +2,7 @@ AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba
 DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
 DIST libopenshot-0.2.4.tar.gz 10295888 BLAKE2B 2967f1faa56090355255e24c0367a4171af7433c53eab303c9d88432174d03879ae9fd2e6904e614ea6ba210e0c72c401cab95a1d2aa93ddd2cea2b861e985ce SHA512 6824ad22e81814b6427a4cb6489e5b893be264b5afa6e54287cd649f244f86b938c1b1d56280c1f49af65fa118d056d204bd39bc5b2ccdc10376d2df2f33a352
 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
-EBUILD libopenshot-0.2.2.ebuild 2203 BLAKE2B 5df8e0074314e938d24c187b1caa311571e7941db450556363550a42f858eb994e2fcc259f98dbcda49360aa6a244b4e3963a5ae5fad1ee206efb6b727dac6bc SHA512 aa0645ebedd9d4d7e1b81300c9ad39cfcf39277cd7ff9a215204ab0c95e6acd6c9469a4531a3dbb461407e1579941a39248a32c47f3fca01c95ede448494c4ab
-EBUILD libopenshot-0.2.4.ebuild 2342 BLAKE2B 1ef25538ab2cf6d26f591a69e0200404c338001cd2f177fdceef8734c559a7baf0bf752a1b118566569b8e277c1c09549bc6e8ec82973e2cd1dd6320106e192a SHA512 24a0fd2b1dc0a764e8b2ccc88cb6a77a69494cf8354ad2fa84290d8539f01818e9cfd02abe68e4c0c9d55a291d847139952dcf0805ad258554b054bba1c887d6
-EBUILD libopenshot-0.2.4_pre20190609.ebuild 2499 BLAKE2B 197e14dd027fe8b98ed18824e6fdc7b3684327c39a4e9275566e3c569e99415313bd87af1662653f6e7b3394f40846e1a6c04175c1121dec56cfeb4dfa370d19 SHA512 2edc3a1df921921f434aefb3edebc355eb1d54433acef15d8605a77cdd257a5c6977cc565b2137fe944947f5c4044f35ab13717d77ec9d437d912188ad22f296
+EBUILD libopenshot-0.2.2.ebuild 2120 BLAKE2B 396b319d1b0e9618b9c22c18565c4466d9bef1b8a8ed0b532e54cb207cb5348d48e05da6f240c854589e19b2e40df11976671eadf513807a6004d2ad6291732a SHA512 bfa64fa1b15e8389fb9369ab1e931c60f18becc812bb42cccbd644d52701cde9f523d5b1739e81842833292d02886a0ebdc3803b4eae5df6ec212e6a2b6614ee
+EBUILD libopenshot-0.2.4.ebuild 2258 BLAKE2B 1c18783cc8c33d985ee21044d3561eaae01c26a38df21b65f0c5ef18a783fa646fe453f91eb80fe328ff248f05bb51333d4cc5da03a49b28286be38a9928bf85 SHA512 1671c4ab1ba07e01f4c5e517ff4960ea641b24fe0cfb7b82edd174592c03820aacbc39140ac7591d983ec8dd39209a1fc2c7714137d529ce858f079c2106e056
+EBUILD libopenshot-0.2.4_pre20190609.ebuild 2415 BLAKE2B c890e1777e9fa8f01412bd50dffd1ff455c786805cde1717420fdaa846b2451ec0396dc2203a75baf969329525b75c5179830f145176dc3385a1496fd79da2bc SHA512 676bbbdc2958a228a0907e260a2a421f753283893415f393ebd3ba66379cc4910e3fc0b64dd7f87534db7e76d2ff6eb8f78bb22725ab4e095c9c969065410fab
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/libopenshot-0.2.2.ebuild b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
index f011d7adca61..36281237c364 100644
--- a/media-libs/libopenshot/libopenshot-0.2.2.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+imagemagick libav +python test"
+IUSE="+imagemagick +python test"
 # https://github.com/OpenShot/libopenshot/issues/43
 RESTRICT="test"
 
@@ -26,8 +26,7 @@ RDEPEND="
 	dev-qt/qtmultimedia:5[widgets]
 	>=media-libs/libopenshot-audio-0.1.4
 	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
-	libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
-	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
+	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="
diff --git a/media-libs/libopenshot/libopenshot-0.2.4.ebuild b/media-libs/libopenshot/libopenshot-0.2.4.ebuild
index 39d166e92c80..a8da723ee468 100644
--- a/media-libs/libopenshot/libopenshot-0.2.4.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0/18"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples +imagemagick libav +python test"
+IUSE="doc examples +imagemagick +python test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -28,8 +28,7 @@ RDEPEND="
 	net-libs/cppzmq
 	net-libs/zeromq
 	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
-	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
-	libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] )
+	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
index 0905430c03b8..32de4448a664 100644
--- a/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.4_pre20190609.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/OpenShot/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.
 LICENSE="GPL-3+"
 SLOT="0/17"
 KEYWORDS="amd64 x86"
-IUSE="doc examples +imagemagick libav +python test"
+IUSE="doc examples +imagemagick +python test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -28,8 +28,7 @@ RDEPEND="
 	dev-qt/qtmultimedia:5[widgets]
 	>=media-libs/libopenshot-audio-0.1.9_pre20190502:0=
 	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
-	libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] )
-	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
+	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora]
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libpostproc/Manifest b/media-libs/libpostproc/Manifest
deleted file mode 100644
index a6e010b9bb2d..000000000000
--- a/media-libs/libpostproc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libpostproc-10.20140517-support-MMXEXT.patch 976 BLAKE2B 529f8770ea4424506d16ad2a68d04948d4e0570f2ab95548d37398e9c878d412d37799c05402225c4775a4074362167dd9ec890af3a661711d45a863a814d6c6 SHA512 18e7c377e4d67f43e39307670a10f23795df441173456c6f57098f259a78ebc93e43ef884cc7b518275d3886e4bd8ccb2d952855c41f5857ceccd5c289ce0177
-DIST libpostproc-10.20140517.tar.xz 65556 BLAKE2B 374dc84fb52f32958bcf9daeaabf2be1405d444f72d1f1ccb22e42b657489adad55199e5be27fa80cdcc21ed4480bae901925fbd833bcd30625d82720d481800 SHA512 0d6dca077c99ac569d892bc92cd08c6bf3e3a5e30e623ced20227b5bd1bd1aa3ecd150bfc900659accd77b997eb64b4d6f0538f9b6161d190ef6c69dcaf47893
-EBUILD libpostproc-10.20140517-r1.ebuild 2358 BLAKE2B 318ac8431f292952b2ad15931fabeede2ebafd91d3c353aa20b6b0fb957cae09da52c4d2581ce715e338bca440a36978710b0ec9bb16f1d454ad1f00c67815a4 SHA512 fda1ede5c66c654450f6e250f7ec25a5fd5455b531f2bf8a0b540b36e90e0fc062db2e08b799f4135b8310aee54186433c824b3c5491e15eb0880c37f8e81a0b
-EBUILD libpostproc-9999.ebuild 2292 BLAKE2B 645eced47a3e77faf9b32ec8c84c656fe909f83adfcf466b2ebdad986f288ef33aa0c0c3609f4a0f821f3a9ad4a4e45e0c3bc5b03099a6b3dcdedd1a8a2e4866 SHA512 28d605b8e61bca3bff79fad005aaeaf075e7b44dda03b5f5a2593224c77718652ec5fbf286c71334d8096b2399a97744df8df0ec386e4a7e348a94277734bb1c
-MISC metadata.xml 405 BLAKE2B 5249780527d1e7eb098411f01da236035ae3d9459da2fb7c69194a758e84a92bd02338e5d23490f310b1b59eedca9b2e7333d96d4cd18a055da40da1bcdaa2c3 SHA512 f6a4bb0b0fe497133fe3a1d4781472ccbdf30ab5e9c9aabb272b990bd7c5f048da8c430212dfb3b0f41f2a5ad5ebf3c6ae774474601e250444324ef4faf9ccab
diff --git a/media-libs/libpostproc/files/libpostproc-10.20140517-support-MMXEXT.patch b/media-libs/libpostproc/files/libpostproc-10.20140517-support-MMXEXT.patch
deleted file mode 100644
index 8f7d5adc0baf..000000000000
--- a/media-libs/libpostproc/files/libpostproc-10.20140517-support-MMXEXT.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Bug: https://bugs.gentoo.org/621172
-Upstream commit: https://github.com/lu-zero/postproc/pull/1/commits/d0c9ca711ef69889ebd0e44da90dccc722fe663e
-
-From d0c9ca711ef69889ebd0e44da90dccc722fe663e Mon Sep 17 00:00:00 2001
-From: Peter-Levine <plevine457@gmail.com>
-Date: Tue, 24 Oct 2017 19:24:10 -0400
-Subject: [PATCH] Use AV_CPU_FLAG_MMXEXT
-
-Use AV_CPU_FLAG_MMXEXT instead of AV_CPU_FLAG_MMX2.
----
- libpostproc/postprocess.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
-index 63b6822..951d1f0 100644
---- a/libpostproc/postprocess.c
-+++ b/libpostproc/postprocess.c
-@@ -961,7 +961,7 @@ static int get_cpu_caps(int cpuCaps)
- 
-         if (caps & AV_CPU_FLAG_MMX)
-             cpuCaps |= PP_CPU_CAPS_MMX;
--        if (caps & AV_CPU_FLAG_MMX2)
-+        if (caps & AV_CPU_FLAG_MMXEXT)
-             cpuCaps |= PP_CPU_CAPS_MMX2;
-         if (caps & AV_CPU_FLAG_3DNOW)
-             cpuCaps |= PP_CPU_CAPS_3DNOW;
diff --git a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
deleted file mode 100644
index 7aaf82daa190..000000000000
--- a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="https://github.com/lu-zero/postproc.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Video post processing library"
-HOMEPAGE="https://github.com/lu-zero/postproc"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Release
-	SRC_URI="https://dev.gentoo.org/~lu_zero/distfiles/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="pic static-libs"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="cpu_flags_x86_3dnow:amd3dnow altivec cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext"
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-RDEPEND="
-	>=media-video/libav-0.8.2-r2:0=
-	!media-video/ffmpeg:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-support-MMXEXT.patch
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBPOSTPROC_CONF} )
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ "${i}" = "native" ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	"${S}"/configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}" || die
-}
diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild
deleted file mode 100644
index 1ce9ec065f89..000000000000
--- a/media-libs/libpostproc/libpostproc-9999.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/lu-zero/postproc.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Video post processing library"
-HOMEPAGE="https://github.com/lu-zero/postproc"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Release
-	SRC_URI="https://dev.gentoo.org/~lu_zero/distfiles/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="pic static-libs"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="cpu_flags_x86_3dnow:amd3dnow altivec cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext"
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-RDEPEND="
-	>=media-video/libav-0.8.2-r2:0=
-	!media-video/ffmpeg:0"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBPOSTPROC_CONF} )
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ "${i}" = "native" ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	"${S}"/configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}" || die
-}
diff --git a/media-libs/libpostproc/metadata.xml b/media-libs/libpostproc/metadata.xml
deleted file mode 100644
index c5d873a154f5..000000000000
--- a/media-libs/libpostproc/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="pic">Force shared libraries to be built as PIC (this is slower).</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">lu-zero/postproc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 9b1ce8583e8d..eddf23360a09 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -5,5 +5,5 @@ AUX libquicktime-1.2.4-ffmpeg2.patch 4046 BLAKE2B 1db6a761fa94a32741a05919d12d02
 AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52706413c1ffd88d8645de7359ec26f7059101ab81ac135cf7ef707a8acbeb709e1a6dae03d6a7e7f70c7e88185ebb271acbe4 SHA512 2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
-EBUILD libquicktime-1.2.4-r3.ebuild 3730 BLAKE2B b5b7d17f6cfc3cdcf2d01836faeed94bde84e2048da49da232c7faa256e66305766366904bed45e19a519baf6278469e527438950d7d66b932614e7e0d4fdd54 SHA512 31dad441cb0f2e4ecf106a4e0d91565e4c9a2d90f7f912a138adf407dc59b50842988939bf08fa2ad1891fddf4674dfc4ffedaf4366e49921eea87d87aadedb1
+EBUILD libquicktime-1.2.4-r3.ebuild 3650 BLAKE2B 01c2dfb8034ab3ca5dd604611c71afbbf92161296f4a87b7bfffc0cd38fdce6ddf020602c40cb0ff5c6117e672bbf4783fec92c40cf8663bc2cdb058146c0aa1 SHA512 ffe74639123cd95b5c4577a2cb1b392f65c408d2db62a604398ee558890e5105b694859fedfc296af92eca0f0fb7c6e3380298be8d1752893462d9bffcfe4ece
 MISC metadata.xml 305 BLAKE2B 6d9bada3e0a351337e65ebe3b38f821d76707bf4fd85c5d91fe186d019a2e179614d132cacf99d4d9d72ac0d15b93f6ebaac5758773736f2ac867ee5fbd1d473 SHA512 2f35d071d5211038792c700f90bf585c5d427ccf6aa98f41b38ca3faad0bcf6f2445c98985b7a51f751a2cf6287693ce21966cb1e98ce8162fc57fa0617ff166
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index ea62b7bbd773..1616c1db31fd 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png static-libs vorbis X x264"
+IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png static-libs vorbis X x264"
 
 RDEPEND="
 	sys-libs/zlib
@@ -23,10 +23,7 @@ RDEPEND="
 	)
 	alsa? ( >=media-libs/alsa-lib-1.0.20 )
 	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
-	ffmpeg? (
-		libav? ( >=media-video/libav-12:0=[${MULTILIB_USEDEP}] )
-		!libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
 	gtk? ( x11-libs/gtk+:2 )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
 	lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index d0380deaa84e..4c612d41cbff 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1,7 +1,3 @@
-DIST libsixel-1.8.1.tar.gz 4777791 BLAKE2B de96029990acc00e0c5fa81e6f892153000a93841b8e152ecc2ae3db0e7ca1dbe5063fdbf69f79f23c82095b253206c7bea0f638ed7536ebcf3d0d23a1137965 SHA512 af38b47aac443bfb443aa7b12041ecc1496722afbc861ad8572e90c34c7c1ed4ee04241d5d5f3abb7d8be945fac2a1f718494c4fbd023a6a7b9f6d912f90554c
-DIST libsixel-1.8.2.tar.gz 4778776 BLAKE2B a43ff76e271b27337fa4144bd89170f33bfae535696f5107cc77b3adef370e89d9da950746621ec7002b201f68dba873f99463d8b2183c319b62f2574f0562a3 SHA512 f0287b7b7a190f0f964e27fc65aa816a78c09de5e50045a25eb05f9b430c74f779a7d5eb591b3430a82a06621d53719bf115bcdd0b99acc9afe3cb9ab6fde271
 DIST libsixel-1.8.6.tar.gz 4791628 BLAKE2B 5fa197d0d759eecd4040c4c1101e6d85fb9af7405ccdff75be571b3ac6b2b0aab6415bc3fdbb37157795f89190fcc1d0fea1bdf705e83a34762e2b05f5588c69 SHA512 460a5d46bada705b4a7ec2e250e2bde7f4b8ba155281fa5a102d1121f79c1c79145f042cd1f4bf93a2fc29e784e89afd539e963470663fc659d4fe72ea49fdaf
-EBUILD libsixel-1.8.1.ebuild 1140 BLAKE2B ab534788b27f873dec3690f6a22ee34be7a8d3a6e31c4c7caf680853c2f6a596386a0e6ce421232ada546aa95cd055daf1b6b43963ac7563248041088d86ddb2 SHA512 45e01e40d16784ce4723c613f15dfc1ffc47a78097f028ebe9cc9510f124a347b37bf408b3c7c40a8af05c96e43a536d377c036882bea1110301ef7b23918259
-EBUILD libsixel-1.8.2.ebuild 1142 BLAKE2B c13f2c30518874b308dd758672367445567292105224bb959f782284444437277e1b354a8f3f04530fcd437f8a09a635189aefbd0b74b53158bd4ddc05dcc367 SHA512 604e91d30ace2de226d6973239a5f3e8d67ab97189c46844f85a4d6357a93c5c3e0afc77a675bf4ecfc9396f193995b5731968b6ce3841c1ebf43ba67e1b887f
-EBUILD libsixel-1.8.6.ebuild 1139 BLAKE2B 25ee7bc8169caf806e2207157ecee901f02e49e075d987df1c29c54ef407918814968c1049162f0ccb0ce38f66ff9a2491a30724978ef0cf07144a097dc486f4 SHA512 81be56f57e7872990e416281e3c9d6ae63fb120380b4f66e4b1bf99dfd7b6beeb54beeeb8fdd93b2118982a6c7072da23627bd4cb7812124d9776c35235f3195
+EBUILD libsixel-1.8.6.ebuild 1137 BLAKE2B f800ad1ab44e827da2e31649859649d7a119d06b518ca303d31e5120e3ac2f342d914a389dbb53d3ce28987fa5e3ad5e990cfb4af4818d6262c4e7559b611d5c SHA512 e2e3b502296827210a9d3cb78b87bb4abdc1857fe00ac72c4a969d31c2af18651421095a16172402a64f92183457f120c36da5fdfbe81a0ca605a782b5c71a5b
 MISC metadata.xml 329 BLAKE2B 607583721c17ebb8bd03d4142860d189cba164b08acbb5471a06172a0b3eb58a141f3daf6cc5cf96b7830699d9528bb60ee5214bc376a0514103e01ec8df4fec SHA512 018b8cb5c0a19e397914b799dedae30e20aab765ad58098529a45cc2aa14bd695abbd75b09efd0eb957da1dcc99b0ea04bf07f167047095288b033f82c4e4b92
diff --git a/media-libs/libsixel/libsixel-1.8.1.ebuild b/media-libs/libsixel/libsixel-1.8.1.ebuild
deleted file mode 100644
index 29e9737626bc..000000000000
--- a/media-libs/libsixel/libsixel-1.8.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
-HOMEPAGE="https://github.com/saitoha/libsixel"
-SRC_URI="https://github.com/saitoha/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE="curl gd gtk jpeg png static-libs"
-
-RDEPEND="curl? ( net-misc/curl )
-	gd? ( media-libs/gd )
-	gtk? ( x11-libs/gdk-pixbuf:2 )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_with curl libcurl) \
-		$(use_with gd) \
-		$(use_with gtk gdk-pixbuf2) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_enable static-libs static) \
-		--with-bashcompletiondir=$(get_bashcompdir) \
-		--disable-python
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-
-	cd images
-	docompress -x /usr/share/doc/${PF}/images
-	docinto images
-	dodoc egret.jpg map{8,16}.png snake.jpg vimperator3.png
-}
diff --git a/media-libs/libsixel/libsixel-1.8.2.ebuild b/media-libs/libsixel/libsixel-1.8.2.ebuild
deleted file mode 100644
index c05386adb4e3..000000000000
--- a/media-libs/libsixel/libsixel-1.8.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
-HOMEPAGE="https://github.com/saitoha/libsixel"
-SRC_URI="https://github.com/saitoha/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="curl gd gtk jpeg png static-libs"
-
-RDEPEND="curl? ( net-misc/curl )
-	gd? ( media-libs/gd )
-	gtk? ( x11-libs/gdk-pixbuf:2 )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_with curl libcurl) \
-		$(use_with gd) \
-		$(use_with gtk gdk-pixbuf2) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_enable static-libs static) \
-		--with-bashcompletiondir=$(get_bashcompdir) \
-		--disable-python
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-
-	cd images
-	docompress -x /usr/share/doc/${PF}/images
-	docinto images
-	dodoc egret.jpg map{8,16}.png snake.jpg vimperator3.png
-}
diff --git a/media-libs/libsixel/libsixel-1.8.6.ebuild b/media-libs/libsixel/libsixel-1.8.6.ebuild
index f938c80c4d36..ad139ad3d010 100644
--- a/media-libs/libsixel/libsixel-1.8.6.ebuild
+++ b/media-libs/libsixel/libsixel-1.8.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit bash-completion-r1
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/saitoha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE="curl gd gtk jpeg png static-libs"
 
 RDEPEND="curl? ( net-misc/curl )
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index bd5dd09158a5..56d8a7b52de2 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -9,6 +9,6 @@ AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d21
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
 DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998
 EBUILD libsndfile-1.0.28-r4.ebuild 1869 BLAKE2B a2cd5a12dce29bb9fb19a1da246299b3d66eb06ea4867bd5bbb224a78e4e9b8324f45d8ad0c1cf1b982360210af08aed49432503a885e15098da4db806d14b7b SHA512 f9babe5df3082d394660f54872cbb13e7a03dbfdb86f24a247302aa72fa139874e6425455b0dc624eee8b87a7809aab7324b8e1802db27e0f801ee91b9e7f9ed
-EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1670 BLAKE2B c05d90db9bb23cdc27904a772317bf6bcdfb204b76ee80b1a0880bbe9cf82a2b6fa3547dab652f30cd1c5572ac0aee7760d9e82ed1bf20dc1a3e19dc9f40bdbc SHA512 2ee4e9af00003f7f972e2a620932c57382cdaaf2c94fc75993d38b2f678c53f0fc9b7b6be53c9103fa5a9a4fed1d09b5d75ccd70bc67af99306cee83f0f3742e
+EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1666 BLAKE2B 966f72edf81507e87965af965952dcca80c9cf398c09d95d8832d80fd4d47a2571191da9f48dbc9b9a2ac34eb07b1d40895deceab17280c2c8bac2d4b2f18f0b SHA512 984cc4a61475efd61d495a78598e0c30e5038ba5256e53a22ee0db67e9b5f59d68f0dc019c6b2dc389f22d688badf7ecad690c8823ae0a07549f2da5522d96d5
 EBUILD libsndfile-9999.ebuild 1817 BLAKE2B 6750b63025de4d300724362b75e69b1a63a3c33961367fd807524d0e8d7446764bff203f0d5564604d54905a5b9767601cac86dad687ca67a26d08ce9dc3612c SHA512 b507722382cb7623de70a62463b67abfee3c974b9ede0cc90e679ff716ad0d1e643ab07dc1ce6738138a7ac4cdaa0a0b674494c4cf0013178d23c896c2b43285
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
index 4b89391f25f9..c9272f7fa8e9 100644
--- a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/erikd/libsndfile/archive/${MY_COMMIT}.tar.gz -> ${P}
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="alsa minimal sqlite static-libs test"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 939361d5268e..e64f21788d7b 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,3 +1,5 @@
 DIST libtgvoip-2.4.4_p20200301.tar.gz 1481876 BLAKE2B cb589eb5c1aacae92f2a6701fed727807f0527320276cd440754052469bae99d613ba3eb5f5166c169d9d0ee7eb77913e98b196f2269bb0a234bee8eed251ab1 SHA512 8d7e540e62447cfaf3e0ef98a2c3c0e9e16019299abd9e384f488d3f34b7efb750c3174175c287c2b520ebec649df55055bfca9736617c6adc33709c25a0cf0f
+DIST libtgvoip-2.4.4_p20200430.tar.gz 1481816 BLAKE2B 82bf6b880f28c9b63f547e473547298e25ea3b7e35b3a832a7375b0ae3a745ea3b5d55f5e635ec678e388a608532a14de85f50828da1dbc9ed77dc23be64b9e0 SHA512 f3130c50dfa7d3f710809bb72fb71d1b246bc91e9f8f413e704499011c8ff01f87a7226315f7cfd6edf2d2b8b6c875508185f516792ff5db74556aface33cdb4
 EBUILD libtgvoip-2.4.4_p20200301.ebuild 1022 BLAKE2B 9534bffdb331c660fed9eb6be2a0a51bb6990351eca8fc0786e609def80f8853a306cf4cfd46cb9af6ac5d2eaafa67d6a6c90938c1062a398ff1c39624825daa SHA512 d30198dfe0910e53912ea6386253472811f345cba956bd6a29ee598ee728ab62ec80647e3dcdafbcdc99d7e1da44c264f75cec74317ed5e5dbe2e0e7e2a52f88
+EBUILD libtgvoip-2.4.4_p20200430.ebuild 1040 BLAKE2B 386991f8aa3a8e3c42c08955b954b8401e204346e90a1aa28187018c3a4af3399b27d81359b32c378790cca82537c3a6625277d4ef5cecd8d26184dda139b3cc SHA512 2ebb9d4ba8ba165a28a66f5b4aaeb8a37aaa02cc126619f318cee0c0bd99da64465e9a0d6ba3475658b19895761334e5fe8c1afa08386247a2ff36b38dbd8ffa
 MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
new file mode 100644
index 000000000000..7d02572b760a
--- /dev/null
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200430.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+EGIT_COMMIT="a045c9eea47b371c0c514c72c76172a211c894cb"
+
+DESCRIPTION="VoIP library for Telegram clients"
+HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
+SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa +dsp libressl pulseaudio"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/opus:=
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable dsp)
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 0477e239d019..d2f0de4f4a2b 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -4,10 +4,12 @@ DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a
 DIST v4l-utils-1.16.3.tar.bz2 1894961 BLAKE2B 71c674abbb3415e592354998e1baa3eedbb4be21757bef80b463ea987e9fc231789e6b333b37d0d9916cb30729e04951dc9f1755ab00a82502fdc415b00cb9a2 SHA512 404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b
 DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab SHA512 f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
 DIST v4l-utils-1.18.0.tar.bz2 1995506 BLAKE2B 35cd138c88960e5b02431c408a43905a73ea6a7650a939abc2250e1f219bda1437262a7083d90d8b4d39c5bd2cce5f6fc590b8dc09a8738fb5baf55266256b94 SHA512 749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b544ee2a306dda79973da04f0301278ee88775f798aba590e5d0f15226d49
+DIST v4l-utils-1.18.1.tar.bz2 1995211 BLAKE2B 853fd7390ea98bcb833ccf43a9408d2ab7212d87512351bf5f4cbb8e626f18e0b8224b953283eb57a93c4d4de5626ce1f9d896d1a9856623f6322ff2be5bb9a7 SHA512 2e9f77abc2fd65bd6a5508831185a941553441384719293f99ece7e6c53c37bb142eb3719532b11f1cef48df691667d2a4235d920338d672738d40659d499056
 DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
 EBUILD libv4l-1.10.1.ebuild 1400 BLAKE2B 0a109cf4ce02b5698a9eaa3021bb12b462f520ee22fbc3c56a3e4cb2831020db862759b0e0a1b43d2bbb36d89a6b31a3f097415e8939f34b350c263726888cc0 SHA512 2232d3dce5dfb8b2a2d4ffa368e20d920a9c438ed7cdfb850e8e0f1c4c5e20186b5f2f3e30be6d945c8e704d0734dc4dbb411582e8758e2f571841b9a1f23379
 EBUILD libv4l-1.16.3.ebuild 1356 BLAKE2B 0c7992fb2e53bac0255e9d80ad4b7aa3cf320544a48e891a4746001d9b3c69bdfb04ddde99f91b9aa0b5579185048c185f7baebd4acf8bc3e3aafccc9303529c SHA512 395082dc3461936632e96ce65f8eb563cac7741d30247ed7d1d564574b57004278a61f457eff1579215a6c19e3d677a1fb24d3d669bdfdd598eaa16450b75b9c
 EBUILD libv4l-1.16.6.ebuild 1462 BLAKE2B e494bb7c233a67b174834037f94b44473744d02e3f64c81221aa384353d36ab120ce1d84a331e2c833d04119d2d3a5a70982fd9f3fdfaf3d05d2c0d200a557a5 SHA512 026eb18799f282078f861a2f26f1ba81d7b3a6f3d80acfd20d93431c4507ea6f2815f976e625e84074da3f1b951c1b7335f48572d7bc0ad87436ad5eddbdb751
 EBUILD libv4l-1.18.0.ebuild 1465 BLAKE2B 288b6c2258790fd7de0ca36e02842227ba524f8a4d761767896681f2b3d5e791b35eb78042ed726fa005926b38bc8ff6b3b4c7834f691317efcd35665ef4314f SHA512 92c5f1aeb9cee88a219394a48c2eea7981787d255863f51134b24f3f105322392f5cb9d9b256dc0e68444a8c399b807eda5d3cdf77d6c982b668ecf3d93f0c02
+EBUILD libv4l-1.18.1.ebuild 1404 BLAKE2B 67207e0668e0b0eedab52f1cb817282455868047dd19aec889a2eddbae230b153c5c4c5c3da2494f1a07248e4f08e4cfdb4458d467bb0f747bd7c2d9033858e8 SHA512 da23bd79616d78f00aab92ac98142d5e029e5cea80c1a8470d1bd65b6c5695d1f1ebcfa2756f454fcb9c87297dc21f210748b45ffdf7b09ec8b4199c18e7317d
 EBUILD libv4l-1.6.2.ebuild 1371 BLAKE2B 43328abd8eb7cc182aa9c84de92dfc5b9e7635b876f1a662964f4be76aa3b9224f1bfd7a862e905bf4a95ddf3e7ffebaa0148f3ef459863ec9100c5b42b09e59 SHA512 777f7e6f18e9665d1753c0dc85358ffa9319497b077724a214e7388c2560bfeb1ae6dd7400baa947ed961fa6d551ecf441d3184283876609626da418343a50f5
 MISC metadata.xml 1120 BLAKE2B b8854ccbfdb3674f5dd2657270945dcea8f9b48e501a07e8589bb04e0b99f927b8499afb979cb34a8d79a04e9813335188853db768dfe774fc5ab2919e9a34ee SHA512 09c21dcc53a675a4e04506dcf8b14b81947806dc761346a4bcb6a6ffdda7b60fb1adf0a778d7e4f060327aea55ec92b7fb700af7a874355d86b64a96541c8c5e
diff --git a/media-libs/libv4l/libv4l-1.18.1.ebuild b/media-libs/libv4l/libv4l-1.18.1.ebuild
new file mode 100644
index 000000000000..19690840ac81
--- /dev/null
+++ b/media-libs/libv4l/libv4l-1.18.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool linux-info multilib-minimal
+
+MY_P="v4l-utils-${PV}"
+
+DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg"
+
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	virtual/libudev[${MULTILIB_USEDEP}]
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~SHMEM"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Hard disable the flags that apply only to the utils.
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-qv4l2 \
+		--disable-qvidcap \
+		--disable-v4l-utils \
+		$(use_with jpeg)
+}
+
+multilib_src_compile() {
+	emake -C lib
+}
+
+multilib_src_install() {
+	emake -j1 -C lib DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README.lib* TODO
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libzen/Manifest b/media-libs/libzen/Manifest
index ef9ab245189a..ec6d34bb7cb2 100644
--- a/media-libs/libzen/Manifest
+++ b/media-libs/libzen/Manifest
@@ -1,5 +1,3 @@
-DIST libzen_0.4.37.tar.bz2 121707 BLAKE2B a9ffb4c06b5cb6dbb4c41f7d0b5293878b58ee842a5983a684f251bddb4c31184b1edc9604edd6e1961920c2341581001da2fd6ed204e6bed7620066ad73f1cc SHA512 3b5bec79470bec054cfa759e753e3925fbd9f27e508c692c0b100fcf1599696bff462d92c08799646e6ffc74c176e7cc7509ae0754c4710d527494f59d95d12b
 DIST libzen_0.4.38.tar.bz2 129706 BLAKE2B 3e40e31663f655885f47b7674936a765cce032da25fcc3f57604b116414bf4348db363a4745bf98126879de9d2de5d4443af1fe3a1f64a7bafd3525eb1ca38da SHA512 d946cd2349848925e13a3fb6aab5ad4f5aca28bc89b3263faca3096d7bbcae3a4ff9ed2552bf005b4ca1f4c8c8f59856f4c4aafa7c734ecebd078e6fc40a9a0b
-EBUILD libzen-0.4.37.ebuild 1284 BLAKE2B fc745ebfa15f10d408adc458fdc5b09166e63fade45598e6f8d56242c5711945aef1a26eed4964367f3eb92c258b65c8e5d80a29b292d9ea0b83c404e936a9d9 SHA512 98f3a82fb719a7649c0b60596a46452dfacd12da5d33a20e009dee0c4c971603dd88f5fbdbbf1fea6b7ec6cfc4f7f487aafa090ad6fe854108e246fd392d2be5
-EBUILD libzen-0.4.38.ebuild 1296 BLAKE2B 96a90e6661cfd6c37d0b5cd772d6d69a2809ac5984c198c59296a097cc67bf53c0d31c648d0d4eeaf343fd9e20ced7a10cc66e58c0f57fd8e2359b2fa14d5bf7 SHA512 6bde13f985bcbfa35c1ed39b016419d3e40ffbf9c03f431a785719efeb4b81e9991fe1909eafa28f6c2e594188b949fb30c25067d719a6a4c4f21ba0a771a5ef
+EBUILD libzen-0.4.38.ebuild 1294 BLAKE2B f186937dd8c346d7b039cd0fe2280f3ca3bb68ece9dafabcca17c4545f9b78c23b95b95c735878a3f1524af4ad8e37b5b44ea589357c6f58b4217a9a6f59aead SHA512 5af4b5142f22553706efc7a716d27b00fcd9f479b77e553f60c76249d71966fc72dc4431a3d9b7f8a85c2f24d8fd999e145d5db9fdb39611b7bf1a701ebc89fd
 MISC metadata.xml 391 BLAKE2B 4ca07b5516ad1c5d98991b668b2affbd1790a6bd6a0b4d266e10ed0b0f613ed1d1af538a2a2b0e258f68be98ecfa223c5e907526f811a5ae41e26597aebfb238 SHA512 5ccf372b5f508aa40d170cf71fffe84456b92527a9eb40c18c25c7b82b9c12d52578efebe2ec8914d401225c3fe188c06c55e5cd7e1510d8f43fb4f2603208ba
diff --git a/media-libs/libzen/libzen-0.4.37.ebuild b/media-libs/libzen/libzen-0.4.37.ebuild
deleted file mode 100644
index 61fd579e454a..000000000000
--- a/media-libs/libzen/libzen-0.4.37.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib ltprune
-
-MY_PN="ZenLib"
-DESCRIPTION="Shared library for libmediainfo and mediainfo"
-HOMEPAGE="https://github.com/MediaArea/ZenLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc static-libs"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_PN}/Project/GNU/Library
-
-src_prepare() {
-	default
-	sed -i 's:-O2::' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-unicode \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd "${WORKDIR}"/${MY_PN}/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	default
-
-	# remove since the pkgconfig file should be used instead
-	rm "${D}"/usr/bin/libzen-config
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Format/Html Format/Http HTTP_Client ; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}/Source/${MY_PN}/${x}/*.h
-	done
-
-	dodoc "${WORKDIR}"/${MY_PN}/History.txt
-	if use doc ; then
-		docinto html
-		dodoc "${WORKDIR}"/${MY_PN}/Doc/*
-	fi
-
-	prune_libtool_files
-}
diff --git a/media-libs/libzen/libzen-0.4.38.ebuild b/media-libs/libzen/libzen-0.4.38.ebuild
index 8ae68b864068..44bed1b7bf2f 100644
--- a/media-libs/libzen/libzen-0.4.38.ebuild
+++ b/media-libs/libzen/libzen-0.4.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc static-libs"
 
 DEPEND="virtual/pkgconfig
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e9df6081858b..ee5183bdb17a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,8 +2,12 @@ AUX mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch 1179 B
 DIST mesa-19.3.5.tar.xz 12064980 BLAKE2B a20ebfb149624f13951795e07154ab70dc1856a7a1261b339b0bdf0009511111756c88439e7b8729f768b0b4b298301b9a3c0c10d7f2fab3abd91649c12ba51c SHA512 413929573fab31e1bb2a1a04c0c770161c2db464a5aab3f0567d27603fff889ede70e1f6e197e7ff1c1639dc4cc543457bcf45761f0f8e6dffafccfa773a4e3f
 DIST mesa-20.0.4.tar.xz 12292888 BLAKE2B a14b747045ee4ff3bc07e527ad43d5b22047d6c9700cf290ba9c95e07bd88b9252bdd14380d4f0033dcb8fb652664987889d972db09462bcc69c8a7e843b606f SHA512 17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55
 DIST mesa-20.0.5.tar.xz 12257484 BLAKE2B 12d2530fa77dffadea74908e0b8e52f19023f0e2d012c607d7d5fc8b1380efad13dee50eee99a453b751340a3633b6260a3f1c82e5b16c03051df2fca6947740 SHA512 6f5780f7574400fea54978b40eb97faca35826a8a7bed96362d7bebcda78e2cadd44585ef8dd7dc126e0cc62cff61bee9b2ea360fedcc09a1fbb4c1f20c6aa08
+DIST mesa-20.0.6.tar.xz 12275708 BLAKE2B 9f6d9ae9c260e396670a3980ba83914ad0c1b7dc5f08471a78e4ab76e6ce3c18b96152fefc3846d89840be971180a2f4c176d40beb2c4b1f572011cb4b913f58 SHA512 a93dc3ed57ed7469b7c60cdbdcf4f29c5da4ec3986171c7b534e009e136ca21fec16207ffab38a6747437a9b1060e2e6c4b74c4e5cdc168b9aba0fc1940b5e90
+DIST mesa-20.1.0-rc2.tar.xz 12577196 BLAKE2B 8dc88b2546fd85874fad03258b8b8c7d1dbe681f568e5947e1d758234a8f6559b60810142c125bb56142be6926c50a8c20aebf45271f0e8270ff057dbce472aa SHA512 b912b1af69d9c33f1d0855887d4e5c1ea3dc10e7ed875d3285ca13b62314647b56470149484f270e8c8ff0ce4818fafd1537a71b59852957aab26f36e53edfbd
 EBUILD mesa-19.3.5.ebuild 14493 BLAKE2B 87bf68a63138a3cd69ef55bd0e32914ecc322defc089dd93fd0dd44cffbcfee156bdf40a7f5fd0b8b05dc5be54d56362500011751adad3635a33a3d73288f980 SHA512 fa540374ada5503e9d87cc436d75de9351092fd82cf556c9398f87abf0c1493c7592b5c870dadfa784c46f5d8218805143088797f2d697772ef8f9ca593cd8ee
 EBUILD mesa-20.0.4-r1.ebuild 14505 BLAKE2B 048aa31180d1242e2617dd6f33adbae79d37e4def656f926faf8496b5925b52340783560ba45ffac730e1f4aa227ae77af093a5bb381e24a435e8df62a6cf852 SHA512 272c0a151a06f5dc594f547358fd38a4cbde6ad6bc6329b4b05c88e42efe1c90d65fcd490565f7855422b6f677368f3ec71811348e9eca3622af70092de2cffd
-EBUILD mesa-20.0.5.ebuild 14343 BLAKE2B f15155e2bb25dcf59aebaba596b44aa3541155381b3e8a9cbcc3d8591d06c3ccf16de1333f779eb37c44d8a7dd70a693dbf757d24c649ee3a149c2719f0d8fcd SHA512 4161af5c2d81110f551899ca2d8429012a4174ea68e132c3e7695ecb8c8cc93a0d8d6a6e368be0823469a0faabf9201fddc0632c5596cbed11a7c190bf19a629
-EBUILD mesa-9999.ebuild 14384 BLAKE2B 9eef2961ff387caf5eec06930b28d1308d85373840f4ff54889a87a2d2242b2f454ca16e5986595470cb3baf1c434eff13b51689c8d52128b7e0659f1d83ab2c SHA512 f9360253c50366a09651ed77e8020673f516ed4d2ed702dec71ac1057727d24fc9c766c516aba878a0c48ff8868849834dc0c59e43873e4521366e9a1b37a736
-MISC metadata.xml 1917 BLAKE2B 795c4e550486eeb2f1fca9f43ad653c1ea45ba836677a3e68863d38faf5ccbcb140699f10366b2e1449718ffc4104830f378560e8b4646d5892b70a5bbe46262 SHA512 1133638886b3c039f15f7a8fa4ce55684db65f84e9d8c6b50ad8e2de4370d4303c6852c7d22239681923b5eb7fe6ebd77ee2caa41bb1210507268d3c1a69353d
+EBUILD mesa-20.0.5.ebuild 14501 BLAKE2B 17f9ccacf1ad095db48ecc8e510334a639885c8860a9fd0fc19e1ac434e46fd44a4431f69e7974890ed2b8425a6291e18a33de9cab128fca95a00cd9949daf7b SHA512 9874a7416e92a72c0fc97eb5cabb686f2b8d27e6bebfc8322f3966e736259a07a1762fd4746a634dbffb3980c2efc51c45ae900f626242bc6fc667c641843dad
+EBUILD mesa-20.0.6.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
+EBUILD mesa-20.1.0_rc2.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
+EBUILD mesa-9999.ebuild 14542 BLAKE2B 86e7f698319bec595583fae1cef94d8fcc453d20e8c9971a78ada1dd4e4a682f04994cfa61eefb8d97001a65e4ad78018110acfc7da08184b3c5ab5c287b90d2 SHA512 8264879e6c4b5cd8ca5b450e20f17bf403cdfa192536c507037e10027d81902fb865e84fda4827c96e39bad1ece856db2ed87ce5f345914215a0bf916106933c
+MISC metadata.xml 1989 BLAKE2B 239b50a1ebb1c70411ec31b3c1c2b85aa620f3ea7e0fcc104b3bdf9c1062df46948eeddbb5dc06258664b0a5c962d2af62d9d7f29091a82540ce170e2b1a3d21 SHA512 e8404153aa7d82b7c459afbab6483cb70372e3c69e366f71e3953d26a9299e5a82fc249751ba83a2a61329dae68e2aebb67d7989ea59fc2eb81c3d5c008ed2c0
diff --git a/media-libs/mesa/mesa-20.0.5.ebuild b/media-libs/mesa/mesa-20.0.5.ebuild
index 85944a36141e..b5ed3341ee9e 100644
--- a/media-libs/mesa/mesa-20.0.5.ebuild
+++ b/media-libs/mesa/mesa-20.0.5.ebuild
@@ -44,7 +44,6 @@ REQUIRED_USE="
 	gles1?  ( egl )
 	gles2?  ( egl )
 	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
 			  video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
 	wayland? ( egl gbm )
@@ -260,6 +259,14 @@ llvm_check_deps() {
 }
 
 pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		fi
+	fi
+
 	if use opencl; then
 		if ! use video_cards_r600 &&
 		   ! use video_cards_radeonsi; then
diff --git a/media-libs/mesa/mesa-20.0.6.ebuild b/media-libs/mesa/mesa-20.0.6.ebuild
new file mode 100644
index 000000000000..03083871b14d
--- /dev/null
+++ b/media-libs/mesa/mesa-20.0.6.ebuild
@@ -0,0 +1,550 @@
+# 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 llvm meson multilib-minimal python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm-sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		$(meson_use zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	if ! use libglvnd; then
+		# Switch to the xorg implementation.
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+	fi
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-20.1.0_rc2.ebuild b/media-libs/mesa/mesa-20.1.0_rc2.ebuild
new file mode 100644
index 000000000000..03083871b14d
--- /dev/null
+++ b/media-libs/mesa/mesa-20.1.0_rc2.ebuild
@@ -0,0 +1,550 @@
+# 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 llvm meson multilib-minimal python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		>=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm-sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		$(meson_use zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	if ! use libglvnd; then
+		# Switch to the xorg implementation.
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+	fi
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 59a1d4fc57ca..03083871b14d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -44,7 +44,6 @@ REQUIRED_USE="
 	gles1?  ( egl )
 	gles2?  ( egl )
 	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
 			  video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
 	wayland? ( egl gbm )
@@ -261,6 +260,14 @@ llvm_check_deps() {
 }
 
 pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		fi
+	fi
+
 	if use opencl; then
 		if ! use video_cards_r600 &&
 		   ! use video_cards_radeonsi; then
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 9e9a04a53e2d..a50cb625e992 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="gles2">Enable GLESv2 support.</flag>
 		<flag name="libglvnd">Use libglvnd for dispatch.</flag>
 		<flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
+		<flag name="lm-sensors">Enable Gallium HUD lm-sensors support.</flag>
 		<flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
 		<flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
 		<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 35ace84e228a..171e1ac4cbbe 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,6 +1,6 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
 AUX mlt-6.20.0-qt-5.15.patch 1571 BLAKE2B a4d5c1a009399ac0ee4d85fdc8f9f603e69ded9d77320083511a46e1c1a2c7adfa1940a97ecfb6d2ad70dfa624b844260cb0f0249fca861ab25aed8b265e9333 SHA512 2eb8934ba6bca513f7851189428c997380da09b36ea8e27bc4b1a3f69c0feebd8b5d53dbf34658693261cae13dd69e60526b26e64ee56605b3972a79c561e295
 DIST mlt-6.20.0.tar.gz 1446137 BLAKE2B 50599c827be82ea5f5145297b41001e94b44519ec4c6344b8cfdc6fc92e6106de60ecd985296ab77d24e6a5b74ea8e859187935bd88f9394f3c108308afc68ac SHA512 939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3
-EBUILD mlt-6.20.0-r1.ebuild 5411 BLAKE2B f59bed59bca6e2333544ab0eabab824ccc85a1b595761fcb819763c47c99c85e9ea804f2feb96d62eaa99cbb2f320fa877625acc0d33f15c4030772a19925049 SHA512 580c59d798663a35f38f1d50b4f4c924e460935de7d236a454c63d74cf8a65a8eee58bf9a9bb05aef0a3a3ca04d360cfce3d1ba4cbced24ebf4ccd30824b0d81
-EBUILD mlt-6.20.0.ebuild 5408 BLAKE2B 8a6f5d49dd70c22c80f66e810451e61da28722cad19da6780a86924ec2c7fe524a79aa89c27e6c83404413d8c58ac792ecc4cd11981ca2cffba87f5c58ccdfa1 SHA512 89ef395743c22051a3a23f50b539adc2605d2b7b49ed99a4f2ee235bacb202caeeab7deb8e737074cc1031fc9ec2b3052dfef3ace13f7260d780dad16f928171
+EBUILD mlt-6.20.0-r1.ebuild 5343 BLAKE2B b113669829ee553f13eb0fbda8648102e9ae746330bca535053763d87d78a4c09a5ddc4f17ea54d28995a2faa2fafc388b69c0d69f467487d21846828fafba7b SHA512 30d57ecbec0b35e1af8767ba083f23fc80bf84506df5052d4ee557d47e9d8209237fb324ed0ceaf4c2fcb97c554df6d0fb959107d6a297910523786614401acd
+EBUILD mlt-6.20.0.ebuild 5340 BLAKE2B c2db005fe50befb993f8154a5f53d8395adebe49e5df102fbd78ecd89f851be944cf16b69fee1b1cd44cfed239219bee3bcb5f5f4b2e184ed06ae32b39459617 SHA512 bdefec68b4a36be06655d5649ca5efd3d94ff501570e8e6a8c0e2fb42bf8907aeaf6727c884c6fb270b31f388bdbf1c8013f3ce784f3ee9c258a16cbf62e21d1
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/mlt-6.20.0-r1.ebuild b/media-libs/mlt/mlt-6.20.0-r1.ebuild
index 8e0a0a9de4d4..6b5ca12addbd 100644
--- a/media-libs/mlt/mlt-6.20.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
-fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python
+fftw frei0r gtk jack kdenlive kernel_linux libsamplerate lua melt opencv opengl python
 qt5 rtaudio ruby sdl vdpau vidstab xine xml"
 # java perl php tcl
 
@@ -38,10 +38,7 @@ BDEPEND="
 #rtaudio will use OSS on non linux OSes
 DEPEND="
 	>=media-libs/libebur128-1.2.2:=
-	ffmpeg? (
-		libav? ( >=media-video/libav-12:0=[vdpau?] )
-		!libav? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	)
+	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
 	fftw? ( sci-libs/fftw:3.0= )
 	frei0r? ( media-plugins/frei0r-plugins )
 	gtk? (
diff --git a/media-libs/mlt/mlt-6.20.0.ebuild b/media-libs/mlt/mlt-6.20.0.ebuild
index 98a221ed040f..24cc72a14135 100644
--- a/media-libs/mlt/mlt-6.20.0.ebuild
+++ b/media-libs/mlt/mlt-6.20.0.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
-fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python
+fftw frei0r gtk jack kdenlive kernel_linux libsamplerate lua melt opencv opengl python
 qt5 rtaudio ruby sdl vdpau vidstab xine xml"
 # java perl php tcl
 
@@ -38,10 +38,7 @@ BDEPEND="
 #rtaudio will use OSS on non linux OSes
 DEPEND="
 	>=media-libs/libebur128-1.2.2:=
-	ffmpeg? (
-		libav? ( >=media-video/libav-12:0=[vdpau?] )
-		!libav? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	)
+	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
 	fftw? ( sci-libs/fftw:3.0= )
 	frei0r? ( media-plugins/frei0r-plugins )
 	gtk? (
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 2cbc4152be0d..2aa5045d9c3e 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -27,8 +27,8 @@ DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a
 DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-2.4.13-r4.ebuild 6028 BLAKE2B 49e634cf091fdbaf69e518f2fde2f3916bdaf39b0fed413d253c22f3c823ef132d49c2c7891b2c6d73e3a7c9b1e3b8efe999940d4d5aff50844b4ad9a5728eb6 SHA512 464e49cf782cabe002d3d5c499932c31cde6ec69658330a8040eb7cbd8a56e94f94ca3cf073780665066e34ee06c338dadbddc18602c6f900a9922ae1edcba74
-EBUILD opencv-3.4.1-r7.ebuild 18644 BLAKE2B 636275f9a39e3fef49f59d2d93e4fe288e73de35e210aec8ec7982058e1f0c98d25a7e7e9ffd85aeccf088225058357c2d7e23330d4a912e3f345a501735a030 SHA512 eba05037ccbdf8858aa799dddad2ddbc031677a69ed808d324e4aa2ae10a29f7f6c0424f92892ea8cdbcf3915da4b47f2a97227bfa35fe390e43c3f5d0439cb5
-EBUILD opencv-4.1.2-r1.ebuild 18329 BLAKE2B f917c45b9d91c362c1470f41ef6f4ad72b5c45d4c3c2c2901a714ebe5898cc3a742ae8a7d15646399d3568bff70b32e63d5d5f82cb6da12864aab88ca98e8cfb SHA512 4ee76673c4284546aa9018cdde1e2b2278e64650695fac63d1677c79beae28dd18b696c19dea7e30d661a9a2dcca22b11bd272c736a582a5b2049029497c4269
-EBUILD opencv-4.1.2-r3.ebuild 18414 BLAKE2B bfc40c7c183bc9eb9112ec5487c296d60b5665358e401ca753ced6df67e4ec6517b212e499057cbac9b638c982e79def94d4e66d8de4296c91d44e9b75f3c797 SHA512 3c7198c638889bbfcf30e9419782bd8c42389b717e4a1b388d9db6aea409e5aa30c55ee45548f4c31546803749b4ec2fb76e9eebe085ed3258e86483e59b26d1
+EBUILD opencv-2.4.13-r4.ebuild 5973 BLAKE2B 2243648334c7c959d874b2255bc6743b3785f30b5f2a2a2884202f97568cea342d978e6247b33d4c069903f213f9cce970e73de5f9049ec72f0fcb2c2cc883ad SHA512 a35e75145fe2ca29570a9004a8526385654b26a41143eb104f2a7be61769542eefaca6020e79bf1ef4ad37f2e07168ce0aba0e2fea29ff3bdc07daab0f36cf84
+EBUILD opencv-3.4.1-r7.ebuild 18569 BLAKE2B 296a275a5bbc44ab2a43bcd48336de85f9806b1667ae201aea7444925a681a9262c326b831beab157f9573c8a7967b22cb5f63aafeed494ad7da3906cfe109c9 SHA512 781fa7d47616b45d24f1be3b1bd6bc9c8e8770cf52b0c7356c538514ab3e461f62288617ddef1f087502afd89566a7f68263eff99317597f15ab729f24abd581
+EBUILD opencv-4.1.2-r1.ebuild 18254 BLAKE2B 531cb1baf152b065cfe10a1d074a5af323da39d367385ff09b53b9eaf3fb2a60033f37c779beec52970c3cb91ea2b30261d9a6e890f8a411687b611887a1b6b3 SHA512 6229f825c8aaafd82ae9261e3a7c4f83d26b909b7d773b81b2efa108503664fc2dc31e6975a2bbcea7520aea31ab1792b5d19b71f9f47de805a94ec9582743d2
+EBUILD opencv-4.1.2-r3.ebuild 18339 BLAKE2B c93988a8a7ebbbccc7e3394c57bf95d22ac963e9fae72a0c6d9397926a2c1f12df70ba3106041582716b0032687edeaf1b53d15fe0a4748a6483d0fe23c94e90 SHA512 42faba97bebbd0f5f5bd351c347b801bf2bbdbf02486dd14ce1efb639afbdd35ec1aca9b39a60502e4b70b269d1e2c9e4cb8f09e874fa5865bc3d15265d33703
 MISC metadata.xml 2786 BLAKE2B 1a29ddd9b75277f52d0a66cfb60fe2ad240ffdbdbf58a74038c684658405e90e858470b84fc0ff0935c972020152cfe6b6570a53ac68b71c299036e06516f469 SHA512 aa72fe71384691be664703e35c2f1342f9c90881d761b04e16357869c515fba551940b5bb624f9a7085f1ffa2e26067ac28b42fd97375d8a81a1901158b86ffc
diff --git a/media-libs/opencv/opencv-2.4.13-r4.ebuild b/media-libs/opencv/opencv-2.4.13-r4.ebuild
index e678316f625b..1e5584759aa4 100644
--- a/media-libs/opencv/opencv-2.4.13-r4.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/2.4"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
+IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -28,10 +28,7 @@ RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
diff --git a/media-libs/opencv/opencv-3.4.1-r7.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild
index d91ffc890ead..683c36a14930 100644
--- a/media-libs/opencv/opencv-3.4.1-r7.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0/3.4.1" # subslot = libopencv* soname version
 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
@@ -55,10 +55,7 @@ RDEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
 	contribhdf? ( sci-libs/hdf5 )
-	ffmpeg? (
-		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
-		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	)
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
 	gdal? ( sci-libs/gdal:= )
 	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
 	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
index 888c589b1c04..ba6201ddc539 100644
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0/4.1.2" # subslot = libopencv* soname version
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
@@ -51,10 +51,7 @@ RDEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
 	contribhdf? ( sci-libs/hdf5:= )
-	ffmpeg? (
-		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
-		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	)
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
 	gdal? ( sci-libs/gdal:= )
 	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
 	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
index 4b4180760a3f..0265b3431315 100644
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0/4.1.2" # subslot = libopencv* soname version
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
@@ -51,10 +51,7 @@ RDEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
 	contribhdf? ( sci-libs/hdf5:= )
-	ffmpeg? (
-		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
-		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	)
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
 	gdal? ( sci-libs/gdal:= )
 	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
 	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index b1d36d0bb16f..1ed9c0c6ec41 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -5,5 +5,5 @@ AUX qtav-1.12.0-multilib.patch 716 BLAKE2B 4cb5518cb14e91963e5371eafdf3f02452fb3
 AUX qtav-1.12.0-qt5.14.patch 443 BLAKE2B 80f2e2da6ef67cdd300257aba988dcdcb0a6a5215b806c862cf0a7d2fba7652aae27f5aa568f0bfbb1067b768be4c4d1a1458dab3e468cb7f55a1938e1c63b81 SHA512 1976e312bad83d0493be3af8652d537cca8905a1559d6dd021e4a3c234ac3e65e5743db6f2ac28bfd69ef8c2e0021b7d2144c8a4efea72dcc718bfc53e6d2370
 DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
 DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
-EBUILD qtav-1.12.0-r2.ebuild 1640 BLAKE2B 7b0b1f9dcf5b955114d4b3d70127cdf7ed5f7a63bf8a5ecd1566d2e5b4ac270f40e20f348f5b66c3758693c3f71245f32b79e76165a23b80e9f02e6149919835 SHA512 5fbf6ab29ac3a07393a7850ba76d1edd524cfc6925c82d1ea947d6ae9c7836a41fd81c2b97a1e5b899ef369953110f6ddb67499ad7d589cf2b028a4eef9399ed
+EBUILD qtav-1.12.0-r2.ebuild 1569 BLAKE2B f45ee920b1a1009d27b35b33280f1857cb627ab05cf24cfd5abd36f97b2818cee56afa992792df963ed0f352062144af6246221fe0d31274ba79d53171d99bf0 SHA512 de5551aa6d4f433cdb90243bafffc9010766a80a95c7d67e8cb3c4cc49460c7e956d8617bd21c7b532ff463862996ffd6100b57f9b3ed739c1e6cfc930a63a28
 MISC metadata.xml 389 BLAKE2B 6f4c10122acf9e5b30236f531b433ffc9cc46f9ddd6e6322bb5e17c70f60ba6ad0966eb93af1946a1df67e03cde1921ef24bad93fc115d5af84be848cbb04585 SHA512 145488dd0015ae2b014509610c33cf28e4e46e966bd37073d1199230297e66df520f3ac0afedd63c8eac20a7aa02ee492e5ad0658aa3b6fd660bd685b984161c
diff --git a/media-libs/qtav/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r2.ebuild
index 3cded19e1794..93df9f4f72ca 100644
--- a/media-libs/qtav/qtav-1.12.0-r2.ebuild
+++ b/media-libs/qtav/qtav-1.12.0-r2.ebuild
@@ -15,7 +15,7 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz"
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0/1"
 KEYWORDS="amd64"
-IUSE="gui libav opengl portaudio pulseaudio vaapi"
+IUSE="gui opengl portaudio pulseaudio vaapi"
 REQUIRED_USE="gui? ( opengl )"
 
 DEPEND="
@@ -24,11 +24,7 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	gui? ( dev-qt/qtsql:5 )
-	libav? (
-		media-video/libav:=
-		x11-libs/libX11
-	)
-	!libav? ( media-video/ffmpeg:= )
+	media-video/ffmpeg:=
 	opengl? ( dev-qt/qtopengl:5 )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest
index 230229d24dc1..6b547cbaf2e2 100644
--- a/media-libs/rlottie/Manifest
+++ b/media-libs/rlottie/Manifest
@@ -1,4 +1,6 @@
 AUX rlottie-0.0.1_pre20190920-disable-werror.patch 420 BLAKE2B 3b3173c4514227de44f1f953678dcce871b3df07ccbb617d0f8a18763f66dadf584fdacd8eeb31a8391a5b8a8a1c00a05137790ad09662e093eb7888f8f0bb4d SHA512 893b5a658a63e8fe4f62e72e967d9e89eaef8184680c1b753fbc0c0893078bbf963967dd4dadff6a94150b7b15c0b6c7ee7cd54631b6874aa3cf3d21989746ed
 DIST rlottie-0.0.1_pre20200110.tar.gz 3370396 BLAKE2B 02a51e6f24a83967ccbf085e0c28400e23057c833e4849db3f749d30a3ccb4ade2d4e0a8ea624da7ba0148bc84013ca4df963f01fc75ed4156ab8dc36bda6945 SHA512 e78470254ab7b9653dcd95037001a1763f4229bdc611f4631943f302b20739a6e4b519d54c967c1ecd7bcc4b555bb8f651af0bceebc04cc9ea41789360b49af4
+DIST rlottie-0.0.1_pre20200424.tar.gz 3371620 BLAKE2B cdfc89f66e7aec736029416decf76777f22b4cb8293bed74e647088480faed4c6ffd03a29a967ac532f9e747858fdd93fa552eb974085f7cf1701a12fe3a2c38 SHA512 1a05b835c083337a80b32ea8c1e201d1d2356c58e314b791f74f95504303f3ef46d3951abf2a7467daaeae462c1fe2cf793d9fb2402639b279ca6ea6367cdda7
 EBUILD rlottie-0.0.1_pre20200110.ebuild 907 BLAKE2B 7a3ca199c35e65723f84ab673ceb7efab88c1fa85fc0d0fef9c313221c8337e8931493b7b07f95fb6f82209e04c982efdf5fb9fa21390f544554b90d35f054dc SHA512 c2c00742c7416cf543c8b38eff58e908b1d9dc2554a332e2ebd80a60da6d2c62f35ca34a4174ee6ad449672b3323720c1828f2a7d6936840644f6f2f670893df
+EBUILD rlottie-0.0.1_pre20200424.ebuild 1011 BLAKE2B efb762e3569df15fd700b131dbcd5a08504120f4ff87f9031bbd84a536f60cd8d80e1a1c9d50b0d2f01bf571d2c9c03bccfe599ef08a615d4ee4f1e57d9a658e SHA512 af73e5c014ddb75cbcc3f053cc39e89850b537716af2da974377e8f492f9932dcf446d714bb78272b1431541b40436808a9fbc254e7ca6426801380aad1d58a1
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-libs/rlottie/rlottie-0.0.1_pre20200424.ebuild b/media-libs/rlottie/rlottie-0.0.1_pre20200424.ebuild
new file mode 100644
index 000000000000..26b4f6d67e7f
--- /dev/null
+++ b/media-libs/rlottie/rlottie-0.0.1_pre20200424.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+MY_COMMIT="607998b9f7e03b05dceed8784207bd0b704f62d4"
+
+DESCRIPTION="A platform independent standalone library that plays Lottie Animations"
+HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie"
+SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD FTL JSON LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/rlottie-${MY_COMMIT}"
+
+PATCHES=( "${FILESDIR}"/rlottie-0.0.1_pre20190920-disable-werror.patch )
+
+src_configure() {
+	local emesonargs=(
+		-D cache=true
+		-D cmake=false
+		-D dumptree=false
+		-D example=false
+		-D log=false
+		-D module=true
+		-D thread=true
+		$(meson_use test)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR."
+	eninja test
+}
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index a62b42b76221..c3f7eed3dda3 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -4,12 +4,15 @@ AUX svgalib-1.9.25-fix_buffer.patch 302 BLAKE2B a3e49949702305d6ee973134a50c7105
 AUX svgalib-1.9.25-glibc210.patch 3842 BLAKE2B 99cfb6151d38fa75adaaa9fb0ff490430e71b416e9a5fb9b6fe228de4b937a8c36a5c645fa3a413c1cdfe3d4764720a961a7a97d9e00ff549283698dbda9bee1 SHA512 43813c240eaff58d993c0ed839bee0d5d73515e4954e7793536a981d149c882808ea79187b0bfe8511afcde78fd31b6e9ad94aaf20d28c8e96577d5f0e530d96
 AUX svgalib-1.9.25-linux_2.6.28.patch 1672 BLAKE2B f5a18701cb29307a3d09656115bcca74ca3191eedf5f7c5c0e0d42ed38c548b2c51c06dfc9d0bd7cfc70832fc31c5b9738b5c989d2966f825927fb4adbac436b SHA512 ba3fcfb870768bc5d7e2d7acfe0381d6602b2e42d40e1d8b37246a60343e6e2f0b251c2a5fb32467773b565f4a0f38fdd5cba7c51fdf7fd36b0e5b988fcf2416
 AUX svgalib-1.9.25-linux_2.6.36-r1.patch 1244 BLAKE2B ce52fd031092c6ed038e854723704a5aa3b380c296f88a27e99a906ac4072f37d86189e5021362a1aae9dc296161ff9f3b66a65f71b597e527fd3df8ad05fd33 SHA512 0a14679ee0029931e54387ff413aee43a01b107c277ff1fde52b1fb862d5ca56571028a527118b6f6c05a9485c00890b0eab35df4537e394bb4cc81e771e9ae0
-AUX svgalib-1.9.25-linux_2.6.patch 9547 BLAKE2B a13d0f848ed2a6dba750d9aaa90b571e32b59cb671ecddd0de0e9b71a9af29f2119ef1db85e8b9474e837e07bcc2981af4246c3c37ef01d991fea60f53093a48 SHA512 b2a1105735398f7f1f452612947a66c85bc0eca5c1e7f0d56f154d980dbfcf23bea2d5038145e6e004afb7658d7d3ab2de655a408da7c6853d8fdc817f775191
-AUX svgalib-1.9.25-linux_3.4.patch 1125 BLAKE2B 0dccae48a8a0ed12d7a7c08074cfba7d8fc6fa574868beef107cf59165086246342a620073579daa5b32f65a7cd1cc1c55a24e1db57d116965bf0561790c4a93 SHA512 35e035cfbe65823d8e5836653a058eb78bf3483c62a05dcad5a2aac3ac1ad47f63a7994c140d5b526bdf2e6edcfc5916452009cec056f73db664c0ffd3ba5857
-AUX svgalib-1.9.25-linux_3.9.patch 1045 BLAKE2B 6c5446a165234ef9c2dce2d407e39610849837c3eb88ccdf564d23bc2820ec5fe8480ef91c27d47235c17a660ac05836849540481621c99b1bbe952f147f31df SHA512 ce3529558b249351f0dbe915fcf940e9b478e60fc444d0727996eaa269f567d6a44707285b7c9a836c5a2309c217361620b6e655ec4331c6b25bd87e445cedeb
+AUX svgalib-1.9.25-linux_2.6.patch 9645 BLAKE2B b21e62155b7e7b8084e606172524ae0b9db8543667aa2dce406f5475b2564bcdba0bd5f9a435f1dd5154be18b3ec89b1da9bfa8bc3adafaba26bd77902d8c227 SHA512 8d9076cf8d871815268b1efe71931b4aa1c857df37ed2ea4c407d0b15147e2aec7f0e1e234a4b39ad8de4c3ebdeb08f414f38682cd512857efaef30ddef55077
+AUX svgalib-1.9.25-linux_3.4.patch 1119 BLAKE2B c5d4102e392512094f9a64ac981e61718a44e78eebc93cbaf2aba4795b02fed38d003fd7b5d752b70ac10a187d63cbec199c73de6f5e6b91a6336e7637628c71 SHA512 2621e0036b2aae17eeb907588eb138b09f6d9b5e53cbd1cf329c656c22194114e78c83ff4fb8f82e6c44d02d1394dae501b5581fc44b7ed43929c7a7bb79f6e9
+AUX svgalib-1.9.25-linux_3.9.patch 1165 BLAKE2B 303aa7e9c45336b2971a95f2cd93ed33228e1bff71828924cbacc63a0d4e121f60640dbd33965268cd6c78cab8891b13b07bb309ab31fad65d5a37c713e7152e SHA512 779f3f10b84ef7217165e18367627cdf12536e841d2a2bf48d770c3f0ffc586b9c967d3f2839716e34400415fa6bd46fead9a3d42525439c84e26756b03716a4
 AUX svgalib-1.9.25-missing_include.patch 1157 BLAKE2B eded4f9ac19d1254cbeb82e89fd1e5bf8647c4268ce5e26a57ce3d4c75bca649c7b9a60f70c6fd1ea29fc7b2fdb63019375b5d6739c1e409ff1de0d7f2bd5a84 SHA512 e0bc82f1c27f7d6003be8ce4e96005605dad73ff22086ceb0861d60931776ecaf86f4bca15b0f4a6e5f5ab5b5ec50d8fa305f53bb090f122ea38d88569834b8b
+AUX svgalib-1.9.25-no-man-compression.patch 1018 BLAKE2B c05151ef1d119b9e78ac58e82a1327611dde1ff68e493ab16d282c427cf2d825e4671281b2be015d1e1da4ec90bc27de903e152de664574888a082d2f3c0a80c SHA512 b2444f4dea12f251011f026e5b3444909b0f7f5d09be48de2814e038d57850214173a9755f6818f9c13e06b27ef758526f09e35c58311298535ef1d6d77c0d3c
 AUX svgalib-1.9.25-vga_reset.patch 747 BLAKE2B 73e459c902be26584bc727bdb4c48398ed4200eaec7155ea12bee897906fd7c97dbb95961db6bc3d13dadbb620a9dd3220a201740343830fbef62db20713c78a SHA512 9baf930a3da15340f3f6823bcb45242bdf6b53d60d4ea2e9ef81af42e748838d40b2d5973821005decd3d44375508838fe852c89d1b704e57b790c042907ba94
+AUX svgalib-1.9.25-wrapdemo-buf-overflow.patch 516 BLAKE2B 504bdd01a0bde6858648f5e640fda34f337e6cef3f08f46b77fa453741fd556964fc09b48f494cf30b644fc1ff416c9728750d1c58502811d292d9b96ad415cc SHA512 e4e58a065f721f3c71d13f9ba0ffecf35ff32b25c6e46217eb9a0184b012e5be13c96c597df153ad7a27a5e41cc5a845cecae04d2d6c3dc6771bc238f8c75232
 AUX svgalib.udev.rules.d.2 44 BLAKE2B 513532c74e5172a5f2882df1912508f12adf1347c3af1bf0a44f66781d139a28b7aa332f5a5e630d099b381b9a94931ba0b7ad787393228bf694878f442279ab SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82
 DIST svgalib-1.9.25.tar.gz 987084 BLAKE2B 0ca81483d754796d8c96abef2940c506dd8c6f69ac015f0b34995a81db91c0540f405271f3c9e337ead551c783e9d6a336ef53bfb1531481115bd1228b679ea8 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7
 EBUILD svgalib-1.9.25-r5.ebuild 3564 BLAKE2B 34169bab844e25a70e0872a767dc50b44efe2af788b8a2f6aa4c707d01e3e2c015c7fb25db1aaa45ee0617930251b83bf15618438fba26dd7e8195310b8c8368 SHA512 c32cd1636355ef7cba7572e894ab7d83c35becaaa999db1849535b8b179a800a34be5afda2a416ef54cb09fa37045d53c290dc909ecb6d04372d72b17b93f21d
+EBUILD svgalib-1.9.25-r6.ebuild 3419 BLAKE2B 1f7f87fc20a728f90540974cc5691ea5d123f86359fa1918e55debf393fb593d831eb2c1a6fecb42a848c2d2ddd1902bc587349c32243a3c8ce0d54b0f5f2fd5 SHA512 67d8565d4d99dc67da5ec0ca3a5188f098045ebf4b82080ea644f88c9d58c58418bcae365d8f877a116c266dd6fd3d0ea094c4b96c8e46627dca8768dae8fd23
 MISC metadata.xml 325 BLAKE2B eee2dcb0d80f8fa891865f3074139f3a9db2af0339f342f0f82512dc1195e7a95616a36ae9917e8724d12f15c1b5c056c3c5d242c32e989c354b39a7d6fbd5da SHA512 7d2874207eaab21b41da8bd8b9afb5cda10351e3c88fe09ae1856664115b3c86d13362a82695a016911390e5ff6762a86409b437a3d76b077e01ac0ff6662d5d
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
index 20ab1fe1ed16..113a2391cdfd 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
@@ -22,7 +22,7 @@
 +++ svgalib/kernel/svgalib_helper/Makefile.alt
 @@ -37,7 +37,7 @@
  CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
- 
+                                                                                                   
  ifeq (1,$(findstring 1,$(MODVER)))
 -	CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
 +	CFLAGS += -DMODVERSIONS -DCONFIG_MODVERSIONS=1
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
index 5e2d1e527cbb..ce9c74ccd205 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
@@ -1,29 +1,29 @@
-diff -Naur svgalib-1.9.25/kernel/svgalib_helper/main.c svgalib-1.9.25_new/kernel/svgalib_helper/main.c
---- svgalib-1.9.25/kernel/svgalib_helper/main.c    2006-01-12 18:17:53.000000000 +0000
-+++ svgalib-1.9.25_new/kernel/svgalib_helper/main.c    2012-06-25 15:02:11.000000000 +0100
-@@ -33,7 +33,9 @@
- 
- #include <asm/processor.h>
- #include <asm/uaccess.h>
--#include <asm/system.h>   /* cli(), *_flags */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
-+  #include <asm/system.h>   /* cli(), *_flags */
-+#endif
- #include <asm/segment.h>  /* memcpy and such */
- #include <asm/io.h>
- #include <asm/pgtable.h>
-diff -Naur svgalib-1.9.25/kernel/svgalib_helper/Makefile svgalib-1.9.25_new/kernel/svgalib_helper/Makefile
---- svgalib-1.9.25/kernel/svgalib_helper/Makefile    2006-05-20 13:31:04.000000000 +0100
-+++ svgalib-1.9.25_new/kernel/svgalib_helper/Makefile    2012-06-25 13:39:38.000000000 +0100
-@@ -11,9 +11,11 @@
-    PWD    := $(shell pwd)
-    TARGET  := svgalib_helper
- 
-+   ifneq ($(TOPDIR),)
-       ifeq ($(PATCHLEVEL),4)
-          include $(TOPDIR)/Rules.make
-       endif
-+   endif 
- 
- else
- 
-\ No newline at end of file
+diff '--color=auto' -Naurd svgalib-1.9.25.prev/kernel/svgalib_helper/Makefile svgalib-1.9.25/kernel/svgalib_helper/Makefile
+--- svgalib-1.9.25.prev/kernel/svgalib_helper/Makefile	2020-05-02 09:49:05.072052128 +0300
++++ svgalib-1.9.25/kernel/svgalib_helper/Makefile	2020-05-02 09:50:14.748043187 +0300
+@@ -11,9 +11,11 @@
+    PWD	:= $(shell pwd)
+    TARGET  := svgalib_helper
+ 
++   ifneq ($(TOPDIR),)
+       ifeq ($(PATCHLEVEL),4)
+          include $(TOPDIR)/Rules.make
+       endif
++   endif 
+ 
+ else
+ 
+diff '--color=auto' -Naurd svgalib-1.9.25.prev/kernel/svgalib_helper/main.c svgalib-1.9.25/kernel/svgalib_helper/main.c
+--- svgalib-1.9.25.prev/kernel/svgalib_helper/main.c	2020-05-02 09:49:05.075052085 +0300
++++ svgalib-1.9.25/kernel/svgalib_helper/main.c	2020-05-02 09:50:14.751043144 +0300
+@@ -38,7 +38,9 @@
+ 
+ #include <asm/processor.h>
+ #include <asm/uaccess.h>
+-#include <asm/system.h>   /* cli(), *_flags */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
++  #include <asm/system.h>   /* cli(), *_flags */
++#endif
+ #include <asm/segment.h>  /* memcpy and such */
+ #include <asm/io.h>
+ #include <asm/pgtable.h>
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
index be10e394707a..2e1f87d7c6ff 100644
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
@@ -1,8 +1,9 @@
---- svgalib-1.9.25/kernel/svgalib_helper/main.c.orig	2016-02-22 11:10:25.000000000 +0300
-+++ svgalib-1.9.25/kernel/svgalib_helper/main.c	2016-02-22 11:17:16.223529679 +0300
-@@ -170,8 +170,12 @@
+diff '--color=auto' -Naurd svgalib-1.9.25.prev/kernel/svgalib_helper/main.c svgalib-1.9.25/kernel/svgalib_helper/main.c
+--- svgalib-1.9.25.prev/kernel/svgalib_helper/main.c	2020-05-02 09:50:14.751043144 +0300
++++ svgalib-1.9.25/kernel/svgalib_helper/main.c	2020-05-02 09:51:44.564742599 +0300
+@@ -171,8 +171,12 @@
  #else
- static int svgalib_helper_ioctl(struct file *filp, 
+ static long svgalib_helper_ioctl(struct file *filp,
                            unsigned int cmd, unsigned long arg) {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) 
 +    struct inode *inode=file_inode(filp);
@@ -13,7 +14,7 @@
  
      io_t iov, *user_iov=(io_t *)arg;
      pcic_t pciv, *user_pciv=(pcic_t *)arg;
-@@ -586,7 +590,11 @@
+@@ -587,7 +591,11 @@
  static int svgalib_helper_mmap(struct file *filp, struct vm_area_struct *vma) {
     unsigned long start=vma->vm_start;
     unsigned long end=vma->vm_end;
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-no-man-compression.patch b/media-libs/svgalib/files/svgalib-1.9.25-no-man-compression.patch
new file mode 100644
index 000000000000..e88647412f09
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-no-man-compression.patch
@@ -0,0 +1,26 @@
+--- svgalib-1.9.25/doc/Makefile.orig	2005-07-02 20:21:57.000000000 +0400
++++ svgalib-1.9.25/doc/Makefile	2020-05-02 00:15:00.104324667 +0300
+@@ -26,7 +26,7 @@
+ SVGALIB=$(subst man,$(srcdir)/doc/man,$(SVGALIB1))
+ VGAGL=$(subst man,$(srcdir)/doc/man,$(VGAGL1))
+ THREED=$(subst man,$(srcdir)/doc/man,$(THREED1))
+-COMPMANPAGES=$(shell cd $(srcdir)/doc; find man? -name "*.gz" -type f -print)
++COMPMANPAGES=$(shell cd $(srcdir)/doc; find man? -type f -print)
+ 
+ .PHONY: clean ascii dvi ps install gunzip gzip
+ 
+@@ -63,13 +63,12 @@
+ 	cat $(VGAGL) | grep -v '^\.so ' | troff -man -T$@ > vgagl.$@
+ 	cat $(THREED) | grep -v '^\.so ' | troff -man -T$@ > 3d.$@
+ 
+-install: gzip
++install:
+ 	mkdir -p $(mandir)/man1 $(mandir)/man3 $(mandir)/man5 \
+ 		 $(mandir)/man6 $(mandir)/man7 $(mandir)/man8
+ 	for i in $(COMPMANPAGES); do\
+ 		$(INSTALL_DATA) $(srcdir)/doc/$$i $(mandir)/$$i; \
+ 	done
+-	make gunzip
+ ifdef MAKEWHATIS
+ 	@echo "Rebuilding the whatis database (this is slow!)"
+ 	@echo "You can comment this out in Makefile.cfg!"
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-wrapdemo-buf-overflow.patch b/media-libs/svgalib/files/svgalib-1.9.25-wrapdemo-buf-overflow.patch
new file mode 100644
index 000000000000..1ea9f6a5e1e7
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-wrapdemo-buf-overflow.patch
@@ -0,0 +1,14 @@
+Fix buffer overflow in palette when writing last non-used element:
+
+wrapdemo.c:256:29: warning: iteration 63 invokes undefined behavior [-Waggressive-loop-optimizations]
+--- svgalib-1.9.25/threeDKit/wrapdemo.c.orig	2020-05-01 23:41:32.000000000 +0300
++++ svgalib-1.9.25/threeDKit/wrapdemo.c	2020-05-01 23:41:55.911933032 +0300
+@@ -230,7 +230,7 @@
+    can be 0, 64, 128, OR 192 */
+ 
+     int i;
+-    unsigned char palette[768];
++    unsigned char palette[769];
+ 
+     for (i = 0; i < 64; i++) {
+ 	palette[i * 3] = i;
diff --git a/media-libs/svgalib/svgalib-1.9.25-r6.ebuild b/media-libs/svgalib/svgalib-1.9.25-r6.ebuild
new file mode 100644
index 000000000000..55f0bb10ddab
--- /dev/null
+++ b/media-libs/svgalib/svgalib-1.9.25-r6.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="A library for running svga graphics on the console"
+HOMEPAGE="http://www.svgalib.org/"
+SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="build +kernel-helper"
+
+MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
+BUILD_TARGETS="default"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch
+	"${FILESDIR}"/${PN}-1.9.19-pic.patch
+	"${FILESDIR}"/${PN}-1.9.25-build.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch
+	"${FILESDIR}"/${PN}-1.9.25-glibc210.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch
+	"${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch
+	"${FILESDIR}"/${PN}-1.9.25-vga_reset.patch
+	"${FILESDIR}"/${PN}-1.9.25-missing_include.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch
+	"${FILESDIR}"/${PN}-1.9.25-no-man-compression.patch
+	"${FILESDIR}"/${PN}-1.9.25-wrapdemo-buf-overflow.patch
+)
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+}
+
+src_prepare() {
+	default
+	sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
+	convert_to_m kernel/svgalib_helper/Makefile
+}
+
+src_compile() {
+	use kernel-helper || export NO_HELPER=y
+
+	export CC=$(tc-getCC)
+	# C89 extern inlines are needed, see #576260
+	append-cflags -fgnu89-inline
+
+	# First build static
+	emake OPTIMIZE="${CFLAGS}" static
+	# Then build shared ...
+	emake OPTIMIZE="${CFLAGS}" shared
+	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
+		textutils lrmi utils
+	# Build threeDKit ...
+	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
+		-C threeDKit lib3dkit.a
+	# Build demo's ...
+	emake OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS+=" -L../sharedlib" \
+		demoprogs
+
+	! use build && use kernel-helper && linux-mod_src_compile
+}
+
+src_install() {
+	local x
+
+	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
+
+	emake \
+		TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
+		install
+	! use build && use kernel-helper && linux-mod_src_install
+
+	insinto /usr/include
+	doins gl/vgagl.h
+	dolib.a staticlib/libvga.a
+	dolib.a staticlib/libvgagl.a
+	dolib.a threeDKit/lib3dkit.a
+
+	insinto /usr/include
+	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
+	doins src/keyboard/vgakeyboard.h kernel/svgalib_helper/svgalib_helper.h
+
+	insinto /lib/udev/rules.d
+	newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
+
+	exeinto /usr/lib/svgalib/demos
+	for x in "${S}"/demos/* ; do
+		[[ -x ${x} ]] && doexe ${x}
+	done
+
+	cd "${S}"/threeDKit || die
+	exeinto /usr/lib/svgalib/threeDKit
+	local THREED_PROGS="plane wrapdemo"
+	doexe ${THREED_PROGS}
+
+	cd "${ED}/usr/$(get_libdir)" || die
+	ln -s libvga.so.${PV} libvga.so.1 || die
+	ln -s libvgagl.so.${PV} libvgagl.so.1 || die
+	ln -s lib3dkit.so.${PV} lib3dkit.so.1 || die
+	ln -sf libvga.so.1 libvga.so || die
+	ln -sf libvgagl.so.1 libvgagl.so || die
+	ln -sf lib3dkit.so.1 lib3dkit.so || die
+
+	cd "${S}" || die
+	dodoc 0-README
+	cd "${S}"/doc || die
+	dodoc CHANGES DESIGN TODO
+	docinto txt
+	dodoc Driver-programming-HOWTO add_driver svgalib.lsm \
+		README.{joystick,keymap,multi-monitor,patching,vesa}
+	# avoid installation of a broken symlink
+	newdoc ../lrmi-0.6m/README README.lrmi
+}
+
+pkg_postinst() {
+	! use build && use kernel-helper && linux-mod_pkg_postinst
+}
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index b2674881562f..51c046dffe69 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -2,6 +2,6 @@ AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLA
 AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
 AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r2.ebuild 1728 BLAKE2B 847c1f3dd32b9df0a23811e8c842096c527161c358700551946ead3aad5edd8a1d8ed10f1c8bd8e48fad24a8c5371d8bfc6b4a8eccfaa81694ace81a5f4a2a74 SHA512 d02e7a4b78923ce99dff53e5b8e8f2f23dd6eca24a764cdbc9b1b595da9ae927c81fea8f45529e3bf1ff34e461a83c68734799e50717c3f15478aeb8904a8656
+EBUILD vidstab-1.1.0-r2.ebuild 1725 BLAKE2B 42f08e1069bd7fb5ba23debdab5fc2a4dcf650007c270a131b3c6ec8f6d71c9718d1be48253732d7e8532818c1fdc6c1adbec59d546ecbc6a0cd81350ef41830 SHA512 efe8d6bf64c3f8633a8bb6056136fb1bd541ba4ca11fdb6206d6efd975535c044ea1d70192a495774d3f5b150fa4a18e198986f29904b6720b401fc36c3d4ae1
 EBUILD vidstab-9999.ebuild 1488 BLAKE2B b565db3fd850dc761e78713c5b04cfe9d762f81567f9026b4e6a91c695b007432c5a28c030eecbe0128a2924d28a69e059c36dce3daf83af2cc1ef27b5c51187 SHA512 8e4211783d88cbc004babce13cbd41e71ec1105b1151eff03189eab336a3f7406481d19540dee08bd71324adca1e84efbbc3f77591c22de3f2ed4000808119f7
 MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
diff --git a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
index a1ced8c34aa6..a00c18ffe048 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 0c6374ddb43e..136df80f3ab0 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -2,8 +2,10 @@ AUX vulkan-layers-1.2.133-Fix-build.patch 588 BLAKE2B fe510a968105213a54a3bc98cb
 DIST vulkan-layers-1.1.125.tar.gz 1763589 BLAKE2B e6db1c8b2469afcc9565a55e3977443952cf8a176b6b2b2f5747fbfdb887074e014138b4626f58ddb5c24f87260af32c0c589aef237366aee5acfd3b31ad06ee SHA512 07fcfa9737711671a1a537285f69b63b1a14cf9201dcc169fbe99e19febe612ba8a1e7b448d18bfd01a35d90fb99a261ada0ae9b8facb36d04079bcf3c5c72e0
 DIST vulkan-layers-1.2.133a.tar.gz 1864458 BLAKE2B 8da19effe360dfdd7b4896407a62870c825bed62aafc3fe68dc0ca7d9fb92dc7d9337101b9e46535ae901ec24f8d4f6d0301c4e72a5c29ebdf4f28e07e4c49ba SHA512 a7fe404f8732486c12ddee0443649fc5a5b4a67bb255a439d8f55939b171e447f5711632726eaca0e492bd6ab80e3ebd7efd3156e8bd0fc5b15dcec8b791301f
 DIST vulkan-layers-1.2.135.tar.gz 1963632 BLAKE2B 89069971266d0797e57f868ad996218d555687a40878b5d5cbf37dcbc392316e53066e8d457fb7b2505727b6529c217d8d6118b45c76416bf8dab7830d2d6818 SHA512 44a660b4c3bfa6f5ea355d7d1121f239c92e96cf2ef941d85b0d4a12154c4bec218b4c4c19e18c7a42cbb03a468f90ffcd6752ec773a8223e67cc182e1e96324
+DIST vulkan-layers-1.2.137.tar.gz 2002707 BLAKE2B d26ae5289a551bc8a42ef431b7c57340a96b049359b8ed9088b1e6e9d5cb101bd05e6ca089a16bd6c88e71f0b353796f5eb407236868357ee1136f5206343a5b SHA512 c3d0039cd49d91890bfeff24f3df536170d3072db333b7438b92a22b0385634051e2309133d100ab0d22150eeea57a21190ba5eacbce5293983fd280bcf83045
 EBUILD vulkan-layers-1.1.125-r2.ebuild 1462 BLAKE2B 33e3d3d8578f6620fa64b19deafe8df8b62c2811da3fe2aae1c5154524cdf0fdf829ac988a9364a32478480132957982854dfd398216e9768ce1412d5e093d60 SHA512 86984927f83bcc8eaaef651a43285ffb4401acf64a960fcfe69c10c734960c3ec1199929fbf5f5dd20bf9972c1b32fbb92f4fa1ddeb9461a6754a83eaa360d76
 EBUILD vulkan-layers-1.2.133-r1.ebuild 1467 BLAKE2B 26403477675e3cfcb7314d98889e6be1ad16f7e10a794bb7a1cadc69a10233b0d74d4f57e53a0de799a247a8e9d48cdf7d13b4f655fe9b797b8f021c20e06943 SHA512 a943f5209fa779cb5259d7782f00c7a2fc09f1c2b21fe6da84240f51b618fbe38dc996ca2d9122d778c0a73138070e261b637a2aa7370bee509fcf77da801be0
 EBUILD vulkan-layers-1.2.135.ebuild 1408 BLAKE2B bf5e56a00864183299d79b38789c17495394e62be0973a936b16a8ee377791e5a927637bb7fcfeedc703ff4a5d9b624821795d691403c5149bf1145f019d4847 SHA512 72eddd500a610bbbc81d1e82bc571b4af89bb7041ceb332cbd727f03f1d7f713bdd1eb25532732d7178eb9946644299d4f33724a987cd85cae61b2828c904587
-EBUILD vulkan-layers-9999.ebuild 1408 BLAKE2B bf5e56a00864183299d79b38789c17495394e62be0973a936b16a8ee377791e5a927637bb7fcfeedc703ff4a5d9b624821795d691403c5149bf1145f019d4847 SHA512 72eddd500a610bbbc81d1e82bc571b4af89bb7041ceb332cbd727f03f1d7f713bdd1eb25532732d7178eb9946644299d4f33724a987cd85cae61b2828c904587
+EBUILD vulkan-layers-1.2.137.ebuild 1420 BLAKE2B 09ea2895e7c8800c42c678df17f5686d1479e4605c4576efba1e0c7b3c6454e94db99f6ef2d72dfbab247d8ebe12d3e241a30eeff070ff55197c066f712f8c37 SHA512 30dda1293db736a4ebdfc29433bf26fc2a67e332ee6f520cbbde8b7bbbccf7fea6631a546a54a0d47e4a24bce40d31da392c591d8d9a818665adba52f81cee74
+EBUILD vulkan-layers-9999.ebuild 1406 BLAKE2B 6777687928575283d4a4158e3ec0420b28a787c354128dcefaf8256acf98b2129277684de4fbc05bda6a9114a18cc852e8fa3a53fb461a915fc568ce44622d1b SHA512 2787784a813412464c2e28573062fb5a36cb950ed66e31f7dda6b80abe04049dae6c69ef934279e55bdba06b0641e3e5d3384a63522e68a369576112377aa7eb
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.137.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.137.ebuild
new file mode 100644
index 000000000000..70a2744338bb
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.137.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="${PYTHON_DEPS}
+	>=dev-util/glslang-8.13.3560_pre20200404:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.4_pre20200429:=[${MULTILIB_USEDEP}]
+	>=dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 716f47b5b7c6..2b938a6f8414 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -28,7 +28,7 @@ IUSE="wayland X"
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
 	>=dev-util/glslang-8.13.3560_pre20200404:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.1:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-9999:=[${MULTILIB_USEDEP}]
 	>=dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 632f9520a023..f4dbcc7fe462 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,8 +1,10 @@
 DIST vulkan-loader-1.1.125.tar.gz 1398802 BLAKE2B 7cf1f99f60b4b37bfad12580fc8809012a0540d928366b465a532fbf90e7d87bf42eeeff70b1a46efeadef9c599cad6009b122ed9c5c7298973207f05acc1032 SHA512 40e1e5c16491f0549eae3efc065c375c258b475d81e1c781a756c71ec329f390e2aba55ced5ed2005e938f9d074dffc1692e7e1e330a35f55460cae1606fdf2e
 DIST vulkan-loader-1.2.133.tar.gz 1401215 BLAKE2B 4a52e2735ed584f96f563dd23761c25169158a12488f50267375cb85dec411fed61f3ac0f090d77a650e9d055e384562d4fd644571b20e45ff0c316547b88647 SHA512 ba486cd0b20d1936a8a7e97509bdaa5e1c42f024428d6f710af80152d55f486c76db072ae44add089ff20eef21a768073904236e6d29d46dd1475d77d26f9907
 DIST vulkan-loader-1.2.135.tar.gz 1405922 BLAKE2B 02d984f758da0c57fbabf18b042da73a2e44d8990e74da9959eddabfb6190732f72ffbe91ccad9c54daf76535ad1b5d7a24244db5e6a0a32a2f1be0ca9dae683 SHA512 cd0092761fed30c830872ee7d5b923996047ac5fcd4e3ba7f5e5f02f36c31a17f93a4acf2b2a5f42e3b956a9769427730b6974f745697a2c871e1582afec7284
+DIST vulkan-loader-1.2.137.tar.gz 1407611 BLAKE2B 32762198b4a71d14c9f487c28a728067a81c8607df2174688cbe3dc575fc5655e22ff7840b516d7dc5d1eaf291d098c26d927ebfa9c80e49e702735af98bca02 SHA512 8ada45a79fed7c99bb7b35d8d2f15a69086aca30a1175469a6a2be31a418828abd16d1695ce36c0df305a6d0395e65008115a82aede8b31313edd745314b4796
 EBUILD vulkan-loader-1.1.125.ebuild 1800 BLAKE2B 16285fe9cd9fff1e3e2ff741fb6755aa383cf6519adef4fb9e9ab0ee093b3a0e73212d16c94c6e366ef34cbcaa6aa6394288b6a180a605e5998b80628129f00f SHA512 0f6f1e42cde2d1f53e32d4b217986fc1e50e8c5286d58891181392ff1b85c59f6d6556519e1b82fca00e43433b7b85054f76c8805fffd211af45acbd920e0f9c
 EBUILD vulkan-loader-1.2.133.ebuild 1698 BLAKE2B 3632bd3bf1f2068c1a56c3aa4cb624713035d991a1ecab697fa2c72d98ce9edd2fcf6c6b485f887b21f12c439c47223224016f172b0321a7e9b0f0c1ff5d3e52 SHA512 2ead18fc2b3afece6e66147f8c7b0f43c2b2ba30963d678e4a1c5d8277f7861c0cd4d27d9707c68a02b1b228c76d13f0879a242d63fb1a7ca1bcd07371cfcd05
 EBUILD vulkan-loader-1.2.135.ebuild 1700 BLAKE2B 99e462a8779ae8e88b78cdd8f0b79ea6249869c6f6a47d4d5f67658e17dcbe734b2f85ca864256715612dc658da8b1fdea62bee82f94831bba5227bc71b8c796 SHA512 71a07781d148b5eb100e5b60969f6a885147f353eb7790ffd12ae91765853d82eeda4cb6c268d63611c8f50dee72d3858a90c5e8519bd993dd2a2262e09c2d70
+EBUILD vulkan-loader-1.2.137.ebuild 1700 BLAKE2B df062c73b1bdac83fa37d69405e357b45a9d5284773e790772758234f2214b7d78c06d7109e8f951366f0ca908afee15403bc2f5afa586069a27ccfb96683b93 SHA512 17481c79255973bd98a61eb7eabf4566f7290afa4fbccde06fcc31d53349172ee32bf2c82b17829f1ab722141cd4a4eb5ce1d4e0a86311d91e50133dfae81a9f
 EBUILD vulkan-loader-9999.ebuild 1698 BLAKE2B 3632bd3bf1f2068c1a56c3aa4cb624713035d991a1ecab697fa2c72d98ce9edd2fcf6c6b485f887b21f12c439c47223224016f172b0321a7e9b0f0c1ff5d3e52 SHA512 2ead18fc2b3afece6e66147f8c7b0f43c2b2ba30963d678e4a1c5d8277f7861c0cd4d27d9707c68a02b1b228c76d13f0879a242d63fb1a7ca1bcd07371cfcd05
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
new file mode 100644
index 000000000000..d47301d0d52a
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Loader
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1 toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="${PYTHON_DEPS}
+	>=dev-util/vulkan-headers-1.2.137
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_LOADER=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index 261f9e547eea..fd59dedeb104 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,4 +1,4 @@
 DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
-EBUILD woff2-1.0.2-r1.ebuild 701 BLAKE2B a00dab0381a34daa02c2ca9c7f6ef486c0fb1fe246dcc3a8706fecee37ec11318130878ae84070c8b5f8587c2637d20a1bc868b5d6602b9c2ab1b632aea69af0 SHA512 e6bba71c501075515743c36ad4e45d22daa79643de9a4057f306ef0cd94a19b977d1ec114dcb531e0fac59869e78ad8171a882e07822437f3c50ac17d5ca8d95
+EBUILD woff2-1.0.2-r1.ebuild 700 BLAKE2B 4dc0e4f28277c72609ed71dd30ed372fcd7727a2fb578b3547711a3f879b7c5248d559b906c72c0bd4fc08efdeacb0b16e95bc8b6501516c66a2cefb83b39576 SHA512 d4143c71529cbed6cb8cd21b08cc2d88767358dfed32223b832caaefbd0af6faba20c76a5d12865cda026d7830b2225c305ffbf18266acf28d47ea2dad87d190
 EBUILD woff2-1.0.2-r2.ebuild 879 BLAKE2B 7d785bb505f4eb5c4698c415f2a7b937b9d1599fd8ee69a8eab2930555a9040b381af7cc3b0cb7d3f049fcf1c6b076e3100c771128c991cc53019580b4f0db5a SHA512 e3d06a27755a0c0706045c9bddbf401224235b9484def783c5ea59beeb53914996318585a2f78454f2017f15ad950ab324d30c0661eed32b5482f7302ab88a10
 MISC metadata.xml 353 BLAKE2B 1cc153f5b5aaee1378bd1c42c3a85e0a156d853c63643e8b832b5517f8d7ff74c52552be3a11e3c0db7550daabfbb41d2618f89763baaf076ff4e327da03b7d0 SHA512 b3ceae6dd9b6556417a7633245e49463ee54759e8e8835583a15c8863c91e5669465a0fa1b22f066d99e0a1bfcd0df1537bddaba27cb6fb838ed356ca7f33a93
diff --git a/media-libs/woff2/woff2-1.0.2-r1.ebuild b/media-libs/woff2/woff2-1.0.2-r1.ebuild
index 3c1822a06be4..80d5309e93f9 100644
--- a/media-libs/woff2/woff2-1.0.2-r1.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"
diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest
index ecde4c1d37ab..1aafe3c1a467 100644
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,5 +1,5 @@
 DIST wxsvg-1.5.11.tar.bz2 514919 BLAKE2B d15d3478b69c4db4bd1cfc5032ff4909d35aca45f69694dbb74db72bc9d651fae3b8948382f60abd3f93a36dd4756f8f8f2c37acf7ac0b8859a9b03cb8cfda55 SHA512 d3538969bc0dda6bab740efef6952c2ca92e0ca74780c6370e3c6daf21d641e894b570d13b6ca408839b1b37df2aca9a3cf32d6423ddbf5f9f84274cfb1b8582
 DIST wxsvg-1.5.9.tar.bz2 512874 BLAKE2B a81099720e8835637ca82c7c0a3738dba36d16425982aba92f72f1427787e281260b3d06a972b0739d090610f8ab487e23f056f87284251c2a87a960666fb088 SHA512 eda51832dfa646cd4a681acdbbc1282b9d82d3a0571633c1212f89093ac23cad57f8f8e03fb7c35591b956a9b18c48852d439c44204830f1efd813549bc7eada
-EBUILD wxsvg-1.5.11.ebuild 977 BLAKE2B b1703068bd2cf111af83b7828f26bb2f183e7f5ae93bde4eb571683eaa58cc6c33591b295b4c0460f6622b26542cfe1da177e7da7a3c3e7fb5b5a986fd663dd6 SHA512 146e2e1cc19b13d03cf07b682ad4f2e93c9969ade2abf8b6be7edf756607784811f5f029cb5e880b48baabc99c5079b086de9c6f793ce266634c7d5ee3fc0103
-EBUILD wxsvg-1.5.9.ebuild 955 BLAKE2B 2b852e540109abcee1bb125ccc07f40edaf6540ed551d54a94cbce4a74a991d76cb82ab9985ade75dec676ed0d188889fd3dc733987126e27e6953601eadab01 SHA512 a73d6a71b6d1bc53d3c153c53a697b5816de41d8534e0722c1c9d751229c0a0e2360fde231e7e6e3f76ffa554ff8b6fa4d51d18bd326c05d6ff41034df8fd1e0
+EBUILD wxsvg-1.5.11.ebuild 922 BLAKE2B 087912d04790f4c465a1acd3f49055f82f48a2667558701222acc902e8c5fcb5c54ad84c9366ab6e7e75a4857cbfbfe4e408f46ee1d0f2dd1bda50879eeab30a SHA512 fb07aa53048ef08778ce42e170cf47c5c287323b451943b19f7a3b20ffff2a69da60db285f5b75ae84d11c27562ed2d3de5ddf97571fc73c66ca4e4d0c1917d5
+EBUILD wxsvg-1.5.9.ebuild 900 BLAKE2B f0ec7b3b0e58cde46e0f3166d50033ddd9af38e270c3c3ee995293ee7594996411c3ef6c3916a2465b7356d45779e8a499bc1e70d15bb2b5cf432a419eb75f59 SHA512 63dd3644b50cd6f41cf79374aaf350d7308595a8d1effc76e5f1f2e3194e387ea08267b3c5fa5db25f991c97eb75ab2df76f52efd82f99cef434487d90db5cf6
 MISC metadata.xml 336 BLAKE2B 178a381a2b4cf5e5ba3d7b81e721257a354bb098ba0c5c2f2d13b66e4e9163f89ed73ed2329101263076d51267e5e9ceb6764010f6b7a6901937f0a5121587f2 SHA512 01e85d6e1cb1a4a3a717cf79df29e4eed10fc1d21fd3e3d431e7f849acf2282c2a3c85b49b3af7ad84072faab77e35ef1a91409de3ad62a21c34d2d97cd6831e
diff --git a/media-libs/wxsvg/wxsvg-1.5.11.ebuild b/media-libs/wxsvg/wxsvg-1.5.11.ebuild
index 72c76daad106..4d9698b5bd21 100644
--- a/media-libs/wxsvg/wxsvg-1.5.11.ebuild
+++ b/media-libs/wxsvg/wxsvg-1.5.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="wxWinLL-3"
 SLOT="0/3" # based on SONAME of libwxsvg.so
 KEYWORDS="amd64 x86"
-IUSE="static-libs libav"
+IUSE="static-libs"
 
 RDEPEND=">=dev-libs/expat-2:=
 	media-libs/libexif:=
@@ -23,8 +23,7 @@ RDEPEND=">=dev-libs/expat-2:=
 	x11-libs/cairo:=
 	x11-libs/pango:=
 	x11-libs/wxGTK:${WX_GTK_VER}=[X]
-	libav? ( >=media-video/libav-9:0= )
-	!libav? ( >=media-video/ffmpeg-2.6:0= )"
+	>=media-video/ffmpeg-2.6:0="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/wxsvg/wxsvg-1.5.9.ebuild b/media-libs/wxsvg/wxsvg-1.5.9.ebuild
index 859a49981f28..89506ea43f15 100644
--- a/media-libs/wxsvg/wxsvg-1.5.9.ebuild
+++ b/media-libs/wxsvg/wxsvg-1.5.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="wxWinLL-3"
 SLOT="0/3" # based on SONAME of libwxsvg.so
 KEYWORDS="amd64 x86"
-IUSE="static-libs libav"
+IUSE="static-libs"
 
 RDEPEND=">=dev-libs/expat-2:=
 	>=dev-libs/glib-2.28:2=
@@ -22,8 +22,7 @@ RDEPEND=">=dev-libs/expat-2:=
 	x11-libs/cairo:=
 	x11-libs/pango:=
 	x11-libs/wxGTK:${WX_GTK_VER}=[X]
-	libav? ( >=media-video/libav-9:0= )
-	!libav? ( >=media-video/ffmpeg-2.6:0= )"
+	>=media-video/ffmpeg-2.6:0="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 84778b36edd7..987e4a30e363 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,5 +1,5 @@
 AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
-EBUILD xine-lib-1.2.9-r2.ebuild 5318 BLAKE2B 4dc14f8a76ff132e75d26b4eea5b0da26683b7a65d45093b1a462d6335de93a4f33f357a2feeadb0edbb59e9a7bc82ce79a61e6cd557f4fee8836a5bd891b713 SHA512 64ab2305b764bd5a4dc0cee493dc323034af4ad52e1363db087fd07118b6695f3b3b01b3ec636d9116cbc260c7a3e13a7a2902689d15c2859c3a372e53f9dfdd
-EBUILD xine-lib-1.2.9999.ebuild 5207 BLAKE2B db9eb0615a456a9b71860e0f8539a3f91f363bd145534f4a6f32d11db3c27e6bb9f34204ec1dc6d581fb33d5f36315bf8c873dbae5244e1210d1ddc0374190bc SHA512 78167fc4b4ec1cb33b5230ee219ca953745a2abe4b10606206a1dc97ca6d1f0f52b0a7187e72643def6931d4da2b8e53c5e81673e7df28f820a1a396b0c76279
+EBUILD xine-lib-1.2.9-r2.ebuild 5145 BLAKE2B 6fc935a7fe217bafcb1f9e9c02559da8ac2df0b56bc1200b7b29cd78445385a54f1ad463b9dbfa34c205486c23e8f2fa22c05aa34e52e226e8027988d940d261 SHA512 e98a1cb2efc4552e8b8d31c4b0a364e1ce97d9cfd8468abc7d76a741fef4a395f42510e6a63b2816a2afc2167219e825c44a9f182bb1562c6258512459bb73c7
+EBUILD xine-lib-1.2.9999.ebuild 5034 BLAKE2B f41eee641edac544ef230e33819c764e06d4e69ce2010f976f302598691b70e2a2cda68fbdd6234977996acdd771396f6f3e58c58dcb8d5e81f8771d1ff68968 SHA512 84e81689317d5701d28e14545af391b9760218f4664a9dbbebb173b69132dee3d9053931896513b0507211c48b2e61e8f46f10d377bf019a0fcd4f7500853ee5
 MISC metadata.xml 2580 BLAKE2B 15f578e1434e0e507eee410a4e28cb87528998e6041569dbfbd65858829697e234987ec773dcb2328ea4dfd56b3992cf92ff1f185dd08d68605f2e10f950ba56 SHA512 85e34bb9a10120c27e144cfc56b9a4f5aa26f29593d0bc6382741549b75e0a8cb0192bdb3960b3482cecc49cd9d0ea3d65a5b30183b0fceb222ac635d1a236a8
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
index 57cd4e37dc9a..f1ccbed79848 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
@@ -24,11 +24,12 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
+	media-video/ffmpeg:0=
 	sys-libs/zlib:=
 	virtual/libiconv
 	a52? ( media-libs/a52dec )
@@ -44,11 +45,6 @@ RDEPEND="${NLS_RDEPEND}
 	imagemagick? ( virtual/imagemagick-tools )
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	!libav? ( media-video/ffmpeg:0= )
-	libav? (
-		media-libs/libpostproc:0=
-		media-video/libav:0=
-	)
 	libcaca? ( media-libs/libcaca )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng:= )
@@ -154,6 +150,7 @@ src_configure() {
 		--disable-real-codecs
 		--disable-v4l
 		--disable-w32dll
+		--enable-avformat
 		--with-external-dvdnav
 		--with-real-codecs-path=/usr/$(get_libdir)/codecs
 		--with-w32-path=${win32dir}
@@ -210,10 +207,6 @@ src_configure() {
 	)
 	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
 
-	if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
-		myconf+=( --enable-avformat ) #507474
-	fi
-
 	econf "${myconf[@]}"
 }
 
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index e8d87db18ee1..bf3fbf83a913 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -24,11 +24,12 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
+	media-video/ffmpeg:0=
 	sys-libs/zlib:=
 	virtual/libiconv
 	a52? ( media-libs/a52dec )
@@ -44,11 +45,6 @@ RDEPEND="${NLS_RDEPEND}
 	imagemagick? ( virtual/imagemagick-tools )
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	!libav? ( media-video/ffmpeg:0= )
-	libav? (
-		media-libs/libpostproc:0=
-		media-video/libav:0=
-	)
 	libcaca? ( media-libs/libcaca )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng:= )
@@ -150,6 +146,7 @@ src_configure() {
 		--disable-real-codecs
 		--disable-v4l
 		--disable-w32dll
+		--enable-avformat
 		--with-external-dvdnav
 		--with-real-codecs-path=/usr/$(get_libdir)/codecs
 		--with-w32-path=${win32dir}
@@ -206,10 +203,6 @@ src_configure() {
 	)
 	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
 
-	if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
-		myconf+=( --enable-avformat ) #507474
-	fi
-
 	econf "${myconf[@]}"
 }
 
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 9150f992708b..453300f934e0 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,6 +1,7 @@
+AUX zimg-2.9.2-gcc-10.patch 462 BLAKE2B 1066a231f220c6c114447065b4c0ad97f38e48fe697e5a3a0ab245fc63b7c4e784365cd9c189d52654032241f5b5e74169d3a60a43d7a1211a6a5560d2a0e727 SHA512 75a6cde8696aef5900fa1a2d450048159866ee8784f2dc435e7db77171065d5f01642472346bd55d83d0b7dc689a92bd05aef28a1000a3ab5b1d8094da5fc131
 DIST zimg-2.8.tar.gz 265363 BLAKE2B a8982c64325e0089617136fcd5d6ee429ab861e3b9445b9cc0292bd3bbd3abb5783e94983e3e802fd9e59c2c7089eeea176d1eda4f3a850379cfc4fb36cbc408 SHA512 1e89087a756798a7ae3bfae3bc8244b29ae8ae7f04f53bdf6c4d4de3cb11412dc1eecd95a4a121bb9077437e633f8fbb665522ff8112ade806d9191ea4b5f7bf
 DIST zimg-2.9.2.tar.gz 266049 BLAKE2B 214a6afec061dc7cc7c751f2a57e56951e44b78fea6a0c0dc71235d3dd286fb811303b0a5198ab82165ee78d993caabaf39d7ec17db4c4e5ffca9a3475b49781 SHA512 b688f8e93a2e4549f2c844cd58c6e0714e6494d6fc8c800dc1b0cdf2278fb9925a646fc332350c1b5d77cef2134bf35e18a873c24ea1979c1adce57bfef68ebe
 EBUILD zimg-2.8.ebuild 779 BLAKE2B 97d1f82f229dd14f97acf6f3795e41a73f478be284846de2b43668486905f8c6a72a20c8f789bb6208e5d3d02a6456cc8e5eda170f6c9c67bb9d968d115b03bd SHA512 66dc003de7278b24ec293250746d0d0a32b2d35ada27c150c5b7d4d784b632f5d046a77cbe56393abb63f568ca4cf96e7dedcda4e2c53194c43d84a1950c4a5a
-EBUILD zimg-2.9.2.ebuild 837 BLAKE2B 6cdf2d0a24468ec064573a541659823e0ec1dc1c868dfd5a44a68ef13773e6f41d1e30f035c6c71748e256e9ce13cda939f686ccdca07a76a8d98e85240034f9 SHA512 026d3d894e7ee21f1cca2a6e5257aae4677d187cde2090ffb41f81a1a6b6947f80d4901e3cd77dfc25b2a02fbde92e8076085289257ffb42f62c647ad05d3748
+EBUILD zimg-2.9.2.ebuild 887 BLAKE2B 084cd79a5168ce2e98b9dccc61aa707058f78ce3fd581dac91851c23cb37dc23b0af0f79a2c8b4272f6e31af667fee900c33cd4e6e1e4035ca2f4652b2c554d1 SHA512 43ef2e3164f76f8d521946f28c9edce9e78d8317955dc92e3fedf37183053369e9b0bb299a6182f1f1018d7b1505b0655b2beb0f54e57b8f09b91934c7652e87
 EBUILD zimg-9999.ebuild 845 BLAKE2B 7610be50c9ae4d842cbed4ba71371bad69a83875f6649d0fabb9ab72affab557a0e078e784096622777101d149bc4771e2ccd9ee7318bd25e31792e96b68809f SHA512 80806f48183a73c0c01c84baeef298f676d00beb03ed1e16ddbb7ec41bbf8ea3bbbd7c57bb52d0a6bdfec725758652c77775a7e84b3b87c58564f53951c019ee
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/files/zimg-2.9.2-gcc-10.patch b/media-libs/zimg/files/zimg-2.9.2-gcc-10.patch
new file mode 100644
index 000000000000..ea192f77fcad
--- /dev/null
+++ b/media-libs/zimg/files/zimg-2.9.2-gcc-10.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/721676
+
+From 9ae36d7d5f7420eaacd9644451933512fa13d716 Mon Sep 17 00:00:00 2001
+From: sekrit-twc <sekrit-twc@users.noreply.github.com>
+Date: Wed, 4 Dec 2019 12:01:26 -0800
+Subject: [PATCH] Update matrix3.cpp
+
+---
+ src/zimg/colorspace/matrix3.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/zimg/colorspace/matrix3.cpp
++++ b/src/zimg/colorspace/matrix3.cpp
+@@ -1,3 +1,4 @@
++#include <cstddef>
+ #include "matrix3.h"
+ 
+ namespace zimg {
diff --git a/media-libs/zimg/zimg-2.9.2.ebuild b/media-libs/zimg/zimg-2.9.2.ebuild
index c1295123848e..e962d7a4b5f7 100644
--- a/media-libs/zimg/zimg-2.9.2.ebuild
+++ b/media-libs/zimg/zimg-2.9.2.ebuild
@@ -20,6 +20,8 @@ LICENSE="WTFPL-2"
 SLOT="0"
 IUSE="cpu_flags_x86_sse debug static-libs"
 
+PATCHES=("${FILESDIR}"/${PN}-2.9.2-gcc-10.patch)
+
 src_prepare() {
 	default
 	eautoreconf
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-17 14:32:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-17 14:32:10 +0100
commit	51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch)
tree	753b6b08624c34d1ed8414bbe22c45409f7741b9 /media-libs
parent	be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff)
parent	deba8115d2c2af26df42966b91ef04ff4dd79cde (diff)