gentoo (leap year) resync : 29.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
commit: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree: 9f47ee47c31a0f13f9496879cd88a1042550aa81 /media-libs
parent: 53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
128 files changed, 730 insertions, 2479 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f2d996cdbb6e..737f5fb68e2f 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/adplug/Manifest b/media-libs/adplug/Manifest
deleted file mode 100644
index a54bc37194b6..000000000000
--- a/media-libs/adplug/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST adplug-2.3.1.tar.bz2 1478424 BLAKE2B 8c2b65d11d3b12b4a3337bc9c6ada2920b07279ac0199d4bdf1fa2ceec2f51748a1bb9357456b3e7aba7c906253691066b274e7a7c7578c777d1e2e77f5131f0 SHA512 324ce084ecf5b0d180b335ebcacd5ab80806a5c9fbdeed6ef7cbd6c2f2cb476d9d9f38f596b7d6100e3d6cab42294300559200297b4b3f34190c1f516454c8c3
-EBUILD adplug-2.3.1.ebuild 878 BLAKE2B 77d847b980b5fa27a906b055f059c402708747edd62827e22bb0e02c22630ff7dfa464269f5ae88b7ca0b6f7517fe088fd7800b192318831a3ffec9cbae1b60c SHA512 2fbec1c70b6f790c1e5b8585ca1065956f9c7794adc42afc2296c29309c5ba04157028c06cf6af07eedf4537625a2e2afa11cbb7bcc7b837b408f0a25cd3839a
-EBUILD adplug-9999.ebuild 875 BLAKE2B d5ba66658f30b462ea56f0a4ca3430877ec4ae2bcf6883fdae14e84e60d8617dbbbd875538c54f839d1651d8c2821971c92d159cc554ca975c6b5bc7acad550c SHA512 c60da57083e0a1a4bddb8a7b616d6e57c63aeedcd485dac6b79f4bb7749295b9988e9f436d0554295d7ecc73602934632cc31a5f40b4c561c044fa1e1e7265c4
-MISC metadata.xml 331 BLAKE2B 469f4a04cc31c288eef0cffee6b2e548b20b9b65d4497361c7ebf01e09908b0aa15620a5e5b2f456b70dcff991fca5ef37b000d3017b37db229240c8a864d0ed SHA512 800eb68a2b91f69c68342da2268e432e862292f06a0525f6a7514f39574bdcdedb97df48e816c22724f8a45e35fd6edaf7d59ed6ccf607ab53504ebd572a0c06
diff --git a/media-libs/adplug/adplug-2.3.1.ebuild b/media-libs/adplug/adplug-2.3.1.ebuild
deleted file mode 100644
index f6a919007c4a..000000000000
--- a/media-libs/adplug/adplug-2.3.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit out-of-source
-
-DESCRIPTION="A free, cross-platform, hardware independent AdLib sound player library"
-HOMEPAGE="http://adplug.github.io/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/adplug/adplug.git"
-else
-	SRC_URI="https://github.com/adplug/${PN}/releases/download/${P}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="debug static-libs"
-
-RDEPEND=">=dev-cpp/libbinio-1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-my_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-my_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/adplug/adplug-9999.ebuild b/media-libs/adplug/adplug-9999.ebuild
deleted file mode 100644
index 3be26a1cfba4..000000000000
--- a/media-libs/adplug/adplug-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit out-of-source
-
-DESCRIPTION="A free, cross-platform, hardware independent AdLib sound player library"
-HOMEPAGE="http://adplug.github.io/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/adplug/adplug.git"
-else
-	SRC_URI="https://github.com/adplug/${PN}/releases/download/${P}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug static-libs"
-
-RDEPEND=">=dev-cpp/libbinio-1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-my_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-my_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/adplug/metadata.xml b/media-libs/adplug/metadata.xml
deleted file mode 100644
index 72259cedf742..000000000000
--- a/media-libs/adplug/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">adplug/adplug</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index c0e45cf4bf28..c07e96e3c4ba 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -6,8 +6,11 @@ AUX allegro-4.4.2-rpath.patch 182 BLAKE2B c6bae5a2ca5cd77022bf07690c5eb4d5b78f44
 AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa70762d6d68883601df933cc44788b6e5a78289d0bde863f788b65cf583ea828ffb6455d03d1d7493b00ff6c40b77 SHA512 5b982f857197dd9256bb1a151b544484b0178fa8e90d6b876bf2d26ea37c6e6bf6f44d1b729f9d2ccd11899024dccc2afbfbbfb73b816cb17e97dc3eb4df51e5
 AUX allegro-4.4.2-static-func.patch 416 BLAKE2B 3f7436cf87dd66c6ac336a3d8be8901a4679ae3054c1fe8ecb1012b5da883d3bfffc41c7421af6d95171e24e5ed864c8a6b029a9b387ad76c082437b406a8891 SHA512 ad1cd77c66f75192ccf5048f0742b9f420e611b7790576c3915721d104299b9e91619451d615d3653737bb2333b1cb170acb3202f0293be92b8be3371445ac19
 AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa64c795a0e083499084c7377f1989bc0df621339ff3988bc2a997447050ebf3fe0f5055fbcef8ee21dd66dfdf1ca003a SHA512 0e873aa6d1b6e72e2e4b46276f0a2a4ffe816c8d0b6a10dd9462cfed826b40d7b3461ebe51e595e9f2e7a5d2f19fd261b1ad0e05f60b77717224911e59a537d0
+AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bbc0aa009707e522e1dc3d09540bf1f9fa6350375f7acea942a986304a834964bb20849da4f08ff3f963b86f43c179a9fc2b012ff SHA512 d8960e21b713a24d415704d023443dc09d6a8909d65063a7b55da47228619485fc7e647c5c52e9a9459da027daaebdc19e6c3e56fe618ee5f553fd03c4716bcc
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
+DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
 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
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-4.4.3.1.ebuild b/media-libs/allegro/allegro-4.4.3.1.ebuild
new file mode 100644
index 000000000000..c0f62180c012
--- /dev/null
+++ b/media-libs/allegro/allegro-4.4.3.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib desktop
+
+DESCRIPTION="cross-platform multimedia library"
+HOMEPAGE="https://liballeg.org/"
+SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Allegro MIT GPL-2+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa doc fbcon jack jpeg opengl oss png svga vga vorbis X"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	svga? ( media-libs/svgalib[${MULTILIB_USEDEP}] )
+	vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXpm[${MULTILIB_USEDEP}]
+		x11-libs/libXt[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86dga[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			virtual/glu[${MULTILIB_USEDEP}]
+			virtual/opengl[${MULTILIB_USEDEP}]
+		)
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.2-shared.patch
+	"${FILESDIR}"/${PN}-4.4.2-underlink.patch
+	"${FILESDIR}"/${PN}-4.4.2-gentoo.patch
+	"${FILESDIR}"/${PN}-4.4.2-rpath.patch
+	"${FILESDIR}"/${PN}-4.4.3.1-texinfo-encoding.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i \
+		-e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \
+		docs/CMakeLists.txt || die
+}
+
+src_configure() {
+	# WANT_LINUX_CONSOLE is by default OFF
+	# WANT_EXAMPLES doesn't install anything
+	# WANT_TEST doesn't do anything regarding unittests
+	local mycmakeargs=(
+		-DDOCDIR=share/doc
+		-DINFODIR=share/info
+		-DMANDIR=share/man
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_DOCS_INFO=$(usex doc)
+		-DWANT_EXAMPLES=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JPGALLEG=$(usex jpeg)
+		-DWANT_LINUX_CONSOLE=OFF
+		-DWANT_LINUX_FBCON=$(usex fbcon)
+		-DWANT_LINUX_SVGALIB=$(usex svga)
+		-DWANT_LINUX_VGA=$(usex vga)
+		-DWANT_LOADPNG=$(usex png)
+		-DWANT_LOGG=$(usex vorbis)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_TESTS=OFF
+		-DWANT_TOOLS=$(usex X)
+		-DWANT_X11=$(usex X)
+	)
+
+	if use X; then
+		mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) )
+	else
+		mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		dodoc -r docs/html
+		#176020 (init_dialog.3), #409305 (key.3)
+		pushd docs/man >/dev/null
+		local manpage
+		for manpage in $(ls -d *.3); do
+			newman ${manpage} ${PN}-${manpage}
+		done
+		popd >/dev/null
+
+		if use X; then
+			newbin setup/setup ${PN}-setup
+			insinto /usr/share/${PN}
+			doins "${S}"/{keyboard,language,setup/setup}.dat
+			newicon "${S}"/misc/icon.png ${PN}.png
+			make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
+		fi
+	fi
+	cmake_src_install
+}
diff --git a/media-libs/allegro/files/allegro-4.4.3.1-texinfo-encoding.patch b/media-libs/allegro/files/allegro-4.4.3.1-texinfo-encoding.patch
new file mode 100644
index 000000000000..1b6b52f7383d
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.3.1-texinfo-encoding.patch
@@ -0,0 +1,19 @@
+From 7694155b74a4be1dedc9d13db6d9d2264d05f107 Mon Sep 17 00:00:00 2001
+From: Vitezslav Crhonek <vcrhonek@redhat.com>
+Date: Mon, 4 Nov 2019 12:07:16 +0100
+Subject: [PATCH] Fix FTBFS
+
+@documentencoding needed when generating documentation from
+non UTF-8 encoding source with texinfo-6.7 (rhbz#1767827)
+
+diff -up allegro-4.4.3/docs/src/allegro._tx.orig allegro-4.4.3/docs/src/allegro._tx
+--- allegro-4.4.3/docs/src/allegro._tx.orig	2019-02-02 20:28:46.000000000 +0100
++++ allegro-4.4.3/docs/src/allegro._tx	2019-11-04 11:12:39.352699777 +0100
+@@ -23,6 +23,7 @@
+ @man_shortdesc_force1=allegro
+ @man_shortdesc_force2=Allegro game programming library.
+ @$\input texinfo
++@$@documentencoding ISO-8859-1
+ @$@setfilename allegro.inf
+ @$@settitle Allegro Manual
+ @$@setchapternewpage odd
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index f0da57c83c77..75913cef7144 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,13 +1,6 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
-AUX alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch 720 BLAKE2B 9f160f4e4976b71ed69f8dac448978c3707e8cfcbbe4818d713ba0f7ab4eb15f5c1ecf4043abd821d613a1aa72e1f966fa6a179dde68b480b58cd5bffc507e57 SHA512 bbfa90c089bfd1a85cbeb4bb4200ae89795116bfda13e3ef7c47d7807d8c5236b7bbc5864878b00ad6243e34b06f9cf400b15dd5c1faa903d3e1544d47104028
-DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158ed77cc3878c076f4344e4d8f7b15e9872d3d6635710049ca14199851f2343246e94810fe2a0bb0d1e02915c941e SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
-DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805ccbc8f2f02d3ee392aa2dbe54ffe31f58ee1744308f851a68f693c83125088708e901d0d83e4a7a5f644ef448aa3 SHA512 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed
-DIST alsa-lib-1.1.9.tar.bz2 1058187 BLAKE2B 60454be162a0f36334602586762f8ce657d2883636bcb65ae91dedce62297bd40f3dbdc6213ef773542708b367f8796e143b1fc987c40de6d5d5a69a648f6b18 SHA512 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
-DIST alsa-lib-1.2.1.1.tar.bz2 1002960 BLAKE2B 6df2145e0fdd42b86759a6250f6fa3d18075d1bbff1c5ec0b4b6130f934ab369e5cc0edd9a53c3b6298dce0d374a9888c5fc63ae0d42b3fd0ef5ca97eff00369 SHA512 8a0b6f1ecc58d60991b4509e791b1581eebae57cd754b0b4829e66b1cfee81d588b04f42a17f598f06310b9658d9f46fd748cca516cc48b6f2989389c22c42e9
 DIST alsa-lib-1.2.1.2.tar.bz2 1004129 BLAKE2B e8bf117f3036a32b020897f16b9648ac105c499f547ae157508720502722d4e1a651719c86a4e2756ca7a3c573a1f17c02524125ccaad12bcb8c7c71675c898a SHA512 e8286fd55f63ee0d95513279d0885c287533de89b7af6c338413dec5d38ba4f5a15da1a4a4ce36e052614e4b730e3778782dab9979d82958283be17b48604913
-EBUILD alsa-lib-1.1.2.ebuild 2129 BLAKE2B 0432126cdd6b664f6b714dd1e9ac06a7dbcedf6f25f676c2b16cd619c30dc155616cbde6d554df23a1f3c87d0c199e0d570b30b5ece8bf6af48a5bf875f1e34d SHA512 dbed1d97a1fcd0503fbfabbf228c1714a7eaa63013d5d62a55df7137f0b017aa3f43ee0e2a30420f1fc4cf3aed020b46dda7631fe6defb8c6a3ecefa98672d7a
-EBUILD alsa-lib-1.1.8.ebuild 2069 BLAKE2B dfa9c16f9ae9520ac0cd558c0bc53e124c0b59140d104e2c76b25da8cb051a862d6607901ae481d4f786c6cc117618e33dbd6a2a656bb582fbb55c99192e53ac SHA512 55976162d5fef66fea1e2e44edf97953ad8001ba6e3c05cae7affa5d0607f20ffde47c93702a3d5f3ff7fa80071d816a9060afe21f028ed121b88cfad9308469
-EBUILD alsa-lib-1.1.9.ebuild 2076 BLAKE2B a5b993db209ad0fc59d2846c083a0906622a86911fcaa023fdb90de823d95ec33f67b61d710ec5e164e78ad323c774bc524f844f7dbcd3b8e5f0b102b30192b0 SHA512 a13d43dc7efb41f4a47ce06a66e07b8f7846350988fbfd64c01ce9b6c14da35b24a8b02f59383ba339230bb8efaf938c09a8c225e923c00cd207cbc47b646aef
-EBUILD alsa-lib-1.2.1.1-r1.ebuild 2147 BLAKE2B d2bb59384252242313a6bc20197bad9dd8979bf0bec59ea8409793b4516b169caf3279ab88c941404580267dabf604071ac8893889097c63403be2d11c329b12 SHA512 abab7f9e9c1b896afb1f7236f349315acbe71ca32316488148c5ee47e35b0ed67007c2cc645adb89f0fa94f3c297f344ddf962744cdb4071a840b781fba1505f
-EBUILD alsa-lib-1.2.1.2.ebuild 2086 BLAKE2B aa9643d205f99d48e9ff4276a1237a2844a193d2eeea159e20bd494b8a1ebcf654d7e34cc1d8dd53b6afa474ae66f01c6361b7d7e35252680030af31a42b3816 SHA512 b7eb5188002fd3d6269cc8284033b8bb9aad04f6facadf26555826e04c20773b2c7a4840fbb56ebe58538ca5e2cf793571c18497f68838e821594107c55e526a
+DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
+EBUILD alsa-lib-1.2.1.2.ebuild 2084 BLAKE2B e40c36c0cf23c31a011dc974336c197f09f32c57e613f99c62cd6f3b2f22fa5df36065da27f0a7f9cb6cd960c9eff1ee171f2a15ba09fc129aa40f2108331137 SHA512 3b81a251f72de5ba9ea601fe7aaf90e941c433b0b75816bf127fba359ef2bd12423bdf1eff811540a72b021572ace15cdba1f24b94eeb96c6f14d2b789a6baeb
+EBUILD alsa-lib-1.2.2.ebuild 2093 BLAKE2B 76989e25782a0133021d786e5c3e26280805d6af8a8a01146e062ce483d8937aec3486d98007f003314b84fe86d7bdb51be035458cfc3043c0335b546edb3957 SHA512 e4d43e6a21573cb052d94aa1960a44a3c45e128a7ec30c02a5919f8877d7b119c843029218bb3c6e0971edf62c3bccaea729a10a876c8659ec118622487da14a
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
deleted file mode 100644
index 11c4a371fbd6..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils ltprune multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-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 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-	# enable Python only on final ABI
-	if multilib_is_native_abi; then
-		myconf="$(use_enable python)"
-	else
-		myconf="--disable-python"
-	fi
-	use elibc_uclibc && myconf+=" --without-versioned"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--enable-shared \
-		--disable-resmgr \
-		--enable-rawmidi \
-		--enable-seq \
-		--enable-aload \
-		$(use_with debug) \
-		$(use_enable alisp) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		fgrep -Zrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
-	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_src_install_all() {
-	prune_libtool_files --all
-	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
-	docinto ""
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
deleted file mode 100644
index cb7eb79da92f..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.1.8.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
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit autotools multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-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 ~sh 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} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-		# enable Python only on final ABI
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_enable thread-safety)
-		$(use_with debug)
-		$(usex elibc_uclibc --without-versioned '')
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
-	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_src_install_all() {
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
deleted file mode 100644
index ba510e926095..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.1.9.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
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit autotools multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-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 ~sh ~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} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-		# enable Python only on final ABI
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_enable thread-safety)
-		$(use_with debug)
-		$(usex elibc_uclibc --without-versioned '')
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
-	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_src_install_all() {
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
index 57e4844a5096..22cac7d92c34 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
@@ -13,7 +13,7 @@ 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 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild
index a9f1cec60974..c09b03a0ee34 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild
@@ -24,7 +24,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
-	"${FILESDIR}/${P}-ucm_add_asoundlib_h.patch" #700870
 )
 
 pkg_setup() {
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
deleted file mode 100644
index 3c6072b8c3dc..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Sat, 23 Nov 2019 14:38:35 +0000 (+0100)
-Subject: ucm: use-case.h - add <alsa/asoundlib.h> include
-X-Git-Url: https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=1a4b362115b5e1bb4f5b888919ffd11736adbf0c
-
-ucm: use-case.h - add <alsa/asoundlib.h> include
-
-It is required for snd_ctl_elem_id_t and snd_mixer_selem_id_t.
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
-
-diff --git a/include/use-case.h b/include/use-case.h
-index 8a37121..80073ef 100644
---- a/include/use-case.h
-+++ b/include/use-case.h
-@@ -42,6 +42,8 @@
- extern "C" {
- #endif
- 
-+#include <alsa/asoundlib.h>
-+
- /**
-  *  \defgroup ucm Use Case Interface
-  *  The ALSA Use Case manager interface.
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index d5fa9a51fe6e..a31be62d3020 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,3 +1,5 @@
 DIST alsa-topology-conf-1.2.1.tar.bz2 5377 BLAKE2B 95cd1074068ba85e6c6b74d65f7ddc40e182426cff69c7765689edcaca3609a249638c70e5f92c889b3c76ea662e7e43e355af4573acb3fc293026392f614522 SHA512 ed86e7372f887a2e13596ca7456da1db84ff05d01f98d80c403263673d2c0f247834bdc9edbeb62231ca1dc6b9792dade87672d905303a8e0fa462c1fac1b7fd
-EBUILD alsa-topology-conf-1.2.1.ebuild 467 BLAKE2B 72f7b3bf2ab1dc0497f93856a957a2f2017c6e4fb485c9c3d2962fe322a67c668b573d8a9338d009da1869022bd675805ea6072a8d1d19b367b8af8a4f1c4b3b SHA512 11b7ec96bf472fc9700b9a6f9b44ce69353484782144d772f0af11089bcfdf301a727ac5ecaad9a924f1cf118c239611f4d944a08119789452c7d0c70f32a331
+DIST alsa-topology-conf-1.2.2.tar.bz2 6346 BLAKE2B 6aea93139e85de3d28ce19319429340eac61bb340c29448dfa14d4fe1d80dc1e5e0c066b33ccab3d9c620efe6b95b095cf1ea52583d7543ca472f1375dc5ad57 SHA512 145ee0e16f7f84d5f97759b1efaa3df9fe35c8b33c7ae863ae1b915f361acd902ad05f59090e1d98b2a4f2ecc14933681592893564fcc45cdbc974899f789b94
+EBUILD alsa-topology-conf-1.2.1.ebuild 507 BLAKE2B 3f32efdb65cdff89332a99c294ad272cf3304a306aa1b52ecff7532d375e9ca8d09c064380c2301375d1952599bd40efc195bb3a6375ca07e38f8770d2e54232 SHA512 c04e9d789a25e023d179fa58bbd8a05513be44425bcee6fac215dd9ae5a3ba980398fb0ac1998514e2eaa5bf187f1e6d3b7e3853eba76d6c087e70d6ce469c96
+EBUILD alsa-topology-conf-1.2.2.ebuild 455 BLAKE2B a7179e25434ce14b3782079a42a035824a0026097f95e64e2d80554b60ba6bd33c7c41fcf7d029027a4a5dbe94124dc74d009956945dd7bf1c4d96f42a0d9c0c SHA512 8b8c99a757e87711fc068d5bd96a8d40d8c88f93f2eba62ba3525f833e9757124de1b7bb729f9f98bd3f6c72b4780301da6a61cce8aac5457aea04b63497a0c2
 MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild
index 601cff7d674c..12ab431d5ffd 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="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-topology-conf/alsa-topology-conf-1.2.2.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
new file mode 100644
index 000000000000..717b000c1287
--- /dev/null
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="ALSA topology configuration files"
+HOMEPAGE="https://www.alsa-project.org"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r topology
+}
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 117d86f85c9b..9dd13bcfbd62 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.1.tar.bz2 14593 BLAKE2B 544d513dc578e8d5a684fe953421880684c7b0472a05b0f6a5b3994e2cbf6af7a319856f032557cbd1215fcb6565a31cbbeb577f211773757c55b29ba65ceb08 SHA512 af1f462199fb30438c7b85e34d9dc74d283843e67e52ef138346e5d83098e4752156d746b107de92390e82eb2a78b87dc3920362b9dbd5e1153f6f8a39683534
-EBUILD alsa-ucm-conf-1.2.1.2.ebuild 461 BLAKE2B effc2f52c3488282f0b78c9ab94410d0fff947a3cb8c75484e7fef8a02b27f8af8d8a8229a6380d68a7acb0e60d16767ae1ac71e02ba9d82c8e315e296cadd49 SHA512 7394b69ef62438daceb63f5f74eaffe333689f67a00fe1d8c36cef4be31df09dd4d34b443bd0145d58cfc9c40dd60b1c9c5a90eb4a914140104fc40a4dc8b0d4
-EBUILD alsa-ucm-conf-1.2.1.ebuild 454 BLAKE2B 81ac047a6e226f13d293634a595acdf50e64df6871b83f849f01693091caad84d44d1a0df010447400797e98dc2801a2306139a539a4b0bdb6f9c91f8a078a59 SHA512 fe3f0c7b94dac038d70c26485ff14e6e21098a406f3478ddfa9ad55f8df8d56f4e455374895c1c6e2b7850a68b3b81f8f8bf992b5855f8c0730c965860f8babf
+DIST alsa-ucm-conf-1.2.2.tar.bz2 14608 BLAKE2B ce850415a115f673267f6ab32f176c2ab73aad8bd7cf2be244bfbb7342756c6de2212044cb92b3524dc4189955c8144b134af144b6a15aabf33c06cbcfe1fdf6 SHA512 25e3f341c110772c7cffc8c7745b320f2ddd12fe6460380c088939b5dc67b99ae4ad92e69375179574e0e1c40d14ff49961e86494e223fde009e51590f00ca8f
+EBUILD alsa-ucm-conf-1.2.1.2.ebuild 501 BLAKE2B c226358500fcb74dcee29395f1dae91006c66a5c4c2ee14f1c95fdbd45c52d35603ff97ba5d6c7d40946796877011282f6a4adb6cb75d42abc518858aa5541d2 SHA512 c09ea99ff11a98a8f2c97c5865643ebc484c6b5b4cf230190628f97b91f6b640cdc0fe7d344909ac4f41923b25a8104416a85cf5a36eacfcb39be0c0f87e1c62
+EBUILD alsa-ucm-conf-1.2.2.ebuild 449 BLAKE2B ffac90f73ee1e12713be464682ef0fe21515bfce445430b6b6e6f74dac6734bba22e74d958176c77d22932fb3599f880d2a03184e60458b1817739bc5027b54b SHA512 4feed2362947276ccb3d7c3e8a4e41666f187f45dcb7d1405d960d34b9e829b52d67acae4a241ab13305f854c567f2d597578c444c3489baf0ff797583af1982
 MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild
index a4806991f68a..9ea117d0b0fe 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="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/alsa-ucm-conf-1.2.1.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
index 3daa74fc1922..bcceba239e5d 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.1.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.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
@@ -9,14 +9,12 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"
-
 src_install() {
 	insinto /usr/share/alsa
 	doins -r ucm{,2}
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 9c0fa2f7e3d3..29d1fb82a8e3 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,3 +1,4 @@
+AUX freeglut-3.2.1-gcc10-fno-common.patch 3500 BLAKE2B 7163acef56f8f1bfebeaed554ecbe7a27dc3321bd19f5da5c1f482f52a447acf7bff3b8358d8023d8552fa5fa999475b70e3ec7242e8a127000ee7b49f2f751b SHA512 0845bc4c91c6233cab8c56d15d1efa8fcdac7ae12270a089f8dd20520fc5c94078b7abceadef304f8f42cd575a61ad5b1f444f21e0bbdd3ff310bcc40192336b
 DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
-EBUILD freeglut-3.2.1.ebuild 1373 BLAKE2B 98d21dfb81cbdb733fe62c9025c6d4bc51ddd671ba96b384469755c2e589ee3874adecc3a7e73399ce6981c7281be9f457425d3e9f5e8000b83df38a80f832ba SHA512 064fc266920044ed4b854ec7e948c4c93cfbdf45df3151828c227788318ced1279f5572f1551d2ad81947a00a4893f352e4c3f847c7cf51d9b79909559fe695b
+EBUILD freeglut-3.2.1.ebuild 1434 BLAKE2B 384883c33216f15a5405dc5118fb84c39db768526837a1242e24818a57ccea813167998bf1b8c5267373c3a7506640c7618575c32c53b785a27ffb4529a3dfe8 SHA512 1744626450f59494087145f17594e1fa999deb229a2990d7150ad807ff4c0a7f31e88fd97cd444c0905ba436f00b5735664776f42d3816aad8eb0b21f3c9d07a
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch b/media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch
new file mode 100644
index 000000000000..655c01bf94b4
--- /dev/null
+++ b/media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch
@@ -0,0 +1,81 @@
+From 5791564dd934d193df771a0a7c52013e9f456aa1 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Tue, 21 Jan 2020 22:33:49 +0000
+Subject: [PATCH] fg_gl2: fix build failure against gcc-10
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+[ 31%] Linking C executable bin/Lorenz_static
+/usr/bin/cmake -E cmake_link_script CMakeFiles/Lorenz_static.dir/link.txt --verbose=1
+/usr/lib/ccache/bin/cc  -Wall -pedantic  -rdynamic CMakeFiles/Lorenz_static.dir/progs/demos/Lorenz/lorenz.c.o \
+   -o bin/Lorenz_static  -lGLU -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -lm lib/libglut.a -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi
+ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x0):
+  multiple definition of `fghGenBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x0): first defined here
+ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x8):
+  multiple definition of `fghDeleteBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x8): first defined here
+```
+
+Note: duplicate definition comes here from 'fg_gl2.h'.
+The fix is to move declaration to a 'fg_gl2.c' file.
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Bug: https://bugs.gentoo.org/705840
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/fg_gl2.c | 12 ++++++++++++
+ src/fg_gl2.h | 14 +++++++-------
+ 2 files changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/freeglut/freeglut/src/fg_gl2.c b/freeglut/freeglut/src/fg_gl2.c
+index 38b0acbb..f79c432a 100644
+--- a/src/fg_gl2.c
++++ b/src/fg_gl2.c
+@@ -27,6 +27,18 @@
+ #include "fg_internal.h"
+ #include "fg_gl2.h"
+ 
++#ifdef GL_ES_VERSION_2_0
++/* Use existing functions on GLES 2.0 */
++#else
++FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
++FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
++FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
++FGH_PFNGLBUFFERDATAPROC fghBufferData;
++FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
++FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
++FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
++#endif
++
+ void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
+   if (fgStructure.CurrentWindow != NULL)
+     fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
+diff --git a/freeglut/freeglut/src/fg_gl2.h b/freeglut/freeglut/src/fg_gl2.h
+index ab8ba5c7..fb3d4676 100644
+--- a/src/fg_gl2.h
++++ b/src/fg_gl2.h
+@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+ typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
+ typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+ 
+-FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
+-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
+-FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
+-FGH_PFNGLBUFFERDATAPROC fghBufferData;
+-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
+-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
+-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
++extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
++extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
++extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
++extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
++extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
++extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
++extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
+ 
+ #    endif
+ 
diff --git a/media-libs/freeglut/freeglut-3.2.1.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild
index 5efa6e624137..dec72e4fdd67 100644
--- a/media-libs/freeglut/freeglut-3.2.1.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.1.ebuild
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-3.2.1-gcc10-fno-common.patch )
 HTML_DOCS=( doc/. )
 
 src_configure() {
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 0cf590ba3e48..7f1920a3df2a 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -20,9 +20,9 @@ DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350d
 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
-EBUILD gegl-0.2.0-r6.ebuild 4966 BLAKE2B 5d9519f7231a6643256cda3464ac0c712a160729d6b0cd4de848f6a154a15432b97b3b52cbf7e5b768843b22a3683b9a081170ed58c094fd2c2ccd8ae3bd0aa1 SHA512 e9e67922c51df429818367276817f0a45caa88f4b8f950d576dfdb83cd210fe087cb51b415bfcb3d48793f07f59faad8a2a9c5d7eb3a3faa75b315cac1f5dd95
-EBUILD gegl-0.3.34.ebuild 5331 BLAKE2B db971910eac714ea5fb30fffb12ffd0c62f48a6157ef8ebb1901c860221c2686b65b3449eb3c23c55bd9ee717e707aed0034c92b61307e430805186df0fea94a SHA512 0d0ffabc97835fdaafb0ca4a971cfd48ba71a6d1247006a3e738fe546329d29f8c1aaaede72044413171d63729b5b578913d4e5aecf05623d4e282068faa9bb1
-EBUILD gegl-0.4.16.ebuild 4872 BLAKE2B 5126609563c9d39b6d4d6c691e9c1418859461a936805238f493b53d2766a5240a5cd9252e4659bdb99f9a72df068c601170885243fabb000210223c6dd651bc SHA512 c86beb3fe1024a23ad1ce8307e05c985124b2c74d03d0d2a0abebfbe6749ea76437107a15eefb7e4e5da00cd45d1d485f38c5ce5d34052f9f811839f2837740f
+EBUILD gegl-0.2.0-r6.ebuild 4939 BLAKE2B 1cea4185489267540158e408740ac0c13a264959c0acca692e62c9336eea686044629f1eec789223b6591576ff4bbfe75614781804029675cfc6dafae8d246cf SHA512 91ada6e1e461114a3891ec8537d1542485c2bff9e8772f1ed689cde04ea30cb45ff77e9000445da707e196604a85c3b3007c4a110d1d8d40bf32283b31857df4
+EBUILD gegl-0.3.34.ebuild 5304 BLAKE2B a3877874e7960972db09997d510b2d3e1c96e2ea219e6c1d986485bee353fd4c857946fd9a479edeb1c7c14165bb0f5d59506e62e04ec8177f5f06e18a8748de SHA512 b003ef341c85fe89c6e8a359f2bcdbdb48db79767045bb88fb79b851e425f661836fdb6579898d994bc44162643f2ff887e974b199d94b5df427f64089ca6650
+EBUILD gegl-0.4.16.ebuild 4847 BLAKE2B d715f3ae0d1b7d4a3991d769d91537493f25cdb51a64783c8a1ce172d4bc0980b3897bd09bfce146bacb52e3de4d70b7ee80bc81fe17eebdece191109264dab8 SHA512 fa95f438de91116b9f5e4720a146230a65af69f7b85f3d6c7432cf7f4321e2ce0b198cf473bc8d18819cc371dab119e0a8ecdf8bbbe0c21535bf3da3e87e8af5
 EBUILD gegl-0.4.18.ebuild 4878 BLAKE2B be26ff0bb228295832b675317423413b400f277034eebba4214115398ae281254d784be6f6d1f1a314dd9ff3c58ecd3d6397143c8331c0668245a1675c982737 SHA512 dbf8429b00f79ed230dac38b9e5c8ea63a32dab638ad3af173359bd25a332b2210195583254dd4e0588910c860a2007dde21ebd9bf39d15be8acbbe3d408f3f3
 EBUILD gegl-0.4.20.ebuild 4857 BLAKE2B cf94e6f7a15e4824f5f97bc9dfc0ad3898a92fa6f7bfced65966621b9a515cea29b89c371d051f75e98b4b9e51568327ccdeb933ea8e81899e93166da10b34c5 SHA512 e3ab09d1214fd189bebf8fc052961a99e31be19848621da3ae03955800ce9deee0a02ee0b6b47485eed786da653ec1527bc87e6e9c5532db94f2b39de1a519ce
 EBUILD gegl-9999.ebuild 4465 BLAKE2B efcc8cfd2a932d910f2a82ab444bc6eb996077fa5ed0b9f9838c16fab29bddbba3eecdddfdcbe90f176a3c55c46360f0fdf67d2daa5195b4e4e62b42066cbee7 SHA512 e73cce2fb1b7d5cb0b1a4af2efe1656e3b48a71e3f97cf573f51691a70073a4c9c1a17f35c8365549e7bd2651ffb573429f5eef0edab298850134ca840df11c1
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index a5ed72cf6603..a8b67b0bda39 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -121,7 +121,6 @@ src_configure() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=451136
 	#
 	econf \
-		--disable-silent-rules \
 		--disable-profile \
 		--without-libspiro \
 		--disable-docs --disable-workshop \
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index f0b3e39ac8c3..6d8e3d45a67c 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -136,7 +136,6 @@ src_configure() {
 	econf \
 		--disable-docs \
 		--disable-profile \
-		--disable-silent-rules \
 		--disable-workshop \
 		--program-suffix=-${SLOT} \
 		--with-gdk-pixbuf \
diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index 6db995f70e12..e0e76c54584c 100644
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.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
@@ -113,7 +113,6 @@ src_configure() {
 		--disable-docs
 		# never enable altering of CFLAGS via profile option
 		--disable-profile
-		--disable-silent-rules
 		#  - Parameter --disable-workshop disables any use of Lua, effectivly
 		--disable-workshop
 		--program-suffix=-${SLOT}
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 254367e44d51..29024b14c631 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,15 +1,8 @@
 AUX glm-0.9.9.2-avx.patch 1124 BLAKE2B d7cf404b222d98ea4771c354ad3afa712e217be0a4e917c026f79cfb7262e1be9faa2efe85c5bf2cae8df446b421b5f3c1c5545fcc8f6cf3181f6b50425dd680 SHA512 a6a67dccfd9eeecf3ddf083de89da2fd48498a1d815e58d82a9f53feab164d46450c8a41978fcb131b9517e468bdc0949ce4c15b1b24ffe9c0dd6e94516c7874
 AUX glm-0.9.9.6-simd.patch 427 BLAKE2B 9f6e4637ff526497ba9a77247125d1fe5f06eda9bb689b5c42661deb72703b004e2c18f7236503f0673b354ba0e6fa7b13361606ea64fc0e7b9e55eccead91a2 SHA512 72f46827cd6651dd6fddc7ba548f8d9132fd74b9799a8eca6e94435141e96f752917b4343d4c3f37536bbc7713e978e4d85842da6d262c086019eb85f351a431
 AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e602da1d49126cffbd28c2aab2e2dbe711d047d482b4aead45d1e8770ab571e23e895201b4d SHA512 c875971c208bac82c1a326ebcd327ec9dd92a5b86981d26bf759516107204876a401ac9c57ca6c9965021364678ebbffcaaca6a3b4ee0e532d468d7b03b3ab9b
-DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
-DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02 SHA512 50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1
 DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
-DIST glm-0.9.9.6-install.patch.gz 7594 BLAKE2B a273e1e2adc6bdcaab2a3b66457b59e42384215c19b12ce6d27706d74c4d0ec5f010912c295dff4300a44ebc16cabc09c381df5dede01daf7ebe60cf8b95d060 SHA512 bf489673077dcfc821264cbda55d63cf7a01f4e27cdcadf3f6e0d73f016a24fe590142144e2fa5d074cbc518acf34164653c31a346ab6909cfbd7af6c294e79f
-DIST glm-0.9.9.6.tar.gz 4354114 BLAKE2B e62af8d4fe22eced565a2703f5d02ad935a18a4c9352302fdb203c85149b9374066684246f940e417882d2700d13b93fc0232921151680ec58c9df80ee0be1fd SHA512 1bc8fc1da21e19f95d4a24259993c7932db328fdd2d0db68dbf60c07f372e19003a8df094fb4e153bb7f50df584c17cf0a540d3d3c38b7a287f3b55314ec2d70
 DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d6092ce3cd7fa93bbf29f5247c42645bc920a3dbf3f0b4b61eb1e47f46514d9cd98c4e6df133ced0072ba6a570ee SHA512 9c557788d6382777317c94f8b30bc3df7e533877705514fa5d384f97b076d6bc750e841acbecdec8113e21af07bd8850159f5f1e079aaa2cde25540b480f983b
-EBUILD glm-0.9.9.2.ebuild 928 BLAKE2B 249029f2fc8e9ca124346e5b5ac3a216c069d61abd1910b36c34f49601d367216fdb426c5df78dcf3d2952cb3fe64e2e5bc807d8de0793d0576ae0993d07cfa0 SHA512 fb5eebd6f6bd8e026828708749ac8659dea4af0eff083372a7aa458f157d03adc10ffe72445fec85b35ec06b607895fef5addc9356d880c37a7f569f276add7f
-EBUILD glm-0.9.9.4.ebuild 889 BLAKE2B bd801b50840bd50869202ca22adf6e877aa48d3817b2d09c5800c6e4708ff03578cdcad3fbd9d87144c28b488b2bcdbecad44e6bba3f819330aa5b28700f22ac SHA512 954dd2e6d9263793b8924fe9a6db7f9036af0f439dac005f9df5ac40a8ebcf5eed55f9a8dbcc75ee0e9384731eb56999e927289361c5175c46be22db35e7a7bc
 EBUILD glm-0.9.9.5.ebuild 888 BLAKE2B 8b24c2462309c9ee9447cb55e443f6b02971e62b038ba3147b33a66a3324c94f056acfd690c412cacaf009c21296ffe002ce1c84879dab029d3f48c3d6bfce65 SHA512 79bbe88e3487f1ea637272e74c4e81f0037c5249aead813e4ce3060adcfa3040efa2340a3fb3fa7a31fa6f8a0ae129e0b64bf8d1e5ef394d91b8fca614d830df
-EBUILD glm-0.9.9.6-r1.ebuild 1030 BLAKE2B 0f06f3cc185b1a888deb28bc96387432a03e7c770e928a1436012c63aa2642d7d5019eb57071411fbc0b624ec59a8a4a8140425a9fbae9ea3b91b8f01db869da SHA512 77cf7c42c718aa860241acf83b0db18199c07c6da79e51ae8563c3314e17e2fcc0da6b765270ca9feac19fa24233adf204b59444e64b1c0221038ae0aae35190
-EBUILD glm-0.9.9.7.ebuild 1229 BLAKE2B 829c68198f35298f4bb7c469eff56846b5b23d46b6e72ab8c91b4ce401fd93c3ca09550beee7d370a7bff6424fdd00249fa79de9b6ff86ed27d5af7585182229 SHA512 294d7faa1bb212b57c0ef5919e195fdc753a448481cc48ccf5481cfae3033e18a402f8bfdbee1824b439baa3cc1156bd1ada573f9e746975310d6866a022cb7a
+EBUILD glm-0.9.9.7.ebuild 1226 BLAKE2B a22afbc22638699834caeaca4892d2b586bf7827b5e7d827ce941d9660a78a4bfbc37edd523fc13498a51b7d85c367a716d6d8e12947597936448770c409757b SHA512 f7d278ed5a57446e86611f6733bad135f81a741c81ec5b9cbbc02ffcbd710af6f40642003a988410ef88cb9bb2e6ad6a944d5b5dd09a368d1c42dbfed917632d
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/glm-0.9.9.2.ebuild b/media-libs/glm/glm-0.9.9.2.ebuild
deleted file mode 100644
index a196c92bc9bd..000000000000
--- a/media-libs/glm/glm-0.9.9.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="OpenGL Mathematics"
-HOMEPAGE="http://glm.g-truc.net/"
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( HappyBunny MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
-IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/opengl"
-
-PATCHES=( "${FILESDIR}"/${P}-avx.patch )
-
-src_configure() {
-	if use test; then
-		local mycmakeargs=(
-			-DGLM_TEST_ENABLE=ON
-			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/glm/glm-0.9.9.4.ebuild b/media-libs/glm/glm-0.9.9.4.ebuild
deleted file mode 100644
index 13639d0788e4..000000000000
--- a/media-libs/glm/glm-0.9.9.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="OpenGL Mathematics"
-HOMEPAGE="http://glm.g-truc.net/"
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( HappyBunny MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/opengl"
-
-src_configure() {
-	if use test; then
-		local mycmakeargs=(
-			-DGLM_TEST_ENABLE=ON
-			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/glm/glm-0.9.9.6-r1.ebuild b/media-libs/glm/glm-0.9.9.6-r1.ebuild
deleted file mode 100644
index 6facddfdf0fa..000000000000
--- a/media-libs/glm/glm-0.9.9.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="OpenGL Mathematics"
-HOMEPAGE="http://glm.g-truc.net/"
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/${P}-install.patch.gz"
-
-LICENSE="|| ( HappyBunny MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/opengl"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-simd.patch
-	"${WORKDIR}"/${P}-install.patch
-)
-
-src_configure() {
-	if use test; then
-		local mycmakeargs=(
-			-DGLM_TEST_ENABLE=ON
-			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/glm/glm-0.9.9.7.ebuild b/media-libs/glm/glm-0.9.9.7.ebuild
index d806cb6f3757..1b2292b614d4 100644
--- a/media-libs/glm/glm-0.9.9.7.ebuild
+++ b/media-libs/glm/glm-0.9.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index d89e1d82725f..e09ec7400a2a 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1,3 +1,3 @@
 DIST gsound-1.0.2.tar.xz 282068 BLAKE2B b85aa42c82c346b4541b38c971be46a35f0276d6cc34420cfc1a0e0ab0b4e25aa02829c17e8cb1d4258acc32d1d9c70a51dfac576046820f84e9ce9821c203ce SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0
-EBUILD gsound-1.0.2-r1.ebuild 836 BLAKE2B 59406918df089c929b623e50d3547ed4ef81fe63d8e6ca243df6e8be339ef45b1ab6c395646decd25d6a292a50501ae4c35b42df10c53cf0d4d118a7d858dd27 SHA512 1c110de8452eed5311dd2ac03504806f914b0fb0c7b9b53f1d7081d1b8aa1bc46d06d2dd4dfcc4254593424ddf4d0486dff29c0a3890d1b939d3d3d0d80eb585
+EBUILD gsound-1.0.2-r1.ebuild 835 BLAKE2B 20783da2497157094aa9b6305e35a946ed7469a2ac3dd2f3e74e40d7af1df0d4ecb990835a6522e16c67f799ee53c7cdc90e707bf36c50bffc3bbe7f68ae3f58 SHA512 9f154e73011e55051b152735b0415cd90f97765c42146bb27f90bcc02d11be07cc138ddcf2a0e1c9850bb4f4eef44b38bfbe7ce452c1eb400215e201e3a432eb
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-libs/gsound/gsound-1.0.2-r1.ebuild b/media-libs/gsound/gsound-1.0.2-r1.ebuild
index 7d43c6b5d04e..ef942f7e5821 100644
--- a/media-libs/gsound/gsound-1.0.2-r1.ebuild
+++ b/media-libs/gsound/gsound-1.0.2-r1.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_configure () {
+src_configure() {
 	gnome2_src_configure \
 		--disable-static \
 		$(use_enable introspection) \
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 5675e2ecdf1c..ce91b99d6bf5 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,7 +1,7 @@
 DIST hamlib-3.1.tar.gz 2130615 BLAKE2B dbc348d5df04015e1706b6f165496f0b0d9a4f7ce5e5ba6c8589349c1c9c1119ef31e8c3d4ba14666d19f3638bf27ad9b4a566af2fd4054faafc0604b8aeafd0 SHA512 befc5c407379e30711bde2affb9c191add6dbb04a36c1309f8771170cf04156c48609a094775638036282e085de6c78d09ef8d2760d69c595471e16e985e0885
 DIST hamlib-3.2.tar.gz 2223125 BLAKE2B c9bffa2b4d2aa4b3f9c590276058c159aa1236f22d3f37a063124af09002dc3034a88fd6f1273b5f4562ae22618222ea50c254fb59384bfae778448fe029ef49 SHA512 9aec2d361980abafdedf7b80f5b8bcf5b71f4f0c32bbfecebc0a50e6f74eb263ddc5188cf77283ed7361baabedb8364a2ce94a12fdda1bbdfaa0a030f510f224
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
-EBUILD hamlib-3.1.ebuild 2146 BLAKE2B 6df82502b57856e0f1e4328c1a13a825cfb329f7da72842e5a5191893ab53a89ccc570d12c8a988cdee84a4eb6a0f0bf4eae2ad37bcce52304c548ca23211aaf SHA512 49897ae1082a8c7442a99c388d7be1691f70fa8085d0a65cb225f77cb651bf43c0ca6253838676d6cf6d6b3ea6d836701676b806b70217eee77df0d60665ecfe
-EBUILD hamlib-3.2.ebuild 2163 BLAKE2B 0c576caf1e1d6457d9e5d8aa5f68ed2bd9aa1814ee41cc84ee3823e5061cd79fc44727314eeb78572bdd0473aba923f69353a2e65a0b74bf72cb4aa6f0326337 SHA512 e7a5ea8a5506fb5db5c2217ad50bbf56e7e0bd1542c6fa4e2810d5b8a0125430952f96aa13e4e678aac79af87e922916e598ad8878f946bda52b218a68a91f31
+EBUILD hamlib-3.1.ebuild 2118 BLAKE2B cf465e4a550819e167799bd078934b27b70cd2fb7fb3ebad4a57f3319fc8e9ba2a911fdfe4a687578602123d779468e09017c8861c137b0c33209a7dbef93992 SHA512 edb41fc07c24a558d9445394dec0fad71b826fee9c9d68c09adaaa30b036b47d40713bf385f7ac27c3dfa114a1533f7abe81551384366d2e168ba7472af47c3f
+EBUILD hamlib-3.2.ebuild 2138 BLAKE2B fe56143078dea009d776ee2bbb569301443ad063faf74e0b36a5496d94ac9f3cd18725bfdede0bfd8a17fea312ec55b87f6a461403da18f6a34ef2df96d46725 SHA512 7aad2a1a6d43bcb83a6dfd1207e57a6c4c68ccc5218f8c37ebe7dc369b144c6ac7f9937814b4d03bf073b9cf3c8501e616e66ff400c019a327e82fba29960430
 EBUILD hamlib-3.3.ebuild 2018 BLAKE2B cb9d883705cb8aca8b94a43da7ba097977ffc0aa28e9629da4c9585f9c70a6273f09fb02c5897feb1b66f5ad922853ef0a9ef8034b8127830fc73b66500538d9 SHA512 3553647a517a792ea5f58ffd719fe03f124dbbdd925b913e6368b9f02bfaf1436f9458daacf825afa64f899f73890f144d6d4deeb552e418e3a339f650a59155
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.1.ebuild b/media-libs/hamlib/hamlib-3.1.ebuild
index a7bc3b024dcb..890f0209c90d 100644
--- a/media-libs/hamlib/hamlib-3.1.ebuild
+++ b/media-libs/hamlib/hamlib-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -66,7 +66,6 @@ src_configure() {
 		$(use_with perl perl-binding)
 		$(use_with python python-binding)
 		$(use_with tcl tcl-binding)
-		--disable-silent-rules
 	)
 	autotools-utils_src_configure
 }
diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild
index 351a58259c60..bdbd7a2b584c 100644
--- a/media-libs/hamlib/hamlib-3.2.ebuild
+++ b/media-libs/hamlib/hamlib-3.2.ebuild
@@ -66,7 +66,6 @@ src_configure() {
 		$(use_with perl perl-binding)
 		$(use_with python python-binding)
 		$(use_with tcl tcl-binding)
-		--disable-silent-rules
 	)
 	autotools-utils_src_configure
 }
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index d2128f87e6f5..9268b790b128 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -2,5 +2,5 @@ AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac0
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
 DIST libdca-0.0.5-constant.patch.bz2 3424 BLAKE2B 048d7afd856090b5f9d0db1d5894b78d037fa1c03086271342527a1bf04f41ed379b38fe6d72eb9bbf74a864c67710b5f9abe53177cdb2f4f53a8e7502d77c44 SHA512 37bd56b8c240f16a6ee86b04d44571345278f8b9dd395cbc307e9fb7e6c001487411d1b4775af19dc97f18fcaed63be97fafeb4fe504f0a76b87022ec792d23e
 DIST libdca-0.0.5.tar.bz2 393291 BLAKE2B 093e941e8cd25ca52ae43ab16607f8ff3c5ebb95ffc4b29c3cb771b6bf9ba45da4cc8ebd83cd91ccd66b0dd981c32a6c77cb3e90f46093b64b9a483dd854ffb6 SHA512 d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
-EBUILD libdca-0.0.5-r3.ebuild 1469 BLAKE2B dbcebcd558d617827fdc2453c6c0bf1b008b08252cdd1de7455260d28cf071e5b1d40c1d8870fc85b6abbf5de965d853bb081b8832833c83d169bab7a4100cb1 SHA512 85e2d01964880a84b51079fa4e42901ba63004e9f414f2ed312cc614ab9b1ccf0f9717e3b5aafdec49fa5a3c665fb4569ade71f98065de5954075630cbe812fc
+EBUILD libdca-0.0.5-r3.ebuild 1435 BLAKE2B f2983cc36bf9c06175caa83e739d50b78e8fbaff8e51bb971c11e25bfe8b2c149d961c4f2535b340c7bffb54423447e18fab48bc7693d6517e3be3318548daf5 SHA512 af3956e3447aa94a66f850a87b6e9f818b3cd048812c82f1da2accc0282c2094bf77fedd9ca18c113afdb757ab6bb5492fb440f1637916561f50d70a9bf3c7e9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
index 93a2bc366d26..793a4fe1a886 100644
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild
@@ -31,7 +31,6 @@ multilib_src_configure() {
 	append-lfs-flags #328875
 
 	ECONF_SOURCE="${S}" econf \
-		--disable-dependency-tracking \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
 		$(use_enable oss)
diff --git a/media-libs/libemf/Manifest b/media-libs/libemf/Manifest
index b7fc6aa5ec2a..2074d08aa89a 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -1,6 +1,6 @@
 AUX libemf-1.0.4-amd64-alpha.patch 3194 BLAKE2B 323edc7677dda422d6a3669ee7cd117fd7fb274265dcc2032b033e13bebfb027a0ee581fc2430283ef465e7fa75a2a087e18a57467c5045aad0d22e20b32c532 SHA512 6e37fcfb52724923ac20f6c6d42450834824e2003f2002802f89b4d9c8b9709af8b179ca94ec80938c20cd0a3ca895021777b088ea95ea593aad2746749d0ee1
 DIST libEMF-1.0.4.tar.gz 818060 BLAKE2B 0abc5f478d06ebc562323a515c51c46afd2a98fd2559d8a309c4b18f16da8063cd65fa7d19a83ba360e8c53a7e9788b590e810d615000069fe7c912194a8eec1 SHA512 8abd6081e79e6045b0a4a1575fbcc19921beeefb22036164ed906a35e4dbc67b6959899acf46bb5db5996ae07cf38aaecf8eb62dd6bf5f528200a4d20b13db55
 DIST libEMF-1.0.7.tar.gz 908973 BLAKE2B cfe2c67bfae9fd7387f5332fa7b5038510d81aab942fc87b04da625ecc39c3e2b711ed14fba46eabae4a2eced4621eb580cedf1c9e67f32fb33afb9bc1ceaa5e SHA512 eff5c46a6e1008d8f581fda59355faa608a825e4832c54dbb074bf20caeee5b038ce18ed3a13181de04bd0601837db7f5c5a0913eb1b8301100dbc26a9ee5888
-EBUILD libemf-1.0.4-r1.ebuild 866 BLAKE2B 6768fc7613671dd38e8d1f9be488a857d706215b734c8c0a7aebff63cca70ca81b5c7908d5fcce835bb1571752c7e815b8722a9f0b340285a3085d98e1d43071 SHA512 4a4322363eaf6030af4c093f8bec408523244fd95a40e98449672a7fb32c7a89b5eee5e3a80a812cde282d4911c311621a583e753e52a77e4b34089912af9ba0
-EBUILD libemf-1.0.7.ebuild 814 BLAKE2B 1be439839cb779087f2bbecac7847e2e87c4e4052c89529e7fb250a81466aae0d0736032dbb2d1c934fa51cd6d56a177d94a558265d04704a50c5f3506df64e8 SHA512 cf8a5f7f03d9d9d7da8b9e971b6f81e04c3e79ba8b5270442ab88b9da65e3cfedab6858b941f350e2cafff39fd8cf9eb9580cf5a431e98ba90d81d22401d6e24
+EBUILD libemf-1.0.4-r1.ebuild 864 BLAKE2B 7c6720af9200e2417baf17d34c8776e2ec9422a9d283d362807b3c8b69b6ddfc53872692fcdab74f83aa3151398b231a9401ebfe806b729883b1c73dbc5c13bb SHA512 dc75bcb21bcd45634877aae19feccbc2048c01e58abbf6e2bba6647c2f55ac1985fede7c38f701975562135327e7b5e7c6f77a5c80af9e10229771db20006fce
+EBUILD libemf-1.0.7.ebuild 815 BLAKE2B a6eba4cc0279401fb72110e17bcf082c6768fd18c3aa3ad94559622680bfba3b7936e15e623078c895cb9147882bca8d36751496cdb8199dcd7ae170bc590bd4 SHA512 b0b3c94474b8aaa809456b89222886f1f0fdf0672d355895f1835e7151a4f5bd8419b8abc31c5ad932afb31167e621049d5feccfa46309209b780a6a3efaccbb
 MISC metadata.xml 248 BLAKE2B dce07ccd35cdf8117e7f05bbe068c807c381bb91d899d48834974c1d362cc25c3d114dffba55b67c669b96893cfcb7cc56451a6ad833cc5b5cf89f577e714b27 SHA512 89826cb9b2687c78bf585335d0f103d00a5c58d9e5902003e18710e9a8afff7304bc39f3909de99f2b14b4b8a6a007a1f0e3aa5f90bf31d0b8d7314a3c7edf05
diff --git a/media-libs/libemf/libemf-1.0.4-r1.ebuild b/media-libs/libemf/libemf-1.0.4-r1.ebuild
index 73fdf633c943..6f4feb321144 100644
--- a/media-libs/libemf/libemf-1.0.4-r1.ebuild
+++ b/media-libs/libemf/libemf-1.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 PATCHES=( "${FILESDIR}"/${P}-amd64-alpha.patch )
 
-src_prepare(){
+src_prepare() {
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	autotools-utils_src_prepare
 }
diff --git a/media-libs/libemf/libemf-1.0.7.ebuild b/media-libs/libemf/libemf-1.0.7.ebuild
index af83fb2002e7..b2375485f9f9 100644
--- a/media-libs/libemf/libemf-1.0.7.ebuild
+++ b/media-libs/libemf/libemf-1.0.7.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=5
@@ -19,7 +19,7 @@ IUSE="doc static-libs"
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare(){
+src_prepare() {
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	autotools-utils_src_prepare
 }
diff --git a/media-libs/libfishsound/Manifest b/media-libs/libfishsound/Manifest
index dffe870765b8..c5e9464700f3 100644
--- a/media-libs/libfishsound/Manifest
+++ b/media-libs/libfishsound/Manifest
@@ -1,4 +1,4 @@
 AUX libfishsound-1.0.0-pc.patch 410 BLAKE2B a949e5c3e843017f7c901ef936da4dac2f9d3300cc6fe57032d28bfba94919baee9a77054464cd97c567bc90733bbd6cd92fa25f7fb4a41cc38e5f502b075eae SHA512 b4b5f70363633702ed1932454bf8133d24ff7703f432ebd0c8721e33d48c1a21fc996c4759713fb2272f230038b40fe6cc773aea715726dfee13066669e32f1e
 DIST libfishsound-1.0.0.tar.gz 444980 BLAKE2B eadb6bed80d51fa7399f9557a38b65183a4f583e431bc68ee961dcca947856c79f011206fdcb04ed6ee5f709e1045b2a9c4fd4a34afa00b09656b1a4623c3ab0 SHA512 97d850fb42b394fca098a96b1784da431a0af1d54d57127179b612e4b88a7a2e406eb1411f55536e5a11ec2e8956f2659182c60ac46d49f6d14250e39a740339
-EBUILD libfishsound-1.0.0.ebuild 1004 BLAKE2B d973991296c28287e4ca56a574431bdb0695349e1cce6435ce2282e7ca00c6afbb7fdeb9e2458f771ca9b8cf5d4e4ad44ed41f10287556fe797b89c3812425c8 SHA512 b5f7cfa3a9e290349dfcc591ba626e4356b29d2491ee5523ad6e7f0c90c1309d5ce3143e13dc4f6ad6e54c7cdba8794f447786e81b4d166374a1b2addf744874
+EBUILD libfishsound-1.0.0.ebuild 963 BLAKE2B b7f1b6bdfe3b5c2e58dcfb9e448b173e19ac57c83a1d555f2e9063c3e91b35117c9395144f7e39f3c32c8b616b1de8bdf33097647650033081ad297a5fc38edb SHA512 11ae0d117078a20bc80045051be6f9c904be4f3f16437388a4b9bd088f22dac832dfc2a0218afa380ebb1b1022dd112900753b2df17e1d737ad43436e3f2c426
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libfishsound/libfishsound-1.0.0.ebuild b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
index d5fe387728b8..9c9167f6dd94 100644
--- a/media-libs/libfishsound/libfishsound-1.0.0.ebuild
+++ b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,9 +37,7 @@ src_configure() {
 	use flac || myconf="${myconf} --disable-flac"
 	use speex || myconf="${myconf} --disable-speex"
 
-	econf \
-		--disable-dependency-tracking \
-		${myconf}
+	econf ${myconf}
 }
 
 src_install() {
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index de63be524a65..d6c21b06d802 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,3 +1,3 @@
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
-EBUILD libggi-2.2.2-r1.ebuild 1357 BLAKE2B c05fb3974263e38defbcc6c461f610f1b9da79f190389e619adb9955ab5afea3420a9508069d61b8306bb30b3eb5a4eaeffc6fe86bcb26c27e91c839587accd7 SHA512 58a480b60210e41ff39e55202344ae3e0b9a8cf0269b04206f200434ab4828215cc1dcb95e0f2a7ea53179a6371ca7f95098ea5e87df955fb44b8da543066c84
+EBUILD libggi-2.2.2-r1.ebuild 1358 BLAKE2B 2073ff37e0d6000746e1730cd5e8cd1b1b7551a69b6eda0bfa641c6bf4215719181cb0af14580673d84911939d8fb14fb790584b2abdc16a7c3ba2da5669010f SHA512 e83a71f93f830905bed6b5fa5eb9fa256213b42f779a7d3105c1d031f8aa2ec41426e18b0bca5008817a4c98d82a5fdb2711a51c15e4fd3dc1eaca24a2c000ed
 MISC metadata.xml 386 BLAKE2B 8e5a70d9b2afb8a35826b2742206a4470427ba4daa42159129226374836cc5d3bb254c0e64411208d836aa5bf1e615a987bc93a6d5dd874c7ad309ccd8f7550b SHA512 9ce52c323ecbb57d46f69ecffd48a406b800078e8f67fcdb744dc9b86a3806c30455a1ccf144b139619388668cefb7250e1708581a5954862d695d5f284fe3c4
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
index a716a009e6be..1bac00c0c483 100644
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -49,7 +49,7 @@ src_configure() {
 		${myconf}
 }
 
-src_install(){
+src_install() {
 	default
 
 	docinto txt
diff --git a/media-libs/libggigcp/Manifest b/media-libs/libggigcp/Manifest
index 131d1bc8636e..ad163a6d4435 100644
--- a/media-libs/libggigcp/Manifest
+++ b/media-libs/libggigcp/Manifest
@@ -1,3 +1,3 @@
 DIST libggigcp-1.0.2.src.tar.bz2 365368 BLAKE2B 797b1e739319e3982836ec2a7eb14626ea39c116a593703af4de4486b0f43b4ffad89fb4a5245d50f434a97265651554f450033fa66b086a35c76837227b2d6c SHA512 88187eac6f9cae56a2e4d184c0eed2f46c8e53c8b69143479775330abc3f03b48f463ecc944788daade871e4bedf86948c2dcae714c037f8c1284b1576428b3a
-EBUILD libggigcp-1.0.2-r1.ebuild 624 BLAKE2B 7fa0138383761fce187eb569531961a8e8279a3d79e41737d0fd1bd8c9ae90f63e496963fe11a1964a84ae221a5a821c8a892b4cf46c7958f14131f6ae7c76e4 SHA512 54c9224da9730e35370e1fc521fd43f457bece67e943840144687979baf53ed1ede2a77f30b9270124b46b760e9fc6325962017b5bec86524a52063a125fa305
+EBUILD libggigcp-1.0.2-r1.ebuild 626 BLAKE2B b4de5097650067ce6d7510d820c307b8f537715238969e625e6e0672e84bfafc0701a65e25476902439aded2d684133673a57c320197b27cbf3aa66df4709c55 SHA512 7459ab4e7b7de096595e4e8ab337baf6ad7b576cce8d0a9089d700ca448147c3ad753cfd195ccf608ab05c734e0cf7d4049634a4b1ab998808d2328083221c1a
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggigcp/libggigcp-1.0.2-r1.ebuild b/media-libs/libggigcp/libggigcp-1.0.2-r1.ebuild
index fc72067cdbe3..57d17475016e 100644
--- a/media-libs/libggigcp/libggigcp-1.0.2-r1.ebuild
+++ b/media-libs/libggigcp/libggigcp-1.0.2-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
@@ -17,11 +17,11 @@ DEPEND="${RDEPEND}"
 DOCS=( ChangeLog README doc/TODO doc/libggigcp{,-functions,-libraries,-structures}.txt
 	doc/colors{,2}.faq )
 
-src_configure(){
+src_configure() {
 	econf --disable-static
 }
 
-src_install(){
+src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 4c9e131fb3fd..76a6f604e1f9 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,7 +1,4 @@
-AUX libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch 2300 BLAKE2B d4e39da8f901d08e1c5162df928fcb000266e408ad7e7f2a5db711c2afc4802868263b0c82f941ce91f39f5a7ad6c3175013396a0c9fac0c68f6a79f462c8b5a SHA512 d1a0ab923011b93379bff803989f824d91efab378b785862916f12c2fde63c0ff80c4c4bad8d9c6b6a371098fc70d4d08d7d9c5b7fc3069a05c7f91c1b57b428
-AUX libglvnd-1.3.0-meson-Fix-the-armv7-build.patch 1279 BLAKE2B b21502bb309d3d45f51421b9474cb6d4a56a4c0fda637a093d8445de69f79bd36e8f2392d7389c152bf77c7a288ecd37b4c2457e0b86eaefc570a4c63eebffa1 SHA512 6b77410c4370ec7016e43c9be315478f83b8ddc254a3161d3f0e109f640bd1821438539de30ba64e2f599e0869a9cb9a5e01d35f00e0321d49f66733f7a9b3d6
-AUX libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch 996 BLAKE2B cd1d29e2a7bf48669b87c630a165f35f5f27a8a31cd664fb7cb1e4df4240151d6b48820d0d32de5dc3f352888e92c00e4eb29610cf58d5f61b19da1e100422d0 SHA512 e55ed7dba293d4366fbf24a4b6711d56038cdf39f7aea7aefa0d191563ca0ae1e8c0850a8181b0e315aa986804ba641373c6f7665bfc08d571fcd4c15b77b3fe
-DIST libglvnd-1.3.0.tar.bz2 713781 BLAKE2B 15014038e8a0f14fc29892354b282535735af0f29e244e4826b945071deec151783fc042f3588add24c31f35a5c72c53bfb1090c109117466f8b8c805cc67356 SHA512 d573fc4a1114be9468afd6e035b3815111f9a7e7453bc2b127c93a1b8a01c7f20440ff8872fbae8fc93aab98862dac3224ceca7f28d02e93f3b9a641d1a248e3
-EBUILD libglvnd-1.3.0.ebuild 1579 BLAKE2B efec0a225b9655c64c4fa1e9951d203ad2884ed05376b4b7d28e88fa537d65b3c2cd23c26a22d730474590312d0fd94226ed2f002ccf7e914656d8d2443933fa SHA512 50c3d8a79b7d10e67893c3bc127c1a8f5cfe05651fd01d71e02baf2fa663d278e31bbcd83610e6dbfb180b78c6400d1551ff33124c89b611718b7586a2dd1e1e
-EBUILD libglvnd-9999.ebuild 1378 BLAKE2B b7768837f805d81b881b756cb7a955296e63b9d6a2fa79b7df8360920d56b949e6e5a8e8ec9b02d4c18f26cda2a87df2d90f8610b1f1ee790f940dfba5210ce2 SHA512 1476d7e60692f2d5feab1ae648977e1e58f25069023e803539a8f3d0951bebb0d7e09e0e4488ffe91ec7d3635258223b32ed51455a839fa0ec1e033761a11924
+DIST libglvnd-1.3.1.tar.bz2 714436 BLAKE2B 31b91f678b0335a7db3e697129dabd157c37fee0ec0f81f7d0be68ffcf9d6be2989a929f7b1fb87b505168ab4a3cc07b4cecf103f1d5a2a3b866eedb5a3a494b SHA512 99bbe8447f7791c8a4b2ab4e9f3067309ea3ffb9a042b0b5e80d1eac7e6e36af8b5ec56ec3266f34343d705521827956f2fdca27be386f40e130cec300e8342c
+EBUILD libglvnd-1.3.1.ebuild 1384 BLAKE2B f327ec99b7e0c620dcccad15a40c2afdbe0b94fde4ea787426cbe01b0664d8d2549cbbee9d871eb01181dae14b15f7eaa0cbd6bd6f346df180fe2bf12b4bef18 SHA512 1ecaf13bf65b15f2201dc4dbbe9166de3f506c563d32db547140f34a56bf029c3242f0a333fd2957d36db721cba54e88b76d9dc686db884671fb5f3985269ad0
+EBUILD libglvnd-9999.ebuild 1384 BLAKE2B f327ec99b7e0c620dcccad15a40c2afdbe0b94fde4ea787426cbe01b0664d8d2549cbbee9d871eb01181dae14b15f7eaa0cbd6bd6f346df180fe2bf12b4bef18 SHA512 1ecaf13bf65b15f2201dc4dbbe9166de3f506c563d32db547140f34a56bf029c3242f0a333fd2957d36db721cba54e88b76d9dc686db884671fb5f3985269ad0
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
deleted file mode 100644
index 51a26c8e0dc8..000000000000
--- a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 5ffb8df0ae243f611a0752950443e7a9877e502c Mon Sep 17 00:00:00 2001
-From: Kyle Brenneman <kbrenneman@nvidia.com>
-Date: Fri, 6 Dec 2019 07:27:54 -0700
-Subject: [PATCH 2/2] meson: Fix the PPC64 build.
-
-Check for a cpu_family value of 'ppc64', not 'ppc'. 'ppc' is for 32-bit power.
-
-In GLdispatch, fix the file list for the PPC64 entrypoints.
----
- meson.build                          | 4 ++--
- src/GLdispatch/vnd-glapi/meson.build | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 44c7172..602e837 100644
---- a/meson.build
-+++ b/meson.build
-@@ -55,7 +55,7 @@ if not with_asm.disabled()
-     add_project_arguments('-DUSE_ARMV7_ASM', language : 'c')
-   elif host_machine.cpu_family() == 'aarch64'
-     add_project_arguments('-DUSE_AARCH64_ASM', language : 'c')
--  elif host_machine.cpu_family() == 'ppc' and host_machine.endian() == 'little'
-+  elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little'
-     add_project_arguments('-DUSE_PPC64LE_ASM', language : 'c')
-   elif with_asm.enabled()
-     error('No ASM available for @0@ (@1@ endian)'.format(host_machine.system(), host_machine.endian()))
-@@ -118,7 +118,7 @@ if use_asm
-   elif host_machine.cpu_family() == 'aarch64'
-     gl_dispatch_type = 'aarch64_tsd'
-   elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little'
--    gl_dispatch_type = 'ppc64le_@1@'.format(have_tls ? 'tls' : 'tsd')
-+    gl_dispatch_type = 'ppc64le_@0@'.format(have_tls ? 'tls' : 'tsd')
-   endif
- endif
- add_project_arguments('-DGLDISPATCH_TYPE_@0@'.format(gl_dispatch_type.to_upper()), language : ['c'])
-diff --git a/src/GLdispatch/vnd-glapi/meson.build b/src/GLdispatch/vnd-glapi/meson.build
-index ce20178..200d476 100644
---- a/src/GLdispatch/vnd-glapi/meson.build
-+++ b/src/GLdispatch/vnd-glapi/meson.build
-@@ -55,9 +55,9 @@ else
-   elif gl_dispatch_type == 'aarch64_tsd'
-     _entry_files += 'entry_aarch64_tsd.c'
-   elif gl_dispatch_type == 'ppc64le_tls'
--    _entry_files += 'entry_aarch64_tls.c'
-+    _entry_files += 'entry_ppc64le_tls.c'
-   elif gl_dispatch_type == 'ppc64le_tsd'
--    _entry_files += 'entry_aarch64_tsd.c'
-+    _entry_files += 'entry_ppc64le_tsd.c'
-   else
-     error('No matching ASM file for @0@'.format(gl_dispatch_type))
-   endif
--- 
-2.23.0
-
diff --git a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
deleted file mode 100644
index e520ae7ff4a8..000000000000
--- a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-armv7-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9ccdb05cdd620c4ae9454010f419d7d11c0efcdc Mon Sep 17 00:00:00 2001
-From: Kyle Brenneman <kbrenneman@nvidia.com>
-Date: Fri, 6 Dec 2019 07:22:40 -0700
-Subject: [PATCH 1/2] meson: Fix the armv7 build.
-
-Fix the GLdispatch meson file so that it checks for the value "armv7_tsd" for
-gl_dispatch_type instead of "arm_tsd".
----
- src/GLdispatch/vnd-glapi/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/GLdispatch/vnd-glapi/meson.build b/src/GLdispatch/vnd-glapi/meson.build
-index c5319fc..ce20178 100644
---- a/src/GLdispatch/vnd-glapi/meson.build
-+++ b/src/GLdispatch/vnd-glapi/meson.build
-@@ -39,7 +39,7 @@ if gl_dispatch_type == 'pure_c'
-   _entry_files += 'entry_pure_c.c'
- else
-   _entry_files += 'entry_common.c'
--  if gl_dispatch_type != 'arm_tsd'
-+  if gl_dispatch_type != 'armv7_tsd'
-     _entry_files += 'entry_simple_asm.c'
-   endif
-   if gl_dispatch_type == 'x86_tls'
-@@ -50,7 +50,7 @@ else
-     _entry_files += 'entry_x86_64_tls.c'
-   elif gl_dispatch_type == 'x86_64_tsd'
-     _entry_files += 'entry_x86_64_tsd.c'
--  elif gl_dispatch_type == 'arm_tsd'
-+  elif gl_dispatch_type == 'armv7_tsd'
-     _entry_files += 'entry_armv7_tsd.c'
-   elif gl_dispatch_type == 'aarch64_tsd'
-     _entry_files += 'entry_aarch64_tsd.c'
--- 
-2.23.0
-
diff --git a/media-libs/libglvnd/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch b/media-libs/libglvnd/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
deleted file mode 100644
index f3492462ddb7..000000000000
--- a/media-libs/libglvnd/files/libglvnd-1.3.0-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a322bd006c5e505a1a2406828211736a93c99924 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 15 Jan 2020 19:21:02 -0800
-Subject: [PATCH] tests: Add _GLOBAL_OFFSET_TABLE_ to PLATFORM_SYMBOLS
-
-On PA-RISC, the _GLOBAL_OFFSET_TABLE_ symbol is always exposed. See
-
-https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blob;f=bfd/elf32-hppa.c;h=2e653083ce05a77b3e33c056e2f9a51b327c2b22#l1001
-https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=blob;f=sysdeps/hppa/dl-machine.h;h=9e98366ea3b09612d54a3e956d5c35c1bdc86560#l80
----
- bin/symbols-check.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bin/symbols-check.py b/bin/symbols-check.py
-index 1c028e4..1548638 100644
---- a/bin/symbols-check.py
-+++ b/bin/symbols-check.py
-@@ -30,6 +30,7 @@ import subprocess
- 
- # This list contains symbols that _might_ be exported for some platforms
- PLATFORM_SYMBOLS = [
-+    '_GLOBAL_OFFSET_TABLE_',
-     '__bss_end__',
-     '__bss_start__',
-     '__bss_start',
--- 
-2.24.1
-
diff --git a/media-libs/libglvnd/libglvnd-1.3.0.ebuild b/media-libs/libglvnd/libglvnd-1.3.1.ebuild
index 75f6c80d4e7a..aa0f129196b9 100644
--- a/media-libs/libglvnd/libglvnd-1.3.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.1.ebuild
@@ -41,12 +41,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-Fix-the-armv7-build.patch
-	"${FILESDIR}"/${P}-meson-Fix-the-PPC64-build.patch
-	"${FILESDIR}"/${P}-tests-Add-_GLOBAL_OFFSET_TABLE_-to-PLATFORM_SYMBOLS.patch
-)
-
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature X x11)
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 444880b86a29..aa0f129196b9 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libifp/Manifest b/media-libs/libifp/Manifest
index 71a67de19308..4e4a25d9dc5d 100644
--- a/media-libs/libifp/Manifest
+++ b/media-libs/libifp/Manifest
@@ -1,3 +1,3 @@
 DIST libifp-1.0.0.2.tar.gz 358550 BLAKE2B 3d9e9d82d0147286d3c577bfcc43d2052b643dd3e86c8770fc6dc56047f8c7923e4e04b6463cf895e552be423f887df48d6741173deaf165aa62d2e64ec1332c SHA512 538ddcf0be4bf7427a7f8ebb60ec77f22b69aa26055fc279f884bd82bae4e32267c79ac37f4dcf9970806e520549bc93dbf0aa2501c9c4fc699a6855e757a331
-EBUILD libifp-1.0.0.2-r1.ebuild 1348 BLAKE2B 5bf1276869e5d41c78ea954a18858492397a0fb7be37a9b8d20dc46559da9eccb1c641d81b57f1663f2ba0d1ab14058fe440fd0f11d83b3bf72d108c1d796f03 SHA512 9431465bb7b2d931a0682755e8eec944a99e482e12b403e129d1703e542b6e0979cf369f27f46be8ebdc3fc012073eb8539945c7315d66a8f2c592e552a93e50
+EBUILD libifp-1.0.0.2-r1.ebuild 1314 BLAKE2B c8b6c3de69a6ccc05af0e6e09a13bdb939c8c0abbc0513e40e5afd84159290e71e6405849d4222358fdaa89d055a7c5b48e2d81f97e54ab1ab63e7904370183a SHA512 54eb289bae0a8ff5d9a0f304a63a928324ab095bd8e6d9cecd0b4b0d63b5b8d957ede23da3bc51debc80b529ec12dc4e0a05b4d528093eb34341752f21779395
 MISC metadata.xml 333 BLAKE2B 87a4530824fff1355c5d2af1b6483b6fb1752c5a346b5848500b7962307a2e9956727f08e753b1548fbd941352a4563e9c14ae386bd46f238f8929cc2d46970b SHA512 d0cd8f6fc7bdc757d2a1ef5443f30410514ac335bcd2a84829995c527862b994fc75a8dfc5ceff2b8e2a3d7b0b081a57cbc50e4b825567b8a56d0f9eb00c13c7
diff --git a/media-libs/libifp/libifp-1.0.0.2-r1.ebuild b/media-libs/libifp/libifp-1.0.0.2-r1.ebuild
index 0e6a83da9e67..c9bb45c9f64b 100644
--- a/media-libs/libifp/libifp-1.0.0.2-r1.ebuild
+++ b/media-libs/libifp/libifp-1.0.0.2-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=7
@@ -28,7 +28,6 @@ src_configure() {
 	use doc || export have_doxygen=no
 
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
 		$(use_enable examples) \
 		--with-libusb \
diff --git a/media-libs/libiptcdata/Manifest b/media-libs/libiptcdata/Manifest
index c79afdc9c749..c75415b44fa6 100644
--- a/media-libs/libiptcdata/Manifest
+++ b/media-libs/libiptcdata/Manifest
@@ -1,3 +1,5 @@
 DIST libiptcdata-1.0.4.tar.gz 569132 BLAKE2B acfac5b4f5945f38da47a5280b92939089f2efa8e4ceae9ad00d9d21c7f062445f63c74d61493e711102789edb8c98ffe49083635f67e836a87c32e1127371e5 SHA512 8656b2febaec133d1a8783252047672bebd58ae9ceab5477c4acfa35bcc381dfda08b655a957b962878af28c69deff77d920e780c84b4debdff2f980b3de94e8
-EBUILD libiptcdata-1.0.4-r1.ebuild 1141 BLAKE2B 9e4e3c541b3552f5a666a832da41889b9f9f65b49bca686acb167e41487ad5d341302355aceedbcdd97803d2b231902cdff06101476f334543f409c5e7fa34b6 SHA512 3173de67b174e4d70493574c80262902d6f3e66ceae67bd788697545413114a1c4484d6f001398df36fa69faabedadb6c789981b094ed9d0dd89eb540be54b46
-MISC metadata.xml 891 BLAKE2B 295b069faa521215b2e2f347401697e7e9a679ccef8b9de59a45c7652bc316f1e3a78934342a24101f1855108ffe8b77245aa01c483732d01a931cc2498d539e SHA512 09fe6f1a7e13e09dedcde51d212282fc31809bd05051e0ec6678909a12b9229be50198c1f4e51272222f0d58eb526e9a9620bc2872eff1d3a404f46da7455aeb
+DIST libiptcdata-1.0.5.tar.gz 593779 BLAKE2B 7e5226a289fed5c2f4b662efaa693a8b38e95ac34bc1365af05d1af649be876d3e5b58fecea4818255879bd7518aa482cb623540601fb3c8065acd428439a29c SHA512 64ef44b1e639890004f31d5d42844ba25ed558f0a118f1dad9bc3f4dcad2457e51b825a13df849659b0e15afc78f528f330b03be94cdf156bd95b62dc419494a
+EBUILD libiptcdata-1.0.4-r1.ebuild 1139 BLAKE2B 2cec1e3d39934017a6a1db4971f68b3a763cb60cc381fbf2d400a04d4e491009062fcf27c4098e4f79e88152e34cfca7aa2d3035c59280016428454b8456293e SHA512 cbd63bfeebfdbcd963b33efd5a09f36d9ff646f293922be28add16279715e0a91136364f2e2d8080ba26c8e49b19aacfa9e5a264fb1f893fe51ceffe43d954a5
+EBUILD libiptcdata-1.0.5.ebuild 1157 BLAKE2B 457f9be1de4459feda5c4837cfc435c20f7592452c7b7084717e93e659630beb3930db44f9826c38173b6a205cdd1ce8ffb0a416c7905f68075c2e643632e373 SHA512 fbe4cf33953ea74222dae2ad4ac8a55268c6f87be6ce005de61266e189942323161420f7f7fd8370ca01212f4b81636a1224b68e1b5998f7f4cae12897c54670
+MISC metadata.xml 1088 BLAKE2B 6871a600af857b89a4d372d514754a1b8c1989d0ca33ad418baf42a9f7baf088e79dea0220a054dfb9518b5edfc766dc5ee39d3c0336304cb61d7e22aa7e8e3e SHA512 bf7b79f193dd31cca18c658a163b1619fb32f92db3310da719725c611f15ae5711ac11285b53063a3e669644e12d80a69804fa04a0050df3ae998c5dcee7d2fa
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
index e3e4b56931df..a4c5b0033b85 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
@@ -29,14 +29,14 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-src_configure () {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable python) \
 		$(use_enable doc gtk-doc)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild
new file mode 100644
index 000000000000..0aaea7ec8323
--- /dev/null
+++ b/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit python-single-r1
+
+DESCRIPTION="Library for International Press Telecommunications Council (IPTC) metadata"
+HOMEPAGE="https://github.com/ianw/libiptcdata http://libiptcdata.sourceforge.net"
+SRC_URI="https://github.com/ianw/${PN}/releases/download/release_1_0_5/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples nls python"
+
+RDEPEND="
+	nls? ( virtual/libintl )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( >=dev-util/gtk-doc-1 )
+	nls? ( >=sys-devel/gettext-0.13.1 )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure () {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_enable python)
+		$(use_enable doc gtk-doc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install () {
+	default
+
+	if use examples; then
+		dodoc python/README
+		dodoc -r python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die "failed to remove *.la files"
+}
diff --git a/media-libs/libiptcdata/metadata.xml b/media-libs/libiptcdata/metadata.xml
index ddce428cece9..e578bbc24402 100644
--- a/media-libs/libiptcdata/metadata.xml
+++ b/media-libs/libiptcdata/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>vivo75@gmail.com</email>
+		<name>Francesco Riosa</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		libiptcdata is a library, written in C, for manipulating the
 		International Press Telecommunications Council (IPTC) metadata stored
diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index 89d2d0785562..9217db18d2fc 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -1,5 +1,5 @@
 AUX CVE-2017-15185.patch 1132 BLAKE2B ae218573443dc724c4136cd5602c14965a146479212c769929e1a60be2f2056b2703351adb8dcee92851666557db71d8303347921343d94a4db96848da827086 SHA512 5336c71917c34b84c882b2afd01d31141db816c1a6293ab1cbc87138b4d7a8288d4ebea8fc7cf882d907c0c07f5b827d9293dda082d6c8ecf3aafd002e540951
 AUX libmp3splt-0.7-libltdl.patch 672 BLAKE2B adca950fbde7d41e6c657711964b8db2ce0b607750aa1227eeb1f620c3cc47306ea1f5c064a297e563bc9ef83e99e2d5a658b6292b301ff4d3d12fb3906a7d32 SHA512 8707dcf0a23f6466c0f8d0bfcce8ecfd8840ffec09f3c7a66f039be5f707b0b561d5462ad9b170e2bca9dc4872a61114a8d515f702b9e7e79af2deddbce6385f
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
-EBUILD libmp3splt-0.9.2-r1.ebuild 1286 BLAKE2B d4d4ab491ca04328db1de81b54a0d05467dda29138f1423c67277cddcfef0fb922106256b9b1c4792a0e928f8298ef3b9fe211ad3abb98529144694d52095cbf SHA512 7030babeccbac98313e454bcde362b434b032149680bf3f2d27a9083a42f61fd8c7ae2d41d21abebc6f34f073242d636265f5f49f26b1e3210a66fd4c517f96d
+EBUILD libmp3splt-0.9.2-r1.ebuild 1252 BLAKE2B 7743cafa4f00af8ac3ad23691e18b74b0314a017d433bfea07bc045d1ac67fa079b358701881fc6866a674ebcfa4a5a185ea26f72e0480cf90206aa39e534469 SHA512 94668060ca959377fdda7d65f179141b5b6e29f30e4ada17e4af18c3e3a569ea3681671c99bc8a1db82ff2b56614f232999f33a156acab44f1e2c4e166d34bf0
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
index 0d68ef5a01eb..8c7d738565f9 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
@@ -32,7 +32,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		--disable-static \
 		$(use_enable pcre) \
 		$(use_enable flac) \
diff --git a/media-libs/libmpd/Manifest b/media-libs/libmpd/Manifest
index dfc27d9d5e7f..1acdaafbdcf0 100644
--- a/media-libs/libmpd/Manifest
+++ b/media-libs/libmpd/Manifest
@@ -1,4 +1,4 @@
 AUX libmpd-11.8.17-remove-strndup.patch 439 BLAKE2B 35f5f6efc5233ea61ce7967c52bf69d3aa44814d3506534d4272ef3df454e93e14005cce25b929d066dd4e4d1c1c28a08e7d6b59c490c1926e46fa61d1bf8511 SHA512 0b0c3b28abd7aaf540d6133ad5a72f5e0fc2cca593bc870106c17d9b1828a2bb35880436a489261ef1c56bbb176e0809d6f09165108bf867f776902cd5757fff
 DIST libmpd-11.8.17.tar.gz 365015 BLAKE2B ed6afc3a90fa8a6b6e53ecfd67d195133a6bbecf4ddb3960247b5b2944624f0851d73229145a2ccb7eb3ca84b1d3a245dd3cc1de39f3bd9d5bd21f58f6576e18 SHA512 ffe2880834a4a39745a5327d628781e16eeb8cd1ec17402dda46ad96ff402bc0d8b4312ba058a39242ad9bb8c3a0bb6feb2c5ea2a30ef9be97652fdb5c02572d
-EBUILD libmpd-11.8.17-r1.ebuild 887 BLAKE2B a54cb895fd8fcd61004d1af5725af97046a615b83d44709763e582398b33e0ffef899bbcac9659da266a93e31f974cf9263350c8dc45242b804a9bf4be6e5309 SHA512 4ee6b2d9cdaa735ab2d0e6e3c21c19bda8fb15d7dcb11f45aafb576ffefdc69b1cd0e8f38a280a56fb5c53a425bc7caba6964f988750c7eee14e18ddf365c909
+EBUILD libmpd-11.8.17-r1.ebuild 837 BLAKE2B f8a57e6ec0a77c30c8b98b278a48549c17f7f43acedf45238452166e9aac31c21c823c923deb594b88df4afb2941356378171bd2d54b90981ccbf15502f3aa5a SHA512 9318f49b24ba571539193b63e13bd1bcf67652d14c22220eb4e881b64bfbd0cfa2caf2b42608417d7a07406d27343bcbb7b05f8be3261022daf01d7f9ef2126e
 MISC metadata.xml 333 BLAKE2B 27806f87ef8b911b13474c3c0f406b3a38bc9df0e382ace36708f93b51fcf42dbc7c66584581659a5d45181b6c098d0fbf6595fda863960ccd69edcd7d061f23 SHA512 41be33cc0e14bfb6e59a8eca29178bf98c97784f397d5f8f7fb199ef320404fd4ea7c55fc99d2db7cd6c75d905ddef52b5b0e89cb8588774613ccc5c5c5e05b9
diff --git a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
index cd7942f7a702..896019b910a0 100644
--- a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
+++ b/media-libs/libmpd/libmpd-11.8.17-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
@@ -22,9 +22,7 @@ RDEPEND="${DEPEND}"
 PATCHES=( "${FILESDIR}"/${P}-remove-strndup.patch )
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	econf $(use_enable static-libs static)
 }
 
 src_compile() {
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index d3a3525e918f..6a8d2f828f1e 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,7 +1,10 @@
+AUX libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch 940 BLAKE2B 229252af799b13bbb309407ad9ef0424c8315ed23e4a68459ba37737ee7bed5c787acfb034cf4aa195f0568e047bedfa83ecd5ace6dcdc181a806c27a0f4e5ac SHA512 4d45973d8775e227345de65ae6f6a2de5379eb4fcbe703bb88410c64986255b2de766a8d3665fc795d057c12df4aa1ea703e94c19a0aee28562c52e2b70b8bf8
 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 1379 BLAKE2B e3603b7a33c563d63cae697e8bca9f1c4dbb94d6872f96207db9867a53108ca78270e637c6063a747158ecffcfedabb687c6a06b6a3c897f5679c32c45326635 SHA512 4343dc01b4d811b94f5b735a6b42a4ce11330c3f62675d5a0e06b68adf9b2ab49b3103f6189874f0c1a5fc5ede3b2a7de4547f47fa91dca90bcc0f0588e3ecc9
+EBUILD libmypaint-1.4.0-r1.ebuild 1719 BLAKE2B e3108b8ee6b9e3c17184d2266ca35ec4cd6578e7f6f02165e07ce5b2084fd39fd3366ba475033abc4c1d7b2e7453f0e5219149e5bcea76c0bc86eacb2e0b12da SHA512 d358058f3d2ade007b951ec3f0fdf3b2f62f2b49344c2fa696f2f58e47813b59718ab93e937b26e7f4bcdbc12fbc469dc5f71203af537016c32426a30d6bc26b
 EBUILD libmypaint-1.4.0.ebuild 1555 BLAKE2B 20c7fde8d07575df537f208890bf45ba552aa1efe6aafe37a792daf21d28ec150e554290cfe169595cccd4020c082117cb6ffa49f43315781bc359329475508e SHA512 c3685b89a00747c57f7b2739d27914044b77b87fd14d6062aa97bd9732f89180f28ea0892e54c2045e57e351e76664dc97b5c38a7f88038cb49ac6a55a9f1cea
 MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc
diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch
new file mode 100644
index 000000000000..8f4b713b3af7
--- /dev/null
+++ b/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch
@@ -0,0 +1,31 @@
+From 748e735e7fffd2524bb3552fd79b2a2c13f60711 Mon Sep 17 00:00:00 2001
+From: Jesper Lloyd <jpl.lloyd@gmail.com>
+Date: Wed, 11 Dec 2019 18:02:35 +0100
+Subject: [PATCH] Adjust generation script to be runnable in Py3
+
+---
+ generate.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/generate.py b/generate.py
+index 6ab3dd0e..1e0b4ee9 100644
+--- a/generate.py
++++ b/generate.py
+@@ -26,6 +26,7 @@
+ import json
+ from collections import namedtuple
+ 
++PY3 = sys.version_info >= (3,)
+ 
+ _SETTINGS = []  # brushsettings.settings
+ _SETTING_ORDER = [
+@@ -82,7 +83,8 @@ def validate(self):
+ 
+ def _init_globals_from_json(filename):
+     """Populate global variables above from the canonical JSON definition."""
+-    with open(filename, "rb") as fp:
++    flag = "r" if PY3 else "rb"
++    with open(filename, flag) as fp:
+         defs = json.load(fp)
+     for input_def in defs["inputs"]:
+         input = _BrushInput(**input_def)
diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch
new file mode 100644
index 000000000000..1413868094d5
--- /dev/null
+++ b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch
@@ -0,0 +1,34 @@
+From 68e2c33add0aec09f1898aa80ef4f822bed67b87 Mon Sep 17 00:00:00 2001
+From: Jesper Lloyd <jpl.lloyd@gmail.com>
+Date: Tue, 17 Dec 2019 17:36:22 +0100
+Subject: [PATCH] Drop python2 requirement/recommendation
+
+---
+ README.md   | 2 +-
+ autogen.sh  | 2 +-
+ generate.py | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/README.md b/README.md
+index 96c748da..fae90566 100644
+--- a/README.md
++++ b/README.md
+@@ -35,7 +35,7 @@ to get started with a standard configuration:
+ 
+ When building from git:
+ 
+-    $ sudo apt install -y python2.7 autotools-dev intltool gettext libtool
++    $ sudo apt install -y python autotools-dev intltool gettext libtool
+ 
+ ### Install dependencies (Red Hat and derivatives)
+ 
+diff --git a/generate.py b/generate.py
+index b613f91d..cd7e99e8 100644
+--- a/generate.py
++++ b/generate.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/env python
+ # libmypaint - The MyPaint Brush Library
+ # Copyright (C) 2007-2012 Martin Renold <martinxyz@gmx.ch>
+ # Copyright (C) 2012-2016 by the MyPaint Development Team.
diff --git a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..92b25f6a172c
--- /dev/null
+++ b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools 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/$(ver_cut 1-2)"  # https://github.com/mypaint/libmypaint/wiki/Versioning
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gegl introspection nls openmp"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	gegl? (
+		media-libs/babl
+		>=media-libs/gegl-0.4.14:0.4[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	openmp? ( >sys-devel/gcc-5:*[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}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-drop-libmypaint-gegl-versioning.patch
+	"${FILESDIR}"/${PN}-1.4.0-gegl-0.4.14.patch
+	"${FILESDIR}"/${PN}-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch
+	"${FILESDIR}"/${PN}-1.4.0-drop-python2-requirement-recommendation.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+}
+
+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/libogg/Manifest b/media-libs/libogg/Manifest
index a4e3ba35666e..433c4ae50b7b 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,5 +1,5 @@
 DIST libogg-1.3.3.tar.xz 417636 BLAKE2B 2fc69580ed94be520c8e6b764e6271ec60e9d83d4265ca0408df4b2e6233a0f1d68e79400bc3871cc130034697ba97cedc453a574b9c6f618c9b819a93a2d3e8 SHA512 37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b
 DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
-EBUILD libogg-1.3.3.ebuild 860 BLAKE2B d9a95ff1d1de6c8a649bc4a1072395ddf405902e6147f89d8745808fa48396a4ea98528b57405f57b1c4e3bbdb363a9c0c4151d6c8af522d715157e48986b34f SHA512 ca82b29dc6b4a4db02b416031f71c0d4bbe20a73d1facde0e48d756702714eed6a5bb500a71f33684e5848621c9780dd56a8dd9bcb478ac84c475b038ded2943
-EBUILD libogg-1.3.4.ebuild 877 BLAKE2B 1228a4557f1d7200fe734a413fb5af96df94227961275f31f8d45c3854938a36efb3c9b05d78004759b5d1d0792fea6efeea61cc4c3a52c76cf5c1ccde07a310 SHA512 e199e2ffa57731dd0f0e79df6ca6ffbe3fcdc972f1a2d56e32c92834731e7ab30462bc8e05a2dbf00c3ea755f2b51bab5af3016c9b3f06b11860a825cdee69ea
+EBUILD libogg-1.3.3.ebuild 763 BLAKE2B 3132e663b6543634067ce8095c7cdddacedec1612d5e76f54c5502f2f37bac1a3a9d10b375ac0a27cbc61784b33b5c4fd95fe0f07e0e7fd7bdce2d425b72861c SHA512 3e97dba0084b9b9b419fd80f75b9dd6e85719c72143d04f2039e88d6b641152d0a2027e5dadfd0e9fe143fa9d9e3628a8b03f7b981d29ff841cd4a1edef63719
+EBUILD libogg-1.3.4.ebuild 780 BLAKE2B 8aa1fb4468a03c41e740c6449318ecc3c6144048f144843866be4ec316b79e96a8e848d931d49759f0b75e0f82de7f8f8b07dea977ee60d1c2460810ff9b9e34 SHA512 538edc515949b21c6cf9a24f9c2d2a1f332d4b88f0d9f4bd2e5d9f38f80a4151b82277ca16d2f99d075324796d1389f90c8c2e7f0984902c08eeee41c6a9465a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.3.ebuild b/media-libs/libogg/libogg-1.3.3.ebuild
index 02d8b4443f0c..9e9954f814cb 100644
--- a/media-libs/libogg/libogg-1.3.3.ebuild
+++ b/media-libs/libogg/libogg-1.3.3.ebuild
@@ -20,11 +20,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 multilib_src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		$(use_enable static-libs static)
-		)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4.ebuild
index f4e3f98c0479..201b09e29f1d 100644
--- a/media-libs/libogg/libogg-1.3.4.ebuild
+++ b/media-libs/libogg/libogg-1.3.4.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,11 +20,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 multilib_src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		$(use_enable static-libs static)
-		)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index cfe519fcd55a..e323685532ba 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,6 +1,6 @@
 DIST libplacebo-v1.21.0.tar.gz 326918 BLAKE2B fe9500de23487d7d5dfc51d9f94dd3d33d22bdac3005fc3334814c53a76a46cebd40655675b5172f058d02dd865385a993b3c52a863b9e9b32ac0bc4801e0126 SHA512 5de95b8cc48ba4ec9bc3afb8c8f2c4fae0d53ce6e69ffb53884c3a3ee2580998bae46b8934e462740b6c9c2e66e3c5d5f009f9b0f8ad2cb7b4fba829891cf333
 DIST libplacebo-v1.29.1.tar.gz 330673 BLAKE2B 3094f167afb45097ef6e494d7f6f6d61b7ee4ed00bab9f1d33bfd27b032020489eb43005a30a44934416dc52577eb7fc66baf367fdfda71652e97214d87023df SHA512 9f09560832a88e670d6c31e9f5b9cbc03de437bfb19ceb0985140307b5cdf20e2050a1dab5d07f18258dfa3e5429a51f1d3d54532099be4bfc6a0dafe3ffd516
 EBUILD libplacebo-1.21.0-r1.ebuild 1313 BLAKE2B 2acee78d091349c05b03b55b3d95139f9aa66415ba0552193e33bc4a17d5a733606658c5877b6a4531aab0c3d107399ce7369b9395c0fd49ff38a6cc8b7377dd SHA512 974c4f9bc20fdb4d5b6ba160bd2f5a14bb8bf66cbac6d47a9593b11da1bd08ec47f28f7ba8d6ea8fb73cbe001b7465029c1e6f3a127b1dcda5b1e6bd18b47ce5
-EBUILD libplacebo-1.29.1.ebuild 1352 BLAKE2B 5cf388f4558397830d49861aa3c5ae68f5a7a0897e655f1a9b4555691b3bc43138a8eef79ebe390eb98928e086cdf16272040f6951f2fb4b26be45d52add9f93 SHA512 cb3ac24c758b608dbfc7531c160d7176031c62e6d6cff7cf6cc3e66267006842936a7586173af2f03f533b7f7a730e34097feb8a73525dbded67c09a81fd52a1
-EBUILD libplacebo-9999.ebuild 1382 BLAKE2B d794c5b51c899763c67fcf463c65b4e4e303cc0e608d8c724d1e07cbd3370b781791f4da2bbcb1635270778fc323a2e634b1198417d2f942b5fda155733864ae SHA512 da4e1fb4cff1fca7f2b81b5436b7764c6a11abdc7185f7e404c785cefbba0a5526e07bdca4c8622d2caaf69d69ccfabbddc4f8080e2043d7fa8fc7b7021b732d
+EBUILD libplacebo-1.29.1.ebuild 1359 BLAKE2B 0387bd7dee63195d87b83a3ef435b952c67817e82e1712dba4b1c385dffd5fa7d37eaf788a3fb5bc2b67c3a8523d26393766eb5032d7453ed5e2aa71a2453781 SHA512 cec08c69cf41b1c292ae4c6f9111e9fb76bec03260bbc0b0e3ecda008ff245b648a152188af0680b7bd98b79975e7ff15688f3dc84b54f9cf701087ed76a163d
+EBUILD libplacebo-9999.ebuild 1389 BLAKE2B 252954f361c32802b4962e8a6d1425b7fdf8a121ce6895974d1f1d8beca2f6626bb710e41773c047b45e54b2f34732dc05cc882a4f24fb45992b31fe8c6cdbe7 SHA512 7ce7295b6dea6247ad3c4e70ffce5a8fb18ef5d969261923d65085b7502ee073bb40dc8658b2ef2049c0d51d64d1965aebb22c5fd0db00ac255bbc903fa4f278
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-1.29.1.ebuild b/media-libs/libplacebo/libplacebo-1.29.1.ebuild
index ee1709c707f2..c431e963d163 100644
--- a/media-libs/libplacebo/libplacebo-1.29.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-1.29.1.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 0d2846316839..53dde3ad005e 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-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
@@ -7,7 +7,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 0779a231e501..6a4fba369f56 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -6,6 +6,6 @@ DIST libprojectm-3.1.2.tar.gz 54503159 BLAKE2B 5b520a6c1553e80de3fc8b0aedff12c50
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
 EBUILD libprojectm-2.1.0-r2.ebuild 1475 BLAKE2B 03c29d4510f0817b551f2a0b289fc1bb5351cc4005173e3920e9790258b53c735c1e967f53b51238a9f3c76ec08ba9a84a8042eb0e67376397bca74ffd5612e3 SHA512 78b0f4671b2be63a9cb0e95edd43fa6f19b028eba00b73d9618744397150e4af76e9bd533ca9a0b40bef94a83ce2f5ed8d364864a100c94620f12f63ccca0f85
 EBUILD libprojectm-3.1.1_rc8-r1.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
-EBUILD libprojectm-3.1.2.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
-EBUILD libprojectm-9999.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
+EBUILD libprojectm-3.1.2.ebuild 1365 BLAKE2B 44aaf08c746c786851e807efe428e309a9505debf544c8c36ba4a23a40b8a8f2cdee43adb690d4218a40c217a914f7550c8c44f1087c6eab686e463dcc87ae63 SHA512 901ae5ae2443331c45ee736075ac24f44454087fcf219455fc6336842f71e5679b9d98934a8633651025724146d8c74b0fb9bc57d38c520bcc48de71ef306232
+EBUILD libprojectm-9999.ebuild 1365 BLAKE2B 44aaf08c746c786851e807efe428e309a9505debf544c8c36ba4a23a40b8a8f2cdee43adb690d4218a40c217a914f7550c8c44f1087c6eab686e463dcc87ae63 SHA512 901ae5ae2443331c45ee736075ac24f44454087fcf219455fc6336842f71e5679b9d98934a8633651025724146d8c74b0fb9bc57d38c520bcc48de71ef306232
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-3.1.2.ebuild b/media-libs/libprojectm/libprojectm-3.1.2.ebuild
index ec8f42efd454..e5134a18e189 100644
--- a/media-libs/libprojectm/libprojectm-3.1.2.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.2.ebuild
@@ -20,13 +20,20 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0/2"
-IUSE="gles2 qt5 sdl"
+IUSE="gles2 jack qt5 sdl"
 
 RDEPEND="gles2? ( media-libs/mesa[gles2] )
 	media-libs/glm
 	media-libs/mesa[X(+)]
+	jack? (
+		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtopengl:5
+		virtual/jack
+	)
 	qt5? (
 		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 		dev-qt/qtopengl:5
@@ -48,6 +55,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		$(use_enable gles2 gles)
+		$(use_enable jack)
 		$(use_enable qt5 qt)
 		$(use_enable sdl)
 		--enable-emscripten=no
diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-9999.ebuild
index ec8f42efd454..e5134a18e189 100644
--- a/media-libs/libprojectm/libprojectm-9999.ebuild
+++ b/media-libs/libprojectm/libprojectm-9999.ebuild
@@ -20,13 +20,20 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0/2"
-IUSE="gles2 qt5 sdl"
+IUSE="gles2 jack qt5 sdl"
 
 RDEPEND="gles2? ( media-libs/mesa[gles2] )
 	media-libs/glm
 	media-libs/mesa[X(+)]
+	jack? (
+		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtopengl:5
+		virtual/jack
+	)
 	qt5? (
 		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 		dev-qt/qtopengl:5
@@ -48,6 +55,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		$(use_enable gles2 gles)
+		$(use_enable jack)
 		$(use_enable qt5 qt)
 		$(use_enable sdl)
 		--enable-emscripten=no
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index d03c4ccd31f4..819c1d2c8e0f 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,4 +1,4 @@
 AUX 2.4.4-pulseaudio.patch 1143 BLAKE2B abbfdccd75bebc71a8e8b5d089db8d7e43efaf57deaff5279057dd200ce1b756021f9c0b5445432f0f7621e28dbf56178ee2265cad3ba6a84aad5ec8f4490b6f SHA512 959ea6e3e26c135e486517ef1390e0b47f12ddfe4779f8faa9f2340f7dca547f51e53945f374372e05ab915c11c2f8af7c8b72c6beb055dfbdbcb7aae50abfc0
 DIST libtgvoip-2.4.4_p20200212.tar.gz 1481831 BLAKE2B 5c6b4ecee4d8daf31f52db1070431cb6caee324d58a20207405ebcd2b275a07c57fa524f3f29e8aaa05e50451730d34ad47bb94a180e3ac8a169dac9979582be SHA512 5da722244d66d3793439e0d3132046f1bb7fa8a56941bcac7779e3779f0c8f517fb5a8f3af546e31d16d4f8deedb9bf7a2d694194fef76bbce233bf1ed6579c3
-EBUILD libtgvoip-2.4.4_p20200212.ebuild 1073 BLAKE2B 392b63ab00a3714903121a65a0def4bb2b934d4c3bd8d0243c1227b9ee68aae2080a3768ca0157cc88b4c8f21000cf2e310e8a2d505f8f89ba0d75fbfa200e34 SHA512 09eaab41171fbb1e185980b3ceb985bcf49eb993eaec3d219c863cf3dc234337d316bf79f733a880bcb18fb4abd9fd4a35abbdadc8a9bf76ee002f5d002afe09
+EBUILD libtgvoip-2.4.4_p20200212.ebuild 1074 BLAKE2B e5908aa530d3a7909857cdae3764f2272572824be3589e648537f533352cdc0a7d4a137e42838e50457e372790079f45f2be370f25c92370f190cc176cf3225c SHA512 aca5eca9b540d8e3a01dcad1d1cf79166fb040b66feccf36e11d5e70e4916dcbaca520df2b3bbeafce72ca6f311c9690d0ea1b4155e9020022b3a2ed38c5df2e
 MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200212.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200212.ebuild
index 3a82534d21e3..70620f03926a 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200212.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200212.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar
 LICENSE="Unlicense"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
-IUSE="alsa +dsp libressl pulseaudio"
+IUSE="+alsa +dsp libressl pulseaudio"
 
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 13097df08d02..8cbc55b0a496 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,3 +1,4 @@
+AUX libv4l-1.16.6-gcc10-fno-common.patch 2423 BLAKE2B 6938e2b75b01e3bc3a1cfa03e2e95591848697e60742c4f65f342fa3ddfe5bddebba8d3bb17ab1de7d870592501f897c4e0aa5a6b2c8754bb0ae3c111df8942c SHA512 7b9fad4f640f14484cd0ab42812fb19392e0959a28511fc4343aff7185e181daf0f32c3460ba398dcd703c5ede9bdc00f1765ffb083cc34fdd8649801eec871f
 AUX libv4l-1.6.2-sysmacros.patch 1821 BLAKE2B 9242ec9dccf2b14ab4d3ebc1246035ec3a1816d0b0389577638949cf8e493074132b7c13db6c1ca360ad5e2a2de271166126110d2f237d068185aeb2c3293c4b SHA512 ff6addf5d8e8da4f8502f1af8f21de60c9579da11b3aa3145d42030387bdcdd7c6263d5b6cdcba302ea8b8b3a578dbd17d75e11250d4074df2b6ca59d6de1d55
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
 DIST v4l-utils-1.16.3.tar.bz2 1894961 BLAKE2B 71c674abbb3415e592354998e1baa3eedbb4be21757bef80b463ea987e9fc231789e6b333b37d0d9916cb30729e04951dc9f1755ab00a82502fdc415b00cb9a2 SHA512 404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b
@@ -5,6 +6,6 @@ DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5
 DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
 EBUILD libv4l-1.10.1.ebuild 1401 BLAKE2B 1bb1b9e0b6bcbc9b0dedb3d05bae4786ea90f8c5661430ddeb73d9ac96ccc613702a711e5950c54416e6c7beae4d75a24488755e3ea09a69e2c05211b4d08535 SHA512 075f00639bf2810d43676df986eb00f48b4f5220882d4b0a592bbec196213fa58dee4379c87b261669088b69d64ea4b9f41a60dad4107bd5abf5b245376f4761
 EBUILD libv4l-1.16.3.ebuild 1360 BLAKE2B 6a8cba7641759011fba00aa6e7d9ea052b33e4537008dec7f6616ddcddceee9040047225dc0ab470c6033f140787b1a4c3ef30c30466b55d0532bc7049480048 SHA512 d3e79e71b17e3d5f020a92962f18446a907acb1e8e19fb87d5b7e076104629c32707bea9afe5b61667f9985ac090c4f0279c39f7cf681081bfa6d1d7edb95400
-EBUILD libv4l-1.16.6.ebuild 1403 BLAKE2B 4f8976c580c1f6ae3058de20eddf1762d3179e4457a5ad17a65ff105cb9f79051a802ceaa08ac0f951bc5c693ffef1d5622f313e8ff52c8392a5e5bf9260d4e2 SHA512 81a1fdc1d60a5e7324717901d9cc5442b1a126c88528b3cea23bd8b0d8b1a2971723d873af415b74d750e532948c99e6a773271d50b6eac8c931ba7a8daf0c3d
+EBUILD libv4l-1.16.6.ebuild 1466 BLAKE2B 7cbf3ff6cffa297172aaf4b0363000e255638f1a0c51f294048f3d2fe61078cf880500125d19fe574eca78bd2a395cb5c8bd818023aebaadf930f9677b8fe1ca SHA512 db2dcb05f28096ac3365253b78038d5270d0f6ea9e6445d766da1eebbe68925f075805346918ebf75aefacefea3a845fdd994e907a36d01b525d23b50a1b35dd
 EBUILD libv4l-1.6.2.ebuild 1372 BLAKE2B d764d9dff3df7d7c38da4769dc10adbd3f5df9f7c54c0d61fa37c00bab87b36c333a5c65a07712db4f23a08d56de17cfbf4fbcc45cee402b66ec26afa21d8da7 SHA512 435700a890ee255890252c7d1e6ff7985cfa4bf403c6e8bc58a9739e90eb7d7534ea72ad035c70d18acf4b238c0506a189cfd384d01036f2befb819a9d15e11e
 MISC metadata.xml 1120 BLAKE2B b8854ccbfdb3674f5dd2657270945dcea8f9b48e501a07e8589bb04e0b99f927b8499afb979cb34a8d79a04e9813335188853db768dfe774fc5ab2919e9a34ee SHA512 09c21dcc53a675a4e04506dcf8b14b81947806dc761346a4bcb6a6ffdda7b60fb1adf0a778d7e4f060327aea55ec92b7fb700af7a874355d86b64a96541c8c5e
diff --git a/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
new file mode 100644
index 000000000000..33855c682b63
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.16.6-gcc10-fno-common.patch
@@ -0,0 +1,68 @@
+From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Wed, 26 Feb 2020 11:07:29 +0100
+Subject: Fix GCC 10 / -fno-common
+
+* GCC 10 switches its default symbol emission mode
+  to cause linker errors when an object is defined
+  more than once.
+
+Bug: https://bugs.gentoo.org/706756
+Signed-off-by: David Seifert <soap@gentoo.org>
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+---
+ lib/include/libdvbv5/desc_t2_delivery.h |  2 +-
+ lib/libdvbv5/dvb-v5.h                   | 26 +++++++++++++-------------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/lib/include/libdvbv5/desc_t2_delivery.h b/lib/include/libdvbv5/desc_t2_delivery.h
+index 93594b76..8c11fa9a 100644
+--- a/lib/include/libdvbv5/desc_t2_delivery.h
++++ b/lib/include/libdvbv5/desc_t2_delivery.h
+@@ -215,7 +215,7 @@ extern const unsigned dvbt2_transmission_mode[];
+  * @brief converts from internal representation to string the SISO_MISO
+  *	  field of dvb_desc_t2_delivery:SISO_MISO field.
+  */
+-const char *siso_miso[4];
++extern const char *siso_miso[4];
+ 
+ #ifdef __cplusplus
+ }
+diff --git a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h
+index 45aaddda..3540bac1 100644
+--- a/lib/libdvbv5/dvb-v5.h
++++ b/lib/libdvbv5/dvb-v5.h
+@@ -14,17 +14,17 @@ struct fe_status_name {
+ 	char *name;
+ };
+ extern struct fe_status_name fe_status_name[8];
+-const char *fe_code_rate_name[14];
+-const char *fe_modulation_name[15];
+-const char *fe_transmission_mode_name[10];
+-const unsigned fe_bandwidth_name[8];
+-const char *fe_guard_interval_name[12];
+-const char *fe_hierarchy_name[6];
+-const char *fe_voltage_name[4];
+-const char *fe_tone_name[3];
+-const char *fe_inversion_name[4];
+-const char *fe_pilot_name[4];
+-const char *fe_rolloff_name[5];
+-const char *dvb_v5_name[72];
+-const char *delivery_system_name[20];
++extern const char *fe_code_rate_name[14];
++extern const char *fe_modulation_name[15];
++extern const char *fe_transmission_mode_name[10];
++extern const unsigned fe_bandwidth_name[8];
++extern const char *fe_guard_interval_name[12];
++extern const char *fe_hierarchy_name[6];
++extern const char *fe_voltage_name[4];
++extern const char *fe_tone_name[3];
++extern const char *fe_inversion_name[4];
++extern const char *fe_pilot_name[4];
++extern const char *fe_rolloff_name[5];
++extern const char *dvb_v5_name[72];
++extern const char *delivery_system_name[20];
+ #endif
+-- 
+cgit v1.2.1
+
diff --git a/media-libs/libv4l/libv4l-1.16.6.ebuild b/media-libs/libv4l/libv4l-1.16.6.ebuild
index 3fafe417aecc..b518b7a92192 100644
--- a/media-libs/libv4l/libv4l-1.16.6.ebuild
+++ b/media-libs/libv4l/libv4l-1.16.6.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"
@@ -29,6 +29,8 @@ BDEPEND="virtual/pkgconfig
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+
 pkg_setup() {
 	CONFIG_CHECK="~SHMEM"
 	linux-info_pkg_setup
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 34f7f4681dbc..7bc3d8164355 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,5 +1,7 @@
 DIST libwebp-1.0.2.tar.gz 4036397 BLAKE2B 708c1083f62bdb3526f8319d9b6ce1e8aeba2bc785105ff7db07c9c7041311cedcfff000de5b8fd8e93550fc86ec149f6dd4a21f576709b80cb6a4b20ddd2863 SHA512 e095b8fdf0096395daf12892b3b74c472868e727f23640ba7aa5922a5a028b778a6a60d8a94f696f6c0ca49577dfc9a0b599ecb74ad831ade48c6db812b71d2e
 DIST libwebp-1.0.3.tar.gz 4029909 BLAKE2B c2b7f65515e455658153ef3042c50d35f3a1e11668f3c75bdcedeee91d232d8724ca34cad0b893912463efc28658b48ff7ea08d98d7f02050a831f50d77691a4 SHA512 3ccdc62e5906f8de791053560e932b39df3cfdd7793617bd4562b7d95e2f6feac1535bc035e1b02591cab14b117ab15e51af6f9e4e3af1df0869c63945ec86b9
+DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
 EBUILD libwebp-1.0.2.ebuild 1843 BLAKE2B 798ac501b9c7d8a30313d42e2e172cad60e1869082e628e4a84373c7eb724c137bd3e636ca9e7aa2c8a9647f34e60513133ca20e25039bcb74319de9f9a384ff SHA512 290ee9d7be668615089602e991c8073ae593971084bf3e9d4903e82bd7e323fe71112b5162e9664517785585edb7097376cd88a7ca0d7cc3bd6a4bdddb084934
 EBUILD libwebp-1.0.3.ebuild 1861 BLAKE2B 680a8c445d2774d9975141ae2d095e7d5e0d301e3477cd67e0b13cb3a56c69f1160fda01b482b51ca7f585be24292917fb2324e52efbe581173b71de1aa8c908 SHA512 ad6284c84c4902c2af31272162564be381072d467ea2513d74f685115c6520e317d8621d0c3e72f361eedf464480aa50559b653d6dd733e1c00f7cd899ce2131
+EBUILD libwebp-1.1.0.ebuild 1861 BLAKE2B 093239c0e8d703fd9e2363c21f50c5b634eb2fda94e2231bf77b4b22ebc81b3a29c2ee4217447aa1fbe1f28cd8fc0fbcab4c7abda45b3dfae38e0b06a18240eb SHA512 283110fe35d4a10736b9b2cc5dd8f13a0013ea5b2403e8eeccdc775e7586eb6ef16d49093c3686c11c5eca66245678ab70f45e7c98472d30829c86131aa8740b
 MISC metadata.xml 551 BLAKE2B be0c5dde4ced33103958fc19f5c5f4e9f17c417ced75f9ca065f35fadd50cf286c2a5dba0889dbbe439aa59a5a60d975725984687c1e008cf338cf1cff0ff7ed SHA512 8557a448b4d83f68911d02ef4d2cc003eddae753f28a57f3f87670cbe7e89fbce784416270ecf4f471c883e2bfcabafc3340e16026c883712b96f8b295c868be
diff --git a/media-libs/libwebp/libwebp-1.1.0.ebuild b/media-libs/libwebp/libwebp-1.1.0.ebuild
new file mode 100644
index 000000000000..f9a7a0e88f04
--- /dev/null
+++ b/media-libs/libwebp/libwebp-1.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool multilib-minimal
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A lossy image compression format"
+HOMEPAGE="https://developers.google.com/speed/webp/download"
+SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/7" # subslot = libwebp soname version
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
+
+# TODO: dev-lang/swig bindings in swig/ subdirectory
+RDEPEND="gif? ( media-libs/giflib:= )
+	jpeg? ( virtual/jpeg:0= )
+	opengl? (
+		media-libs/freeglut
+		virtual/opengl
+		)
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Fix libtool relinking, bug 499270.
+	#elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local args=(
+		--enable-libwebpmux
+		--enable-libwebpdemux
+		--enable-libwebpdecoder
+		$(use_enable static-libs static)
+		$(use_enable swap-16bit-csp)
+		$(use_enable jpeg)
+		$(use_enable png)
+		$(use_enable opengl gl)
+		$(use_enable tiff)
+
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
+		$(use_enable cpu_flags_arm_neon neon)
+
+		# Only used for gif2webp binary wrt #486646
+		$(multilib_native_use_enable gif)
+	)
+
+	ECONF_SOURCE="${S}" econf "${args[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+	dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
+}
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index b6b849acbe08..ddf3f87c5b74 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -1,8 +1,8 @@
 DIST lsp-plugins-1.1.10.tar.gz 53837323 BLAKE2B d890e80d2c6bf871053bd53994af597e653c19894b64df8396c54e1b70bd716adacb8ff7ce7946098d96ca64fe0e03aafc7d4d52af342b67b2551fb0dadaff42 SHA512 aedc6a6a421bfb1ad964f6963793cdb2616456044736745a1c3dc27e947b1d6395de1942c2525bc983e654df5335d35466eed16b8f31612119284b024bdce6c2
 DIST lsp-plugins-1.1.5.tar.gz 51911033 BLAKE2B ec9b6f3715f1043537ebe35d14abda85b8dfe23d52d335c54c02eb2867753c9b256a5acd71537c95d6da273d054f0e0c9439fe2f81f6d6ced3087de93bfaef60 SHA512 42b9cd102247a0165a32f82a5a7ce05928a9703c80f215783ad67020d1f975d1c334af1f86c9f17e76bea3fd90bcf5c47fff5618875038b3655621880b60a699
 DIST lsp-plugins-1.1.7.tar.gz 52408312 BLAKE2B 1763d7aaff60c4bf3185325789925dc7e5ea1052907f0d1ee3af7c09d39d1f49dfdda537c29d1d2e1ed2bd041345fb3f32a444aa403521f6d4fbd7a952f9f7cb SHA512 e98000c98464abc1db75e044bc1b7adb535b94fbe1025a52baf0a2c92bcd21039c9b330e790f0607b4747356aff3f7d4ae20e666a9135108e875057c5459c8ae
-EBUILD lsp-plugins-1.1.10.ebuild 1032 BLAKE2B aa79896ebb5cd7eb2e2067268db7e67f07ba90f000a0f26d0af43cc06ec36b825db98e9aa3280dc777a9651b863ea68ab0e97ccf1093bfa3a032b77d08394a14 SHA512 c185dad8e7ca7aa71007d7f3c6a9d135c56891a8902849a463d057868fbf7a0b17ced33af49df1e8d5dace8907a29f8cbe12b9205c668d7e23dc111f0d3d29c9
-EBUILD lsp-plugins-1.1.5-r2.ebuild 1252 BLAKE2B 2c1f932eea9632a89c4f56b9abc40cef06fd81f8e7126a6b81b4942f3a7e7c657a6967f1aa91fce4f68da6593f9b7dcbf0dc1bdaf6737cd3e3326d743a7b771c SHA512 54e4e0b0ff4eb94e1598a06ba4b5a4799e90220e12d57c53d760d585dcc7a41f71a6e26aedd1a53914b515438524e40bb5fd7667583263e018b0a5e636de2aa8
-EBUILD lsp-plugins-1.1.7-r1.ebuild 1030 BLAKE2B 083c311a6afd08bf1d92b2b600dbb8da7ab2292e88d11b039781ca04cbc15b320234cbd9879a63d72846878ec6a2f42c92c471e37ac37676d78bb072b7751e8b SHA512 5d5f2ae554d6f512cbc925b602fac88b0f12a764b9aa7bda184f7d154c5dc234094673589f1bfd57899a391ef35195ad3c68d41546e633e5e640db404204c554
-EBUILD lsp-plugins-9999.ebuild 1032 BLAKE2B aa79896ebb5cd7eb2e2067268db7e67f07ba90f000a0f26d0af43cc06ec36b825db98e9aa3280dc777a9651b863ea68ab0e97ccf1093bfa3a032b77d08394a14 SHA512 c185dad8e7ca7aa71007d7f3c6a9d135c56891a8902849a463d057868fbf7a0b17ced33af49df1e8d5dace8907a29f8cbe12b9205c668d7e23dc111f0d3d29c9
+EBUILD lsp-plugins-1.1.10.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
+EBUILD lsp-plugins-1.1.5-r2.ebuild 1260 BLAKE2B 31d54fbcb2d2a175e8ab93eff26535f9e62c151d4e9dd0d22f1092d7e83fccd11da864aa89a95df86da9eccd8434c623716b48d27cf6f3990d326e554543304e SHA512 2d09fc21ca51ddaf084461b664139a2855dc23a8863ea73c58da57e808fcd1d29a47054a0c83adbc4c10b0bff006239f5a426bacdf8b8bc1007262c2eeee2b8c
+EBUILD lsp-plugins-1.1.7-r1.ebuild 1037 BLAKE2B cd70d7c20ac3e6abc074780b15dc24a5c7f0f19eb8dbc54239e6ae4977fc5ac04ffdeb29f105cbf1b71975a029f5ffaefa182903820c8ae1f57754c2256dc7e1 SHA512 cb9256462b87742bc44663d6888f385fec69f4ac8776434574e305ef3526a0befcc8b737ca94d5d931b4337682195a2f4ee8990e86e4254266230896ff0a1a61
+EBUILD lsp-plugins-9999.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
 MISC metadata.xml 492 BLAKE2B 6550b2fe0e0a6bc5bece22d51b36d920284f662f1da5dbe2551fbf82ebc3416262339436ce2eddf9efbee49e57d5a28139f6ac3f1f86e20b5a74e5c4fb3bc37d SHA512 681338f3f8abbd1c103ef72c176595e10ca6bc0e6ca309e2f4d39166309329d8176aa9025056685d67d708ec1732d023c773a1e2a4cce7f019945ea112ab8f84
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.10.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.10.ebuild
index bae36037133c..3e66062b835d 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.10.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
-src_compile(){
+src_compile() {
 	use doc && MODULES+="doc"
 	use jack && MODULES+=" jack"
 	use ladspa && MODULES+=" ladspa"
@@ -47,6 +47,6 @@ src_compile(){
 	emake BUILD_MODULES="${MODULES}"
 }
 
-src_install(){
+src_install() {
 	emake PREFIX="/usr" DESTDIR="${ED}" LIB_PATH="/usr/$(get_libdir)" install
 }
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.5-r2.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.5-r2.ebuild
index 79a8ccbba8f4..2d9141c1d36e 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.5-r2.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,12 +31,12 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
-src_prepare(){
+src_prepare() {
 	eapply_user
 	sed -i '/install_.*: all/s/ all//g' Makefile
 }
 
-src_compile(){
+src_compile() {
 	use doc && MODULES+="doc"
 	use jack && MODULES+=" jack"
 	use ladspa && MODULES+=" ladspa"
@@ -44,7 +44,7 @@ src_compile(){
 	emake BUILD_MODULES="${MODULES}"
 }
 
-src_install(){
+src_install() {
 	use doc && emake PREFIX="/usr" DESTDIR="${D}" LIB_PATH="/usr/$(get_libdir)" install_doc
 	use jack && emake PREFIX="/usr" DESTDIR="${D}" LIB_PATH="/usr/$(get_libdir)" install_jack
 	use ladspa && emake PREFIX="/usr" DESTDIR="${D}" LIB_PATH="/usr/$(get_libdir)" install_ladspa
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
index f5121d8801b8..5807ec304fd7 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
-src_compile(){
+src_compile() {
 	use doc && MODULES+="doc"
 	use jack && MODULES+=" jack"
 	use ladspa && MODULES+=" ladspa"
@@ -47,6 +47,6 @@ src_compile(){
 	emake BUILD_MODULES="${MODULES}"
 }
 
-src_install(){
+src_install() {
 	emake PREFIX="/usr" DESTDIR="${ED}" LIB_PATH="/usr/$(get_libdir)" install
 }
diff --git a/media-libs/lsp-plugins/lsp-plugins-9999.ebuild b/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
index bae36037133c..3e66062b835d 100644
--- a/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
-src_compile(){
+src_compile() {
 	use doc && MODULES+="doc"
 	use jack && MODULES+=" jack"
 	use ladspa && MODULES+=" ladspa"
@@ -47,6 +47,6 @@ src_compile(){
 	emake BUILD_MODULES="${MODULES}"
 }
 
-src_install(){
+src_install() {
 	emake PREFIX="/usr" DESTDIR="${ED}" LIB_PATH="/usr/$(get_libdir)" install
 }
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 2b06a1c63377..23f538811072 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,14 +1,8 @@
 DIST mesa-19.2.8.tar.xz 11462168 BLAKE2B c49d6d3d10b4c85534a75e4bea29fc8b7526c784af5068764de623d40cbb59ecb96beb1969fa1a13815b6bd259bb98faaf42e4969792c6a75ce702d4b2e57155 SHA512 9bedc2f1a5296da96c1a2a491edaea701e70f683b26eac076e8cbef2230156d5d5ddb2330c3a2530afd4982a9893d76ded8d54bc73a98c846de0c3dfa3634c43
-DIST mesa-19.3.2.tar.xz 11834324 BLAKE2B 114912816a08424da1d55c65d8ff4fb97d58022f5968d37938055e0b0fcdfeeebdbdca3c28d187fd85aaf6385d3a1bfbfe3f011f410e9a991519d34cb81697b5 SHA512 fb69999fa7a15cd6f2c254fb6e8fe635e56dc49a5c2c762a96c77815cbad77060b8f81a02e67ac9ec58092ab866e080fb928086a5ac1e61c3efe882e5825cd28
-DIST mesa-19.3.3.tar.xz 11938700 BLAKE2B a2fd88e8c2d8b189ddf4fcebe324d2f6c00e0c101a565eeb783f50ecc7b2b85f3fe698822788807ab9aaf0403a4d27b7c469bd73c891f535e220b9a0204059f9 SHA512 1f792fbde71132afd4a43d6abe6a3d640f375e83641c6144c82312774434c9588ffba65a3ba38394947bd753656aa85213b6cd9f745cec0040c0559eb41f0dc9
 DIST mesa-19.3.4.tar.xz 11968288 BLAKE2B be39a2ca08d91f8afbc2f3a47d596b14445fac62600f64d627b23d63b340b002bc05246eece95e19b33485a92c01f7980fff52b2375b7a2053161e0aa87d0b38 SHA512 2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb
-DIST mesa-20.0.0-rc2.tar.xz 12100548 BLAKE2B 6bc2130dd7920d2a6eee845d4f53633e609ec2f8a740e39df23a732db842dbe5e0da6374dd0a8b2dfbd938ef1d0de55281a80c061d568dd609f8ac78da528aee SHA512 27e23925ce7e3a38954088db47d564776c4ac7e028d30ef5c58229b3182b461ece37863a69bc42ea4ff0a4817c46c0b0ca8d70f6fafddb5c3fe60bd9c429563b
-DIST mesa-20.0.0-rc3.tar.xz 12107300 BLAKE2B 937cca2152bf2d8c3fea267409d5ec87ebd44e47e9928860fe44d572e1e0b6f6821d786d11dc4e4a149a06f15fb0d51458c0d26d0ce3321bd50a47c6e3305a36 SHA512 df873cf961e641b9d9e9a6ce7eccde1a865e9125507e304b1600c6c28f15f89f9b66898a5a474f08a8ad05781d46db532fc7aedf92de3bb73b9ed1f2ba24b6cb
+DIST mesa-20.0.0.tar.xz 12153408 BLAKE2B 41daa21c5b74bb0e50e713ee9766fb60bad5bce4c6ab23aee6e7c32fead61dcc3f17f927a91cb6f1fa1f1c1c314c666a81fde3e5d1b388ed930811b15f92d647 SHA512 3968820029434682fb6644947c76e12b6bb991a3d05cb519a6ea971ecc4aa9b21d03f84b9a452cc21cc77a7981db9e40dd2dfd3ea3dee85b3dd88a59b4842bbb
 EBUILD mesa-19.2.8.ebuild 14496 BLAKE2B 1135c0e5ac0a205e7e8fa5ad581b2d4d5b08447c71c76be0d97281de65b58ef7531442d61ad8ae248e4488d1664defba56831beb994473488a9ca0ce35d2b4b0 SHA512 0428f593206f9582a8f083fca0148dcd82b1d77776fb0f766f80157f35f7756c075f0dba18e474e94f11ee28ba750eff8890d78ee0d5abf861e0722090329f7e
-EBUILD mesa-19.3.2.ebuild 14486 BLAKE2B 33d8a963751b081b312b15f53d109bfc3d365d9d44c8c75a2d39a3ef9f06259c9e22d725a57b9003966c4206d5335345795ac7f466d5dbc45623ce198d60657f SHA512 b4cfe959b194238f61da07496eb594391f0de2f50864b47f6cbfa3fdd890b89bbf8d691bd6ba0f3c619972a6d2f52e5b2bf8113fea54856957ebad254b96b28b
-EBUILD mesa-19.3.3.ebuild 14486 BLAKE2B 33d8a963751b081b312b15f53d109bfc3d365d9d44c8c75a2d39a3ef9f06259c9e22d725a57b9003966c4206d5335345795ac7f466d5dbc45623ce198d60657f SHA512 b4cfe959b194238f61da07496eb594391f0de2f50864b47f6cbfa3fdd890b89bbf8d691bd6ba0f3c619972a6d2f52e5b2bf8113fea54856957ebad254b96b28b
 EBUILD mesa-19.3.4.ebuild 14486 BLAKE2B 33d8a963751b081b312b15f53d109bfc3d365d9d44c8c75a2d39a3ef9f06259c9e22d725a57b9003966c4206d5335345795ac7f466d5dbc45623ce198d60657f SHA512 b4cfe959b194238f61da07496eb594391f0de2f50864b47f6cbfa3fdd890b89bbf8d691bd6ba0f3c619972a6d2f52e5b2bf8113fea54856957ebad254b96b28b
-EBUILD mesa-20.0.0_rc2.ebuild 14326 BLAKE2B f3de76318c8e1440d994b944f6e1f6ff8a6ebb34543aef009af2291c9e3269c793d266208c6d9a8c2303be396fa6cba28fcface670c50cc537eaaefed020f473 SHA512 dad54d1e532a5d46250a0128dd11f157779841f44763a6bcf27085caa20635c08d9300cc881eb0da9472de592d264ee3a61cc488aa8eff62ee5095d370c18a31
-EBUILD mesa-20.0.0_rc3.ebuild 14326 BLAKE2B f3de76318c8e1440d994b944f6e1f6ff8a6ebb34543aef009af2291c9e3269c793d266208c6d9a8c2303be396fa6cba28fcface670c50cc537eaaefed020f473 SHA512 dad54d1e532a5d46250a0128dd11f157779841f44763a6bcf27085caa20635c08d9300cc881eb0da9472de592d264ee3a61cc488aa8eff62ee5095d370c18a31
-EBUILD mesa-9999.ebuild 14367 BLAKE2B f943f71814589c1298bb2fa36e20fb440185f0b1ad56126268fe25ac2ba364723a1f09e29af71cbc1b54b903dad90d6f86141cc2ce95f0a4009279ae5ab4dc81 SHA512 44fedc245b2088bc41fe5c88fd8bf33a02378ed18fd33f43f04b0cf6dbd5af51f7445718c0239745677b268153f5b68e803a3c6e6374c9640320021fcbf0de4b
+EBUILD mesa-20.0.0.ebuild 14399 BLAKE2B 270db0052a8de75af1f5f24fb2b8210c3371af12c8a8366bdd320328d715930669c063551a7eae121685a37d92554d5adaf2a1ab081b24c008e94451ae25469f SHA512 c040b6f1c182bf0f1b73f6cf8ab409d1c86c2f8016ac356d54b18fe507efba463a5d717bd4b664d6295f6fa098e0a1a4bd4ddc44aad22c37582f39deae65c31e
+EBUILD mesa-9999.ebuild 14440 BLAKE2B 342588113f76d4fb3cae4627941fcb6931f27f383344a2a6a988561ad726dc16ef59dbef6881c6450a1fc07a0a9506ec5f419bb35e3e4c36b8d36f12216b8f92 SHA512 37061628a07ef20eab2f75bf9ec27c98d62fc6eac4623c30df5dcae6b50f1d63856d1f99b06ccf5d652649aa81a8d835f5b9768e0f12c07786d14bb5e59a60bd
 MISC metadata.xml 1917 BLAKE2B 795c4e550486eeb2f1fca9f43ad653c1ea45ba836677a3e68863d38faf5ccbcb140699f10366b2e1449718ffc4104830f378560e8b4646d5892b70a5bbe46262 SHA512 1133638886b3c039f15f7a8fa4ce55684db65f84e9d8c6b50ad8e2de4370d4303c6852c7d22239681923b5eb7fe6ebd77ee2caa41bb1210507268d3c1a69353d
diff --git a/media-libs/mesa/mesa-19.3.2.ebuild b/media-libs/mesa/mesa-19.3.2.ebuild
deleted file mode 100644
index 26304ad69b1a..000000000000
--- a/media-libs/mesa/mesa-19.3.2.ebuild
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal pax-utils 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 ~sh ~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 pax_kernel selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
-
-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_i965 video_cards_iris video_cards_radeonsi )
-			  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[${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? (
-					dev-libs/ocl-icd[khronos-headers,${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}]
-	)
-"
-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="9"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${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 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 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=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	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
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	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)
-		-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
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
-}
-
-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-19.3.3.ebuild b/media-libs/mesa/mesa-19.3.3.ebuild
deleted file mode 100644
index 26304ad69b1a..000000000000
--- a/media-libs/mesa/mesa-19.3.3.ebuild
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal pax-utils 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 ~sh ~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 pax_kernel selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
-
-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_i965 video_cards_iris video_cards_radeonsi )
-			  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[${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? (
-					dev-libs/ocl-icd[khronos-headers,${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}]
-	)
-"
-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="9"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${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 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 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=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	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
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	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)
-		-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
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
-}
-
-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.0.0_rc2.ebuild b/media-libs/mesa/mesa-20.0.0.ebuild
index 39da329b5dd5..d02cf2adf0b5 100644
--- a/media-libs/mesa/mesa-20.0.0_rc2.ebuild
+++ b/media-libs/mesa/mesa-20.0.0.ebuild
@@ -37,7 +37,7 @@ 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"
+	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 ) )
@@ -128,6 +128,7 @@ RDEPEND="
 		>=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}
@@ -481,6 +482,7 @@ multilib_src_configure() {
 		$(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[*]}")
diff --git a/media-libs/mesa/mesa-20.0.0_rc3.ebuild b/media-libs/mesa/mesa-20.0.0_rc3.ebuild
deleted file mode 100644
index 39da329b5dd5..000000000000
--- a/media-libs/mesa/mesa-20.0.0_rc3.ebuild
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal pax-utils 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 ~sh ~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"
-
-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_i965 video_cards_iris video_cards_radeonsi )
-			  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[${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? (
-					dev-libs/ocl-icd[khronos-headers,${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}]
-	)
-"
-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="9"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${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 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 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=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	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)
-		-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
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
-}
-
-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 5bec3f52d106..4710eca2f2df 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -37,7 +37,7 @@ 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"
+	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 ) )
@@ -128,6 +128,7 @@ RDEPEND="
 		>=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}
@@ -482,6 +483,7 @@ multilib_src_configure() {
 		$(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[*]}")
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 406e410eebef..de363488ebcd 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -6,8 +6,9 @@ AUX mlt-6.16.0-mlt_consumer-race-condition.patch 936 BLAKE2B 1ac34744d8bab9cc18c
 AUX mlt-6.16.0-rotoscoping-interpolation.patch 998 BLAKE2B 22ae634e46fa61cc60113a4d8f35454ecabd73f4f9de0c0a9c385aad44a941610ed075bd278d0b45f9101bb3939b82a0565938d4e3c4f29f320d93334cfad4b0 SHA512 f785df6e7db75018c05f57f49537e57e86fbd0b3cf2aad705c0179f36d2cb1115cd8f20f2b4977db0c32b485fef3ba32283fc68c817db4eddcc161e549a63685
 DIST mlt-6.16.0.tar.gz 1414374 BLAKE2B 6c031360721d535e95cbaf890c1f42f5f5dd914e0c6c20992bd3aec4ecbcc0b53370fe6b82b5d11c8242bb0a1f2d94f28bc61b4e5a920e5afb41ca8bb5229433 SHA512 554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26
 DIST mlt-6.18.0.tar.gz 1430398 BLAKE2B 43d33756ace75dd38c7a223ff297323d3f47d8b7cdf2791709ee8cafcfed56c345b49ac3943ad4c49123e69a182dbb551cc93b1f56358fb96966e1b336691d90 SHA512 af6042fa554a7bf87060aaab401c51111fd03a1e50037024662fe727a2281c218f62db07f2c44db62d46f2b9ff67d4599f7aaccc2b337e20394383a24e3c5953
+DIST mlt-6.20.0.tar.gz 1446137 BLAKE2B 50599c827be82ea5f5145297b41001e94b44519ec4c6344b8cfdc6fc92e6106de60ecd985296ab77d24e6a5b74ea8e859187935bd88f9394f3c108308afc68ac SHA512 939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3
 EBUILD mlt-6.16.0-r1.ebuild 5776 BLAKE2B 87676544fa092cee5ea8b39d710f2ee62fe22f3d7cea6ccb07d8d64aab6ba5d032ad709ef05fd5d981dcee66e7297b7367398bda118e4ce6c1c48d0f1f86c009 SHA512 d608429a2c3c62d5e2507e28789f57ee394aa04362bae8e7b2a22a15aecba221effffb065a9e1031a5d11302ede425b03f7f3b04bace9eb766b507b726e197a1
 EBUILD mlt-6.16.0-r2.ebuild 5776 BLAKE2B f7a30d589351353030d89799d8fe719fbdf434c2ab16648f024297f3f24d4d8e3436acc633ccdfb15f7d0a5a27bacea42a372fd445353dc4f6d59f8912455ea7 SHA512 c34b90ff7bcb17f3673f43312ee088154d0a9845f168afc74b7c3e07af52ba18d955e949a2db1ab48b32d1585d58c0f2af3ee7bca33f0df9d223f7e719c55a49
-EBUILD mlt-6.18.0-r1.ebuild 5374 BLAKE2B bc9fbbaed6447ec2dbd1be10de77fb607728ed4c85ce61a8431c6cfd06817285035dbdfe2983bd04fe5df8095b1ed2a34079598f5d1dc85e6404131b438576fd SHA512 7838b7c247abda99c51b3b8dafe3cae6ea6630a7783f8d3efbf59e06809684415d6d1bdcaccdd29d60852690cbe81666113741cbba8fe5029a0e5d17ee993dd2
 EBUILD mlt-6.18.0.ebuild 5374 BLAKE2B 2b1702e9bb100178d620a68e5cbc444fced88662cc187e3c03167a456e913a8b99ded0a9417c0207c38b4070d2afacbce09241d587d4b615c8434b7c387189f5 SHA512 267861c33a99b38c26e291af7fdd893bc5ba607ac2fd74f78189b3be032f077d367db17d41ebd031f42b3537c1ead6285f236b9b7eec71531a78b87f3d969cb0
+EBUILD mlt-6.20.0.ebuild 5376 BLAKE2B 47553f7c3a4dfed6be9498c0170193c0e1562cc817f7bbf80f0ce47b60c00a6441f28b083850e2e14b38e71550bd82c6cd908ab4439e249e1ae5c30e5670b43e SHA512 5bea27b4d4bedd5b41ab0548befbd6104e9da2257a0bed78e4b40000cf7676c960019719d9d1971298422b6b5bd302bae26fd8f16cb300ad76b75b8b86a4d790
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/mlt-6.18.0-r1.ebuild b/media-libs/mlt/mlt-6.20.0.ebuild
index f1837af1f625..faf5025e814d 100644
--- a/media-libs/mlt/mlt-6.18.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 # this ebuild currently only supports installing ruby bindings for a single ruby version
 # so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
 # /usr/bin/${USE_RUBY} directly
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index a7ff2e2bc2ad..88dd9b8369cd 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -1,4 +1,4 @@
 AUX opusfile-0.11-libressl.patch 6273 BLAKE2B d4868792619ce83d01994c034f9605a86929e52879a22010c0cc00c512a5b8c5abe2261e406616c04475307b7f9d16a5bc57281304d9462b0317849e7ceda922 SHA512 1eeb55595a125bd43469f47073f78bf392bf70ff5e1f94192bf9a5cfad0fd3a3887d9b38b10290cd32d357d8c6c1e00feddc4f6fa14f652ec56a7d365280d812
 DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349
-EBUILD opusfile-0.11.ebuild 1017 BLAKE2B 5731104f655a3c77a7f8513d773cc2f177188d5af1b260fdc6296219b7c967bb6e7baeb1be6d68379473f38f4fc9cecff9c195d734e637704f319357b99a4406 SHA512 4c7ad904457e1ed4c2f19becff170270af7cdd272e6f26e043e2a23c4c14646ee278e812883d8ba205082a4271431b02edc719616d044ebb55a6a06ca4d6da45
+EBUILD opusfile-0.11.ebuild 973 BLAKE2B bcad69ac5b0d648720cc99360b22bcb0ab52dc85dfc7930f8385c9a8a4fc245783f4281865bd1456c2d6b8248e97d88582e36ec27298940a4b18c0d8e9f68557 SHA512 226a87f28bee352edac9a09177f5308d3f86529ac999c8a33ac080fa28896c3ccb7bd3030077299ab4d3f065f9be7298ba54af447f400cfa5610f30718a97853
 MISC metadata.xml 574 BLAKE2B 67bceafd9042cb07a851772ca2b78b542783c6fd4e9bdd5e44643a36652e24907692465390b33ceddd44d37be297b096129ecb92940fe5d7ec5aedbd709c8cb1 SHA512 12eaea9edb76ed36ac8cd60af4b14cf395b4fcb81f4d3dabb1020a0139f05e05fe80bc800080913e66fcb967d4ed1de6b37238a7b0d72dad69de505354aa3830
diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild
index ad156369cced..ae2c53f3f598 100644
--- a/media-libs/opusfile/opusfile-0.11.ebuild
+++ b/media-libs/opusfile/opusfile-0.11.ebuild
@@ -28,7 +28,6 @@ PATCHES=( "${FILESDIR}/opusfile-0.11-libressl.patch" )
 
 src_configure() {
 	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable doc)
 		$(use_enable fixed-point)\
 		$(use_enable float)
diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index 40999b1ccafa..496aa648327e 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -4,5 +4,5 @@ AUX plotutils-2.6-libpng-1.5.patch 575 BLAKE2B b35dc9895e5a2f17ad1d5b71d8dfc1d04
 AUX plotutils-2.6-libxmi.patch 5076 BLAKE2B ca028895b5af74e38176b3fe43747196033d39f01aa763f5388de8dc502ca5119f5bc153ec9537a1f1934940fe253125460844e8090459890132d4ade90e446b SHA512 157824dce491a06c15091eae8129e0c2269ffecaff168485e17535d61eabfade4007fd7e799921d91d674f28b2a9f67ac957155f0661821b1363fe5045dacae1
 AUX plotutils-2.6-makefile.patch 2921 BLAKE2B db41feef6b6f25cd5fe3b9e2329c142805d8cc2b3698042846f91275eb968f1eea797c482dd153f97ab63d0a0f937d3efa4fc01a52e97d0f72cf05614a403cb3 SHA512 ac98f183d19d36c4380d0bbb25a2f86569d79136729a6c265cbc51ce4aa7ad1fc279f9ae7c0ac1db7b4e49325032bbf082db900eb740f394d890ecca57f19a84
 DIST plotutils-2.6.tar.gz 3657562 BLAKE2B d77d62ba4e632001d056da7333d1300b2e3d7966029a130e6836fa88545a1749e15b5dc7322d03575432fc5e1342c839f4769ed821962f711848c2d8523904fb SHA512 4e5982605e5c1fbdb7325069c3ab2edd736e37a2eb30a1ec01fdc3541fcee6ed49937d4814c6baf79dab5b6fa42f909e4800c851d0ace3c7cf6d5a8681d0f0e7
-EBUILD plotutils-2.6-r2.ebuild 2027 BLAKE2B 0d8ed6d133fd6d33def5a463b1ad3a266679cea30cf6d5be4c65bc8501bb69bf26e58328690d919af4ef76e670dbbed6d31b7ad9f3d00f66cb21d6ff0fe79d92 SHA512 14cc4464caa61e928542ca13bcb98221549b6138802dbca22d90cd2a85ef3e2bebfba5c68538bcdc50701cdd1e4bcba17f25793471d7044a8c820e1482bdaeef
+EBUILD plotutils-2.6-r2.ebuild 1993 BLAKE2B 671347af96372b2e1685d7dddc589b90b61bd282ba744c1f24f845c2d38d0f5fcb236474c1750950bdba7d6908f0c4c9907731374cf27161a65c2c44204b6036 SHA512 f2f3ceaddd89319a5a045ae2ed388836577dfafce959d7bcc71f11707a5e2346fe1e8f8ae1b4312a1d31a210d36428de1e6f9693b1a6d12477963fa1e1ac2892
 MISC metadata.xml 265 BLAKE2B 90437751c83b28b75582d0e1588732b99bfc1da98cfeedf982178e01192da161352633d821465f38c4f31a6a75c562b54c5d1a6dff0173ff6c064d524073d56c SHA512 6546f5402491a7065802409af29815ec26d09fc6fe196be110860059a5af6511b01abfc8bb4c8dbe4954c90d2fb2c85fe9ffb221c0dadc90b302fb58369d2ba4
diff --git a/media-libs/plotutils/plotutils-2.6-r2.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild
index 3656dbf26e3f..ae8ee4daa544 100644
--- a/media-libs/plotutils/plotutils-2.6-r2.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r2.ebuild
@@ -47,7 +47,6 @@ src_configure() {
 	fi
 
 	econf \
-		--disable-dependency-tracking \
 		--enable-shared \
 		--enable-libplotter \
 		--disable-libxmi \
diff --git a/media-libs/pulseaudio-qt/Manifest b/media-libs/pulseaudio-qt/Manifest
index 362896f35b1c..759746395ac2 100644
--- a/media-libs/pulseaudio-qt/Manifest
+++ b/media-libs/pulseaudio-qt/Manifest
@@ -1,3 +1,3 @@
 DIST pulseaudio-qt-1.2.tar.xz 30748 BLAKE2B f6f61eaad122795d6833934edd69e2c9b2f79b458b61a240f07f80b17e2f02fd46bfa639932e2824f2d19c782dc394d6b9e30b69c75f9c0da0c2d9ce3530c3c2 SHA512 20bddc4db80310bf46b37a1a386f714bfa3dc2a58871bdd0c0085675c43b42e24792d05cbe5543135a341588e17738525f03ccb08adbc73e1c65967039b35dc7
-EBUILD pulseaudio-qt-1.2.ebuild 665 BLAKE2B e4c10193953a67e73556a0fd28cf7d7319e6267986e194ed5def146d68889fe508f9b1d698f89b0227e0342b326860ddc6b0137fd8e8badb103aca80415077e2 SHA512 e9401b80fa4fe0d2c3894b801b4eb2872c9f2a2ab9980024e339412ad44ab4d923e40a2a67f27c91d7e5d71ace8fdf58b832273f6bcd5bf8c4e07e67a33f32c4
+EBUILD pulseaudio-qt-1.2.ebuild 675 BLAKE2B 8167b7caceaa1a6ac146dbdc5c88d1a821a53e707f021077b645a503a1024cbf54b5fd0eaa686a6498c8406359228e3d8e7d4fd83c6e4414c3be6d90e8b86616 SHA512 6d05d095f2317558db7eafce5f6158fd0733f4967b4b6a68fa4b806069ababa964f47448ce5a53191b9ab0f4d1184505bbec66ad5df6aceca08740b394de7e66
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
index 50296eb8ddce..577af8c394e9 100644
--- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
+++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/pulseaudio-qt.git/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index 84192c7b7127..b1d36d0bb16f 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -5,6 +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 1641 BLAKE2B 6c51dfd91ef106e3ae7a77a9c0996c6e8e91ef8aa76e903afd0ac77252f3fca78c13f574882a24cc59c813ab457770c3e0b2261bd97b4f6e8399c229a385b52e SHA512 177a561fca968e0939d60e940faa8bbab941ab5efa7e57e5efd909180fcde5f48d98be1e75e327f9d2d74211cbf5d01d49d665f1b001c7ed7ddae487dc328d8f
-EBUILD qtav-1.12.0.ebuild 1452 BLAKE2B 9002c43be94e25f31e50f8ad5d081cc6cbc824c245d84fe4fe843f2d8a21484c904b64f07b0d236a9f5d9aba18989e233d555f70d000547bc6a7f570411e6d5f SHA512 4c176409df4009c3b73d2461f738e8c7808906671b4628edebe598662631766b26a776cabec06104e6b3359c2c302a2a0ff7670dec8e1c438a1cc7f82f397ac1
+EBUILD qtav-1.12.0-r2.ebuild 1640 BLAKE2B 7b0b1f9dcf5b955114d4b3d70127cdf7ed5f7a63bf8a5ecd1566d2e5b4ac270f40e20f348f5b66c3758693c3f71245f32b79e76165a23b80e9f02e6149919835 SHA512 5fbf6ab29ac3a07393a7850ba76d1edd524cfc6925c82d1ea947d6ae9c7836a41fd81c2b97a1e5b899ef369953110f6ddb67499ad7d589cf2b028a4eef9399ed
 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 8480fcb56a03..3cded19e1794 100644
--- a/media-libs/qtav/qtav-1.12.0-r2.ebuild
+++ b/media-libs/qtav/qtav-1.12.0-r2.ebuild
@@ -14,7 +14,7 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz"
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gui libav opengl portaudio pulseaudio vaapi"
 REQUIRED_USE="gui? ( opengl )"
 
diff --git a/media-libs/qtav/qtav-1.12.0.ebuild b/media-libs/qtav/qtav-1.12.0.ebuild
deleted file mode 100644
index 9f203d800ef2..000000000000
--- a/media-libs/qtav/qtav-1.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="QtAV"
-CAPI_HASH="b43aa93"
-inherit cmake-utils
-
-DESCRIPTION="Multimedia playback framework based on Qt + FFmpeg"
-HOMEPAGE="https://www.qtav.org"
-SRC_URI="https://github.com/wang-bin/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-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"
-REQUIRED_USE="gui? ( opengl )"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	gui? ( dev-qt/qtsql:5 )
-	libav? (
-		media-video/libav:=
-		x11-libs/libX11
-	)
-	!libav? ( media-video/ffmpeg:= )
-	opengl? ( dev-qt/qtopengl:5 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	cp "${WORKDIR}/${P}-capi.h-${CAPI_HASH}" contrib/capi/capi.h \
-		|| die "Failed to add missing header"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_PLAYERS=$(usex gui)
-		-DBUILD_QT5OPENGL=$(usex opengl)
-		-DHAVE_PORTAUDIO=$(usex portaudio)
-		-DHAVE_PULSE=$(usex pulseaudio)
-		-DHAVE_VAAPI=$(usex vaapi)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/resid/Manifest b/media-libs/resid/Manifest
index 7e54cba78075..fcde318150ba 100644
--- a/media-libs/resid/Manifest
+++ b/media-libs/resid/Manifest
@@ -1,3 +1,3 @@
 DIST resid-0.16-p2.tgz 329919 BLAKE2B 00f93b13351ec6387579755ad2b6b44394d6a1d2f2c0a6077e581db01628e84c07e6707b7c8b580492989adc8b5a5f89de670792b38bf2d8037b4abb22f88c2d SHA512 f7e86e97ea6d17c3e75b7763974b1182b49b2498c5fd3c1b0665c026ea6473cda3f9fc70bc123ac1357034879e3caaf41279d2253a8122246dc7e1c70c063d09
-EBUILD resid-0.16_p2-r1.ebuild 951 BLAKE2B 63fcd3b5c86033eda39de80aefd8f94254b05ac8a55c9f63115bdfbaa41fcd84697e67554d67149ccf38ae292aa179fa9dde9d0757be083b8ae7d2156816f111 SHA512 6efe404460c57efb378e3f9ce01ef5c9d0c6c34f3540608c37c97d557aedc201b9a5ef4d0db7048b39334ae22225e8aa5f8b9c50ace109974efc379a3c2372d5
+EBUILD resid-0.16_p2-r1.ebuild 917 BLAKE2B 9af50cb66a8a88d84f1951fe5cdc300e902b9224ae80b9ac15fcc87a166d09528d87c5c1b8cc517d25ef0f8ed6499f3cae582cc47f2fbc3960d3717ef49420f4 SHA512 991451f9108b1e7edd8d8ed70dc17e888e88de3d6c8d953567ae2e2cd66a085c3ed6bb7e3b051ad1918791168cd0b8c65c948dec03d8c591e313af696dc8891a
 MISC metadata.xml 331 BLAKE2B 41bbcd40272e97e1e0b10fd8e9471db6bfa393ac15eead124bd6e5885b1a35d746bd5be4ced94ed97d31ea130ed17aee55f81b6582e1895813661e3cf07e55b6 SHA512 83c0e6c0f4c7a85a10c96db7cb2eadffab0ef5e4614b0a091a4e14bb9a37b90d0d509bec47bf75d03853ab39a06ca12bcb5cd89f89e09901340a76c7b5c392e8
diff --git a/media-libs/resid/resid-0.16_p2-r1.ebuild b/media-libs/resid/resid-0.16_p2-r1.ebuild
index 821b7db6a278..339518007976 100644
--- a/media-libs/resid/resid-0.16_p2-r1.ebuild
+++ b/media-libs/resid/resid-0.16_p2-r1.ebuild
@@ -34,7 +34,6 @@ src_prepare() {
 multilib_src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
 		--enable-resid-install \
 		--enable-shared
 }
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index cccba3956e18..70e6813075d8 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,5 +1,5 @@
 DIST SDL_gfx-2.0.25.tar.gz 1760656 BLAKE2B f0779c725529d52b675312a3f6fffac7581f2e3a6f609c433e0c1fc636a3f73660727ce8996764578dcb486252ceaf6064a6710a6b60a82fc3cc106097d2e7ab SHA512 42a5d78fe1a9b644d329fb688ed6c98558f8dd0aa029a1a0d99b1c59f94859269e0aef8f9e420b8018b687d8eae151652890be3994775644e1d3a80ba7b6fe8c
 DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01
-EBUILD sdl-gfx-2.0.25.ebuild 1125 BLAKE2B 38530516b4e8e29f9c87a9f15d75ecfa4b34085910ac86c0ada666064a8670ab70d61b11df852200469311b6eccacca8ff566e9d1c0f86564f5003395aa94468 SHA512 c8424b477d0d06121dfd9c23cac340e0db70a318eae7df45e373af87fb026252c289348862cb30e604ecac8c7aefb1301a72755bc76a4617ebd73b1f470cc82c
-EBUILD sdl-gfx-2.0.26.ebuild 1220 BLAKE2B 5ea1af9e474d34a245d9de040b08a0b3491a878405b5b8886403efdc5d1fef315bc956c4e7050ce1f9223b9fce7f57d955ad5d75f85f193e4bc3bfeb2a19ee2a SHA512 645bef39cfb28896d013d512b285cbc587b483fb79687b1c6fc1e0821d89a658a291717852046f014bbb1a639a1c410bb4b613d758f0f5439344c77f7523fb16
+EBUILD sdl-gfx-2.0.25.ebuild 1091 BLAKE2B c8eecaad4deaea4e30b6d4e19d38957c1621c2b133cd12ee25ecd0f41540d22f59aa2e4cd4ef95d72778d9b8fb940656115dc703e41ff42de034674487dfc17e SHA512 334ff048a7e81e3b10d99c91b74622eb46724cadabbcacb5f939ed97d6a42f6577603d63ea55efcf28a37aec3219b0e3b8a480818960f5233e5f308892d35dcf
+EBUILD sdl-gfx-2.0.26.ebuild 1183 BLAKE2B 0df4f287bad2fe70fb07c6c1e7c26a735ee8810d0c883b1a9f7b957558dfcb6240d8d6277d56eca68d28e83fe6c786072cec7ba98ba70f4b1d8fb807818c9c16 SHA512 b5348c1a1fead83f1dd1b59fe384dd3dcd5447a3f03a61d98f3440abf8432488dcf039f01dde6250a8b5e78408e55b01b930f860d692171e0a489aeea6566e0f
 MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
index bb70fbd0442d..9e8dddbdff9f 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
@@ -27,7 +27,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		--disable-dependency-tracking \
 		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable static-libs static)
 }
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
index a785ec3d6742..e0141aadd518 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		--disable-dependency-tracking \
 		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable static-libs static)
 }
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 416172cc94a5..3b929c69450d 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -4,5 +4,5 @@ AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff439
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r4.ebuild 3257 BLAKE2B 20d957d83faf3aea94673aea868e13ab16042811b039432dfbe30d4c37ba74376ef474667db32e505edf387252124708d9bdfce7d96f2af26cbe3abf633dc1a3 SHA512 84136f7f8dd70da214f4f27c4dfef81fa2421391d48e97af09552e407a81ff16b1c544ec33392112371263c4b9e514cdef62f4352f964e5b032bc90809fa1f5f
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3223 BLAKE2B 73649b92f16769ca384dcd93b2f157ef822e0c319b0671c5edbfb13f41bd26e43e8997b4a6ff9e40c5e9b2109631abfe48345d8fb8ddfaff3e1fb8a95dafbe9f SHA512 c424833cb92b1cae9a4ec259fd1122f08150edd233fb0cff285c8dfce0724c051e032f3fe39ea0587e99fd78fa8e4c4027dd91c119404b9c7d9914df530aa055
 MISC metadata.xml 663 BLAKE2B 5d86fe5c016f831f870da2f9b3d0192b6719bc6a98c0101c06c382d62e6100af314f46980ad5c246c8bea9db8ea99e9cd47afe2e5aee5b7887f5f6d529dddee2 SHA512 16a16403ac93fe964330da05038a0e904d0c6e895413994db9ef587170eaf7161f3cc2ce7fb0fe13ded675306b489837d96e837c1002f216b8ffe72d6fd49591
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 9e1d72f7543e..c24c05fcb3eb 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -61,7 +61,6 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE=${S} \
 	econf \
-		--disable-dependency-tracking \
 		--disable-music-flac-shared \
 		--disable-music-fluidsynth-shared \
 		--disable-music-mod-shared \
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index 17988eea3827..0fea358a08a5 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
-EBUILD sdl-net-1.2.8-r1.ebuild 993 BLAKE2B c224a4417689d78c5d4ae7bd56b6f14be3cfb5f2aaf31beffa54ff4310ea377f895c45f073a92108fb43a5ab92d9f483588f1879f366d3e967a1be588d4393d1 SHA512 f8421bbd6ac0bcd8a6aa464e132869a5bb99ddad7b470378b3d6a2221abf52e947f718370b52763fef8c445273cdca999bd555093714f055fbebbf2269f516fd
+EBUILD sdl-net-1.2.8-r1.ebuild 959 BLAKE2B 954cc7b2a329e417d77b6d5cc7d11304e5265a0caf0f32fda0bff47324e6efc7ccaa83e98c2fcf6f90aa36f3d40926954d1b7ed5d669a7b7a0f8ab5e6c616f67 SHA512 10374ed83bbfbd55c4c985e7322c4dac0d35631515ffa94a6d0098d54c421c8671fe37ad6ea383364ff822647fb6b7085fbb7fc0ca6737e55e7debc511c05083
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
index 4d5faca8829b..7cbee93304e6 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
@@ -22,7 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		--disable-dependency-tracking \
 		--disable-gui \
 		$(use_enable static-libs static)
 }
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index a77af2b73fc9..3568de4b3439 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,5 +1,5 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1263 BLAKE2B 2ecdc0fc8c92a7118e3398f877657a2f6d726b887b3ec43d2ad6def76604583e7a6538c918d18ab188d357b74d0ce2e914bfda4818070c51514039a2aa430311 SHA512 2e5b989eb2c6a916d614af84cf1fef749985509c9b746945585908b2e66d0b465c5e99f12d49781c9588c37fd3be9c1d48f4a8f01a54314dfc3b6fc571ad6d1e
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1231 BLAKE2B 567bf58a427d80e0924673816c911bc20c42e630ee577d9e2f5b379c74681800582ef72e3eb7161b9ed31bd5ebdddd110a9ef180631c100926c2b2b8f0d4ad64 SHA512 39e3d970f6667ca397fd81db4a1f17febea57757bf3e26e75c32347d944672fd9a6ab0b7183ea1febaa23a02ece7b7622130383f9fb21cb24b2677ff36676729
 MISC metadata.xml 487 BLAKE2B 95ce74adcba0d3325dbcbf132d27ec7e09a56bb5043d44ced349f0a8318f7a7ba6a3f77cf164292af4f789c4c058b6825a733338245d9434f689ce3c84060565 SHA512 8da59a1be8aa7ca22c2f8b14e4c4fd288a9bc4b508157bb38b0cbb8f1f5f7dce3904861e419b8a6b40a0b895e8866c53b677c1467c0531b9615d70806bdee360
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 5b1894fdd075..70a44ce8728a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -36,7 +36,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--disable-dependency-tracking
 		$(use_enable static-libs static)
 		$(use_with X x)
 	)
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 24f37a18f853..02fa23024173 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -4,5 +4,5 @@ AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
 DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
 EBUILD shaderc-2018.0.ebuild 1972 BLAKE2B 59ff84898d5eb429e0cf2ca5eb102cfd0fe652c4a7b6b44409a245509bbbc99ad69e18d65672b6a53ad5eb6b09f8f987a7f538880f4772c2bcfb785f982939a0 SHA512 0665f70683a796084e2da406c6e650ff3632aacf5318e078eb2de50f3d9b123b14b8b04095186bde791cfadc51befcd7abf3805e87d633b777c893234b81e716
-EBUILD shaderc-2019.0-r1.ebuild 2085 BLAKE2B 92c60e5103ec3bb8eb3a40be7b8de11b7ae1045dec1f1d10f762d503ddb4913852538e43746dc9e9376f76f1795e4d93d3508779a4462b39df1604212af67d82 SHA512 8387bbfc8e76865bc19de3c926f33f5005c50e24bfd9e09bee0801970fe63d349e37c4c4821128a7730037424c470185d21bcd16ab31b446202f4e6b8f1f7469
+EBUILD shaderc-2019.0-r1.ebuild 2092 BLAKE2B 6b8a0b3eda40a6de6ca1bd4ab98fcddd6e1fb18e642c0a92d45b776b8f10a802c02d5ce0e4962c8d0e7c00b5f465cd6f2e2f86c8319fb9bc53384507d2e785cf SHA512 7d71e75785b4348976aae21e482e14fab20730cd1b882bcea56206e6c10804b655c80208fb73283007cf625e7f3b72fa3fbbfc9cc40a27eed03d8abc74955098
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2019.0-r1.ebuild b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
index 2c48717338f0..99087b2d869d 100644
--- a/media-libs/shaderc/shaderc-2019.0-r1.ebuild
+++ b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index aa6225f1ff9e..766ea456a5c5 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -1,3 +1,3 @@
 DIST spandsp-0.0.6.tar.gz 3309837 BLAKE2B 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4
-EBUILD spandsp-0.0.6.ebuild 2041 BLAKE2B a082688ec2a0e9b723b8ab8330fbb19369dbb2a6ae4f38494eb46b4fb09bedee2f7dbca874112b5776b3e46b527caef36d2455d6b46e7bf77f2536299eb77472 SHA512 fdbfc16950fbf4c54133cff392916946aa1cbc93e3e6312021ebe2af6d33d8ee430819ddffbcea2aedfb61d00b67739a4eae044e24e14bf4625c4a6610748e80
+EBUILD spandsp-0.0.6.ebuild 2006 BLAKE2B e49af71fc431217c06b250e4480987368a05fd0de98cad041cd7b5d84d99b502db5dfce343af460da417e465295147d06ebc37f94832c7f2fad99a675f9a6c9d SHA512 017cda541b8db42bcc60d509e2b296df95da38ce65e75ac5d9ee68e20a2970e3d3b1201b8341da7fbf7e23d31d485d90aee45064913d29dde63cd7d67cb4b740
 MISC metadata.xml 295 BLAKE2B fdbb4c9e5e6392277d1096f1a966b5ee26ed4f752bc77f1433c2bb97f9b7337f3ffde846baf8e1d2df797b01cd46e3a530427b8b83ab56697ede4172239c34ee SHA512 da977d763bedbbdbde4231bd708f3a9fa932241a6a88990884108a8d8309328a5ed80ecac0686ff0dd38a7efab246500e31f360af995611f4ecc60c61302acff
diff --git a/media-libs/spandsp/spandsp-0.0.6.ebuild b/media-libs/spandsp/spandsp-0.0.6.ebuild
index 2900d078f7d2..cd8ed0301d23 100644
--- a/media-libs/spandsp/spandsp-0.0.6.ebuild
+++ b/media-libs/spandsp/spandsp-0.0.6.ebuild
@@ -42,7 +42,6 @@ src_configure() {
 	# from one another. Otherwise, you'd have to do REQUIRED_USE.
 
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable doc) \
 		$(use_enable fixed-point) \
 		$(use_enable cpu_flags_x86_mmx mmx) \
@@ -52,7 +51,7 @@ src_configure() {
 		$(use_enable static-libs static)
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog DueDiligence NEWS README
 
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index ffb2796f8e6f..f3fe9d6929bc 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-layers-1.1.125.tar.gz 1763589 BLAKE2B e6db1c8b2469afcc9565a55e3977443952cf8a176b6b2b2f5747fbfdb887074e014138b4626f58ddb5c24f87260af32c0c589aef237366aee5acfd3b31ad06ee SHA512 07fcfa9737711671a1a537285f69b63b1a14cf9201dcc169fbe99e19febe612ba8a1e7b448d18bfd01a35d90fb99a261ada0ae9b8facb36d04079bcf3c5c72e0
-EBUILD vulkan-layers-1.1.125-r2.ebuild 1455 BLAKE2B fdf77002ac28e64c367df7104626b7e37fbf76179230976ccb41acc118d9e0ad513c1ade8635a5d47649b1d511ad85d93b6be3533168101a71c474cd8f86bee1 SHA512 ca3e73d8061da3e2ea86b494500566f7525040b907edfda0245824d6f36899337860202b2466f83d78c4246d11bfd9cfd54d8cbcad18eca05594920ece4c425f
-EBUILD vulkan-layers-9999.ebuild 1439 BLAKE2B e5233489dd2e520e8fb97e06a1604d84c678479a46d0378c911642b8e42f7029b330a19e85aa3e5b776aa0fd725346eb5bba473323205bd4660aba87b33a7f7b SHA512 8ea1a54dbac14d56ec58b76aa335ee0ebac6058213bacb9935d863d7134167c51fa6acf615f6155c152524b28e191825f1d51d6091bcb26c9d3c506308b79176
+EBUILD vulkan-layers-1.1.125-r2.ebuild 1462 BLAKE2B 33e3d3d8578f6620fa64b19deafe8df8b62c2811da3fe2aae1c5154524cdf0fdf829ac988a9364a32478480132957982854dfd398216e9768ce1412d5e093d60 SHA512 86984927f83bcc8eaaef651a43285ffb4401acf64a960fcfe69c10c734960c3ec1199929fbf5f5dd20bf9972c1b32fbb92f4fa1ddeb9461a6754a83eaa360d76
+EBUILD vulkan-layers-9999.ebuild 1446 BLAKE2B d50ebd62ea8c8b52b9129374fa6a86209828c822031fc044c577c998365c129a4e548756f21dd4f539ea048e5ff57325b2b8cd939a71192b9e8515fb8474fe18 SHA512 10de6ff6bbd8d66c4e7f0160bf675eaa8799beb765f95cf818a9f7374afde563b4724e340eada551225bb6372eaf41c2f538940de086ab4ac281bfd3a5e02ec4
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
index 9a3f1dd75c31..5c8a22273cf5 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.125-r2.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
 fi
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 8b38bc5df9e4..891fec0fb1cd 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
 fi
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index ac3d43b8f2cd..7fb76d8020a7 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-loader-1.1.125.tar.gz 1398802 BLAKE2B 7cf1f99f60b4b37bfad12580fc8809012a0540d928366b465a532fbf90e7d87bf42eeeff70b1a46efeadef9c599cad6009b122ed9c5c7298973207f05acc1032 SHA512 40e1e5c16491f0549eae3efc065c375c258b475d81e1c781a756c71ec329f390e2aba55ced5ed2005e938f9d074dffc1692e7e1e330a35f55460cae1606fdf2e
-EBUILD vulkan-loader-1.1.125.ebuild 1783 BLAKE2B ea4bce58c924c9e7ae3f0c15edd0a29c05bdae3b356527909ee4d235670f2654a51e6527f319d26f235a733b8ee53fc828cb54ff88539b0997580c29098b2ac2 SHA512 a3be26b8c6b28e2ea281540dc10048ad47fe041c5cac3ad0191e784042a6f24b5598626f93120f533de085ff55bbcf174e7e18234a240c2d6ebb39d1dcd83e6d
-EBUILD vulkan-loader-9999.ebuild 1785 BLAKE2B f5d326b8d33f44d87dad4434d4979aa0d550cb4a9b5f5abf1622f6ed23742549766b6b11fd757d54eed2550b7ba41ca6eaa286be86f6dbcbb2468c6effb8a8e8 SHA512 3ded4d4ab634eca8e083ecff8725097e6c7ceb50f7c85f9bd542155a27994c4c00136deb906910f60e129390fc0da09c22ae7050e4f141e67395b2cb7a3d774e
+EBUILD vulkan-loader-1.1.125.ebuild 1790 BLAKE2B 1dd473e6d50d291b3aab7bba9c6c81c61e064b6a460190ab7af6cdda36b5b41cd9a3ecc25a80ba2ea8426560133b4a02e7301fbff33ccf2168425998c93aa2e2 SHA512 68cecc0c5cfff779ef325838c9c1e6f7316c96f90f7335279ada86015d90fac2a9d813cf3566db689db26f8805ebfe0c0e553c0fcb66fc4e0a43117cddbaac9b
+EBUILD vulkan-loader-9999.ebuild 1792 BLAKE2B 4e64a5da96ea7e055a42cfd93c3da6cb726198c962e6493f1746295910658536ca16737f894c7cc705959393c063c9d4b2913631199eed35a63aeeb2154ed069 SHA512 ac144187ceeed774d98e50ea289a15318065e51deef360a9e670453313b76717a83bd5ea61195160c5a383f1501fe4fccf33e24a77c39f335a0ddda28b41a448
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
index 57567e265b71..3244a95630ec 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.125.ebuild
@@ -16,7 +16,7 @@ else
 		MY_PV=${SNAPSHOT_COMMIT}
 		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
 	fi
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
 fi
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 7e0ba7770fcd..8d64aee32dd6 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -16,7 +16,7 @@ else
 		MY_PV=${SNAPSHOT_COMMIT}
 		MY_P=Vulkan-Loader-${SNAPSHOT_COMMIT}
 	fi
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
commit	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree	9f47ee47c31a0f13f9496879cd88a1042550aa81 /media-libs
parent	53cba99042fa967e2a93da9f8db806fe2d035543 (diff)