gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-libs
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
397 files changed, 3192 insertions, 3798 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8791e74226b0..e07a168542c9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/SoQt/Manifest b/media-libs/SoQt/Manifest
index 4cc988fd46dd..a8b93ff53266 100644
--- a/media-libs/SoQt/Manifest
+++ b/media-libs/SoQt/Manifest
@@ -1,3 +1,3 @@
 DIST SoQt-1.6.0-src.tar.gz 1675532 BLAKE2B 9935c32a7f0ad0d0e4248c6f81d2aacad00f3674d8e14aa192a87be5dc3b99e29213fbd96044ad4cc6548aef7f1d281aadebc48256bbfc11ad305e2136f6e12a SHA512 4221e98f51cca4dda23043428e869b60ab4d994710f97c0f44cd82631ffad2bd8bbaf0b820434a4636892df663d66ecd2aec14b185972671b2d22c0fe242b553
-EBUILD SoQt-1.6.0.ebuild 1009 BLAKE2B 912f10bb9c850b04d349ba7fc944da7836f6f602bb14c252d1cfdeb4dd5f6bf02c16cde7d04a1666ec47b7e522bb5b21c26e85654cc52e93a688c5e1435b64ce SHA512 1dfbc3c215aee64c215aa5ebf93aa607867ad7ca4f5aa1cfbf2599f2a65d7e816abc17849a0a3b8fcf6447ecb160fc72b5de602c88ff77f17327f1b50b02aff4
+EBUILD SoQt-1.6.0.ebuild 1007 BLAKE2B aef059845a59886e93984903843e8225da644a14cc8223c6afde2de00160176366f31d08b81a72615e18253a6a6823debc9780fddc11a705e923037f89de9a13 SHA512 bb242f2ccea433a181df2a024ba92632a5cd0a645a5a64e2e2882b4a1b0ceca1bab4ba1228d00f7183a1aa8ca81b6b29c34ef01ee4a578e704a42e5aef2e28b3
 MISC metadata.xml 597 BLAKE2B 8ff0a3f531a56870fa34aa5b7e9f33fbbc71bdd0572fe0d690621bf426ae774c1b2677c6d65ccd53080a8fe2f85eca5e358500df5bd1b77200d43f2b4ce0703a SHA512 94c34a663a95e6e081c991ba070b4a2ce3d8cbe65dcea1c1c34936795e9530eddf32bb22d0694feacec21022ee61af11b16131daef719aacba7b7e1abfb5cd96
diff --git a/media-libs/SoQt/SoQt-1.6.0.ebuild b/media-libs/SoQt/SoQt-1.6.0.ebuild
index 987b9268d17c..0e10d8cd816f 100644
--- a/media-libs/SoQt/SoQt-1.6.0.ebuild
+++ b/media-libs/SoQt/SoQt-1.6.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
@@ -12,7 +12,7 @@ DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
 SRC_URI="https://github.com/coin3d/soqt/releases/download/${MY_P}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="debug doc"
 
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 4ec20378f452..5758541d493e 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -6,5 +6,5 @@ AUX aalib-1.4_rc5-key-down-OOB.patch 504 BLAKE2B 1742e3d22889e7faabaf0fcacecc7db
 AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f1f780c37f5d5282c27985ef064e53221d369974c3147634b1bfb1af6df7232088a71fdd12230e587c475c5817180a602c SHA512 c2b723af88a0ca70505086bc7436e5c213d2f52698b293392be2a6b18ef26ef285a09e460577a4a60b328df45b1d61c50064f3ba1f3df43a844082f2c5da25b2
 AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
-EBUILD aalib-1.4_rc5-r9.ebuild 1927 BLAKE2B 4d446220b6d9fe584d804dbdc526fb86f4f991680bf4161765cdf59c464298532f74972912139045e2eed1c82e85e32bcebc0ea5beb7f3dda83073edef33eda7 SHA512 9796629fd831c7ebcaa1a97a73cb2c941c8a353f2df661637c1f414749dd5d19ed02f3cace2475a27057c9ef1ba9058df4f04e433e2b38eec3c646e15d61dfda
+EBUILD aalib-1.4_rc5-r9.ebuild 1928 BLAKE2B 105c0579466197596714918f50d47df92f4f16679c6dc49a668e52f83955f5a9fe61cd38c9baeac0084c23e4646426305ae65a25b94c9583afb233f0a9bff311 SHA512 98a19e101071fef0a1e2dd9642242307e60129c26b58e4a718431b7fb605fa2e87236dad707db3a2c010ba2ad9b00896f55ad92e98bc36d0fefbc8a067218084
 MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
diff --git a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
index 418f35e62be0..03e172822833 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 5ee82f0a9089..86180bf7989a 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -8,5 +8,5 @@ DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febd
 DIST allegro-5.2.7.0.tar.gz 7911231 BLAKE2B 9cc588a42d461ce06db94c1dd57642a2e9445c4930fcc164f2da57edfb463552a279a5e50f46740561a88c974c96605bb09fcc596e7bc6afb5e30b18ff7b74d5 SHA512 300bb951c661e7a220d913cca4116aba99afdcb5346af7c57b09bbdfa892d446cd64fde54397c57edb3c5f57d3380fbc2b6c4d9c9e17f48ff8180cfbf59e7d99
 EBUILD allegro-4.4.3.1.ebuild 2970 BLAKE2B 9286e322b7397b7ad99f42170b6e260d586e896af3396bb5e8d315d1a120ad0445dacf22825ea180264cec3236ffa967f5346695a13e2a934d70e63894619505 SHA512 caa42406b233bec316d1f57285cec04928f470cc4ac57c0a6b50a5ccf39816b43d4fc376bf06f46daa954af6795b06a811851a50124fc8259d2a93b293aaa594
 EBUILD allegro-5.2.6.0.ebuild 2969 BLAKE2B cbc457b3bc7486368625b4e68f0e2113bf2ec6d7c8c06ac2a04f2f52845c3d24bbb35ebb421d3a036daaec70d08384a803fd6b9c18af3d6407f05c1af55b8ef5 SHA512 ae3061752943fadcfd1500014476f164699233d54a4d1f853f852476fd0e65d04a6f4942283a9bbff37fc29020506f987a80b8e8d792f9978c084f633d7d43fa
-EBUILD allegro-5.2.7.0.ebuild 3241 BLAKE2B 684994cbb4508b2cdc3cce9305fae8485e01542071f70b249f6f68c9f61ce37fb3635c617579201b029dededd6e64c5153a30afcb5f8887171fa335e0e2a8b48 SHA512 5e252e81a1f6f491204697b528ec2feb6c3c83f28ebe881487a3d21be2b7ffda7a93668adcc158baebd956eb7bb079caea90a0d15a114f3434ff5b39af82d1b8
+EBUILD allegro-5.2.7.0.ebuild 3237 BLAKE2B 6601d15cfbdf58a24fc157d5c23cffff5de5621716f68c9cad05125157b377962d1821a8fb7cde3b81f8d89f4b4dc50df716a09074e8c1564a767b47d3a31c0e SHA512 0f12764cc79847fdf4211389916053fe0805bfb34df335ff8618048b59db2beb17954af6d3f8d781a560e712c83daf147559ca5089a39d94e07ba958ae1b72b6
 MISC metadata.xml 1093 BLAKE2B 8cc4e85959faafa86e52e526676ae7bc69cbdfde6ea829db073f27dd2bf205130618673dca511f02b2d57ded95261ee5b47ffd337c6e1ce8f15a02a82929e77c SHA512 b66c3f858aba247b1ec1c0e77ff8bbf9fb11f2b98e827984af1fbdaa5af5a396e463aab40eeecdbde27e10be2c4c4ff836b197ed6dbb2afd6be30303004070ae
diff --git a/media-libs/allegro/allegro-5.2.7.0.ebuild b/media-libs/allegro/allegro-5.2.7.0.ebuild
index df38a28b0382..c6241370e13b 100644
--- a/media-libs/allegro/allegro-5.2.7.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g
 
 LICENSE="BSD ZLIB"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 908a431da8c1..f184853a9795 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,4 +1,6 @@
 DIST babl-0.1.84.tar.xz 299216 BLAKE2B 80db725230f5bee71a9e2056e40cfe9c4dda7669fe3004d73c2d1525c9a89362491edc5addef47f28a94938ab3cdefef0496b38404fc4ab11931e7b9e0daaebe SHA512 a8cba80bd3a434ee9bbd1a0d1fcd6e5e38f9c657b189a70631ff3fe4e4c270e64762d1be13d48e8514d4166ac4175745001499fcda68eb1ea93e03c18b2a5d06
+DIST babl-0.1.86.tar.xz 299868 BLAKE2B 2189659ef5b3890bc78329808dcff5e7577a85c9728d54f848fa2f6ed085cea53deeaa734c600b1d73dcb5a8acd2f680800459c0a4c5b7dce61bc69a54ab9d3c SHA512 aff3b0069f7cdb515e6ace880500f4b89521062f9030ef452f0555b3cd993fffdd5f700c403a7be8e6758957073e7623360fc6ac41d86d5d31551c0fd0ff6048
 EBUILD babl-0.1.84.ebuild 1754 BLAKE2B df007b372ddcf5183259fb0cd84733dd6e199c876517a20c6befd0b771e04a4950a929282cb9e0d67246cdb7a521046ee22a9b7ac286ed73d50b5d23cb0e566f SHA512 874afe0607634738fd4ffef5a25df48c118d7a10f1e47919e085a3a2e34e38c9aeb21bac3af17c2b32e41cece3b9c4520395629d516574374319a7010a5a74a9
+EBUILD babl-0.1.86.ebuild 1758 BLAKE2B 79030d534f1dc591516ec5bd956cd035a22689d81d21baf3c36b4ebe79f12fc4dfe8dd58e992852dc9c2b51a5bcfc8cef5482aa98efe09387f0addf5b83a4152 SHA512 b0989be42b8d1133c8cd95a853768bc8257e625e36e0d05679ba5094c8bb166b5b123c2d9a063a2ddb50dab2a39c5c7974bfa0f7385b6d69ef5f3282206214cb
 EBUILD babl-9999.ebuild 1758 BLAKE2B 79030d534f1dc591516ec5bd956cd035a22689d81d21baf3c36b4ebe79f12fc4dfe8dd58e992852dc9c2b51a5bcfc8cef5482aa98efe09387f0addf5b83a4152 SHA512 b0989be42b8d1133c8cd95a853768bc8257e625e36e0d05679ba5094c8bb166b5b123c2d9a063a2ddb50dab2a39c5c7974bfa0f7385b6d69ef5f3282206214cb
 MISC metadata.xml 400 BLAKE2B c5653da1c91643fe976b5205210a2636b060ee941b6a766350231bea4bdc0fd2721fec6e72b381905dbd6470a3c72f32661d00eb53837afe358d62cf96b8df24 SHA512 fd1ee3b3dedb0ebff804feb04c144350c6a9da8edae2238b846132d21b8916ce8850d15c6063da2bcc2b97a8faaeda96b1738ca485f0ab22937cc8a80ebc5f46
diff --git a/media-libs/babl/babl-0.1.86.ebuild b/media-libs/babl/babl-0.1.86.ebuild
new file mode 100644
index 000000000000..a247b4053c85
--- /dev/null
+++ b/media-libs/babl/babl-0.1.86.ebuild
@@ -0,0 +1,61 @@
+# 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_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_sse4_1 enable-sse4_1)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/cal3d/Manifest b/media-libs/cal3d/Manifest
index 69c1933e64eb..894776095a70 100644
--- a/media-libs/cal3d/Manifest
+++ b/media-libs/cal3d/Manifest
@@ -3,5 +3,5 @@ AUX cal3d-0.11.0-gcc6.patch 19938 BLAKE2B bb2cd317a004e33fdcd9a1d73f563a933b7b4a
 AUX cal3d-0.11.0-tests.patch 352 BLAKE2B af4d33ccb48a89c45e3de3dab7860ff3a60e29756681b63a0da9c886591ebc6e7cb41caacdd5bb5f477b65edb4d3f7ad147b224eb8309a546187606a5ae8cd9b SHA512 bf605596206935d7882ee878e6fd1bb42e474f2c59f5bb76e8f8f92c606fa7258271eabd14fa30793aee6cb55dd95fb8592ddf7895f513363c22d91d80099857
 AUX cal3d-0.11.0-verbose.patch 503 BLAKE2B 8efdf4a56cd1430b9632f9ba85172024f700afea081b896bfcd50fc126a85748b5fdf53dfee1d9b2c4b8a8d43593bb68c733b3c1b7ef15c52bf7b75eb1d84fb2 SHA512 e0dc8a17b644012f4c291d9ba667ba6c7c8c3f34491f35490ab92573c137d1a6a1d1bf88c846b457a0310aff1aef27eabbf8c92b8477685b5828930f68416793
 DIST cal3d-0.11.0.tar.gz 568532 BLAKE2B 6730b9d623c9fa3dddb9f90d3cdcfc70a80ea1d2decb3bc5e8e3137142565c2fa570512b59c807996c6dfb04edc92f21301aaffa064bd41e6de7809223167ccd SHA512 4dc4b36b8f18760bfe6f8c80cbd941c14e2ebe596d0cd514fdb1ae4175bf2706e125665272d67ff21d33bb4b34e7be22bad9c00d488c1da21f442550bf3f204f
-EBUILD cal3d-0.11.0-r1.ebuild 1118 BLAKE2B cca483fd25d165c71c4bfd44e2d87b06f1d9da04596bcfa3a9c8ba6854db8402a7ebad97277652bf36fae3d09fb2162d8d444784e91cb742286d8f57942cff71 SHA512 8ad10cae49cd4f0c13576eca4b976c8c46cfc8dc9b8f0d86359fe4fa6ed0306e6e78d8399a19e23564a07b133a4faf58b4d96019905066311c8b4d98a6f68e43
+EBUILD cal3d-0.11.0-r1.ebuild 1115 BLAKE2B 860ffda2c31fd870836316c7bee4ac53a9df77235022d21996338f08792b632cdd2e2fbdebe3af8404deb765d728180aea1b20a3ac67086c733443236f3c37a2 SHA512 bb0316247908249e371c802750fb3d4b4d9edc8534db3c451d17418fca5a9f30fb4ccdd481d8680dddd7667befbe4fd6917bc1403e91f69543d0057f5ebd953a
 MISC metadata.xml 252 BLAKE2B 1bccb839ae3c0dc677c38529c7d325bffa3e6d2f74e76e39114a3e481e8d387764418dd3ad1f24e9ccd0a264cd8e7b03a93c381b382f8b495eda79bd1b01f5cb SHA512 ac70d6adaca480b4b09896a376c5023dadfbafc9fd00e39842edba993697e6d5970118695969b547cd29eb08bf80ceeb939506947cf111d2116f6dbd49bd94f8
diff --git a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
index 94d50870d372..4ed4f9c971d4 100644
--- a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
+++ b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils autotools
+inherit epatch autotools
 
 DESCRIPTION="Cal3D is a skeletal based character animation library"
 HOMEPAGE="http://home.gna.org/cal3d"
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index a23ee170060e..ca56cdc814c5 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,9 +1,4 @@
-AUX chromaprint-1.4.3-cmake.patch 1787 BLAKE2B 596a2ec2e684c3f2a03180fd5420029cca56c07bf3362e2158a99f40c2d4a117b7d17ce6a8afc20647654643ee31569849e8413962168799963acb043bf869fa SHA512 b53dfd1c26f34aedae6964d9e87725872f5b3b4d7f6d5f8162490579f05d863bc27d5bc4f6f2303f95346ace2cd751e6f3a0ee15c34d15eb3088123f472c5338
-AUX chromaprint-1.4.3-test-bigendian.patch 1944 BLAKE2B e8441359f3d830451398c492e0711e6eeb290be75e336099b307e61d327158fbc2e188ffa96201e16fa5d2c1588ab763b79d9881b6f3ba276c6dcdee7de5e4ea SHA512 a6df0cd861c3d9d2c5ae28f50459c6930ddac262e2126e2f3ca4ec05a5e4d790df8cb0d7fc90eb0f4269ea4289958e9777d7d39cf588fea99e4c1d1f9f63bb59
-DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST chromaprint-1.5.0.tar.gz 615217 BLAKE2B 14bf219c23360028ac232e67b7eb36e3226bb6e19838ef239266a9d826e1bd50d798f69f961bcb78f36baf48630a93f53243f8f9ab6187c403382bab23042630 SHA512 25ab3f7834581a8204ac09614fef6036c801f5f8b7b72a864701ca0de8082b2458a2bd7c075d53451581d770898576411cdcfb23ce609bc82f9d9b395cc1a129
 DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
-DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-EBUILD chromaprint-1.4.3.ebuild 1344 BLAKE2B 3d972ab4b4912089f91da2ad2f60df3731ec672c633938bc5ae986facf7d4ddf8b916753f44bffca062cc7334a8ff415dd2311c92cac68b01790f2b003595188 SHA512 bfc148cbbb5cf2846b8bf2d162ea77364207a02bd0b8457362cfa788660a94350776cf5ad4ab8b38d299c560b4a432865fa54592504f31412b44f31fee39b4a8
-EBUILD chromaprint-1.5.0.ebuild 1276 BLAKE2B 32373b8684f8cf429f6893eb147a387dbdcda3328a7f204ed5d004943a116320fb1cb601355457d3b7d0a6e350367c78e47f3d31e74730e0272806da1bd3524a SHA512 f745544934e666fdef0683768906b0332ec6d13c625477c9f2f0656dba19fd59691b428c685c80032506ae0d11acc1a214c1d114336c71e76f5f4b836ff89df7
+EBUILD chromaprint-1.5.0.ebuild 1328 BLAKE2B cba2e2ef808fbf5ef0919793b5e5dd7e30faa9303f8b4ec7c67caa5bb423238211497051823a2a378480445d08aed42d969a37cc70e11b956f339d10ea766f6c SHA512 5f381256d6f6f59b885a2db658b1f057a6ab7321842cee6eb3a9a9702879a8be515435d68b723bc860afec45ee1c2f722a6000401a4acb85a28e40d76674c9df
 MISC metadata.xml 502 BLAKE2B df06b1e73d069ac54fae83766cfc89cb668c9c43c22e6ea50be9b3e40dd172b6400152804bd9f13fa63475eda8acc1791f0051174af391a22aa58b5899c99e3f SHA512 c7941613a5b06a74271018c079d1b483d816c558bd0fdf0be390e14df90dfa0eeb4769a9af3348d42345516899b828257b583815357b58b11033be9025135b22
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
deleted file mode 100644
index 81c4f4b78a7a..000000000000
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-GTEST_VERSION="1.8.0"
-inherit cmake-multilib
-
-DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
-	test? ( https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test tools"
-RESTRICT="!test? ( test )"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND=">=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-bigendian.patch
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-DOCS=( NEWS.txt README.md )
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-multilib_src_configure() {
-	export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/"
-	local mycmakeargs=(
-		-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DFFT_LIB=avfft
-		-DAUDIO_PROCESSOR_LIB="swresample"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
diff --git a/media-libs/chromaprint/chromaprint-1.5.0.ebuild b/media-libs/chromaprint/chromaprint-1.5.0.ebuild
index 443f5af521e7..256d472f451f 100644
--- a/media-libs/chromaprint/chromaprint-1.5.0.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.5.0.ebuild
@@ -1,10 +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
 
 CMAKE_ECLASS=cmake
 GTEST_VERSION="1.10.0"
+GTEST_DIR_VERSION="1.10.x"
 inherit cmake-multilib
 
 DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
@@ -15,7 +16,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test tools"
 RESTRICT="!test? ( test )"
 
@@ -30,7 +31,7 @@ DOCS=( NEWS.txt README.md )
 S="${WORKDIR}/${PN}-v${PV}"
 
 multilib_src_configure() {
-	export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/"
+	export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_DIR_VERSION}/googletest/"
 	local mycmakeargs=(
 		-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
 		-DBUILD_TESTS=$(usex test ON OFF)
@@ -41,5 +42,5 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-	emake check
+	cd tests && (./all_tests || die "Tests failed")
 }
diff --git a/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch b/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch
deleted file mode 100644
index 60fe548cf29c..000000000000
--- a/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3991219..f9e172b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,21 +1,11 @@
--cmake_minimum_required(VERSION 2.8.12)
--
--if(POLICY CMP0042)
--	cmake_policy(SET CMP0042 NEW)
--endif()
--
--if(POLICY CMP0048)
--    cmake_policy(SET CMP0048 OLD)
--endif()
--
--project(chromaprint C CXX)
-+cmake_minimum_required(VERSION 3.3)
- 
- set(chromaprint_VERSION_MAJOR 1)
- set(chromaprint_VERSION_MINOR 4)
- set(chromaprint_VERSION_PATCH 3)
- set(chromaprint_VERSION "${chromaprint_VERSION_MAJOR}.${chromaprint_VERSION_MINOR}.${chromaprint_VERSION_PATCH}")
- 
--set(PROJECT_VERSION "${chromaprint_VERSION}")
-+project(chromaprint LANGUAGES C CXX VERSION "${chromaprint_VERSION}")
- 
- set(chromaprint_SOVERSION 1)
- 
-@@ -31,14 +21,14 @@ include(CheckCXXCompilerFlag)
- 
- find_package(Threads)
- 
--check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
--if(COMPILER_SUPPORTS_CXX11)
--	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
--endif()
-+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
- 
--if(CMAKE_COMPILER_IS_GNUCXX AND BUILD_SHARED_LIBS)
--	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
--	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
-+set(CMAKE_CXX_STANDARD 11)
-+
-+if(BUILD_SHARED_LIBS)
-+	set(CMAKE_C_VISIBILITY_PRESET hidden)
-+	set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-+	set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
- endif()
- 
- if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-@@ -70,7 +60,6 @@ if(APPLE)
- 	set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to")
- endif()
- 
--option(BUILD_SHARED_LIBS "Build shared libraries" ON)
- option(BUILD_TOOLS "Build command line tools" OFF)
- option(BUILD_TESTS "Build test suite" OFF)
- 
diff --git a/media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch b/media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch
deleted file mode 100644
index dc080bb98470..000000000000
--- a/media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= <lukas@oxygene.sk>
-Date: Sat, 10 Feb 2018 06:52:10 +0100
-Subject: [PATCH] Change LoadAudioFile to not depend on little-endian CPU
-
-Fixes https://github.com/acoustid/chromaprint/issues/46
----
- tests/test_utils.cpp |  9 +++++++++
- tests/test_utils.h   | 14 +++++++++-----
- 2 files changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/tests/test_utils.cpp b/tests/test_utils.cpp
-index fc8bb86..536f46e 100644
---- a/tests/test_utils.cpp
-+++ b/tests/test_utils.cpp
-@@ -2,6 +2,7 @@
- #include <algorithm>
- #include <limits>
- #include "utils.h"
-+#include "test_utils.h"
- 
- using namespace chromaprint;
- 
-@@ -92,3 +93,11 @@ TEST(Utils, CountSetBits64) {
-     EXPECT_EQ(64, CountSetBits(0xFFFFFFFFFFFFFFFFU));
-     EXPECT_EQ(8, CountSetBits(0x0101010101010101U));
- }
-+
-+TEST(Utils, LoadAudioFile) {
-+	std::vector<short> data = LoadAudioFile("data/test_mono_44100.raw");
-+	ASSERT_EQ(data.size(), 176400/2);
-+	EXPECT_EQ(data[1000], 0);
-+	EXPECT_EQ(data[2000], 107);
-+	EXPECT_EQ(data[3000], 128);
-+}
-diff --git a/tests/test_utils.h b/tests/test_utils.h
-index 3631007..d01e9e3 100644
---- a/tests/test_utils.h
-+++ b/tests/test_utils.h
-@@ -31,11 +31,15 @@ inline std::vector<short> LoadAudioFile(const std::string &file_name)
- {
- 	std::string path = TESTS_DIR + file_name;
- 	std::ifstream file(path.c_str(), std::ifstream::in | std::ifstream::binary);
--	file.seekg(0, std::ios::end);
--	int length = file.tellg();
--	file.seekg(0, std::ios::beg);
--	std::vector<short> data(length / 2);
--	file.read((char *)&data[0], length);
-+	uint8_t buf[4096];
-+	std::vector<int16_t> data;
-+	while (!file.eof()) {
-+		file.read((char *) buf, 4096);
-+		size_t nread = file.gcount();
-+		for (size_t i = 0; i < nread - 1; i += 2) {
-+			data.push_back((int16_t) (((uint16_t) buf[i+1] << 8) | ((uint16_t) buf[i])));
-+		}
-+	}
- 	file.close();
- 	return data;
- }
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 2f208f684440..af16d2573fc6 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.2.tar.bz2 695931 BLAKE2B cfe7667e583e05f8fd84b226a26ea23a901336fd8cf62900b47cd6b3bf92f8fe58d14224d1e063cc3bf7abdb17da437d291dc3f604cb68e99fc0615619f76880 SHA512 73335594950b08596356a1950213abf57c6d48060da37149e700565f9689ca82b7427e320040bf43b2e97eff7b6da7116a6aca77cb717f7ce140039ebdae5595
 EBUILD dav1d-0.8.0.ebuild 1175 BLAKE2B 043f3cac61cba7b31b92c3a4c7f0b6722444c66d3e0e6d82acf27841b1ca0003a816839e6a67eaf3cfa94f4795dd8e466d36c1d3681fdaed85a6de9615fbf779 SHA512 4624d5b50cb6fcb27dd7168efe7ada23f431ce7d575edc81e111488df7da4beae7d8f098332b26a19ed6a911e6b3891f10c4cd294a97fb244d24c271574936c8
-EBUILD dav1d-0.8.2.ebuild 1261 BLAKE2B c638bed21ad66263281ae7772ddb146ba774fc02b9c45aedf98d411f4b8ae23304b2c04445f69def2e68fb2c4ef05c74f8e037b6be94678a9b14370269b05a8f SHA512 a514ba781229c5c39c8fd378cd4f077d68d20db36030b243c170c6f1dc09ef8f7f5c0011c68ce30dbeb8883b6d3d814281565a8452cec71e0d408eaded6f49f9
+EBUILD dav1d-0.8.2.ebuild 1255 BLAKE2B 4ddaa8cf4cad0ea61d18fcc22b9140f4abc188feb7aafc6f0ad1ba4afd507cfdbe2ae930f335af61f585209b490c4298aaa11d997606474611fdfe4332740e6f SHA512 4e352a5e7d77bb95c168b12ee6963737b84b7be8b052cd296ebada29f658de914747b7f4372ec97d165922ffa81f61200b659a046ac1d2439fbd3be9cdbd6361
 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.2.ebuild b/media-libs/dav1d/dav1d-0.8.2.ebuild
index 38fc32f1023f..8cb72bbfcc98 100644
--- a/media-libs/dav1d/dav1d-0.8.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.2.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/esdl/Manifest b/media-libs/esdl/Manifest
index e16c8ddee400..4b24df59f3ac 100644
--- a/media-libs/esdl/Manifest
+++ b/media-libs/esdl/Manifest
@@ -1,3 +1,3 @@
 DIST esdl-1.3.1.src.tgz 308475 BLAKE2B 258d4c774ee56cf1c4afbb1f0a712cd42a1ca5742c7dde6c03b3f297351d3c3cda918491ad58338551450fb68ea29da04477c4057cebb7ffa81b9bba25a918b7 SHA512 66e8f69fa29fc0400f58dfa892656e00536a481a3dc364b9b295aee98818ff325f6475a009287352520ef428941e866b46e6f0267a7df184831c87b9304d385d
-EBUILD esdl-1.3.1.ebuild 804 BLAKE2B 9b53830d9c4643773988dc6a9e578bb78b0fb35810f610fe3d0259e89203d412c5da6aca4251d61192f14ac931ecb69b63bc1e40599bbebc15965c15917c3746 SHA512 e0a86f1ee1ae5363fcb736f89fa4ddb452ec0b6a00f284d3545a1c58f4cdcadd3757a70d6ff4f141e33bc7dbacf8cddc077a1b2a4fb249462c9bcea1bbd5609c
+EBUILD esdl-1.3.1.ebuild 794 BLAKE2B 9d962e2cf6c3999bc2a68dd925a06cccc4837d88a09aa23c202c8362f3047a8889d8df4d65903a15ab72b34e149f96c5ac9a60684244a720197c2e5dd5991825 SHA512 a0b0202281d4297d15f33543de35db11a460956e33cecfe7bce75bd30043aad3e4c5c67f3b83278b7a43225f3c7d97203a30f8e4e53f3ebc038d80389f0c3063
 MISC metadata.xml 569 BLAKE2B 97a0cc90b9e0a074f81467914a8b2f3559f17d21ffe82c39a83d5d9fadd9c7b4c7c6863a21de70cd0d0c396ac631ffbe1bb57bd8eb72086a77be1739f489bbfa SHA512 488bb609405c6b0186624e4434eed2ea24d5501b54e74197b2d02ac6c762bdf54477f006857e0bd8a8192e19579e4b3dbfe05923b0a5e322872ccf4585519b35
diff --git a/media-libs/esdl/esdl-1.3.1.ebuild b/media-libs/esdl/esdl-1.3.1.ebuild
index fcdf01675319..39c668074613 100644
--- a/media-libs/esdl/esdl-1.3.1.ebuild
+++ b/media-libs/esdl/esdl-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils fixheadtails multilib
+inherit fixheadtails multilib
 
 DESCRIPTION="Erlang bindings for the SDL library"
 HOMEPAGE="http://esdl.sourceforge.net/"
diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index edaa13928da2..cede6101f646 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -1,3 +1,5 @@
 DIST fdk-aac-2.0.1.tar.gz 2865456 BLAKE2B 79c66956b3c43138fb34448398cf104a021757332b2af6d4493bce8c4f9dfdf97a38d1f00c3f1a3f91ffb3b2ce2bb0bdc982e3f92a1ffe7e5f0d1c2f0ef8ca99 SHA512 08209bbd060edafe7b607c9e1394cd03df4f98df6f32b4be21d34d1ab491a7447ed592785546c040126767bd31980121ca6a31aba06eaf90558b14228e302d82
+DIST fdk-aac-2.0.2.tar.gz 2886434 BLAKE2B f9917cf8ded3e4165048b27211c5985b4fe174d1ac815a7bc4afad88e059f3a89a24f88ad20633becdba9cb91717b9d4bf44781368c436e35002061b1644eb64 SHA512 8e5a7992869a7e649bee6d41bf7c6e408cec7ba1931a6cd7a9ad8a01e6ac49bd299ddd147b18823e8ee379ce7c6373d7f5a94f0f859ed973a30c61eccd53fa7e
 EBUILD fdk-aac-2.0.1.ebuild 1328 BLAKE2B c4da80c35ec53c1c0a2bba5fd0dce0c766baed5bc7ce7b2f66b751ba512d21fbcb795a251c35dd4021f7479975253d5959cf8c49f133a0d5b4ca566f8c84c0d5 SHA512 eef06746f316d6e4e4e50ec17c242ce0eebdc04458747810fcb543749587e96e8534916998a8060f5c07d132c0c10d3d3647355d75431590708ab1cd563c5b34
+EBUILD fdk-aac-2.0.2.ebuild 1334 BLAKE2B f510ecb0acda1e90c1a508eb0812df2f1b18949c3033075bf871b684d68d42f6533f0b2000697caa481aeb9f424e2a928c553738e9ac59630f6f794a2c42e70c SHA512 4eb6135ff5e16a25fa741d1b59f3e5c426a3dfd1a7217f1b8ba0f3b88904ba4d4c6688b9c4c2f1353e229ead7dc068521699a2f5837b81867c2d7fcdc686336d
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
new file mode 100644
index 000000000000..01bbf0f08671
--- /dev/null
+++ b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+	inherit autotools git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
+		SRC_URI="mirror://gentoo/${P}.tar.xz"
+	else # Official release
+		SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
+	fi
+fi
+
+DESCRIPTION="Fraunhofer AAC codec library"
+HOMEPAGE="https://sourceforge.net/projects/opencore-amr/"
+LICENSE="FraunhoferFDK"
+# subslot == N where N is libfdk-aac.so.N
+SLOT="0/2"
+
+IUSE="static-libs examples"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable examples example)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples; then
+		mv "${ED}/usr/bin/"{,fdk-}aac-enc || die
+	fi
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	use examples && einfo "aac-enc was renamed to fdk-aac-enc to prevent file collision with other packages"
+}
diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 30cca15b5062..dfc0ebc29bcc 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,4 +1,4 @@
 DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e SHA512 dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
-EBUILD ffmpegsource-2.23.ebuild 883 BLAKE2B 42018ff0d2322a958cd94e99b463328171b78846d7467572d4ba3e82b3dda5dd9c100005c0f8c8de425db5fea5e30ba024a411f9b7fbcab7332874fb01e83201 SHA512 990eef3aa71ca54545cb2bb7ea92640e905c3f630a0b775dc21087691b6fc18f48e9b2b8db8854bac88fe62a8b9cf3f228c7e5424ef4ad7302fce0a4a3f2bf48
-EBUILD ffmpegsource-9999.ebuild 870 BLAKE2B 6ace3df13e77bc530cc237233c2d0723d322d6cd8e9baf263d979e96319083d73700a12598a23da1f8e17c8b592c4bd053a0e8cb749f1de96ebde6c958439451 SHA512 eaaaa9c5be69b5bdfeaabb3ff0c76b6c4c0212d183841c3214d1c98da257cd64b9c2215a9547d028862c25d1ea077bb270c42cbcc32b1a8d805762e4ffbd2b75
+EBUILD ffmpegsource-2.23.ebuild 876 BLAKE2B dddd6ad5f8bd985620cc5cfe8433accde80b0d57548f4f07ac788d9d5de80423d43ddba3d7bd1027072b3664dd3eca72622fa0d6fbe02cd2dbff27eeb68ebb4b SHA512 2cfc73bae2563d4ec371bbc7d409230032ee978eff2dd99c40e7f1d5465d6dbdf4e3344d3d6253cc9261d83a54fb8db20bedc047b3f265ae885235203c23ff6e
+EBUILD ffmpegsource-9999.ebuild 863 BLAKE2B 537818ad3e594165ce3fa47c920379daeb87bea57663ab9080b6ca568c20cbe113971388075a0b0e01142fe448329c2333340ad3fe222b83153aaa27fbd5e970 SHA512 a824cb96fcb29e2d23de0d3c97e85199d3cf42aea540c1e4dc473b8e30bc860711a799456895a0cc55f763201ed029f16e844bfc9827bb1d8c0a2286938f6f54
 MISC metadata.xml 308 BLAKE2B f8a202e4bf52b16aa495c09b7ab1341093f2bceccc0c5316b77897de97c6896720cdfebfe6078e6aa92f38624ad69070cc478c8c40cd55bb57494ddb7eb9b8a5 SHA512 7ba87927b0f446e7b47a677003380bdf9d75ada3dde1aa363f842efedc48bfaa833c5dad62ebb3a678acafd9dfb814f261beabcee6262f4b2fbbd65044951527
diff --git a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
index 09065b7eccb8..9d58b1388ee8 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.23.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.23.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=6
 
-inherit autotools eutils flag-o-matic ltprune vcs-snapshot
+inherit autotools flag-o-matic ltprune vcs-snapshot
 
 DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate access"
 HOMEPAGE="https://github.com/FFMS/ffms2"
diff --git a/media-libs/ffmpegsource/ffmpegsource-9999.ebuild b/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
index 24db4238a967..7fc91742a422 100644
--- a/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-9999.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=6
 
-inherit autotools eutils flag-o-matic git-r3 ltprune
+inherit autotools flag-o-matic git-r3 ltprune
 
 DESCRIPTION="A libav/ffmpeg based source library for easy frame accurate access"
 HOMEPAGE="https://github.com/FFMS/ffms2"
diff --git a/media-libs/fidlib/Manifest b/media-libs/fidlib/Manifest
index 88814d7041f7..62c668e15a38 100644
--- a/media-libs/fidlib/Manifest
+++ b/media-libs/fidlib/Manifest
@@ -1,4 +1,4 @@
-AUX fidlib-0.9.10-extern.patch 525 BLAKE2B 6a018a1e1c58d4c0457546955c88152a3d6e72aa0379d4787c0c3dcc85c409e8cef2e3f9d493bf4121521119eaf70cefa5c1d35ca03d01d060dc2246e8414e4c SHA512 e47f4814b181047d998d533ace997977ea32c7c1fbcce25c41cf775eacba8abb4360bc0a63335355453300e17fd314e5c5da59897afd68345ab97c7d53eeb14c
+AUX fidlib-0.9.10-extern.patch 501 BLAKE2B 883d3914412ba50429a5fd0e607effbfa477e4e806d7f820ed1afdc4e11d18315602dc70271888a15072f2b21ff21dbc00cb5c24240a9bc9f56d1084ba4dafb1 SHA512 b49c6fd88d59b82fdcf96692e4ce1abfccf7209c9ce0757e8111e7a5c66b4d56558999dde2b3e1e017c87bd662e22edd9bb3aed827f12f94429eba4fd37c7c96
 DIST fidlib-0.9.10.tgz 87082 BLAKE2B 1a8c2c9abaf1d8d0855466af2c3243a4253f505b488822852d49c702f0904beb599bfa7a023d4be925d1d245b8357ebef05dd6c4051bdc9c9c3eeae96bbf0b46 SHA512 77600acd665407b4d786b406a4f20b2f6c30c74775f5777d5054420b80c74e5bfa316bf7bd90df1669c09cef0ff9b552a0338cd138bf7d9bcf1df7cbff9fea4b
-EBUILD fidlib-0.9.10-r1.ebuild 1107 BLAKE2B 514896ac94d4ec18fef4a801aabd02f48217c921f702ee10bd8d51fcdf61b52848f6ab8b3a5c137bd45ac1845e75e38fd7aa49aa5cd02a838053d5deeb1a8b1c SHA512 016d8decb9df92fc632dda85ed6a56369f3ada565179813eb4bdee53f9aa058c9a71dabd9716ff535718fbaf337f9a7f7deb2559c69e07235a55f25ded593a1b
+EBUILD fidlib-0.9.10-r1.ebuild 1106 BLAKE2B 847539de1169e67cbecaa8aa2be90b039701e31d149502e28d416a5fcf7f223a9d10aa6c6eac9ecb20851e61c55f4ab19fef1303063f1c5d6378253c232e277f SHA512 4b101015a6434781c2c7ad11354d60fc3b2484e2d879f845b0637bb5efbbd132f2e3d6891f389be7742206fe327fa097f330b7f3107874d6c880d05dcd2f31cc
 MISC metadata.xml 265 BLAKE2B e3dedcada43b8145986c6c9f3ed1d374d3e93d2a1f6bdf5d83af1a43e24d01ee0ea4b6efd67ffee46d585e6d37272cbacec69e66e21b22af6a5e01878003e44a SHA512 5b875b5d0a59914316df520eee72ee3c5f931b8513424120281657bbc266c777214a924e4c6c867cdd7a61cb66037c7b9b501225cc06d890abb8ca04c13f5fba
diff --git a/media-libs/fidlib/fidlib-0.9.10-r1.ebuild b/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
index 939921d2acf6..43f1384db120 100644
--- a/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
+++ b/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit toolchain-funcs flag-o-matic eutils multilib
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Run-time filter design and execution library"
 HOMEPAGE="http://uazu.net/fidlib/"
@@ -13,13 +13,17 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-extern.patch
+)
+
 doecho() {
 	echo "$@"
 	"$@" || die
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-extern.patch
+	default
 
 	# Avoid ICE under gcc-4.6, fixed in 4.6.3
 	if [[ $(gcc-version) == "4.6" && $(gcc-micro-version) -le 2 ]] ; then
diff --git a/media-libs/fidlib/files/fidlib-0.9.10-extern.patch b/media-libs/fidlib/files/fidlib-0.9.10-extern.patch
index 0e819942907e..691a9e273c46 100644
--- a/media-libs/fidlib/files/fidlib-0.9.10-extern.patch
+++ b/media-libs/fidlib/files/fidlib-0.9.10-extern.patch
@@ -1,5 +1,5 @@
---- fidlib-0.9.10/fidlib.h
-+++ fidlib-0.9.10/fidlib.h
+--- a/fidlib.h
++++ b/fidlib.h
 @@ -2,6 +2,13 @@
  //	fidlib include file
  //
diff --git a/media-libs/flickcurl/Manifest b/media-libs/flickcurl/Manifest
index 992acddc394a..c367d1612e43 100644
--- a/media-libs/flickcurl/Manifest
+++ b/media-libs/flickcurl/Manifest
@@ -1,3 +1,3 @@
 DIST flickcurl-1.26.tar.gz 1870073 BLAKE2B 2e14565ee076b5fd83987fc4aadc00ef1561714ea30cefef9d79260ebefa4856eca18ada5afdf6b02ad6e8ed293dd0872927346083d9eb8209bece1f456ea6bf SHA512 5ffdef58e67cbf99da2e8eefad57e845627703d5b22c85d5635557cd2df53e47e74d8e3387523495708c5cc8952c290da5c4d5f1e86bd482312fc7e46e9af6cd
-EBUILD flickcurl-1.26.ebuild 967 BLAKE2B 41ff9ba2eb7d74deb7884ebe3663fabfbdcaa10a2cd55213371e8fa8bbe70a81b539de59c016744349ea8ff5ba44c2e7ba08d88ea8612970a6fccb2a2e3f4f4c SHA512 558227f401a3798714e5b3c0e12e1d00857cb01ffd84b882be7e8a3647c1bd284a8c12136d748a4b005e9b7828f147f1cce2e786544fef4f0184e6091a89ee92
+EBUILD flickcurl-1.26.ebuild 960 BLAKE2B 75484ae600157cd48ea10e62fa7f2d9e8b2d5d23ecc0b3d4ee0e01bc29181b7cb8ff4106a3f2a7e8f0acf3a94ee199f7332ce49628cd4d2a1a14907547c71ca6 SHA512 37e92f60b0f347206d0ef04035aaa213badb77a7a65ce9b990714ff284ea1579f10c92fb7f9d6f50f54f7d67c024bd0337864e0fccc60a24cccefe0d949bf79e
 MISC metadata.xml 352 BLAKE2B b6f3d74efcfaf4e6dcfbaa16d9d85cec8969314e8cbb35803b8b47d2767ec8f5270377a4168a0142b1d19be15f46103bc6aff5b61d3529903b8bb694995b53c4 SHA512 70c66b003401b481e348eb3d94d9d6ac1d3961b1fb4e8a964b93dbf6806ac9f888076b8b3de5f0b5905d1185c044a078b0510377087056e1c3c9957ec58874ed
diff --git a/media-libs/flickcurl/flickcurl-1.26.ebuild b/media-libs/flickcurl/flickcurl-1.26.ebuild
index ef6b41c2723c..8df4de7f976c 100644
--- a/media-libs/flickcurl/flickcurl-1.26.ebuild
+++ b/media-libs/flickcurl/flickcurl-1.26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit autotools eutils ltprune
+inherit autotools ltprune
 
 DESCRIPTION="C library for the Flickr API"
 HOMEPAGE="http://librdf.org/flickcurl/"
diff --git a/media-libs/fontconfig-infinality/Manifest b/media-libs/fontconfig-infinality/Manifest
deleted file mode 100644
index 7a116b820c1e..000000000000
--- a/media-libs/fontconfig-infinality/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX Xresources 178 BLAKE2B 456674039dd0c4cfa2c721cf5ffb4760b9bf1ebd9b30ab760669675552e6f75fcc9aefa7179bfbbc712c570138a2a7a2e845a4feeb638a4f053089087435594f SHA512 9b29089594c81f5adc533d2df299bffc696f3480344cc1010d128caa46e9668051e3b0bbfcaaf11dbaa737ab8f45f8fa9dba1d13554d5040a3f9130cd527a277
-DIST fontconfig-infinality-20130404.tar.xz 23344 BLAKE2B 8531a8cab3ab37c7d8c23c992ad9ecb3473e92918569c1f77b0345be61d9f0bec968447bdd63898ca6197f210a5c79117433a1aa9e7eb4ff4f7b479a4817476a SHA512 742206795523509a7d195f194394ef3f67a9022b46f194ea369f7388c0c59842d29573fd2719f616dcc2378a4b527b93cdd3cf787b7a1728c875c7e1aa5a5417
-DIST fontconfig-nyx-2.tar.xz 1376 BLAKE2B 35853d469bc1e38d7ccbc0346e26e8c1d885db86d4b81f7c341b64a2914fc0b8fdc5f7e449800e8b305163e7dca1bc60f7ed912674f5a4acd2e6e79cdb0c939b SHA512 7863c41f67b02a37d9d3b438bcd1d6ece2bf42310ea61090f4d6384e22893a4ffbb2f7bc349511f40ba4570784f14e5656506de6b7e60f6da9c9eaba252beb1d
-EBUILD fontconfig-infinality-20130404.ebuild 1521 BLAKE2B 80bf72042abb01fc978088e5e5886c99492e754eaff564f3f1f8ffecd0458d896d2258f1bca57e6fbe1a404c25cf6a98024a6bb5cc2d0a2e2780a75c84a86d27 SHA512 e03dbb7e4b594470d087eed27b8927fc07b0da74ae99f61268c332e6b2e7a8f8518b3ad97614890a04751aedc90eac9471fca8ed5afddae9a3a5320f29a6cce4
-MISC metadata.xml 326 BLAKE2B dd093b07465ecce80ed78966217960f47725a0737737af4a5c0d140b542e51f6f9705b49f46000ef5d28f1c9f602ff20e0dc71072874203580558ad0863049f2 SHA512 272fe9c2e8befa218cd456c34c82e11ad47149da9735b3d7c5a9073f4993d04127f8b23224a910c40d339da6745ec504724b29438fda5f019915cdd6e3d1fada
diff --git a/media-libs/fontconfig-infinality/files/Xresources b/media-libs/fontconfig-infinality/files/Xresources
deleted file mode 100644
index c65472e24001..000000000000
--- a/media-libs/fontconfig-infinality/files/Xresources
+++ /dev/null
@@ -1,9 +0,0 @@
-! basic settings for infinality
-
-Xft.antialias:  1
-Xft.autohint:   0
-Xft.dpi:        96
-Xft.hinting:    1
-Xft.hintstyle:  hintfull
-Xft.lcdfilter:  lcddefault
-Xft.rgba:       rgb
diff --git a/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild b/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
deleted file mode 100644
index 044748c76069..000000000000
--- a/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit readme.gentoo
-
-DESCRIPTION="Configuration for freetype-infinality subpixel hinting"
-HOMEPAGE="http://www.infinality.net/blog/infinality-freetype-patches/"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz
-	nyx? ( https://dev.gentoo.org/~jstein/dist/fontconfig-nyx-2.tar.xz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+nyx"
-
-DEPEND=""
-RDEPEND="app-eselect/eselect-fontconfig
-	app-eselect/eselect-infinality
-	app-eselect/eselect-lcdfilter"
-PDEPEND="media-libs/freetype:2[infinality]
-	>=x11-libs/libXft-2.3.0
-	nyx? ( media-fonts/croscorefonts )"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	DOC_CONTENTS="Use eselect fontconfig enable 52-infinality.conf to enable the
-	configuration. Then use eselect infinality to set your fontconfig style and
-	eselect lcdfilter to set freetype variables. If you run into trouble with
-	applications not being able to find Type-1 fonts, then comment out the
-	relevant lines in ${EPREFIX}/etc/fonts/infinality/infinality.conf"
-
-	dodoc infinality/{CHANGELOG,CHANGELOG.pre_git,README}
-	readme.gentoo_create_doc
-
-	insinto /etc/fonts/conf.avail
-	doins conf.avail/52-infinality.conf
-
-	insinto /etc/fonts/infinality
-	doins -r infinality/{conf.src,styles.conf.avail,infinality.conf}
-
-	insinto /etc/X11/
-	doins "${FILESDIR}"/Xresources
-
-	if use nyx ; then
-		insinto /etc/fonts/infinality/styles.conf.avail
-		doins -r "${WORKDIR}"/nyx
-	fi
-}
diff --git a/media-libs/fontconfig-infinality/metadata.xml b/media-libs/fontconfig-infinality/metadata.xml
deleted file mode 100644
index 0b45bdc8b863..000000000000
--- a/media-libs/fontconfig-infinality/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
-  <use>
-    <flag name="nyx">Additional style using croscorefonts</flag>
-  </use>
-</pkgmetadata>
diff --git a/media-libs/fontconfig-ultimate/Manifest b/media-libs/fontconfig-ultimate/Manifest
deleted file mode 100644
index cf2125b7cd57..000000000000
--- a/media-libs/fontconfig-ultimate/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fontconfig-ultimate-2015.08.01.tar.gz 1241997 BLAKE2B 291a2cefb793dda5b5d5c826dd720cb9eee311d67a8268554911a4581b6e2bd3389079f4383eb32d350c57f9eb854af04734adaac40e3da134a819c77456c03e SHA512 2c1e8c522c94f6db45c63cde610bd2abf95ae913241ebda275d40cda0c0b62a489047749eaefa78fcf25d802ebad442f32f2bbf5629d4fa8ee0c6dbc9f105de9
-EBUILD fontconfig-ultimate-2015.08.01.ebuild 3144 BLAKE2B 221307db922eec0882feeb81b1d321ff61098764108d6bfbd3a1dc48da7cdfbc58075983cdb56f57d87ddda4a491de4c11b9b4a7a1e935347041f465677748c4 SHA512 3f15be9d4612b925ef33db3d146985b7d4999651a71d0c47a5d6eb1d8106dafde7ebd863bad40189d8ca84e38b89200bc16557963f9f833341e102fa2b3aa310
-MISC metadata.xml 341 BLAKE2B 609469836f44b2b1afcd253057bb9a2ce0a1cae6a28177d71864b50e7ce8cf320278d3b6c393fac59af62d513018ff587bf8cc8a5d251ab1ec3dfccbcd5b34da SHA512 55d47d4699c323ee47f874f74fd765211068a361b83aaa0016c7dd0b838d2d1902ed0c14b8ae264184e1501c31b10d84c87cd9e27989076b999049177b134272
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
deleted file mode 100644
index 0a217240ac46..000000000000
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit readme.gentoo versionator
-
-MY_PV=$(replace_all_version_separators "-")
-DESCRIPTION="A set of font rendering and replacement rules for fontconfig-infinality"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-eselect/eselect-infinality
-	app-eselect/eselect-lcdfilter
-	media-libs/fontconfig-infinality
-	media-libs/freetype:2[infinality]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DISABLE_AUTOFORMATTING="1"
-DOC_CONTENTS="1. Disable all rules but 52-infinality.conf using eselect fontconfig
-2. Enable one of the \"ultimate\" presets using eselect infinality
-3. Select ultimate lcdfilter settings using eselect lcdfilter"
-
-BLACKLIST="43-wqy-zenhei-sharp.conf"
-
-src_prepare() {
-	pushd fontconfig_patches/fonts-settings || die
-	rm ${BLACKLIST} || die
-	popd
-
-	# Generate lcdfilter config
-	echo -e "################# FONTCONFIG ULTIMATE STYLE #################\n" \
-	> "${T}"/ultimate || die
-
-	local infinality_style
-	infinality_style=$(sed --quiet \
-		-e 's/^USE_STYLE="*\([1-9]\)"*/\1/p' \
-		freetype/infinality-settings.sh) || die
-
-	if ! [ -n "$infinality_style" ]; then
-		ewarn "Missing USE_STYLE variable in package source."
-		infinality_style=1
-	fi
-
-	sed --quiet \
-		-e '/INFINALITY_FT_FILTER_PARAMS=/p' \
-		freetype/infinality-settings.sh \
-	| sed --quiet \
-		-e "${infinality_style} s/[ \t]*export[ \t]*//p" \
-	>> "${T}"/ultimate
-	assert
-
-	sed --quiet \
-		-e '/INFINALITY_FT_FILTER_PARAMS/ d' \
-		-e 's/^[ \t]*export[ \t]*INFINALITY_FT/INFINALITY_FT/p' \
-		freetype/infinality-settings.sh \
-	>> "${T}"/ultimate || die
-}
-
-src_install() {
-	insinto /etc/fonts/infinality/conf.src.ultimate
-	doins conf.d.infinality/*.conf
-	doins fontconfig_patches/{ms,free,combi}/*.conf
-
-	# Cut a list of default .conf files out of Makefile.am
-	local default_configs config fonts_settings
-	default_configs=$(sed --quiet \
-		-e ':again' \
-		-e '/\\$/ N' \
-		-e 's/\\\n/ /' \
-		-e 't again' \
-		-e 's/^CONF_LINKS =//p' \
-		conf.d.infinality/Makefile.am) || die
-
-	# Install per-font settings
-	pushd fontconfig_patches/fonts-settings || die
-	doins *.conf
-	fonts_settings=$(echo *.conf)
-	popd
-
-	# Install font presets
-	pushd fontconfig_patches/ms || die
-	for config in ${default_configs} ${fonts_settings} *.conf; do
-		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-ms/"${config}"
-	done
-	popd
-	pushd fontconfig_patches/free || die
-	for config in ${default_configs} ${fonts_settings} *.conf; do
-		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-free/"${config}"
-	done
-	popd
-	pushd fontconfig_patches/combi || die
-	for config in ${default_configs} ${fonts_settings} *.conf; do
-		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-combi/"${config}"
-	done
-	popd
-
-	insinto /usr/share/eselect-lcdfilter/env.d
-	doins "${T}"/ultimate
-
-	readme.gentoo_create_doc
-}
diff --git a/media-libs/fontconfig-ultimate/metadata.xml b/media-libs/fontconfig-ultimate/metadata.xml
deleted file mode 100644
index 29794ae87612..000000000000
--- a/media-libs/fontconfig-ultimate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">bohoomil/fontconfig-ultimate</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index c5af9f57d07f..8788b7497a08 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -6,6 +6,6 @@ AUX fontconfig-2.13.1-static_build.patch 2274 BLAKE2B 41dcaf492c8096d9d5d964f98f
 AUX fontconfig-2.13.93-latin-update.patch 1793 BLAKE2B 6d8bd13ee9eb4a5105fb6437e41681daaeb2bf0739326646ae3c78d60c49a1137ce9d62087e3fcc042398840fd5957ca93b1da37886ad6e2f9829f9fa810dbdc SHA512 cee297048df1a116af0416dd81ccd221cf9e24be2b828b4ba9a92f96dd9951ff13d627166740a88b0d0d3f1fced1eece2b8495ed30d463702ce326e02a29851d
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
-EBUILD fontconfig-2.13.1-r2.ebuild 5606 BLAKE2B e56b1cff96e38c2495bbc041ba7f4a5debff6476ff2df3460ab19353876df21fa0be1af2b0dc4258e5b0c796c002ebb7b5be3dbee7b4047a062695872a39f5f3 SHA512 f45676cbe2ffb35839513cf85a76c5d9c7ead789fe4fa0be07ad1c1dc701f79caded154ce128a7da0a0a04e73e0ce8bd5665f305e935a6121d69bee1cff2247e
+EBUILD fontconfig-2.13.1-r2.ebuild 5607 BLAKE2B 4722f100c1c0f4d1c476bf434695ada405ce4d31b3936a5f8bc3d3db61896b413bdf1d8c9eef15a3753f3d396abc5fcf94af0bd723cc4820cfeefef0a8ac8d07 SHA512 77cd364bbc0b8c1ef7fe6d792d2c089350b0b46470f2342fac36a2009d3c22f891385ac15a0d7fc274c03afe3be1437146751ec68f3979db75cc7ba351ed3f7d
 EBUILD fontconfig-2.13.93.ebuild 5832 BLAKE2B 277d6ebe2e2481cacf7e3b4a513899b4bdd65aec0f2db1353c169eb3e46060fc4d6f3493ca36c642b68693ade6aac0d107e15b4f044e72941ae957a78e00bc51 SHA512 4d09dc19f73128bfdd66bf14ff643f78c4c2d777cc526c2817dbc1905cea66194ad5465603794061e1a0c11f98933b14da0274b1c78d0c12523753f096280344
 MISC metadata.xml 598 BLAKE2B 9dde998386dce5ea1c1a087103d18c0e0654bc2e8a59e1bd99ef92eab86584b52d0b1a00da4bd1921bf322f00752c9a1954aec1e5daff6c68497eb8cc8e82bf2 SHA512 fa7c42680f0108f22187ff0daac898161bbe7a74265c7370e1fcf1c3cc6f78987e88722b5159ee524b4245daa528474986e0ed69036f3d4b7a95948012acf324
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 9d01156b5ebf..6b51d5adc5b4 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Test test-bz106632 is known to be broken, see bug #751232
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index c224b25c3090..d4dcc588cd19 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -8,6 +8,6 @@ AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b896
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 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 3171 BLAKE2B 4d0067d1fb5c6175e1ba560018bf6341951d3aa9e281b1726018e7340655a96b5f352bbc591d0323080a6f61a6596b5c43de95b8d27ab6b85f706035a0b0180f SHA512 81d452cf25aba46d7e46393b133fa45813458cfc0a1cc1f685f9f9aad92b65a4552864c82bd853506f7d87fe58a7a83e11a836c2dfc4d080d1616efebc9176aa
+EBUILD freeimage-3.18.0-r1.ebuild 3055 BLAKE2B 4ee4e6887a25899a4e610c15f1995e63672951578aa738b3ba3daeed7d39c5b33e5c5461529cb697798c59685b99853dd968807a80ecbab92ed33f6cf9d697dd SHA512 08a64c0e4ddd54d7f9f44d21ae2d9b47a0df012c8203ad0df1b896bca811200c014ca06b743fb31bda13d86b688b3d0caee9deb28d7b4e4b1eea452384f03f18
+EBUILD freeimage-3.18.0-r2.ebuild 3174 BLAKE2B fb299df99374303edc9f38dd38effe2a2aeff342446a4f2b44cb8878b393308cc1611801d32e23a892ffbf879616ee03f5216f75545e712a8c4211f5bce90858 SHA512 252093fc344316203110f98c1eca639e1834a8d5196f7cf86d6e6b0fe3adbbfdbc891b6d3d63ac4f08e2496e37b3fb82959794f3e7a9f83858a1306ebae0d21b
 MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
index b6dc64c0ab98..0193edd91608 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-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
 
-inherit eutils toolchain-funcs
+inherit edos2unix toolchain-funcs
 
 MY_PN=FreeImage
 MY_PV=${PV//.}
diff --git a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
index 17929a69f041..3240d3021ec0 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit edos2unix toolchain-funcs
 
 MY_PN=FreeImage
 MY_PV=${PV//.}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index e42eba91a2b0..ab227dd1de89 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,7 +1,10 @@
 AUX freetype-2.10.3-sizeof-types.patch 1038 BLAKE2B bb49e7d4195346b67f37c16f9f31e3d5b658398afa7209c5d7c89dbbf90c98385d0827960545b83573425c6be8e4615311f76d93e40ff6237977bfe160639587 SHA512 64e3cc7820bd0b8816ad34108fa174da90f2a0b8f96a3c94425900ba5f5eb8b01074fdfa3bee699815d7eb74ec44cf043239a932a228c2971557fad0caec912f
+AUX freetype-2.10.4-dont_hardcode_libtool.patch 1312 BLAKE2B 7cd7d9f5284a54a9667243ce1e2f16104f75b117b9b27367ccd2ceaf4c643829b3f1a031d51b6008d9300a31322634602cf281f09d56ecbfbf143b466894c4a4 SHA512 85f66eed284fe804857e1d651cbfc75cfcc4bad2126681dc36873cd9f9561c9d6c31fee39bc333e8ac936f491708e4b7b9d62de4b75015ac9a1f78b3c8647ec1
+AUX freetype-2.10.4-slibtool_build_fix.patch 1262 BLAKE2B b2e3fc0565f5b90c00628d44ec3d1633c3ccce0df3effabaf9e36636b78067d03c899c86a100e11df27ca299daf4afdc815924430b04a42bcabb4104d7f4a8b7 SHA512 5fd4fce61c4f1f78fc6e19477e89b8f989ad17a50ff48c49841f6a7499e0843525a489e622db8064799749b53e62f0177bbfde519fe03813eedd7ca6e752f238
+AUX ft2demos-2.10.4-install_target.patch 1647 BLAKE2B 4409123fbb089c1312ff90ebbb32c70f3a0025d96b705dd6be24bdf33fa0b1956e512549c39e5b378c2a6f4a4cb8e7708c096c786fbf0bcc3e037f691f9aad21 SHA512 5d77f5892f7ce4ab1bc3dcbfb04cd86f2fc54e347c2b3ce7e701995b0f75efc0164797b18454b645a0cc1cc8b0f41816b5bca19d786a66f3bc145fa0ca2cd8b1
 DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
 DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
 DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
-EBUILD freetype-2.10.4.ebuild 6745 BLAKE2B 6fdfc887e407dd5848a8d7989808862cdb8723354d3716761ce1b106606d125cc7320f613f8cab38d408a32eac30af923638b922ecf8cda8beda307422773048 SHA512 29c8171c1729f59064c61eeeda66d0413b46e9d225a657ab038c2344ae49892bd742d6576bb27b9d4107ba50c058bd9c8a9d2aa66923ed3f32f50d9f8f8e5135
-EBUILD freetype-9999.ebuild 7139 BLAKE2B c765a0fac9000c3ce9d90ee41c825c494b065055cba425580cbdfcb7804383a905215eebd113b09bdf4bef91dc6b90b2c83cdd62c78907bab1a97c256d268dfc SHA512 79c30e21004e1f0cc0ec079eea6c98467c5e0726f629659c1fd81cb75c05d32f1f94ea9016f084c8c64e4920a03ee7477270b87d7a5360bed6c27d3fc5d3336a
-MISC metadata.xml 1459 BLAKE2B 0299ed3326810e7b5dd4138e887b5b7f285a50d7a12b05d5650d552d840b498525801c9f7deef59fdaf71fd3b3ed3dbdd2d736a80a118ef741c54d6946797d0e SHA512 9c8be8c3c6f712a475c41eedde85c001c6429e0a4ffb7b9a177ac777ce934096bb710ee00fc1fa857055cc4ace9a98168cc0dc248e4e4379c4849634011197a8
+EBUILD freetype-2.10.4.ebuild 6819 BLAKE2B bd401c75e986dbc8c15228e058ff104d3b1de5cc7c49350e41169f29efaef88c7e4b6f54106d795b35a8e80292bd66097eef9d33e46366f96eb3e21e4c0b62f3 SHA512 4455927d94a4ecc45b4aef2bc3e779582b560371679b2538a6a2fd491c8f1e64fe12cc85d70d5bc0a2f138e4ce0ba2eba87b63eff0badf38cb115d392e0a988c
+EBUILD freetype-9999.ebuild 7287 BLAKE2B 7f0fb25254f4486369dca71433f0d35070bc892cf7c814ad52c641c9ce795016520082a2924e2950b759fe397897165987bf3919f0199313d595973d69ae38aa SHA512 476e1c68c8c5808ac6630e1bc40a4343688f6dc0015e1c7f447ca3442b81f196afa812c5e7949fdaed7a9fb05c3b635a13fd145b2bb22eda5d4fc84d92c1144a
+MISC metadata.xml 1613 BLAKE2B 93afe7641d11f06f2b6c87348498fe292b50f1b6240019532bc8639bf2b70c0511014c720e3fc7fe0e0f033bb4449745df0a489597750e4d99695798bbbdf2b1 SHA512 ee0c14554af76884f8efced54d2dd7b0dcb90c3aeb8e6ed638956a79d840bc825c32af49230f56e7659bdfc4cfe761068c0ebf31ee3cd28f79078cd5738e052e
diff --git a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
new file mode 100644
index 000000000000..310b5aaca935
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
@@ -0,0 +1,42 @@
+From 597566b2301deeff4e9832aebdab1bf659a2accf Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 22 Mar 2021 16:15:37 -0700
+Subject: [PATCH] * Makefile, mac/Makefile (LINK_CMD): Don't hard-code
+ `libtool`.
+
+---
+ Makefile     |    3 +--
+ mac/Makefile |    3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 810142f..949402f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -165,8 +165,7 @@ else
+ 
+   ifeq ($(PLATFORM),unix)
+     override CC = $(CCraw)
+-    LINK_CMD    = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
+-                  --mode=link $(CC) \
++    LINK_CMD    = $(LIBTOOL) --mode=link $(CC) \
+                   $(subst /,$(COMPILER_SEP),$(LDFLAGS))
+     LINK_LIBS   = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME)
+   else
+diff --git a/mac/Makefile b/mac/Makefile
+index 73ae99c..52038a4 100644
+--- a/mac/Makefile
++++ b/mac/Makefile
+@@ -68,8 +68,7 @@ else
+   LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<)
+ 
+   CC        = $(CCraw)
+-  LINK_CMD  = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
+-		--mode=link $(CC) \
++  LINK_CMD  = $(LIBTOOL) --mode=link $(CC) \
+ 		$(subst /,$(COMPILER_SEP),$(LDFLAGS))
+   ifeq ($(findstring CoreServices,$(LDFLAGS)),)
+     LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(MATH) \
+-- 
+GitLab
+
diff --git a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
new file mode 100644
index 000000000000..895a86c444d6
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
@@ -0,0 +1,40 @@
+From 8e9447b32dae7e6c95bee3f878ee1877f9b628a4 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 22 Mar 2021 16:15:09 -0700
+Subject: [PATCH] [graph] Fix build with `slibtool`.
+
+* graph/rules.mk (GRAPH_LIB): Handle the case specially where
+`LIBTOOL` is defined.
+(COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`.
+---
+ rules.mk |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/graph/rules.mk b/graph/rules.mk
+index 4903a38..a3f0de1 100644
+--- a/graph/rules.mk
++++ b/graph/rules.mk
+@@ -12,7 +12,6 @@
+ 
+ 
+ GRAPH_INCLUDES := $(subst /,$(COMPILER_SEP),$(TOP_DIR_2)/graph)
+-GRAPH_LIB      := $(OBJ_DIR_2)/graph.$(SA)
+ 
+ GRAPH := $(TOP_DIR_2)/graph
+ 
+@@ -46,9 +45,11 @@ GRAPH_OBJS := $(OBJ_DIR_2)/gblblit.$(O)   \
+ # this value can be modified by the system-specific graphics drivers.
+ #
+ ifneq ($(LIBTOOL),)
+-  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -static \
++  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(A)
++  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -module -static \
+                                  -o $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
+ else
++  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(SA)
+   COMPILE_GRAPH_LIB = ar -r $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
+ endif
+ 
+-- 
+GitLab
+
diff --git a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
new file mode 100644
index 000000000000..f3d7f8de43e4
--- /dev/null
+++ b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
@@ -0,0 +1,58 @@
+From b88cd2f027e77bd26d1334fc13c4eda796423d19 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 24 Mar 2021 09:04:41 -0700
+Subject: [PATCH] [build] Add an `install` target for binaries and man pages.
+
+* Makefile (MANPAGES): New variable.
+(install) <unix>: New target.
+---
+ Makefile |   19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 949402f..8352f61 100644
+--- a/Makefile
++++ b/Makefile
+@@ -194,7 +194,7 @@ else
+                 $(LINK_LIBS) $(subst /,$(COMPILER_SEP),$(GRAPH_LIB)) \
+                 $(GRAPH_LINK) $(MATH)
+ 
+-  .PHONY: exes clean distclean
++  .PHONY: exes clean distclean install
+ 
+ 
+   ###################################################################
+@@ -317,6 +317,11 @@ else
+   # EXES += fttimer
+   # EXES += testname
+ 
++  # Not all demo programs have a man page; we thus check for existence in a
++  # loop.
++  #
++  MANPAGES := $(foreach man,$(EXES),$(wildcard $(TOP_DIR_2)/man/$(man).1))
++
+   exes: $(EXES:%=$(BIN_DIR_2)/%$E)
+ 
+ 
+@@ -567,6 +572,18 @@ else
+                         $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
+ 	  $(LINK_NEW)
+ 
++  ifeq ($(PLATFORM),unix)
++    install: exes
++	    $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \
++                             $(DESTDIR)$(mandir)/man1
++	    $(foreach bin,$(EXES), \
++              $(LIBTOOL) --mode=install \
++                $(INSTALL) $(BIN_DIR_2)/$(bin) \
++                           $(DESTDIR)$(bindir)/$(bin);)
++	    $(foreach man,$(MANPAGES), \
++              $(INSTALL) $(man) \
++                         $(DESTDIR)$(mandir)/man1/$(notdir $(man));)
++  endif
+ endif
+ 
+ 
+-- 
+GitLab
+
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
index 6ede5206ae84..0575eaa7fb6e 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
@@ -148,6 +148,11 @@ src_prepare() {
 		if ! use X; then
 			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
 		fi
+
+		# Taken from upstream (https://bugs.gentoo.org/775881)
+		eapply "${FILESDIR}/${P}-slibtool_build_fix.patch"
+		eapply "${FILESDIR}/${P}-dont_hardcode_libtool.patch"
+		eapply "${FILESDIR}/ft2demos-2.10.4-install_target.patch"
 		cd "${S}" || die
 	fi
 
@@ -204,15 +209,10 @@ multilib_src_compile() {
 multilib_src_install() {
 	default
 
-	if multilib_is_native_abi && use utils; then
+	if multilib_is_native_abi && use utils ; then
 		einfo "Installing utils"
-		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
-		dodir /usr/bin #654780
-		local ft2demo
-		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
-				"${ED}"/usr/bin || die
-		done
+		emake DESTDIR="${D}" FT2DEMOS=1 \
+			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
 	fi
 }
 
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 10ef7635e9df..3cc2445891fa 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
-DESCRIPTION="A high-quality and portable font engine"
+DESCRIPTION="High-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality +png static-libs utils"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -24,7 +24,6 @@ fi
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
 
 RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
@@ -82,9 +81,9 @@ src_unpack() {
 	_egit_repo_handler ${EBUILD_PHASE}
 
 	if [[ "${PV}" == 9999 ]] ; then
-		# Need to copy stuff from dlg submodule (#758902)
-		local dlg_inc_dir="${S}/submodules/dlg/include/dlg"
-		local dlg_src_dir="${S}/submodules/dlg/src/dlg"
+		# Need to copy stuff from dlg subproject (#758902)
+		local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
+		local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
 		local dlg_dest_dir="${S}/include"
 		mkdir -p "${dlg_dest_dir}/dlg" || die
 		cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
@@ -94,14 +93,22 @@ src_unpack() {
 
 src_prepare() {
 	if [[ "${PV}" == 9999 ]] ; then
+		# Do NOT automagically mess with submodules!!!
+		sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
 		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
+		eval $(sed -n \
+			-e 's/^#define  *\(FREETYPE_MAJOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_MINOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_PATCH\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			include/freetype/freetype.h || die)
+		FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
+		[[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
 		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
+		sed -e "s;@VERSION@;${FREETYPE};" \
 			< configure.raw > configure.ac || die
 		# eautoheader produces broken ftconfig.in
 		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
+		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
 		popd &>/dev/null || die
 	fi
 
@@ -125,11 +132,11 @@ src_prepare() {
 	# Will be the new default for >=freetype-2.7.0
 	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
 
-	if use infinality && use cleartype_hinting; then
+	if use infinality && use cleartype-hinting ; then
 		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
-	elif use infinality; then
+	elif use infinality ; then
 		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
-	elif use cleartype_hinting; then
+	elif use cleartype-hinting ; then
 		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
 	fi
 
@@ -137,25 +144,22 @@ src_prepare() {
 	# via environment (new since v2.8)
 	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
 
-	if ! use bindist; then
-		# See http://freetype.org/patents.html
-		# ClearType is covered by several Microsoft patents in the US
-		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-	fi
+	# See https://freetype.org/patents.html (expired!)
+	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
-	if ! use adobe-cff; then
+	if ! use adobe-cff ; then
 		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
 	fi
 
-	if use debug; then
+	if use debug ; then
 		enable_option FT_DEBUG_LEVEL_TRACE
 		enable_option FT_DEBUG_MEMORY
 	fi
 
-	if use utils; then
+	if use utils ; then
 		cd "${WORKDIR}/ft2demos-${PV}" || die
 		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X; then
+		if ! use X ; then
 			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
 		fi
 		cd "${S}" || die
@@ -202,7 +206,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	default
 
-	if multilib_is_native_abi && use utils; then
+	if multilib_is_native_abi && use utils ; then
 		einfo "Building utils"
 		# fix for Prefix, bug #339334
 		emake \
@@ -214,25 +218,20 @@ multilib_src_compile() {
 multilib_src_install() {
 	default
 
-	if multilib_is_native_abi && use utils; then
+	if multilib_is_native_abi && use utils ; then
 		einfo "Installing utils"
-		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
-		dodir /usr/bin #654780
-		local ft2demo
-		for ft2demo in ../ft2demos-${PV}/bin/*; do
-			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
-				"${ED}"/usr/bin || die
-		done
+		emake DESTDIR="${D}" FT2DEMOS=1 \
+			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
 	fi
 }
 
 multilib_src_install_all() {
-	if use fontforge; then
+	if use fontforge ; then
 		# Probably fontforge needs less but this way makes things simplier...
 		einfo "Installing internal headers required for fontforge"
 		local header
 		find src/truetype include/freetype/internal -name '*.h' | \
-		while read header; do
+		while read header ; do
 			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
 			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
 		done
@@ -244,8 +243,8 @@ multilib_src_install_all() {
 		dodoc -r docs/*
 	fi
 
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
+		find "${ED}" -type f -name '*.a' -delete || die
 	fi
 }
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index 8ee62c35ac89..d27bf8abe71c 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -12,6 +12,8 @@
 	<use>
 		<flag name="adobe-cff">Use Adobe CFF as default font-renderer</flag>
 		<flag name="brotli">Enable brotli decompression support via <pkg>app-arch/brotli</pkg></flag>
+		<flag name="cleartype-hinting">Bytecode hinting mode for TrueType fonts that
+			activates subpixel hinting (a.k.a. ClearType hinting) by default</flag>
 		<flag name="cleartype_hinting">New bytecode hinting mode for TrueType fonts that
 			activates subpixel hinting (a.k.a. ClearType hinting) by default</flag>
 		<flag name="bindist">Disable ClearType support (see http://freetype.org/patents.html)</flag>
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index 446b34c1e2e0..905bc67dfdd7 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -2,5 +2,5 @@ AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af1
 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1239 BLAKE2B 0d4bec1e3f1a6ecc06bedbd3a7c06778daa2746d60047c0938a19fd205d803bcd290623d5bec1f6a6a5c96507fe711414088d26babbc99e8620bf43b0eaac2b1 SHA512 913908774dff4dd726dfa84d7b6da9176cfa083b546a7c973a2f9ad3b85b1e3d88b15a93645d39043731664a2bcf02e91c8fef28cf89014068113dbd6f05693b
+EBUILD ftgl-2.1.3_rc5.ebuild 1240 BLAKE2B 9d193145a5da5afa2517a445b2061c1c51077fabf3f3ee7c6176dbfbbbc6164d336981e00efd7bc838391e81680f470a138443351775c85594a2af6cfa46871b SHA512 6e84d20a0fe8eda1b9c6485ebb2cb1760e863c89d45340566144da0236e8f4ff4f5c07042fb04b968fbddc9b507ebc64fd4d90b1c83d701949a718ad8b1bee94
 MISC metadata.xml 327 BLAKE2B 84a08c3564faec441b2c375d60326a01d2a60ec1a5390b1e4a8a7e317e85d7da7bc181dba11b84a5d387e32231a73ec9308466fa914d5b90cdbe12e255ba931b SHA512 d5fb9210e27a2e5687f6a223885f6f5ea023c0da51e594c12fb3b07521f3fd882bcc19829d0ccbfaebcfe7e4e15df897c70eabb2fab0d29f8f4b45dbfe710d56
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 4edfdff9cffa..d0df3131095d 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_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=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=media-libs/freetype-2.0.9
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index a5972b701165..e5c1b95e298b 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,4 +1,6 @@
 AUX game-music-emu-0.6.2-gcc10.patch 546 BLAKE2B ef04c95fbb0fc51afbfaf27d93cb38c689ff07499f3b7362a0c50ccf726082bf68f4b7d6bc36a3abdff9d81a8bb87f650ddac362e989da590471ebbece810e92 SHA512 a09190e164c969760eded45474c965db1ebd53d78485b748d31e067eccc42f32f370ccab80d4ed51bab393d535ccc499ec8212eb4258428417c60b79399691c9
 DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
+DIST game-music-emu-0.6.3.tar.xz 234412 BLAKE2B 21edd8f5e868231424c56dad6740a5c7cb8e7f503b707dc56ea71d7a75085566b2bd0c2060b0f9e919f858c13821b3810959cff96c41f9248bb3b98f12eb22f7 SHA512 4b20c69ced696bb879c34bcb7ce0f5f276642458d4cebca8ede673eed7d50664e527626e2077f85a3411a26660f1b3f01e43cccd72945e1edb2994421efeb552
 EBUILD game-music-emu-0.6.2.ebuild 544 BLAKE2B cfc296de059a13c0d684ee037cebd5088044792b04a2b78b4c3bd316e2ed5d61d1011a67bbfb40262a6bf8778737156aa48eeb651be2824d2c577849b757fb42 SHA512 d0d62797c51dc871ae10fb137cfa700f2ea2c7055d05d15450c0dea2ab89592330e5be913a28a11fba5a6e97b42c78e9459cbdb5d50aa7b8f8ae9dc9bc2f2823
+EBUILD game-music-emu-0.6.3.ebuild 490 BLAKE2B b302d9a3c9faf16e1779e2c55e66dfd09653730b3eccaed2e03f139c0277cf3a1d2f9c4220a1e5286078ec3f75dc3725c05db210241c799c9637789b34c91320 SHA512 ace43fd05f27f9dd1fcc05adb3cc901b6b7df86ebc24f4f6809cca1f3df49ab47a65fe95469d45e2b7f90e9c8cd2386fb4640f615961c52e6b5e46a853db6581
 MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
new file mode 100644
index 000000000000..682248956319
--- /dev/null
+++ b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Video game music file emulators"
+HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu/wiki/Home"
+SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DOCS=( changes.txt design.txt gme.txt readme.txt )
diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index 74acf6074296..e73066f396f7 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,3 +1,3 @@
 DIST ganv-1.8.0.tar.bz2 382822 BLAKE2B 4936b7f87fa7cf17ed86b8165558684f0f59387c9673144d57d8505e41f367735117e9f5b08508dcecb831b77b6bbc6559323417824a9f8defc43c81cc91d469 SHA512 00969879592af11d211ad790b970a8a3765ec0591515af856230e3fc9371b1611f2a4edc73d1fc59371a4c4a49c7479f279dc6f298d843296e6707cd2d495af4
-EBUILD ganv-1.8.0.ebuild 987 BLAKE2B a019168597a0f53d2bcc7622df85573f09865cf533b2f50c2f03c718a5b6d57907511081d258d794de197aa2ee1af5a32bc344d7d958f32be71e7c179abf76df SHA512 b775cac5f042ba88699175e7bf61e64eda654c7b32b5ca7ab7146927c1bd16b9d1c124ca29c44a42a53659cd6e91dea8f5cdca874713dbc68b9acf39f78c2055
+EBUILD ganv-1.8.0.ebuild 980 BLAKE2B 3db5196143c90c82b6f606d3548c6f7b3d3299c46f6ac2507fca0f7fd6f8861662a336f3bfbc0da11ae23bc87550e46366abb21264b993b3622242680e3097f0 SHA512 2809c86a2d807614f9079f05cd8332396add6769952a5355fb937cf6e769470115f28fab09d6ffd03df7cfa9cc1f7585f04ea867ef0171c99a855a0f99b20439
 MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/ganv-1.8.0.ebuild b/media-libs/ganv/ganv-1.8.0.ebuild
index 58367e54c0b2..44fd56077d02 100644
--- a/media-libs/ganv/ganv-1.8.0.ebuild
+++ b/media-libs/ganv/ganv-1.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
-inherit eutils flag-o-matic waf-utils python-any-r1
+inherit flag-o-matic waf-utils python-any-r1
 
 DESCRIPTION="A GTK+ widget for interactive graph-like environments"
 HOMEPAGE="http://drobilla.net/software/ganv/"
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index bab6a710a4c8..422f7aefd364 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -4,7 +4,7 @@ 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
 DIST libgd-2.3.2.tar.xz 2821096 BLAKE2B a126fbac1c20113fe8f27187e70b1b81712212b7da01c9a0b3e5e38fb4d4356b7992a0cfd7db55a2f94877f6ecf82d775c39977a523db1f948cf215c6c0d7672 SHA512 a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2
-EBUILD gd-2.3.0.ebuild 2561 BLAKE2B 916cc3bc7b44afee22557e424d8296890e0d5bd8d009eb939470e7fb6c5750b2d0347b909e872aabbc88551ee71005ab9d59de2fe8b85c5e68145127d4ecdfe8 SHA512 2605629f9c96f1c9b0121639d989888f422b37611066deb73ad76843d4a7cd5fcfc093c3492f76169faa27872e6e66cf9405f1c75aac0251cd1a3881df4b2529
-EBUILD gd-2.3.1.ebuild 2473 BLAKE2B 72db570af22b67ab71c491d5cdfcb2b61272f9080587ce3f721d1cc8f4fb95bd5487809223d5db6bbedc35151f49cf6f650d1fbdb7516acd129ffb16861a1e9d SHA512 efdf98097f6864c41aab735e613e074481b64b2e6a7d58b57201104088ca32f608c351f4c551912b2158d16f0d5de060153fd0a6d0898e16a6588ca22b5e615d
-EBUILD gd-2.3.2.ebuild 2638 BLAKE2B 03d95d2ab48aa709d6ee6b9125a672fb1813204f18a58cc53742c4b827b8e6d8ccd93d09f65aed46da3cfcdd772a7a14e082b24a7e0f523a0e72df15107636c9 SHA512 b39c076366d61d93121e841cf8293ca431b6be35a6c798b4ae6ed17fcba5bef6d25ea8bc2d19c18eac10ad907eb9309249287b82537682a3e53fa6695c9db81e
+EBUILD gd-2.3.0.ebuild 2562 BLAKE2B 439023b5e0794151ac045b0fc9e7686db50b71044e7866c65a756398720473cb9c887a7323ac9914e2ff3c4339d4055af4b0100b3ab7ee9f6e3319b6169b4c81 SHA512 401ae121978ea066367e26dfbfeaa6ca98588830b60f7f0ba89c0aa95be486811f91a33c3c6922d34adf1ef1b8ca82b3df688d546760e2e91c03a1e2e29cff72
+EBUILD gd-2.3.1.ebuild 2474 BLAKE2B 330a280915eec3c018663ce118d62e6bec06d22b9e6bf99c873af74e2362451a7b1bbc2cb63401d805ad2230d94a9f93688d3269a25204e77d0c47330e22d230 SHA512 959c4948cd62837b7000f733d64575ad624bf316c0ce628eb4e1f1171d1096f303dd04c1928679a9cda2769eae71f34214a7ce4dabc67bdbcd4498c03a2a3c01
+EBUILD gd-2.3.2.ebuild 2634 BLAKE2B 2436c27567a749b2d27d4717c1dedb35b42d2e83d02bd24c60e9220d8c7203df7ea36704706385aef445829b7960c8dc16113c002f442f78d45e054cd3123b44 SHA512 ef960db47bd11751fac4aa876de2da338f1a41fc5116c52b8eb99de9e39d63ebde8fd98bbe7bef2009519e45fbabd0d0d83e485530a51d9d6a387b354b93d173
 MISC metadata.xml 1636 BLAKE2B 2f70829e07669f433893a7ecd5dc7097e3ca80c6d86ef018823723601228d5960ea4c4bf97635107306e1e0fa401c593374a3a5514b645211c05bae253a95511 SHA512 5ed6fa619ad40835ae21266222975283322ca6092f8a5ad71258f48e012fb6537b44da2aa6ea07b92043dd5fc252239af5b51f558ddb69d7f6ce1cb667bc223d
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
index 4824a477708f..2bbd3e5bb1d8 100644
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ b/media-libs/gd/gd-2.3.0.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/gd/gd-2.3.1.ebuild b/media-libs/gd/gd-2.3.1.ebuild
index 81b85e2979fe..99fe254589bc 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/gd/gd-2.3.2.ebuild b/media-libs/gd/gd-2.3.2.ebuild
index 5797a5d83b04..9965a554fb43 100644
--- a/media-libs/gd/gd-2.3.2.ebuild
+++ b/media-libs/gd/gd-2.3.2.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="avif cpu_flags_x86_sse fontconfig +jpeg heif +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 aae5a7d6ff2c..58ef53593801 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -2,7 +2,9 @@ AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773
 AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417
 DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24
 DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
+DIST gegl-0.4.30.tar.xz 5398052 BLAKE2B c57b34ed64d3b9305d3e639b872c283bd4c9c798d13f7bde49b991044139bb4e433a3adb0a9e991b78b2905985496ca3bf4ed116333ceaaccc043b8a66426131 SHA512 73db2d18260ba061fbbc2adb3256ea9d5b822b57f5654cc3aefb59e7afeeb2e4f0fd7e95ac14603c0a549935df04d5744001089efb378511c914c68664dbd378
 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 4579 BLAKE2B ad31fb273d8f344da9e3e9b3574896170c9b1a433cfdcf4af98c6c3d335ea177086acaf00f9b1c6f3de081b87a000a3620e2271c0e44c66ffe740fa29343988c SHA512 90b820a15cd92aaa9f33c062219e78af5f93145ea1fd0b89966bf9966ef98e69bcba6d95cda47c511a2e8cb0f129058e7203c84aa100497c92a80397916a24f7
+EBUILD gegl-0.4.30.ebuild 4762 BLAKE2B 340be5f6e2bd80c2b683f414521c9c158d238e5457e85f841f58de3011874d1901b4cd1918bb6c1a4afe5b1cc753af1c4a0a587d9728e22f24f91a5576da6584 SHA512 779fb12362ad509f8f91042e031937a5e82fd35d582a9f424b6795d2216c6bc42a00aa4c877a07ec20902d0793e33e50aa4a5286d7307cf53273b37a9b96ad24
+EBUILD gegl-9999.ebuild 4493 BLAKE2B ef40bd142f0f50c7a762a68071ceaadaa0eadb0d15ff2da97a7b42b72aa9782bd37b6bc5b1162f1cd986b08cb24169000c4db69fdfcced450dcb281f3714ff0b SHA512 b33c2c4cfb749a836e53802f96e9000dbb6b68a6fb3f4863737f5d4e3550cefd17ef8a4610c04014fa7d696b0efc637b3437e145961bd567c1393f3be7caee4a
 MISC metadata.xml 580 BLAKE2B 604088ef1ce307cb04f44e6c204355569136168f6f574a3b58a5ce374b9e9d4e41476107f11cd5990d0ae39ace5db5420e372c7c88d409b38930cc8b6030b3c0 SHA512 a59cd50a65117f265616e2b595ec3cc95a59f9caac46218fb137af2f62067c5563a4dc53930188b6adf13b0548f02b637bb8312863ee1976ace90ec509e4a2f1
diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild
new file mode 100644
index 000000000000..db958e5516ed
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.30.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson optfeature 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.84[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="
+	${PYTHON_DEPS}
+	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 )
+
+python_check_deps() {
+	use test || return 0
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	# patch executables suffix
+	sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die
+	sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die
+	sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die
+	# skip UNEXPECTED PASSED 'matting-levin' test
+	sed -i -e "s/composition_tests += 'matting-levin'//" \
+		-e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die
+
+	# 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 'build'headers from *.cl on gentoo-hardened, bug 739816
+	pushd "${S}/opencl/" || die
+	for file in *.cl; do
+		if [[ -f ${file} ]]; then
+			"${EPYTHON}" cltostring.py "${file}" || die
+		fi
+	done
+	popd || die
+
+	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
+		-Djasper=disabled
+		#  - 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
+}
+
+pkg_postinst() {
+	optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index c0ed1b98aeaa..72e12f1f01b1 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 VALA_USE_DEPEND=vapigen
 
-inherit meson gnome2-utils python-any-r1 vala
+inherit meson optfeature python-any-r1 vala
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -72,7 +72,7 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
 
 python_check_deps() {
 	use test || return 0
@@ -99,8 +99,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/meson.build || die
 
-	gnome2_environment_reset
-
 	use vala && vala_src_prepare
 }
 
@@ -111,9 +109,6 @@ src_configure() {
 		-Ddocs=false
 		-Dexiv2=disabled
 		-Dgdk-pixbuf=enabled
-		#  - 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
 		#  - libspiro: not in portage main tree
 		-Dlibspiro=disabled
@@ -146,3 +141,7 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+pkg_postinst() {
+	optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
+}
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index f59ece4a2b10..1309d3a29541 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,3 +1,5 @@
 DIST gexiv2-0.12.1.tar.xz 372104 BLAKE2B e712bc8056e0e02d66ee831425776c26b65275db8f4cb4a526dbe9f00bddc473312f6c4c8e011906ca02ff256c00c7fe8d602acd64c787b05e13ad582ff8ebee SHA512 cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d
+DIST gexiv2-0.12.2.tar.xz 378428 BLAKE2B bb3fd6310cdb76f3e88bb31e018d78013bb626559b9e95bf59688601388cff10739c20c431fa9539c1d24c9045d2b3590a0f783a994d3b8966c4df12e9127f4e SHA512 850bf41f6180b0fdd050ab08da6e3bbd8d25ffc25a1f48e17a1d7a65771893cc79fba9cbd6718bf1754251ac4a4754983f0ab8f006a05f8c4a15085846d001a5
 EBUILD gexiv2-0.12.1.ebuild 1785 BLAKE2B f9ee602000fffb2fb5a7da96a8387abe8c5fd20349886197a88b254e43364c45ea0f66c295cb65ce77358338fd805959681bb4c175b837b1deb95427ebcee9fe SHA512 9ca34e4290ad103f6cea1769cf24dfd8df0c74c92a7d50e27e7703d02c09b990a405577cb1237b451ddb4c82761fe6e1a1e2c90719cbf3d369d9dcb35a66de49
+EBUILD gexiv2-0.12.2.ebuild 1792 BLAKE2B a540a47d039ee90ade227d35ce223de1845d13bab3de1252297d62deae99cd246ed6af9b0fc7b2e87e065d19a73725a26de9f1e1153b0f3031fd287d1283e7cb SHA512 c55a23c4286b4bd7d56bb3a99cd2be756bc7d70251cd967c868e636bfecf5f9d71e575cf915d449444556dc9796a3c64ea7f00a9d829f437c64abbad6e63faa4
 MISC metadata.xml 513 BLAKE2B 7820281c36922b5e68aacb3c3935f7193e2725515f196eaf72f6eba42327a8c8d10ceaed6422fb95cf15b0f1a0d96a168c7a677e42ae847fe050b26c39c39a0b SHA512 deb951010c3342738d8ad5b9e79baa790913f3b906799f9f72f59d4e978f0564fc52f14482bb632ffe817488d154bd8bafe98bc5eea07b7c2da1504867d671b0
diff --git a/media-libs/gexiv2/gexiv2-0.12.2.ebuild b/media-libs/gexiv2/gexiv2-0.12.2.ebuild
new file mode 100644
index 000000000000..54ea8224ebf4
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.12.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-r1 vala
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1+ GPL-2"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test +vala"
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=media-gfx/exiv2-0.26:=
+	>=dev-libs/glib-2.46.0:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? ( media-gfx/exiv2[xmp] )
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		-Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either
+		# Prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules)
+		-Dpython2_girdir=no
+		-Dpython3_girdir=no
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+}
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 9574fea86b21..396593722c1a 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,5 +1,5 @@
 AUX giflib-5.1.9-gentoo.patch 200 BLAKE2B 0d3e9e349b8ef00a09743ac1424c0f53d293573cfbc80a1105f65041d201a0231cb7e69791b8441a5b286841b507ad6b908f4fe0a514a79b8ba6546385f2fa70 SHA512 2d899722238eecd8bdfa7412cf5778c42c58d2e93c9e02e458b5dc636933f7765fd39ceb7906200425039a6c908b47403ec306dc3c79e1402f3824a351a17081
 AUX giflib-5.2.1-fix-missing-quantize-API-symbols.patch 920 BLAKE2B a559e326851cc937977f7b91295b218b444deddb8d03350406be706722139005a01160be6f558064239ef6f245b6dbfbb9836899dc72cc1c3106d7900234cabc SHA512 5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3
 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
-EBUILD giflib-5.2.1-r1.ebuild 1877 BLAKE2B 474ceab5ed2fb23b04eee2cd993a6cb7db178426e89740362bbf418479c155a0bcdf2c712a226f9e5cbe4dd7acc653d97ea609ca552fa2b4574340cc8d4087b9 SHA512 4cbfdf5f939135c77c22fec1ea42bb3b8ad8b2d1c83e366f99e6b065d2df508e0bf672816432924e45ec72e857f45536b92f25eb38291e25ec6ac0a8d7914b84
+EBUILD giflib-5.2.1-r1.ebuild 1878 BLAKE2B e7103539564c3e5bb73c45c8da4eb5a935adffd620fa09bddc194d0ec8c8aab67b9021e9dfc749eb93bfa50b56a0e06843a61546b977061fb235f867ed46c553 SHA512 976202963a61f99bfc641e654dfb11a92d68de35028f202b1eda50076a938aa8a56e53454cdd4cd2c9572bb30e88ea78c38630467cf01b162f1c8b0872316668
 MISC metadata.xml 339 BLAKE2B fcc496083e6e0543691af5864bc363ef47c1d155c5499b86c2356b46db7945e146833436577e831d09e3fa0f5405feb29413a5035f3d414a6d377f390bbd58eb SHA512 21b44038fe54a7ec9b6a8e9fd33020b029d0d7cb8f99bd4bf63ec7a59335e9ae70accb9dc224be3569e1a4e7df0c8c2dec3827a0fe5986537a2ac954c2e5c917
diff --git a/media-libs/giflib/giflib-5.2.1-r1.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild
index a64dbd61c8f1..aa570a52f460 100644
--- a/media-libs/giflib/giflib-5.2.1-r1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index a5e16880dcd5..e749ddd7bb3b 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,5 +1,7 @@
 DIST glfw-3.3.2.tar.gz 759972 BLAKE2B a246681d580dd569a045b76db71c18f8dbfacb8483c2d825aa68094d655468d093c52ba3770b2b5d566de62149a775001f5acd7c7539a8235c43e3e9ab58df28 SHA512 f5af749d33b5b900ccf07988ad0bf51bd766a18e4cf2bc2a76020c88e98a2528ff1b965224184fe0d290cfe34b1af1e6f633600660d81194fe354078e2f35c56
 DIST glfw-3.3.3.tar.gz 763713 BLAKE2B bd6202877a3462d717a6d77b6381de704da854df011f7ab5172e626dc46df90793190284241b470a4b78e020302e5dca4051476e092e73e34731f6245a43ea14 SHA512 6d743d89d159bff6c4f7fa3fc5bc407fd728bdc432d76acc4897fd392580be272f8a9d1d7c375c4323e82bf2fd28310e5daab097fef33e8f43b69ce104f9bd31
+DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
 EBUILD glfw-3.3.2.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
 EBUILD glfw-3.3.3.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
-MISC metadata.xml 327 BLAKE2B fd8eb3b2c083a3f02e52ae8290f0e1105847ff17cd052eb0211bd007cddf452f34009ad2eaee0809f90a633e60baf4cd2a47e2184d21f691a16219c409ebc907 SHA512 d9d3fe05c0a07b0e0ea3f49589117dc9e3d7859bb0207dcea3d95451858b040c27bba2eaf422b2dcdc6aa8e08b0147ff32d12fea93b648fd861df0e70960a650
+EBUILD glfw-3.3.4.ebuild 919 BLAKE2B c4e4a3053fe56de47352674c8ac7834b1e45935ed64fa72515e4692e274916d04abc4aaf99a7ca9aaf6ad0d431e71a9f108ea4e78d59ef970e07127dde66e001 SHA512 6923cfb6d28c261e2a0cdb99d330b9266a49a45f57779befd9c74cbd261a0877b0281ed5c72ddc802b707080e32db5ee8563bd4a690cef8b0226a0255e9d3b24
+MISC metadata.xml 388 BLAKE2B 6f83bc48ed7a722cf0b64e450ac3839543db9713d3252c40eab395a54d53b9782e163a3238e6d443c2f8f6c8fd747a273ca018e08918fe084b048821665a8bbe SHA512 47ef3b02e4c8b3a12f328bc227f3ed2196c82e05970a9af12d1988a4466d5b614e0b788914dc03b4325a5cd2d63d93a677b6d093cdd50455c78b3d79c64a5171
diff --git a/media-libs/glfw/glfw-3.3.4.ebuild b/media-libs/glfw/glfw-3.3.4.ebuild
new file mode 100644
index 000000000000..ea8df33cd67c
--- /dev/null
+++ b/media-libs/glfw/glfw-3.3.4.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/glfw/metadata.xml b/media-libs/glfw/metadata.xml
index 19c47b0974ba..6e5bbe581196 100644
--- a/media-libs/glfw/metadata.xml
+++ b/media-libs/glfw/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">glfw/glfw</remote-id>
+		<changelog>https://www.glfw.org/changelog.html</changelog>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/glu/Manifest b/media-libs/glu/Manifest
index 76c3baa7fc2d..c3929920fcba 100644
--- a/media-libs/glu/Manifest
+++ b/media-libs/glu/Manifest
@@ -1,4 +1,4 @@
 DIST glu-9.0.1.tar.xz 434632 BLAKE2B ed624b107a97ac84517cd0fa740090746ab93c77498135bf6dae3ee488e04afc93b0d239aba15533de8ab407d3d3d5e7cb5086b29985d93037e78753b249741e SHA512 8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018
-EBUILD glu-9.0.1.ebuild 1009 BLAKE2B 7341081e9ec058682a78116744e884005a6922f69641bdc90d8d4278916162fabf1a0096825c2ef3bcf55efc6ff4937cb5a3c4d8afcf623d3eb77f1ff0add4d4 SHA512 f056a5959a1c3fffcc1be2e3064d29bc427fdbd3c5a9d3b43b07816a791fc20b99731925c32608faa390e3603807bf231e099ca5edb106f9dff0070ba2c7ba75
+EBUILD glu-9.0.1.ebuild 1010 BLAKE2B 078af9acf532164d49b0a31a3a3da31d6c7ee3dbe696a8113eb29fa0a1943915b0aacaf3d082688c4cb34ef046edd67f8dd9be4ae3517460a9d527b122b08fd7 SHA512 434aceecdf7108304d26b077e50978064471acf01399a72384c0d7e682ee996ba3aca1262a7edd0a82e26525c22798e0c6fce84b2af74cc0f4a1a96c0b9bfc31
 EBUILD glu-9999.ebuild 1010 BLAKE2B 969a6e9217035d36fa73b42e65318961b1f5c2b084d1af7720c0ad0afdba256c2f3bb1dcd88fdfc5e4e53c6b873dc4b69f1c3143e52f1e402d0dc3cc198a0c93 SHA512 5cbfce3faeb61fdfa05a950c78be9c2e60445461e28412f539195372ee0febff5dc7ef72bee80fde822dd6ad38ce2e4a85259882b259717a5021d3756ddc0cb0
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/media-libs/glu/glu-9.0.1.ebuild b/media-libs/glu/glu-9.0.1.ebuild
index f173ada5ae1c..956eacac0623 100644
--- a/media-libs/glu/glu-9.0.1.ebuild
+++ b/media-libs/glu/glu-9.0.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
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${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"
+	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="SGI-B-2.0"
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 9eb2d24ef565..966ce0ba2e6f 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -4,9 +4,11 @@ DIST intel-gmmlib-20.2.2.tar.gz 728309 BLAKE2B 1c26661c5317d66797ca8a72fe910ae73
 DIST intel-gmmlib-20.2.5.tar.gz 728792 BLAKE2B c78cebcfad9f314e3ee298deaa78586cb5c1c8e2e5bba9051a8b17c26001b72aaa675443fcdc9757031977c548a0360e2511bd29873fc7302922b33a2c1a0324 SHA512 354363b0944e4f0e08065fa7a0cb85d477f522858a55f4998a2374ef8e115e331961cc269db886dac3b1e5825d11e036ebc0b4ab65b1618653810e4bfc4751ec
 DIST intel-gmmlib-20.3.2.tar.gz 729059 BLAKE2B 3cc07d9dc07fecd483c35bde41802c8a433a751310fe4d0273625f3a6e245a2dd6e5546b4e5bed40b04b22c4e00a648cce66b221c25da8c6f3f3637a890508bd SHA512 1d8ea369b5b22ca747f8bdaee0be24584b79ccdecaad6c85e5f0a41ac171459261c8c5b220797ffc525e7e29cfa1664f9eaca07f5e72d4a260f327d8980fb2dd
 DIST intel-gmmlib-20.4.1.tar.gz 732088 BLAKE2B 80873ee7a4b7428197352e77b82315068d6217e025b33e719c6fdc24aa4e5f97fe64b290f2d4461bb701eb8c14e747c8eac0b62f226f044f9a7c71de0455dfbd SHA512 a4f6fb8cd3ae2dc837586d6b51495bcceda5d4a9ecaa59fa730d3240a0da359b4449cd9aec96905f7c572f6425cdc19bb419681d99269ca8541542d7abf03c96
-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 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5
-EBUILD gmmlib-9999.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
+DIST intel-gmmlib-21.1.1.tar.gz 737024 BLAKE2B d8a3b3bf1abe7faf7821ca120ebc40e0407dd8edf074ec8a8c05063c3ea48c0b4b33694210562aa4e6bd32fae30f45fcd23b04bb961535ffb10684ff180a9e2d SHA512 06becc986eb04c5243389686121bcc597ab16620fcb47943de14f901938dd906ad884b132da0e46ff939e7e599899d4262006efe19d14b3ed87b6f799ca40787
+EBUILD gmmlib-20.2.2.ebuild 849 BLAKE2B 2cdd2eecc70572bdc19867c91a00c3ee07053877f23b31620fb8e1b8f9036f4b23487e88fa025adf96dd90b121902be81385abb290166df3936ccc21ab8b86e7 SHA512 5b40d4a632ffd9f0e16195e58701b0e5485aeb7e6ae34443295313722522f76f8000b6a0fbc7b6cba4ee8e6c6abb0c6967e9495b0510b7b1a40554eca4d2db02
+EBUILD gmmlib-20.2.5.ebuild 850 BLAKE2B 6ed565043380da387123c75f902c44ee33f82b2b3514768da9c0428dc4cfff894c41603e05b0e7a55d3f5afb5321609808251b1959a130c084415933abc3a84d SHA512 949074be31cf55106b9fb02b0b78ca62b31e47f3d0520b6447b16618f6a686510c385899cac61d886047ccdb5741e7d87ff7d935845251d7b8e5054a5eba4409
+EBUILD gmmlib-20.3.2.ebuild 850 BLAKE2B 6ed565043380da387123c75f902c44ee33f82b2b3514768da9c0428dc4cfff894c41603e05b0e7a55d3f5afb5321609808251b1959a130c084415933abc3a84d SHA512 949074be31cf55106b9fb02b0b78ca62b31e47f3d0520b6447b16618f6a686510c385899cac61d886047ccdb5741e7d87ff7d935845251d7b8e5054a5eba4409
+EBUILD gmmlib-20.4.1.ebuild 986 BLAKE2B 64a5e72660d7d7649fd9246dee574cf86305da9e2ac7ba29d2867588f8edb41fbb95a61379ed9fdd5f66fc55dc9f472215761de7b7100764e0b43fb548839feb SHA512 7bae5f3c22f2e85b4c373e4c08a6a40f1c6dce76e0969d811ff112f72442c6c27c05ef833ac43c56eeea0d59dda5a58e5511e6e2648171a7060822961548a592
+EBUILD gmmlib-21.1.1.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
+EBUILD gmmlib-9999.ebuild 987 BLAKE2B fa9af19564425d1f169068232162c0761bb16b7b5e489af55a0f3282d6e16b78f4022eb76030d62e72197eeeb0e1de9f61fec1bb6d5a8cfc1ebf599b205be893 SHA512 1207e0e79bf790f036d2aea2682f3a01e6d8e8ef629e187e486488835913c5d4995e5baaa4bc9d936fa901605083ff6d1564e681b9f089c3f31cee0ee1218b36
 MISC metadata.xml 504 BLAKE2B 504d2971f8948eda1c88d8e6a2b83651552dbf753e7cc1e0230afd075e49350533f5498405b75ed79e54f793a7a6d72571b83a2ff57222ee3960e496fb5923a7 SHA512 60f62309d8e03e23178486bfe6d3e9b23e472de83b2ae5ea1e44da0a26d56b41c12601d3e164e5d3d33c8cc9873314c35f5892abe4059912c39630c4477289ff
diff --git a/media-libs/gmmlib/gmmlib-20.2.2.ebuild b/media-libs/gmmlib/gmmlib-20.2.2.ebuild
index 1c6172411ec8..0360af62aaac 100644
--- a/media-libs/gmmlib/gmmlib-20.2.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.2.2.ebuild
@@ -31,8 +31,6 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="${DEPEND}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
 )
diff --git a/media-libs/gmmlib/gmmlib-20.2.5.ebuild b/media-libs/gmmlib/gmmlib-20.2.5.ebuild
index 5dae8781fc44..c2ccec30beac 100644
--- a/media-libs/gmmlib/gmmlib-20.2.5.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.2.5.ebuild
@@ -31,8 +31,6 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="${DEPEND}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
 )
diff --git a/media-libs/gmmlib/gmmlib-20.3.2.ebuild b/media-libs/gmmlib/gmmlib-20.3.2.ebuild
index 5dae8781fc44..c2ccec30beac 100644
--- a/media-libs/gmmlib/gmmlib-20.3.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.3.2.ebuild
@@ -31,8 +31,6 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="${DEPEND}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
 )
diff --git a/media-libs/gmmlib/gmmlib-20.4.1.ebuild b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
index daef825f99e2..cd84eca98c8b 100644
--- a/media-libs/gmmlib/gmmlib-20.4.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
@@ -31,8 +31,6 @@ IUSE="test +custom-cflags"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="${DEPEND}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
 	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
diff --git a/media-libs/gmmlib/gmmlib-21.1.1.ebuild b/media-libs/gmmlib/gmmlib-21.1.1.ebuild
new file mode 100644
index 000000000000..4e796e2186d3
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-21.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test +custom-cflags"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TYPE=Release
+		-DBUILD_TESTING=$(usex test)
+		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index 4e796e2186d3..eec88a3a2181 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -31,8 +31,6 @@ IUSE="test +custom-cflags"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="${DEPEND}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
 	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
diff --git a/media-libs/gmtk/Manifest b/media-libs/gmtk/Manifest
index cccd832f9f1e..9a543b9317ef 100644
--- a/media-libs/gmtk/Manifest
+++ b/media-libs/gmtk/Manifest
@@ -1,3 +1,3 @@
 DIST gmtk-1.0.9.tar.gz 411609 BLAKE2B 6c5c7b3390a3d7ab6593484247447f1016475b5f785cb7cf77810aac37034ce704286e9512cc5d091a04ae6362f8a0634db21599ff6bb78141aa3c5a5405db9d SHA512 61da4bbba5b74510c5ad5d6b5e10606fb99f54732cf412aa6245add2dc2b0df12b75e4e6f1474b4cab0541063ba6f95893e366f1c8b52a055521b667c182dcdf
-EBUILD gmtk-1.0.9.ebuild 1016 BLAKE2B 0f3ad5d4f7326bbbbac3579f920dd606d59ad762c47228f4563e6d40634b841136dcef32fd38bb89ad02f3a49aa3ea86ae726b20d410aebb702ba0e7e1d90540 SHA512 d756b97726b63bbeb8c57b3471b13479ebb41378abbb08575d69d354766d04b47c5ae640f59011a4d166f90004d5e85ab1e72031b0ec4d4f890b2dbe7a5e3c6a
+EBUILD gmtk-1.0.9.ebuild 1009 BLAKE2B 3277bb3ed10993193dc9078a9b8303dd076013e41d2215e07630ff5ead8044c7a063875c5c32f4535e0919bfd6e6df3b8fbced316e123a503620519389e85e95 SHA512 b73b59913ae67befc9f44d5b6bd2d73b4adb00a77e15cd80322acc63f00ce7d1bff3b4b158512ac113e53b984799e594e95987f03afd578ae449febcfeb07526
 MISC metadata.xml 321 BLAKE2B 9ee0f6f0335977fcf934de319b5c6b43c490de8c6e2e84563e962f10bf781186b04a1db77d420f2c13782723eec266b1b150b2bf72d96c55edc5aee6b4b5aa88 SHA512 e89aecb354cbcd3e1df953d02b20ade390b417179779efc7f8e5d3753a583502bb87637f26b205c883abbfca8022fe4f9119e7129f2599aaf5a434e974bc8247
diff --git a/media-libs/gmtk/gmtk-1.0.9.ebuild b/media-libs/gmtk/gmtk-1.0.9.ebuild
index 46de70dc1f94..5d4b524780fc 100644
--- a/media-libs/gmtk/gmtk-1.0.9.ebuild
+++ b/media-libs/gmtk/gmtk-1.0.9.ebuild
@@ -1,8 +1,8 @@
-# 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
+inherit ltprune
 
 DESCRIPTION="GTK+ widget and function libraries for gnome-mplayer"
 HOMEPAGE="https://code.google.com/p/gmtk/"
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 3e6403ced7d5..54e42da3836d 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,4 +1,5 @@
 DIST graphene-1.10.2.tar.xz 292372 BLAKE2B 94553a32dc57216402a9676e11525552c010d970caeb1256dde50ca842b4d673ad78d004d57e7c7a017b8c6e64ad75fc3b03603cba746027ab10befa76d32955 SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0
-EBUILD graphene-1.10.2-r1.ebuild 1705 BLAKE2B 4ff0ca9ec420607e1b197aea11e6a356ee3aff3fc891f18dae8b2c3a29075a00f4a69a0c2f09aa18863a25db1e509c2ba93faf470bd154416167bb4110a6b296 SHA512 4b3e28e4363e730277bf45104a362f91bc26ece330364a9fcde0fc876764af203fee5e2bdb8e567973c0d8f09b25335d6f78683f1d9ecc4f2467d7a19905c554
-EBUILD graphene-1.10.2.ebuild 1699 BLAKE2B dbfa70bea4f57e2d759cbe4bcbd43d381e485f6fffce1dc412c3d0bd9e51888138afceb49597067bf34aec9f244d941aea64c09c27d693e2367ba5ddd7a5808f SHA512 31368e60b6c0c4b44435e5972352de0748536be54a343b919b0fd4b615cae966ca106b667d9e39c95656866d340226df06cfc2d1e88206099d98059cc7d029f3
+DIST graphene-1.10.6.tar.xz 333332 BLAKE2B d353efb22510b78c7360b748b7e83237309b88c170909e521d50e95618e907bd8b2424c3583a5db3ff2ca57954bf793646a69251bbb31caac55155c15981ed3a SHA512 075e8c712509655d0614258a7fd2943e67a9642334cdabdc15d2489a88c961e278f7464a513080cd287f5371c7ece8ceb7565d1718a8b71fea4a4977f82aeb72
+EBUILD graphene-1.10.2-r1.ebuild 1700 BLAKE2B fd3a7f8f0b1a29113829c80a358b3e37ea268febb1159d89a5c13c2bd7941d93892720aa05a234c342e74de29ad964a34f59c69ece15f1be683480f6afe12eb7 SHA512 4ebde609e453675b004b2a6d75172cb65040e72234fd021853739ee05d2e7a52d1545d0f50dc261e0ae23d5f3f45e942eea156bedbb14a5778596c670847fcc5
+EBUILD graphene-1.10.6.ebuild 1715 BLAKE2B 39b4ec66698dc5dafc94470143325b90c84e779c1db4ece36fde40a4af1aa7ddedb1851f2c899b07a9e52a83897dbdc503aa2511abc6004d005b9fea37022c27 SHA512 85167c061fe4841016c6144afe8c7e9443ecefedb56b2f105c97699543f23b007a0643b6efe7fe05fd2ef1b598ce45549626fa730ab3b30b6ebf1882a8556c7b
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.10.2-r1.ebuild b/media-libs/graphene/graphene-1.10.2-r1.ebuild
index 0e8e63c01e29..cc8be3fb7ec1 100644
--- a/media-libs/graphene/graphene-1.10.2-r1.ebuild
+++ b/media-libs/graphene/graphene-1.10.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 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="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/graphene/graphene-1.10.2.ebuild b/media-libs/graphene/graphene-1.10.6.ebuild
index bb80f5eb2d54..74cf717498d6 100644
--- a/media-libs/graphene/graphene-1.10.2.ebuild
+++ b/media-libs/graphene/graphene-1.10.6.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..9} )
 inherit xdg-utils meson multilib-minimal python-any-r1
 
 DESCRIPTION="A thin layer of types for graphic libraries"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 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="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 RESTRICT="!test? ( test )"
 
@@ -24,8 +24,10 @@ DEPEND="${RDEPEND}"
 # Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup, as meson uses it too anyway
 BDEPEND="
 	${PYTHON_DEPS}
-	doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
 	virtual/pkgconfig
 "
 
@@ -34,7 +36,7 @@ multilib_src_configure() {
 	local emesonargs=(
 		-Dgtk_doc=$(multilib_native_usex doc true false)
 		-Dgobject_types=true
-		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
 		-Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
 		$(meson_use cpu_flags_x86_sse2 sse2)
 		$(meson_use cpu_flags_arm_neon arm_neon)
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index b8a8340ef9e2..4bcb2428d25e 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,3 +1,5 @@
 DIST grilo-0.3.12.tar.xz 234340 BLAKE2B dd9f2558dee73080d87a98209816ca79a13fee4934a9e456190616e11565095e3c08e64f3ccec30e3bb7a102a9e23c25ba32a95f963676516a354a785bd6bdd6 SHA512 c0badc4b3f96efa04e6f3b5f32b2322855d9a660f748ce68012d266a6f5936f850bd63e559c782ae02ee24ba282c3b3882c6b8fae99019b913d74ff927a31017
+DIST grilo-0.3.13.tar.xz 236420 BLAKE2B 8f891507edce92bccbc12aa9ecce78e8bd0804e548deec9a3651a656a27e9e87156e8cd7e1959a662c23e16fe958ff09f95755f825116f785784271883579dfc SHA512 b229b9b7524c1be63ed8891a9438844ebb87013074b394330f25316feb015040b304cd98bf3c89dc3248e6898c587a5e51666776a5b4ba5026a80ee8ad3e6d01
 EBUILD grilo-0.3.12.ebuild 2177 BLAKE2B 83c6a3c6ef688d089661f0c57b84f886746411dab7a5b4d1ccd6ef18686f83676b82228aee7a9eaae30292afec7d83b66bc5f67413432cf707306f5eda1368b3 SHA512 c6a49bd755af487c317d9177a914e029b3945f1cea6439cf40473219373a9e06bdc22afed9c03ff7362536e15f8e0698abe73c304e27adf4a8c4248882f2c94b
+EBUILD grilo-0.3.13.ebuild 2164 BLAKE2B a410bc714f34ad9b0c7eeaee99c71ee6d2caaa141e5a3ad6edd8ca4b0839d7c29dea01d42de8f64b2eb32250bac1321386871dfb855d8dfc55f7b94c36027578 SHA512 0be573f9c1e45900f0aeb58f98548a003d5a820f21a015c411e1ef121194f023a7f4a02768a54486b7ca7a41398cab74f463dda24d81f738d72e897d9b644df4
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.13.ebuild b/media-libs/grilo/grilo-0.3.13.ebuild
new file mode 100644
index 000000000000..954cedfd8939
--- /dev/null
+++ b/media-libs/grilo/grilo-0.3.13.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk gtk-doc +introspection +playlist test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.41.3:2.4[introspection?]
+	playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+
+	gtk? (
+		net-libs/liboauth
+		>=x11-libs/gtk+-3.14:3
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.3
+	)
+	${PYTHON_DEPS}
+	test? ( sys-apps/dbus )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
+	sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
+	sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
+
+	# Drop explicit unversioned vapigen check
+	sed -i -e "/find_program.*vapigen/d" meson.build || die
+
+	# Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
+	sed -i -e "/subdir('examples')/d" meson.build || die
+
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable-grl-net=true # Fails to build
+		$(meson_use playlist enable-grl-pls)
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk enable-test-ui)
+		$(meson_use vala enable-vala)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 50fbc340c8aa..446228cd1e5c 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -2,5 +2,5 @@ AUX hamlib-3.3-format-security.patch 738 BLAKE2B 896d6023f68979400ba8782956da86b
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
 DIST hamlib-4.1.tar.gz 2260629 BLAKE2B e53249f476005f3ec8afcbba6d875d913cdc45eb741fdb8b8718c1c5bda9cf8d50087165b72055600bc9ff364117f7d72235a3d68a9fb0882a77a6fdbf366605 SHA512 a5fca5dc89a7408628bc77fe22c6d8c77474b3dabee7b2b6d0b280becb6cb63f5619e4a620ad11aeb81b8412145b0f8cb0291a2d4cd3751c643cb1709b2dfa78
 EBUILD hamlib-3.3-r1.ebuild 2095 BLAKE2B fc8447042f8dfdaaf44a3a41bb6d0421fe16d6e7931d3f45bf2e583e1b086d4df69fc13eb2f936d736ba9099eaee3a3c1c83b6e61d91e05e1f5c85810edb65f9 SHA512 bdc9205557895c1b91ac3cdd740ac558f6e5b665f863e362c24a1cfa54770c631c8c469f9c70f466753a426aca4f1d873ac2c6a5b7244eaf6d9a5103814b99e7
-EBUILD hamlib-4.1.ebuild 2059 BLAKE2B a3995c0df56ea1749eba18d5baa69d539297cd6dbdd809a61adbc3eb0da8c6a7a1a7dca06c7d98c7573ca4883f2487f4e7d1c77cf0ce6d08e9b615573fce7c3a SHA512 ebe679507cb0640baaa69571105c2a3b8fb064073ecfd1a23499d8b86cff920d8ed7502e9125b27c8e9196dcf393d255474df1afdf9f34dde26b40911486545f
+EBUILD hamlib-4.1.ebuild 2057 BLAKE2B cfc7560c85e7c826ffe23a87393a1eafc96805d5a2c0efd40ac538869bf5b66fe9ede92f3317421e5f84e516bc1556c52d4584df264f1dbc050b58a2fc37e5e4 SHA512 8fc1a8b6ce0943fcb8f53b341e39fd927fe108001f59e89ff45dd036c1213697a3044becf1ecf0ae821e17f45d629e2b0f235a45e57567171a83646fa78e7853
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-4.1.ebuild b/media-libs/hamlib/hamlib-4.1.ebuild
index 0e74ee1e6b9a..c8e30755a905 100644
--- a/media-libs/hamlib/hamlib-4.1.ebuild
+++ b/media-libs/hamlib/hamlib-4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 505bf5145c21..3e4e53978a2c 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,8 +1,4 @@
-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.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.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
-EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290
 EBUILD ilmbase-2.5.5.ebuild 1069 BLAKE2B ac5419454146e4df6f7d22c3ef83765261e0638951f76e8f9928010be9a6c1e6b142ff4761afefc2a665d50d5f981aa55839410a627b4b1bcf4c6a5ca4612d9c SHA512 1a5ca247caa34c8d0551be377e3bef91d4ec8fa5c02aeea0102ea8d867f396211f6d23b4598a9064042f9a42f26f6c01f9dc9e130de3b3ab283ad425faa43001
 MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6
diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch
deleted file mode 100644
index 214285293910..000000000000
--- a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch
+++ /dev/null
@@ -1,214 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -15253,7 +15253,7 @@ else
- fi
- 
- 
--if test "${cxxstd}" == 17 ; then
-+if test "${cxxstd}" = 17 ; then
-       ax_cxx_compile_alternatives="17 1z"    ax_cxx_compile_cxx17_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -16966,7 +16966,7 @@ $as_echo "$as_me: WARNING: C++17 is not
- 
- 	CXXFLAGS="$CXXFLAGS -std=c++17"
- else
--  if test "${cxxstd}" == 14 ; then
-+  if test "${cxxstd}" = 14 ; then
-         ax_cxx_compile_alternatives="14 1y"    ax_cxx_compile_cxx14_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -17874,7 +17874,7 @@ $as_echo "#define HAVE_CXX14 1" >>confde
- 
-   	CXXFLAGS="$CXXFLAGS -std=c++14"
-   else
--    if test "${cxxstd}" == 11 ; then
-+    if test "${cxxstd}" = 11 ; then
-         ax_cxx_compile_alternatives="11 0x"    ax_cxx_compile_cxx11_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -18542,7 +18542,7 @@ $as_echo "#define HAVE_CXX11 1" >>confde
- 
-       CXXFLAGS="$CXXFLAGS -std=c++11"
-     else
--      if test "${cxxstd}" == 03 ; then
-+      if test "${cxxstd}" = 03 ; then
-         $as_echo "#define ILMBASE_FORCE_CXX03 1" >>confdefs.h
- 
-         CXXFLAGS="$CXXFLAGS -std=c++03"
-@@ -21827,11 +21827,11 @@ $as_echo "#define HAVE_CXX17 1" >>confde
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&5
- $as_echo "$as_me: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&2;}
- 
--        if test "$HAVE_CXX14" == 1 ; then
-+        if test "$HAVE_CXX14" = 1 ; then
-   	      CXXFLAGS="$CXXFLAGS -std=c++14"
-           cxxstd = 14
-         else
--          if test "$HAVE_CXX11" == 1 ; then
-+          if test "$HAVE_CXX11" = 1 ; then
-   	        CXXFLAGS="$CXXFLAGS -std=c++11"
-             cxxstd = 11
-           fi
-@@ -22768,7 +22768,7 @@ LIB_SUFFIX=""
- lib_suffix_valid="no"
- 
- lib_namespace=""
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
-     cat >>confdefs.h <<_ACEOF
- #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API}
- _ACEOF
-@@ -22787,7 +22787,7 @@ _ACEOF
-     lib_namespace="${ILMBASE_VERSION_API}"
-     LIB_SUFFIX="${ILMBASE_VERSION_API}"
-     lib_suffix_valid="yes"
--elif test "x${library_namespace_versioning}" == xno ; then
-+elif test "x${library_namespace_versioning}" = xno ; then
-     cat >>confdefs.h <<_ACEOF
- #define IMATH_INTERNAL_NAMESPACE Imath
- _ACEOF
-@@ -22823,7 +22823,7 @@ _ACEOF
- fi
- 
- 
--if test "x${lib_suffix_valid}" == xyes ; then
-+if test "x${lib_suffix_valid}" = xyes ; then
- LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
- 
-  if true; then
-@@ -22858,7 +22858,7 @@ else
- fi
- 
- 
--if test "x${custom_public_namespace}" == xyes ; then
-+if test "x${custom_public_namespace}" = xyes ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5
- $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;}
-     $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h
-@@ -22870,7 +22870,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
- 
-     public_namespace=""
-     custom_public_namespace=no
--elif test "x${custom_public_namespace}" == xno ; then
-+elif test "x${custom_public_namespace}" = xno ; then
-     $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h
- 
-     $as_echo "#define IEX_NAMESPACE Iex" >>confdefs.h
-@@ -22912,12 +22912,11 @@ fi
- 
- 
-   if test "${osx_arch}" != default ; then
--          osx_arch_flags="-arch ${osx_arch// / -arch }"
-+     osx_arch_flags=$(printf ' -arch %s' ${osx_arch})
-      CXXFLAGS="$CXXFLAGS $osx_arch_flags"
- 
-           if test "$enable_dependency_tracking" != no ; then
--        osx_arch_array=( ${osx_arch} )
--        if test ${#osx_arch_array[@]} -gt 1 ; then
-+	if echo "$osx_arch" | grep >/dev/null " " ; then
-           as_fn_error $? "building multiple OS X architectures requires --disable-dependency-tracking.
- Please re-run configure with these options:
-   --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,19 +45,19 @@ AC_ARG_ENABLE(cxxstd,
-                              [enable ISO c++ standard 11/14 [[default=auto]]]),
-               [cxxstd="${enableval}"], [cxxstd=14])
- 
--if test "${cxxstd}" == 17 ; then
-+if test "${cxxstd}" = 17 ; then
-     AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
- 	CXXFLAGS="$CXXFLAGS -std=c++17"
- else
--  if test "${cxxstd}" == 14 ; then
-+  if test "${cxxstd}" = 14 ; then
-       AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
-   	CXXFLAGS="$CXXFLAGS -std=c++14"
-   else
--    if test "${cxxstd}" == 11 ; then
-+    if test "${cxxstd}" = 11 ; then
-       AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
-       CXXFLAGS="$CXXFLAGS -std=c++11"
-     else
--      if test "${cxxstd}" == 03 ; then
-+      if test "${cxxstd}" = 03 ; then
-         AC_DEFINE(ILMBASE_FORCE_CXX03)
-         CXXFLAGS="$CXXFLAGS -std=c++03"
-       else
-@@ -65,11 +65,11 @@ else
-         AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
-         AX_CXX_COMPILE_STDCXX([14], [noext], [optional])
-         AX_CXX_COMPILE_STDCXX([17], [noext], [optional])
--        if test "$HAVE_CXX14" == 1 ; then
-+        if test "$HAVE_CXX14" = 1 ; then
-   	      CXXFLAGS="$CXXFLAGS -std=c++14"
-           cxxstd = 14
-         else
--          if test "$HAVE_CXX11" == 1 ; then
-+          if test "$HAVE_CXX11" = 1 ; then
-   	        CXXFLAGS="$CXXFLAGS -std=c++11"
-             cxxstd = 11
-           fi
-@@ -212,7 +212,7 @@ lib_suffix_valid="no"
- dnl Internal library namespace
- dnl 
- lib_namespace=""
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
-     AC_DEFINE_UNQUOTED(IMATH_INTERNAL_NAMESPACE,     Imath_${ILMBASE_VERSION_API})
-     AC_DEFINE_UNQUOTED(IEX_INTERNAL_NAMESPACE,       Iex_${ILMBASE_VERSION_API})
-     AC_DEFINE_UNQUOTED(ILMTHREAD_INTERNAL_NAMESPACE, IlmThread_${ILMBASE_VERSION_API})
-@@ -221,7 +221,7 @@ if test "x${library_namespace_versioning
-     lib_namespace="${ILMBASE_VERSION_API}"
-     LIB_SUFFIX="${ILMBASE_VERSION_API}"
-     lib_suffix_valid="yes"
--elif test "x${library_namespace_versioning}" == xno ; then
-+elif test "x${library_namespace_versioning}" = xno ; then
-     AC_DEFINE_UNQUOTED(IMATH_INTERNAL_NAMESPACE,     Imath)
-     AC_DEFINE_UNQUOTED(IEX_INTERNAL_NAMESPACE,       Iex)
-     AC_DEFINE_UNQUOTED(ILMTHREAD_INTERNAL_NAMESPACE, IlmThread)
-@@ -238,7 +238,7 @@ else
- fi
- AC_SUBST(LIB_SUFFIX)
- 
--if test "x${lib_suffix_valid}" == xyes ; then
-+if test "x${lib_suffix_valid}" = xyes ; then
- AC_SUBST(LIB_SUFFIX_DASH,"-${LIB_SUFFIX}")
- AM_CONDITIONAL(LIB_SUFFIX_EXISTS,true)
- else
-@@ -257,7 +257,7 @@ AC_ARG_ENABLE(customusernamespace,
-         [custom_public_namespace="${enableval}"], 
-         [custom_public_namespace=no])
- 
--if test "x${custom_public_namespace}" == xyes ; then
-+if test "x${custom_public_namespace}" = xyes ; then
-     AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to default])
-     AC_DEFINE(IMATH_NAMESPACE,     Imath)
-     AC_DEFINE(IEX_NAMESPACE,       Iex)
-@@ -265,7 +265,7 @@ if test "x${custom_public_namespace}" ==
- 
-     public_namespace=""
-     custom_public_namespace=no
--elif test "x${custom_public_namespace}" == xno ; then
-+elif test "x${custom_public_namespace}" = xno ; then
-     AC_DEFINE(IMATH_NAMESPACE,     Imath)
-     AC_DEFINE(IEX_NAMESPACE,       Iex)
-     AC_DEFINE(ILMTHREAD_NAMESPACE, IlmThread)
-@@ -296,14 +296,12 @@ case "$host" in
- 	      [osx_arch="${enableval}"], [osx_arch=default])
- 
-   if test "${osx_arch}" != default ; then
--     dnl Replace "a b c" with "-arch a -arch b -arch c". Should probably use an all-whitespace regexp rather than a single character for the search string.
--     osx_arch_flags="-arch ${osx_arch// / -arch }"
-+     osx_arch_flags=$(printf ' -arch %s' ${osx_arch})
-      CXXFLAGS="$CXXFLAGS $osx_arch_flags"
- 
-      dnl If multiple archs specified, make sure that --disable-dependency-tracking was also specified
-      if test "$enable_dependency_tracking" != no ; then
--        osx_arch_array=( ${osx_arch} )
--        if test ${#osx_arch_array[@]} -gt 1 ; then
-+	if echo "$osx_arch" | grep >/dev/null " " ; then
-           AC_MSG_ERROR([building multiple OS X architectures requires --disable-dependency-tracking.
- Please re-run configure with these options:
-   --enable-osx-arch="${osx_arch}" --disable-dependency-tracking
diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch
deleted file mode 100644
index 8211846b09b6..000000000000
--- a/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Subject: testBox: allow fuzzy comparison of floats, doubles
-From: Steven Chamberlain <steven@pyro.eu.org>
-Date: Wed, 24 Feb 2016 01:10:11 +0000
-
-Allow for inexact values, as long as the error is smaller than the
-epsilon of the data type.
-
-On 32-bit x86, allow even greater discrepency at double
-precision, due to possible double-rounding.  See
-https://lists.nongnu.org/archive/html/openexr-devel/2015-12/msg00001.html
-
-Index: ilmbase/ImathTest/testBox.cpp
-===================================================================
---- ilmbase.orig/ImathTest/testBox.cpp
-+++ ilmbase/ImathTest/testBox.cpp
-@@ -47,6 +47,58 @@ using namespace IMATH_INTERNAL_NAMESPACE
- 
- namespace {
- 
-+template <class T>
-+bool
-+approximatelyEqual (const T &p1, const T &p2)
-+{
-+	/* int and short should be exact */
-+	return (p1 == p2);
-+}
-+
-+bool
-+approximatelyEqual (const Vec2<float> &p1, const Vec2<float> &p2)
-+{
-+    float e = limits<float>::epsilon();
-+    float m = 0;
-+
-+    for (int i = 0; i < 2; ++i)
-+    {
-+	m = max (m, abs (p1[i]));
-+	m = max (m, abs (p2[i]));
-+    }
-+
-+    for (int i = 0; i < 2; ++i)
-+	if (!equalWithAbsError (p1[i], p2[i], m * e))
-+	    return false;
-+
-+    return true;
-+}
-+
-+bool
-+approximatelyEqual (const Vec2<double> &p1, const Vec2<double> &p2)
-+{
-+#if defined(__i386__) || defined(_M_IX86)
-+    /* double-rounding on 32-bit x86 may cause larger error:
-+       use epsilon of float rather than double */
-+    double e = limits<float>::epsilon();
-+#else
-+    double e = limits<double>::epsilon();
-+#endif
-+    double m = 0;
-+
-+    for (int i = 0; i < 2; ++i)
-+    {
-+	m = max (m, abs (p1[i]));
-+	m = max (m, abs (p2[i]));
-+    }
-+
-+    for (int i = 0; i < 2; ++i)
-+	if (!equalWithAbsError (p1[i], p2[i], m * e))
-+	    return false;
-+
-+    return true;
-+}
-+
- //
- // Test case generation utility - create a vector of IMATH_INTERNAL_NAMESPACE::Vec{2,3,4}
- // with all permutations of integers 1..T::dimensions().
-@@ -250,7 +302,8 @@ testExtendByPoint(const char *type)
-                               
-         IMATH_INTERNAL_NAMESPACE::Box<T> b;
-         b.extendBy(p);
--        assert(b.min == p && b.max == p);
-+        assert (approximatelyEqual (b.min, p));
-+        assert (approximatelyEqual (b.max, p));
-     }
- 
-     //
-@@ -283,7 +336,8 @@ testExtendByPoint(const char *type)
- 
-             b.extendBy(p);
- 
--            assert(b.min == min && b.max == max);
-+            assert (approximatelyEqual (b.min, min));
-+            assert (approximatelyEqual (b.max, max));
-         }
-     }
- }
-@@ -358,7 +412,8 @@ testExtendByBox(const char *type)
-             }
-             b.extendBy(IMATH_INTERNAL_NAMESPACE::Box<T>(p0, p1));
- 
--            assert(b.min == min && b.max == max);
-+            assert (approximatelyEqual (b.min, min));
-+            assert (approximatelyEqual (b.max, max));
-         }
-     }
- }
diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
deleted file mode 100644
index e994e236f280..000000000000
--- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/24" # based on SONAME
-KEYWORDS="amd64 -arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.0-testBox.patch
-	"${FILESDIR}"/${PN}-2.3.0-fix-bashisms.patch
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
-
-multilib_src_configure() {
-	# Disable use of ucontext.h wrt #482890
-	if use hppa || use ppc || use ppc64; then
-		export ac_cv_header_ucontext_h=no
-	fi
-
-	ECONF_SOURCE=${S} econf "$(use_enable static-libs static)"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides pkg-config files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 40c0db8450ba..e31e6f7fce26 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,5 +1,5 @@
 DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f SHA512 0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
 DIST imlib2-1.7.1.tar.bz2 893631 BLAKE2B 637bf70ea223a63c51def0fac4102683a090de41a1f5904d6232fd2fa004915e3dcde54eac51d16532d2df83a0f8df127266766ac3700ae2948d39fefef512b8 SHA512 36e457855da0f129c7e7ba3dfcb44162b6624b1d56df5f84448495a96fe9ad1ce3e6c628222630be7274476722c4feaa8e1648d1e463439ca758e66ce9645970
-EBUILD imlib2-1.6.1.ebuild 2265 BLAKE2B c17d5006217501fb09a9a830dfa28701619acedbdcffde6554234ad0bf330cc7975f7866f3cb651cf82c736d0aca4c5b167cf39381d952028903861160fb9788 SHA512 63499f3825fbc49a74f0218d306e1691e0a9ca5fa908369ce250852dcd0a5d98d760cf2d9f1d07b33fb5e87205010412bb08919cb48a9c28e3d759c772e2a754
+EBUILD imlib2-1.6.1.ebuild 2266 BLAKE2B c9517679b79b2faff8c2da3fec6e5113c5ed1b83303ffcf4e71c0084b60bca13a29f2a913d1cd9911d0f27e1c431bcd5204688e83710bfe9a26c27792f96907d SHA512 5a2a8c8d0858da0617cfe7814e7ae15fdae1a733ed71da6230c197bc47cf2fbf915e38b21296b49414a27f374209175a9465db6f44542eacaf131c1a9007b1f2
 EBUILD imlib2-1.7.1.ebuild 2274 BLAKE2B 1ed206c08e47ee8221f809afdcbdf3771536f732436968f7084c15f97f10bc0858e08aa2a38084e2d33f34747e9bb0e44a2c5321ecd3139c5683c77d6222890d SHA512 7568e4b5ed75184c64da376377a736420f311ffbec252081f14be3bdeee62f64314a7a9932ecf4741ae014eeac313b4f73c8c792fbfac39c25d871939d10350a
 MISC metadata.xml 3007 BLAKE2B df2f5a1a31aaf3f2a9535869ce159ba896d0a2f6c4b079815e08cb61444889627463663eb0226929c7f9cbc081b44aed251de5feefa2e33306ea3daf6aff987b SHA512 773c6756e2fd5bfd63a47bfa702f306e20d12f368fd6f675cd0df835783db934608052426ab2cfd11f3cafc52c2e5be911b37367283f686a85c2edae49ca0274
diff --git a/media-libs/imlib2/imlib2-1.6.1.ebuild b/media-libs/imlib2/imlib2-1.6.1.ebuild
index 26f1343b243c..f34224e684a1 100644
--- a/media-libs/imlib2/imlib2-1.6.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png +shm
 	static-libs +tiff +webp zlib"
 
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 661a1c843d58..7a0e47e4af99 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,6 +3,6 @@ AUX jbig2dec-0.18-overflow-IAID.patch 1285 BLAKE2B d2733f588b57af91ea40844750a88
 DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f831288b27df09bb19dec2f84854cf7fea50b5b041d331e925145f37f2f89848058ecdc074e7d6c238033f SHA512 382890b36345b8aaebb3554e776a53f3276c6d835335ce41f3f41829ff62bba7ae646602544103ba8541a7a824dca92d682b682c254ab2918c7fe45b3e358b45
 DIST jbig2dec-0.18.tar.gz 148563 BLAKE2B a864fd5b00abca3ae0f847c1d8fd537d92d68a3c042c851b6bebd51bb674f5bc4a36811f2b4fd7753db4d3641e544e03ec184cb90d43da0247d8affd7cf62c11 SHA512 5931530ee3b811f9009c95d08ad65701564ef8ebf6511145acb969cc7c99dab5028daaee580dd83358b6bdc477cffe347712b9c9768c9b1a63395e366046267d
 DIST jbig2dec-0.19.tar.gz 149134 BLAKE2B 576f3a516499b6291d25dfdefe5af62899665167526dca11435bc07e04a3feb707f82d3a8bdda774f5cfe0d792c3147e77aa94fa57feac25ba1c0a7805c5fc58 SHA512 d5a27951cc9c06c184f454e258e81b6e4d5aa2742a4da821522b9a42ecc78e7e1b78058dabc23821618e62d62d8832011f16b5ef2d66beac463da6b809fd02af
-EBUILD jbig2dec-0.18.ebuild 1633 BLAKE2B 672a30af0230c0efb61ce3cb2ad47457cbf29bf1f9a2009abe9dedc2a708bcc1dfd290a56c24dab4e02c0e21e5060098063afdd225bdeaef58309add0788d8c2 SHA512 05677f6df48371a4426688465520a5acaa168882bf31ed66672575f7f7c8c70af56bb85454ba51ee2540dcae12d81930a1d2256f0fb5501bb3ecc6e699577f80
+EBUILD jbig2dec-0.18.ebuild 1634 BLAKE2B a6c9d3294d324668c0963ffa18501c7793e333e2bd267b6ee491cfc44138552b3f21c7d56967627d9a0df79a6e3bacda6978cc50bc2cb97cdf81f37229fe9082 SHA512 300f0308ea4996d2b19723211f67d0f4e5a146eaefd7ea33736829e93123ff5fa299f7af53251fa9f8f14d84afe2d2a30ebf8a24d7c083b7161b706871ddf3c1
 EBUILD jbig2dec-0.19.ebuild 1540 BLAKE2B 191e2b7d2482955f238347b3fa7c4ad4ea8df655e7fac471013e630faa10e658fe0878db08af96e1537e551a10ad3b74f3d610106ff3172068695c3a524481d0 SHA512 9cbe37546c37d875cdf394ae4cf526f6810337dec4b08b1fe972e103f7b20d5cfd4b3c0e1973263f577418f57ce6d881de5ae9bf5dbca4f39ce0733b48b6b927
 MISC metadata.xml 347 BLAKE2B 6c6d66bb933731270b688e7f0d9174f3cac5e697d30af47398425b7f3789e6960f87a67c192d931603c0120622839a92ad93bb6154c1ceecf07ba2827488f001 SHA512 7472b2c0abdc9db46fc886ba58d9c9daf16efc76d306087b4ccec7bffdb1ddf034f433ede85681a7bb2b87d7959f7eef557743c9fbde7891efd4e3c5058aeda7
diff --git a/media-libs/jbig2dec/jbig2dec-0.18.ebuild b/media-libs/jbig2dec/jbig2dec-0.18.ebuild
index 85b3fddff201..fd2742d804a1 100644
--- a/media-libs/jbig2dec/jbig2dec-0.18.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)" #698428
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/jbig2enc/Manifest b/media-libs/jbig2enc/Manifest
index 00fb81841ef8..4cd252dbb771 100644
--- a/media-libs/jbig2enc/Manifest
+++ b/media-libs/jbig2enc/Manifest
@@ -2,5 +2,5 @@ AUX jbig2enc-0.28-leptonica-1.70.patch 1681 BLAKE2B 78de2dd85258d277114c9fdd60e5
 DIST jbig2enc-0.28.tar.gz 39879 BLAKE2B 08cbb2f2a5277085a592d18a8db529d2e5f79f69eaa5392f2b06b920f7d1651c3c73795ba2e43ae843fd5720a1406633b5429ab0b1fe260a6308da4cf10868b9 SHA512 81d194fb648fe7a866302796fd5e2adbb213d52193a279a94dbc5918ce3480561ea204e8497125eed5d6c6e4c6d089f7f35a89ef98bc484ca753ffde23e444c6
 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
+EBUILD jbig2enc-0.29.ebuild 915 BLAKE2B c2e09ca59d82f397001b3722705172515668bcec04e03c7c77d96c94fd82e68cc21e241e71e81403fc80cc36abb17c6b932616969947b54e3392a0c66dafb18e SHA512 ab72905e573cd778de1d8437d37ae2aa9140280e1d7fdd1a29c8b078589794b79be7ef20aaf900981b3f39de05a025273633fb9c3cb0673576fdf7c85b55f1ab
 MISC metadata.xml 324 BLAKE2B 6b82651c0b2513c62e014a8fd6f931c7edc95c84ed88dcd9fa18396a8ec59306c3bb4a08914dbae815530b031f3b66c97d909da57ba4a6d13177a44e226345d4 SHA512 6a6bdbd18023007787f6790a5004e782c4fd136c64aeb261655f743fd8619b35d280e74e806540156e3ac75ed15cf7053fefffd298b119a43cf430e57d1384be
diff --git a/media-libs/jbig2enc/jbig2enc-0.29.ebuild b/media-libs/jbig2enc/jbig2enc-0.29.ebuild
index 632ea5cccd30..272370bdf537 100644
--- a/media-libs/jbig2enc/jbig2enc-0.29.ebuild
+++ b/media-libs/jbig2enc/jbig2enc-0.29.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86 ~ppc-macos"
 IUSE="gif jpeg png tiff webp"
 
 RDEPEND="media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]"
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 47445caea970..4672913344a8 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,4 +1,4 @@
 AUX jbigkit-2.1-build.patch 8829 BLAKE2B f50d73770d13dff06f2627026f2b2d75bb5d4ef5cc7c4785f0b31e83c5a5057371b4334c0ae6b39fa49a1f1e46ca4db711e0d92cbe275093a228471eb90302c4 SHA512 2cdf2f93c91835880166198a1eed0e2f6438c52f4f7ee5f4370ac417613f7425f0db3420e44f8afe384867d330ee6433a14d9e12a5f6e0143f7311f9255aa926
 DIST jbigkit-2.1.tar.gz 438710 BLAKE2B 7bd82f0e10a2d3794739ee85b77c5407d58753a00e014e937735f9af3043347de88a6e567609bc26de488887a6d61b0a162387fb72732b9be7e550e3f9b9539e SHA512 c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
-EBUILD jbigkit-2.1.ebuild 1367 BLAKE2B 1a87e64bb111bd0c8523f3e946949d5a7a82437f0a05e84a1630da691eac182fa33d4c11cf413b2eebe377520710009cfb4805cac233369c6d393ee74da4e6ea SHA512 4b1776141a70b5664e4e676102e44df5ca54ae4011c546a70316aa6811086ddb70fb986c22bab265345f2f613c90d347b901d9e122f136fbcba904010ae74653
+EBUILD jbigkit-2.1.ebuild 1368 BLAKE2B 9b3d647bbb8bcb32aa179d635eae35144dfb5f0e1ce1e22b49be924d252fca74a59abba44627db9e4aeffb745e426e45a1df73d916411c928105d416adf3fc0a SHA512 500fa774118f052763e2d51a8108e366b750bc5621344feec9e26d711856a148699f7e835b4f843c5fa91a8a38a72aff02f271a7e73b22872ecf872834cebb7b
 MISC metadata.xml 373 BLAKE2B 02b125f44ea8401eb695a1b3fff8584c38f50cf9f359cf70e209955babbd749fcfbcd14415a757281f8fd4c0970ba5efbd67b937b81b45b2152a79093d141a34 SHA512 663285ac228539d95ca401d530b53cdb58e2f01e3ee4187622afd1c8bf6ca0ae76bbbdaeb92742408502f4b55dd269464ac2f21231d987ab73f949f6abb92882
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index 58cb0a9b89a1..b6912dc72909 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}" # Since we install unversioned libraries, use ${PV} subslots.
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
index 1d7a1c263dec..599a3cd8385f 100644
--- a/media-libs/kcolorpicker/Manifest
+++ b/media-libs/kcolorpicker/Manifest
@@ -1,3 +1,3 @@
 DIST kColorPicker-0.1.5.tar.gz 12013 BLAKE2B b4141e45b44e05c4769d008014817327a560c8ad74996010a1d16d22b6503547ce2ba657eee01c3893bb9a72cecd8fc368afe8e503d2c582cb02f1ab4b371a12 SHA512 6792cb79fe96f00c073f3f4b84c2c0a713523c33ee9f29113a9ed4f4c5f8e5509fefa4127a28546b1b44f73e0df7be9364a1c04498c36efcb6c2764df25250a8
-EBUILD kcolorpicker-0.1.5.ebuild 743 BLAKE2B f14f659014ccf0f984498f0a84c4459e26711c3952a3b37099280dc95b5c0d9f110a70858f56a78f8ef6fd99cfbefe086cbe6239032226a1c9dc0ef0506d76d8 SHA512 2abb05fc432dcc5bac30a45b7211d251090c039aa50ca396b4c0ccd1a4336205efa1040d724ac333c76fbfb65071097c2ad343649a56a4a6b39a57edbcfbadb8
+EBUILD kcolorpicker-0.1.5.ebuild 740 BLAKE2B 8b5acd88f5bef7eb1cef09ba7e4010adc2e7b55fdb054591dd3b9bd76e66d1ae9b6eb59f305941f987b610de682c7f3d4cf147ffd07229c9d7f5e5f1f6c83407 SHA512 329b50bea92f27a8d826274d167f4595e68ca0f47ea4f98927ec9cb2f0f0441c94272f15eb1c1f468e91c4bb7a4de8f8046bb4edbd7bac8c74ea240987a96fb2
 MISC metadata.xml 612 BLAKE2B 236c23c5065b8dfb1c1416a8ecab5692b660f24a9451ad56a66aec10d2c88b3efd55dbbccda943d05c873d9d3d1aee3cf28d676703535a35762a9125d0267b7b SHA512 ae6fefb02537b26dde3bc775a2d59c15f1f99225ca183b21f56fda9b7ce1538e825c0bc2e3b001b261565a3191ed11a13b2fa6ac07e2151812e8f2ff351344a2
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild
index 497f088f00b4..356f123bc91f 100644
--- a/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild
+++ b/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 9d6fee8ffa52..b708b06a799f 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,3 +1,3 @@
 DIST kImageAnnotator-0.4.1.tar.gz 165976 BLAKE2B e25679416b411082aeaefa8d56aba203443c5a8fedef418caf7bd48b6facc07bfa4ed336d3f49970366023200bd4c0456ac631edc6b6c858b095f4410195761c SHA512 f133bfc81dc0aafd31a4deae2cb6a45b9d7941b27be3027ded7ffa59efe35c0f0a313b3076f672b93acbbfeccedf4832193fafe90c0fef004fab644d1da0dadb
-EBUILD kimageannotator-0.4.1.ebuild 841 BLAKE2B 9969bcfe22955dc6d1325e6041fea55a36a6b62c39b0fa66977984a58cc71b4d40b2edeb553b783e46534e66f029568f7f825af66987b6f93d2d3dadadb69834 SHA512 9887a7620a1f996a9987071f83bf7f8f3288f8d2f0fac748ddb05ea427316669459b8292e26d3b624907707fbb6dc690435717431c2003e5c7023dd45bf0d1af
+EBUILD kimageannotator-0.4.1.ebuild 838 BLAKE2B a666de99e75281c219b27779a053e54cd2acf6b429046f7e7f49854c5be4505b45318fb0e4958cd14cf8f911e2b7b05127a5b96195b5b93355872b1d77097a6f SHA512 2d0d66550b2365ddac5e2d4233a4bbe49ed69ccf4302840460d7f6fb2bfd352effe720240b9d647ab60e2a91a3f04ebc7a76a451bf721964d1f4a95f091b1041
 MISC metadata.xml 397 BLAKE2B 2d096ac4360843336191b34452b62ac986ffc35a49e05e8d3bc4db9693eb64c99d8b180a14346bad2e0e97d70d77cf759dd33f724796c857e77c6d29b6e5b9dd SHA512 e86c63f5c2889d1d5901c1fd5f3bd906c6b3285f2ded680d1bb3960f5a0ecf07b842d5c5ac25e0b6c30daa3c4183daac572ec56b10078fd626a0533b8946aaec
diff --git a/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild
index 7a96553458a7..ae004e293da0 100644
--- a/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index f5d778c5d438..becbb7efbeee 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -1,4 +1,4 @@
 AUX ladspa-sdk-1.15-properbuild.patch 3933 BLAKE2B bbddaddd99c24db14306443b82106c17a096aee2ec684b717c8fccb76dd028e62f0ac8a575777450a0037cc154ea6e1515a6e732dd9822ddff39980afeb0c154 SHA512 bc276c02b9f23643616372477d5b2e9d186977ae1f3aef3a984162d46c362df06dd6e0b8a3156f1eb7e37dc66cbb4db8768cebcd0879ba6b36ab0245db2dbb9b
 DIST ladspa_sdk_1.15.tgz 71179 BLAKE2B 7a201fd968433241fda190874d51b835f425c8f35270dc8fac9acf4e9e1546fa20d48f85e894b9eb263dd5d84c2b407481d168e18256dfe2cdd026fe0c805a65 SHA512 a521622e23d988284244003e4ccfc3b42f6ddc7944cb00e7949b87e09d7f39a0cbb64b6d8b5a5af0a5ccf7179f88815416a88f02d3912957167e54b74accfc65
-EBUILD ladspa-sdk-1.15-r1.ebuild 1218 BLAKE2B 50933e309e744900add5f2603bec284378dea620eff51b03923dee4985625e3d4dfd3b888d4dc951891b991d0f8977222d199b729600d988858d8466a40f0732 SHA512 fb4827b2de81701d7c0b99ca53d1a9b8246ec2e3e7b994bd89ad4f117c9a97b7bfa44a209aa7ba6889af0b969ddd06376792f7a776b9912768a85bbe9b650358
+EBUILD ladspa-sdk-1.15-r1.ebuild 1211 BLAKE2B 4a0491986573830feda0c5abd86f2ecc519b74ea9a7ee8423d8c600dcca50a62e5ade83662c43d27dfb6cabd8bc3b2557887d67ad8b85b6e9e6bc8876eada1e8 SHA512 c2ec8349960d925d15b6cdd7994a38ba50c7fc6a2979eeec81ade5bc3aefbbfa23b1f472060fcacce999f4b11de4a891f5332b993f8b620c1e62152b44f66b8c
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild
index 91eb5ff0dede..6dc5e8ba32f8 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.15-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
 
-inherit eutils multilib toolchain-funcs portability flag-o-matic multilib-minimal
+inherit multilib toolchain-funcs portability flag-o-matic multilib-minimal
 
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}_${PV}
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 885bed090b37..649a56885698 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,5 +1,5 @@
 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
 DIST lcms2-2.12.tar.gz 7419126 BLAKE2B ee75b1ec902b61683d0f157277fb7732ce2ec6aa8fa0b87d52f03029758ed11c2369db322f98d6ce06f62e8bf6235b8b96db9067ef448b87eab236b80c5d175c SHA512 967e8ac9a1d1aa3be45dc82362b9bc71c555e8577441efda57dc12d0bf84ed9188460c52eb8542d399ce9ab43bd4191988ed22b254ef34c6c1877bbb935952ed
-EBUILD lcms-2.11.ebuild 1160 BLAKE2B 31a6b342cf59fee0faa0b1788f3af0ddd9c5b3a3b4c5a76774ff0818fa27a3213dc8c8171a5c2b1dcae6989001a79ec7749c0648f83190c14dadf4dbef7e7d7e SHA512 1a0b36d07060d269dd2f7a613683e1930a362489f48680351bfdcc1ae9c8d29e6d0428b3d2fb342a2f5a7d9f4ccc3b36d4ff3debf16a05f6f3bd79b9f469c5e5
-EBUILD lcms-2.12.ebuild 1244 BLAKE2B f115e34474e0f16a9c998ea2608faded1903802b46721bfc0d51c62155d2491c1ebab2b162b1bfb9277760f195ec4debfec5ca64e667f24e897289358a6e838e SHA512 a97858aff1caad42c283ac4a99152260f9f18667377731fe6d6f2f0affd5067cca9df45dfbca199a041401f854fd75023ec927442eda091137bbedc33313df4a
+EBUILD lcms-2.11.ebuild 1161 BLAKE2B 6544d7c87de96c0bb45bc117c190419149322d86d5169af3d2da67d5764cec68b7adea5e13b28109c8ee33b19ca696bc205140e56f21c6d9654732466a803797 SHA512 67668031db5c0b28115fa4c94bbfd7229bd0e901d1fc03138b741bf04002b794f1bfac019b3d936ba5d70cf4688ffee03d394ef3b86af27704dbb3d6fa6a6178
+EBUILD lcms-2.12.ebuild 1236 BLAKE2B 9c1265e1ec4d784539c3a82f582fc0ea324a98d548f106a27196cc8d6c2e575a7e6f68eaeb298460696c25625be28fba260aa0c6da232455b441bd40a4dab310 SHA512 dda347aa717613fe1ef27f936db32d1853a00ba77a39a969123ace9c425fcaa087d31b748cbd5abb1fb2da95e4699ec075115df704afc4f71a817f9e6302d4d9
 MISC metadata.xml 464 BLAKE2B 83de84dcbe1b9e2997c7334eb55ae601e80a4cbb8c1fd0e5f5fb5c95470354d1657d8c5fe6f5b895a6071e39bcaefe4d3216385ad70ed6e42ac58a90bd5f33b8 SHA512 c63a193bf5607356c0d48e4e840355553f4fcd61f7d1269e7cf6cb198d462b786777ef46dd1e07c8edff0ea5311c42b3e5a2c8e709adb3e0b40dd538d7f3a60d
diff --git a/media-libs/lcms/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild
index a7e28b7c9264..d35c2fd1aa2c 100644
--- a/media-libs/lcms/lcms-2.11.ebuild
+++ b/media-libs/lcms/lcms-2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/lcms/lcms-2.12.ebuild b/media-libs/lcms/lcms-2.12.ebuild
index 6a1b118ac059..e16e0d022282 100644
--- a/media-libs/lcms/lcms-2.12.ebuild
+++ b/media-libs/lcms/lcms-2.12.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lcms2-${PV}"
 
 LICENSE="MIT"
 SLOT="2"
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff zlib"
 REQUIRED_USE="tiff? ( zlib )"
 
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 1762ffd3d6e5..5df93d84c572 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,6 +1,6 @@
 AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
-EBUILD leptonica-1.74.4.ebuild 1746 BLAKE2B 3db9bed04781b057ad93acca2d0a1a8ba26627c992e7dd1907a6efc9ce05447378a26efb7062f4b26c3966dcda8b01f63fa8ff4c4ab7b9f14c92ecb4881030ed SHA512 aec17f1f1f49dbee29efca27c2d89d1674a8a5c3de87e77b24fd2708a94debc6c7eda3d3fb721d67468c455457dfa9b7fdaf7291fd6f5142da596c85f757c600
+EBUILD leptonica-1.74.4.ebuild 1739 BLAKE2B fdd42c8ae0e6c59a9892c1d4e761a00f4f5e353fe904dbcf624eb14c5d1fe72f57668078e01524ea8a549348a6e022a5c93324836d0ea85bc89fb14afdfbe5fa SHA512 206dbadf6ffbd98c47cec1eb49b80dbc0fea5b91b7a036966ae3ebd21eda1a6decfc804008f1163c10156c59ca7e8abfa777e85b9c1f6ccdac73920379526078
 EBUILD leptonica-1.80.0.ebuild 2024 BLAKE2B a6f08294f1183051c19593538b26912629605bcd7872e3c054199fff7ef953157f2ef4a683a29936087263030dc97bfbe10988caf68e8371d140594447330825 SHA512 25f9a6fea60204f9f7a0c919578a617cab49801f275cdc9ff054fd5e67190c7d3630003c1e27de300f3cafb92c069432c94f31208a04d8683ef79121e6777a60
 MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild b/media-libs/leptonica/leptonica-1.74.4.ebuild
index de04ce5cda57..5b4df59969af 100644
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.4.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=6
 
-inherit eutils ltprune multilib-minimal
+inherit ltprune multilib-minimal
 
 DESCRIPTION="C library for image processing and analysis"
 HOMEPAGE="http://www.leptonica.org/"
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index 525bf4113e8c..7a07b5b9961c 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -3,6 +3,6 @@ AUX lib3ds-1.3.0-pkgconfig.patch 2345 BLAKE2B 9d1fddb8a14ccaf5d2747c39113e809ca6
 AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 BLAKE2B bb196782a7da408412d7a1ae5c1c006ff9b59827dfbe6bb7092ae8b6d7ca1b7eaaeba167bb3804dd24ba369b90982dc97f10443424dea39b0f3ecaac378ed2e7 SHA512 63bc93b5cdf099a33b13ad84ebbd964607fe2824f102d5e4dd37c435cb84ca82e4de16a1796de8abe9e4dd43071b3bcb6b3f176d0d2c4019534d8d08decc8570
 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 704 BLAKE2B 78e2ebf501d6e22e7bbb405615f5573db91e7ab679fd35962e9e7026bd008a3263a13a19e2f2cef6a0a8693b1693902613d3a33e4c6dbd8443274130fb2a342d SHA512 ed931595a7c290116c5923ca1659820300daa988cfc00be75eeeb0b323d6941a0ecad87f216d4ac988c6e93e17bcd81c857be1e949636777a04929ec51517bc7
+EBUILD lib3ds-1.3.0-r2.ebuild 636 BLAKE2B 256b9a06dacf3eb3a43328bc3f1721ab1c5a58bb767c4b32180831c42906542ea8657052ae1bd36a35a7746186c216f012db1427befea6d62991f214cd4d5748 SHA512 b1193d3d5dc13f0bccc66694b15cf73674582efbfbe1aa3a8afca83b9b688e3ce1f4e3cbfcf06d57e41b8b4cafda2680e758397afde0b438fe54cb8f0018e859
+EBUILD lib3ds-2.0.0_rc1-r1.ebuild 700 BLAKE2B c63dbd3f85d989c68103819b954dc1d4c2dfb00da876ba86a361150a5035f8361b25d89871811030cb90cd4b0ee900ae529b9738f50ce002df51c30aae124e07 SHA512 5588428b6a41a384c40473a396b060f9ea32c37d66e898f4d625916c3b74bc1ccc6edb8a88c1fa74a0bef2ca00a182b6ff1bb899a2830300ec5eeb799c63f209
 MISC metadata.xml 596 BLAKE2B e9452f740b765cd11da41f9ae41656ed0db4a3994ee8d871fe7d074973c47938494d224cdc9b927e4fa69c3893af2383315962c6f10952c66a82163d74a32951 SHA512 0090513ed5ba8b3855a64d27e4a84e1e6ef340f178899e03ea7b43cb983ead98c64d8129559203403313c102efa93104be841c635245f02bcec350f0cb91fb11
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index d9f40c14c6cf..22bfc9ac8e31 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.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
@@ -26,6 +26,6 @@ src_install() {
 	default
 
 	if ! use static-libs; then
-		rm "${ED}/usr/$(get_libdir)/${PN}.la" || die
+		find "${ED}" -name '*.la' -delete || die
 	fi
 }
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 e8423a28d6c4..b7da0c9e8a8c 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -30,6 +30,6 @@ src_install() {
 	default
 
 	if ! use static-libs; then
-		rm "${ED}/usr/$(get_libdir)/${PN}.la" || die
+		find "${ED}" -name '*.la' -delete || die
 	fi
 }
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index b121ee2c3140..840449c6d1da 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -3,8 +3,9 @@ AUX lib3mf-1.8.1-0002-Add-library-link-dependencies.patch 2567 BLAKE2B 10bae2bc7
 AUX lib3mf-1.8.1-0003-Change-installation-include-dir.patch 1737 BLAKE2B b6ffd368f7078d8a7ee06d49fab001b7fdc8969d52ac1e54efd4ef2184c9b8d2947eb5ca2fe77d9a7b6369adca15e9362db09d0c55ee921bef3d04741162f71e SHA512 cf2ebd71308f75a620b9ac7f213e5d794350f9b59f7840fcc5b3a49e20b75cd323fc99a074900d751c81ca86171a5acb29191fa05ebf6c8305b0ee3fd55dae99
 AUX lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch 1172 BLAKE2B d6e27b935d0a7644ba6a56e9da2159fd24a9f42831befe2acd0f9b26fa5c1266ac87de34c7ef2d709dfb12048f52a1a27232307a4df1c12ec099e5cb45d37c57 SHA512 f514ad5f37e6da0a45c81769ead73c6ef4c04d368dc6a129d3b3547147c3b47db2182bf630457c02fd67951c5c97ef43db2c770d4a0864003ebbc207c4974fe7
 AUX lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch 1067 BLAKE2B 1c56383b9a791ea5bcc8762a23c92426d308d6f55e5b51ec9268a779bb202144958f9cfa02686d72bf260d2beeb08b3ddf0c58441bf1a899032c408fd137df93 SHA512 af9930e67b6a0a3db26a97326e68a8e8a2d3ac57c378cf8f79397f514ec18ab600efb84b941d0449ffc8d620564082f8942a428c1fefa3cf199d972a7a4f9622
+AUX lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch 5462 BLAKE2B 73ebe5037f11673232363ee4ec99aea828b37ea24469ddced15593310e8f7f7806c08bddde40583640471d2566985d5002970dcc6f8f3d64ff369cfe3a3567e7 SHA512 1f5fb5c3b0dd115da478bdcf9c47e9c269c13613604905df8b0a80fccf5b039ee2c1ce0f433c68f783b11e5faf1756fb66772f0e313bdb0ae6af3c2a5cf35ab3
 DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a
 DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846
-EBUILD lib3mf-1.8.1.ebuild 1076 BLAKE2B 3bb98e5e52aaeeb101469619e10e01da43fe2f9da661075b44042aab351e9db8a65b34d156c360df6ee8aef3ffe15b07d2a935630903be4b22482e5f51a72141 SHA512 ddb2f6e90b2cbcc048efb496577e14fe4c6600ba3ed311e8b8a9910c808c105ed46f9847a6af725b18423032957627c13cdfc5f658337a1242d4b38d88e4f247
-EBUILD lib3mf-2.1.1.ebuild 1490 BLAKE2B d61c1693fed466314d95fb022fbf72fcb0630ed0ffa09c82e629d03d63c22988113e1b60c80afc82e8080b01f5de739928cc62f289b01d3ad8f37aab64e4a06a SHA512 68187b38d7bc7c1faceb019c11aa010c4f1ec69031342d69c44a24eab897c8fcb8aa33c21c153d66ad5b8f087fabcf89bdc3309ec4a3c9db51ef6f866b1a9943
-MISC metadata.xml 723 BLAKE2B 487aab86ed2e1105547a270a4f1e717e65d1c838d8f8f336b9b6fbac2969b1a2649b366e9484f2acdb73415a1f65792621e708725a3e5f7a257fa0d4b93512ae SHA512 4b006ff1d394ca718d20b890ec35cd21d10a433dee4778303ca8c8e12fb161d83e2b54907718d59d8a887a24f3706e2b379c0588263cdeec08f80041c55ca9ee
+EBUILD lib3mf-1.8.1.ebuild 1082 BLAKE2B 56b7700e947b7ae6c0657e68d62c21ccd9d750695f185d19459ff68f3933285e78f0fb46a6e19dee0908b7a2349df3fb392cb85e23fec07e42c1a67796786f97 SHA512 5ad4a29703d59e659dd8563a3fa31b1fc1224296acf80c997c00aac6148739220d2e786eaff21cef2b6d2b7d61a0e01c4609153b10e239091db5d035213169cc
+EBUILD lib3mf-2.1.1-r1.ebuild 1615 BLAKE2B 6dd77c1d31063c8cc490f63d9e18d275d22b55d097b4850d8bf43a0ea31b1d958c71c8b9e20e4e563433139f689a962e98676845bb71713fc6a39f99f3baa110 SHA512 967b68df018553f947c631a3bc8c36f559aa545379191b536f1e6f9366b14e9ec916fb1b98add4b37d00fb9ec8a949f6e05adcc6c18a03f4713c24d5a85f3ddc
+MISC metadata.xml 935 BLAKE2B e249808fd2905dc9202259b4aa0a557bfa7e04ea13f72b1dcb0d2e6b3b2c6844dd340ed8629fda53b57a0fe2ddbec55a11dc98acb1997015d118a138ffc23796 SHA512 d58e9bb490ee4b3dfa11e18bd2cb5fdc0e581e0786ca9c4435f900bfdd8b2f158cd9dc863edc9b6b4b40c89e279f96b485a4c64589ced5ed475c1ff1f7bec8bf
diff --git a/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch b/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch
new file mode 100644
index 000000000000..00089c58468f
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch
@@ -0,0 +1,141 @@
+From c4e004aa8580f799dbbb7ec6951e0826dc387811 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 6 Apr 2021 08:45:45 +0200
+Subject: [PATCH] patch to use system-provided act binary
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 109 +++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 73 insertions(+), 36 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 64a11d9..55abdde 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,14 +54,19 @@ if (${MSVC})
+ endif()
+ 
+ ### The API generation target
+-if(CMAKE_HOST_UNIX)
+-  if(APPLE)
+-    set(ACT_COMMANDENDING darwin)
+-  else()
+-    set(ACT_COMMANDENDING linux)
++option(USE_SYSTEM_ACT "Use system-provided act binary" OFF)
++if(NOT USE_SYSTEM_ACT)
++  if(CMAKE_HOST_UNIX)
++    if(APPLE)
++      set(ACT_COMMANDENDING darwin)
++    else()
++      set(ACT_COMMANDENDING linux)
++    endif()
++  elseif(CMAKE_HOST_WIN32)
++    set(ACT_COMMANDENDING exe)
+   endif()
+-elseif(CMAKE_HOST_WIN32)
+-  set(ACT_COMMANDENDING exe)
++else()
++  find_program(ACT act)
+ endif()
+ 
+ set(CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED ${CMAKE_CURRENT_BINARY_DIR}/Autogenerated)
+@@ -71,35 +76,67 @@ set(ACT_GENERATED_SOURCE
+   ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation/lib3mf_interfacewrapper.cpp
+   ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation/lib3mf_interfacejournal.cpp 
+ )
+-add_custom_command(
+-  BYPRODUCTS
+-    ${ACT_GENERATED_SOURCE}
+-  OUTPUT
+-    ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
+-  WORKING_DIRECTORY
+-    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
+-  COMMAND
+-    cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
+-  COMMAND
+-    cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
+-  COMMAND
+-    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
+-  COMMAND
+-    cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
+-  COMMAND
+-    cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
+-  COMMAND
+-    cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
+-  COMMAND
+-    cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
+-  COMMAND
+-    cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
+-  COMMENT
+-    "Generating hourglass API bindings and implementation stub"
+-  DEPENDS
+-    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
+-  VERBATIM
+-)
++if(NOT USE_SYSTEM_ACT)
++  add_custom_command(
++    BYPRODUCTS
++      ${ACT_GENERATED_SOURCE}
++    OUTPUT
++      ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
++    WORKING_DIRECTORY
++      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
++    COMMAND
++      cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
++    COMMAND
++      cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
++    COMMAND
++      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++    COMMAND
++      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
++    COMMAND
++      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
++    COMMAND
++      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
++    COMMAND
++      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
++    COMMAND
++      cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
++    COMMENT
++      "Generating hourglass API bindings and implementation stub"
++    DEPENDS
++      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++    VERBATIM
++  )
++else()
++  add_custom_command(
++    BYPRODUCTS
++      ${ACT_GENERATED_SOURCE}
++    OUTPUT
++      ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
++    WORKING_DIRECTORY
++      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
++    COMMAND
++      cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
++    COMMAND
++      cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
++    COMMAND
++      ${ACT} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++    COMMAND
++      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
++    COMMAND
++      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
++    COMMAND
++      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
++    COMMAND
++      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
++    COMMAND
++      cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
++    COMMENT
++      "Generating hourglass API bindings and implementation stub"
++    DEPENDS
++      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++    VERBATIM
++  )
++endif()
+ 
+ add_custom_target(lib3mfACT
+   DEPENDS
+-- 
+2.31.1
+
diff --git a/media-libs/lib3mf/lib3mf-1.8.1.ebuild b/media-libs/lib3mf/lib3mf-1.8.1.ebuild
index 6a9e8bdc83aa..a51555571c7c 100644
--- a/media-libs/lib3mf/lib3mf-1.8.1.ebuild
+++ b/media-libs/lib3mf/lib3mf-1.8.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
@@ -7,7 +7,7 @@ inherit cmake
 
 DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
 HOMEPAGE="https://3mf.io/"
-SRC_URI="https://github.com/3MFConsortium/$PN/archive/v$PV.tar.gz -> $P.tar.gz"
+SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/media-libs/lib3mf/lib3mf-2.1.1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
index 35900c26454e..f2853dab0b21 100644
--- a/media-libs/lib3mf/lib3mf-2.1.1.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
@@ -13,10 +13,10 @@ LICENSE="BSD"
 SLOT="0/2"
 # the included ACT binary is a statically x86_64 built one
 # see https://github.com/3MFConsortium/lib3mf/issues/199
-# no package available for ACT yet in Gentoo.
-# Keywords x86 and arm64 can be re-added after we have a package
-KEYWORDS="~amd64"
-IUSE="test"
+# Keyword arm64 can be re-added after we have dev-go/act
+# package keyworded
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+system-act test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -27,6 +27,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
+	system-act? ( dev-go/act )
 	test? (
 		dev-cpp/gtest
 		dev-libs/openssl
@@ -36,6 +37,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
+	"${FILESDIR}"/${P}-0001-patch-to-use-system-provided-act-binary.patch
 )
 
 src_configure() {
@@ -44,6 +46,7 @@ src_configure() {
 		-DLIB3MF_TESTS=$(usex test)
 		-DUSE_INCLUDED_LIBZIP=OFF
 		-DUSE_INCLUDED_ZLIB=OFF
+		-DUSE_SYSTEM_ACT=$(usex system-act)
 	)
 
 	if use test; then
diff --git a/media-libs/lib3mf/metadata.xml b/media-libs/lib3mf/metadata.xml
index 7907c9b23f8c..2b80f7d806e5 100644
--- a/media-libs/lib3mf/metadata.xml
+++ b/media-libs/lib3mf/metadata.xml
@@ -15,6 +15,13 @@
 	It provides reading and writing capabilities for 3MF files, as well
 	as conversion and validation tools for input and output data.
 </longdescription>
+<use>
+	<flag name="system-act">
+		Use system-provided <pkg>dev-go/act</pkg> as code generator
+		instead of package provided binaries. This flag will be removed
+		after some time used for testing!
+	</flag>
+</use>
 <upstream>
 	<remote-id type="github">3MFConsortium/lib3mf</remote-id>
 </upstream>
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 35f245fccc83..f89a01f6162f 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,4 +1,4 @@
 AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.2-r1.ebuild 1558 BLAKE2B 1c6e4760c76df09831031eac25c27e89e729f81491e131b3de5890a5161185cff84d18967cd4a2f84b1b68f1aa90417a90ec7429157207755e612d58b1ad0ede SHA512 0192041dca00730dbaa9411a41cd362c486be399ed5c2058c61129ca184a153a2d5cf214a6768699a7b9518dc37afcb742983b8370cbca846601bb26157e79fd
+EBUILD libao-1.2.2-r1.ebuild 1523 BLAKE2B c5234b18ee4fee0d71c12f22fb6143b0426dea17282d2b6fae84550a6707101316080d2cf8fdcd89f55e7bd40d88e6a50ff5d508da30bfdee62a371fa6720ff7 SHA512 c1823efe1bebe94ff7c5ee1352db03b1f07aaa47d849db9bc4a089679115c8e8f75ade6e6ff07a64db9ab192d0be2655b35e7eb3881efdb4fcc6f79566f63780
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libao/libao-1.2.2-r1.ebuild b/media-libs/libao/libao-1.2.2-r1.ebuild
index 587e006037fd..dda461774e57 100644
--- a/media-libs/libao/libao-1.2.2-r1.ebuild
+++ b/media-libs/libao/libao-1.2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools libtool multilib multilib-minimal
+inherit autotools multilib multilib-minimal
 
 DESCRIPTION="The Audio Output library"
 HOMEPAGE="https://www.xiph.org/ao/"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="alsa nas mmap pulseaudio static-libs"
+IUSE="alsa nas mmap pulseaudio"
 
 RDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
@@ -38,11 +38,11 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--disable-arts
 		--disable-esd
+		--disable-static
 		$(use_enable alsa alsa)
 		$(use_enable mmap alsa-mmap)
 		$(use_enable nas)
 		$(use_enable pulseaudio pulse)
-		$(use_enable static-libs static)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
@@ -53,5 +53,6 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc AUTHORS CHANGES README TODO
+
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 28ab03c8cb19..7cf8aae49169 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -6,8 +6,10 @@ AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f56
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
 DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e729fb86380f2849b9bc80deee0251bf0a1149b548ebcb6642fa6edac13658f3e9c55d5f50c905fb733f8312431 SHA512 8e72e6d1c2fbae7fd8afaea6e7d086f2b533006934ffa8e126d4e769d3fc1aa92703ce7cae4c6dfa5dd8050b2afdbe2eba54fbf4f49c1d11ae41cc9913379607
 DIST libaom-2.0.1.tar.xz 2391756 BLAKE2B 46d5938c49e720ec773d55e461f38d86a4307358fe8d3d9cc0e16e63dd52e54d41163bd14a583c059c9881a6980b1a8c54323b499dbef8301e9fa90094cd0e02 SHA512 2e7e2a9f456d51641ded44cb3ff639982e996276157d34e6a38895a68b7a8f36e209bcbad3dea7a04bd5b45b8cfe8a3bf202ab630f93388ea6dfb516f13ed82f
+DIST libaom-3.0.0.tar.xz 3272588 BLAKE2B ffe3dae3d275818e1fa8819d016ed7a1f01d374ea058a1daa0cfde2a43f3d065a0be08bcd55db7cb823e0a1802a0cf0ae8cdcae63d7fadad9fa1b53e3f654e13 SHA512 6845d7139b1f5d49a0dea98b08de66904909ed0280d90ac56e740f26f17fe1ec3f49c454aded311db5505d7a4133eedc05a09eb6a0c45a43a4895223f5dc35a2
 EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5
 EBUILD libaom-2.0.0.ebuild 2309 BLAKE2B 58f2c55f85387c62abe184863c934979033c63f0b966664a11e13bddf4abf22ead334a94a645bb1cc28ae05ae58f9398cb462e9384f7b087e1ec1983257d1870 SHA512 6fa8b6e03dd556b84abebb271047c58b3936eb7e9479360d87f6f2f4b3bb7815911e43a10de03c4acc431a60897457a39de65ce4e2087ec238bf3afdfd8c285e
 EBUILD libaom-2.0.1.ebuild 2319 BLAKE2B 072057d02485e70a557be99c7e0eb0d52b8382a3cd11afd9c6ac375b830965cb1291488e7a599e4226d4fc553287b618b50ae1cfea27c2e935ce259c2870431a SHA512 4b284f8049d487a178b280c9bb18bfd757f4e8a9f0b673c4cda337085c0fb7192632b46540081967fd03dd9c982cd488155751bb008cc114d4d38f5e98cc8c35
-EBUILD libaom-9999.ebuild 2413 BLAKE2B b2f16d9046d8ab50c57d76c7798a4e3f59277cbac662a0f1b3e3b4a3176b0ffd4f14dbfdede2ad651a7df19e637b19ce4f5c9aca7b48b097332055754474dfdd SHA512 ebab14a84e97a4a3a0f19f2a1836bccf10a6b1130ed49525b24ef22a73ab4da1dd99fb2e252c5fe8a0b93830b92a19a061bace04b2d7ac2989f6b50c86eaae76
+EBUILD libaom-3.0.0.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
+EBUILD libaom-9999.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-3.0.0.ebuild b/media-libs/libaom/libaom-3.0.0.ebuild
new file mode 100644
index 000000000000..358a43197c20
--- /dev/null
+++ b/media-libs/libaom/libaom-3.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/libaom/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# the PATENTS file is required to be distributed with this package bug #682214
+DOCS=( PATENTS )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index a437118de10a..358a43197c20 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-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
@@ -10,14 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
 else
-	if [[ ${PV} == *pre* ]]; then
-		SRC_URI="mirror://gentoo/${P}.tar.xz"
-		S="${WORKDIR}/${PN}"
-	else
-		# SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="mirror://gentoo/${P}.tar.gz"
-		S="${WORKDIR}"
-	fi
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/libaom/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
@@ -25,7 +18,7 @@ DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
 HOMEPAGE="https://aomedia.org"
 
 LICENSE="BSD-2"
-SLOT="0/2"
+SLOT="0/3"
 IUSE="doc examples"
 IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
 IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
@@ -56,7 +49,8 @@ multilib_src_configure() {
 		-DENABLE_TOOLS=ON
 		-DENABLE_WERROR=OFF
 
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
 		# ENABLE_DSPR2 / ENABLE_MSA for mips
 		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
 		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
diff --git a/media-libs/libart_lgpl/Manifest b/media-libs/libart_lgpl/Manifest
index c3ea3d48eb36..4bc462c42cd4 100644
--- a/media-libs/libart_lgpl/Manifest
+++ b/media-libs/libart_lgpl/Manifest
@@ -1,5 +1,5 @@
 AUX libart_lgpl-2.3.21-crosscompile.patch 2007 BLAKE2B b5a1ab145e5f33ea33d23ca6eace0dfbb156056dd82a195ed72e853cbcba4bd0d774425f8cfc0f8c7658302a5113c9deb9364b1cd0fa702d3e165d92e5e58e67 SHA512 d7710f23972b309b08a318a76ef58c0bb2303c52f1348e817be01298466b894e2b7ab3cc666ef94e8cc3571b5d0fdf543139a24d2c85cecab16a01d5af124ff0
 AUX libart_lgpl-2.3.21-no-test-build.patch 535 BLAKE2B b7752c0b0a84a56164bcca9fb30b10f5810112dd4829571185a5d759151de59473f8ee9621718440d29e5becd593d50ca819d26db7f88175fff55296ea917f1a SHA512 17baab4a8f572812d49a25abe6a455c3cf6637bb03833e8f4bd662e96d30a74a15cbc70bc2eb78b0d23d6f2448a8f272dc9317841f6dc9f27caee06933ee8e42
 DIST libart_lgpl-2.3.21.tar.bz2 329102 BLAKE2B 581fbe3b0c52e69543eebb244f9a49046437d907d498aff1fddead24930f7e33067c7ea657917860a1171251b77b09b9520244a2216122c28bf83a71dcb3128b SHA512 8a632a6a4da59e5e8c02ec2f5a57e36d182b325b46513765425e5f171ff9ae326af1b133725beba28f7e76654309e001aee9bace727b5b4c8589405256a3c020
-EBUILD libart_lgpl-2.3.21-r3.ebuild 1078 BLAKE2B 10ac2c65da15c30218d0f785315dee5d73010cce9d576431f85bb6f82304612040d87e97f2bb9869a89ff7794ffdda0180f850b8480e0249ed0cce2074db367e SHA512 a60c8b14e8e143bac8ee2dc692554d89f2c4d6c1c0c42a9c77fca565a1e4cea250c6e729724a5093782c1c42071725578a1553f54a7154630944c7caf17d957d
+EBUILD libart_lgpl-2.3.21-r3.ebuild 1079 BLAKE2B 5f05561ba84411011dfa4cb71c5fc185e4353675e45b51cdc658d9a1837016995699ec245f456d26dc43fb84025f642708ce3ff4c7fd7a0c2d25cfa8bbe5ade2 SHA512 9bb0d2aadf858a44cd9cc3ff6868ecf2c65e6e2eb7b2da5509a5a235238eccc9caf59c35b720bc913ae35f859a6f0612695b8f29c840439b0a8752eeb5716f5a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
index b08741e892ea..a6923db9c7c4 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.levien.com/libart"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 78814be0e893..dfe69fb72587 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -2,6 +2,6 @@ AUX libavif-0.9.0-pkg-config.patch 800 BLAKE2B 401bc92fc4ed0c6f224b1ff23d22b6da9
 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.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6
-EBUILD libavif-0.9.0-r2.ebuild 2726 BLAKE2B 4032da82246d4a3abf95dea3a731386f956c8cd99e0efa654703b03d50bded33fb7885bb8db77407dca9d35e412d868d13bfeeb35a590031f041404226ad012c SHA512 f35d29f062547d27b1943d3425a7dfbcefac3f6e55cceccdf075d5a5bd4a62aac256602b4b96071891cd66241c40bf6e34500388177c9fda98e7ddedb4379998
+EBUILD libavif-0.9.0-r2.ebuild 2725 BLAKE2B ea04f7269ca1ae6a9d8dff2b16efc62c7cd7463d8093519537ae16f0c678772fdfb5f3ed19c6d75bda00f69b74bfa1e0750775711af73c885a2ec375139910f6 SHA512 9693b4c894ea4c910984e3eb0207f2a04c74ad7c8411efbdfc66e36495042dd436e4e492350aeb8321ed3dfd7fff424e6010a34d98b9fdfe33c00e79b336030f
 EBUILD libavif-9999.ebuild 2598 BLAKE2B 30eb997ed8776849fe1a6c075b93169da72ac416ca84e7d0c6a4b8ea6a83eff005a1586eabe28955a8bc453161953dda15f9a90ba94340f239f41b819b0eb9d6 SHA512 f4b650f6ddd67b4a230d4560311f2419c4b8c5c8efc0811350631dfd08f43fced574dc522a36426164fe43a8f77ad6b956c0f25d2c149a067fd7b1d678c25961
 MISC metadata.xml 873 BLAKE2B 076f55198ed293b3a61d5fb312e6c0b5769f3e01118ab481b6902cc6b5412298b05e23d20d2063dcdec5514c804b02249f24e433194910741688cba8a51e56c2 SHA512 0ca9b65794748bba0c92034b531b5bb2e3e6f87ba362073954b8c8689cf115f20f0de3b19bdec9189a2b54ac1c5a33c77b426fb1d907b35ff35ff3b71dd86ee7
diff --git a/media-libs/libavif/libavif-0.9.0-r2.ebuild b/media-libs/libavif/libavif-0.9.0-r2.ebuild
index 87d63556573d..5599acf29413 100644
--- a/media-libs/libavif/libavif-0.9.0-r2.ebuild
+++ b/media-libs/libavif/libavif-0.9.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
 DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index b14e9131619e..19a71f8c8ddd 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,7 +1,9 @@
 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
+DIST libbluray-1.3.0.tar.bz2 754069 BLAKE2B d4c699ce28d2e5b1d4dda461a1359d3a446afe72368e9d76066ca4d5c49d1f24b4bcec307608d96913d0c668168a86267416b9db37ad942628c2926b79ec47d9 SHA512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc
 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
+EBUILD libbluray-1.3.0-r1.ebuild 2026 BLAKE2B 8b8f85f69de138fc2ce2d3e3ecaaa9ccd0d79dc1dcff733653f5d5753e549842eef35d7209463becf588773f7a3a9ffc0644857490aada84990f0e3baa65e8ba SHA512 0a0f35bbae2bd34f7296e0f073819be0794e39e73bf1277a8cdaea07984f749f426829eba911b0b5d9274a8b47f44ead1ae5186ab1dd1ad4f77255071bb0efaf
+EBUILD libbluray-9999.ebuild 2007 BLAKE2B 478fd75959be666b511ca485c1bceea124b70282273dcdb687c9ae1e6b98d0bc6c7e92fa0ccbb020a29370202c248dc7ec1a0b2b5eaf4269714db18cae12344f SHA512 5a168560da9a4db8f929596176889e3ac7d6ea34c9c9ca2f39f37550909e45502976933d08456dcfe67c815a41564105321aa5f3bfde5e4f52680814b45590f6
 MISC metadata.xml 540 BLAKE2B 1385b09e4a4a1a2ffe572ca02cc50ae5808a2d283841128258a906742ab8fd67d48b1a677d601990d84a587cc18e9ae68409bf6e9af40e084c05da6f73988aef SHA512 181c79234a6c7a88d6df5b8e2de071fd7746505b153a1f2d92c4d6bffb95cbfaa3f276656b95786e02bc7c097d1fdce65afcc953c569bd82639707c843b1e575
diff --git a/media-libs/libbluray/libbluray-1.3.0-r1.ebuild b/media-libs/libbluray/libbluray-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..7e8ef811ae39
--- /dev/null
+++ b/media-libs/libbluray/libbluray-1.3.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV#9999}" != "${PV}" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
+
+RDEPEND="
+	dev-libs/libudfread[${MULTILIB_USEDEP}]
+	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
+	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.8:* )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	java? ( >=virtual/jdk-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.8:*
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-jars.patch
+)
+
+DOCS=( ChangeLog README.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use java || unset JDK_HOME # Bug #621992.
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-optimizations \
+		$(multilib_native_use_enable utils examples) \
+		$(multilib_native_use_enable java bdjava-jar) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_enable static-libs static) \
+		$(use_with xml libxml2)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi || return
+
+	use utils &&
+		find .libs/ -type f -executable ! -name "${PN}.*" \
+			 $(use java || echo '! -name bdj_test') -exec dobin {} +
+
+	use java &&
+		java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index e0edf9695213..6781e565d5d8 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-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
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 
@@ -20,37 +20,32 @@ LICENSE="LGPL-2.1"
 SLOT="0/2"
 IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
 
-COMMON_DEPEND="
-	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-"
 RDEPEND="
-	${COMMON_DEPEND}
+	dev-libs/libudfread[${MULTILIB_USEDEP}]
 	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
 	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.6 )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.8:* )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
 "
 DEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.6 )
+	${RDEPEND}
+	java? ( >=virtual/jdk-1.8:* )
 "
 BDEPEND="
+	virtual/pkgconfig
 	java? (
-		>=virtual/jdk-1.6
 		dev-java/ant-core
+		>=virtual/jdk-1.8:*
 	)
-	virtual/pkgconfig
 "
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-jars.patch
 )
 
-DOCS=(
-	ChangeLog
-	README.txt
-)
+DOCS=( ChangeLog README.txt )
 
 src_prepare() {
 	default
@@ -84,5 +79,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 540d929517de..827812886c76 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,6 +1,6 @@
 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-r1.ebuild 4014 BLAKE2B 658006e7e49ef8b9d705431ef29b29e4e8d8bf307f5e371895d37323f30856229e206e5dcd7d05865986bcaff1c7213d464213cf9ec64354c551eab164ca64dd SHA512 d79418fe064ade96cd94602086720bbe46092b0cd3bcca863b7bd5cd9c2710b7a11d5dc4510895f14e1c9702f6637491120283e6b9c74a66c73fa0d5d6f9cf7b
 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/libcaca-0.99_beta19-r1.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
index b368ed8f2360..4c634422850e 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r1.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=5
+
 RUBY_OPTIONAL=yes
 #USE_RUBY=ruby20
-
-inherit autotools ruby-ng eutils flag-o-matic ltprune mono-env multilib java-pkg-opt-2 multilib-minimal
+inherit autotools ruby-ng epatch eutils flag-o-matic ltprune mono-env multilib java-pkg-opt-2 multilib-minimal
 
 MY_P=${P/_/.}
 DESCRIPTION="A library that creates colored ASCII-art graphics"
@@ -14,7 +14,7 @@ SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+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 )"
 REQUIRED_USE=""
diff --git a/media-libs/libcddb/Manifest b/media-libs/libcddb/Manifest
index 54d3e8c5ba62..1c988180616b 100644
--- a/media-libs/libcddb/Manifest
+++ b/media-libs/libcddb/Manifest
@@ -1,3 +1,3 @@
 DIST libcddb-1.3.2.tar.bz2 352909 BLAKE2B 8386ea051f23004396d53ad228a595d13c8c194361223026e901ff859f8e3d2dadb93d5e779902ec4698c164a3e06073fc82f331b22b4cf42f5ab8b1fae562e6 SHA512 0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a
-EBUILD libcddb-1.3.2-r1.ebuild 1206 BLAKE2B 22a47208d98dda257f7ddb8c72a13e73b57e33ac0fe7e9fd9d3b8ca57ff584d5af594be85f4b931d885d7afa87da0d582f30e2e556dca57af5005266f5e00876 SHA512 9c3c613101139032fe53f8c0771d9da64c44d7a0514cb442652cab36bc65a87840b0a628cb4ce098b577a835ce7695d8c4285259e63b3359ea6a945abf4b4255
+EBUILD libcddb-1.3.2-r1.ebuild 1206 BLAKE2B a09bc30d71c63c8f3d7703d6084f293c85424177e8e550e13b325d3c2a6ad75848787f17f9462399426c44b4fa767ead59ee5b424313812612d8592f91081bdc SHA512 6a445ab884d96236be8674961e93e8b611ad29401b7eb4a91fc4cd6628dc0b8a593e22dc609e56958c1a0214403600840195d05c3f5b4af07eab54aa3cffa120
 MISC metadata.xml 330 BLAKE2B 5a8314f4fd530d9866bfc3d9bf50a83e247705353cd3744b9bca49627e30bd683565e2abdbbdd9d04c062aa4ddc16f26deb06d4d4887b237d6fdb42142332c8e SHA512 db4acf96ddc4640b5e328063fc76160a6294aa850569c4466fa741ee0e223f9a325f563701d0d096b8a639c5ab0af1040aa2bea431981808e58bd1c2482c2b34
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 0ea671150776..18a3a1f47777 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-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 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-li
 IUSE="doc static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen )"
 
 RESTRICT="test"
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index 3948c744f0f4..c3e4102b37be 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,5 +1,7 @@
 AUX libcdr-0.1.6-icu-68.patch 977 BLAKE2B ef4fa0e61607847aa0f7d1105775224f7ebed349d163cf0dd2d190f719aef041415ec87833d39fdc90c8a128b1aa052d1b7b8dda7c1cfeed962506d6556a04ec SHA512 fd0d109a48208596a86ba6df3a022bf60a02295af686a5fe924a866e808ef00023e92b40c9dceed701dac9c4243e61c017cf04b1ced9e73903e870ca379cd1e6
 DIST libcdr-0.1.6.tar.xz 612068 BLAKE2B ec5226a28f101472ea3044e9e5b87dba57b584fc813dfda29e00281182d067126bf8a5740c32bc5cb545f230f6f96163aac2fdf08879ec64379b7845839bc88a SHA512 629d55da71c7333f41f60a32e2880deffcf80088096af1bbc8c572b80ef21d851102fdebce56f77245ed60822ca98e02c0867b192abef496a2313fde54a97bb6
+DIST libcdr-0.1.7.tar.xz 618528 BLAKE2B 7e74b1936f80078f4b0a07e2e37f9d59489ad27acee66175032ba7250ab492310e4042c7b6d7995b1ffffee7da1c7562f5c2fc24457c3efe0b19fe7e00d8e42b SHA512 9af327fcf9f3f3ef1c446e92f4d2ff06ebaccb54d4c65b021960a212bf416f7098006324625f3e1c00500597eaa9da39832cc27b83a6cd593e97b76b1eb63d38
 EBUILD libcdr-0.1.6.ebuild 1152 BLAKE2B a59172d3b3950e253f94c167f6398ff1587bc268d528b05b1f8d3c112369c1c04ba7413600b5a3d897b5d287909ae721707ccca17da7c5c003acd902b4e46e90 SHA512 8ae02a13f6ab9e0acc47821afc731c6a7d04991b99248c9cb1740f46753601d6977805ce339e5d64cb3638a4bf93f8c1695bc3b602b8f802ea9672fab67efba3
+EBUILD libcdr-0.1.7.ebuild 1099 BLAKE2B ec4c040ff08e55e36a99ee0aabc127164cd2c461c53f7583fe3b09995f3712fb2c3dada933a380572d852aed9edd0fdaa2f670e2f878d8f1d5f2ed47ef406f2d SHA512 74abfd3de4d90dd85d43216d92f2f3b537244e9c875eeb54c005eb74540adc189900988d08086e9dddf0b890df2f53f6d5dfc54494499a0145a0652300af75ab
 EBUILD libcdr-9999.ebuild 1099 BLAKE2B c0ca8298f6f3d222a9d94bee445be4f079bfe381db7b334a5dd3146096938b637e454383eee00f8dcdcf3257264e2be022f87f4693e864cb50489c669c771498 SHA512 2f505734658a48e57552aebf7d216a737443712da0178500a21bb6408212adb55e4c20c914b4b8e1cc4f739c90b1fb1655bc6d17b5cf056ca05bd2dcf6169545
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libcdr/libcdr-0.1.7.ebuild b/media-libs/libcdr/libcdr-0.1.7.ebuild
new file mode 100644
index 000000000000..fb7137dfd9bc
--- /dev/null
+++ b/media-libs/libcdr/libcdr-0.1.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Library parsing the Corel cdr documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	media-libs/lcms:2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_with doc docs)
+		$(use_enable test tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index 170158a5a38d..12d7b77ed579 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -1,6 +1,6 @@
 AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac02d00e78903654ca68a4bd3093cd9216c3911eb35223931a6dc69edf248f4952d17d9549eb4a8a9507ae973e83b SHA512 cadc239c379c271db9a62c7a314607612e9b43a18a605e414b9943b962a65d6b760a2558917a2259a3875a07f61adc12a8c2d8767cfa76ff4894f02a0842e383
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
-AUX libdca-0.0.7-slibtool.patch 864 BLAKE2B 67e8bc01ae9b6911215d25eb2bf86567332a11410e4e755d532d19efbb6b88bcfb0d7050aa4e25aaee108ee00f9ff1faf1bfd7c89e131a0b3438e68116dc5dba SHA512 65bc66482da55b2d08812819789e9de56ae019073b57f462fc0ffa86e5dc033daea2f25817f08714093511fa3a5a7d57fb72cd75a9aaa847721fdd0ca1c120f6
+AUX libdca-0.0.7-slibtool.patch 956 BLAKE2B dca54165d2fd4a4036bd021786e11c5ab1a57cf94cfe1c02d2dae02778086dc75e8e8445a31248c0f00f2cf568dce5e9e679e6a2a3e9b8c82d4d9284f589c527 SHA512 d7722c739a10bad42695e909559b62863ec07df4021465777cbfd276bcfb49e761915ecb5da00e88db10b21291b9320ffea128a0f0d488e6cc25db909ad0cce1
 DIST libdca-0.0.7.tar.bz2 158232 BLAKE2B 943ef3845f6b73d3d7a2cc47fd3c59517544c156f46e1be42b7940e11a164d8c533ba0e1436ea7bee95467bb7fdce95bb390e2816ebe7d8e208821eb325cb9de SHA512 dae15d77d066687c882833d5bed8d65a585c1fc0277b7276563c89ddd5a83b35389ec94cca445f38af28a9b01430b72647e9afd1b08f030959e711de1a08924a
 EBUILD libdca-0.0.7.ebuild 1364 BLAKE2B 56b893da56ac8fae8e7d21302939fdaa226f97bb95766a797482ab6ff41c3e7ff307a72921516ac3ca7c28f72b31fd1dae499352bc44736806971b89eb290d38 SHA512 c790547b7a2eecd94821dad401a26e1fbdb9f2ba2acc3127918e10119f25ca8dcc607c115678b19662c038ed739fd4dab89a16e98e31253543f5c3b8d95cb4f4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/files/libdca-0.0.7-slibtool.patch b/media-libs/libdca/files/libdca-0.0.7-slibtool.patch
index cd6b89d060e7..785edff9805e 100644
--- a/media-libs/libdca/files/libdca-0.0.7-slibtool.patch
+++ b/media-libs/libdca/files/libdca-0.0.7-slibtool.patch
@@ -1,4 +1,5 @@
 https://code.videolan.org/videolan/libdca/-/issues/4
+https://code.videolan.org/videolan/libdca/-/commit/95c4bd8baee808ec563120f463111e2cd6cd240e
 https://bugs.gentoo.org/775602
 
 commit c54898d587fda740b10e32055c5464eeae289889
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index ba8d7d45591c..43ffd8bc16ae 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,5 +1,5 @@
 AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
 DIST libde265-1.0.8.tar.gz 381963 BLAKE2B 0577623de2ef86e1122b5b5c3642a750bb222c4988a996168e060e8ffd9f5c0787d31331cc8738362d3fc3fb31e8eb659629cab068f0ff1c71de9d15ed1f2ceb SHA512 0007138cb5da0d4cad1e118c01de249580f39c387a11f490d1e1f63ad0968ee2f7951e54580f298b3dbe31e5a3d1a7fa04454e11cbb82beaf8a9aaf56f5532ed
-EBUILD libde265-1.0.8.ebuild 2352 BLAKE2B 52b9cb1a63fb38b4ee07f2bf085597948a7b93bd3e2b05a62823164babacccf001dcfa9913178c4b21b6c13dc3193753497bd45e7bd1fd9725d70e1624bc3523 SHA512 080e03a4541a6e1e0934f8f49793b2f679bd6ac3662a1ef0e2ba00bc0ca95bd146275bcb95a4282fc4b10296fe1e9b3ab4803993ce0783def4c42f4d129f4263
+EBUILD libde265-1.0.8.ebuild 2351 BLAKE2B 1846ded7d2ac6d8caff86bc6141dcabf309c05d2cfec1ee41155cd4ccf4bd05047a7624222732cbe82a618a12c41d1c8d0a332a55649f9b0b75e7be960e6c9b1 SHA512 c5cec886324f8a0bacac396dc26109104fe228299d5a1e05a45be8c95c40cd91b6553f14b9b935adabf2108cd176d98d47300a04bf187363e28adf22250df00a
 EBUILD libde265-9999.ebuild 2355 BLAKE2B 2b0701a6f2c9c2bb24e08fe76844c613befdc9bf16c81695b3ae2e4dc8db3bf58225ad5897e5072ad1ad3e30126e89ca829338812decd31c663ca0530b501d82 SHA512 2605125ee6c33605f6a03282e3c51b1577eb9bc124e348f8a9b197a5dfb5a4698fa3752baec7baf44c592f998b48bcc8125423a83d45e648a577ab8f2505c337
 MISC metadata.xml 660 BLAKE2B ad29eca8291fd1d09bc3964b23fcadb61d952be12dc54ea451e1b420ce158cc05b97a549bc2d98e62747d3d26765785be1e3249cfc86838fe04f2a62553ab335 SHA512 bd446c5bc5317e7ecce0a0f910d23efc65fe61f6ee81d13e7c2a813e09c773e2d35b3d8deb57b89ee171feb88b86e64251c4680010461313f9e135f7af95cac3
diff --git a/media-libs/libde265/libde265-1.0.8.ebuild b/media-libs/libde265/libde265-1.0.8.ebuild
index b5e48bb7b823..d532ac429877 100644
--- a/media-libs/libde265/libde265-1.0.8.ebuild
+++ b/media-libs/libde265/libde265-1.0.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 2908fe34700b..891af4bce79b 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -1,6 +1,4 @@
 DIST ebu-loudness-test-setv05.zip 91631421 BLAKE2B 95a345b0700893ab96854c7563ecc9c667db30e8137352226d1f1ac7a666f6b08d1748d88ef11f72056d0a4bd513f365a1336de568ea45917a6ba9af5bc526ea SHA512 60d022fdac47ad0be2688411be9daecbff85da994d6fa4921bba6cffab841b081d8b15d9ce284ad2253efb686463450a84a0d19cb0bad7a934546cc52dd73771
-DIST libebur128-1.2.4.tar.gz 23140 BLAKE2B 4095a11b976109c82ffbd133d5e509b60a2fa27871982d4a81c1927cb23783e89f907bcce52e78d3c743d1e41d1bd823b9b7b510792137649e4b3b680c93eca7 SHA512 d9aec133aca9240f7e859aae30cfcab07ba7aa20378187d53dfeec4cd3840d49bb117fa0698591bac04d95f9d8b5cd0b1fbe41c364694f2fa8267dd690b2dc02
 DIST libebur128-1.2.6.tar.gz 25890 BLAKE2B 8f497091d201f05efc02c423ac3e83e9d056c11ac0dd67cc89d43b7d50f1a28f22ea0f35d329e6f7c8e3df4fb1f245e729fcf7201bdf0c83477211f67472fd00 SHA512 ab188c6d32cd14613119258313a8a3fb1167b55501c9f5b6d3ba738d674bc58f24ac3034c23d9730ed8dc3e95a23619bfb81719e4c79807a9a16c1a5b3423582
-EBUILD libebur128-1.2.4.ebuild 999 BLAKE2B febcd841988f5d74572a2650aa9988d6b9c4fc4437f0173d4a126d68b911662be02101563cf9eea82681004378509fa6152d3b172a60113c164ce0eed886e79f SHA512 01e7974db9c780d5653dead79759463680f75bbd84b590aca82bacb2d465f01b20bc5971befb10bf9568dd632b85058891d7970587b0ebf5f20a91e549bb5159
-EBUILD libebur128-1.2.6.ebuild 969 BLAKE2B af5eb618043df7fbda6f48a43b2d3c93144cb0167d9baf8ec6fab93bc2d8ba898d49a1af0bd69c229c21275da5896b443cb6685a583a7a905a4389042675310a SHA512 4f51791f4f5b34e7e1ed6c40c5086995a3243137d8631196acd879a47c8034dddbe85e586919732d3bb303b6a15f5e604ab143bbe284369375549855857e821d
+EBUILD libebur128-1.2.6.ebuild 962 BLAKE2B 4446d4dbc570d0e7e7c4ec2b4e05a8c29715047f3f3738fa11f3baf0ac5f3db2d6f4354a443b672cd321bd21fd54ae025fd410adf75eeef06a8e09dfd524e363 SHA512 e8714b42aa28df8f8cbdd1cd1f7a08939433cf6560020e7d1cb8c51192385085475356539b650d7aa09c551de21e840b99203d044e26f2d037f2d119d7e1f0dd
 MISC metadata.xml 613 BLAKE2B 2c03f77d7bfec26a031ccce628f06d91621870a1f557c9dd09cb8ca85443523268a6ee87ae7048efbce6f934c0e1f4424886e453727b150e2e5570d63167bec2 SHA512 58133a2f99fd62b3fb5da2be5351648d12dc3e8046dcc9a4cb65211db9990f7c5fc46a728e85a588c859fc2ce1dd452fe83d3b677e59631ebaff47a5cc67439e
diff --git a/media-libs/libebur128/libebur128-1.2.4.ebuild b/media-libs/libebur128/libebur128-1.2.4.ebuild
deleted file mode 100644
index bbea82445b4f..000000000000
--- a/media-libs/libebur128/libebur128-1.2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="A library implementing the EBU R128 loudness standard"
-HOMEPAGE="https://github.com/jiixyj/libebur128"
-SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( app-arch/unzip
-		media-libs/libsndfile[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	cd "${WORKDIR}" || die
-	"${BUILD_DIR}"/r128-test-library | tee test-results
-	grep -c "^FAILED" test-results > /dev/null \
-		&& die "At least one test failed"
-}
diff --git a/media-libs/libebur128/libebur128-1.2.6.ebuild b/media-libs/libebur128/libebur128-1.2.6.ebuild
index f031bb7c263e..2f6ba7d05ebd 100644
--- a/media-libs/libebur128/libebur128-1.2.6.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libeot/Manifest b/media-libs/libeot/Manifest
index a70efaea374b..00c05ee634be 100644
--- a/media-libs/libeot/Manifest
+++ b/media-libs/libeot/Manifest
@@ -1,4 +1,4 @@
 DIST libeot-0.01.tgz 38651 BLAKE2B ba8362035dca9db2adef636ce153f4fd1d75c20cf0f9671d6f1aa64e055dfbe7644811f44751e11eb4660f0902c14b66be8cdbb45c85325bfd5dd5b37e388b15 SHA512 ff8c3d92b948159171c76306d4a74758974c7ee26c801c5de48805f182b542015286b1e53cfc6dc4524494becb74fb55185701e06fc9be7c16f2d89ac0275941
-EBUILD libeot-0.01.ebuild 699 BLAKE2B 0c11508aa73202b5d6c7f13f0b727e75a2c47a7ec29925924f8aeb0f7a8e72e3c2ab41a4a86a0d039ccdbf3ecba815c93a07df04e038d4f9f276a9b99888fa0e SHA512 320ec7130a189d83acaf070d33afd43e887be53cb04d26a43a84343ef9d4806d20ae10b38ecbfe028e28bfe8b2d95d3355ad7cebe4349caa7b1f666974c1aa22
-EBUILD libeot-9999.ebuild 701 BLAKE2B 86559b59fb7277b41c41fc1946ece801593d14efe3f5e85764cffa7298156e05985bbbd2ee4c537962a053231893cf57f1c4a3781ed435878c4f37bbfe085240 SHA512 69703795571e69821014e21606cef15e2078266b19fb052b2bd7d407127467182b2a4595a991542900337ae9c37a2fd2325a33f48996cada59d937ae1b82912d
+EBUILD libeot-0.01.ebuild 692 BLAKE2B 330378073ba083447521e6ad0df638e00d68d3672046cbe84f405eb610c9eedf2fe96cc2df63ddcc6e24e4b81821998259f69a1172466f1a7d27ff31a5625620 SHA512 c5fc592ea03910988818f53aa2673fdad231d0e86a1a7fb1d8e2439702468ac5395f7f200e8f7ec773d24722ecb79ed1bff30c50818b390221540122ce95bb4a
+EBUILD libeot-9999.ebuild 694 BLAKE2B 0da7f2e8f4b4628da94c3c9dc65756c6bb10934e2e6cd3421c66988a9c563c32f10d423d9aea202e32f6839f3c49a20478a1a9f47c65c8d17bb72b022d51abae SHA512 7f5b14ce36569857ed1ae14df8d927302fe2cdd3811f389ea2fd78d6deb914e584b3122a27ee8e6c4c6f39052d0109476f573c93ae2173047391a8e96f145fbb
 MISC metadata.xml 337 BLAKE2B b8636ce208e245d250593a208f1a771817442b9270a374a4338769a06f17986f677339e76fd9b803944df5dfa4e7705fedfd5704bbe923e86473d04de95183bf SHA512 699d241b170761e48b15613479a695561576c49eb850e79952e920cba10c96a7cc8fc1dbb39a94095b1298c5005dc0a15e646826ea6924163b53d0c1a9eef14b
diff --git a/media-libs/libeot/libeot-0.01.ebuild b/media-libs/libeot/libeot-0.01.ebuild
index 4c39bd19e789..0ed17956bad6 100644
--- a/media-libs/libeot/libeot-0.01.ebuild
+++ b/media-libs/libeot/libeot-0.01.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 EGIT_REPO_URI="https://github.com/umanwizard/libeot.git"
-inherit eutils autotools ltprune
+inherit autotools ltprune
 [[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library for parsing Embedded OpenType files (Microsoft embedded font 'standard')"
diff --git a/media-libs/libeot/libeot-9999.ebuild b/media-libs/libeot/libeot-9999.ebuild
index 49cdb315231b..735af859bb04 100644
--- a/media-libs/libeot/libeot-9999.ebuild
+++ b/media-libs/libeot/libeot-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 EGIT_REPO_URI="https://github.com/umanwizard/libeot.git"
-inherit eutils autotools ltprune
+inherit autotools ltprune
 [[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library for parsing Embedded OpenType files (Microsoft embedded font 'standard')"
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index e6b6cb50edd6..6da4ea6265cb 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,4 +1,4 @@
 AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241e098f801f0dd1a471427127c99f56945836ca679b14c2bdff3a85c3be32d399bae871911742fa1ea0c74c8a2e50741ae70938 SHA512 a8e9793f78902317fa2aacc9fc61160579fd211f6e36ae817afc1d8963c60eeb930b0f4574bb855b75bfbfa1b678882773b581db91462289132cd44bb2b0be6e
 DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4
-EBUILD libfpx-1.3.1_p10.ebuild 988 BLAKE2B 88ccbfcecab4996b8d020faceab7b9a05f3946ff458492e85e95f38e6c4d15a4c7cad76a773bdbfd759b23bcfb75ab621d976df6e0e0bed2a957dee27ffd597e SHA512 414910d3d95fa40a38cd3ad8b90f3f542cfd12f79589de2250f585733cbc9cd8ba4254665b860d4e9ff453899e40853d94ba09c37079c9cccbcf376cc92f7536
+EBUILD libfpx-1.3.1_p10.ebuild 981 BLAKE2B 298fce7edd22f8acaf89055ba9df0ec1a1d6ab93bfb19d291ed14f9c2aa0d5e3a0f8623743f9594a4b9ce8a6de8119baaa433dd0130c20e6ec4dee8b6de4bd51 SHA512 f5a070e31f50b2240c665f18ed6aa996aec8e5ed9572efe3cb03155ed94f464e092a154aaf6c6b5415cd9c86b691d213f18ceba40fe8e905e0aef863d803722b
 MISC metadata.xml 333 BLAKE2B ded0f3e7a01b6a7c6b9073b5970f4760cde2230e21dc53ef3285cd9a69aae162acdaafe34aeefd66a7f4761cf54c62889cc990cdb1de9404df7a14d30eea91af SHA512 ea962485ec3f07a7d60d17a16dec78a249b76007e51bfac544028d343634b981077e6bf9fa72499fb504f2412661acafbfce47d5ceb87701c68d54e43f606f4b
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index 89ff882c3f76..5d056e5f60a6 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic libtool
+inherit flag-o-matic libtool
 
 DESCRIPTION="A library for manipulating FlashPIX images"
 HOMEPAGE="https://github.com/ImageMagick/libfpx"
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index 19e20e93713d..b2d10a1fdb9e 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,3 +1,3 @@
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
-EBUILD libggi-2.2.2-r1.ebuild 1356 BLAKE2B ad7c721fe537ad910d702c4224e98f6234da8b62f878f5231f412dd1f657b2d9f58134b26ad40712a7ec50eef155465c092ffe3eb008c27db26b8cf4a8d07018 SHA512 d3beb9b702d4e796907b71438178d4a90b169bc34f945c8688586a726d836bd443e4320485fce79889f13fc892073c9c42a44a065c9a7dfe02f28cb49e5cf2d5
+EBUILD libggi-2.2.2-r1.ebuild 1357 BLAKE2B 2459c19e1dbbaf17a022e37ba8af42e87131efe235fa179d4fe6090e0e5b45136a0aa4f4672cdee6dd355f6e2482df476e60bc31d01bb73b6213ab306485b7fe SHA512 1313cb8e025037f24a2e5a3df130339b3fcaf5f06b40f3b8906585af21ad0b917222f800d24318ff50c912a4886d7443f9928706a5ce5f9bd012361a06a1ab12
 MISC metadata.xml 484 BLAKE2B ab01b03cd27a489e6665bef5c38e2468415ef4790cf785cc77dcecf7cb449efe72b13df3fe29743ea37efb7d09d2d371f8dd4a26b9dd1489f06c6c8ef3281507 SHA512 3473e065599be786c0707dad290283abef3e977b74d7559c81b607a4ad9daad2a392d306ec83b9edc4720310983483e9d30f5cd4492ba0f367ecd9b0d477c41d
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
index 0602ea31a216..e662b15728d5 100644
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild
+++ b/media-libs/libggi/libggi-2.2.2-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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X"
 
 RDEPEND=">=media-libs/libgii-1.0.2
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 294c919b9e36..3bcc816e3aff 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
-DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
 DIST libgphoto2-2.5.26.tar.bz2 7572381 BLAKE2B 671ef19b1d427a4c9d31bb383b4b0513a6423780910a2fabbcf9d9f45e9060a833336fcda0ccc6456068a702e94f1fffeece41a6f08b882f4e1e65b317e69c52 SHA512 d05a559447ac867f4826d2e20b83831dc4b4776c1e3edc9de0867050a4d39dc45b25a33ec73806282e16f75adb1dded3b59fe428bdb1dde4365c12d7af244cec
-EBUILD libgphoto2-2.5.22.ebuild 6170 BLAKE2B a83709b54295c4994ca246aca207bc5376688155cc29f3d6df086718a7f0dde4db7e9bcb2aa3c686b76ead993e806b1b59dc9754292a6c287eb4d237e9d5f365 SHA512 fcc78f218b711f4b363cd3cfa72bb6dd83ccee3e7656e4382a8160021269a4405429037d387bf0645779603430fe292aa8aed14cd10ad54565ae85c4af9dfa28
-EBUILD libgphoto2-2.5.26.ebuild 6156 BLAKE2B 01413add0b6e6fe0ba35b79109d2e2fbb2a9036410aa3deebd7dc7a4f890c0abe2d801e4436756215764becb14ed55862854f283c67755993d708c980db17293 SHA512 a5dbad3cf94cb0a4c0b78ee0f0f506033fd18dcf6318c3fd5d9c31725de7dfa24796cf91e6acc799d9ada7e5def8e9a70ccd6c6b3e6bb6400c0542ab07ab2d0e
+DIST libgphoto2-2.5.27.tar.bz2 7540660 BLAKE2B 6fa2d54497e2162b8e9a4be17a8fe74c6e13ccf15d8fe873649c4285188d86e45cbe8359572bcfd252f1abce28ac327d3333fcb62ad958e6f992c9e11fff4fb1 SHA512 7cc82977e62034c539c7e62bff62ee61a299d3adb0c42e88b8e5521e75eedbc22437b9520af8a4bbd7dc0639ce5a8a10b1f5e5e8075e9b73a566da9061c958f8
+EBUILD libgphoto2-2.5.26.ebuild 6151 BLAKE2B 98707be43724f61f931e84fbd9da9d07afd3447ddb0403a98c64fdf35ad780a509bf6c6028c9cad7063497c249869a97002d7b11a08772e661216ba8ef99584a SHA512 b0296444ffc649971aa4c7910cac202ceffc6b162a78e626382f7760f055c1101645877045aa8d23ffddd31b7098d2c4644ebc003390268a2e0a87086aed4cd7
+EBUILD libgphoto2-2.5.27.ebuild 6158 BLAKE2B 7ccc8bc4e4eedcd708591cbe0db5427dc88cb4aad27ea8d7b45b9ff41b4c29dc02ffb0a56ab06dc4eb276ec0a17945fcaff5f49827050d443aa7695ac2ab2a9b SHA512 e26b29401d16ba123a8509bbc44ffc0d0b946fdc462ab88c0b4d3d14b9b143d009f3301de86a6a6e2127ff8d4112928db125c6462dfd6ed1cae601d891d74d5d
 MISC metadata.xml 400 BLAKE2B 2c435dd678051ca73f903a55574f62c9f6b71c17717411f0b6c201e80694d3efd88520d010898725197e9915ed0a5d486a9132dd4a33bb4f5285c3812f114e95 SHA512 c4cb0fe1a6bb6e60ddac16dfaa17d7131dae260ee6bcecdea7fee2e2cecee5b3c1ffbe44ac36e7f48af1085fe0775c47c46b05be5e074a0893fc2fcb1548d632
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
index 22c68ebd81ab..195c78aeac27 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.27.ebuild
index d45dbc32ba06..51ddafc86c55 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.27.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
 #    https://sourceforge.net/p/gphoto/bugs/643/
 
-EAPI=6
-inherit eutils ltprune multilib multilib-minimal udev
+EAPI=7
+inherit multilib multilib-minimal udev
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
@@ -60,9 +60,9 @@ RDEPEND="
 	gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
 	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
-	!<sys-fs/udev-201
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gtk-doc-am
 	sys-devel/flex
 	>=sys-devel/gettext-0.14.1
@@ -154,14 +154,14 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 
 	einstalldocs
-	dodoc TESTERS MAINTAINERS HACKING
+	dodoc TESTERS MAINTAINERS
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/README examples/*.c examples/*.h
+		docinto /usr/share/doc/${PF}/examples
+		dodoc examples/README examples/*.c examples/*.h
 	fi
 
 	# FIXME: fixup autoconf bug #????
@@ -201,7 +201,7 @@ pkg_postinst() {
 		elog "if you want to be able to access your camera."
 	fi
 
-	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
+	local old_udev_rules="${EROOT}"/etc/udev/rules.d/99-libgphoto2.rules
 	if [[ -f ${old_udev_rules} ]]; then
 		rm -f "${old_udev_rules}"
 	fi
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index cc534b505767..db3cf87d3cd1 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -1,7 +1,6 @@
 AUX libgpod-0.8.3-comment.patch 611 BLAKE2B 6ed4cfbb6ca1ca6876f835bdad2b9d11a8ad147c0f0f584436791fa84e40e15dcbfe163a47dedc688eecf4db84610df81ab01ae2c1266324a8cebadd914627e2 SHA512 a9d042745d8095a8188e57d82c8e1b00acb41f45da1510b2615d29b607b52ae49e54d3482e5021d085501f3705f4ad0fa79796cd4262c74acd0b4f34f8450a44
-AUX libgpod-0.8.3-mono4.patch 334 BLAKE2B 06b76b3939c6b38e9b9bab8aa0d5b471a04032976ed9a9f53c690cda9bc3e19ba63a08af0c9e0929f184ba20cc20409826493c0be51e4d4d0b95f73ffa50006b SHA512 293e1c72b60175d4aa5d092955fa84f53120461b39545bde0827a0c76b583f22d14a940534c4a5b79c68edf00250d81dab1524accbc6f4eb2e487afe399c324c
 AUX libgpod-0.8.3-pkgconfig_overlinking.patch 640 BLAKE2B 74d924d61ce33c4fd0219e8dedb505bd66cd40e9912efb2dbbb5df31c2bea943ea4a4eb8b9e9baf2762966b02efae3f77c73293f8a4a581f6a43be4cc22eb727 SHA512 c8ebcc18ba7b44aef8fada3f9fea88fdaaf6bae12cf809b08f98e85ab6396ae032bfd7706809cd266be67c694749d4364a9cc591eb750478e095cbbcbe061419
 AUX libgpod-0.8.3-segfault.patch 1171 BLAKE2B ae8f00ad8708f23ef83c9f03f5e9a7157c2bdeaf0cfa2ed4542f8cc96295dad0200e968cb180883efa0e93fd180088be84fa0d2f1b40c642ada0caf37f7f3b9a SHA512 9b2f9a4f4e8f41e5d11cbc943cbba915147b81ec66859b62a5986b5d1c5c90526ce522e24499daf3378c201126ac6e5da8ef855a5f2353b933806c5b3aa6effb
 DIST libgpod-0.8.3.tar.bz2 801903 BLAKE2B e9bc54d23be7f54a17eea3f8a07d7bf6a28224d9c0b0f90fb9d44d97af6cf64c31096de5d9fa4b446e1a9463a6e8f3a59929d73bf52ad8d638732868c3c1b7d0 SHA512 e39f22054c2d2bdf5fc764aa1f692de17a1a06c7c7e9c60883d126b216dacca7840bf818e7e7e039218fe2a64c0920ba96d8cbbe310e11c1c4e68b82e7cbbd8e
-EBUILD libgpod-0.8.3-r3.ebuild 1636 BLAKE2B 41434a2a6e95737b25677378192badd1afff279562b3c85ef1523909287ed3886ab909d9968b47546d7bf7d91c0de4910a7d9a2ae86097ac0bb4309b8d80f6d7 SHA512 e7fee7000206185411dd6d203b952e192e39d174c986d0b54c1bf4700d9f72d8b2655f5edaff79b08f3ffdb97477b9aaf83cf600d7ffb01e26143c5b9acdc967
+EBUILD libgpod-0.8.3-r5.ebuild 1442 BLAKE2B ae8cf010fd070cb8606bf68f86b62026117c963ae171df07f9fc349069b5d4ab8529f9fe7909aff745189f1927deadd3a33e4bdc92581ee80678fc55567d5f4f SHA512 78debbb5e4f2cc5be53339afdae48c54491639c9e77629dc0e7b1f9fbf50c4859b2d02e0b964c6cbf6af85f5f5eb2374443e5d5bc7972ef4338b2214253d3398
 MISC metadata.xml 483 BLAKE2B 39ce660cb10293f1a9dcf4eed9e253c85f8c2eceb17fb380d61fa5a189c3e2676917b7482676c884ad388a84b36c1e915bfc4a278f3b9c90a79f1d3655c08476 SHA512 0cf6044e1a0bbbd172d3421b4f1eab9a7334cdf1d732f6f61e689fad2d998bf302cb5436e4a695ad9d1a1beaf5939cd269b643db4b4edc2d869469a20c2f2827
diff --git a/media-libs/libgpod/files/libgpod-0.8.3-mono4.patch b/media-libs/libgpod/files/libgpod-0.8.3-mono4.patch
deleted file mode 100644
index 9cb57b464ffc..000000000000
--- a/media-libs/libgpod/files/libgpod-0.8.3-mono4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgpod-0.8.3/m4/mono.m4.orig	2015-05-18 12:25:35.417699745 +0100
-+++ libgpod-0.8.3/m4/mono.m4	2015-05-18 12:25:53.488079557 +0100
-@@ -34,7 +34,7 @@
- 
- AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER],
- [
--	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, gmcs)
-+	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs)
- ])
- 
- AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
diff --git a/media-libs/libgpod/libgpod-0.8.3-r3.ebuild b/media-libs/libgpod/libgpod-0.8.3-r5.ebuild
index bdbbcf9a5bc2..3cef30ca197a 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r3.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r5.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
 
-inherit autotools mono-env udev
+inherit autotools udev
 
 DESCRIPTION="Shared library to access the contents of an iPod"
 HOMEPAGE="http://www.gtkpod.org/libgpod/"
@@ -12,21 +12,17 @@ SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="+gtk +udev ios mono"
+IUSE="+gtk ios +udev"
 
 RDEPEND="
 	>=app-pda/libplist-1.0:=
 	>=dev-db/sqlite-3:3
 	>=dev-libs/glib-2.16:2
 	dev-libs/libxml2:2
-	sys-apps/sg3_utils
+	sys-apps/sg3_utils:0=
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	ios? ( app-pda/libimobiledevice:= )
 	udev? ( virtual/udev )
-	mono? (
-		>=dev-lang/mono-1.9.1
-		>=dev-dotnet/gtk-sharp-2.12
-	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -40,40 +36,34 @@ BDEPEND="
 DOCS=( AUTHORS NEWS README{,.overview,.sqlite,.SysInfo} TROUBLESHOOTING )
 
 PATCHES=(
-	"${FILESDIR}"/${P}-comment.patch #537968
-	"${FILESDIR}"/${P}-segfault.patch #565052
-	"${FILESDIR}"/${P}-mono4.patch
+	"${FILESDIR}"/${P}-comment.patch # bug 537968
+	"${FILESDIR}"/${P}-segfault.patch # bug 565052
 	"${FILESDIR}"/${P}-pkgconfig_overlinking.patch
 )
 
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
 src_prepare() {
 	default
-
-	# mono-4 fixes from Fedora
-	sed -e "s#public DateTime#public System.DateTime#g" \
-		-i bindings/mono/libgpod-sharp/Artwork.cs || die
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable udev) \
-		$(use_enable gtk gdk-pixbuf) \
-		--disable-pygobject \
-		--without-hal \
-		$(use_with ios libimobiledevice) \
-		--with-udev-dir="$(get_udevdir)" \
-		--without-python \
-		$(use_with mono)
+	local myeconfargs=(
+		--disable-pygobject
+		--disable-static
+		--without-hal
+		--without-mono
+		--without-python
+		--with-udev-dir="$(get_udevdir)"
+		$(use_enable gtk gdk-pixbuf)
+		$(use_with ios libimobiledevice)
+		$(use_enable udev)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
+	rm "${ED}"/usr/$(get_libdir)/pkgconfig/libgpod-sharp.pc || die
 	rmdir "${ED}"/tmp || die
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 033277b7f2d9..57846edc45a6 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,8 +1,4 @@
-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 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-1.11.0.ebuild 1829 BLAKE2B 79717765460165bad32b30e4e6ad000cc5436b516c62415e1b4d8d885fa03f894394f5b2e9e60114f2b0d3edfed335ee5c5de1ceb01f09bd2fbeb2cc3e29bc5e SHA512 cec879361ba3869c151da18a27059055d17466fb49bcb3d88121c8aa940b36bcd08e4ad2c9c684cfcb87db1800af23b61dbaca3d02ecdbf39a1843056c96a496
 EBUILD libheif-9999.ebuild 1833 BLAKE2B 0d7fc59c209a62e3437d30a21ad587cf74a6b32f12a71349132a380ab4ba62e31a20564c3ffad60c9ed307b20d75e222c1e93a7b76624f4a07147e8d387fbb87 SHA512 b525e20e676dc64b9e798671bf52035188e16e893cca79722b350ac31057e223b32cded88ceafaf52a94290b6341ed65109de9324806008575ab28a07ee6478b
 MISC metadata.xml 1038 BLAKE2B c04c4e8ef4df16a22ab34e87ab9142f00243aec2e471a17645ae74b9159ab7092c396cb65131c762ab5b102bf510b3859f4a9e36870cb10d254614ba8fcdce95 SHA512 fad35ef040ebf936350bf75195aae4a8ceb42472f5243b5e3e6afa170a5a9d4c4f2e6fb93d6674c13e27051261f210f24b155f6f666f3a9af896726906280d31
diff --git a/media-libs/libheif/libheif-1.10.0.ebuild b/media-libs/libheif/libheif-1.10.0.ebuild
deleted file mode 100644
index 1dbb452f4a4d..000000000000
--- a/media-libs/libheif/libheif-1.10.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.10"
-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-1.11.0.ebuild b/media-libs/libheif/libheif-1.11.0.ebuild
index f85c234173f7..8b2e59db0e89 100644
--- a/media-libs/libheif/libheif-1.11.0.ebuild
+++ b/media-libs/libheif/libheif-1.11.0.ebuild
@@ -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"
diff --git a/media-libs/libheif/libheif-1.9.1.ebuild b/media-libs/libheif/libheif-1.9.1.ebuild
deleted file mode 100644
index 49f02ffbc2bb..000000000000
--- a/media-libs/libheif/libheif-1.9.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 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.9"
-IUSE="gdk-pixbuf go static-libs test +threads"
-REQUIRED_USE="test? ( go )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-lang/go )"
-DEPEND="
-	>=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}]
-	media-libs/libde265:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	media-libs/x265:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
-	go? ( dev-lang/go )
-"
-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() {
-	local econf_args=(
-		$(multilib_is_native_abi && use go || echo --disable-go)
-		$(use_enable gdk-pixbuf)
-		$(use_enable static-libs static)
-		$(use_enable threads multithreading)
-	)
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_test() {
-	default
-	emake -C go test
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 125108291850..60951ed50e8d 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -9,5 +9,5 @@ AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 583 BLAKE
 AUX id3tag.pc 222 BLAKE2B 3ad47be06f4752c8398f12a598e2955e8164bd633681995aa1aee925a335a0f8472a91288a13374ce8db6b1c554b6c1077c3ee1b6c713e455136f9ed0dc91142 SHA512 591fdff509376a3afeb43d6dc7f9063f2388d024494952d366dae2ba8ffc3d2d5e430e0ad7470951d6c740f794529994b882d12840ff06d2fffffe70c2feae84
 AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3ee3a6f1c95c840f7103116f9ea3ef805c5aa186c2c87747f02cb67fda1e4c13c806c5a0b32b304c2f66941fddac0942761b62e SHA512 3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
-EBUILD libid3tag-0.15.1b-r4.ebuild 1641 BLAKE2B 5e9bfc1aa7864a5d0fd299bd2a0117e38fac5ca70e3aa0978d152dbded7a0218113b8752389b7f4edd8bcb5184803176351bb6adfd338002919cbbe1d2fb5807 SHA512 4444cc1d65f75d25ce3a5739cd802dfbabccdfc2f18fc67d343fcfc57d24cfbe472e4ad21319f5c86faa868351eca2963aab744cbdf58ef88e109ce7e0da4bca
+EBUILD libid3tag-0.15.1b-r4.ebuild 1642 BLAKE2B 51e8c4a9995cd51aa53df3db28e499e11774b49b1faed31b9113752259b437886862aefe7d7bf22527318224acb611b9198db4b15a739761549bb10d95ee8c2f SHA512 cd3d4a42fb872775ed0944871e20cb8bf9daeb73fce4d421bfcaea80e0baed9ed491aeb91918b8705e996f0990103964d7b502db26588edee5e524f48ff8f429
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index 538b52133549..58fc3dd68d63 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 294cca031128..aec8de98a74f 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -4,7 +4,9 @@ AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca889205
 AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
 DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd83f6548f267033969a6a26830afb24ae96c8ebba8407e4d2ded76da66a535ed59e249f64ed61218055771e5db9491514f SHA512 504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c
+DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9c4fd370c5ec4fc0dc3696ead7b4cd031228aaaf0eef3ceba194bb96bac6134b9c951162c0b81e88637edd6e71f4577f7 SHA512 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
-EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2986 BLAKE2B ac2af06f2cf40f1f8ada21d841a46d8ba6fe8908ad19e9ab9e7c1f1eb607446f466e1c7aa79aedf856e08241ad6b61c7fbc5b5768b5a7ebf6d0fb481bc77332a SHA512 a6cbfbfbc7ccf0fd7f5e96935a378677f3435de7c3fd260c5912cabcb68a6820b18ade6347f8bfd9495ed4df5d7d5e4c944a0cf1f0021bcd71073925b3151cac
-EBUILD libjpeg-turbo-2.0.6.ebuild 3074 BLAKE2B 28d83accdf1be5beb235cc6ada2b57eb4a3dca1fbdf20acedfaa979e46a90aca50d5db2577a4127710835db7f957e4c36c35859cee0dd98198109f4c692da447 SHA512 188498e6272f6755d00ed8b17dd214b821111b5624e56d48669052650377671111674f74fe393e79e66da6384364eb4baa90a9f7fa678b7eea9ec78d17e493f5
+EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866
+EBUILD libjpeg-turbo-2.0.6.ebuild 3051 BLAKE2B b85cb9cb4ad088928d5c8e81535c58e47948df44a0c3bcc887303fbe68e053aa2cf5c7a66c1812a4fbb60c6067f98c6b233203c6d7f5ec00ca5df53f708c6d19 SHA512 f072c13c9ad72b532b09ee3ec415a189491bb9eb0dee6f50f2b0a601cd24c952c62f8a947ec3af4e2f669c6a7353dbc8d9a5d6814e9aed45e14088e64e7e6df7
+EBUILD libjpeg-turbo-2.1.0-r1.ebuild 3122 BLAKE2B 6e27dff735c4359e48083cb3e775c9193d786274f94ff75e3e54f40d028aad26f4b716fbe441601d200e5ed1af5de5212fa2646e078a04707d44e1446281cee7 SHA512 e55edff1b94b2409b87e01731bf250d6266f7d434bf56dffcbabe1950eae23684977e8019ffef14ae8e679d7afb1e72dd52e78b17cd4a518e6287308c59a66c3
 MISC metadata.xml 566 BLAKE2B 57882cb0d2f18155c76966075cc2e39de863edd42a161077cf98fe070b045e95181851609b9b2e79134919b7c88504ffcaf6a43f1cfa913fd68a728c64dde514 SHA512 33c2184b17b1c3ace640fc94a2aca554fa3dcbdee1dd2f1546e2340f6490c89e5f2c35dc60c3b3410be80fb66abc015846c311f1f0722431345214262ca8d900
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
index 947ddfd54687..0df02e0f65ee 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools libtool java-pkg-opt-2 toolchain-funcs multilib-minimal
+inherit autotools java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
 HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
index 333b911bb9fe..321276ccaa99 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs
+inherit cmake-multilib java-pkg-opt-2
 
 DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
 HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
@@ -13,8 +13,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
-[[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+if [[ "$(ver_cut 3)" -lt 90 ]] ; then
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+fi
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
@@ -84,7 +85,7 @@ multilib_src_configure() {
 	)
 
 	# bug #420239, bug #723800
-	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DWITH_SIMD=OFF ) #420239
+	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DWITH_SIMD=OFF )
 
 	# mostly for Prefix, ensure that we use our yasm if installed and
 	# not pick up host-provided nasm
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..58efd29d1eec
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib java-pkg-opt-2
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG ZLIB"
+SLOT="0/0.2"
+if [[ "$(ver_cut 3)" -lt 90 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+
+COMMON_DEPEND="!media-libs/jpeg:0
+	!media-libs/jpeg:62"
+
+BDEPEND=">=dev-util/cmake-3.16.5
+	amd64? ( ${ASM_DEPEND} )
+	x86? ( ${ASM_DEPEND} )
+	amd64-fbsd? ( ${ASM_DEPEND} )
+	x86-fbsd? ( ${ASM_DEPEND} )
+	amd64-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	x64-macos? ( ${ASM_DEPEND} )
+	x64-cygwin? ( ${ASM_DEPEND} )"
+
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* )"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+	local FILE
+	ln -snf ../debian/extra/*.c . || die
+
+	for FILE in ../debian/extra/*.c; do
+		FILE=${FILE##*/}
+		cat >> CMakeLists.txt <<EOF || die
+add_executable(${FILE%.c} ${FILE})
+install(TARGETS ${FILE%.c})
+EOF
+	done
+
+	for FILE in ../debian/extra/exifautotran; do
+		cat >> CMakeLists.txt <<EOF || die
+install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
+EOF
+	done
+
+	for FILE in ../debian/extra/*.[0-9]*; do
+		cat >> CMakeLists.txt <<EOF || die
+install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
+EOF
+	done
+
+	#default
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi && use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_STATIC="$(usex static-libs)"
+		-DWITH_JAVA="$(multilib_native_usex java)"
+		-DWITH_MEM_SRCDST=ON
+	)
+
+	# bug #420239, bug #723800
+	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DWITH_SIMD=OFF )
+
+	# mostly for Prefix, ensure that we use our yasm if installed and
+	# not pick up host-provided nasm
+	has_version dev-lang/yasm && ! has_version dev-lang/nasm && \
+		mycmakeargs+=( -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) )
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	if multilib_is_native_abi && use java ; then
+		rm -rf "${ED}"/usr/classes || die
+		java-pkg_dojar java/turbojpeg.jar
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local -a DOCS=( README.md ChangeLog.md )
+	einstalldocs
+
+	newdoc "${WORKDIR}"/debian/changelog changelog.debian
+
+	docinto html
+	dodoc -r "${S}"/doc/html/*
+
+	if use java; then
+		docinto html/java
+		dodoc -r "${S}"/java/doc/*
+		newdoc "${S}"/java/README README.java
+	fi
+}
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 01d199be8884..5a861770e39a 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,3 +1,3 @@
 DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b
-EBUILD libkate-0.4.1-r4.ebuild 864 BLAKE2B dd17222ab2034253b0af2c7bd9925d0eb1e984ca6f190bbb74bd76014be9e8db068a4714024ad1c899e4e9edc8c4049e24566bf690f2dfb8c73f29f529164e56 SHA512 5c335fa359f611f1904a7c08c4ce9cdef8eba986ccbd6b9114624b53ede193331a7811c4830ee1049efa87b4d4108bca6677aa17216cad82cd939409c6058015
+EBUILD libkate-0.4.1-r4.ebuild 879 BLAKE2B 494f51df19c5ab3950d936b1ad19105562e3879fc0f476fe98ebf679fdc9b926e4746cba31409f4597589a8e51ef075642d32f56ff457922b6aafa59a6e76675 SHA512 5e4627454349a69151294e814ae4a38245fa8eeb80ac058f165d7591506349b5d8845b6b2bd96c976afc6ef0c31f50625b39a232fee73afacd03cf69b15e01bc
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r4.ebuild b/media-libs/libkate/libkate-0.4.1-r4.ebuild
index 18704d8cba5d..5b8f0675bea9 100644
--- a/media-libs/libkate/libkate-0.4.1-r4.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r4.ebuild
@@ -1,7 +1,7 @@
-# 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 multilib-minimal
 
@@ -19,15 +19,17 @@ RDEPEND="
 	media-libs/libogg:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex[${MULTILIB_USEDEP}]
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/bison
+	sys-devel/flex[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
 multilib_src_configure() {
-	local ECONF_SOURCE=${S}
+	local ECONF_SOURCE="${S}"
+
 	econf \
 		--disable-static \
 		$(use_enable debug) \
@@ -37,5 +39,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
+
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index ecf84fd98416..cd5315ea945c 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,4 +1,6 @@
 DIST liblscp-0.6.2.tar.gz 689354 BLAKE2B ecc365e8840c8179bd753b8b9ee2706daea7e12948fb079d1b39a4aab388204af5ecab381e27ac8f5feedcbb56fd02a5a236ff8da7041f213a7551d5cd0cb3cc SHA512 672ea452e5dfe5e34dc6a1cc8c9d40dacfd1a415fc4c3ba50b984d3cf064910da53c814dd43a572665c1cbb7a402a09225c0dc7d489b1589c2a98a3f8eb8f0db
+DIST liblscp-0.9.2.tar.gz 689968 BLAKE2B 1b78389a764a58e47b24676a4b4cd6ada7647ef1bc16e9d63a7fe6ad6b62870521ec39eef866b862e07fad55baacb3f0814293858dcdaa6bcd6d8a94d600e780 SHA512 e0d6f2ae3679cf41b1bc8f04910614424d3bbc046e51272a9d526429d098b0e674dccd5951482fd85832d9788a74eeefce99d1d81291e3829c077c98bcb87602
 EBUILD liblscp-0.6.2.ebuild 637 BLAKE2B 248a9bc252af1529c988da6775225b3d877bc7de320ddb3e6b095b7ed0a90a73a0932870440fdb7f7f084f2dfac867796d92d0d4d0989fe4ec760730781f015e SHA512 d7f2bade518b7cd3302f6ddda469f99ecdafda4b1066d9c01a33e1837c9e22b63a4daf9db49649c90da02b13b7f0e0dbfb1e7de9b22c50e02c24feaedf034098
+EBUILD liblscp-0.9.2.ebuild 639 BLAKE2B 4a1023307f6d44477fbe9da47ed6c0ba12125441a9fad00144556b5e32b1f9c5ac8d72408d001154348a9344f931fcdc7c47e1a8befb571a5b7a1adfe5c08709 SHA512 8f2815a7ac5a81ba951fe1a4748e229233deac43a33b5f839c1c2e78cab2722310f5e5d0a5213f6b4e9d458dbf17370c9be4f3c066df6591abbbe95c72ddfacb
 EBUILD liblscp-9999.ebuild 666 BLAKE2B 6d46b9205a46720401495db41bd03e090e29b1b4f23bac9b41d4d6d86f187a3d3d69d0eac2849a623a30f2b4ce8f43a2ddd85b7e1d8f951cd88f0bfd884eeb78 SHA512 676ddb8b98247c647b70f8283dddaebd318a2a0a2944a3da931492c01aec648042b9ae1d58854a285fa0b23199d8d831b09efbda6ca51d7f61cc82b62c0432d4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liblscp/liblscp-0.9.2.ebuild b/media-libs/liblscp/liblscp-0.9.2.ebuild
new file mode 100644
index 000000000000..8d147da49de0
--- /dev/null
+++ b/media-libs/liblscp/liblscp-0.9.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ library for the Linux Sampler control protocol"
+HOMEPAGE="https://www.linuxsampler.org"
+SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
+https://download.linuxsampler.org/packages/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog TODO NEWS README )
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libltc/Manifest b/media-libs/libltc/Manifest
new file mode 100644
index 000000000000..e20fdb712bdf
--- /dev/null
+++ b/media-libs/libltc/Manifest
@@ -0,0 +1,4 @@
+DIST libltc-1.3.1.tar.gz 440790 BLAKE2B 881a237a23e6f4a9d058d69b26cad78c96a9dc0f90bb5b5ffc2d08f4b894d039b57e53cb70844d89b0defa5795d252e3afef07d43bfd4dc8b10a34066b6c1efe SHA512 e4ba96560f04155d022d2c975fa36d4bb77efb9a877344041e1bd12bd5e7d04dccb452f3a4e061aba961bd0c3c0d1d53dc98ac469e04e61a934feeedc20e09b3
+EBUILD libltc-1.3.1-r1.ebuild 637 BLAKE2B 4be99e4b5703025bfc195c3888939494026b269e9a71941d7398155b9ef1b15cf803e98e36f839e669e0bb73ef2c50c6f58df4d3cee06e01eb81cce3b6bc64d5 SHA512 f20bd2865c70ac0cb31077cb520c5481f49aa023d3c588ec001a6ac0d58040bc89f44eee7cd10ebac9daa92d2c7f97175305952b0c47d6aaabc1d81fbe94ba4a
+EBUILD libltc-9999.ebuild 637 BLAKE2B 4be99e4b5703025bfc195c3888939494026b269e9a71941d7398155b9ef1b15cf803e98e36f839e669e0bb73ef2c50c6f58df4d3cee06e01eb81cce3b6bc64d5 SHA512 f20bd2865c70ac0cb31077cb520c5481f49aa023d3c588ec001a6ac0d58040bc89f44eee7cd10ebac9daa92d2c7f97175305952b0c47d6aaabc1d81fbe94ba4a
+MISC metadata.xml 392 BLAKE2B 66b65d303fec6353210301c86c459a343db14eb1fcd2865eeb29e72090aff6af68a6cdeb533a8f02b480e8190d70894e297eda102a8432a3114b1c0dfb8fe1bb SHA512 4bf748be05980afc6a1fb92202d1551a865d6b2b70870abe11d13a274900346e852edab9241ff5c13aec20c01dbefb2e9d1bec950e9be8caf5a4c0536ba2176a
diff --git a/media-libs/libltc/libltc-1.3.1-r1.ebuild b/media-libs/libltc/libltc-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..37f4e75a206e
--- /dev/null
+++ b/media-libs/libltc/libltc-1.3.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Linear/Logitudinal Time Code (LTC) Library"
+HOMEPAGE="https://github.com/x42/libltc.git"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://github.com/x42/libltc.git"
+else
+	SRC_URI="https://github.com/x42/libltc/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+LICENSE="LGPL-3"
+SLOT="0"
+RESTRICT="mirror"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && (eautoreconf || die)
+}
+
+src_install() {
+	default
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libltc/libltc-9999.ebuild b/media-libs/libltc/libltc-9999.ebuild
new file mode 100644
index 000000000000..37f4e75a206e
--- /dev/null
+++ b/media-libs/libltc/libltc-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Linear/Logitudinal Time Code (LTC) Library"
+HOMEPAGE="https://github.com/x42/libltc.git"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://github.com/x42/libltc.git"
+else
+	SRC_URI="https://github.com/x42/libltc/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+LICENSE="LGPL-3"
+SLOT="0"
+RESTRICT="mirror"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && (eautoreconf || die)
+}
+
+src_install() {
+	default
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libltc/metadata.xml b/media-libs/libltc/metadata.xml
new file mode 100644
index 000000000000..703c168ad048
--- /dev/null
+++ b/media-libs/libltc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/x42/libltc/issues</bugs-to>
+		<remote-id type="github">x42/libltc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 287123c02cc4..296f89fb391f 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,3 +1,5 @@
 DIST libmatroska-1.6.2.tar.xz 65460 BLAKE2B f746f0dd519b8e3b4f98057d3f83e23a79595ab95e71f0c45c1128b2cbe093d5955a38d9d0565be9336f3d53279e20bddf0a2b4a54378c78faf4ee8f94586686 SHA512 c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1
+DIST libmatroska-1.6.3.tar.xz 65612 BLAKE2B b72553ba32358b996b98fb1b4a3d05b4026c95406c31312d43cf7ad875192683de05d8813e5f0bed04502543c80b83524b02c7caeb860f79860760d926b92754 SHA512 271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41
 EBUILD libmatroska-1.6.2.ebuild 629 BLAKE2B ac32392e700a32fad8bf0c12f43a6a784d77590370a94286b76dfbab95636c2db91d3919eda79c5a3f862d3f0c9a39518ec80d927d1b4d83b488c31b7ed42788 SHA512 250be02d4b44d04d462f336cc5f0850ac3d7464ea89ea3c4f413d44ea8a0458f7eedd54dd88dd33616094397a59d4243f90badabdf2a5220029226031a0c602a
+EBUILD libmatroska-1.6.3.ebuild 636 BLAKE2B 016f3cd183ef4909091ea135ac81b9321c2d2a4d8a0115e85319e888267ff04df95e8436071f3db322febd73784377e2925999573f9251e2fccb98f28641f33e SHA512 e92ce03c22b8738110096736da63b8829d2cb56c124565635eabe9d69a3aeb81bc2bd06fe6fe48912776bd7fd5073f657f470cce7d9738bfdbd3b669d89c07e8
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.6.3.ebuild b/media-libs/libmatroska/libmatroska-1.6.3.ebuild
new file mode 100644
index 000000000000..8db09a789117
--- /dev/null
+++ b/media-libs/libmatroska/libmatroska-1.6.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Extensible multimedia container format based on EBML"
+HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
+SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/7" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/libebml-1.4.0:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
+	cmake_src_configure
+}
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index ddc6036565a8..72fe2765f472 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,3 +1,3 @@
 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de
-EBUILD libmikmod-3.3.11.1.ebuild 2105 BLAKE2B f88b06a6786d76eee321425b518acdd79ca613e1f74a30bea9df11c50124902ee701c89d6e96844c863b390e7d85588d5e6c11c1c75b068839437499416cbded SHA512 0b30cf389006298c8ebfb2e050f8001b76dd0222c320515b1516de8daf368c00ae71e4644ecf9caaaafab440f08df4dd2f377514221e4ff39d4a6ff83775c4ab
+EBUILD libmikmod-3.3.11.1.ebuild 2098 BLAKE2B 70e984687edd8f1c77fbdea16f1dba0787e4d695e61d051242543930ae71a4e7814b3a6abd42df23dbb94f86c99d3efda7930aa6218b9bed13c17c5b8eeb7355 SHA512 338f3bff6c76a52a4ce0cb6cffec814715ea5676e3460d0ddeb675f00d930285e72f72033d7c87a0fcc68079212433a542862c0426490953fbffb46d8ad614e3
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 22a960beebb2..d204242d575b 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils ltprune multilib-minimal
+inherit ltprune multilib-minimal
 
 DESCRIPTION="A library to play a wide range of module formats"
 HOMEPAGE="http://mikmod.sourceforge.net/"
diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index b063a183fac2..dc08e1edae22 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -1,8 +1,6 @@
 AUX CVE-2017-15185.patch 1088 BLAKE2B e823a30ec18735deb5ba22592165e7828266888d4cdb435ddb88b606b6312c18444e2b3395c3f155fb12d6749a3371baa9b18d7972086c19e750deb253b17162 SHA512 d5ef327e47681bd74ef7488965805727d8e905f65ee46698b06f88d971003c65c309fc8b6714e07c7a12803657db302b15522d6e4f4a75c0dce1217deaa07439
-AUX libmp3splt-0.7-libltdl.patch 676 BLAKE2B 144528812f340517d4da52eeefb35054b31363d5c24eb0fc1fa74be7c39008a9d27fd61a9c412aeddf5698df1469975101fec74de5f65b17bdc2a9d727017cf0 SHA512 50e9c6472b79b2dfcb43764828e26ddacc3b1b747a6264291385d6173de51608188d4fd865ac20dd2ad63ddb9d3191eb62f872ddead15564d7400b31dc5bca66
 AUX libmp3splt-0.9.2-drop-libltdl.patch 7164 BLAKE2B 29332a97ffa8b4acd6580e1c10ae73b3038c2c56b3e01eaaea10da8379c1c157624a7577e4b4bda5de279f07db326e4f48b48a815c52ad9266c78f48aa98809c SHA512 b527eda408df9123ef254ab28be850535042eb9b28de910fda6852b78287a55ea26d03326dc08d8c35b9c08ee2ef47797a6be14883c945bac7e051e7e0664fdd
 AUX libmp3splt-0.9.2-fix-implicit-decl.patch 5820 BLAKE2B b7ed33d91c7fe26a528ed678e8d174208cb4415bdb573d415c0523241672b6ecd5280e28c28314a17249187ce36af589336ea2669b461c03f03b4fee9e3775be SHA512 8fcc35dd7c1c6110b302bd67d07d2023bf5c1bd428b5387782ea5b9a4b233739b9544b4814b3a3db780d2c275bacc53ea37378c004c5029984cecb21867775e5
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
-EBUILD libmp3splt-0.9.2-r2.ebuild 1293 BLAKE2B d841d43e3703728e26bd7034a84669eb9fe925e1208f7ae7f22d86f4d98833a428056e0b28eab11001c82f45e1ccd8d576dab6cb197e0ec37fef6d9251ec4e66 SHA512 4a4d5eef497cb2572e186c62c12fd8466b8a3405ef1c41259ffe6e7fd7b928e607f205aefc74dfbb9a9d2dc873e6c17e29cdd6a225ab0c684157180f302ec21f
-EBUILD libmp3splt-0.9.2-r4.ebuild 1442 BLAKE2B 57b6340087d90c44f4084f4506a7bc1b95bf715ddf335c85a5c83e0cc3854fbb3d266dcc8be2ec13f549e6b3356dc68680cd29c323eef1f8c143262425a4dc6b SHA512 fe175c01ad47c1bf7b3a619c3ead47bef3d9502523e02b44d99ab2d2af47f82c6a51d077d041abd4fabcbe88c7183b2b4dc622eda85d84a8daa0e001235bd872
+EBUILD libmp3splt-0.9.2-r4.ebuild 1439 BLAKE2B 87255bebb946490569d71448fb10d0b46ee6a4ff15202fcc7a596353f8bbfeab9b366d54b579e28eab100614fcfb3546cc28be0612046de1a0f4da669e53c10f SHA512 87335f2d814001754030cc5d6a022af6ece6da8639bc1f3604582847a7288c997f6a9dec91b1c070a0df369bc11a491fca429dc68cfd68271cf28716e9bf6031
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch b/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
deleted file mode 100644
index 0755fe79af92..000000000000
--- a/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac	2011-08-07 00:14:06.723806363 +0200
-+++ b/configure.ac	2011-08-07 00:14:02.405860340 +0200
-@@ -68,16 +68,13 @@
- # Enable libtool, check for libltdl and define @LIBLTDL@ and @INCLTDL@
- #################################################################
- 
--ifdef([LT_CONFIG_LTDL_DIR],
--      [ LT_CONFIG_LTDL_DIR([libltdl]) ],
--      [])
-+AC_SUBST([INCLTDL], [])
-+AC_SUBST([LIBLTDL], [-lltdl])
- 
- ifdef([LT_INIT],
-       [ LT_INIT([win32-dll]) ],
-       [ AC_PROG_LIBTOOL ])
- 
--AC_WITH_LTDL
--
- #################################################################
- # Check for the type of the host
- #################################################################
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
deleted file mode 100644
index dec4b03a7c8d..000000000000
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library for mp3splt to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net/mp3splt_page/home.php"
-SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="doc flac pcre"
-
-RDEPEND="
-	dev-libs/libltdl
-	media-libs/libmad
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libvorbis
-	flac? ( media-libs/flac )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/findutils
-	doc? (
-		>=app-doc/doxygen-1.8.3.1
-		media-gfx/graphviz
-	)
-"
-
-DOCS=( AUTHORS ChangeLog LIMITS NEWS README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7-libltdl.patch
-	"${FILESDIR}"/CVE-2017-15185.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cutter # TODO package cutter <http://cutter.sourceforge.net/>
-		--disable-optimise
-		--disable-static
-		$(use_enable doc doxygen_doc)
-		$(use_enable flac)
-		$(use_enable pcre)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	use doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r4.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r4.ebuild
index 1a3609c270c4..86737e29997a 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r4.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="doc flac pcre"
 
 RDEPEND="
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 98433e4b40b6..b15fc954f27c 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,5 +1,5 @@
 AUX libmpeg3-1.8-impldecl.patch 559 BLAKE2B a21953fc4acd57169fbb1e6bd48aaf8d6b3d0e3deaa635cbf6f8fe1dcd73bb394820f2f66b188c7d78ae2cc07d7cbbb0176327455a3a49e44ada8c48b8a072c8 SHA512 43affdcfd54146c0623478f6b2108b28b2be09c956d800705b24dfe9eff6c50e861c83e392371a4deaff19649d61fe27edc7521c7daa703ac369c96b5f698ff9
 DIST libmpeg3-1.7-gentoo.tar.bz2 5625 BLAKE2B 8c0e18c690d70d6dc2e87428993eda57c5b67152514221b38860644c21ab4a98d6f4060f9399be5bcfddaa42de0ce6f55019a6d88ae3abfc2793b9d57a0d85e5 SHA512 9ef94c41ee943e321c9fc14a02659a839f08554aac4f5c5abcb9835e9940f0e5dc4c67c26f8124de960cba78493fa43f6c800748c0426e6dc141aa106e2aabc1
 DIST libmpeg3-1.8-src.tar.bz2 2452350 BLAKE2B f5d4a3f7291847baa35bf5103f7bc5d79122d488c1f89ae6006912666cd29d4651cc74721e5e451f543c2493f64bd3cae0fa72384d866454cae6f3e0a2e77985 SHA512 e381f07d46d47d391c6db420791a065e3572e17ca63966eb52712560867866683505693f73b25869059319eec66fd1c2f923dbef1fdca5ef9efbe598e217d60e
-EBUILD libmpeg3-1.8-r1.ebuild 1723 BLAKE2B d0a90786014d4996dda7ee26050a0ce487f91a196163b8b45c70cf41f31d415985558ca7f2253f5329d91ea4a8ce87f7e382d150c19aa65ec1db62d8120634c5 SHA512 f8f8f40676eb6fd89b385d0a0f8b873ecd4ccc59ecebad7bed2813a3c2279a3e5a9a2aadc2987cb965d45dfb43987875f6ac4145a19d19ab1a25d00822652cae
+EBUILD libmpeg3-1.8-r1.ebuild 1707 BLAKE2B 2b856e8559d6d4815a091c6ba0aabb0be9547f9f8df3d05d2fceba3363cd4a034090553b90728b75a7d7350e7fc336b6594626d9c5e5bf527e3c1e0dbf694fd7 SHA512 a996728e04529e00e90e9d94e992ab1d078d30275fb3059c73f00afa5294ccb4b4dd317b0595d022c04a20f5ad8cb8dbd363e7bd25ebdcb5cb800e48e9b9f0b1
 MISC metadata.xml 309 BLAKE2B 0ff62755ba6e4b13232af28e76b191520e01ff5603517e3e50b06a3cba120b6a3dccc3aabc3c726568b13c8ee46d21d7065afd6eef3547a3a4403cea155b1e20 SHA512 f14445391f7eee4a7f0906b3c483ccb915cd64bcccdbad63780bb1da5e0eb851621abebafc70f8b88cbfabd335fb396aa3dc909f5789cd8c8eb582af923a2d63
diff --git a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
index 1a177b2bda5b..2b72b966641f 100644
--- a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.8-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=5
 
-inherit eutils autotools toolchain-funcs multilib-minimal
+inherit autotools epatch multilib-minimal
 
 DESCRIPTION="An mpeg library for linux"
 HOMEPAGE="http://heroinewarrior.com/libmpeg3.php"
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 2502fad65b85..1544c6576f8f 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,3 +1,3 @@
 DIST libmypaint-1.6.1.tar.xz 519464 BLAKE2B 6302914ab7e0876012e5235573c5cb3a76cbca9b5f0707321b0fc0a8406f712b9164ccb02ecc8a63b13d1e640a04cba8063c568bcbe40fc8543fc4a2c1576e5b SHA512 e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608
-EBUILD libmypaint-1.6.1.ebuild 1399 BLAKE2B f148cbef7f43874d9e12727dde9cfc952d8cf32dc9ea8b8c26640c0d6499286eed59a3421d2d54215a4e70491cb7542bbc1c9fffc0479ae2d1359ea319f34bbb SHA512 dda2f380ae6b35e254828a61fdaa0e533a354883b8e353461ddc0af62767ebd3c4e86aea926e976ead2669fc58b5a2b32b8e3d5e602eeae95589c47fbc21f203
+EBUILD libmypaint-1.6.1.ebuild 1391 BLAKE2B 6c3247f36a1cd84faf293f60daa0ad8b452ced96dd1af1a354160ac8bb02021a4cc092b01f72bc78dc3b46093b396ede80c3575b981ee5c5668656fbc05f4ddd SHA512 3b333fbf5e2d8980a0271e85d3ca79b03760b8e866647aa9fdd469c1db505e30cfaac1cddacddaaeccc8a5fd3dff843b5fa10e190028f8942efa18a60a89f730
 MISC metadata.xml 407 BLAKE2B 58fc66fd0988af9aa8346d5fecfa1c44dfd149449d8eb82caf6f89ac98b097a06730b84d43fad6be27d07d76370b0882ef81cd32178557e97e1a4e350e1198b2 SHA512 2c421d05d719f7b7bcf079bac1755f02a9d5346e52ceeedf2966082842b0c12713f02f736c1f6c05083f6f1c66152c1315160606f571bdaedfd81707a147ea45
diff --git a/media-libs/libmypaint/libmypaint-1.6.1.ebuild b/media-libs/libmypaint/libmypaint-1.6.1.ebuild
index 8067dd910028..16cfcb99acd7 100644
--- a/media-libs/libmypaint/libmypaint-1.6.1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.6.1.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,9} )
 
-inherit autotools python-any-r1 toolchain-funcs
+inherit python-any-r1 toolchain-funcs
 
 MY_PV=${PV/_beta/-beta.}
 MY_P=${PN}-${MY_PV}
@@ -44,6 +44,7 @@ RDEPEND="
 
 src_configure() {
 	tc-ld-disable-gold # bug 589266
+
 	econf \
 		--disable-debug \
 		--disable-docs \
@@ -57,5 +58,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/libnsbmp/Manifest b/media-libs/libnsbmp/Manifest
index 1cfa050f007c..38b627718b65 100644
--- a/media-libs/libnsbmp/Manifest
+++ b/media-libs/libnsbmp/Manifest
@@ -1,3 +1,3 @@
 DIST libnsbmp-0.1.6-src.tar.gz 463348 BLAKE2B 546f26c0ebbc2b93aec3002424c8e6d5aaeaa06f06fea13712675dd33c71b431c7f6d296c55a4d091cba7c9d5eaf053960b3d7e16e24b0832e42f8f4881f675d SHA512 7e987a47d56216b2e2a795c1233c63599d474fdd9dd495f31bc9a902f92072078ae79e73323da457fd5059908a65f44bacc6c8742f92f0950af80196a4bb4732
-EBUILD libnsbmp-0.1.6-r1.ebuild 659 BLAKE2B 1a82637902063f0b6604a71cc7c9af253373d9484c934b8953f04689b2a8fa3844498488d61e90da2e45b3915b9255cbcaf12d6cd1a6af4e6f9653c604220016 SHA512 6e84fed4a6dfd845f84a9e2368f7ed7fa5db6a73989bac0b06ff1cbadc966378bbde3109420f11336e6756060586a7ba97d1ec294c104b489b6deb4d121c2348
+EBUILD libnsbmp-0.1.6-r1.ebuild 666 BLAKE2B 20bffe01d3ca51af70192ebb85a3ee32ef8bed75593578fb87e5ebc2340613214ce7ccad8ade588eefdbdd5f93d338b1926192b3fd818fa8cacdf74b8686b2ea SHA512 a44519f4f6f614c21c4c58e32ec05e6e732104ce87532ece1aff8fd85936dc0aab9887d359db0c4d4b3883fec7fec3fdb14cba6092e1ef313225ca56a8e135dd
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
index f2da283bd6ac..dad9d8f1c506 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
+++ b/media-libs/libnsbmp/libnsbmp-0.1.6-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 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index dcc49247a55c..783d95d6cf47 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,3 +1,3 @@
 DIST libnspsl-0.1.6-src.tar.gz 320130 BLAKE2B 8485054d1431f57ff71440120fd28610d62687527927dcc2f3bf7869075e08c05d2583567a90a28a2690aa78721c81949019cc353b570def1aa47e37bbbaa437 SHA512 928ce45bbc75215db5f1238a1cc879b3e91511950fc870c0232d84b1270882ec8c6470ce1a8d5cfbe7b6f24bf9e25745f2053ad2f1f4933f3d648d67d3ba2754
-EBUILD libnspsl-0.1.6-r1.ebuild 626 BLAKE2B 961ffa3b20fee692d06e07c7e642d83e960c3447a15a61bb4bab846893b6cd56efd7d6fe73a0f2b3eca745b799f641ec1e7a64a70dee7e3bb551ac9864f697aa SHA512 6a5eb8efc5269cd2914d03b7706fcf640621ece48007d5efbdd8c5507e584e8f4caf4e52b887ec2f4ea4b4de6ea8e6815fc5a58e1140f1baac7c0a92e0409151
+EBUILD libnspsl-0.1.6-r1.ebuild 633 BLAKE2B 31a88ab1204c43458f077a0aa7768a4b25f41bc4eb9d5c2ed652a67b0b39846a3fd6616d30728e69fe906cc7ccd189e4adb5427302af32fa4067439bba842931 SHA512 1315e252ccf3356b4e91c2bea461d521272e844f37442a39bbc80ba7863564322259aea4aa62cbbdda5680ec4a42726a8c0bab230f44863a85f58dcffa3f954b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
index dc77fa36d30a..68a4a03b8767 100644
--- a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.6-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 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE=""
 
 BDEPEND="
diff --git a/media-libs/libopenaptx/Manifest b/media-libs/libopenaptx/Manifest
index ff5fc68210ec..173b7bebbbbd 100644
--- a/media-libs/libopenaptx/Manifest
+++ b/media-libs/libopenaptx/Manifest
@@ -1,4 +1,4 @@
 DIST libopenaptx-0.2.0.tar.gz 27797 BLAKE2B b178a9aaf78796c9219d9e7066ff985ce9f5dd86a6926ae22e373f2822090ad313efe04d5cf607940f1042bd27ddf5484d7e8298dfff91a8ae5596cec7ad5fa9 SHA512 d57e5084b398eec2ad49c9893baa496651c139abfb95692c834a4691bc4bb951d0b1afdd499a8b67c84b873407b584965d3a045d8ef3d9e62b3ccf45de22809a
-EBUILD libopenaptx-0.2.0.ebuild 1034 BLAKE2B d469f80ed7a601e1aaa2e9fdd94d32fd42c720a8c70c1564878387d2a71b7af44fbd7767bb60d2c6518893d522b6f176ad287a5839a75c240b29ff782436fd7c SHA512 53893069ea7bd443b883ccb905a3d5d11f67f3e375595bc114fc2f243581a8eace365b1611c5aa8759f092444bc4a122422319ed14890626397d306cbfe35254
+EBUILD libopenaptx-0.2.0.ebuild 1051 BLAKE2B d59142413d5366e0f3b324499e49ba72e39764c746fb7b1add12a2e10b5dbe5864a829f359e8a397bc9400e235b9e4378b5f29c95e7d8e8601af7edcb73495e8 SHA512 dbcfbe7e5ac7ec5681a75012ea7a38e0049f3f2b90a425c1f0aa9506ab378fc6a3101bff86616e7e042c74f79fa21762f2fee0ee075c7e98db8fd72d5847882e
 EBUILD libopenaptx-9999.ebuild 1022 BLAKE2B ed3d85400142cf3d3fd9de1bf37e2cda897a952f07d2168252c575b0701d5a9003846f4b5605690512bf42f76c69b1f25c9e3a8ca2f0e52943dead7930504179 SHA512 4e9477a48a0cf0d4daea89bef6819b23eefbd8e619cf0973554e56306a450090a3ee7d723d23cb6be7b02c901136cff38c6be8f72844a01c76104b86f34992e9
 MISC metadata.xml 475 BLAKE2B ce3ccc5f113c6178230b372c55e9992731ff55477bdde2efcca199b73d7b2ec66419dcba89c3f368ff9b7ef54011bd92c6cecaf9b3cd64b5a6ab8ea2e0b0d1ec SHA512 7bde88afdf7a137ea5ec1b491dda467eec36d2897f0bd009ca22066614db64531fe5b343cdb426b1e80ef6cf8011db1c43a0a525b9b302496e04cd7d2e97dbc0
diff --git a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
index ca430d9589f5..f90b9b0868a1 100644
--- a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
+++ b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/pali/${PN}"
 else
 	SRC_URI="https://github.com/pali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index 5f82e314f7ea..98054bf177c6 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.5+release.autotools.tar.gz 1471537 BLAKE2B f79c27a376cb6dd01957f7c53e4844a08936c6fc34b26bb582367bbb745ac82e5e51f93769f668661532e7518173d2e4797c2f9ac20bc81052e0f923cf1cefa8 SHA512 8a56fdd0994b6db3567ea81d6cbd6ab69caceb82e7b0eb1dde017eb5c001c291384e7ab4a5a8a3ddbed3df4ac6b073a4d26e66f493926f582d198fb6810f9890
-EBUILD libopenmpt-0.5.5.ebuild 1536 BLAKE2B bc62cfa3a457ea8f6210af58dbb5f524207e1c9d5e3903bf92ee78585ccca0f7eaf1ca8fa64da81648fd84404041a1979e60cb9c998b389aa6f715e6fd405541 SHA512 1b529981ecfa0352e6c58dab4fb5fd4f654a05688eaf5232bd39edc4a8c45199797c10f3a1b9d6fa5765ee531c5d62dee1ab0d583a5cb62d4d7ea0d0d0229fec
+DIST libopenmpt-0.5.8+release.autotools.tar.gz 1474083 BLAKE2B 5519f2c8d9d4e02e32bf1ccd28a89fe547b1a4ec79a0be209a872db5c7e2eb9ca3e1a9fec820a13492bb14d1413c217654a5cbafc79bb0e041dbf2f6d27d9ca5 SHA512 29a5b97495c2fa9898cb806cbdc1bac3263b30ecb9c02860e9f7147dc1186d7600589b5f44c9b1aede9c9d44add3521e28e1ff6a9299227e8b19361fe9cd7cc2
+EBUILD libopenmpt-0.5.8.ebuild 1539 BLAKE2B 55b4bd27473b615348ca62bc4c3739e4e7026f7e131c3b556ecfb36755b87c7b5214921440868e7a3f799858201907ba078d354869a241084f7b417d8b3ea927 SHA512 31689e5b8ccef179944e31e1f0ffb913c2659a33580c131ca348b15a68556feb9405dd25b8864d0bd0566e45b26fc4d3c8c1bc1caad7097c4d2b8bfe534d2462
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-libs/libopenmpt/libopenmpt-0.5.5.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.8.ebuild
index 04304cf5ed15..0e4a4efa3c62 100644
--- a/media-libs/libopenmpt/libopenmpt-0.5.5.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.8.ebuild
@@ -51,7 +51,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	rm \
+	rm -f \
 		"${ED}"/usr/*/*.la \
 		"${ED}"/usr/share/doc/${P}/LICENSE || die
 
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 674eeb73a1cf..78958a7f7d7e 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,3 +1,3 @@
 DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029
-EBUILD libopenraw-0.1.3.ebuild 1051 BLAKE2B 71204e173f34b437b3757db62307890a9a5557c5e8014f04187c075d1020582a04eb6c5ee5dd54452900198e1814302aa0297e17f8518f3681b24c9699f97e02 SHA512 cb6050515ee8f35f790387d6c2c5771befb2b876622b284c8357bf544f14528da0306e4090929ea98597c2afb9c2f258372bf6bcedfd7b21b6ce554b0e0ac998
+EBUILD libopenraw-0.1.3.ebuild 1050 BLAKE2B 17d4a60c14fe01a686a539d7fe231e0b6f3bddf26f4cf3dd6c529ab320a98869f094364c55b3528dc717638e3c32661a24226bac9a69d9d32c63dbacaf0d0f2d SHA512 06ee1756780eb54b1d9a54955a0c814785df3b7d0441892e41a9a154513be9df4a6f804b0e0aa10f3500eb7603560495dd4eb4a858179ecd9fa010322aa4925f
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.1.3.ebuild b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
index a09c541263fa..e004a6a8e899 100644
--- a/media-libs/libopenraw/libopenraw-0.1.3.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index 4d8d7aec98aa..6780781d9f18 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,3 +1,5 @@
 DIST libpano13-2.9.19.tar.gz 3527845 BLAKE2B 59d6b46b75de60a3230eb46e42bbb0f7b8826ac5b84d1dc32d28cc384b6690b258c0c3a6b75d3423a1583daccbd0aecd3f010eb58fb356cae5c54d29e05672f0 SHA512 f9f147426d44d8babac09cb1a1b5111f88b9c2fc079f33df80133492bcf24cbd1edd771e6bec7bed4b0256bf15c700139c0a83119d3adf296ae5c567e006d868
-EBUILD libpano13-2.9.19.ebuild 890 BLAKE2B 72b5e0e4afe75f9f1d7baaa9168ef0f68b3d8dd24ad4d6aca10c94ff16100fb3005e6fd60908f30f4a52762e8749ad2a7917a1b8cf88e58b19ef599971095788 SHA512 06542458d0a41d3ee9b8e9bd4e0f75965c219a953b7358e8903b99e2781a1827d18966d342833ea8283caf45ca3ae1e44263c5f7c5b5cda2130d4f24dc11e7be
+DIST libpano13-2.9.20.tar.gz 3564544 BLAKE2B aabf9d8a3dac5b01e4a5bdb6d5ad6b56ea3e672f143b002c06b7108fae19cd6a00e8b524a4c18cbe16c65f41242fc12e7b19dd71c00bf6b553db65472fe8798d SHA512 18da5cb3760f06df8007622a64c4121c3acdadf8b02faa2125f319acde30532378cec5d97ccd5a65d6d2c1960c1b4946c80ffa850da2dc790051f5c0b76f8a86
+EBUILD libpano13-2.9.19.ebuild 883 BLAKE2B 1cedb29f99b8b987c86bdb9b3930545a8f41b2ff54a5a9012983e21c32c3b4a19cf0a711c6d9a3c5dcc57a242b1f8e9f19584f396a5db9e76858726e28d8b76c SHA512 e4796a286ec4fd9ddc666e6c5fbff7fb4b41800b8b4ec904710c997c25b03688acc994b0ff45a23fc958a1707a8e268f5bcab6d21823fa4520fcc426762cd9e2
+EBUILD libpano13-2.9.20.ebuild 866 BLAKE2B b60d021a143de4504834dcf384f9aff9acd590a1bbbf4c7b955b7b01711fb9328cbdfc3c132a7b8c75086473d9513e5997f8870a92befd1aed78ae72cc21f0fd SHA512 a466f5b447f9b59902414725e451a2e15c5fa113fea134e811d58d924bfc18d84b6ffed1a5350d87a7408a1f57c777686aa32ef617d1cbf887da26472be2ce36
 MISC metadata.xml 324 BLAKE2B 04d40b636b02143022e3a5e9d5733a8bb758937d86d0800faf7dcf21b501f97ff8e970e13b5e842492e74f237dfed8f07efb40ce3e952172c41a208196a4cf23 SHA512 40a9330f4bbbfdc98598c5677d7b9ce485fe13e96bfc976f3829e881c5da234e8abc6d5c9e8db7522ba32536d953b2a0daddc878bc09fb474d446139da33f3a6
diff --git a/media-libs/libpano13/libpano13-2.9.19.ebuild b/media-libs/libpano13/libpano13-2.9.19.ebuild
index 23062ff71a96..eb91c186da4d 100644
--- a/media-libs/libpano13/libpano13-2.9.19.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit versionator java-pkg-opt-2 eutils ltprune
+inherit versionator java-pkg-opt-2 ltprune
 
 DESCRIPTION="Helmut Dersch's panorama toolbox library"
 HOMEPAGE="http://panotools.sourceforge.net/"
diff --git a/media-libs/libpano13/libpano13-2.9.20.ebuild b/media-libs/libpano13/libpano13-2.9.20.ebuild
new file mode 100644
index 000000000000..fd5ec44fc28f
--- /dev/null
+++ b/media-libs/libpano13/libpano13-2.9.20.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="Helmut Dersch's panorama toolbox library"
+HOMEPAGE="http://panotools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="java static-libs"
+
+DEPEND="media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	java? ( >=virtual/jdk-1.3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+src_configure() {
+	LIBS="-lm" econf \
+		$(use_with java java ${JAVA_HOME}) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README README.linux AUTHORS NEWS doc/*.txt
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest
index 040f5ee66fbd..290e91b97dc7 100644
--- a/media-libs/libpgf/Manifest
+++ b/media-libs/libpgf/Manifest
@@ -1,3 +1,5 @@
 DIST libpgf-7.19.3.zip 1303189 BLAKE2B 129ec655241f0a152814b412c1ee5d40fc5b89daef172d1e73985e49f8ffec22ce87c6aa893dbf330b5176370d985ffd0c6a015adfbb9faf72131bc63cf0c94d SHA512 68f9734b51372f7bb39b35cf99425bac6f9cf29f0351dba8813742c41f62f394798c92f674803d1315456a9337c7af03479d43455a9e611c07f5cf47ab3e5b58
+DIST libpgf-7.21.7.zip 2075722 BLAKE2B 31c5ab5930ef5658ca9b320fa3df94b7d8566467a657df6d255781664a4750d6b5cb7b351c828cad7c60b42f8cb8926c51bb0271d5c51e2484426a15f18b5eb2 SHA512 dbc17d9dce1afbeffb272df0d573059914d2ac79d652d1d43e67c49509fd6e643be8594bbd1a3058a5aa3a9d30db100c6dcf641051345049cf8f9375d49e2799
 EBUILD libpgf-7.19.3.ebuild 801 BLAKE2B c55364991eb98d6ee6ef594d575e65873d878645feff7c8103f25bf301a7f2705ff1913d5ec5727447d11c16a4d83a0fbd2535281ff122532900dbaee54f6b12 SHA512 d39c5a1ca845af427d53913082172fb9db2ef3b30c951849f113ff4790ed88d851af78d5abd78e4cc15e4c8df059aa424ae36fc7928ad33697be529b77d3ac00
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+EBUILD libpgf-7.21.7.ebuild 970 BLAKE2B 853f2272d1672f69253a2ef3dcadf6c983bc1b3d4f13395218e8d68dd63cef58c679ad790758c7db619d942f6f4040adc7f986938e56120a303cc9f79c870a6b SHA512 951bb2435265341d6ae9191acd8f9d9d38d1e5b37fe42fdadf88775a9a4e9eeb4b40da536965ddc9be6f0b35d9db902534f32a6763861b7bfcac3539a1678dcd
+MISC metadata.xml 402 BLAKE2B ce7dad4fc9e57a354e4cbd49d7c2ba2beb8c0c8e5163ef846e51f6bfe329cb2368857bf027f0c8e01f3722ca956ed809e539ec665cf48254022efa4b0cd50519 SHA512 a69578f7391678865fdedb982b780dcf8733096a1ca36219e9045708e9643e9c5a1638f59dffeace89cdc12b0ec58c7dbea271a04b8214b8cc58034e0598b29e
diff --git a/media-libs/libpgf/libpgf-7.21.7.ebuild b/media-libs/libpgf/libpgf-7.21.7.ebuild
new file mode 100644
index 000000000000..7d9af7177603
--- /dev/null
+++ b/media-libs/libpgf/libpgf-7.21.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools edos2unix
+
+DESCRIPTION="Library to load, handle and manipulate images in the PGF format"
+HOMEPAGE="https://www.libpgf.org/"
+SRC_URI="https://downloads.sourceforge.net/project/libpgf/libpgf/${PV}/libpgf.zip -> ${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+BDEPEND="
+	app-arch/unzip
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/libpgf"
+
+src_prepare() {
+	default
+
+	# configure.ac has wrong version number
+	sed -i "s/7.15.32/${PV}/g" configure.ac || die
+
+	# many files, including configure.ac and Makefile.am, are saved in dos format, causing errors in autotools
+	edos2unix *.{am,ac,in,sh} */*.{am,in}
+
+	if ! use doc; then
+		sed -i -e "/HAS_DOXYGEN/{N;N;d}" Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libpgf/metadata.xml b/media-libs/libpgf/metadata.xml
index 1b2becffa26c..6eb1c692fd55 100644
--- a/media-libs/libpgf/metadata.xml
+++ b/media-libs/libpgf/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libpng-compat/Manifest b/media-libs/libpng-compat/Manifest
index 9c80a59e9ceb..22d1e6792960 100644
--- a/media-libs/libpng-compat/Manifest
+++ b/media-libs/libpng-compat/Manifest
@@ -2,5 +2,5 @@ DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff2890
 DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
 DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
 EBUILD libpng-compat-1.2.59.ebuild 900 BLAKE2B f0cdaf25bd129a47fe60229973497b3d45d772eaefc6eac9406947d0acd72969e49bb9cfaf838a4798a9ca4edb00ff612c805a1e8b563ba99ed08a5b4c1ac6e7 SHA512 810dc61ed8cf6e17e6be2e3b3f9c4f8232dce3c20a32f7680a641f09b28e188130158a95f147405aafb9e164c43a44608c79d604517c022c5e3bbd59044d33e4
-EBUILD libpng-compat-1.5.30.ebuild 1710 BLAKE2B d02f9f9768c1a7217f5d80af290f9a4c9adeeb9110fc957ef99b238fc68ca04d7d8d4aa6bd933df20b53f870bfcc65ecc5a1776fd9a796482d2d057d83d3d813 SHA512 8060fe82fbea04334e3e111344c39e7c3c6d36cb9a14c1328538f946d4e64abd52cccf2fad4314df50c433c36d90bb82679dbf82085d94382f6a385559cce3c2
+EBUILD libpng-compat-1.5.30.ebuild 1873 BLAKE2B c2b9486cf1be90c256ff9de888e7dd487052c402812a84362eb8ede37b89ae71d3015f9ec098de45ccbf8940060cb0af2fc75c792d3dc8e800643cb7aabfbcfa SHA512 ceb42f3f8d3b88b9ee6f8ac7f3a761c01c0f4bd0ca4244c8ee5d9beaa8c0fb0e7f3d155c8e529e19074aa7747314a1dc8aaf3ef340659a59db3e0511770eab0a
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
index 9d75a9357442..21c669bb96bf 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # this ebuild is only for the libpng15.so.15 SONAME for ABI compat
 
-inherit eutils libtool multilib-minimal
+inherit libtool multilib-minimal
 
 MY_P="libpng-${PV}"
 DESCRIPTION="Portable Network Graphics library"
@@ -17,14 +17,16 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="libpng"
 SLOT="1.5"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng neon"
+IUSE="apng cpu_flags_arm_neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	!=media-libs/libpng-1.5*"
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/xz-utils"
 
-DOCS=""
+# Don't install any docs here because we're literally just installing the
+# old library for compatibility. Use libpng for the full contents.
+DOCS=()
 
 pkg_setup() {
 	local _preserved_lib="${EROOT}/usr/$(get_libdir)/libpng15.so.15"
@@ -47,7 +49,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-static
-		--enable-arm-neon="$(usex neon)"
+		$(use_enable cpu_flags_arm_neon arm-neon check)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index caba64073660..8465e0f63e22 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,4 +1,4 @@
 DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f
 DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
-EBUILD libpng-1.6.37-r2.ebuild 1351 BLAKE2B 3bcab7762912e1002c9c43c99acbfcab3526833b91da2fcb81e48837f81e736611b41702ddd9bbc56c339688769c0f2dd1a38634dd6443e2d78909d9803680fb SHA512 26c82252134e02af455e328745c08943975d8a353d0275e804c727ec7d7758f83b5c608db1336c396d4f1cc1b67b17a7e2d6031436df143b49f796cb001a74d0
+EBUILD libpng-1.6.37-r2.ebuild 1351 BLAKE2B 80d8da8c8884ba9fa526d0e9aa4e5bafb252f63741be0a5a19cdbc09aab1379044d44d4fbf5a0841226c4da2565c8fa932c7eb5721f69f40c55cb115e314ebd7 SHA512 662669111df09cff11631d6bd75ee2f73327128779a0d86622d796fc59e2c337b9d49e3ffd4e7be98f678025e68f3240a399fa3fad2b7af743b7c468da9d982d
 MISC metadata.xml 950 BLAKE2B 148894d74c766c80be02d1c6d48946ac8b3fa1d59cc6a28515f50a3aebd2f46da99c67dc324ff3fc99ffee5147b25c3848d6e39e8a57d864140160747c8480e1 SHA512 b26758a5222f261eab2a7a5388798120fd4170cbf1f495ba44d73512c2a9676892b9ad669e96a35b84df354de8baa83d259f5ffdd8de7c09285f0f50a805dad2
diff --git a/media-libs/libpng/libpng-1.6.37-r2.ebuild b/media-libs/libpng/libpng-1.6.37-r2.ebuild
index 864911bfec3d..38d7b6e61955 100644
--- a/media-libs/libpng/libpng-1.6.37-r2.ebuild
+++ b/media-libs/libpng/libpng-1.6.37-r2.ebuild
@@ -12,12 +12,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
+
 src_prepare() {
 	default
 	if use apng; then
@@ -30,15 +32,15 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
+		$(use_enable cpu_flags_arm_neon arm-neon check)
 		$(use_enable cpu_flags_x86_sse intel-sse)
 		$(use_enable static-libs static)
-		--enable-arm-neon=$(usex cpu_flags_arm_neon)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
-	DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
-	einstalldocs
+	default
+
 	find "${ED}" \( -type f -o -type l \) -name '*.la' -delete || die
 }
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index b93929fca720..ae8dbad3556a 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,9 +1,4 @@
-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
-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 1358 BLAKE2B 872f453155627b3daa9b06a14c503a66f1f7c8b2bedd0a60faa86a001fa80339fad4ae55b313b9a73002042ce501209acca4089c9d9cb01a6ef3a5a744e2f179 SHA512 3502ebbe98bbd5fb0a41bab4e4ee75de12a55bdb3f191b0f87e85f1a1a9251bc5b3a14ac9ab6683b38fca48918ed5addd24a3df7327f7c6a2a10c2e964e9829c
+EBUILD libprojectm-3.1.12.ebuild 1403 BLAKE2B 20513f6a62fc322eccb39d661637aaf9de70940111e9e93b6eba1aa13681cb04e3aa8136e73f374b8f6db9854dac7291c0bd19c8f1da3b31add3d32654bf8feb SHA512 a8d6d7c5d74932a058fc3b8243fe2b2f5bb0ae1bcdadaeb4b357874c2ddb83c9101943a3b1f6b140489a696409596c7e446de2533d48eaa5f3c9c4d8c3f3755b
 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.11.ebuild b/media-libs/libprojectm/libprojectm-3.1.11.ebuild
deleted file mode 100644
index a273f50c063e..000000000000
--- a/media-libs/libprojectm/libprojectm-3.1.11.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.12.ebuild b/media-libs/libprojectm/libprojectm-3.1.12.ebuild
index a273f50c063e..4ad62c3d8e28 100644
--- a/media-libs/libprojectm/libprojectm-3.1.12.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.12.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/libprojectm/libprojectm-3.1.8-r1.ebuild b/media-libs/libprojectm/libprojectm-3.1.8-r1.ebuild
deleted file mode 100644
index a273f50c063e..000000000000
--- a/media-libs/libprojectm/libprojectm-3.1.8-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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
deleted file mode 100644
index 8b34a76cc923..000000000000
--- a/media-libs/libprojectm/libprojectm-3.1.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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 qt5 sdl"
-
-RDEPEND="gles2? ( media-libs/mesa[gles2] )
-	media-libs/glm
-	media-libs/mesa[X(+)]
-	jack? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtopengl:5
-		virtual/jack
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtopengl:5
-		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 sdl)
-		--enable-emscripten=no
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/librosprite/Manifest b/media-libs/librosprite/Manifest
index 09e1f3121984..675606d4c41f 100644
--- a/media-libs/librosprite/Manifest
+++ b/media-libs/librosprite/Manifest
@@ -1,4 +1,4 @@
 AUX librosprite-0.1.2-Werror.patch 393 BLAKE2B dc5794093ac33e7b65ca42a9ab4dd967cc44b9c8e890d404021f995cbaf7fe83be2549377c503dc8d7b3dc692f3a48eeffcd1709d9cad840b4f9522b4b9fab15 SHA512 1f72277eadc2c958ff58c9a23e78bf5a8198c76502cba45e5619413f3dba4243e7a5f8650a11436cc87dd9e63257a874cf8b1805b4dcfe5f3db88733ff08e1fe
 DIST librosprite-0.1.3-src.tar.gz 32816 BLAKE2B 553f5046eac8b7de5940e812103a545ee1d599bcc30d4fd6bb14449e0718364132e76e3992b224d0d2dd3c7582100fe6d9e4d433f245a89b23e3f15542329e0e SHA512 ab039ab12df7f527a86a76247bc5cb70ebe550591f81a1b987abef73fb3c6bd25c9a36afe17bd6717f4f33b1a133d847bb5acad53057aa3c406efe4ebcdc601b
-EBUILD librosprite-0.1.3-r2.ebuild 666 BLAKE2B c217426ac0c9f0c6173e331a043746e515e1bdf862f8e354f8a86c88717fadc6517a2b7792a27a913768772a1b657e5707dd5e1593616a35b51871faccaa637d SHA512 d25feb83373087be94eeb15d33ea355cef39321b331ae923c4c0d534c50ee2bb717fb35c4a6442151d13bb461cc53e09599cebef9f9db6e40a5bc263c4bc265c
+EBUILD librosprite-0.1.3-r2.ebuild 673 BLAKE2B 6a50e4cb68e42deb40a769a26450284717c6422a92ab401d5c1b9c1a9345f21e7ec6de21a60a05ab8b33a329bb2d8da97f6f2cb7f9634b1e77beab2507c786db SHA512 244ea0f19f3eaa35f4d0a1f728bab85fd88393057a4001f8c5eb3e54f75edb94529adfb1f30623d8eb9084b95631ca162e04db7f2cf75c60a4761d75b94f5e59
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
index 7079dc81f265..73c0b7ed565e 100644
--- a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild
+++ b/media-libs/librosprite/librosprite-0.1.3-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://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index eb73bca58840..1b89051a6ffd 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,10 +1,4 @@
-AUX libsamplerate-0.1.3-dontbuild-tests-examples.patch 1187 BLAKE2B e6acec51e3a8dcfaa50074734e55ba64d416882334e80e9fbf5a079d236e1ed358173efd84faf568c29962dc5655b11e8cf7adeb007159f8fdd0b0e14904c457 SHA512 93fce01981c831ced0fd83c315841660a7d194a706ba8b1fb775cc327d8e526c1b65abc8556dfde808672143d51b5e70f005f569034e6921e8af53af1ad45eee
-AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf842819d8a70930469dc35140f648d71a29f3ed84eb36016c69a0738358a03d58930acc8381cacf3c047552b1fdcb7bae60 SHA512 acc63d2b6a547d9b480c4752864b474b478a753c88bd535833a5b1ca745c54d1e323bbe985f96430158307c0f1d1d1cf1171ec00bdbb31e9e888b3ed2c55019a
-AUX libsamplerate-0.1.9-htmldocdir.patch 1638 BLAKE2B 21cfc155520cdb1392925560a48317ba5850539e66544dc8c0ebf1a7d9eab0249e6ac98611695b169b4a0e984f6c4a9c1710d77cd99da53516c6bf8ec72e8c13 SHA512 859e94497d68470865f5dc198bdda8bc86135f84d67e1b06031e0acc67f10b88c354255fc6944a3c258934d71584c2cb72fbdf840cdd798a2e7712cf7cc3c9fd
-AUX libsamplerate-0.1.9-no-sndfile-resample.patch 1070 BLAKE2B b0e655e5162f8c77f66f57a54da132185d0f192d6e1def8aebb2ce389ed21e7460801bdacf096b7b71dcf0c067a585f4b7749680276ad28c75fd909532e93449 SHA512 d32fb092c593578060a58bab323aaad76c5a6f35a3e17a2617581f7d9309b4e2377753c13013637dc02f06343e082089b2ea229219d48a46dce2b138839f3eb4
-DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728
 DIST libsamplerate-0.2.1.tar.bz2 3747188 BLAKE2B 83540f3e75cfa79cbd166f075d22cab6a63e0e057b90ac6a3760c07196cac962df7d1ca26620a9033de046e0528bee3ded2b482e8629b1ae316844b5b31f3074 SHA512 f54f7f12c9536868d7a11fc9cbb86857505e7b75fe34cedaf0b9bfc864da6037296b3eae303a33d4c87b7fd20d96933b91ef59c8cc3d1313b9fc21654e5daa2d
-EBUILD libsamplerate-0.1.9-r1.ebuild 1003 BLAKE2B 51b1ef8835d7725369e8358e008d0e18e63bb6750b71362244c50fcf8a9d1351e276e9b06a4bfb4ce1f4fa7929ce003ce21b4cd2db99760e607040df9bf27c64 SHA512 ce35cf2cdf645f6dab7e1e8c1c7f3507fd7e79f8d10da27e678ed234dcdb5a9aeaecd705d497573c1ae7cbe4a5301dd2a8177d2e0e635b1b28ca0181b5067e9c
 EBUILD libsamplerate-0.2.1.ebuild 1275 BLAKE2B 31ae278e123cf062ad85bcb0ab30e010cf8f2567b0dee4cc4489b58a2d1771b1272b36e4dc8787bfc03888aba50cd2db2b407863ab45a81d6acd1c9a2dd8c75a SHA512 937dd69f5070996dfecfcf32dd1fafed4546e33f904312cccfc541b16fff911b9c9532bf7a326968e277b73945eb262674f17f84210c13e6753f3fc84b080eb9
 EBUILD libsamplerate-9999.ebuild 1282 BLAKE2B a8a0a12e7b2d244f497998d36318d4122f376c79eb0e4abfe6b0b028b9fbd460b7ed7a57e2ea966cd2c8c3bf21d8c86027835cf62f1c61723e5601422f030cd0 SHA512 9eba6f3eb488a4912777efc82b3529a87d581dafc817d903170ba2f19148aa67e829f926786dfc5c6d632ae1e10feaa9430dc6bfcd82f66087f4ac8f6138687f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.3-dontbuild-tests-examples.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.3-dontbuild-tests-examples.patch
deleted file mode 100644
index 23cf5897a59e..000000000000
--- a/media-libs/libsamplerate/files/libsamplerate-0.1.3-dontbuild-tests-examples.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: libsamplerate-0.1.3/examples/Makefile.am
-===================================================================
---- libsamplerate-0.1.3.orig/examples/Makefile.am
-+++ libsamplerate-0.1.3/examples/Makefile.am
-@@ -3,7 +3,7 @@
- 
- bin_PROGRAMS = sndfile-resample
- 
--noinst_PROGRAMS = varispeed-play timewarp-file
-+EXTRA_PROGRAMS = varispeed-play timewarp-file
- 
- SAMPLERATEDIR =../src
- INCLUDES = -I$(srcdir)/$(SAMPLERATEDIR) @OS_SPECIFIC_INCLUDES@
-Index: libsamplerate-0.1.3/tests/Makefile.am
-===================================================================
---- libsamplerate-0.1.3.orig/tests/Makefile.am
-+++ libsamplerate-0.1.3/tests/Makefile.am
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = misc_test termination_test simple_test callback_test \
-+EXTRA_PROGRAMS = misc_test termination_test simple_test callback_test \
- 					reset_test multi_channel_test snr_bw_test \
- 					float_short_test varispeed_test callback_hang_test \
- 					src-evaluate throughput_test
-@@ -55,7 +55,7 @@ throughput_test_LDADD  = $(SAMPLRATEDIR)
- 
- #===============================================================================
- 
--check: $(noinst_PROGRAMS)
-+check: $(EXTRA_PROGRAMS)
- 	date
- 	uname -a
- 	./misc_test
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.8-lm.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.8-lm.patch
deleted file mode 100644
index bfaa87bf976f..000000000000
--- a/media-libs/libsamplerate/files/libsamplerate-0.1.8-lm.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- libsamplerate-0.1.8/samplerate.pc.in.orig
-+++ libsamplerate-0.1.8/samplerate.pc.in
-@@ -8,4 +8,5 @@
- Requires: 
- Version: @VERSION@
- Libs: -L${libdir} -lsamplerate
-+Libs.private: @LIBS@
- Cflags: -I${includedir} 
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch
deleted file mode 100644
index cedcd3124336..000000000000
--- a/media-libs/libsamplerate/files/libsamplerate-0.1.9-htmldocdir.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 06fea5c39b186955194e85ada50724465c39033d Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 10 Jun 2017 15:48:00 +0200
-Subject: [PATCH] Remove htmldocdir variable
-
-* Autoconf and Automake provide a variable (htmldir)
-  for this already.
-
-* asturm 2020-09-04: Rebased onto 0.1.9
----
- configure.ac    | 10 ----------
- doc/Makefile.am |  6 +-----
- 2 files changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0ce20e9..6d5e692 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -264,21 +264,11 @@ AS_CASE([$target_os],
- 		;;
- 	esac
- 
--htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
--
--if test $prefix = "NONE" ; then
--	htmldocdir=/usr/local/share/doc/libsamplerate0-dev/html
--else
--	htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
--	fi
--
- #====================================================================================
- # Now use the information from the checking stage.
- 
- AC_DEFINE_UNQUOTED(OS_IS_WIN32, ${os_is_win32}, [Set to 1 if compiling for Win32])
- 
--AC_SUBST(htmldocdir)
--
- AC_SUBST(SHLIB_VERSION_ARG)
- AC_SUBST(SHARED_VERSION_INFO)
- AC_SUBST(OS_SPECIFIC_INCLUDES)
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index be86d64..cbc9963 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -1,7 +1,3 @@
--htmldir = $(htmldocdir)
--html_DATA = SRC.png SRC.css index.html license.html history.html download.html \
-+dist_html_DATA = SRC.png SRC.css index.html license.html history.html download.html \
- 				lists.html quality.html win32.html faq.html api.html \
- 				api_simple.html api_callback.html api_full.html api_misc.html
--
--EXTRA_DIST = $(html_DATA)
--
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch
deleted file mode 100644
index ae515602d817..000000000000
--- a/media-libs/libsamplerate/files/libsamplerate-0.1.9-no-sndfile-resample.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bf39835df4eba7b2ec2d5c5e7d1d40397942c3b0 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 27 Jan 2018 14:12:35 +0100
-Subject: [PATCH] Move `sndfile-resample` to sndfile-tools package
-
-* Fixes https://bugs.gentoo.org/645258
-
-* asturm 2020-09-04: Rebased onto 0.1.9
-
----
- Makefile.am                 |   7 -
- 1 file changed, 7 deletions(-)
-
---- a/examples/Makefile.am	2014-11-30 11:44:50.000000000 +0100
-+++ b/examples/Makefile.am	2020-09-04 17:30:07.824611967 +0200
-@@ -1,8 +1,6 @@
- # This file was automatically generated
- # DO NOT EDIT!
- 
--bin_PROGRAMS = sndfile-resample
--
- EXTRA_PROGRAMS = varispeed-play timewarp-file
- 
- SAMPLERATEDIR =../src
-@@ -15,9 +13,6 @@
- 
- #===============================================================================
- 
--sndfile_resample_SOURCES = sndfile-resample.c
--sndfile_resample_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS)
--
- varispeed_play_SOURCES = varispeed-play.c audio_out.c audio_out.h
- varispeed_play_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) $(OS_SPECIFIC_LINKS)
- 
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
deleted file mode 100644
index c81aef8573ca..000000000000
--- a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.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
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
-HOMEPAGE="http://www.mega-nerd.com/SRC/"
-SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.1.3-dontbuild-tests-examples.patch"
-	"${FILESDIR}/${PN}-0.1.8-lm.patch"
-	"${FILESDIR}/${P}-htmldocdir.patch"
-	"${FILESDIR}/${P}-no-sndfile-resample.patch" # bugs 408849, 645256
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-fftw
-		--disable-sndfile
-		--disable-static
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/libsbsms/Manifest b/media-libs/libsbsms/Manifest
index f02d036e92b2..d90de8e46e6f 100644
--- a/media-libs/libsbsms/Manifest
+++ b/media-libs/libsbsms/Manifest
@@ -1,4 +1,4 @@
 AUX libsbsms-2.0.2-cflags.patch 688 BLAKE2B f42728c599064927973f65a1eb3443cdf7a931f4f5d971a61d749ba4f0b990b34d8c47a2d52b08c5720202732e8409f006dae481b94634ba5b97a57f76bfdf40 SHA512 330a26e5b4b99f00546a2f625c4bae90f8a8645e855379e7de4f833a1c561c3c8e23f0faa954a989359f0de09a1310374ff93644d2f646bae3b9788293cfcd29
 DIST libsbsms-2.0.2.tar.gz 450170 BLAKE2B a9e75f1f2a3da2a407d21bd267fe842d2c2367f85e4cb588902ae34e56b76297c2f60968113ae7a08a6652e57bc20376f1a60e97d6d59863f9f1ae30589e0723 SHA512 8aaab3e191f3e10e559683ab4ebdcb8d951cf0e776390234f25675a98640d60d20aed872061ba72fdc3bd7827b7d46bc27225fe947cdd7fa4312f75cbdd78e6c
-EBUILD libsbsms-2.0.2-r1.ebuild 771 BLAKE2B d0c6e2697e60d6ef663f0ce8bf7540ae481498e33574a195ddf38c9a40008de99886570cd855cadb38a5added0610710833b6a69c455ad063206f265530720e4 SHA512 1f6098dbcae9526cc17453f6633b565db8921de92c212548f5db0d4d36cd628884498fa8a56d4c5da86a01e829595b61950d8ec7afd8c043847d65a6054f0570
+EBUILD libsbsms-2.0.2-r1.ebuild 764 BLAKE2B 7527e8553a597122b7a694221a1ae81600c844eb8b66a03733ff70c1c75a05528b5890ec0e24176076c7fef9de2652c7aac2a22c33acb3d49b0cbf263730aaf7 SHA512 6d9e5810c65e79fa8228fabf7aaca0992c8e23f6a153b42dc0771c188c35df1c467301cce567981203a7be7ebe7c1a8c4776284ebff1fde2b0f9cb6b67dfead4
 MISC metadata.xml 334 BLAKE2B 27f96c580033502f5fae3be23efbde22dff9671695e36128f4e8aa1103d81383d718dd36225f1a966b0bf800a7566a89f735197aba72d4842f7162f3e7f06333 SHA512 0bdcb69cb01f3ee3734ee6374e72b0e2d6b413660067b0c63df773f61d13230d0e1b7af19ed5ffe8a31472a4f8e715c3da3b76bdb3e350cfbadab5dbb4d25a59
diff --git a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
index 8c2ce6927e18..1d5aa0a2c7df 100644
--- a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 AUTOTOOLS_AUTORECONF=true
-inherit eutils autotools ltprune
+inherit autotools ltprune
 
 DESCRIPTION="A library for high quality time and pitch scale modification"
 HOMEPAGE="http://sbsms.sourceforge.net/"
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index d649e5a68143..477c27a529a4 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -6,8 +6,9 @@ AUX libsdl-1.2.15-gamma.patch 1339 BLAKE2B 83e0d10fc4396ce992c8f59043e2380921a44
 AUX libsdl-1.2.15-joystick.patch 315 BLAKE2B e1adc864e4d660ef21ce2401f29c61c380be6503a62aa6baf82976511c53196ace378c9a259fd2196e8e3b47928a344943ec1704acfe58404bceac2591d8f077 SHA512 653e7d2e2dbc4c945e4e4e43dc53f569164c8bbb1e4e9d9c2421cd7da13849d04439ef9cbcf6736c6e5d2aa695a1b24d314045eb3f817dcb1b6f2e93fbfb2e1a
 AUX libsdl-1.2.15-resizing.patch 2098 BLAKE2B 6f8e7832262384b1c710f8353b0b0654b0a951a83e198ef7c8781a5d6ad20c806677f99da93f14e2731b3330662ac4506d687c594116651a148c2833d803dc0b SHA512 afa82d81e03fe974b2c1a4f3c9ed48a15472784548c8e88f988bb03ea992e8ce86bbad74f7e5980dd1476139cf82180eda72e77041e065925cb373cda47c268b
 AUX libsdl-1.2.15-sdl-config.patch 784 BLAKE2B d54d98ad6ddbea163fd4a0ce9d65ac77d832d68d611c1cd4fb20fa70b5bee641204a4ff7b51eff47f6a4e94193d1cad2f82bdb64a4d73582c932a3661870e3cb SHA512 95af8c3dac4fdea5bad92c044a311efaae02a46e1c5bfa84dadee7b3fab6b48f4dcf12ca6e581429decb479de21ec6167c59b215fb3a398fb82151aa4c3fb432
+AUX libsdl-1.2.15-slibtool.patch 2288 BLAKE2B 5018f714eb40320eb0d310de1553638d66c81a70e7ab7366cedc38d11641f7ab68699d5fa2ea466a2e99c5cd778bb949114a5c5a4190e37f8fc86060962a8bf4 SHA512 e020a8d9a4fe2e74884b0aa8e69778dbbf2b60c70181767f84404038a07ca55956794b19ad8d3a4e5211bf6ecf05ec65712a588076fe9467442f21b99baca4fe
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
 DIST SDL-1.2.15_p20210224.tar.gz 3991106 BLAKE2B be0906950c80cddf15bc458f7734a3ebfa767b11e2f54bf9f771155f4420947900b95bbbebf01341d9dba4c1c7cfe9d54e43150e5f7781622b99668b3362adeb SHA512 3521fe996cf8a8ebb9beaa4802ac05cf5f3a2e7ed1c9b362a818d965b26ec8b3bbebfaac7c827feae44becf5bdd764378cb4282d129285f23a982b5c7474e006
-EBUILD libsdl-1.2.15-r9.ebuild 4080 BLAKE2B 3ce3e61ef81dadff7ce55cff055ace796e6697d87f2d62131fe2162d2146ff8a1a964fa79021d19db9171bd9bb19479e0208510c7d79d5f2eb4bd7a99d3142e3 SHA512 193e9823cbf1b3bcf89604b1983752408b90629490b2f68ba91d1bf433893bd5562550b627c83234927c9f17709951b230070078d319ab6f675e6f90d41b9c55
-EBUILD libsdl-1.2.15_p20210224.ebuild 4083 BLAKE2B a755125b25c7154906e96353ff7e6bac28a7a08eabb2f6c2bc77c875ee405ae7ad94a61a4ebdc83992f52da206f01dc23e546974035031d8f25d4d90fff1478c SHA512 1a4bb4c170604ad5fecde71bc2d4286ddb51c96cf97960b0b7bc5171d2e56c89df120f70180fe4f1eb86932b8a8f3ef1d93bac980860981cf2f51210b5b232a2
+EBUILD libsdl-1.2.15-r9.ebuild 4081 BLAKE2B 258b06714d6ee5783241833823da37a9a8785e96702c1de4b87c1ee7898b95137317f38784e7fd025b78462d7351ebcd25d0be122af7aff5586b9c279c5b497c SHA512 0a910fd44c84082b74b67037d6703765d50ff9d6fc36c9d5e3e3640b6b4099fcdf2d2ce9022d64fe213fb6c94af78d3871486598f1c335863928862ae2804750
+EBUILD libsdl-1.2.15_p20210224.ebuild 4956 BLAKE2B dc6c957471496eed2dbc8a60c2953d2871b3a5da8d650880d5c5bd84cf10daee89893c60b0a8f87da159057a48153a63dbe7bd4fa683b9b2fbed4338526772be SHA512 29ad2d8f6a9102a986f4a01be57065ba4709c8e09ec33df905e1db5995d7e781751cf6d6bf20b167f083b8c49fbedea7f15a91304817715f2a5122608d528e1b
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch b/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch
new file mode 100644
index 000000000000..3066e9fc8b03
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.15-slibtool.patch
@@ -0,0 +1,56 @@
+https://bugs.gentoo.org/779445
+
+commit ed1030d9b6a98e06aa293d18c49da18169918b8b
+Author: orbea <orbea@riseup.net>
+Date:   Tue Mar 30 18:57:37 2021 -0700
+
+    Fix the build with parallel make and slibtool.
+    
+    There is no dependency on the $(OBJECTS) files on the 'build'
+    directory which causes slibtool to fail when the directory
+    does not yet exist. GNU libtool avoids this by being slower
+    than mkdir(1).
+
+diff --git a/Makefile.in b/Makefile.in
+index ab51035..90940d4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -51,7 +51,7 @@ LT_RELEASE  = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ LT_LDFLAGS  = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
++all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
+ 
+ $(srcdir)/configure: $(srcdir)/configure.in
+ 	@echo "Warning, configure.in is out of date"
+@@ -61,8 +61,9 @@ $(srcdir)/configure: $(srcdir)/configure.in
+ Makefile: $(srcdir)/Makefile.in
+ 	$(SHELL) config.status $@
+ 
+-$(objects):
+-	$(SHELL) $(auxdir)/mkinstalldirs $@
++$(objects)/.created:
++	$(SHELL) $(auxdir)/mkinstalldirs $(objects)
++	touch $@
+ 
+ .PHONY: all depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist
+ depend:
+@@ -71,6 +72,8 @@ depend:
+ 
+ include $(depend)
+ 
++$(OBJECTS) $(SDLMAIN_OBJECTS): $(objects)/.created
++
+ $(objects)/$(TARGET): $(OBJECTS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+@@ -88,7 +91,7 @@ install-hdrs:
+ 	    $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \
+ 	done
+ 	$(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h
+-install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
++install-lib: $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index e5706ac4f8db..f4b6d7b5d092 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools flag-o-matic ltprune multilib toolchain-funcs eutils multilib-minimal
+
+inherit autotools flag-o-matic ltprune multilib toolchain-funcs epatch multilib-minimal
 
 DESCRIPTION="Simple Direct Media Layer"
 HOMEPAGE="https://libsdl.org/"
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
index 5e79c923cb07..65181ee97dc5 100644
--- a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -65,6 +65,7 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-sdl-config.patch
 	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-gamma.patch
+	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-slibtool.patch
 )
 
 DOCS=( BUGS CREDITS README-SDL.txt TODO WhatsNew )
@@ -73,11 +74,34 @@ HTML_DOCS=( {docs,VisualC}.html docs/{html,images,index.html} )
 
 src_prepare() {
 	default
+
+	if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
+		# GCC at least has no idea what -fpascal-strings is
+		sed -i -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"/d' configure.ac || die
+		# We have trouble building against Frameworks with GCC for now (no Blocks support, etc)
+		# error: unknown type name ‘CGImageSourceAnimationBlock’
+		sed -i \
+			-e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_CARBON"/d' \
+			-e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX"/d' \
+			configure.ac || die
+	fi
+
 	AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf
 }
 
 multilib_src_configure() {
 	local myconf=
+
+	if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
+		# We can't build against Cocoa because we lack Blocks + Objective C++ support in
+		# GCC (for now)
+		use video && myconf="${myconf} --disable-video-cocoa"
+		# CD support drags in audio
+		myconf="${myconf} --disable-cdrom"
+	else
+		myconf="${myconf} --enable-cdrom"
+	fi
+
 	if use !x86 && use !x86-linux ; then
 		myconf="${myconf} --disable-nasm"
 	else
@@ -95,7 +119,6 @@ multilib_src_configure() {
 		--disable-arts \
 		--disable-esd \
 		--enable-events \
-		--enable-cdrom \
 		--enable-threads \
 		--enable-timers \
 		--enable-file \
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 07398d72f489..1d599af52c70 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,11 +1,10 @@
 AUX libsdl2-2.0.12-egl-detection.patch 744 BLAKE2B cfcb6db61505e7f8dbd327c73098c2df88860c336438af531905aba5f8de1f696b41cbbab7a09a6a1fc067a39c3178aebbc2e86146f45e2d3ddac8ab1e6bb892 SHA512 1640c71d5a5c86e99d60123b3c5c8e60a9e1bcdf886662d9d2c8f2fda994cba873c5ac515cdf41e5e81663a895e6e2db08ea5e180999a5cebac8e08d2438d59b
 AUX libsdl2-2.0.12-static-libs.patch 2510 BLAKE2B 2c93b5a9ba38d797281d2d3b13eeb1848b46835e99dec20a325fd6e4e30ff44ae1966292f8b0cf95e3356e6a6d2787e90ea51c47fd92948cba2943c6ecbfb8c3 SHA512 d0f6a3f8282275f9ae63bfb363a357deb804d079be6feeaa0d8c749b79df1ad195da59b0da22f1eae4f527eecd63ceef210f52c1f303229a7aa13b71c3d711b0
 AUX libsdl2-2.0.12-vulkan-headers.patch 536 BLAKE2B 5bc6f494aa3afb6c1176055193505bc091569925f2f31f6e623254fa19df3eeb3fe477b97b4eef1973a3f9961d8f5159cf62aae39b8ab84d178ca5f8cf8346fd SHA512 20a6f433c973bb521d4db19c682b1a063b314405a0f2b68ed88a68030ef2a4ba71a8b84c45c0980c6218f2b9f332cc3cfd1354aebcd0932584169161638e011e
-AUX libsdl2-2.0.14-static-libs.patch 1820 BLAKE2B 54a6e92a2fd52c54ae25a1b859502cc403fa9bfcb6e2f3b83ca90fa125ff98c5ed0478cf786d6f1142968187230efbc994a57f706ae1a90bd1fe21eeada1673a SHA512 cf3762b03600c80f26e72f8828b4c0d6ac3c32ae00e1e0f5c9ab46fb4de178f4b045dcfd68f5d371c835235c96c5f1762e5966377d2a95874a012008eb2b13b9
+AUX libsdl2-2.0.14-static-libs.patch 1812 BLAKE2B 47f2e3f2d9c5d7c86d2cd046c0d4012c417ec4eb4f78d561abe9f6b07fee94364040947978898758ba6647c342c475f8ff32d7026de7a9ff7189207405996922 SHA512 1e0fa0c12a089c4fe39cdf458e566378fd2fde6c1da5e0950c7978930e9429f3da407bc69f3d6c30acb6a268a292f7c6f11f675b6e27fbe0ef601340de969812
 AUX libsdl2-2.0.14-vulkan.patch 554 BLAKE2B 654415d20fc1782ee8d3a979355dcb743537cad60bebf4edf5299feec821cacbd75c45247820d1c41cb4c706b3bbf58fd2e33ed38b1150a50b0be0aab9d3f536 SHA512 d379da36a27c82c8e178f05ba572022119c012b304ffa672529d652c41d00ee7ad00ce715892306c7e6e914a3071d2879c67f37198139d5a786ce4da442309c0
 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 5895 BLAKE2B 4ef95d547e288bd1ae52a35aaf20e2c679655c51e7c749327ce089644aa02c799bd8461033e918c327bf455dd5e7f97448a3ccf1c3fb327aeadea6b5139eafbe SHA512 54e4c662d6ced0f013e87310639154b9d1900a9ecd3bdfda48cfa54fbc5e0d793fee512e393a37d13a6e7f05ec621613b7c4f8b551d21713b30d8c4d8cd00091
-EBUILD libsdl2-2.0.14-r1.ebuild 6155 BLAKE2B c38ffed9cd5160241f44268b9b34d267b82b9315cea18f9b0fcc3cf562018d3256c5266d5fec5c841df532133b3f184c7230ff4dae9828ed2d626c640a732bd5 SHA512 c3d07224b7be960c8e6201b659e5ee7923d2f2a3cb6aaadfe3118cbd7b27ec88dc9a3f2f4199f43d82bbb67eda21852a424d1c5e6d04b8aa6a98d1f69474b37e
+EBUILD libsdl2-2.0.14-r1.ebuild 6061 BLAKE2B 14e534a1cb0f97092c0a71c715e5c69c8d2d0069a275dac254d2c52d9f2b7e39d944447e6363a2675133edff7fe9e34d04f2084736a30f0e847cac897f482ac9 SHA512 333006640172dd85d3f4b08b708d265b33b179d184c8978b6355f2b09399f247579fe62089dbb2e79559fc7826f3a375d919fa19942cd14d94e368892170f2d0
 MISC metadata.xml 1805 BLAKE2B 16d4961cf6d0c9997fe706dd5deb51b98f153135cb4f0bedbc29e842d485ba2f4493003830385957b7ac92fd9f6d31bcf4319d800a7f2bd46a9a1772b86f3e5a SHA512 37e976d6a469c6e17e3efb178a189903c3ac2baf99d0e3aa7fb80bfc6d297e52c910ae6361e119fe1173d6d8a9d2aef47172bb4a1185ef4f99f36c75d1f8c19f
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
index 01b9c5134379..0d4dfdcb445e 100644
--- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
+++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
@@ -24,11 +24,11 @@ Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
  
  $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
 -	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static
  
  $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
 -	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir)
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static
  
  install: all install-bin install-hdrs install-lib install-data
  install-bin:
diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
deleted file mode 100644
index 4c094388884f..000000000000
--- a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal
-
-MY_P="SDL2-${PV}"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="https://www.libsdl.org/"
-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"
-
-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 gles2 haptic 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="
-	alsa? ( sound )
-	gles2? ( video )
-	jack? ( sound )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	vulkan? ( video )
-	wayland? ( gles2 )
-	xinerama? ( X )
-	xscreensaver? ( X )"
-
-CDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	kms? (
-		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm]
-	)
-	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
-	nas? (
-		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	)
-	opengl? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)"
-RDEPEND="${CDEPEND}
-	vulkan? ( media-libs/vulkan-loader )"
-DEPEND="${CDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/SDL2/SDL_config.h
-	/usr/include/SDL2/SDL_platform.h
-	/usr/include/SDL2/begin_code.h
-	/usr/include/SDL2/close_code.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.12-static-libs.patch
-	"${FILESDIR}"/${PN}-2.0.12-vulkan-headers.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Unbundle some headers.
-	rm -r src/video/khronos || die
-	ln -s "${SYSROOT}${EPREFIX}"/usr/include src/video/khronos || die
-
-	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
-}
-
-multilib_src_configure() {
-	use custom-cflags || strip-flags
-
-	# sorted by `./configure --help`
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--enable-atomic
-		$(use_enable sound audio)
-		$(use_enable video)
-		--enable-render
-		--enable-events
-		$(use_enable joystick)
-		$(use_enable haptic)
-		--enable-power
-		--enable-filesystem
-		$(use_enable threads)
-		--enable-timers
-		--enable-file
-		--enable-loadso
-		--enable-cpuinfo
-		--enable-assembly
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_sse ssemath)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_3dnow 3dnow)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable oss)
-		$(use_enable alsa)
-		--disable-alsa-shared
-		$(use_enable jack)
-		--disable-jack-shared
-		--disable-esd
-		$(use_enable pulseaudio)
-		--disable-pulseaudio-shared
-		--disable-arts
-		$(use_enable libsamplerate)
-		$(use_enable nas)
-		--disable-nas-shared
-		--disable-sndio
-		--disable-sndio-shared
-		$(use_enable sound diskaudio)
-		$(use_enable sound dummyaudio)
-		$(use_enable wayland video-wayland)
-		--disable-wayland-shared
-		$(use_enable video_cards_vc4 video-rpi)
-		$(use_enable X video-x11)
-		--disable-x11-shared
-		$(use_enable X video-x11-xcursor)
-		$(use_enable X video-x11-xdbe)
-		$(use_enable xinerama video-x11-xinerama)
-		$(use_enable X video-x11-xinput)
-		$(use_enable X video-x11-xrandr)
-		$(use_enable xscreensaver video-x11-scrnsaver)
-		$(use_enable X video-x11-xshape)
-		$(use_enable X video-x11-vm)
-		$(use_enable aqua video-cocoa)
-		--disable-video-directfb
-		--disable-fusionsound
-		--disable-fusionsound-shared
-		$(use_enable kms video-kmsdrm)
-		--disable-kmsdrm-shared
-		$(use_enable video video-dummy)
-		$(use_enable opengl video-opengl)
-		--disable-video-opengles1
-		$(use_enable gles2 video-opengles2)
-		$(use_enable vulkan video-vulkan)
-		$(use_enable udev libudev)
-		$(use_enable dbus)
-		--disable-ibus
-		$(use_enable tslib input-tslib)
-		--disable-directx
-		--disable-rpath
-		--disable-render-d3d
-		$(use_with X x)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# Do not delete the static .a libraries here as some are
-	# mandatory. They may be needed even when linking dynamically.
-	find "${ED}" -type f -name "*.la" -delete || die
-	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
-}
diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
index 4d1a2b292c97..a7e5d16fe307 100644
--- a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
@@ -12,7 +12,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 udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
@@ -112,9 +112,6 @@ src_prepare() {
 multilib_src_configure() {
 	use custom-cflags || strip-flags
 
-	# libsdl2-2.0.14 build regression. Please check if still needed
-	append-flags -D__LINUX__
-
 	if use ibus; then
 		local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
 	fi
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index 287cfcde67d5..dc7a974584ed 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,3 +1,5 @@
 DIST libsidplayfp-1.8.8.tar.gz 673522 BLAKE2B 2d31955e08b0b2b9558e033eff5d959acda08cdc5a3c2bb8c0aacb07c4b8c105812b4faa0af07dbc51255c72cfdf4893ce0da4d642dfc0f89ebc6ec96c51db51 SHA512 84fb24dcf6680dd0e2ec9cc39ddaf30707e4beb5136b7b496b1b85bf11580b1080fbb59b6ec3c1dc7b829fa0cd933db89ee3968518f23ef1a35d9253707d6392
+DIST libsidplayfp-2.1.2.tar.gz 788212 BLAKE2B 1959404d8b694e9271276bd3a7d32298747fcfc52fc96da3ebae16e23ed9c1825cda4810bff5ad39a0ca7f173300f6b86791ff589ee78bf05c9e12bc49bccaf5 SHA512 c044cc835666a7616b2c16e8f186877caa42c80c74ae2fd503868f77311ed6bc8df58cbb72e7086477adec1ba314bd4f1410a733642ff18baf1596afa1a9b22b
 EBUILD libsidplayfp-1.8.8.ebuild 837 BLAKE2B c895321c29600fd9d7a46c429606dbc1efd60c376e437a84cc5edb4c16abaf12cb02c3e3a38971be3a5684bca2ac6309c7b45d6805be36dbd71cc5a351411754 SHA512 d2452be2e98918d9fd8a694b80c5cfa60118fe9578b0b8a212b8e51deb04d22e503684865469b236a33b4db8eb0988dedf855ca0ec80d88ee5a20551ba614fe2
+EBUILD libsidplayfp-2.1.2.ebuild 747 BLAKE2B 02b40f4d38913c921db9e63cecc122a2eaf982389c35ae9e31fa2c03c7ad300ed1e0c766c9ad7d23105a72a6fc78d76402a1b2c479c03d7b0fe8ddf00ec21208 SHA512 6b92125a4ab7212433be9e8076cb036be45ca1434639b3b5dfcae331564f48b3c88c5d73079ce3169f93d7658c56a75275e58a3bd4ca4a9a80a292a56a34aeee
 MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild
new file mode 100644
index 000000000000..8712fad9752d
--- /dev/null
+++ b/media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Library for the sidplay2 fork with resid-fp"
+HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/6"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="cpu_flags_x86_mmx static-libs"
+
+src_prepare() {
+	default
+	# fix automagic. warning: modifying .ac triggers maintainer mode.
+	sed -i -e 's:doxygen:dIsAbLe&:' configure || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_mmx mmx)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 35a1204a867e..c807cd848036 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,6 +1,4 @@
-DIST libsndfile-1.0.30.tar.bz2 852320 BLAKE2B 00bd558a3d8645f4ad03fba38c31fcea25d30bea4b6f1a785b4b31b0da61bfa6a6f7df1bd7907c95c543cce8ee6766032d2e614eb285f2fc529146cb1d319517 SHA512 c4be4bc57df880da81570889a80256ba4567f2c7d6bdfb38f3803c55f616278160e962544bfac32e53b613b8fdf2a2644d8da9ee778747c32cb681a0fd5aab00
 DIST libsndfile-1.0.31.tar.bz2 875335 BLAKE2B 33e3c3d111427e829d8233aec52c227188834936839da9a04cf1ea5d2595d6a3127e7ce86d7686ca0336cca2017e6e2466845c27c7fc399efae34a0902316e41 SHA512 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1
-EBUILD libsndfile-1.0.30.ebuild 1804 BLAKE2B 94528a9c05d8390086590e8441541dfc2849ac42817f2ea51a6fa18ffaf8f08d2775be6ab03f955d6f9e63afffff07c367a0bd110522f850ae5aaeef332b2ad1 SHA512 024e0429d1ac534c3ceec5d6d9a8628a1e042a8a6ad75a987cb64f792b058a720d23e867b53954d04b8e019372332807a7d24417b9b562a510d6bd22abbcd8ad
 EBUILD libsndfile-1.0.31.ebuild 1781 BLAKE2B 8e1f3d7a97b6d4c6f2d50cf21771d61e155f8c6cb24ec0e8fc9299094f0c45b732b5c3b8bf2af83fa2b88526987dfec43a566f36e75875fb13421f812d631dbe SHA512 c1081cd331cbb6b07f08a6cea0e23ecf980d30fd01bd129ba39898c64d520d52834719c16825160383721bcab1bd9b7a50c3cd826ab072fbd0d85fd3e32e3bb7
 EBUILD libsndfile-9999.ebuild 1788 BLAKE2B 2c16c7480477006e1a72e91f50e19d9c9b8fb5e6edecf4b351a8a48925f90749e1a55368a6e74b7c77a77f030e1a2dbd4431d9a8b24d17650f20378b875ab2b5 SHA512 423e5e7c5be3fcd74d4b5523394eb27bb9c2890300f330e5d8f8d05e54ec4e4a4cb706164880aaeb3a20f9408bc1d4a2f90207a3ce6334f43b59f39516841f64
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.30.ebuild b/media-libs/libsndfile/libsndfile-1.0.30.ebuild
deleted file mode 100644
index 9dc9865c9e56..000000000000
--- a/media-libs/libsndfile/libsndfile-1.0.30.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
-else
-	SRC_URI="https://github.com/erikd/libsndfile/releases/download/v${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-inherit python-any-r1 multilib-minimal
-
-DESCRIPTION="C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa minimal sqlite static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!minimal? (
-		media-libs/flac:=[${MULTILIB_USEDEP}]
-		media-libs/libogg:=[${MULTILIB_USEDEP}]
-		media-libs/libvorbis:=[${MULTILIB_USEDEP}]
-		media-libs/opus:=[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib:= )
-	sqlite? ( dev-db/sqlite )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )"
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND+="
-		${PYTHON_DEPS}
-		sys-devel/autogen
-	"
-fi
-
-pkg_setup() {
-	if use test || [[ ${PV} == *9999 ]]; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-octave \
-		--disable-werror \
-		$(use_enable static-libs static) \
-		$(use_enable !minimal external-libs) \
-		$(multilib_native_enable full-suite) \
-		$(multilib_native_use_enable alsa) \
-		$(multilib_native_use_enable sqlite) \
-		PYTHON="${EPYTHON}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index fb633d8a2a97..94ba50d344bf 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,3 +1,5 @@
 DIST soundtouch-2.1.2.tar.bz2 526281 BLAKE2B f15f004fd6abdf4cd6fdb842c650480c670a517c6d94365633a7cc4beb95447d7a8bee965d4b258da6c31630e370e3c1c1fc73abfe8568ace465ce41a87397cf SHA512 d45cb0f94e3df32e9c76722a148f201277b2ddc3e390394c1f4ae1263f13557c6b664e90301b5f62d7561d743ab4903a44a34ab7248880b343d581cebd5f0cd9
+DIST soundtouch-2.2.tar.bz2 527571 BLAKE2B 0ed67604f0996a9112cbabad9eda39c314aa1f3b1b70aac2a014f76880cb5ad06aeb697f44e9229ad197c9245ce8f684f5fb9b31ce31ae631400a17fe825679f SHA512 8bc1b9aa60031145e8be7ab48d10d93da84b0f5032eb2d8cf46291d4267b6810513f284f6fa72dd6f343e30eeec03070a7485cd933f30bace2ebf995bc843143
 EBUILD libsoundtouch-2.1.2.ebuild 1520 BLAKE2B 1201cd8926d9a18249cc31bf7a59a4f2fcc7069fc4288ded072c0186c4d7e1494311080d8dec1574d0449b8b90117b8d0bc7569135cf03265a8aa08853883499 SHA512 2d8ca9157fb7e2a360a106231adf089c01ac804b0804d8197500c32e97aee60dde3289867ef7d9e0ff71b0db538dd640ec38e185256c524d39c8a0b8c70e6683
+EBUILD libsoundtouch-2.2.ebuild 1524 BLAKE2B 5dfeb54696c03bcc4d95d28798230ffd4dd60c63a40abfcf1498ff5dfd10300e84e568aff4ed7a01715d315b953f92d935182550c8cfb0d9570894837039ed08 SHA512 d8b236a447e751fbf04d45069748260efb46db7628b4e5e9e0fffcc8d86f2c8088ebecb830b6155780214bbe97ffda2bf4079d1c2398b15cd89909b0b38c5fe3
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.2.ebuild
new file mode 100644
index 000000000000..05a3b1ff14d0
--- /dev/null
+++ b/media-libs/libsoundtouch/libsoundtouch-2.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+MY_PN=${PN/lib}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
+HOMEPAGE="https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch"
+SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+# subslot = libSoundTouch.so soname
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="cpu_flags_x86_sse openmp static-libs"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--disable-integer-samples
+		$(use_enable cpu_flags_x86_sse x86-optimizations)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index 1ae8c150f2ba..3b159070d571 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,4 +1,4 @@
 AUX libsvgtiny-0.1.3-parallel-build.patch 406 BLAKE2B 1b7ef472490646196af762701b28636fcab2778ff4f77efc1e1c7d0736d73ca41703bf473333ee775e99df8eca24d4845e0bd03e117586e84b4a629af726b417 SHA512 1126b2985293432d9e8849ce85c27055d7fc96948657e9d8a35b41578ce1f014e6352798ccc605079b6ec4a1998899d91a240e7a338e277b092b83b4858d83d6
 DIST libsvgtiny-0.1.7-src.tar.gz 760963 BLAKE2B badf14e656e10a178a6b692659265644b636cc103ec92f89026638700293028e0b06b5e051c420911fd6c319a94bab68328b1d9f42cec69dc7926c2d31aeec67 SHA512 c13352325d32b6f41159b09607b12a373517672e9e4da6d26cbca9a7fb1896b6e5730aee53adaa51f0b49c35f7dd9e9ece6b1f0187a7f5494b5cc223acbe64ad
-EBUILD libsvgtiny-0.1.7-r2.ebuild 804 BLAKE2B 595b50f60e311aa82af7af137e9a5d2dc848bd37890c0acdd2d2db28b18c783a0b14849b102ea013049f29e6bb5f927875689dc57c7a0ddddd58fc17767ee8f0 SHA512 d3efbfab4ca05957b677acbae9e34699ac4531cb97296cad31052b15ee034b920e397bf5d5a1be613c2d6153471034c3e2808f8d45643c7e84df7b5086b42a5e
+EBUILD libsvgtiny-0.1.7-r2.ebuild 811 BLAKE2B e734a69585a30673fc284fd5532d23c87783868c4e8b28dccd22f15947b81a41e0437acdb5ecae66f6cb7251b97573fe9262095740507bafab86a2c646e92349 SHA512 023e8b1e384fc7ca5eab0131e49ab97d4187225b0941781c0d2ae965d95d1e235940efdeb7c0d7209ab4e5e6690ca92d9ae46a35ea02e362ca1b14ce8f4583b0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
index c326a787bba0..5b62e937edcc 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7-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://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE=""
 
 RDEPEND="
diff --git a/media-libs/libtaginfo/Manifest b/media-libs/libtaginfo/Manifest
index 69c33e769b3d..17faff59688c 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 496 BLAKE2B 804b030bf2463a5a7180165b89cc19ee631899cab5f35449cca36616b193c2f73f8925f463515ba730ab1dc007d6ed005d0d8f0bf783587ad24085e70612017c SHA512 e4b35228c7b92f0e3d9e25ad3a765b8a344e1f85822093c129275fee33be7152fddafb54383ac5beee5cf7bb09d37bdfb2e2baa1cc078847d02a4c978dec0f4d
+EBUILD libtaginfo-0.2.1.ebuild 497 BLAKE2B 3e478ea3d0691e1344a06c123812055bcf36fe612c7fc280476fc194fa994ee380b1d8ab2e75823423e3e6357f269d6e7866cf907ed55df390ca071ae2d6bfa3 SHA512 52328aeeec648108209281fe8b069c5aeab4e2ab27b76b9bf6cb082d5d939e0defac23901090ac84c3081903a31b7bf19ae2a885ded82b4a23dbf39fda9d760b
 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 8ea298db777b..922bec301628 100644
--- a/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
+++ b/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
@@ -16,6 +16,6 @@ KEYWORDS="amd64 x86"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="media-libs/taglib
 	!<media-sound/xnoise-0.2.16"
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README TODO )
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 332c7dc77c8c..fffe65e91039 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,5 +1,3 @@
-DIST libtgvoip-2.4.4_p20201030.tar.gz 1091098 BLAKE2B 81815a0c9c7f62175493af8f3f56064f6a6a0167351d4f8baf5c846744dc03d325c106dfafb49589702e4f461865e5528395f379142af49b8722f490fdd57d1b SHA512 58dfd537c378c7e9772eab374f25b7d68d26b6db1f71bb9a88e6405e2f2e3cd0ebc2fc94733ce787288365ac9669fc50f8d5a3ab2f2900683c6399ca43172945
 DIST libtgvoip-2.4.4_p20210302.tar.gz 1097895 BLAKE2B 36551fb915ee5b5895d8ea68196be5a910739e46886c879bd9f932fa2294a94c22ec3215a94d9bad05a5d24519291676a686c594b74f513f594eb063c83de012 SHA512 d8e27be18e521f367a30c63665300496dbd8fe250261fddf5576325afc27d855e280ee31e46d5fcc2294d79a91c4003732e22f2bfb6db0472e357508b5053d29
-EBUILD libtgvoip-2.4.4_p20201030.ebuild 1182 BLAKE2B 061dd2a7e004bc6b725c5980068cd9e20f1fb93d9d936db1aa56401e9a5d08726d4a5cb685b3f80dcb942b129b85cfd0ff9e0413ff1c15643cecf9de2e31b51e SHA512 92fdc837c12aecf4867243ff81e19d7794208366f55f9aad0e3b2a00f24366d2e36dc4fbb70e28a3c4dd12a171031b970e7d4912820347c3fb3d22a813de86ed
-EBUILD libtgvoip-2.4.4_p20210302.ebuild 1510 BLAKE2B 8507d049a316d35705639658944aafdc71e7406d4fe15651651fc0cbd9fe4eba365a5226411e5335134767489c3df7a9fa9a9e5ea969a6ea29d90a7fa49b20ad SHA512 38b1b68315f3984168a65868ff1475a7e39e5c5f97280b9cc2e4ff8de3dfe7e7e3eab37d6f9e305dbae76178f968b757f4589cfb045c92c7836fa415ae0d371c
+EBUILD libtgvoip-2.4.4_p20210302.ebuild 1509 BLAKE2B ac52b621918606c2596e89073fe0a2fb72f01fcb1b57d38089bae921e2a2f42dbb3cdea3f382013fd0ffad067c78a281af57365931f678a19d69a6b1e9e93e5a SHA512 35ff95953390016469e704c3b22ffd5ee94d31f00eb72340e49bb2db3507b777ca81fbe3ec022d08e695e14ad8c74460c55f8b4962373aa97682d7e6e3d6fa53
 MISC metadata.xml 542 BLAKE2B ddf38189857cb4216e85e9a958daa176e8d030b907735f9d57e25ce5b71d0a6179300bb9064960e4a82532dedf329fc85ee98025faf0494b17b74a00fcb8d056 SHA512 e455e7c38f6171064d6c3923fa04373bd6e902e40d6e2c63f7a1ca8adc8245b93ef5b67051ee3fd3986a3efd0868c3c631b7ae36613f7978eba7441322711c72
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20201030.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20201030.ebuild
deleted file mode 100644
index b905384a4dd6..000000000000
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20201030.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-EGIT_COMMIT="fdabfb671d818d0d4d08cb1aeef6058d4a96882b"
-
-DESCRIPTION="VoIP library for Telegram clients"
-HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
-SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dsp libressl pulseaudio"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/opus:=
-	media-libs/alsa-lib
-	!pulseaudio? ( media-sound/apulse[sdk] )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_prepare() {
-	default
-	# https://bugs.gentoo.org/717210
-	echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--with-alsa
-		--with-pulse
-		$(use_enable dsp)
-	)
-	use dsp && append-cxxflags '-DTGVOIP_USE_DESKTOP_DSP_BUNDLED'
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302.ebuild
index d2e68c759f60..b3f91097b27a 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+dsp libressl pulseaudio"
 
 DEPEND="
diff --git a/media-libs/libtiger/Manifest b/media-libs/libtiger/Manifest
index 4569f24e74ef..f9817a237fe2 100644
--- a/media-libs/libtiger/Manifest
+++ b/media-libs/libtiger/Manifest
@@ -1,3 +1,5 @@
+AUX libtiger-0.3.4-fix-autoreconf.patch 1346 BLAKE2B 90db8353687e3feae55c7aebffdf24b341f9f13dfc9a3fd784995cb4827c49f0c0bc012055b45cf6566ac75a70539bc6174b304b93ac5fb7f8c21ac68b958edc SHA512 ac0de7e8706194834c3d6cc388eb80710b3437d6419435ba7ade5af390bd0fe4b8e28213cfada3d1b5dc24e538a06fff9d47b47ba3accfd0318bee7bdf34f620
+AUX libtiger-0.3.4-fix-undefined-references-slibtool.patch 964 BLAKE2B 41102d231c92b3594284db305e6fd1a484faf389d860020456a9129eed68f22d3a247da28d4855c7bf15c23d9df095e281a39da865b3813748e92e25c3143fa9 SHA512 58e6f43233b89c94541bb005152f638a3d1d173062029240853a38ef08cd38a613b09d56996879dc4bb701d6ab2570f3f2a00f0b7ce8b8be6b2e1d404d44b302
 DIST libtiger-0.3.4.tar.gz 383685 BLAKE2B 92bfb1ec5879c9d4af2eb1ecb26eda007fd583121eaa6e3bb23de9f8b477612eb4c87359ec61869c5a70233f1055eedcef270cb79cdd94944013147e04a85bcf SHA512 559e522b5127f32fdd08d62c40dfb493dc2db1efd1e21707d723ef27cbe03e7e38fb04d40856d824ed0c3c94a223ed1a0358fc11ecb30446b5ee5c7a3b802e6d
-EBUILD libtiger-0.3.4-r1.ebuild 845 BLAKE2B ef5b4b557db2aa428d08f7c490260ec988cfc65bc72d6170abc672db5ad64734cd5174c2df3a6fdb88efefb179f9eef0092b07489a97fea5b9ea3ba781389e55 SHA512 06d8b3c9ea72eaab21654b74ffa366bb50474450d21ff5dd671239308ee8e253722923d293e19153aeb9b35d08d267742c293e4fe6cc6c96e814ca05549fe35b
+EBUILD libtiger-0.3.4-r1.ebuild 995 BLAKE2B c818bd48c34a0fd927c0afbb2870d3dd20a05bd65c4dddd8b47718e846b247a8f146d36703dc30312409e1b06482706a2a9bf777e5983c96b2b43f003ccfa4e5 SHA512 a7c95da64f711e481b4780f0c306c9d4c303e6c4f88cc8a3064d853407f0745d5253899343593521a385db8e7a62390c4fa22041d74c68277fbe18e5d86401e9
 MISC metadata.xml 550 BLAKE2B 58756433fc1ab142f1f2dc2c465371e19c3838874b697297cf3cd62c88bbfd5805807db521135ab76972cc176b131657caf6ba1c8b75ca792f539816a3baa3d1 SHA512 2590f113bd0261f583083f51aee3beb97771b4a112ed23d2b75028daba956278ad3a56cb7de84973c9bbcc72d1c0ee0e4281531a01a8a44f6e55289d8081a500
diff --git a/media-libs/libtiger/files/libtiger-0.3.4-fix-autoreconf.patch b/media-libs/libtiger/files/libtiger-0.3.4-fix-autoreconf.patch
new file mode 100644
index 000000000000..88b3316ea702
--- /dev/null
+++ b/media-libs/libtiger/files/libtiger-0.3.4-fix-autoreconf.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/778578
+
+From f3f463faa8cb73ffbdce172bddfa839eb65b2d0f Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 27 Mar 2021 07:44:14 -0700
+Subject: [PATCH 1/2] Build: Fix autoreconf.
+
+---
+ Makefile.am     | 2 +-
+ configure.ac    | 3 ++-
+ doc/Makefile.am | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c5d6b6e..746d893 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,7 +11,7 @@ tigerinc_HEADERS=include/tiger/tiger.h include/tiger/tiger_config.h
+ tigerpc_DATA=misc/pkgconfig/tiger.pc
+ noinst_DATA=misc/pkgconfig/tiger-uninstalled.pc
+ 
+-LIBTOOLFLAGS=--silent
++AM_LIBTOOLFLAGS=--silent
+ 
+ AM_CPPFLAGS=-I $(top_srcdir)/src -I $(top_srcdir)/include
+ 
+diff --git a/configure.ac b/configure.ac
+index 2f63684..a1cf2ae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,6 +26,8 @@ dnl     then set AGE to 0.
+ 
+ LIBTIGER_SHARED_VERSION="5:2:0"
+ 
++AM_PROG_AR
++
+ AC_PROG_CC_C_O
+ AC_PROG_LIBTOOL
+ AC_PROG_GREP
+@@ -35,7 +37,6 @@ AC_PROG_SED
+ AC_C_CONST
+ AC_C_INLINE
+ 
+-
+ # headers
+ 
+ AC_HEADER_STDC
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 70d48c5..01e95d3 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,4 +1,4 @@
+-LIBTOOLFLAGS=--silent
++AM_LIBTOOLFLAGS=--silent
+ 
+ # dependency to get doc to be built
+ noinst_DATA = .doc-dummy-target
+-- 
+2.26.3
diff --git a/media-libs/libtiger/files/libtiger-0.3.4-fix-undefined-references-slibtool.patch b/media-libs/libtiger/files/libtiger-0.3.4-fix-undefined-references-slibtool.patch
new file mode 100644
index 000000000000..01ccc22524ef
--- /dev/null
+++ b/media-libs/libtiger/files/libtiger-0.3.4-fix-undefined-references-slibtool.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/778578
+
+From 0b990d5db74b5e5055753f4ad5006b8d89d23d26 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 27 Mar 2021 07:47:09 -0700
+Subject: [PATCH 2/2] build: Add -lm to fix undefined references.
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 746d893..348bad0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,7 +35,7 @@ noinst_HEADERS=\
+ lib_libtiger_la_CFLAGS=@CWARNFLAGS_FULL@ @CFLAGS_FORTIFY_SOURCE@ @CFLAGS_DEBUG@ @CFLAGS_PROFILE@ \
+                        @PANGOCAIRO_CFLAGS@ @KATE_CFLAGS@ @PTHREAD_CFLAGS@
+ lib_libtiger_la_LIBADD=@PANGOCAIRO_LIBS@ @KATE_LIBS@ @PTHREAD_LIBS@
+-lib_libtiger_la_LDFLAGS=-version-info @LIBTIGER_SHARED_VERSION@ -no-undefined
++lib_libtiger_la_LDFLAGS=-version-info @LIBTIGER_SHARED_VERSION@ -no-undefined -lm
+ 
+ am__tar = ${AMTAR} chof - --owner=0 --group=0 --exclude=CVS --exclude=.cvsignore "$$tardir"
+ 
+-- 
+2.26.3
diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
index 2e118f17e648..ee5b7ef378fd 100644
--- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
+++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
@@ -1,8 +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 libtool multilib-minimal
+EAPI=7
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A rendering library for Kate streams using Pango and Cairo"
 HOMEPAGE="https://code.google.com/p/libtiger/"
@@ -13,20 +14,30 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
-RDEPEND="x11-libs/pango[${MULTILIB_USEDEP}]
+RDEPEND="
 	>=media-libs/libkate-0.2.0[${MULTILIB_USEDEP}]
-	x11-libs/cairo[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+	x11-libs/pango[${MULTILIB_USEDEP}]
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.4-fix-autoreconf.patch
+	"${FILESDIR}"/${PN}-0.3.4-fix-undefined-references-slibtool.patch
+)
 
 src_prepare() {
 	default
-	elibtoolize
+
+	eautoreconf
 }
 
 multilib_src_configure() {
-	local ECONF_SOURCE=${S}
+	local ECONF_SOURCE="${S}"
 	econf \
 		--disable-static \
 		$(use_enable doc)
@@ -34,5 +45,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
+
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libtimidity/Manifest b/media-libs/libtimidity/Manifest
index b7f0a7606f78..422e49d20401 100644
--- a/media-libs/libtimidity/Manifest
+++ b/media-libs/libtimidity/Manifest
@@ -1,3 +1,5 @@
 DIST libtimidity-0.2.6.tar.gz 421927 BLAKE2B 1644608591510e83b3e0fd338ada3bb1ea1846d26f06ec455c58f2bc640a2c8fc182bbcecbcc0465ac0e5da921f26c2494e5aec89014a42b22820bc1f986075c SHA512 e913cdec619001f5deb98c5e50707b1c5c110eab5d14606a6a7385cba1c47844a5143bc848dec17329788c5e1caff2efeeeada9ad37ec9ef704c545bf0e29ee9
+DIST libtimidity-0.2.7.tar.gz 435691 BLAKE2B da6ac814297e9663dea44044eea640d5e4d750aac0e58e79eae0f3a9af87613ee55eeec1e3ed2ac2dd8a5d9eb2b427c6cbc66a1a58a1dd9268eb241a26f29fa6 SHA512 91ae25a18a453d4a1301f257d74a9a67ade515e182e27921549a7cd086f816770fe58e6cc9c72a06cb4a1cd2c6639c43fb902241e13baaabba1320166a337bd1
 EBUILD libtimidity-0.2.6.ebuild 818 BLAKE2B bf3e0d1b314fc1466ee5bbd466cbbee766037192d8148ea828f1d64091ea74b1b913df88980461dd4e4dd5b9d5998364f848e9b50409961d45b62dbad6f4d57c SHA512 5ccc611ccfe7b2e3b8c4e327ab90179e60aa83470b41f3195b2381e4ca3414713f7a892c01d2d764576198600c9ff68fad471efebb54d3171f53a35dca75f244
+EBUILD libtimidity-0.2.7.ebuild 823 BLAKE2B f6c4f6b4a138411f7a119f58e13130e6e90fe295dd1ae8f8df90b5ee1045989b1830471aa62210f0e356fb8afa90b3bfdfb57a3184428237192e7f78df4aeeab SHA512 cd48f0284ffeea622716693c9dbb58158017245c487d091938148a24b00a738c00d1b99e85a451f202537cbb27baaf96cd6ba41ecd5a53debbded40aca9fc15b
 MISC metadata.xml 334 BLAKE2B dae2cde17ce0b3493754cd7984b7c74a937ac7694cbe125d6137fa00062fe5f8406e311502cc09400b720f0f11d233726c3061f1039408236651ebab1f1b449b SHA512 9b744ea46e81fa07fdbed4bd7b71840eeb1500bc35651e9c8461f91e8041e76567fd5b20472767d2b8ebb16967005ae025bb7a8165b14c2e33ec1a891770d91b
diff --git a/media-libs/libtimidity/libtimidity-0.2.7.ebuild b/media-libs/libtimidity/libtimidity-0.2.7.ebuild
new file mode 100644
index 000000000000..1aa2d21c7c28
--- /dev/null
+++ b/media-libs/libtimidity/libtimidity-0.2.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="MIDI to WAVE converter library"
+HOMEPAGE="http://libtimidity.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ao debug"
+
+RESTRICT="test"
+
+RDEPEND="ao? ( >=media-libs/libao-1.1.0-r2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS CHANGES TODO README README.timidity )
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable ao)
+		$(use_enable debug)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index a56acb8799c9..b318aca70324 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -1,3 +1,5 @@
 DIST libuninameslist-20091231.tar.bz2 568820 BLAKE2B 09574729cc8b655bc9921c49b6f81a7c242a761d70865a0ca6b9ef479582f158f05580e81b94100994ede623ebf8e16f482ae2bacbd596d195b2201023a8ee7e SHA512 3780759428ef2bf2fd808de6ea87a44cf85952f926240ea355d692ef08b5e50c1cf068a2ee05b00cf0fc6b725d71142306aae01e9d6e5144291f6e5dc4505bc2
-EBUILD libuninameslist-20091231-r1.ebuild 583 BLAKE2B e01c3a4c9be1a34ec5d75228cf4499531522f3164f0dde3ad67a0807714a730421ad24f5265e643334087b2356992ba179da27c675ec94587b35cb823919db60 SHA512 aeefc14f95dce14d40709046f7f70f7810b186e94fd3da99b8353827a054a1f16384b093c0dd6c357ade402f21af4f10f9916dbdbf2912d5a7d4ee151f575ef3
-MISC metadata.xml 418 BLAKE2B af32b153bb118f182f452c92fbe3847c3e2402647daff56972e66aabe631bfd82da9427c8a46e9ff415aa99f9df1dcefaad21f79e8119da26d95d3e798c1f631 SHA512 35b1f463cb8d9c67f640b4adf5081d16100ad1277bac95222c499b8837b8eafe6619fa0d5ef7d0089eeb43515205feaed55157e8c5412bc7a065ffe774b41e71
+DIST libuninameslist-dist-20200413.tar.gz 1210689 BLAKE2B 10577d930e4f1e2d8dc41d7df684b63897f62dae31d0bb2208b26ec9102ecc2fd0181d7d3d05c6c678de69b4f379805bfcbf0a484fd0076ff65ee2fa1e9d1368 SHA512 88befff4bf7efed149b4e3a5d58a733b2cb6477e103ec34529ff02a88f8c72a6fc9d7b0be9e97cd539a75c8ebe5e4127cdf03a568da2f219157174b9b585b2a3
+EBUILD libuninameslist-20091231-r1.ebuild 569 BLAKE2B c6c7756ff1750da6071383171f22fdc2aba91bfb73291ba76deb5108ad24760691b9d3e75fc9a69532b82dc9590d000183b59788c533e260033d0e64d57d9e90 SHA512 94ccdd53e367cbd45c8914137d3935c1730c50bf17e6f53b56430b7442a887f9d038c2bb831cb5a0c04d104d1e6b305dcaa9a75cd590e260f56c4eeedca91c36
+EBUILD libuninameslist-20200413-r1.ebuild 606 BLAKE2B 001abbc98a470b98ee4f06d816dbfac1b065eec24599159021a076d0c0d7af07fc877dc0373e75310db29de931f8d7d8ffa2f344104412a08801f9e1a01c8182 SHA512 5cbbcbce1c26dac491d5774e86b2a23514aaa6b06a219002d842cc2a50e4eaddfcfd346b27c7f7baf0452a37e775d01981eb58f1f789c9905e7b1d56fed86129
+MISC metadata.xml 483 BLAKE2B bf0ffb6a5095fd83a532b7ac3c1b07509a88970787a9624fd82e0b577634f807f4154180c44275c97f1981cfd306f94358e19f614b00daa32b20a9b61bbe6808 SHA512 7ff44828584d7eeee4081961dd9dbdb8c54086fbed3328c21fa12298f6f8ac23e963dcd399df604956c5dccd1b1c3dc9396c063fa4f5b53ac66951db6f8edafe
diff --git a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
index 4b87f6978b1d..4ea179d8d318 100644
--- a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
@@ -1,25 +1,22 @@
-# 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
 
 DESCRIPTION="Library of unicode annotation data"
 HOMEPAGE="http://libuninameslist.sourceforge.net/"
 SRC_URI="mirror://sourceforge/libuninameslist/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 src_configure() {
-	econf \
-		--disable-static
+	econf --disable-static
 }
 
 src_install() {
 	default
-	find "${ED%/}"/usr -name '*.la' -delete || die
+	find "${ED}"/usr -name '*.la' -delete || die
 }
diff --git a/media-libs/libuninameslist/libuninameslist-20200413-r1.ebuild b/media-libs/libuninameslist/libuninameslist-20200413-r1.ebuild
new file mode 100644
index 000000000000..4c5da330a82b
--- /dev/null
+++ b/media-libs/libuninameslist/libuninameslist-20200413-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library of unicode annotation data"
+HOMEPAGE="https://github.com/fontforge/libuninameslist"
+SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${PN}-dist-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}"/usr -name '*.la' -delete || die
+}
diff --git a/media-libs/libuninameslist/metadata.xml b/media-libs/libuninameslist/metadata.xml
index 3e2614d54131..97181e4b01d2 100644
--- a/media-libs/libuninameslist/metadata.xml
+++ b/media-libs/libuninameslist/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Fonts</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">fontforge/libuninameslist</remote-id>
 		<remote-id type="sourceforge">libuninameslist</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 189a3aa84ba0..582af43d60e6 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,4 +1,4 @@
 AUX libv4l-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD libv4l-1.20.0.ebuild 1508 BLAKE2B ff1128f29189f59abe7698afa3c4f4992532a888a96b7a7ae3aaeedadb42749039879f850765bb6e731785a0bbacc6499fbe10d0ac283fd74d67252531230332 SHA512 a9511a92d5d422e6c5380b99cbb4f6a02e0ebd4f64c32465571cf8acc4884b39ee3dda813cc21b739a9b649288369691d4c8e47601db25cbe168bd900a0eba40
+EBUILD libv4l-1.20.0.ebuild 1509 BLAKE2B 723c9051eac7841dbfee921ebd77688c55f58070087dd3775fb18f5aa4f841d645f8b0fc38c6a6cf8ccc9dcc13aef2059d3efe463253f5d1748db46de040534b SHA512 941fd642e4ba5116aaa95a2dcee8a6907d1f75a2211cd5c9944afa22f7114917edd3e680fb8aa90f0921361493dc246961875924b1d64e5b564ce5b471665bd0
 MISC metadata.xml 1116 BLAKE2B 0a5c579aaa12eda3c043a7684a41ef17b8c7ed7411c2639fa3c0df6466f34ad01fa9d18fff1edd65b2bb4b9bf429e1a7c0ef120d75cbae8ea9dcbdbaa5e4b372 SHA512 8bf11a27222e9672c3662a6d807cfda13b5935618289b7acc259db7bfd9a13095b57d881170b7354fa8e971a87e15592e92f8853be18415618df38672a684c41
diff --git a/media-libs/libv4l/libv4l-1.20.0.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
index d92276eb4f44..c00574fbf535 100644
--- a/media-libs/libv4l/libv4l-1.20.0.ebuild
+++ b/media-libs/libv4l/libv4l-1.20.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dvb jpeg"
 
 RDEPEND="
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 9a69e6d81864..503622190069 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,5 +1,5 @@
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
 DIST libwebp-1.2.0.tar.gz 4092120 BLAKE2B 213b2385f646dd0fbaa7c9103b0d33a9cb5e7285d9df91107db722f514428ab8cc896704d71a3913ca1aedffeb706fcda4c7a59a3960ebc21c74ca9422632605 SHA512 c46b41899a543cc80914c89646dd607dbb5d025a9727dd83ef70994b9310eedc697666bd812141a90aa16632a9a354a031d9360a9ee1112295c7e154e69f0b74
-EBUILD libwebp-1.1.0.ebuild 1837 BLAKE2B a112fcc370eec9a5a69d75101b0c6e3b27f1553a0a9bf07297c2f840e8ba179a80a0cb4b8879ec89433a3fbf00b291c5aaf5ab43b26d285fcf60615c3c2451d4 SHA512 46c5b6ec590c13f48d9667fc89dea65ebe93fad63a80a4f807106b271dd0944a80d492d4d7d201972999dbef082e5dbe6b633b5b49ffb5cc2924414085091185
+EBUILD libwebp-1.1.0.ebuild 1838 BLAKE2B 104227fcf8dc4c6abae133dde661f269ca77bacd915fc502c38b0123a9df48006ebdd96b607cdcc187a7e1da6eb4d4903e57988878a844269e3dcaf13cf4071e SHA512 cf3218f03cd046b6a8d8e5236a13f418b346feab3a4b1004ba3925da6e55f7b82cfc009606afd418082f4ebb7eb81b60b523a2dec903a18b1ef8d4f26aad29f8
 EBUILD libwebp-1.2.0.ebuild 1846 BLAKE2B 251fdfc4a1b25cc1ebd333199709d3f70335393c7d86602ccc6ed7626ba41babe7a512b075ac81e3102dcb50de0f47e91628c894f95af9716e11b75a8a0e6fee SHA512 a54f5f102f1e539088872280ca43bba45070eb9ee060ebf8245d0a04b69810a3a86e2a671f65005562683006d11907ad0ddf998be099db87de16e1c3d6b77cc8
 MISC metadata.xml 431 BLAKE2B 657047e71cd8f3ab7791af317c5a3581b3815d96d7b0bc9dd049fa773e5bcf0d88703f1e4c54c5417c4c40f74a9ee2037dfa503a9a66931f662868ef8f5a32c0 SHA512 61ec4c77d9c47b17a2ad64929b1f9eea891bf463ab74a05c2beae1f0cb631ad47e707b8414ddc62fc355b1d7140de145d209d556b6e45bad4d3d25fcad5a1af4
diff --git a/media-libs/libwebp/libwebp-1.1.0.ebuild b/media-libs/libwebp/libwebp-1.1.0.ebuild
index 0802570c55e4..f338c5100529 100644
--- a/media-libs/libwebp/libwebp-1.1.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e3ebcaa277c6..bd875a69dfd7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,12 @@
-DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888
-DIST mesa-20.3.4.tar.xz 14253372 BLAKE2B 210908f5b802b9fd0170a6f06310f39bab4aa0ca1c84914d702863f9df4d47f1720f0d3779ae804d2eef322a09f4b6cc40855efd7dc365cd84dd8f222b217998 SHA512 81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477
 DIST mesa-20.3.5.tar.xz 14367412 BLAKE2B 7bad876ce702158e727a752eda6722e7165b497fd3a485dae4e989f22b13288a93f51bcd5e6a69b979f0bbe41599fa237c08f3bbb81cb9c6dc4c06827f8ad5f4 SHA512 481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9
-DIST mesa-21.0.0.tar.xz 14617108 BLAKE2B bc49b9084c2d16354235fa8ff30bc274a40dda350dc8ca5fa8d471665cd3f2a280efdf05a6ea84310beebcdb71926a64f2fd0c63391bf846c49180e13a25c151 SHA512 32f4a74fbc1456dac478fdc3a85e37cedb9ac1e1b7c5434706dc24930a70bc9e857ba6b5bf1e7e05798e259f8ff0b05bad5252c07253cb5d6a9707c7c2e147ad
 DIST mesa-21.0.1.tar.xz 14648932 BLAKE2B 70e1277336320d7b4351c72f42a72cbcb91dcbc46cc1bf30996b8895bbc30552265404508130c828b67a7d045c9f6eece5ac3d07c2443cea581774c585ba0b69 SHA512 b31b78778b6092dfaf0712f90de3074217574389c4236f8379c127739874f6bd1b47883140a26445d25e58df87e6207278efd048453096ee710d334b1dcfe419
-EBUILD mesa-20.2.6.ebuild 14762 BLAKE2B 10df82dc80592a5735ed4137a3db8e57acd8cb53a32649fd8b7854a845fd90cb6804e3e43bd52a1d7ce60a7446577a4e45c4ad4fbf16d08518007a2bb51e3ed7 SHA512 ab2f3fb312e255a93928795b94bf641060cad1bae388c8526cdd38eab0699f7be8f6779901d04aec1e14ac7482126b4bddd88337d6b618d056e39bb667072f38
-EBUILD mesa-20.3.4.ebuild 15043 BLAKE2B 97371390b8d1c5c0df8b6d875cfa603baf673caadca70e71d56547d48a465cea307a04b5191d80a0367f4ee29877358ded96a3b205ef868bfb91c574971b6eba SHA512 da014599e3b5f1987347d3f43b7100d61842650715e1f05477e128cd5c877451202249786f532ef32050c469ef748e2d0189b236999b16bb23bfc0c619fc460d
-EBUILD mesa-20.3.5.ebuild 15050 BLAKE2B b79e2917c6201348aa7252ac7c06376a5af06191c92f6f2a832a24cefd674a13d232b5439657476926334a889903820341cac5d939c541772d326dcd988da4fe SHA512 79e6c14c9e38d03122375560f8ee88b6769bd7863264061b933342289afeb0f7e331fd4c9f501a161aeb25044b7f057845b3496f56c9db20276f0abb310d34dd
-EBUILD mesa-21.0.0.ebuild 14961 BLAKE2B 41fbbed6df2796ac7e0bf64e185432fea72b3673001be8071dfa2139ad7a7f48db61473f4a54b358b2ce25b7648641c14ea7b2efb4914eb60bf89912854275ff SHA512 43acf75931e45a66f1b0938c72d723c96c1c8ea66eb4a6bdb8e474fd164389519f67dfb26a333b0910f075ce13f1c0b820961ec1d33572fd0ed099647d01b3e6
-EBUILD mesa-21.0.1.ebuild 14961 BLAKE2B 41fbbed6df2796ac7e0bf64e185432fea72b3673001be8071dfa2139ad7a7f48db61473f4a54b358b2ce25b7648641c14ea7b2efb4914eb60bf89912854275ff SHA512 43acf75931e45a66f1b0938c72d723c96c1c8ea66eb4a6bdb8e474fd164389519f67dfb26a333b0910f075ce13f1c0b820961ec1d33572fd0ed099647d01b3e6
-EBUILD mesa-9999.ebuild 14922 BLAKE2B d0d49536e4e4e021fce6029717f496e0358c151f5406105337a651385bd7b337116d14b14442510b7d28ca621fa0c39177273f5df214d06a9627a993aaa3aefa SHA512 be9d773f963ebbd7aedab8fee3d368f8efd046d06698130c74b68cad3ce3e25f69e39659cd81e6490c3bbc8955859bca046d62f824f6c3d8f1b8d8fdfa6f96d0
+DIST mesa-21.0.2.tar.xz 14671512 BLAKE2B 5733e65e7e8ffe3e6bed17f499c4d40d2dfbd3dafef967f6b1dbbd14089734640aed02d39568a32d362cc27b4125f425874c25625fd58731500910427dc6c594 SHA512 c3d7969b56e1c31ee642e3b7143d565c4233173dab7cc5576b686c873c27134dc8292a9f2caa0a0dd3c54d0c89d27d6030f36a2c84f85dcedee7ae80b19e5c3b
+DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f
+DIST mesa-21.1.0-rc2.tar.xz 15053612 BLAKE2B 25d83aebf4498e1e0ad096999a97b8b8e336b066c19507ee104191d64c495208711e2bb91a62d8dfc4d7b1654dc623a94ad54c9d1951b37182dd8291fff82cd9 SHA512 1f8cbbbc597519a025e9adf34e65b176781ebdab3d3b7ed20312bef79d727da4c778ac7daf94cef8d652c0e05f77fe534cf347d4bebeb00c682d0d807a148f5d
+EBUILD mesa-20.3.5.ebuild 15063 BLAKE2B cbf593097a3b3a98f9e658f4e5e1d2bb29e7d7f977dffbb130dfd84afbfea76e10b997ec119a65450e687c101da1de199fff987f6aacfb995f4cf7551868050a SHA512 5399d4cffa57c5b1c6b089a6a0187c1aea2ee6334e8b560a8e1a7724c636538351d8d649f84fdd0d929b6c4f47c5b58cb5ebbb413a72577ca1d46db141242e47
+EBUILD mesa-21.0.1.ebuild 14981 BLAKE2B 1bcef01ce9f3df45e43f86c012249f9974e7d01b06bc5c9ba329b27efa576f699656d5b4a05025a99f991156291e5203ebfd6aa4afde4c28b2800d731589313d SHA512 7fa89a752fa2ef3b65dfed8965b76ac3a3cfe9edc9862fac408439fbeb464415084c0f253aeae524b1c92b9447e86d53fe28eaff50201090ae452329e7a39020
+EBUILD mesa-21.0.2.ebuild 14981 BLAKE2B 1bcef01ce9f3df45e43f86c012249f9974e7d01b06bc5c9ba329b27efa576f699656d5b4a05025a99f991156291e5203ebfd6aa4afde4c28b2800d731589313d SHA512 7fa89a752fa2ef3b65dfed8965b76ac3a3cfe9edc9862fac408439fbeb464415084c0f253aeae524b1c92b9447e86d53fe28eaff50201090ae452329e7a39020
+EBUILD mesa-21.0.3.ebuild 14981 BLAKE2B 1bcef01ce9f3df45e43f86c012249f9974e7d01b06bc5c9ba329b27efa576f699656d5b4a05025a99f991156291e5203ebfd6aa4afde4c28b2800d731589313d SHA512 7fa89a752fa2ef3b65dfed8965b76ac3a3cfe9edc9862fac408439fbeb464415084c0f253aeae524b1c92b9447e86d53fe28eaff50201090ae452329e7a39020
+EBUILD mesa-21.1.0_rc2.ebuild 14981 BLAKE2B fc836a8e9dde7326f5e2a5793c1602ad30b02373df690efca5e37a1d1b21c79786e4699c14cfef5df21bdea6c56c05f2f62b043428e3a33e43b79b332f3b90c0 SHA512 320e890922b63d9b41acf2f248448a77eeed0e3f977065089d9b9e4f11ad5a2bf16a47c51fc254bf8f5fa4fee9be1bb3325888d94b4f497d80e182b11fbd87a9
+EBUILD mesa-9999.ebuild 14981 BLAKE2B df68d9a7fa62672d81582f8a43c3ff125abdd134b83683bc5bd24c2b9c457b3fc1b925102c33777d7ba121e2be6d507febec0d7ac1a32f17b738bd1785623540 SHA512 d0385e88dd4c47e499a353beeb891fb3dad9c8008642ca325402af53bb5da42243e771fcfb8088dead4c08d6ba590cef67fa6d4b86a80e383c4fbd9a25877c40
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.3.5.ebuild b/media-libs/mesa/mesa-20.3.5.ebuild
index 83d95adc4aa3..b77317562fe9 100644
--- a/media-libs/mesa/mesa-20.3.5.ebuild
+++ b/media-libs/mesa/mesa-20.3.5.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	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"
@@ -147,7 +147,6 @@ 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}]
 "
@@ -226,6 +225,7 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/mesa/mesa-21.0.1.ebuild b/media-libs/mesa/mesa-21.0.1.ebuild
index 9aa7c68c80fe..ebeac9698ee4 100644
--- a/media-libs/mesa/mesa-21.0.1.ebuild
+++ b/media-libs/mesa/mesa-21.0.1.ebuild
@@ -147,7 +147,6 @@ 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}]
 "
@@ -226,6 +225,7 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/mesa/mesa-21.0.0.ebuild b/media-libs/mesa/mesa-21.0.2.ebuild
index 9aa7c68c80fe..ebeac9698ee4 100644
--- a/media-libs/mesa/mesa-21.0.0.ebuild
+++ b/media-libs/mesa/mesa-21.0.2.ebuild
@@ -147,7 +147,6 @@ 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}]
 "
@@ -226,6 +225,7 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/mesa/mesa-20.3.4.ebuild b/media-libs/mesa/mesa-21.0.3.ebuild
index d8acea6fdc44..ebeac9698ee4 100644
--- a/media-libs/mesa/mesa-20.3.4.ebuild
+++ b/media-libs/mesa/mesa-21.0.3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	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"
@@ -43,6 +43,7 @@ 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 )
+	osmesa? ( gallium )
 	vulkan? ( dri3
 			  video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
@@ -104,7 +105,7 @@ RDEPEND="
 	)
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
 	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-1.18.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}]
@@ -116,7 +117,6 @@ RDEPEND="
 	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}]
@@ -147,7 +147,6 @@ 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}]
 "
@@ -226,6 +225,7 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -317,6 +317,10 @@ pkg_pretend() {
 	if ! use llvm; then
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
 	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
 }
 
 python_check_deps() {
@@ -446,6 +450,7 @@ multilib_src_configure() {
 			gallium_enable -- kmsro
 		fi
 
+		gallium_enable -- swrast
 		gallium_enable video_cards_lima lima
 		gallium_enable video_cards_panfrost panfrost
 		gallium_enable video_cards_v3d v3d
@@ -490,14 +495,6 @@ multilib_src_configure() {
 		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'/,}"
@@ -512,6 +509,7 @@ multilib_src_configure() {
 		$(meson_feature gbm)
 		$(meson_feature gles1)
 		$(meson_feature gles2)
+		$(meson_use osmesa)
 		$(meson_use selinux)
 		$(meson_feature zstd)
 		-Dvalgrind=$(usex valgrind auto false)
diff --git a/media-libs/mesa/mesa-20.2.6.ebuild b/media-libs/mesa/mesa-21.1.0_rc2.ebuild
index 16ba0eb17bea..1c0e0aaca5d4 100644
--- a/media-libs/mesa/mesa-20.2.6.ebuild
+++ b/media-libs/mesa/mesa-21.1.0_rc2.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
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	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"
@@ -43,6 +43,7 @@ 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 )
+	osmesa? ( gallium )
 	vulkan? ( dri3
 			  video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
@@ -72,7 +73,7 @@ REQUIRED_USE="
 	zink? ( gallium vulkan )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
 RDEPEND="
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
@@ -104,7 +105,7 @@ RDEPEND="
 	)
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
 	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-1.18.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}]
@@ -116,7 +117,6 @@ RDEPEND="
 	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}]
@@ -147,7 +147,6 @@ 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}]
 "
@@ -226,6 +225,7 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -258,8 +258,9 @@ pkg_pretend() {
 	if use vulkan; then
 		if ! use video_cards_i965 &&
 		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
+		   ! 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
 
@@ -316,6 +317,10 @@ pkg_pretend() {
 	if ! use llvm; then
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
 	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
 }
 
 python_check_deps() {
@@ -332,7 +337,15 @@ pkg_setup() {
 	if use video_cards_i965 ||
 	   use video_cards_iris ||
 	   use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
 		linux-info_pkg_setup
 	fi
 
@@ -437,6 +450,7 @@ multilib_src_configure() {
 			gallium_enable -- kmsro
 		fi
 
+		gallium_enable -- swrast
 		gallium_enable video_cards_lima lima
 		gallium_enable video_cards_panfrost panfrost
 		gallium_enable video_cards_v3d v3d
@@ -478,14 +492,7 @@ multilib_src_configure() {
 		vulkan_enable video_cards_i965 intel
 		vulkan_enable video_cards_iris intel
 		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+		vulkan_enable video_cards_v3d broadcom
 	fi
 
 	driver_list() {
@@ -502,6 +509,7 @@ multilib_src_configure() {
 		$(meson_feature gbm)
 		$(meson_feature gles1)
 		$(meson_feature gles2)
+		$(meson_use osmesa)
 		$(meson_use selinux)
 		$(meson_feature zstd)
 		-Dvalgrind=$(usex valgrind auto false)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index aac65f99e5f1..b57fb6ce0dfe 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -73,7 +73,7 @@ REQUIRED_USE="
 	zink? ( gallium vulkan )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
 RDEPEND="
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
@@ -142,11 +142,11 @@ RDEPEND="${RDEPEND}
 # 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_MAX_SLOT="12"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:12[${MULTILIB_USEDEP}]
 		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
 	)
 	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
@@ -225,6 +225,7 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index e618f1374cbe..b7b2ddc08b05 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,5 +1,8 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
+AUX mlt-6.26.1-fix-crash-w-ogg-album-art.patch 2476 BLAKE2B f11ae9637e014313499691431863cffd4b87aa9ee06b21a557b63cef3166d73b977acb9818267b0b21335929aa72c2444ec52b935faffe44e31f043cc2fc6acc SHA512 0961298be7798af4a4618224ed9b7d36d3ab0e5f976d087c01c455fce3220e282e03bef53cdb7532ff84ca64fab1d23cb1c4c2179c85d0a1475f4597ac963426
 DIST mlt-6.24.0.tar.gz 1351427 BLAKE2B ea645f0fc6822c0fe3012ac4833062dcddff9859e35fc41aacd929c2dc0c80b49bb83b7714d234e0bcad9a4e300534e8637b1e6927c99cb84e9ce2959e619a7b SHA512 c9533191aad7be894152e305a4ce3f8c1dbd652ea887774866c74aed4794eae90bd15b0b9a070e6fc22f2979e210af6ca1a2c937adcc3b0be5d39ba900df6229
+DIST mlt-6.26.1.tar.gz 1366022 BLAKE2B f5b7e733090ae60cb55556893775ab4a68847705e215b85c90d901d72022f5b57c08122cd8c08c1ba51b71eedc5341adaaad2ad002af76724a2d2cf6a7379974 SHA512 6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
 EBUILD mlt-6.24.0-r1.ebuild 5347 BLAKE2B bda27b1eaa0ab139b06b029790b9528f3978b188eab9c75307c1128b60f0fa21ab34bae69e6f0efb0dec654f552fc8fc60fcf88d13a85ec85982465f907d8d3e SHA512 04e4f83c6efbb5a9d5fd7f307904f0473b82d385575332687b1c4ef87e69914605f75daa1ce116f913fdd6bf5ef7d8109c5bc469c39a566ec9cde110c7db8029
+EBUILD mlt-6.26.1-r1.ebuild 5388 BLAKE2B c73bc8330d74a81dcb3228c05bc91b5524574e6605e66e894037237326d4d087253e293d94477c3817442f8d5b72c9785d20b122a91532671702b56781c0acce SHA512 eacd7c3367987f15a4af95f003710286829fcd858c976cdf144049199c1f266fe4bb69da9f2204b5bf771c26e0f328f9848f1c5c8eac0df3396353d8e11e5f4b
 MISC metadata.xml 1536 BLAKE2B eeec58dc42f229c4dfbb41841d82d2b3035bee6a07f42a08b0a396b2f4dfd498d85bfaf34a73d6b3d03c7109033b9158f930a0da531466ca81a0bb03dbc2a475 SHA512 34236fad3d304e6798f50f9bdbc7e2d6bb261ededa9fbde09ba535850ec908f6fefde2e4c717187d7b50fe195f2c8795f7d0ac8ccff1fabb70943a594e7348a1
diff --git a/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch b/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch
new file mode 100644
index 000000000000..4ad7ff5de416
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch
@@ -0,0 +1,50 @@
+From 7063e88e09977282470c4f2f93e56e05f21b7c2b Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Fri, 16 Apr 2021 11:15:37 -0700
+Subject: [PATCH] fix #704 by properly identifying cover art
+
+(cherry picked from commit 6b0829df726aa9a840b8b34e923e9faf17a3a5ca)
+---
+ src/modules/avformat/producer_avformat.c | 15 ++++-----------
+ 1 file changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
+index 049452f9d..e079e6f70 100644
+--- a/src/modules/avformat/producer_avformat.c
++++ b/src/modules/avformat/producer_avformat.c
+@@ -398,10 +398,7 @@ static mlt_properties find_default_streams( producer_avformat self )
+ 				if ( first_video_index < 0 )
+ 					first_video_index = i;
+ 				// Only set the video stream if not album art
+-				if (self->video_index < 0 &&
+-						(codec_params->codec_id != AV_CODEC_ID_MJPEG ||
+-						 codec_context->time_base.num != 1 ||
+-						 codec_context->time_base.den != 90000)) {
++				if (self->video_index < 0 && !(context->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC)) {
+ 					self->video_index = i;
+ 				}
+ 				mlt_properties_set( meta_media, key, "video" );
+@@ -1682,11 +1679,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
+ 	codec_params = stream->codecpar;
+ 
+ 	// Always use the image cache for album art.
+-	int is_album_art = ((codec_context->codec_id == AV_CODEC_ID_MJPEG
+-		|| codec_context->codec_id == AV_CODEC_ID_GIF
+-		|| codec_context->codec_id == AV_CODEC_ID_PNG)
+-		&& mlt_properties_get_int(properties, "meta.media.frame_rate_num") == 90000
+-		&& mlt_properties_get_int(properties, "meta.media.frame_rate_den") == 1);
++	int is_album_art = stream->disposition & AV_DISPOSITION_ATTACHED_PIC;
+ 	if (is_album_art)
+ 		position = 0;
+ 
+@@ -2296,8 +2289,8 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p
+ 		mlt_properties_set_int( properties, "meta.media.frame_rate_num", frame_rate.num );
+ 		mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den );
+ 
+-		// MP3 album art is a single JPEG at 90000 fps, which is not seekable.
+-		if ( codec->id == AV_CODEC_ID_MJPEG && frame_rate.num == 90000 && frame_rate.den == 1 )
++		// Cover art is a single image at 90000 fps, which is not seekable.
++		if (stream->disposition & AV_DISPOSITION_ATTACHED_PIC)
+ 			self->video_seekable = 0;
+ 
+ 		// Set the YUV colorspace from override or detect
diff --git a/media-libs/mlt/mlt-6.26.1-r1.ebuild b/media-libs/mlt/mlt-6.26.1-r1.ebuild
new file mode 100644
index 000000000000..b04aa302aa90
--- /dev/null
+++ b/media-libs/mlt/mlt-6.26.1-r1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit lua python-single-r1 qmake-utils toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug
+ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python
+qt5 rtaudio rubberband sdl vdpau vidstab xine xml"
+# java perl php tcl
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+#	ruby? ( ${SWIG_DEPEND} )
+BDEPEND="
+	virtual/pkgconfig
+	compressed-lumas? ( virtual/imagemagick-tools[png] )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+"
+#rtaudio will use OSS on non linux OSes
+DEPEND="
+	>=media-libs/libebur128-1.2.2:=
+	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
+	fftw? ( sci-libs/fftw:3.0= )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		virtual/jack
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( ${LUA_DEPS} )
+	opencv? ( >=media-libs/opencv-4.5.1:= )
+	opengl? ( media-video/movit )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		x11-libs/libX11
+	)
+	rtaudio? (
+		>=media-libs/rtaudio-4.1.2
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	rubberband? ( media-libs/rubberband )
+	sdl? (
+		media-libs/libsdl2[X,opengl,video]
+		media-libs/sdl2-image
+	)
+	vidstab? ( media-libs/vidstab )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	ruby? ( ${RUBY_DEPS} )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
+	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
+	"${FILESDIR}"/${P}-fix-crash-w-ogg-album-art.patch # git master
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	for x in python lua; do
+		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
+	done
+
+	use python && python_fix_shebang src/swig/python
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local myconf=(
+		--enable-gpl
+		--enable-gpl3
+		--enable-kdenlive
+		--enable-melt
+		--enable-motion-est
+		--target-arch=$(tc-arch)
+		--disable-gtk2
+		--disable-kde
+		--disable-sdl
+		--disable-swfdec
+		$(use_enable debug)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable ffmpeg avformat)
+		$(use_enable fftw plus)
+		$(use_enable frei0r)
+		$(use_enable gtk gdk)
+		$(use_enable jack jackrack)
+		$(use_enable libsamplerate resample)
+		$(use_enable opencv)
+		$(use_enable opengl)
+		$(use_enable qt5 qt)
+		$(use_enable rtaudio)
+		$(use_enable rubberband)
+		$(use_enable sdl sdl2)
+		$(use_enable vidstab vid.stab)
+		$(use_enable xine)
+		$(use_enable xml)
+		--disable-sox
+	)
+		#$(use_enable sox) FIXME
+
+	use compressed-lumas && myconf+=( --luma-compress )
+	use ffmpeg && myconf+=( --avformat-swscale )
+	use vdpau && myconf+=( --avformat-vdpau )
+
+	if use qt5 ; then
+		myconf+=(
+			--qt-includedir=$(qt5_get_headerdir)
+			--qt-libdir=$(qt5_get_libdir)
+		)
+	fi
+
+	if use amd64 || use x86 ; then
+		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
+	else
+		myconf+=( --disable-mmx )
+	fi
+
+	# TODO: add swig language bindings
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang=()
+	# not done: java perl php ruby tcl
+	# handled separately: lua
+	for i in python; do
+		use $i && swig_lang+=( $i )
+	done
+	[[ -z "${swig_lang}" ]] && swig_lang=( none )
+
+	econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
+
+	sed -i -e s/^OPT/#OPT/ config.mak || die
+}
+
+src_compile() {
+	default
+
+	if use lua; then
+		# Only copy sources now to avoid unnecessary rebuilds
+		lua_copy_sources
+
+		lua_compile() {
+			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
+
+			sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die
+			./build
+
+			popd > /dev/null || die
+		}
+		lua_foreach_impl lua_compile
+	fi
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	#
+	# Install SWIG bindings
+	#
+
+	docinto swig
+
+	if use lua; then
+		lua_install() {
+			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
+
+			exeinto "$(lua_get_cmod_dir)"
+			doexe mlt.so
+
+			popd > /dev/null || die
+		}
+		lua_foreach_impl lua_install
+
+		dodoc "${S}"/src/swig/lua/play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python || die
+		python_domodule mlt.py _mlt.so
+		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
+		dodoc play.py
+		python_optimize
+	fi
+
+	# not done: java perl php ruby tcl
+}
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
index 456472fb83ca..10cd82c61749 100644
--- a/media-libs/munt-mt32emu/Manifest
+++ b/media-libs/munt-mt32emu/Manifest
@@ -1,7 +1,6 @@
-AUX docs.patch 810 BLAKE2B 941da013c47dd7b51ceb18be748b21edaec86157afa43fbaeab2310229302b3fb7ca2cbf058fc104ce9d9135089084aa2b009706618c81e8c4cae48a601fafde SHA512 99a2707a7eb94579de27a8f0351641d22dd963257edc58ae5d01f8d79722827f25677e6d7ca0b4d24ffbf71281df5cac428a8c0ddde8f42925995f5451d326bf
 AUX munt-mt32emu-2.4.2-docs.patch 518 BLAKE2B 15ed5513d3ef11dbfdd9304a1295d82b3e54f223dcf448285392c9cdc24635c5823a8b5ad4b0954908627ba2ebd450e2f849a9cd725fd78b70e578d0a3d68c43 SHA512 2a1ba4731a13c2f54d5eccad6971b0544b75787df922d31ab2ae68471f078e0585d2c386f09461b89db38fa2bf57b2e402ad98c07f6d5773fbd93856d1c27d6d
 DIST libmt32emu_2_4_2.tar.gz 458962 BLAKE2B 43bd794fbb8e6483f4dd8384f375af3145f0297e974e7bc374764c40d90f0af971622004e052dff2e4235931d08e5ba3c154a45ad0f344c26811f92dc7a6d699 SHA512 6e567260bce4a7ba7f4696d08fde78a05402d8b3087d7720bf86cdbe8c6c392036ce4a5c0ec5951c547d2a98218145fa155d4730404e98ad2dcc573d3cca8da4
-DIST munt_2_3_0.tar.gz 418703 BLAKE2B d9c4290f11f4114b26aa45d6591c04a73d56981e7f618c1466db81fd35be3588b2853fb60b9cf65dd523ce8ea120a5a187bd805b58ba2f75719d460929c2e4e1 SHA512 87fe4891628ea33967270fe3c6c3840e40deb14bd7c8d61490d4c0057438af6bc0099c10e24e813ef1613ca9cc9fc1567a0340c7ea1f4254b209f7fc99c8c7a1
-EBUILD munt-mt32emu-2.3.0.ebuild 592 BLAKE2B 124ac1da68cbe70f86a61c9de2f1cc50fc9bb0ccdd0387b85e5dff56a344bf2a9ce551314d6046964ce05d1b7f846e90e40dcc02a6869e8ec15fab3d8530c502 SHA512 ff901148241e2ac1358146798ec08d7f0251a048c0970a88064dbe3e8abcd17a6704ba618662a4efacce9afb25640c46df8eb449e61bfc941f63ca3ae1b16d2e
+DIST libmt32emu_2_5_0.tar.gz 526300 BLAKE2B a458e402a094e0ea6a42a408f0422c9d12a23126d5c6e5c2b69a15b5264463a436c02a963aaf2c30e3198df1dfb01845b279bc0b4e5f5680b372e98a706c866e SHA512 e86733bb26714a2a5f54a1b443db1e6f320bc3373dde6bbbe6662ecfb5b36c8ba0811919f2ddd54a11f264551add76e7032cd51f5803c502bfd4b1020fafb86b
 EBUILD munt-mt32emu-2.4.2.ebuild 588 BLAKE2B 92e1eba74b079a4e5f4d22d561a5db31bb42e959d81293c7b194c3968e79f16983430a207036b5e35e75128327398eddf12455d47506529e4ac144a347b888d9 SHA512 fa1d01b48107ae52a913d2da2f587c2161bea7c28d311dfee9ab10045532b4e84170c74204570cf0426987e3659f662c38e045fe2644ea2330b63fc4beab3f57
+EBUILD munt-mt32emu-2.5.0.ebuild 595 BLAKE2B 0cd8c1168845910ecdcc3a7bc60753ef5dd5efb152ddbe0ff0e602f2c17ca52f9e2a32415f8d5851a58f4dd12dba1f179dc1d524743af344a6b6b84b7ad393d3 SHA512 27fb007e9682f3657a2d03e60189e7a2c515ddf091e3c7de2e616e71e03fed47c61724b34617c6750cd55e1b679ddebe77adbcb0df438fc65142f9ffaf795dc0
 MISC metadata.xml 620 BLAKE2B be9835ba92d5c8d4cf03c2a716886e422e2539ae773a8e281f4e804192caae29c185e8bac79a5b3a0ca9f7e639f9c5aa099c1ee8f496e1a508b096d4216bc1a9 SHA512 80cde499938128dc44148fdce298a26a49a8cd2660508cd5c6b0e5a9ed8c07eb9d067561d96f8fa94798edff7aa439d9d9269b9ee19a2f83759f574e08e192b3
diff --git a/media-libs/munt-mt32emu/files/docs.patch b/media-libs/munt-mt32emu/files/docs.patch
deleted file mode 100644
index 20034b933641..000000000000
--- a/media-libs/munt-mt32emu/files/docs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 43b3a932650ffd52fc1bc56f5c515ee4855bfd79 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Mon, 22 Jan 2018 21:07:52 +0000
-Subject: [PATCH] Install documentation in Gentoo-compliant manner
-
----
- mt32emu/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mt32emu/CMakeLists.txt b/mt32emu/CMakeLists.txt
-index 248f576..704d4f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -251,8 +251,8 @@ endif()
- 
- if(libmt32emu_PACKAGE_TYPE STREQUAL "Runtime" OR NOT libmt32emu_PACKAGE_TYPE STREQUAL "Devel")
-   install(FILES
--    AUTHORS.txt COPYING.txt COPYING.LESSER.txt NEWS.txt README.txt TODO.txt
--    DESTINATION share/doc/munt/libmt32emu
-+    AUTHORS.txt NEWS.txt README.txt TODO.txt
-+    DESTINATION share/doc/$ENV{PF}
-   )
- endif()
- 
--- 
-2.15.0
-
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.5.0.ebuild
index 8e19616aa4da..f1a27e25b8c9 100644
--- a/media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.5.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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
 
-MY_P="munt_${PV//./_}"
+MY_P="libmt32emu_${PV//./_}"
 DESCRIPTION="Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
 HOMEPAGE="https://github.com/munt/munt"
 SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 S="${WORKDIR}/munt-${MY_P}/mt32emu"
 
 PATCHES=(
-	"${FILESDIR}"/docs.patch
+	"${FILESDIR}"/${PN}-2.4.2-docs.patch
 )
 
 src_configure() {
@@ -24,5 +24,5 @@ src_configure() {
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index c958d7a1012c..6cad246d5603 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -5,5 +5,5 @@ AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
 DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-EBUILD nas-1.9.4-r2.ebuild 2454 BLAKE2B 9c8f919b8511a96c58e5661a0c1851932d34291adb5af7934d05feaf4789cd51265e0f99ce014afa29eb3b98dc9850f8e31732eb6884ba785b8c4d02ef95b3a0 SHA512 01bbff49655f81db5a7a8fde93d6c0754d634a36904014f8a8bd5423395dea14a8553629885e46ef5f387bbfd1e683bb0518dca0b280350f8a568f881a6d153f
+EBUILD nas-1.9.4-r2.ebuild 2550 BLAKE2B e2f59c54c71cfc3c08b50da74f13496afa23e296b5393764a4e0525ed9899b731fbbca61b70f1f28a578476f6a7e100c4fc625f963757afa3d614cf0f6587ca2 SHA512 337f7a24c0c46a7c970d0e3c18e78731746348b1caf5b436dc8732d05880b79e86576d26910da48ba210f1e5875f61e40b344f82c53987692cf8cd130d07a58f
 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index 6364aaca1aa4..513893a8cd31 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-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
@@ -24,13 +24,14 @@ RDEPEND="
 	x11-libs/libXmu
 	x11-libs/libXpm
 	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	sys-devel/bison
 	sys-devel/flex
 	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
@@ -51,13 +52,14 @@ multilib_src_configure() {
 	pushd config || die
 	econf
 	popd || die
-	xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 multilib_src_compile() {
 	# EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
 	local emakeopts=(
-		AR="$(tc-getAR) clq"
+		AR="$(tc-getAR) cq"
 		AS="$(tc-getAS)"
 		CC="$(tc-getCC)"
 		CDEBUGFLAGS="${CFLAGS}"
@@ -82,7 +84,7 @@ multilib_src_compile() {
 			Makefile || die
 	fi
 
-	emake "${emakeopts[@]}" World
+	emake "${emakeopts[@]}"
 }
 
 multilib_src_install() {
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 4be71e5752eb..df97dd33df16 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,4 +1,4 @@
-AUX make-tarball.sh 1364 BLAKE2B 40001ac396b0ff26bb8e5d1a1a160b1467b4f9453d930394cf66dbc5e60b9d1e04c419801ca4ea2cbcb930797fe07df305549b7d5155e3cac3ce099a4dddbfbf SHA512 89b0ebfe6f5a82c3e3fc678ec4599d7281a0978c3a53437f0fbcfcb33607f8087bca1263d8a52c5b25cb1ab91a6635385cf423213464af858fc2f9663d5446a7
+AUX make-tarball.sh 1895 BLAKE2B d6311e862d8b2fb10d88a90263f7187c04bde49ff0ecb7860d4b306a6553b41f24ed718e94113807f7b8cdfe21774de383baf7799f2a3c3a12acea6f7aedbd4f SHA512 8128d2d8c0fb60d1d3cba73b4b3d87e914a7ac284e5f049cfd0a596f772d705acb3222da2d6a6f7d1882c7221eeaae9daac9d1b855e61881600345dc615cc428
 AUX netpbm-10.31-build.patch 1641 BLAKE2B 2102aa5a41b89beea645842ebaf72d472464c161601673f25d100f030c8058c86a98ae1d402387c7ce09eaa2558d099ab6cc8551fe1f231ea5a7e71b813d84ee SHA512 352b4390c7b622a7509ce370ba03d596bdee9ed19f63ab72990f15cec74eee42e768525aeaff87a160c8edb0034189c0a09a86189f7324675091484652cc1abd
 AUX netpbm-10.66-test.patch 347 BLAKE2B e4f88878dd61c2d7e8ad642d5a32aec8351cdcf8ef2d4bf81dd9174a69d17b6c56fc3eb7160f63764360a7bdea99bcb2cb3e8dd47d04f881185f86e2a8f6cbf5 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74
 AUX netpbm-10.70-system-libs.patch 1024 BLAKE2B 8fe242dad22030b66613a9c3c3e1c5d0a00589581f68dccf2940b9991a16cf6e1c5deec86562ec696db65e0d1465e7dacf840c6d9220be1bce3505d9dccf96ff SHA512 e25f58186621820612923e50d1342262cc30a790725d31a8ff2a9e8eae8415db600b6601539e1124eb9dcc5fed2f7db9738d6b8effe9e8e118af1f517111eb81
@@ -9,5 +9,5 @@ AUX netpbm-10.76.00-test.patch 6045 BLAKE2B ec4bf18a2022e67b26b78a591f3949552e10
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
 EBUILD netpbm-10.70.00.ebuild 5373 BLAKE2B bae61227e2fd3e65aa4005e4abb612cbf8e4ab749ff61921c9999eb4fa9203eea7efc9256df0149b47f3877aa2dad9c91a05df774801272e3c467e16ea578fb2 SHA512 b94aeeb1d9c1b7e721708711e1eb5d2bbdfd69692540edd1b79a102c191fb8bad1cc57e6ce18a0ba2e36a417416ddb7ec233381a0ca482cbad8757b90cde5e02
-EBUILD netpbm-10.76.00.ebuild 5238 BLAKE2B d2dc02fdf01e48e7967c3a79bf3626c94a2f730a16340b87379b5900ca6596bbddd1dad68c1bb105bfada1f33ee68880544995ba2e116d4a9031b94960dfc7f9 SHA512 af6bcc41dc8ea868ddaad86e513ab70b797c6a75b43d97a686447bb2ddff4c60e80669345359fe844c2cb38bf20f927f5ff274041588a8450ed527fcf0eae321
+EBUILD netpbm-10.76.00.ebuild 5261 BLAKE2B 56e5848b5c56ea78e54c7b2d09ef1bf942afe4aa8148ae3b534c8df9db9bae562753b0f1139e681bcc52e9758dedad4fa8ea2a6922260ae301e5607e168683ce SHA512 c75b3a3715371cd535c73811c667cc7c4d97f0e37089c017d769a572d7c716cb9b23a93f7f06f84760e0cd3d2203d6df61165c67533663f5a47f8607cca4d3e0
 MISC metadata.xml 342 BLAKE2B cd90d97e1e3d42554ec5feb7ab3db473ab52ba26e9ce4045a0bb55b89aca21f61c34043d0ec6db28af8f08dc95addcae6cd933544104259a334a794a467bcfdd SHA512 7bb2ebbf5bd2957fd06142bebe3271a0d4695b0b18d9bf9c0084ec7d0da65889efd5fbe39fa121b5f8dce0c3562bcd5ffc687d8092324ca85e43fa7f4cc53c7b
diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh
index 90a64ffb34d7..29ad4b3d92e4 100644..100755
--- a/media-libs/netpbm/files/make-tarball.sh
+++ b/media-libs/netpbm/files/make-tarball.sh
@@ -1,13 +1,23 @@
 #!/bin/bash
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
-. /etc/init.d/functions.sh
+# Helper script for creating tarballs of netpbm releases since the netpbm
+# project refuses to do so themselves for "current" releases.  Their process
+# is entirely contained in the svn repo.
+# http://netpbm.sourceforge.net/getting_netpbm.php
+# https://sourceforge.net/p/netpbm/code/HEAD/tree/
+
+. /lib/gentoo/functions.sh
 
 PV=$1
 SVN_ROOT=${2:-/usr/local/src}
+NETPBM="${SVN_ROOT}/netpbm"
+USERGUIDE="${NETPBM}/userguide"
 
 if [[ $# -eq 0 ]] ; then
 	ebegin "Detecting latest version"
-	cd "${SVN_ROOT}/netpbm/release_number"
+	cd "${NETPBM}/release_number" || die
 	svn up -q || die
 	PV=$(svn ls | sort -V | tail -1) || die
 	[[ -z ${PV} ]] && die
@@ -17,9 +27,14 @@ if [[ $# -eq 0 ]] ; then
 
 	if [[ ! -d ${PV} ]] ; then
 		ebegin "Checking out ${PV}"
-		svn up -q ${PV}
+		svn up -q "${PV}"
 		eend || die
 	fi
+
+	ebegin "Updating userguide"
+	cd "${USERGUIDE}" || die
+	svn up -q || die
+	eend
 fi
 
 if [[ $# -gt 2 ]] ; then
@@ -32,28 +47,28 @@ P=${PN}-${PV}
 T=/tmp
 
 maint_pkg_create() {
-	local base="/usr/local/src"
-	local srcdir="${base}/netpbm/release_number"
-	local htmldir="${base}/netpbm/userguide"
+	local base="${SVN_ROOT}"
+	local srcdir="${NETPBM}/release_number"
+	local htmldir="${USERGUIDE}"
 	if [[ -d ${srcdir} ]] ; then
 		cd "${T}" || die
 
-		rm -rf ${P}
+		rm -rf "${P}"
 
 		ebegin "Exporting ${srcdir}/${PV} to ${P}"
-		svn export -q "${srcdir}/${PV}" ${P}
+		svn export -q "${srcdir}/${PV}" "${P}"
 		eend $? || return 1
 
 		ebegin "Exporting ${htmldir} to ${P}/userguide"
-		svn export -q "${htmldir}" ${P}/userguide
+		svn export -q "${htmldir}" "${P}"/userguide
 		eend $? || return 1
 
 		ebegin "Generating manpages from html"
-		(cd "${P}/userguide" && ../buildtools/makeman *.html)
+		(cd "${P}/userguide" && ../buildtools/makeman ./*.html)
 		eend $? || return 1
 
 		ebegin "Creating ${P}.tar.xz"
-		tar cf - ${P} | xz > ${P}.tar.xz
+		tar cf - "${P}" | xz > "${P}".tar.xz
 		eend $?
 
 		einfo "Tarball now ready at: ${T}/${P}.tar.xz"
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index a1fcc051cc55..ab3d9c130b38 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.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,11 +11,14 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
-BDEPEND="app-arch/xz-utils
-	sys-devel/flex"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/flex
+	virtual/pkgconfig
+"
 RDEPEND="jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( >=media-libs/libpng-1.4:0 )
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index ae0aba9cb57e..8fc6ac7fdd25 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,3 @@
-DIST openal-soft-1.21.0.tar.bz2 525483 BLAKE2B 28d44cfddd93bf6637b476cdcc44c5f69a1a8036c17d63be2defdce47d038bf54c29c9248070a65e7c6f86497ed3b79fd5548832bd67a1ebb67ffc363e46de9b SHA512 12e7dca4040765e06658d2945e984af01f21c65b7d44f9daee3a55457c27bd050bf74665e91ebfefdac09739774ace3e7a4bfc02870778cd65268941314aeb3b
 DIST openal-soft-1.21.1.tar.bz2 524787 BLAKE2B ca052ee3ba18188a9b8342540b8a9ffa95a0c19c137f5e799fa69768d51ec30da55afa46bddf3d9b65e589b94423bc5b23f2090e07bb9fc2a34937f9c199ee89 SHA512 420eec18149a9b784daaabe8a2865de3b87d5550cf2e8e06569464d0b5ba6e51d904c18f1461af08676bf8c8b76ef270e860008d79545a5f85131299e89bffd4
-EBUILD openal-1.21.0.ebuild 2092 BLAKE2B ff9f3883ba0b67c509849715f445d056fb7dedee605a96e19524b3f3e7108285f5edd50fd7f2d8b938095c47b604c75c318980a828ef5f384ef1b2fa6e66b10c SHA512 b5b63a5963c0fcbd09c0596c2067f077373520d9d606a1be32481b4dc5731d5b41eae173065f94002102b77031b02ed792b8caf37db74e95cccbfec530d8ef95
-EBUILD openal-1.21.1-r1.ebuild 2464 BLAKE2B ad7eb12ae49bed75b6bce15b685782ca28512b93841e985fae51f225f95d102bab9512b9da5824a217626c1e92b35f215313be5962f29c2b63470e8f979167aa SHA512 3e1f15a76985ffb0dc42110ecfbe956fcacd2f72e067ab62f101304c8918d095078bda23c7584757ea55260b289eaf79b6bba9801810a97288bb64e9d2fe3300
+EBUILD openal-1.21.1-r1.ebuild 2457 BLAKE2B 4922fa44a5a7bd0e97fc533981ef7dd106a2ae6fed327acc2c56a447849dd888f614730ae8223d3211b5dd8a6e24d6c78f37141e03e50cde916eedb2bcbde2e0 SHA512 ff9a4884155e5897fe99cedf51670e328e4c2ed03669c36a4e37f3925b8e20695873016d97d75c56ee17190144daee616a1f1ce1f4039c7d18082d43853f8d58
 MISC metadata.xml 437 BLAKE2B 9f220770b5df968956b8e4deb86df9a6ddbd58494978992dfc2169f8066d8799f36d8e4df6f5870276af9f51f73fd485582c0d718e51cb39049697854b4fb94c SHA512 0e54e8d8677dc4a7a21bf4488a5db6345a394f9602de367e263d1ed4d309e54ca8c1e2406e635aa13ed9d2dff5557a2e0270b591fe07d8f4093796f5f57b5ff0
diff --git a/media-libs/openal/openal-1.21.0.ebuild b/media-libs/openal/openal-1.21.0.ebuild
deleted file mode 100644
index 27025fcebb02..000000000000
--- a/media-libs/openal/openal-1.21.0.ebuild
+++ /dev/null
@@ -1,68 +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
-
-MY_P="${PN}-soft-${PV}"
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="https://www.openal-soft.org/"
-SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	cpu_flags_arm_neon
-"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
-			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
-			-DALSOFT_REQUIRE_JACK=$(usex jack)
-			-DALSOFT_REQUIRE_OSS=$(usex oss)
-			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
-			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
-			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
-			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
-			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
-			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
-			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
-			-DALSOFT_EXAMPLES=OFF
-		)
-
-		use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
-
-		cmake_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/openal/openal-1.21.1-r1.ebuild b/media-libs/openal/openal-1.21.1-r1.ebuild
index abc96492de7a..58c1a7b9dd8a 100644
--- a/media-libs/openal/openal-1.21.1-r1.ebuild
+++ b/media-libs/openal/openal-1.21.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 # Some components are under BSD
 LICENSE="LGPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl sndio qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index bef0c395a7cd..0e277d482f9a 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -2,5 +2,5 @@ AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6f
 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.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173
-EBUILD opencollada-1.6.68.ebuild 1884 BLAKE2B a108f1d9dd924702fc1b9c5a13ffbdf3a416b134fab025cc616a7637211cdbcf63b39d1043dc33c37a166c0bd93422d560eade6f54bcf68c3204b148708d1c08 SHA512 5c6b6056432859f6e9b7ac530a1c205051b0d98482e2597356b171df05f2f880a865dbd96070a9eed54f75800ba58cb92ad763ac65646416f12d389d06f35ae6
+EBUILD opencollada-1.6.68.ebuild 1887 BLAKE2B c3a62d6fb6c53de47eb872b1bc2bef933c13c6880ac55d80706bafc0dc37c547ddde3f7d334f9913d4faf7a3fa9bdb57b02547924179755f6475af3b5f38902d SHA512 de0a56e8f3854b053543b0e91f846558dd0d32f4743b1b12b4a59b091c83a6bbaadf4c0a1903ffa857e8b10539c702bb8ebc3fddba7be9f80a79a84eed44a9e0
 MISC metadata.xml 488 BLAKE2B 4f9f9f640659848a0a9778e0eb0b01f5010452068702f6db244b636a8958afd7e702edc3609fb381fa4dca47e156f653864d791e19cc09ff21323875a4580c97 SHA512 19e46bb89a2fd280b5a6721ad7e4dbf40ad9cd478bce6e8f796c3b34cb57a3e46e41782344384e341fc9d3b400abae63574f9a391c2b19c84526e62aac2f01ae
diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
index c6347454a3d8..49f53f567c18 100644
--- a/media-libs/opencollada/opencollada-1.6.68.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake eutils flag-o-matic
+inherit cmake edos2unix flag-o-matic
 
 DESCRIPTION="Stream based read/write library for COLLADA files"
 HOMEPAGE="http://www.opencollada.org/"
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 390746cfa631..0df101f7a00e 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -3,7 +3,8 @@ AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd
 AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
 AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
 AUX opencolorio-1.1.1-fix-self-assign-clang.patch 493 BLAKE2B fbe85fc4385556deacd173ab44f5a5cbe32c2cd5b4541f1aaf20037840d5d8c7a61d5c314176cde7d0f08c80b6436b0b937c9fef10c3841948b6881601073df5 SHA512 8132a8352a36994550dd089a4858e11459fcbe0495bd07b6bc599a4b8bb7191da8ca6ae061cd1c04f52f586ac993e3656e8c03c6665f7160fa50b4a117f0cb22
+AUX opencolorio-1.1.1-no-werror.patch 349 BLAKE2B 79788a964466a884754dbdead8e252ff2422a52b56f3da8b0f256a52c714120fd2538b16e476271766a6130b97ec5025859e1320ca0a90c3ef5502fb0005f630 SHA512 d80fc47d8c4a768100cae38edcbf6741583507119d8cd8e2b6620cdc727599e5a1c170380cc25c711279b59c3432782c30315c7ffacbb78fcd1536dc12e3481a
 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 2408 BLAKE2B 391b8d5a072d32373554895248b3da0b8307fb0f0bbcc1f8ef1a88ae51945b7f6a5a6305516df3790b2065868a6af254f9f2c8772a24e086bd1795deb2f34b64 SHA512 e9455eb9f4f19075e2e102247bc390b3a3de72a8e2eae53a6bba829d9656cc63cb989f9fd86f435b7bf55298e35c18f68102073b15d2d928013c911a6c78bae3
+EBUILD opencolorio-1.1.1.ebuild 2444 BLAKE2B 7903ebaa327e75a41b630a4d959b0227286bd8a861c50cf9a836bf9c9bc77bd874db079c2ee04ab70d8590f9f2e01222180c5832d19d9eb44757c79c8a8287b6 SHA512 e5d52b606b4a1b0c86c2bb8431b643ac186547ddaf8e57c9a6784453006f8a0006b1e0ba363dc306ea11c6deb6f9e8a834304770e1d39d436b490cd121b42366
 MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch
new file mode 100644
index 000000000000..df8fa2102534
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/786198
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -23,8 +23,6 @@ if(WIN32)
+     if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+         set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
+     endif()
+-else()
+-    set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
+ endif()
+ 
+ # SHARED
diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index 481f2561de4a..a20bb6f44aef 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.1.0-remove-Werror.patch"
 	"${FILESDIR}/${PN}-1.1.1-yaml-cpp-boost-check.patch"
 	"${FILESDIR}/${P}-fix-self-assign-clang.patch"
+	"${FILESDIR}/${P}-no-werror.patch"
 )
 
 pkg_setup() {
diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index 862d435d9a7f..c52029dbcdd8 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -1,13 +1,13 @@
 AUX openctm-1.0.3-create-lib-with-correct-soname-and-symlinks.patch 722 BLAKE2B 09a4cbfb50cfbadd4367e6f944169cb10b59a11b060c76422f3d2147ca8e1ac233b1d0c41dcef4c155ac04f9bcb13b84227dab19c776e89fb20a10bb849d29ac SHA512 86a2232fbb58d1d4d262512963016ed3e9372c22f5f7f85560f47b05332e6f3c10c3029f16318c79bea9dc5968089dace880afaa4e325ffe9e09fcb635099a17
-AUX openctm-1.0.3-do-not-set-rpath.patch 895 BLAKE2B 8cda8a3c13d5bb2db05bfca4b17b1f2405c33f137720b4a5dc7944e8857ffb7eddfd6a2566cd5e4facd0e39b18f0f6f9cd6a8701e75a12ad617874415168545e SHA512 e3a0fe886cdabd2f7fa52f2c1fc268d94230cd101838a3d4260054b412d70e58e1c195837cd8a01895d05c97da171a86919205ad3fd05757818c9b342b431bce
+AUX openctm-1.0.3-do-not-set-rpath.patch 901 BLAKE2B 46ad1a63d8c12ee4d983ac0026a8d04b7ae0991ba7bf4eff8196201225e1aff1a85287338474be2b893537d78064d1406dbbdad9133fb2f46be727e1f9aef446 SHA512 b67d34671b6659251af8d8df3aca298e8684840d6bc1e84d1895265c0cd7758e23bc9ce7ee0cde2e47f3efccdd16c7fbf0c67abfea945c336d7b79382c750a3c
 AUX openctm-1.0.3-escape-hyphens-in-ctmconv-man-page.patch 305 BLAKE2B f5ca2982837b86e25c87aaec43f50cd45d5037228c846f5b35acf0b214b6b34f8528297213303374cd2e77c347cdb443659b820d891f1b2ce9f68e5237727615 SHA512 40469f718f28db9caad6fcaa2728c7a3c56d5ad60c0d39929e871d9348801ad2aef2cbe5112cb785f9d2b794209bfd2bbe9d5d583ad77567a632c8e21efbfab1
 AUX openctm-1.0.3-fix-install-paths.patch 838 BLAKE2B 4849dc0ecc20f9b3a8bdbe1a033696b4755c6254e6e5b55838b5e60999cda52466d8f34e8444ec5666f19254a285e7fd2cb5cf344af2377c7a09ed1dfdf867dd SHA512 d1c47b171636cfdeebeb310c7553e9fba18e7b36a66e2659a32a5ea878ee3f17f842ac4fcba34e965dbc1865f17f4883f569763ca3ec12adfc55d944997b8e53
-AUX openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch 559 BLAKE2B e0a09ed99bc50957051f7867183c95ec7df43cbf17e4285ebb0cc43414eb7289260dd4288afe3a8355c18c7d20df4cdeb88b63cf8ef9f726943a1cba56756600 SHA512 4d0d6a0f64c9095a38874471d638c31657c8df5f53a803b43ee1e2e8794ecf519075de95dcfaff3bfa62af14a7c534b4abac9869188a368e4b3bc2c5eafd679b
+AUX openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch 562 BLAKE2B 6b7cfd1861861fc662769fdc10c7d499def19942a15d6f5dc7d029fee01d375dca70d9a3becc06a2b53550b245850013fd0484f74e6335509718b2fbdba2d5ff SHA512 eb62a22af8c9f05f2d5367e7fc8313a02f01e8f1762562a024d80b237b0133bca8bc96bba8f9e2f78cb890789f7a1decf44d116db13af4ae1b7c1cb8fb5ec1cf
 AUX openctm-1.0.3-link-ctmviewer-with-libGL.patch 349 BLAKE2B d1d8571b867c735df8418d119b50327d6899509e9bf4bd19abd25272797e5c794671c0af67ed693d33a30c666eafb03b2fe460015a154e4b99fff8846022ff8e SHA512 a1c00ae7a8f77b0bc6fc1a437352726cb42fdacb98bb17c4d4bd1f1ca2d92c552c5805ff7115f00d64610e10ad397bfdd26c0c7937eb0a74805a8f9e631257d4
 AUX openctm-1.0.3-link-ctmviewer-with-libGLU.patch 747 BLAKE2B 9f2599e9cbe0dc8fd0ed6b801ce2afa82fd216caa218e28d264aa64a33d1a1eb24e0080bf20bfc7231244253b7e654121def33df7ce8e9735d89c1c04861efb7 SHA512 71a6a4ce3bc352f376f83d7bb26167159bb3aa8f45d3e1134cb703a16a847453eb60de2b50c2aa470e77b837d260375832d5a3941de54891063ab0c169a38d98
 AUX openctm-1.0.3-no-strip.patch 1272 BLAKE2B 78cceaee9185d913d06bcd4ca61447c45cab782388401ff71842fe093bc1f0ef76ec90d0e27a752d3a78f2782ef6cf7b8fdbd773016e465acff6aaf4430ec69d SHA512 a808a499b5a3162831d7b7d67433ef71f1f31e634e2f5057f4f19b59ee962e0379eadad57342a3a24f9891809c2b24adc83abcc311fef990d97446d4baa318cb
-AUX openctm-1.0.3-respect-flags.patch 2931 BLAKE2B fa6b99c7fa46ce5a0f1790cbf89ac45ac19ea939ff165cece87e419f1c902de8d3528c82ad800da079aa07b4f03fd33df47eed07bb61cb60d3326146f91e6153 SHA512 a6d6efa9df63835cb0990906a5755cc6d673a48377af1f28b880384051e4cb2380deae13eff864c179e7e98b3e0319e993c639609bc8b482e3ea37fbf4cb21cd
-AUX openctm-1.0.3-use-system-libs.patch 3289 BLAKE2B d0402954c36ea42372fd65858ef1166fd519e133b3f2f4e5770fd5a76f9f8dc31354749df7af97b7bf050b47c6327f7aa6253eeb7cd4225c55c1dc6e1ac3aebd SHA512 a12e45f703373749e1c71ddfb11576d056b2970de32800bf6fa46332cb23c8e6c5e3e741bc30468599b7a66918e9bd1140e50d5963fba5c71dfaa6649d64a66a
+AUX openctm-1.0.3-respect-flags.patch 2937 BLAKE2B 4c3d1c435bccfc67bef5a1647384d22c6084b816ff28bab2be762f73d85994e962b4898bd45431b5cc45cfc316c01e8f3c90f17c559fa46967c7c09a0571ab05 SHA512 0f0a1baa97345586bfb82645ecd9afe3dafde8dae97d92e3e8fbd14576838be3ab1cae141e1c634118404bdae022bf4517350d680aabc4ddcbb4d1cbee2269b0
+AUX openctm-1.0.3-use-system-libs.patch 3295 BLAKE2B c837257274c0cb923d04ac0cbba66dd9a693b24370721758678fc6e52da3b07e477cb8317f4fb08f12e8d6c89b06b6cfb3ab93c9e6d26a88b654a562072fe16e SHA512 c68c3c42bdede730083d3e27dbe9a8d33f5e5907e4d7c541408a1f18ed56e889be28c4d8c4c61a01d1ed4111d27b04127bbd1295ddcb66b2a0f71fcd9d72a386
 DIST openctm-1.0.3-src.tar.bz2 1507603 BLAKE2B 379dad88ef3b069ee4167bdee8c1e86c6f1250c0db7bb108d12b6005f0cd19a4cafcaae51a8e1eddde7566fc9c8e361472268edb1806a5383f536d070ea4354a SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e
-EBUILD openctm-1.0.3-r1.ebuild 1408 BLAKE2B 58ceaaf66b0e27e567ea1fa03e2733df059fe3c2460c270315aff4d78d4e5431c84bdccf87f97770c32f3ed9eccd9185309a72c5b4c8ecb2ad2ac4a4cdd0f7d0 SHA512 383cad1ffdbdbd7238d5be19299a82dcca03a52764e7cd452dddf86579234106fadcddd298483058291695558f6e630c79a3c734ae0dd05aaaf3745200b846b7
+EBUILD openctm-1.0.3-r1.ebuild 1450 BLAKE2B 0529d1ad697ee4f9c696a35434ec552864c2615d80ac83af206931d5f310dd2263a3053fcfb3b270ea59b380814ddf9a8014b4c2fffee47d5a00dfeffcea0c8b SHA512 57641cca20d7dafd9e223e0bdad3dda73ab8662a1e49ad7795b16b4d7e21891de5b584da937881babb6d5d1cc63a52d91c8e0f542f5a40210f22412dd16ef68e
 MISC metadata.xml 733 BLAKE2B 7ea0e6029b6d34f1ebdd762fc2e20a331df83e8bcf34a37451c7f18dd261127795bc59d6eb91bd6479d6a10034cf046c1b08b6eef2412be25403ffa27aa3484d SHA512 26ecfbe9a152237fc20b9355781fdccb9e9bfc5a52382e6b4c242bb89d55b5f16f6f4eda177606a3f826a43e6d54404df8bddc1862d9f9c4dc73d045dbcf038c
diff --git a/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch b/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch
index e80e5cf34b4c..89a4575a139b 100644
--- a/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch
+++ b/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch
@@ -8,8 +8,8 @@
 +	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
 
  ctmviewer: $(CTMVIEWEROBJS)
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
-+	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `${PKG_CONFIG} --libs gtk+-2.0`
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `${PKG_CONFIG} --libs gtk+-2.0`
 
  ctmbench: $(CTMBENCHOBJS)
 -	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -Wl,-rpath,. -lopenctm
diff --git a/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch b/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch
index 370960721b5c..77512ba3c70c 100644
--- a/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch
+++ b/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch
@@ -4,7 +4,7 @@
  	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
 
  ctmviewer: $(CTMVIEWEROBJS)
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `${PKG_CONFIG} --libs gtk+-2.0`
 +	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
 +	-ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW \
 +	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
diff --git a/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch b/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch
index 4a406d0caf88..753c820ff2da 100644
--- a/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch
+++ b/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch
@@ -39,8 +39,8 @@
  RPLYDIR = rply
 
 -CPP = g++
--CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
-+CXXFLAGS += -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
+-CPPFLAGS = -c -O3 -W -Wall `${PKG_CONFIG} --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
++CXXFLAGS += -W -Wall `${PKG_CONFIG} --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
 
  MESHOBJS = mesh.o meshio.o ctm.o ply.o rply.o stl.o 3ds.o dae.o obj.o lwo.o off.o wrl.o
  CTMCONVOBJS = ctmconv.o common.o systimer.o convoptions.o $(MESHOBJS)
diff --git a/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch b/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch
index e6d158c6c3b1..be2f9b65c14c 100644
--- a/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch
+++ b/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch
@@ -14,7 +14,7 @@
 
  CPP = g++
 -CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(JPEGDIR) -I$(TINYXMLDIR) -I$(GLEWDIR) -I$(ZLIBDIR) -I$(PNGLITEDIR)
-+CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
++CPPFLAGS = -c -O3 -W -Wall `${PKG_CONFIG} --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
 
  MESHOBJS = mesh.o meshio.o ctm.o ply.o rply.o stl.o 3ds.o dae.o obj.o lwo.o off.o wrl.o
  CTMCONVOBJS = ctmconv.o common.o systimer.o convoptions.o $(MESHOBJS)
@@ -39,7 +39,7 @@
 -ctmconv: $(CTMCONVOBJS) $(TINYXMLDIR)/libtinyxml.a libopenctm.so
 -	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
 +ctmviewer: $(CTMVIEWEROBJS)
-+	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `${PKG_CONFIG} --libs gtk+-2.0`
 
 -ctmviewer: $(CTMVIEWEROBJS) $(JPEGDIR)/libjpeg.a $(TINYXMLDIR)/libtinyxml.a $(ZLIBDIR)/libz.a libopenctm.so
 -	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) -L$(JPEGDIR) -L$(ZLIBDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lz -lglut -lGLU `pkg-config --libs gtk+-2.0`
diff --git a/media-libs/openctm/openctm-1.0.3-r1.ebuild b/media-libs/openctm/openctm-1.0.3-r1.ebuild
index e4014df8c998..c77dbee3d4ba 100644
--- a/media-libs/openctm/openctm-1.0.3-r1.ebuild
+++ b/media-libs/openctm/openctm-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit edos2unix flag-o-matic toolchain-funcs
 
 MY_P=OpenCTM-${PV}
 
-DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh."
+DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh"
 HOMEPAGE="http://openctm.sourceforge.net"
 SRC_URI="https://downloads.sourceforge.net/project/openctm/${MY_P}/${MY_P}-src.tar.bz2 -> ${P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}"
@@ -16,7 +16,6 @@ LICENSE="GPL-2"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86"
 
-IUSE=""
 DEPEND="
 	dev-libs/tinyxml
 	media-libs/freeglut
@@ -28,6 +27,7 @@ DEPEND="
 	x11-libs/gtk+:2
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-escape-hyphens-in-ctmconv-man-page.patch"
@@ -49,6 +49,8 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	emake CC=$(tc-getCC) CXX="$(tc-getCXX)" -f Makefile.linux
 }
 
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index fb826d445585..f5ab7966f968 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,16 +1,4 @@
-AUX openexr-2.2.0-Install-missing-header-files.patch 1929 BLAKE2B 9695d1c5294d312b5551522044d838db8c19e2a46d970b392ebb2d2889ea1c54f765f3195ce9b1df42b9ac7586a6569e9621b039dde5ab562b0bce5b74a9f33b SHA512 b6d1bb5a37bdf2283da8f45b71f3a8830a96437f2459746c5d354cecaaceee5e35ba3e3cf247e3c5c6f7930490233672542d8f7aaa59b79593d209e66eac8421
-AUX openexr-2.2.0-fix-config.h-collision.patch 1556 BLAKE2B d7366aeae2a4d5b5496815d844de90c381d3a514dde0e37f86d2b2c5a8fe11eb3631aa44a554a5390cd2a43700cc8a36ff88af4a0e894c4774c45edf0129c4c5 SHA512 15d654f9e1546ea32a6175b1cce24ed9d979afe7dd763ca53a17c1020ca8851c31cc3b8fc0e4ef31722ead91557e24a67958ca9ee5fd0fa4e574304c3153be33
-AUX openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch 2536 BLAKE2B 7eb4db8596cd157f30ba7be564f776598cfa0d893dbaf8f729e8041079e851b0272ba595298e10792a5c74c14b21fbea78a4157d9494501f2c1ca5ef946dc6af SHA512 530088a51d97039e951055361526b8afa2c322351971d26302d21ddd6fdf2d21682df0577872be608b8cd0c3d3fc05792d871e7c724546be42bfa439e74bb726
-AUX openexr-2.3.0-bigendian.patch 2226 BLAKE2B e11a081bee4916276a912a0e96c873a9cee093df84aac0d69bf1c071d53b79064603c09637a446438d014739ba2c27b12f42567e5135af4a9913464f25fabe44 SHA512 2d1e300a3b5d0de7611c2b155f6123c778546a0cba0ee569c915ebcc39c343f88894286e6204bb10f153c824fd6ffed78979fc51804f56065ebf478c553f1e2f
-AUX openexr-2.3.0-bigendian2.patch 655 BLAKE2B 0bbafb66a643263e756d473216f262a9e307b805bd428f102c8aa6ed28e7ce42fa7549a6a4c820b56b6195e9301f97433a0c18e5b03a2207bbb14bdc1dfb25c0 SHA512 c0d4b2b79102f8d75134debc10f4324921233384b1b404a957db2d36948527a764e2e8d911c14230b849b91cd050d3de2fc222437434802b1d71c5d9fba3e1fe
-AUX openexr-2.3.0-fix-bashisms.patch 4505 BLAKE2B cedadd9425265c9378de1431ccd9875afa047ec1324cf2fcef1de2f3444fa634e94da457050b2d7481b31918fb9855c7e7ff55160af2ce9889f0840cf847fcb9 SHA512 57293c57d8294bb20c075337b933b37e88f396b0c5fa5cd871800249ccbf286edcda1360e53aab9aa5b289bfc5e351e6ccaaa8f182607ce8bd1cc11cab03fad5
-AUX openexr-2.3.0-fix-build-system.patch 2381 BLAKE2B 37fd9c6ae5357ffb93fd47344137b4c91110a79ab2b685ac048109192f87e41f01aaa0a0fbee222bfa10ffdc58340d7c803b3068bca8bf99c323dfe46252597d SHA512 36889880813acf75a77d3d34ea3f0a6535ca45194ad491bec17df3701d1eabd2bb03d81c525ba96cf695e91ec67abeb1b2395cfa45ff0767d90b4600d63e768a
-AUX openexr-2.3.0-skip-bogus-tests.patch 1429 BLAKE2B fe9dcafb4ea5990cfcf36b16f377592dba1a6f9c31315e38596b67007b2cb67fa46a3217f335202b86b5aa8fb0498c5af5a0905a5a57b9af42b601da1bdae473 SHA512 ff13061b24f6477195e189c38e2bf855a46ab77461c8622dd2e2414a7d2103b260f5184735bb142275690e66fb469e6f6c1fbf626dd9c1c2afbc15b975eba78a
-AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8ac43d62d91b87b87bc2735ecc22426401b3b671d0b397e6a9a1fba351ae66e022c9bb488f95d29a9fbcca479d3d70501eac SHA512 5ffc8bda7e476ce71ee103b519c76e630371e5cc005b04f99d2c054580e387cc2b3b9598cbe4442415c5dfe85b0de8ceedf87079c3f738b7ebb737ea23ea7729
-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.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
-EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382
 EBUILD openexr-2.5.5.ebuild 1691 BLAKE2B ddaa5c3bca30159e1c1349a8d3ec8b79e670c0739f98abe62dac2286b8207352361f15461ec06577a9c90ab566bc0081372d2fd6f305e6a91fe7083eece97b9a SHA512 840e4a1652df0f5968b015dfcb14ea35f6587338f8b22e3e4b78dc4358dd33108cf7edf01c1406163f8e9a11e3b7c4e7582855d1784c8c4adb1f7d85f8c28015
 MISC metadata.xml 704 BLAKE2B 7315b803d664938f38c13ec83a4d4fbfb3364fb5816d816243efe2b350517d561f9aab072df80c117f998fb139b789cd5aade8774f4a118d475ef0146fee0e24 SHA512 041be55dab737fc1d1b94ed930341818e9296a3e24c9838f91605ca001f198493d8784e9bf25da2ed03755382714d5159c5ad6386075d148bb2d1de665980540
diff --git a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch b/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch
deleted file mode 100644
index 1075cd9a30fa..000000000000
--- a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a018f82655402421a995565dd4a5192259cbc207 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Sat, 23 Sep 2017 10:36:40 +0100
-Subject: [PATCH] OpenEXR: Install missing header files
-
-Some header files are not installed via Autotools, but are with
-CMake which breaks compatibility with certain programs. This patch
-enables Autotools to install these header files.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- OpenEXR/IlmImf/Makefile.am     |  3 ++-
- OpenEXR/IlmImfUtil/Makefile.am | 17 +++++++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/IlmImf/Makefile.am b/IlmImf/Makefile.am
-index a7c219c..b7b96ac 100644
---- a/IlmImf/Makefile.am
-+++ b/IlmImf/Makefile.am
-@@ -162,7 +162,8 @@ libIlmImfinclude_HEADERS = ImfForward.h ImfAttribute.h ImfBoxAttribute.h \
- 			   ImfMisc.h          \
- 			   ImfPartHelper.h \
- 			   ImfDeepImageState.h \
--			   ImfDeepImageStateAttribute.h
-+			   ImfDeepImageStateAttribute.h \
-+			   ImfFloatVectorAttribute.h
- 
- noinst_HEADERS = ImfCompressor.h    \
- 		 ImfRleCompressor.h \
-diff --git a/IlmImfUtil/Makefile.am b/IlmImfUtil/Makefile.am
-index 8005ee1..e1d3674 100644
---- a/IlmImfUtil/Makefile.am
-+++ b/IlmImfUtil/Makefile.am
-@@ -33,6 +33,23 @@ libIlmImfUtil_la_LIBADD =  -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf
- 
- libIlmImfUtilincludedir = $(includedir)/OpenEXR
- 
-+libIlmImfUtilinclude_HEADERS = ImfFlatImage.h \
-+			       ImfDeepImage.h \
-+			       ImfDeepImageChannel.h \
-+			       ImfImageLevel.h \
-+			       ImfDeepImageLevel.h \
-+			       ImfDeepImageIO.h \
-+			       ImfImageChannelRenaming.h \
-+			       ImfImageIO.h \
-+			       ImfFlatImageChannel.h \
-+			       ImfImage.h \
-+			       ImfFlatImageLevel.h \
-+			       ImfImageDataWindow.h \
-+			       ImfSampleCountChannel.h \
-+			       ImfFlatImageIO.h \
-+			       ImfImageChannel.h
-+
-+
- EXTRA_DIST = CMakeLists.txt
- 
- INCLUDES = \
--- 
-2.14.1
-
diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch b/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch
deleted file mode 100644
index 53421194c2da..000000000000
--- a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Rename enum from VERSION to MYVERSION due to
-collision with VERSION from autoheader.
-
---- a/IlmImf/ImfDwaCompressor.cpp
-+++ b/IlmImf/ImfDwaCompressor.cpp
-@@ -1944,7 +1944,7 @@
- 
-     #define OBIDX(x) (Int64 *)&_outBuffer[x * sizeof (Int64)]
- 
--    Int64 *version                 = OBIDX (VERSION);
-+    Int64 *version                 = OBIDX (MYVERSION);
-     Int64 *unknownUncompressedSize = OBIDX (UNKNOWN_UNCOMPRESSED_SIZE);
-     Int64 *unknownCompressedSize   = OBIDX (UNKNOWN_COMPRESSED_SIZE);
-     Int64 *acCompressedSize        = OBIDX (AC_COMPRESSED_SIZE);
-@@ -2356,7 +2356,7 @@
- 
-     const Int64 *inPtr64 = (const Int64*) inPtr;
- 
--    Int64 version                  = *(inPtr64 + VERSION);
-+    Int64 version                  = *(inPtr64 + MYVERSION);
-     Int64 unknownUncompressedSize  = *(inPtr64 + UNKNOWN_UNCOMPRESSED_SIZE);
-     Int64 unknownCompressedSize    = *(inPtr64 + UNKNOWN_COMPRESSED_SIZE);
-     Int64 acCompressedSize         = *(inPtr64 + AC_COMPRESSED_SIZE);
-@@ -3142,7 +3142,7 @@
- 
- 
- //
--// Setup channel classification rules when reading files with VERSION < 2
-+// Setup channel classification rules when reading files with MYVERSION < 2
- //
- 
- void
---- a/IlmImf/ImfDwaCompressor.h
-+++ b/IlmImf/ImfDwaCompressor.h
-@@ -124,7 +124,7 @@
- 
-     enum DataSizesSingle 
-     {
--        VERSION = 0,                  // Version number:
-+        MYVERSION = 0,                // Version number:
-                                       //   0: classic
-                                       //   1: adds "end of block" to the AC RLE
- 
diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch b/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch
deleted file mode 100644
index 1dc13c724074..000000000000
--- a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-IlmImf_ImfSystemSpecific.cpp,v 1.2 2014/08/19 13:34:42 joerg Exp $
-
-Rework cpuid function to use gnuc __get_cpuid (requiring at least gcc 4.3)
-This get's over issues such as encountered with PIC builds.
-Upstream issue : https://github.com/openexr/openexr/issues/128
-
-https://raw.githubusercontent.com/jsonn/pkgsrc/trunk/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.cpp
-https://github.com/jsonn/pkgsrc/commit/5158af44e65b6d7b9f1a8aca2eb24cb87d003724
-https://bugs.gentoo.org/show_bug.cgi?id=626760
-
---- a/IlmImf/ImfSystemSpecific.cpp.orig	2014-08-10 04:23:57.000000000 +0000
-+++ b/IlmImf/ImfSystemSpecific.cpp
-@@ -40,21 +40,30 @@ OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EN
- 
- namespace {
- #if defined(IMF_HAVE_SSE2) &&  defined(__GNUC__)
--
-     // Helper functions for gcc + SSE enabled
--    void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
-+    void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx,
-+					unsigned int &ecx, unsigned int &edx)
-     {
-+#ifdef __i386__
-+        __asm__ __volatile__ (
-+            "pushl %%ebx; cpuid; movl %%ebx, %0; popl %%ebx"
-+            : /* Output  */ "=m"(ebx), "=a"(eax), "=c"(ecx), "=d"(edx) 
-+            : /* Input   */ "a"(n)
-+            : /* Clobber */);
-+#else
-         __asm__ __volatile__ (
-             "cpuid"
-             : /* Output  */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) 
-             : /* Input   */ "a"(n)
-             : /* Clobber */);
-+#endif
-     }
- 
- #else // IMF_HAVE_SSE2 && __GNUC__
- 
-     // Helper functions for generic compiler - all disabled
--    void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
-+    void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx,
-+					unsigned int &ecx, unsigned int &edx)
-     {
-         eax = ebx = ecx = edx = 0;
-     }
-@@ -64,7 +73,7 @@ namespace {
- 
- #ifdef OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
- 
--    void xgetbv(int n, int &eax, int &edx)
-+    void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
-     {
-         __asm__ __volatile__ (
-             "xgetbv"
-@@ -75,7 +84,7 @@ namespace {
- 
- #else //  OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
- 
--    void xgetbv(int n, int &eax, int &edx)
-+    void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
-     {
-         eax = edx = 0;
-     }
-@@ -94,8 +103,8 @@ CpuId::CpuId():
-     f16c(false)
- {
-     bool osxsave = false;
--    int  max     = 0;
--    int  eax, ebx, ecx, edx;
-+    unsigned int  max     = 0;
-+    unsigned int  eax, ebx, ecx, edx;
- 
-     cpuid(0, max, ebx, ecx, edx);
-     if (max > 0)
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
deleted file mode 100644
index 0851fe957354..000000000000
--- a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Fix test-suite on some big-endian archs
-Author: Dennis Gilmore <dennis@ausil.us>
-Bug-Debian: https://bugs.debian.org/793040
-Origin: vendor, https://github.com/openexr/openexr/issues/81
-Reviewed-by: Mathieu Malaterre <malat@debian.org>
-
-Index: openexr/IlmImfTest/testFutureProofing.cpp
-===================================================================
---- openexr.orig/IlmImfTest/testFutureProofing.cpp
-+++ openexr/IlmImfTest/testFutureProofing.cpp
-@@ -40,6 +40,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
-+#include <byteswap.h>
- 
- #include "tmpDir.h"
- #include "testFutureProofing.h"
-@@ -64,6 +65,7 @@
- #include <ImfNamespace.h>
- #include <ImathNamespace.h>
- #include <IlmThreadNamespace.h>
-+#include <ImfSystemSpecific.h>
- 
- namespace IMF = OPENEXR_IMF_NAMESPACE;
- using namespace IMF;
-@@ -1234,6 +1236,12 @@ modifyType (bool modify_version)
-             
-             //length of attribute
-             fread(&length,4,1,f);
-+            if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
-+            {
-+                int tmp = bswap_32(length);
-+        	length = tmp;
-+            }
-+
-             if(!modify_version && attrib_name=="type")
-             {
-                 // modify the type of part 1 to be 'X<whatevever>'
-Index: openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
-===================================================================
---- openexr.orig/IlmImfTest/testMultiPartFileMixingBasic.cpp
-+++ openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
-@@ -40,6 +40,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
-+#include <byteswap.h>
- 
- #include "tmpDir.h"
- #include "testMultiPartFileMixingBasic.h"
-@@ -59,6 +60,7 @@
- #include <ImfDeepScanLineInputPart.h>
- #include <ImfPartType.h>
- #include <ImfMisc.h>
-+#include <ImfSystemSpecific.h>
- 
- namespace IMF = OPENEXR_IMF_NAMESPACE;
- using namespace IMF;
-@@ -1383,6 +1385,11 @@ killOffsetTables (const std::string & fn
-             
-             //length of attribute
-             fread(&length,4,1,f);
-+    	    if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
-+    	    {
-+    		int tmp = bswap_32(length);
-+    		length = tmp;
-+    	    }
-             
-             //value of attribute
-             for(int i=0;i<length;i++) 
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
deleted file mode 100644
index cf1ad7b09027..000000000000
--- a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Upstream is not interested in big endian arch
- Seems to only affect the test suite.
-Author: Mathieu Malaterre <malat@debian.org>
-
-Index: openexr/IlmImfTest/main.cpp
-===================================================================
---- openexr.orig/IlmImfTest/main.cpp
-+++ openexr/IlmImfTest/main.cpp
-@@ -153,7 +153,7 @@ main (int argc, char *argv[])
-     TEST (testHuf, "core");
-     TEST (testWav, "core");
-     TEST (testRgba, "basic");
--    TEST (testSharedFrameBuffer, "basic");
-+    //TEST (testSharedFrameBuffer, "basic");
-     TEST (testRgbaThreading, "basic");
-     TEST (testChannels, "basic");
-     TEST (testAttributes, "core");
diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch b/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch
deleted file mode 100644
index f633eb0e49f1..000000000000
--- a/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From ba329cba788d4f320e6fc455919233222c27a0dd Mon Sep 17 00:00:00 2001
-From: Kimball Thurston <kdt3rd@gmail.com>
-Date: Sun, 21 Jul 2019 23:07:01 +1200
-Subject: [PATCH] Fixes #139
-
-Removes bash-isms from the autoconf bootstrap / configure.ac files
-
-Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
----
- IlmBase/bootstrap            |  4 ++--
- IlmBase/configure.ac         | 22 ++++++++++------------
- OpenEXR/bootstrap            |  4 ++--
- OpenEXR/configure.ac         | 26 +++++++++++++-------------
- OpenEXR_Viewers/bootstrap    |  4 ++--
- OpenEXR_Viewers/configure.ac | 15 +++++++--------
- PyIlmBase/bootstrap          |  4 ++--
- PyIlmBase/configure.ac       | 15 +++++++--------
- 8 files changed, 45 insertions(+), 49 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,30 +76,30 @@ AC_ARG_ENABLE(cxxstd,
-                              [enable ISO c++ standard 11/14 [[default=auto]]]),
-               [cxxstd="${enableval}"], [cxxstd=14])
- 
--if test "${cxxstd}" == 17 ; then
-+if test "${cxxstd}" = 17 ; then
-     AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
- 	CXXFLAGS="$CXXFLAGS -std=c++17"
- else
--  if test "${cxxstd}" == 14 ; then
-+  if test "${cxxstd}" = 14 ; then
-       AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
-   	CXXFLAGS="$CXXFLAGS -std=c++14"
-   else
--    if test "${cxxstd}" == 11 ; then
-+    if test "${cxxstd}" = 11 ; then
-       AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
-       CXXFLAGS="$CXXFLAGS -std=c++11"
-     else
--      if test "${cxxstd}" == 03 ; then
-+      if test "${cxxstd}" = 03 ; then
-         CXXFLAGS="$CXXFLAGS -std=c++03"
-       else
-         dnl automatically determine...
-         AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
-         AX_CXX_COMPILE_STDCXX([14], [noext], [optional])
-         AX_CXX_COMPILE_STDCXX([17], [noext], [optional])
--        if test "$HAVE_CXX14" == 1 ; then
-+        if test "$HAVE_CXX14" = 1 ; then
-   	      CXXFLAGS="$CXXFLAGS -std=c++14"
-           cxxstd = 14
-         else
--          if test "$HAVE_CXX11" == 1 ; then
-+          if test "$HAVE_CXX11" = 1 ; then
-   	        CXXFLAGS="$CXXFLAGS -std=c++11"
-             cxxstd = 11
-           fi
-@@ -216,7 +216,7 @@ AC_COMPILE_IFELSE(
-    [sysconf_nproc="no"]
- )
- AC_MSG_RESULT([$sysconf_nproc])
--if test "x${sysconf_nproc}" == xyes ; then
-+if test "x${sysconf_nproc}" = xyes ; then
-     AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count])
- fi
- 
-@@ -297,14 +297,14 @@ LIB_SUFFIX=""
- lib_suffix_valid="no"
- 
- lib_namespace="Imf"
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
-     AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf_${OPENEXR_VERSION_API}], [OpenEXR])
-     AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
- 
-     lib_namespace="Imf_${OPENEXR_VERSION_API}"
-     LIB_SUFFIX="${OPENEXR_VERSION_API}"
-     lib_suffix_valid="yes"
--elif test "x${library_namespace_versioning}" == xno ; then
-+elif test "x${library_namespace_versioning}" = xno ; then
-     AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR])
- 
-     lib_namespace="Imf"
-@@ -318,7 +318,7 @@ else
- fi
- AC_SUBST(LIB_SUFFIX)
- 
--if test "x${lib_suffix_valid}" == xyes ; then
-+if test "x${lib_suffix_valid}" = xyes ; then
- AC_SUBST(LIB_SUFFIX_DASH,"-${LIB_SUFFIX}")
- AM_CONDITIONAL(LIB_SUFFIX_EXISTS,true)
- else
-@@ -338,11 +338,11 @@ AC_ARG_ENABLE(customusernamespace,
-         [custom_usr_namespace="${enableval}"], 
-         [custom_usr_namespace=no])
- 
--if test "x${custom_usr_namespace}" == xyes ; then
-+if test "x${custom_usr_namespace}" = xyes ; then
-     AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'])
-     AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
-     usr_namespace="Imf"
--elif test "x${custom_usr_namespace}" == xno ; then
-+elif test "x${custom_usr_namespace}" = xno ; then
-     AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
-     usr_namespace="Imf"
- else
-@@ -386,7 +386,7 @@ enable large stack optimizations                $large_stack
- internal library namespace                      $lib_namespace
- user-client namespace                           $usr_namespace])
- 
--if test "x$build_osxuniversal" == xyes; then
-+if test "x$build_osxuniversal" = xyes; then
- AC_MSG_RESULT([
- build OS X universal binaries                   $build_osxuniversal])
- fi
diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
deleted file mode 100644
index 811a7af38758..000000000000
--- a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 067f9d0..fdbe2f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,8 +13,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
- AC_CANONICAL_HOST
- AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
- AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
--AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
--AM_MAINTAINER_MODE
-+AM_INIT_AUTOMAKE
- 
- 
- LIBTOOL_CURRENT=24
-@@ -28,7 +27,7 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
- 
- dnl
-@@ -58,8 +57,8 @@ AM_PATH_PKGCONFIG(
-     [ILMBASE])
- 
- dnl Define the version string
--AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string])
--AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string])
- AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
- AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
- AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
-@@ -110,16 +109,7 @@ AC_ARG_ENABLE(threading,
-               [multithread="${enableval}"], [multithread=yes])
- 
- AS_IF([test "x${multithread}" != xno], [
--	ACX_PTHREAD(
--    [
--      AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD)
--      ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS"
--      ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS"
--      CC="$PTHREAD_CC"
--
--      AM_POSIX_SEM()
--    ],
--    [AC_MSG_ERROR([POSIX thread support required])])
-+	AX_PTHREAD
- 
- 	AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
- 
-@@ -195,15 +185,6 @@ dnl AC_MSG_RESULT($complete_iomanip)
- dnl AC_LANG_RESTORE
- AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
- 
--AC_MSG_CHECKING(for gcc optimization flags)
--old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -pipe"
--AC_TRY_COMPILE([#include <stdio.h>],
--[ printf ("hello, world"); ],
--[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
--CFLAGS=$old_cflags
--AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
--
- 
- dnl Check to see if the toolset supports AVX instructions in inline asm
- AC_ARG_ENABLE([avx],
diff --git a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
deleted file mode 100644
index 360b9609b2dc..000000000000
--- a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Remove bogus test from suite
-Author: Mathieu Malaterre <malat@debian.org>
-Bug-Debian: https://bugs.debian.org/790495
-Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790495#15
-
---- openexr-2.2.0.orig/IlmImfTest/testSampleImages.cpp
-+++ openexr-2.2.0/IlmImfTest/testSampleImages.cpp
-@@ -162,15 +162,15 @@ testSampleImages (const std::string&)
- 	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_b44.exr",
- 		       ILM_IMF_TEST_IMAGEDIR "comp_b44_piz.exr");
- 
--	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
--		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
--	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
--		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
-+//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
-+//		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
-+//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
-+//		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
- 
--	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
--		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
--	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
--		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
-+//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
-+//		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
-+//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
-+//		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
- 
- 
- 	cout << "ok\n" << endl;
diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
deleted file mode 100644
index bb3917d79961..000000000000
--- a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Usual double rounding issue with x87
-Author: Mathieu Malaterre <malat@debian.org>
-Bug-Debian: https://bugs.debian.org/909865
-Forwarded: https://github.com/openexr/openexr/issues/346
-Last-Update: 2018-12-19
-
---- openexr-2.3.0.orig/IlmImfTest/Makefile.am
-+++ openexr-2.3.0/IlmImfTest/Makefile.am
-@@ -54,6 +54,8 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
- 
- AM_CPPFLAGS = -DILM_IMF_TEST_IMAGEDIR=\"$(srcdir)/\"
- 
-+AM_CPPFLAGS += -ffloat-store
-+
- if BUILD_IMFHUGETEST
- IlmImfTest_SOURCES += testDeepScanLineHuge.cpp testDeepScanLineHuge.h
- AM_CPPFLAGS += -DENABLE_IMFHUGETEST
diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
deleted file mode 100644
index 430bb20bcfae..000000000000
--- a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix test-suite on some 32bits archs
-Author: Mathieu Malaterre <malat@debian.org>
-Bug-Debian: https://bugs.debian.org/791478
-
-Index: openexr/IlmImfTest/Makefile.am
-===================================================================
---- openexr.orig/IlmImfTest/Makefile.am
-+++ openexr/IlmImfTest/Makefile.am
-@@ -44,7 +44,6 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
- 		     testDeepScanLineMultipleRead.h testDeepScanLineMultipleRead.cpp  \
- 		     testPartHelper.h testPartHelper.cpp \
- 		     testOptimized.cpp testOptimized.h \
--		     testOptimizedInterleavePatterns.cpp testOptimizedInterleavePatterns.h \
- 		     testBadTypeAttributes.cpp testBadTypeAttributes.h \
- 		     testFutureProofing.cpp testFutureProofing.h \
- 	             compareDwa.cpp compareDwa.h \
-Index: openexr/IlmImfTest/main.cpp
-===================================================================
---- openexr.orig/IlmImfTest/main.cpp
-+++ openexr/IlmImfTest/main.cpp
-@@ -82,7 +82,6 @@
- #include "testCopyMultiPartFile.h"
- #include "testPartHelper.h"
- #include "testOptimized.h"
--#include "testOptimizedInterleavePatterns.h"
- #include "testBadTypeAttributes.h"
- #include "testFutureProofing.h"
- #include "testPartHelper.h"
-@@ -174,7 +173,6 @@ main (int argc, char *argv[])
-     TEST (testExistingStreams, "core");
-     TEST (testStandardAttributes, "core");
-     TEST (testOptimized, "basic");
--    TEST (testOptimizedInterleavePatterns, "basic");
-     TEST (testYca, "basic");
-     TEST (testTiledYa, "basic");
-     TEST (testNativeFormat, "basic");
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
deleted file mode 100644
index 69309c6d2019..000000000000
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/24" # 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 examples static-libs"
-
-RDEPEND="
-	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2016.09.16
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # Tests broken upstream doesn't really care about them, bug #656680
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-fix-cpuid-on-abi_x86_32.patch"
-	"${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
-	"${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
-	"${FILESDIR}/${P}-fix-build-system.patch"
-	"${FILESDIR}/${P}-fix-bashisms.patch"
-	# From Debian
-	"${FILESDIR}/${PN}-2.3.0-tests-32bits.patch"
-	"${FILESDIR}/${PN}-2.3.0-skip-bogus-tests.patch"
-	"${FILESDIR}/${PN}-2.3.0-bigendian.patch"
-	"${FILESDIR}/${PN}-2.3.0-bigendian2.patch"
-	"${FILESDIR}/${PN}-2.3.0-tests-32bits-2.patch"
-)
-
-src_prepare() {
-	default
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-imffuzztest
-		--disable-imfhugetest
-		--enable-threading
-		$(use_enable cpu_flags_x86_avx avx)
-		$(use_enable examples imfexamples)
-		$(use_enable static-libs static)
-	)
-
-	# TODO: check if this still applies on updates!
-	# internal tool dwaLookup fails to run when linked with gold linker
-	tc-ld-disable-gold
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/openexr_ctl/Manifest b/media-libs/openexr_ctl/Manifest
index 049b122be4e3..8ebeaf265d59 100644
--- a/media-libs/openexr_ctl/Manifest
+++ b/media-libs/openexr_ctl/Manifest
@@ -4,5 +4,5 @@ AUX openexr_ctl-1.0.1-gcc44.patch 457 BLAKE2B 574e0a606769c996ec8eeb556165a0327b
 AUX openexr_ctl-1.0.1-namespace.patch 348 BLAKE2B 4bb257667565106034c687efd5d142380c5e1bb662c9d552d8abca29f1e5d0bff96ce1fcbbf6aefc205c7921dd930b21e56a33ac1aef54e5868c8e6a838fde82 SHA512 28f3b0964ccb7ee81dfc4c4600f0747e28d11ada1fe3a3b5beec17c56bdd8d66c37f6d4974272d6a0c54a397445665eda06a81f5ada64cfd96f74c2461cb896f
 AUX openexr_ctl-1.0.1-pkgconfig.patch 632 BLAKE2B 2adfca932aed12a83634c917b5af224e5fceb3e404fc0c4aff3fd4ac225c21813d919d2d2d05902193cd9fb47532c7692deb5eb9b4c04a1641416691ce3973cd SHA512 38c683204ded3aa0c0e5d83506a2eb49cdf33dfa7b44f5dce1502783f18aa154f8f4b5357aa4a07932ccacafb3d8cf32b80ce288cbcf0e75ca917adc2ff5e271
 DIST openexr_ctl-1.0.1.tar.gz 362864 BLAKE2B 4ac3daaeeab91bbf9d8b1e23ade7934d5917b69df4e6b717a1b5a2b27a73b68d6e0fe06eb2b420d7fb5fe3e284c1615a56cc46973eb2de3604c2a321c5456cfb SHA512 831a06dc83ac53ae9b520629dbd24d3a7cd24f3ab5f484de37d1b232dd16fcf71392d163a7b9f9059bb8f30ff249f7f5a9fbc35730211ff98c8e13dcf386898a
-EBUILD openexr_ctl-1.0.1-r2.ebuild 857 BLAKE2B c6ed59e6b4fd9eadb80e01be3af09c47100cc17767d1f1bbe84021e6d9ab6b1db49099b8cdfc1bcabbd5ab6c63554580c13eefafcc3aa4f0168fa2f6601e94e3 SHA512 4276880eb789d9d90b69db9a21d964ac0f2d8d8d2c902953ec31009627378db419c224cad4ec17a0451a92be68c3c3d60dee1af313964f1d5bb36eb9bc5bd462
+EBUILD openexr_ctl-1.0.1-r2.ebuild 857 BLAKE2B fbe17196f0da875927236d27143a27d70e1e40e660e81b124784029f9029607bbb7e6921e8d829d35530c0e246755e93496504014c2da533fd45a4cad6b8e84f SHA512 0af04e0b4f3acb52e6d12cde62916be34c4bf667cfcd958276395ff748c6c2e9270fb56c381761b8923c4888994b834ce6891fa11ea09f0e313213fc2f1e26bf
 MISC metadata.xml 301 BLAKE2B 149874bca2d8b5957909f8749f1b274cec115425510904811eebe3cf19b76b28924a060d86f57f3fb6953c8e8ea55da59dfd8c4d4f83fdc8ee0b7f23f9dbf264 SHA512 6df4d1d337a4c00e4a2415c19a46d07d1a151135fbf29a92de300b077de3ae4fb64277b639448edeb0e64bec87d120f67d829f569cce2368388f3b4478dcd1bf
diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
index bd5b81b23db9..aa79521623c1 100644
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
+++ b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils ltprune
+inherit autotools epatch ltprune
 
 DESCRIPTION="OpenEXR CTL libraries"
 HOMEPAGE="https://sourceforge.net/projects/ampasctl"
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 939b97148981..c44422882b9c 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -7,7 +7,7 @@ DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5af
 EBUILD openimageio-2.2.10.0.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 3691 BLAKE2B 7e640ab4c09cf10203da1e9bf05bbacdfde49d38f0f59210968c1514491d585ec45540215e7c0178bd4a737c007af1312f74aefc46d376079ebb82ea3301c1bf SHA512 c1c838fd9444071a9b9c083ca6c25d6c0e7b9cda6e7344b1d81463102386595fc2eabd91f3537ea57d778ee55cfccb3fe5a1d8c31519947276b9b170413fd3f9
-EBUILD openimageio-2.2.12.0.ebuild 3693 BLAKE2B e0f42d05f77ff242450463ab151072bea1632218e1dcad771ef738f8c08d535a6f3f338c731794c4fe745ebf640f00e994b0a0cac180972ee780da444d5a2e76 SHA512 032289072666f3c2ffdadcceb00d96450e0d4ea6cb66373f24a1293e86be0baa02af1df0f5943f3c0de5035f8972dc964ef13e2cc283b96a01a7d111053192eb
+EBUILD openimageio-2.2.12.0.ebuild 3692 BLAKE2B f15afd2de794e65e70481be2aa28fd0260f054e9ad5c706e8f07d2dadeed417b657b70b15e28c5977b675dcd25fa2c386115bfdcc38b1ccb97275d5f42054d17 SHA512 dbcb6e706de01f0b9b390621cfb1135340d9da50432eb3e4591fce8dad512b84bd79432916f66201f0e7fad92e384103716f907a78de9ae320db39451cd16a75
 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 936 BLAKE2B 0ba7d5d9c77d481d876a273f479cc33f7b4233be522a6722aa4762ff682166eebf93645a5c042591c7495e4954bc0c61fa89083fd2b4ee76a5ccbdb5299dfcba SHA512 732d0ad35c7176710ac7a5362a4a6ac03c01d11d8df016654b13490e84b6d56801714158536abaccafccbc14b55234a78095e8a1d9550419bf0a67fe3d4cab5c
diff --git a/media-libs/openimageio/openimageio-2.2.12.0.ebuild b/media-libs/openimageio/openimageio-2.2.12.0.ebuild
index f963cbd15ac0..1fd923d5c9b5 100644
--- a/media-libs/openimageio/openimageio-2.2.12.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.12.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm ~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/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 54e957dd44e6..cd41ec6ed459 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,5 +1,5 @@
 AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670
 DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
 DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
-EBUILD openjpeg-2.4.0.ebuild 4460 BLAKE2B 71797deef49f3ed4df64f61089de426f0d8b35d874f440e8a24307bc3706469033f39f5ef954a7140f93dfe4b1dd51ca02def0ff4a2ddbd9435c21e6b2466ed6 SHA512 8b972f658d4b3fadf5cabae721e1c2386bb72b19aecb678ec48c406cf6a63b9b78e97bb44148a552f3ca6e8f253f2572458e7aab1d471c7ed718e7824e3cd730
+EBUILD openjpeg-2.4.0.ebuild 4461 BLAKE2B b79a28655f492c4e0762ad50a8c44e1ba96476d8d575df9f14ac1811cb5aeb142aeac4beb1d652a5772c2a15ed6ea58d5ecd80f827e63d578c763208c804d931 SHA512 a6b3397492243f211427ef62ebd01e1632e25a96dcbff9fc01f8dc8050b9e50450c3abd4b050aba8b76ab93b3b424a62c200c0e542716517239819fe35d3e15b
 MISC metadata.xml 363 BLAKE2B 2d62e4b26da75477163ad31097d1e5cd7f287341e2074905928563eda9a3c9fc4d274d75c48949abeb29ea0a4bf5fcd20037b9a9cf3d3372f6760eda9ca11324 SHA512 e446a1f8697819653f6ded68416140c56e6714007a73a897d60b92b8c785ce612096b0f044caa39adfab399a889d1b68856039f768105d0a5afa0835d18d8663
diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index d14c44cab8ae..58bad868b8f3 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/phat/Manifest b/media-libs/phat/Manifest
index ec4b09faae43..bca7765f8981 100644
--- a/media-libs/phat/Manifest
+++ b/media-libs/phat/Manifest
@@ -1,4 +1,4 @@
 AUX phat-0.4.1-underlinking.patch 859 BLAKE2B cd3f794f3dec133d493d295f3986f22bc4ca4c3af8393e5d405e18bd2a2cc22692fa6891bc9c59e9aab55135ba72539407d078815b5eef8765d8c0a2765af4eb SHA512 814cf8d980d61e4729db095c2b440a5811dff626f28963d24fa6e37316fc13716da2d63861f796ba2b8e4d5c2141be2bd919f01d5d6fb4cb4cd445ace9f5d0a6
 DIST phat-0.4.1.tar.gz 550910 BLAKE2B ab95b5ed5c0d9d37ff9e12b733368b3b1c3ad90fecec07ca4ae2a803094b2c1b2b743986e9983a95a5be30b8fe3a0e2080e201e6ce6d9567bc02f1c303031332 SHA512 c2d25d4cf2f291a447229ab3c1c779e5a8872d8b0c88a759b7dee437b8ad355eea6211b7d257af96cd3e719098a0da3cff7ffc916281af29bf55eb9c077ff333
-EBUILD phat-0.4.1-r1.ebuild 760 BLAKE2B 20e447e7ff68187fab020745aeaeb0b712b3646f9305426bae45c004fc81273eee22fccb3a6ebea186b61d6be32cedc16b0e49be62030c33b6e916d034cbb59d SHA512 3c50e1c82eeaee3e9c87aa1b5bd81ed317ab8d06cc2b5b2a3ba3bfc024c2d1db843116ad16933301015c8ff017554f200cc655f42374180790b983990cfbb7de
+EBUILD phat-0.4.1-r1.ebuild 753 BLAKE2B bb011080c9aebd848256c1957682d89e6a9879c6365a64cd0bc8b3ccbc5aa927fe1706d7e867327cd654617001d6fe21fc673ea432ce76fb9cd173ed82c5724a SHA512 f4af423e952313c527f6a31b507e0c1bfcc5fde581b6af014682bde2380bdef2f6570db1df700de855faa3d23505450e444025f95e13adeb0b01bc8841ef5b4a
 MISC metadata.xml 335 BLAKE2B 738611cc2556b28fe188331b8f79cc70d597fe6e0bc1840163690062674b4c97f1e51a7230d4ef0aef7e6355307e853261ee21ffcb7383665a06bd46387a5536 SHA512 ec33ba62442191f9943c431fb9313a4dd94ccc2630e0b37deec07ad945e65de3927e0d8e1d75a438fe9419353ac2cf7f1a4e392f13c1fd087280d9d3e72588b1
diff --git a/media-libs/phat/phat-0.4.1-r1.ebuild b/media-libs/phat/phat-0.4.1-r1.ebuild
index 6b6463391702..3ed4ae455362 100644
--- a/media-libs/phat/phat-0.4.1-r1.ebuild
+++ b/media-libs/phat/phat-0.4.1-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=6
 
-inherit autotools eutils ltprune
+inherit autotools ltprune
 
 DESCRIPTION="PHAT is a collection of GTK+ widgets geared toward pro-audio apps"
 HOMEPAGE="https://sourceforge.net/projects/phat.berlios/"
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 0e675b60d40c..d3e0653cc5ab 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,5 +1,3 @@
-DIST phonon-backend-vlc-0.11.1.tar.xz 65064 BLAKE2B 2380d31f574b71e2552b37e5c2a8b22239268aac9c2875417486fd77496c89820b5b4c7e94d39bfebad62a5175a35767945e3f57830e69041ed7c58be4b978cc SHA512 4a068478eb1467477cf5c21813723779742eb15766aee2df8184da8c0b58598c5eff8aecefdcfed8e6136495f3caf7691c99d43e98226ab477c162ff19e1fa4e
-DIST phonon-backend-vlc-0.11.2.tar.xz 66096 BLAKE2B 342a13377807d97c5da89c5f341e2dcca9fe0ae41ff0408a5789195ec18b5914b3fefe68be519674c412f70690aaf0c27a97e236fbc0317b82fb093baf041d7e SHA512 14ec3ef91aa4ca8275bc92f9cf5bee181ad57b4c2bf696120c8931e34c950d360c58d935f4a9298b2fae6e4ea5fac4b025df697a1bbf270da71a2151f0954949
-EBUILD phonon-vlc-0.11.1.ebuild 718 BLAKE2B bcbf42bd4e10829152e90b2a0a72a9f5c9268b04c32de53c5490ac606ac9796ce4cabde9ea0e62d32c35249d9d534287d5d33764bb53ac4c33b1fbc39f695523 SHA512 2a8d082490d0e2477a6804baf4c38da1a91ae89243107023a4f8b0ac55cd17ad0f22127d69ed0bfb4bf27aec5eac0d86502e1950f7630472d5d8c3f3e486077d
-EBUILD phonon-vlc-0.11.2.ebuild 720 BLAKE2B 7e0e0d1c676069ad19eff86148c2102148c00e59ae10724539108f4679cb922e4b3a4a915cb10997440f97fbea457fa2fd2c44051734a6bf5b3919879be98b39 SHA512 40e3cc913a0cc0c47354ec6081afbae6cc77a12ba9db4128ec564ae0204a411e394a2a3a61111ed74e0fe0cbd94089e79da01eb5403b02d4eb7b34007fb24d38
+DIST phonon-backend-vlc-0.11.3.tar.xz 67196 BLAKE2B 597ead8300bfcd4dd1a94ee1733e77ea15436eea01924093ba6655d08de7b2334cd39c10e61655adcbf12e5ca1afb239c0ee0bd05fefe2e294cc1cb1ef5c7799 SHA512 11593d15874734d92922bcfd8e038a2a4f528d9145d525d6654aad7bb9d7edb911f31f564d83217341dff3be973c8cf00d91f03b66a90305f4f7ed97c2d57033
+EBUILD phonon-vlc-0.11.3.ebuild 717 BLAKE2B 7fa8f381da00c763ebd2d034ecb1ed0c7a1979555adba123be4c26cce0b9d9fedac44aad8cc3e8a5dd57c38817aec659dac700a46951a37020dda5c3f2424535 SHA512 214d511afa39d94ba184634d6030ec971158a87d3e1ce22be6075e2a53e26e0be1437e0edc63e7de16e63a9dcc65cd653368f9f757dd80431a7fabba781cec75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
deleted file mode 100644
index 36e81365b54a..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="phonon-backend-vlc"
-inherit ecm kde.org
-
-DESCRIPTION="VLC backend for the Phonon multimedia library"
-HOMEPAGE="https://community.kde.org/Phonon"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=media-libs/phonon-4.10.60
-	media-video/vlc:=[dbus,ogg,vorbis]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.3.ebuild
index b92df18e6896..053592789a18 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.11.2.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.11.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://community.kde.org/Phonon"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
diff --git a/media-libs/pnglite/Manifest b/media-libs/pnglite/Manifest
index a43dfff46308..7000b83a2b4a 100644
--- a/media-libs/pnglite/Manifest
+++ b/media-libs/pnglite/Manifest
@@ -1,4 +1,4 @@
 AUX pnglite-0.1.17-include-stdio.patch 406 BLAKE2B 20f8f543906bf6c913b22de65c4ae1a1041fee3d674bf1f033b367021bbfbdb2fd5e10b9a9d62b5916791a77a6ad7523acef39d14690a9535af5bd5d6985c5e0 SHA512 96482d08c90ab90985c8694a99bf9ab1967a872fe32b441b3ac930a6af346f173859988132a339ed3e9b4935fbaaabc910276425955d8db20fa4f39b726a345a
 DIST pnglite-0.1.17.zip 6516 BLAKE2B 2c44855a5672bcbf633d600820f87f9f9ad42643bd0906fe62ed7c6da8b282d5c8adca684c828cc6064b1c6c02f3e7aca7a07df6c2317c674ed70ae577dacb1b SHA512 f728273a702287d1c299e2939a2e2da5a6c1fbc55372fe1869d7f93cfe59c016c9dcf02be0242c5fa77cda66b0016bbafe1b78f7a876ba2866c37f504d262ce8
-EBUILD pnglite-0.1.17.ebuild 1070 BLAKE2B 15a122f1a4bd2bcc4613b77437f7f4fe6a0bfa57026b44472034c48776336b07febb254474b102de57bea48d0006ba1b6d01aac5fc40c117c35fb4ffa141beb4 SHA512 65639bff8b3e231424483d90ea7516bf4ff82e56757b615b03640a55876ee87875467dbfa9092aed8bf812c4b73a563f3e6aaf91541d64028fd58830f7a227c6
+EBUILD pnglite-0.1.17.ebuild 1067 BLAKE2B 27b3f3b26054b89292a32ffb08a5e0d75f8c6ec0a160885b8d088543f2d04c087e3f01f554eefc1d2fab98a78ae64a1d506a6e0af4255606223df2ca1e0a61f5 SHA512 7498e04223948d2cfce12b013f6909925117bfa155a6c1348022679857b6b733f3a10b45cc3c3541cee5bbf222c73f800172f83c3971a5b71eee3c06b94178d5
 MISC metadata.xml 244 BLAKE2B 4f1127041c6043b79ad2bbee408e730ce6d03bab4cb6054663888947c262e60aa4105da8feb36cf8b7b8bd5032719f569306388d839b1891668286facbb92930 SHA512 00be6ce5aad771b58b8787411186c9c47dc2aadf68baa77940824a8a7218306c1b771591d2fb49854bb9a1d76263beb5a584f32d0939f07154e6195198042e50
diff --git a/media-libs/pnglite/pnglite-0.1.17.ebuild b/media-libs/pnglite/pnglite-0.1.17.ebuild
index 070934b43a6f..2216647ba3f1 100644
--- a/media-libs/pnglite/pnglite-0.1.17.ebuild
+++ b/media-libs/pnglite/pnglite-0.1.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit epatch flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Small and simple library for loading and writing PNG images"
 HOMEPAGE="https://sourceforge.net/projects/pnglite/"
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 55b81c8b3ef1..222e48947e56 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,7 +1,4 @@
-AUX qhull-2012.1-64bit.patch 1509 BLAKE2B d5f50bfb5229109f13ac88f46eff36d130830339c43265981b00a8e5defaf3229cd50870e379e13a2726312efd8a15e99a2683c3b3a9b1eb9bf1503b7f6b1fbe SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5
 AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654
-DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4
 DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
-EBUILD qhull-2015.2.ebuild 1021 BLAKE2B c123f9b2fbf062da2aedd57bda3610dd13a48d772944082a5f56dcb2b9337ddc9a824587240ee52e237d990182ffa7a1d255534ee7c1e692ddecae5001e8c3c0 SHA512 bb1fae2412eb9359ae384019ab0388b951f0a3cd97ae9e7520a219fe41c417828edc30f2d8fb519b10e994f5ed199eb6d94dee89db65207274302351cb9af8de
-EBUILD qhull-2020.2-r3.ebuild 1494 BLAKE2B 9c5e2a9725f73662bf65582703e287a730a2fa297a4e09a1805b8edcdf0f06e3830f24d31c8e9771c3dbd07672a2103c76e2bc43d5003c8cb5735de5b628c6e2 SHA512 fc8e794675a2c5c513956ef39e60747f996f4f7018f82962e7434f1df45cc29e3a5c243aa5dfa8306110a7aef948a71bd0cb056cbe20e83944ba872ba2ee709a
+EBUILD qhull-2020.2-r3.ebuild 1489 BLAKE2B 2698c5f32d2a75e77e958db40ef85b241dd774880886c00536dd05b1f8f427ead00429d5fc4f10b56357a12444589151413716845ce56871748eb4b4141fc5f2 SHA512 2424ab6c611b9b5966ccdeeb01fd3aa87a544efa4e200768bffee3c3b11c96832aba8ce4f20edb38e3d8e27c45f8ed14547ec559038439eedb44cedc732479a4
 MISC metadata.xml 1094 BLAKE2B 9667f9f89fc9717129401070888401f0db493c01e4fe73eb8168efae9c1c2d7f1a7aa234fe72f3beea7feb385dc920418a6affe4d99679736cc6a1aef212e4eb SHA512 b1e13904fe69b4535806a871cdda79fadbf294c30654fe119e7e3be0ed481dc926a9dfaffd75c2849e3eb91ebad671a6b7eca293b40a249c8ccbee6264cfdaf9
diff --git a/media-libs/qhull/files/qhull-2012.1-64bit.patch b/media-libs/qhull/files/qhull-2012.1-64bit.patch
deleted file mode 100644
index 4c909c28c8f2..000000000000
--- a/media-libs/qhull/files/qhull-2012.1-64bit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- src/libqhull/io.c   | 4 ++--
- src/libqhull/stat.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libqhull/io.c b/src/libqhull/io.c
-index 09a0079..7ad4b35 100644
---- a/src/libqhull/io.c
-+++ b/src/libqhull/io.c
-@@ -68,8 +68,8 @@ void qh_produce_output2(void) {
-     qh_memstatistics(qh ferr);
-     d_1= sizeof(setT) + (qh hull_dim - 1) * SETelemsize;
-     qh_fprintf(qh ferr, 8040, "\
--    size in bytes: merge %d ridge %d vertex %d facet %d\n\
--         normal %d ridge vertices %d facet vertices or neighbors %d\n",
-+    size in bytes: merge %zd ridge %zd vertex %zd facet %zd\n\
-+         normal %d ridge vertices %d facet vertices or neighbors %zd\n",
-             (int)sizeof(mergeT), (int)sizeof(ridgeT),
-             (int)sizeof(vertexT), (int)sizeof(facetT),
-             qh normal_size, d_1, d_1 + SETelemsize);
-diff --git a/src/libqhull/stat.c b/src/libqhull/stat.c
-index 7dc60b9..5721130 100644
---- a/src/libqhull/stat.c
-+++ b/src/libqhull/stat.c
-@@ -472,7 +472,7 @@ void qh_initstatistics(void) {
-   qh_allstatI();
-   if (qhstat next > (int)sizeof(qhstat id)) {
-     qh_fprintf(qhmem.ferr, 6184, "qhull error (qh_initstatistics): increase size of qhstat.id[].\n\
--      qhstat.next %d should be <= sizeof(qhstat id) %d\n", qhstat next, (int)sizeof(qhstat id));
-+      qhstat.next %d should be <= sizeof(qhstat id) %zd\n", qhstat next, (int)sizeof(qhstat id));
- #if 0 /* for locating error, Znumridges should be duplicated */
-     for(i=0; i < ZEND; i++) {
-       int j;
diff --git a/media-libs/qhull/qhull-2015.2.ebuild b/media-libs/qhull/qhull-2015.2.ebuild
deleted file mode 100644
index 667e3483d460..000000000000
--- a/media-libs/qhull/qhull-2015.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Geometry library"
-HOMEPAGE="http://www.qhull.org"
-SRC_URI="http://www.qhull.org/download/${PN}-2015-src-7.2.0.tgz -> ${P}.tar.gz"
-
-SLOT="0/7"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc static-libs"
-
-DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2012.1-64bit.patch
-	)
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	mycmakeargs+=(
-		-DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${P}/html
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# compatibility with previous installs
-	dosym libqhull /usr/include/qhull
-	if ! use doc; then
-		rm -rf "${ED}"/usr/share/doc/${P}/html || die
-	fi
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/lib*.a || die
-	fi
-}
diff --git a/media-libs/qhull/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
index 59f96d53709c..839985c989cb 100644
--- a/media-libs/qhull/qhull-2020.2-r3.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0/8"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index 0660d116951a..593e77318f3c 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -5,5 +5,5 @@ AUX qtav-1.12.0-qt5.14.patch 443 BLAKE2B 80f2e2da6ef67cdd300257aba988dcdcb0a6a52
 AUX qtav-1.12.0-qt5.15.patch 650 BLAKE2B cf5d5d5b4a30a1eb32ee38cd3f87c9df3a813eca19d342ba720521da8cc2c32eaabeb8a93bd56a25e456ef8fa9523bbbc4c832dbf22fd3831324bc96523a084e SHA512 156d6feb8bf0d9a3660f0341ceb3d2728d7b044ef4e3a9c7f81adbc262e3d30c4e8769a6059ef90601006d17f50f2259dcc533f223d0bcdc7467376b11f10899
 DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
 DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
-EBUILD qtav-1.12.0-r3.ebuild 1553 BLAKE2B b2ffa156e4387ca3c57a4442ff91a769d04a246f51176a5cf89af7cb199ae3030f8a598597ab02abd7203567de04a8572b4c1ea4f85e9cef3329e5dedaa92e3a SHA512 18167e0168e9a09aac1ed17deddd396ed5b084cce3a055f32b6e6432102b29f3ad52db3753e97035080b1189c5eb2036de9306bea249d9227cf789f9112de43b
+EBUILD qtav-1.12.0-r3.ebuild 1560 BLAKE2B 855361a6efc04b0819ad199fa7e1bc7d1a343eefeb4e6609c97e6a72944dc341bdf5047094f05f8c7034cc858fabb5bd58ea947a38cbfed942a879097bb78103 SHA512 722a498d686f1ef798259cb0b6f00484823f05bca80ef39d4449355a486c9a95a5031018df44896f01dfb45c7b5a3d446909550b93e5432fe921f746d64fb8f2
 MISC metadata.xml 389 BLAKE2B 6f4c10122acf9e5b30236f531b433ffc9cc46f9ddd6e6322bb5e17c70f60ba6ad0966eb93af1946a1df67e03cde1921ef24bad93fc115d5af84be848cbb04585 SHA512 145488dd0015ae2b014509610c33cf28e4e46e966bd37073d1199230297e66df520f3ac0afedd63c8eac20a7aa02ee492e5ad0658aa3b6fd660bd685b984161c
diff --git a/media-libs/qtav/qtav-1.12.0-r3.ebuild b/media-libs/qtav/qtav-1.12.0-r3.ebuild
index 2635466a5bf3..38c5d150a590 100644
--- a/media-libs/qtav/qtav-1.12.0-r3.ebuild
+++ b/media-libs/qtav/qtav-1.12.0-r3.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 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz"
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="gui portaudio pulseaudio vaapi"
 
 DEPEND="
diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
index ff99f4fed017..88b545d75e21 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
+EBUILD quarter-1.1.0.ebuild 1363 BLAKE2B dd6327391b0a12c2987f83b71a66d0e90484d89b5083eab58f79921e2e2a6332613fabdd139062d8bf675e3685c96ff20231a0bc535c386073b907ac2db3c11d SHA512 ea0579d3912689f1a36aca4bf832a2bd69c7446d4271d54e6e59a0acc75bcb0bca7aa4a28c68d3dea8016211ac54e3844cda0e19742da1e46c2571414367ff5f
 MISC metadata.xml 849 BLAKE2B 8f7116c681789a3afbfa5b009386743fd57426f797f6302b83e720cc72b3bc0b4899987325a539f77e5e4b41faeab7004dc0cd0a1b5eb86a1d8c03241e2fab89 SHA512 5ae7391e55fa9875827031d983ed55a9480d28a5612cdda8c4a7991b35551a69d97a05f16681fb0e478cb41755712d6cb0c51f56231f21d42eb40a85a6193c53
diff --git a/media-libs/quarter/quarter-1.1.0.ebuild b/media-libs/quarter/quarter-1.1.0.ebuild
index 71fc4f42430f..6567e2ff9627 100644
--- a/media-libs/quarter/quarter-1.1.0.ebuild
+++ b/media-libs/quarter/quarter-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=7
@@ -12,7 +12,7 @@ DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
 SRC_URI="https://github.com/coin3d/quarter/releases/download/${MY_P}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="debug designer doc man qthelp"
 
diff --git a/media-libs/quesoglc/Manifest b/media-libs/quesoglc/Manifest
index 9ead83a8331d..81b9e8da9ec8 100644
--- a/media-libs/quesoglc/Manifest
+++ b/media-libs/quesoglc/Manifest
@@ -1,3 +1,3 @@
 DIST quesoglc-0.7.2-free.tar.bz2 657394 BLAKE2B 73798b80fea5be9a66aa7c0090ec0564d517417a8597d102d057fcd91bc4c6d0c48352470b02182705d135cb04434178b206a964d539283cc4ac69d2f1dc5cb9 SHA512 107cc28fe85722614bc6c222a64914eeef0de1c5dfa01cef9ec611e5caff54fdbcf2b387d413c0b56533d33e06741ca8dee99fc0c5ee1e63d9a95d86c6c69190
-EBUILD quesoglc-0.7.2.ebuild 1072 BLAKE2B 7048ffd177b5e381bdd35fde1e8391f238be6f425b8e24968fbf5481cdc90e5cc835f1feabea5be297b653a8e096c36705f1faaee1b0ccdedeca569491ec3470 SHA512 ab872a5e0111a0790c06dae3c329f279e0fc51168b83a40326f850b614cd4da99287c637163e494a594a2a9a57f09f68c0a21c188a9c6dc8e2e8ff9b9afd9e80
+EBUILD quesoglc-0.7.2.ebuild 1065 BLAKE2B 1f8ee6d32820bc68d31d3a05567fe673058fe63fb344f14e8883657a92337ba0f19fa10e9b74e437fa562c59b69c1eba2f70cc0f7779dc05c8531fc29aeaceb7 SHA512 45dbf16a62132419c41b6a9bff808b391957541c5137a54fcc00efe088f0b1559086ffe37050d09a1ecbab11f3042637aa81269bee6003cf430720ccefe3b906
 MISC metadata.xml 331 BLAKE2B ceaba043139669fa90e55b48c5b21bd1dcc7bcec0eb8fc8bd5d3ff4ed16a3c7bc29c63dfb12b5eb7b9041e918da1b79f9cfe34b27554f9ba83efae51d6c704a3 SHA512 ca843d6a3a6abbe8148dfd89cdda0a8b1335343f77b2f12fc6ac3760bbfa893c30db593ca6730674784fe60b3c1d31addfbafc6561ed415035880b09ca5df52b
diff --git a/media-libs/quesoglc/quesoglc-0.7.2.ebuild b/media-libs/quesoglc/quesoglc-0.7.2.ebuild
index 5acb761b30bb..e552499f88e4 100644
--- a/media-libs/quesoglc/quesoglc-0.7.2.ebuild
+++ b/media-libs/quesoglc/quesoglc-0.7.2.ebuild
@@ -1,8 +1,8 @@
-# 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
+inherit ltprune
 
 DESCRIPTION="A free implementation of the OpenGL Character Renderer (GLC)"
 HOMEPAGE="http://quesoglc.sourceforge.net/"
diff --git a/media-libs/raspberrypi-userland-bin/Manifest b/media-libs/raspberrypi-userland-bin/Manifest
index 8e7d9d98f837..0c12415f1276 100644
--- a/media-libs/raspberrypi-userland-bin/Manifest
+++ b/media-libs/raspberrypi-userland-bin/Manifest
@@ -1,4 +1,4 @@
 AUX 04raspberrypi-userland-bin 21 BLAKE2B c494bde8627a6068bf924d722cbc7ccb48e4d49cf9b875f0420e621018b61d83fc27de0017586f21cb839414e4aa49118bf3e2ab90e049e47a7a9e15658d2f87 SHA512 15fc252a183d45f0d80cc27edc93c40a7b577abed3e2f664c8bf635178e73875245835e770b82fda0e983c7c5878975ffe3008a937fbb7656fc01860c2219854
 DIST raspberrypi-firmware-1.20201201.tar.gz 189332299 BLAKE2B b3ec91f07b4713d26c29be5412d018a220129eef7ddf7c5c09d85e645c2c5754a95f13be7e690ab40648a982e3974cc760aa5b33c76612da836227d38c4ee3a5 SHA512 a7f4591552718956bd7f2d0d377234277e2e6f18cc9714ea30fe13f26d5ae1164b982f39dcf72ae4a18663369ef06d0187d8182713763262371c13107aac4c65
-EBUILD raspberrypi-userland-bin-1.20201201.ebuild 863 BLAKE2B 7fb57c01334ee9c3bb4113d486f8908c7413869534a28679ea95f0efac71f68df6e007a81c59862c936fe9a4b159ed2a5a59dc11035d7379ddbc4e9282042038 SHA512 66d2074fbc5bf58d3b2ff0016c55ac3c19f84ae2ea87bd19bff5db38c4acffadc6746a8d57878bcd161ae688d66395a9a08c6bfab75d45d9130bcb9cccac102a
+EBUILD raspberrypi-userland-bin-1.20201201.ebuild 843 BLAKE2B e0a48b943906238d467033ca6943e79d1cd0d7f6ef4ac14377170e3a0327863f0050f8cfe579b4d037b0ccef4433975bb6b9015b47b0383b7558cdafd56fecdf SHA512 267038445aa58b0e6dffcef57592573183a04240ccca2af248b474c6cb8e4edb2aa0b7015953b59238be1e52d39548a44dc9c1db1a6db78d2a951695531ad0b9
 MISC metadata.xml 389 BLAKE2B d3577d29c94a74d9cc3cbf749fe2cdc46e37ffc5aeed828e280e04fec248f71a1dcbea5aee4c1e178c9699771c88bbb03228aba956069be5f07818d21ea65a67 SHA512 83074595bc89f763ca63b370aeaf44ca973ddfe6cd411de09dc89bc90f986078a7e2af98354f5ed7442a2b526d41851e8312d6b70e131d13377a69daf32e4f54
diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild
index ca662960c5dc..cdba7d110e39 100644
--- a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild
+++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="-* arm"
 IUSE="+hardfp examples"
 
 RDEPEND="!media-libs/raspberrypi-userland"
-DEPEND="${DEPEND}"
+
 RESTRICT="binchecks strip"
 
 src_install() {
@@ -28,7 +28,7 @@ src_install() {
 	dobin bin/*
 
 	insopts -m 0755
-	insinto "/opt/vc/lib"
+	insinto /opt/vc/lib
 	doins -r lib/*
 
 	doenvd "${FILESDIR}"/04${PN}
diff --git a/media-libs/resid/Manifest b/media-libs/resid/Manifest
index fcde318150ba..f2de6ce0e303 100644
--- a/media-libs/resid/Manifest
+++ b/media-libs/resid/Manifest
@@ -1,3 +1,4 @@
+AUX resid-0.16_p2-drop-CXXFLAGS-override.patch 735 BLAKE2B d2e742d785752ce5cbca248b33ae50780b4623f6aae8757e9de548b323b38bb2ee8c56a4624ba65bb2ade61a0933ee9a42fc66baa600b995827e55492d84499d SHA512 a4ad17fc1aaa0e9b07103eafc18be9ccce7f13cb6fc21cb0e74e512382db7ce603ea29696d2f5328c7e3f67818626314c4275e58167052b913508bab89d4dd9d
 DIST resid-0.16-p2.tgz 329919 BLAKE2B 00f93b13351ec6387579755ad2b6b44394d6a1d2f2c0a6077e581db01628e84c07e6707b7c8b580492989adc8b5a5f89de670792b38bf2d8037b4abb22f88c2d SHA512 f7e86e97ea6d17c3e75b7763974b1182b49b2498c5fd3c1b0665c026ea6473cda3f9fc70bc123ac1357034879e3caaf41279d2253a8122246dc7e1c70c063d09
-EBUILD resid-0.16_p2-r1.ebuild 917 BLAKE2B 9af50cb66a8a88d84f1951fe5cdc300e902b9224ae80b9ac15fcc87a166d09528d87c5c1b8cc517d25ef0f8ed6499f3cae582cc47f2fbc3960d3717ef49420f4 SHA512 991451f9108b1e7edd8d8ed70dc17e888e88de3d6c8d953567ae2e2cd66a085c3ed6bb7e3b051ad1918791168cd0b8c65c948dec03d8c591e313af696dc8891a
+EBUILD resid-0.16_p2-r1.ebuild 917 BLAKE2B 13a21768a1b2a2abaaac7547c7c821dcc873b623f65846aa4af0b956b31fa8a9cb0fc1f3bec9da474a443093646637824551e470ee50da367dd5179867e933b0 SHA512 172f88d9b8e8839041d780e0201a89f4b43b7b596ce76d706dc4100accfe687836c581d832a854afb0175656e6a73b90c6e2e5bd9a08a5fe171ab96b68986c87
 MISC metadata.xml 331 BLAKE2B 41bbcd40272e97e1e0b10fd8e9471db6bfa393ac15eead124bd6e5885b1a35d746bd5be4ced94ed97d31ea130ed17aee55f81b6582e1895813661e3cf07e55b6 SHA512 83c0e6c0f4c7a85a10c96db7cb2eadffab0ef5e4614b0a091a4e14bb9a37b90d0d509bec47bf75d03853ab39a06ca12bcb5cd89f89e09901340a76c7b5c392e8
diff --git a/media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch b/media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch
new file mode 100644
index 000000000000..f116c1d6f8b9
--- /dev/null
+++ b/media-libs/resid/files/resid-0.16_p2-drop-CXXFLAGS-override.patch
@@ -0,0 +1,24 @@
+--- a/configure.in
++++ b/configure.in
+@@ -26,20 +26,6 @@ AC_SUBST(RESID_INLINE)
+ dnl Checks for programs.
+ AC_PROG_CXX
+ 
+-dnl Set CXXFLAGS for g++. Use -fno-exceptions if supported.
+-if test "$GXX" = yes; then
+-  if test "$ac_test_CXXFLAGS" != set; then
+-    CXXFLAGS="-g -Wall -O2 -funroll-loops -fomit-frame-pointer -fno-exceptions"
+-    AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+-    AC_TRY_COMPILE([],
+-                   [int test;],
+-                   [ AC_MSG_RESULT(yes) ],
+-                   [ AC_MSG_RESULT(no)
+-                     CXXFLAGS="-g -Wall -O2 -funroll-loops -fomit-frame-pointer"
+-                     ])
+-  fi
+-fi
+-
+ AC_PATH_PROG(PERL, perl)
+ 
+ dnl Checks for libraries.
+-- 
diff --git a/media-libs/resid/resid-0.16_p2-r1.ebuild b/media-libs/resid/resid-0.16_p2-r1.ebuild
index 339518007976..6959ad0f820c 100644
--- a/media-libs/resid/resid-0.16_p2-r1.ebuild
+++ b/media-libs/resid/resid-0.16_p2-r1.ebuild
@@ -1,39 +1,38 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils ltprune multilib-minimal versionator
+EAPI=7
 
-MY_MAJ=$(get_version_component_range 1-2)
+inherit autotools multilib-minimal
+
+MY_MAJ=$(ver_cut 1-2)
 
 DESCRIPTION="C++ library to emulate the C64 SID chip"
 HOMEPAGE="http://sidplay2.sourceforge.net"
 SRC_URI="mirror://sourceforge/sidplay2/${P/_p/-p}.tgz"
+S="${WORKDIR}"/${PN}-${MY_MAJ}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="static-libs"
-
-S=${WORKDIR}/${PN}-${MY_MAJ}
 
-DOCS=(
-	AUTHORS ChangeLog NEWS README THANKS TODO VC_CC_SUPPORT.txt
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.16_p2-drop-CXXFLAGS-override.patch
 )
 
 src_prepare() {
 	default
 
+	mv configure.{in,ac} || die
+
 	# This is required, otherwise the shared libraries get installed as
 	# libresid.0.0.0 instead of libresid.so.0.0.0.
 	eautoreconf
-
-	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
 		--enable-resid-install \
 		--enable-shared
 }
@@ -41,5 +40,7 @@ multilib_src_configure() {
 multilib_src_install() {
 	default
 
-	prune_libtool_files
+	dodoc "${S}"/VC_CC_SUPPORT.txt
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index e90e81284a02..8e69137f1036 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,7 +1,4 @@
-AUX rubberband-1.9.0-makefile.patch 339 BLAKE2B 93a60dde06e197578f8279b60551541bf69ac756fef348128bfbd3289ece20c98ccaebed6856cf7697588440c61bcfa6ac65b6480648cf63aed9f21ac642f270 SHA512 3921eb71daee708ace0c4f28075ac67a2b10af71ddeb85edea1cde0c2e0721d09ca590ce90255f49be0f284cc43a0cfda9b4805c82a09baeb4303cadb06ad3c3
 AUX rubberband-1.9.1-build.patch 6538 BLAKE2B 9387ebba5a8a06f6ea11dfa16c9b37fb2bc607a4982a6b77ad62e59fce597e7d4c358c0795c471a5e8b74cb553da31239cff50b2ac367e702e04262a66c462a0 SHA512 64677e108c17e35739a2e86a473c08b3d1e575daee14db124bec013e348120538e29e9a6829f7ec905998f7ba8f4386e8aea8591642bf45cf3be0f6e657b828f
-DIST rubberband-1.9.0.tar.bz2 192240 BLAKE2B dd97f80e01b05883645bf7c78730f8a3f873a60379cc209887591a28d0b6292e083c2f522db35ef9435c0a446eaa9b5acab8b5e2c9703514019491a939a804c9 SHA512 2226cfec98f280a12f874f60620c3bf09f7399a7808af5e9f5c9a5154b989cfbf3c4220e162d722e319a4ef046f81c6a07eac2b8c6035c8f6230f0a20b1577a8
 DIST rubberband-1.9.1.tar.bz2 164644 BLAKE2B 1bbbd0056b2131ac16bf427db93e19bdd6adb5433733e62523f4a04c8a74d1a48e82dbace09e7ffe6dddfeec699e3aeee8e84344c9e7cbe75067316dde6268d6 SHA512 cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3
-EBUILD rubberband-1.9.0.ebuild 1790 BLAKE2B 24e0049a4d43e50ee0a6f7daa723649ee0eca5950d077a8346ebb52dfd9e27c32683c72bad74f052c599fcf7ee9719ad98dac584cd7288a84e97fe0871718cab SHA512 71a2a8c41387c86f250e5a69031c2a5c267daf24f5eb4b4b7f5e3d72014f5000ba5ee9620e249563b593bdef7509683693f9a52fcaef622894e094211e8e0e8f
-EBUILD rubberband-1.9.1-r1.ebuild 1442 BLAKE2B 42a5dcdd0c26fbebb29ff58cc1f5e0cc1e68e7d430da0c674b69fb55745cb9629d27c1113dd88c7e3b1333a6f0a455cf911485b56a1dd72c22084a7f516ab063 SHA512 2a38d074ead0493c2de9a6268c67c3865e0520fe872ebe2d728c40cea333b309b226ea582fe69fe09b987717043eb535ca40b1612d16b30629802bc1717aad6b
+EBUILD rubberband-1.9.1-r1.ebuild 1444 BLAKE2B 19ae91edaa90e5b586d5d21b03f7c86667790a152542e19fe8d95c8fd5ecb662718b46a41d4292db1b4ae156c6fc91fb9b8e04994b8cd585989447ac5b8c5fa9 SHA512 0b85d47949f7fa42e4f301faf9ae022e10cf1fa3b994dc1a390baf85bf7f682cb40366e09df773349d457cbf4f4951bfd8f685f8e34bfe9bb86e6ce28217a306
 MISC metadata.xml 490 BLAKE2B 849555ada519e1a558d37977b952b8338d4d19ac3a7e8523a15cc3924b7b7b5faca70df7782597e322c362af7d05b1a35dae64b8cd8f2a998cc5d074ee81f090 SHA512 a1e8673326887e5582aa7a948543341d3061a149e0232a01ef8aa3b6778a499393aae434d5f1c2181910aa309a3cd2f0d80820922dfe668745f75314e0526e31
diff --git a/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch b/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch
deleted file mode 100644
index 5539162dec29..000000000000
--- a/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index fdddb72..86c0548 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -19,7 +19,7 @@ VAMP_PLUGIN_LIBS	:= @Vamp_LIBS@ $(LIBRARY_LIBS)
- LADSPA_PLUGIN_LIBS	:= $(LIBRARY_LIBS)
- 
- MKDIR			:= mkdir
--AR			:= ar
-+AR			?= ar
- 
- INSTALL_BINDIR		:= $(PREFIX)/bin
- INSTALL_INCDIR		:= $(PREFIX)/include/rubberband
diff --git a/media-libs/rubberband/rubberband-1.9.0.ebuild b/media-libs/rubberband/rubberband-1.9.0.ebuild
deleted file mode 100644
index 3a6cfca0a2c9..000000000000
--- a/media-libs/rubberband/rubberband-1.9.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="https://www.breakfastquay.com/rubberband/"
-SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="ladspa static-libs +programs vamp"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="
-	media-libs/libsamplerate[${MULTILIB_USEDEP}]
-	media-libs/libsndfile
-	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
-	ladspa? ( media-libs/ladspa-sdk )
-	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-)
-
-src_prepare() {
-	default
-	if ! use static-libs ; then
-		sed -e '/^all:/s/$(STATIC_TARGET)//' \
-			-e '/^\tcp $(STATIC_TARGET)/d' \
-			-i Makefile.in || die
-	fi
-
-	sed -e '/cp -f.*JNI_TARGET/d' -i Makefile.in || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable programs ) \
-		$(use_enable ladspa ) \
-		$(use_enable vamp )
-}
-
-multilib_src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-multilib_src_install() {
-	# fix libdir in .pc file
-	sed -iE "s%/lib$%/$(get_libdir)%g" "${BUILD_DIR}/rubberband.pc.in" || die "Failed to fix .pc file"
-
-	emake INSTALL_BINDIR="${ED}/usr/bin" \
-		INSTALL_INCDIR="${ED}/usr/include/rubberband" \
-		INSTALL_LIBDIR="${ED}/usr/$(get_libdir)" \
-		INSTALL_VAMPDIR="${ED}/usr/$(get_libdir)/vamp" \
-		INSTALL_LADSPADIR="${ED}/usr/$(get_libdir)/ladspa" \
-		INSTALL_LRDFDIR="${ED}/usr/share/ladspa/rdf" \
-		INSTALL_PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-		install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild b/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
index 211b36068f7f..ab6b7eac6dc4 100644
--- a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
+++ b/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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="ladspa jni static-libs +programs vamp"
 
 BDEPEND="
@@ -20,7 +20,7 @@ BDEPEND="
 CDEPEND="
 	media-libs/libsamplerate[${MULTILIB_USEDEP}]
 	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
-	jni? ( virtual/jdk:* )
+	jni? ( >=virtual/jdk-1.8:* )
 	ladspa? ( media-libs/ladspa-sdk )
 	programs? ( media-libs/libsndfile )
 	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
@@ -58,6 +58,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	! use jni && find ${ED} -name "*.a" -delete
+	! use jni && find "${ED}" -name "*.a" -delete
 	einstalldocs
 }
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index 4002581edeab..04f588679db5 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,4 +1,4 @@
 AUX sbc-1.5-ifdef-builtin.patch 871 BLAKE2B a63b5d5ce0e00723d8492a83e403d926eb16091b8eaf9c426cc24444a041949a6747fe134020261131f0681448111d2558b85391308157c828a96ea1b046c7d1 SHA512 bc1116ff941c88418e79bb35e1f08828d637e4d2d3192c1e808b1d5adc02e1942f968f49805365cb7a34817f119e24d8d9c3baf2133c77b91ba79a3e4446d249
 DIST sbc-1.5.tar.xz 264472 BLAKE2B 421a4cb5ab0e282255f8bdb810384e0a4d6d66835869489c22d51d2a0cabd7ef834bef3756ff887b9d9166dcfe88f4d661c26cb804e2868fb6106cc4886f9dcc SHA512 0243586188acede595317f2afbfdb41be5850d2a6133c374edbe5cbcf59a2a0fd4570d0b8f2d13ce9637ce48b2f1910c3e4ab1c0354dbf273ee67b09db8c4915
-EBUILD sbc-1.5.ebuild 889 BLAKE2B 0f0e9b336e7aa1bc61140522395576ea7d152de959dff049e7c7e64e4a9924131c7bea430396bb1836084c2ecaca37888915cee818daf3378669e56e750d6e59 SHA512 dc406c812aa1a50cc4100e349fbd4b151311bf6641a089dd3781c4c4cf8b886f77ac01ded449c1c52b66cb9250e34abe9dfb125786d95be5ae599483d4aa5304
+EBUILD sbc-1.5.ebuild 880 BLAKE2B 88f979a6e82fac8511f97e573c6e94f2f2e7d247383c28be336cc74c297ebe94acd4f7ce4ad16338a7d208544435dc3e9d6004c74e199d9189c3bb59b45b0a0a SHA512 c50098b887056add2ae3dbf3ebf7b68ba3e0802027fe90ac60a93676add25954269c271742eaf6f997bf24ffabcb7e0fbb3d713355b9d6dec11cb166a5dfdcd1
 MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
diff --git a/media-libs/sbc/sbc-1.5.ebuild b/media-libs/sbc/sbc-1.5.ebuild
index 61e8809d6939..5a84ef013944 100644
--- a/media-libs/sbc/sbc-1.5.ebuild
+++ b/media-libs/sbc/sbc-1.5.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit multilib-minimal
 
 DESCRIPTION="Audio codec to connect bluetooth HQ audio devices as headphones or loudspeakers"
@@ -17,8 +18,7 @@ IUSE="static-libs"
 # .wav file to execute it
 RESTRICT="test"
 
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${P}-ifdef-builtin.patch" )
 
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index 28ad40ad59f8..a5bc2d0151bc 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,4 +1,3 @@
 DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01
-EBUILD sdl-gfx-2.0.26-r1.ebuild 1194 BLAKE2B 89d995b1dc114637f04adf91dcc4d788f2e2748fc69cde248ec804e94c464ccac73b3c0dec8e2640ab08bb55152690e2f190f6655085e2abd658a6a02e7b932f SHA512 fa55cc2565ddadd22b0561f1ab683fe9fa435e7014ce67a0d8235da26d2eb7015c99fbd3d09519c67935e8d762252f346c2d64339aba5242a0056b5098c61963
-EBUILD sdl-gfx-2.0.26.ebuild 1167 BLAKE2B fd021b412999dac8556766918270164ff961c7e3b249c12a0b3cf36be6c3cdf654a893ed12697158d658f3c3c158037fbdc89a129586d08d69ffebb95b57f934 SHA512 91ab8a68fafbad85b960cf1c7fc137bdad2834134d4e04aa30b5c447d7e1e596eaa38ed64920078817fc09b455ad43e63451824bcf98b069bbe6a5d9842db7b6
+EBUILD sdl-gfx-2.0.26-r1.ebuild 1163 BLAKE2B 33d41a7543c6d7d08399c27bcdb71b782b3760233b7238f00960945b011ed080fac8766d8591527c0d76cc1d9393b4d6849d6fd3d0a1c9623194580ec74f484f SHA512 c0d56a2fec8dc8628c9f1087dcb640b7279623b8fb6451a26d6ee55d580c68807d0cf4dbe217b99e90fa3aff2778925532dfa57e000fafb86dfa37cf45560e4e
 MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
index 69cfd9504e43..d836fe55697f 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
@@ -2,25 +2,25 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="Graphics drawing primitives library for SDL"
 HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
 SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0/16" # libSDL_gfx.so.16
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc cpu_flags_x86_mmx static-libs"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc cpu_flags_x86_mmx"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog README )
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	default
 	sed -i -e 's/-O //' configure.in || die
@@ -31,7 +31,7 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 #multilib_src_install() {
@@ -40,9 +40,11 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
+
 	if use doc ; then
 		docinto html
 		dodoc -r Docs/*
 	fi
+
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
deleted file mode 100644
index 373fb1ac374f..000000000000
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-DESCRIPTION="Graphics drawing primitives library for SDL"
-HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
-SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc cpu_flags_x86_mmx static-libs"
-
-RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i -e 's/-O //' configure.in || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable static-libs static)
-}
-
-#multilib_src_install() {
-#	emake DESTDIR="${D}" install
-#}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use doc ; then
-		docinto html
-		dodoc -r Docs/*
-	fi
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index da68eaf8ad2d..46ed8cc29f71 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,5 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
-EBUILD sdl-image-1.2.12-r2.ebuild 1545 BLAKE2B 477a011823f1a1d58bf6e5a6dd02df27bf1b21f5062984d4d200960412209efda27e3ca1cc172d5ae70e3ecc73b8e19c37229e1177d85436dd77d377e8e5b8d1 SHA512 ce89a0f8e90958c616123197acdb0cef937ae4679a6212c9607efac0aa4779ae8154037aea8c25f10fedf09e06125f1c87452b564bc63270d77e61cd6ca75019
+DIST SDL_image-1.2.12_p20210314.tar.gz 10890897 BLAKE2B ddc3e0a49e4ce8fc3c46c5dabe277f9bd2db81f43880aadc8fbd3b6fa09254669fdac90ee4c3c7b92d5c7ec97747944c3953ea2dca065e646416391730cb22dd SHA512 f087472593cbaa9e65c5d643d7801e2ff5e49bee66502d8c094ea18bcd5f66e6da153d39bff7bc81ed20556c909fc4cce279275ff55ee00aebf07d39c27fd543
+EBUILD sdl-image-1.2.12-r2.ebuild 1538 BLAKE2B ae23e1cf3fab15f0cc216ba1cbf99c9189ace20defcdc87c46af5ffa3bb91eaf6295304121cb3d13d144443006f4ccf5bce05662f5cad25c0e9f03b998517425 SHA512 ee2b0b91d4393e660e13815b08113c683e79756f7f9e832b09cd726cd61e78c7d8bd231b4d88440135be2190e0d3d1006749b13df7c2b926f3322d8762c0f701
+EBUILD sdl-image-1.2.12_p20210314.ebuild 1621 BLAKE2B 93413685315a243d8f217257d2fa807286c102c33e266c6efde925048326934a2cd931f478d8ae464eab6288a1a14bde99e7e7d7db0181d9637c7d45ebc1592a SHA512 b8414c846bf7b98c98aa1a4060436122fc46c810b10513a862389d1a06edd27cdedde6e101881f88ff8cd1e207e6372d6dc4d94c773930c6c1d2ed2f008fdc99
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
index a6ac4ca4c190..014efeb9eef9 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils ltprune multilib-minimal
+inherit ltprune multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="image file loading library"
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
new file mode 100644
index 000000000000..c0ad65d10de5
--- /dev/null
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+MY_P="${P/sdl-/SDL_}"
+MY_COMMIT="5d792dde2f764daf15dc48521774a3354330db69"
+DESCRIPTION="Image file loading library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_image/release-1.2.html"
+SRC_URI="https://github.com/libsdl-org/SDL_image/archive/${MY_COMMIT}.tar.gz -> ${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="gif jpeg png static-libs tiff webp"
+
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+	png? ( media-libs/libpng:0[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/SDL_image-${MY_COMMIT}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-jpg-shared \
+		--disable-png-shared \
+		--disable-tif-shared \
+		--disable-webp-shared \
+		$(use_enable static-libs static) \
+		$(use_enable gif) \
+		$(use_enable jpeg jpg) \
+		$(use_enable tiff tif) \
+		$(use_enable png) \
+		$(use_enable webp) \
+		--enable-bmp \
+		--enable-lbm \
+		--enable-pcx \
+		--enable-pnm \
+		--enable-tga \
+		--enable-xcf \
+		--enable-xpm \
+		--enable-xv
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	dobin .libs/showimage
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	use static-libs || find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 85d7bdeec00f..56e4e7d77a0a 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -2,7 +2,8 @@ AUX sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch 553 BLAKE2B
 AUX sdl-mixer-1.2.12-clang.patch 276 BLAKE2B 242e261861bab476d7f83148fc265daee990965cad8c3247dcf7e9e28e6b3aa9b2f491ac51c3517e3db4ab043ac8f8a118ca18c170f826f200df757de303e8db SHA512 2f318a73991783c75b32d05c9f81a42a7fd145a9d78e1cef00d1f2184f7c498e4c0a5a578bd2866315a940af76d4296de660ee94488530815694b7524d1d452e
 AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff4397cd3fd284f2f39102879f5cf4956603075ba79cf0753822a8cbdcf4d1196ac9839f59211e0128bf97c0a1f36f00e70cc7682 SHA512 64ad577331eceea0eb060d0c2b333b664d4edb62cb3336f97b53e5c88f6b4ecdc4004136fef0461cdf999b282064b5809e79308591239bfafbdc3df8360bf123
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
+AUX sdl-mixer-1.2.12-parallel-build-slibtool.patch 4288 BLAKE2B 3beaeddf4e3ff97dc2778dfc79f800b3749a0b0fa511872f353587a3e01ded1cdc9c57c3a89cb3e1a6a34d6848b19aaacba5a2a81c3129906f521c2afc71e2c0 SHA512 b6e42b2ee43b57a3a4f3e8b47b96aa5d94b37f0326cbecca7128eb8b34f0ac00dded506a4d5164156ca23cf1aeaca6aa92f40ec43991fa73a97274a2262fe679
 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 3238 BLAKE2B e90817c91c696fe043183c3dcbdbc881ad57fb960f54d957dfdeedb9b35f75aad721a8c09c71deaff6abdc2fc24185bd9e3c1dde9ac1ab9cb46177f6bdf2304d SHA512 e3b7cf7a8ce8e728dd17cb93ebb384de0c313d5c2e131037ed44abacae28547fdcb68177226556cf04879d286c5c067943c6bf7067f49c1a7736b288efc39956
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3436 BLAKE2B 95a2a3a0389ec656f2e36cdac75378a82cdb85863a9a1d28ac1baac8df23a65fc8c6bc284426ecd12f804521a68aabd40e7287937c7cbc1be81185fbce987b07 SHA512 05cd8c12f237c85757c08f17e43761e7a4edf035018d8af5632106c1d5b463d8e160562e2d52964f8b31af1d9b7c17ea17c97c528223fe669f05697f272d61f8
 MISC metadata.xml 663 BLAKE2B 5d86fe5c016f831f870da2f9b3d0192b6719bc6a98c0101c06c382d62e6100af314f46980ad5c246c8bea9db8ea99e9cd47afe2e5aee5b7887f5f6d529dddee2 SHA512 16a16403ac93fe964330da05038a0e904d0c6e895413994db9ef587170eaf7161f3cc2ce7fb0fe13ded675306b489837d96e837c1002f216b8ffe72d6fd49591
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch
new file mode 100644
index 000000000000..a9996f9b10e7
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch
@@ -0,0 +1,92 @@
+https://github.com/libsdl-org/SDL_mixer/pull/311
+
+This is the SDL 1 variant of the SDL 2 patch also in Gentoo.
+See: 36d63464d341868f0ba533188238c805710f16e0 (Gentoo)
+Bug: https://bugs.gentoo.org/777420
+
+From 0b3b8a5f886648c95ce5ed0abb3d4e9e181d7ca6 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 6 Apr 2021 07:32:27 -0700
+Subject: [PATCH] build: Fix parallel make with slibtool.
+
+---
+diff --git a/Makefile.in b/Makefile.in
+index 293608d..5d27df1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -47,7 +47,7 @@ LT_RELEASE  = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ LT_LDFLAGS  = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
++all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
+ 
+ $(srcdir)/configure: $(srcdir)/configure.ac
+ 	@echo "Warning, configure is out of date, please re-run autogen.sh"
+@@ -55,8 +55,9 @@ $(srcdir)/configure: $(srcdir)/configure.ac
+ Makefile: $(srcdir)/Makefile.in
+ 	$(SHELL) config.status $@
+ 
+-$(objects):
+-	$(SHELL) $(auxdir)/mkinstalldirs $@
++$(objects)/.created:
++	$(SHELL) $(auxdir)/mkinstalldirs $(objects)
++	touch $@
+ 
+ .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
+ 
+@@ -78,7 +79,7 @@ install-hdrs:
+ 	done
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)/pkgconfig
+ 	$(INSTALL) -m 644 SDL_mixer.pc $(libdir)/pkgconfig/
+-install-lib: $(objects) $(objects)/$(TARGET)
++install-lib: $(objects)/$(TARGET)
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
+ install-bin:
+--- a/configure.in
++++ b/configure.in
+@@ -626,14 +626,14 @@ OBJECTS=`echo $SOURCES`
+ DEPENDS=`echo $SOURCES`
+ OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
+ DEPENDS=`echo "$DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
+-$(objects)/\2.lo: \1/\2.c\\
++$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
+ 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+ 
+ OBJECTS_CXX=`echo $SOURCES_CXX`
+ DEPENDS_CXX=`echo $SOURCES_CXX`
+ OBJECTS_CXX=`echo "$OBJECTS_CXX" | sed 's,[[^ ]]*/\([[^ ]]*\)\.cpp,$(objects)/\1.lo,g'`
+ DEPENDS_CXX=`echo "$DEPENDS_CXX" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.cpp,\\
+-$(objects)/\2.lo: \1/\2.cpp\\
++$(objects)/\2.lo: \1/\2.cpp \$(objects)/.created\\
+ 	\$(LIBTOOL) --mode=compile \$(CXX) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+ OBJECTS="$OBJECTS $OBJECTS_CXX"
+ DEPENDS="$DEPENDS $DEPENDS_CXX"
+@@ -643,7 +643,7 @@ VERSION_OBJECTS=`echo $VERSION_SOURCES`
+ VERSION_DEPENDS=`echo $VERSION_SOURCES`
+ VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.rc,\\
+-$(objects)/\2.o: \1/\2.rc\\
++$(objects)/\2.o: \1/\2.rc \$(objects)/.created\\
+ 	\$(WINDRES) \$< \$@,g'`
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\\$,\\\\$,g'`
+ 
+@@ -652,7 +652,7 @@ PLAYWAVE_OBJECTS=`echo $PLAYWAVE_SOURCES`
+ PLAYWAVE_DEPENDS=`echo $PLAYWAVE_SOURCES`
+ PLAYWAVE_OBJECTS=`echo "$PLAYWAVE_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
+ PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
+-$(objects)/\2.lo: \1/\2.c\\
++$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
+ 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+ PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\\$,\\\\$,g'`
+ 
+@@ -661,7 +661,7 @@ PLAYMUS_OBJECTS=`echo $PLAYMUS_SOURCES`
+ PLAYMUS_DEPENDS=`echo $PLAYMUS_SOURCES`
+ PLAYMUS_OBJECTS=`echo "$PLAYMUS_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
+ PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
+-$(objects)/\2.lo: \1/\2.c\\
++$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
+ 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+ PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\\$,\\\\$,g'`
+ 
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 7757eec87498..a5a0b15fce59 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
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_P=${P/sdl-/SDL_}
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Simple Direct Media Layer Mixer Library"
 HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
@@ -56,11 +56,17 @@ PATCHES=(
 	"${FILESDIR}"/${P}-clang.patch
 	"${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch
 	"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980
+	"${FILESDIR}"/${P}-parallel-build-slibtool.patch
 )
 
 src_prepare() {
 	default
 	sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die
+
+	# Hack to get eautoconf working
+	# eautoreconf dies with gettext mismatch errors for now
+	cat acinclude/* >aclocal.m4 || die
+	eautoconf
 }
 
 multilib_src_configure() {
diff --git a/media-libs/sdl-terminal/Manifest b/media-libs/sdl-terminal/Manifest
index 1d4a8bd5aa04..dd2d8797eb6d 100644
--- a/media-libs/sdl-terminal/Manifest
+++ b/media-libs/sdl-terminal/Manifest
@@ -1,4 +1,4 @@
 AUX sdl-terminal-1.1.3-nopython.patch 620 BLAKE2B 059ea3c8bb08f3649983c70551d1fff5017dea5e87d3f2d13b6d530826d1b6bd67f1fc716cb5ab50dfb16345cb57e307db776088cf96bf2bb5a34a209bca6776 SHA512 0e7aede86affef6041c0fb76d84b9a76a5b00c6e6ea68cb6669e12d5d50c162360660ee720e072451913166417e7fe24823da24be6eaa1deebe2009ccf6f75a2
 DIST SDL_terminal-1.1.3.tar.gz 466321 BLAKE2B 49c8a8262fd4a9dd14ce987e9128ece958e0357e8da3877516a9e139951d04ef779a414b15ab7748de679c053b8b14d461dbd4575b7aea62fe12608889a88c23 SHA512 be6e74430ac9467e58fde6048b042db319940e564061b6e537f45dcbd54148f5df593dd0b8a28d866ae298d0f1c8f3a113bf23640c25213c6784ede5233882ef
-EBUILD sdl-terminal-1.1.3-r1.ebuild 793 BLAKE2B 37e12dae568ed9b2f1d2079cba20f1e9240fd651c12e2d305898cde855d67d8dfd8150181a327103ddd546c1e548baae095c4faf946e6ba9a7e3b0f6b5e7d9a8 SHA512 92a9587a5c3828c77e3ccdbabefcfd299c2b423015f394948deb808db6cea26da50dc4374a441bbb6e631d1dbc0ed69f9e9fe022c54d57aee8824a278b4afe6e
+EBUILD sdl-terminal-1.1.3-r1.ebuild 793 BLAKE2B 25c5d45b31fa83d201426f54d433ead1669794469ef020ed4e4e8daf194492b037bfd09246b9ee480f904f231c018610ced63f58d81de7437f6a1309390f6b68 SHA512 c2f4a25cad76adc000d4a81e0cb8e4412e68bb214d12039c36224e70104d968699d3d951fd23b49770323961b366354faca814971e190f982a5dc20adb9691fc
 MISC metadata.xml 335 BLAKE2B 23c8a9d4276dffe28dec3f816a59fd1656899118fdcb9ad438b72d7f9510da23199ceafff70951389cb025abc060e5ade878e59858633d91c14e36c66f568c3d SHA512 d6e3731ff8357267d1571c5e9976614985e7f98ce43b5c1f46df66b60e4f7023c5d377d35a1ea5149f891c354acdca2038425a9f619876586af4470b4b61002c
diff --git a/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild b/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
index 3d37f445cdf2..ac16bb3b20c5 100644
--- a/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
+++ b/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# 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 autotools ltprune
+inherit epatch autotools ltprune
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="library that provides a pseudo-ansi color terminal that can be used with any SDL application"
diff --git a/media-libs/sdl2-gfx/Manifest b/media-libs/sdl2-gfx/Manifest
index 9e47deedb18a..8aec9b1582f5 100644
--- a/media-libs/sdl2-gfx/Manifest
+++ b/media-libs/sdl2-gfx/Manifest
@@ -1,4 +1,4 @@
 AUX sdl2-gfx-1.0.4-slibtool.patch 560 BLAKE2B 421170fe30fc7ba46867cfe111fd7366b68caa5a33e9e3ed27a47ef1350858a08a3c7f05aeb79219696d428b8409dabaec339a1f7169b7d3847ca037c05804f7 SHA512 f8266c0e43f77471c8ac28e6b3815c07a3dc36fe1a05a89fa578551f038ea48839dc9602294626f7b3030e9e8aeeaa6df98b28beee15baf5a81bcb3ebfc5fbc6
 DIST SDL2_gfx-1.0.4.tar.gz 1230588 BLAKE2B a14cf8433aa171b8185aab765c934262fd4ecde4e45e9c8bdfb4aa7feb97676cd8fb5274ad0452bcf77fcc8f268254184fedc73f1c791ff42305d518d01a8cc7 SHA512 81a100d3c8c3a7c6bd37a23f1290ff10685f8e62fbecd83b0086aae4edc721483e2153cd4219fbd9168f115eea0ea6b25f9be375faf5761f0babdfb1b52fe482
-EBUILD sdl2-gfx-1.0.4.ebuild 1125 BLAKE2B 66d7bfcd52ae2ad4175269d5425727f0b5c2f3636e4b5bcd9c64e3791dbc328c417dbbf1af63b6bcdd3834a89ce7bf748f29e732c59ae8d8018dc318863156f3 SHA512 ab6a0f04d27f929dc1d11e92a35303d801441d82a142cc42312d4bea43ad834fb12fe6311989a3f85b9ad86d730af462065a32aa6c3f2d1e2308769c29c95399
+EBUILD sdl2-gfx-1.0.4.ebuild 1102 BLAKE2B 2b1a29385ed96ebda541748d17ee1921b03ad1e233226a555c8368df6f12767abc56a0036e1232ae2f292fd85997f7089d6656637bfaa20f0441a19f715389a9 SHA512 11a361005f6f4936f05a1b20fa289492d9abdf2c2568ec0b0ae515b89b9ffa847e01110811afff11eaa1564775b6e2ff72fd034700b92a57118e1cb7e62790ad
 MISC metadata.xml 801 BLAKE2B f50f493cdd14251d398a3cd92dc0b282fb7cfeb631998e70654c8c2132a698b375be5bd778cce89944b1ddf98161961e54dcf7db0442ba0b09b61c675a36c9d6 SHA512 9ea5f88ee86ff482c56e86b0e83d4f7c56ec17c46824eac8273981c7f6988df4f83299c98972036551a2bfe96b9b099a9f943de77f3586e9db99dd99909085d4
diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
index 494a39f77f5a..7208220ba2c4 100644
--- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
+++ b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
@@ -2,27 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit autotools multilib-minimal
 
 MY_P="${P/sdl2-/SDL2_}"
 DESCRIPTION="Graphics drawing primitives library for SDL2"
 HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
 SRC_URI="http://www.ferzkopp.net/Software/SDL2_gfx/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE="doc cpu_flags_x86_mmx static-libs"
+IUSE="doc cpu_flags_x86_mmx"
 
 DEPEND=">=media-libs/libsdl2-2.0.1-r1[video,${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog README )
 
-S=${WORKDIR}/${MY_P}
-
 PATCHES=(
-	"${FILESDIR}/${PN}-1.0.4-slibtool.patch"
+	"${FILESDIR}"/${PN}-1.0.4-slibtool.patch
 )
 
 src_prepare() {
@@ -37,16 +37,19 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable static-libs static)
+		--disable-static
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	einstalldocs
+
 	if use doc ; then
 		docinto html
 		dodoc -r Docs/html/*
 	fi
+
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 0bd88929e84f..f16065ac3ff2 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,3 +1,5 @@
 DIST SDL2_image-2.0.5.tar.gz 11736518 BLAKE2B 8009fc4ff76d8f8f4093c02304329218e1d8b7d6fd9c747387f239bc6ee09133f8f3faee0005267ce29c083a6bf4ddcf8db72f502ea047f7288ec57ebbb16380 SHA512 77e743d3f32707e015b290c1379ae3c7d7a3fe265995713267f0d0ec6517de4808f0de9890b5ab28445941af5bc9fbff346620629e0d7d7e9f365262cab05ee7
+DIST SDL2_image-2.0.5_p20210328.tar.gz 12397062 BLAKE2B ae4fe8c30b21bc7dca87e2e78cab43c83e891630962eb020c29ba84c2b206bb749491dccddd8bcc212f2fd07da651691151baf41212fb5ea954427543e3bf994 SHA512 9ba0b671dedfb7bde072424cebfa7d65e79d2d58416833d84548777aff6bf0edda8dbe30c3e423bbb724f794b4b191e609b148f38573b4166eef31203ab0005d
 EBUILD sdl2-image-2.0.5.ebuild 1585 BLAKE2B 24238b783885041ebb9de56ea9be3281dca5dbbae6f9b16bc38a9974f579ce782da76146cece2df7e75dc4f59eae131c303999b6983a432fc464e36ba37a6ac4 SHA512 c82415323ab8efa95a5b79c4ef2f89deb9577da201d88a6c946d0eb4d09381c1ee901fc404cf4839db7300529074e5e3d87fec356aee161bc65adfbef6130435
-MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
+EBUILD sdl2-image-2.0.5_p20210328.ebuild 1680 BLAKE2B 5f67e4dd6b50c091bc6d6230226cfb0d20de0b2903dfd27a7a8c213e46852179823e46890a0122b04a53fb50f0e5051117d64efa6d9cba248b4019b65ea3f2e0 SHA512 272653a92b028fe1b40c8a56c6e361624b2c8ebc398fc86ec05a6b0e60c67c6a297d14729d0349237582d127d333b8f621463a89b9b4a63043585c929723d65d
+MISC metadata.xml 476 BLAKE2B 025a06bf4bd229d2f8f7a52b1a38d345d319294789db9a3cb680dbeaa8d41767ab2d8e947d1cd6d6863971da48c049cf0a2c5a97a5ed0ba32975fc07b7a4ffd4 SHA512 a2c51673b42a6240444e3914659a4058ed45b5479c54ebe3995f97c54284ec6cb8da94ad6d7310ce1df85e5565dbca511d815e2d8274d29455e8b9f411bf3b1a
diff --git a/media-libs/sdl2-image/metadata.xml b/media-libs/sdl2-image/metadata.xml
index a92c1a1c50db..a5e8d2d006ea 100644
--- a/media-libs/sdl2-image/metadata.xml
+++ b/media-libs/sdl2-image/metadata.xml
@@ -5,6 +5,10 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">libsdl-org/SDL_image</remote-id>
+		<bugs-to>https://github.com/libsdl-org/SDL_image/issues</bugs-to>
+	</upstream>
 	<use>
 		<flag name="webp">support loading WEBP images</flag>
 	</use>
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild
new file mode 100644
index 000000000000..fd36c4b51f1b
--- /dev/null
+++ b/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal
+
+MY_P="SDL2_image-${PV}"
+MY_COMMIT="f36684864e82538da2d2cf57fa3db077a3be42c7"
+DESCRIPTION="Image file loading library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_image/"
+SRC_URI="https://github.com/libsdl-org/SDL_image/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gif jpeg png static-libs tiff webp"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.9[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/SDL_image-${MY_COMMIT}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-sdltest
+		--enable-bmp
+		$(use_enable gif)
+		$(use_enable jpeg jpg)
+		--disable-jpg-shared
+		--enable-lbm
+		--enable-pcx
+		$(use_enable png)
+		--disable-png-shared
+		--enable-pnm
+		--enable-tga
+		$(use_enable tiff tif)
+		--disable-tif-shared
+		--enable-xcf
+		--enable-xpm
+		--enable-xv
+		$(use_enable webp)
+		--disable-webp-shared
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/sge/Manifest b/media-libs/sge/Manifest
index afe9a6bba455..71c3b1390893 100644
--- a/media-libs/sge/Manifest
+++ b/media-libs/sge/Manifest
@@ -1,7 +1,7 @@
 AUX sge-030809-build.patch 3874 BLAKE2B a01040b011494cdada26c22c163b7f478a59f762bb736370e0ca695ac02248e97ec640b30fb67592a51fd1229d5c8360525a74e9cb3fd8eeac2fcdc466b4cb58 SHA512 d685efed24604339013099deca3846bf1b5547a7518eeecdc36d36cee41a914f9f8d10d0880fbfe7f936ff3538396eff22bded91be553315bf57c6c126cca6a8
 AUX sge-030809-cmap.patch 684 BLAKE2B 951a434b5aa8fbf890b62c9cfaa420137ae5898a91775af03e6d37e324b879176c838487b9537fa1aed9582258285ee80921a834a7b911df80b9ee06049cf435 SHA512 adf9018c09c8e2581d1693cee28224b65c605f95a8df333ab9f50fe14668b501d1e3ce39b91b43216f67f1d107c167b77be8aa28a9025b95ec8ea025e9d6a43e
 AUX sge-030809-freetype.patch 625 BLAKE2B c075614e5c163344661a8628bd9b612ab154e8bee063c52e0c64575a5c5e8905da9f0d3edc553c6e5570f395aebf6ef533962f306604402d0abed891f412a890 SHA512 ec7fbcf0d072b6f1b51de6838113d8f1e030a8b91036f6e6674d63728adf1b81e6f31edff7e6bc28d270f200b907c6ecdc924730d9195e563f3da807a519764a
-AUX sge-030809-freetype_pkgconfig.patch 708 BLAKE2B afbbf5b8e6bc7c3404d822464b3b99056bb12c639f61b52285f41acc460d6f6f8826b1511f6147b7a2ece90f28512c9fce8e8695f9d84ae68b4f8b00108a0ef0 SHA512 cd17e10e43ebccca33b876203417aae4fd40d8c0cfda616ee29620cefe4c028fcaccb55adb61902755b8704110291105bb4fd7985a70261065d0bc4ded4c9581
+AUX sge-030809-freetype_pkgconfig.patch 701 BLAKE2B 036fbfbfdf76f8460b0b82d9abbf29c1ae0e20d7d779fa21925be9def41ebb9cc6d34a2b050b7b4b3b843ef3a4589e65636dc43d42699d2bee084d41598dd22e SHA512 9925452ea57a581869c7bd0d27af1bcb440a4e5a6fdd93084ca1c7cefecb9d78d2805a11d2b725fcedaeaf4e9f84f0efa093aee018b59ec34e7c00bf80f73b77
 DIST sge030809.tar.gz 251698 BLAKE2B fbb8ac88e6328c160af95e8922eb401f5ae34b296ba5e5bc161d5236b94ed7fc3b1502cdc684092d73276d1120c2f1eb56bc7571ec44b941cdc6ebcbc51f0176 SHA512 59144d573f254cc451a22a2d60ba68c7d9437b5095f63fc7ec36c21c3caf7580c5365267a004e08b9d08cf187a59ddefb76a5829f4a6aa1ff4d45f7d044bb2fb
-EBUILD sge-030809.ebuild 1315 BLAKE2B d6c88b708608c60471486e36e8801f6b6a30051b80329ce9c1c9520fca056704f5d96c4520948236f5842b1aa0b2efcb3a25a7190c84f5967c5330c71e6362c2 SHA512 35bbbe4607507d23ae23a0b36ff0367919404dfcf1997d5800d10fdb82d33887f7ce0f1cb826f77c72dfe5cd5076d8ceddf5ed218dae43b6a1bd7e2ecc1072c8
+EBUILD sge-030809.ebuild 1315 BLAKE2B 1927382db509ba4d0c39bf9856c2d613c3b465bdbb79e7682f7b0575adcc425c4178a6ddd0c3c68dd623a9247f3a4113201695c70d0c713d8e7bf42febcf42e4 SHA512 f09f1973d8e2df0cdf4a0928a5b8b91533b0f25286f04bb4addf783fb3da828bed86bbbec9a2bf89d43478156b0ffdd49317610b200eeec52dfa1a6cce023381
 MISC metadata.xml 331 BLAKE2B 0d4e5d5cb7ea39a3404a3b0708d61022a77962c30767cfd801f923749bb5ad2211d6d4ed26e9ada97dbb045cf16542e774b2327bd7d0505df33b3a4333733570 SHA512 65e4d002bc5d040804fd5b43a1b33e89cc8404d1048fea0459a55dc9aca010135ac0944d57282ebf09ccc5d7d8125728a963d08c45837aca4fc92565a77a8ae6
diff --git a/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch b/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch
index ceb478f3d828..738f4e2aeaa8 100644
--- a/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch
+++ b/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/655798
 
---- sge030809/Makefile.conf
-+++ sge030809/Makefile.conf
+--- a/Makefile.conf
++++ b/Makefile.conf
 @@ -35,16 +35,16 @@
  SGE_LIBS =$(shell sdl-config --libs) -lstdc++
  
@@ -9,7 +9,7 @@ https://bugs.gentoo.org/655798
 -# Is freetype-config available?
 -HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
 +# Is freetype available?
-+HAVE_FT =$(shell if pkg-config --exists freetype2 ; then echo "y"; else echo "n"; fi;)
++HAVE_FT =$(shell if ${PKG_CONFIG} --exists freetype2 ; then echo "y"; else echo "n"; fi;)
  ifeq ($(HAVE_FT),n)
    USE_FT = n
  endif
@@ -18,8 +18,8 @@ https://bugs.gentoo.org/655798
    USE_FT = y
 -  SGE_LIBS +=$(shell freetype-config --libs)
 -  FT_CFLAGS =$(shell freetype-config --cflags)
-+  SGE_LIBS +=$(shell pkg-config --libs freetype2)
-+  FT_CFLAGS =$(shell pkg-config --cflags freetype2)
++  SGE_LIBS +=$(shell ${PKG_CONFIG} --libs freetype2)
++  FT_CFLAGS =$(shell ${PKG_CONFIG} --cflags freetype2)
  endif
  
  
diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809.ebuild
index b3eb1819a16f..a84e9aa3238f 100644
--- a/media-libs/sge/sge-030809.ebuild
+++ b/media-libs/sge/sge-030809.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
 
 MY_P="sge${PV}"
 DESCRIPTION="Graphics extensions library for SDL"
@@ -38,7 +39,7 @@ src_prepare() {
 		-e '/^CXX=/d' \
 		-e '/^AR=/d' \
 		Makefile.conf || die
-	tc-export CC CXX AR
+	tc-export CC CXX AR PKG_CONFIG
 	# make sure the header gets regenerated everytime
 	rm -f sge_config.h
 }
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 516bee2aacd6..f52b7b3d6c90 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,6 +1,6 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
-DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2
 DIST shaderc-2020.5_pre20201216.tar.gz 220278 BLAKE2B 9565873bd1d85c2800b26ba821da8044aecf7ef7268b4843570b18bfbe07e0c9891b4f67b3ef58d7ac0813a2ca306ec2af8ef8bacb15047903d2d9bd1b723b6f SHA512 6b133b83f300c09408efa61f56b299b5ee3900fb739f2ada37e0ee3b8af4bf50423f0f9ca9a637d845bb02eeb61347456ddae9d616b5e46d2e481994ca3d35f3
-EBUILD shaderc-2020.4_pre20201106.ebuild 2159 BLAKE2B 5a1ae3c49778a45be4c9e468618890ae370d7024e302e43337afa5d93a3e90ba72647d256c5242f07a15ca50b63b2cb0fc14e1b1f4b8a2b911bcc825d60b5a48 SHA512 68339ba7418738a0eefb1577f54268c7ce12c2dfc14f4fb3b47fc98257dc428c355cc7e5c4e0736fe1437756ccbd4005b9195066ffec9632395f59b648604664
+DIST shaderc-2020.6_pre20210327.tar.gz 220258 BLAKE2B 5f3321d7bea0a39bec865cf3c6b25baba82068ecea6a5272a4c1e3432bb9f1c0062c1bcf9a57bac1e92dcd382dfb0837a03bbe434d19e83b755dc5da16e2f1dd SHA512 07f4a49faed28f23fb2f7b33c804c9909617e362f8046d6cafaaf3c74d6453ac53ea3f848dde8d2164a8827375e492c4fc544d7b9276c3e7ca80cae4baf1b47c
 EBUILD shaderc-2020.5_pre20201216.ebuild 2152 BLAKE2B e9779b48efd4dc8233ba298ca956e536a8ddb8fce6451b960b94209d750539c4bf25227b5466c8009a5edcfb7fe0cad78bc9fb33f35a6ea02dbf69e751c77c9b SHA512 190557755660bac2d52542e435fa0ebd50bf1b5971dba4cc84dc775835b60d53f945d84f58e64393ae8da57260bc83d684560bd5cdc7e0b2a3ecc5cd2a6d3745
+EBUILD shaderc-2020.6_pre20210327.ebuild 2164 BLAKE2B 3f7b8071cdd102b995188bb744472041ac791916426ac976ef66bcc7daeced36ac646bb8b8ec29eac396c29f07d291e5906a11859b465cd1370420e51828b674 SHA512 2af1ae076e7ea20b40ed4f1f58d1cdd0e22f134d3cf991774cb80a1d8eccadaa8adae59bb6472111dd0b1c2f00a56868f13c1dec9e1d9c51a320047b2f7bf231
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild b/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild
index 7e4884d24ced..d116c32b130b 100644
--- a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
+++ b/media-libs/shaderc/shaderc-2020.6_pre20210327.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=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 
 CMAKE_ECLASS=cmake
 
@@ -11,22 +11,22 @@ inherit cmake-multilib python-any-r1
 
 DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
 HOMEPAGE="https://github.com/google/shaderc"
-EGIT_COMMIT="fcafd5b49266d65ab7e4268c825224e8b6c1b8bb"
+EGIT_COMMIT="3fe94c6a76d2b617e7fb20fdf3cde98001a274e3"
 SRC_URI="https://github.com/google/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	>=dev-util/glslang-10.11.0.0_pre20200924[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.5_pre20201107[${MULTILIB_USEDEP}]
+	>=dev-util/glslang-11.2.0[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2021.0_pre20210327[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.5.4
+	>=dev-util/spirv-headers-1.5.4.2_pre20210327
 	doc? ( dev-ruby/asciidoctor )
 	test? (
 		dev-cpp/gtest
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index ea49eab4be02..51beaa34e20b 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -12,5 +12,5 @@ AUX smpeg-0.4.4-missing-init.patch 266 BLAKE2B 6476eed877a31ff26ff83936e137da8d9
 AUX smpeg-0.4.4-mmx.patch 352 BLAKE2B 02e060104c7fa0a817a9929c8a9911b24dd1ae131b26939edc7a1ac752a181e1db3cd0539d33d1548d1766f0a9ca2ecac31f6d0408711f54f04e6ed9ca5a35c5 SHA512 f83a04a6a8edb008dee9b76d96ad45b76e8ffcbb3086e6d97b64ee05ad400778bab97890811548274521504f502a904bc2f13598dfca33a872e6fb8800c0d974
 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 BLAKE2B 0ea9258a057108a462d9c4b9d9bcb21cdff71714507a3d09538f56817b206ec54681b3d2546b64c07f239ea3381f3644d26234853a239a2fe49353ba1c9b2759 SHA512 30370e0edd41767ce260d10de515be0087f47b479ec0085ec186506c93be0b2a404c1bcb1626f9a6a1f575160d9c382708d2769dddfe6dca6236fe0eaa58602d
 DIST smpeg-0.4.4.tar.gz 315054 BLAKE2B 16a7b87a207874deaaad64b5233964d4b0e244d35cc475cf0ed37302529ca4eb044393777fc98c202b5965de420f75bc5fb398ecc3eb0f97992d90e365f8a039 SHA512 d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
-EBUILD smpeg-0.4.4-r10.ebuild 2067 BLAKE2B f6ddf54805a2c2ce1ec21ea842ee0827c81b60a0aeb3123e958fbc68473caabd435aa9db85cb7618a2e057f970ebd7fda7184b200ec681abcd23f92d01e0c55f SHA512 2a3518dfb30ddeed12ec3b25cb44a3f1e4a2f87c947c66013b99e94b24db089e04f518e0e60ed241a23fa5ae7623b2a205110b74acf6bdf956cca5355951d573
+EBUILD smpeg-0.4.4-r10.ebuild 2052 BLAKE2B 0d3c923073866aa7436285b9bd576405523d8bfccb9b8d3dc06a3ad3b998d35bdb61728bdd8b259a445fe4ef5d5a0397af991705b861573bac03e0a5ea373c94 SHA512 8c59cb8ff0cacd5e79733b5982b02782e126227778f6749adbd9ee88e358142258f872894b5ceee5692262edaf69edd6bc49460d8a95b5224c5205df5098a3b7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index 0952de8f1b64..9ce094aca830 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -1,8 +1,9 @@
-# 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 toolchain-funcs autotools flag-o-matic ltprune multilib-minimal
+
+inherit autotools epatch flag-o-matic ltprune multilib-minimal
 
 DESCRIPTION="SDL MPEG Player Library"
 HOMEPAGE="https://icculus.org/smpeg/"
diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index 7ab533855366..456deafbef5b 100644
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -1,5 +1,5 @@
 AUX smpeg2-2.0.0-gcc6.patch 857 BLAKE2B b0e94293db4d4b2389ea6d75c8f958e36a8f503c552bc2255f3169c6d647b839ae4612a7e94f7763b5ccda29d14f0cee00ddb98697f34ec23c4340c03153acf4 SHA512 506a9aa8714927466dcef913d566b1acdd705e3eb8bb8d4e8bfe103428af9a7fc16e71a79ff126328c36a76c6cd2fd727804f5de1c3ae00bd0a7a82aa3a1dfc7
 AUX smpeg2-2.0.0-smpeg2-config.patch 1022 BLAKE2B a7b81a5c3f5ae886d1ec6e17011b602f25d568f4b781abb0608378ff000e3ce3cbad873fdf4da6d99853c603d83ef07516b19eca68e47ec3b694fdd99da071fa SHA512 1f91228f9e00bd60d2a8cbb04f0d9b9a5fbd4b5a53ded9547ae1d577afa12388b43a662e4c4e15e6b12f4007bd800c4e49b9c88812aef0ecec71a4c666686b05
 DIST smpeg-2.0.0.tar.bz2 311846 BLAKE2B 311de560d367d718eab4e014d4ea196f7bcb4d3e58b8a4002d81f63b76809530dc81a32a4f1163bb5003810fa3cc7257e3b8f94396acca580ac88d619fecfe11 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950
-EBUILD smpeg2-2.0.0-r3.ebuild 1339 BLAKE2B e09fe5635e410f23278020ce4fbc8c5ae0e4b708243c41d542a46b92ac351f3e7416e9c32d760f1ba9b1ccfea18dae6edf9e73628c57f0527eca3177873250f8 SHA512 cbc297c6921ae4336f6823e1a0d5481ab5b56befb6b94bc83b0f0c043603c8030ef938cf05fb861550c6471d3777ac6dbda9bf9c94296f13de8e5f77da14e9a9
+EBUILD smpeg2-2.0.0-r3.ebuild 1324 BLAKE2B d65ab20e5e093a33c94ff92e817cdc35e452d16fe3290750402315dddc970327b79e25d3cc2834495bb487caff58a366a87e4ad45fdb99b2e1a2970713956ecc SHA512 7fa9a384df8563f7a557f71f1911f7bd4aa727b6f118d8aaa72082e20ae0b03f16bc29e77abf029d29e1892f8117625cac1abadf934ea79e7ef89bb58388e57e
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
index 943f360aeaac..d4dc5e3a6527 100644
--- a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
@@ -1,8 +1,9 @@
-# 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 toolchain-funcs autotools ltprune multilib-minimal
+
+inherit autotools epatch ltprune multilib-minimal
 
 MY_P=smpeg-${PV}
 DESCRIPTION="SDL MPEG Player Library"
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 24c2977e26d8..05db5607e3c4 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,4 +1,5 @@
 AUX svgalib-1.9.19-pic.patch 487 BLAKE2B aed4fbb6ba2d0590ce6dc189f0b675ab34cd8fa206faabc68c7235c3519da3151da5d3bcabf3da7f5042ac9bf259f6dcd6ec337efac91c8054f8ebac19fe9a9e SHA512 313488478d487ce4e3e5cda64c2cba2b65dae12c768f0ec91da6365d5c0b939061f5ab489c7d19e2d8579534653da990c2e7e5a2e2f58ca4bd0b28076d22657e
+AUX svgalib-1.9.25-ar.patch 355 BLAKE2B e57dfe83294c27acbd57752bcc83e0cc965041a4afa713abfa31f9dd3877ea3ad69a89cb81ddf208e52bf264a18d070339aa69301855eb3bf1d324991daab390 SHA512 7c431b89ed9f8da3c12ff752ad4c0783c0f40f94c2faca04aebea1783297b1486cf40748e024e2cf52caeb62efa68fca800dc493c8606b3807ef0fd02fce8c62
 AUX svgalib-1.9.25-build.patch 2163 BLAKE2B 66fb7fcb2d006dd7419e78dd2c98254acb856689638fc09a2d8f4e849ac5137ad683fdaa66895a7180c494101e810a9e1073878c64bdd49f3aca370d6098d00e SHA512 87cb6458bb427d2e73bc275d6e77987919587dec1b2f52944191087e628aaa4eba46148bf8cd2f89f5c51a5c9f5433f3262d378173ed16e894fd962d8bada4e5
 AUX svgalib-1.9.25-fix_buffer.patch 302 BLAKE2B a3e49949702305d6ee973134a50c7105ccf46fb732b54351616af5c2831712aa178b00d8dd2f040cbfd93b3cdd08a215103319508a89b6329d7cc6339188908b SHA512 e238a5e05db06623abe04a6058345a4c4b91953c73ef02c3b4bd0b4606f9a57f2b20ef18aa2a91c50465bd3c048ba2ffd4792d62dcfadd94320afffa826641f1
 AUX svgalib-1.9.25-glibc210.patch 3842 BLAKE2B 99cfb6151d38fa75adaaa9fb0ff490430e71b416e9a5fb9b6fe228de4b937a8c36a5c645fa3a413c1cdfe3d4764720a961a7a97d9e00ff549283698dbda9bee1 SHA512 43813c240eaff58d993c0ed839bee0d5d73515e4954e7793536a981d149c882808ea79187b0bfe8511afcde78fd31b6e9ad94aaf20d28c8e96577d5f0e530d96
@@ -14,5 +15,5 @@ AUX svgalib-1.9.25-wrapdemo-buf-overflow.patch 516 BLAKE2B 504bdd01a0bde6858648f
 AUX svgalib.udev.rules.d.2 44 BLAKE2B 513532c74e5172a5f2882df1912508f12adf1347c3af1bf0a44f66781d139a28b7aa332f5a5e630d099b381b9a94931ba0b7ad787393228bf694878f442279ab SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82
 DIST svgalib-1.9.25.tar.gz 987084 BLAKE2B 0ca81483d754796d8c96abef2940c506dd8c6f69ac015f0b34995a81db91c0540f405271f3c9e337ead551c783e9d6a336ef53bfb1531481115bd1228b679ea8 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7
 EBUILD svgalib-1.9.25-r7.ebuild 3561 BLAKE2B 1bcc24d53ddf425a5dc0a2c46889f584933be7cb9be7b1db175ef81c91c691dd263d1fde43a0ad2ae1d565df6f3c5afb9f18cbbbfb372ce8a8cf8516fbd5a024 SHA512 f8912ee94857c5bf31a4b1ed59b1db81aa40c3a0be8cb1720634493b67d54140adf51e537e84a541300d365c13f8ec627ebcdc3572a62acd6f72043732546a9e
-EBUILD svgalib-1.9.25-r8.ebuild 3419 BLAKE2B 1f7f87fc20a728f90540974cc5691ea5d123f86359fa1918e55debf393fb593d831eb2c1a6fecb42a848c2d2ddd1902bc587349c32243a3c8ce0d54b0f5f2fd5 SHA512 67d8565d4d99dc67da5ec0ca3a5188f098045ebf4b82080ea644f88c9d58c58418bcae365d8f877a116c266dd6fd3d0ea094c4b96c8e46627dca8768dae8fd23
+EBUILD svgalib-1.9.25-r8.ebuild 3456 BLAKE2B 514c65ea6a896d91e36a659aa242b106b40b959a75c95e0a35fad4056aaebe4f772607e1b9668ed8aa8f74863cac93442a0b7e26a0767cdb9244a27681889e0e SHA512 4a47755b107909177ada3457676a2605537a6dde33d0865a1fe9df3f0426fd583c00eba753c1c6e372c6f982e1f8a5649b320d3828e0c96831af32816d470f66
 MISC metadata.xml 325 BLAKE2B eee2dcb0d80f8fa891865f3074139f3a9db2af0339f342f0f82512dc1195e7a95616a36ae9917e8724d12f15c1b5c056c3c5d242c32e989c354b39a7d6fbd5da SHA512 7d2874207eaab21b41da8bd8b9afb5cda10351e3c88fe09ae1856664115b3c86d13362a82695a016911390e5ff6762a86409b437a3d76b077e01ac0ff6662d5d
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-ar.patch b/media-libs/svgalib/files/svgalib-1.9.25-ar.patch
new file mode 100644
index 000000000000..1f48481f7814
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-ar.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/724714
+--- svgalib-1.9.25/Makefile.cfg.orig	2021-04-21 15:27:13.000000000 +0300
++++ svgalib-1.9.25/Makefile.cfg	2021-04-21 15:47:57.152922480 +0300
+@@ -318,7 +318,7 @@
+ DLLFLAGS = -fPIC -DPIC
+ 
+ # Utilites used.
+-AR	  = ar
++AR	  ?= ar
+ INSTALL_PROGRAM	= install -m755
+ INSTALL_SCRIPT	= install -m755
+ INSTALL_SHLIB	= install -m755
diff --git a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
index 55f0bb10ddab..87dea240053f 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r8.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
@@ -31,6 +31,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch
 	"${FILESDIR}"/${PN}-1.9.25-no-man-compression.patch
 	"${FILESDIR}"/${PN}-1.9.25-wrapdemo-buf-overflow.patch
+	"${FILESDIR}"/${PN}-1.9.25-ar.patch
 )
 
 pkg_setup() {
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index f0906df6a22a..f5636d84cb7d 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 1153 BLAKE2B d1bc65b830f32f5534a8f92565ce861fe66fb93d20ed85d741371c23187e2f523a354d02174ab5e32e7a9dff6348ab7a31ec2bdb0b53c401f91cf66a50ce746e SHA512 fe370dfa044615d3fdded4beda28efd9de97410d251638051b8e1e325764000f4005e0b014a919a91b3f80ccfecaddfe0daa7bb4bbc4fff69198a762dd4095b5
-EBUILD svt-av1-9999.ebuild 1055 BLAKE2B af96eb94a47185ddf01ef21ccb5044ecdaa5ea3eee428a05de6bad22022d8777d4dfa31a6de1290200504d01b27a5129fa92b02832eaeadc653b8043b98be589 SHA512 45326879f4d0069b712a1ab85a5fa4b1ab4324f7eeb21c7735821dced5e638bf7430e4f2357511cbc2f596d7364316268194a406981e6c7fa617cfa8d077535d
-MISC metadata.xml 561 BLAKE2B 009974d51481a9e04834da9b466fe4f42a6c5605c48fc9bffacfcbed248b10c5c684d4999ce41d18016ae9168e493eaad6203634f181bafe2d5e212c0e623614 SHA512 bec2c1832e4621f6b28cc773632f68fef9d40a26e1268258aba5dc911d6941a6b8d9e85cc53f2dfb7ad1385ebf90506fee0641a3759cb6c6402d082ef1752516
+EBUILD svt-av1-0.8.6.ebuild 1185 BLAKE2B 6fa6a312e218b319ceb4ab1c29615e848c6bb254d9053e7c0be47509c9ac2190e067db3339a0a29b5a51d3f9b8631453bbe1f7d04126c724d1fc2a4997f40116 SHA512 64d4f7446876408915e78af93cc56f6563788dfa0c48267983e0975abca43b4f16457855812df2c4611be1773b6334b5a4a6c2e3d64d94794caf4e25f285ed80
+EBUILD svt-av1-9999.ebuild 1090 BLAKE2B 130f31f96ac34ec20e237ff7134f09132b98795aaf1a4c94f3e4d12789e21599a8128fbbc12f94903cc9699de97cf769585f891917d32864a63fe2f0af873922 SHA512 0d40431b5fe9f11137499595ae6cf41d86ed05843ed121f01f499208db76814b83577a7ad7b18528a18698d098f098b0865d981b4b6614dea484c72b7c025da2
+MISC metadata.xml 561 BLAKE2B d7ef721d1c86b184505d2b16dc4ccc39f1e2b2077e377ef3e18e5db8b756148ac7c36c3664f5b5cbb6e0a01cb77cf690fec40de5e5b590e8fd59169572579b55 SHA512 de3456b47eb8342ce7a7156eeaff18e8b55c224df6c758010c9cec75cc88cc220a5d5f893467a40be6b900bf0a399e9a40a26afc894bb4496c746e1e5f2a643b
diff --git a/media-libs/svt-av1/metadata.xml b/media-libs/svt-av1/metadata.xml
index 732224856375..90e261ce833f 100644
--- a/media-libs/svt-av1/metadata.xml
+++ b/media-libs/svt-av1/metadata.xml
@@ -13,6 +13,6 @@
 		<email>media-video@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">AOMediaCodec/SVT-AV1</remote-id>
+		<remote-id type="gitlab">AOMediaCodec/SVT-AV1</remote-id>
 	</upstream>
 </pkgmetadata>
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 424c5cda9ef2..b28f25e57ab4 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 ~arm64 ~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
 
@@ -21,6 +21,8 @@ fi
 LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT"
 SLOT="0"
 
+DEPEND="amd64? ( dev-lang/yasm )"
+
 PATCHES=( "${FILESDIR}"/${P}-fix-c-only-build.patch )
 
 src_configure() {
diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-9999.ebuild
index 9bd9658e06a6..9c3996507abf 100644
--- a/media-libs/svt-av1/svt-av1-9999.ebuild
+++ b/media-libs/svt-av1/svt-av1-9999.ebuild
@@ -21,6 +21,8 @@ fi
 LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT"
 SLOT="0"
 
+DEPEND="amd64? ( dev-lang/yasm )"
+
 src_configure() {
 	append-ldflags -Wl,-z,noexecstack
 	local mycmakeargs=(
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 76d7e9f76756..a2e573d8de58 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,9 +1,4 @@
-AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6bd25e2f5152c14743fa49c6c44a14f93a961f08a4d53337efe0800d98126a8aa58627a330e19386283cc16d8f20c9637262 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37
-AUX taglib-1.11.1_p20181028-libdir.patch 721 BLAKE2B de84d157b6da665c6e2dee504bfd68409500fa00366d83adc67735bfb7962cdadcfa6e3ff838115521f66db12ae2d8ef9963981f452944b100e475653fb9064c SHA512 fa9082f58257a3250a54eba49dc1b0d6f25e59f2fa500a7d41571b7c5fa8b2e8e5a7d4426ee2046dbe556c3dd2cf1c271cb4e0e1e9b78b8733a84de9420974ab
-AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
 AUX taglib-1.12-cmake.patch 18074 BLAKE2B f4f9dedd614d7bb2f981f7e4e8dc0b257847e9627e1fdc24d85a615cac7d894402b6901e39297a5a9473d9b1eecb6bc0be6183950abc3196245c1c8921f930aa SHA512 2003f02a843c3982c7c50db77bbda9ca75c36f25a371df03cca5139bd78e2efd7b083672bb06c5f9b0d114253fdaf6adeb995304877ff84085d8d1b07ef2c779
-DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
 DIST taglib-1.12.tar.gz 1364231 BLAKE2B 414a61a302fbdd1af8dae70fcec96311023d3ef85a659b8dc598c8c73cf31142b4a254c843f4d415eff0fda84e62e18f1bb63921f1868400990f023aa01b1a41 SHA512 63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6
-EBUILD taglib-1.11.1_p20190920-r1.ebuild 1328 BLAKE2B 43e1d33fa7e6b77bfab239ccfb2ba01c46ee9feb9977839e8525ed465f7c3eb4d4f1fdb61c6885d7873b76fb7cb6057c5c68ee51a5079e5852dcf98c24f863c5 SHA512 477b4ed7c0665740e450c346e9b5bcf3be976181490ce443d10aed7bae1114984848342774a2f7a2c3cec1cad006ba89d7a361c2cf4d4e84eae6a68b5e25a982
-EBUILD taglib-1.12.ebuild 1308 BLAKE2B c976322a2b8442f6e17a75b72ab2940c64c54bb427777080b17d7314f2b856c5deb8aa4a0154fae06de2d6cee3e7c86dd2cc8ba90671f35a26ee7f13a297b4c0 SHA512 3760f6b71d648921a629c0999727d0313e2a04cc1972c125afba818737de4909bfee9820f5d7972874c27d00c10e65c6c8c7e6d52d3a48d2015763ed5db2e104
+EBUILD taglib-1.12.ebuild 1301 BLAKE2B a31dac83d51c9d079803131d9b12b764e7d7f6d105c881bf1a3118ac8771d781ae535a5e75418524c71935dc41c1cc214304661e346f56c040cfb7179ec6d83f SHA512 238500ddf60d11940516aae0d6c595ed7d5bad9bdd0275a572fcda9fbd1922fbcd2846b4f2a1d68489dba1f080ec370422306270c24438ad4b46dc2302acc5a1
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/files/taglib-1.11-install-examples.patch b/media-libs/taglib/files/taglib-1.11-install-examples.patch
deleted file mode 100644
index fd676c6aec14..000000000000
--- a/media-libs/taglib/files/taglib-1.11-install-examples.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -37,3 +37,10 @@
- add_executable(strip-id3v1 strip-id3v1.cpp)
- target_link_libraries(strip-id3v1 tag)
- 
-+INSTALL(TARGETS
-+  tagreader tagreader_c tagwriter framelist strip-id3v1
-+  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+  RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-+  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-+)
-+
diff --git a/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
deleted file mode 100644
index 0ae6b1cfb9af..000000000000
--- a/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cd9e6b750206417f155574c78d2551242a779a97 Mon Sep 17 00:00:00 2001
-From: jiblime <47689567+jiblime@users.noreply.github.com>
-Date: Sat, 19 Oct 2019 15:12:03 -0700
-Subject: [PATCH] Changed libdir/includedir variables to change based on a
- user's system and match syntax
-
----
- taglib-config.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/taglib-config.cmake b/taglib-config.cmake
-index 2a5c19f90..e613fa226 100644
---- a/taglib-config.cmake
-+++ b/taglib-config.cmake
-@@ -16,8 +16,8 @@ EOH
- 
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+libdir=@LIB_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
- 
- flags=""
- 
diff --git a/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch b/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch
deleted file mode 100644
index 4b8311d24a13..000000000000
--- a/media-libs/taglib/files/taglib-1.11.1_p20181028-version-1.11.2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/taglib/toolkit/taglib.h	2018-10-28 14:43:45.000000000 +0100
-+++ b/taglib/toolkit/taglib.h	2018-11-17 23:40:39.517716254 +0100
-@@ -30,7 +30,7 @@
- 
- #define TAGLIB_MAJOR_VERSION 1
- #define TAGLIB_MINOR_VERSION 11
--#define TAGLIB_PATCH_VERSION 1
-+#define TAGLIB_PATCH_VERSION 2
- 
- #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1)) || defined(__clang__)
- #define TAGLIB_IGNORE_MISSING_DESTRUCTOR _Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"")
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
deleted file mode 100644
index a79a5c9b8e23..000000000000
--- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.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
-
-CMAKE_ECLASS=cmake
-COMMIT=54508df30bc888c4d2359576ceb0cc8f2fa8dbdf
-inherit cmake-multilib
-
-DESCRIPTION="Library for reading and editing audio meta data"
-HOMEPAGE="https://taglib.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="debug examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11-install-examples.patch
-	"${FILESDIR}"/${PN}-1.11.1_p20181028-version-1.11.2.patch
-	"${FILESDIR}"/${PN}-1.11.1_p20181028-libdir.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/taglib-config
-)
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
-		-i CMakeLists.txt \
-		-i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/taglib/taglib-1.12.ebuild b/media-libs/taglib/taglib-1.12.ebuild
index 22ad368018c4..5735acbbaab0 100644
--- a/media-libs/taglib/taglib-1.12.ebuild
+++ b/media-libs/taglib/taglib-1.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://taglib.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="debug doc examples test"
 
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 95068778701f..8fd382f5edd7 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,9 +1,5 @@
 DIST libvpx-5b63f0f821e94f8072eb483014cfc33b05978bb9.tar.gz 5337558 BLAKE2B 795f613cee5efc4f6382b09063978b772ebb283fb1f5f621f5fbac018a6aca4721319de89dba02cf66202fe92bf9df681c27b94657a67acea66293b9cf3e1b0c SHA512 ad151972dc6077ddc520d7b6aa14d64e3183e010ceddd5acc6e2d9407f3476006a92461f61662b826feab623a65e748df60d5478af56bd657fbacbdb71dddec6
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
-DIST tg_owt-0_pre20201105.tar.gz 18390526 BLAKE2B 115e93eb9dfd158779d2a521de9bca8cf0e0a38cff7d7a470b59d2941212a79cc7c33abf330c348ad70321486cd80d44644ceea61f9a86bbaee3ef6463a9e23d SHA512 de9d4490c3e68f17dd75e523596683395e67e91b51c5c7af61c0a51517779129cc965bc97d63b5054bdddb76d385ab33d6995d72b08316941fa2a72a93d1c3fa
-DIST tg_owt-0_pre20201112.tar.gz 18391959 BLAKE2B 85ad2880e9067daad94389708c0cb3638c090fa8281b8bf55d990dcdbf8eb898a70a930a0c0e904b0a682b9ebdb021134e18270ab760191b12cccba12dae95d5 SHA512 10f6ca1a6a82e9bd9af9e815b4d849fdace39332df61d32a9b706bffc3e8647b20f58e63a2fcc4e714e1480768ddd8f7ad21588f1e9762b3c056b205abfd5806
 DIST tg_owt-0_pre20210309.tar.gz 16159542 BLAKE2B 354992fca17f6217daa7294a8b60aa96f16b1198a07c79599ce676770cde068bf3ebf83c3935613ab181d4f7f23abbf2e4dd3ba41988b7505f27f537ada87fc2 SHA512 eca2c249d4837f8564218ea969390579b7f07c40879a80249310d978ba6d8865b85ec12e324fdba92af2d0b9bd501f2328fad5475028211013239dc35f508bb0
-EBUILD tg_owt-0_pre20201105.ebuild 1110 BLAKE2B 08db203fac816c05d87217e9f188ef66d17ba838ff2180c7477ee69f5d9fd3795b18b1912e9aa71bcac79a080ef7cfec8fd4d206b02a8a49306a6a4e8d4e8df5 SHA512 284997626835d55edfa2628ddd789ec7bd80fd2f675106f9e87f76dc4617426cc73cc388bf7cd3470f6053f89b6b3bf3ec0248857a767cebec61a46c4eb1a17c
-EBUILD tg_owt-0_pre20201112.ebuild 1115 BLAKE2B 0b6ee35510c34969290b97a8928df3359b00a9628dadc7a4ef0f988fc08fd9022bd0fde6e4ccab22ab29c1dd7c455cf97c1259ebe3c1de7a76593bfc72ac6813 SHA512 4a123260cb17113443345b0b4916174461994b57ce8600e6b0cfafcc893cfe161ce79c13445ee39edcc25558107e7943f6fa30d7745ece8d74ff6500833a6b28
-EBUILD tg_owt-0_pre20210309-r1.ebuild 2573 BLAKE2B 17139fa4a6c405ed5e15680c1917d7ef1b6b4046be8824857e6cb1c0e1b5a418dd4f3e0a2ed8d293c6f74fad525ba5ce00213de3ee02fb0cf662e4e398f08fc1 SHA512 b612fbd2fe75f416a208fc2c2795519680829c374de543c1373ed5aafbef47e57567f3c4c7ad7580c1499a4b4e0c0d63ab0f59b7332ec3b23f5831ba845fb7e4
+EBUILD tg_owt-0_pre20210309-r1.ebuild 2572 BLAKE2B 1a6fa3110b55b71c5fd5b35c8a2143af554d10b1d76ccdd08f8deaf73f2ad26d48eda46cc54879d0a8e013bb09995c0cde72b520508461de6b8b87208e628e48 SHA512 f3fd874d29fa468266c918d0882168bccae193b4a5cc90ef80488a10de8c83a36003d85c90ab302d9773ef0fc7d5ae6947287d0ecf26fc21cb6d3c98d462f304
 MISC metadata.xml 409 BLAKE2B 1d4ff3a79885150e6c29f8eda10d9ded0bebf9635033a3e76bbda7f223767cac0627599537faeb2827e8424fa3791eae0244ac1033486900c0bfbf3448f14b79 SHA512 cd254c020f0e32e28d91bf1d404ccb631e837962f9fcbfddb0cea4a0e54d82076d90eea987f3bcdcd9e689fbafe069ee671005f8edf6b8acf45d8ba99a18eae2
diff --git a/media-libs/tg_owt/tg_owt-0_pre20201105.ebuild b/media-libs/tg_owt/tg_owt-0_pre20201105.ebuild
deleted file mode 100644
index b385716b4137..000000000000
--- a/media-libs/tg_owt/tg_owt-0_pre20201105.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-TG_OWT_COMMIT="12f4a27f2f02f9dd40f9891d8ec6e58bc1ff5263"
-
-DESCRIPTION="WebRTC build for Telegram"
-HOMEPAGE="https://github.com/desktop-app/tg_owt"
-SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="pulseaudio"
-
-# some things from this list are bundled
-# work on unbundling in progress
-DEPEND="
-	dev-libs/openssl:=
-	dev-libs/protobuf:=
-	media-libs/alsa-lib
-	media-libs/libjpeg-turbo:=
-	media-libs/libvpx:=
-	media-libs/openh264:=
-	media-libs/opus
-	media-video/ffmpeg:=
-	!pulseaudio? ( media-sound/apulse[sdk] )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	amd64? ( dev-lang/yasm )
-"
-
-S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
-
-src_configure() {
-	# lacks nop, can't restore toc
-	append-flags '-fPIC'
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=TRUE
-		-DTG_OWT_PACKAGED_BUILD=TRUE
-		-DTG_OWT_USE_PROTOBUF=TRUE
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/tg_owt/tg_owt-0_pre20201112.ebuild b/media-libs/tg_owt/tg_owt-0_pre20201112.ebuild
deleted file mode 100644
index 51716d538a99..000000000000
--- a/media-libs/tg_owt/tg_owt-0_pre20201112.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-TG_OWT_COMMIT="10b988aa9111fd25358443ac34d0d422b5108029"
-
-DESCRIPTION="WebRTC build for Telegram"
-HOMEPAGE="https://github.com/desktop-app/tg_owt"
-SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="pulseaudio"
-
-# some things from this list are bundled
-# work on unbundling in progress
-DEPEND="
-	dev-libs/openssl:=
-	dev-libs/protobuf:=
-	media-libs/alsa-lib
-	media-libs/libjpeg-turbo:=
-	media-libs/libvpx:=
-	media-libs/openh264:=
-	media-libs/opus
-	media-video/ffmpeg:=
-	!pulseaudio? ( media-sound/apulse[sdk] )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	amd64? ( dev-lang/yasm )
-"
-
-S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
-
-src_configure() {
-	# lacks nop, can't restore toc
-	append-flags '-fPIC'
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=TRUE
-		-DTG_OWT_PACKAGED_BUILD=TRUE
-		-DTG_OWT_USE_PROTOBUF=TRUE
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210309-r1.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210309-r1.ebuild
index 579a610a5718..8a01480de92e 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20210309-r1.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20210309-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="pulseaudio"
 
 # Bundled libs:
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index d455ad362feb..810610bd5198 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,3 +1,5 @@
 DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
-EBUILD tiff-4.2.0.ebuild 2056 BLAKE2B e6c3f2878ae89232c7b47eace14c36641a0609cfe4766e171c87c0355a0f989ed66e9b8271b57f23fe152c29f892be849a6296bc364387d3536e823a6b26d46c SHA512 85ad2d18abecf9a69c8e757663736697a0ea8fe0c16e967058ae2c59930535b1a53a43af79baf90fce0098e77f40c7407261f19ce369704bb7e2811d72e02f6f
-MISC metadata.xml 559 BLAKE2B c7f72104f0c49114e27a3db9548edfc112b6bb04881c980d5f4175835abd46a7be088cd9e8c2eae8311bd1656064d975d50579547a96e814b1affef54a17befe SHA512 95ca6b5655637f4cfacb224a77532ea958634e208b3f7d39cf2be778033b99f77af7947bce9db1e633dbcbc721ea2fba60e5a18a4c0e32a9019fcb95f568cce8
+DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175b0d73b4af3aa301af2dee3d76184e4689e7b2f1f9b73567ac78d50456ee94fffe00bad6da05375cf2d94d92 SHA512 e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493
+EBUILD tiff-4.2.0.ebuild 2049 BLAKE2B 3698f96feeafe136a25898946f7b5a003fd40e62eea9463696831d97f12bdfb2ad6e916a9d2adb5e5e59eec6ad8648887b5dd1b26a5f0fe9da28c29d072b1b16 SHA512 3748ebce45e493316c50e99491be799ee9faf78fae345bc5791f6788fdb9a9a2e79bf9ebf801baa2ff6cf0732cc9e70ab3b3a848d73e89d96d1884527d433765
+EBUILD tiff-4.3.0.ebuild 2057 BLAKE2B cddf05f09143cc28fe2c0976bc470839b5751755e548b2d243ff0f227439be6e19bb91b0fb50528dcb8a4cafca9cd1c0a381063eaf32aeaba64f4f5fed0f7201 SHA512 c9b8412855f06e5b4883240d00017312dde09ade494276b6f298cc4ddee26059bbf39e169d24eb7f1851d317b822cb72e2faa9428430b92e3fe5854eae897d2c
+MISC metadata.xml 614 BLAKE2B 65a0c3386b69b69a980f6f6c9d2e18cc2e98c0f5a319af7e61763cea5a584a456715360e2106330b439981e09375701685ddc94f5062c7e206245944282a7b84 SHA512 f7b29a08c37621126390ddb9d8dc42a757da0d228151d725625fe603a26751294895d8795ebfa851ee36863f459c67d04c235a953304d48dca429d24de72761a
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index 7cc4f8fccac4..a6ae642d2e86 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -10,6 +10,7 @@
 		support, but also used by GIS and other imaging tools.
 	</longdescription>
 	<upstream>
+		<remote-id type="gitlab">libtiff/libtiff</remote-id>
 		<remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id>
 		<remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id>
 	</upstream>
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
index 69bb47338e2a..714507392efe 100644
--- a/media-libs/tiff/tiff-4.2.0.ebuild
+++ b/media-libs/tiff/tiff-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools libtool multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Tag Image File Format (TIFF) library"
 HOMEPAGE="http://libtiff.maptools.org"
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/tiff/tiff-4.3.0.ebuild b/media-libs/tiff/tiff-4.3.0.ebuild
new file mode 100644
index 000000000000..49ce9bf164b9
--- /dev/null
+++ b/media-libs/tiff/tiff-4.3.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
+
+LICENSE="libtiff"
+SLOT="0"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="test? ( jpeg )" #483132
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+src_prepare() {
+	default
+
+	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
+	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--without-x
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cxx)
+		$(use_enable jbig)
+		$(use_enable jpeg)
+		$(use_enable lzma)
+		$(use_enable static-libs static)
+		$(use_enable webp)
+		$(use_enable zlib)
+		$(use_enable zstd)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	# remove useless subdirs
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ tools//' \
+			-e 's/ contrib//' \
+			-e 's/ man//' \
+			-e 's/ html//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		emake -C tools
+	fi
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
+}
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 3909419aebd2..f2502799714c 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -8,5 +8,5 @@ AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48d
 AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c222981de896c8c6e9d66a8dbb1cbe5b90e54e3f24b07bea23c508c260e0639720b4103ada81fea3277e06ca63939 SHA512 6403f48e858af2f8a177588e231367c09f8c939fc614198a10e45ca83ec000f9d5baf67681c5a65fe75177d59d34ab10c19c3621ac0eda6382793ed3b6bd8d84
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
-EBUILD urt-3.1b-r3.ebuild 2353 BLAKE2B 316dfaa5a398aebfb3e1d4e827530d80864f643cfc5b858ba6460ac60acdfed56b9c434ce72e0cc3caf267b226fa72625132e36f7b17276cee45505458afa23a SHA512 700c7d707b308ebc8c3e70ca1deb7ad93038f93980e9de654bd3cc17b72ba291a757af62129927dcf4afd9f00f309c15cf4518d53c8c7bedd20459684c55563a
+EBUILD urt-3.1b-r3.ebuild 2347 BLAKE2B 8570eb525f1bcf36f9f3912691bfbe63724e3a3d1eeb324f67235459c8186190fc47cbb4da269b2740bc1f0d40596b8c4cfb58bf8c8a498eefb5b13065e7fd29 SHA512 08fd522346aaab593e1c02d62fcb6e4a1e60d45973d2040224fcf6470cdc375b8bfdded73fe961e6cbadfcea9f0fb45f74064b8e70506aa61f5b37a8ea78f049
 MISC metadata.xml 219 BLAKE2B 5fa48553765105c349c2191a280c44bd60cd54219abd17acb444e50eb7d1a4d5c669847b048d3155746e8ccf74f3a7698c2b8dc040fff6b3d919dc36e1978638 SHA512 b1650774ef8d66b16dc9449ca934cfbfb5d130eea013dbfa961a060763ce1765a95330776b6334b954a55077149f2d089b8866bc4d06e69228f02262d8fe1d28
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 2670c6df6421..99e08abf1455 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images"
 HOMEPAGE="https://www.cs.utah.edu/gdc/projects/urt/"
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~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-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index d35239cbc9a1..f304d0e4075d 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-layers-1.2.162.tar.gz 2398927 BLAKE2B febfcc88584cb7d69ac2f2bd95a73921d2dc92524b05f17e7d2a9f99336416260da60eefc560d93ad788d9a185d4dd865881f5bc8faf0dae388bacca59a21b7a SHA512 85eba0e1d07cafad212ef611fb1aef3113b6609361476cda7176a49110fe62d257b815f7c622d6ba959872785242e2231c7245242e7794ff5e60325d10f3061b
+DIST vulkan-layers-1.2.170.tar.gz 2581751 BLAKE2B 968d17e11a21422003c0c922518b121586ebbd4e5375189f38715c52afc24b1bed04b1a4f05e17875b15fee3815492c357ad84316ea0abc359a97026418b490d SHA512 199e64c6d2ca34a604bb611fd231bfccf4608078a777369039597dadc209a23b7e7ea4ce71dc8b48826bd7874a7ea623d8af7dc47945914405fd99ce8bdf8de6
 EBUILD vulkan-layers-1.2.162.ebuild 1487 BLAKE2B 39f16295cadbfcd4921db6699ffad0acb9006b11fd6d2b73a4d00ea1bfb3d19586e172656610129af32e01125e8d3f8b0ac9d7434976dd09aa43e217f40da183 SHA512 4d4e14abebaebc304004c7256d4f81ee9522d2f46dfc4450d70f935d1d1ecf87b631d13eb7765be8c8a3570ff2ed6b384971939cd37d33fe698c9a54f0a92781
-EBUILD vulkan-layers-9999.ebuild 1498 BLAKE2B 1aae6c33c685e3992dad9456fc09a174c0e13a2cab4d9b34ff95636f52a539b7545ff450c0fa03b069eec903eae1e5732495608b936603b5f6797478c9335db8 SHA512 142d147fae940ec7215ddd610a80f417e1049e3eea565b15bb17336e23b061268b22497f1a5048a8a7a076d423950762aed5c65658d8aa04cf2f15f06ccbc50d
+EBUILD vulkan-layers-1.2.170.ebuild 1490 BLAKE2B ba45d1e33f4a005e4dfac11f93ccab9cb1938234b4b7c84e2492456d565cd06d5dfc763900c1cf83fa78fdfe61fc9887b991fff48f4ad59658dc6bed399776e1 SHA512 8c152efe16a791615d5156c5abd588f425f87b5d1823b8e0a5d1a9aab999eef9198fa32882cf1744129c20cc0e7ecb09985c4b0119724088f8c70f300a77e02e
+EBUILD vulkan-layers-9999.ebuild 1490 BLAKE2B ba45d1e33f4a005e4dfac11f93ccab9cb1938234b4b7c84e2492456d565cd06d5dfc763900c1cf83fa78fdfe61fc9887b991fff48f4ad59658dc6bed399776e1 SHA512 8c152efe16a791615d5156c5abd588f425f87b5d1823b8e0a5d1a9aab999eef9198fa32882cf1744129c20cc0e7ecb09985c4b0119724088f8c70f300a77e02e
 MISC metadata.xml 440 BLAKE2B 9dd8769693fe4ce6aae2493b4e9f0020da3fec24b35527ccc8a0d2ca014681b3a06019de49d7277286046b23b9b798e84d3c747909e6b7f19eed36d0e2c89012 SHA512 3977758a3f8c9d3648b8a70da5497c4596dfbf28509a84799920c39b6908703353584b01d8264fd39ec2f5fef5d1dba03c239a2848224531f42389de802d14da
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.170.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.170.ebuild
new file mode 100644
index 000000000000..1d652e22f4e9
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.170.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 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,9} )
+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-11.2.0:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2021.0_pre20210327:=[${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-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 71f1be1849f2..1d652e22f4e9 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
@@ -27,8 +27,8 @@ 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/glslang-11.2.0:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2021.0_pre20210327:=[${MULTILIB_USEDEP}]
 	>=dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index fd0b256f1bfe..98a2819383e7 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,5 +1,7 @@
 AUX vulkan-loader-1.2.162-Fix-pkgconfig.patch 1421 BLAKE2B 6271cbf4b9b91976a2e0e821f0f62a75c556d6fc54482add5c3be7d139013d9971e22ee462e0fed251e4d78a41f94ee3127702aa1052a1a5ff04e9ba036f9d64 SHA512 63309d605f269d7c48c86aff823cf1a17a1ab1e6778ee6fa838eecbc3e439fbd730610753fc64eba19c43ef441ab68dc378f778ef8ff84349fe925ff3be6a321
 DIST vulkan-loader-1.2.162.tar.gz 1421710 BLAKE2B 94b739821c5a12a94a52d8f0a9d79c13055ef3b45b907d53b82325b7be13db52b77d01397534e939bed5629d7a405ff8a09f8da374274a066986b4126fae9863 SHA512 89a99f282b73ec59dde30e4c8c09056b40416185a14ff9b7f7bd496754840e5ac764e7624f1f9a0f11792e786b00f19c3c9e55ccbb22a3c501d8ea9e815d84f9
+DIST vulkan-loader-1.2.170.tar.gz 1422110 BLAKE2B 8903fceee3172970ee4e9c41df7c9ceb3c4d21d380061c9442cf6c3c07412e5568f7d4653591bf53128088b928d7db8050782e9a90441b66e12ba12135e5c242 SHA512 b9512c8b30b68799a6cc2905e7a5593a1c03214edae7a99fd7bc27b1761f17ef70a61f422fc318dd805ac089bbfc6cf18dfe69d1b8a91789a1774ee396058747
 EBUILD vulkan-loader-1.2.162-r1.ebuild 1788 BLAKE2B e6b9dbcb8a6ff5cc1d4f1a445f7505a6dd4749eee774ad500eeeb8e4b966308b842e76ecf2e507c4144f9fa852a66f128ff954ecd4d1bb8917bfbf3b73547bfc SHA512 e2fe1e5a4322c8d7896a55551fe3b059cca82fefbe521846d9e8fdfca237876f6da7a9df1ffba1cef446fcac3a1f3e8adc106349eb0f584a5abb6f744a2f170c
+EBUILD vulkan-loader-1.2.170.ebuild 1735 BLAKE2B 7e92f7f99e21a883b8c6a8203ca2424fe2217e9c17bee7921a4ddbbf76c07e719da1a3f89a6b7e83c94347cfda2388229ee3096d675762022dddf511a5617a96 SHA512 fa730483da5a0e91309c11e44136fd239f94c5a7f643f52cc4449842fa39d923b434dd6546c639291063e3999ab52d53a464da7d6705b500ba398543697d634b
 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.170.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.170.ebuild
new file mode 100644
index 000000000000..060cfb0c20bd
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.170.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 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,9} )
+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-${PV}
+	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/waffle/Manifest b/media-libs/waffle/Manifest
index 0775f8164c40..71c19ff864a6 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,9 +1,4 @@
-AUX waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch 3008 BLAKE2B a81a85ffc11351034454b9f903827a012b0168ed113211e8a1cbab890edebff1baabd1b38a4721f1d4f92d5fb07a17c07e1806139b911be6a35be8ec27333c3e SHA512 ae9f1a6450da0f9a6332762740daf1bcba5740daab4c4fcc952fcebffe36a2d134a72a1a73f58d440a7e520d1065dd6a50ffad3910afb1c74890e7fa692d6d2e
-DIST waffle-1.6.1.tar.xz 227152 BLAKE2B 360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52 SHA512 1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
-DIST waffle-v1.6.2.tar.bz2 259740 BLAKE2B 62708dcda7800d2728ea708f88af5e9c3ff5bbeeef653d064c457ebf86620f67d8dfcd934425810ffb66a452814337e3ed13b6f3e8a4d420363a0b66ceeaf2cf SHA512 2b1e153277366731cb5cb3790c6ae1b884efa8e5e0d5a9499a218f1a902370a066e3253f9922297314943aa751596f70a33faff10c2e480ccc1ceace93ccecbf
 DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
-EBUILD waffle-1.6.1-r1.ebuild 1718 BLAKE2B 1e0ee700d4537d3da90f166724b59445e91a2870fafff71c7604fd91c6014001625ae420113583a8635a5ae48ddcd97d480080d938fa8df9287bdd44af9c4a20 SHA512 86a5d9bb19290a5f062c57402de0442d32288876ff21cc2fd6bf1c7a3edaac5660deaa3b2619772e63dcdc2d6fc349dd0f2473e07ace1b775729f43630270489
-EBUILD waffle-1.6.2.ebuild 1826 BLAKE2B ae87f2a7389a4404ce840875ba60e191b918f0717b6f64e0041a92b84a943bf4b8a136593e00da98cf23c5543eee1a3039f2077fae84261dec08f48d688cfbd6 SHA512 c59f5ee9199adbeb822993d3f269b3842111d986b555d08c641c234d12e5fc647c76797ef250d804d5f4029237a115af61c920fe687bf40d2a51263032905b67
-EBUILD waffle-1.7.0.ebuild 1727 BLAKE2B 1ca9dca8d8c9b422ef59653d5146ac40951e07ae33b4e241dcb20e54a6766bca74f239517125c2e64654c211754427e35a53048f9c72d1cb7632a85505b317d4 SHA512 261d7a6b43412c61dea8c2f44bd815c5ebb8ebe3fd1cd3f7602fa5c819d6ef8ebffe6ee17a9413111ff996e1376c7df6e1c026d1edb2f69f48a2f9429d622859
-EBUILD waffle-9999.ebuild 1727 BLAKE2B 1ca9dca8d8c9b422ef59653d5146ac40951e07ae33b4e241dcb20e54a6766bca74f239517125c2e64654c211754427e35a53048f9c72d1cb7632a85505b317d4 SHA512 261d7a6b43412c61dea8c2f44bd815c5ebb8ebe3fd1cd3f7602fa5c819d6ef8ebffe6ee17a9413111ff996e1376c7df6e1c026d1edb2f69f48a2f9429d622859
+EBUILD waffle-1.7.0.ebuild 1700 BLAKE2B f26a5b3174fd77e9ab91c271682a2ce258e92d79c562a3e0f6c858830b27ab897e3a67e36e41f8bf85722b267ae7b65dabe496121f82d8eaa15f46480717ffa0 SHA512 749cd982c751bf23d7bb4d8327491f8416bd3ed54e0864b993f02b01a5652185af34453a635b7e51d4e8b9fafb8151a83677a31554c68aa48ec2200f233cdb15
+EBUILD waffle-9999.ebuild 1700 BLAKE2B f26a5b3174fd77e9ab91c271682a2ce258e92d79c562a3e0f6c858830b27ab897e3a67e36e41f8bf85722b267ae7b65dabe496121f82d8eaa15f46480717ffa0 SHA512 749cd982c751bf23d7bb4d8327491f8416bd3ed54e0864b993f02b01a5652185af34453a635b7e51d4e8b9fafb8151a83677a31554c68aa48ec2200f233cdb15
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
deleted file mode 100644
index ef31275de08e..000000000000
--- a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From b71cfa674db5828a2be04a42ce9996d6677629ee Mon Sep 17 00:00:00 2001
-From: Dylan Baker <dylan@pnwbakers.com>
-Date: Fri, 7 Jun 2019 15:36:09 -0700
-Subject: [PATCH] meson: Generate cmake config and version files if meson is
- new enough
-
-Meson 0.50.0 added a module similar to the pkg-config module for
-generating cmake config files. Since the CMake build system provides
-these the meson build system should as well.
-
-v2: - Bump version to 0.50 instead of incorrect 0.49
-v3: - remove TODO comment that this fixes
-    - Add a definition of set_and_check for meson-generated Config
-      files.
-
-Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
----
- cmake/Modules/WaffleConfig.cmake.in | 10 ++++++++++
- meson.build                         |  2 --
- src/waffle/meson.build              | 20 ++++++++++++++++++++
- 3 files changed, 30 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/WaffleConfig.cmake.in b/cmake/Modules/WaffleConfig.cmake.in
-index b60b470..4e19755 100644
---- a/cmake/Modules/WaffleConfig.cmake.in
-+++ b/cmake/Modules/WaffleConfig.cmake.in
-@@ -7,6 +7,16 @@
- 
- @PACKAGE_INIT@
- 
-+# This should only be used for meson
-+if (NOT DEFINED set_and_check)
-+    macro(set_and_check _var _file)
-+        set(${_var} "${_file}")
-+        if(NOT EXISTS "${_file}")
-+            message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-+        endif()
-+    endmacro()
-+endif()
-+
- set_and_check(Waffle_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@waffle_libname@")
- set_and_check(Waffle_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
- set(Waffle_LIBRARIES "@waffle_libname@")
-diff --git a/meson.build b/meson.build
-index 29fda22..22b7f59 100644
---- a/meson.build
-+++ b/meson.build
-@@ -231,5 +231,3 @@ endif
- if get_option('build-examples')
-   subdir('examples')
- endif
--
--# TODO:  CMake config file
-diff --git a/src/waffle/meson.build b/src/waffle/meson.build
-index 322df40..cd68ddf 100644
---- a/src/waffle/meson.build
-+++ b/src/waffle/meson.build
-@@ -211,6 +211,26 @@ pkg.generate(
-   description : 'A library for selecting an OpenGL API and windows system at runtime.',
- )
- 
-+if meson.version().version_compare('>= 0.50')
-+  cmake = import('cmake')
-+  cmake.write_basic_package_version_file(
-+    name : 'Waffle',
-+    version : meson.project_version(),
-+    compatibility : 'SameMajorVersion',
-+  )
-+
-+  cmake_conf = configuration_data()
-+  cmake_conf.set('waffle_libname', waffle_name)
-+  cmake_conf.set('PACKAGE_CMAKE_INSTALL_INCLUDEDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir')))
-+  cmake_conf.set('PACKAGE_CMAKE_INSTALL_LIBDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir')))
-+
-+  cmake.configure_package_config_file(
-+    name : 'Waffle',
-+    input : '../../cmake/Modules/WaffleConfig.cmake.in',
-+    configuration : cmake_conf,
-+  )
-+endif
-+
- if get_option('build-tests')
-   if get_option('default_library') == 'shared'
-     # The unit tests need to poke at internals of the library, but with a
--- 
-2.24.1
-
diff --git a/media-libs/waffle/waffle-1.6.1-r1.ebuild b/media-libs/waffle/waffle-1.6.1-r1.ebuild
deleted file mode 100644
index 6bd3d6db7455..000000000000
--- a/media-libs/waffle/waffle-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
-	GIT_ECLASS="git-r3"
-else
-	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
-fi
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc +egl +gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
-	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xml-dtd:4.2
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/wflinfo$(get_exeext)
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X glx)
-		$(meson_feature wayland)
-		$(meson_feature X x11_egl)
-		$(meson_feature gbm)
-		$(meson_feature egl surfaceless_egl)
-		-Dbuild-manpages=true
-		-Dbuild-tests=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	! use doc && rm -rf "${D}"/usr/share/doc/waffle1
-}
diff --git a/media-libs/waffle/waffle-1.6.2.ebuild b/media-libs/waffle/waffle-1.6.2.ebuild
deleted file mode 100644
index a1d9e8bbbf26..000000000000
--- a/media-libs/waffle/waffle-1.6.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
-	GIT_ECLASS="git-r3"
-else
-	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
-	S="${WORKDIR}"/${PN}-v${PV}
-fi
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc +egl +gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
-	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xml-dtd:4.2
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/wflinfo$(get_exeext)
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X glx)
-		$(meson_feature wayland)
-		$(meson_feature X x11_egl)
-		$(meson_feature gbm)
-		$(meson_feature egl surfaceless_egl)
-		-Dbuild-manpages=$(multilib_is_native_abi && echo true || echo false)
-		-Dbuild-tests=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-
-	! use doc && rm -rf \
-		"${D}"/usr/share/doc/waffle1 \
-		"${D}"/usr/share/man/man{3,7}
-}
diff --git a/media-libs/waffle/waffle-1.7.0.ebuild b/media-libs/waffle/waffle-1.7.0.ebuild
index a3d7588a87d7..1a2174a6add7 100644
--- a/media-libs/waffle/waffle-1.7.0.ebuild
+++ b/media-libs/waffle/waffle-1.7.0.ebuild
@@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from portage
 
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
 	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
 "
 BDEPEND="
 	dev-libs/libxslt
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index a3d7588a87d7..1a2174a6add7 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from portage
 
 RDEPEND="
 	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
 	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
 "
 BDEPEND="
 	dev-libs/libxslt
diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest
index b5738a0bf96f..1f5542a648eb 100644
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,3 +1,3 @@
 DIST wxsvg-1.5.11.tar.bz2 514919 BLAKE2B d15d3478b69c4db4bd1cfc5032ff4909d35aca45f69694dbb74db72bc9d651fae3b8948382f60abd3f93a36dd4756f8f8f2c37acf7ac0b8859a9b03cb8cfda55 SHA512 d3538969bc0dda6bab740efef6952c2ca92e0ca74780c6370e3c6daf21d641e894b570d13b6ca408839b1b37df2aca9a3cf32d6423ddbf5f9f84274cfb1b8582
-EBUILD wxsvg-1.5.11.ebuild 922 BLAKE2B 087912d04790f4c465a1acd3f49055f82f48a2667558701222acc902e8c5fcb5c54ad84c9366ab6e7e75a4857cbfbfe4e408f46ee1d0f2dd1bda50879eeab30a SHA512 fb07aa53048ef08778ce42e170cf47c5c287323b451943b19f7a3b20ffff2a69da60db285f5b75ae84d11c27562ed2d3de5ddf97571fc73c66ca4e4d0c1917d5
+EBUILD wxsvg-1.5.11.ebuild 894 BLAKE2B 108ca0a6cbdf20640152f314f68f56c8072c2fa1cbe2c397593a58104afc066b85f543c8cc25c9a40eda2a9a152e1b063c84c7b0b8973b275ea75c713f771db4 SHA512 e385b6bb83829b6d0b3f620481f68251c754e757b94ae24b499f76832437af4a75903552118de0614234930c769c52316823f84e4e34817c2d48ed6fbf19bb04
 MISC metadata.xml 336 BLAKE2B 178a381a2b4cf5e5ba3d7b81e721257a354bb098ba0c5c2f2d13b66e4e9163f89ed73ed2329101263076d51267e5e9ceb6764010f6b7a6901937f0a5121587f2 SHA512 01e85d6e1cb1a4a3a717cf79df29e4eed10fc1d21fd3e3d431e7f849acf2282c2a3c85b49b3af7ad84072faab77e35ef1a91409de3ad62a21c34d2d97cd6831e
diff --git a/media-libs/wxsvg/wxsvg-1.5.11.ebuild b/media-libs/wxsvg/wxsvg-1.5.11.ebuild
index 4d9698b5bd21..29f3e8102c28 100644
--- a/media-libs/wxsvg/wxsvg-1.5.11.ebuild
+++ b/media-libs/wxsvg/wxsvg-1.5.11.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 WX_GTK_VER=3.0
-inherit eutils ltprune wxwidgets
+inherit wxwidgets
 
 DESCRIPTION="C++ library to create, manipulate and render SVG files"
 HOMEPAGE="http://wxsvg.sourceforge.net/"
@@ -12,7 +13,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="wxWinLL-3"
 SLOT="0/3" # based on SONAME of libwxsvg.so
 KEYWORDS="amd64 x86"
-IUSE="static-libs"
 
 RDEPEND=">=dev-libs/expat-2:=
 	media-libs/libexif:=
@@ -24,19 +24,19 @@ RDEPEND=">=dev-libs/expat-2:=
 	x11-libs/pango:=
 	x11-libs/wxGTK:${WX_GTK_VER}=[X]
 	>=media-video/ffmpeg-2.6:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog TODO )
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-	need-wxwidgets base-unicode
+	setup-wxwidgets base-unicode
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		--with-wx-config=${WX_CONFIG}
 }
 
 src_install() {
 	default
-	prune_libtool_files
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
index b363745ea67b..ab0408892e23 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1,4 +1,4 @@
 AUX tests-gcc7.patch 677 BLAKE2B 23258f8fd35fd650524b8b79a324206e73ae8921792898f3b57ad9f2412b79517e4bdd9925ebb997b5066dacdad3d9c480ac8cd54d65b7eba44219ecd2f91f9b SHA512 88e19bbb5e81f506dc031a2d8c2232396840784d3b22cdc67f8358792020c060432881c3a8ca126a96e779f83a12dd8209d7691c14cd2857a536dc0c84f3f074
 DIST zvbi-0.2.35.tar.bz2 1047761 BLAKE2B 5fa5fec7e39c9adc6590f3f6841a40ca723ffb6a017854f71f92f32232103672a6f48678b244a84f0cad742c378ffdb247fe33e5e3cdb1ee4d737e92f650a548 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d
-EBUILD zvbi-0.2.35-r1.ebuild 1303 BLAKE2B b1ea4f7a5d8e98a5e43336c8d5066c4b15d4cc1fb13f0fbf1689ace8a6403889a769cffa20bd5561cb2cf7694592589db07f48ea53034eae118cc7dea4ea8259 SHA512 cb9979831b5d908fc0feacf81fc799417dbd2bcdf7e8b8c3fb661ddf4a5ec57ce2e369ab5d24ca0a3d7bd41619dcddcfbab2ff482c7042a5ae50f81bdc0c990c
+EBUILD zvbi-0.2.35-r1.ebuild 1303 BLAKE2B c76617131c8cfa69bc6d9f5012510a4967400ada559933e5dceec584e9d86ce6ff8e5910370b628d7e0caf156863373f0c3564b5e0de96bc858b92192c83b2ac SHA512 203cd5b913edd9eff1fe8f5575db29ef423a4625c361f9ebc67d51d5b9fd8c40e481fdc09b0462a4d9065e521ae91eb0e9a8a51a151e0fac71873a56d40c5270
 MISC metadata.xml 244 BLAKE2B 55571cd41428f715036d3a2362fed34732d4e7508383a83799d507ec234175db13ca329b3c7b53487a3775149a8f16d26ea027ce67eba4bd8015a74810082cb1 SHA512 af9d2d89aee60846c292c11e0b2615eaedac9dddde3ff9ad6d4869892bd078ee0a16f8b87e17360d2c82561dd36c3c22bcd110e63835f4cba593e4f5f35db1a5
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
index 459e9441d5b1..106e0e4ce38a 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
@@ -1,8 +1,8 @@
-# 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 libtool multilib-minimal
+inherit epatch libtool multilib-minimal
 
 DESCRIPTION="VBI Decoding Library for Zapping"
 SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /media-libs
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)