gentoo resync : 12.03.2021

73 files changed, 793 insertions, 600 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6bc2042a681e..41db74e493e3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 4c2f1dffc0cc..5ee82f0a9089 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -5,6 +5,8 @@ AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa6
 AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bbc0aa009707e522e1dc3d09540bf1f9fa6350375f7acea942a986304a834964bb20849da4f08ff3f963b86f43c179a9fc2b012ff SHA512 d8960e21b713a24d415704d023443dc09d6a8909d65063a7b55da47228619485fc7e647c5c52e9a9459da027daaebdc19e6c3e56fe618ee5f553fd03c4716bcc
 DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
 DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febdcecddfda864559e1e9621f99c9ff7584fb422594c6fd3a1c352c892533c825faef10e35ecbf97058396fbb46fc7d SHA512 a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721
+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
 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
new file mode 100644
index 000000000000..df38a28b0382
--- /dev/null
+++ b/media-libs/allegro/allegro-5.2.7.0.ebuild
@@ -0,0 +1,99 @@
+# 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="Cross-platform library aimed at video game and multimedia programming"
+HOMEPAGE="https://liballeg.org/"
+SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD ZLIB"
+SLOT="5"
+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 )"
+
+# TODO: For tests, we need some extra deps.
+# -- Could NOT find OPENSL (missing: OPENSL_INCLUDE_DIR OPENSL_LIBRARY)
+# -- Could NOT find MiniMP3 (missing: MINIMP3_INCLUDE_DIRS)
+# TODO: Tweak REQUIRED_USE for tests?
+# WARNING: allegro_video wanted but no supported backend found
+
+REQUIRED_USE="X? ( opengl )
+	xinerama? ( X )
+	|| ( alsa openal oss pulseaudio )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dumb? ( >=media-libs/dumb-0.9.3-r2:=[${MULTILIB_USEDEP}] )
+	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
+	physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${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}] )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
+
+src_configure() {
+	# We forego freeimage for now because ebuild is not multilib
+	# No known consumers yet anyway
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_DEMO=OFF
+		-DWANT_EXAMPLES=OFF
+		-DWANT_FLAC=$(usex flac)
+		-DWANT_IMAGE_FREEIMAGE=OFF
+		-DWANT_IMAGE_JPG=$(usex jpeg)
+		-DWANT_IMAGE_PNG=$(usex png)
+		-DWANT_IMAGE_WEBP=$(usex webp)
+		-DWANT_MODAUDIO=$(usex dumb)
+		-DWANT_NATIVE_DIALOG=$(usex gtk)
+		-DWANT_OGG_VIDEO=$(usex vorbis)
+		-DWANT_OPENAL=$(usex openal)
+		-DWANT_OPENGL=$(usex opengl)
+		-DWANT_OPUS=$(usex opus)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PHYSFS=$(usex physfs)
+		-DWANT_PRIMITIVES=$(usex opengl)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_TESTS=$(usex test)
+		-DWANT_TTF=$(usex truetype)
+		-DWANT_VORBIS=$(usex vorbis)
+		-DWANT_X11=$(usex X)
+		-DWANT_X11_XINERAMA=$(usex xinerama)
+	)
+
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	local HTML_DOCS=( docs/html/refman/. )
+	cmake-multilib_src_install
+
+	dodoc CHANGES-5.0.txt CHANGES-5.1.txt CHANGES-5.2.txt
+	doman docs/man/*.3
+}
diff --git a/media-libs/elles_icc_profiles/Manifest b/media-libs/elles_icc_profiles/Manifest
index 0340fad79955..ff6d87b86f54 100644
--- a/media-libs/elles_icc_profiles/Manifest
+++ b/media-libs/elles_icc_profiles/Manifest
@@ -1,3 +1,3 @@
 DIST elles_icc_profiles-20160501.0932.tar.gz 334145 BLAKE2B c2aa9b8720a83d9296e87e0dc56c18e34536a395d80412589d29a5d39bb36ea8c83929afdc1c36b335f3bff4b6d19b5793fd25b8ec45ca49ad159008a70e1f2e SHA512 10a3df45aadf923b2d7ff9c8ee906b000e70ad7d17c1a5005f889b49c6d57849c8befb5c4ed92748908bd5506789b6877c0504666de43c1a8621f646ab665e2f
 EBUILD elles_icc_profiles-20160501.0932-r1.ebuild 559 BLAKE2B 473ef32b6561276e8432848f52cef71fc5bfc2087eb77a5757bfe8041ba19e740a07c9c8291c4dabf8010e924564e2a1a6d78a2feb93fe7701dc42e1267d750c SHA512 5f594d399dcafdcba8e8dc7666fe7c6061e3420ae00cfa1682b070432f25094afb780e2f08e780821388ed1542587a5f84b7e80fc2e7c4de4c8f455c99b312dc
-MISC metadata.xml 1155 BLAKE2B 7d65efd6ec703153a72426b810abb5ea5a2d2f705f2c2971f8196c0591726f5919ca293e82b5f230ce5d994569950249f6cc044714fd50bdb71eadc0a6343c1e SHA512 3ab1772a6f2e06380dbd61e10926dda5ca7c80f1ae28cbf6e0f62e546c343eb8d9661bd6570c575b6f70cc83ea93e7df009a13eb4cecca4fcc63d4540bad37ae
+MISC metadata.xml 1179 BLAKE2B 6e99d727506a7e9e989b76d627bbc3d5b621ac07966536b4b626c5d0405acb2214df7c519c6ba0ca99e6409b62889974d3dc0fc9dc94e12b5c0a9444ba46b9a0 SHA512 e460b09626c0de8ad92dabce05528eceb13efa859224681b8d1e7df73c4d980a1084b0b6b28d41f1e936c18e253cc1e6cbe692cdbdfce69e482860ecf3f1fd38
diff --git a/media-libs/elles_icc_profiles/metadata.xml b/media-libs/elles_icc_profiles/metadata.xml
index bf2fc8f218e5..8aafea199dd4 100644
--- a/media-libs/elles_icc_profiles/metadata.xml
+++ b/media-libs/elles_icc_profiles/metadata.xml
@@ -5,6 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		Elle Stone has developed LCMS-based ICC profile-making code which
 		makes a variety of RGB working space profiles, plus Gray profiles,
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index d3648818480f..918b7d96129e 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,4 +1,4 @@
 AUX freeglut-3.2.1-gcc10-fno-common.patch 3500 BLAKE2B 7163acef56f8f1bfebeaed554ecbe7a27dc3321bd19f5da5c1f482f52a447acf7bff3b8358d8023d8552fa5fa999475b70e3ec7242e8a127000ee7b49f2f751b SHA512 0845bc4c91c6233cab8c56d15d1efa8fcdac7ae12270a089f8dd20520fc5c94078b7abceadef304f8f42cd575a61ad5b1f444f21e0bbdd3ff310bcc40192336b
 DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
-EBUILD freeglut-3.2.1.ebuild 1495 BLAKE2B e06be19800d6723db22c152a7989794e537ffd6e0ae10e75b83b457bd3567cf90b912f4a3c4a56a82d9cd3552a15d7a9c2ec6be6cd748f3d7ec55a326885daef SHA512 900f862d0ece2ee074e4028ed65f8dbae784d44499d3c24c7815a4400b129bbcb9939cc927efc5b41b6b6826cb16f6c8fc083075efec0ee25ef1d928709cb872
+EBUILD freeglut-3.2.1.ebuild 1496 BLAKE2B 4caaa8ebb3687289b65a1affa82cca7dae944f211765eaf8def4876fd2e798da87a827b5d9ac9ac285c6ab0c68c36b659237632e9e277dd1cb9d596ae23cd353 SHA512 3e8e19d9dbd77c0b7efa554735804a52b70a46e0f6c9a76ca68477b06f83e62fabf492dab89454a82ba3aa9a50880c73aba2f9d82a2e26ab22e608f432f4190e
 MISC metadata.xml 528 BLAKE2B ee8c09e46677ec77c1d6771b31ac1b28e75464d7e0e4405c41831e19446c5a442c782dbd32a79d0fe5e7ed85ecbd2404764f2121f5f4bff5483db4571fd89212 SHA512 94dc412f8f049bb88723fdba9f9b89645eb792547a768ea524a711ad9302c5cac38a7292ab09726154fc6829a05f41af05220f91d9f6eaed056e4cff8324370e
diff --git a/media-libs/freeglut/freeglut-3.2.1.ebuild b/media-libs/freeglut/freeglut-3.2.1.ebuild
index 35753e70c800..8cac34cf3c48 100644
--- a/media-libs/freeglut/freeglut-3.2.1.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.1.ebuild
@@ -44,5 +44,5 @@ src_configure() {
 
 multilib_src_install() {
 	cmake_src_install
-	cp "${D}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die
+	cp "${ED}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die
 }
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index f683e81503e8..bab6a710a4c8 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -3,6 +3,8 @@ AUX gd-2.3.0-fix-tests-bug722448.patch 2231 BLAKE2B 629caa9cd7dbd63cab93c9746692
 AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244d0b858f520da1835547853d693f7c71621222744fe438f393aaaefa1fc6316ef27442a426af09df95c0faa2 SHA512 24d4774af36ca832504063c8327ff9a84956ae1a48cda3ef6f27d819e8a18b31a9083f2ce6d2587d5acb237d8c96c3d68cfe8eb8350a10715c15d16aca1cf37c
 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
-MISC metadata.xml 1444 BLAKE2B 39e3cd90d98350aa1c4d1ff96f3633db5084f181fa0b01c280d88b4dc87d425090f720c329543c42af9b92a03c27ca823e890190bbb92e5feb492fb69e7cf20d SHA512 76e5dfdfcd85ca4dbec0736b145cde370d692c805297fcf82636dd1dc3915690c895db5d4da319e1cf16c21ff27e5b9d40b11efac60386360fcb04e31fb39e50
+EBUILD gd-2.3.2.ebuild 2638 BLAKE2B 03d95d2ab48aa709d6ee6b9125a672fb1813204f18a58cc53742c4b827b8e6d8ccd93d09f65aed46da3cfcdd772a7a14e082b24a7e0f523a0e72df15107636c9 SHA512 b39c076366d61d93121e841cf8293ca431b6be35a6c798b4ae6ed17fcba5bef6d25ea8bc2d19c18eac10ad907eb9309249287b82537682a3e53fa6695c9db81e
+MISC metadata.xml 1636 BLAKE2B 2f70829e07669f433893a7ecd5dc7097e3ca80c6d86ef018823723601228d5960ea4c4bf97635107306e1e0fa401c593374a3a5514b645211c05bae253a95511 SHA512 5ed6fa619ad40835ae21266222975283322ca6092f8a5ad71258f48e012fb6537b44da2aa6ea07b92043dd5fc252239af5b51f558ddb69d7f6ce1cb667bc223d
diff --git a/media-libs/gd/gd-2.3.2.ebuild b/media-libs/gd/gd-2.3.2.ebuild
new file mode 100644
index 000000000000..5797a5d83b04
--- /dev/null
+++ b/media-libs/gd/gd-2.3.2.ebuild
@@ -0,0 +1,90 @@
+# 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
+
+DESCRIPTION="Graphics library for fast image creation"
+HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
+SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
+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"
+IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib"
+RESTRICT="!test? ( test )"
+
+# fontconfig has prefixed font paths, details see bug #518970
+REQUIRED_USE="
+	prefix? ( fontconfig )
+	test? ( png )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	avif? ( media-libs/libavif[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	heif? ( media-libs/libheif[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xpm? (
+		>=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
+	if use cpu_flags_x86_sse ; then
+		append-cflags -msse -mfpmath=sse
+	else
+		append-cflags -ffloat-store
+	fi
+
+	# bug 632076, https://github.com/libgd/libgd/issues/278
+	if use arm64 || use ppc64 || use s390 ; then
+		append-cflags -ffp-contract=off
+	fi
+
+	# we aren't actually {en,dis}abling X here ... the configure
+	# script uses it just to add explicit -I/-L paths which we
+	# don't care about on Gentoo systems.
+	local myeconfargs=(
+		--disable-werror
+		--without-x
+		--without-liq
+		$(use_enable static-libs static)
+		$(use_with avif)
+		$(use_with fontconfig)
+		$(use_with png)
+		$(use_with tiff)
+		$(use_with truetype freetype)
+		$(use_with heif)
+		$(use_with jpeg)
+		$(use_with webp)
+		$(use_with xpm)
+		$(use_with zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc README.md
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index f341db0625da..6c08c2fe834f 100644
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/metadata.xml
@@ -28,6 +28,8 @@ and so forth.
 		<bugs-to>https://github.com/libgd/libgd/issues</bugs-to>
 	</upstream>
 	<use>
+		<flag name="avif">Enable support for the avif format via <pkg>media-libs/libavif</pkg></flag>
+		<flag name="heif">Enable support for the heif format via <pkg>media-libs/libheif</pkg></flag>
 		<flag name="webp">Enable support for the webp format</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index b9111419adc9..f95909c4fbeb 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -4,5 +4,5 @@ DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab24
 DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
 EBUILD gegl-0.4.26-r1.ebuild 4918 BLAKE2B fed1558637b7204e42276acce1686e082c30872da393ceb587fb65fa5799868e6a3e547fd053cdfdb4d03944e13e739f6e7d0f612b145a20275a94c851fa3330 SHA512 be8f2fc4138d83fe1d302ae195a31d5da438be83daad88c729bf1bdec28a31c8677a469143e1a8f59de8ad48a8032405c04396ff6b05f2b9e5a726232752c395
 EBUILD gegl-0.4.28.ebuild 4922 BLAKE2B d8ea7a1ca2ed1370330ec03d1cb8650ad45a7b7172322c567ec50aec302b453f434aecfc30bfe6242096d92d9eeaa6a53223c79b2fbe894840be8f3582026d5a SHA512 0d195fb4b3dc1b9d496a7701d26c7f508c3177eaa5ce9d180777b89bb99e1dea79289ef8deacd9cbb3de62c98b7e83b3b21068adbca7a228e1dca83008cbebf4
-EBUILD gegl-9999.ebuild 4334 BLAKE2B d83101880fbaac028f3cb680251c7888f3113ed98a2be7bae7eb24020c3954c61aec3d9603d9befc036ecf9ac9e9ddeb65c85a847aa6b7ccc831df043cdcc80e SHA512 8840e9585942ca50a96a181269878e174853bcf57818d4429d6117baba441fbc95b11bef262d74d974ec225b985acfcb63206ca5c439065ae6933b27b529bc3e
+EBUILD gegl-9999.ebuild 4579 BLAKE2B ad31fb273d8f344da9e3e9b3574896170c9b1a433cfdcf4af98c6c3d335ea177086acaf00f9b1c6f3de081b87a000a3620e2271c0e44c66ffe740fa29343988c SHA512 90b820a15cd92aaa9f33c062219e78af5f93145ea1fd0b89966bf9966ef98e69bcba6d95cda47c511a2e8cb0f129058e7203c84aa100497c92a80397916a24f7
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 2dded5def551..c0ed1b98aeaa 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-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=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_USE_DEPEND=vapigen
 
 inherit meson gnome2-utils python-any-r1 vala
@@ -62,6 +62,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-lang/perl
 	>=dev-util/gtk-doc-am-1
 	>=sys-devel/gettext-0.19.8
@@ -73,21 +74,20 @@ BDEPEND="
 
 DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
-	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
-)
-
 python_check_deps() {
+	use test || return 0
 	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
 }
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 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
@@ -111,13 +111,10 @@ src_configure() {
 		-Ddocs=false
 		-Dexiv2=disabled
 		-Dgdk-pixbuf=enabled
-		-Dgexiv2=disabled
 		#  - There are two checks for dot, one controllable by --with(out)-graphviz
 		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
 		-Dgraphviz=disabled
 		-Djasper=disabled
-		-Dlibjpeg=enabled
-		-Dlibpng=enabled
 		#  - libspiro: not in portage main tree
 		-Dlibspiro=disabled
 		-Dlua=disabled
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 9d177123910b..f59ece4a2b10 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,4 +1,3 @@
 DIST gexiv2-0.12.1.tar.xz 372104 BLAKE2B e712bc8056e0e02d66ee831425776c26b65275db8f4cb4a526dbe9f00bddc473312f6c4c8e011906ca02ff256c00c7fe8d602acd64c787b05e13ad582ff8ebee SHA512 cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d
 EBUILD gexiv2-0.12.1.ebuild 1785 BLAKE2B f9ee602000fffb2fb5a7da96a8387abe8c5fd20349886197a88b254e43364c45ea0f66c295cb65ce77358338fd805959681bb4c175b837b1deb95427ebcee9fe SHA512 9ca34e4290ad103f6cea1769cf24dfd8df0c74c92a7d50e27e7703d02c09b990a405577cb1237b451ddb4c82761fe6e1a1e2c90719cbf3d369d9dcb35a66de49
-EBUILD gexiv2-9999.ebuild 1626 BLAKE2B b653d799388cfd363d2e61a33b0c2a9060fbd284ab6bcdb7f391eff51dec41bc727c9fceb0b561d42d88c1d1bfbfaaf448c76cef558100ffb42f796710ea5828 SHA512 a52da59be73cd2ae891b406a029d6fa72bc714337dfc76758c4f59593c5180c5ed734cf128baa3653c921a71869284111a85fb530dd5ee389715fc3f6d5b83a0
 MISC metadata.xml 513 BLAKE2B 7820281c36922b5e68aacb3c3935f7193e2725515f196eaf72f6eba42327a8c8d10ceaed6422fb95cf15b0f1a0d96a168c7a677e42ae847fe050b26c39c39a0b SHA512 deb951010c3342738d8ad5b9e79baa790913f3b906799f9f72f59d4e978f0564fc52f14482bb632ffe817488d154bd8bafe98bc5eea07b7c2da1504867d671b0
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
deleted file mode 100644
index 4d9de41ebce9..000000000000
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-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 )"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pygobject:3
-		media-gfx/exiv2[xmp]
-	)
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.38.0:2
-	>=media-gfx/exiv2-0.21:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		# 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/graphene/Manifest b/media-libs/graphene/Manifest
index 9f6f541a01f0..3e6403ced7d5 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,4 +1,4 @@
 DIST graphene-1.10.2.tar.xz 292372 BLAKE2B 94553a32dc57216402a9676e11525552c010d970caeb1256dde50ca842b4d673ad78d004d57e7c7a017b8c6e64ad75fc3b03603cba746027ab10befa76d32955 SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0
-EBUILD graphene-1.10.2-r1.ebuild 1706 BLAKE2B ff096a29e3b6184afdadb0d0a253a1aa35ccac54becd12f49c2c036dcd0aef29b536cbf3d6c6ce70cc8fd59429ed5b2261cefd5faf8d6abfd60b1e969cb21dfc SHA512 e1545d9d6bbcedfdbe59aa222075fd6920b15403a50268d7142f39a5bc33b81d97364cbc268c85f688dad50f79271fc44aa9afb63d92d4b5ff0103ccf07b5ac7
+EBUILD graphene-1.10.2-r1.ebuild 1705 BLAKE2B 4ff0ca9ec420607e1b197aea11e6a356ee3aff3fc891f18dae8b2c3a29075a00f4a69a0c2f09aa18863a25db1e509c2ba93faf470bd154416167bb4110a6b296 SHA512 4b3e28e4363e730277bf45104a362f91bc26ece330364a9fcde0fc876764af203fee5e2bdb8e567973c0d8f09b25335d6f78683f1d9ecc4f2467d7a19905c554
 EBUILD graphene-1.10.2.ebuild 1699 BLAKE2B dbfa70bea4f57e2d759cbe4bcbd43d381e485f6fffce1dc412c3d0bd9e51888138afceb49597067bf34aec9f244d941aea64c09c27d693e2367ba5ddd7a5808f SHA512 31368e60b6c0c4b44435e5972352de0748536be54a343b919b0fd4b615cae966ca106b667d9e39c95656866d340226df06cfc2d1e88206099d98059cc7d029f3
 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 0de3c1124ed5..0e8e63c01e29 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/hamlib/Manifest b/media-libs/hamlib/Manifest
index 7312535d563d..50fbc340c8aa 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,10 +1,6 @@
 AUX hamlib-3.3-format-security.patch 738 BLAKE2B 896d6023f68979400ba8782956da86b9d30878f661eb70ac40f595cf903739f29c11fe4a3d75135333c65148ff8d0e2fb8b81e03ea32520d16b0824e9262be01 SHA512 fea0ed27228de5177f1f849e237a517b32f3efd74efab4dfc858c75ae7339dacf942097016229faaa790396f6627160e0e4716dfb16eb496e91c5d8301134098
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
-DIST hamlib-4.0.tar.gz 2242857 BLAKE2B 458a5cadc36f8f434fefc73b6230b08c858a741a685805e8d8ab1e2bd74aef9667d6b3d006aa493516830a6fc8af19e77b4d92736198bb920797aecfac605f41 SHA512 6c097f503d1050dca4e5ab9091cd9885f8db8b0e4b2fb26af570f1871f2da713ac3fe10e3629d20ebfc2927768555ad277e68cc38821f4a905900b8d3a5ba8c9
-DIST hamlib-4.0~rc2.tar.gz 2188867 BLAKE2B 02df21910266e47c99e3cd72fc815ed75b9b5f50b29b9a94aa6fc5ddac73b1a09d16caa0d5e4be71bfe44e1940b853a0a8e1303f23fbacf003da18eed198531c SHA512 6d192bbb1c98e76fdfd1dd6bde1d0fd8b668243332827ae609e7bb4a93a3fed9fda0b12363638f5e9df65d65fd2305dfd493bd37a99aca2f2bd5b0861e948d5b
 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.0.ebuild 2042 BLAKE2B 85eb4910782ccad90bdcd0361a7df1fbca5614cc9ac70a7a0fa4436f5f2b5662e63a4f16819a905f308137f860b5673af6bbfc9bcd26f54106915a6723319a97 SHA512 cd02f20205904e8e745c1a4face3c1ac8ecf6acfa7b654999dca8d3f48326a5ab579e7137c9efcab0aaf7ba8d8511b3380f73d9dc82ad3b1bd38bf342c8e9ef2
-EBUILD hamlib-4.0_rc2.ebuild 2062 BLAKE2B ae28931887b38c1d76b2887400912bf2ed36510d89515b3457cccea08ad31035ef927c46ca9ecd28823fbe498359f8d1490b1d6434b254db814c9cb90ecc0a21 SHA512 0e383c2449a97aa0d8e0e8b2fe10cae2da174fbd8fde7d268065ce87c203cbe6a8fdfd5a7c4be68a3f3c85eb4d776d686f1efd7f95c11b27b47af26e46d36797
-EBUILD hamlib-4.1.ebuild 2057 BLAKE2B 7bf5bcee83869eabe6dbe90cb17647e7684f587ac8ef6b13a7d6e95cbeb220be02dde958cf8c875474bb2a5395b20c7dac9181499d12a7ca05536d1206097607 SHA512 b866afe7a42c8fba1de7d7c04b68a8bc7c2e05d57a78e62ce5d59f9e116280f0a20eba63cd8b30a94e8caf430cbd9295ab95640d2b094cae26591ffa89dae352
+EBUILD hamlib-4.1.ebuild 2059 BLAKE2B a3995c0df56ea1749eba18d5baa69d539297cd6dbdd809a61adbc3eb0da8c6a7a1a7dca06c7d98c7573ca4883f2487f4e7d1c77cf0ce6d08e9b615573fce7c3a SHA512 ebe679507cb0640baaa69571105c2a3b8fb064073ecfd1a23499d8b86cff920d8ed7502e9125b27c8e9196dcf393d255474df1afdf9f34dde26b40911486545f
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-4.0.ebuild b/media-libs/hamlib/hamlib-4.0.ebuild
deleted file mode 100644
index 5d4e7ef486ef..000000000000
--- a/media-libs/hamlib/hamlib-4.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="https://www.hamlib.org"
-SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-}
diff --git a/media-libs/hamlib/hamlib-4.0_rc2.ebuild b/media-libs/hamlib/hamlib-4.0_rc2.ebuild
deleted file mode 100644
index a3b8c853065a..000000000000
--- a/media-libs/hamlib/hamlib-4.0_rc2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="https://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer TODO)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-}
diff --git a/media-libs/hamlib/hamlib-4.1.ebuild b/media-libs/hamlib/hamlib-4.1.ebuild
index d5550a87ae9b..0e74ee1e6b9a 100644
--- a/media-libs/hamlib/hamlib-4.1.ebuild
+++ b/media-libs/hamlib/hamlib-4.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.hamlib.org"
 SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
-SLOT="0"
+SLOT="0/4"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc perl python tcl"
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index ba4af3096209..d4d52ab6ee96 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,6 +3,6 @@ DIST harfbuzz-2.7.3.tar.gz 16696840 BLAKE2B 95eb0fc86caf51f512520ba599e9be08b4a9
 DIST harfbuzz-2.7.4.tar.gz 16703694 BLAKE2B 9932c039bb27ee53179e500c80ae8bd24d4cb77d4fcd01c10b8b5f0fd55de6af3c265196aa80653835f464c5431f89a870a7112eaf2c715f05e1e084011fa240 SHA512 5b412e0f6d1c9142a0ef2713826cb8d6ebf348c5b64054a0676d3ce084bcff1de375dadf90e87dbbf6d0ec8e4a99339cb64b514d5464efb7e27037551e494099
 EBUILD harfbuzz-2.7.2.ebuild 2661 BLAKE2B a6bd48d29506d99817b97a68464f7f662b72e6c0e8df0f72def1b5ca25cc145645cd96663487b4c3152fb6b99837167700677f4e2b8785f23d93cbaa80abb900 SHA512 733df9dbbe4036f88f66672da20c58345a42f602c097cb846a75c34626dae380d70cef4ed4f0e4a8909518c93ffb9dbd5ddad8a9f98d6c163e395b5f33860353
 EBUILD harfbuzz-2.7.3.ebuild 2670 BLAKE2B 7440f374a018e052194a2deeec2f810839769466de248dc1d9c66db2bf5321f3706e8e6ac186b9457fa1e3f189489746a4c707d8c0763076b17d255e90a0f193 SHA512 a62aa5bb0e35b5d68022c43985eaad257306900ba4399b4e65c9a4fd3f99b78d6220204eb2148cb936c84656a3edaf55513afebe74b996b8b7cda033e89e12af
-EBUILD harfbuzz-2.7.4.ebuild 2775 BLAKE2B 72290ee76d7d0f8faceba6babf63575ae74eafcabdcf394e8e106822783014662819b28a34bfb2e72331bf9340e71c0bd6ba65cef0b77da7f01b41786e1926c2 SHA512 6d7efb61f320fa807c04d7d36402258405f64d57e2275d0c2bc6559e9f9190d9a4b3eadba3f8c3d39bd6ee97b2f1f9164ad77de974a150912a72f75dc3e50d44
-EBUILD harfbuzz-9999.ebuild 2775 BLAKE2B 72290ee76d7d0f8faceba6babf63575ae74eafcabdcf394e8e106822783014662819b28a34bfb2e72331bf9340e71c0bd6ba65cef0b77da7f01b41786e1926c2 SHA512 6d7efb61f320fa807c04d7d36402258405f64d57e2275d0c2bc6559e9f9190d9a4b3eadba3f8c3d39bd6ee97b2f1f9164ad77de974a150912a72f75dc3e50d44
+EBUILD harfbuzz-2.7.4.ebuild 2768 BLAKE2B baf2486a8dd32b590c304d7c1f2da1e0318aa8a173d8249088061b38998ccfe5625f5af245220f312b0dd2a5589f8931748df0d340bbc2b338f3d024e750fef6 SHA512 b52d9c5aa13a76c713670b19090d042d3b8e7c74ca0fa3e95cc02cb9155a39cd8e6e890c99623130602b0f1226f5e75f368d96773129a79ebe6759d6fc26be57
+EBUILD harfbuzz-9999.ebuild 2775 BLAKE2B 09138736a479f0bbf49c50e232bf66cff70dfc78e46166f3be07231002b3a1c3813be2c04af35468f0fab9459f4a7e58dc7b8d70eb56ddd94a01b67d343a0ed3 SHA512 fdc7e80b435ac37008654bac7771a00a0e06878fb9ea217b914f57a954ddd1266cbfdf737cbccbe624596d4a14fa3ff49f13a69644ecee595c670593280d0ac8
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
index 4641ca787616..30f4061f3c5d 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	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"
 fi
 
 LICENSE="Old-MIT ISC icu"
@@ -34,10 +34,10 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	>=dev-libs/gobject-introspection-common-1.34
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
 	introspection? ( dev-util/glib-utils )
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 4641ca787616..dd5ebd99dc19 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -34,10 +34,10 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	>=dev-libs/gobject-introspection-common-1.34
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
 	introspection? ( dev-util/glib-utils )
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 07a2426afd11..2633601df7cc 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -2,6 +2,9 @@ AUX lib3mf-1.8.1-0001-Gentoo-specific-avoid-pre-stripping-library.patch 1047 BLA
 AUX lib3mf-1.8.1-0002-Add-library-link-dependencies.patch 2567 BLAKE2B 10bae2bc7422bd35b05fcb4c016f9391035baad0ff903b628ce8d6f7e8e2e3f758360306772c6a6603e24ab037d8e98348f616da4dae9b509c2e342697e57801 SHA512 97bef547c3c5e7e25bdec1d5f907852e883b62c6e481659cefb48f3b69f8a26804ff8ee45657349345f3d6e9452251b68043767a44b6ce3b4e759d6ada2c21de
 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
 DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a
+DIST lib3mf-2.1.0.tar.gz 15882048 BLAKE2B 9466e1fd30d82600dcc52f61709c1430ae3c129358225162a343ec0d7f489e14572882a9c5239ccd63ea66ee7faec1563fa5aa0e788f28d18ad96db0ae7b9f36 SHA512 05f92da9cbbac279baf33fe3a7ce43ff7faad987c4ba08120094406e1a8f9bab2330b47822fa0a84d1558be9c829f3e805782a46ed85b706e7f85cb861d0d4f5
 EBUILD lib3mf-1.8.1.ebuild 1076 BLAKE2B 3bb98e5e52aaeeb101469619e10e01da43fe2f9da661075b44042aab351e9db8a65b34d156c360df6ee8aef3ffe15b07d2a935630903be4b22482e5f51a72141 SHA512 ddb2f6e90b2cbcc048efb496577e14fe4c6600ba3ed311e8b8a9910c808c105ed46f9847a6af725b18423032957627c13cdfc5f658337a1242d4b38d88e4f247
+EBUILD lib3mf-2.1.0.ebuild 1433 BLAKE2B 77a7906db88af83ace93bd42f4dce4058bca3d798cc96a11f694cf5ca7fbb9251aa5993fbc7c6b27be565e5a3065e79cea7bf7487fbf459d283d964a79ad9b06 SHA512 6f6fefc60f490668f37ee720ee815d50404514853f200280aa53e28b2c1dfa611aad24b9dee97ee7bf07e0c7b8f752aa786577877a39ebf75fc851dae11b96dc
 MISC metadata.xml 693 BLAKE2B 9b222dffbdd2718cdde2fa6b3ac9b53a4b353900e63fa90af886705a5b1667aa5ac38d9d7b026ee45c6a0f90c7264676476f7ed95b4f2e030842f53a48c8eb73 SHA512 bf0c3889b8c7ea456c3132eb182cb9fa46270ec632114e71f94a818dd1916770aa63627677778e7e4456c94500eb7b4227e03ba44191f34ec8c8a7736b6432d4
diff --git a/media-libs/lib3mf/files/lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch b/media-libs/lib3mf/files/lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
new file mode 100644
index 000000000000..7c5cdd0c68fb
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
@@ -0,0 +1,27 @@
+From 13f974157b178efe4c6d617f23246dde2b100f0d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 10 Feb 2021 18:49:14 +0100
+Subject: [PATCH] [Gentoo-specific] avoid pre-stripping library
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c8b4ba..05d493f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -182,9 +182,6 @@ if (UNIX OR MINGW)
+   # Uncomment the following to put the version info into the .so-file.
+   set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${LIB3MF_VERSION_MAJOR}.${LIB3MF_VERSION_MINOR}.${LIB3MF_VERSION_MICRO}.${BUILD_NUMBER}")
+   set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION "${LIB3MF_VERSION_MAJOR}")
+-  if (NOT APPLE)
+-    set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS -s)
+-  endif()
+ else()
+   # wd4996 masks the deprecated-warning
+   target_compile_options(${PROJECT_NAME} PUBLIC "$<$<CONFIG:DEBUG>:/Od;/Ob0;/sdl;/W3;/WX;/FC;/wd4996>")
+-- 
+2.30.1
+
diff --git a/media-libs/lib3mf/lib3mf-2.1.0.ebuild b/media-libs/lib3mf/lib3mf-2.1.0.ebuild
new file mode 100644
index 000000000000..39ab6d0de474
--- /dev/null
+++ b/media-libs/lib3mf/lib3mf-2.1.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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"
+
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libzip:=
+	sys-apps/util-linux
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-cpp/gtest
+		dev-libs/openssl
+		dev-util/valgrind
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-Gentoo-specific-avoid-pre-stripping-library.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
+		-DLIB3MF_TESTS=$(usex test)
+		-DUSE_INCLUDED_LIBZIP=OFF
+		-DUSE_INCLUDED_ZLIB=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DUSE_INCLUDED_GTEST=OFF
+			# code says it uses libressl, but works with openssl too
+			-DUSE_INCLUDED_SSL=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( CONTRIBUTING.md README.md )
+	cmake_src_install
+
+	cd "${ED}/usr/include/${PN}" || die
+	ln -sf Bindings/Cpp/${PN}_{abi,types,implicit}.hpp . || die
+}
diff --git a/media-libs/libaacplus/Manifest b/media-libs/libaacplus/Manifest
index 0a6228c2a7a5..ebc973e8f5f6 100644
--- a/media-libs/libaacplus/Manifest
+++ b/media-libs/libaacplus/Manifest
@@ -1,5 +1,5 @@
 AUX libaacplus-2.0.2-clang-inline-redefinition.patch 1277 BLAKE2B 6df3ac18034ad74bb46e1fe84ba616558ffc4635ed15414bced6e438c7f7f96db4ef2adc2e134e0495a16714e244ceefdb0c0e187fd35ae137e672b50f24480a SHA512 19fb221b29f1e65f26146358943bed62e0002dd8dc682d9af6134f8f497ce67901fb4ac1eea6c957536900715f82e36914e89f70bd5c50e364dc7f72a13bb340
 DIST 26410-800.zip 1348294 BLAKE2B ff774eb4c6db9a545ccd06611237d35bca192509b44cdfdcdc538c4aa4895e3ca6139904e25e44a457bbfdaa2306b17c3029b916b02c2e35bf9c267fb3007901 SHA512 a1d5a4d9b67b4e7292d3d07ba62090f92e9f6cd90e72aadb0e4067120941cc89b93ed136023461354567e845f34274a8097187a70d1477695b3e2024f86ee29d
 DIST libaacplus-2.0.2.tar.gz 42155 BLAKE2B fd65ac4d1a59136b1af1209f5ade9ba331ccb3d529e184329594c95654829e0bce29d107a221542b2ac3800610062774be52a1619aa0b591eaec3d8836b049a1 SHA512 05a6cc206fc187c96b065e94a80a57f6f1610fc5a3228f0163ac5acedabab2f2501dec8df3d196b9a1e2c2785277b0224cd5bb4d2a090bad2dcae44e023f9189
-EBUILD libaacplus-2.0.2-r3.ebuild 1362 BLAKE2B 75d53d3b89f6fcc0a90e02411c44781f3fe4794f7593f7bb0423645e4e51ff86ea5adbbcae9407d584f930bfe33b2fa11a18d88a7d559c31a7d15f07c512a6e0 SHA512 5b80ccddd6b17502cc3600b950eb7c9b77b8a7083b0cdfce58163b00b9e2181463fafc4693ce0b503ee66f19bce059f5dd444fda5f58398dad2fd5c1fef098f2
+EBUILD libaacplus-2.0.2-r3.ebuild 1378 BLAKE2B 488d8ed4cf75afdfa4b7db11f94f62f18d5a28759473991bdad0121099819f0ef4ede5138a35ee9f42610ff0b99d051c990d82d784745d3aaf9ba41b4f0f5bfa SHA512 0df8535e28cefee9688f427352a10309193177e9cd42ea3dc52f12354ee4b17c8ecefd50a45835e7216853b38a11b334718964c797566b55141d22d2d55f418e
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
index 5cc97a7bfb8e..6db528358739 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2-r3.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
+EAPI=7
 
-inherit autotools eutils ltprune multilib-minimal
+inherit autotools multilib-minimal
 
 # This file cannot be mirrored.
 # See the notes at http://tipok.org.ua/node/17
@@ -26,9 +26,11 @@ RESTRICT="bindist mirror"
 RDEPEND="
 	!media-sound/aacplusenc
 	fftw? ( >=sci-libs/fftw-3.3.3-r2:3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/unzip
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-clang-inline-redefinition.patch"
@@ -36,11 +38,15 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	sed \
 		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
 		-i configure.ac || die
+
 	eautoreconf
+
 	cp "${DISTDIR}/${TGPPDIST}" src/ || die
+
 	multilib_copy_sources
 }
 
@@ -55,6 +61,6 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 	einstalldocs
 }
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 5aa2f3bf7aec..1b534b66a081 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -1,6 +1,7 @@
+AUX libavif-0.9.0-pkg-config.patch 800 BLAKE2B 401bc92fc4ed0c6f224b1ff23d22b6da909527e5f3ea7b6f225695e35251f4fa442a640326d4e1d8cf8fe233a923fe6e171dc8b8ca8e103d22a648d3a00f4616 SHA512 fd7e9c333ce3184431af0bab84f0987094d970af1e557b16238eac06db86fe625b8d696810f14ab4940494bed96994586374c1dd501154b537a1c037b78cfb89
 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.ebuild 1806 BLAKE2B 873f6d96b022b31edb2d01d20601c1318fcc89e86f512cf06a1b33fc004cdf6d4a2af0b098dd986e4405f7d550b8ff25f72fef45b7a5f6d3065a94f4f705087e SHA512 2428c8cbb7d57b707683be62328feb6fd9831afc0676c067bfd5983e2f8e5ccec1d9afaa669f8615d2550437ceba2cb3e68e4656fd9942d99c22bb3507ac27a5
-EBUILD libavif-9999.ebuild 1728 BLAKE2B b05566cc98406688badc4551f3fb8be04649b768d0a03ce093d3cdc94dae7df6909fd4b030ac8d7cae557a32e630bcf8eeae0e02a8ca470d4b0cf23ab83f81f0 SHA512 82e73423d625c76c7199d6e6afce22c99f4bf82485da39e148448493a8cdfbd4fc6ce6c0af98ccca374b80e2452eb44ba748e47bcd0a921bfc67770c6448581d
+EBUILD libavif-0.9.0-r2.ebuild 2726 BLAKE2B 4032da82246d4a3abf95dea3a731386f956c8cd99e0efa654703b03d50bded33fb7885bb8db77407dca9d35e412d868d13bfeeb35a590031f041404226ad012c SHA512 f35d29f062547d27b1943d3425a7dfbcefac3f6e55cceccdf075d5a5bd4a62aac256602b4b96071891cd66241c40bf6e34500388177c9fda98e7ddedb4379998
+EBUILD libavif-9999.ebuild 2598 BLAKE2B 30eb997ed8776849fe1a6c075b93169da72ac416ca84e7d0c6a4b8ea6a83eff005a1586eabe28955a8bc453161953dda15f9a90ba94340f239f41b819b0eb9d6 SHA512 f4b650f6ddd67b4a230d4560311f2419c4b8c5c8efc0811350631dfd08f43fced574dc522a36426164fe43a8f77ad6b956c0f25d2c149a067fd7b1d678c25961
 MISC metadata.xml 843 BLAKE2B f95582a72acc4b86d02f246fca2a8c080ee96be8e649008f4b684cbf616c8201c3f6df1e258beb2e402add6da06fb3203254c902cf3613c4fd8d867f7f62b3e9 SHA512 80a0962deb24701c3b920c287875f26f4cdd8d282f0dc1af60039190833097bcdb78dabc0f82283035746a85a9a7b2d95241819fe6e0d36f3194bb2c62ea98e3
diff --git a/media-libs/libavif/files/libavif-0.9.0-pkg-config.patch b/media-libs/libavif/files/libavif-0.9.0-pkg-config.patch
new file mode 100644
index 000000000000..b1238b321770
--- /dev/null
+++ b/media-libs/libavif/files/libavif-0.9.0-pkg-config.patch
@@ -0,0 +1,28 @@
+https://github.com/AOMediaCodec/libavif/pull/532
+
+From 4ce461df9109f0b05a05aa01e1e1538663b2bc9b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 4 Mar 2021 21:20:33 -0500
+Subject: [PATCH] libavif.pc: respect libdir setting
+
+Do not hardcode "lib" as that is often the wrong path with multilib.
+On an x86_64 system for example, it should actually be "lib64".
+---
+ libavif.pc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavif.pc.cmake b/libavif.pc.cmake
+index 006539b14782..4ef2c8a97b57 100644
+--- a/libavif.pc.cmake
++++ b/libavif.pc.cmake
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}/bin
+-libdir=${prefix}/lib
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: @PROJECT_NAME@
+-- 
+2.30.0
+
diff --git a/media-libs/libavif/libavif-0.9.0-r2.ebuild b/media-libs/libavif/libavif-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..87d63556573d
--- /dev/null
+++ b/media-libs/libavif/libavif-0.9.0-r2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
+
+DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0[${MULTILIB_USEDEP}] )
+	dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
+	rav1e? ( media-video/rav1e[capi] )
+	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="|| ( aom dav1d )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-pkg-config.patch"
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
+		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+		-DAVIF_CODEC_LIBGAV1=OFF
+
+		# Use system libraries.
+		-DAVIF_LOCAL_ZLIBPNG=OFF
+		-DAVIF_LOCAL_JPEG=OFF
+
+		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+		-DAVIF_ENABLE_WERROR=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+			-DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
+
+			-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+			-DAVIF_BUILD_APPS=$(usex extras ON OFF)
+			-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+		)
+	else
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=OFF
+			-DAVIF_CODEC_SVT=OFF
+
+			-DAVIF_BUILD_EXAMPLES=OFF
+			-DAVIF_BUILD_APPS=OFF
+			-DAVIF_BUILD_TESTS=OFF
+		)
+
+		if ! use aom ; then
+			if use rav1e || use svt-av1 ; then
+				ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode."
+				ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}"
+				ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}"
+			fi
+		fi
+	fi
+
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if ! use aom && ! use rav1e && ! use svt-av1 ; then
+		ewarn "No AV1 encoder is set,"
+		ewarn "libavif will work in read-only mode."
+		ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
+	fi
+
+	if use gdk-pixbuf ; then
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
+	fi
+}
+
+pkg_postrm() {
+	if use gdk-pixbuf ; then
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
+	fi
+}
diff --git a/media-libs/libavif/libavif-0.9.0.ebuild b/media-libs/libavif/libavif-0.9.0.ebuild
deleted file mode 100644
index c00246430f4a..000000000000
--- a/media-libs/libavif/libavif-0.9.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake gnome2-utils
-
-DESCRIPTION="Library for encoding and decoding .avif files"
-HOMEPAGE="https://github.com/AOMediaCodec/libavif"
-SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
-
-DEPEND="media-libs/libpng
-	sys-libs/zlib
-	virtual/jpeg
-	aom? ( >=media-libs/libaom-2.0.0 )
-	dav1d? ( media-libs/dav1d )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
-	rav1e? ( media-video/rav1e[capi] )
-	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="|| ( aom dav1d )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
-		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
-		-DAVIF_CODEC_LIBGAV1=OFF
-		-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
-		-DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
-
-		# Use system libraries.
-		-DAVIF_LOCAL_ZLIBPNG=OFF
-		-DAVIF_LOCAL_JPEG=OFF
-
-		-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
-		-DAVIF_BUILD_APPS=$(usex extras ON OFF)
-		-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
-
-		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
-
-		-DAVIF_ENABLE_WERROR=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_preinst() {
-	if use gdk-pixbuf ; then
-		gnome2_gdk_pixbuf_savelist
-	fi
-}
-
-pkg_postinst() {
-	if ! use aom && ! use rav1e && ! use svt-av1 ; then
-		ewarn "No AV1 encoder is set,"
-		ewarn "libavif will work in read-only mode."
-		ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
-	fi
-
-	if use gdk-pixbuf ; then
-		gnome2_gdk_pixbuf_update
-	fi
-}
-
-pkg_postrm() {
-	if use gdk-pixbuf ; then
-		gnome2_gdk_pixbuf_update
-	fi
-}
diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild
index f4756e028039..1cb15d73dc44 100644
--- a/media-libs/libavif/libavif-9999.ebuild
+++ b/media-libs/libavif/libavif-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit cmake git-r3 gnome2-utils
+CMAKE_ECLASS=cmake
+inherit cmake-multilib git-r3 gnome2-utils
 
 DESCRIPTION="Library for encoding and decoding .avif files"
 HOMEPAGE="https://github.com/AOMediaCodec/libavif"
@@ -14,12 +15,12 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
-DEPEND="media-libs/libpng
-	sys-libs/zlib
-	virtual/jpeg
-	aom? ( >=media-libs/libaom-2.0.0 )
-	dav1d? ( media-libs/dav1d )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0[${MULTILIB_USEDEP}] )
+	dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e[capi] )
 	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
 RDEPEND="${DEPEND}"
@@ -27,26 +28,48 @@ BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="|| ( aom dav1d )"
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
 		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
 		-DAVIF_CODEC_LIBGAV1=OFF
-		-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
-		-DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
 
 		# Use system libraries.
 		-DAVIF_LOCAL_ZLIBPNG=OFF
 		-DAVIF_LOCAL_JPEG=OFF
 
-		-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
-		-DAVIF_BUILD_APPS=$(usex extras ON OFF)
-		-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
-
 		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
 	)
 
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+			-DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
+
+			-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+			-DAVIF_BUILD_APPS=$(usex extras ON OFF)
+			-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+		)
+	else
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=OFF
+			-DAVIF_CODEC_SVT=OFF
+
+			-DAVIF_BUILD_EXAMPLES=OFF
+			-DAVIF_BUILD_APPS=OFF
+			-DAVIF_BUILD_TESTS=OFF
+		)
+
+		if ! use aom ; then
+			if use rav1e || use svt-av1 ; then
+				ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode."
+				ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}"
+				ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}"
+			fi
+		fi
+	fi
+
 	cmake_src_configure
 }
 
@@ -64,12 +87,16 @@ pkg_postinst() {
 	fi
 
 	if use gdk-pixbuf ; then
-		gnome2_gdk_pixbuf_update
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
 	fi
 }
 
 pkg_postrm() {
 	if use gdk-pixbuf ; then
-		gnome2_gdk_pixbuf_update
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
 	fi
 }
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 0e6e250fc2c0..65610f945918 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,5 +1,5 @@
 AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
 DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r5.ebuild 2465 BLAKE2B 4fd216fd7773ab63cc32bc7f875c58508ec06d9b44bde3c3d5ee2ee91bace253a3dbcec695ac2bf96332c8ea54c3ed30221d724b5529114a8694bd6fb99437ff SHA512 f9990ec5808b8df9b162f11622d6dc5424a3d0a33466475256a8ba66e16c88466900e4f6f6233418bef9062cdec0847b383418a8d7875e7f521377d543b3b0bf
+EBUILD libcanberra-0.30-r5.ebuild 2473 BLAKE2B 75b07031a677a4fea1e3a2f2233e30851da389744105f22116a97fbd82c018e2e55379e818a3cd703cef1ca7bc6578831bae0105f72adc97a86b413881fc6a14 SHA512 cf58747911a91ecd74dba2c84b0e7e57d9738dffc6aa6aa1480603b1c709debacf7827395e6b2c5a5de295abf295a6a62f3f9c84a58cb4f89b3053341cb7b5c4
 MISC metadata.xml 1730 BLAKE2B 8a3bef42abdbb7b229af42e8555eee2eb339275c55ffbfa89e62564d4ca28501de45fe99f6efbae91bcbd0c580ed99136bba751367deda70f137230ae7a5746d SHA512 14720aaeff663ff227dc7f59d1f69e636d8bbc7771dda7ed5a950c2ac75c09e0075223fad78b24feda994fa92dce8e5cfc186e08a3515db0645f4403641a9061
diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index 727ef0161557..5b2b36df02d6 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit multilib-minimal systemd
 
 DESCRIPTION="Portable sound event library"
-HOMEPAGE="http://git.0pointer.net/libcanberra.git/"
+HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
 SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index eb2b915a6c0a..95232a8ca1ae 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
 DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
 DIST libepoxy-1.5.5.tar.gz 332057 BLAKE2B bf9a1e089c620e710caa7d4b7d5d0ec0cef186c7881b1a61aa22f58d8e023706087c766ad970ea8950752d87d2f32d12e2ded3137502f35991afb5b4fb3648cd SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45
 EBUILD libepoxy-1.5.4.ebuild 1141 BLAKE2B 3ab8f35d56300ea3056e3d7f97b9cf5fe95a22a7059710f87800de978b11db4448d17b61e51f5e9e86ad750005d7d113a2dde5acfb02d82d98dcd4e163315f68 SHA512 d1467370eea40684490e64712f11451ce6bfd680cd23e13304e4214825670e2e9054952f31db9c094841e35ff1eb561146850be1747e48c4e414af6e62d1ee73
-EBUILD libepoxy-1.5.5.ebuild 1163 BLAKE2B 78abc721431b4c827905c43beb28d28977b4c934bd2725469b758ec2d5a7f56ad9bb7f1f5c769695a58ad0a7f57d9ecc2fefaca39be03f5e6aa8ec8061d39a67 SHA512 9f5bfce5549c057eb5688b593c16d410d8ee2708f597fedfb0d16aa42e6741a3a9d60c4f4386a51a7acb1c090965678198a2add521bcd6a7b8e336227893aaa3
+EBUILD libepoxy-1.5.5.ebuild 1159 BLAKE2B c151e56dbea8c771a29f379925402838e3599eaacd12777755f28a50d008e6e04231c69da2d0798a754baa8cd96e822065394893066e59045ddcceea6b1d7544 SHA512 e9dbd11a1391132143bb542c54e0f7b632af634a92732ec8a106ff67ccc5a5ae83ef5fee9011b3b2d46517c427b298f3b85afc54b9366bf908af8993918c6368
 EBUILD libepoxy-9999.ebuild 1163 BLAKE2B 78abc721431b4c827905c43beb28d28977b4c934bd2725469b758ec2d5a7f56ad9bb7f1f5c769695a58ad0a7f57d9ecc2fefaca39be03f5e6aa8ec8061d39a67 SHA512 9f5bfce5549c057eb5688b593c16d410d8ee2708f597fedfb0d16aa42e6741a3a9d60c4f4386a51a7acb1c090965678198a2add521bcd6a7b8e336227893aaa3
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.5.ebuild b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
index 9b903d1590db..2c9831ede9ca 100644
--- a/media-libs/libepoxy/libepoxy-1.5.5.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.5.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 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 608a3bb76055..0f13e86ee541 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 6158 BLAKE2B 82f579f9282b66ccf086820233dc9c6d8ae49e3e0c65b02100c222ff192eddca33857e8c07f17d60d63a27ee59bd38dfdf65d7378fda8a608ec9d534230cbb1a SHA512 d160b7abe979dcf227f38234550e3a39b12f17caf7fb4562d1cf6312cfba3818555785a62c3a346fcec6600cebab99e843b967e8816972025bced62c33df2849
+EBUILD libgphoto2-2.5.26.ebuild 6157 BLAKE2B eee3979efcd1506da9e90d6d9e06ad25b1af4bb523c239606ebfa17d3090719c7631474ce497e5e08dc661a5486048b30cb998525ed36c7d3f84cd5a4dc7c46d SHA512 f0038cf1a934a392c5e9aad2f60457559c743b9aa15653e36720e722cca416c93025854c47338010b959e28b61ddafae9acd10eae9dc22318f897d65e000251b
 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 06fae19d1d0f..749274cfef82 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.26.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
 
 # TODO
@@ -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/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index a816a3a9619d..b93929fca720 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,11 +1,6 @@
-AUX libprojectm-2.1.0-fix-c++14.patch 1505 BLAKE2B 102d3e8aa719fa42e92e81c5dd4fa0f7395672bd0b94fe83ac35d1961acc58f3aba0529d49c5579e8ad4c3661268dd7bdacdd1f5445d1d08cd894daca65b4156 SHA512 071070f2f8c890cccdba09bbe9cb1a68451ebdf30ae339263e322afbaccf974be41a0eabeab12e1432382bc94bff4df46a4f1e2c227c3de77577f5a8776aa3c6
-AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd04699938f08bfe2b9dbebe95f19abcd1e16c4f7f9619c44639586611f3c7b69784af92d2fbff02ab301503ca626ff9da0d7c0 SHA512 562e9616500a49b52e29d50d7c40b8db2b8eb36dbcf28c2b415975b0ce751d21d8ecc06747c3c810303078a2e83ee1c6ed438818d936ddd86efe94900d1a348d
-AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
 DIST libprojectm-3.1.11.tar.gz 52831435 BLAKE2B 286cbe5d7c497b0955da38d3ccfd4a5c97d80bc102a4bb739f98ee6c39afb1420d780c989997c16be9d2e7d54718a498769f98e15e2443bc7ac8ad850ecbb2df SHA512 da2c34ce5798205d31906c401d98ad2f16a45b6123975a291657c892db41c86d05d38edee34b52f2415c4442d8302c8c0dc5bb89e5932a057df17f7ccac7db22
 DIST libprojectm-3.1.12.tar.gz 52831726 BLAKE2B f9a9ecf8fc55b49e664a61a5c0ca3eef745b00390d5dd3b1549d6d68985c246834d35adb96ab8595e2bf78997c4688096c7931a6be54ea9d867bfdbe5a427832 SHA512 6d265280f3e3e952686ebf77afd8b083669e9ab81d2d9d122168d47747c367ff3b17ab682cc041e4ac9cee9607b7393b5dcb067deac95fcbb97d63a9656912a5
 DIST libprojectm-3.1.8.tar.gz 55482686 BLAKE2B 226cc62ce84932e81c650dac8dcf89eed4d71513324b3bb3a7250c450cb002870f2c2c2eaf6947f6056b35efa5159ea7956bfec420e9f545df445f7654a76d05 SHA512 efbcd5e867ab9e710d11018d580ae6c3bc7aaba46e3ce2a3d682e9ec341756db6ecf613deab0a9d13ed6ace3d05dcf19a384c00ee21832acd5b6ebfe2b806f44
-DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD libprojectm-2.1.0-r2.ebuild 1462 BLAKE2B 02bd1446c7250f0313805c051814ea9114b881ab8cfa7b5ccde11c88c636826600660026935bdbf7a9a283c540c220080f98b28bce7f626ea21dce830723e73a SHA512 b82ecdef0da92c14e0993d099cad1741ff5f7d5407c2d31c275ce3a9664929001ed3099b554767ca49626a2e104bbb5c4ac90a68689f20f1e0e9e3f58b66c40c
 EBUILD libprojectm-3.1.11.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
 EBUILD libprojectm-3.1.12.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
 EBUILD libprojectm-3.1.8-r1.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch
deleted file mode 100644
index e3e156620935..000000000000
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Properly call namespaced std::isnan and use implicit
-conversion operators, such that they work in C++98 and C++14.
-See also:
-https://bugs.gentoo.org/show_bug.cgi?id=582866
-https://sourceforge.net/p/projectm/code/ci/92226e25192a69839b9ae3b66ea7173732c639b3
-
---- libprojectM/Common.hpp
-+++ libprojectM/Common.hpp
-@@ -63,7 +63,7 @@
- 
- #ifdef LINUX
- #include <cstdlib>
--#define projectM_isnan isnan
-+#define projectM_isnan std::isnan
- 
- #endif
- 
---- libprojectM/MilkdropPresetFactory/Parser.cpp
-+++ libprojectM/MilkdropPresetFactory/Parser.cpp
-@@ -1406,7 +1406,7 @@
-   PerFrameEqn * per_frame_eqn;
-   GenExpr * gen_expr;
- 
--  if (fs == NULL)
-+  if (fs.fail())
-     return NULL;
-   if (param_string == NULL)
-     return NULL;
-@@ -1561,7 +1561,7 @@
- 
-   if (preset == NULL)
-     return NULL;
--  if (fs == NULL)
-+  if (fs.fail())
-     return NULL;
- 
-   if ((token = parseToken(fs, name)) != tEq)
-@@ -1875,7 +1875,7 @@
-   /* Null argument checks */
-   if (preset == NULL)
-     return PROJECTM_FAILURE;
--  if (fs == NULL)
-+  if (fs.fail())
-     return PROJECTM_FAILURE;
-   if (token == NULL)
-     return PROJECTM_FAILURE;
-@@ -2166,7 +2166,7 @@
- 
-   if (token == NULL)
-     return PROJECTM_FAILURE;
--  if (fs == NULL)
-+  if (fs.fail())
-     return PROJECTM_FAILURE;
-   if (preset == NULL)
-     return PROJECTM_FAILURE;
-@@ -2348,7 +2348,7 @@
-   if (token == NULL)
- 
-     return PROJECTM_FAILURE;
--  if (fs == NULL)
-+  if (fs.fail())
-     return PROJECTM_FAILURE;
-   if (preset == NULL)
-     return PROJECTM_FAILURE;
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
deleted file mode 100644
index aceee30e6278..000000000000
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libprojectM/CMakeLists.txt
-+++ libprojectM/CMakeLists.txt
-@@ -35,7 +35,7 @@
- 
- ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
- 
--SET(LIB_INSTALL_DIR "\${exec_prefix}/lib"
-+SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
-   CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
-   FORCE)
- 
-@@ -234,7 +234,7 @@
- FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
- INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
- INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
--INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
- INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
--INSTALL(TARGETS projectM DESTINATION lib)
-+INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
deleted file mode 100644
index bb780e8943ad..000000000000
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
-===================================================================
---- libprojectM/CMakeLists.txt
-+++ libprojectM/CMakeLists.txt
-@@ -33,7 +33,7 @@ set(PROJECTM_VERSION 2.1.0)
- set(PROJECTM_ABI_LEVEL 2)
- #
- 
--ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
-+ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
- 
- SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
-   CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
deleted file mode 100644
index 7795ea42bbf1..000000000000
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs
-
-MY_P=${PN/m/M}-complete-${PV}-Source
-MY_P=${MY_P/lib}
-
-DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
-HOMEPAGE="http://projectm.sourceforge.net"
-SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 sparc x86"
-IUSE="debug openmp video_cards_nvidia"
-
-RDEPEND="media-fonts/dejavu
-	>=media-libs/ftgl-2.1.3_rc5
-	media-libs/freetype:2
-	media-libs/mesa[X(+)]
-	media-libs/glew:=
-	sys-libs/zlib
-	video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}/src/libprojectM
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-path.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-)
-
-src_configure() {
-	if use video_cards_nvidia; then
-		append-ldflags -L/opt/nvidia-cg-toolkit/$(get_libdir)
-		append-ldflags -L/opt/nvidia-cg-toolkit/lib
-		append-cppflags -I/opt/nvidia-cg-toolkit/include
-	fi
-
-	local mycmakeargs=(
-		-DUSE_CG=$(usex video_cards_nvidia)
-		-DprojectM_FONT_MENU="${EPREFIX}/usr/share/fonts/dejavu/DejaVuSans.ttf"
-		-DprojectM_FONT_TITLE="${EPREFIX}/usr/share/fonts/dejavu/DejaVuSansMono.ttf"
-	)
-
-	if use openmp && tc-has-openmp; then
-		mycmakeargs+=( -DUSE_OPENMP=ON )
-	else
-		mycmakeargs+=( -DUSE_OPENMP=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 5c679c30d6f7..eb73bca58840 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -5,6 +5,6 @@ AUX libsamplerate-0.1.9-no-sndfile-resample.patch 1070 BLAKE2B b0e655e5162f8c77f
 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 1282 BLAKE2B a8a0a12e7b2d244f497998d36318d4122f376c79eb0e4abfe6b0b028b9fbd460b7ed7a57e2ea966cd2c8c3bf21d8c86027835cf62f1c61723e5601422f030cd0 SHA512 9eba6f3eb488a4912777efc82b3529a87d581dafc817d903170ba2f19148aa67e829f926786dfc5c6d632ae1e10feaa9430dc6bfcd82f66087f4ac8f6138687f
+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/libsamplerate-0.2.1.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
index c2eb013b6fe2..6d9b87d12f82 100644
--- a/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 1916fc822276..d649e5a68143 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -5,7 +5,9 @@ AUX libsdl-1.2.15-const-xdata32.patch 2253 BLAKE2B fd78ab356a20db3037360309edb4b
 AUX libsdl-1.2.15-gamma.patch 1339 BLAKE2B 83e0d10fc4396ce992c8f59043e2380921a44dac84d305cd3108dc6989de23aef7f1442b162c8f8392846630c3df6a725bb54cf1ead9d6ce2ffe3bc6df735a38 SHA512 0717e8eea7a9a1bcadb56c4a51023142d57718ccfff4e372faba3e28ce17b3e32caa8a8ffc8054c8b49bab566a44fd46f5eaf97b778ba6ec991d845d4ae464ce
 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 780 BLAKE2B e62be7f44481b48ea226200f382dc8c20c5110997ed26672e5dcd8798e748529826b0951e3803e3fd5f30f8c3050a5fb298e5f880ab7e495dde9c0c8fff6cf1e SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03
+AUX libsdl-1.2.15-sdl-config.patch 784 BLAKE2B d54d98ad6ddbea163fd4a0ce9d65ac77d832d68d611c1cd4fb20fa70b5bee641204a4ff7b51eff47f6a4e94193d1cad2f82bdb64a4d73582c932a3661870e3cb SHA512 95af8c3dac4fdea5bad92c044a311efaae02a46e1c5bfa84dadee7b3fab6b48f4dcf12ca6e581429decb479de21ec6167c59b215fb3a398fb82151aa4c3fb432
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
-EBUILD libsdl-1.2.15-r9.ebuild 4086 BLAKE2B c4af74cde55f18b5a4201088bfc3ab8ddf182b2759350d955dc2788b8fdf8c73073a2f0c6e0241b7577c7860aa25c251a66fdb1aab6d7b1be7fc896e81831a90 SHA512 63ae62e1a2e8ce3fbbf714ab71d20675241efab3e417655565cd891ff03b8c67eb12acf1e0b6bab855eba193de12da263b1f0b0804beda5a30921d1b401b16a2
+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
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch
index f430428e6e90..457c934b6c40 100644
--- a/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch
+++ b/media-libs/libsdl/files/libsdl-1.2.15-sdl-config.patch
@@ -2,8 +2,8 @@ Only output -L -rpath cruft if using a non-standard install location.
 
 Makes ABI / cross-compiling easier on the soul.
 
---- sdl-config.in
-+++ sdl-config.in
+--- a/sdl-config.in
++++ b/sdl-config.in
 @@ -44,7 +44,12 @@
        echo -I@includedir@/SDL @SDL_CFLAGS@
        ;;
diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index af5d4bf883f5..e5706ac4f8db 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.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
 
 EAPI=5
 inherit autotools flag-o-matic ltprune multilib toolchain-funcs eutils multilib-minimal
 
 DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org/"
-SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
+HOMEPAGE="https://libsdl.org/"
+SRC_URI="https://libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
new file mode 100644
index 000000000000..5e79c923cb07
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -0,0 +1,141 @@
+# 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
+
+MY_COMMIT="99d7f1d1c5492f0fb3c799255042ca7a3f4a5de4"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="https://libsdl.org/"
+SRC_URI="https://github.com/libsdl-org/SDL-1.2/archive/${MY_COMMIT}.tar.gz -> SDL-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# WARNING:
+# If you turn on the custom-cflags use flag in USE and something breaks,
+# you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
+IUSE="aalib alsa custom-cflags dga fbcon +joystick libcaca nas opengl oss pulseaudio +sound static-libs tslib +video X xinerama xv"
+
+RDEPEND="
+	aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	)
+	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	nas? ( x11-base/xorg-proto )
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	pulseaudio? ( virtual/pkgconfig )
+	x86? (
+		|| (
+			>=dev-lang/yasm-0.6.0
+			>=dev-lang/nasm-0.98.39-r3
+		)
+	)"
+
+S=${WORKDIR}/SDL-1.2-${MY_COMMIT}
+
+pkg_setup() {
+	if use custom-cflags ; then
+		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
+		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+		ewarn "libsdl without the custom-cflags use flag in USE."
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-sdl-config.patch
+	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-gamma.patch
+)
+
+DOCS=( BUGS CREDITS README-SDL.txt TODO WhatsNew )
+
+HTML_DOCS=( {docs,VisualC}.html docs/{html,images,index.html} )
+
+src_prepare() {
+	default
+	AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=
+	if use !x86 && use !x86-linux ; then
+		myconf="${myconf} --disable-nasm"
+	else
+		myconf="${myconf} --enable-nasm"
+	fi
+	use custom-cflags || strip-flags
+	use sound || myconf="${myconf} --disable-audio"
+	use video \
+		&& myconf="${myconf} --enable-video-dummy" \
+		|| myconf="${myconf} --disable-video"
+	use joystick || myconf="${myconf} --disable-joystick"
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable prefix rpath) \
+		--disable-arts \
+		--disable-esd \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-file \
+		--enable-cpuinfo \
+		--disable-alsa-shared \
+		--disable-esd-shared \
+		--disable-pulseaudio-shared \
+		--disable-arts-shared \
+		--disable-nas-shared \
+		--disable-osmesa-shared \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio) \
+		$(use_enable nas) \
+		$(use_enable X video-x11) \
+		$(use_enable dga) \
+		$(use_enable xv video-x11-xv) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable X video-x11-xrandr) \
+		$(use_enable dga video-dga) \
+		$(use_enable fbcon video-fbcon) \
+		--disable-video-ggi \
+		--disable-video-svga \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
+		--disable-video-ps3 \
+		$(use_enable tslib input-tslib) \
+		$(use_with X x) \
+		$(use_enable static-libs static) \
+		--disable-video-x11-xme \
+		--disable-video-directfb \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -type f -name "*.la" -delete || die
+	einstalldocs
+}
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index daf097c110e1..35a1204a867e 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,6 +1,6 @@
 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 1788 BLAKE2B 2c16c7480477006e1a72e91f50e19d9c9b8fb5e6edecf4b351a8a48925f90749e1a55368a6e74b7c77a77f030e1a2dbd4431d9a8b24d17650f20378b875ab2b5 SHA512 423e5e7c5be3fcd74d4b5523394eb27bb9c2890300f330e5d8f8d05e54ec4e4a4cb706164880aaeb3a20f9408bc1d4a2f90207a3ce6334f43b59f39516841f64
+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.31.ebuild b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
index 541b8501fc49..bbcf03ae429c 100644
--- a/media-libs/libsndfile/libsndfile-1.0.31.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${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"
+	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
 
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index 0da2bd0d91af..ac1b1e0ef3c6 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -3,6 +3,6 @@ DIST lsp-plugins-1.1.24.tar.gz 63809276 BLAKE2B 3d623d4a5b21f2b4dbd7263805b50c9c
 DIST lsp-plugins-1.1.29.tar.gz 66143142 BLAKE2B 6fa6943d8cdf3aedc9f671c64b433ffd5c4f6c7ca14f6a75578300240971e7c9e8546b9a7df7a13b8cd6e0844724c064daa7e249aba70636f47a622e73ed264a SHA512 b8c3804ad583322bce414d6beb079afa5b98a111126bb4507642376fcf1f82b31525b4959c6388b02cc1d14e0ec25de3596794895f2860f492a5fbf87f6e88b7
 EBUILD lsp-plugins-1.1.22.ebuild 1037 BLAKE2B e3f7c25cfbd4938ee04bc88f3026b24ed254d6e6f68a4262dcca59e5f99ef61c91c16293763aa4e53c42633da9db7416947d36c2de4fffba6c0407c86de11e99 SHA512 2d8042b5a22dae0e3e9df23a639184562f3623789e44d1a02d58d3b8bde5b6d136e4e74874c0c3a5656ae28f108eb177ec295c03afcac5764281336b58c1e617
 EBUILD lsp-plugins-1.1.24.ebuild 1076 BLAKE2B 399febc0f6dc791d765d16c3455469eafe5a5ea76934b4475993d9758e3ce0a3c00540995e7719c94cdc849cd7dc7208fb86eff9094af139be70ae5625d1d184 SHA512 2dc5383e1da3ccaebf80a8a5edf092db87177a2590dbf7e96bfc1862ebd9a4567f1dbec95c2e35ec38c5603a2f5d691c67c6f4836bf0c568873b04483aeef0c6
-EBUILD lsp-plugins-1.1.29.ebuild 1084 BLAKE2B 8168ae8249856691932e98386934637efb32428614843cdcc67a47e875171bf2d498b9292c0783f9b46c00a91c23353783268d0158995529221b201b6605d6fe SHA512 b3d8a5385230637718b70fa22c6be4acad4e9179ad81e5225f8b167cb94afd24d9bb43c8ef269c63da899affa6c0f7b95ef04c45bf542bc2c0c63563426fd8d9
+EBUILD lsp-plugins-1.1.29.ebuild 1089 BLAKE2B f8d392c402f63e6b170caaad0a7da7ebe9f15e31ff6e392d160723112f0e77159f450e49125bc8b5db3cd7f6131804e441ff31228a8ddd255ebd180c52e720f9 SHA512 f85be73dbe995d41f437540876a0572311e25c80301d7746c25f6a13104dd469c4daf54553642a17d12bd2e9b209e73e6c27a014c5ce7e8e3da4b242a87a5c45
 EBUILD lsp-plugins-9999.ebuild 1065 BLAKE2B 57234488746b4b43a1b71b89491a74540646b074b13276ad84bde7398c02a2a2665197a953d2a5974f9eb4f9402585d7fa681e9f55fdb233ec6dc7d94d255ba3 SHA512 48b0fae3be3abe2c80cba542553886fb8e850694b00b1d3c7154466647ff2a20e4aa6eb466a8cdb4ddea4ad2371f7d2cb70319866e92fa958281df53913981e3
 MISC metadata.xml 492 BLAKE2B 6550b2fe0e0a6bc5bece22d51b36d920284f662f1da5dbe2551fbf82ebc3416262339436ce2eddf9efbee49e57d5a28139f6ac3f1f86e20b5a74e5c4fb3bc37d SHA512 681338f3f8abbd1c103ef72c176595e10ca6bc0e6ca309e2f4d39166309329d8176aa9025056685d67d708ec1732d023c773a1e2a4cce7f019945ea112ab8f84
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
index 135fc0006ee3..e7c2d946d2c3 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="LGPL-3"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f8596653cf20..0ca7b81e0e39 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,8 @@
 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-21.0.0-rc5.tar.xz 14544136 BLAKE2B 74e2c7436819535a74d36a26d3deec5b68d2a158a3602d61a7c30c59bc4763dcbd327e761a7db688007255332eaccdb615069921c3f9395cd67b6f9bb47db00f SHA512 89e212a7caf70320841551dbf937fe627e156896e9d11dc6654f91552c97800354562d5297b3a218c8c0f8261d2f32c62cb6e9445bace64f0b41eced829be7ed
+DIST mesa-21.0.0.tar.xz 14617108 BLAKE2B bc49b9084c2d16354235fa8ff30bc274a40dda350dc8ca5fa8d471665cd3f2a280efdf05a6ea84310beebcdb71926a64f2fd0c63391bf846c49180e13a25c151 SHA512 32f4a74fbc1456dac478fdc3a85e37cedb9ac1e1b7c5434706dc24930a70bc9e857ba6b5bf1e7e05798e259f8ff0b05bad5252c07253cb5d6a9707c7c2e147ad
 EBUILD mesa-20.2.6.ebuild 14762 BLAKE2B 10df82dc80592a5735ed4137a3db8e57acd8cb53a32649fd8b7854a845fd90cb6804e3e43bd52a1d7ce60a7446577a4e45c4ad4fbf16d08518007a2bb51e3ed7 SHA512 ab2f3fb312e255a93928795b94bf641060cad1bae388c8526cdd38eab0699f7be8f6779901d04aec1e14ac7482126b4bddd88337d6b618d056e39bb667072f38
-EBUILD mesa-20.3.4.ebuild 14852 BLAKE2B 3981ee9b591e5a84e59a0acf9b694c59b2932453153ae587892644803a06ce1dffd83fbf58ea1206fb06190a65c1dd06c9915aa4d0292aa9b58e28c4e42d2a76 SHA512 c613b37f8f40875f28b927ac382c3f3337cecee316c5e0f41c048b5b786a060eb03a394148f827fa4a82e580953a32d5116465b0bde09291644b22135a784b55
-EBUILD mesa-21.0.0_rc5.ebuild 14763 BLAKE2B 61a0be70fd8f848330a71d3427997eb0e1cef84cd389d1da40919abb113d37c95ba835099da438470b2a812b4098b6bc06b556ed771622adfbb8741018569587 SHA512 83e5b4a9d0c03fc9c89233371d682d013267cc9741a78631c581d84db5a6fa6eb745327e9fe6000a76a85986b056b8cdc0679717e4674a8ea8959384da1287c4
-EBUILD mesa-9999.ebuild 14763 BLAKE2B ce477c142ffc33ed0728a81c21ee19492172449fba48d6fb3d75d2c5bc6a001dc5475de75d462b8115f28e0a11b5726170fea49021444f76522d896df830b5cf SHA512 2c59cbd8e935b7762251d7cca0e641bffe591ffaf238d6ca3b961193c36d1c8a1bb696e31f69233aa3a5824b20b0be12a0bf3bf035a4993cf66bf77d6af0a314
+EBUILD mesa-20.3.4.ebuild 15046 BLAKE2B b65a25da02677b8803f1baeaaab1d615384417655fbb5f41993d8e69a0fbfb8d4560fad9f352005f4fbc70718599e748e3030897253284fe0d619413fa881603 SHA512 c7425d70ab84ab09f6e2f15d1bbb1d8b8a6d40cd5368a98a139d2ec939f23dccf4fd034ddcacaefc15b5e6aba128a9db6abbea68686056fa3c7ba7d6db2de7fb
+EBUILD mesa-21.0.0.ebuild 14961 BLAKE2B 41fbbed6df2796ac7e0bf64e185432fea72b3673001be8071dfa2139ad7a7f48db61473f4a54b358b2ce25b7648641c14ea7b2efb4914eb60bf89912854275ff SHA512 43acf75931e45a66f1b0938c72d723c96c1c8ea66eb4a6bdb8e474fd164389519f67dfb26a333b0910f075ce13f1c0b820961ec1d33572fd0ed099647d01b3e6
+EBUILD mesa-9999.ebuild 14922 BLAKE2B d0d49536e4e4e021fce6029717f496e0358c151f5406105337a651385bd7b337116d14b14442510b7d28ca621fa0c39177273f5df214d06a9627a993aaa3aefa SHA512 be9d773f963ebbd7aedab8fee3d368f8efd046d06698130c74b68cad3ce3e25f69e39659cd81e6490c3bbc8955859bca046d62f824f6c3d8f1b8d8fdfa6f96d0
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.3.4.ebuild b/media-libs/mesa/mesa-20.3.4.ebuild
index 551fcd5d326d..3bcef8c19175 100644
--- a/media-libs/mesa/mesa-20.3.4.ebuild
+++ b/media-libs/mesa/mesa-20.3.4.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 ~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"
@@ -333,7 +333,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
 
diff --git a/media-libs/mesa/mesa-21.0.0_rc5.ebuild b/media-libs/mesa/mesa-21.0.0.ebuild
index 8aeb115afdd8..9aa7c68c80fe 100644
--- a/media-libs/mesa/mesa-21.0.0_rc5.ebuild
+++ b/media-libs/mesa/mesa-21.0.0.ebuild
@@ -337,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
 
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c004f76fad6a..aac65f99e5f1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-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
@@ -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}]
 "
@@ -337,7 +336,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
 
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index cdd4cc7dfe2c..211ce11922bb 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 1877 BLAKE2B 108145d10da5ca0146e551314129e630d237818cc07d6f41ed4f1d670ef1f15347355e5017661e76f20ecc14493e90d38299ae9b6ed1fe2890b1a10abc375fc1 SHA512 269201ce5a76a2ce3d6345e230a49501fd5caa0c73faef446668fe60221a7033a70a27ea1559c240dc720d823abb9a55531e61ec530e16713f09601a743dd518
+EBUILD opencollada-1.6.68.ebuild 1884 BLAKE2B a108f1d9dd924702fc1b9c5a13ffbdf3a416b134fab025cc616a7637211cdbcf63b39d1043dc33c37a166c0bd93422d560eade6f54bcf68c3204b148708d1c08 SHA512 5c6b6056432859f6e9b7ac530a1c205051b0d98482e2597356b171df05f2f880a865dbd96070a9eed54f75800ba58cb92ad763ac65646416f12d389d06f35ae6
 MISC metadata.xml 458 BLAKE2B 5ca8dec8f5e0c58c4351c20d64bfe6e45a3e673e337f2e5bebf3cea759cc44c10de579e33ca7f99a64908a0553b99f206ee6440432eb142097cf184361526b7f SHA512 45cf8dc7088652a5982c5535afbe54fb2afab57417b811148e91c0530f57c5d4801cecf28d1ed9a8a097fbb55b9389caf568c8f94972665bb7b53e0cc7ed876c
diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
index ec8c164459ae..c6347454a3d8 100644
--- a/media-libs/opencollada/opencollada-1.6.68.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 5917414f1ec1..f8c5804810ed 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -3,5 +3,5 @@ AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82
 AUX opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch 1620 BLAKE2B 5c7e721f8754d50fdffb468009a2cc67c926ecb8abe3c0c2e5c60f15cac5f778222074f639b0040b98f405eb392f3d9c97358ed3302832fb32a1417d6bc36311 SHA512 b919c3c3f8c3190b683c5bc02cb523821200bbe951d65e2543d6f0f818ee1bcc4117c3140857becf032c54fd58aa4ee2f06b8f8cf550f72f3df9c5b21f483cb1
 AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 2239 BLAKE2B d35a7118b742244f045aa5c0e5e1ab42a8eea98cac377b9fb0efd8948e2b13d2be973aa17714a8554a97061a8de0769861947cf9c890bcf81acff593b3f34ae5 SHA512 2e86d3f73568c16c839d783574abfb765432b3bf9171b73da8eab9c86be4c736912b892879cb04d974046fb90c5fdf2e60669cc94d468d5aec51573c0ffdcaa6
 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
-EBUILD opensubdiv-3.4.3.ebuild 2357 BLAKE2B f835d36bd7251f7422dbc9f0c57eb6fbc690bf5710f3a2c1cc6c2bd6869950a75f2d7703259ea61134b390accfcd7bb1ccf740cdfedd5f43d77e6642cd7968ce SHA512 d7cc4043301020579e0c8f8193eeccb338cc57491e003d17d41867ba5b3dc24fed7e506a53f230a3d915138173c33e0b41faa600b3adf1995e5ccf3778ae00f2
+EBUILD opensubdiv-3.4.3.ebuild 2364 BLAKE2B 69170fed94197b2f7d1b8163b9c87bec8135678a18675ada98018110644bc3a842616633812df6529d5b12cb11f6b1fdc413c248cd4ee8cd2cd4c3039b30e54c SHA512 0b0e981af5d29f3271fc2cc1d710e071de2b27989aa407ebd215eda91163882ee1970353841dda060515a648d91244317379ecb89121f8894e0dc679cad01af6
 MISC metadata.xml 1005 BLAKE2B 8672aa4423818052199d3a4d3e594b1d838accbb5e332f9eeb075593c7a466f93698d171a543a6e39829028baaf62a1713d09682aefeb4a904ab41dde43ea4f0 SHA512 cd592ca220b954b57199944e41a9904bfe5efde067eb4d7640d008adc2dacfb02ebebb3783f5bbc99436f7213b2b9397b2e1d4408cb837462909070649aa093d
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
index 51707c88fe75..765b0146696a 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 # See for example CMakeLists.txt for details.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
 
 RDEPEND="
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index fa78ec4b4467..827c7d6b503b 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -2,5 +2,5 @@ AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385ca
 DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
 DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
 EBUILD osl-1.10.13.ebuild 1982 BLAKE2B ba5db5bb799f094356b034d82a322a7f189b671b4b04f8e0573ff3f5b6478d1787ac4e9a91cfff3ad3444ca95f6e678b4b9f2829b425b84fc348057363e7089e SHA512 0b198ebc63420aad4adb20b29640d2a00d8b4b3cf8e62f68e454aefed2e60c5f7af977b9762a1d26074bac8e5016c6703ccf9d7a038cfa2649a701eda24045fd
-EBUILD osl-1.11.9.0.ebuild 2137 BLAKE2B 3a7993f36779b7bd262a866d96fc9256319d33ac2ef54f930a0bf9aa93f9c829fd332c7a6547b0ca6a1a7b8080d9d0a4080f624370e4dacc133c8ce666668911 SHA512 42f98ae0c1229b75592702ee43dbd21bfbd8237e50b69f8be5ca4477bc63d67974c0b654ff7d6ad29cb7c8d8781a663642f916ec48bfa521a3702cd35cb2f781
+EBUILD osl-1.11.9.0.ebuild 2144 BLAKE2B 74b8721250769b65c88f9f73441262414390c0d7d3ade2ebc9e15be7d7b14d6a58e578b11949ed1fc0f76373fd3ffe26b2fd1168f44e73d9fe029f07dd024ddf SHA512 2f1f7510283d594ac97e295e3201c5dc4470a0002a4f8067cb153e210e1145c96aa47755a3f6b57b2690b6ee2b300fa6cd0875fb438912f58303106c2ce3a952
 MISC metadata.xml 810 BLAKE2B 85c4497ffc27bcf44682666135bebe083468c950618a5840fac008af4eca4dd902d371123d42f7ccfb3133e94dd2fbae22531d857e4e76bbafe10e55aa6b009b SHA512 cd69216183988e52c8224240263e162079510f264b7b277222dbc299316feb235dd51396351ca650298c4a890d8629ab38ab8ed75c198e8d60e117ed3a4a8b40
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
index 1acabfffb6e1..ea80a9490447 100644
--- a/media-libs/osl/osl-1.11.9.0.ebuild
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
 
 LICENSE="BSD"
 SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 X86_CPU_FEATURES=(
 	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 9244598cb089..3a7e1a18c5b0 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -3,7 +3,7 @@ DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448
 DIST partio-1.10.1.tar.gz 333129 BLAKE2B 82d1dd36e9854e221af036d386ecdc558ac032ad7cd720403787ddc83ac236f05fd86e8c07ade07ca93b06a12ac2b834c96a6d43265e396934e44a815df003d3 SHA512 7d3c6449ebd1e8b8a29298a3119acfd1036970b287e9cd5f288a63c7e2b3bf451e9e1ba8fc72f203e225eb2b062d59cd7373817ccc6467de67427d02c0b12477
 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
 EBUILD partio-1.1.0_p20170829.ebuild 1148 BLAKE2B b0c55730e21d0676f6174448b1b52214ab704ddf5ff2057c4c10a104714009cd0129f821866929b79afcbc18bf0f2dd2ecdaa11f49a1fe65e00a1a947dc4a6ca SHA512 275f28c68464d6480c175971d4626f22f4c76e296f674704110a787a7bc96e7ef95e732acb4563adc99f9230af5c66a7d1cad989743f6aee81376243a968fd04
-EBUILD partio-1.10.1.ebuild 1009 BLAKE2B d1bbe9cc46ad0b5caa91c74b923a9bb33c00a4968391f6389e6ec0f0a884dccd33421860c55264004f04e6e9363b860e826a8687164a804d264412095e5ca144 SHA512 7ad6d4799b41f890543aa1af00d5e33a77366b1f91968d7d673341fd228f6eba68aa01a90ffbfabbb0d5c23749e7151d6e3dea31728a2cdce2524bc8d0f321e6
+EBUILD partio-1.10.1.ebuild 1016 BLAKE2B f299a2d45d8d7cb384e2036a48a6bbb8052460c341d860d8548b282c27f0a6ed95a0571e7839df7c934a3e83db7abb9161670e79ac63e7bfbce6e9567b88e858 SHA512 5f522ae58b71252dd1da74c73c80ac75bca3d9e97bd4f76dd3c3f152a77254894bba0a193dea97f78341c25a2801fecd031836af0dc82a1e9102e327049960b6
 EBUILD partio-1.5.4.ebuild 1005 BLAKE2B 181022e1927fce74730a795e92299cd21491e8f65c6a9da11a84d3edb8b8d818314bb69011a2960f89cbeac69757ec05180c2015cea7919c126c1d4e3ad4c71d SHA512 69f26f13def6dd5fc1ae178c82bfabd4c05f4eb926eba32f09585a37ff05fed405c25146e7fd4c98aa121d70d8d2c810e707477f4c24330b636bb1bccb75682c
 EBUILD partio-9999.ebuild 1007 BLAKE2B 0ef6f815874a53c90a329598fa1fb74ffbe8df5d54594b4bca6c13de3836c50417f5185e2e6adf84c0ff5111fce8dbc850e5901e33cefb2eb274048dcf4bddc4 SHA512 42c9ce2cb8ac4ae9cf89a3bedcb2e7ff10c7adfe8c7c22cc39ed592f359a8d102ae736321fae802b18e29664c29e9201691ecd402f12e523a5e2b30ce32785d7
 MISC metadata.xml 444 BLAKE2B f9a6abe05db032e6425daecb9a5ccb29f5f0a1a2642f1184ccee43b7473efd5d1b014c656e7349b9326d7e7a7e15b3ae035a287ab129e69235c81b6dd0f9109c SHA512 78259bbbc1fce6259ea0c6ab0b6cb19aa570407ccb31a58183480c954a385941ecad95667318494d87fd3a3480e59faad55e029faf050d371a61592151d8544b
diff --git a/media-libs/partio/partio-1.10.1.ebuild b/media-libs/partio/partio-1.10.1.ebuild
index 900b5feb8067..02a27dab96e1 100644
--- a/media-libs/partio/partio-1.10.1.ebuild
+++ b/media-libs/partio/partio-1.10.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wdas/partio.git"
 else
 	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Library for particle IO and manipulation"
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index fb93110e8923..0775f8164c40 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,7 +1,9 @@
 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-9999.ebuild 1727 BLAKE2B cf94f90fe201fe745c838f8aa64a8b4a2079227ad0b847c7a3edcc994114d4b396ce36f2420bef00d4204cc86b71e8c5f40c18846b4e965762b92153f02e4282 SHA512 24d84572ed2c4d93bd17f12de0fc5c2fd59d47de67741f5be37c405a45b020403846c346c6cf8d6f54b27736140cc6e70dfc0059df76e028f46c3f8c99050044
+EBUILD waffle-1.7.0.ebuild 1727 BLAKE2B 1ca9dca8d8c9b422ef59653d5146ac40951e07ae33b4e241dcb20e54a6766bca74f239517125c2e64654c211754427e35a53048f9c72d1cb7632a85505b317d4 SHA512 261d7a6b43412c61dea8c2f44bd815c5ebb8ebe3fd1cd3f7602fa5c819d6ef8ebffe6ee17a9413111ff996e1376c7df6e1c026d1edb2f69f48a2f9429d622859
+EBUILD waffle-9999.ebuild 1727 BLAKE2B 1ca9dca8d8c9b422ef59653d5146ac40951e07ae33b4e241dcb20e54a6766bca74f239517125c2e64654c211754427e35a53048f9c72d1cb7632a85505b317d4 SHA512 261d7a6b43412c61dea8c2f44bd815c5ebb8ebe3fd1cd3f7602fa5c819d6ef8ebffe6ee17a9413111ff996e1376c7df6e1c026d1edb2f69f48a2f9429d622859
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.7.0.ebuild b/media-libs/waffle/waffle-1.7.0.ebuild
new file mode 100644
index 000000000000..a3d7588a87d7
--- /dev/null
+++ b/media-libs/waffle/waffle-1.7.0.ebuild
@@ -0,0 +1,67 @@
+# 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://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
+"
+
+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-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 43899a8515c6..a3d7588a87d7 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-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
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 728e3bf510b9..3b5a9f8da909 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,6 +1,6 @@
 DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
 EBUILD xine-lib-1.2.10.ebuild 5196 BLAKE2B 3ab9183a937bf5e72058dc6309a1258e8177b2e1d2044e6b164e525be497688cdfcd12c176f9aa1fe809588c5511de060935ed29189886c4a24ba5f81991170e SHA512 569b9418b0671eba865429434ebdccb52b9a1d387027f70fb7484f4d32b99b9bda5658c1c6a9f58d43bf026e625cd0666ea0d8cb657952cb88e7460543914910
-EBUILD xine-lib-1.2.11.ebuild 5209 BLAKE2B 9b315488fb44f003cdd49567a0fea17a328c301ddb4a37994d789e9aece01539529948f405f5773e7226830b72df45038c968a47c1762f34da3df37b33d8405f SHA512 c6dafc32a52babe3ab2615829245a9e71ebe1a77521697bfbb168aedf161ec0c36f04ff90adde28c972678662172e8e36da5b87e60464fe4d1c8fe0a8cbea273
+EBUILD xine-lib-1.2.11.ebuild 5207 BLAKE2B 40417e61e79213e1b0947d6273712e18037721921d55b64c9ffa4af4ce77a27e5ffe4072b68f7d003fd36a3d5005e53b618631ab39d36449b681dd217035cbae SHA512 1e916b2261d5d1d43aa33744ad177f9991c9e9cfe0bdf1e439b5c711c36daac35282ade02193662d0deeb00dcd756843756f3c603cc5df33ce017914443f2a2b
 EBUILD xine-lib-1.2.9999.ebuild 5211 BLAKE2B f8c2ae627ba412ae2d0dc19a293787a1395e81729ca20a70170e5521744faa538de5b8e074208d2ede249dd5b85fbb507e324106df37662e0912fcd52df1795f SHA512 6c49006f8a5ee75073a0c28cfce7ffed01d93001cce4bf59fac1eb8efad132ebc982306f66a1495930f78d8b1b8aaf55a37351e51650bf3748cac9512fcf6d05
 MISC metadata.xml 2678 BLAKE2B 475baae30c66efa429a1bfb89590dde7f22a5774da81e7ac984fa4274668b892cdc30201d51c4fae9ef84da2ce02bac642a6084a45841f2a53d45815fdac924e SHA512 d57598b801107419ee3dc81e5b1ced81dad8296730967f9c58c94d4a1092eca53bbedf2e8ac654c6f0677ad32dbba32962787816ff201865fd1241cb363769b6
diff --git a/media-libs/xine-lib/xine-lib-1.2.11.ebuild b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
index 9385bc831433..813581de41fd 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/zita-convolver/Manifest b/media-libs/zita-convolver/Manifest
index 00188e207790..c66f743797ef 100644
--- a/media-libs/zita-convolver/Manifest
+++ b/media-libs/zita-convolver/Manifest
@@ -1,4 +1,4 @@
 AUX zita-convolver-4.0.3-makefile.patch 907 BLAKE2B ab142d1f19bf104cb0bb02d615f1611138859dd001062b675a7f1e716763749f464534e8b64a0793211e6a816ac35d4fad0af4fa8896b55e7024c3dd9910f462 SHA512 4f6ea8c861d8444e259a1dcd5d0ddb5980a36a396a6362bb2cd7e498dff2b368cd7b1458a54360255645b32561872cbbc59a8bfbd1ff71659f24329df51be702
 DIST zita-convolver-4.0.3.tar.bz2 19591 BLAKE2B 3bd77cbc46d93c2200329451634dc48b94183aaa17034aa4b3dd03c33ad7982e9bed85e164f5c0e34666a1a6443199afe24222d41477368c4b366335e9767b91 SHA512 62d7841757f10c094e43ed755e187f947c5743f302ed2a1ee6064a850c18921466f4505d8a2a7b3ad23619db7f1ad7307e1dfb2e8a1e7685e60ece2ffff4f6ca
-EBUILD zita-convolver-4.0.3.ebuild 759 BLAKE2B 65b040a21cd6c7f09896349852a92087008c232ceedb4270341782382d3314aab01c8dce9f789750fd01bf9d32d5e7e7719f6e9170746fc617a795086386b12c SHA512 af2c9c4d70f8107393982cb048a2c1642f40c4e8de64f629bca1ac462998f889330e5ef2eca54d56441a7ab7a3938fd55fdb5e88a24110191161137829ce47fe
+EBUILD zita-convolver-4.0.3.ebuild 764 BLAKE2B ed92ea23606c97f0a4c75a990f0128100c98de5b1922bf159c675f1eb72635d17a25ffa047a0f0fc29517b5dabcd13eed385d4b32ccd3f9770ec3c308408d346 SHA512 4062bd9f8261d8e485c7e16cd5ad2dd4fb3c65bda38af20d7ca744d7cee4e1036bd15345108452f80d0acadc6db664406ef8068a962816e58de10f67f1ba83d2
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild b/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
index 782e235b0206..f84c5835b94c 100644
--- a/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
+++ b/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0/4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="sci-libs/fftw:3.0="
 DEPEND="${RDEPEND}"