gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /media-libs
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
195 files changed, 998 insertions, 4972 deletions
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild
index 1e412e0a73c5..79531d527f6e 100644
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="mpi"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
index 2b71a7304ca0..aca4ce9ebfe5 100644
--- a/media-libs/Field3D/Manifest
+++ b/media-libs/Field3D/Manifest
@@ -1,4 +1,4 @@
 AUX Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch 5371 BLAKE2B c8a1360db04de4cfa18b739af024934469b9cf2a2314d3fb248ad2df371be902369989f120dc7c1adb86ea77cf01a7a5e0944b9a4a57e9a9e329a06c5d24c97d SHA512 167da6b57983e317266ccbb9670cc5ec03f041343e44af3cbedc14366e349edd1d5f2a0ac163fa919827b2dfdd9811525b81c446a0e32016b3bd51f84f202bcb
 DIST Field3D-1.7.2.tar.gz 502481 BLAKE2B 8d5fbac915b52b36e66250f8fcd2beb5fff9d2446696ad1829e3edf05c9810b5d54928c6ab4f5aa99c1338da24cea446134434a59aa1d053f3da3500c2800f59 SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
-EBUILD Field3D-1.7.2.ebuild 791 BLAKE2B e6272d99776dd7906fdafcbd3ff1caca135f9e7093a76879ba857785f5a2515bae3097191e8a0f7d5618673450d687cdd7c05337ddfea43129622a5696c64b07 SHA512 ec54a40850812ce4108193f7f73d694fc939d7e2885d1dfdfc14a8a007e40f27afb7ed8b3740aa5e9b17dc040107f3c1df38cf339eef9850ebec4d6e67233b7a
+EBUILD Field3D-1.7.2.ebuild 796 BLAKE2B d15d78c64f8fabcf4648232d536d054e63f87e23254150cc3fded4e23fbed9bf10362265bdbed64fabdab8ffa4c1fbfef8221a0830ee814be7d6aed32cfd2fb3 SHA512 9ef2edf4968ac27009d5447a72ac0ba1925f09e5b0c686ed378759d3b3464e8a944cb3b85660f39bcfeab8c9d25ad330bb1568633d1f002b5bdc79c02bdce0c7
 MISC metadata.xml 708 BLAKE2B b783e8e9cc226dbf51d9033659f49ad45587757791112f704a799a081b02d34f4ec772701f7b88c3bbe1c31a10a2b9bb80ddd51eb5d61376367bb99886c6dad8 SHA512 421af157753908d4743f552d65c649b8852ec4811a9b58eac99b63d377cf3bb289beccc5a6a8c6862884a48c8ebbc4aa9deb7f62fba4d329e17346712ab0f514
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f72ad27e0d98..7ebd8ea1f16a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aften/Manifest b/media-libs/aften/Manifest
index e8376cb13090..c3cf02664895 100644
--- a/media-libs/aften/Manifest
+++ b/media-libs/aften/Manifest
@@ -2,5 +2,5 @@ AUX aften-0.0.8-multilib.patch 576 BLAKE2B c049de0a7f99ec04a7edfff591ab320c61ad7
 AUX aften-0.0.8-no-static-aften.patch 684 BLAKE2B c0df8086a8b73d155ec3175767cee9c32ba9f835b0307e880dc985602ee901b43a5bd9458a288380ef0d99981f62092d7eb9758ee52281a4250f3e5bb9d24a57 SHA512 cfd2b151a031b64cb3f09b0bfa514e220fade4372dbe37bccbb58a158053ec25715617ffbcd5fd3b5e0a348488f28d13711db5a18bd62fc67058dbee540a36a5
 AUX aften-0.0.8-ppc.patch 4066 BLAKE2B 27285a58026f95b2974f8ceb09dfeaf38d53c019c19e96ef8e8da42a7a368432a59bde54b3b72bf80202da7ce7c3f3faa279b5b5801bca7a1237c269cf7d05e3 SHA512 5022529320ae0cefbbd4124c37bdf3d2451c4733b41007f77cfcb5a26ae32ca159716ce4782b6e75767309a2057c839e467e966c8d9ad159d074c53ffdaf4ef5
 DIST aften-0.0.8.tar.bz2 80865 BLAKE2B 8746ba1f061255a6ec79a1253aede9aca8fa9bbdcb3bcc38636a99ec2f83f882cb713183483143ba0dc3852bff821d00a9029e0812b67e67540b303fb67b26b7 SHA512 1261297eac5065c6f028618d3e15e9b152ac35440c74cfb09d98cd99a90fb1c6a49585f70928834c3f6ddbcdd1d8721f7329d24f57cd30901dff09bbc0d419e3
-EBUILD aften-0.0.8-r2.ebuild 748 BLAKE2B 7ae415f226965337c44d46d6d532c4360c51f7333625ff97acb58b97ba63fef5e9d932e8b19a3f1ec86ca7bd73fa12a8ffdc8d4414cb36a1e641a986ebf2b7bc SHA512 67783c52290ab48a8898a0529d1d1401ef1f2339ca069d128d2995e924fcff44c0ab97c106dd9e7941bfdca267ffa643dad32f11a113149078f3cf97f65eee24
+EBUILD aften-0.0.8-r2.ebuild 730 BLAKE2B 2418260a40a8f2c12963e7bb780eeddc56613c4d3bdd8bdb1bdb56034347151e6a9bfd7a109f153cf72486cfa2352b765ae317ddfb68c4cbf681fd5727a59873 SHA512 016bab4905810d5d969c2da6961ebf70a33a2fa641be06e5a9bbf08451412965d1f4a8a67a706c72a63a0b1d74e488d6fcc74467920440367e5940635656bc3d
 MISC metadata.xml 602 BLAKE2B 87b43f5a24944d2583cc0b10dbb51babab9de77027aa6f19460e7a217e5370c7f8343610df5ada3f21827f267c2a1b84bb720afcb1221112fd112ff944001467 SHA512 6b78ecfd5eefe1ce29c875db4d487ed23fda5faf9a1bc97b75d6de9afad30be6aceffabd3031bf35badbfb8cabdb4bfa24fb2c7a3905d7a68b9ef9bc0bf0d458
diff --git a/media-libs/aften/aften-0.0.8-r2.ebuild b/media-libs/aften/aften-0.0.8-r2.ebuild
index f1dd9d2fa9ec..ab7fe29f0a45 100644
--- a/media-libs/aften/aften-0.0.8-r2.ebuild
+++ b/media-libs/aften/aften-0.0.8-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="An A/52 (AC-3) audio encoder"
+DESCRIPTION="A/52 (AC-3) audio encoder"
 HOMEPAGE="http://aften.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="cxx"
 
+DOCS=( README Changelog )
+
 PATCHES=(
 	"${FILESDIR}/${P}-multilib.patch"
 	"${FILESDIR}/${P}-ppc.patch"
@@ -25,12 +27,11 @@ src_configure() {
 		-DSHARED=1
 		-DBINDINGS_CXX=$(usex cxx)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
-	dodoc README Changelog
+	cmake_src_install
 	# File collision with media-sound/wavbreaker, upstream informed
 	mv "${ED}"/usr/bin/wavinfo{,-aften} || die
 }
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 2456d226e149..75bca9f63255 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,6 +1,4 @@
-DIST babl-0.1.78.tar.xz 298920 BLAKE2B 654baf0ed09fbbad54578bf8bba60f45152e446d8b3d3ee49ca57084f220d22ed9478bc95851c5c1b17deeacdacfc14a39ab4d6e3f0448012eb212eef8b357b2 SHA512 d40f68cbd3d7703066a8985958b6cc49eaefe842c0fb3b7bbf6a5d6e6198642b55c4f95bdbf0d25a29d24a975c9b94acfd084792c60b18ec5f66260dfe54893b
 DIST babl-0.1.84.tar.xz 299216 BLAKE2B 80db725230f5bee71a9e2056e40cfe9c4dda7669fe3004d73c2d1525c9a89362491edc5addef47f28a94938ab3cdefef0496b38404fc4ab11931e7b9e0daaebe SHA512 a8cba80bd3a434ee9bbd1a0d1fcd6e5e38f9c657b189a70631ff3fe4e4c270e64762d1be13d48e8514d4166ac4175745001499fcda68eb1ea93e03c18b2a5d06
-EBUILD babl-0.1.78.ebuild 1819 BLAKE2B a68c754d5c98ad395b3d3375ccdd7daa9b42d3c3fc1ef927ebe0816dd2b4fb38b6962224b6bbd457d1bb6f5f06a086cc81e651757f023e6b6de6080e7c059ff9 SHA512 da47b65a2dfd1b81eb925f4076a79c5821512e683973729be8af0de9dae3640a26ffc0adac375b8b2b67cf9d23f06d8e20632353845a0460e25e3394ba231747
-EBUILD babl-0.1.84.ebuild 1758 BLAKE2B 79030d534f1dc591516ec5bd956cd035a22689d81d21baf3c36b4ebe79f12fc4dfe8dd58e992852dc9c2b51a5bcfc8cef5482aa98efe09387f0addf5b83a4152 SHA512 b0989be42b8d1133c8cd95a853768bc8257e625e36e0d05679ba5094c8bb166b5b123c2d9a063a2ddb50dab2a39c5c7974bfa0f7385b6d69ef5f3282206214cb
+EBUILD babl-0.1.84.ebuild 1754 BLAKE2B df007b372ddcf5183259fb0cd84733dd6e199c876517a20c6befd0b771e04a4950a929282cb9e0d67246cdb7a521046ee22a9b7ac286ed73d50b5d23cb0e566f SHA512 874afe0607634738fd4ffef5a25df48c118d7a10f1e47919e085a3a2e34e38c9aeb21bac3af17c2b32e41cece3b9c4520395629d516574374319a7010a5a74a9
 EBUILD babl-9999.ebuild 1758 BLAKE2B 79030d534f1dc591516ec5bd956cd035a22689d81d21baf3c36b4ebe79f12fc4dfe8dd58e992852dc9c2b51a5bcfc8cef5482aa98efe09387f0addf5b83a4152 SHA512 b0989be42b8d1133c8cd95a853768bc8257e625e36e0d05679ba5094c8bb166b5b123c2d9a063a2ddb50dab2a39c5c7974bfa0f7385b6d69ef5f3282206214cb
 MISC metadata.xml 370 BLAKE2B 18f0dfd3b6fb8f284f888dbcd30d3d4ddce8753e58ef3e92ba0803bd6dadd36962f2f6e57dcd6ccebc547bf43b8972bdaf27e5817c77307172fdb835fe2d9c9e SHA512 9ad9dbdfc25d5a59c0129f1f83615d73bcb9026cc0411a71e9987bca46389fa5f3905a72d22ddac319b1838b770cc5755a2ec312a05db1752e10be5cca08ea38
diff --git a/media-libs/babl/babl-0.1.78.ebuild b/media-libs/babl/babl-0.1.78.ebuild
deleted file mode 100644
index a0888f521ae3..000000000000
--- a/media-libs/babl/babl-0.1.78.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="https://gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-REQUIRED_USE="vala? ( introspection )"
-
-BDEPEND="
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-RDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	local emesonargs=(
-		-Dwith-docs=false
-		$(meson_use introspection enable-gir)
-		$(meson_use lcms with-lcms)
-		$(meson_use vala enable-vapi)
-		$(meson_use cpu_flags_x86_avx2 enable-avx2)
-		$(meson_use cpu_flags_x86_f16c enable-f16c)
-		$(meson_use cpu_flags_x86_mmx enable-mmx)
-		$(meson_use cpu_flags_x86_sse enable-sse)
-		$(meson_use cpu_flags_x86_sse2 enable-sse2)
-		$(meson_use cpu_flags_x86_sse3 enable-sse3)
-		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/babl/babl-0.1.84.ebuild b/media-libs/babl/babl-0.1.84.ebuild
index a247b4053c85..721b1da802da 100644
--- a/media-libs/babl/babl-0.1.84.ebuild
+++ b/media-libs/babl/babl-0.1.84.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index c6e6d7049466..0549ae6c3073 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -6,4 +6,4 @@ AUX coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch 1394 BLAKE2B 40b43a0cce
 AUX coin-4.0.0-0006-Fix-underlinking-against-X11.patch 827 BLAKE2B 33aaa8281fc260bb382875a0b41eac83d8099e52709e93a523ba4b048e1f9ab92c1a17cb09e1c5dd091c90878c373ef973c380211f856b32581f97992a8cc83e SHA512 37709b1a853287245b0778297154a8ea15ed86d60558af541ccd60fb0ee369c296947964080bff790595030c8e41964e008b0983bcbf5146d3c5ac81756ff622
 DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae
 EBUILD coin-4.0.0.ebuild 2763 BLAKE2B 50e79002571255b544aa0e69151ed5b7e86fc916f6c4ba5f500aa2ad3a006817017ef2fe85653d801fc6a8927ca386664a9807f8a52636c501b4bf09ca00e0ce SHA512 68be6c6a83e9ca4b6f5b644d8744b88b28ce5d81801652f90ff0e5067c8c2f7715bdef818557b41ede049d9adf0d5f9ca51e8253f996723244c1d60a9fc6bb10
-MISC metadata.xml 511 BLAKE2B 0efdd7dbb4a2bbc64ba41ae5ef9da8b09b448bfdf895d86623b219bdaed02b973483e68c52933728f023695c8d26a0bfab41f40ea7d278781b55904dc50777d5 SHA512 549388ebbc1b58b66025dbce92805952de633ac4db11cd9ca7a5416671b18a2fbe7aa71a1e1f02bf2d9da4e81e4c7cb132741e28f91424f330007e2e4f16e252
+MISC metadata.xml 455 BLAKE2B 66b502796e3ec2229c84491f50ccfef1f1fe4694a4272cd4db8323d67803740ba21e5d5a592608ae4887bc04bdeb80e6819a0130805b2702c1e880c8cdd5715e SHA512 913f9d064f160c8191244f284df8df21690e2e42864badc726dd09e7e2c529e2c831c77452c4e9218bc490347d1c03f8b9b5318078908d820a8a5f31eb016f47
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index f76f33813aaf..8c9ef4c9014e 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -6,7 +6,6 @@
   </maintainer>
   <use>
     <flag name="exceptions">Compile with C++ exceptions</flag>
-    <flag name="man">Build and install man pages</flag>
     <flag name="qthelp">Build API documentation in QtHelp format</flag>
   </use>
   <upstream>
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index f4e711192f97..2f208f684440 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,6 +1,6 @@
 DIST dav1d-0.8.0.tar.bz2 668627 BLAKE2B 6f45c6b0011acb74bb26fa201e667b16dbf8b691a2bc5d2043517381ca58132fa29ee828841609762737ac8637948b2bd4bac9e2c1d2ca23b1d3ad23f5883875 SHA512 906481ce5b9ce99cef2723c4c2466ba762095b9f88caccd42dcabfd4800964d7cd142736de1bf2ef25b631ee01eb26f7f1ac1754fc161b8fb7192e104df10e28
-DIST dav1d-0.8.1.tar.bz2 674110 BLAKE2B d1dc6137148ee59ccee727127655cc61310d220046f3f3367551153728a4057a92ed2af3298a7b099b4ef345be0f63c2c6d6cf8985fa84a9cb8ee3ee11f2738a SHA512 e882c11c4166a8ada0803a7f1f1de73b6d41fe94ea11300c89121a0551c04b6681e4e6e79d27753a990f7dca1723c35503eb1f02683cd4722db1ae055489e406
+DIST dav1d-0.8.2.tar.bz2 695931 BLAKE2B cfe7667e583e05f8fd84b226a26ea23a901336fd8cf62900b47cd6b3bf92f8fe58d14224d1e063cc3bf7abdb17da437d291dc3f604cb68e99fc0615619f76880 SHA512 73335594950b08596356a1950213abf57c6d48060da37149e700565f9689ca82b7427e320040bf43b2e97eff7b6da7116a6aca77cb717f7ce140039ebdae5595
 EBUILD dav1d-0.8.0.ebuild 1175 BLAKE2B 043f3cac61cba7b31b92c3a4c7f0b6722444c66d3e0e6d82acf27841b1ca0003a816839e6a67eaf3cfa94f4795dd8e466d36c1d3681fdaed85a6de9615fbf779 SHA512 4624d5b50cb6fcb27dd7168efe7ada23f431ce7d575edc81e111488df7da4beae7d8f098332b26a19ed6a911e6b3891f10c4cd294a97fb244d24c271574936c8
-EBUILD dav1d-0.8.1.ebuild 1261 BLAKE2B c638bed21ad66263281ae7772ddb146ba774fc02b9c45aedf98d411f4b8ae23304b2c04445f69def2e68fb2c4ef05c74f8e037b6be94678a9b14370269b05a8f SHA512 a514ba781229c5c39c8fd378cd4f077d68d20db36030b243c170c6f1dc09ef8f7f5c0011c68ce30dbeb8883b6d3d814281565a8452cec71e0d408eaded6f49f9
+EBUILD dav1d-0.8.2.ebuild 1261 BLAKE2B c638bed21ad66263281ae7772ddb146ba774fc02b9c45aedf98d411f4b8ae23304b2c04445f69def2e68fb2c4ef05c74f8e037b6be94678a9b14370269b05a8f SHA512 a514ba781229c5c39c8fd378cd4f077d68d20db36030b243c170c6f1dc09ef8f7f5c0011c68ce30dbeb8883b6d3d814281565a8452cec71e0d408eaded6f49f9
 EBUILD dav1d-9999.ebuild 1261 BLAKE2B c638bed21ad66263281ae7772ddb146ba774fc02b9c45aedf98d411f4b8ae23304b2c04445f69def2e68fb2c4ef05c74f8e037b6be94678a9b14370269b05a8f SHA512 a514ba781229c5c39c8fd378cd4f077d68d20db36030b243c170c6f1dc09ef8f7f5c0011c68ce30dbeb8883b6d3d814281565a8452cec71e0d408eaded6f49f9
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.8.1.ebuild b/media-libs/dav1d/dav1d-0.8.2.ebuild
index 38fc32f1023f..38fc32f1023f 100644
--- a/media-libs/dav1d/dav1d-0.8.1.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.2.ebuild
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 43446a085689..d3648818480f 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,4 +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 1428 BLAKE2B d8284f119c625e9dc69c39000a058a34a2a61880f413f643bf31cde949ade2e51ea73407011d3a4bb9e5e2c6d7fba23f7e6724555792dc463c68a26c2dae6914 SHA512 c5a22c592f633facb4bac2f823b8b2afe1a27bc4576fae94f90d3e2597cfd43d1463e780ae3ab322c6137edddd2cd03d3c5d6cb2b9da4fa9684eeba28c0ddfe4
+EBUILD freeglut-3.2.1.ebuild 1495 BLAKE2B e06be19800d6723db22c152a7989794e537ffd6e0ae10e75b83b457bd3567cf90b912f4a3c4a56a82d9cd3552a15d7a9c2ec6be6cd748f3d7ec55a326885daef SHA512 900f862d0ece2ee074e4028ed65f8dbae784d44499d3c24c7815a4400b129bbcb9939cc927efc5b41b6b6826cb16f6c8fc083075efec0ee25ef1d928709cb872
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/freeglut-3.2.1.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild
index 3ea22fc54f73..35753e70c800 100644
--- a/media-libs/freeglut/freeglut-3.2.1.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library"
@@ -32,6 +33,7 @@ HTML_DOCS=( doc/. )
 
 src_configure() {
 	local mycmakeargs=(
+#		"-DOpenGL_GL_PREFERENCE=GLVND" # bug 721006
 		"-DFREEGLUT_GLES=OFF"
 		"-DFREEGLUT_BUILD_DEMOS=OFF"
 		"-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)"
@@ -41,6 +43,6 @@ src_configure() {
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
-	cp "${D}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc
+	cmake_src_install
+	cp "${D}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die
 }
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index be631a4be50d..c224b25c3090 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -9,5 +9,5 @@ DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb5
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 EBUILD freeimage-3.18.0-r1.ebuild 3052 BLAKE2B a013e1053090f810136410e9bcadbe09d5610cf6896160fc4cbe00223adf0e386c8f294c70848f4c7da4194e8ffa5c766393bd8bb76a956cfe9aa3f5997ad96a SHA512 3b587b0c14a81c752f7c5f669aaf2f32ac077a72e98a957b3bce7458ddb6ad5d4fc3ae189224bddae1739e9cd103b0c1bbeafd01d6ec2b22564fdc77509e747e
-EBUILD freeimage-3.18.0-r2.ebuild 3165 BLAKE2B f8e4ee3616194ae6b71e2b3fe86bc62997b739256b2ecccd391b05310fbb74cb1b1d1235965e755bc5e35a3e6179d3b597484a526db588aafa99d715ea39ebaf SHA512 ca3f049f9a2341187f6cff0fbd9c556aa2cc6db54e4ce9055aca744df0fd63c7bc6abe9bc0dc3559bb804387c1284a174bd94ef7dcdf19270c84758f9fb3f2bd
+EBUILD freeimage-3.18.0-r2.ebuild 3171 BLAKE2B 4d0067d1fb5c6175e1ba560018bf6341951d3aa9e281b1726018e7340655a96b5f352bbc591d0323080a6f61a6596b5c43de95b8d27ab6b85f706035a0b0180f SHA512 81d452cf25aba46d7e46393b133fa45813458cfc0a1cc1f685f9f9aad92b65a4552864c82bd853506f7d87fe58a7a83e11a836c2dfc4d080d1616efebc9176aa
 MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
index d15d09ce9bc8..17929a69f041 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 660ecbbab322..368187e020bd 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,5 +1,4 @@
 AUX 1.4.0-x32.diff 759 BLAKE2B f122756759da4cb2a122ff702b688c63bf878801e75080d0482bd8583a935448bee42fe00f50bbd99679e5cc5a3e96b01854dad2882a12a64432782b368750c6 SHA512 4c4408ec7d42e81f4e5913ec4d97cc88290a3729d5990910f0c7d2a86da511cd496bd20574f340ff8786e533f09687c0788ba790746cba56a43403e11b638a3f
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
-EBUILD gavl-1.4.0-r1.ebuild 1090 BLAKE2B 09ecaa97c26e2fd046c6cb35eabcffa67f768977409e57c13103e452964afaaf20125689006a766f507af0ca3fd7d57624492de492a7a531624ca5236608d5f7 SHA512 33408ccd8f78d4e2c4d6dfbfda3fbd350bdc65ad5ab5836feb7cad9453ce51fd20b4c5ce8669bb5c040f5951eb7fd9157012dccd8ee853414f7859896fb979ba
-EBUILD gavl-1.4.0-r2.ebuild 1364 BLAKE2B e167b7d76166a6b54eb1c4a2fea97cd16d772022402328a4741f91b62b267a742524568455507ad70ad467096e9ad550bdf482cde0a5650d3f275b9cfbc4e657 SHA512 bb115b2b88ab3245556380af677b92503f73d74f6d2ce09e7b6dd1f2247467c3deae3edfe179daac788f9b0faff8550293a3217ed08ed50278f6f22aa11de827
+EBUILD gavl-1.4.0-r2.ebuild 1361 BLAKE2B 795f27739120d2b886af44959b0340ac983278a9407ad4579f840dd32c9829a6694a7c7a908f6c9db81bbe255e419fbdd574a50b588941f037905d7f59d2ae3a SHA512 e7af92925ce929a0e88422671f8e1085242856371f9f31140541e6c9c429e5531799dbaff3c2188e008f83552e8935453e56293f990835d3e1df3e6a1cc30d1d
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/gavl-1.4.0-r1.ebuild b/media-libs/gavl/gavl-1.4.0-r1.ebuild
deleted file mode 100644
index 1fff889bcf13..000000000000
--- a/media-libs/gavl/gavl-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-multilib
-
-DESCRIPTION="library for handling uncompressed audio and video data"
-HOMEPAGE="http://gmerlin.sourceforge.net"
-SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-x32.diff"
-
-	# AC_CONFIG_HEADERS, bug #467736
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:-mfpmath=387::g' \
-		-e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::g' \
-		-e '/LDFLAGS=/d' \
-		configure.ac || die
-
-	export AT_M4DIR="m4"
-
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	# --disable-libpng because it's only used for tests
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-libpng
-		$(use_with doc doxygen)
-		--without-cpuflags
-		)
-
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/gavl/gavl-1.4.0-r2.ebuild b/media-libs/gavl/gavl-1.4.0-r2.ebuild
index ccd9c0e8c0f1..71259eefe9a6 100644
--- a/media-libs/gavl/gavl-1.4.0-r2.ebuild
+++ b/media-libs/gavl/gavl-1.4.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 876bfcc4259b..baa72feee10b 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -4,5 +4,5 @@ AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244
 DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
 DIST libgd-2.3.1.tar.xz 2632076 BLAKE2B 22457c4a2fc493872ccbc8a2c45283e785ab200ca671c48f00f3f22a037fac3b97afb35534f5ec7288714a16dfaa59ed53acbbd39c3e7f89f16cdec72ef1bed1 SHA512 0b96406a1d62129d7d63f78fc4558062c223a3bfbf9719be86362fd922b72b5dac294524dd1b0a996a4a7a709ee9d2dfc790ee32564add70adad41d044a0ed80
 EBUILD gd-2.3.0.ebuild 2561 BLAKE2B 916cc3bc7b44afee22557e424d8296890e0d5bd8d009eb939470e7fb6c5750b2d0347b909e872aabbc88551ee71005ab9d59de2fe8b85c5e68145127d4ecdfe8 SHA512 2605629f9c96f1c9b0121639d989888f422b37611066deb73ad76843d4a7cd5fcfc093c3492f76169faa27872e6e66cf9405f1c75aac0251cd1a3881df4b2529
-EBUILD gd-2.3.1.ebuild 2482 BLAKE2B 90387f225d6e6b7b1baca1b0e2825816653e8245622f03d2328066a4a9f6713b7005b9f78321d58f609076009e0b06b0121f2fdacc8e41cd7b2e23dbe70b8589 SHA512 d773c116c5b94e29c699ced4298a354640be7913895e67d3df1c547f6afd14b24e1c850eea4d6fd4ab786f19ce987f8988bffa471bab8b532f3d7016ec4763f9
+EBUILD gd-2.3.1.ebuild 2475 BLAKE2B 745dc0dbe45088e4b084fcb112e15f0527ab3e106e2a8ff4436611ed2542fdf1544f8976ac776e3f12191d9eca851a24de47f976d433046e84657e98237baa1b SHA512 139c341e155cc5ddc65e9505f43073ac88ae29ba874474331d54c940e00203c15d5946ddc0998648866c6ea23d16101ba760c3e837843654273cd3ab95ddb5fe
 MISC metadata.xml 1444 BLAKE2B 39e3cd90d98350aa1c4d1ff96f3633db5084f181fa0b01c280d88b4dc87d425090f720c329543c42af9b92a03c27ca823e890190bbb92e5feb492fb69e7cf20d SHA512 76e5dfdfcd85ca4dbec0736b145cde370d692c805297fcf82636dd1dc3915690c895db5d4da319e1cf16c21ff27e5b9d40b11efac60386360fcb04e31fb39e50
diff --git a/media-libs/gd/gd-2.3.1.ebuild b/media-libs/gd/gd-2.3.1.ebuild
index 698406d51559..83f4d37508a5 100644
--- a/media-libs/gd/gd-2.3.1.ebuild
+++ b/media-libs/gd/gd-2.3.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index bbfbdb776e45..b9111419adc9 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,11 +1,8 @@
 AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773d4835f13d8ff0d271fe83ca5da93ad83da7f5e808b8be3858b6812b4e102d0086fcb55270157b6fd3a568882537d4ddf33d298 SHA512 efeb64b100e2e5d548fdcfe49be3ee5fe208e90b8655b16f0dcfe08821d1ea792501ad372d7ae0029552ffe762bb5408543e573f9d7977d238afb8f261f521f5
 AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417
-DIST gegl-0.4.24.tar.xz 4937056 BLAKE2B a6237d0642713e2dc6fb5aa889dea31aad688608b99e985d69dfa43580caae634a6fc41ff050372d8b364f2f002e260335159325c01f73a10719c3d1bda70d36 SHA512 09d857332eeabe39327d312b1a1692b7c6c9f8f952ae3e3cc06b5a5c262757d8b86467c25a4e66c90c37922fd3548fc1342a9864732d17924f97e7b6c6c1786d
 DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24
 DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
-EBUILD gegl-0.4.24.ebuild 4720 BLAKE2B 97078707051ed9d5b3430b47fbd3cae55fc2f9eb8487fd43211dd4d123955caab9bf9e01d498e1dcf9e6542f5070b4d102709ab83184cf8150dfa0a04150df73 SHA512 91e7d050fffa0aafa7e88887b2e066a8c7ea47ac53cdda09d8bdded941cf9af0f7d97898d8725cae657b5b9aa62cfa4ad33ba4942227f01a7f442482ab3f25c9
-EBUILD gegl-0.4.26-r1.ebuild 4922 BLAKE2B f97fa804b25824eec8b32f7fb358697632f9b3a0bd8c9baacec268e08191c9c85f2a687ae231e57eb5bc5705e1a308f065c29588c5e526226e65e52c93f8528d SHA512 a611cfa1df5fc10134f47922c68ed87e2a2d893cbefadfd36ca2136e3e9075a53214e2d85f28b05425a68dcaff849c36867ef2e2bc35292232d21b46ef9bee61
-EBUILD gegl-0.4.26.ebuild 4726 BLAKE2B 82cf61d3666802281ae89ded03daeb7cc6127f0befa7aa90fd7f2384b1c9632c8366070e3e34ef6ab3bf3cb3769d16db357d636d4f246b3d1a5f6ffb13c66dfd SHA512 ef63a5ba65046a4d818880030680a38c9b1458ad8a0f3d42900cacbf5ba42abde0a44ce1fac226a56385c05f2d44f1d63272a6f065c7fda6ce89d225aa649fce
+EBUILD gegl-0.4.26-r1.ebuild 4918 BLAKE2B fed1558637b7204e42276acce1686e082c30872da393ceb587fb65fa5799868e6a3e547fd053cdfdb4d03944e13e739f6e7d0f612b145a20275a94c851fa3330 SHA512 be8f2fc4138d83fe1d302ae195a31d5da438be83daad88c729bf1bdec28a31c8677a469143e1a8f59de8ad48a8032405c04396ff6b05f2b9e5a726232752c395
 EBUILD gegl-0.4.28.ebuild 4922 BLAKE2B d8ea7a1ca2ed1370330ec03d1cb8650ad45a7b7172322c567ec50aec302b453f434aecfc30bfe6242096d92d9eeaa6a53223c79b2fbe894840be8f3582026d5a SHA512 0d195fb4b3dc1b9d496a7701d26c7f508c3177eaa5ce9d180777b89bb99e1dea79289ef8deacd9cbb3de62c98b7e83b3b21068adbca7a228e1dca83008cbebf4
 EBUILD gegl-9999.ebuild 4334 BLAKE2B d83101880fbaac028f3cb680251c7888f3113ed98a2be7bae7eb24020c3954c61aec3d9603d9befc036ecf9ac9e9ddeb65c85a847aa6b7ccc831df043cdcc80e SHA512 8840e9585942ca50a96a181269878e174853bcf57818d4429d6117baba441fbc95b11bef262d74d974ec225b985acfcb63206ca5c439065ae6933b27b529bc3e
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-0.4.24.ebuild b/media-libs/gegl/gegl-0.4.24.ebuild
deleted file mode 100644
index dfd417839dda..000000000000
--- a/media-libs/gegl/gegl-0.4.24.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	test? ( introspection )
-	vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
-	media-libs/libnsgif
-	>=media-libs/libpng-1.6.0:0=
-	>=sys-libs/zlib-1.2.0
-	virtual/jpeg:0=
-	>=x11-libs/gdk-pixbuf-2.32:2
-	>=x11-libs/pango-1.38.0
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	pdf? ( >=app-text/poppler-0.71.0[cairo] )
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
-	vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
-	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
-)
-
-python_check_deps() {
-	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/meson.build || die
-
-	# fix skipping mipmap tests due to executable not found
-	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
-		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
-		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
-	done
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		#  - Disable documentation as the generating is bit automagic
-		#    if anyone wants to work on it just create bug with patch
-		-Ddocs=false
-		-Dexiv2=disabled
-		-Dgdk-pixbuf=enabled
-		-Dgexiv2=disabled
-		#  - There are two checks for dot, one controllable by --with(out)-graphviz
-		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-		-Dgraphviz=disabled
-		-Djasper=disabled
-		-Dlibjpeg=enabled
-		-Dlibpng=enabled
-		#  - libspiro: not in portage main tree
-		-Dlibspiro=disabled
-		-Dlua=disabled
-		-Dmrg=disabled
-		-Dpango=enabled
-		-Dsdl2=disabled
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_feature cairo)
-		$(meson_feature cairo pangocairo)
-		$(meson_feature ffmpeg libav)
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature openexr)
-		$(meson_feature pdf poppler)
-		$(meson_feature raw libraw)
-		$(meson_feature sdl sdl1)
-		$(meson_feature svg librsvg)
-		$(meson_feature test pygobject)
-		$(meson_feature tiff libtiff)
-		$(meson_feature umfpack)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
-		$(meson_feature vala vapigen)
-		$(meson_feature webp)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild
index a4238436f12a..5185fcb9f8e9 100644
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.26.ebuild b/media-libs/gegl/gegl-0.4.26.ebuild
deleted file mode 100644
index 36c57d00d57e..000000000000
--- a/media-libs/gegl/gegl-0.4.26.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
-REQUIRED_USE="
-	svg? ( cairo )
-	test? ( introspection )
-	vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
-	media-libs/libnsgif
-	>=media-libs/libpng-1.6.0:0=
-	>=sys-libs/zlib-1.2.0
-	virtual/jpeg:0=
-	>=x11-libs/gdk-pixbuf-2.32:2
-	>=x11-libs/pango-1.38.0
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	pdf? ( >=app-text/poppler-0.71.0[cairo] )
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
-	vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
-	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
-)
-
-python_check_deps() {
-	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/meson.build || die
-
-	# fix skipping mipmap tests due to executable not found
-	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
-		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
-		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
-	done
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		#  - Disable documentation as the generating is bit automagic
-		#    if anyone wants to work on it just create bug with patch
-		-Ddocs=false
-		-Dexiv2=disabled
-		-Dgdk-pixbuf=enabled
-		-Dgexiv2=disabled
-		#  - There are two checks for dot, one controllable by --with(out)-graphviz
-		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-		-Dgraphviz=disabled
-		-Djasper=disabled
-		-Dlibjpeg=enabled
-		-Dlibpng=enabled
-		#  - libspiro: not in portage main tree
-		-Dlibspiro=disabled
-		-Dlua=disabled
-		-Dmrg=disabled
-		-Dpango=enabled
-		-Dsdl2=disabled
-		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
-		-Dworkshop=false
-		$(meson_feature cairo)
-		$(meson_feature cairo pangocairo)
-		$(meson_feature ffmpeg libav)
-		$(meson_feature lcms)
-		$(meson_feature lensfun)
-		$(meson_feature openexr)
-		$(meson_feature pdf poppler)
-		$(meson_feature raw libraw)
-		$(meson_feature sdl sdl1)
-		$(meson_feature svg librsvg)
-		$(meson_feature test pygobject)
-		$(meson_feature tiff libtiff)
-		$(meson_feature umfpack)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(meson_feature v4l libv4l)
-		$(meson_feature v4l libv4l2)
-		$(meson_feature vala vapigen)
-		$(meson_feature webp)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index e04b5bbb9e39..3a75d3922ee8 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,3 +1,5 @@
 DIST glfw-3.3.2.tar.gz 759972 BLAKE2B a246681d580dd569a045b76db71c18f8dbfacb8483c2d825aa68094d655468d093c52ba3770b2b5d566de62149a775001f5acd7c7539a8235c43e3e9ab58df28 SHA512 f5af749d33b5b900ccf07988ad0bf51bd766a18e4cf2bc2a76020c88e98a2528ff1b965224184fe0d290cfe34b1af1e6f633600660d81194fe354078e2f35c56
+DIST glfw-3.3.3.tar.gz 763713 BLAKE2B bd6202877a3462d717a6d77b6381de704da854df011f7ab5172e626dc46df90793190284241b470a4b78e020302e5dca4051476e092e73e34731f6245a43ea14 SHA512 6d743d89d159bff6c4f7fa3fc5bc407fd728bdc432d76acc4897fd392580be272f8a9d1d7c375c4323e82bf2fd28310e5daab097fef33e8f43b69ce104f9bd31
 EBUILD glfw-3.3.2.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
+EBUILD glfw-3.3.3.ebuild 919 BLAKE2B c4e4a3053fe56de47352674c8ac7834b1e45935ed64fa72515e4692e274916d04abc4aaf99a7ca9aaf6ad0d431e71a9f108ea4e78d59ef970e07127dde66e001 SHA512 6923cfb6d28c261e2a0cdb99d330b9266a49a45f57779befd9c74cbd261a0877b0281ed5c72ddc802b707080e32db5ee8563bd4a690cef8b0226a0255e9d3b24
 MISC metadata.xml 327 BLAKE2B fd8eb3b2c083a3f02e52ae8290f0e1105847ff17cd052eb0211bd007cddf452f34009ad2eaee0809f90a633e60baf4cd2a47e2184d21f691a16219c409ebc907 SHA512 d9d3fe05c0a07b0e0ea3f49589117dc9e3d7859bb0207dcea3d95451858b040c27bba2eaf422b2dcdc6aa8e08b0147ff32d12fea93b648fd861df0e70960a650
diff --git a/media-libs/glfw/glfw-3.3.3.ebuild b/media-libs/glfw/glfw-3.3.3.ebuild
new file mode 100644
index 000000000000..ea8df33cd67c
--- /dev/null
+++ b/media-libs/glfw/glfw-3.3.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="The Portable OpenGL FrameWork"
+HOMEPAGE="https://www.glfw.org/"
+SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="wayland"
+
+RDEPEND="
+	x11-libs/libxkbcommon
+	!wayland? (
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+	)
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[egl,wayland]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	!wayland? ( x11-libs/libXi )
+	wayland? ( dev-libs/wayland-protocols )
+"
+BDEPEND="
+	wayland? ( kde-frameworks/extra-cmake-modules )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGLFW_BUILD_EXAMPLES=no
+		-DGLFW_USE_WAYLAND="$(usex wayland)"
+		-DBUILD_SHARED_LIBS=1
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 7d7cb37c4b47..028b25a4575b 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -7,6 +7,6 @@ DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d609
 DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B 41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a SHA512 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
 EBUILD glm-0.9.9.5.ebuild 888 BLAKE2B 8b24c2462309c9ee9447cb55e443f6b02971e62b038ba3147b33a66a3324c94f056acfd690c412cacaf009c21296ffe002ce1c84879dab029d3f48c3d6bfce65 SHA512 79bbe88e3487f1ea637272e74c4e81f0037c5249aead813e4ce3060adcfa3040efa2340a3fb3fa7a31fa6f8a0ae129e0b64bf8d1e5ef394d91b8fca614d830df
 EBUILD glm-0.9.9.7.ebuild 1211 BLAKE2B b567e64d07b301f9290e7ab533145497307185050b3ffea4de9fc8c27ba6c3d2f6eb3356d35b2aa1517aa1495cd2632de8afdbba0d157186246789841950f5f6 SHA512 c7ff576f73564277be087ac108e255699017ede17ead85ea50074b08bcacadf25f1bcdd6286f046893f3f4afc514ca03c7612462707cb170d8c982f409225a0a
-EBUILD glm-0.9.9.8-r1.ebuild 1421 BLAKE2B 1177ffedc90816dcad867b30ddfba2ea9027034a6b626728641b2015dfc695b8a06b2cde88eca33658e1736bef00326fa1105bbc03bdb505e6bfa9b68bf551a8 SHA512 90296879eb843e4cdd2dfc4f0e5c96086bff74cae0dc3f01dbac8b205c1738e7d639f5215652c4428d6a5b3fffbddfbfc93ddc8068f1ea8ab595933ec45f78be
+EBUILD glm-0.9.9.8-r1.ebuild 1420 BLAKE2B 717743d5396a3d7785eb51a13b07dd10a08fecbe56105dfe6a4d4adc96be35446789dc5d5014657ad06cc76da352ee7e77d75ef8e78389c9b68d1aca6f23bfdc SHA512 70156f2783e717c8799416a64bd9a494c3da1e18d1d1ff567800cea840fcae3f6593c342342356e84a18dce13b3e35be5237320ddf3d433a5fdaec0a66ef9e46
 EBUILD glm-0.9.9.8.ebuild 1229 BLAKE2B 137b4407d122ed1cabce0a0083216499fd4cad705fcc0f66bc14191b5abdac188b58746c9272f7ca316311547410d9f0eb297b437adf98f36b7a5d05d80d2d22 SHA512 3b103f7db0bd6df218109da65d17f1f323aaae481dea170ae6fc34e51aab7f802478abeba6bf5d40c848b02068f7217d4c0de5adae7667f78e98420e531b80df
 MISC metadata.xml 544 BLAKE2B 1b51ba07aff67e963ef1fc1e9e30d40352c7f04c7c3996db73a5877aa2cb9e7150fa52017ac3a5100f1bdbc400f0ec6a392ac4352531e5a8ff893ddfcc271325 SHA512 144dfba609da46e7b7757b9173bf06248efd764e4246564321cb8c60bb9504d99cf0da62ed3d2bdc78bcc81648353c9c507aca6defff9299e3f9f99b4c3fe902
diff --git a/media-libs/glm/glm-0.9.9.8-r1.ebuild b/media-libs/glm/glm-0.9.9.8-r1.ebuild
index 9f2a239e9940..477a13fcc988 100644
--- a/media-libs/glm/glm-0.9.9.8-r1.ebuild
+++ b/media-libs/glm/glm-0.9.9.8-r1.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 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 sparc 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/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 767eb589ddab..cde14cb51d71 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -7,6 +7,6 @@ DIST intel-gmmlib-20.4.1.tar.gz 732088 BLAKE2B 80873ee7a4b7428197352e77b82315068
 EBUILD gmmlib-20.2.2.ebuild 870 BLAKE2B cbcec1f9012ff1e89324231daf1a9e70840ef6f108d4048ffae04d33a8d399597ad85bba83e843b4c8a6a504e66a4eac2ed966976c3c588ceb97fbe0cd5ada86 SHA512 ed2200c4cec251bbf0903ef5af0e3141aac3ccd4dac77b3613b21f81346da2ebf101b9cc176a302586ea3fb8fc67f48103018854a3a59be66736a0cfe34acd78
 EBUILD gmmlib-20.2.5.ebuild 871 BLAKE2B 09e0697e955cca1ba573fbee7f47a6f0ac691fdc4e481343079d82702ea37b8f6040fc2a5786530d269a19fc9b7b40bbb8a85a701009ae13f8643420b347c210 SHA512 1414c4b738aad2d13dd78e45db2d5dff3e5dd9bbfa946991980e0df21bcdaa6d9b87e83530d5bd01b6a9d81ebb1df214ae3f9b26377e9740c022e73f08756817
 EBUILD gmmlib-20.3.2.ebuild 871 BLAKE2B 09e0697e955cca1ba573fbee7f47a6f0ac691fdc4e481343079d82702ea37b8f6040fc2a5786530d269a19fc9b7b40bbb8a85a701009ae13f8643420b347c210 SHA512 1414c4b738aad2d13dd78e45db2d5dff3e5dd9bbfa946991980e0df21bcdaa6d9b87e83530d5bd01b6a9d81ebb1df214ae3f9b26377e9740c022e73f08756817
-EBUILD gmmlib-20.4.1.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
+EBUILD gmmlib-20.4.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5
 EBUILD gmmlib-9999.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
 MISC metadata.xml 490 BLAKE2B 306c3fddcc4a5569f5bd040f7cfb545b78a052d6786b54fa0751cf980b753d9097b09b2a03c0c9d11be40c0dab7dde2a92d1c1bbeb3775e1e77dec847230a93d SHA512 30cbe0310e14e2ebd354ece2d7b710db50ee9cbb7d697370f5bda57b2b823f9d93a6e3c07844c3f8d90b91fabf9236ac450c9fbaa5aca5438ef0d4d5feaaac0b
diff --git a/media-libs/gmmlib/gmmlib-20.4.1.ebuild b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
index 4e796e2186d3..daef825f99e2 100644
--- a/media-libs/gmmlib/gmmlib-20.4.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 44d619d6deb9..1c0799371155 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,9 +1,3 @@
-AUX gst-plugins-bad-1.14.5-make43.patch 7736 BLAKE2B b0b1b85e7bce7b267c382bd853b8edbe4b8b3e1e2aed52cba06aa5dbe954c050f21b8d1a47410b18071bb94b1a5c5121b7256557de42f2acd4196c9f8c25efbc SHA512 dff8b0e71ca151c81505e2a27f16ca998a56b2752457ad870d0bfdf610ad463575d29925141890922f588be9fbb3e8bdda7020d87732e30c9101782d6d5fa472
-AUX gst-plugins-bad-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a337eb326e47b9b16fce36938ccfea0b1dbea09213190899843bda338063cfe38589b9badc2676826bcb463cb1c1d90f5dbc19f9 SHA512 ccfd579039d2696e268f7b6fa17930383a765ad472f1e6b5ccc90ee26cbaf9006b584aad3009d8a7882ebbf1533533ae001b4335c781decb0ac93591056c8c30
-DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
-DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
-EBUILD gst-plugins-bad-1.14.5.ebuild 2681 BLAKE2B bc85aecf70149241ab47bf8fe6dc2f4a172feac1a445d713f7dd8a948efd0e2ab1c216c972e744c16f058aaa70b5c6641b49ccc8a2e598462dfeec57a31be9b5 SHA512 b4cbdeea64bbb9f86eace388008b5102a32e1101629a5dac7cd049dbb2c6adf021b91becc4ae6abed9ca6e58b7d66e3f11c94ff4780cc8e836034da552f3b9c0
-EBUILD gst-plugins-bad-1.16.2.ebuild 2303 BLAKE2B d2a38f50c1ee5806ffb1be74b1ce92e532521624457b69284b334ba728cb3b4c97180e07bb69620f413a635cd52c78d8ae7fd9a3fa028eb7b68a25396e032b67 SHA512 c5e7d28c33f5b146aaa979999c4c2b2e4b827977d0f342f7bc5b4a7350c459020efdbbcdaf2791aa4303b1ed67a500db639f1c08a4eb423615639a3c6633293c
-EBUILD gst-plugins-bad-1.16.3.ebuild 2206 BLAKE2B bcc5873674924143be5cce2d9e50dabea919f53a7ea2bb518d1f218cd3cb0500886fd62dad170e65c48c75d598038e50d35eeb8c73dcd1ceef2a3a4a57a2f338 SHA512 b9c8f1863c3a3e71f35013689cb0ec5bacda0ed1b66207eab8428e1d4a447551a402c4652d6a77bf2c7bf0fea259a6f1aa3b23adb839992bb9d51eb66e71b0ed
-MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
+EBUILD gst-plugins-bad-1.16.3.ebuild 2204 BLAKE2B 4997f2c2c124f632229b3dbe185f553b53be5419d00479d4b9c712bade33bc4558800c9e64648e603cb007f2fc6bf9c67f25cc8215e66e65e32e579c373c2eed SHA512 a508b1e0d2521cbc35ddeeef9fee6a46d89d9c9670a8037875573cd34492acd2a222bd95d09e78dfd4996c977e81ec71ba382f6c68578d7e6dbb15d95653255a
+MISC metadata.xml 345 BLAKE2B 2350705c0853758df34ef4e9217585b367adfa6f7a166e884c3e40a10cb2917b6c10dcc4438f41cd404337f70a9438114cfe7f301848637dddff626d8c25449e SHA512 26921a7928b3d70098a9f9d36c3f211a6e96df6ca42473ba98e083a52b2f9ab00a71336c0298751b9b46198f2277dada4db8097c0a4b09850e5ecd1a15db5436
diff --git a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.14.5-make43.patch b/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.14.5-make43.patch
deleted file mode 100644
index 37d72b9f7e84..000000000000
--- a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.14.5-make43.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,14 +1,16 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
---- a/ext/srt/Makefile.in
-+++ b/ext/srt/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -795,7 +797,7 @@
- 	gstsrtserversink.h \
- 	$(NULL)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
---- a/ext/srtp/Makefile.in
-+++ b/ext/srtp/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- VPATH = @srcdir@
- am__is_gnu_make = { \
-@@ -775,7 +777,7 @@
- BUILT_SOURCES = gstsrtp-enumtypes.c gstsrtp-enumtypes.h
- nodist_libgstsrtp_la_SOURCES = $(BUILT_SOURCES)
- CLEANFILES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
---- a/ext/webrtc/Makefile.in
-+++ b/ext/webrtc/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -797,7 +799,7 @@
- 
- libgstwebrtc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- libgstwebrtc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
---- a/gst-libs/gst/interfaces/Makefile.in
-+++ b/gst-libs/gst/interfaces/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -773,7 +775,7 @@
- glib_gen_prefix = gst_photography
- glib_gen_basename = photography
- glib_gen_decl_banner = GST_PHOTOGRAPHY_API
--glib_gen_decl_include = \#include <gst/interfaces/photography-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/interfaces/photography-prelude.h>
- built_sources = \
- 	photography-enumtypes.c
- 
-@@ -805,7 +807,7 @@
- 	$(built_headers)
- 
- CLEANFILES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
---- a/gst-libs/gst/mpegts/Makefile.in
-+++ b/gst-libs/gst/mpegts/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -821,7 +823,7 @@
- glib_gen_prefix = gst_mpegts
- glib_gen_basename = gstmpegts
- glib_gen_decl_banner = GST_MPEGTS_API
--glib_gen_decl_include = \#include <gst/mpegts/mpegts-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/mpegts/mpegts-prelude.h>
- BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h
- nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c
- CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
-@@ -841,7 +843,7 @@
- @HAVE_INTROSPECTION_TRUE@gir_DATA = $(BUILT_GIRSOURCES)
- @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/
- @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
---- a/gst-libs/gst/webrtc/Makefile.in
-+++ b/gst-libs/gst/webrtc/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -761,7 +763,7 @@
- glib_gen_prefix = gst_webrtc
- glib_gen_basename = webrtc
- glib_gen_decl_banner = GST_WEBRTC_API
--glib_gen_decl_include = \#include <gst/webrtc/webrtc_fwd.h>
-+glib_gen_decl_include = $(H)include <gst/webrtc/webrtc_fwd.h>
- built_sources = webrtc-enumtypes.c
- built_headers = webrtc-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
-@@ -806,7 +808,7 @@
- 	$(GST_ALL_LDFLAGS) \
- 	$(GST_LT_LDFLAGS)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstWebRTC-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@include_HEADERS))
- @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@_la_SOURCES)) $(BUILT_SOURCES)
diff --git a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.16.2-make43.patch b/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.16.2-make43.patch
deleted file mode 100644
index f5caac7872d1..000000000000
--- a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.16.2-make43.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff --git a/common/glib-gen.mak b/common/glib-gen.mak
-index ef93a5f..cc02239 100644
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
-diff --git a/common/gst-glib-gen.mak b/common/gst-glib-gen.mak
-index 76b2233..5f2b1ed 100644
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,6 +1,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -8,7 +10,7 @@
- #glib_gen_decl_banner=GST_EXPORT
- #glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
-diff --git a/ext/srt/Makefile.in b/ext/srt/Makefile.in
-index 09109c3..e5f2a9d 100644
---- a/ext/srt/Makefile.in
-+++ b/ext/srt/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -794,7 +796,7 @@ noinst_HEADERS = \
- 	gstsrtsrc.h \
- 	$(NULL)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff --git a/ext/srtp/Makefile.in b/ext/srtp/Makefile.in
-index 758db8e..017c075 100644
---- a/ext/srtp/Makefile.in
-+++ b/ext/srtp/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -775,7 +777,7 @@ glib_gen_basename = gstsrtp
- BUILT_SOURCES = gstsrtp-enumtypes.c gstsrtp-enumtypes.h
- nodist_libgstsrtp_la_SOURCES = $(BUILT_SOURCES)
- CLEANFILES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff --git a/ext/webrtc/Makefile.in b/ext/webrtc/Makefile.in
-index da8fd9a..ec3588f 100644
---- a/ext/webrtc/Makefile.in
-+++ b/ext/webrtc/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -805,7 +807,7 @@ libgstwebrtc_la_LIBADD = \
- 
- libgstwebrtc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- libgstwebrtc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
-diff --git a/gst-libs/gst/interfaces/Makefile.in b/gst-libs/gst/interfaces/Makefile.in
-index ca1bde5..9d54c2e 100644
---- a/gst-libs/gst/interfaces/Makefile.in
-+++ b/gst-libs/gst/interfaces/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -773,7 +775,7 @@ glib_enum_define = GST_PHOTOGRAPHY
- glib_gen_prefix = gst_photography
- glib_gen_basename = photography
- glib_gen_decl_banner = GST_PHOTOGRAPHY_API
--glib_gen_decl_include = \#include <gst/interfaces/photography-prelude.h>
-+glib_gen_decl_include = ${H}include <gst/interfaces/photography-prelude.h>
- built_sources = \
- 	photography-enumtypes.c
- 
-@@ -806,7 +808,7 @@ BUILT_SOURCES = \
- 	$(built_headers)
- 
- CLEANFILES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff --git a/gst-libs/gst/mpegts/Makefile.in b/gst-libs/gst/mpegts/Makefile.in
-index 7a145cb..91a81cc 100644
---- a/gst-libs/gst/mpegts/Makefile.in
-+++ b/gst-libs/gst/mpegts/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -822,7 +824,7 @@ glib_enum_define = GST_MPEGTS
- glib_gen_prefix = gst_mpegts
- glib_gen_basename = gstmpegts
- glib_gen_decl_banner = GST_MPEGTS_API
--glib_gen_decl_include = \#include <gst/mpegts/mpegts-prelude.h>
-+glib_gen_decl_include = ${H}include <gst/mpegts/mpegts-prelude.h>
- BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h
- nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c
- CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
-@@ -842,7 +844,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
- @HAVE_INTROSPECTION_TRUE@gir_DATA = $(BUILT_GIRSOURCES)
- @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/
- @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff --git a/gst-libs/gst/webrtc/Makefile.in b/gst-libs/gst/webrtc/Makefile.in
-index 04146bc..1d0db28 100644
---- a/gst-libs/gst/webrtc/Makefile.in
-+++ b/gst-libs/gst/webrtc/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -761,7 +763,7 @@ glib_enum_define = GST_WEBRTC
- glib_gen_prefix = gst_webrtc
- glib_gen_basename = webrtc
- glib_gen_decl_banner = GST_WEBRTC_API
--glib_gen_decl_include = \#include <gst/webrtc/webrtc_fwd.h>
-+glib_gen_decl_include = ${H}include <gst/webrtc/webrtc_fwd.h>
- built_sources = webrtc-enumtypes.c
- built_headers = webrtc-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
-@@ -807,7 +809,7 @@ libgstwebrtc_@GST_API_VERSION@_la_LDFLAGS = \
- 	$(GST_ALL_LDFLAGS) \
- 	$(GST_LT_LDFLAGS)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstWebRTC-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@include_HEADERS))
- @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@_la_SOURCES)) $(BUILT_SOURCES)
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
deleted file mode 100644
index ceb2433d5d84..000000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit flag-o-matic gstreamer virtualx
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-# TODO: egl and gtk IUSE only for transition
-IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
-
-# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
-# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
-	wayland? (
-		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.4
-	)
-
-	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
-)
-
-src_prepare() {
-	default
-	addpredict /dev # Prevent sandbox violations bug #570624
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use opengl || use gles2; then
-		myconf+=( --enable-gl )
-	else
-		myconf+=( --disable-gl )
-	fi
-
-	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
-	gstreamer_multilib_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable orc) \
-		$(use_enable vcd) \
-		$(use_enable vnc librfb) \
-		$(use_enable wayland) \
-		--disable-examples \
-		--disable-debug \
-		--without-player-tests \
-		--enable-shm \
-		--enable-ipcpipeline \
-		"${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DISPLAY
-	# Tests are slower than upstream expects
-	virtx emake check CK_DEFAULT_TIMEOUT=300
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
deleted file mode 100644
index 4e59e10b3ade..000000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit flag-o-matic gstreamer virtualx
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="X bzip2 +introspection +orc vnc wayland"
-
-# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
-	wayland? (
-		>=dev-libs/wayland-1.11.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.15
-	)
-
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
-)
-
-src_prepare() {
-	default
-	addpredict /dev # Prevent sandbox violations bug #570624
-}
-
-multilib_src_configure() {
-	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
-	gstreamer_multilib_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable orc) \
-		$(use_enable vnc librfb) \
-		$(use_enable wayland) \
-		--disable-examples \
-		--disable-debug \
-		--without-player-tests \
-		--enable-shm \
-		--enable-ipcpipeline \
-		--disable-gl # eclass probably does this too, but be explicit as it used to be handled in ebuild here; all parts now in gst-plugins-base instead
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DISPLAY
-	# Tests are slower than upstream expects
-	virtx emake check CK_DEFAULT_TIMEOUT=300
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
index faecf4215dad..db635b8782a6 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="X bzip2 +introspection +orc vnc wayland"
 
diff --git a/media-libs/gst-plugins-bad/metadata.xml b/media-libs/gst-plugins-bad/metadata.xml
index c51baf610a15..ad9bf185482b 100644
--- a/media-libs/gst-plugins-bad/metadata.xml
+++ b/media-libs/gst-plugins-bad/metadata.xml
@@ -7,7 +7,5 @@
 	</maintainer>
 	<use>
 		<flag name="bzip2">Enable bzip2 encoder/decoder plugin</flag>
-		<flag name="egl">Enable EGL support</flag>
-		<flag name="gles2">Enable GLES2 support</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 418051b57fda..a0a1f01b07d0 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,10 +1,3 @@
-AUX gst-plugins-base-1.14.5-make43.patch 10992 BLAKE2B 19db9e3d90100863262f2fc632591a0662a79ea118cef8f0c757c62c64bd0f0b3c443c0284b9901404eac96b5b2d0911313f1fc6fdcc247b3eaf6c80167712ff SHA512 d91c9d9677ec820174ea16ebf1aeaccad6db6f3c2caf90ca63a55be3cc7e5dafc1f717ddd9f43089bb4c80bfc1cf93483efab356425aebfcf904e00550591cb2
-AUX gst-plugins-base-1.16.2-make43.patch 12403 BLAKE2B e99167bbb792c5815e8bb726559b63734fcc7489dbde65ab4de48ff17c069b8295059f002d130d5a970461e7333a2bbbd4ac3e20c2a4809e7282b5a13a981964 SHA512 9d65537814310059f21afe43390c858d52d9390b54b6de590b3fd3541e333a7954f9aa9c44a91bcd01b6232dd01f0711c8a19462f9a2cbff82851b4366871502
-DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
-DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
 DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
-EBUILD gst-plugins-base-1.14.5-r1.ebuild 6025 BLAKE2B 0b7698e494efef8651973fb3ad48af145c9d7c94afa9964aa5598beacbd64d4e85147caa3b2d89d34925851bcdb3a6558f7e515fd3430c6bc35cf6a82b9adb46 SHA512 e19f197d53cc5758645db08e32e336004433270f897f8253200eac634480ea41ccfe162b625e27a0722e005e35ea05bf6fe9943ab9317803d91de21f6f225bb6
-EBUILD gst-plugins-base-1.14.5.ebuild 5939 BLAKE2B ee15054730e0119af1d6b0203f5b6e0f479bfa5f01be60f2956c0431ba26692a4814c723b33b049e6d692ddeb29505889f52d5eb1003739fa1a0e907d8a1c1bf SHA512 b7c4d12d8c029a184711e54d7eeee23e6427d79d36f18dbf5f15a8b26dbe078a057a312930b708684808f31b1a519d57a94939f602754ffe012c2730fb4fd95a
-EBUILD gst-plugins-base-1.16.2.ebuild 6046 BLAKE2B 1925848df988f12d58b5da0963744b5304654fa88acd78c84fd2d7a5da6c4300e368e91753e095cba4acfca0bad97a7355af87a22a148c6a4f081d55cc06d9c2 SHA512 7cf8736921c8ea16058fa84c796ab8182ddb60e90c01851cea41cc5d33de0bdd31d142192536a0925287a33a625cff7e856aeb835d391e798e5cf78646c0c6bb
-EBUILD gst-plugins-base-1.16.3.ebuild 5949 BLAKE2B 292ae91fc3691c69506cb9198b8f14e868b975d28f60ad6653a706cbc53f80bcd4e90430a717417c89b84c87fbcf36a1e55e3a06a1512f7fb4a0934a1b982bd1 SHA512 7efff63bdf5dc907756785d14a22066f0582a56736dad8d22eb84bd6fa12e758679c446bfec1312354629e3dd94bf5aa4ab28bce28596ef6808d7b3570de7616
+EBUILD gst-plugins-base-1.16.3.ebuild 5947 BLAKE2B 1bf307a244a86a2a2a5b6d4111aa27fcba696e56641840ea9397b428591f7c074d2c0f040fcf2ef28b14e88ad0dbebcfe8d444626e51643b0eb5806b9c27b808 SHA512 4107099a70c8a65a611ec9345caeca037d37405c812a53b483c31f8af2803fb765e3e460dcd18a39bf0cebbf2d1e34a19677f4e390d481259ee11ace0dc3fa79
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.14.5-make43.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.14.5-make43.patch
deleted file mode 100644
index 04b2924376b7..000000000000
--- a/media-libs/gst-plugins-base/files/gst-plugins-base-1.14.5-make43.patch
+++ /dev/null
@@ -1,312 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,14 +1,16 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
---- a/gst/encoding/Makefile.in
-+++ b/gst/encoding/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -638,7 +640,7 @@
- 	gstsmartencoder.h	\
- 	gststreamcombinerpad.h
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
---- a/gst-libs/gst/app/Makefile.in
-+++ b/gst-libs/gst/app/Makefile.in
-@@ -17,13 +17,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -618,12 +620,12 @@
- glib_gen_prefix = __gst_app
- glib_gen_basename = app
- glib_gen_decl_banner = GST_APP_API
--glib_gen_decl_include = \#include <gst/app/app-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/app/app-prelude.h>
- glib_enum_headers = gstappsrc.h
- built_sources = app-enumtypes.c
- built_headers = app-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c
- nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
- libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
---- a/gst-libs/gst/audio/Makefile.in
-+++ b/gst-libs/gst/audio/Makefile.in
-@@ -39,13 +39,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -784,7 +786,7 @@
- glib_gen_prefix = gst_audio
- glib_gen_basename = audio
- glib_gen_decl_banner = GST_AUDIO_API
--glib_gen_decl_include = \#include <gst/audio/audio-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/audio/audio-prelude.h>
- built_sources = audio-enumtypes.c
- built_headers = audio-enumtypes.h
- lib_LTLIBRARIES = \
-@@ -895,7 +897,7 @@
- @HAVE_X86_TRUE@	$(GST_LIB_LDFLAGS) \
- @HAVE_X86_TRUE@	$(GST_ALL_LDFLAGS)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # Introspection
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir
---- a/gst-libs/gst/pbutils/Makefile.in
-+++ b/gst-libs/gst/pbutils/Makefile.in
-@@ -17,13 +17,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -664,6 +666,7 @@
- 	gstdiscoverer.h \
- 	gstaudiovisualizer.h
- 
-+H := \#
- 
- # variables used for enum/marshal generation
- glib_enum_headers = $(headers_pbutils)
-@@ -671,7 +674,7 @@
- glib_gen_prefix = pbutils
- glib_gen_basename = pbutils
- glib_gen_decl_banner = GST_PBUTILS_API
--glib_gen_decl_include = \#include <gst/pbutils/pbutils-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/pbutils/pbutils-prelude.h>
- built_headers_configure = \
- 	gstpluginsbaseversion.h
- 
-@@ -719,7 +722,7 @@
- 
- # DISTCLEANFILES is for files generated by configure
- DISTCLEANFILES = $(built_headers_configure)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \
---- a/gst-libs/gst/rtp/Makefile.in
-+++ b/gst-libs/gst/rtp/Makefile.in
-@@ -17,13 +17,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -675,8 +677,8 @@
- glib_enum_headers = $(libgstrtpinclude_HEADERS)
- glib_gen_basename = gstrtp
- glib_gen_decl_banner = GST_RTP_API
--glib_gen_decl_include = \#include <gst/rtp/rtp-prelude.h>
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+glib_gen_decl_include = $(H)include <gst/rtp/rtp-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstrtpinclude_HEADERS)) \
---- a/gst-libs/gst/rtsp/Makefile.in
-+++ b/gst-libs/gst/rtsp/Makefile.in
-@@ -17,13 +17,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -679,8 +681,8 @@
- glib_enum_headers = $(libgstrtspinclude_HEADERS)
- glib_gen_basename = gstrtsp
- glib_gen_decl_banner = GST_RTSP_API
--glib_gen_decl_include = \#include <gst/rtsp/rtsp-prelude.h>
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+glib_gen_decl_include = $(H)include <gst/rtsp/rtsp-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstrtspinclude_HEADERS)) \
---- a/gst-libs/gst/tag/Makefile.in
-+++ b/gst-libs/gst/tag/Makefile.in
-@@ -17,13 +17,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -680,12 +682,12 @@
- glib_gen_prefix = gst_tag
- glib_gen_basename = tag
- glib_gen_decl_banner = GST_TAG_API
--glib_gen_decl_include = \#include <gst/tag/tag-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/tag/tag-prelude.h>
- glib_enum_headers = tag.h gsttagdemux.h
- built_sources = tag-enumtypes.c
- built_headers = tag-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgsttaginclude_HEADERS = \
- 	tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h
- 
---- a/gst-libs/gst/video/Makefile.in
-+++ b/gst-libs/gst/video/Makefile.in
-@@ -39,13 +39,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -740,7 +742,7 @@
- glib_gen_prefix = gst_video
- glib_gen_basename = video
- glib_gen_decl_banner = GST_VIDEO_API
--glib_gen_decl_include = \#include <gst/video/video-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/video/video-prelude.h>
- built_sources = video-enumtypes.c
- built_headers = video-enumtypes.h
- lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
-@@ -821,7 +823,7 @@
- 
- libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
- libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstvideo_@GST_API_VERSION@include_HEADERS)) \
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch
deleted file mode 100644
index f8121962918a..000000000000
--- a/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch
+++ /dev/null
@@ -1,347 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,14 +1,16 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
---- a/gst/encoding/Makefile.in
-+++ b/gst/encoding/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -638,7 +640,7 @@
- 	gstsmartencoder.h	\
- 	gststreamcombinerpad.h
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
---- a/gst-libs/gst/app/Makefile.in
-+++ b/gst-libs/gst/app/Makefile.in
-@@ -17,13 +17,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -618,12 +620,12 @@
- glib_gen_prefix = __gst_app
- glib_gen_basename = app
- glib_gen_decl_banner = GST_APP_API
--glib_gen_decl_include = \#include <gst/app/app-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/app/app-prelude.h>
- glib_enum_headers = gstappsrc.h
- built_sources = app-enumtypes.c
- built_headers = app-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c
- nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
- libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
---- a/gst-libs/gst/audio/Makefile.in
-+++ b/gst-libs/gst/audio/Makefile.in
-@@ -39,13 +39,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -784,7 +786,7 @@
- glib_gen_prefix = gst_audio
- glib_gen_basename = audio
- glib_gen_decl_banner = GST_AUDIO_API
--glib_gen_decl_include = \#include <gst/audio/audio-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/audio/audio-prelude.h>
- built_sources = audio-enumtypes.c
- built_headers = audio-enumtypes.h
- lib_LTLIBRARIES = \
-@@ -895,7 +897,7 @@
- @HAVE_X86_TRUE@	$(GST_LIB_LDFLAGS) \
- @HAVE_X86_TRUE@	$(GST_ALL_LDFLAGS)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # Introspection
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir
---- a/gst-libs/gst/pbutils/Makefile.in
-+++ b/gst-libs/gst/pbutils/Makefile.in
-@@ -17,13 +17,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -664,6 +666,7 @@
- 	gstdiscoverer.h \
- 	gstaudiovisualizer.h
- 
-+H := \#
- 
- # variables used for enum/marshal generation
- glib_enum_headers = $(headers_pbutils)
-@@ -671,7 +674,7 @@
- glib_gen_prefix = pbutils
- glib_gen_basename = pbutils
- glib_gen_decl_banner = GST_PBUTILS_API
--glib_gen_decl_include = \#include <gst/pbutils/pbutils-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/pbutils/pbutils-prelude.h>
- built_headers_configure = \
- 	gstpluginsbaseversion.h
- 
-@@ -719,7 +722,7 @@
- 
- # DISTCLEANFILES is for files generated by configure
- DISTCLEANFILES = $(built_headers_configure)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \
---- a/gst-libs/gst/rtp/Makefile.in
-+++ b/gst-libs/gst/rtp/Makefile.in
-@@ -17,13 +17,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -675,8 +677,8 @@
- glib_enum_headers = $(libgstrtpinclude_HEADERS)
- glib_gen_basename = gstrtp
- glib_gen_decl_banner = GST_RTP_API
--glib_gen_decl_include = \#include <gst/rtp/rtp-prelude.h>
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+glib_gen_decl_include = $(H)include <gst/rtp/rtp-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstrtpinclude_HEADERS)) \
---- a/gst-libs/gst/rtsp/Makefile.in
-+++ b/gst-libs/gst/rtsp/Makefile.in
-@@ -17,13 +17,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -679,8 +681,8 @@
- glib_enum_headers = $(libgstrtspinclude_HEADERS)
- glib_gen_basename = gstrtsp
- glib_gen_decl_banner = GST_RTSP_API
--glib_gen_decl_include = \#include <gst/rtsp/rtsp-prelude.h>
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+glib_gen_decl_include = $(H)include <gst/rtsp/rtsp-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstrtspinclude_HEADERS)) \
---- a/gst-libs/gst/tag/Makefile.in
-+++ b/gst-libs/gst/tag/Makefile.in
-@@ -17,13 +17,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -680,12 +682,12 @@
- glib_gen_prefix = gst_tag
- glib_gen_basename = tag
- glib_gen_decl_banner = GST_TAG_API
--glib_gen_decl_include = \#include <gst/tag/tag-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/tag/tag-prelude.h>
- glib_enum_headers = tag.h gsttagdemux.h
- built_sources = tag-enumtypes.c
- built_headers = tag-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgsttaginclude_HEADERS = \
- 	tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h
- 
---- a/gst-libs/gst/video/Makefile.in
-+++ b/gst-libs/gst/video/Makefile.in
-@@ -39,13 +39,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -740,7 +742,7 @@
- glib_gen_prefix = gst_video
- glib_gen_basename = video
- glib_gen_decl_banner = GST_VIDEO_API
--glib_gen_decl_include = \#include <gst/video/video-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/video/video-prelude.h>
- built_sources = video-enumtypes.c
- built_headers = video-enumtypes.h
- lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
-@@ -821,7 +823,7 @@
- 
- libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
- libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstvideo_@GST_API_VERSION@include_HEADERS)) \
---- a/gst-libs/gst/gl/Makefile.in
-+++ b/gst-libs/gst/gl/Makefile.in
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=${H}include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -863,14 +865,14 @@ glib_enum_define = GST_GL
- glib_gen_prefix = gst_gl
- glib_gen_basename = gl
- glib_gen_decl_banner = GST_GL_API
--glib_gen_decl_include = \#include <gst/gl/gl-prelude.h>
-+glib_gen_decl_include = ${H}include <gst/gl/gl-prelude.h>
- built_sources = gl-enumtypes.c
- built_headers = gl-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
- CLEANFILES = $(BUILT_SOURCES) $(am__append_27)
- nodist_libgstgl_@GST_API_VERSION@include_HEADERS = $(built_headers)
- nodist_libgstgl_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstGL-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(gstgl_gir_headers)) $(patsubst \
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
deleted file mode 100644
index 94060e0598b0..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-
-# For OpenGL we have three separate concepts, with a list of possibilities in each:
-#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
-#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
-#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
-# With the following limitations:
-#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
-#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
-#  * glx platform requires opengl API
-#  * wayland, gbm and most other non-glx WSIs require egl platform
-# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
-#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
-#  and libpng/jpeg are required for gloverlay element;
-
-# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
-IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
-GL_REQUIRED_USE="
-	|| ( gbm wayland X )
-	wayland? ( egl )
-	gbm? ( egl )
-"
-REQUIRED_USE="
-	ivorbis? ( ogg )
-	theora? ( ogg )
-	vorbis? ( ogg )
-	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
-	gles2? ( egl ${GL_REQUIRED_USE} )
-"
-
-# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
-# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
-GL_DEPS="
-	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
-	egl? (
-		x11-libs/libdrm
-	)
-	gbm? (
-		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-	)
-
-	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
-	media-libs/libpng:0[${MULTILIB_USEDEP}]
-	virtual/jpeg:0[${MULTILIB_USEDEP}]
-" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
-	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-
-	!<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
-)
-
-src_prepare() {
-	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
-	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
-	default
-}
-
-multilib_src_configure() {
-	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
-
-	local myconf=()
-	# FIXME: Automagic gbm and x11 wsi
-	if use opengl || use gles2; then
-		myconf+=(
-			--enable-gl
-			$(use_enable egl)
-			$(use_enable gles2)
-			$(use_enable opengl)
-			$(use_enable wayland)
-			$(use_enable X x11)
-		)
-	else
-		myconf+=(
-			--disable-gl
-			--disable-egl
-			--disable-gles2
-			--disable-opengl
-			--disable-wayland
-			--disable-x11
-		)
-	fi
-
-	if use opengl && use X; then
-		# GLX requires desktop OpenGL and X
-		myconf+=( --enable-glx )
-	else
-		myconf+=( --disable-glx )
-	fi
-
-	myconf+=(
-		--disable-cocoa
-		--disable-dispmanx
-		--disable-wgl
-	)
-
-	gstreamer_multilib_src_configure \
-		$(use_enable alsa) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable ivorbis) \
-		$(use_enable ogg) \
-		$(use_enable orc) \
-		$(use_enable pango) \
-		$(use_enable theora) \
-		$(use_enable vorbis) \
-		$(use_enable X x) \
-		$(use_enable X xshm) \
-		$(use_enable X xvideo) \
-		--enable-iso-codes \
-		--enable-zlib \
-		--disable-debug \
-		--disable-examples \
-		--disable-static \
-		"${myconf[@]}"
-
-	# bug #366931, flag-o-matic for the whole thing is overkill
-	if [[ ${CHOST} == *86-*-darwin* ]] ; then
-		sed -i \
-			-e '/FLAGS = /s|-O[23]|-O1|g' \
-			gst/audioconvert/Makefile \
-			gst/volume/Makefile || die
-	fi
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
-	unset GSETTINGS_BACKEND
-	emake check
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
deleted file mode 100644
index 8b1ba0f14416..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-# For OpenGL we have three separate concepts, with a list of possibilities in each:
-#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
-#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
-#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
-# With the following limitations:
-#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
-#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
-#  * glx platform requires opengl API
-#  * wayland, gbm and most other non-glx WSIs require egl platform
-# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
-#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
-#  and libpng/jpeg are required for gloverlay element;
-
-# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
-IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
-GL_REQUIRED_USE="
-	|| ( gbm wayland X )
-	wayland? ( egl )
-	gbm? ( egl )
-"
-REQUIRED_USE="
-	ivorbis? ( ogg )
-	theora? ( ogg )
-	vorbis? ( ogg )
-	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
-	gles2? ( egl ${GL_REQUIRED_USE} )
-"
-
-# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
-# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
-GL_DEPS="
-	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
-	egl? (
-		x11-libs/libdrm
-	)
-	gbm? (
-		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-	)
-
-	media-libs/libpng:0[${MULTILIB_USEDEP}]
-	virtual/jpeg:0[${MULTILIB_USEDEP}]
-" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
-# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
-	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-
-	!<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	X? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
-	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
-	default
-}
-
-multilib_src_configure() {
-	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
-
-	local myconf=()
-	# FIXME: Automagic gbm and x11 wsi
-	if use opengl || use gles2; then
-		myconf+=(
-			--enable-gl
-			$(use_enable egl)
-			$(use_enable gles2)
-			$(use_enable opengl)
-			$(use_enable wayland)
-			$(use_enable X x11)
-		)
-	else
-		myconf+=(
-			--disable-gl
-			--disable-egl
-			--disable-gles2
-			--disable-opengl
-			--disable-wayland
-			--disable-x11
-		)
-	fi
-
-	if use opengl && use X; then
-		# GLX requires desktop OpenGL and X
-		myconf+=( --enable-glx )
-	else
-		myconf+=( --disable-glx )
-	fi
-
-	myconf+=(
-		--disable-cocoa
-		--disable-dispmanx
-		--disable-wgl
-	)
-
-	gstreamer_multilib_src_configure \
-		$(use_enable alsa) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable ivorbis) \
-		$(use_enable ogg) \
-		$(use_enable orc) \
-		$(use_enable pango) \
-		$(use_enable theora) \
-		$(use_enable vorbis) \
-		$(use_enable X x) \
-		$(use_enable X xshm) \
-		$(use_enable X xvideo) \
-		--enable-iso-codes \
-		--enable-zlib \
-		--disable-debug \
-		--disable-examples \
-		--disable-static \
-		"${myconf[@]}"
-
-	# bug #366931, flag-o-matic for the whole thing is overkill
-	if [[ ${CHOST} == *86-*-darwin* ]] ; then
-		sed -i \
-			-e '/FLAGS = /s|-O[23]|-O1|g' \
-			gst/audioconvert/Makefile \
-			gst/volume/Makefile || die
-	fi
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
-	unset GSETTINGS_BACKEND
-	emake check
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
deleted file mode 100644
index 6aeb1095638c..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-
-# For OpenGL we have three separate concepts, with a list of possibilities in each:
-#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
-#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
-#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
-# With the following limitations:
-#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
-#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
-#  * glx platform requires opengl API
-#  * wayland, gbm and most other non-glx WSIs require egl platform
-# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
-#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
-#  and libpng/jpeg are required for gloverlay element;
-
-# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
-IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
-GL_REQUIRED_USE="
-	|| ( gbm wayland X )
-	wayland? ( egl )
-	gbm? ( egl )
-"
-REQUIRED_USE="
-	ivorbis? ( ogg )
-	theora? ( ogg )
-	vorbis? ( ogg )
-	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
-	gles2? ( egl ${GL_REQUIRED_USE} )
-"
-
-# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
-# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
-GL_DEPS="
-	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
-	egl? (
-		x11-libs/libdrm
-	)
-	gbm? (
-		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-	)
-
-	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
-	media-libs/libpng:0[${MULTILIB_USEDEP}]
-	virtual/jpeg:0[${MULTILIB_USEDEP}]
-" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
-	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-
-	!<media-libs/gst-plugins-bad-1.15.0:1.0
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
-)
-
-src_prepare() {
-	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
-	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
-	default
-}
-
-multilib_src_configure() {
-	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
-
-	local myconf=()
-	# FIXME: Automagic gbm and x11 wsi
-	if use opengl || use gles2; then
-		myconf+=(
-			--enable-gl
-			$(use_enable egl)
-			$(use_enable gles2)
-			$(use_enable opengl)
-			$(use_enable wayland)
-			$(use_enable X x11)
-		)
-	else
-		myconf+=(
-			--disable-gl
-			--disable-egl
-			--disable-gles2
-			--disable-opengl
-			--disable-wayland
-			--disable-x11
-		)
-	fi
-
-	if use opengl && use X; then
-		# GLX requires desktop OpenGL and X
-		myconf+=( --enable-glx )
-	else
-		myconf+=( --disable-glx )
-	fi
-
-	myconf+=(
-		--disable-cocoa
-		--disable-dispmanx
-		--disable-wgl
-	)
-
-	CONFIG_SHELL=${BASH} gstreamer_multilib_src_configure \
-		$(use_enable alsa) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable ivorbis) \
-		$(use_enable ogg) \
-		$(use_enable orc) \
-		$(use_enable pango) \
-		$(use_enable theora) \
-		$(use_enable vorbis) \
-		$(use_enable X x) \
-		$(use_enable X xshm) \
-		$(use_enable X xvideo) \
-		--enable-iso-codes \
-		--enable-zlib \
-		--disable-debug \
-		--disable-examples \
-		--disable-static \
-		"${myconf[@]}"
-
-	# bug #366931, flag-o-matic for the whole thing is overkill
-	if [[ ${CHOST} == *86-*-darwin* ]] ; then
-		sed -i \
-			-e '/FLAGS = /s|-O[23]|-O1|g' \
-			gst/audioconvert/Makefile \
-			gst/volume/Makefile || die
-	fi
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_test() {
-	unset GSETTINGS_BACKEND
-	emake check
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
index a12eacc9b07c..f3b1eed0e260 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index d20a1991f7b3..9990475d5319 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,9 +1,3 @@
-AUX gst-plugins-good-1.14.5-make43.patch 1869 BLAKE2B 93bf7ca4bfc14461b71dab9a458f86aa79d0fe6c3086f307e70822528e7f91f535760c3d1ba00f86090846b587dcc82a94775f94f2365a3729cd52e093c229d5 SHA512 016c2743025f6a55720238304de54c46931b9e3b3249a49ea5d3980de1d53312afe0150cfd7aa11f8772e3b363aecde2c9afd52df447ab37fe636dec3c196069
-AUX gst-plugins-good-1.16.2-make43.patch 1927 BLAKE2B ff38be465f3300f8b6821b37878e0beeee471d359362b9f26f2fa74b9f91cb5d3afd73de5d13f3015883915f21eaf3cfe2c5fb06b7d387e4e268a577c1afb48d SHA512 8c3432a402cbc2bffd617a294a356c3f0bb0dc88593267db82b308817d07f0c0a9e30b205868ad9c7937aee8864420240c4a16cb019b26cce2dcbfb10337e0fe
-DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
 DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
-EBUILD gst-plugins-good-1.14.5.ebuild 1506 BLAKE2B 4f7fa9ec216eba6ba101b8ffdfa9d35151f2c6956bb40fdfbacfc88fe8b800a0cdc5e645fc662f183d41eb569885da7036e5a82cfdb370d15485efc47110c212 SHA512 54bebe46bbede74adcb733677f92f4694cc770edae5cd1e45fe7aa0056cd67e4838a7612215f0ccee160eaa51d274d2fa0a38513cb695805966549d495767b32
-EBUILD gst-plugins-good-1.16.2.ebuild 1506 BLAKE2B c55b6d76f96fd092f316a507f8623f45db960b3f630660c39a4fa664f88a80938d3afcc46330e807e5b83df54c2dc6e6be6c713d6d922b514b0def2b66cd32ac SHA512 c9a04a15948cc29977c6cf6faafc7e0d13cb068decdaee0807fc06b771f9f11497e02c1e49b2bdbf4c2b5184ebd3582656750408535c1331b0eee503498cc5d5
-EBUILD gst-plugins-good-1.16.3.ebuild 1409 BLAKE2B ae9049f25027ab42ea1c1a090b4bf136518d3a768bba32e11c9f9777088cac35beaf727ea63d5362f952566d8f691b1acd2ff65b884c8b2181c9637b3e08a728 SHA512 a04d47a2df01a9704214d9c97d1ba839349e9777c9dc9df4fcf441c62df527bc7579787ba127049b574b6d29fa128b9ff2639376b24a8ffb21fd628c1978b77c
+EBUILD gst-plugins-good-1.16.3.ebuild 1407 BLAKE2B 7709616de2741cecd718c6dd6ac66e7f427b4f8ed80b5a07085a3cb5a3e2cfcc0ac36f28adbbb5c6f6f91f0e31768483462c5f390c672311d4f1c7d308dfac86 SHA512 e31d9ff7c2a665942970da87adedcb90ce31c9c8cecba2816af2d5a15edf7b07f0fdbba7b5bd1a0fb0973f2f8f685b64c54981f601927ca8b6b68b672303b8ad
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch
deleted file mode 100644
index 2429bf2b0008..000000000000
--- a/media-libs/gst-plugins-good/files/gst-plugins-good-1.14.5-make43.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,13 +1,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
---- a/sys/v4l2/Makefile.in
-+++ b/sys/v4l2/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -669,7 +671,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- plugin_LTLIBRARIES = libgstvideo4linux2.la
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgstvideo4linux2_la_SOURCES = gstv4l2.c \
- 				gstv4l2allocator.c \
- 				gstv4l2colorbalance.c \
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.16.2-make43.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.16.2-make43.patch
deleted file mode 100644
index b7e43f35c2a1..000000000000
--- a/media-libs/gst-plugins-good/files/gst-plugins-good-1.16.2-make43.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,13 +1,15 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
- #glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
---- a/sys/v4l2/Makefile.in
-+++ b/sys/v4l2/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -669,7 +671,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- plugin_LTLIBRARIES = libgstvideo4linux2.la
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgstvideo4linux2_la_SOURCES = gstv4l2.c \
- 				gstv4l2allocator.c \
- 				gstv4l2colorbalance.c \
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
deleted file mode 100644
index cf5aec755cca..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
-)
-
-multilib_src_configure() {
-	# Always enable optional bz2 support for matroska
-	# Always enable optional zlib support for qtdemux and matroska
-	# Many media files require these to work, as some container headers are often
-	# compressed, bug #291154
-	gstreamer_multilib_src_configure \
-		--enable-bz2 \
-		--enable-zlib \
-		--disable-examples \
-		--with-default-audiosink=autoaudiosink \
-		--with-default-visualizer=goom
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
-	fi
-
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
deleted file mode 100644
index 38c26b5161b0..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.16.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.16.2-make43.patch # remove when bumping and switching to Meson
-)
-
-multilib_src_configure() {
-	# Always enable optional bz2 support for matroska
-	# Always enable optional zlib support for qtdemux and matroska
-	# Many media files require these to work, as some container headers are often
-	# compressed, bug #291154
-	gstreamer_multilib_src_configure \
-		--enable-bz2 \
-		--enable-zlib \
-		--disable-examples \
-		--with-default-audiosink=autoaudiosink \
-		--with-default-visualizer=goom
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
-	fi
-
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild
index 4e2a8542d1d5..ce42945f1481 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 36ffe1f7790e..8954709ac0db 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,8 +1,3 @@
-AUX gst-plugins-ugly-1.14.3-make43.patch 540 BLAKE2B 13b53beb26c0f70233178c974337bde725316fbca2540dda38568935a67e4114e775d53f5c37390ab574caf8a4748dd039be04d6b8c935d1cc17dac8931e2ee8 SHA512 7e3dddb06522dcb031296ccbdc1b09315d30ca974d63c8e552983213d5d11bdc258ca7c659ec874f7c6fa2b81925707805c91a8928085b3950c5eb62fe336e61
-DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
-DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
 DIST gst-plugins-ugly-1.16.3.tar.xz 899124 BLAKE2B f848c7bbf36cdfca6e3dec4893b9b1bdc363feb697ee7cc89f4c664aa7aa700b76678873e5dae23f277ad99d6034c1e3617d760acc9cd075e0044fae3f4bb88d SHA512 0223f4ceebd1482329cfc7c3faa094d9f3b1d3eaa51eab3ff42da781f0aede8e838221bdc8d1a3ffc43318fb424421447d5548ebaf9ecaf8a290975d178df9ca
-EBUILD gst-plugins-ugly-1.14.3.ebuild 1040 BLAKE2B b407e5fd151f84fdad9b7b15fcf3a26911a741fb38fe7e87cc8f85e983b7a98628bfc41ab1db9ebbd72542b0232f268b58c3bd86f90bf384de6ea4728fa1d98f SHA512 2dea55696ecad8c8e71dda5f882908a41eec0b29f127235eda786721052d28cee41a8fadd5b0bc44145b1b71a64829f053a8f45284e1c17854b6ea11c8e92945
-EBUILD gst-plugins-ugly-1.16.2.ebuild 1040 BLAKE2B b407e5fd151f84fdad9b7b15fcf3a26911a741fb38fe7e87cc8f85e983b7a98628bfc41ab1db9ebbd72542b0232f268b58c3bd86f90bf384de6ea4728fa1d98f SHA512 2dea55696ecad8c8e71dda5f882908a41eec0b29f127235eda786721052d28cee41a8fadd5b0bc44145b1b71a64829f053a8f45284e1c17854b6ea11c8e92945
-EBUILD gst-plugins-ugly-1.16.3.ebuild 943 BLAKE2B 50eca7c070bc2965003682dce199e4bcd3bbdf28f188eb3765c3c76be15250251f31670646929e8eb61391b3c8e896e6531be3dfb363212c77460a4c1ab300a7 SHA512 32fd8c313e3ad3b1294191984de092ee9640031c7b9ff6232a350355a718e3b1d2512e7dfebe9a6d404dd26c601fbe03379c56629ffd4d484fec131a32acd27a
+EBUILD gst-plugins-ugly-1.16.3.ebuild 941 BLAKE2B 2a5e299284a15b210674a41aaa998b46bc607aafed4915fb29ae253ba92840977a74211ec80fc529dd706a6de03aedc9d4a81f8342df3cd5064120130a024bcd SHA512 11e3fc097a2fe4dbf114c5ab80678144b9d3f3b7e7b35ac688d30829a63e3057de7fe82a51f716f87023ac2ccae81b65c8920bb9a33e899371154498edd59cab
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/files/gst-plugins-ugly-1.14.3-make43.patch b/media-libs/gst-plugins-ugly/files/gst-plugins-ugly-1.14.3-make43.patch
deleted file mode 100644
index 86ce47cdf158..000000000000
--- a/media-libs/gst-plugins-ugly/files/gst-plugins-ugly-1.14.3-make43.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
deleted file mode 100644
index 155a2d797c35..000000000000
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.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
-GST_ORG_MODULE="gst-plugins-ugly"
-
-inherit gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.3-make43.patch # remove when bumping and switching to Meson
-)
-
-multilib_src_configure() {
-	gstreamer_multilib_src_configure
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
-	fi
-
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.ebuild
deleted file mode 100644
index 155a2d797c35..000000000000
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.2.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
-GST_ORG_MODULE="gst-plugins-ugly"
-
-inherit gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.3-make43.patch # remove when bumping and switching to Meson
-)
-
-multilib_src_configure() {
-	gstreamer_multilib_src_configure
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
-	fi
-
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild
index 43c49b62c45f..45604b117350 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index 34391765a541..22eddc66eaeb 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,8 +1,3 @@
-AUX 1.16.2-CVE-2020-6095.patch 1517 BLAKE2B f317ca6e3443b4b4255759c31a0bdac46237eb1c7e0cba2e5ae2a598599c0702f3fdc2504bce88502c2316f64792fc35417a0d77e3d2d1149bad0cf3d58760e8 SHA512 9cf2fe75fb8c14dd2fe0b46a5679a1a68df35882d6bc0f6aa90865ad1870d6ae498f5398dbc5bc44c835c10218d6a41fbca05cd862335fac46a49ef80dd7d449
-AUX 1.16.2-glib-deprecation-fix.patch 1992 BLAKE2B 74833b158bcf855b6548b01899aa1c910e2c9b8502753fc74349c212427d1c760de4762493f831eb2567b22ac53cce1631cc898a781e8c7e21f1a70d4cda56cc SHA512 e08b895c6108c845601107f56be5ce711629208fa7f9277c083752b14fdc77d48ccae7097b85e1d0e6fd68c770bf8e779c6dce518247537b1b9ca2e3f324d9b4
-AUX 1.16.2-leak-fix.patch 774 BLAKE2B 739fb1d5b0097e0426646731c01036339e9f63deb2a784032cd9758f89bd154acec6eb54661b9fa27671bd97ef195ddc4b617a3cbed9d677f9973d6db0f51cbd SHA512 192acc9f27f87f797a0ce28db213cee36f590d6db790e84038cec6a15bfd3957f0aa961965761225eabe30495bc868f43802b739ef6753209158d4ec9b298ea1
-DIST gst-rtsp-server-1.16.2.tar.xz 693368 BLAKE2B 612b59bc3a08167a81790c8d5164efebb8756ce3d3c9c278a0363bd640929b14d2fb1c26454a513dbaa9e093a702e7553950b6210ef57a6e9188a059c81650d3 SHA512 e18d87ae309594ffd7917b1804e595b83d5002518608f0ee03b9e68ab9bdf771ec2f691e50408618a6d1a39495c123e8288b3179e6cdaef65a38ef404544e0eb
 DIST gst-rtsp-server-1.16.3.tar.xz 699472 BLAKE2B 8937ce9d0550b11657496dec5a79c00f74de4da9deb9236693a25f4e266a779c8d4f439b127c2af87c874327e10f01f6a1d74fc1cd1bd0eca20093341568cb82 SHA512 f9ca08cfef92b74a63279a5480cfc1b18557f3062aadc765dd4d3de57d62b9ddf3ca98a4680dcd0f050812128c5c03592cdbf9d8329b85a6c2f3a39209c07701
-EBUILD gst-rtsp-server-1.16.2.ebuild 2107 BLAKE2B 9db192f48783a16277efc845550777dd1d9a94ef9d8f8f22e92aca4e115762520f14cbc89b30f367a107d7f0b0587174eeffb05dfd540c155a49658dbc8c2bf2 SHA512 442d7df4389cde8d455f69bbeaaa33c7dd51cb42050fc81e5f9b040d8efef332753cc732fef28b7ec1f195c273cc53e8b244d98f9fa36b082077b60833e766b5
 EBUILD gst-rtsp-server-1.16.3.ebuild 1969 BLAKE2B 573c21027d9acd09e9b15e086a1909e94e1d281ba1acb2d31612ce101a7a71bad18f943f3be9c2fe71d00c3f866c876cae134c402ec8bd2e775cde0c2d05a4ff SHA512 ceed93d572043b1f6aa49075efebad5e2e15203b6a5ce325264c9df5ab9711089ae212dc8dd933dd26d883ba6c7725fce3ff5363a58c579fe8a4fead42fa1fb1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gst-rtsp-server/files/1.16.2-CVE-2020-6095.patch b/media-libs/gst-rtsp-server/files/1.16.2-CVE-2020-6095.patch
deleted file mode 100644
index 87b2e54973b4..000000000000
--- a/media-libs/gst-rtsp-server/files/1.16.2-CVE-2020-6095.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ccc8d0c4388056acc801fd855e065eb2b0ca6578 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Mon, 23 Mar 2020 16:06:43 +0200
-Subject: [PATCH 3/3] rtsp-auth: Fix NULL pointer dereference when handling an
- invalid basic Authorization header
-
-When using the basic authentication scheme, we wouldn't validate that
-the authorization field of the credentials is not NULL and pass it on
-to g_hash_table_lookup(). g_str_hash() however is not NULL-safe and will
-dereference the NULL pointer and crash.
-A specially crafted (read: invalid) RTSP header can cause this to
-happen.
-
-As a solution, check for the authorization to be not NULL before
-continuing processing it and if it is simply fail authentication.
-
-This fixes CVE-2020-6095 and TALOS-2020-1018.
-
-Discovered by Peter Wang of Cisco ASIG.
----
- gst/rtsp-server/rtsp-auth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gst/rtsp-server/rtsp-auth.c b/gst/rtsp-server/rtsp-auth.c
-index f14286f..c15fa18 100644
---- a/gst/rtsp-server/rtsp-auth.c
-+++ b/gst/rtsp-server/rtsp-auth.c
-@@ -871,7 +871,7 @@ default_authenticate (GstRTSPAuth * auth, GstRTSPContext * ctx)
- 
-       GST_DEBUG_OBJECT (auth, "check Basic auth");
-       g_mutex_lock (&priv->lock);
--      if ((token =
-+      if ((*credential)->authorization && (token =
-               g_hash_table_lookup (priv->basic,
-                   (*credential)->authorization))) {
-         GST_DEBUG_OBJECT (auth, "setting token %p", token);
--- 
-2.20.1
-
diff --git a/media-libs/gst-rtsp-server/files/1.16.2-glib-deprecation-fix.patch b/media-libs/gst-rtsp-server/files/1.16.2-glib-deprecation-fix.patch
deleted file mode 100644
index 679c5c5207cf..000000000000
--- a/media-libs/gst-rtsp-server/files/1.16.2-glib-deprecation-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From df227481504574ecc6028400d17870913a16a047 Mon Sep 17 00:00:00 2001
-From: Jordan Petridis <jordan@centricular.com>
-Date: Thu, 23 Jan 2020 16:41:26 +0200
-Subject: [PATCH 2/3] rtsp-latency-bin: replace G_TYPE_INSTANCE_GET_PRIVATE as
- it's been deprecated
-
-from glib
-```
-Deprecated: 2.58: Use %G_ADD_PRIVATE and the generated
-  `your_type_get_instance_private()` function instead
-```
----
- gst/rtsp-server/rtsp-latency-bin.c | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/gst/rtsp-server/rtsp-latency-bin.c b/gst/rtsp-server/rtsp-latency-bin.c
-index cf7cdf1..c297ab6 100644
---- a/gst/rtsp-server/rtsp-latency-bin.c
-+++ b/gst/rtsp-server/rtsp-latency-bin.c
-@@ -23,9 +23,6 @@
- #include <gst/gst.h>
- #include "rtsp-latency-bin.h"
- 
--#define GST_RTSP_LATENCY_BIN_GET_PRIVATE(obj)  \
--     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_RTSP_LATENCY_BIN_TYPE, GstRTSPLatencyBinPrivate))
--
- struct _GstRTSPLatencyBinPrivate
- {
-   GstPad *sinkpad;
-@@ -106,7 +103,7 @@ gst_rtsp_latency_bin_get_property (GObject * object, guint propid,
- {
-   GstRTSPLatencyBin *latency_bin = GST_RTSP_LATENCY_BIN (object);
-   GstRTSPLatencyBinPrivate *priv =
--      GST_RTSP_LATENCY_BIN_GET_PRIVATE (latency_bin);
-+      gst_rtsp_latency_bin_get_instance_private (latency_bin);
- 
-   switch (propid) {
-     case PROP_ELEMENT:
-@@ -140,7 +137,7 @@ gst_rtsp_latency_bin_add_element (GstRTSPLatencyBin * latency_bin,
-     GstElement * element)
- {
-   GstRTSPLatencyBinPrivate *priv =
--      GST_RTSP_LATENCY_BIN_GET_PRIVATE (latency_bin);
-+      gst_rtsp_latency_bin_get_instance_private (latency_bin);
-   GstPad *pad;
-   GstPadTemplate *templ;
- 
-@@ -250,7 +247,7 @@ static gboolean
- gst_rtsp_latency_bin_recalculate_latency (GstRTSPLatencyBin * latency_bin)
- {
-   GstRTSPLatencyBinPrivate *priv =
--      GST_RTSP_LATENCY_BIN_GET_PRIVATE (latency_bin);
-+      gst_rtsp_latency_bin_get_instance_private (latency_bin);
-   GstEvent *latency;
-   GstQuery *query;
-   GstClockTime min_latency;
--- 
-2.20.1
-
diff --git a/media-libs/gst-rtsp-server/files/1.16.2-leak-fix.patch b/media-libs/gst-rtsp-server/files/1.16.2-leak-fix.patch
deleted file mode 100644
index 2707c3ebdc05..000000000000
--- a/media-libs/gst-rtsp-server/files/1.16.2-leak-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9dfdcb71e84e53e25388a6e0b485a70c45ea0dec Mon Sep 17 00:00:00 2001
-From: Nicola Murino <nicola.murino@gmail.com>
-Date: Thu, 12 Dec 2019 17:56:18 +0100
-Subject: [PATCH 1/3] rtsp-auth: fix default token leak
-
----
- gst/rtsp-server/rtsp-auth.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gst/rtsp-server/rtsp-auth.c b/gst/rtsp-server/rtsp-auth.c
-index f676b80..f14286f 100644
---- a/gst/rtsp-server/rtsp-auth.c
-+++ b/gst/rtsp-server/rtsp-auth.c
-@@ -214,6 +214,8 @@ gst_rtsp_auth_finalize (GObject * obj)
-   g_hash_table_unref (priv->basic);
-   g_hash_table_unref (priv->digest);
-   g_hash_table_unref (priv->nonces);
-+  if (priv->default_token)
-+    gst_rtsp_token_unref (priv->default_token);
-   g_mutex_clear (&priv->lock);
-   g_free (priv->realm);
- 
--- 
-2.20.1
-
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.2.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.2.ebuild
deleted file mode 100644
index c4f50223188d..000000000000
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gstreamer
-
-DESCRIPTION="A GStreamer based RTSP server"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="examples +introspection static-libs"
-
-# gst-plugins-base for many used elements and API
-# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
-# gst-plugins-srtp for srtpenc and srtpdec elements
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-# Due to gstreamer src_configure
-QA_CONFIGURE_OPTIONS="--enable-nls"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-leak-fix.patch
-	"${FILESDIR}"/${PV}-glib-deprecation-fix.patch
-	"${FILESDIR}"/${PV}-CVE-2020-6095.patch
-)
-
-multilib_src_configure() {
-	# debug: only adds -g to CFLAGS
-	# docbook: nothing behind that switch
-	# libcgroup is automagic and only used in examples
-	gstreamer_multilib_src_configure \
-		--disable-debug \
-		--disable-valgrind \
-		--disable-examples \
-		--disable-docbook \
-		--disable-gtk-doc \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable static-libs static) \
-		--disable-tests \
-		LIBCGROUP_LIBS= \
-		LIBCGROUP_FLAGS=
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi ; then
-		ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-	# Handle broken upstream modifications to defaults of gtk-doc
-	emake install -C docs/libs DESTDIR="${D}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*.c
-	fi
-}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 4c028f1c8e35..1eec4bacb2b0 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,5 +1,3 @@
-DIST gstreamer-editing-services-1.14.5.tar.xz 1069356 BLAKE2B 95ddff56b56b3ae59872a340258af0277d9b5c3619fe25861ce3f65238d3802bdda3c51cf84f0a206f7ccf095ab81ff3f178b7c0322dc7687741626c3b8da947 SHA512 9b3d0336e596004a51069900c61f293eaf213a83655799139373c77cf5637a3511ba4ec6a1c75f53d81643539e32f7d130fd0cd58090b948f81e8e081226b5c3
 DIST gstreamer-editing-services-1.16.3.tar.xz 1091208 BLAKE2B d88bed4e8958a6bad05aab8d6c19cd737c6812e0780c420fd144d58fe416cd5dbd01e019c3fc53417d65cb2d6e100de123dc8183c8c3dab329fd677ba55644c5 SHA512 c84cc2dab2b1644ab118794b7aeb98748f893a26070359850f48e87cf362fd53b54baf8754a07e1d412cacb85cf9cfcafb3cf10d79c67bbe077e4d763f9703ef
-EBUILD gstreamer-editing-services-1.14.5.ebuild 1523 BLAKE2B fe1402365b5b5756648a8bbc767ec2aef7e7d301697ee4c1dc1598f299bcc343d178aec0f757e2f2769d720908ca0139f11874dd221daffa74f435765547c6f3 SHA512 4f70b7f7eb13ddeb8a7a551b94c5e33b54ade8a00df5dad6619a63f6b55410f1745b1be21fa6d38f6028d397cb14c92a7a8f53d816cd8597798227b5b53952be
 EBUILD gstreamer-editing-services-1.16.3.ebuild 1854 BLAKE2B ca2103e20fe4db1494a3bfd0292cd14a8c6984bb6eb176cb1b8832e996fd246002077fc053c65d93c1dce510138d8fb1d004bc1261b4c23470512e3c5fbf4d9a SHA512 80b202bc6983adf3b29015bcdba91a60c0bc6d36021f741169648af133e96cf87c214b2063ee61901b8ec0b6e99381902546696080912f8e470cc9c40ed21c27
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
deleted file mode 100644
index 24e441707e99..000000000000
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_7 )
-GNOME2_LA_PUNT="yes"
-
-inherit bash-completion-r1 gnome2 python-r1
-
-DESCRIPTION="SDK for making video editors and more"
-HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
-SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="amd64 x86"
-
-IUSE="+introspection"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libxml2:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection?]
-	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.3
-	virtual/pkgconfig
-"
-# XXX: tests do pass but need g-e-s to be installed due to missing
-# AM_TEST_ENVIRONMENT setup.
-RESTRICT="test"
-
-src_configure() {
-	# gtk is only used for examples
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-examples \
-		--without-gtk \
-		--with-bash-completion-dir="$(get_bashcompdir)" \
-		--with-package-name="GStreamer editing services ebuild for Gentoo" \
-		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #538888
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	addpredict /dev
-	gnome2_src_compile
-}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 009df8125e26..d6861c2571ef 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,9 +1,3 @@
-AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5cbdb2d4fe085fcf77bd798cb474216b758bff3a70f6b0e3f93d656a6e41b44be6c3f931ed5543e4ca10b51d19b4f4f153bc9 SHA512 f559150ac5e40a2fe259a8346ed085a20df86d93e5292c9dcc024274f12e0beb90266395538943946ca01a2a5f56be3ab32f1f850e1c8c047848aebc13ab2350
-AUX gstreamer-1.14.5-make43.patch 3176 BLAKE2B a221894affd68da53d475c65544cfe825b9ab947fb6b7b13c2b409b71f7fcd7224f94835d293d4ea10da9a7cd271284449c97ebd475166fdda6d54929b816e04 SHA512 89de24659fe954e483d62f938b01dc2de25cbcc039eb6c12e8a0dd1681071a567f4799f0cf615738173304e6d103afc2b569fa81cbbbe61bbca1b0a1e849b9bf
-DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
-DIST gstreamer-1.16.2.tar.xz 3328600 BLAKE2B 9bc12330fc5a7fa3a65e2c03f9d06172d787e9aadb4c2cb7d98f8f7c5850e05535cf23f747bf89514a609447f3894942bcb2fa4a6d3d3406e129e1eb67b49158 SHA512 a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f
 DIST gstreamer-1.16.3.tar.xz 3338692 BLAKE2B 79eb08bc446073fadf881adea0f60a2caf6384836df975f80ce0e57db6469e6a016cab38413d3de00d11b491a0281f95dcbcd1f782b31f2d1a07b866c1ed7dd5 SHA512 4a879e71f65c89609c2e106dc79222853e6f37830638d5b9624c436fc9d8974cc6474d399eff02cdc13ff7189fcd13e9450450d36c3a6092aa53cb97056f5854
-EBUILD gstreamer-1.14.5.ebuild 3028 BLAKE2B ef82e9743fd2fc3e3a58e440898923cd95a25b522834d16f8f8c7aa54e94b482453e4eee356f38b84f8485cc7dff771909305dd304da18e45fe288d38ba9792b SHA512 a8fc136c373baa98d9ff27ce5edc1bb95fbd5f43de35468d13cd4b071cb1696523737ed5926dc00c5930ae3836ff4323eb43a508c40a4976f9899867c8a297c6
-EBUILD gstreamer-1.16.2.ebuild 2946 BLAKE2B 00ac2a8067a0847131146f7c74ebdfc9a4ace5091eb8a27c31913d08cbc08685602ad6c2dc1836a5566b7aa8d40b126962b019021c3f32d35b632b6716468441 SHA512 25b99b349aec91c480fbb18425904463d034936d22747d9e5f7ef96937791ad46b76ab4b308f6db46a408f4f4e74935d1609b260f9fb3404ad033b291dd4eeb4
-EBUILD gstreamer-1.16.3.ebuild 2849 BLAKE2B 4bb6b27cbcf237967fbbca8adceca3ae5922f6135fa565af49e2e5e1863cb3ba2a892c272c6b361da944ca74c16f55598605b7c1cd1ed5837b39a167a4a79318 SHA512 ca40695f371fba53684ba3d5a816c8b31a03ce23134da16afd8edfdc5a3f5f78adc30726a8a8a7e08830393a0b77dd465bf8a2b4f866ae6165d52f623ad02baa
+EBUILD gstreamer-1.16.3.ebuild 2847 BLAKE2B 95b0b9dadc8f8fb3eaee2b00e973fef51cfdfcab1abe841407b0bf1296e19cf18f827f9695da188067ea49a7a589c9045a285e13aca5533ac977186e3a87e3ca SHA512 ff18be2a9d99fced7226cf997411b94bea35bf6cfe7023f615c39229aa09530be8abca7fe5905ea2fcf6ee8b263986fc231ab32f7f2b4a4840b671b92d9e22f5
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch b/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch
deleted file mode 100644
index ca74bf0cc2e6..000000000000
--- a/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 4a7739f4b6442814696bbd0706ab9a1ce1462d80 Mon Sep 17 00:00:00 2001
-From: Havard Graff <havard.graff@gmail.com>
-Date: Wed, 31 Oct 2018 10:27:23 +0100
-Subject: [PATCH] tests/uri: fix test after GHashTable changes in GLib 2.59
-
-Maybe the implementation should not be dependent on a "random" hash-table
-ordering, but at least this shows the problem clearly.
----
- tests/check/gst/gsturi.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/tests/check/gst/gsturi.c b/tests/check/gst/gsturi.c
-index ee623dbcf..fa87c7c77 100644
---- a/tests/check/gst/gsturi.c
-+++ b/tests/check/gst/gsturi.c
-@@ -414,7 +414,11 @@ static const struct URITest url_presenting_tests[] = {
-   {.uri = {"scheme", "user:pass", "host", 1234, "/path/to/dir",
-           {{"query", NULL}, {"key", "value"}}, "fragment"},
-       .str =
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-+      "scheme://user:pass@host:1234/path/to/dir?key=value&query#fragment"},
-+#else
-       "scheme://user:pass@host:1234/path/to/dir?query&key=value#fragment"},
-+#endif
- 
-   /* IPv6 literal should render in square brackets */
-   {.uri = {"scheme", "user:pass", "12:34:56:78:9a:bc:de:f0", 1234,
-@@ -977,14 +981,24 @@ GST_START_TEST (test_url_get_set)
- 
-   fail_unless (gst_uri_set_query_value (url, "key", "value"));
-   tmp_str = gst_uri_to_string (url);
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-+  fail_unless_equals_string (tmp_str,
-+     "//example.com/path/to/file/there/segment?key=value&query#fragment");
-+#else
-   fail_unless_equals_string (tmp_str,
--      "//example.com/path/to/file/there/segment?query&key=value#fragment");
-+     "//example.com/path/to/file/there/segment?query&key=value#fragment");
-+#endif
-   g_free (tmp_str);
- 
-   fail_unless (gst_uri_set_query_value (url, "key", NULL));
-   tmp_str = gst_uri_to_string (url);
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-+  fail_unless_equals_string (tmp_str,
-+      "//example.com/path/to/file/there/segment?key&query#fragment");
-+#else
-   fail_unless_equals_string (tmp_str,
-       "//example.com/path/to/file/there/segment?query&key#fragment");
-+#endif
-   g_free (tmp_str);
- 
-   fail_unless (!gst_uri_set_query_value (NULL, "key", "value"));
--- 
-2.20.1
-
diff --git a/media-libs/gstreamer/files/gstreamer-1.14.5-make43.patch b/media-libs/gstreamer/files/gstreamer-1.14.5-make43.patch
deleted file mode 100644
index e22cc9f8b458..000000000000
--- a/media-libs/gstreamer/files/gstreamer-1.14.5-make43.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,14 +1,16 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
---- a/libs/gst/controller/Makefile.in
-+++ b/libs/gst/controller/Makefile.in
-@@ -17,13 +17,6 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
--#glib_enum_headers=$(colorbalance_headers)
--#glib_enum_define=GST_COLOR_BALANCE
--#glib_gen_prefix=gst_color_balance
--#glib_gen_basename=colorbalance
--#glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
--
- 
- 
- VPATH = @srcdir@
-@@ -550,11 +543,12 @@
- 	gstinterpolationcontrolsource.h \
- 	gstlfocontrolsource.h
- 
-+H := \#
- glib_enum_define = GST_CONTROLLER
- glib_gen_prefix = gst
- glib_gen_basename = controller
- glib_gen_decl_banner = GST_CONTROLLER_API
--glib_gen_decl_include = \#include <gst/controller/controller-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/controller/controller-prelude.h>
- built_sources = controller-enumtypes.c
- built_headers = controller-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
-@@ -587,7 +581,14 @@
- libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM)
- libgstcontroller_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
- CLEANFILES = *.gcno *.gcda *.gcov $(BUILT_SOURCES) $(am__append_1)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+
-+#glib_enum_headers=$(colorbalance_headers)
-+#glib_enum_define=GST_COLOR_BALANCE
-+#glib_gen_prefix=gst_color_balance
-+#glib_gen_basename=colorbalance
-+#glib_gen_decl_banner=GST_EXPORT
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstcontroller_@GST_API_VERSION@_include_HEADERS)) \
diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
deleted file mode 100644
index 0610aeed9ce8..000000000000
--- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 multilib-minimal pax-utils
-
-DESCRIPTION="Open source multimedia framework"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+caps +introspection nls +orc test unwind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	unwind? (
-		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
-		dev-libs/elfutils[${MULTILIB_USEDEP}]
-	)
-	!<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# gtk-doc-am to install API docs
-
-PATCHES=(
-	"${FILESDIR}"/1.14-glib-2.60-tests-compat.patch
-	"${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
-)
-
-src_configure() {
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local completiondir=$(get_bashcompdir)
-	# Set 'libexecdir' to ABI-specific location for the library spawns
-	# helpers from there.
-	# Disable static archives and examples to speed up build time
-	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--disable-benchmarks
-		--disable-debug
-		--disable-examples
-		--disable-static
-		--disable-valgrind
-		--enable-check
-		$(use_with unwind)
-		$(use_with unwind dw)
-		$(multilib_native_use_enable introspection)
-		$(use_enable nls)
-		$(use_enable test tests)
-		--with-bash-completion-dir="${completiondir%/*}"
-		--with-package-name="GStreamer ebuild for Gentoo"
-		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
-	)
-
-	if use caps ; then
-		myconf+=( --with-ptp-helper-permissions=capabilities )
-	else
-		myconf+=(
-			--with-ptp-helper-permissions=setuid-root
-			--with-ptp-helper-setuid-user=nobody
-			--with-ptp-helper-setuid-group=nobody
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		local x
-		for x in gst libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install() {
-	# can't do "default", we want to install docs in multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
-}
diff --git a/media-libs/gstreamer/gstreamer-1.16.2.ebuild b/media-libs/gstreamer/gstreamer-1.16.2.ebuild
deleted file mode 100644
index d2ffca1d69d6..000000000000
--- a/media-libs/gstreamer/gstreamer-1.16.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 multilib-minimal pax-utils
-
-DESCRIPTION="Open source multimedia framework"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+caps +introspection nls +orc test unwind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	unwind? (
-		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
-		dev-libs/elfutils[${MULTILIB_USEDEP}]
-	)
-	!<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.5-make43.patch # remove when bumping and switching to Meson
-)
-
-src_configure() {
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local completiondir=$(get_bashcompdir)
-	# Set 'libexecdir' to ABI-specific location for the library spawns
-	# helpers from there.
-	# Disable static archives and examples to speed up build time
-	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--disable-benchmarks
-		--disable-debug
-		--disable-examples
-		--disable-static
-		--disable-valgrind
-		--enable-check
-		$(use_with unwind)
-		$(use_with unwind dw)
-		$(multilib_native_use_enable introspection)
-		$(use_enable nls)
-		$(use_enable test tests)
-		--with-bash-completion-dir="${completiondir%/*}"
-		--with-package-name="GStreamer ebuild for Gentoo"
-		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
-	)
-
-	if use caps ; then
-		myconf+=( --with-ptp-helper-permissions=capabilities )
-	else
-		myconf+=(
-			--with-ptp-helper-permissions=setuid-root
-			--with-ptp-helper-setuid-user=nobody
-			--with-ptp-helper-setuid-group=nobody
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		local x
-		for x in gst libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install() {
-	# can't do "default", we want to install docs in multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
-}
diff --git a/media-libs/gstreamer/gstreamer-1.16.3.ebuild b/media-libs/gstreamer/gstreamer-1.16.3.ebuild
index 953410b343b6..f226c18f1622 100644
--- a/media-libs/gstreamer/gstreamer-1.16.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.16.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 3717c7252169..e5298c68d6c8 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,13 +1,8 @@
 AUX ilmbase-2.3.0-fix-bashisms.patch 8531 BLAKE2B e21eb0c1d2ec002867048923f94f6521d9f247854febbc35eb1ba8720491a9f46fff899d68719b3b542524cccf21adae6267703801faa65542c2b93c7d588d40 SHA512 972285da78ad70c9efa6b1477621fc3f73270711a5ffa40cd1d11762f83e846716782124eb9a38adf1b99f6edc5858a66648e7ab8c54946f15b7b93aa19f8f7b
 AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b81f1bed29fe05fe79accc033484479e891482529ead24ddc2b1b931d808eb20a6b960f7281da83357b637c3d937ca SHA512 81eb09823fed3841742ef8b85b262d9d6fbce97ae87fdc5e902c4d85c7f8c7a01b7be08acac23fee5c5cfdb8815f410b200f2af4039ade0cedd31866312015db
-AUX ilmbase-2.5.2-musl.patch 2134 BLAKE2B eb22304535301b717adf2397343b6f43bfcfb900497d0e549cfc19b78ab9af6511c37aeee77a7f8f99e9214e1519b7fbf808bab28eb9fce63be65a04eb9ac177 SHA512 3505444148a3062f853dea35abf5b2e932c7caf72416c5b083e324cb2b1fcb54fee20f240bfb36c4b1c9d226765ad4520f7784feaf9ea4b7c17009480abab486
 AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e554fa65342c4c364ba51f13717c3c96806417cc7ae814a34a59137da3a93c442cc436bfe7f4330f0a537ba7ed9579a45a4b8c986b443fdfab3fcb42f2 SHA512 06318e4c019fd02c49f7e3c2cf0ecbf0701ee625607763709b010984fa96f2681e19955ad0538397ac9ee3c1a514840f84423b0fe98bafad5e399c43e619175b
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
-DIST ilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
 DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290
-EBUILD ilmbase-2.5.2.ebuild 1326 BLAKE2B f58d3ad532feb4f6b285b4ae66102aa7426b66c97c2d96f8adf594301df833e8d2e9877a35dae22b508ac3a3728030860e3df2e257b170fa1ba664fb7e515f3c SHA512 31b8c62f4c271c275a9e45b7852d75bb84035f82e9f43951f7f5ab34367783d7257f6148b1c593ab9ce51d565a240962d19df023a1ad30b93595813c7b991363
-EBUILD ilmbase-2.5.4.ebuild 1067 BLAKE2B e67250c33c6a71e67868382cd1348bcde9b6d0e033b0c8db4058d19c4b93505ebb52fee00ada46d7a651764144b94e415a20c7b7a11eb4ec7b2f28f491acb6dc SHA512 787d029ece0615e6e7d3ab32d78d9b9229e70c2bb2a743bf063ccf0ee238e4300074c0d73210ea432fc86a04ea6a74c8293c3e3978b3a68d8632380ae670da02
-EBUILD ilmbase-2.5.5.ebuild 1076 BLAKE2B 9e8c0f76dea3230d17b096fa3661a8ea4281061e80dad43d5763da19de578ecd9ddfffdf80758a5a9ef55b35c63f1c29110811b777af86317c84d5c5f6a3cd4d SHA512 154a92f3d3a1f1cbbb537af9e36a65048283d0955c79fa90fdd0773a6a8b9984fcea102854a06d02a0097fbe58f3e59cc486fcffd759506c61bd02bf1d226a3a
+EBUILD ilmbase-2.5.5.ebuild 1069 BLAKE2B ac5419454146e4df6f7d22c3ef83765261e0638951f76e8f9928010be9a6c1e6b142ff4761afefc2a665d50d5f981aa55839410a627b4b1bcf4c6a5ca4612d9c SHA512 1a5ca247caa34c8d0551be377e3bef91d4ec8fa5c02aeea0102ea8d867f396211f6d23b4598a9064042f9a42f26f6c01f9dc9e130de3b3ab283ad425faa43001
 MISC metadata.xml 661 BLAKE2B 3392b45aa602d98cd1f9403766c7829cc2744893629489e267d2a6c568a5d934114012f8b6ec84acda5bd42f06c3b2ebad8bf25cb540a27b80485696c82c7469 SHA512 6a0773377471b23316f73e7aba924a7421432a1d75da858354c72685eb6602cce7c7e16a5232ca47df3d8f9f3465f1bc5c1f58259733fcdfaeeeaa2b0327bdef
diff --git a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
deleted file mode 100644
index 80f11e44c12e..000000000000
--- a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c7af102e6bce6638add2f38576ffe9c6741ba768 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
-Date: Thu, 30 Jul 2020 02:21:07 +0200
-Subject: [PATCH] IexMathFpu.cpp: Fix build on non-glibc (e.g. musl libc).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Originally from:
-https://github.com/void-linux/void-packages/blob/80bbc168faa25448bd3399f4df331b836e74b85c/srcpkgs/ilmbase/patches/musl-_fpstate.patch
-
-Fixes error:
-
-    IlmBase/IexMath/IexMathFpu.cpp: In function ‘void Iex_2_4::FpuControl::restoreControlRegs(const ucontext_t&, bool)’:
-    IlmBase/IexMath/IexMathFpu.cpp:284:38: error: ‘struct _fpstate’ has no member named ‘cw’; did you mean ‘cwd’?
-      284 |     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-          |                                      ^~
-          |                                      cwd
-    IlmBase/IexMath/IexMathFpu.cpp:287:20: error: ‘struct Iex_2_4::FpuControl::_fpstate_64’ has no member named ‘magic’
-      287 |     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-          |                    ^~~~~
-
-Signed-off-by: Niklas Hambüchen <mail@nh2.me>
----
- IlmBase/IexMath/IexMathFpu.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/IlmBase/IexMath/IexMathFpu.cpp b/IlmBase/IexMath/IexMathFpu.cpp
-index ceed658e0..439329e50 100644
---- a/IexMath/IexMathFpu.cpp
-+++ b/IexMath/IexMathFpu.cpp
-@@ -281,10 +281,18 @@ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif
diff --git a/media-libs/ilmbase/ilmbase-2.5.2.ebuild b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
deleted file mode 100644
index f2e753877179..000000000000
--- a/media-libs/ilmbase/ilmbase-2.5.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="large-stack static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/openexr-${PV}/IlmBase"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfigInternal.h )
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DILMBASE_INSTALL_PKG_CONFIG=ON
-	)
-
-	# Disable use of ucontext.h wrt #482890
-	if use hppa || use ppc || use ppc64; then
-		mycmakeargs+=(
-			-DILMBASE_HAVE_UCONTEXT_H=OFF
-		)
-	fi
-
-	# needed for running tests with x86_32
-	# see https://github.com/AcademySoftwareFoundation/openexr/issues/346
-	if use abi_x86_32 && use test; then
-		append-cppflags -ffloat-store
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-libs/ilmbase/ilmbase-2.5.4.ebuild b/media-libs/ilmbase/ilmbase-2.5.4.ebuild
deleted file mode 100644
index f840cd379ffb..000000000000
--- a/media-libs/ilmbase/ilmbase-2.5.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="large-stack static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/openexr-${PV}/IlmBase"
-
-DOCS=( README.md )
-
-src_prepare() {
-	if use abi_x86_32; then
-		eapply "${FILESDIR}"/${P}-0001-disable-failing-test-on-x86_32.patch
-	fi
-
-	multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DILMBASE_INSTALL_PKG_CONFIG=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/ilmbase/ilmbase-2.5.5.ebuild b/media-libs/ilmbase/ilmbase-2.5.5.ebuild
index c8c99d2fd039..3575c02a3284 100644
--- a/media-libs/ilmbase/ilmbase-2.5.5.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="large-stack static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/jbig2enc/Manifest b/media-libs/jbig2enc/Manifest
index cbccbef084de..00fb81841ef8 100644
--- a/media-libs/jbig2enc/Manifest
+++ b/media-libs/jbig2enc/Manifest
@@ -1,4 +1,6 @@
 AUX jbig2enc-0.28-leptonica-1.70.patch 1681 BLAKE2B 78de2dd85258d277114c9fdd60e587bdf833211cb8cbcf12856ad3a26647e20c9b713f77a9dc84f983f0d19e38b59a086bf514a0ee81df186b7bad4760ea669c SHA512 2c9999dde1156df91616e42e051b5e0b81339cb818a9c0fd0592c0d77c4b741c80ac876576a7bc87b990e09af587df5e095c87d8893308100b37188e9640d738
 DIST jbig2enc-0.28.tar.gz 39879 BLAKE2B 08cbb2f2a5277085a592d18a8db529d2e5f79f69eaa5392f2b06b920f7d1651c3c73795ba2e43ae843fd5720a1406633b5429ab0b1fe260a6308da4cf10868b9 SHA512 81d194fb648fe7a866302796fd5e2adbb213d52193a279a94dbc5918ce3480561ea204e8497125eed5d6c6e4c6d089f7f35a89ef98bc484ca753ffde23e444c6
-EBUILD jbig2enc-0.28-r1.ebuild 869 BLAKE2B 37989321c52ae5ecc7a10e4aec1ae8ae2775c5d84fb4ce99e2f9437b2d075c32be9911656a79f08e28cd70f6412d5deded9db1b7485444576fc02bfc53433f04 SHA512 4c24a01da97958fdbf11ad6c14b1d06f96a1726ebe1024bc72f11d814d074ed92d7e51de06684eb7197490f3db54f64a4b02acf9f1c74c6f58f623beeac83380
+DIST jbig2enc-0.29.tar.gz 1108212 BLAKE2B 44efc2afecb2ca581711c58e9abfed7ae790053e6a725012cb6e68c5c52b6d89d071a115bf1fb9ea2c15de64e03e889dd47d9d36a0e707f039de55029d33633a SHA512 aa50cdaf61ef0ae473c8139d8da2a4c374450f8d0d31e2260031e8086dab9201c303c86d50cd51427135bef500718cbc3a53baabf2bf505f8908c22a3d361c51
+EBUILD jbig2enc-0.28-r1.ebuild 929 BLAKE2B 9b6a77d22c87b1a8f8ab12cb9eb13944c878497fe0f0c7dfaf1cf793f8fa4a8d8a94f2f3a1faa27fcb1207846be51e0eb3219e26d82ac4a9877c4b50875cdd24 SHA512 1daa8bec55140e1213b8be8dce06095bfac67ff01a9377846b07997547c7a9a6cd4008b64c235ebc974544bce6ab23307a7d951de60f21707e413d43eb8c3217
+EBUILD jbig2enc-0.29.ebuild 917 BLAKE2B 3d0b491b62495946f654d84da08ba167d9c0080696b5c8d156b95502d31dd192a20e62afbecde41b8988de7f24a6fe70754e6f8863172c22bc6aaa1419bcde94 SHA512 8b6ad914ef83ae2d3bd0b15b7cb3b0f2a2ba89963a2cc23cd3d02717a1eacd89a85c54397b4f54c5bc0e49ee40972b2f282e7f08dc61be814eec1cb12ba1e3d2
 MISC metadata.xml 324 BLAKE2B 6b82651c0b2513c62e014a8fd6f931c7edc95c84ed88dcd9fa18396a8ec59306c3bb4a08914dbae815530b031f3b66c97d909da57ba4a6d13177a44e226345d4 SHA512 6a6bdbd18023007787f6790a5004e782c4fd136c64aeb261655f743fd8619b35d280e74e806540156e3ac75ed15cf7053fefffd298b119a43cf430e57d1384be
diff --git a/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild b/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild
index b1e25014dafb..f6949b5e887e 100644
--- a/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild
+++ b/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="JBIG2 Encoder and libs"
 HOMEPAGE="https://github.com/agl/jbig2enc"
@@ -13,19 +12,29 @@ SRC_URI="https://github.com/agl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86 ~ppc-macos"
-
-IUSE="gif jpeg png static-libs tiff webp"
+IUSE="gif jpeg png tiff webp"
 
 RDEPEND="media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-leptonica-1.70.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-leptonica-1.70.patch"
+)
 
 src_prepare() {
+	default
+
 	# remove -Werror
 	sed -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac || die 'sed on configure.ac failed'
 	# prevent static linking and QA notice about insecure RUNPATHs
 	sed -i -e '/jbig2_LDFLAGS/d' src/Makefile.am || die 'sed on src/Makefile.am failed'
 
-	autotools-utils_src_prepare
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/media-libs/jbig2enc/jbig2enc-0.29.ebuild b/media-libs/jbig2enc/jbig2enc-0.29.ebuild
new file mode 100644
index 000000000000..632ea5cccd30
--- /dev/null
+++ b/media-libs/jbig2enc/jbig2enc-0.29.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="JBIG2 Encoder and libs"
+HOMEPAGE="https://github.com/agl/jbig2enc"
+SRC_URI="https://github.com/agl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos"
+IUSE="gif jpeg png tiff webp"
+
+RDEPEND="media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# remove -Werror
+	sed -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac || die 'sed on configure.ac failed'
+	# prevent static linking and QA notice about insecure RUNPATHs
+	# TODO: --disable-rpath (new in 0.29)?
+	sed -i -e '/jbig2_LDFLAGS/d' src/Makefile.am || die 'sed on src/Makefile.am failed'
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
index 797972da33c6..d14501c260e3 100644
--- a/media-libs/kcolorpicker/Manifest
+++ b/media-libs/kcolorpicker/Manifest
@@ -1,3 +1,3 @@
-DIST kColorPicker-0.1.4.tar.gz 11438 BLAKE2B 407211d5938d78aa8bfe193c037a3224ab51cacec7213e4526689ba38a800db2f5df4b0804cd3cc428765a22f426b50d870a355ce07d3f40ff231b8d4f44bf93 SHA512 135b8e0e189feb724f6a4f6a09b8e18922d294fbb3c80cd8522acec272ad0503eff5bf375ae7d58b1dd2f891dc0df187b2a3442726f8ff980583c475090b8673
-EBUILD kcolorpicker-0.1.4.ebuild 743 BLAKE2B f14f659014ccf0f984498f0a84c4459e26711c3952a3b37099280dc95b5c0d9f110a70858f56a78f8ef6fd99cfbefe086cbe6239032226a1c9dc0ef0506d76d8 SHA512 2abb05fc432dcc5bac30a45b7211d251090c039aa50ca396b4c0ccd1a4336205efa1040d724ac333c76fbfb65071097c2ad343649a56a4a6b39a57edbcfbadb8
+DIST kColorPicker-0.1.5.tar.gz 12013 BLAKE2B b4141e45b44e05c4769d008014817327a560c8ad74996010a1d16d22b6503547ce2ba657eee01c3893bb9a72cecd8fc368afe8e503d2c582cb02f1ab4b371a12 SHA512 6792cb79fe96f00c073f3f4b84c2c0a713523c33ee9f29113a9ed4f4c5f8e5509fefa4127a28546b1b44f73e0df7be9364a1c04498c36efcb6c2764df25250a8
+EBUILD kcolorpicker-0.1.5.ebuild 743 BLAKE2B f14f659014ccf0f984498f0a84c4459e26711c3952a3b37099280dc95b5c0d9f110a70858f56a78f8ef6fd99cfbefe086cbe6239032226a1c9dc0ef0506d76d8 SHA512 2abb05fc432dcc5bac30a45b7211d251090c039aa50ca396b4c0ccd1a4336205efa1040d724ac333c76fbfb65071097c2ad343649a56a4a6b39a57edbcfbadb8
 MISC metadata.xml 582 BLAKE2B 5cabe4fbc89f6b33dd2193707ce455544c8e61139ea78d03220a4acb6833d7d085c8d3470ab0031ead6072d766987b93b4e1f15694898f25b8358bf550868598 SHA512 1b722a703324f146d71a8cbcf807b1e8be67708bbb3af541dbbe1e42958c9f47d5eca36e93f967521f37a2b674068265e7d2c2c7853aaeddfb93748b83794c8b
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild
index 497f088f00b4..497f088f00b4 100644
--- a/media-libs/kcolorpicker/kcolorpicker-0.1.4.ebuild
+++ b/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 56c73835531c..d8eed87c472c 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,4 +1,3 @@
-AUX kimageannotator-0.4.0-fix-static-test-library-PR195.patch 1010 BLAKE2B c296f280c851b54d3a6d7fe088ce429b9840144214617346c5e6849784eaa4e3f5b1469cbbf05407aaef812c10f61f0e693bcf3be1d5b852802280e15b2f8c74 SHA512 6baa5fc3fe31e1f9cd6422a667a4cd295783cf8c92aec5c4ff22918edafa461a90008ff4d99f8ded9f3718dbf9c667c59a6dfb280c62292a5b0915bd3b1081a8
-DIST kImageAnnotator-0.4.0.tar.gz 164030 BLAKE2B 09ec5eb18d212739c21b30809808cdd453321bf785fd79d21ae3ad5259edfb1dcddbac4de3fc68131627f0252c67f45f22d8572d91bb8c182d68e0d3140bcad5 SHA512 4fb76ff889ad4619080246f91e92fe9683056766b96faa071e0f73efd7c3647f90716fcf94b283461cd0152bdaa647002d26ffc7bf2cd1756ecdf3111005085a
-EBUILD kimageannotator-0.4.0.ebuild 962 BLAKE2B b5e381ba97888b47ddf9bc3ad10acec68252bdc8c3b2fed0bcf8dd2f73e7b6e13341c5413c164d0cf5c565fb9673a78058d2933bdf9d301809c5c632abb70ed0 SHA512 5800ebc6e15b18f0f50cd47d386a6204cb91888fa4a960738984eb7c9e07e63364f4ed4a6f1ad715fd5fc0ee2fc7c7c8ba59f941dd5f0e7b092d4df0d4a8f19c
+DIST kImageAnnotator-0.4.1.tar.gz 165976 BLAKE2B e25679416b411082aeaefa8d56aba203443c5a8fedef418caf7bd48b6facc07bfa4ed336d3f49970366023200bd4c0456ac631edc6b6c858b095f4410195761c SHA512 f133bfc81dc0aafd31a4deae2cb6a45b9d7941b27be3027ded7ffa59efe35c0f0a313b3076f672b93acbbfeccedf4832193fafe90c0fef004fab644d1da0dadb
+EBUILD kimageannotator-0.4.1.ebuild 841 BLAKE2B 9969bcfe22955dc6d1325e6041fea55a36a6b62c39b0fa66977984a58cc71b4d40b2edeb553b783e46534e66f029568f7f825af66987b6f93d2d3dadadb69834 SHA512 9887a7620a1f996a9987071f83bf7f8f3288f8d2f0fac748ddb05ea427316669459b8292e26d3b624907707fbb6dc690435717431c2003e5c7023dd45bf0d1af
 MISC metadata.xml 367 BLAKE2B f30c0617f7adf7b64264c40571a38b5375ac6cb00135ede7d70c0f55107caa1bd4bb3e51f1b0bb0e3f3ad123a21cceb0210cc75ff818554e7731e69d828831f1 SHA512 b32379ad213b24539da0e9efb2966792921cf98c7bdbb9903568ffde9f1fb76a5565f062c4e42ca906740d9c0f684815d9c929f6adba20d9fe6f8211f06e9da2
diff --git a/media-libs/kimageannotator/files/kimageannotator-0.4.0-fix-static-test-library-PR195.patch b/media-libs/kimageannotator/files/kimageannotator-0.4.0-fix-static-test-library-PR195.patch
deleted file mode 100644
index 7944118641c3..000000000000
--- a/media-libs/kimageannotator/files/kimageannotator-0.4.0-fix-static-test-library-PR195.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 25f13f3058c79e3f4a2b1cd257b213f102931cc3 Mon Sep 17 00:00:00 2001
-From: Dave Flogeras <dflogeras2@gmail.com>
-Date: Wed, 6 Jan 2021 20:07:20 -0400
-Subject: [PATCH] Make test static library explicitly link against kColorPicker
- and X11.
-
-This was broken when those libraries were made part of a PRIVATE
-interface by bbc2b6595 and af2ff6167.
----
- tests/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index b1ecc8a..9918010 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -56,7 +56,7 @@ set(TESTUTILS_SRC
- 
- add_library(KIMAGEANNOTATOR_STATIC STATIC ${KIMAGEANNOTATOR_SRCS})
- 
--target_link_libraries(KIMAGEANNOTATOR_STATIC Qt5::Widgets Qt5::Svg kImageAnnotator)
-+target_link_libraries(KIMAGEANNOTATOR_STATIC Qt5::Widgets Qt5::Svg kImageAnnotator kColorPicker::kColorPicker X11)
- 
- target_compile_definitions(KIMAGEANNOTATOR_STATIC PRIVATE KIMAGEANNOTATOR_LANG_INSTALL_DIR="${KIMAGEANNOTATOR_LANG_INSTALL_DIR}")
- 
diff --git a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild b/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild
index 35a7aa80a670..7a96553458a7 100644
--- a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5[png]
-	>=media-libs/kcolorpicker-0.1.4
+	>=media-libs/kcolorpicker-0.1.5
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}
@@ -32,10 +32,6 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	dev-qt/linguist-tools:5
 "
-PATCHES=(
-	# https://github.com/ksnip/kImageAnnotator/pull/195
-	"${FILESDIR}/${P}-fix-static-test-library-PR195.patch"
-)
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index cc29df61a70a..7a9dae19ce91 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,4 +1,4 @@
 AUX lensfun-0.3.2-warnings.patch 1813 BLAKE2B d0ee40324b584eddbee19442f1c221b25043d06b90357feee37b93e9c77dc9475bb45bb23fcd884d90cea031f6b6b46fc9c50e6f22d5bb816d9e289bac8a1e3a SHA512 517d613ba3916dd031eb026748465ec71f2cdc4658b0ce3dede827386f9805916f9bb1c4adc9af350b61b7e68bba1ceee02f89989ff91e52ffcb1ee442599527
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
-EBUILD lensfun-0.3.2-r1.ebuild 1471 BLAKE2B 8d1393eaf434cb159d3b2f0d817c9f7115c0097bc6afc3cd392be39583e24eeb6d4cd15f483629f3dd86d79772efd8640e2290826b9d2b860e744b0f38757f91 SHA512 cbda3e5fc148d73d443c524b16e24b28d253bb0558fba356ce608e13230f14eaba3af034f763ec70af101798a03725b2accbdd2e689eaa5eb7b36ac4fc61377b
+EBUILD lensfun-0.3.2-r1.ebuild 1473 BLAKE2B d0b953fbba2433d92b6fa3eb4db27574a39e4c35e825455999c18b2a99a6cc7ecb03afae83832817498bc6818b1d04a3253ee3ecc9ad1f9c20975f94b5c8db06 SHA512 37c709667ae5da978ae7990cf3b5b352fa83d872caeac4bd857faeffbc25069120abc86563d13ab67fbcb148b47cd92d4c06f4ddfdb74e1861a625840a708590
 MISC metadata.xml 713 BLAKE2B e8cc55a88122f0d188e1bce8f72f9ae57f1799c50ccebb1f1253094de326b9858e0ecf38922873397693946848910435103aefe6ed61040080e514d6d0b0bf0d SHA512 0c04301dcb4cb729050574c28c29f7f27494f1368bea0b62667e8ef3ed322a3339bd74090aa2e970129ae6b8e4e3bf749a090dbcca878adec90de568146bd32c
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index fe03c97849c9..dab6beaee637 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit python-single-r1 cmake
 
 DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index cb61349017c5..525bf4113e8c 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -4,5 +4,5 @@ AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 BLAKE2B bb196782a7da4
 DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac
 DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
 EBUILD lib3ds-1.3.0-r2.ebuild 640 BLAKE2B 3bfb11f5a8c068985efa79b1383ba2fb064d1abb292d296896c20cea4ef82c70adeea74c7cc088c0059c35610efd6ff6f54f03b1f693a10e8e8d162e0e9be651 SHA512 b5e009cf9ba4510b6802b72e61e8de44cbea936b610c875bccfecc1e7f65f2249930aa4da7047b0834dc0d490d0c1f54eae2a0d1221a48ce1e58c12162bd12e4
-EBUILD lib3ds-2.0.0_rc1-r1.ebuild 699 BLAKE2B c7ed09eaa47b6efe577f63dd0048411a86e0d71b4b3fdd31c8fc9065542365b412c6b9f82d39cc05d30ce5ce4ba61c660d65a318e59ddce58ebc3cc99fabfd53 SHA512 9c5cb3890adc65efddc6f80cf168a92c03b5b24552f811e1815aee45f052758e29aa317b3222bc86deab6f8c35963d6b1269554ecc5788fa9e6e7dbbc5ee01a5
+EBUILD lib3ds-2.0.0_rc1-r1.ebuild 704 BLAKE2B 78e2ebf501d6e22e7bbb405615f5573db91e7ab679fd35962e9e7026bd008a3263a13a19e2f2cef6a0a8693b1693902613d3a33e4c6dbd8443274130fb2a342d SHA512 ed931595a7c290116c5923ca1659820300daa988cfc00be75eeeb0b323d6941a0ecad87f216d4ac988c6e93e17bcd81c857be1e949636777a04929ec51517bc7
 MISC metadata.xml 596 BLAKE2B e9452f740b765cd11da41f9ae41656ed0db4a3994ee8d871fe7d074973c47938494d224cdc9b927e4fa69c3893af2383315962c6f10952c66a82163d74a32951 SHA512 0090513ed5ba8b3855a64d27e4a84e1e6ef340f178899e03ea7b43cb983ead98c64d8129559203403313c102efa93104be841c635245f02bcec350f0cb91fb11
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
index d5322d7ca6ec..e8423a28d6c4 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://code.google.com/p/lib3ds/"
 SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip"
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index fc9baf4e14ee..c07a6f5a2fcb 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -1,6 +1,8 @@
 DIST libavif-0.8.1.tar.gz 2915941 BLAKE2B 40030a5a002e68231adf48ecc6e8012f7ec53506770872fc79dfd73496fa3a214c10cf5fb5826f145fe1f881adf2a3ecca13c33989b2f048aa72e455ab6950e0 SHA512 03692fbba49fde08d76cebb847d0404a81113824e9e65edc6a0977f323d060c394d111e2a7647788fa3115f3ae80b0fc92d4fe5be53852e6734b96a8f1c1a078
 DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d9f82e1b7ca5876cb9859b96ac5b60ad86c2345654f85e97cb6d920f286b683d0bb588ce7db04f50322b158678c SHA512 92c5df26da70ca113ff3b217a4a09e3dea0b7c4737e0924bd2b232502cfda0c79f4f0785bc7992c973491af7660338cda481bae7b999632815142564bf3275ba
+DIST libavif-0.9.0.tar.gz 2961252 BLAKE2B 75a3d9c0f9ada1934fdafb8208571c6a863ffe04210d84b26207952028280d4e5c4efe42a6d4bc1fe417e3bbc06e8b93c416472c79ccd08d760ab65a663e16d9 SHA512 220ef27edf716af4ffc5b035c63f84e2848f165a3fe9c1b74dc0ba29f0de65147610fd4266f1b2419f60cfbb72159368da840fcb574c7a07364a60548d3db179
 EBUILD libavif-0.8.1.ebuild 1664 BLAKE2B 4d23f517dfb7afe074b36a3aef30ffde2ecddc49c0570e69aa54cedf31ae5dc2a499dd1e8f944fa44b606fb6302b49231ed8337d81f6e4fa6fde503794d80844 SHA512 32cb7970ba5fc28330c6b9575e693417c36116b7a57ff5aa1c4f88d6db039b3d14ec36b325d8df0f09bc56581b928725ed33f9093a46c39151409b103ffac9f6
 EBUILD libavif-0.8.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6
+EBUILD libavif-0.9.0.ebuild 1806 BLAKE2B 873f6d96b022b31edb2d01d20601c1318fcc89e86f512cf06a1b33fc004cdf6d4a2af0b098dd986e4405f7d550b8ff25f72fef45b7a5f6d3065a94f4f705087e SHA512 2428c8cbb7d57b707683be62328feb6fd9831afc0676c067bfd5983e2f8e5ccec1d9afaa669f8615d2550437ceba2cb3e68e4656fd9942d99c22bb3507ac27a5
 EBUILD libavif-9999.ebuild 1728 BLAKE2B b05566cc98406688badc4551f3fb8be04649b768d0a03ce093d3cdc94dae7df6909fd4b030ac8d7cae557a32e630bcf8eeae0e02a8ca470d4b0cf23ab83f81f0 SHA512 82e73423d625c76c7199d6e6afce22c99f4bf82485da39e148448493a8cdfbd4fc6ce6c0af98ccca374b80e2452eb44ba748e47bcd0a921bfc67770c6448581d
 MISC metadata.xml 843 BLAKE2B f95582a72acc4b86d02f246fca2a8c080ee96be8e649008f4b684cbf616c8201c3f6df1e258beb2e402add6da06fb3203254c902cf3613c4fd8d867f7f62b3e9 SHA512 80a0962deb24701c3b920c287875f26f4cdd8d282f0dc1af60039190833097bcdb78dabc0f82283035746a85a9a7b2d95241819fe6e0d36f3194bb2c62ea98e3
diff --git a/media-libs/libavif/libavif-0.9.0.ebuild b/media-libs/libavif/libavif-0.9.0.ebuild
new file mode 100644
index 000000000000..c00246430f4a
--- /dev/null
+++ b/media-libs/libavif/libavif-0.9.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
+
+DEPEND="media-libs/libpng
+	sys-libs/zlib
+	virtual/jpeg
+	aom? ( >=media-libs/libaom-2.0.0 )
+	dav1d? ( media-libs/dav1d )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	rav1e? ( media-video/rav1e[capi] )
+	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="|| ( aom dav1d )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
+		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+		-DAVIF_CODEC_LIBGAV1=OFF
+		-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+		-DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
+
+		# Use system libraries.
+		-DAVIF_LOCAL_ZLIBPNG=OFF
+		-DAVIF_LOCAL_JPEG=OFF
+
+		-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+		-DAVIF_BUILD_APPS=$(usex extras ON OFF)
+		-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+
+		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+		-DAVIF_ENABLE_WERROR=OFF
+	)
+
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if ! use aom && ! use rav1e && ! use svt-av1 ; then
+		ewarn "No AV1 encoder is set,"
+		ewarn "libavif will work in read-only mode."
+		ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
+	fi
+
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_update
+	fi
+}
+
+pkg_postrm() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_update
+	fi
+}
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 411c098220cb..b14e9131619e 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,7 +1,7 @@
 AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b279d9222ad94bf4c3875522db75ba585566b0609d1a27cbd4e25066832b19351acf05f5b00295ed5364c2984 SHA512 2b376149680edf6891f2129de2fc074dfc32a236d8eb19b3d899e1f7d3ac98eaf8cdf6e13c7b548ab59354c558e2c149f06d85c1c5be61c5e05cc5ec4382d86d
 DIST libbluray-1.2.0.tar.bz2 747265 BLAKE2B d9f0d1c321faa9008431b17aecba495e44d2795cea2973f9772b5be2c0193af53e3c947b9dd0b2d4d22c4085e163461252f895618e98491184d85eb7fbf5bd54 SHA512 d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324
 DIST libbluray-1.2.1.tar.bz2 751063 BLAKE2B af353e03a70b0202776c2190d927506225bbe1147fe5bfb19039839f5d82d0beb4fd7c2813a9ce10a2bc6f9d07e2a2080b54f1442e02e5f8e72564a5bcaf0a2a SHA512 e9eeee433034266e88c05ae3469c0bd2bf700d7f16e17ad706f48426c143c823e83c16ab79a637f1e85e4eb858aa0577630671f87ba35d179db2a1d8bc8545c4
-EBUILD libbluray-1.2.0.ebuild 2015 BLAKE2B c3cf6990b14304fff11405aac550c5530ba783c1c5deed300bf005d25e8c8b50f8649634886c54dd8ee65ca2c518b383955434bed59818f508101af6a193633f SHA512 410ab87bdf182df127ef572c0c08b7145b130561ff4ffd7a5f35b23ec18ac71f81d8d6a6e875c435b6037fb9b1fa7acf6a6a09e7e9df5e11aedec0c9f7c0efc6
+EBUILD libbluray-1.2.0.ebuild 2056 BLAKE2B 812ebe0d1aaab6226efa607b79bf8c04f792f7261900b5dcb0a4024b3bfa16d5fe688422bfd3503cd7dc79364bfcad3342d5aaed7bfdbe6abcd429f85607aca9 SHA512 de7cb76efd10b6a5ef3e906bb17c78fbec7bff47d11bf20073b8316e70d6938b8dd87f9aac1f7c7433fe0689c4ea5122848e22901fbe3a46bc9b48c3295ad05d
 EBUILD libbluray-1.2.1.ebuild 2022 BLAKE2B 8c0219e09ebd99b7184e13c36530721479c996c213cebe6990cad3172f152365c141c3e6046d31c6315e97313c1486732f8c855001353a6493aff52ac3e0b57e SHA512 682887926431df5790ef7c1a01a7a91a47100852184ce4d98b80bb9396a268fcb5918ff47b67906d94cdba83463bf73bba95e5a149a33408423546e36c5a59fe
 EBUILD libbluray-9999.ebuild 2022 BLAKE2B e4809bc9c8afb1eca5917ebd4958c6d60133e5a4cb75971f6def95432cc1d055674ab91515ecf1df74b9b2797d54be9afbc1ca1bb25f60a7c0547676f071c1ae SHA512 9ebfd3ca32b2bdfb487714c382e73263c916803a1d25d5c01efd03dfeb8a0c8c929c3b6a0b86209c068ed45480ed09a32489b56bb852addcc39d95f15805a294
 MISC metadata.xml 540 BLAKE2B 1385b09e4a4a1a2ffe572ca02cc50ae5808a2d283841128258a906742ab8fd67d48b1a677d601990d84a587cc18e9ae68409bf6e9af40e084c05da6f73988aef SHA512 181c79234a6c7a88d6df5b8e2de071fd7746505b153a1f2d92c4d6bffb95cbfaa3f276656b95786e02bc7c097d1fdce65afcc953c569bd82639707c843b1e575
diff --git a/media-libs/libbluray/libbluray-1.2.0.ebuild b/media-libs/libbluray/libbluray-1.2.0.ebuild
index 5046241e54d1..db894afbff0b 100644
--- a/media-libs/libbluray/libbluray-1.2.0.ebuild
+++ b/media-libs/libbluray/libbluray-1.2.0.ebuild
@@ -54,6 +54,10 @@ DOCS=(
 
 src_prepare() {
 	default
+
+	# bug #714610
+	append-cflags -fcommon
+
 	eautoreconf
 }
 
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index cf27342404b3..540d929517de 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,5 +1,6 @@
-AUX libcaca-0.99_beta18-fix-tests.patch 1874 BLAKE2B ff5537354ec12b336e6f0e9f35c41d973adc880656b8554b273ce92c3dce99491145e1398a8585bdb89b8f0054cd31c142f745f04dedeafa2cc6a2c445e05642 SHA512 1a10f0c4b006684471505b35bbe0369e6928c2dfc01e9d8c8ed706d9dc6890035c1fbf509e4a02c6030f0af382a982616c83128b92a2b5574a99e0963ae6b20f
-AUX libcaca-0.99_beta18-latex_hacks.patch 641 BLAKE2B ecaaed51bf3d8c7f75641da665bf8a4d25d2aab47de4bb0fe9e8ff40cacb628650a346074e2a57d220f7fa8a5c2063a8f16f65d52aad222dd81eba6269809e7e SHA512 66d878696ae237310cea20e3bd5802afce6fa94f66b07c1660456d17a33218a93e3aea6bcaf99bfada67bef6857089559aa48068a1761e7fe439a81d82a1ab6b
+AUX libcaca-0.99_beta18-fix-tests.patch 1886 BLAKE2B 8961c617ae568ab19b0404a8ddb1e4da743f7792b36fd32ace460071c04754f8e5845200333f96e4b9602f547d3249da301c3df62cee7bb20235da6a3242789f SHA512 583b440f93d2d468b14a707946eda928811b8c6573b1a48a1f6010d2f3713399689434531b0068ebbc1999dc82867c7ae6da0bdea9fb754277eda484fe39b1f6
+AUX libcaca-0.99_beta18-latex_hacks.patch 645 BLAKE2B 8b72799bdb19accf044c590a144ec7330532aebb7faa3076b12cc49ca82e8e127126b7d1ec8930d0a0871476e4f7632c6ebb6d10ae36146a3006040be72157d6 SHA512 9c1fc4aba3eecf94f47f296ebf11441de60ddf7a335c11bae4da4aa04e5cbbddd07d8cacf40b2b0aaf96312923c24cc0f1a3f031284cac13e8dd9c29ce36aa18
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
 EBUILD libcaca-0.99_beta19-r1.ebuild 4006 BLAKE2B d5a7e3f99356162b1998288dfd99a12329144bce68bb7818378df3b87a92fa90af1b466666cc59ac1a6786f13573c4af57b4b7392208ec8d56191e0647c1ef4f SHA512 3ab0b1fc10d7e2b549c0a9e1227a5d5973c6b075a657ad4d2f98e59ad6d56515522797a25b2f9a337c4c76f25c63497eabc4dd4c580f3e2a28eebc2bfd7949a7
+EBUILD libcaca-0.99_beta19-r3.ebuild 4162 BLAKE2B 721115dcd52859816b62ad09c2ca11e0083154fabd5cf5298b9f1ca28f908e64fb8521c5f507ef9995a8a84b3cbdaa28573b3bce777ef2ef20d5eb40c07d14fc SHA512 b2a5edc036c7b92b75a9bef4a7007ad71afb24d068adc405b11e70076a35b3bba3a0993bee9b1ed2627284c7df59aeb6e373faeca17969738aa73f57b594574f
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch b/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch
index f9ff8090c215..1bfb931a75ac 100644
--- a/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch
+++ b/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch
@@ -1,13 +1,13 @@
---- test/Makefile.am
-+++ test/Makefile.am
+--- a/test/Makefile.am
++++ b/test/Makefile.am
 @@ -1,3 +1,5 @@
 +AM_TESTS_ENVIRONMENT = \
 +	top_srcdir="$(top_srcdir)"
  
  AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca
  
---- test/check-copyright
-+++ test/check-copyright
+--- a/test/check-copyright
++++ b/test/check-copyright
 @@ -3,10 +3,11 @@
  #
  # Check that the copyright information is valid
@@ -30,8 +30,8 @@
        echo "error: $dir/$x lacks proper copyright information"
        nfails=$(($nfails + 1))
      elif [ -d ../.git ]; then
---- test/check-source
-+++ test/check-source
+--- a/test/check-source
++++ b/test/check-source
 @@ -3,6 +3,7 @@
  #
  # Check that we have no tabs or trailing spaces in the source code
diff --git a/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch b/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch
index 060822e6dcc7..15e17d2f95e2 100644
--- a/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch
+++ b/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch
@@ -1,8 +1,8 @@
 Hack it a bit differently so that it works with texlive 2013, see http://bugs.gentoo.org/480862
 Turns out this patch is required also for texlive 2012, see http://bugs.gentoo.org/517474
 
---- doc/Makefile.am
-+++ doc/Makefile.am
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
 @@ -29,7 +29,7 @@ if BUILD_DOCUMENTATION
  if USE_LATEX
  	rm -f latex/libcaca.tex latex/libcaca.pdf
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
new file mode 100644
index 000000000000..9e2445342374
--- /dev/null
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RUBY_OPTIONAL=yes
+#USE_RUBY=ruby20
+
+inherit autotools ruby-ng flag-o-matic java-pkg-opt-2 mono-env toolchain-funcs multilib-minimal
+
+MY_P=${P/_/.}
+DESCRIPTION="A library that creates colored ASCII-art graphics"
+HOMEPAGE="http://libcaca.zoy.org/"
+SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
+RESTRICT="!test? ( test )"
+
+# ruby? ( ruby_targets_${USE_RUBY} )
+REQUIRED_USE=""
+
+# ruby? (  $(ruby_implementations_depend) )
+DEPEND="
+	imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
+	mono? ( dev-lang/mono )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}]
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="java? ( >=virtual/jre-1.5 )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		virtual/latex-base
+		>=dev-texlive/texlive-fontsrecommended-2012
+		>=dev-texlive/texlive-latexextra-2012
+		dev-texlive/texlive-latexrecommended
+	)
+	java? ( >=virtual/jdk-1.5 )
+	test? ( dev-util/cppunit )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
+
+PATCHES=(
+	# Removed 'has_version '>=dev-texlive/texlive-latex-2013' &&' that prefixed this
+	# patch before wrt #517474
+	"${FILESDIR}"/${PN}-0.99_beta18-latex_hacks.patch
+	# Fix out of source tests
+	"${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
+)
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use mono && mono-env_pkg_setup
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	# bug #339962
+	sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die
+
+	sed -i \
+		-e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.ac || die
+
+	sed -i \
+		-e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' \
+		-e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I$(top_srcdir)/caca:' \
+		java/Makefile.am || die
+
+	if ! use truetype; then
+		sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
+	fi
+
+	if use imlib && ! use X; then
+		append-cflags -DX_DISPLAY_MISSING
+	fi
+
+	# bug #653400
+	append-cxxflags -std=c++11
+
+	# bug #601902
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+
+	default
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi; then
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+		fi
+
+		# bug #44128
+		export VARTEXFONTS="${T}/fonts"
+
+		# bug #329651
+		use mono && export CSC="$(type -P gmcs)"
+		use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY})
+	fi
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable slang)
+		$(use_enable ncurses)
+		$(use_enable X x11)
+		$(use_with X x)
+		--x-libraries=/usr/$(get_libdir)
+		$(use_enable opengl gl)
+		$(use_enable cxx)
+		$(use_enable imlib imlib2)
+		$(use_enable test cppunit)
+		$(multilib_native_use_enable java)
+		$(multilib_native_use_enable ruby)
+		--disable-python
+		$(multilib_native_use_enable mono csharp)
+		$(multilib_native_use_enable doc)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	local _java_makeopts
+
+	# bug #480864
+	use java && _java_makeopts="-j1"
+	emake V=1 ${_java_makeopts}
+}
+
+multilib_src_test() {
+	emake V=1 -j1 check
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	# Note: broken, see bug #508564 and bug #773913
+	if multilib_is_native_abi && use java; then
+		java-pkg_newjar java/libjava.jar
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	rm -rf "${ED}"/usr/share/java || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 98b5feb8c9be..0e6e250fc2c0 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,5 +1,5 @@
 AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
 DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r5.ebuild 2459 BLAKE2B ee479bd5c14d066928d8c82d54ce09ef8fc02807112ce8022ec5f1d9255af4f7ee22c2db97159f473e303e6d2c540de696c2e17813c25617dae9a61f4d74729a SHA512 65714b83fff4e88e20a41441168870d0fe9d42bb5f5636d884f5a9f797aa7eac7a5491b4be35b692d71301e29b34b665c8dcf29ad539f055868ec0681c109d80
+EBUILD libcanberra-0.30-r5.ebuild 2465 BLAKE2B 4fd216fd7773ab63cc32bc7f875c58508ec06d9b44bde3c3d5ee2ee91bace253a3dbcec695ac2bf96332c8ea54c3ed30221d724b5529114a8694bd6fb99437ff SHA512 f9990ec5808b8df9b162f11622d6dc5424a3d0a33466475256a8ba66e16c88466900e4f6f6233418bef9062cdec0847b383418a8d7875e7f521377d543b3b0bf
 MISC metadata.xml 1730 BLAKE2B 8a3bef42abdbb7b229af42e8555eee2eb339275c55ffbfa89e62564d4ca28501de45fe99f6efbae91bcbd0c580ed99136bba751367deda70f137230ae7a5746d SHA512 14720aaeff663ff227dc7f59d1f69e636d8bbc7771dda7ed5a950c2ac75c09e0075223fad78b24feda994fa92dce8e5cfc186e08a3515db0645f4403641a9061
diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index 344dbc295877..727ef0161557 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
 
 DEPEND="
diff --git a/media-libs/libdvbcsa/Manifest b/media-libs/libdvbcsa/Manifest
index d46d0fb678e1..d4ba96f39b36 100644
--- a/media-libs/libdvbcsa/Manifest
+++ b/media-libs/libdvbcsa/Manifest
@@ -1,3 +1,3 @@
 DIST libdvbcsa-1.1.0.tar.gz 345487 BLAKE2B ff5d9347f4255ca2c4e62477771715a7d8fcfca6eeb3a2e6cfdfcd903c9927a35d9049d18ec5a9d458328d6a3712d6cf81633e7ddc7c67d1a8099b8d56b2fd68 SHA512 f336bc90711261bb86bb42f897d5207a71da5a384bfb7d641de7e1fb3a43d20aeec250e9a5ceaf0b20f1e4335ccda70055675256c6889873bf1bfff55005a015
-EBUILD libdvbcsa-1.1.0.ebuild 808 BLAKE2B d1155025350811cbd931982701908d711b3ce7629336897983ad412ee0e7af9ab939e65621a652f992d8c97a671443ace4f6e4533d411f141c6483220668363d SHA512 618331153077bb542d654a6fab79c71f17200eacb350f72bcfe1d2086b736536b690ae3cc4d768120cbc87f7e849ac1e28a0a2a8262b87605b060846ee2b04dd
+EBUILD libdvbcsa-1.1.0.ebuild 806 BLAKE2B cb24d42c44474bc57e207a5e7736303be510ecf33bb33f9d8d733e4eb580def21e132b4d7b15865000e81a610317b51a5177c3bbd81332fd037fa6e883abb15c SHA512 5c12338d1abaa400e3eaac194d7d3263af90cf9beb87daddbefb5a692107cd67492ee3b1a653713a52358c2629ce7520c7599de77229585a2d25759ecf86255c
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild b/media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild
index 7f8e54937aec..ac84d04a2b38 100644
--- a/media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild
+++ b/media-libs/libdvbcsa/libdvbcsa-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="Free implementation of the DVB Common Scrambling Algorithm - DVB/CS
 HOMEPAGE="https://www.videolan.org/developers/libdvbcsa.html"
 SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug cpu_flags_x86_mmx cpu_flags_x86_sse2 static-libs"
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index fdf5b2c91e6f..981d2ea51157 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -2,6 +2,5 @@ AUX libfame-0.9.1-gcc43.patch 1190 BLAKE2B 7f99db82fe87c5f024ae68b7ddb68124cdf5a
 AUX libfame-0.9.1-mmx-configure.ac.patch 1003 BLAKE2B a775cdac594a6b30b78cbaee88f69b502a08d46b462f0d16206e878d836cef89f7bfba260a468600ffc36506a22630c5910822c7d9f11c074cc6a8119a436d2e SHA512 9632ad664682bf420eb4b30c25f4979215e172aaa81fe7ad09b714b36edf124bb3c60d56f63e55267345bd8be52b0ea35f40ce54421d1fc58ca8542915180db2
 DIST libfame-0.9.1.tar.gz 296837 BLAKE2B 2c3b2b1c90baa2363ea17ab308070e130a15e2f58efcf00166e724dcf55175179012ffa9874dfce7c9179dec01e0c63ccb0b051d744a326636acf70e796f2483 SHA512 511e7be0bac81482edbe5357b982ad1f4adf2bc784a9f52a3f095269076cd1e42866d2ae24a31b17c38acefc03e2c9d868b17074931e5d320ab5eb52271c4345
 DIST libfame-patches-2.tar.bz2 5324 BLAKE2B 03768badf8a3b0cc5546fed200fa71850c1151223b6b0e2301b56f396e9a71ec495ab2bfbb1ab5bd2c3fbc6f4813928786edfae8876e15c4f742bb09162a85ca SHA512 e4f67b137c3397dd00f8a4d5835a180963c3109c0d239d8f0fe616983a5187f6eaad9f4097cc9eaceb5b9c42de9d9e7518a4174247665a8203a4f69b3383abc4
-EBUILD libfame-0.9.1-r2.ebuild 995 BLAKE2B 2d8cb993ad1778c6afcd18470a9e7deeab240370cf3ba0ba6611a57965aca656403977e74ff2c8437423c91586a42a59efda6f69cde2b2bee4823fd37f52172c SHA512 77373224e5cef3416b8350bfd294d9b5b6bb4a6b0d7dc848dd1a05c8369a5de247e076d6ecfdc3ab9d26442a22fd7efac5734dbc4fad2896850deec27bdbd849
-EBUILD libfame-0.9.1-r3.ebuild 1038 BLAKE2B 471dde380cb7fb6d31f92c4600656e5de5f992b7f966300ac01453dcfb0929f687d3cf0fb77a53f1eb020f33273366311cc6cc53b2f9b486bb3033edd8ce6534 SHA512 584adbf9fc0073fd5ce822f5b757796a80dec6d5bd03c71c4012e25d400062b71dd93244d032fc57e72ba887001e0edae2fc4df3376d111a9ecc431d7f2d437c
+EBUILD libfame-0.9.1-r3.ebuild 1034 BLAKE2B 52b6b037f3dac484e97963551ea8418a7b388b8a634e3b68424d5c17d45bb656c7e14bdc668ad8013271a1682f5b7cb0fc0ffd761a2a53f7d5841d4e5eec1b2b SHA512 3e34c6f733498384c069a8bc6ee207a763af2aa77744280c4bf755dc1c7caadd0403ae366105f4645330ac4f64b2f28b7b60e43d021b61715a039488aed4af58
 MISC metadata.xml 297 BLAKE2B 11f51d49c6584b02011081cb8eaaa00441c9bf623bbd068fc731d0352c568e891654b18ee0c50d6722c31cdd966351cf58ce18947beee1410138b29c1d1c9b08 SHA512 6fad09bf8ac2d08c4e255fc2ae8a95afd410a7dbaaa91fc7467a78ace5a9a9a9cef1ec25ddd676a3c696a5a2714bb3c3f5b180cbfb0fd8a254bab9a5e310212f
diff --git a/media-libs/libfame/libfame-0.9.1-r2.ebuild b/media-libs/libfame/libfame-0.9.1-r2.ebuild
deleted file mode 100644
index 8a30205fd66e..000000000000
--- a/media-libs/libfame/libfame-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-multilib
-
-PATCHLEVEL="2"
-DESCRIPTION="MPEG-1 and MPEG-4 video encoding library"
-HOMEPAGE="http://fame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
-	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="cpu_flags_x86_mmx static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-mmx-configure.ac.patch )
-
-DOCS=( AUTHORS BUGS CHANGES README TODO )
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
-
-	# Do not add -march=i586, bug #41770.
-	sed -i -e 's:-march=i[345]86 ::g' configure.in || die
-
-	rm -f acinclude.m4
-
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable cpu_flags_x86_mmx mmx)
-	)
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libfame/libfame-0.9.1-r3.ebuild b/media-libs/libfame/libfame-0.9.1-r3.ebuild
index 71650acdb21d..d8afa4ffd3a4 100644
--- a/media-libs/libfame/libfame-0.9.1-r3.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx"
 
 PATCHES=(
diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest
index e3c68164b168..b98ac594959b 100644
--- a/media-libs/libgroove/Manifest
+++ b/media-libs/libgroove/Manifest
@@ -3,5 +3,5 @@ AUX libgroove-4.3.0_cflags.patch 1872 BLAKE2B 87a696b844394659d29bf586231519064e
 AUX libgroove-4.3.0_ffmpeg4.patch 2037 BLAKE2B 851cf22e93e2e5700b30c023d24b00db0852b36dd30665d655cdb3402c9d0ee1e286bc1a19988f992d8913560f6f943890cb7c993e2fdb798b23df4a1b0801da SHA512 834f760a7c7b51abda55f65d6fad1ce771d293ace9c7e4e39aaf5bfbc6763f9e3750e0aa3e8e6548893593b5c776bce357d557080b946b3425339367f21f2790
 AUX libgroove-4.3.0_sdl2_include_dir.patch 507 BLAKE2B d96df15e5378f8ab7d2f473c0fe05a210959eeb0ec4548bf7b03b3be701cce263d3c5d91c85834b18b2426e1c3de7845abc5eb069e226429a4d7ae67809f156c SHA512 5c9954680369c9e90a5acda70da36a57ea64ce8f44fcb5a0f962636cbf710ddd968c7c7bff18819671b6b89dc68a0b9513b8223ac7ba9bedf8f005b4485272ac
 DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705
-EBUILD libgroove-4.3.0-r1.ebuild 1102 BLAKE2B cdf667d82060e9d7551e4a46bdf3ef334dd5b3c820a6dd14308d3cd2c7c36f4a52d5edfeda453cef4fd8ef8df26e370980164a7afc8e11d4519d6c5502e67a09 SHA512 7e069a066dbbd3cfec6b04a7b8a0217645e2fe4ec6b728e22118912606dccc083ba3d30a72ba47a943aed8621064d890ed6390b89f74a65c213f43d5e6359a55
+EBUILD libgroove-4.3.0-r1.ebuild 1034 BLAKE2B 51ff73ff9ca7beb103c59ec0fa2ec93d3f5ebfcfabe90856635fc4646b1872a498d236b7d816e03037a6512eababa1ca30d2ff4afbd1c1462d27d0607cf51966 SHA512 b3bdb7c215e049b88341244b7b2458869ef949fa9e039008fa561696b2057c38686954852a217674279e5ffc2626181cf9b4fefafe12cd2078727d028906a8df
 MISC metadata.xml 1202 BLAKE2B 4949a299d75c9e9d7bd40df94fbe3fd16c608d0110ddad43fb5717751bb0ed174c7be81b1913ad2313b7b7a8627a3c079bc125e5d50a8a0544ea961e7c89b0cf SHA512 1173c515ba13bec73cd60fc78b5b9936d47563c89cf2968ef49eefca4efa8c75badbc1cdb26cf8cea8c7737e7972f9d236009b829ce5fa9f07875bb7db003ed3
diff --git a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
index 1b2a09b839fd..2b45f178d15b 100644
--- a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
+++ b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="Streaming audio processing library."
+DESCRIPTION="Streaming audio processing library"
 HOMEPAGE="https://github.com/andrewrk/libgroove"
 SRC_URI="https://github.com/andrewrk/libgroove/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
 KEYWORDS="~amd64"
-IUSE="+chromaprint +loudness +sound static-libs"
+IUSE="+chromaprint +loudness +sound"
 
 DEPEND="
 	media-video/ffmpeg:=
@@ -34,13 +34,10 @@ src_configure() {
 		-DDISABLE_LOUDNESS=$(usex !loudness)
 		-DDISABLE_PLAYER=$(usex !sound)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
-
-	if ! use static-libs ; then
-		rm "${ED%/}"/usr/$(get_libdir)/*.a || die "failed to remove static libs"
-	fi
+	cmake_src_install
+	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libs"
 }
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 45771314c0bb..0c8f44b3aef0 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -3,5 +3,5 @@ AUX libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch 2867 BLAKE2
 AUX libharu-2.3.0-3-cmake-fixes.patch 6376 BLAKE2B ec14be6aeda6e0e43a40bc2f1d41fcec4b601161cdcf1bdeff3e585bd78d6924aae322ffa5fe48f4fe221b1750b672ec7a80ba0a985368da4e5b00122b7d6617 SHA512 186d36b0b943c811e9fc34d448f58177914d2146a3df5cf8b12fe8c9fe7525046a7e53361052d308164cb99d4ec9a28341e4fe3b6cc69d6cb2c0ea03a49b0355
 AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 15988 BLAKE2B 6cbd9826317e6d1de126dfdcdd3508bfb6351c34cd58fda8f09fe44efead890d78c67f33750223cb2291312b2299ecf16f7b91e4e20a3024bb6007da96753f86 SHA512 94d1377e529d1d96941a90ac82276748f5bf7f0e248a6770d938394151e453aaa082c0d256c0de28f737e7e995bc0ee60a4eb5562aa450af1dfcc1733b403466
 DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
-EBUILD libharu-2.3.0-r2.ebuild 994 BLAKE2B f673398681e9d6fd1f88bb169682c77168297bd0f01fa8af451e5a5f5866889fb4a03ede12736969192a252383a32be694ad0dfb159a885253a74efe8c23a0fe SHA512 51ed100f32b29d56bbe2dcf25832366321bb01423f05aa3387bea6303594b8cd39560e0f5d2c87ec4be0f0a755c0589d0d6773a9a89f9b2bb2933d6e44414921
+EBUILD libharu-2.3.0-r2.ebuild 1001 BLAKE2B 9f04bc8a78562e064b218b416dc0cebbad3b6e2f986e484d373fea2daca824ed8d5daaec863795b50fb1eeb5d2aa1fa6ca79584ce7f55c5766e102bcb8ce6aa3 SHA512 82af022912c5bd3a56b1bc656a73502ff7c1ec2d1a60433e78acd00b199111557f4f14d599a0d81669637458cd120c750216e6fde2140bc78f7ecaf42f2f34fe
 MISC metadata.xml 875 BLAKE2B 1c9251d1eed492f8e1e19ba2e579ac05a91e19f52b44c3a04185ff0ecb1e087efd9da03f7eb512b64ff3fb38fee456aab45c6fe696a9f2f26ef77da38fda5380 SHA512 fde85e36972d2a50280cdc8d8baca9e958e7816bcb63c7c8203d65dc4400a1673f8dfd7921e4d87a2322fd0a9a696643e9d530f88cc6642f23388e19f6715853
diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 7542d93ed89c..5e6deb88198f 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 0fe62daa5db2..6041086f09e3 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,8 @@
 DIST libheif-1.10.0.tar.gz 1681115 BLAKE2B d9dc8c630f76d0f8df33e644fbbd589a92aab62927b72f7cc49b0ac9b65141979250c7fecbc4f119d62e5cc4386803580bff10accb3a0a4a04aa9c74ada9a146 SHA512 85550afe4d2c4a0af16213f51b7c9e9478f87199941d125aa7622ee42e5473a2344f3460d9c684b1805d45f903a98b77b4081f539d5b8c445fbf9443c8341629
+DIST libheif-1.11.0.tar.gz 1680855 BLAKE2B a85ed643bd05cd59a34e9e42c0b8690fc779c06d01aa4925b177c1a36e7a4d11c9dfa798295c9b8215f45802e80119f2a8f5c3876103818c5436358416d97dd8 SHA512 1a5d54a09a5dc581a054052bac4299f7c96ca121650e9238312c426d5261247ce6af1840088b8717c5a53d212b7ec17bfaa109b9245abfaebf1603eaeb77b0ed
 DIST libheif-1.9.1.tar.gz 1556450 BLAKE2B 5829afbde9c8ad8d7a2ed46e736d17e84dc6f5f2c4deccd1647c3048588fb8bdec96764a31e7801aac81d5f0a3f1c3e1474b8bd5e2d4d84236ef07478e62933e SHA512 a41ff9666877904da095c72af743b56196c75ce90deaeb1998be7eba9729a62282827e7e916e2a067489cc78e558c55fbb6d70da6a5b5281f6d2efcccbe6dbbe
-EBUILD libheif-1.10.0.ebuild 1799 BLAKE2B d2aa12a8d13d921528ca4649f2ac9445443c666908e946773e88eeeed3da8af7bb98aaf64340b9ec426086fe3dfcf764351e15bf3b5d45bd0da6609038b1da18 SHA512 48ff3b07952fcb6f9a73f300f546602d84156078ae50d8804ceaf13c6a0318c9ac5d985b7fcce36e17b5df0e7e1887133b9b9c336712951b14692ea36660e9ce
+EBUILD libheif-1.10.0.ebuild 1832 BLAKE2B 9ca2ae7db0359ce08c1438d21853c274fae7c9b4264a8579c4faa352db5193d17d4db51c838b18497b8152a772da4df34439e401896a995bb7cee416a009d6d2 SHA512 bca081a5dd7c953b914e58ea9fc48091a1c8eb3110b468d132b63633b2a9481890e8d3004b6d1176e11b21dccdc8d22c33f1d30296ed2417e733bca38dc10592
+EBUILD libheif-1.11.0.ebuild 1833 BLAKE2B 0d7fc59c209a62e3437d30a21ad587cf74a6b32f12a71349132a380ab4ba62e31a20564c3ffad60c9ed307b20d75e222c1e93a7b76624f4a07147e8d387fbb87 SHA512 b525e20e676dc64b9e798671bf52035188e16e893cca79722b350ac31057e223b32cded88ceafaf52a94290b6341ed65109de9324806008575ab28a07ee6478b
 EBUILD libheif-1.9.1.ebuild 1594 BLAKE2B 32fcf5315081f5aa4437c88de45393c2965a391f0d37fde470f3527d8ce5a5c346088ce0e119672cafc4788eced325c7eb415f4252a16d455995249636f38912 SHA512 45026b98d6cab726bea57cc32b16ac5ee535c1b56355f75108cb5c3e566a7df07d74caa566deb8baf3046803c69c35ed71626d07dbe7676ef0a9a4c5b8cfbdbf
-EBUILD libheif-9999.ebuild 1799 BLAKE2B d2aa12a8d13d921528ca4649f2ac9445443c666908e946773e88eeeed3da8af7bb98aaf64340b9ec426086fe3dfcf764351e15bf3b5d45bd0da6609038b1da18 SHA512 48ff3b07952fcb6f9a73f300f546602d84156078ae50d8804ceaf13c6a0318c9ac5d985b7fcce36e17b5df0e7e1887133b9b9c336712951b14692ea36660e9ce
+EBUILD libheif-9999.ebuild 1833 BLAKE2B 0d7fc59c209a62e3437d30a21ad587cf74a6b32f12a71349132a380ab4ba62e31a20564c3ffad60c9ed307b20d75e222c1e93a7b76624f4a07147e8d387fbb87 SHA512 b525e20e676dc64b9e798671bf52035188e16e893cca79722b350ac31057e223b32cded88ceafaf52a94290b6341ed65109de9324806008575ab28a07ee6478b
 MISC metadata.xml 1008 BLAKE2B efdcb0e8e478a1c4959b60f942b45feb79f9209157e29b8be19ca862a1f19b4ffad223a531fbb400351650db09285e12007a4d5f55c7762806496cdd8d520e72 SHA512 fd7c1bf830f32c9a9d13cd2471c403ce889dda643027b191e36cc6c1dd9fac4c481946c221cbf186b380bf26cb816b7f8695ea3aa5f57fde15a366c21197203d
diff --git a/media-libs/libheif/libheif-1.10.0.ebuild b/media-libs/libheif/libheif-1.10.0.ebuild
index d68ecc0dddea..1dbb452f4a4d 100644
--- a/media-libs/libheif/libheif-1.10.0.ebuild
+++ b/media-libs/libheif/libheif-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/strukturag/libheif"
 LICENSE="GPL-3"
 SLOT="0/1.10"
 IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
-REQUIRED_USE="test? ( go )"
+REQUIRED_USE="test? ( go libde265 )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
@@ -48,6 +48,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	export GO111MODULE=auto
 	local econf_args=(
 		--disable-static
 		$(multilib_is_native_abi && use go || echo --disable-go)
diff --git a/media-libs/libheif/libheif-1.11.0.ebuild b/media-libs/libheif/libheif-1.11.0.ebuild
new file mode 100644
index 000000000000..f85c234173f7
--- /dev/null
+++ b/media-libs/libheif/libheif-1.11.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.11"
+IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
+REQUIRED_USE="test? ( go libde265 )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
+	go? ( dev-lang/go )
+	libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] )
+	rav1e? ( media-video/rav1e:= )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export GO111MODULE=auto
+	local econf_args=(
+		--disable-static
+		$(multilib_is_native_abi && use go || echo --disable-go)
+		$(use_enable aom)
+		$(use_enable libde265)
+		$(use_enable gdk-pixbuf)
+		$(use_enable rav1e)
+		$(use_enable threads multithreading)
+		$(use_enable x265)
+	)
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_test() {
+	default
+	emake -C go test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index d68ecc0dddea..f85c234173f7 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,9 @@ DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
-SLOT="0/1.10"
+SLOT="0/1.11"
 IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
-REQUIRED_USE="test? ( go )"
+REQUIRED_USE="test? ( go libde265 )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
@@ -48,6 +48,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	export GO111MODULE=auto
 	local econf_args=(
 		--disable-static
 		$(multilib_is_native_abi && use go || echo --disable-go)
diff --git a/media-libs/libiec61883/Manifest b/media-libs/libiec61883/Manifest
index 726ca4a902c2..ef0be47bbce9 100644
--- a/media-libs/libiec61883/Manifest
+++ b/media-libs/libiec61883/Manifest
@@ -1,5 +1,4 @@
 AUX libiec61883-1.2.0-examples.patch 1140 BLAKE2B ab448e0a4941fd87ac8d0cd2cb6f21e3fc784b956ff2d8a1b81cad50a91ac0e60469eb5341d7ff3d7bfb7093fe424a51b63246292b52a62dcd773370fd6a7445 SHA512 b022bd213e82ae0f6ac206512a6764784720ef4e5caf349e39e729ec2a7c6b84c70af9ef02753b76e431707fc36fe1cc076b87367ca3c89250bcc1a0660d4eb7
 DIST libiec61883-1.2.0.tar.xz 233640 BLAKE2B c1fdd4d6fbfd96eea9f1c22b20a1e71e4cafbe064091ef6211d097342f8751955f2d8a68cb3e5235d733f7ecd3725144abb329331bfa3497be1911bb8773d4a9 SHA512 817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23
-EBUILD libiec61883-1.2.0-r1.ebuild 943 BLAKE2B 172fa1dc69fae176b893f8f489c756c5535000a572e7d2a580e1f3e65e326e05c43d9c9bd6cd3f0ac540605dca68ce4f341fe25a205d5fba72c087712555065a SHA512 8bde8dc265aa718ba5354bb9a5eaf7151298158bd052f946efe6a2ebc2171b314c911b238556616c04c54de61f8fa06e1895b564bcdaac720b5f13be5dd163ec
-EBUILD libiec61883-1.2.0-r2.ebuild 850 BLAKE2B f7e0c426ebbdd3288a8b0fd7269d469acb8189b71a260ddb8dc571e355114df39a6689ae5f98216680c648a14068158cfdb366e3bd682545b940708863c9c14b SHA512 54974d4b4771fd9eaaf0747ec94c0a740deff27f9197e82f4c69fd318841bca8fed9c3aaaa2a42a4a342e5d5658ba287ed32a5165c709fc674fd8f0a70a9de38
+EBUILD libiec61883-1.2.0-r2.ebuild 845 BLAKE2B c3883a20964d2fc7a5fde19526c14d8907f0d5818148cb57d2ed81f5bd44094b56539a413dae4d70b74364560745661d1597000c2860054d6e4e99bb096bb78f SHA512 4db797835327a3087c8326a7102f0ce2435763bf35d3934ab46d98d13ed3222b5c29a4c5193f115113c30ed2bb708716b497e77bb70b8f9d85308c7d314b9a4a
 MISC metadata.xml 531 BLAKE2B b3f4a2efce5fb0eb30e14c02ab34a58d4dd4e38b7b5a8b799816fa4ac50fec6e2656652629f351388519f6bf05275448f22fd10b4565884c12bdf054130639d1 SHA512 bbf4b45023f2a7f1ed7769fa4513cc13ec9697eeb677fde7ec882f5f787e00d0b291ef6be1c2d0ace4d35059782d85678c9ac38f8913ffd63f35a82ebfcab933
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
deleted file mode 100644
index e9b573d52ae9..000000000000
--- a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib eutils unpacker autotools
-
-DESCRIPTION="Library for capturing video (dv or mpeg2) over the IEEE 1394 bus"
-HOMEPAGE="http://dennedy.org/cgi-bin/gitweb.cgi?p=dennedy.org/libiec61883.git"
-SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples static-libs"
-
-RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	if use examples; then
-		sed -i -e "s:noinst_PROGRAMS.*:noinst_PROGRAMS = :g" \
-		-e "s:in_PROGRAMS.*:in_PROGRAMS = plugreport plugctl test-amdtp test-dv	test-mpeg2 test-plugs:g" \
-		examples/Makefile.am || die "noinst patching failed"
-		AUTOTOOLS_AUTORECONF="1"
-	fi
-	autotools-multilib_src_prepare
-}
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
index 13dd6ab4543e..cd9a6c950a2c 100644
--- a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index 7ede4baac883..48a593da5282 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -1,3 +1,4 @@
+AUX libilbc-3.0.4-respect-CFLAGS.patch 1217 BLAKE2B 69e46ed5ee1f9ef082b54b6049d078dfa3a007d63b8d0a79c1f07dd8335eaa0402dcc08bc30c0bf8c9329b1244d638231c10fa46396a9c07cdcdab8539fa6c5a SHA512 7de1bb74f552dadccbe3a31c4a2cef7da7525fae47dc7e5d22c78e59604ac9e07e3f4123acc35e174dcf9fe25f4c7e3b6e51a092f77c4f604b23af1ed724cf4a
 DIST libilbc-3.0.4.tar.gz 1307591 BLAKE2B a914b79c1134536f45910d367216b1ac27d4acb08f4c9b9dd3f01eaf181ecf0f6dc351b944039b05445217360a7e4b868b3aba9f8d6265eeee62a90ce0641a42 SHA512 2239a915263c2a73d83836354d42c670e4fe1173a38b3d1a9cef169778038ae5f4901d8202d6c5367d00db76e034e72bcdf6ac81bf0188f6a3f928e7d36d5a31
 EBUILD libilbc-3.0.4.ebuild 599 BLAKE2B 5476326bb06e7c351926ab0364a42ffcdbc025af8e03ec2663edffab7b78307a12ab021a5af977303887fb46e4f2ad5698af1d321d7104abc0c8640ae357b49d SHA512 40e44020521fbae740f457a9e104c412f4cebfe8c295cb06b5a7490825239b7b371ef16fc03f3d9806339df00eb9206646942cd89bdc177fea73d01544986626
 EBUILD libilbc-9999.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
diff --git a/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch b/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch
new file mode 100644
index 000000000000..feb3a2255e10
--- /dev/null
+++ b/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cda8105..b766ec2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,15 +52,15 @@ set(CMAKE_CXX_STANDARD 14)
+ 
+ if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR
+    (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU"))
+-    set(CMAKE_C_FLAGS "-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing")
+-    set(CMAKE_C_FLAGS_DEBUG "-g")
+-    set(CMAKE_C_FLAGS_RELEASE "-O2")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing")
++    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS}")
++    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS}")
+ endif()
+ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
+    (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU"))
+     set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing")
+-    set(CMAKE_CXX_FLAGS_DEBUG "-g")
+-    set(CMAKE_CXX_FLAGS_RELEASE "-O2")
++    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS}")
++    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS}")
+ endif()
+ 
+ if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
diff --git a/media-libs/libkeyfinder/Manifest b/media-libs/libkeyfinder/Manifest
index 260b393a5545..92c53fcb2270 100644
--- a/media-libs/libkeyfinder/Manifest
+++ b/media-libs/libkeyfinder/Manifest
@@ -1,5 +1,3 @@
-DIST libkeyfinder-2.2.3.tar.gz 117373 BLAKE2B a6d3ff64f26e0842c95dea125ae86f3c642db101fe934bf0a54a3586276cea1f2ee427e480e4f375067b80b2c9d9623f9276110371cc91c8b8d9319c92fd91d3 SHA512 7617bb7305854790e2d5fba5e401387612cad4fa61e9209a6af45301ee8dcc990c116e478c70a5d845d12fc6dfaf63362dca608f4774640bc6c29459ca192f45
 DIST libkeyfinder-2.2.4.tar.gz 79053 BLAKE2B 4d30931451625b00e1ecc2bfb6349497887ab805b5a986e05dbc51fb007a2aededcefbf9fc18c1beb7a7bc4e368c763a658979b5c5c6f7e91f4a21797ad414d7 SHA512 6673b9a81dbfa3693fc4e7af4e5fc0f351f0c60b00fdafeb9e3437e2f77b5fec7d1e78e3989ff1daca72770a1d3cdbe3837508718b8e8aba3ac3f3d56af81a56
-EBUILD libkeyfinder-2.2.3.ebuild 653 BLAKE2B caca1cae9f0e66b72a8934fc05c52e448f274c8e0bd07534b1b107d9bb33326d6326c341bf31de5004c3bf15e53e552ffa25939122299d8399db0c08bc6612a5 SHA512 2788c76a06485cedbfa5eb72ef84a22538c47d330c4c353b9470c73dc9bcb95258b091630508e0cef81ab125551464b262c62a3db72e559335b9d2bde0f4eac2
 EBUILD libkeyfinder-2.2.4.ebuild 626 BLAKE2B 8e8ccfefe5732c82eec1b155ebdb52ab05dea92dca7bbd2b5a54edc463cbdc0f808beabc133412536d646b1e2957ba1b5e705aff1043309bcb27a53d5e5829b5 SHA512 5384f945acb1f6323faad9e043c911e737c1d00542a901bcf12ce73a87a8714e3a26f79c28e0a40f63b2debc63bb71021e2e57d2fc8d9bddf2b0afa787192d88
 MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600
diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild
deleted file mode 100644
index a6032b4b6ffc..000000000000
--- a/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Musical key detection library for digital audio"
-HOMEPAGE="https://github.com/mixxxdj/libkeyfinder"
-SRC_URI="https://github.com/mixxxdj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	sci-libs/fftw:3.0
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/libKeyFinder-${PV}
-
-src_prepare() {
-	sed -i -e "s/NAMES fftw /NAMES /" \
-		cmake/FindFFTW.cmake || die
-	sed -i -e "s/DESTINATION lib/DESTINATION $(get_libdir)/" \
-		CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/media-libs/libmms/Manifest b/media-libs/libmms/Manifest
index 84160011960c..bb8f84bd2f0b 100644
--- a/media-libs/libmms/Manifest
+++ b/media-libs/libmms/Manifest
@@ -1,4 +1,3 @@
 DIST libmms-0.6.4.tar.gz 356217 BLAKE2B 2b0029cde3e985b1a0310e7d00acafb54a53606c656fee1b87a086a31ecc1e488aec31e86880959f23a077a20594a6c939efea3e08545a3d47f804ed762395a4 SHA512 9771c697515f5232eaeaff79e68fe15e34d8aa38aa5d3d68525216357223f314c544d71b5fe18d79a77682f41b1b5d9fb5e7c3c99d0cba5723d2e3de31faec96
-EBUILD libmms-0.6.4-r1.ebuild 687 BLAKE2B 572fe7f67fb62fa39a0d3e3b50c0e9e6e927b79370e1c9f27052046f3768699de5521e06678f3f853e34daf5355b709710495a80eb3912b0c4afed9fc9786800 SHA512 87b269d52b44adde51055ed940153f72f29a93bc9f06b56d2e5a6ef83a1270e444021bcd792025c563cca942034ded713f973f8f88e4c1975940e43bca8c6f9b
-EBUILD libmms-0.6.4.ebuild 636 BLAKE2B 10e4eebbdfa1b21b0b1883a76b95535e840c09bca39af8a0283ad86c604add9a815c7f48178f73c18e2f46a5a3f0fbb8a76cb03bd87b72bfd47a16a45d3ba88a SHA512 bf4fbba5e64f588fe5624a359ca654be47fd047368a94d793df63512823afe30f9161a02a9472e0c484320afb2b36b949421d8f0fc2389d37e65133a44fba1b5
+EBUILD libmms-0.6.4-r1.ebuild 684 BLAKE2B e384bf8387e59dd09c225d8417ed4462b4fea39ac89859af218d51dc22c14ec18ecf39a6840b274a927f506b92d93a42fee44383fada1caf3246c221c8219ebb SHA512 845a4215d9a94f4579a73e3e8e8a7a12cb737a42a21a40d08a7df98164299238000f822494dcc5b5af9d5e4e10331fa5e61bf8a1f29ad0dee948873882ea153b
 MISC metadata.xml 358 BLAKE2B f61ee71ee2acfcaf289a33d28efed96cae45933a0a0434f53e2fd2196722eb3c2f4d2f75a39f31bbbb630d11b67bca1f6d43c95349d3f97560f6260bbfa50082 SHA512 c9c5cc18c8b1ea6dcd96d280d74a811f19f7a93a866b95263454d46975f876791559799dd2e036b24f41e8c10d8130e2a4b200aa71f087f44044ebadd5d9aa95
diff --git a/media-libs/libmms/libmms-0.6.4-r1.ebuild b/media-libs/libmms/libmms-0.6.4-r1.ebuild
index 87f7331674f3..6f6c86b591a0 100644
--- a/media-libs/libmms/libmms-0.6.4-r1.ebuild
+++ b/media-libs/libmms/libmms-0.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libmms/libmms-0.6.4.ebuild b/media-libs/libmms/libmms-0.6.4.ebuild
deleted file mode 100644
index 89ae2449c679..000000000000
--- a/media-libs/libmms/libmms-0.6.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-inherit autotools-multilib
-
-DESCRIPTION="Common library for accessing Microsoft Media Server (MMS) media streaming protocol"
-HOMEPAGE="https://sourceforge.net/projects/libmms/ https://launchpad.net/libmms/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README )
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index bfa44c185085..4aa9d0c4a2a4 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,6 +1,5 @@
 AUX libmodplug-0.8.4-timidity-patches.patch 557 BLAKE2B 4c26c285bb2f23057dae320ab3488e13dbbfb420f8185fd615732912e17f416537b4d210cf8cf48745a3b6dc2df8be49274904626e9db432f2f347dacfbe99a6 SHA512 4fa8bfe0665713b65b0b3f9be59589c98c7fbe5aa278ee95107fd1b91ba1a25fbd20a86bf91ab7eb7e160f522e04dc78838ada6298d4f5c1905b528c1fd7a57e
 AUX libmodplug-0.8.9.0-no-fast-math.patch 437 BLAKE2B 7b4f449d4906480b392b2ea93260c816a2418678a6f5209c6d00939830c977161c6d481a34830e0e0b39400adcf7af8665df63091580bd3db84841f7ee8158f1 SHA512 f07f8e3efdb4d15dc8916c5f62429f2d51a0342743a2bc881b44fcc8cb689fe973f9089815c2eb3ba469e622e9c4f86a7c4f5b6e5bd78d506aa7c69b80426653
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
-EBUILD libmodplug-0.8.9.0-r1.ebuild 833 BLAKE2B 753e00b596fe381746019feeab969da083b71db86ced44288e1b7b91a7a65ca6f52e2ac042e4020bca345777f87c506ee8fdf330a48dd9da944c0e5a40fe82a8 SHA512 33a708974974aa5b028d7e9fb85538bf992b45c0ca550208fec515cf03ec93cbc1c0f4b0838965dcbda17acdd1d7b358be1dd4750beff948df30a57744706f61
-EBUILD libmodplug-0.8.9.0.ebuild 741 BLAKE2B 109d2ddb2adf9b398114dbc7e8fedf82584c089ff7513e3a8a559971727f731fb734974f42ef548a691edcfd2fc43490aa68073bbbeedd074ca14dc35d662db2 SHA512 b9cfbf0f1b9b2ad38795df9242a8e47cfd240529520561db0f884af7843a8796f4f14fea84d0bb9edbdc94285b3e189adada3962f0d39c4a67341425db784856
+EBUILD libmodplug-0.8.9.0-r1.ebuild 828 BLAKE2B e069061a34376f674a2ac2fd727c732dca6f893028e120dc5122c62cc22369cbdb4f4d84548e3988d61dbc295f94a9ac59a57f6f72bf8b3c3af93bf2caaba6ef SHA512 7cb9eca3dfa7ba49da79d1ca6f49b7e6d8ef5c905fa724ae61c9b72558e1ccea1f35e2545c26fac07c27d2c22088e3cc51f0920b2680f59b81bc48600337f5b0
 MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
index 5609e526ea88..fc9c59f2321e 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
deleted file mode 100644
index 82c45f86a9c0..000000000000
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
-
-DESCRIPTION="Library for playing MOD-like music files"
-SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
-HOMEPAGE="http://modplug-xmms.sourceforge.net/"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.4-timidity-patches.patch"
-	"${FILESDIR}/${P}-no-fast-math.patch"
-)
diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest
index 4078398fa408..583159fb0667 100644
--- a/media-libs/libmygpo-qt/Manifest
+++ b/media-libs/libmygpo-qt/Manifest
@@ -1,5 +1,5 @@
 AUX libmygpo-qt-1.1.0-qt-5.11b3.patch 4991 BLAKE2B b79e01b8c72c9248ebcdda72f7051e799a399a8153785ec35cc223ff64e0707baa856846720e79acd5fc93bd73ea7e1ac8b48e8fc4a853970019b0eaac227a55 SHA512 91617ce03cfb94c9524f06dc5dd3af0c84b5b7af279cc8e13b8d4cc221b6d86c4f28347039a944f9002c57ba65bdf8c870e6076b7877ee1c88e1fefa31c1776c
 DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a
-EBUILD libmygpo-qt-1.1.0.ebuild 955 BLAKE2B 65f78497d97db14a20a6f03374c8dac38b80b401a61b07f6dc47d241a8f7dbd6b954f963fe790718f25eeeea6ae83e0eaf0fd4c153538e8668891387b82fd21c SHA512 168a9ee0d73f06eb397b328afbd73b2d1490372611234d17a849dacd27b2231547fa3e6efbba5d104da4195001cfb19c5eca54ce2296cdf5807be1f9d3c58597
-EBUILD libmygpo-qt-9999.ebuild 787 BLAKE2B 47d3d8048f378ac0f07856e97896dece83d51aae984f6cacfddc35740b864f646710504c5834bf671fb67e0cd3ba75bd00ef055fa06998970f4403e251a80347 SHA512 ba87fcc11692dfff8978caeeeefd77060635f722a924800d77117502642aa04989dddbf8aacbbc49e6594a7d3a616f8b0f12df73ba29bb2e479f30a77e1ad377
+EBUILD libmygpo-qt-1.1.0.ebuild 949 BLAKE2B 06569a501cebe0d307fa28418345173db8d73715fbceea73dac793c3c2aa677ef80384d0bdc36556abbc47eae45265aec24e9f6daa7400f462e7e127dc8a323c SHA512 7f8a0061c7dd495d131b12c696acc1afe15e581a44be6154f8bbd3bba98eef0ee73c1db127c8d53faaeecb06145e15d7b877364ee447dc120a5203e180600434
+EBUILD libmygpo-qt-9999.ebuild 801 BLAKE2B 82f4bba29a54e619090a59b1f3d19347eab4331e70c0dd25c576974e0aab051927aaf19e0b547e507fd229cd3c1185deba3c0aca657425594807f319b733cf95 SHA512 79439297ed45bb8673f1c0a1ba1171812118c68ac7ec8753483f81f60242d6a1ad76e2c7692ab599efcbf1c040f5882c847953889e7d0583897c70267b30c8a7
 MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
index cda56925c14d..336d3d382254 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
 HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"
@@ -21,12 +21,14 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	test? ( dev-qt/qttest:5 )
 "
 
@@ -38,7 +40,7 @@ src_configure() {
 		-DMYGPO_BUILD_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -47,5 +49,5 @@ src_test() {
 		-E "(JsonCreatorTest-test)"
 	)
 
-	cmake-utils_src_test
+	cmake_src_test
 }
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
index 55b84538167e..ce97b2319290 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 37ee57e9e0ab..a816a3a9619d 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -2,11 +2,13 @@ AUX libprojectm-2.1.0-fix-c++14.patch 1505 BLAKE2B 102d3e8aa719fa42e92e81c5dd4fa
 AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd04699938f08bfe2b9dbebe95f19abcd1e16c4f7f9619c44639586611f3c7b69784af92d2fbff02ab301503ca626ff9da0d7c0 SHA512 562e9616500a49b52e29d50d7c40b8db2b8eb36dbcf28c2b415975b0ce751d21d8ecc06747c3c810303078a2e83ee1c6ed438818d936ddd86efe94900d1a348d
 AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
 DIST libprojectm-3.1.11.tar.gz 52831435 BLAKE2B 286cbe5d7c497b0955da38d3ccfd4a5c97d80bc102a4bb739f98ee6c39afb1420d780c989997c16be9d2e7d54718a498769f98e15e2443bc7ac8ad850ecbb2df SHA512 da2c34ce5798205d31906c401d98ad2f16a45b6123975a291657c892db41c86d05d38edee34b52f2415c4442d8302c8c0dc5bb89e5932a057df17f7ccac7db22
+DIST libprojectm-3.1.12.tar.gz 52831726 BLAKE2B f9a9ecf8fc55b49e664a61a5c0ca3eef745b00390d5dd3b1549d6d68985c246834d35adb96ab8595e2bf78997c4688096c7931a6be54ea9d867bfdbe5a427832 SHA512 6d265280f3e3e952686ebf77afd8b083669e9ab81d2d9d122168d47747c367ff3b17ab682cc041e4ac9cee9607b7393b5dcb067deac95fcbb97d63a9656912a5
 DIST libprojectm-3.1.8.tar.gz 55482686 BLAKE2B 226cc62ce84932e81c650dac8dcf89eed4d71513324b3bb3a7250c450cb002870f2c2c2eaf6947f6056b35efa5159ea7956bfec420e9f545df445f7654a76d05 SHA512 efbcd5e867ab9e710d11018d580ae6c3bc7aaba46e3ce2a3d682e9ec341756db6ecf613deab0a9d13ed6ace3d05dcf19a384c00ee21832acd5b6ebfe2b806f44
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
 EBUILD libprojectm-2.1.0-r2.ebuild 1462 BLAKE2B 02bd1446c7250f0313805c051814ea9114b881ab8cfa7b5ccde11c88c636826600660026935bdbf7a9a283c540c220080f98b28bce7f626ea21dce830723e73a SHA512 b82ecdef0da92c14e0993d099cad1741ff5f7d5407c2d31c275ce3a9664929001ed3099b554767ca49626a2e104bbb5c4ac90a68689f20f1e0e9e3f58b66c40c
 EBUILD libprojectm-3.1.11.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
+EBUILD libprojectm-3.1.12.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
 EBUILD libprojectm-3.1.8-r1.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
-EBUILD libprojectm-3.1.8.ebuild 1359 BLAKE2B 35125d135a787204760525a533d86d8b49b9c2006ce1e067460d68a61451cb9bd4ce96e71eb1ef02e5806d09b2d1c1bd05724af05e6abad55773deeed3c1df19 SHA512 5250de2e327f8f411273a819881d158fa28e93bc3f1f8d993b197892277bf436568eb946185ca740c974324501b4e39e76d918c92eff97034de253dd261deec9
+EBUILD libprojectm-3.1.8.ebuild 1358 BLAKE2B 872f453155627b3daa9b06a14c503a66f1f7c8b2bedd0a60faa86a001fa80339fad4ae55b313b9a73002042ce501209acca4089c9d9cb01a6ef3a5a744e2f179 SHA512 3502ebbe98bbd5fb0a41bab4e4ee75de12a55bdb3f191b0f87e85f1a1a9251bc5b3a14ac9ab6683b38fca48918ed5addd24a3df7327f7c6a2a10c2e964e9829c
 EBUILD libprojectm-9999.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-3.1.12.ebuild b/media-libs/libprojectm/libprojectm-3.1.12.ebuild
new file mode 100644
index 000000000000..a273f50c063e
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.12.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	S=${WORKDIR}/projectm-${MY_PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0/2"
+IUSE="gles2 jack pulseaudio qt5 sdl"
+REQUIRED_USE="
+	jack? ( qt5 )
+	pulseaudio? ( qt5 )
+"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+	media-libs/glm
+	media-libs/mesa[X(+)]
+	jack? (
+		virtual/jack
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtopengl:5
+	)
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	sdl? ( >=media-libs/libsdl2-2.0.5 )
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gles2 gles)
+		$(use_enable jack)
+		$(use_enable qt5 qt)
+		$(use_enable pulseaudio)
+		$(use_enable sdl)
+		--enable-emscripten=no
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libprojectm/libprojectm-3.1.8.ebuild b/media-libs/libprojectm/libprojectm-3.1.8.ebuild
index 12835ffd75a1..8b34a76cc923 100644
--- a/media-libs/libprojectm/libprojectm-3.1.8.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	MY_PV="${PV/_/-}"
 	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 sparc x86"
 	S=${WORKDIR}/projectm-${MY_PV}/
 fi
 
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index da1e65a7b269..07398d72f489 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -6,6 +6,6 @@ AUX libsdl2-2.0.14-vulkan.patch 554 BLAKE2B 654415d20fc1782ee8d3a979355dcb743537
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
 DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
 EBUILD libsdl2-2.0.12-r1.ebuild 5507 BLAKE2B 90e85b193d881a8c5e6309a21e0e49c63d747f1b1c961625f58d760b8170dee0107a6896b64b3ba47788128feaa0c669e5b325445f0bf2f7dfbb0d6a3293c649 SHA512 478a84f6c427a2dba3e97cf1932e004e6933d9e87fc0c902729381572ab1b97de0a8824bd1ea9a2bf8714165478a3030fff834ded36f6d565cc2114dc2fd4cdd
-EBUILD libsdl2-2.0.12-r2.ebuild 5896 BLAKE2B 233c8d1ee14e2c95d6bb09eef0c62644c9688c7d51baff25db7bf94148f1465591e32873516fd74ad7a1af552054f7161d5d132656ee3560d4ec69ec3bb8353a SHA512 777603ad7137c73b7fdccbf56c4a27766c8394f43a1df52751766d2f445a1e51b03dfbb83b32274cd982f5ebaeaa0cd80e9caca215e352996dc802c98a05d0dc
+EBUILD libsdl2-2.0.12-r2.ebuild 5895 BLAKE2B 4ef95d547e288bd1ae52a35aaf20e2c679655c51e7c749327ce089644aa02c799bd8461033e918c327bf455dd5e7f97448a3ccf1c3fb327aeadea6b5139eafbe SHA512 54e4c662d6ced0f013e87310639154b9d1900a9ecd3bdfda48cfa54fbc5e0d793fee512e393a37d13a6e7f05ec621613b7c4f8b551d21713b30d8c4d8cd00091
 EBUILD libsdl2-2.0.14-r1.ebuild 6155 BLAKE2B c38ffed9cd5160241f44268b9b34d267b82b9315cea18f9b0fcc3cf562018d3256c5266d5fec5c841df532133b3f184c7230ff4dae9828ed2d626c640a732bd5 SHA512 c3d07224b7be960c8e6201b659e5ee7923d2f2a3cb6aaadfe3118cbd7b27ec88dc9a3f2f4199f43d82bbb67eda21852a424d1c5e6d04b8aa6a98d1f69474b37e
 MISC metadata.xml 1805 BLAKE2B 16d4961cf6d0c9997fe706dd5deb51b98f153135cb4f0bedbc29e842d485ba2f4493003830385957b7ac92fd9f6d31bcf4319d800a7f2bd46a9a1772b86f3e5a SHA512 37e976d6a469c6e17e3efb178a189903c3ac2baf99d0e3aa7fb80bfc6d297e52c910ae6361e119fe1173d6d8a9d2aef47172bb4a1185ef4f99f36c75d1f8c19f
diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
index b5fe12b57ec3..04fbc2536369 100644
--- a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 7149415ac377..aef55315a8c8 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,3 +1,3 @@
 DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
-EBUILD libsfml-2.5.1.ebuild 1541 BLAKE2B 5d59a9fc6342d4ba6fbeae645a37cb514a29d38034f7a808939d6c8c0ab591f472cfd60ee6c2f0c53ebc2cd489196d2e417540e612128d20f66724386c0b0923 SHA512 0e75cf34912d7a520cf081ad2fccec0db53053b1db7150a45882fec2a08487cebb7a3192c04e8839033f52c988ffedd6e3566b08fa1922f11312d632464db4cc
+EBUILD libsfml-2.5.1.ebuild 1501 BLAKE2B de377f3a5fb7d0ccbc79ad824026d6390e1cf083a9b40a0300d2a855b1b47ceb9247ffbf410c834e6956321c0b2974981a5a97f42decfc7ffde98a1758f867ab SHA512 215c7a61421723a0ed2b33ed46efa53910e229320a4d0a67562ad55c7c4726f85782977339b5c34dd38457fc6c706571e47aa84d5837775996e41ffbcd7898a8
 MISC metadata.xml 732 BLAKE2B 598678c33da33373a1669f4b9048b95503d9c430730b571b985e4137e034e5104dc509cb0a6605834ef463c6d6438b25bd2bb06ec6ce41d7e1c52fbef7219e3d SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2
diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
index 159102d00492..2b975f17c8fc 100644
--- a/media-libs/libsfml/libsfml-2.5.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils eapi7-ver
+EAPI=7
 
-MY_P="SFML-${PV}"
+inherit cmake
 
 DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
 HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"
@@ -33,21 +32,21 @@ RDEPEND="
 		x11-libs/xcb-util-image
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( app-doc/doxygen )
 "
 
 DOCS=( changelog.md readme.md )
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/SFML-${PV}"
 
 src_prepare() {
 	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
 		doc/CMakeLists.txt || die
 
 	find examples -name CMakeLists.txt -delete || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -59,11 +58,11 @@ src_configure() {
 	if use kernel_Winnt; then
 		mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	insinto /usr/share/cmake/Modules
 	doins cmake/SFMLConfig.cmake.in
diff --git a/media-libs/libtaginfo/Manifest b/media-libs/libtaginfo/Manifest
index 2eaae2e757ce..69c33e769b3d 100644
--- a/media-libs/libtaginfo/Manifest
+++ b/media-libs/libtaginfo/Manifest
@@ -1,3 +1,3 @@
 DIST libtaginfo-0.2.1.tar.gz 2093070 BLAKE2B 0b0c83c1cfe15cbc2fd19936bcba4377cfeea13a95d085dff95b42c9b547b8bf8c21a2187ebb7d0d8510644be8db38a98a6beefe22ea83be7303762fa590214a SHA512 f1a79b1f7ea12bce10c82c0a4106f855c95b6efeef25e7548fc629d4f8977f50fe62637426a53ec0333902d5e2a81980c189719d030d7f85897ecfa8cbb1ba41
-EBUILD libtaginfo-0.2.1.ebuild 536 BLAKE2B 8321b170c08ded520deb9340d8281afbeefc0ef088810b459193c0160e4c7d73917f6ad32c676ab5557679b5f7ee8d78cded2856dd4003872d10c9bba59ef61a SHA512 c3594f7e2f4daf23d322016c4bc78d325dacb194b40b26a1330f129a59369757747b95b046061182f1d9111b11b08ef3f7826e62f6e5e16771b6ddc75aad1340
+EBUILD libtaginfo-0.2.1.ebuild 496 BLAKE2B 804b030bf2463a5a7180165b89cc19ee631899cab5f35449cca36616b193c2f73f8925f463515ba730ab1dc007d6ed005d0d8f0bf783587ad24085e70612017c SHA512 e4b35228c7b92f0e3d9e25ad3a765b8a344e1f85822093c129275fee33be7152fddafb54383ac5beee5cf7bb09d37bdfb2e2baa1cc078847d02a4c978dec0f4d
 MISC metadata.xml 343 BLAKE2B 3105b1f560c3275ca31c3e59264e95e58187eccf5ed08820b76e85ad7ac2c47455a9a17f5405389963bf3c16107af2b7254912bc354c0df2b213faefdaf7a8a3 SHA512 c82b178d2bd05a410f7d7279f6b58076dc35cb3e18eaf3c62699df09427fe595e3d8927bd31483757c45c5a35493f277acd02fbf06901bbbcc18f39f8e66ffff
diff --git a/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild b/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
index 2b198242c65a..8ea298db777b 100644
--- a/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
+++ b/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-AUTOTOOLS_IN_SOURCE_BUILD=1
+EAPI=7
 
-inherit autotools-utils
+inherit autotools
 
-DESCRIPTION="a library for reading media metadata"
+DESCRIPTION="A library for reading media metadata"
 HOMEPAGE="https://bitbucket.org/shuerhaaken/libtaginfo"
-SRC_URI="https://www.bitbucket.org/shuerhaaken/${PN}/downloads/${P}.tar.gz"
+SRC_URI="https://bitbucket.org/shuerhaaken/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="media-libs/taglib
 	!<media-sound/xnoise-0.2.16"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
+DEPEND="${DEPEND}"
 
 DOCS=( AUTHORS README TODO )
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index fe36dbce99d1..ee5edad420ed 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,3 +1,3 @@
 DIST libtgvoip-2.4.4_p20201030.tar.gz 1091098 BLAKE2B 81815a0c9c7f62175493af8f3f56064f6a6a0167351d4f8baf5c846744dc03d325c106dfafb49589702e4f461865e5528395f379142af49b8722f490fdd57d1b SHA512 58dfd537c378c7e9772eab374f25b7d68d26b6db1f71bb9a88e6405e2f2e3cd0ebc2fc94733ce787288365ac9669fc50f8d5a3ab2f2900683c6399ca43172945
 EBUILD libtgvoip-2.4.4_p20201030.ebuild 1182 BLAKE2B 061dd2a7e004bc6b725c5980068cd9e20f1fb93d9d936db1aa56401e9a5d08726d4a5cb685b3f80dcb942b129b85cfd0ff9e0413ff1c15643cecf9de2e31b51e SHA512 92fdc837c12aecf4867243ff81e19d7794208366f55f9aad0e3b2a00f24366d2e36dc4fbb70e28a3c4dd12a171031b970e7d4912820347c3fb3d22a813de86ed
-MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
+MISC metadata.xml 300 BLAKE2B 0c717bfe3ade5077d80410fa8829818fe603d0937dc7b1770794e227f86d42248f86b7243f08c21bd57fe9fecc284c6b9dadbab49b3cc66518c66b1839fc124a SHA512 af4492f640c0cf0a67429b0e1a164c1cf35bb397ddd460598e5efe35d6105c2689d984d7918035b925893e4a32b26a588d3157730f292e96c4263c34ddcb61f1
diff --git a/media-libs/libtgvoip/metadata.xml b/media-libs/libtgvoip/metadata.xml
index c5af453673d4..442b636ea787 100644
--- a/media-libs/libtgvoip/metadata.xml
+++ b/media-libs/libtgvoip/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="dsp">Enable signal processing (echo cancellation, noise suppression, and automatic gain control)</flag>
 	</use>
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index 0321ab31e623..0da2bd0d91af 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -3,6 +3,6 @@ DIST lsp-plugins-1.1.24.tar.gz 63809276 BLAKE2B 3d623d4a5b21f2b4dbd7263805b50c9c
 DIST lsp-plugins-1.1.29.tar.gz 66143142 BLAKE2B 6fa6943d8cdf3aedc9f671c64b433ffd5c4f6c7ca14f6a75578300240971e7c9e8546b9a7df7a13b8cd6e0844724c064daa7e249aba70636f47a622e73ed264a SHA512 b8c3804ad583322bce414d6beb079afa5b98a111126bb4507642376fcf1f82b31525b4959c6388b02cc1d14e0ec25de3596794895f2860f492a5fbf87f6e88b7
 EBUILD lsp-plugins-1.1.22.ebuild 1037 BLAKE2B e3f7c25cfbd4938ee04bc88f3026b24ed254d6e6f68a4262dcca59e5f99ef61c91c16293763aa4e53c42633da9db7416947d36c2de4fffba6c0407c86de11e99 SHA512 2d8042b5a22dae0e3e9df23a639184562f3623789e44d1a02d58d3b8bde5b6d136e4e74874c0c3a5656ae28f108eb177ec295c03afcac5764281336b58c1e617
 EBUILD lsp-plugins-1.1.24.ebuild 1076 BLAKE2B 399febc0f6dc791d765d16c3455469eafe5a5ea76934b4475993d9758e3ce0a3c00540995e7719c94cdc849cd7dc7208fb86eff9094af139be70ae5625d1d184 SHA512 2dc5383e1da3ccaebf80a8a5edf092db87177a2590dbf7e96bfc1862ebd9a4567f1dbec95c2e35ec38c5603a2f5d691c67c6f4836bf0c568873b04483aeef0c6
-EBUILD lsp-plugins-1.1.29.ebuild 1065 BLAKE2B 57234488746b4b43a1b71b89491a74540646b074b13276ad84bde7398c02a2a2665197a953d2a5974f9eb4f9402585d7fa681e9f55fdb233ec6dc7d94d255ba3 SHA512 48b0fae3be3abe2c80cba542553886fb8e850694b00b1d3c7154466647ff2a20e4aa6eb466a8cdb4ddea4ad2371f7d2cb70319866e92fa958281df53913981e3
+EBUILD lsp-plugins-1.1.29.ebuild 1084 BLAKE2B 8168ae8249856691932e98386934637efb32428614843cdcc67a47e875171bf2d498b9292c0783f9b46c00a91c23353783268d0158995529221b201b6605d6fe SHA512 b3d8a5385230637718b70fa22c6be4acad4e9179ad81e5225f8b167cb94afd24d9bb43c8ef269c63da899affa6c0f7b95ef04c45bf542bc2c0c63563426fd8d9
 EBUILD lsp-plugins-9999.ebuild 1065 BLAKE2B 57234488746b4b43a1b71b89491a74540646b074b13276ad84bde7398c02a2a2665197a953d2a5974f9eb4f9402585d7fa681e9f55fdb233ec6dc7d94d255ba3 SHA512 48b0fae3be3abe2c80cba542553886fb8e850694b00b1d3c7154466647ff2a20e4aa6eb466a8cdb4ddea4ad2371f7d2cb70319866e92fa958281df53913981e3
 MISC metadata.xml 492 BLAKE2B 6550b2fe0e0a6bc5bece22d51b36d920284f662f1da5dbe2551fbf82ebc3416262339436ce2eddf9efbee49e57d5a28139f6ac3f1f86e20b5a74e5c4fb3bc37d SHA512 681338f3f8abbd1c103ef72c176595e10ca6bc0e6ca309e2f4d39166309329d8176aa9025056685d67d708ec1732d023c773a1e2a4cce7f019945ea112ab8f84
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
index 6e275d247806..135fc0006ee3 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="LGPL-3"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 85a255302d89..f8596653cf20 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,8 @@
 DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888
-DIST mesa-20.3.3.tar.xz 14222700 BLAKE2B 02996b9f784f4c4a4502f8d5a1ef9763799b36206cfbfb56aeeb84837a119457fcfdd2d2efc3bf87fe945bd4dd4747b77fe9af51b290311b86e850fa4d6ac8c6 SHA512 77735462f4ccbe865d0cf7e9db47c42f8bc2600b9a030dca11066d29e43f73c18ca0422e6356129fc14ac1b1018ed752ae4ee45bd31ae706fea58f573a14d346
 DIST mesa-20.3.4.tar.xz 14253372 BLAKE2B 210908f5b802b9fd0170a6f06310f39bab4aa0ca1c84914d702863f9df4d47f1720f0d3779ae804d2eef322a09f4b6cc40855efd7dc365cd84dd8f222b217998 SHA512 81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477
-DIST mesa-21.0.0-rc3.tar.xz 14488732 BLAKE2B f459fde39b7a1a62166b1d58df309e6295c489eef1324649478a6e21139317068b7cc5fb9ab6d54a31bbfc8c696df81ebc9531e14c40020380f342dc5948036d SHA512 b51495e8ef3a4a2f1b98ad3c4f5037c21b4b7df375138bcc02b24cb4b7ffd7b807d76ac0853d0ecc81c09ceca2a97e5c402352700f297ed7f4369f98d03a0810
+DIST mesa-21.0.0-rc5.tar.xz 14544136 BLAKE2B 74e2c7436819535a74d36a26d3deec5b68d2a158a3602d61a7c30c59bc4763dcbd327e761a7db688007255332eaccdb615069921c3f9395cd67b6f9bb47db00f SHA512 89e212a7caf70320841551dbf937fe627e156896e9d11dc6654f91552c97800354562d5297b3a218c8c0f8261d2f32c62cb6e9445bace64f0b41eced829be7ed
 EBUILD mesa-20.2.6.ebuild 14762 BLAKE2B 10df82dc80592a5735ed4137a3db8e57acd8cb53a32649fd8b7854a845fd90cb6804e3e43bd52a1d7ce60a7446577a4e45c4ad4fbf16d08518007a2bb51e3ed7 SHA512 ab2f3fb312e255a93928795b94bf641060cad1bae388c8526cdd38eab0699f7be8f6779901d04aec1e14ac7482126b4bddd88337d6b618d056e39bb667072f38
-EBUILD mesa-20.3.3.ebuild 14852 BLAKE2B 3981ee9b591e5a84e59a0acf9b694c59b2932453153ae587892644803a06ce1dffd83fbf58ea1206fb06190a65c1dd06c9915aa4d0292aa9b58e28c4e42d2a76 SHA512 c613b37f8f40875f28b927ac382c3f3337cecee316c5e0f41c048b5b786a060eb03a394148f827fa4a82e580953a32d5116465b0bde09291644b22135a784b55
 EBUILD mesa-20.3.4.ebuild 14852 BLAKE2B 3981ee9b591e5a84e59a0acf9b694c59b2932453153ae587892644803a06ce1dffd83fbf58ea1206fb06190a65c1dd06c9915aa4d0292aa9b58e28c4e42d2a76 SHA512 c613b37f8f40875f28b927ac382c3f3337cecee316c5e0f41c048b5b786a060eb03a394148f827fa4a82e580953a32d5116465b0bde09291644b22135a784b55
-EBUILD mesa-21.0.0_rc3.ebuild 14763 BLAKE2B ce477c142ffc33ed0728a81c21ee19492172449fba48d6fb3d75d2c5bc6a001dc5475de75d462b8115f28e0a11b5726170fea49021444f76522d896df830b5cf SHA512 2c59cbd8e935b7762251d7cca0e641bffe591ffaf238d6ca3b961193c36d1c8a1bb696e31f69233aa3a5824b20b0be12a0bf3bf035a4993cf66bf77d6af0a314
+EBUILD mesa-21.0.0_rc5.ebuild 14763 BLAKE2B 61a0be70fd8f848330a71d3427997eb0e1cef84cd389d1da40919abb113d37c95ba835099da438470b2a812b4098b6bc06b556ed771622adfbb8741018569587 SHA512 83e5b4a9d0c03fc9c89233371d682d013267cc9741a78631c581d84db5a6fa6eb745327e9fe6000a76a85986b056b8cdc0679717e4674a8ea8959384da1287c4
 EBUILD mesa-9999.ebuild 14763 BLAKE2B ce477c142ffc33ed0728a81c21ee19492172449fba48d6fb3d75d2c5bc6a001dc5475de75d462b8115f28e0a11b5726170fea49021444f76522d896df830b5cf SHA512 2c59cbd8e935b7762251d7cca0e641bffe591ffaf238d6ca3b961193c36d1c8a1bb696e31f69233aa3a5824b20b0be12a0bf3bf035a4993cf66bf77d6af0a314
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.3.3.ebuild b/media-libs/mesa/mesa-20.3.3.ebuild
deleted file mode 100644
index 551fcd5d326d..000000000000
--- a/media-libs/mesa/mesa-20.3.3.ebuild
+++ /dev/null
@@ -1,558 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-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://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d 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 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="11"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
-		sys-devel/llvm:9[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	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
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature 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_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   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_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# 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
-		vulkan_enable video_cards_v3d broadcom
-	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=enabled
-		$(meson_feature dri3)
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		$(meson_use vulkan vulkan-device-select-layer)
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $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-21.0.0_rc3.ebuild b/media-libs/mesa/mesa-21.0.0_rc5.ebuild
index c004f76fad6a..8aeb115afdd8 100644
--- a/media-libs/mesa/mesa-21.0.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-21.0.0_rc5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-libs/noise-suppression-for-voice/Manifest b/media-libs/noise-suppression-for-voice/Manifest
index c11ac75ad73e..25ef1c0f3c60 100644
--- a/media-libs/noise-suppression-for-voice/Manifest
+++ b/media-libs/noise-suppression-for-voice/Manifest
@@ -1,4 +1,6 @@
+DIST noise-suppression-for-voice-0.91.tar.gz 207544 BLAKE2B e16f81b58f382e6bc01905c046fdb0b00891b9a82540df01387fc5e5ded165314b8f3c40a1c3c33a4544c536eb1b7aa57d25ac59180624dd2550ec9c465f0545 SHA512 e117fd54e6cf01c4721b79fddca2f2898331e46764c7a05077ed3034c50e2cbc0c1d6fa3084f7c6f56a629bf20127a7d1bccd57d30b0693cc3eb30edaae6cd28
 DIST noise-suppression-for-voice-0.9_p20200705.tar.gz 207467 BLAKE2B d840ed8e8ec61438e582cedec4c20b8ab2358395857a23d655269cae1e82a0888d785ad364fccf619812ad3c92bd720a035b64bb986ab0c9375b727ce2451de0 SHA512 ccc1c3c2daa473bbeaf94aa460f7039863f883216cefb0185683001e8d8271b6a6785350c1b43f14349c9971fb7b74a05659bdd0a28010c54ab4310c94784877
+EBUILD noise-suppression-for-voice-0.91.ebuild 779 BLAKE2B 8554f17dcdae331ef9198cf4145a921853f57d68661bce723b9368109a22a7d6b55f84768d21947ad0c28091be4bc62046ffa88ccb661f56dbcf578cdbb4c04e SHA512 68e68964b131eb0666939ae92e3c1e8493f37e811195c34a1ce4e79dcf5a2b46ed393f36aef38b06fbcfa2bbd91f4816022835225b1a8ab4cc124b3f8fed687b
 EBUILD noise-suppression-for-voice-0.9_p20200705.ebuild 830 BLAKE2B e8fd7ad9560e565fa11b03dc0adb2421075e7ac4cc6bfdc49082c9afb2732a7e6defa9ae76d4dc49b7ef83e6b5ea466b963effeae9359bbe0241b8f5181d3e3e SHA512 02dd2b16ac23c8e7b6d359e09ddf72869ea94c43ee51df4dbafd523f4a4a5434231b63c84c564f158045c23fb9069e50f79e5e484186eb864358aab3641674c5
-EBUILD noise-suppression-for-voice-9999.ebuild 772 BLAKE2B 84f165d5996613388cfba1bb6b39b57bd65f9bd0bb9e13be1dcf3bcf32632c49d0bdd2e7a5bfefb98a15445f655331b053a107f891854c0e99406157b95e622d SHA512 77d24993705b14c74fa44e6c2edd20a8932cc229899b7d3fcb87d1db7d5562cc343f95488e5be87930486291a376ab3872231893ec54aefe0b085a404dd61ace
+EBUILD noise-suppression-for-voice-9999.ebuild 779 BLAKE2B 8554f17dcdae331ef9198cf4145a921853f57d68661bce723b9368109a22a7d6b55f84768d21947ad0c28091be4bc62046ffa88ccb661f56dbcf578cdbb4c04e SHA512 68e68964b131eb0666939ae92e3c1e8493f37e811195c34a1ce4e79dcf5a2b46ed393f36aef38b06fbcfa2bbd91f4816022835225b1a8ab4cc124b3f8fed687b
 MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.91.ebuild b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.91.ebuild
new file mode 100644
index 000000000000..3180e7892ee4
--- /dev/null
+++ b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.91.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A real-time noise suppression plugin for voice"
+HOMEPAGE="https://github.com/werman/noise-suppression-for-voice"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/werman/noise-suppression-for-voice.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/werman/noise-suppression-for-voice/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+	dodoc README.md
+
+	cd "${BUILD_DIR}"
+
+	insinto /usr/$(get_libdir)/lv2/
+	doins -r bin/rnnoise.lv2
+
+	insinto /usr/$(get_libdir)/ladspa/
+	doins bin/ladspa/librnnoise_ladspa.so
+}
diff --git a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild
index e88a0d3eefb9..3180e7892ee4 100644
--- a/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild
+++ b/media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/werman/noise-suppression-for-voice.git"
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/werman/noise-suppression-for-voice/archive/v0.9.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/werman/noise-suppression-for-voice/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="GPL-3+"
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 4c21275b4754..cdd4cc7dfe2c 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,9 +1,6 @@
-AUX opencollada-1.6.62-cmake-fixes.patch 4823 BLAKE2B 84805e591bb8212e0cfce78fa8c7b6c03684d2d54dc16644b2211768ecdf0868fa77f4836f5a24280f9bd7f0fe47b7715f70f06f48db1c6bf90efb6a23e05632 SHA512 db5c2389aa45d0924371e93b0006052d6a83f1fba2727c86c23093fa2e21194586fcaaec361828343676cf170aea30a5bfefb7126f1f19fb1c966257165743eb
 AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6faa4f164a21a8e1b840a0d54c596049f29a7e94cbe6297343fa323dacebc1831ed6871d7e82ac12fe3026ab75823d07670c SHA512 8ea88344ebc345e4a996ebe39852e5d52806cba76ce433253c67f8840de6ce082515d2bec571d49bddfe3ec620912b3de0674c522c10203bbc590bd6df80fc55
 AUX opencollada-1.6.68-cmake-fixes.patch 4823 BLAKE2B 0a403bf25b0935380d86ee9fe272935dcff053b29813de665d4e65028115f7b0ae5d7c8e51a4de0d027c74a41d0ebc23883469a20ca2e150fb1c440976f4db25 SHA512 5c2499575d5127a94eab5876817019a9bf28a32843d6f610d5b39ca35de2463589a12cc58b0004947a6cfb369c0b4c8115584f32f827b11dd5b966bd0f171494
 AUX opencollada-1.6.68-fix-null-conversion.patch 781 BLAKE2B ea4edb531f8075d8f70730707c3315ee8207a603fe2f6f1d569a37712572b69b011d75890837d530ddf788dfcd2f952dbeef9427a9167bf0b23d148a311512a6 SHA512 b18662b5844d71c643ad384fbdccd679b1177d6a9f0afcda653fd38d07a9d0048ab6abb029bc7b992198e455fcfbd868f8b74569606b3794d5a1892fddbf83be
-DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01
 DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173
-EBUILD opencollada-1.6.63-r1.ebuild 1640 BLAKE2B 18ac545d76b9ebc99b5f85d44503e184fa195ec691ddc6cb2453ce9cd8d095784df884a029caba88cb1a962ea40a525efe309032a4bc93b1e69cbe05580b5b69 SHA512 04c9b1453208e360d449adb678876f0d6856704222e1cfeb5de4c1448f34b73b407c00235b62848a7fd9b6e4360dfd1be419a8815acbd7bf24f719d9169fbf75
-EBUILD opencollada-1.6.68.ebuild 1873 BLAKE2B ec57fd450e0f622999428485ff9dd4dc31ccbb9b4cab915a45794f8db6e29f0b8efa88ca28c7abca9a7221b1d32c3505dcb25be4b0353d5046988bc238343b2d SHA512 c64b0d3134fdeacc794e99615bd93c5aa9b0fc5caccb81a4d93da717019e24e5e986100d56bd2210e87df147614ad077d2622da37b70ff3c9b4b7b0241c058b5
+EBUILD opencollada-1.6.68.ebuild 1877 BLAKE2B 108145d10da5ca0146e551314129e630d237818cc07d6f41ed4f1d670ef1f15347355e5017661e76f20ecc14493e90d38299ae9b6ed1fe2890b1a10abc375fc1 SHA512 269201ce5a76a2ce3d6345e230a49501fd5caa0c73faef446668fe60221a7033a70a27ea1559c240dc720d823abb9a55531e61ec530e16713f09601a743dd518
 MISC metadata.xml 458 BLAKE2B 5ca8dec8f5e0c58c4351c20d64bfe6e45a3e673e337f2e5bebf3cea759cc44c10de579e33ca7f99a64908a0553b99f206ee6440432eb142097cf184361526b7f SHA512 45cf8dc7088652a5982c5535afbe54fb2afab57417b811148e91c0530f57c5d4801cecf28d1ed9a8a097fbb55b9389caf568c8f94972665bb7b53e0cc7ed876c
diff --git a/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch b/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch
deleted file mode 100644
index 8fc32784daa7..000000000000
--- a/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From c3ed65c2c60b8744163b3a57cf24469e688536dd Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Sat, 13 Jan 2018 11:54:44 +0000
-Subject: [PATCH] OpenCOLLADA/CMakeLists.txt
-
-Use CMAKE_BUILD_TYPE which can be overrided with custom distro types
-
-Adhere to GNU filesystem layout conventions. Not all distros and OSes
-have directories in the same locations and they define the
-GNUInstallDirs variables, so use those variables. Also, this enables
-multi lib installations.
-
-Define the version variables to enable SONAME versioning on the
-library files in case there is ABI changes in the future.
----
- CMakeLists.txt | 58 ++++++++++++++++++++++++++++++++++++----------------------
- 1 file changed, 36 insertions(+), 22 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 95abbe21..00ad8d6a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,14 +37,41 @@ cmake_policy(SET CMP0010 NEW)
- # Input directories must have CMakeLists.txt
- cmake_policy(SET CMP0014 NEW)
- 
--# avoid having empty buildtype
--set(CMAKE_BUILD_TYPE_INIT "Release")
- 
--set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Only do Release and Debug" FORCE )
--mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
-+# Set Release type for builds where CMAKE_BUILD_TYPE is unset
-+# This is usually a good default as this implictly enables
-+#
-+#   CXXFLAGS = -O3 -DNDEBUG
-+#
-+if( NOT CMAKE_BUILD_TYPE )
-+	set( CMAKE_BUILD_TYPE "Release" )
-+endif()
- 
- SET(CMAKE_DEBUG_POSTFIX ""  CACHE STRING "Add this string to as suffix to Debug libraries, e.g.: xml2_d.lib " )
- 
-+# Adhere to GNU filesystem layout conventions
-+include( GNUInstallDirs )
-+
-+
-+# #-----------------------------------------------------------------------------
-+# Initialize project.
-+
-+project(OPENCOLLADA)  # must be after setting cmake_configuration_types
-+
-+set(EXTERNAL_LIBRARIES        	   ${OPENCOLLADA_SOURCE_DIR}/Externals)  # external libraries
-+set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules")
-+
-+set(OPENCOLLADA_VERSION_MAJOR 1)
-+set(OPENCOLLADA_VERSION_MINOR 6)
-+set(OPENCOLLADA_VERSION_PATCH 62)
-+set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
-+
-+if(NOT SOVERSION)
-+	set(SOVERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}
-+		CACHE STRING "Set the SO version in the SO name of the output library")
-+endif()
-+
-+
- #-----------------------------------------------------------------------------
- # Macro's
- 
-@@ -58,7 +85,7 @@ macro(opencollada_add_lib
- 
- 	if (USE_STATIC)
- 		add_library(${name}_static STATIC ${sources})
--		set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name})
-+		set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name} SOVERSION ${SOVERSION})
- 		foreach(target_lib ${target_libs})
- 			if(TARGET ${target_lib}_static)
- 				target_link_libraries(${name}_static ${target_lib}_static)
-@@ -84,7 +111,7 @@ macro(opencollada_add_lib
- 			message(${name} " WARNING: Shared library support implemented for UNIX-like OS only")
- 		endif ()
- 		add_library(${name}_shared SHARED ${sources})
--		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name})
-+		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${SOVERSION})
- 		foreach(target_lib ${target_libs})
- 			if(TARGET ${target_lib}_shared)
- 				target_link_libraries(${name}_shared ${target_lib}_shared)
-@@ -145,19 +172,6 @@ endmacro()
- # end copy
- # --------
- 
--#-----------------------------------------------------------------------------
--# Initialize project.
--
--project(OPENCOLLADA)  # must be after setting cmake_configuration_types
--
--set(EXTERNAL_LIBRARIES        	   ${OPENCOLLADA_SOURCE_DIR}/Externals)  # external libraries
--set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules")
--
--set(OPENCOLLADA_VERSION_MAJOR 0)
--set(OPENCOLLADA_VERSION_MINOR 1)
--set(OPENCOLLADA_VERSION_PATCH 0)
--set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
--
- 
- #-----------------------------------------------------------------------------
- # Compiler warnings.
-@@ -190,9 +204,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNINGS}")
- #-----------------------------------------------------------------------------
- # Install vars
- 
--set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
--set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
--set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
-+set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencollada)
-+set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada)
-+set(OPENCOLLADA_INST_CMAKECONFIG ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/OpenCOLLADA)
- 
- 
- #-----------------------------------------------------------------------------
--- 
-2.15.1
-
diff --git a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
deleted file mode 100644
index 1ed2b159eba1..000000000000
--- a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils flag-o-matic
-
-DESCRIPTION="Stream based read/write library for COLLADA files"
-HOMEPAGE="http://www.opencollada.org/"
-SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/zziplib
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/OpenCOLLADA-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.62-cmake-fixes.patch"
-	"${FILESDIR}/${P}-pcre-fix.patch"
-)
-
-src_prepare() {
-	edos2unix CMakeLists.txt
-
-	cmake-utils_src_prepare
-
-	# Remove bundled depends that have portage equivalents
-	rm -rv Externals/{expat,lib3ds,LibXML,pcre,zziplib} || die
-
-	# Remove unused build systems
-	rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
-	find "${S}" -name SConscript -delete || die
-}
-
-src_configure() {
-	# bug 619670
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DUSE_SHARED=ON
-		-DUSE_STATIC=$(usex static-libs)
-		-DUSE_LIBXML=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN} || die "echo failed"
-	doenvd "${T}"/99${PN}
-
-	dobin "${BUILD_DIR}/bin/DAEValidator"
-	dobin "${BUILD_DIR}/bin/OpenCOLLADAValidator"
-	# Need to be in same directory as above binaries
-	docinto "/usr/bin"
-	dodoc "${BUILD_DIR}/bin/COLLADAPhysX3Schema.xsd"
-	dodoc "${BUILD_DIR}/bin/collada_schema_1_4_1.xsd"
-	dodoc "${BUILD_DIR}/bin/collada_schema_1_5.xsd"
-}
diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
index 9be28a0a789c..ec8c164459ae 100644
--- a/media-libs/opencollada/opencollada-1.6.68.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 9333d52cbdb3..390746cfa631 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -5,5 +5,5 @@ AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1b
 AUX opencolorio-1.1.1-fix-self-assign-clang.patch 493 BLAKE2B fbe85fc4385556deacd173ab44f5a5cbe32c2cd5b4541f1aaf20037840d5d8c7a61d5c314176cde7d0f08c80b6436b0b937c9fef10c3841948b6881601073df5 SHA512 8132a8352a36994550dd089a4858e11459fcbe0495bd07b6bc599a4b8bb7191da8ca6ae061cd1c04f52f586ac993e3656e8c03c6665f7160fa50b4a117f0cb22
 AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b
 DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
-EBUILD opencolorio-1.1.1.ebuild 2403 BLAKE2B 422036f0f6322470c963bccc4ed64262def86450500ae29cd207833ac127da7c3b8d325ea66c0a2829c777d43de9ad886f60508c04defcd092ae79c4aaa5f592 SHA512 47d2f442d82e322b4465368fa512bc0867c9391bed6312958f0b4fafe79cb9ef11cb7a242953260aedb8362696858e4ba83359292c1822fab685fd0f808ccb8b
+EBUILD opencolorio-1.1.1.ebuild 2408 BLAKE2B 391b8d5a072d32373554895248b3da0b8307fb0f0bbcc1f8ef1a88ae51945b7f6a5a6305516df3790b2065868a6af254f9f2c8772a24e086bd1795deb2f34b64 SHA512 e9455eb9f4f19075e2e102247bc390b3a3de72a8e2eae53a6bba829d9656cc63cb989f9fd86f435b7bf55298e35c18f68102073b15d2d928013c911a6c78bae3
 MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9
diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index 15395d8dca9b..481f2561de4a 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/OpenColorIO-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
 REQUIRED_USE="
 	doc? ( python )
diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest
index 46604cc4174d..935534d86827 100644
--- a/media-libs/opencore-amr/Manifest
+++ b/media-libs/opencore-amr/Manifest
@@ -1,5 +1,3 @@
-DIST opencore-amr-0.1.3.tar.gz 881105 BLAKE2B e9e1d40b90aa819d1b4fce328ae8ff199c7656f3326199c005e8f0a47e4e3282ae02f93826e923c5128c4ec4cebc3f35b6f5ca9f3f49c7dd15d541fb77383d28 SHA512 f67e84604fe3fbb87d608343e595503e2057272fa0b3bf9158a176e88a96d272c35149483c3ee47ba2b064bd6b17cdb315888a5285aa82edc0401f17d2ae761b
 DIST opencore-amr-0.1.5.tar.gz 929581 BLAKE2B 4943a27f0df3d874720c87f48c523d9aa4cce849dd0a3c9183466416a0629aa02dac8f01646e469e8c45438bf3c57047eb11e69f3f1b261449a0989a36639e59 SHA512 c324db9dcac5a31bfac633153bc054bfe42d5ff98202c4adb3c75a3fae9792f07f60d48cd659acf106dacd307174a62b2aeee22a4af53caa20d2bfba46488faf
-EBUILD opencore-amr-0.1.3-r1.ebuild 526 BLAKE2B 3d06bda1b612ac43dd04ef723c46ce15a8237dbecc901b170b2446cfb4448a697ee5881818b1b6b21f628c4f088ba6f7e79f98cb9671df7b27102fc2aa4f7696 SHA512 33d1cd7e49e92b536bf9b0a1fdc35c2aaad733d2342af0a675b96ef25896a32231250343378b30be4e9ddda010f163f312eb722344b75635462be23117a3232f
-EBUILD opencore-amr-0.1.5-r1.ebuild 627 BLAKE2B 84ddc8192012c274710f23ed4788f1e234ee2aa2d6c22ad9ab6a0ff6c414fcc41efcb86610612ccc5bef8ef291d7fe6cf47c48f9509060c787f9a412a9c6f1c2 SHA512 a202aea9b5396d4f1482b873793d33a34261804b510800bbe3027990d6b3b9cf5d3c105c6669decc13479770f0313ad0a8b670b3018b9857a88c0e2ea72c400a
+EBUILD opencore-amr-0.1.5-r1.ebuild 623 BLAKE2B 92ef8293defc84b7b0d380ab430a75a6a3e977325714d4fe6c5c3bf26acd9cae99b1daf2beb495b51d1ed8f86c7e3295515b3bf551dd92df243cf797d4276eef SHA512 f7ac1f2a3f4c30ef7e9d445a01a429d5f92ad48706633b7656f2e9afaee1f46fb4272663e6ec95ad335d4e38d588c914b883bae364d1aa77cda1483252c48576
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
deleted file mode 100644
index 8a641b8694cd..000000000000
--- a/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
-
-DESCRIPTION="Implementation of Adaptive Multi Rate Narrowband and Wideband speech codec"
-HOMEPAGE="http://opencore-amr.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="static-libs"
-DOCS=( AUTHORS ChangeLog README )
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
index 92234a069898..7e369fd986ef 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
 
 multilib_src_configure() {
 	ECONF_SOURCE=${S} econf --disable-static
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 8ca9c781c188..b115c7c27d45 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -10,11 +10,7 @@ AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8
 AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f41b77d25aaf04f9a20d0d406eeae17988cc6f3eecf805f6bac1e42805b283f3123455ca1b069d7c0dc04628835ded2d8dec SHA512 58ad1d8f5dc28be60cdc290c7829d8b50708d26f3a769530e054c629170457f6b7e2b526455f6f86d2ee24931d8afdb61345ada99ae49897d926c0d50fb579f6
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
-DIST openexr-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
-DIST openexr-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
 DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382
-EBUILD openexr-2.5.2-r1.ebuild 1673 BLAKE2B 6cb66a92a938e9e6878fa2550a9dba69afe2dd70853ca1fd1e0278c8dfdc774b4f164bb8c61b578210fe9183bb37fda5803e6b36c31d1a4f44f6492328a98bd5 SHA512 6731b8406a8b454366e96774003a1da4640fb6261c665d8327a4bbc83ab3fd8f59c1dc2b3d9ec3d3e148f4162de46c7a44ef034b073d55e3c472809ae570b18e
-EBUILD openexr-2.5.4.ebuild 1696 BLAKE2B 6090335e9c7eb793c43642efcf7ca9158ee6589c7752cf021d457c1b037cbd95d73f0755739822311a386e0c907e1d291710056de85b23b32bc56081194f817e SHA512 fb64443451b2ca0d8df6a31053ee3ee9a1ba70cd60855122ec5e0ca7059f388dd39eb51a4e1db75a4b12c53254d0e22db8ef563346c8351d608e237041ad0366
-EBUILD openexr-2.5.5.ebuild 1698 BLAKE2B a0e3e116800767c03b5eecb1afdd4bc543701edbd88d8a35a14c034fa0eb8bd9e3098d87e0674b2a9404553ebcb9a7fd3166600f88920fc91e0e895adcc0be19 SHA512 51bd2ed3daddc725f595209ff505421914a3bc312b727b6af19200f47fab209f03eda95269573e8a6d27bb29b657772ab920e4f819f88f0854c9c214459f575a
+EBUILD openexr-2.5.5.ebuild 1691 BLAKE2B ddaa5c3bca30159e1c1349a8d3ec8b79e670c0739f98abe62dac2286b8207352361f15461ec06577a9c90ab566bc0081372d2fd6f305e6a91fe7083eece97b9a SHA512 840e4a1652df0f5968b015dfcb14ea35f6587338f8b22e3e4b78dc4358dd33108cf7edf01c1406163f8e9a11e3b7c4e7582855d1784c8c4adb1f7d85f8c28015
 MISC metadata.xml 674 BLAKE2B e6f57d2c1adb7d004da06cd8667031bcebbd1dbcc30dc4e8e7238fc6dc9a57dc5277c8b94e66510533933fe57610c5899e1e1ab82679c66c4c705a35052cc240 SHA512 027357eccaa8494c0a79b19f14a3e7356f08255d7c62b227701d98d770b3d58f0dea1bc71bb87989e453379bd9eba7ecc658ac7d02a44b6e983db7767864ac5e
diff --git a/media-libs/openexr/openexr-2.5.2-r1.ebuild b/media-libs/openexr/openexr-2.5.2-r1.ebuild
deleted file mode 100644
index cd30b0dee54a..000000000000
--- a/media-libs/openexr/openexr-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/ilmbase:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/OpenEXR"
-
-DOCS=( PATENTS README.md )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfigInternal.h )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
-
-	if use abi_x86_32 && use test; then
-		eapply "${FILESDIR}/${P}-0001-IlmImfTest-main.cpp-disable-tests.patch"
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DINSTALL_OPENEXR_DOCS=$(usex doc)
-		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
-		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON				# default
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		DOCS+=( doc/*.pdf )
-	fi
-	einstalldocs
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/openexr/openexr-2.5.4.ebuild b/media-libs/openexr/openexr-2.5.4.ebuild
deleted file mode 100644
index 56d1fff0c5b0..000000000000
--- a/media-libs/openexr/openexr-2.5.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/OpenEXR"
-
-DOCS=( PATENTS README.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
-
-	if use abi_x86_32 && use test; then
-		eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
-	fi
-
-	multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DINSTALL_OPENEXR_DOCS=$(usex doc)
-		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
-		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON
-		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		DOCS+=( doc/*.pdf )
-	fi
-	einstalldocs
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/openexr/openexr-2.5.5.ebuild b/media-libs/openexr/openexr-2.5.5.ebuild
index 888a4b92902a..c60a06f6f05a 100644
--- a/media-libs/openexr/openexr-2.5.5.ebuild
+++ b/media-libs/openexr/openexr-2.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 3a0e12181d8f..e13ca4d7933b 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,11 +1,13 @@
 DIST openimageio-2.2.10.0.tar.gz 29215970 BLAKE2B e35e1bf19dce23c9b1067ace21c2878c58ca005eef5fdc4a0c60825ba5c29dd37a543551e9427fda99d859d3cf3cab9cb8c459b47e2b8935e8b7730a09e19de1 SHA512 79f412bd3f7ad4cf6cb57d99293c02fa71478ece102478a6b93a8c5b8c4c56d1313595d24753f9ae1714039ac6aa1be4ae37461233203bac217fe6c0667fbf3b
 DIST openimageio-2.2.10.1.tar.gz 29215445 BLAKE2B ac45bcbd89f023aac7ae063ebbcf9d26375af2d370d18569cd0b4571640d446ceb639b871c107c6727aa92ad05ebea662bc8c34231bfd99a1c18215920ad3089 SHA512 6178a0c7acd870e22bffc8749282f0d1bd7475602bc63dd022b859a9ba3862b9925685a2765ea3604ba9c1ec4c0d8c3961a789862f82077ff261a7ae4e1d166a
 DIST openimageio-2.2.11.1.tar.gz 29250377 BLAKE2B 90184bbc8db97b4486f4af076ad6c37f235b2b8cfd463ee6290fe73fb267771325c6cc3db40b9bcedb56926b79f61587f11766c9eca00c6feccfb2526a4477b3 SHA512 73809587dd405e64e593d6223ef37d4b94c4f1e1d9682fd1bf09e8e4ee8bc9928ed500b7dcc03036e138e45e65ea1f43c11c53d1cb6436a34eb8d15b2415ada5
+DIST openimageio-2.2.12.0.tar.gz 29251419 BLAKE2B 7ab1b611f9354d4a8d3fc33bc30acfbc193d6fda012945af2e3b41343419755a211df1a051fc5e6f00149a78db0896ec0f8c59d559e06294dc2626401e66df87 SHA512 14c7ce8b5f71622ca5ffbcae36044a02ae760f6f0173d5efb90472c40970f1bbf355059ca06a47aba895e365892fdf91aa2fdb0f38a7ba04d148ed33f51db80d
 DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
 DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5afc1258018cef98e671977fb706c3fe1e80c30416fff89ff1b9936f0f1426eab0136e130efb4a41d7378d3f1eb77eab193a SHA512 d03500c5a9f4f1417c5629098254d1bbf032a17228898e5f087e4a5d0988f806537d3ab538366e64c51172568c3688389ab29b641fdaaf7208bf939cb859e06d
 EBUILD openimageio-2.2.10.0.ebuild 3688 BLAKE2B d5a87f880c41031f38540db419869546471b0bed383a198c05df6af55c4b21b087f9756be98ac3095b6c0fa1b9ba9cd0658821ff0442c0f4894b6deaf4ccba43 SHA512 8161c32a21d0f5b1b288b02884ce80a2f1d95a4ebd7bd76cd7e087d4435df51b66653d57b7ee081b13425fbe3640c44e46eeadb901228c8d513a9e3c0fd62be0
-EBUILD openimageio-2.2.10.1.ebuild 3688 BLAKE2B d5a87f880c41031f38540db419869546471b0bed383a198c05df6af55c4b21b087f9756be98ac3095b6c0fa1b9ba9cd0658821ff0442c0f4894b6deaf4ccba43 SHA512 8161c32a21d0f5b1b288b02884ce80a2f1d95a4ebd7bd76cd7e087d4435df51b66653d57b7ee081b13425fbe3640c44e46eeadb901228c8d513a9e3c0fd62be0
-EBUILD openimageio-2.2.11.1.ebuild 3688 BLAKE2B d5a87f880c41031f38540db419869546471b0bed383a198c05df6af55c4b21b087f9756be98ac3095b6c0fa1b9ba9cd0658821ff0442c0f4894b6deaf4ccba43 SHA512 8161c32a21d0f5b1b288b02884ce80a2f1d95a4ebd7bd76cd7e087d4435df51b66653d57b7ee081b13425fbe3640c44e46eeadb901228c8d513a9e3c0fd62be0
+EBUILD openimageio-2.2.10.1.ebuild 3687 BLAKE2B 64cd8906e6e79cd53a0d2684ed345806aeee012a0183662ab8219b1869fe3c12ec7a26c2d2a3c3f616f443b368e634297a59c8ef7650de4f68c4fca90f78a08a SHA512 3c6e9072d34eefbfd3f575d48386babe65cc1b7a0700545ae6a8dafa1d195903c39209af98d2ae6537e6d85ec7850b3a34ba1874084f67db442843e66613492d
+EBUILD openimageio-2.2.11.1.ebuild 3692 BLAKE2B f15afd2de794e65e70481be2aa28fd0260f054e9ad5c706e8f07d2dadeed417b657b70b15e28c5977b675dcd25fa2c386115bfdcc38b1ccb97275d5f42054d17 SHA512 dbcb6e706de01f0b9b390621cfb1135340d9da50432eb3e4591fce8dad512b84bd79432916f66201f0e7fad92e384103716f907a78de9ae320db39451cd16a75
+EBUILD openimageio-2.2.12.0.ebuild 3693 BLAKE2B e0f42d05f77ff242450463ab151072bea1632218e1dcad771ef738f8c08d535a6f3f338c731794c4fe745ebf640f00e994b0a0cac180972ee780da444d5a2e76 SHA512 032289072666f3c2ffdadcceb00d96450e0d4ea6cb66373f24a1293e86be0baa02af1df0f5943f3c0de5035f8972dc964ef13e2cc283b96a01a7d111053192eb
 EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 90500e5e8bd4c94ac24506b2049a1f875961834f1822aec9cda7067b425a6f2f55df02be32c8e6694a5986c11edd4789aa04bf0622dd66f7e5193706e2d0682f SHA512 6fc5f91ef2eef33934dd7a151383fc2fc165ee97fb77133308641031309bfb96871b2ef5a8b5cbc9baa563b21c3de834378d651ded46cecdda4d11d72eaa53a8
 EBUILD openimageio-2.2.9.0-r1.ebuild 3686 BLAKE2B 95bcd6666bba47874bb02eec536c1dd6d22b821cba96106916276fb9dbaad5ed592d78363bd44bf39e146cc9c753b0dc7b7a333fd0cfc5572404d3e3861b6c39 SHA512 ee932fd014b3ecc44e0cc208613b3e9e2ce9df9bc4b0fbd516232ff52ea94239da42fc057a42caee8c6e546a19b12c49a64c6286b96ca6b3407781b11462825e
 MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/openimageio-2.2.10.1.ebuild b/media-libs/openimageio/openimageio-2.2.10.1.ebuild
index ceb522b9b67a..820face3e394 100644
--- a/media-libs/openimageio/openimageio-2.2.10.1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.10.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/openimageio/openimageio-2.2.11.1.ebuild b/media-libs/openimageio/openimageio-2.2.11.1.ebuild
index ceb522b9b67a..1fd923d5c9b5 100644
--- a/media-libs/openimageio/openimageio-2.2.11.1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.11.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/openimageio/openimageio-2.2.12.0.ebuild b/media-libs/openimageio/openimageio-2.2.12.0.ebuild
new file mode 100644
index 000000000000..f963cbd15ac0
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.12.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 06f681cf7831..5917414f1ec1 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -3,5 +3,5 @@ AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82
 AUX opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch 1620 BLAKE2B 5c7e721f8754d50fdffb468009a2cc67c926ecb8abe3c0c2e5c60f15cac5f778222074f639b0040b98f405eb392f3d9c97358ed3302832fb32a1417d6bc36311 SHA512 b919c3c3f8c3190b683c5bc02cb523821200bbe951d65e2543d6f0f818ee1bcc4117c3140857becf032c54fd58aa4ee2f06b8f8cf550f72f3df9c5b21f483cb1
 AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 2239 BLAKE2B d35a7118b742244f045aa5c0e5e1ab42a8eea98cac377b9fb0efd8948e2b13d2be973aa17714a8554a97061a8de0769861947cf9c890bcf81acff593b3f34ae5 SHA512 2e86d3f73568c16c839d783574abfb765432b3bf9171b73da8eab9c86be4c736912b892879cb04d974046fb90c5fdf2e60669cc94d468d5aec51573c0ffdcaa6
 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
-EBUILD opensubdiv-3.4.3.ebuild 2352 BLAKE2B 4f63d66a6e3f273fb78cccfde28f9f32d0cb77751ca8fb728450c3db8309c4bbe8326f849b339a13b24778db6939789d15c1a81669c3690a7ddfa961ded16c5b SHA512 ff3f3bcda330f307973e8ac2cf3e3e550d45b40ba141f59883083b6bbc9f3a07e3ffa74b40a709af710104dcfead3505d91acb15b2554504087d26de571f8316
+EBUILD opensubdiv-3.4.3.ebuild 2357 BLAKE2B f835d36bd7251f7422dbc9f0c57eb6fbc690bf5710f3a2c1cc6c2bd6869950a75f2d7703259ea61134b390accfcd7bb1ccf740cdfedd5f43d77e6642cd7968ce SHA512 d7cc4043301020579e0c8f8193eeccb338cc57491e003d17d41867ba5b3dc24fed7e506a53f230a3d915138173c33e0b41faa600b3adf1995e5ccf3778ae00f2
 MISC metadata.xml 1005 BLAKE2B 8672aa4423818052199d3a4d3e594b1d838accbb5e332f9eeb075593c7a466f93698d171a543a6e39829028baaf62a1713d09682aefeb4a904ab41dde43ea4f0 SHA512 cd592ca220b954b57199944e41a9904bfe5efde067eb4d7640d008adc2dacfb02ebebb3783f5bbc99436f7213b2b9397b2e1d4408cb837462909070649aa093d
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
index 6944163c7dfd..51707c88fe75 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 # See for example CMakeLists.txt for details.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
 
 RDEPEND="
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index db4e610a1496..fa78ec4b4467 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -2,5 +2,5 @@ AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385ca
 DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
 DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
 EBUILD osl-1.10.13.ebuild 1982 BLAKE2B ba5db5bb799f094356b034d82a322a7f189b671b4b04f8e0573ff3f5b6478d1787ac4e9a91cfff3ad3444ca95f6e678b4b9f2829b425b84fc348057363e7089e SHA512 0b198ebc63420aad4adb20b29640d2a00d8b4b3cf8e62f68e454aefed2e60c5f7af977b9762a1d26074bac8e5016c6703ccf9d7a038cfa2649a701eda24045fd
-EBUILD osl-1.11.9.0.ebuild 2132 BLAKE2B a504079bb9e6f9541154a951e102cb4007425b65b54af4e4ac96e098f6f456c8f5a8aa4c26b77d715d90071bb4e12daee7372ed2cda14307217bc60bf6ab923d SHA512 cafdaef138efa8f53ffb84096055b61ab75ddb8c800319c51305cb158afd434cf43f8dbcc71faf3781107dbafe4c833d1ba746cf3140770224c1d7ecb04299ab
+EBUILD osl-1.11.9.0.ebuild 2137 BLAKE2B 3a7993f36779b7bd262a866d96fc9256319d33ac2ef54f930a0bf9aa93f9c829fd332c7a6547b0ca6a1a7b8080d9d0a4080f624370e4dacc133c8ce666668911 SHA512 42f98ae0c1229b75592702ee43dbd21bfbd8237e50b69f8be5ca4477bc63d67974c0b654ff7d6ad29cb7c8d8781a663642f916ec48bfa521a3702cd35cb2f781
 MISC metadata.xml 810 BLAKE2B 85c4497ffc27bcf44682666135bebe083468c950618a5840fac008af4eca4dd902d371123d42f7ccfb3133e94dd2fbae22531d857e4e76bbafe10e55aa6b009b SHA512 cd69216183988e52c8224240263e162079510f264b7b277222dbc299316feb235dd51396351ca650298c4a890d8629ab38ab8ed75c198e8d60e117ed3a4a8b40
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
index 9ab4388c8dfd..1acabfffb6e1 100644
--- a/media-libs/osl/osl-1.11.9.0.ebuild
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
 
 LICENSE="BSD"
 SLOT="0/11"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 X86_CPU_FEATURES=(
 	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 9a62ae2aba58..9244598cb089 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -3,7 +3,7 @@ DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448
 DIST partio-1.10.1.tar.gz 333129 BLAKE2B 82d1dd36e9854e221af036d386ecdc558ac032ad7cd720403787ddc83ac236f05fd86e8c07ade07ca93b06a12ac2b834c96a6d43265e396934e44a815df003d3 SHA512 7d3c6449ebd1e8b8a29298a3119acfd1036970b287e9cd5f288a63c7e2b3bf451e9e1ba8fc72f203e225eb2b062d59cd7373817ccc6467de67427d02c0b12477
 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
 EBUILD partio-1.1.0_p20170829.ebuild 1148 BLAKE2B b0c55730e21d0676f6174448b1b52214ab704ddf5ff2057c4c10a104714009cd0129f821866929b79afcbc18bf0f2dd2ecdaa11f49a1fe65e00a1a947dc4a6ca SHA512 275f28c68464d6480c175971d4626f22f4c76e296f674704110a787a7bc96e7ef95e732acb4563adc99f9230af5c66a7d1cad989743f6aee81376243a968fd04
-EBUILD partio-1.10.1.ebuild 1004 BLAKE2B 8bf7a27dc1c97c5ab668482d3cd785541ee9b5de056909146b2564281491b7226b9ffac18b850a8313b69732be38405488b93360b556246da7068c8a61727bb0 SHA512 83aba22cea524a70fc83f32c074d1d5c7bf7b56c0321ae452c66843acd0c1145c3a0aa9970a4da2f8bf9761a54bcd6f3f850d6f48fc0d030faf4e92c218d16b1
+EBUILD partio-1.10.1.ebuild 1009 BLAKE2B d1bbe9cc46ad0b5caa91c74b923a9bb33c00a4968391f6389e6ec0f0a884dccd33421860c55264004f04e6e9363b860e826a8687164a804d264412095e5ca144 SHA512 7ad6d4799b41f890543aa1af00d5e33a77366b1f91968d7d673341fd228f6eba68aa01a90ffbfabbb0d5c23749e7151d6e3dea31728a2cdce2524bc8d0f321e6
 EBUILD partio-1.5.4.ebuild 1005 BLAKE2B 181022e1927fce74730a795e92299cd21491e8f65c6a9da11a84d3edb8b8d818314bb69011a2960f89cbeac69757ec05180c2015cea7919c126c1d4e3ad4c71d SHA512 69f26f13def6dd5fc1ae178c82bfabd4c05f4eb926eba32f09585a37ff05fed405c25146e7fd4c98aa121d70d8d2c810e707477f4c24330b636bb1bccb75682c
 EBUILD partio-9999.ebuild 1007 BLAKE2B 0ef6f815874a53c90a329598fa1fb74ffbe8df5d54594b4bca6c13de3836c50417f5185e2e6adf84c0ff5111fce8dbc850e5901e33cefb2eb274048dcf4bddc4 SHA512 42c9ce2cb8ac4ae9cf89a3bedcb2e7ff10c7adfe8c7c22cc39ed592f359a8d102ae736321fae802b18e29664c29e9201691ecd402f12e523a5e2b30ce32785d7
 MISC metadata.xml 444 BLAKE2B f9a6abe05db032e6425daecb9a5ccb29f5f0a1a2642f1184ccee43b7473efd5d1b014c656e7349b9326d7e7a7e15b3ae035a287ab129e69235c81b6dd0f9109c SHA512 78259bbbc1fce6259ea0c6ab0b6cb19aa570407ccb31a58183480c954a385941ecad95667318494d87fd3a3480e59faad55e029faf050d371a61592151d8544b
diff --git a/media-libs/partio/partio-1.10.1.ebuild b/media-libs/partio/partio-1.10.1.ebuild
index 350c77be27d7..900b5feb8067 100644
--- a/media-libs/partio/partio-1.10.1.ebuild
+++ b/media-libs/partio/partio-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wdas/partio.git"
 else
 	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Library for particle IO and manipulation"
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 0e226fe5759a..84db69497f6b 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,4 +1,4 @@
 AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1
 DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
-EBUILD ptex-2.3.2.ebuild 780 BLAKE2B 43fb9c46ca0a132145cc96a3a6ca92abddc172e9597ed4c7e784c8e0161778819941cfd40d7a94c2ad1d8d37c5c41e20c8c48a7c2e7e61bde1ed42e4921604df SHA512 7db656cf4c8f13175a3dd9678060628a67314919f5cc2ba5b6fd31a5f0e306439901f3e4936cebac29b4f95b97652726acec036ac41321203b0ba2a2a2851f73
+EBUILD ptex-2.3.2.ebuild 785 BLAKE2B a4bc5f8b72221dd7e13748113f19c383426e5157f68222ead0ed93b075aece503e8c2c5a4d9d35d550759fd6727ad113fee8a0410ca14f734a9a2159083f399d SHA512 ed1ed98de5a28af3c0922f69ce838206559cba02dbb478bc53d6c7815cbc31378eacef4ef3f6497ac178a498b45f490c95a171b6f33711df27782ade04518755
 MISC metadata.xml 442 BLAKE2B c2d8c5008567c10224514df3263df6ce9a3b5ab1fb764ae62c08b0aff8cf8bfc9152d86364b9a2dc5e5cd92b8ea9dce9609db65645908cfb137a6543e8e23aab SHA512 029c88e1a08bdda8d6518b6f2a1050e52ac121154550807ad52a34252b526216e52783477561567cc49d213c50d23c296f90e8f3d6da1e03dc6a6e2bc18e14ef
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
index 7087ff9171c6..10406918b145 100644
--- a/media-libs/ptex/ptex-2.3.2.ebuild
+++ b/media-libs/ptex/ptex-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="static-libs"
 
 BDEPEND="app-doc/doxygen"
diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
index a76192e9e3b0..ff99f4fed017 100644
--- a/media-libs/quarter/Manifest
+++ b/media-libs/quarter/Manifest
@@ -1,4 +1,4 @@
 AUX quarter-1.1.0-cmake.patch 535 BLAKE2B b800b87ff88a824170700f37599bd425c08d2defdd515f98314de531710ff56f916a7619cd9eac35c74664bc7dd55f4320234ac96b0e1c6b08ff64b04c312918 SHA512 fbd981e1af9003ee6f92a6218a2d150b110f3e86c580b2a57a7d5e496f3e7a36e0ee8b5e664ef38b7d5db7294b2500c64e1c8c4adf9a8ee3b877173f409bb411
 DIST quarter-1.1.0-src.tar.gz 724762 BLAKE2B 8f1f0025706c4502ea178c09204e442b9c52148371863a5a49640ba751084cca9ca464398ee171729d85e8fc2f3fe3ea9d5f0492d114d810527601936abbd1e0 SHA512 2b2649132c66c709e3d5df2a99d621fb9cf61424c5376a5ca6a016ee5c7514841f8bbe390d1acc7b94688a86b56304ed12fb98840e11933162ac6ccb3f3d681c
 EBUILD quarter-1.1.0.ebuild 1365 BLAKE2B e939cda9ba73ca07c4d6e3465245173c361c26d83d168efef138a1dda8f11059748939f221d25ddd5e0265ef80470e85e8e95206348b0503ababf18d57c8d73f SHA512 289234257e66f0705bdce89c47e3ec4b93c8a5094cb5637493d2a71702ad1560858510b235ce2b5162c4f9f3d057448efbb98b736532dc4d75f15fac0e1371db
-MISC metadata.xml 905 BLAKE2B 5fdaa70b0890d88bb877ad348dffeda594598c82b213b178dc87bdd149bfbe5f5c0cb54681963d1c046c1d39ed6ef3c169a9ffb0cba2e1594399b1ab03bc6fce SHA512 9711104dcd8b1d26d3aff62d5046389492becad1cbbec1e8367dab68ba499e581ff7b3f2bec0b59af53052e40c81071db79a26b79992ece3450da598efec2475
+MISC metadata.xml 849 BLAKE2B 8f7116c681789a3afbfa5b009386743fd57426f797f6302b83e720cc72b3bc0b4899987325a539f77e5e4b41faeab7004dc0cd0a1b5eb86a1d8c03241e2fab89 SHA512 5ae7391e55fa9875827031d983ed55a9480d28a5612cdda8c4a7991b35551a69d97a05f16681fb0e478cb41755712d6cb0c51f56231f21d42eb40a85a6193c53
diff --git a/media-libs/quarter/metadata.xml b/media-libs/quarter/metadata.xml
index a9191913aaaf..c7ef651c0ca9 100644
--- a/media-libs/quarter/metadata.xml
+++ b/media-libs/quarter/metadata.xml
@@ -13,7 +13,6 @@
   </longdescription>
   <use>
     <flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-    <flag name="man">Build and install man pages</flag>
     <flag name="qthelp">Build API documentation in QtHelp format</flag>
   </use>
   <upstream>
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 0b6c7332c17c..85d7bdeec00f 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 3208 BLAKE2B f950b8364eb337806b9abe4e408ef4a506b19f909c170d3d9598851172aa0723db740ad14826b6adc3cf762ba47c4c059c0176057235b20b1221d1c76437c1eb SHA512 42fdb78570cfaf776a3cbc16c5dcf12928a80c829e45972f961cdc411d6598b578a289efb6861f8c6dc5218b2079843e4249c9226d657762373c381ef5533350
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3238 BLAKE2B e90817c91c696fe043183c3dcbdbc881ad57fb960f54d957dfdeedb9b35f75aad721a8c09c71deaff6abdc2fc24185bd9e3c1dde9ac1ab9cb46177f6bdf2304d SHA512 e3b7cf7a8ce8e728dd17cb93ebb384de0c313d5c2e131037ed44abacae28547fdcb68177226556cf04879d286c5c067943c6bf7067f49c1a7736b288efc39956
 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 d9efb2a003f1..7757eec87498 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
@@ -1,18 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune multilib-minimal
+EAPI=7
 
 MY_P=${P/sdl-/SDL_}
+inherit multilib-minimal
+
 DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
+
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
 	timidity? ( midi )
@@ -23,60 +25,65 @@ REQUIRED_USE="
 	mod? ( || ( mikmod modplug ) )
 	mikmod? ( mod )
 	modplug? ( mod )
-	"
+"
 
-RDEPEND=">=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
 	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
 	midi? (
 		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
 		timidity? ( media-sound/timidity++ )
 	)
+	mod? (
+		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
+		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	)
 	mp3? (
 		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
 		smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
 	)
-	mod? (
-		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
-	)
 	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
 		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)"
-DEPEND=${RDEPEND}
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-wav.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch
+	"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-wav.patch \
-		"${FILESDIR}"/${P}-clang.patch \
-		"${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch \
-		"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch #445980
-	sed -i \
-		-e '/link.*play/s/-o/$(LDFLAGS) -o/' \
-		Makefile.in || die
+	default
+	sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die
 }
 
 multilib_src_configure() {
+	local myeconfargs=(
+		--disable-music-flac-shared
+		--disable-music-fluidsynth-shared
+		--disable-music-mod-shared
+		--disable-music-mp3-shared
+		--disable-music-ogg-shared
+		$(use_enable wav music-wave)
+		$(use_enable vorbis music-ogg)
+		$(use_enable mikmod music-mod)
+		$(use_enable modplug music-mod-modplug)
+		$(use_enable flac music-flac)
+		$(use_enable static-libs static)
+		$(use_enable smpeg music-mp3)
+		$(use_enable mad music-mp3-mad-gpl)
+		$(use_enable timidity music-timidity-midi)
+		$(use_enable fluidsynth music-fluidsynth-midi)
+		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
+	)
 	ECONF_SOURCE=${S} \
-	econf \
-		--disable-music-flac-shared \
-		--disable-music-fluidsynth-shared \
-		--disable-music-mod-shared \
-		--disable-music-mp3-shared \
-		--disable-music-ogg-shared \
-		$(use_enable wav music-wave) \
-		$(use_enable vorbis music-ogg) \
-		$(use_enable mikmod music-mod) \
-		$(use_enable modplug music-mod-modplug) \
-		$(use_enable flac music-flac) \
-		$(use_enable static-libs static) \
-		$(use_enable smpeg music-mp3) \
-		$(use_enable mad music-mp3-mad-gpl) \
-		$(use_enable timidity music-timidity-midi) \
-		$(use_enable fluidsynth music-fluidsynth-midi) \
-		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
+		econf "${myeconfargs[@]}"
 }
 
 multilib_src_install() {
@@ -88,7 +95,7 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc CHANGES README
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/media-libs/sdl2-net/Manifest b/media-libs/sdl2-net/Manifest
index 319c881ec8ce..9322b2385574 100644
--- a/media-libs/sdl2-net/Manifest
+++ b/media-libs/sdl2-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL2_net-2.0.1.tar.gz 347436 BLAKE2B 9c7bb46cf97581f75543b9e2695e4ce87b78c66dada3ac1a3ddf7b8e6eeaf2540532aece3e7a6dc7f6dfcfd3ecf5148d5bfb9a84bc2775e57f68b3adf32e5828 SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a
-EBUILD sdl2-net-2.0.1.ebuild 806 BLAKE2B eb4e811ab802d5391a6dd13cdbe9b067d491be08ce66ed3b2aef982722ff7c9d5656a6c23f8264523f06908d4f02b6d28d3802010fe8ff876b5f118510986543 SHA512 66f2791901f2be6c27de3929969ddf5bbfc082c6d87727a527a59c2d4c307915c71c99b2031ca863fbabf3756b25b95d4a5bb335e0af1ebfa5ed387a1f57340d
+EBUILD sdl2-net-2.0.1.ebuild 817 BLAKE2B 1e608f52a1a0f20642bca1e461530cfaf78f2f1166172720760b4debd41b0e48344497244216ea3aab569641371a27a90d612880786f17467071d272b9799beb SHA512 9f3505b20827026d43869ca6bd51120425d566b2d1fdfbcf2f1e689ab5f01efbf5659143ca7530c55c8c3aa92e0409485ffcfc8dee976eae0a9e85b50f3d6283
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
index 5777ab54ca27..195ceafd5397 100644
--- a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
+++ b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune multilib-minimal
+EAPI=7
 
 MY_P=SDL2_net-${PV}
+inherit multilib-minimal
+
 DESCRIPTION="Simple Direct Media Layer Network Support Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_net/index.html"
-SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_net/index.html"
+SRC_URI="https://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
@@ -17,7 +18,7 @@ IUSE="static-libs"
 RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
 DEPEND=${RDEPEND}
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
@@ -31,5 +32,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc {CHANGES,README}.txt
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 62c7e9b7810b..06ee01b4429e 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -8,6 +8,6 @@ AUX simage-1.8.1-fail-on-missing-quicktime.patch 453 BLAKE2B 23592fb30537aabd5c3
 DIST simage-1.8.0-src.tar.gz 797069 BLAKE2B 6f9e3512c9815974b1b2799306c6567f6b5aec6771fe31e0a5fa47a827819df02e80e976063ddbae3e3aa3a4d33da68a23c9067e7b91f82c28592f83d0e782cc SHA512 fb4943c38f418461b087d5d013c2054f25d553a872fc80f9445a5e907901eb40265d838c5cc1031032dd84885f066f1c640a1949bc450591fb0ea88c05d1e38f
 DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe
 EBUILD simage-1.8.0-r1.ebuild 2239 BLAKE2B a9a205e8eab2e7593e81f5cea619764fa92e5ea6ee6003f39ec02bda59c84a9082c59ced21464d7a9484f11b3c522da4472f2fe275d18178d48af468d62d32da SHA512 5c890d96f4507fc924d0967b42327bcf099c75eafa8f748eae08e93836a6f88f87ced49f602371f447717f415e61ede23ef5ae78b63105ffba437bb9ad5dc885
-EBUILD simage-1.8.1.ebuild 2213 BLAKE2B 6ca0cd18f87a6825bb7b8a854478b40d42af6dc45cdb07f7b3ed7c8be029df91edcd2ae8cbf7381b04deb94c9eab1359d9d35f1d6c784a64e99e2df71cfaefcd SHA512 8bd8da547da521c75e8f0dfc0fccd9373d319643cf638b88f8fc5a78eec1607f81e756672978a959a6c1ba52f880ea17d78563ec79105493f0b0ee96228e39aa
+EBUILD simage-1.8.1.ebuild 2209 BLAKE2B e5287791ffb967d5f09dbabccfe5987b2d3f51e06941f30ab340bfac608b575e8666ce499a41a18984318d55842a7cd70417065a2d244630bb0421277601f16e SHA512 94007af266ba5340902b5f8d377020698858fd8e849402f68750dbc32c3913f5e36a9bbe2d8ec34f2d22c9715288c5f7d9c7d04ab4dbeefd88be40df2cc89e20
 EBUILD simage-9999.ebuild 2161 BLAKE2B 9550de5e7bfc93f6dc04ce7625c33fbbf6c9111ed2c75da0cc7c60a24e36a720fa13abff9f2ad5b7b651aebe9e7ba8fc04df25613968db812a9b9141fb55477c SHA512 d9e1f039e6315f48c6d69a1433f5c60617b31844aaee15342b146a4a8a6d4d664e0350d7baa3200bb3913358c7bef47226fdc860afde04876bdf2b5a5e9bd5f0
 MISC metadata.xml 297 BLAKE2B a6b86d0b1492873d329613ad09de390097f930f3b6782979bc15d2c20ec06f74b49e58db89ed76d955fc9c6ee7d5b854498e3d4b10763f6f6b2a17f4eee3f4e2 SHA512 8de4e504b13d7a98b5bb90a634c4dd5009688b6f9b78ed2504970b5bedcd4abfa4456db084803b63fd4ea4d88c4f9cdf4bac624a671663b079dad513b41328f3
diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1.ebuild
index 20e75177d9c1..d2d198033f3d 100644
--- a/media-libs/simage/simage-1.8.1.ebuild
+++ b/media-libs/simage/simage-1.8.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/coin3d/simage.git"
 else
 	SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 	S="${WORKDIR}/${PN}"
 fi
 
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index efab9ce31849..ce6dee1279ba 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,5 +1,5 @@
 DIST suil-0.10.10.tar.bz2 339906 BLAKE2B 03d1ac744fa3fa487bbf44d6e006f6cfcc73dc4aa6eb79d1ac5d024dc9493e3e426ff6054705d1de514286b2d43f5a1448bfcf7e573fa95d61c41790ca06c405 SHA512 e442022096150b2f71d65bbd625e2e262cb3e3865c57f5a30f0472dac8ef90ad2fbbf67235823055019017e3751b46330f6e98b8e1745e5845eb02c4d2a4fc21
 DIST suil-0.10.8.tar.bz2 357003 BLAKE2B d5445a8a539d3aaca94141fe0a7bfce976db9602fcaa563d0e5661ce7d281ac48679110e5545d3a3aa4d3c488c5ce7a00f2f06bd67e56da26943885a71480648 SHA512 1d68996756ac593b2b2da6d9554e3257944cacbc8d70d90ded0f6ad5b5877778a08c779a12c7b4527d492f9c480613e030ab6933532f758e16221daa9d5c2dd4
-EBUILD suil-0.10.10.ebuild 1037 BLAKE2B 80c53727fdeb68f3d46a4f1b0edace5c18ae440d6a11c58d23c0270d45485af6cc2b66d409f907874f26bb04c884d9c6eb12b5d097440bc3a84dcd1e52fff691 SHA512 33fb1042f6a6b993ebc428b591aacdd075305f69f9527d4631a4a4016bc98931cb5aa95a38dbf42ef90117db3609d264729e166dbd4f07286a57bce93d041e55
+EBUILD suil-0.10.10.ebuild 1090 BLAKE2B 0b8d89df718aa7a8011c87b57e6fd5f55a95ba2355ab6969f802c6930f28ba6aab67b840e70f993ea4d640758e6eed3aa2d2ac324983e3c2660ef346f68b0296 SHA512 eb09b762218987cb9155386e8fe56b8d5d39efa8448092c5aab8c4d305bb10733dad94c0d0e9602b9df0e2420a0e658049964bb45c70b868e2de4f31fb145d14
 EBUILD suil-0.10.8.ebuild 1033 BLAKE2B 3e698fb6bd09a3fd76fd9c538bd03af87fc59ce7eaa2864b9db93c07304d29d6651dd6ad8bd692a284f4b3d25c70a5e01f692996a6500ff81096339f2562fa6b SHA512 28f367ea81c46dd7324277ccc9a42881ef43e56a1de0ab74cce01cd717328f65ee266d9550c2360fe21067535d470a95b0f0fb21754560a25d016f1818a86323
 MISC metadata.xml 491 BLAKE2B 8d423d4bd56c2fc586cac7dfeef9ba125799795a02f8f7303d1e657e83181ad68eae5e20cc75806fefbe1296f0eabc632fee3824b9b36e7ccef0a22e04fe4081 SHA512 c56784f3b84159aaa284b5b04ce4d2110d78acb536ea9dd60d5043199a061171dfd0272f4d810e7ac68025fb906cc021b36f099ea966bc87e0de8f57464a88c3
diff --git a/media-libs/suil/suil-0.10.10.ebuild b/media-libs/suil/suil-0.10.10.ebuild
index 4af965262246..8774c5bba0eb 100644
--- a/media-libs/suil/suil-0.10.10.ebuild
+++ b/media-libs/suil/suil-0.10.10.ebuild
@@ -19,7 +19,11 @@ IUSE="doc gtk qt5"
 
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+	)
 "
 CDEPEND="
 	media-libs/lv2
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index 63171bdfe2ae..e3d2504cb00b 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -1,5 +1,5 @@
 AUX svt-av1-0.8.6-fix-c-only-build.patch 5078 BLAKE2B c26a13dba8ac62ec2951d43d1419d6cacebbbb185841636845fb20a6aecb1c6fe4cabc1ab53748c3df0a4b2fcb8e25ff7b63447c486655fc8ec23144ed8388d4 SHA512 41f3c400bc6ff0c8df529cc5db125538367bc36468bc000936e76f58bfaff15d3fbf322ec2705ac20281753273ab834a1691e7852ede6baaec003b1d46285e1f
 DIST svt-av1-0.8.6.tar.gz 6416120 BLAKE2B c30d3bfc2dba6d7964625c4505bb135aa335adf195df91ad058fb02496276cabdc651b09854a2d14136352a434e08f4974148e03e7d54bde0924d25a1c4524cd SHA512 07e7353e35bc581b23c71913e65f5fd27566f4bf1d317d474d57d5bb2b82f380f713a00be19bd3f703935da50f81f3abf1d4ae38fbdf253385edf423737c0543
-EBUILD svt-av1-0.8.6.ebuild 1146 BLAKE2B a8cf2fd22ef19ee6ec7bdddf5fdf863d2df97a73b28c0e4cb8847d5b2d9130ad3e7d8d31a631335c060930867e0e6f3ca5a8a8a5fdfe0b4d1919703067c4fb02 SHA512 f6e4432e9d9db6f0ebf22e4e24a42a9745ff200b21534224491cca5ec427a0a7e13f50746fe56c6449672a8fa9f428117978c2817d2e798a078abb63e4835195
+EBUILD svt-av1-0.8.6.ebuild 1153 BLAKE2B d1bc65b830f32f5534a8f92565ce861fe66fb93d20ed85d741371c23187e2f523a354d02174ab5e32e7a9dff6348ab7a31ec2bdb0b53c401f91cf66a50ce746e SHA512 fe370dfa044615d3fdded4beda28efd9de97410d251638051b8e1e325764000f4005e0b014a919a91b3f80ccfecaddfe0daa7bb4bbc4fff69198a762dd4095b5
 EBUILD svt-av1-9999.ebuild 1055 BLAKE2B af96eb94a47185ddf01ef21ccb5044ecdaa5ea3eee428a05de6bad22022d8777d4dfa31a6de1290200504d01b27a5129fa92b02832eaeadc653b8043b98be589 SHA512 45326879f4d0069b712a1ab85a5fa4b1ab4324f7eeb21c7735821dced5e638bf7430e4f2357511cbc2f596d7364316268194a406981e6c7fa617cfa8d077535d
 MISC metadata.xml 531 BLAKE2B b276b87582bf66d16429b34b3c55c522b459700dd11010c85210ba8377538bd91b74fe65f6464dddef9f3aca809b9d2e836ce67875574960a6dbdfea34fb9172 SHA512 99100bbfcbe32caa3d5a80121a512802cf01da9b439b5baae5ca88a694658a50783d42bd047e349367a42dca2c724684bbe216fdc8e433d8aa4a58ac9cfae2c6
diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
index ee38d183fd1d..424c5cda9ef2 100644
--- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild
+++ b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
 	S="${WORKDIR}/SVT-AV1-${PV}"
 fi
 
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index f521947a3e0c..4d06adc6b743 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -2,4 +2,4 @@ DIST tg_owt-0_pre20201105.tar.gz 18390526 BLAKE2B 115e93eb9dfd158779d2a521de9bca
 DIST tg_owt-0_pre20201112.tar.gz 18391959 BLAKE2B 85ad2880e9067daad94389708c0cb3638c090fa8281b8bf55d990dcdbf8eb898a70a930a0c0e904b0a682b9ebdb021134e18270ab760191b12cccba12dae95d5 SHA512 10f6ca1a6a82e9bd9af9e815b4d849fdace39332df61d32a9b706bffc3e8647b20f58e63a2fcc4e714e1480768ddd8f7ad21588f1e9762b3c056b205abfd5806
 EBUILD tg_owt-0_pre20201105.ebuild 1110 BLAKE2B 08db203fac816c05d87217e9f188ef66d17ba838ff2180c7477ee69f5d9fd3795b18b1912e9aa71bcac79a080ef7cfec8fd4d206b02a8a49306a6a4e8d4e8df5 SHA512 284997626835d55edfa2628ddd789ec7bd80fd2f675106f9e87f76dc4617426cc73cc388bf7cd3470f6053f89b6b3bf3ec0248857a767cebec61a46c4eb1a17c
 EBUILD tg_owt-0_pre20201112.ebuild 1111 BLAKE2B d2ce91fdc8b0e2e4e81133d69b636bb6739904f5a308f7d7173c84448ec52fc351c9411444ea92fb40d4fd55d33b189de5e7d56c5948d3e963cf62ba99834c86 SHA512 80f0e7a3096c52a170a7690ace4122f6945f41171d266f127e5fa3e743434c7f18b429064119b4d97dfde1a57cbdd3432d7f757caa1ee4768de9f6ed538b72d3
-MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/tg_owt/metadata.xml b/media-libs/tg_owt/metadata.xml
index efcd58fe0b9b..7a38bb900964 100644
--- a/media-libs/tg_owt/metadata.xml
+++ b/media-libs/tg_owt/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index ed2dda34c3af..6357fdfae7a8 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -7,5 +7,5 @@ AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
 EBUILD vigra-1.11.1-r3.ebuild 3535 BLAKE2B 0af86fbaeb60e40a3eaea93de6a22ac0310023aa16a10669ce87a7b21d6460f4b9cb1e49fedf88e5386a86777505134fdc9e787724f0fc5b2babb076d566feca SHA512 2c7dfdc5d3dfa1b4f2bb084f1ce91868b30cd4067ad41471b5de973ced7c2cb4d1119d0d4317b34a00c097598b194ecba46029036f1e3bd7e01dd97602cf8391
-EBUILD vigra-9999.ebuild 3905 BLAKE2B 36f5a5e95225129ed05d2f7f4fe057fcdffaef55f17983fb9998585ef9fa5d2b12c50852bdb6fd4974fcec1de60b8a11887f8fc36ef3e111809c9d679e8043e2 SHA512 77a9075fa4ad56a4f78bd0a44d352eac22c0ff02f167a08956cd65c1798b9c2e0eee82c50213d4e4bc3a651bf6ac398a6ae5db7ac90f4f6f8d988451ddac791b
+EBUILD vigra-9999.ebuild 3844 BLAKE2B 8a0a93277944dbf5c820162cd7881907f5ae043882639826cee6b56fb6c1d723d327ef021cd9ae59d9e2595913ac909571e0d9c0da55fe1db880f710668597bd SHA512 955ddba13948748776e1c715174a03dfb3973627f38d90c594b90bfb8ce58795c268b964a7b235a1ba22b4e1ce570527ce2e74672383acca88028941997ee995
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index c445f2e401cf..9ffac6b73b01 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="threads(+),xml"
-inherit cmake-utils python-r1
+inherit cmake python-r1
 
 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
 HOMEPAGE="https://ukoethe.github.io/vigra/"
@@ -83,7 +83,7 @@ src_prepare() {
 		fi
 	}
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if [[ ${PV} != *9999 ]]; then
 		rm -r doc || die "failed to remove shipped docs"
@@ -101,7 +101,7 @@ src_prepare() {
 
 	if ! use test; then
 		cmake_comment_add_subdirectory test
-		sed -e "/ADD_SUBDIRECTORY.*test/s/^/#DONT /" -i vigranumpy/CMakeLists.txt || die
+		cmake_run_in vigranumpy cmake_comment_add_subdirectory test
 	fi
 }
 
@@ -116,7 +116,7 @@ src_configure() {
 			-DWITH_VALGRIND=$(usex valgrind)
 			-DWITH_VIGRANUMPY=$(usex python)
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 
 	if use python; then
@@ -131,7 +131,7 @@ src_configure() {
 src_compile() {
 	local VIGRA_BUILD_DIR
 	vigra_compile() {
-		cmake-utils_src_compile
+		cmake_src_compile
 		VIGRA_BUILD_DIR="${BUILD_DIR}"
 	}
 	if use python; then
@@ -150,17 +150,17 @@ src_compile() {
 
 src_install() {
 	if use python; then
-		python_foreach_impl cmake-utils_src_install
+		python_foreach_impl cmake_src_install
 		python_optimize
 	else
-		cmake-utils_src_install
+		cmake_src_install
 	fi
 }
 
 src_test() {
 	# perhaps disable tests (see #390447)
 	vigra_test() {
-		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
 	}
 	if use python; then
 		python_foreach_impl vigra_test
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index c5764d0a2477..4b254160cb98 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-layers-1.2.154.tar.gz 2312569 BLAKE2B 01415b6bb1a2b3e89569ac1a5010be12f752d1a6cb8885aa8ba2d062e5742313f75c8cb51c078b2020afcecffbbf8139a8a97220beae556191427bbcbc7a21e7 SHA512 44cdf3c72d6933969959ee959121de8e32a225bb941d9d7f3b2785bbae26d56cfdb0efb072c11649c316b5cef00b44f2f2415071c39faa0fe00a9e7c66098b7f
 DIST vulkan-layers-1.2.162.tar.gz 2398927 BLAKE2B febfcc88584cb7d69ac2f2bd95a73921d2dc92524b05f17e7d2a9f99336416260da60eefc560d93ad788d9a185d4dd865881f5bc8faf0dae388bacca59a21b7a SHA512 85eba0e1d07cafad212ef611fb1aef3113b6609361476cda7176a49110fe62d257b815f7c622d6ba959872785242e2231c7245242e7794ff5e60325d10f3061b
-EBUILD vulkan-layers-1.2.154.ebuild 1498 BLAKE2B 915c22156cdcb9385f539484a18d1b9ce60b29e116642d6cb480c0e8ba07591ffb8ab14f34d7d4b7190328584cfe11efed0b8f0b51c9a4b09f57438581f40fa7 SHA512 75c07e0eb319bef4cdd7f718c733765f1e13ada5a76fc35c57c73766eeda24f7631ad517805fa4c116bd754c0e16802d4b78207759a24e19f7d63bbbbe45588e
 EBUILD vulkan-layers-1.2.162.ebuild 1487 BLAKE2B 39f16295cadbfcd4921db6699ffad0acb9006b11fd6d2b73a4d00ea1bfb3d19586e172656610129af32e01125e8d3f8b0ac9d7434976dd09aa43e217f40da183 SHA512 4d4e14abebaebc304004c7256d4f81ee9522d2f46dfc4450d70f935d1d1ecf87b631d13eb7765be8c8a3570ff2ed6b384971939cd37d33fe698c9a54f0a92781
 EBUILD vulkan-layers-9999.ebuild 1498 BLAKE2B 1aae6c33c685e3992dad9456fc09a174c0e13a2cab4d9b34ff95636f52a539b7545ff450c0fa03b069eec903eae1e5732495608b936603b5f6797478c9335db8 SHA512 142d147fae940ec7215ddd610a80f417e1049e3eea565b15bb17336e23b061268b22497f1a5048a8a7a076d423950762aed5c65658d8aa04cf2f15f06ccbc50d
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
deleted file mode 100644
index 5e310af24185..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-10.11.0.0_pre20200924:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.5_pre20201107:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 474db2e11def..fd0b256f1bfe 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,7 +1,5 @@
 AUX vulkan-loader-1.2.162-Fix-pkgconfig.patch 1421 BLAKE2B 6271cbf4b9b91976a2e0e821f0f62a75c556d6fc54482add5c3be7d139013d9971e22ee462e0fed251e4d78a41f94ee3127702aa1052a1a5ff04e9ba036f9d64 SHA512 63309d605f269d7c48c86aff823cf1a17a1ab1e6778ee6fa838eecbc3e439fbd730610753fc64eba19c43ef441ab68dc378f778ef8ff84349fe925ff3be6a321
-DIST vulkan-loader-1.2.154.tar.gz 1417349 BLAKE2B b134932b31325884639e94ef74f7b97c9111554ef904777df9b4e398d927e89bdf2394593ce8e4483e9fda1cd1f299df0841471ac11263580b04bc97786ac973 SHA512 003f16bff7eb24791e458b757d0fee5db9ab68d6e7b56eae623af0c4702c534cc19099c79d2ec2493cd3c30c796f1dff060bc3aaa4057b9215749de65566c157
 DIST vulkan-loader-1.2.162.tar.gz 1421710 BLAKE2B 94b739821c5a12a94a52d8f0a9d79c13055ef3b45b907d53b82325b7be13db52b77d01397534e939bed5629d7a405ff8a09f8da374274a066986b4126fae9863 SHA512 89a99f282b73ec59dde30e4c8c09056b40416185a14ff9b7f7bd496754840e5ac764e7624f1f9a0f11792e786b00f19c3c9e55ccbb22a3c501d8ea9e815d84f9
-EBUILD vulkan-loader-1.2.154.ebuild 1730 BLAKE2B 21d41b6e01f498c6d1b2da28fc037513bdbf8b9c377c0dd47c8ae1220a119584c47f8d88c14a0277034a10c64a4a5d2f43a2d448e9e7ad8993bff4c68598af31 SHA512 a3e4e650d272f24405960540ad651c8b3b5d064f1d45891e137cadb4883bd3670ceae1f82a543d19bf6f1d714838220d972f9fe03d1aefc9419b28ad54e30f65
 EBUILD vulkan-loader-1.2.162-r1.ebuild 1788 BLAKE2B e6b9dbcb8a6ff5cc1d4f1a445f7505a6dd4749eee774ad500eeeb8e4b966308b842e76ecf2e507c4144f9fa852a66f128ff954ecd4d1bb8917bfbf3b73547bfc SHA512 e2fe1e5a4322c8d7896a55551fe3b059cca82fefbe521846d9e8fdfca237876f6da7a9df1ffba1cef446fcac3a1f3e8adc106349eb0f584a5abb6f744a2f170c
 EBUILD vulkan-loader-9999.ebuild 1729 BLAKE2B e7bf2f7b33ba980cba5bc56e7fe30ad84e80801fe8171222944832f3c2af5afd6736fdc0baed62b77162d75fcbef03a69125febf93adba4af9ac3ea36317b8b2 SHA512 14a7d4da4c473d59203ebe1f8625a62a7aa8a8bf9dd3b55f89b22871fa0e9967c33ca449d768a81412d473cee5be4475c74d15058b989d6c06b15ba22246d061
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
deleted file mode 100644
index 3179d49681eb..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-1.2.154
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/zita-convolver/Manifest b/media-libs/zita-convolver/Manifest
index 71abafd89c37..00188e207790 100644
--- a/media-libs/zita-convolver/Manifest
+++ b/media-libs/zita-convolver/Manifest
@@ -1,4 +1,4 @@
 AUX zita-convolver-4.0.3-makefile.patch 907 BLAKE2B ab142d1f19bf104cb0bb02d615f1611138859dd001062b675a7f1e716763749f464534e8b64a0793211e6a816ac35d4fad0af4fa8896b55e7024c3dd9910f462 SHA512 4f6ea8c861d8444e259a1dcd5d0ddb5980a36a396a6362bb2cd7e498dff2b368cd7b1458a54360255645b32561872cbbc59a8bfbd1ff71659f24329df51be702
 DIST zita-convolver-4.0.3.tar.bz2 19591 BLAKE2B 3bd77cbc46d93c2200329451634dc48b94183aaa17034aa4b3dd03c33ad7982e9bed85e164f5c0e34666a1a6443199afe24222d41477368c4b366335e9767b91 SHA512 62d7841757f10c094e43ed755e187f947c5743f302ed2a1ee6064a850c18921466f4505d8a2a7b3ad23619db7f1ad7307e1dfb2e8a1e7685e60ece2ffff4f6ca
-EBUILD zita-convolver-4.0.3.ebuild 740 BLAKE2B f4d6f1d4c70924dc799d3d7891b95bf8c2aa7330b7a998f57997140b0e172ba863a34a9a98c3be6c7761d975457fec35c0186f24635d2b333cf0dcfedb7e18b5 SHA512 b6788a671a26e322dd205996fb0d211e4e9e139167d93008224dd8c4291641dfca490983c45610b94119a0f4bc9c446ae607d42c23456e7954a977676c4a5bf0
+EBUILD zita-convolver-4.0.3.ebuild 759 BLAKE2B 65b040a21cd6c7f09896349852a92087008c232ceedb4270341782382d3314aab01c8dce9f789750fd01bf9d32d5e7e7719f6e9170746fc617a795086386b12c SHA512 af2c9c4d70f8107393982cb048a2c1642f40c4e8de64f629bca1ac462998f889330e5ef2eca54d56441a7ab7a3938fd55fdb5e88a24110191161137829ce47fe
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild b/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
index 391c6bbf3478..782e235b0206 100644
--- a/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
+++ b/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0/4"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="sci-libs/fftw:3.0="
 DEPEND="${RDEPEND}"
diff --git a/media-libs/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest
index 51ee0392a17f..47aca2b7554f 100644
--- a/media-libs/zita-resampler/Manifest
+++ b/media-libs/zita-resampler/Manifest
@@ -1,7 +1,4 @@
-AUX zita-resampler-1.6.2-makefile.patch 3036 BLAKE2B 595ebbae53d4c0ec344d02f4602eec599e9d301a308384f3a4d3c99a9e64111f7b183ccee92c9f7e069a00275f3304712b9644409bbe23030961aeeadf9c8b52 SHA512 a7bb5621c761ab36502303053872782cf275e55b248f0387765c1251ab43c58577862c5fc2b321f6746fd7ec0a8e7c7766bcac290cb204f2e94947aa27cb1992
 AUX zita-resampler-1.8.0-makefile.patch 3222 BLAKE2B d13a3e6b2beeb6eb4b440f68431d7956cf66774e50549f8a7e8d6351d370778b5c3b75c98880a1260f2ac98b812f1fc51cf97f7f86d38ebf7f147714cd3e7b1d SHA512 4487230e87df2b165abb6e59fad6929fecc72c44509a60162976d5d1b54a2a584f04713c7f8cf77e9792213495656eeb45606c330d3c16be05084d4429cc9f84
-DIST zita-resampler-1.6.2.tar.bz2 125539 BLAKE2B d2e04fb5e0efbde3432ce973df59a11d2a184146d124b662712a5de2d9c243f6564899f190f7a7b68a9e01bcaab05c92b91ebcbf942473134a12a85e4e08c603 SHA512 d547419dd222c8a399d8f196efa1ec88a3f781275b696ae2fe1bb6e2fc329285affb8aace85972c304ad256becc4a155534dd5ef4ce3c57cbc9dcca0122b670c
 DIST zita-resampler-1.8.0.tar.bz2 131161 BLAKE2B 1ba5d255fff9c66e18e6177bc7e48a4710fdf54f58c07f162f8c8801f4f449b22dea9922645e7e33b70e07739c2b381176714e704f9840305f194f3c23d66de2 SHA512 adf1f465ac09104be5a02c1cf0f052a44b4c1a448312f3aca016a889e98cfcdebfded38f60300ad85d18ae03eadca7e8e95efb2875267bc36435ccfac881a8e7
-EBUILD zita-resampler-1.6.2.ebuild 899 BLAKE2B ab844529d67e9284f42fbd8a7e7a6ba536188ace3e778c370e30c39d46fd8de400869d6093cfbc6cb461008667a7cd9f253ab4e4634adaaa6d3326631f9e99f1 SHA512 deaf05a05be70b4d72f07495a64a880cab200d259315314736c192528efe6a502918cd074f7750dc48344b468907ea4727d10faad3d1f761f36149762f8cb091
-EBUILD zita-resampler-1.8.0.ebuild 1005 BLAKE2B d60c6d6b1edfd161b241440b27db610c6750e77debe8e20a5b2dba8172b5144ad2fd51f7c848dea511542f2b2ed13f9ccaf93ffcda4118ddbf5dccf75c2492ad SHA512 e2c11ddf31cd41df94c986a88a05fcb843e121ce4773aa2f70b365ed8e676e4ea70d53f2b38be0c7430607b246e8c458104bb486efbce12dfec41c875dd3b29b
+EBUILD zita-resampler-1.8.0.ebuild 1004 BLAKE2B c254e7fcdddac56778da0e9066090acd697fda81665bb5d5c20d86fbddfcddb198f6708c6215c162daa2f5404942168e12c495c676ee7154101a9f3e1b5f516d SHA512 653b5c5e325ec8904d181a2bcf7dea1acc3a7d0910494e334fab6f794760a466185d8e4ce39a673c3d7e63a1cfe12036750d50ed229eec8338b4dc8c5eac8fcd
 MISC metadata.xml 692 BLAKE2B fad59853ee366f99db8e9c0dfa932c564eb0d8194808b809182ce64f286d39de2a363eb86f192d124adbbc92b1e7801a9fa5be0752fad1725f147d468484f589 SHA512 be926699e99357b49f5fe90a78c60b0fd701229fd603dca5988b40611ae5bb0c271a6a346469e0ebaff62bdc718c400954491ccc2557e5799a4fba08c67207cf
diff --git a/media-libs/zita-resampler/files/zita-resampler-1.6.2-makefile.patch b/media-libs/zita-resampler/files/zita-resampler-1.6.2-makefile.patch
deleted file mode 100644
index 29735e7729a0..000000000000
--- a/media-libs/zita-resampler/files/zita-resampler-1.6.2-makefile.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -urN zita-resampler-1.6.2.orig/apps/Makefile zita-resampler-1.6.2/apps/Makefile
---- zita-resampler-1.6.2.orig/apps/Makefile	2018-08-24 21:41:47.000000000 +0300
-+++ zita-resampler-1.6.2/apps/Makefile	2019-04-13 18:49:50.005800712 +0300
-@@ -23,18 +23,17 @@
- MANDIR ?= /usr/share/man/man1
- 
- VERSION = 1.6.0
--CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
--CXXFLAGS += -O2  -ffast-math -Wall
--CXXFLAGS += -march=native
-+CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I ../source
-+CXXFLAGS += -ffast-math -Wall
- 
- 
--all:	zresample zretune zresample.1.gz zretune.1.gz
-+all:	zresample zretune zresample.1 zretune.1
- 
- 
- ZRESAMPLE_O = zresample.o audiofile.o dither.o
- zresample:	LDLIBS += -lzita-resampler -lsndfile -lrt
- zresample:	$(ZRESAMPLE_O)
--	$(CXX) $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
-+	$(CXX) -L ../source $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
- $(ZRESAMPLE_O):
- -include $(ZRESAMPLE_O:%.o=%.d)
- 
-@@ -42,25 +41,18 @@
- ZRETUNE_O = zretune.o audiofile.o dither.o
- zretune:	LDLIBS += -lzita-resampler -lsndfile -lrt
- zretune:	$(ZRETUNE_O)
--	$(CXX) $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS)
-+	$(CXX) -L ../source $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS)
- $(ZRETUNE_O):
- -include $(ZRETUNE_O:%.o=%.d)
- 
- 
--zresample.1.gz:	zresample.1
--	gzip -c zresample.1 > zresample.1.gz
--
--zretune.1.gz:	zretune.1
--	gzip -c zretune.1 > zretune.1.gz
--
--
- install:	all
--	install -d $(BINDIR)
--	install -d $(MANDIR)
-+	install -d $(DESTDIR)$(BINDIR)
-+	install -d $(DESTDIR)$(MANDIR)
- 	install -m 755 zresample $(DESTDIR)$(BINDIR)
- 	install -m 755 zretune $(DESTDIR)$(BINDIR)
--	install -m 644 zresample.1.gz $(DESTDIR)$(MANDIR)
--	install -m 644 zretune.1.gz $(DESTDIR)$(MANDIR)
-+	install -m 644 zresample.1 $(DESTDIR)$(MANDIR)
-+	install -m 644 zretune.1 $(DESTDIR)$(MANDIR)
- 
- uninstall: 
- 	/bin/rm -f $(DESTDIR)$(BINDIR)/zresample
-diff -urN zita-resampler-1.6.2.orig/source/Makefile zita-resampler-1.6.2/source/Makefile
---- zita-resampler-1.6.2.orig/source/Makefile	2018-08-24 21:41:47.000000000 +0300
-+++ zita-resampler-1.6.2/source/Makefile	2019-04-13 18:49:25.936129640 +0300
-@@ -32,8 +32,7 @@
- 
- 
- CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
--CXXFLAGS += -Wall -fPIC -O2 -ffast-math
--CXXFLAGS += -march=native
-+CXXFLAGS += -Wall -fPIC -ffast-math
- LDFLAGS += 
- LDLIBS +=
- 
-@@ -47,6 +46,9 @@
- 	zita-resampler/vresampler.h zita-resampler/cresampler.h
- 
- 
-+$(ZITA-RESAMPLER_SO): $(ZITA-RESAMPLER_MIN)
-+	ln -sf $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_SO)
-+
- $(ZITA-RESAMPLER_MIN): $(ZITA-RESAMPLER_O)
- 	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP)
- 
-@@ -58,8 +60,8 @@
- 	install -d $(DESTDIR)$(LIBDIR)
- 	install -m 644 $(ZITA-RESAMPLER_H)   $(DESTDIR)$(INCDIR)/zita-resampler
- 	install -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)
--	ldconfig
- 	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_SO)
-+	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-RESAMPLER_MAJ)
- 
- uninstall:
- 	/bin/rm -rf $(DESTDIR)$(INCDIR)/zita-resampler
diff --git a/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild b/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
deleted file mode 100644
index af41a8918a7f..000000000000
--- a/media-libs/zita-resampler/zita-resampler-1.6.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ library for real-time resampling of audio signals"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="tools"
-
-RDEPEND="tools? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-HTML_DOCS="docs/."
-
-PATCHES=( "${FILESDIR}"/${PN}-1.6.2-makefile.patch )
-
-src_compile() {
-	tc-export CXX
-
-	emake -C source
-	if use tools; then
-		emake -C apps
-	fi
-}
-
-src_install() {
-	emake -C source DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install
-	if use tools; then
-		emake -C apps DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	fi
-
-	einstalldocs
-}
diff --git a/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild b/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
index 17d7f10a52c7..aeb00f4c90f1 100644
--- a/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
+++ b/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_sse2 tools"
 
 RDEPEND="tools? ( media-libs/libsndfile )"
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /media-libs
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)