gentoo resync : 22.05.2021

98 files changed, 379 insertions, 1678 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3e5ab4f82729..3efd756eb5df 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index ff053b7c7c1d..d07dab6c457b 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,4 +1,4 @@
 AUX avidemux-core-2.7.6-ffmpeg-flags.patch 303 BLAKE2B 9b8a1f14bb7ce12c48f96f732228fb97783e8dd79a9e7f8fa4913a1536f93f0eb384c92946816e78f65ba5cb31a062de95992069d43bc5f28468d017d39a2bcb SHA512 25d41f677c71a76528f2b09ff06643a38cf04de6c32c8c4f272ace7043d373670abbf85cf7219a2a3f65d23f9eba314fdecf1938b9550f6b916b25711a95aea2
 DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
-EBUILD avidemux-core-2.7.6.ebuild 2581 BLAKE2B 19866bbb3d2636cddf0b2f1b2b3258b144aab9265d73a209981b60d372904b3f5e2b549f21a81f5cf61341970dac6e13e3fbab315db99e2ebe7b9e5921130bed SHA512 983515082d8c4517947c8266d9a0edc94fde1402530318f27f746178d1ea69a4722d37c2970ed788805d48a2b8494471d16f6ac2b93ef8bef42bbfadcad0dd08
+EBUILD avidemux-core-2.7.6.ebuild 2625 BLAKE2B 034507126a57480094c4031333cfe896ab1379a22ad8504c1286b34d2249d16201901bbb399b91822bbc7a0a71ffaefa168ff35b835a4eecc15a763770cd1f8f SHA512 04f4c055ccaae76f817cd70fb3e960d65c8dcf133b63588b420e08c9b656601589932a409aa85cf2c7bc8e5705bcd329a03fd71e8830141320aa65b15daaba6f
 MISC metadata.xml 569 BLAKE2B 19e9f892bf6e5c63f2054dfd44beef6b394fcdeecbb2e91edf01e7e9370b7a32c21529ad566921d46992f14d00943ac69e5f0f55cff8406d48ee84dc6515619c SHA512 58e100ccdc3e1145703d4feef2776bdf4ccfcc44dc9e04f1e79f5ea1b89f6ae59c386794028328f27d8715cd00abb410cb6970f1b72c1646750babf742fe3270
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
index a43ad8aca26f..6f2b5d5eb4bf 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.6.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
@@ -75,6 +75,8 @@ src_prepare() {
 src_configure() {
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
+	# Bug 768210
+	append-cxxflags -std=gnu++14
 
 	local mycmakeargs=(
 		-DAVIDEMUX_SOURCE_DIR='${S}'
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index af16d2573fc6..e6f2afe5ff31 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,6 +1,8 @@
 DIST dav1d-0.8.0.tar.bz2 668627 BLAKE2B 6f45c6b0011acb74bb26fa201e667b16dbf8b691a2bc5d2043517381ca58132fa29ee828841609762737ac8637948b2bd4bac9e2c1d2ca23b1d3ad23f5883875 SHA512 906481ce5b9ce99cef2723c4c2466ba762095b9f88caccd42dcabfd4800964d7cd142736de1bf2ef25b631ee01eb26f7f1ac1754fc161b8fb7192e104df10e28
 DIST dav1d-0.8.2.tar.bz2 695931 BLAKE2B cfe7667e583e05f8fd84b226a26ea23a901336fd8cf62900b47cd6b3bf92f8fe58d14224d1e063cc3bf7abdb17da437d291dc3f604cb68e99fc0615619f76880 SHA512 73335594950b08596356a1950213abf57c6d48060da37149e700565f9689ca82b7427e320040bf43b2e97eff7b6da7116a6aca77cb717f7ce140039ebdae5595
+DIST dav1d-0.9.0.tar.bz2 771739 BLAKE2B 9cf24b142a1148200766a1a20010ff14d1baec507a7ecb477117826784b668178ba753049abf316aacbe1b957340c157f960f748ab8e6f74caf567edba2be3a9 SHA512 cfbfa4cb4508e1b975d7247bf0fa09d3b7adfd224adcf181153365677237b98a6d53b0b7bb91055a26e5668d58b3dcda5f675f68aceb1b020d14b53c4488575e
 EBUILD dav1d-0.8.0.ebuild 1175 BLAKE2B 043f3cac61cba7b31b92c3a4c7f0b6722444c66d3e0e6d82acf27841b1ca0003a816839e6a67eaf3cfa94f4795dd8e466d36c1d3681fdaed85a6de9615fbf779 SHA512 4624d5b50cb6fcb27dd7168efe7ada23f431ce7d575edc81e111488df7da4beae7d8f098332b26a19ed6a911e6b3891f10c4cd294a97fb244d24c271574936c8
 EBUILD dav1d-0.8.2.ebuild 1255 BLAKE2B 4ddaa8cf4cad0ea61d18fcc22b9140f4abc188feb7aafc6f0ad1ba4afd507cfdbe2ae930f335af61f585209b490c4298aaa11d997606474611fdfe4332740e6f SHA512 4e352a5e7d77bb95c168b12ee6963737b84b7be8b052cd296ebada29f658de914747b7f4372ec97d165922ffa81f61200b659a046ac1d2439fbd3be9cdbd6361
+EBUILD dav1d-0.9.0.ebuild 1261 BLAKE2B c638bed21ad66263281ae7772ddb146ba774fc02b9c45aedf98d411f4b8ae23304b2c04445f69def2e68fb2c4ef05c74f8e037b6be94678a9b14370269b05a8f SHA512 a514ba781229c5c39c8fd378cd4f077d68d20db36030b243c170c6f1dc09ef8f7f5c0011c68ce30dbeb8883b6d3d814281565a8452cec71e0d408eaded6f49f9
 EBUILD dav1d-9999.ebuild 1261 BLAKE2B c638bed21ad66263281ae7772ddb146ba774fc02b9c45aedf98d411f4b8ae23304b2c04445f69def2e68fb2c4ef05c74f8e037b6be94678a9b14370269b05a8f SHA512 a514ba781229c5c39c8fd378cd4f077d68d20db36030b243c170c6f1dc09ef8f7f5c0011c68ce30dbeb8883b6d3d814281565a8452cec71e0d408eaded6f49f9
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.9.0.ebuild b/media-libs/dav1d/dav1d-0.9.0.ebuild
new file mode 100644
index 000000000000..38fc32f1023f
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.9.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+inherit ${SCM} meson ninja-utils multilib-minimal
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0/5"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+BDEPEND="asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+DOCS=( README.md doc/PATENTS THANKS.md )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	local enable_asm
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		enable_asm=false
+	else
+		enable_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-D bitdepths=$(IFS=,; echo "${bits[*]}")
+		-D enable_asm=${enable_asm}
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 2af127ab74d6..c20b2aea0941 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,6 @@
 AUX exiftool-12.16-CVE-2021-22204.patch 1607 BLAKE2B 1cfcdb7c002ba24785b9a7c5e806f2d4cdd5054905858de3d322f81919f37b472f58ebaff14fbce49fb2c88e512488e26dfda603de7e271d0c8a4a1093f6539a SHA512 7a24dfc1962e10e05d14090ede26d292352d9e8d0e1eec2289527bb7577e59eb4e618c7b1b5773dd3a8295b124af10c4082a395d38a6893b5548b3e5a06bf1b7
-DIST Image-ExifTool-12.08.tar.gz 4842868 BLAKE2B 0ad8228f5b40bf51f1e29e4676ecd012de2dec6229452f7655adb543d44e59825a21311f2d09ece5190fdda06b21fbd8cc6a697b164cf6aae94c401d082459e1 SHA512 66e445fe1aca640d4b984cfacb4972f2bc64bcab61dbb014a0486a7d04612ecbd249a2691bcff704957c93467533b383c53883bb409a2064bb8c839ae7c2d4a5
 DIST Image-ExifTool-12.16.tar.gz 4888506 BLAKE2B d262f087b4334c01ed927945aa0b072c90eaf7322af017030ef193b8b20fc7ce7008b69c483bc83d1dbe0ceab5bcb7e894e5085cae853a1d9d74f72b9c8a360e SHA512 adfd21834ccf06277903712b3c5e328b29c56f3b30ee68f6802dca0820823b627622e55f53238690525d1d19df2a59cb57f9d80a1bb2e99da37fb7d963ee16ee
-EBUILD exiftool-12.08.ebuild 543 BLAKE2B 3c64bd7b7a5a26358572ebb599df5c815200cee69bb7121a60d51f94eac2ffec1d6b19027150acf57474e05d8921272c1012dc71d95b1bfcf4abe54d2be44d2d SHA512 d98a45ba549b24053b9fb21a2bf61250fd73f5ca478dd24db1f1925e7d0c6956d183f235b7a4542b96794500284916e10d6c2eef73a82ea94338f74f5c35dfac
+DIST Image-ExifTool-12.26.tar.gz 4933296 BLAKE2B e45683243b82f8276aee498d52a88d5b34eaf8b28aebdd631f70e30bb91ceb52224dc994ed189b914f024be4eb471b07bf9f1d860d96af2ab211e482b9ea194e SHA512 15bbff738e151d3ed5c77a17c99ded6cc3da2050fe7df94c42aea544aa31d7f539d70d07fd5336ae018af05b7f168712f1367046d8004861fce58442c03f82bd
 EBUILD exiftool-12.16-r1.ebuild 606 BLAKE2B cf68bfa66a01d97d577a6e2dc3a120e2b609ea0d30c841948098b199d52860afe219f87fa3ee55899b15aad3bf7ce4c318af7ff290281d2c6dc7b236dd10edb6 SHA512 16e2e2c7a85f0848978a2388022437823dde88d82bae36c6ba0c2a543d04d94da228bc835fe9374fbf95c843b677dabe6cf8864bfb3c7839ff44d6178f67a6c0
-EBUILD exiftool-12.16.ebuild 548 BLAKE2B 4fe20c6aff48822e2830453d416740ccbd257ef0fb28164793f8cc3ff9e4ccd5448983e2a2008546f9ccd57a8e57685f2e06d01d5d7ab6bd5caae0f0fab79aeb SHA512 8ee2add456ad6eb6ce386075e6498e9cdd250434e0e881a6201febdc8fa9abfa1b7e5041d63bad0907c23df0e8d412476081bc33c1bf17ea6a9f664fcdd0c842
+EBUILD exiftool-12.26.ebuild 548 BLAKE2B 4fe20c6aff48822e2830453d416740ccbd257ef0fb28164793f8cc3ff9e4ccd5448983e2a2008546f9ccd57a8e57685f2e06d01d5d7ab6bd5caae0f0fab79aeb SHA512 8ee2add456ad6eb6ce386075e6498e9cdd250434e0e881a6201febdc8fa9abfa1b7e5041d63bad0907c23df0e8d412476081bc33c1bf17ea6a9f664fcdd0c842
 MISC metadata.xml 10039 BLAKE2B da44aad7d46d49683f89fa75db8c92230b9088cd14a5c8715a9f3a982843d8a348393f1bd10bdcc08d5d6dc4e5f2fbf0fdd517ce88df2180807796fbd5c06b32 SHA512 c4647e7055ffcae7226aa2bdff458576cc0fef14f6d782a16695902f4af96740a96f0388398eafbdca22ee76a0c808c81dafc2ccc583f8218c718f69c8fd0da9
diff --git a/media-libs/exiftool/exiftool-12.08.ebuild b/media-libs/exiftool/exiftool-12.08.ebuild
deleted file mode 100644
index 579e441d9422..000000000000
--- a/media-libs/exiftool/exiftool-12.08.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://exiftool.org/"
-SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-12.16.ebuild b/media-libs/exiftool/exiftool-12.26.ebuild
index 48300e4ce1a6..48300e4ce1a6 100644
--- a/media-libs/exiftool/exiftool-12.16.ebuild
+++ b/media-libs/exiftool/exiftool-12.26.ebuild
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 422f7aefd364..188e45843870 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -6,5 +6,5 @@ DIST libgd-2.3.1.tar.xz 2632076 BLAKE2B 22457c4a2fc493872ccbc8a2c45283e785ab200c
 DIST libgd-2.3.2.tar.xz 2821096 BLAKE2B a126fbac1c20113fe8f27187e70b1b81712212b7da01c9a0b3e5e38fb4d4356b7992a0cfd7db55a2f94877f6ecf82d775c39977a523db1f948cf215c6c0d7672 SHA512 a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2
 EBUILD gd-2.3.0.ebuild 2562 BLAKE2B 439023b5e0794151ac045b0fc9e7686db50b71044e7866c65a756398720473cb9c887a7323ac9914e2ff3c4339d4055af4b0100b3ab7ee9f6e3319b6169b4c81 SHA512 401ae121978ea066367e26dfbfeaa6ca98588830b60f7f0ba89c0aa95be486811f91a33c3c6922d34adf1ef1b8ca82b3df688d546760e2e91c03a1e2e29cff72
 EBUILD gd-2.3.1.ebuild 2474 BLAKE2B 330a280915eec3c018663ce118d62e6bec06d22b9e6bf99c873af74e2362451a7b1bbc2cb63401d805ad2230d94a9f93688d3269a25204e77d0c47330e22d230 SHA512 959c4948cd62837b7000f733d64575ad624bf316c0ce628eb4e1f1171d1096f303dd04c1928679a9cda2769eae71f34214a7ce4dabc67bdbcd4498c03a2a3c01
-EBUILD gd-2.3.2.ebuild 2634 BLAKE2B 2436c27567a749b2d27d4717c1dedb35b42d2e83d02bd24c60e9220d8c7203df7ea36704706385aef445829b7960c8dc16113c002f442f78d45e054cd3123b44 SHA512 ef960db47bd11751fac4aa876de2da338f1a41fc5116c52b8eb99de9e39d63ebde8fd98bbe7bef2009519e45fbabd0d0d83e485530a51d9d6a387b354b93d173
+EBUILD gd-2.3.2.ebuild 2633 BLAKE2B 6a1123155f400e9b9837b64d79f56e7bdbb5a50b11bf766ead068a8deb6274e52e23f08b6cb9243228f2333e18358332f7dcb240b4f71a928ec026b81e457478 SHA512 992ac0958f5545514deab7e9663529f747a96d7448f41cdd15766002da5af9a1636d521aed7c04508d9e0763e726a0d3561fc1a23918847218049b71792e9724
 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
index 9965a554fb43..2da3de419186 100644
--- a/media-libs/gd/gd-2.3.2.ebuild
+++ b/media-libs/gd/gd-2.3.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 9ab74435712c..3ea18644b586 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,8 @@
 DIST harfbuzz-2.7.4.tar.gz 16703694 BLAKE2B 9932c039bb27ee53179e500c80ae8bd24d4cb77d4fcd01c10b8b5f0fd55de6af3c265196aa80653835f464c5431f89a870a7112eaf2c715f05e1e084011fa240 SHA512 5b412e0f6d1c9142a0ef2713826cb8d6ebf348c5b64054a0676d3ce084bcff1de375dadf90e87dbbf6d0ec8e4a99339cb64b514d5464efb7e27037551e494099
 DIST harfbuzz-2.8.0.tar.gz 17000989 BLAKE2B a2b29bccf394ad8836fb534af42aaa193addc02745ffe8a82294e571483b2eb1f7ece300dbae60a0c1b9e70235109e764ded16518ab2b17e4d3d319b43404faa SHA512 736e6829fd470d1647df2c7116b4e9e6186676bc33140b3913130a9f1818f7bef2415958cab8c6bf9c5b660f43e4924d3ca220970a5c48c0c1525f601e26fd48
 DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
-EBUILD harfbuzz-2.7.4.ebuild 2767 BLAKE2B a1c4735ac9cbc60c398c2aecd86d6fdf700caf0c47d19cde266b3b471874e9761ad72f30299adc812ecbf9c65eb2c8928ebbe6c5f6d16d985812d0f1779d4dc0 SHA512 66f1d810305e2108de21d7fab29f499bb9992c32adbf88dcc37acc9aceee3c8feaca89ee9be8c85b30b6d358fe0d1c0e63af99cbc2d9847cf345e49e30aa84fc
-EBUILD harfbuzz-2.8.0.ebuild 2775 BLAKE2B 09138736a479f0bbf49c50e232bf66cff70dfc78e46166f3be07231002b3a1c3813be2c04af35468f0fab9459f4a7e58dc7b8d70eb56ddd94a01b67d343a0ed3 SHA512 fdc7e80b435ac37008654bac7771a00a0e06878fb9ea217b914f57a954ddd1266cbfdf737cbccbe624596d4a14fa3ff49f13a69644ecee595c670593280d0ac8
-EBUILD harfbuzz-2.8.1.ebuild 2775 BLAKE2B 09138736a479f0bbf49c50e232bf66cff70dfc78e46166f3be07231002b3a1c3813be2c04af35468f0fab9459f4a7e58dc7b8d70eb56ddd94a01b67d343a0ed3 SHA512 fdc7e80b435ac37008654bac7771a00a0e06878fb9ea217b914f57a954ddd1266cbfdf737cbccbe624596d4a14fa3ff49f13a69644ecee595c670593280d0ac8
-EBUILD harfbuzz-9999.ebuild 2775 BLAKE2B 09138736a479f0bbf49c50e232bf66cff70dfc78e46166f3be07231002b3a1c3813be2c04af35468f0fab9459f4a7e58dc7b8d70eb56ddd94a01b67d343a0ed3 SHA512 fdc7e80b435ac37008654bac7771a00a0e06878fb9ea217b914f57a954ddd1266cbfdf737cbccbe624596d4a14fa3ff49f13a69644ecee595c670593280d0ac8
+EBUILD harfbuzz-2.7.4.ebuild 2830 BLAKE2B d73705a7cdc51bc7a3162ec94894e91269b070d5b19e467e4d6d123281120793e7cba62b20b5aa06e304285a97cb5aba64adca31213b3534a77ad52367f223aa SHA512 b9eb722d9ead132cb2bc01029b9a3fe6e91d731c2543fbfa4b6ca2b96e21500a26801f30cc1f6561a55d71befc60940d813cc6c901c790909a7c17613b817459
+EBUILD harfbuzz-2.8.0.ebuild 2838 BLAKE2B 0388c4fa0d71c09d0299437d3335d7f0a6dffdca8310a67db597227c04672964fcd33914a081d45084749210358db7f505f968ea07af1ade0843df92b1706952 SHA512 6341f907d560396b101de4530aa08624428b5d16a30441c91bcc6cf509c55164e079a94475bebf03cda5fb24cbaecd294a611e63b2eda57e519419f39258aef4
+EBUILD harfbuzz-2.8.1.ebuild 2838 BLAKE2B 0388c4fa0d71c09d0299437d3335d7f0a6dffdca8310a67db597227c04672964fcd33914a081d45084749210358db7f505f968ea07af1ade0843df92b1706952 SHA512 6341f907d560396b101de4530aa08624428b5d16a30441c91bcc6cf509c55164e079a94475bebf03cda5fb24cbaecd294a611e63b2eda57e519419f39258aef4
+EBUILD harfbuzz-9999.ebuild 2838 BLAKE2B 0388c4fa0d71c09d0299437d3335d7f0a6dffdca8310a67db597227c04672964fcd33914a081d45084749210358db7f505f968ea07af1ade0843df92b1706952 SHA512 6341f907d560396b101de4530aa08624428b5d16a30441c91bcc6cf509c55164e079a94475bebf03cda5fb24cbaecd294a611e63b2eda57e519419f39258aef4
 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 0a5cf370b8b6..faa0655ca207 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
@@ -63,6 +63,9 @@ src_prepare() {
 	# bug 618772
 	append-cxxflags -std=c++14
 
+	# bug 790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
 	# bug 762415
 	local pyscript
 	for pyscript in $(find -type f -name "*.py") ; do
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
index dd5ebd99dc19..48efc9f4fcbc 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
@@ -63,6 +63,9 @@ src_prepare() {
 	# bug 618772
 	append-cxxflags -std=c++14
 
+	# bug 790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
 	# bug 762415
 	local pyscript
 	for pyscript in $(find -type f -name "*.py") ; do
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
index dd5ebd99dc19..48efc9f4fcbc 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
@@ -63,6 +63,9 @@ src_prepare() {
 	# bug 618772
 	append-cxxflags -std=c++14
 
+	# bug 790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
 	# bug 762415
 	local pyscript
 	for pyscript in $(find -type f -name "*.py") ; do
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index dd5ebd99dc19..48efc9f4fcbc 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -63,6 +63,9 @@ src_prepare() {
 	# bug 618772
 	append-cxxflags -std=c++14
 
+	# bug 790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
 	# bug 762415
 	local pyscript
 	for pyscript in $(find -type f -name "*.py") ; do
diff --git a/media-libs/kquickimageeditor/Manifest b/media-libs/kquickimageeditor/Manifest
index bb4cfb552f60..235b223c37b8 100644
--- a/media-libs/kquickimageeditor/Manifest
+++ b/media-libs/kquickimageeditor/Manifest
@@ -1,3 +1,3 @@
 DIST kquickimageeditor-0.1.3.tar.xz 3281972 BLAKE2B 314d492f841f1786d8e958f0b925a5485d8ee4644488e26fefaaf67bd9388403d5b88c7fc52826555ca91b762ec6caec79ae6a363a2c1d688d26076287a6e72a SHA512 ce04ca71aa6232cde2303a07dd800db9bc590a3fafda8c3843d46e994a37858934ee98914dde4c29e03cd01a247059b577375e57ac5d1449f9029d4865eae4ef
-EBUILD kquickimageeditor-0.1.3.ebuild 618 BLAKE2B 53c04e70a12762679ea82bd1e512c6d7393b8f55586693b18f87962bb36210834a104a70000ca62d7f7539ad5c41b1c5832d3c2d20993dcdb08a8bedd7e699e3 SHA512 7f246a24bbdc2014f4f447838fae2910ecb2ec887d3884c562f077acfd982b527c2f46ca2ebd7356bb76b7b4160fdd79abda1bdb4dd2186740eb6bfd4dcc949e
+EBUILD kquickimageeditor-0.1.3.ebuild 625 BLAKE2B 623bbe5b53acf151641b74b91876cb09e1b0d31d6e4b97ae58270907bce24dd7266012fffdfe00ffa671d2ea42b8e1df081906fa3b3693caa479d46b726f9267 SHA512 936a9d4628f52aad6a88d429500fdc4eed7c66a3f84ab3cd9ff104d401870050c5e80921da4ded23d407d97e9110cb9215866af4a357be35f9deea3abc7ee2b9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/kquickimageeditor/kquickimageeditor-0.1.3.ebuild b/media-libs/kquickimageeditor/kquickimageeditor-0.1.3.ebuild
index 639fb3296722..6a90ca4cdcd4 100644
--- a/media-libs/kquickimageeditor/kquickimageeditor-0.1.3.ebuild
+++ b/media-libs/kquickimageeditor/kquickimageeditor-0.1.3.ebuild
@@ -13,7 +13,7 @@ https://api.kde.org/kquickimageeditor/html/index.html"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 566310ee0264..b3750af99085 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -2,6 +2,6 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 DIST kvazaar-2.0.0.tar.gz 589661 BLAKE2B 253085784bb3481b578206d5a406d0c25c002905f420337939489d01604f7b5f4ee13a17e596ce96e5d577c508f93f72d2befa5851ab95d7ba9db2030de02550 SHA512 9b2564643f4470d59160f7addffbc6b9e22c0d8bd04dbcd77705aa7263dfdc0195a8642255c45b94049b88ba9cbf4ffd49f968d766e31bc404c612b8f18bdbca
 EBUILD kvazaar-1.2.0-r1.ebuild 1834 BLAKE2B 80e47155391be5fccd67ccde5f2ab8865a23ef63b03e4d4695314f27cde4e4b613637b646831ff0c0b4166b8dd623ca0a846bf256c899936d31f45bbde7c431a SHA512 f8b0b8842293e298092852c9ffdadaf34263a850c5f7a170f52ef8af8f514a0b87a65a317f4580e97ae358e9cd8c2399f3b2c9e9b4807c418bf8ef029637d9dc
-EBUILD kvazaar-2.0.0.ebuild 1841 BLAKE2B 8c301cc10d60875ccee438af2a7e663a81f6facaa1d456b5b316758ddd3e0f4e75cb22e3a3b11d27c9483e70ea116aff6ef7ef6eed83b4b37d19b5162a2f90d8 SHA512 a95bdb2ef91e1d50ee24734200edcb09aefc008dec2a3c7bf1c8f483511a169abf49efd052bccf9963042ad0049b5baa3b372555f1e7b2dcad72aa70ab6928f7
+EBUILD kvazaar-2.0.0.ebuild 1834 BLAKE2B 2c7336af0d2ce04c3f6cc02f6a4a2507524d3a2c15467b5f8bb41cf85363ea365d269b305097c4d9bc9999ba9cf607d5e3c4ac39314c3431b8b0fee408adb243 SHA512 648b759c0a51ed7b6e7336be96a34205dcc141a58fcedf25ed96650aea0f25a24ee80fbf9b7a2db6e0ca26509a62257eefd68262f97e91c93cd9f55794392078
 EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 8c301cc10d60875ccee438af2a7e663a81f6facaa1d456b5b316758ddd3e0f4e75cb22e3a3b11d27c9483e70ea116aff6ef7ef6eed83b4b37d19b5162a2f90d8 SHA512 a95bdb2ef91e1d50ee24734200edcb09aefc008dec2a3c7bf1c8f483511a169abf49efd052bccf9963042ad0049b5baa3b372555f1e7b2dcad72aa70ab6928f7
 MISC metadata.xml 306 BLAKE2B 9556e4fbc08c1634b447aa9ebbc78c7b8b55a088e71db8cb7ada5c45645a2ea809f50b956a2b3b54dc1493a59861e9f4c405405edc00a49991e543125017f32b SHA512 8210924e0f6d879f473b353a9806e95ec136ceaef507b1911162c7d2bfbbc4e072f9e59ac105af2771b64ba625f3b4f922b60bba7072d1d87a079c221511d927
diff --git a/media-libs/kvazaar/kvazaar-2.0.0.ebuild b/media-libs/kvazaar/kvazaar-2.0.0.ebuild
index f0ff4dca3520..9ef41a2530fb 100644
--- a/media-libs/kvazaar/kvazaar-2.0.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 fi
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index 71ad731674cf..db85fff1bf1d 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -1,5 +1,5 @@
 AUX lasi-1.1.3-cmake.patch 365 BLAKE2B 9e3944665e416a157c8cb5fa029723db5b551d7690fe6c7471f9e589093e5c136b17ec339ba0a93f96ce463be7fa1b01d734c361b3fe5061a445e13d64b036a3 SHA512 b1d6b6cb1d1f2d0006e1cac26d42f3b024f86687de87043208ad4a6c8cb94f9cd1b36d62df10bedd20729081d944c52645323420016cbf0d046c633f46f1b7cf
 AUX lasi-1.1.3-pkgconfig.patch 400 BLAKE2B b15c712c16bd70e92f80d0ab9b48edeadca75382191b54a34ac6c6dc2e0929491a7104e09c21c816b108e946f842d38f4506b71a62435785cf55acbaad13065d SHA512 fa7286b524163a6d2783758f368d60a2385012a10567ae30843daa9b72a22ddeb1fe767c24f271463bc60e27a370cd5292a6f35e6a5b5cf6f17b185f0797551a
 DIST libLASi-1.1.3.tar.gz 726769 BLAKE2B d8d06fb56e82b78f4342c959965de3908d70d1cec6147a6e3cc3d58ab4e9f978b7966c8e4507c0ff69e4ba3716270f38f3cfcafdc834001e3a0069a3495eda31 SHA512 036fb0ea1536d4ae04c0d9b5bd193ca6828228afe2cba6c1c7e12febd9b936bf3ac677711c122c44d3b12ab2f7b67f5e9dd18f44a4938ceaa2fbcc430a5748ac
-EBUILD lasi-1.1.3.ebuild 1274 BLAKE2B ad09f419804b09eefe96367fd507944553afefb1eb4f600e0036d4fd20d5ac40cfb0c0275802187ae19797bed9fe4e9bd779bd099e5c764150229c18703083a4 SHA512 05fd04abae45fe74c410a9031a754f185a94f59fd81f7303bb55f44cfbed23d527d64adf9de1f600396bc5d239cf39051e76add049f87abf3bb9069d22a87052
+EBUILD lasi-1.1.3.ebuild 1327 BLAKE2B 65564c86cb9f07ffeee748573de79e35d30f3751d3395a7c1605340f7c57d84de1e5845fcd2c92849a83c10028871f008ded1eb80f857b0d3d01c274e4c5af26 SHA512 0013cedebf95e044b521a194be95fda2790c544f3cbffcf182bf9e50f972ea8db24a4ab907fd909c526bfeb190108cc877140412dc4d2d148de58f29caa6ab49
 MISC metadata.xml 1218 BLAKE2B f6a5085f03d1bc69e88727d15754965b6db817bda61be0e71a7e7eb39262f3836de56e44498263f7c55ebdc2d58f7914e364fc23d11a1988a0ef4ca2883529c5 SHA512 c9688f2a9e74c81d7906d6609db72a7f29463c12800fb9e7922f1a4cd41db001722e5c5b102642464541e02d3a3f678fe0dd7013df9c8eace959dba3ba49ed71
diff --git a/media-libs/lasi/lasi-1.1.3.ebuild b/media-libs/lasi/lasi-1.1.3.ebuild
index c2f08f49bcb8..df41f56e078e 100644
--- a/media-libs/lasi/lasi-1.1.3.ebuild
+++ b/media-libs/lasi/lasi-1.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake flag-o-matic
 
 MY_PN=libLASi
 MY_P=${MY_PN}-${PV}
@@ -49,6 +49,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# 788766
+	append-cxxflags -std=gnu++14
 	# doesn't like CMAKE_BUILD_TYPE = Gentoo
 	CMAKE_BUILD_TYPE=None
 	local mycmakeargs=(
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 5df93d84c572..96240bc4c9a5 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -2,5 +2,5 @@ AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97f
 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
 EBUILD leptonica-1.74.4.ebuild 1739 BLAKE2B fdd42c8ae0e6c59a9892c1d4e761a00f4f5e353fe904dbcf624eb14c5d1fe72f57668078e01524ea8a549348a6e022a5c93324836d0ea85bc89fb14afdfbe5fa SHA512 206dbadf6ffbd98c47cec1eb49b80dbc0fea5b91b7a036966ae3ebd21eda1a6decfc804008f1163c10156c59ca7e8abfa777e85b9c1f6ccdac73920379526078
-EBUILD leptonica-1.80.0.ebuild 2024 BLAKE2B a6f08294f1183051c19593538b26912629605bcd7872e3c054199fff7ef953157f2ef4a683a29936087263030dc97bfbe10988caf68e8371d140594447330825 SHA512 25f9a6fea60204f9f7a0c919578a617cab49801f275cdc9ff054fd5e67190c7d3630003c1e27de300f3cafb92c069432c94f31208a04d8683ef79121e6777a60
+EBUILD leptonica-1.80.0.ebuild 2018 BLAKE2B 1ee023027c04abf35ea7108aee366b0ffb491a0eea9c98297dabcef9a83a33890588f038919d49402ea84c4d974398831521b41ef39e69306d8596c4c15fa457 SHA512 9fec7391ba7b2302ebb42e41f0b49b4371ac25793a7095709860bd1304d264b7da3757f87f985599f8168296cf2a9cda2b5507669acab74db44b117b24200fe6
 MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/leptonica-1.80.0.ebuild b/media-libs/leptonica/leptonica-1.80.0.ebuild
index 5cf65cc4ca80..ee995cad6cf1 100644
--- a/media-libs/leptonica/leptonica-1.80.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.leptonica.org/"
 SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libXcm/Manifest b/media-libs/libXcm/Manifest
deleted file mode 100644
index 884e3b48ecd7..000000000000
--- a/media-libs/libXcm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libXcm-0.5.4.tar.gz 397552 BLAKE2B 73fb9aa2e52f1b0a26108d6e07fc66afa9da6503aedd49a140692a467bf5665c4551ac34224f91305debb5e15384e29b93fd4a2ef9f233e0b4f5c6c0ab1bce27 SHA512 96d279aff907bbbe4e38d099b79ebbc3b3beaf242be296d10a16e36e721669086ae0b5252f5abc629cc1fd65e595e2eec70bb890ea6ca4bbd08e8ce91cb05b53
-EBUILD libXcm-0.5.4.ebuild 1051 BLAKE2B eabd2215954c8e532780cd93b6718f90453c19e3d27ea079ba3b923addfdcde626dea104fa74966e4335c7e0d2b8fcec0137cc7859ea9ddd60f0730cb7638306 SHA512 9b3280340e8618e1cb390781f58a4bd9834d6e536e7e6d6701a44a300aa0c28c0f36b4a23c8c734c1ae8916d9484de25ef599abb3cf1eb5028c09cb1dfa78c86
-EBUILD libXcm-9999.ebuild 875 BLAKE2B f37e5f335a04c84791cd5d967d8ff990e262cb120b6e09837876e74b41c45718f433db7a9b9f89b4241a19c1c9177fdc37761f890fdaaee6c2c9b083e3079359 SHA512 9bd5f0148c9089981df4cd48b365fe805efb650fca79a5a644c7c24a4aa26529b65a2a4839e97a89d07c2efcf055b657d6491a82780ead42366f654beafa7799
-MISC metadata.xml 302 BLAKE2B c089ace165b933d9f27e066196f28ed5b5cfad718090384a2bb49c7872f3cb3b9af85d4944b4ec9af0f596daf6fd172963ba797fc57eda5573548d74cce8bd90 SHA512 5d4afa6ae4e9df290f007c047159be9103f78e839ab183ee77b87784a3ce78ddaebb11ba8d8e29b65fd2ec1d65b0900a1162178acdd1ab796024ac06f1e60282
diff --git a/media-libs/libXcm/libXcm-0.5.4.ebuild b/media-libs/libXcm/libXcm-0.5.4.ebuild
deleted file mode 100644
index d1c34e4d3d15..000000000000
--- a/media-libs/libXcm/libXcm-0.5.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999 ]]; then
-	GITECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/oyranos-cms/libxcm.git"
-fi
-inherit autotools multilib-minimal ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="Reference implementation of the X Color Management specification"
-HOMEPAGE="http://www.oyranos.org/libxcm/"
-[[ ${PV} != *9999 ]] && \
-SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs X"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXmu[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-[[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}"
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with X x11)
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libXcm/libXcm-9999.ebuild b/media-libs/libXcm/libXcm-9999.ebuild
deleted file mode 100644
index dff600917b05..000000000000
--- a/media-libs/libXcm/libXcm-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/oyranos-cms/libxcm.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-	S="${WORKDIR}/${P,,}"
-fi
-
-DESCRIPTION="Reference implementation of the X Color Management specification"
-HOMEPAGE="https://www.oyranos.org/libxcm/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="static-libs X"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libXmu
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with X x11)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/libXcm/metadata.xml b/media-libs/libXcm/metadata.xml
deleted file mode 100644
index b6513109fac8..000000000000
--- a/media-libs/libXcm/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">oyranos-cms/libxcm</remote-id>
-		<remote-id type="sourceforge">oyranos</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index 122a609053bb..06c29fbd3845 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -1,9 +1,11 @@
+AUX libafterimage-ar.patch 1219 BLAKE2B a7f96ea3bd29cd2c4c34305b56b6bbfaf9341fb74f6456c441b6ac8da1d2a1965ec0d913ee229bf12b70ac1d37ede71aa48d6ae1888e31b2a853538813269889 SHA512 68af198e1f1c7ae1d4aa93f3ac05f4e6af4d91345ebeb56f2cf7899e4f94284667c5f9db136a5b1ce85e5ce6329003d726dc076448b959237bba45630404030a
 AUX libafterimage-config.patch 369 BLAKE2B fe12e682be9c55d4e3813181b1a9898536f5a2d33f47ce108eb52efc6526cb8407a4cd6a105c98f9804105a240793ab30fdaee9c333b24aa60c67df689e4fca5 SHA512 8d87d55d5d0df765e824418e3d79d2df2512d775f774896274388c28b5c64b8561cb7f346e327bd03975211f6c6a4e2aeb4af6c125766ddfa5c8087ca4a11de8
+AUX libafterimage-freetype.patch 855 BLAKE2B 35f2b187c516857e19c981c05dd5ce33fb5307f1c1b7b5feb296aaa307d659b53ed98ae634a4f3f0a10b355d07fe80645ebe2a9bdcf8051d5399452f4a0dd39f SHA512 87e85759c29c5dc31f28d0ed60939e1b9453f4bbb5dfdeaeaa68a5eb2b09006cdbd5248818ede642319a60408ad5a8ef4c2437cd89be6c86996e985cc6bfedb7
 AUX libafterimage-gif.patch 1436 BLAKE2B 228cbdc4f6b1a934a2f67e680ef2721b2797362fb757cc8bb625987783b33f9bdc01f9efda345330f714c5733f7cf21fd1ef9d717d938721dcc7a927290fd603 SHA512 d4f40c05be0174d2cc9f9ec9d4e911697716710d6ba451dc5d9c92581c84ff73c4a8ffe47f91ddd0917e873e3d141b2a1effa556e84f92dd7ff9cbc7eeb865ab
 AUX libafterimage-giflib5-v2.patch 11725 BLAKE2B 92ffc58146a513bb7aa0789d24ca3f39a2d4a57cecb37b2b2f3d14ce32f662c45abe17c27c409fc5bf1f0a9401364d429fb08e0362ce446910850869f356e7ef SHA512 57d53e7a2138825c6d59120247c3c4d0818710d661231316dc414d53d3e493b58fc98b6423595b3587a348de14eda15eaaf32e1284b4dcc38ce11097c3c97f70
 AUX libafterimage-libpng15.patch 1076 BLAKE2B 1de5fb2ea663842a0f843f5f2db14062021d4886bd4258da8e034cc6982086f532ff53fb0c2ed1cee7557ddd53be6d6baa9ccf6cd8f603d7d356e372fef594ec SHA512 67fff22ecb8d2027fecb50a6450b90d3be457c69c8d7c3c0cd16715ead2824634ae5b792cf3877585b74a1323c25934ab31d1462ea983557dc8acc4a6d11bc7a
 AUX libafterimage-makefile.in.patch 2168 BLAKE2B eae3d6ded2e08442d72014c9e054357ffc8dfa37b9f4be76debd6a3c6e4f54a661735eac54a5e4b12663e0365f46c49283efec21ec0e3130d6ede6c0be20e58c SHA512 0fab45a672d4cdecdbd792eb966a31d3ea7e7be7fae52b1e7080d96a513788502099dac41692b4cadfc062ee7fa24bfaceeed4931811488dc4f7c7c34a1e99ec
 DIST libAfterImage-1.20.tar.bz2 1017055 BLAKE2B 2a0c7de0a6e3369518e19d87c877401675533247f40bfc60f77ac48b52ee1ffc66feae34eb6f80a5e37415999d38db9f05ef06be88610d846a1077685decf1ce SHA512 4056c73d1ab401480803a3a932d647a66574df9f65efc0d30ba80800e1a3424b4fbfce8e9cdf82c4852862491d92cbb42392f8cce8d6ac21d3b49e4ffe1808c4
-EBUILD libafterimage-1.20-r2.ebuild 2678 BLAKE2B 5f72651d27ca2f1b341da4ba11bb724e8d835523c9d91a0af5ac1621b112676c0d6552314d6e8bd6c518cfc9d83691275622b3b425c39a212b55098ea7550e0d SHA512 171b53140e5ef261fa7a3214e79aa93960b0cd3818bda22a6fdaa81007a306a2491da74d70e0cfc46e1f3bfe5e6cd05bcce4c6c63476f2589aa26399d223795f
 EBUILD libafterimage-1.20-r3.ebuild 2616 BLAKE2B 5a675b26535616567447720dfc1c11d989b3cae58e2a63c04754231ed0eea52585dfe1778cb037d0fd3bdaf24fb73cb39db99c5d92e3f7848ae312d3759a614a SHA512 55328dd6dd1fe6aa5c5d74ce08ddb2b5312725ae177226d1d85f9575c3e3f518c24eee081d8dac93abd2ede943f2411a4f2bc8f3b62783b09b9553162172ff55
+EBUILD libafterimage-1.20-r4.ebuild 2778 BLAKE2B e5abc7d8cd6bdf6f92ea299a114a8d19495acdb39ea5123cc7df76477addb8d28dd0d552a48d5f2604dcd54d3b3d9f278e61eb01c6307fa11dcdd0713fa44440 SHA512 f987b94d84867f0fbbfdc20ee3cfe91b3a702d07bbcededf6cf96f54178a4a1e25ebd62976d495209e76eea657827da9bc95270a314c5480c1fb3519f97a6d27
 MISC metadata.xml 1093 BLAKE2B e95588bdee3a0fbb8d586f551f79b704807f8677bf9bc6e81882f65262d3c74f01d295019d77a5486c227b8c78067a7fe05776c864dae04da2acebb5c99fbd5a SHA512 d0a2fcc071c5ebe0fff77f80c6e663885181001ce1e2ea3e39ca6950e50332d4d6eaf560008ade8e72d6294d182ecaead1e9b30e7d5abb193bae2f2c75318018
diff --git a/media-libs/libafterimage/files/libafterimage-ar.patch b/media-libs/libafterimage/files/libafterimage-ar.patch
new file mode 100644
index 000000000000..6e8d0bb8cd46
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-ar.patch
@@ -0,0 +1,39 @@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/Makefile.in libAfterImage-1.20/Makefile.in
+--- libAfterImage-1.20.orig/Makefile.in	2011-01-15 08:52:22.000000000 +0300
++++ libAfterImage-1.20/Makefile.in	2021-05-19 23:32:32.793826120 +0300
+@@ -78,7 +78,8 @@
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
++AR		?= ar
++AR		+= cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/aftershow/Makefile.in libAfterImage-1.20/aftershow/Makefile.in
+--- libAfterImage-1.20.orig/aftershow/Makefile.in	2011-01-15 08:52:22.000000000 +0300
++++ libAfterImage-1.20/aftershow/Makefile.in	2021-05-19 23:32:53.158905472 +0300
+@@ -11,7 +11,8 @@
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
++AR		?= ar
++AR		+= cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/apps/Makefile.in libAfterImage-1.20/apps/Makefile.in
+--- libAfterImage-1.20.orig/apps/Makefile.in	2011-01-15 08:52:22.000000000 +0300
++++ libAfterImage-1.20/apps/Makefile.in	2021-05-19 23:33:15.769993568 +0300
+@@ -8,7 +8,8 @@
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
++AR		?= ar
++AR		+= cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@
diff --git a/media-libs/libafterimage/files/libafterimage-freetype.patch b/media-libs/libafterimage/files/libafterimage-freetype.patch
new file mode 100644
index 000000000000..575a68fd7ca2
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-freetype.patch
@@ -0,0 +1,23 @@
+--- libAfterImage-1.20.orig/configure.in	2011-01-15 08:52:22.000000000 +0300
++++ libAfterImage-1.20/configure.in	2021-05-19 23:40:50.359764859 +0300
+@@ -561,9 +561,9 @@
+ else
+   if test "x$ttf_includes" = "xno"; then
+     AC_MSG_CHECKING(headers required by TTF support)
+-    if freetype-config --cflags >/dev/null  ;then
++    if pkg-config freetype2 --cflags >/dev/null  ;then
+ 	  present_incs="$CCFLAGS $x_includes";
+-	  for l in `freetype-config --cflags` ;	do
++	  for l in `pkg-config freetype2 --cflags` ;	do
+ 	    inc_found=no
+ 	    for p in `echo "$present_incs"` ; do
+ 		if test "x$l" = "x$p" ; then
+@@ -636,7 +636,7 @@
+     have_ttf=yes
+   fi
+   if test "$have_ttf" = yes; then
+-	  AFTERIMAGE_LIBS="`freetype-config --libs` $AFTERIMAGE_LIBS"
++	  AFTERIMAGE_LIBS="`pkg-config freetype2 --libs` $AFTERIMAGE_LIBS"
+   fi
+ fi;
+ AC_SUBST(TTF_INCLUDES)
diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
index f66921efd7c1..a682ba6f4eea 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools
 
 MY_PN=libAfterImage
@@ -12,8 +12,8 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm +shaping svg tiff truetype"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype"
 
 RDEPEND="
 	X?		( x11-libs/libSM
@@ -21,17 +21,15 @@ RDEPEND="
 			  x11-libs/libXrender )
 	gif?	( media-libs/giflib:0= )
 	jpeg?	( virtual/jpeg:0 )
-	opengl?	( virtual/opengl )
 	png?	( >=media-libs/libpng-1.4:0= )
 	svg?	( gnome-base/librsvg:2 )
 	tiff?	( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}
-	X?		( x11-base/xorg-proto )
-	virtual/pkgconfig
-	!!x11-wm/afterstep"
+	X?		( x11-base/xorg-proto )"
+BDEPEND="
+	virtual/pkgconfig"
 REQUIRED_USE="
-	opengl?	 ( X )
 	shaping? ( X )
 	shm?	 ( X )"
 
@@ -50,6 +48,10 @@ src_prepare() {
 	eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
 	# add giflib-5 API support, bug 571654
 	eapply "${FILESDIR}"/${PN}-giflib5-v2.patch
+	# fix ar: respect $(AR), bug 731044 and drop 'l' flag, bug 784182
+	eapply "${FILESDIR}"/${PN}-ar.patch
+	# detect freetype properly, bug 783375
+	eapply "${FILESDIR}"/${PN}-freetype.patch
 	# do not build examples
 	use examples || sed -i \
 		-e '/^all:/s/apps//' \
@@ -68,7 +70,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
-		$(use_enable opengl glx) \
 		$(use_enable nls i18n) \
 		$(use_enable shaping) \
 		$(use_enable shm shmimage ) \
@@ -80,6 +81,7 @@ src_configure() {
 		$(use_with svg) \
 		$(use_with tiff) \
 		$(use_with truetype ttf) \
+		--disable-glx \
 		--enable-sharedlibs \
 		--with-xpm \
 		--without-builtin-gif \
@@ -101,7 +103,7 @@ src_install() {
 		doman ascompose.1
 		emake clean
 		rm Makefile* ascompose.1 || die
-		insinto /usr/share/doc/${PF}/examples
-		doins *
+		docinto examples
+		dodoc *
 	fi
 }
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index dfe69fb72587..636c322cba6d 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -2,6 +2,6 @@ AUX libavif-0.9.0-pkg-config.patch 800 BLAKE2B 401bc92fc4ed0c6f224b1ff23d22b6da9
 DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d9f82e1b7ca5876cb9859b96ac5b60ad86c2345654f85e97cb6d920f286b683d0bb588ce7db04f50322b158678c SHA512 92c5df26da70ca113ff3b217a4a09e3dea0b7c4737e0924bd2b232502cfda0c79f4f0785bc7992c973491af7660338cda481bae7b999632815142564bf3275ba
 DIST libavif-0.9.0.tar.gz 2961252 BLAKE2B 75a3d9c0f9ada1934fdafb8208571c6a863ffe04210d84b26207952028280d4e5c4efe42a6d4bc1fe417e3bbc06e8b93c416472c79ccd08d760ab65a663e16d9 SHA512 220ef27edf716af4ffc5b035c63f84e2848f165a3fe9c1b74dc0ba29f0de65147610fd4266f1b2419f60cfbb72159368da840fcb574c7a07364a60548d3db179
 EBUILD libavif-0.8.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6
-EBUILD libavif-0.9.0-r2.ebuild 2725 BLAKE2B ea04f7269ca1ae6a9d8dff2b16efc62c7cd7463d8093519537ae16f0c678772fdfb5f3ed19c6d75bda00f69b74bfa1e0750775711af73c885a2ec375139910f6 SHA512 9693b4c894ea4c910984e3eb0207f2a04c74ad7c8411efbdfc66e36495042dd436e4e492350aeb8321ed3dfd7fff424e6010a34d98b9fdfe33c00e79b336030f
+EBUILD libavif-0.9.0-r2.ebuild 2724 BLAKE2B a79345d45dadaccfcfa196aa69fef897f31b0e94ca30d4f77540c35d1ea6b4f4cd88d7199aace47f89f39f49ece9e673b853989083bfef597bfcece1632e218d SHA512 f27a8f3dea9f4efcf030b4ed914e8e1e95e58e1b275bf17aef2b0599356387a512e4bd44aeffb7dc01338f5b43b65e06df4edde672ab143c19203d0029aa8104
 EBUILD libavif-9999.ebuild 2598 BLAKE2B 30eb997ed8776849fe1a6c075b93169da72ac416ca84e7d0c6a4b8ea6a83eff005a1586eabe28955a8bc453161953dda15f9a90ba94340f239f41b819b0eb9d6 SHA512 f4b650f6ddd67b4a230d4560311f2419c4b8c5c8efc0811350631dfd08f43fced574dc522a36426164fe43a8f77ad6b956c0f25d2c149a067fd7b1d678c25961
 MISC metadata.xml 873 BLAKE2B 076f55198ed293b3a61d5fb312e6c0b5769f3e01118ab481b6902cc6b5412298b05e23d20d2063dcdec5514c804b02249f24e433194910741688cba8a51e56c2 SHA512 0ca9b65794748bba0c92034b531b5bb2e3e6f87ba362073954b8c8689cf115f20f0de3b19bdec9189a2b54ac1c5a33c77b426fb1d907b35ff35ff3b71dd86ee7
diff --git a/media-libs/libavif/libavif-0.9.0-r2.ebuild b/media-libs/libavif/libavif-0.9.0-r2.ebuild
index 5599acf29413..74044b589094 100644
--- a/media-libs/libavif/libavif-0.9.0-r2.ebuild
+++ b/media-libs/libavif/libavif-0.9.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 ~x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
 DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 1af9a854b5f7..63b4703005e8 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,6 +1,6 @@
 DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c
 DIST libglvnd-1.3.3.tar.bz2 715179 BLAKE2B 781550cbda489dca31596115c78edd1d4f1fe66062218c83ccf6cb34707501fce839b649c2b0aee3621c283397acca8fb40ad16c0388551ce7caa7fd79b7dbf5 SHA512 7da9e12c010a8f109cd24ca4c2ffc846dd7d23f82157e1e39b8ae69575fabcc9592c0b639b23d2112fe2026b679f1536f1b705a5c948fefea105418803e1b629
-EBUILD libglvnd-1.3.2-r2.ebuild 1528 BLAKE2B 592e19b30551860fbfb735e2e4b6eed4d293ffb28b68c2653ecaf16722a396971203e6a3b52577cf524e599d9f037852d9434f4038bbc0e43ce40a0db5944de6 SHA512 460609a9aba15122b3a05cc5ab7fbfda83eaa731188f58d51dda5b51910a332964a286d840a12dc6c86e2c397a169d095bfc5b82282b21d34cbaa1972cf09e27
-EBUILD libglvnd-1.3.3.ebuild 1535 BLAKE2B 33d8925075c50b240597fca54aa6a804bc6c4e79a0afae8b263ee9c222e52973adf51a944b4463071395062a3a46bcf5c010eec0a7b990f6fb8dc3a789bf8fbe SHA512 b977631fe3c0317c6efbc72f32fd0dee4405c14b05594acee42043d3b3675d08eea7c6c4698b29efae392f44c31ef2b509ca83720aa6e72605d8f7e2bd0089c1
-EBUILD libglvnd-9999.ebuild 1535 BLAKE2B 33d8925075c50b240597fca54aa6a804bc6c4e79a0afae8b263ee9c222e52973adf51a944b4463071395062a3a46bcf5c010eec0a7b990f6fb8dc3a789bf8fbe SHA512 b977631fe3c0317c6efbc72f32fd0dee4405c14b05594acee42043d3b3675d08eea7c6c4698b29efae392f44c31ef2b509ca83720aa6e72605d8f7e2bd0089c1
+EBUILD libglvnd-1.3.2-r2.ebuild 1523 BLAKE2B 51e3efbd58b3cedd9ffa2a4c6dba498eceec7902b61a1c9c1e4ea46c728a2e315e76932c42e5304dd4e8d44dd1bbad2acee8044d19354101195b2ed25992eaad SHA512 02417794a77cf9e6a510bff9541d01200de9ad9b8e8b8e511165c3104c50c71a653cf923a4bbd18d6f6906249a9bc79553d31b00080aa61e077feb58ec8443b2
+EBUILD libglvnd-1.3.3.ebuild 1530 BLAKE2B 4c0bbb2f24a0a70cafe5a101cda3c953468a5b3e72999a001735ac32152649fd9ca4abcc072606f3cef24f7d426a67e63eebdfe4fc601c09df8691f464fa5d6e SHA512 ec1d543fa0525065623a86abc7b950418f601b5346257f70d603a32f3213b8fb1e4fd939405757e73f62486b0f4359a665babf7f5aefed5968937c28eb2a082f
+EBUILD libglvnd-9999.ebuild 1530 BLAKE2B 4c0bbb2f24a0a70cafe5a101cda3c953468a5b3e72999a001735ac32152649fd9ca4abcc072606f3cef24f7d426a67e63eebdfe4fc601c09df8691f464fa5d6e SHA512 ec1d543fa0525065623a86abc7b950418f601b5346257f70d603a32f3213b8fb1e4fd939405757e73f62486b0f4359a665babf7f5aefed5968937c28eb2a082f
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild b/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
index d7725a774182..7f2486102e0f 100644
--- a/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.2-r2.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a \    '__gentoo_check_ldflags__'," \
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
 		bin/symbols-check.py || die
 }
 
diff --git a/media-libs/libglvnd/libglvnd-1.3.3.ebuild b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
index ffdb47646a23..00a568b16f98 100644
--- a/media-libs/libglvnd/libglvnd-1.3.3.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a \    '__gentoo_check_ldflags__'," \
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
 		bin/symbols-check.py || die
 }
 
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index ffdb47646a23..00a568b16f98 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a \    '__gentoo_check_ldflags__'," \
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
 		bin/symbols-check.py || die
 }
 
diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest
index b00efbf2db6a..5bccfcdabfd6 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,4 +1,4 @@
 AUX liblastfm-1.1.0_pre20190625-missing-dep.patch 766 BLAKE2B 87172764568e132717a88d42ce66f2c33453a2c506a1fcfa4200172d8ad88f353fa2d625397c38589fb6ee83674b4b45d64c78532e3513a3c738fd7dc7c89cf5 SHA512 d983704f7c4e10135b8399e0786f9f69974f44e0a3b5035d2b482cd2154ebfa066d4b2c874fd65c6a25b91a218518498f36aea54928603467a95c95bc5fc10c9
 DIST liblastfm-1.1.0_pre20190625.tar.gz 119348 BLAKE2B d4755d6dfe6dc8bb4c21e1f4ed94fd96165313111a553271e518ad57f08aab45980239a51416d6e99d87a86f7859c7ea04ba81fb06f6dfa61b2aa7f554935589 SHA512 ee36cc31e1f7b345e2de29ff4151acb7bbe30960bbf2528bf8eb5214a47272955efe3bd1c6e20af8dd22a4fbc510de34befdcd6c728683ae300bd45e578e5ebb
-EBUILD liblastfm-1.1.0_pre20190625.ebuild 1069 BLAKE2B 7e676bf61ed54474a790055acd1cb4f5e263fca9229ac653be61304fdafdfc88441d5077f150a5ae03881b138da8d729175bd3cdb8c90a5c41c8cdfbc4dcee2b SHA512 08465b758fe6a98cb909fee8d60588e28c8118596314557f961721a53b71d12e048579b0d9f12fd7333e7f6e2e3775c9d4a0459360787b97243c1a10d8dbb4bc
+EBUILD liblastfm-1.1.0_pre20190625.ebuild 1161 BLAKE2B 579903beb7d62e5bce82275551de2d9bffdaff82c85633cb693247af9199b6cc6c1a5f3c79a7d5ae126552f733623fbd134caced9b08103521218075d14f2fad SHA512 4725c5cd1bb8d7144f7f82ec8449c4d2d1d2a9e780438265bd512125e71836c7bc70a7665e8dd2ec80be4935aaff121478e3b20812185336062746b03f95bd03
 MISC metadata.xml 416 BLAKE2B 8f559223d9c09d5bcb551e582240252467d3846806e2d1ca1c2fe243286cd88b7f5760ec8313f15924b4041f55937c08795df1d4485e96c6523721c910b33efd SHA512 61b4387e1a4d837b28f13a7c705f1ab043fefb1ef80dda47399d52cb1a14ba79127f323967eb2e993fd6118375f134d9894fea9e132cc147c883758d1d5222a6
diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild
index e7a0b783f0a5..e8a9dfa10853 100644
--- a/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 COMMIT=f867df52757c569d97d9755c911ac9dec146f365
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="Collection of libraries to integrate Last.fm services"
 HOMEPAGE="https://github.com/lastfm/liblastfm"
@@ -36,6 +36,11 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}/${P}-missing-dep.patch" )
 
+src_prepare() {
+	append-cxxflags -std=c++14 # bug 787128
+	cmake_src_prepare
+}
+
 src_configure() {
 	# demos not working
 	local mycmakeargs=(
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index cd5315ea945c..e1ce9cbd25d1 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,6 +1,8 @@
 DIST liblscp-0.6.2.tar.gz 689354 BLAKE2B ecc365e8840c8179bd753b8b9ee2706daea7e12948fb079d1b39a4aab388204af5ecab381e27ac8f5feedcbb56fd02a5a236ff8da7041f213a7551d5cd0cb3cc SHA512 672ea452e5dfe5e34dc6a1cc8c9d40dacfd1a415fc4c3ba50b984d3cf064910da53c814dd43a572665c1cbb7a402a09225c0dc7d489b1589c2a98a3f8eb8f0db
 DIST liblscp-0.9.2.tar.gz 689968 BLAKE2B 1b78389a764a58e47b24676a4b4cd6ada7647ef1bc16e9d63a7fe6ad6b62870521ec39eef866b862e07fad55baacb3f0814293858dcdaa6bcd6d8a94d600e780 SHA512 e0d6f2ae3679cf41b1bc8f04910614424d3bbc046e51272a9d526429d098b0e674dccd5951482fd85832d9788a74eeefce99d1d81291e3829c077c98bcb87602
+DIST liblscp-0.9.3.tar.gz 696509 BLAKE2B a3cddd07f55522291be12f2952eafd0b9761ac8c3d38c05010d9ca6593ef9db62d9bdd7a1e8f31d74fd9cbd29cbe3ade71f3b51ffa330780a0b7feb18ff71d32 SHA512 e776b0d48a9728e69b1a198d44ab88862366ecece293d71f6552ab395fd33bfdc395dbea6f56000c2ef9897ba00e0e287b0bc042fd6b6bdc1b4864b72b20753e
 EBUILD liblscp-0.6.2.ebuild 637 BLAKE2B 248a9bc252af1529c988da6775225b3d877bc7de320ddb3e6b095b7ed0a90a73a0932870440fdb7f7f084f2dfac867796d92d0d4d0989fe4ec760730781f015e SHA512 d7f2bade518b7cd3302f6ddda469f99ecdafda4b1066d9c01a33e1837c9e22b63a4daf9db49649c90da02b13b7f0e0dbfb1e7de9b22c50e02c24feaedf034098
 EBUILD liblscp-0.9.2.ebuild 639 BLAKE2B 4a1023307f6d44477fbe9da47ed6c0ba12125441a9fad00144556b5e32b1f9c5ac8d72408d001154348a9344f931fcdc7c47e1a8befb571a5b7a1adfe5c08709 SHA512 8f2815a7ac5a81ba951fe1a4748e229233deac43a33b5f839c1c2e78cab2722310f5e5d0a5213f6b4e9d458dbf17370c9be4f3c066df6591abbbe95c72ddfacb
+EBUILD liblscp-0.9.3.ebuild 639 BLAKE2B 4a1023307f6d44477fbe9da47ed6c0ba12125441a9fad00144556b5e32b1f9c5ac8d72408d001154348a9344f931fcdc7c47e1a8befb571a5b7a1adfe5c08709 SHA512 8f2815a7ac5a81ba951fe1a4748e229233deac43a33b5f839c1c2e78cab2722310f5e5d0a5213f6b4e9d458dbf17370c9be4f3c066df6591abbbe95c72ddfacb
 EBUILD liblscp-9999.ebuild 666 BLAKE2B 6d46b9205a46720401495db41bd03e090e29b1b4f23bac9b41d4d6d86f187a3d3d69d0eac2849a623a30f2b4ce8f43a2ddd85b7e1d8f951cd88f0bfd884eeb78 SHA512 676ddb8b98247c647b70f8283dddaebd318a2a0a2944a3da931492c01aec648042b9ae1d58854a285fa0b23199d8d831b09efbda6ca51d7f61cc82b62c0432d4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liblscp/liblscp-0.9.3.ebuild b/media-libs/liblscp/liblscp-0.9.3.ebuild
new file mode 100644
index 000000000000..8d147da49de0
--- /dev/null
+++ b/media-libs/liblscp/liblscp-0.9.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ library for the Linux Sampler control protocol"
+HOMEPAGE="https://www.linuxsampler.org"
+SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
+https://download.linuxsampler.org/packages/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog TODO NEWS README )
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libltc/Manifest b/media-libs/libltc/Manifest
index e20fdb712bdf..b66515d8a64f 100644
--- a/media-libs/libltc/Manifest
+++ b/media-libs/libltc/Manifest
@@ -1,4 +1,4 @@
 DIST libltc-1.3.1.tar.gz 440790 BLAKE2B 881a237a23e6f4a9d058d69b26cad78c96a9dc0f90bb5b5ffc2d08f4b894d039b57e53cb70844d89b0defa5795d252e3afef07d43bfd4dc8b10a34066b6c1efe SHA512 e4ba96560f04155d022d2c975fa36d4bb77efb9a877344041e1bd12bd5e7d04dccb452f3a4e061aba961bd0c3c0d1d53dc98ac469e04e61a934feeedc20e09b3
-EBUILD libltc-1.3.1-r1.ebuild 637 BLAKE2B 4be99e4b5703025bfc195c3888939494026b269e9a71941d7398155b9ef1b15cf803e98e36f839e669e0bb73ef2c50c6f58df4d3cee06e01eb81cce3b6bc64d5 SHA512 f20bd2865c70ac0cb31077cb520c5481f49aa023d3c588ec001a6ac0d58040bc89f44eee7cd10ebac9daa92d2c7f97175305952b0c47d6aaabc1d81fbe94ba4a
+EBUILD libltc-1.3.1-r1.ebuild 636 BLAKE2B 39bce99c13b892d3ee8c0f51889d995e0c632dfec5f3998341893de7799fb917737d55cd73551ee82fa8daac9cad771f5cff35ccd6ae4df242baf8fdb9b0d107 SHA512 20a2d328bc8d105e7c3b32103d887610e4eed7d8e05049c89d94afcf186684cd9dafee782f9f773b5b4134e063bffff12de3bebcc58ff6579f4255babefd86bd
 EBUILD libltc-9999.ebuild 637 BLAKE2B 4be99e4b5703025bfc195c3888939494026b269e9a71941d7398155b9ef1b15cf803e98e36f839e669e0bb73ef2c50c6f58df4d3cee06e01eb81cce3b6bc64d5 SHA512 f20bd2865c70ac0cb31077cb520c5481f49aa023d3c588ec001a6ac0d58040bc89f44eee7cd10ebac9daa92d2c7f97175305952b0c47d6aaabc1d81fbe94ba4a
 MISC metadata.xml 392 BLAKE2B 66b65d303fec6353210301c86c459a343db14eb1fcd2865eeb29e72090aff6af68a6cdeb533a8f02b480e8190d70894e297eda102a8432a3114b1c0dfb8fe1bb SHA512 4bf748be05980afc6a1fb92202d1551a865d6b2b70870abe11d13a274900346e852edab9241ff5c13aec20c01dbefb2e9d1bec950e9be8caf5a4c0536ba2176a
diff --git a/media-libs/libltc/libltc-1.3.1-r1.ebuild b/media-libs/libltc/libltc-1.3.1-r1.ebuild
index 37f4e75a206e..7ec6c8eaf9eb 100644
--- a/media-libs/libltc/libltc-1.3.1-r1.ebuild
+++ b/media-libs/libltc/libltc-1.3.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/x42/libltc.git"
 else
 	SRC_URI="https://github.com/x42/libltc/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 43a8c507496e..451348a0c7af 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,5 +1,4 @@
 AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
 EBUILD libmng-2.0.3-r1.ebuild 1176 BLAKE2B bfe03984708e67885728e396aa1bd88319c2331ddb0e412927526a2f99c6d5d44688c6c8a768572c0589fe3e722a428043812eee7fd977c10656b528e322a312 SHA512 1d7dbcaf2e1d99b647710c426b2d784ceb94992762457d9a6fd842b534d24aaa5a7faaeca0ca5329c76dff2dc56c6bea63577afdb9567dd4dfe9074a55c45294
-EBUILD libmng-2.0.3.ebuild 1221 BLAKE2B 0463241e6eb9f36fb561c0661d213838b100727b4e7ef0ef81ae9e903b330b365a711a23f5d70d5400d509b66c30a3d321d29bf0015999b80ff03fc93cdb6bab SHA512 739abb6ab344fa3c2f30897af3eb7ce99a9ee913863fc6784a725fc617eb0e60967c36f1624030724b98e909888f36a9532a540158bf4b1f432b92f679e8926b
 MISC metadata.xml 291 BLAKE2B a9b24a9ed6218970d09a574357f76445e0966a927f5d12cf72b2be8b01a7dc6070562bdcb13d7f341b16ea695d45bf0330eb8a9e416593f79eff1fd5171638b1 SHA512 662be34d4175954a83c5dafae699a79ddefd0faef98f541d0c7ab1cccf930e1e980f9cb1c9efe085dafe4ed6373a254aee9d5f2f936b537da29acfa0cf5ea02c
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
deleted file mode 100644
index cfdb8cfeaeae..000000000000
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)"
-HOMEPAGE="https://www.libmng.com/"
-SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
-
-LICENSE="libmng"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="lcms static-libs"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-	>=virtual/jpeg-0-r2:0[static-libs?,${MULTILIB_USEDEP}]
-	lcms? ( >=media-libs/lcms-2.5:2[static-libs?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-jpeg-9a.patch )
-
-src_prepare() {
-	default
-	# effect of 'make distclean'
-	rm Makefile config.h config.log config.status libmng.pc stamp-h1 || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--with-jpeg
-		$(use_with lcms lcms2)
-		--without-lcms
-		)
-
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc CHANGES README* doc/{doc.readme,libmng.txt}
-	doman doc/man/*.{3,5}
-}
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index 98054bf177c6..ea9217e6e237 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.8+release.autotools.tar.gz 1474083 BLAKE2B 5519f2c8d9d4e02e32bf1ccd28a89fe547b1a4ec79a0be209a872db5c7e2eb9ca3e1a9fec820a13492bb14d1413c217654a5cbafc79bb0e041dbf2f6d27d9ca5 SHA512 29a5b97495c2fa9898cb806cbdc1bac3263b30ecb9c02860e9f7147dc1186d7600589b5f44c9b1aede9c9d44add3521e28e1ff6a9299227e8b19361fe9cd7cc2
-EBUILD libopenmpt-0.5.8.ebuild 1539 BLAKE2B 55b4bd27473b615348ca62bc4c3739e4e7026f7e131c3b556ecfb36755b87c7b5214921440868e7a3f799858201907ba078d354869a241084f7b417d8b3ea927 SHA512 31689e5b8ccef179944e31e1f0ffb913c2659a33580c131ca348b15a68556feb9405dd25b8864d0bd0566e45b26fc4d3c8c1bc1caad7097c4d2b8bfe534d2462
+DIST libopenmpt-0.5.9+release.autotools.tar.gz 1475064 BLAKE2B 0c7675ac723b10e879f0c7282a64bebb4fc489cf7ff8dd7fca8da2739cdcc89bed52da9d5bfa24e7c2e6eeb1a55b1e09d84dfc625d8c5b2eff6300b37b44d882 SHA512 993a466a508698a673fbb5b397493b1b75da2a96e3139c5d726546c999169d03fa77a96256721192d869b59e58c938d49224b08bcd0056ad3f78874dea9dcd21
+EBUILD libopenmpt-0.5.9.ebuild 1539 BLAKE2B 55b4bd27473b615348ca62bc4c3739e4e7026f7e131c3b556ecfb36755b87c7b5214921440868e7a3f799858201907ba078d354869a241084f7b417d8b3ea927 SHA512 31689e5b8ccef179944e31e1f0ffb913c2659a33580c131ca348b15a68556feb9405dd25b8864d0bd0566e45b26fc4d3c8c1bc1caad7097c4d2b8bfe534d2462
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-libs/libopenmpt/libopenmpt-0.5.8.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.9.ebuild
index 0e4a4efa3c62..0e4a4efa3c62 100644
--- a/media-libs/libopenmpt/libopenmpt-0.5.8.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.9.ebuild
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 6a5345977a06..844feceb2fc1 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -2,8 +2,10 @@ AUX libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch 2047 BLAKE2B aa
 DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf023dea2974fe355d29a6c835efa67b6f50ec500fa3ce50b932fef5d035a470f0adc8377cd274c5904fb4ffc303bb0c SHA512 c57463a9fcde1b259620fcb7ce6470b0d06e45ed837b4eca35ff0931e4c440ef613590485119ed21237f9cf3c3cdb617253f17699d9d252070f30d5dcbc233ab
 DIST libplacebo-v2.43.1.tar.gz 356913 BLAKE2B 1fbda35bcdaf96ebfb20a05bcec35fc03168def2a5fbf3aa4861187a67409d3b9ae28169de2cb6fa9a78e40a1d073982e58c7e36ac9468b5c7c227ef0bb0f96c SHA512 62463dfee6e6fd450395e42d7af2b6e0caa0b183c0d00f5ba0c5ddc893a47cdd0371d37fc72a7361228324b0dc9c55dd0309a5a7210cf753618fde18a094abcb
 DIST libplacebo-v2.72.2.tar.gz 398314 BLAKE2B 59ce83d23c22fa1bc10d82b01b531ee82e3e40bf062adf7ea1d276a65c683c448797348a7a9ce234f92e0fd6c699903ae70f15df5d2e2779bec32db6b0b769e6 SHA512 0cb100350dbc81566a8363b0265bf89de8569b0313d1f1aa8ba621e39d7ee43a47ec9ab7827d01fdd2133c357983002412e67c2b2ba3616bd570f16e8e3ba135
-EBUILD libplacebo-2.43.0.ebuild 1565 BLAKE2B a698e4b9206214bec581b84ae7b9b6d9415869ff34845f94e673a60e006bc3649389a1fccf092e5eb05318ba5e906af7a688bfc20836acbb1efcd3cb6633acee SHA512 9b35fe6eab88288b78789e78c53a6baeacd684e52010845d0194e4349ee126eaa8701aad7e7714bad051d287b586263efe4846f5ded0f156fc04db5c68af3eee
+DIST libplacebo-v3.120.3.tar.gz 523749 BLAKE2B 6192570dba8de6e0bb98ccf3f0e4f13c01a27c5f97873ff0e5e3212d9b7cdebd98cce3d5ee5364ca8a585ec2a16d0bafc5a863ed35f6f225d86a4410b92edfd3 SHA512 6a2d3c6c053edc3a912a46f9c16d226d83c6f8880714f0b20a8b9417889616e4c1d4d41b8935b898cc580dc3b480ce974bb3921162165f0774ea91be1dfff520
+EBUILD libplacebo-2.43.0.ebuild 1564 BLAKE2B 6ad120ec3ff0fadb1619cfe39a9495e03c3dfce8b2aac9b06b18331355b16ff0a4f98708d337746fde1911947c1d61e55d5ff2358f8757be12c29eeee7607aa3 SHA512 b2ee3a9eaf533fe5d284ec3243d06c9871b526e8f82c11f58de412662703966e014cdeba3294b22a328355348fcac839a68f04c1d8da004a64b18c0af423487f
 EBUILD libplacebo-2.43.1.ebuild 1580 BLAKE2B 1422e2a236e6f296a00108eb9fa1516289607f30f443c56b905157e112608c9bdae8a4a6451200a579c413e08c08eac986f91481eeaed14a0774dde0ca1df3ad SHA512 2cfef936484d384e9917f0330ee2af8ec439c2e7af9771e7e0ae5086a4cb7a8dad3fd6844d72b787d6dcd976b988c2be96965c64988aa11f593b26f01c3b82ba
 EBUILD libplacebo-2.72.2.ebuild 1887 BLAKE2B 33b04aca370df443ea0be685beac68a201595685edb9298bc8f48540b966ad891485f11e3622d96d28c09e93dbb949aae2588d4763e820d67941e0e327041b42 SHA512 2c9fafa906884c9408a36cbd10e12ada226704431c795a2afdc0e1a122e8b2b273770e5d7181efc38beb0bec45d5e19457180e44b18242d28df2c311f0938fa7
+EBUILD libplacebo-3.120.3.ebuild 1887 BLAKE2B 918c0f6525ff7dbe46422e59f33f8d7339abb01668b7ea83f0aa0a366775a404c3b13704886de7aed923342b8bb974aa77c28ca8a3c26e3e0dda55292d8a3e09 SHA512 0afaf40e5e57d766d1aba53bfddd8affc48d064e56d82a0c27a6023a8111c1427b065452b6fe543fdec8f9c6eaefe85880b6bbf8ac8723ae7c07cc1ffecba689
 EBUILD libplacebo-9999.ebuild 1922 BLAKE2B 62d626bcc7f770dba9c265ccadcebae2bd4151985fcb3536c5926ef480efc9d9c414b22276cb0467149921eef0acc7ee42457de39c54acc17b520bf55306769f SHA512 9a372a4099483519cac4d63a4a9146fe201660ab11002242cd03e2499c7f219d726f2fff940c4096c9e5b7d61af6d9aebd64a322461ca7389d82fd0413990147
-MISC metadata.xml 837 BLAKE2B b3da2bf7d7bcd290fecdc1cc762d9fbdd747e2eaddf114eda7a2700048de5e8087815a98420a3fc1d2d38665e4e28d575f61c0917f8087dba69ecc90943cdb2e SHA512 20768ff4d0bd79cc4d1b9748b0f76874ffb8c060f0922dd913acf97c2ab77259dd5cd5c3dd2dc0b856ca249ac5a68b5ff0e7181d6bce5c7905473e2cbd935151
+MISC metadata.xml 599 BLAKE2B 1eaf6838d56d66603411785c54a4f7aad9152cc06e57152639bfb8cb0e29f55f68a0d6df01958cc67ecef9dd1ae84cbb33f83952820f8864f63e7e31975c8911 SHA512 ec68741bb3770de0166d12a3717d97a4ddce3b6cd811ed7b7074a78ee80b8984b5c59f4807c0f984d0d3fd6a5501b482c7c351b9a9541ff1e37fbf99c718ce6b
diff --git a/media-libs/libplacebo/libplacebo-2.43.0.ebuild b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
index d9a29bf54191..d16eba18f617 100644
--- a/media-libs/libplacebo/libplacebo-2.43.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="amd64 ppc64 x86"
 	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
diff --git a/media-libs/libplacebo/libplacebo-3.120.3.ebuild b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
new file mode 100644
index 000000000000..5167c014b94a
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+inherit meson multilib-minimal python-any-r1
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/$(ver_cut 2)" # libplacebo.so version
+IUSE="glslang lcms +opengl +shaderc test +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+	opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] )
+	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
+	vulkan? (
+		dev-util/vulkan-headers
+		media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig
+	vulkan? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	)"
+
+python_check_deps() {
+	has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use vulkan && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature glslang)
+		$(meson_feature lcms)
+		$(meson_feature opengl)
+		$(meson_feature shaderc)
+		$(meson_feature vulkan)
+		$(meson_use test tests)
+		# hard-code path from dev-util/vulkan-headers
+		-Dvulkan-registry=/usr/share/vulkan/registry/vk.xml
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test -t 10
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/libplacebo/metadata.xml b/media-libs/libplacebo/metadata.xml
index 898246a18559..b672de855c67 100644
--- a/media-libs/libplacebo/metadata.xml
+++ b/media-libs/libplacebo/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gentoo@haasn.xyz</email>
-		<name>Niklas Haas</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="glslang">Use <pkg>dev-util/glslang</pkg> to compile GLSL</flag>
 		<flag name="lcms">Add support for color management via <pkg>media-libs/lcms</pkg></flag>
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 477c27a529a4..0ba8ac4c7ac3 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -10,5 +10,5 @@ AUX libsdl-1.2.15-slibtool.patch 2288 BLAKE2B 5018f714eb40320eb0d310de1553638d66
 DIST SDL-1.2.15.tar.gz 3920622 BLAKE2B ecd4b82d7de6e4ca0de1317ad34bcd957a5a0d319e94c5b705f8b30aa53136ac08c88a6dcd90ad0ac84e607ba9483c2366921c4b25c8c53973cee62cfe97d204 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc
 DIST SDL-1.2.15_p20210224.tar.gz 3991106 BLAKE2B be0906950c80cddf15bc458f7734a3ebfa767b11e2f54bf9f771155f4420947900b95bbbebf01341d9dba4c1c7cfe9d54e43150e5f7781622b99668b3362adeb SHA512 3521fe996cf8a8ebb9beaa4802ac05cf5f3a2e7ed1c9b362a818d965b26ec8b3bbebfaac7c827feae44becf5bdd764378cb4282d129285f23a982b5c7474e006
 EBUILD libsdl-1.2.15-r9.ebuild 4081 BLAKE2B 258b06714d6ee5783241833823da37a9a8785e96702c1de4b87c1ee7898b95137317f38784e7fd025b78462d7351ebcd25d0be122af7aff5586b9c279c5b497c SHA512 0a910fd44c84082b74b67037d6703765d50ff9d6fc36c9d5e3e3640b6b4099fcdf2d2ce9022d64fe213fb6c94af78d3871486598f1c335863928862ae2804750
-EBUILD libsdl-1.2.15_p20210224.ebuild 4956 BLAKE2B dc6c957471496eed2dbc8a60c2953d2871b3a5da8d650880d5c5bd84cf10daee89893c60b0a8f87da159057a48153a63dbe7bd4fa683b9b2fbed4338526772be SHA512 29ad2d8f6a9102a986f4a01be57065ba4709c8e09ec33df905e1db5995d7e781751cf6d6bf20b167f083b8c49fbedea7f15a91304817715f2a5122608d528e1b
+EBUILD libsdl-1.2.15_p20210224.ebuild 4949 BLAKE2B 400524ae9f36330af81fafd2d3778f10c8a435ae1a6039a9e34e459bc689bd1f5b0019070cc06d92cc50aff34c476ccd7d8a9508b55107f37b6519b5c3d2836e SHA512 783acdfc7df215863607795f6417c98c95b3032768a524c7eca497557bb7cfbfb5cbb19783a4598755c873c08283523eb6083657c5a3c1d51cd18470d5f7f882
 MISC metadata.xml 1415 BLAKE2B e1f07f85768757045a516c548dfb8c9a014e0291ca13d32b3e6164d38de389d718dc5d7e9dc4f98bc67cc16d043f92cafc2819fd02d18d72b17472500a8245dc SHA512 52c647d06adee1c595d45caf05e1781c692d700726c9c0ce182ce74796f2480fada765a2772d1679589dd7919d30edfcf5a0668e525cd8e30f78455c525d5446
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
index 65181ee97dc5..274c20d5e60a 100644
--- a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libsdl-org/SDL-1.2/archive/${MY_COMMIT}.tar.gz -> SD
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 # 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.
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index a42145fc4f54..19ba08a7b972 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -6,6 +6,6 @@ AUX libsdl2-2.0.14-vulkan.patch 554 BLAKE2B 654415d20fc1782ee8d3a979355dcb743537
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
 DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
 EBUILD libsdl2-2.0.12-r2.ebuild 5880 BLAKE2B b762d683d18fca57041ef5abdc328258bd8ae7f9bb79f1b3baae9aa40337acc873a71ba1c558754bb08862b5e39bcce37d68625fd770965bac3cdcc5f65a249b SHA512 4c5ce2040cbedede83c4103aaa6a4fea4c4d26d654b0ae3da1ea8d704d64e3e7b9f7f7cf89b208d8900c61a29ba85ad2f5948ad2905ba499ba8017dd2574c8dd
-EBUILD libsdl2-2.0.14-r1.ebuild 6042 BLAKE2B fdfa03ea09941f9bc5f25a849025bfd4449b36397c7a0a8fe369f50ddf7e097f4bce95564eb65fd43a0f5e988e4722729b50cd64cb154d1605684b9e4af4fadc SHA512 79c358c001ae930a5136aa4d09cd6f35d63f3b98d8d1502a039029f481e2d3691bc83056d2ecfafe696c894d91c0ca7c3fe736a087e13b6bd32d3f82962b8e18
-EBUILD libsdl2-2.0.14-r2.ebuild 6155 BLAKE2B db8f074cfd21ca9dd922c79228d5ff85d191872909c8da1bae03ed2613919300a37e8c9929d7295103cb29be96189db1da424c3a5bfad2d7ec517dfa64920004 SHA512 21e44e143bc637862fb9a6c760857205fe1a11abae1d055cf236b2a40ad27b2ab080c80797f46731e422f67050c4d2761f2595ac3dbda2e18062401d1676e8fc
-MISC metadata.xml 1863 BLAKE2B 96b91c7b6e7dd08e8410626cedfdd6b5e563be61356573405c740d0f2ef5fa1dc6e060a38fcd4b60a5adab81591ab7d9cd2196be68bf9f705a1d0244982418bb SHA512 60ddaf41efbbcddfe9f4a9a02e82108831c6326c86410d16d9e4c5dc008cddef3f7159e2d2d2612c2d278f235f0604c0350771d17dc620d46986699e455751c3
+EBUILD libsdl2-2.0.14-r1.ebuild 6040 BLAKE2B 568f3cf2814d110c76c5eebbb5ecad94315c6b1406afebf10c8d2d92a7a8095126499fafdecc2b87032840e555264053d176688d57977f031c9b89f9bdbddcc4 SHA512 f3ab38be41cf3450e3943dcfb4426f36e81e172acd05b58a847927e83257051daec0f9f5f600bafd20939899279f1dfa466f3f9aeb0ad9030dd603e5a196770a
+EBUILD libsdl2-2.0.14-r2.ebuild 6235 BLAKE2B a9b2f8f8bbc5566113b9ecf99e813213bbfd06b5cc13112cadc6db8de5f6025dc7773aaef0d10621deabad709382d335edb934f6ae79df248bfad97fbc965c74 SHA512 5d799b2bdaa0f0ed111c6ad429540a6fbf7cd77692610cd3577347314d371970452593521f4076de26e1800247b2f7df57535bc0f967228fed24e8830e3c7c67
+MISC metadata.xml 1951 BLAKE2B 4d14f24a1f7e5db8a4ff7d3197cd54931319c510fddf0da0113a1cb2fdfc8b8bd4d6415ee6f70c6bb6ae2055e18b9bfb511dd080aa26743ae0da05c2d1f26573 SHA512 68738817cbcc9fd12209ee8ff30029a58af736566a1f47b418bb08045c0a58d04be9b5ad496e5ad5ee5ab5f58369e187d408ec16f6f24e6288d22f45f2c4abbd
diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
index 80f626e5bab7..263553b6bc07 100644
--- a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild
index e6a22bd2b6b1..50f6d8e1fe46 100644
--- a/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild
@@ -14,7 +14,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( sound )
 	fcitx4? ( dbus )
@@ -25,6 +25,7 @@ REQUIRED_USE="
 	nas? ( sound )
 	opengl? ( video )
 	pulseaudio? ( sound )
+	sndio? ( sound )
 	vulkan? ( video )
 	wayland? ( gles2 )
 	xinerama? ( X )
@@ -52,6 +53,7 @@ CDEPEND="
 		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
 	)
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
 	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
@@ -154,7 +156,7 @@ multilib_src_configure() {
 		$(use_enable libsamplerate)
 		$(use_enable nas)
 		--disable-nas-shared
-		--disable-sndio
+		$(use_enable sndio)
 		--disable-sndio-shared
 		$(use_enable sound diskaudio)
 		$(use_enable sound dummyaudio)
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index a35fb97837a8..7c587dc6d2ec 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -31,6 +31,7 @@
 		<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="joystick">Control joystick support (disable at your own risk)</flag>
 		<flag name="kms">Build the KMSDRM video driver</flag>
+		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
 		<flag name="sound">Control audio support (disable at your own risk)</flag>
 		<flag name="tslib">Build with tslib support for touchscreen devices</flag>
 		<flag name="video">Control video support (disable at your own risk)</flag>
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index b6fe85d3d888..591b4ad15409 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,5 +1,3 @@
-DIST lilv-0.24.10.tar.bz2 443795 BLAKE2B a316c0aae8f93a6104ad46e9e93cd3948b4596920a9bb7f1ab5bfe596428aa43e45413f79cd9e7c094ca3239e4811bd391015f17be5c059a54b0a050aff1e964 SHA512 1dfd4fef19537686b63a4e7df45e3b1a7c4a658acc21d5646daba4d3bd5676513857b3f437b89f1a06232516433ef155772d19625c33d49d13ada37a965982cf
 DIST lilv-0.24.12.tar.bz2 427404 BLAKE2B 47efe553c6fc249ed0cde47a47a01e0b3496ea4dfac88849b75d9720cb3a158fa1c95959ffc1a09e606f8ba3831e79382ba08ad100ee17cf19c7f1ffa186d6e2 SHA512 ea22db4e995792b62d60d793169c792549b8fb0255c2cf7a85780dd149811921e2fae5eaea0fb83465f01b14dfa66361af3be40bf7cb3733e98655b943f4faee
-EBUILD lilv-0.24.10-r1.ebuild 1792 BLAKE2B 7cb6e3a3c046d518152359e1561c27b7d48cf6b0c09e1b9fa5122d1d71776a18732b7e4b8751f5e2d82a3d50264d7f91a3e3a71bbc1c54ecde27501bc813b624 SHA512 7cb8e4da42e9c0a6edbe448c2b1727b6028e96dffa5dfaf64ecaab5a8c43ad5547e2c7a91de1d8c1fcfcc88eda77d3482917cddfac88801cd5ad31794ac0579b
-EBUILD lilv-0.24.12.ebuild 1856 BLAKE2B d675d1fc4dbaabcfcbb987366f54b28e7d7e5ea6d35908749ac79e5da0bdc016c7339dfd8d33775e8b3ba667d2ba96b7ff3afc48598082f0dd115b46a3f684a4 SHA512 c606c0c4fc6418b8834eda378288e4d5075ac5903f6aa3f745547fc374bf9dff1b2cbb38435ac9e17f20788b5cbdbcfcc811ad82b16561c8536d183d824c694b
+EBUILD lilv-0.24.12.ebuild 1854 BLAKE2B 236a33f88d7a321032c52a15984cd53af11fc7711578a2e1d08978219f2dedfe988ea79b8819637922c84031e3a106679afc8b0f9c53be062b4e4cef6833e83f SHA512 bfaf6f3c9c2988fa9f2f8d5623fb29c272ebfab05cbd268b437e345e2bbf70524b997e7578d571d53c0e3afc888b63e388e97cdf137a506bb3b7445d53f39e4e
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.10-r1.ebuild b/media-libs/lilv/lilv-0.24.10-r1.ebuild
deleted file mode 100644
index d39fc0b06433..000000000000
--- a/media-libs/lilv/lilv-0.24.10-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
-
-DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
-HOMEPAGE="http://drobilla.net/software/lilv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc +dyn-manifest static-libs test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/serd[${MULTILIB_USEDEP}]
-	dev-libs/sord[${MULTILIB_USEDEP}]
-	media-libs/libsndfile
-	media-libs/lv2[${MULTILIB_USEDEP}]
-	media-libs/sratom[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/unittest2[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--no-bash-completion \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "") \
-		$(usex dyn-manifest --dyn-manifest "")
-}
-
-multilib_src_compile() {
-	./waf build || die
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	sed -i "/lv2jack/d" utils/lilv.bash_completion
-	newbashcomp utils/lilv.bash_completion lv2info
-
-	dodir /etc/env.d
-	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
-
-	python_optimize
-}
diff --git a/media-libs/lilv/lilv-0.24.12.ebuild b/media-libs/lilv/lilv-0.24.12.ebuild
index 2c1b1c006d8d..cd8939ba7a9e 100644
--- a/media-libs/lilv/lilv-0.24.12.ebuild
+++ b/media-libs/lilv/lilv-0.24.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 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="doc +dyn-manifest static-libs test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d7ed1aa957ab..7af8cb5d210b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,8 @@
 DIST mesa-20.3.5.tar.xz 14367412 BLAKE2B 7bad876ce702158e727a752eda6722e7165b497fd3a485dae4e989f22b13288a93f51bcd5e6a69b979f0bbe41599fa237c08f3bbb81cb9c6dc4c06827f8ad5f4 SHA512 481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9
 DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f
-DIST mesa-21.1.0-rc3.tar.xz 15062052 BLAKE2B 6f53346e80625b84b090d295dc8e2e2682796cf85bedac97838cd72edc95eebf929583fd3a6702e6eb05f839bf9d059bf3c4c39eb32500e5a1a779774440a59a SHA512 1668fa8ef1ad61ccf2da243f0c773b1e6f1e54f1cd3637de0567fd1c91e7e7a37d53c6e4cde6c9e487a012317323e2eb81046aacbad1b623b9dbc68abe8b22a1
-DIST mesa-21.1.0.tar.xz 15145196 BLAKE2B 605273e9d25cca027d66cb2e99f89d6e7fb637072dbddc1d88fa1a5cc935f520d10a83175889023eccf08aed8091af8f13a326a774be27e50335ba32772d1fea SHA512 9d7617a6d5dd8ec1d93fdda8fe8b2f745695c02bc381d685f1257f7e7f08d5c06f3c57ae71c5f2dfaabb1742b8a88f47294a369bd3ac553f29835f24ce5dd350
+DIST mesa-21.1.1.tar.xz 15169732 BLAKE2B b2c2f2fa14ebf78baeb64ca976dde2920a594bcea02b3a17820135afc169c8489f37a2869b140d637b11b618c96e37834c255ca7a92d17f70003a11e8fffd401 SHA512 79d0e2b0e1e590e7f36a082df3584010a553af0b3060bd2d3a7ace700ac7a8d1b7734ba67f2e193dd441434eeec74a16e0dbcbf8c15061b5dd5d6a1feca73d62
 EBUILD mesa-20.3.5.ebuild 15063 BLAKE2B cbf593097a3b3a98f9e658f4e5e1d2bb29e7d7f977dffbb130dfd84afbfea76e10b997ec119a65450e687c101da1de199fff987f6aacfb995f4cf7551868050a SHA512 5399d4cffa57c5b1c6b089a6a0187c1aea2ee6334e8b560a8e1a7724c636538351d8d649f84fdd0d929b6c4f47c5b58cb5ebbb413a72577ca1d46db141242e47
 EBUILD mesa-21.0.3.ebuild 14981 BLAKE2B 1bcef01ce9f3df45e43f86c012249f9974e7d01b06bc5c9ba329b27efa576f699656d5b4a05025a99f991156291e5203ebfd6aa4afde4c28b2800d731589313d SHA512 7fa89a752fa2ef3b65dfed8965b76ac3a3cfe9edc9862fac408439fbeb464415084c0f253aeae524b1c92b9447e86d53fe28eaff50201090ae452329e7a39020
-EBUILD mesa-21.1.0.ebuild 15021 BLAKE2B 6b8ef24e6e5d64b5c22edc76157924c8189bd7be957d06bf81011ab4b8d701c1393d22ad7a5301fe280f453af6aa1191563b798e6a8ded2c67b477a1ff7532af SHA512 d57fbefed59d1328bc915fb8435457a9c09e917a86fc6c1225e7ea942ee2a41ef093965b386b8a3aa5fb1baa466162683c39ef319380e5e7c27425b958c92907
-EBUILD mesa-21.1.0_rc3.ebuild 15021 BLAKE2B 6b8ef24e6e5d64b5c22edc76157924c8189bd7be957d06bf81011ab4b8d701c1393d22ad7a5301fe280f453af6aa1191563b798e6a8ded2c67b477a1ff7532af SHA512 d57fbefed59d1328bc915fb8435457a9c09e917a86fc6c1225e7ea942ee2a41ef093965b386b8a3aa5fb1baa466162683c39ef319380e5e7c27425b958c92907
+EBUILD mesa-21.1.1.ebuild 15021 BLAKE2B 6b8ef24e6e5d64b5c22edc76157924c8189bd7be957d06bf81011ab4b8d701c1393d22ad7a5301fe280f453af6aa1191563b798e6a8ded2c67b477a1ff7532af SHA512 d57fbefed59d1328bc915fb8435457a9c09e917a86fc6c1225e7ea942ee2a41ef093965b386b8a3aa5fb1baa466162683c39ef319380e5e7c27425b958c92907
 EBUILD mesa-9999.ebuild 14981 BLAKE2B df68d9a7fa62672d81582f8a43c3ff125abdd134b83683bc5bd24c2b9c457b3fc1b925102c33777d7ba121e2be6d507febec0d7ac1a32f17b738bd1785623540 SHA512 d0385e88dd4c47e499a353beeb891fb3dad9c8008642ca325402af53bb5da42243e771fcfb8088dead4c08d6ba590cef67fa6d4b86a80e383c4fbd9a25877c40
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-21.1.0_rc3.ebuild b/media-libs/mesa/mesa-21.1.0_rc3.ebuild
deleted file mode 100644
index c15b166a9280..000000000000
--- a/media-libs/mesa/mesa-21.1.0_rc3.ebuild
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	osmesa? ( gallium )
-	vulkan? ( dri3
-			  video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="12"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		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
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable -- swrast
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		$(meson_feature dri3)
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		$(meson_use vulkan vulkan-device-select-layer)
-		$(meson_use vulkan-overlay vulkan-overlay-layer)
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-21.1.0.ebuild b/media-libs/mesa/mesa-21.1.1.ebuild
index c15b166a9280..c15b166a9280 100644
--- a/media-libs/mesa/mesa-21.1.0.ebuild
+++ b/media-libs/mesa/mesa-21.1.1.ebuild
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 399a1708979c..ba5a1e7db82c 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -13,7 +13,7 @@ AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
 DIST netpbm-10.86.21.tar.xz 3768736 BLAKE2B 19d641f3519f55d737aa6cd22f60847b2b241f71134bc7f9fa558e681cbffb1bff53f16e4d89e7a85b20b86e0bf0f4d9c341dde656ca07a7bc20adc94e811e36 SHA512 caa6c18039be72c47419b3ef60b64e0a04123752beb27bab178adcbb48e5311da05b422205f52c784149bb0636be1e3155e6bbf7703ec5c5775cb9981de1008e
-EBUILD netpbm-10.70.00.ebuild 5373 BLAKE2B bae61227e2fd3e65aa4005e4abb612cbf8e4ab749ff61921c9999eb4fa9203eea7efc9256df0149b47f3877aa2dad9c91a05df774801272e3c467e16ea578fb2 SHA512 b94aeeb1d9c1b7e721708711e1eb5d2bbdfd69692540edd1b79a102c191fb8bad1cc57e6ce18a0ba2e36a417416ddb7ec233381a0ca482cbad8757b90cde5e02
-EBUILD netpbm-10.76.00.ebuild 5261 BLAKE2B 56e5848b5c56ea78e54c7b2d09ef1bf942afe4aa8148ae3b534c8df9db9bae562753b0f1139e681bcc52e9758dedad4fa8ea2a6922260ae301e5607e168683ce SHA512 c75b3a3715371cd535c73811c667cc7c4d97f0e37089c017d769a572d7c716cb9b23a93f7f06f84760e0cd3d2203d6df61165c67533663f5a47f8607cca4d3e0
-EBUILD netpbm-10.86.21.ebuild 5547 BLAKE2B b692572c523bd7840f60e955b584166996bec57629ee1bbf0a8d8a719233d7f5ba65e62c3f8609dc06024a7543f2aacfc793a3742871bcdeda4ee58f086c1b56 SHA512 c00bc6a48866f4e105d40558ae6bcac12f0d9660f1cbbb52efe92cb3dc55fae0489ceb9cf554cdbd433faa634cd92f612c444f4ae9661b18b9d8c8c9c9edba2c
+EBUILD netpbm-10.70.00.ebuild 5382 BLAKE2B 8b5a70217742d7f87b59c16d777b040277cd582929a7ae5fdf3d7ca1287e598e5204d498a4b38cd3e54fd3411bfc2d2ead8cf2ee030ce34f0594d3894ff45f7d SHA512 bca0a73ebb20f6eb7543048c0e34eabf5c8a3652c8b43ab357ba3742b649bd1075ff97c522da910b80e9d9feb8125103eea4df5373b00cf7d44851bd9927c786
+EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B c94c55e373301f8506a9ee6275865f0702c0bcc5ceeccf2b8433dedf71f99834475dd27ef5328db4c9d9eda5b7a5ce3943cd59e3e19e8e6db22bc35741cbf911 SHA512 a79ddc4ab964ed64e29d644ca33fc0bed01e0c90e96a3aa38d6a6be30039b5cff2dd86f8c5a798982df9e353d286e461ae560e8be6c98e008cfdd345927c611f
+EBUILD netpbm-10.86.21.ebuild 5500 BLAKE2B f87ef16b8f85afce5d4afa89efd0fa3a9f53cc1c0ecc522676e6cd2e8d0428ca0411e7d924363be90c6b98655e480d60d421e22dd3e4a8a683f3190ee99ce2e0 SHA512 6470eab0092d68f273aff46b160d8443769e1d769244c6a8c96665b999ac208cd1dde2efa50de398974a66dc7167d2b1664fa787c0eac319e8fb10b2c0f03b94
 MISC metadata.xml 577 BLAKE2B c70497704f1a34aa7b8bcf905c05560e554957e6350b7c219ea2050815215aa926f4242ae233c9f6b11a1dd9900fcbef0956cb45d50044720769857c15808b4b SHA512 9813c0b3d04c040a54dadbcedb1e88f1d90cbff7001381f7136c84ae3909788423496c7c97242cb989c63bf5127df5196d62e75c503fb2475f14f14cfd3741f0
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index 1824974a3eec..595ad00ef034 100644
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index ab3d9c130b38..b27af756a539 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 BDEPEND="
diff --git a/media-libs/netpbm/netpbm-10.86.21.ebuild b/media-libs/netpbm/netpbm-10.86.21.ebuild
index 342952e16c90..c729f0b7f70f 100644
--- a/media-libs/netpbm/netpbm-10.86.21.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.21.ebuild
@@ -108,13 +108,11 @@ src_prepare() {
 			test/legacy-names.{ok,test} || die
 		sed -i -e '/^$/d' test/legacy-names.ok || die
 	fi
-
-	# avoid ugly depend.mk warnings
-	touch $(find . -name Makefile -exec sed "s:Makefile:depend.mk:g" {} + || die)
 }
 
 src_configure() {
-	cat config.mk.in - >> config.mk <<-EOF || die
+	# cannot chain the die with the heredoc, please check the comment below
+	cat config.mk.in - >> config.mk <<-EOF
 	# Misc crap
 	BUILD_FIASCO = N
 	SYMLINK = ln -sf
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index c342a0a58ce5..32ccd534eb03 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -16,6 +16,6 @@ DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85
 DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-4.1.2-r3.ebuild 18312 BLAKE2B 39fb4c39c4635128d31dcd5954136316eddbeb442c7331818a12d8cbe1615df0f0c2413be84ae32eb4e24b07a87fcfc7664c490b3b70049ae26fdc63d77bb268 SHA512 7d33490fefc27f8a565e714f686635902a4dcb2b99072da88c58e1ebb9d39e76b328345e035d2171b5a21ceeed7e3fafe81911273a0b090aaa7a3a6020d1bea6
-EBUILD opencv-4.5.0.ebuild 20527 BLAKE2B c6ce61375151a3da02722d8fbf8556239bc894cfe0a72ce1f8bfd7eddec85599bfe3c170ed79e45a418747e1c0a0a000725ca48fc198c41278515027b91fe894 SHA512 02cc7342c1045fb8ec6e92a50d64dc616a471634d9fe09ea9914ac96cfb065614c81dfef5187dd8390d25feb62d99949fcbd196fa14fc878520ae0edc1472ee9
-EBUILD opencv-4.5.1.ebuild 20617 BLAKE2B 77d0a272fa41a6d9154971c68be0103e526a610bdb3dc7a849c573a4659aa0339f7eee19841676a832c1b453016f860d7da6c1a51554a42f7bd74c9e44bfbc42 SHA512 8bf9b7106766ecb826658aa40df6cb39afe324ac4e0bec80d85f46a15f14986ff6d24d463062b69f5f65d2d4bf17f43ec84266074c23a43682cf06da2e01a838
+EBUILD opencv-4.5.0.ebuild 20509 BLAKE2B f0c9cdab62f516faf0b992bc7feb508c2889f552bbc520cc93f564782f54583ad6816ef9db9b1ad812dd84f75dd99a3d8fe5412b27fb3b659f6aa141abc4c4a3 SHA512 78ca91218694de32ba693650225e0fd84ba0ebe9451be348dde52bac27972d87449b49633f318333dda838e31a5d043351493531e88ff88945a41460f50011a5
+EBUILD opencv-4.5.1.ebuild 20599 BLAKE2B f901afa70907bf457fc327a169418b4b436204e5a84d247017bf336393d0616f8eabb1c4ccdcea9844f2cac04915ea4b633347bfff019d259820db0f025462c9 SHA512 48b466cbd40c9248276870f2a3cffff1f400a0a4d1f01381c11d20a4706d3f55c18347f4409b7d86a4aace412d505aebbcde3fc64f9ec956d45281977d45333d
 MISC metadata.xml 3185 BLAKE2B 107d18573676738a6ca8bec19250a4fdc2f839fb183757c19d042effe46825326346cf9090c86bc4e382bfefd05c81735886ad15b91539b1fca7896deb22a8de SHA512 51cf777192755265ed3d5fb4e7a83ba3c5e36c6e40165b770cba1a6b91183bd9e59360cd0130a2e159534c6fed90d8270787c5d204a6066e84d7a1b93e3e4f14
diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0.ebuild
index fa89f6dd8626..afbb574ddd3b 100644
--- a/media-libs/opencv/opencv-4.5.0.ebuild
+++ b/media-libs/opencv/opencv-4.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -115,7 +115,6 @@ RDEPEND="
 	lapack? (
 		virtual/cblas
 		virtual/lapack
-		virtual/lapacke
 	)
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/opencv-4.5.1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild
index 3804ebcf9ae9..c2dc01d988a9 100644
--- a/media-libs/opencv/opencv-4.5.1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -117,7 +117,6 @@ RDEPEND="
 	lapack? (
 		virtual/cblas
 		virtual/lapack
-		virtual/lapacke
 	)
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
diff --git a/media-libs/openicc/Manifest b/media-libs/openicc/Manifest
deleted file mode 100644
index d74349f6dfd7..000000000000
--- a/media-libs/openicc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX openicc-0.1.0-buildsystem.patch 8257 BLAKE2B c979455e7136e47fa7d82f23f81e6b49373455fa03191f6eb2f2cb56d52bb403d4198df3739d29d6b74f841a0901ca4b1c4d7fd35354581f93176958ecc0ba6e SHA512 880b47966eb8350b245dd7f9124d715d2915b40d962bcf550c52defa832132e9d79c269bd31b58844cfe2b582d528d76bc7eca84a92acd75c5d2165117d4fefc
-DIST openicc-0.1.0.tar.gz 193974 BLAKE2B c256d1aa6fe9ccff15650cd72ddc25392961da62a3621541e672b6e0942f24b7d7be032557038d789932530e185f340ec35414739c2402bae637bdd73af2b029 SHA512 81df4545694e920bea0b24535c1c8d06327f87dee465883c4e3209d7348ab2220f94b9e9785d9da68c5e023e9a59512d5e15b4ad8f82e256b63b7c28459fd029
-EBUILD openicc-0.1.0.ebuild 1106 BLAKE2B 10eded582abac0c870a2c27d0e7f2afe7d1b7524e06a06337423a293ef750a05f3b7da7a297cb16e49b8dca7c6eb776c17058427d5a71ed00751183c8ddb83f9 SHA512 7b67f34984dde57148e3e563fd39d6cd8ef3c3c429dceebeb83caa67f1921000a7ea59b3cc738ca2db3f671ed2aacc6e73180d14812fce870ecfca2060195fb8
-MISC metadata.xml 332 BLAKE2B 37d73e61e45957551d87dc0737f0ce43f4087517129b65d3fd43af0f3d28f1ea831f63eb39b8ba0749dff1308123ab7b5de60916a34578a08c40f6815eb577be SHA512 1976c2a94f105bdcfec12732c170797877cde03acb4f102b167df60c0aa4587877e71c1e414f19bca608feb26521522fb65d31f2742c3d48985bc535c07226c5
diff --git a/media-libs/openicc/files/openicc-0.1.0-buildsystem.patch b/media-libs/openicc/files/openicc-0.1.0-buildsystem.patch
deleted file mode 100644
index d5a3467a71bd..000000000000
--- a/media-libs/openicc/files/openicc-0.1.0-buildsystem.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c3879e..a78b993 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)
-+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5)
- 
- PROJECT (OpenICC)
- 
-@@ -35,6 +35,16 @@ SET( REVERSE_DOMAIN org.openicc )
- 
- SET( ${PROJECT_NAME}_VERSION_MAJORMINOR "${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}" )
- 
-+include(GNUInstallDirs)
-+
-+option(ENABLE_TESTS "Build tests (requires static libs)" ON)
-+option(ENABLE_TOOLS "Build tools (currently openicc-device)" ON)
-+option(ENABLE_STATIC_LIBS "Build static libs" ON)
-+
-+IF( ENABLE_TESTS )
-+  SET(ENABLE_STATIC_LIBS ON)
-+ENDIF()
-+
- IF( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-   SET(PLATFORM "OSX")
- ELSEIF( ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 950d3dc..0a89aea 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -16,13 +16,13 @@ SET (TARGET_CMAKE_FOLDER
- 
- SET (TARGET_PLUGIN_FOLDER "openicc"
- 		CACHE STRING
--		"Optional folder below system library folder where to install openicc plugins. LIB_SUFFIX is honored."
-+		"Optional folder below system library folder where to install openicc plugins."
-     )
- 
- SET (TARGET_PKGCONFIG_FOLDER
- 		"pkgconfig"
- 		CACHE STRING
--		"The folder below system library folder where to install pkgconfig files. LIB_SUFFIX is honored."
-+		"The folder below system library folder where to install pkgconfig files."
-     )
- 
- SET (TARGET_DOCUMENTATION_FOLDER
-@@ -36,10 +36,6 @@ SET (TARGET_DOCUMENTATION_FOLDER
- # Misc.
- #
- 
--SET (LIB_SUFFIX ""
--		CACHE STRING
--		"Optional suffix to use on lib folders (e.g. 64 for lib64)"
--    )
- #cmake settings for use by find_package
- CONFIGURE_FILE (
- 		"${CMAKE_CURRENT_SOURCE_DIR}/OpenIccConfig.cmake.in"
-@@ -49,6 +45,6 @@ CONFIGURE_FILE (
- 
- INSTALL ( FILES
- 		"${CMAKE_CURRENT_BINARY_DIR}/OpenIccConfig.cmake"
--		DESTINATION lib${LIB_SUFFIX}/cmake/openicc COMPONENT dev
-+		DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/openicc COMPONENT dev
- 	)
- 
-diff --git a/cmake/OpenIccConfig.cmake.in b/cmake/OpenIccConfig.cmake.in
-index 46dc1ba..373190f 100644
---- a/cmake/OpenIccConfig.cmake.in
-+++ b/cmake/OpenIccConfig.cmake.in
-@@ -16,7 +16,7 @@
- # Set path to the header file.
- FIND_PATH(OPENICC_INCLUDE_DIR
- 	NAMES openicc_version.h
--	PATHS @CMAKE_INSTALL_PREFIX@/include/@TARGET_INCLUDE_FOLDER@
-+	PATHS @CMAKE_INSTALL_FULL_INCLUDEDIR@/@TARGET_INCLUDE_FOLDER@
- 	NO_DEFAULT_PATH
- )
- MARK_AS_ADVANCED(OPENICC_INCLUDE_DIR)
-@@ -25,7 +25,7 @@ MARK_AS_ADVANCED(OPENICC_INCLUDE_DIR)
- # Set path to the library.
- FIND_LIBRARY(OPENICC_LIBRARY
- 	NAMES OpenICC openicc-static
--	PATHS @CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@
-+	PATHS @CMAKE_INSTALL_FULL_LIBDIR@
- 	NO_DEFAULT_PATH
- )
- MARK_AS_ADVANCED(OPENICC_LIBRARY)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index a60698a..57cf57f 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -19,5 +19,5 @@ IF( DOXYGEN_FOUND )
-   ADD_CUSTOM_TARGET( docu ALL
-                      DEPENDS html )
- 
--  INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PACKAGE_NAME} )
-+  INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_DOCDIR} )
- ENDIF()
-diff --git a/extras/CMakeLists.txt b/extras/CMakeLists.txt
-index ee939a5..8289b32 100644
---- a/extras/CMakeLists.txt
-+++ b/extras/CMakeLists.txt
-@@ -13,6 +13,6 @@ CONFIGURE_FILE(
- 
- INSTALL( FILES
- 		"${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}.pc"
--		DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}
-+		DESTINATION ${CMAKE_INSTALL_LIBDIR}/${TARGET_PKGCONFIG_FOLDER}
-        )
- 
-diff --git a/extras/openicc.pc.in b/extras/openicc.pc.in
-index 8680344..826a3d0 100644
---- a/extras/openicc.pc.in
-+++ b/extras/openicc.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=${prefix}/bin
--libdir=${prefix}/lib@LIB_SUFFIX@
--includedir=${prefix}/include/@TARGET_INCLUDE_FOLDER@
-+exec_prefix=${prefix}/@CMAKE_INSTALL_BINDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@TARGET_INCLUDE_FOLDER@
- 
- Name: @PACKAGE_NAME@
- Description: @PACKAGE_DESCRIPTION@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 09c6c05..d61f533 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -94,7 +94,7 @@ FIND_PACKAGE( GetText )
- MESSAGE( "GetText: ${GETTEXT_FOUND}" )
- IF( GETTEXT_FOUND )
-   SET( USE_GETTEXT TRUE )
--  SET( OI_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale" )
-+  SET( OI_LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}" )
- ENDIF()
- 
- # debug
-@@ -106,9 +106,13 @@ ADD_SUBDIRECTORY( include )
- 
- ADD_SUBDIRECTORY( libopenicc )
- 
--ADD_SUBDIRECTORY( tests )
-+IF( ENABLE_TESTS )
-+    ADD_SUBDIRECTORY( tests )
-+ENDIF()
- 
--ADD_SUBDIRECTORY( tools )
-+IF( ENABLE_TOOLS )
-+    ADD_SUBDIRECTORY( tools )
-+ENDIF()
- 
- ADD_SUBDIRECTORY( examples )
- 
-diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
-index 082eaf8..c37d987 100644
---- a/src/include/CMakeLists.txt
-+++ b/src/include/CMakeLists.txt
-@@ -16,4 +16,4 @@ SET( CHEADERS_OBJECT_CONFIG_PUBLIC
- INSTALL( FILES
- 	${CHEADERS_OBJECT_CONFIG_PUBLIC}
-         "${CMAKE_BINARY_DIR}/src/include/openicc_version.h"
--	DESTINATION include/${PROJECT_DOWN_NAME})
-+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_DOWN_NAME})
-diff --git a/src/include/openicc_version.h.in b/src/include/openicc_version.h.in
-index 627bd3b..b0b9927 100644
---- a/src/include/openicc_version.h.in
-+++ b/src/include/openicc_version.h.in
-@@ -8,10 +8,10 @@
- #define OPENICC_VERSION (OPENICC_VERSION_A * 10000 + OPENICC_VERSION_B * 100 + OPENICC_VERSION_C)	/**< version variable */
- 
- #define OPENICC_PREFIX         "@CMAKE_INSTALL_PREFIX@"	/**< install variable */
--#define OPENICC_BINDIR         "@CMAKE_INSTALL_PREFIX@/bin"	/**< install variable */
--#define OPENICC_DATADIR        "@CMAKE_INSTALL_PREFIX@/share"	/**< install variable */
--#define OPENICC_LIBDIR         "@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@"	/**< install variable */
--#define OPENICC_DATADIR        "@CMAKE_INSTALL_PREFIX@/share"	/**< install variable */
-+#define OPENICC_BINDIR         "@CMAKE_INSTALL_FULL_BINDIR@"	/**< install variable */
-+#define OPENICC_DATADIR        "@CMAKE_INSTALL_FULL_DATAROOTDIR@"	/**< install variable */
-+#define OPENICC_LIBDIR         "@CMAKE_INSTALL_FULL_LIBDIR@/"	/**< install variable */
-+#define OPENICC_DATADIR        "@CMAKE_INSTALL_FULL_DATAROOTDIR@"	/**< install variable */
- #define OPENICC_SYSCOLORDIR    OPENICC_DATADIR "/color"	/**< install variable */
- #define OPENICC_LOCALEDIR      "@OI_LOCALEDIR@"
- #define OPENICC_CMMSUBPATH     "@OI_CMMSUBPATH@"	/**< install variable */
-diff --git a/src/libopenicc/CMakeLists.txt b/src/libopenicc/CMakeLists.txt
-index 1db9b0e..b4e7994 100644
---- a/src/libopenicc/CMakeLists.txt
-+++ b/src/libopenicc/CMakeLists.txt
-@@ -36,14 +36,20 @@ ADD_LIBRARY( OpenICC SHARED ${SOURCES} )
- TARGET_LINK_LIBRARIES (
-    OpenICC
-    ${EXTRA_LIBS} ${EXTRA_LIBS_CS} )
--ADD_LIBRARY( openicc-static STATIC ${SOURCES} )
--TARGET_LINK_LIBRARIES (
--   openicc-static
--   ${EXTRA_LIBS} ${EXTRA_LIBS_CS} )
- 
--INSTALL( TARGETS OpenICC openicc-static
--         RUNTIME DESTINATION bin
--         LIBRARY DESTINATION lib${LIB_SUFFIX}
--         ARCHIVE DESTINATION lib${LIB_SUFFIX} )
-+INSTALL( TARGETS OpenICC
-+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
- 
-+IF(ENABLE_STATIC_LIBS)
-+   ADD_LIBRARY( openicc-static STATIC ${SOURCES} )
-+   TARGET_LINK_LIBRARIES (
-+   openicc-static
-+   ${EXTRA_LIBS} ${EXTRA_LIBS_CS} )
- 
-+   INSTALL( TARGETS openicc-static
-+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-+ENDIF()
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index 8792328..4bb1602 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # Device listing
- ADD_EXECUTABLE( openicc-device "${CMAKE_CURRENT_SOURCE_DIR}/openicc_device.c" )
- TARGET_LINK_LIBRARIES( openicc-device OpenICC ${EXTRA_LIBS} )
--INSTALL (TARGETS openicc-device DESTINATION bin)
-+INSTALL (TARGETS openicc-device DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
diff --git a/media-libs/openicc/metadata.xml b/media-libs/openicc/metadata.xml
deleted file mode 100644
index fb3005160158..000000000000
--- a/media-libs/openicc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>asturm@gentoo.org</email>
-		<name>Andreas Sturmlechner</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">OpenICC/config</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/openicc/openicc-0.1.0.ebuild b/media-libs/openicc/openicc-0.1.0.ebuild
deleted file mode 100644
index e6f43adc3073..000000000000
--- a/media-libs/openicc/openicc-0.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Config database to store, share and manipulate colour management informations"
-HOMEPAGE="https://github.com/OpenICC/config"
-SRC_URI="https://github.com/OpenICC/config/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	dev-libs/yajl[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="test? ( static-libs )"
-
-PATCHES=( "${FILESDIR}/${P}"-buildsystem.patch )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/openicc/openicc_version.h
-)
-
-S="${WORKDIR}/config-${PV}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_STATIC_LIBS=$(usex static-libs)
-		-DENABLE_TESTS=$(usex test)
-		$(multilib_is_native_abi || echo -DENABLE_TOOLS=OFF )
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
deleted file mode 100644
index 6db24c6c687d..000000000000
--- a/media-libs/oyranos/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX oyranos-0.9.6-mesa-18.3.1.patch 834 BLAKE2B f8cae2cdb21c4588cc1f89c9989ea95c71d200b69d1341fbdaf7dda2a17278350bec2b887f9965cd7838b4ca67d710588bb978a0805b66927afc5f29777e51c7 SHA512 6d590754543b94a8a2558a92dc0610a2df37a55a05ddfabf166004fc6fff29a38b4e5919a91b0dd1a03256da349a8167790e2eceeb00519df7de2ad95eeb08b9
-AUX oyranos-0.9.6-underlinking.patch 1064 BLAKE2B e05060b0bd88b8ca3edb36f2e9d86b5d2296e16f13420a14473a7b0273bf9b53fdea57cbd6ae4828c3b63d4ec8025757e5b9a4858378861d42f83f537155b2fc SHA512 19b22636294c74a44cad38ff4e795a110154349e89715104afd014a219e254a3749a1e9e59b37ce14f01fe22653c6ae062e11e587456b19c8012cc1315699b09
-DIST oyranos-0.9.6-patches.tar.xz 11680 BLAKE2B 2e082ce2bd091dcb59a92662ec813504fbacf03d452f54260434c3abcd63523b1c718055bb0ea2576202b3f85b4af2b36975902163991e4fe82e8e52f714cf5a SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493
-DIST oyranos-0.9.6.tar.gz 2247841 BLAKE2B b086104e2de949ec08a452fbab16c219daf36a69771f766fafeccffcdb45b74ff9b4d7754f45896c04d04f3fa78fb1faa1ae898b0594d172dd5e6355ca58af9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111
-EBUILD oyranos-0.9.6-r1.ebuild 2669 BLAKE2B e57cb65d4286ec733bf8c01e67d4b438aaf567c7b2abba5303672359254ba4c20ace18c4c08e2396c66be16f9939a401499b3a1c60d388ebca5cfa4df9e9a020 SHA512 696bcde3a1e8b34016119e0429ec446ea3fcdc99e5b42fc0458e304266a6dc862e1ac124af0fa7a268ff7fa6a36f30bb4370aa09c6c940228263dc41f2be49d1
-EBUILD oyranos-9999.ebuild 2635 BLAKE2B ef6ebe70c54e5b9cc7bf0e289ae594f1f9c106c1494f6f74c83efd62d3231f9b38ef23c49fa4bb06d6bc5d316c632d59d5f8fd643dd40300b8dd6376c49ac495 SHA512 00f825173d253661d76da2901a48681a0572abc68b7c147ba6343e813347f0e8c1e98dd5e981a3e7a21042c378c14cf28e030850ac74310aade5a43d83d6c709
-MISC metadata.xml 251 BLAKE2B 0999a9b822622949e7ddd1e5d5b77cd32cf1f689c715a8e9d4c2a4a312d8f59bf2efd06c84f52d71b05149e51514c4f4cecaf30a2c8ab391dcb3a5f7957d7b7e SHA512 bd232a6e37c4b956d15fd9fb66e3b7698c41747b9d3a1b474e8f41a1d7a0d841308526f9ba6a5b250f0140c1af47353bb0adc2e08d09bf8ef52c7b09e66ab891
diff --git a/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch b/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch
deleted file mode 100644
index 83ed82a5629a..000000000000
--- a/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ac7bdc35ea376f938ad223b0156a04a2af6d2eff Mon Sep 17 00:00:00 2001
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Fri, 28 Dec 2018 00:14:24 +0100
-Subject: [PATCH] * [exmpl]: update GLee.h to Mesa-18.3.1
-
-the include guards of system files changed
----
- src/examples/image_display/GLee.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/examples/image_display/GLee.h b/src/examples/image_display/GLee.h
-index 2edca003..01b19c68 100644
---- a/src/examples/image_display/GLee.h
-+++ b/src/examples/image_display/GLee.h
-@@ -61,7 +61,9 @@
- 	#include <OpenGL/gl.h>
- #else // GLX
- 	#define __glext_h_  /* prevent glext.h from being included  */
-+	#define __gl_glext_h_
- 	#define __glxext_h_ /* prevent glxext.h from being included */
-+	#define __glx_glxext_h_
- 	#define GLX_GLXEXT_PROTOTYPES
- 	#include <GL/gl.h>
- 	#include <GL/glx.h>
diff --git a/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch b/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch
deleted file mode 100644
index b25a36cf79e9..000000000000
--- a/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt
-===================================================================
---- oyranos-0.9.6.orig/src/modules/color/modules/CMakeLists.txt
-+++ oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt
-@@ -74,9 +74,9 @@ SET( OY_MODULE oydi )
- SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} )
- ADD_LIBRARY( ${OY_MODULE_LIB}
-              SHARED ${PACKAGE_NAME}_cmm_${OY_MODULE}.c )
--TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} )
-+TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} )
- INSTALL (TARGETS ${OY_MODULE_LIB} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OY_CMMSUBPATH})
--SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} )
-+SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} )
- 
- SET( OY_MODULE oyra )
- SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} )
diff --git a/media-libs/oyranos/metadata.xml b/media-libs/oyranos/metadata.xml
deleted file mode 100644
index 785c991172d5..000000000000
--- a/media-libs/oyranos/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">oyranos-cms/oyranos</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
deleted file mode 100644
index 26ac4c259163..000000000000
--- a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~asturm/${P}-patches.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS"
-inherit cmake-utils flag-o-matic xdg
-
-DESCRIPTION="Colour management system allowing to share settings across apps and services"
-HOMEPAGE="https://www.oyranos.org/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="cairo cups doc examples exif fltk jpeg raw scanner static-libs test tiff X"
-
-REQUIRED_USE="test? ( static-libs )"
-
-COMMON_DEPEND="
-	app-admin/elektra
-	dev-libs/libxml2
-	>=dev-libs/yajl-2.0.4-r1
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	>=media-libs/libXcm-0.5.4
-	media-libs/openicc
-	cairo? ( x11-libs/cairo )
-	cups? ( net-print/cups )
-	exif? ( media-gfx/exiv2:= )
-	fltk? ( x11-libs/fltk:1 )
-	jpeg? ( virtual/jpeg:0 )
-	raw? ( media-libs/libraw )
-	scanner? ( media-gfx/sane-backends )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/icc-profiles-basiccolor-printing2009
-	media-libs/icc-profiles-openicc"
-
-DOCS=( {AUTHORS,ChangeLog,README}.md )
-
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}/patches"
-	"${FILESDIR}/${P}-mesa-18.3.1.patch" # bug 671996
-	"${FILESDIR}/${P}-underlinking.patch"
-)
-
-src_prepare() {
-	# remove bundled libs
-	rm -r libxcm openicc yajl || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-		-DUSE_SYSTEM_ELEKTRA=ON
-		-DUSE_SYSTEM_LIBXCM=ON
-		-DUSE_SYSTEM_OPENICC=ON
-		-DUSE_SYSTEM_YAJL=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex !cairo)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex !cups)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex !doc)
-		-DENABLE_EXAMPLES=$(usex examples)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex !exif)
-		-DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(usex !fltk)
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex !raw)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex !scanner)
-		-DENABLE_STATIC_LIBS=$(usex static-libs)
-		-DENABLE_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex !tiff)
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
deleted file mode 100644
index c074e905a4e1..000000000000
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS"
-inherit cmake-utils flag-o-matic xdg
-
-DESCRIPTION="Colour management system allowing to share settings across apps and services"
-HOMEPAGE="https://www.oyranos.org/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff X"
-
-REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
-
-COMMON_DEPEND="
-	app-admin/elektra
-	dev-libs/libxml2
-	>=dev-libs/yajl-2.0.4-r1
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	>=media-libs/libXcm-0.5.4
-	media-libs/openicc
-	cairo? ( x11-libs/cairo )
-	cups? ( net-print/cups )
-	exif? ( media-gfx/exiv2:= )
-	fltk? ( x11-libs/fltk:1 )
-	jpeg? ( virtual/jpeg:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-	)
-	raw? ( media-libs/libraw )
-	scanner? ( media-gfx/sane-backends )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/icc-profiles-basiccolor-printing2009
-	media-libs/icc-profiles-openicc"
-
-DOCS=( {AUTHORS,ChangeLog,README}.md )
-
-RESTRICT="test"
-
-src_prepare() {
-	# remove bundled libs
-	rm -r libxcm openicc || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-		-DUSE_SYSTEM_ELEKTRA=ON
-		-DUSE_SYSTEM_LIBXCM=ON
-		-DUSE_SYSTEM_OPENICC=ON
-		-DUSE_SYSTEM_YAJL=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex !cairo)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex !cups)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex !doc)
-		-DENABLE_EXAMPLES=$(usex examples)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex !exif)
-		-DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(usex !fltk)
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(usex !qt5)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex !raw)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex !scanner)
-		-DENABLE_STATIC_LIBS=$(usex static-libs)
-		-DENABLE_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex !tiff)
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 46ed8cc29f71..c5570bb15caa 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,5 +1,5 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
 DIST SDL_image-1.2.12_p20210314.tar.gz 10890897 BLAKE2B ddc3e0a49e4ce8fc3c46c5dabe277f9bd2db81f43880aadc8fbd3b6fa09254669fdac90ee4c3c7b92d5c7ec97747944c3953ea2dca065e646416391730cb22dd SHA512 f087472593cbaa9e65c5d643d7801e2ff5e49bee66502d8c094ea18bcd5f66e6da153d39bff7bc81ed20556c909fc4cce279275ff55ee00aebf07d39c27fd543
 EBUILD sdl-image-1.2.12-r2.ebuild 1538 BLAKE2B ae23e1cf3fab15f0cc216ba1cbf99c9189ace20defcdc87c46af5ffa3bb91eaf6295304121cb3d13d144443006f4ccf5bce05662f5cad25c0e9f03b998517425 SHA512 ee2b0b91d4393e660e13815b08113c683e79756f7f9e832b09cd726cd61e78c7d8bd231b4d88440135be2190e0d3d1006749b13df7c2b926f3322d8762c0f701
-EBUILD sdl-image-1.2.12_p20210314.ebuild 1621 BLAKE2B 93413685315a243d8f217257d2fa807286c102c33e266c6efde925048326934a2cd931f478d8ae464eab6288a1a14bde99e7e7d7db0181d9637c7d45ebc1592a SHA512 b8414c846bf7b98c98aa1a4060436122fc46c810b10513a862389d1a06edd27cdedde6e101881f88ff8cd1e207e6372d6dc4d94c773930c6c1d2ed2f008fdc99
+EBUILD sdl-image-1.2.12_p20210314.ebuild 1614 BLAKE2B 87dcb398db953ef226f9d738b3289cdc3d77a30a561920dac2897ee6c051fcdab1105fa2e25b43d33e7a805d150f0f6a8cfe3307615b314310429585d541178f SHA512 cc83ca8ea6b7a9639a90dabb814a1ebc2630d2915c8e7fb80b0307760f3e2d103b23d1b06cf981ce3c182737e77600412ee88f70db899d27fdae9dd647981c82
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
index c0ad65d10de5..4095a856d531 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libsdl-org/SDL_image/archive/${MY_COMMIT}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index f16065ac3ff2..f4f6008016bd 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,5 +1,5 @@
 DIST SDL2_image-2.0.5.tar.gz 11736518 BLAKE2B 8009fc4ff76d8f8f4093c02304329218e1d8b7d6fd9c747387f239bc6ee09133f8f3faee0005267ce29c083a6bf4ddcf8db72f502ea047f7288ec57ebbb16380 SHA512 77e743d3f32707e015b290c1379ae3c7d7a3fe265995713267f0d0ec6517de4808f0de9890b5ab28445941af5bc9fbff346620629e0d7d7e9f365262cab05ee7
 DIST SDL2_image-2.0.5_p20210328.tar.gz 12397062 BLAKE2B ae4fe8c30b21bc7dca87e2e78cab43c83e891630962eb020c29ba84c2b206bb749491dccddd8bcc212f2fd07da651691151baf41212fb5ea954427543e3bf994 SHA512 9ba0b671dedfb7bde072424cebfa7d65e79d2d58416833d84548777aff6bf0edda8dbe30c3e423bbb724f794b4b191e609b148f38573b4166eef31203ab0005d
 EBUILD sdl2-image-2.0.5.ebuild 1585 BLAKE2B 24238b783885041ebb9de56ea9be3281dca5dbbae6f9b16bc38a9974f579ce782da76146cece2df7e75dc4f59eae131c303999b6983a432fc464e36ba37a6ac4 SHA512 c82415323ab8efa95a5b79c4ef2f89deb9577da201d88a6c946d0eb4d09381c1ee901fc404cf4839db7300529074e5e3d87fec356aee161bc65adfbef6130435
-EBUILD sdl2-image-2.0.5_p20210328.ebuild 1680 BLAKE2B 5f67e4dd6b50c091bc6d6230226cfb0d20de0b2903dfd27a7a8c213e46852179823e46890a0122b04a53fb50f0e5051117d64efa6d9cba248b4019b65ea3f2e0 SHA512 272653a92b028fe1b40c8a56c6e361624b2c8ebc398fc86ec05a6b0e60c67c6a297d14729d0349237582d127d333b8f621463a89b9b4a63043585c929723d65d
+EBUILD sdl2-image-2.0.5_p20210328.ebuild 1728 BLAKE2B 3216e97549e567f97be74bcc44a6cbe7ed69835b9d9ef28cb3c4aaaf33f5c4f58f1ce1446173bbd215e92fabf34db0bbd56b2d198bbc4479f7396741d30b36c8 SHA512 0edf09c887eddffe057f6f8a2d50897a907e8ed94f23b149083ad98f06df13adcd7b17a93a8f1de01e5f26eac7659d614ff5fd85c2a614ae320877b1a95e82b8
 MISC metadata.xml 476 BLAKE2B 025a06bf4bd229d2f8f7a52b1a38d345d319294789db9a3cb680dbeaa8d41767ab2d8e947d1cd6d6863971da48c049cf0a2c5a97a5ed0ba32975fc07b7a4ffd4 SHA512 a2c51673b42a6240444e3914659a4058ed45b5479c54ebe3995f97c54284ec6cb8da94ad6d7310ce1df85e5565dbca511d815e2d8274d29455e8b9f411bf3b1a
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild
index fd36c4b51f1b..c0a291b550e5 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libsdl-org/SDL_image/archive/${MY_COMMIT}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
@@ -51,6 +51,10 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
+multilib_src_compile() {
+	emake OBJC="$(tc-getCC)"
+}
+
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 6ad5cc6e291b..4a15ec6ee49b 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,6 +1,6 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
 DIST shaderc-2020.5_pre20201216.tar.gz 220278 BLAKE2B 9565873bd1d85c2800b26ba821da8044aecf7ef7268b4843570b18bfbe07e0c9891b4f67b3ef58d7ac0813a2ca306ec2af8ef8bacb15047903d2d9bd1b723b6f SHA512 6b133b83f300c09408efa61f56b299b5ee3900fb739f2ada37e0ee3b8af4bf50423f0f9ca9a637d845bb02eeb61347456ddae9d616b5e46d2e481994ca3d35f3
 DIST shaderc-2020.6_pre20210327.tar.gz 220258 BLAKE2B 5f3321d7bea0a39bec865cf3c6b25baba82068ecea6a5272a4c1e3432bb9f1c0062c1bcf9a57bac1e92dcd382dfb0837a03bbe434d19e83b755dc5da16e2f1dd SHA512 07f4a49faed28f23fb2f7b33c804c9909617e362f8046d6cafaaf3c74d6453ac53ea3f848dde8d2164a8827375e492c4fc544d7b9276c3e7ca80cae4baf1b47c
-EBUILD shaderc-2020.5_pre20201216.ebuild 2152 BLAKE2B e9779b48efd4dc8233ba298ca956e536a8ddb8fce6451b960b94209d750539c4bf25227b5466c8009a5edcfb7fe0cad78bc9fb33f35a6ea02dbf69e751c77c9b SHA512 190557755660bac2d52542e435fa0ebd50bf1b5971dba4cc84dc775835b60d53f945d84f58e64393ae8da57260bc83d684560bd5cdc7e0b2a3ecc5cd2a6d3745
-EBUILD shaderc-2020.6_pre20210327.ebuild 2161 BLAKE2B 8e171ffbbe7f104ae30d8fe2c4346b92558f5be42155b6adbd9f39d9b79e007a9986193c0134b66a84d29d33c1d93d83f17a07b565983bb309e0a02cbd0d6c42 SHA512 91c1a568ae5005059e01365b36083307a3f94b1e12568ca39081a9e3ccb9fb20f7c1fa381a3bb0f3987532e260aed8713fe0f09840f18a1c09b03338d1434e91
+EBUILD shaderc-2020.5_pre20201216.ebuild 2155 BLAKE2B b9a0a6025f0c9e3a2b0ef62507691774030e3c231d8bad678aeed53597bd20de3ee4410f858c44ec5503b6b37d5fe542a3ffc57e3665beea30cc909a48d9f01b SHA512 61eaaff97c665286998865ebb1b85287b37b07ef04b0c813d58d2cc0c7519d6ae09f47ed08cf7fd8173c95fba777e17a9bc8a1c334f71f5a32d1f3b05c52765b
+EBUILD shaderc-2020.6_pre20210327.ebuild 2164 BLAKE2B a1ce8d176c93ac883ce5e1992786a40db675c550bfd9356fa4c2c4c7b58f7e0f8fff7ae9890a58b49e9288f67913f3b43669d3a2936f64b29a2c6ce4e62cbce0 SHA512 197e4e7e5f67e8e0d56359d87f4a695d77720a3ca48710420441488a497670cb0091d259cd0420639e46c4e236da837c955826c7fd86d8f41d9ac741f723bcc9
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
index aea9fc518e26..f5b20c3034d9 100644
--- a/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
+++ b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
@@ -79,7 +79,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	if multilib_is_native_abi && use doc; then
-		cmake_src_make glslc_doc_README
+		cmake_src_compile glslc_doc_README
 	fi
 	cmake_src_compile
 }
diff --git a/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild b/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild
index 871135cebb08..cdce13da42b0 100644
--- a/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild
+++ b/media-libs/shaderc/shaderc-2020.6_pre20210327.ebuild
@@ -79,7 +79,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	if multilib_is_native_abi && use doc; then
-		cmake_src_make glslc_doc_README
+		cmake_src_compile glslc_doc_README
 	fi
 	cmake_src_compile
 }
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 6886832905cf..e664f2d48f3f 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,5 +1,3 @@
-DIST sratom-0.6.6.tar.bz2 347297 BLAKE2B 0cb1949486deb5e8f823b17c98fb415dc44b0cefece647b6c5b3646438736ee9c7afa617bb00a68d61a31c80f6e643758f48602f647655aa4b185b2cc5fff893 SHA512 ccc209af68a39c1a669ba694d250b292df2f588aeea2a9d1dfe54a23e31f032fcce1d99ebf9dd7cff80ce5aedd204c74e3ccc04d6cd239921cd3e443db83ed55
 DIST sratom-0.6.8.tar.bz2 327027 BLAKE2B 8e11e03e6a66e9c96f90a0f31f4a65c660ed44304600caa2daad09b955a4829b266f7495b8ed85c62c34adfbc3e7f97790096bd721b51e1038986ac2e3926e60 SHA512 49ec4b230a72005ab7a7a3de0bfa630a27a16f9f811ca8e7f6da7fcf6b34526577217075d428a993f95b813dd2a82a9b6892eeb2e36b66b122ada778fbb3fb95
-EBUILD sratom-0.6.6.ebuild 1207 BLAKE2B 6401aff2bb8d49dc156287886a37da05065e49bc1cb13f3e23d61e8d867c2b43b7cf51e9cf760e9254c82a4e6846dc77f0834d5552ae0c2dcbc753e5fb8a109e SHA512 d209123d39be88b8b2de3cbe84d5d931943068db4b6d1416be7d36df7f431ee80f63f3c24e6433c43824227df8e39a631dc9e34d70c7821cb822d0761e75336d
-EBUILD sratom-0.6.8.ebuild 1273 BLAKE2B 4bb0ab1e2622c04c077430cf5360e93ae8784e054abac49e54a7f324c1385e3dde751bb17e3637b8959acfd37b29ddd6bb8e34c1af643ac7960b7150de409daa SHA512 fc4b54ae1f05e427e3b8f6a321ac9cae59a49b9f2614d6480845ff5274f86e7060e524989a38f5560c5eb14f6649ca9c9b6421c6e7c46104dbb51a576e074933
+EBUILD sratom-0.6.8.ebuild 1271 BLAKE2B 852c884d0562f225a020b1fadc347fd3ea1e7478067c0c6c6bce81331ffea0391a3d34937fdfd955349cb194f4d10ebfad947aa3e61b39ac9a8a48ad891a6a9e SHA512 6355d8dfce903188b9795a7d53842a1e2fcb145a1e5c8989904f001cbc97dc24c0044bd3f521d72b6e0274952bc617c50ea08756780146cb15faf299958a0c95
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.6.ebuild b/media-libs/sratom/sratom-0.6.6.ebuild
deleted file mode 100644
index 980aeb5e6538..000000000000
--- a/media-libs/sratom/sratom-0.6.6.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax"
-HOMEPAGE="http://drobilla.net/software/sratom/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/serd
-	dev-libs/sord
-	media-libs/lv2
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( "NEWS" "README.md" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	default
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	default
-}
diff --git a/media-libs/sratom/sratom-0.6.8.ebuild b/media-libs/sratom/sratom-0.6.8.ebuild
index eb91d0762f0e..edd7dc0c1850 100644
--- a/media-libs/sratom/sratom-0.6.8.ebuild
+++ b/media-libs/sratom/sratom-0.6.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 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="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 05db5607e3c4..bcf4319b08e5 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -2,6 +2,7 @@ AUX svgalib-1.9.19-pic.patch 487 BLAKE2B aed4fbb6ba2d0590ce6dc189f0b675ab34cd8fa
 AUX svgalib-1.9.25-ar.patch 355 BLAKE2B e57dfe83294c27acbd57752bcc83e0cc965041a4afa713abfa31f9dd3877ea3ad69a89cb81ddf208e52bf264a18d070339aa69301855eb3bf1d324991daab390 SHA512 7c431b89ed9f8da3c12ff752ad4c0783c0f40f94c2faca04aebea1783297b1486cf40748e024e2cf52caeb62efa68fca800dc493c8606b3807ef0fd02fce8c62
 AUX svgalib-1.9.25-build.patch 2163 BLAKE2B 66fb7fcb2d006dd7419e78dd2c98254acb856689638fc09a2d8f4e849ac5137ad683fdaa66895a7180c494101e810a9e1073878c64bdd49f3aca370d6098d00e SHA512 87cb6458bb427d2e73bc275d6e77987919587dec1b2f52944191087e628aaa4eba46148bf8cd2f89f5c51a5c9f5433f3262d378173ed16e894fd962d8bada4e5
 AUX svgalib-1.9.25-fix_buffer.patch 302 BLAKE2B a3e49949702305d6ee973134a50c7105ccf46fb732b54351616af5c2831712aa178b00d8dd2f040cbfd93b3cdd08a215103319508a89b6329d7cc6339188908b SHA512 e238a5e05db06623abe04a6058345a4c4b91953c73ef02c3b4bd0b4606f9a57f2b20ef18aa2a91c50465bd3c048ba2ffd4792d62dcfadd94320afffa826641f1
+AUX svgalib-1.9.25-gl-asm-width.patch 561 BLAKE2B 8c6fcbff330fc2a96259e34311157af79e03fd5e70f219ed367aa3ca4b7a76b1be0c72443da7f2e5280c09c66f830c032019e4777ebfab1ba21fd7ccc3f1fe7b SHA512 00bedbcfea7d8b14f29a1588d3dc4d8bd1de686ad6f4daa38ce27ba0a27ea648351dceb2c1c47d1f4bdb197afcd6918e51d31f68eeacf39cd0970fad8d013d7a
 AUX svgalib-1.9.25-glibc210.patch 3842 BLAKE2B 99cfb6151d38fa75adaaa9fb0ff490430e71b416e9a5fb9b6fe228de4b937a8c36a5c645fa3a413c1cdfe3d4764720a961a7a97d9e00ff549283698dbda9bee1 SHA512 43813c240eaff58d993c0ed839bee0d5d73515e4954e7793536a981d149c882808ea79187b0bfe8511afcde78fd31b6e9ad94aaf20d28c8e96577d5f0e530d96
 AUX svgalib-1.9.25-linux_2.6.28.patch 1672 BLAKE2B f5a18701cb29307a3d09656115bcca74ca3191eedf5f7c5c0e0d42ed38c548b2c51c06dfc9d0bd7cfc70832fc31c5b9738b5c989d2966f825927fb4adbac436b SHA512 ba3fcfb870768bc5d7e2d7acfe0381d6602b2e42d40e1d8b37246a60343e6e2f0b251c2a5fb32467773b565f4a0f38fdd5cba7c51fdf7fd36b0e5b988fcf2416
 AUX svgalib-1.9.25-linux_2.6.36-r1.patch 1244 BLAKE2B ce52fd031092c6ed038e854723704a5aa3b380c296f88a27e99a906ac4072f37d86189e5021362a1aae9dc296161ff9f3b66a65f71b597e527fd3df8ad05fd33 SHA512 0a14679ee0029931e54387ff413aee43a01b107c277ff1fde52b1fb862d5ca56571028a527118b6f6c05a9485c00890b0eab35df4537e394bb4cc81e771e9ae0
@@ -14,6 +15,5 @@ AUX svgalib-1.9.25-vga_reset.patch 747 BLAKE2B 73e459c902be26584bc727bdb4c48398e
 AUX svgalib-1.9.25-wrapdemo-buf-overflow.patch 516 BLAKE2B 504bdd01a0bde6858648f5e640fda34f337e6cef3f08f46b77fa453741fd556964fc09b48f494cf30b644fc1ff416c9728750d1c58502811d292d9b96ad415cc SHA512 e4e58a065f721f3c71d13f9ba0ffecf35ff32b25c6e46217eb9a0184b012e5be13c96c597df153ad7a27a5e41cc5a845cecae04d2d6c3dc6771bc238f8c75232
 AUX svgalib.udev.rules.d.2 44 BLAKE2B 513532c74e5172a5f2882df1912508f12adf1347c3af1bf0a44f66781d139a28b7aa332f5a5e630d099b381b9a94931ba0b7ad787393228bf694878f442279ab SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82
 DIST svgalib-1.9.25.tar.gz 987084 BLAKE2B 0ca81483d754796d8c96abef2940c506dd8c6f69ac015f0b34995a81db91c0540f405271f3c9e337ead551c783e9d6a336ef53bfb1531481115bd1228b679ea8 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7
-EBUILD svgalib-1.9.25-r7.ebuild 3561 BLAKE2B 1bcc24d53ddf425a5dc0a2c46889f584933be7cb9be7b1db175ef81c91c691dd263d1fde43a0ad2ae1d565df6f3c5afb9f18cbbbfb372ce8a8cf8516fbd5a024 SHA512 f8912ee94857c5bf31a4b1ed59b1db81aa40c3a0be8cb1720634493b67d54140adf51e537e84a541300d365c13f8ec627ebcdc3572a62acd6f72043732546a9e
-EBUILD svgalib-1.9.25-r8.ebuild 3456 BLAKE2B 514c65ea6a896d91e36a659aa242b106b40b959a75c95e0a35fad4056aaebe4f772607e1b9668ed8aa8f74863cac93442a0b7e26a0767cdb9244a27681889e0e SHA512 4a47755b107909177ada3457676a2605537a6dde33d0865a1fe9df3f0426fd583c00eba753c1c6e372c6f982e1f8a5649b320d3828e0c96831af32816d470f66
+EBUILD svgalib-1.9.25-r8.ebuild 3502 BLAKE2B 150bd395483c32965bf3858fcb0d42b7834af751e3bdfabbaa5adcb4822792da735324956469c17e1b440dea51cd701b0504d20770b3c1b08c17165967efa8a2 SHA512 3f8004bfc89776162dbe4c5c99219d4c90b737c5e5a8e76bd5746960eb9362fe2601837d75e18cb0dbb75694de491df7957c67a002f1b332e7756ff9c26026d8
 MISC metadata.xml 325 BLAKE2B eee2dcb0d80f8fa891865f3074139f3a9db2af0339f342f0f82512dc1195e7a95616a36ae9917e8724d12f15c1b5c056c3c5d242c32e989c354b39a7d6fbd5da SHA512 7d2874207eaab21b41da8bd8b9afb5cda10351e3c88fe09ae1856664115b3c86d13362a82695a016911390e5ff6762a86409b437a3d76b077e01ac0ff6662d5d
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch b/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch
new file mode 100644
index 000000000000..8204ea163bd4
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=789747
+--- svgalib-1.9.25/gl/driver.c.orig	2021-05-16 13:24:38.937410767 +0300
++++ svgalib-1.9.25/gl/driver.c	2021-05-16 13:24:47.263441562 +0300
+@@ -38,9 +38,9 @@
+ 	    ((c >> 8) & 0xff) << 8 |
+ 	    ((c >> 16) & 0xff) << 0;
+ #else
+-	asm("rorw  $8, %0\n"	/* 0RGB -> 0RBG */
++	asm("rorw  $8, %w0\n"	/* 0RGB -> 0RBG */
+ 	    "rorl $16, %0\n"	/* 0RBG -> BG0R */
+-	    "rorw  $8, %0\n"	/* BG0R -> BGR0 */
++	    "rorw  $8, %w0\n"	/* BG0R -> BGR0 */
+ 	    "shrl  $8, %0\n"	/* 0BGR -> 0BGR */
+       : "=q"(c):"0"(c));
+ #endif
diff --git a/media-libs/svgalib/svgalib-1.9.25-r7.ebuild b/media-libs/svgalib/svgalib-1.9.25-r7.ebuild
deleted file mode 100644
index d6e517631e72..000000000000
--- a/media-libs/svgalib/svgalib-1.9.25-r7.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="A library for running svga graphics on the console"
-HOMEPAGE="http://www.svgalib.org/"
-SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="build +kernel-helper"
-
-MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
-BUILD_TARGETS="default"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch
-	"${FILESDIR}"/${PN}-1.9.19-pic.patch
-	"${FILESDIR}"/${PN}-1.9.25-build.patch
-	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch
-	"${FILESDIR}"/${PN}-1.9.25-glibc210.patch
-	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch
-	"${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch
-	"${FILESDIR}"/${PN}-1.9.25-vga_reset.patch
-	"${FILESDIR}"/${PN}-1.9.25-missing_include.patch
-	"${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch
-	"${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch
-)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-}
-
-src_prepare() {
-	default
-	sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
-}
-
-src_compile() {
-	use kernel-helper || export NO_HELPER=y
-
-	export CC=$(tc-getCC)
-	# C89 extern inlines are needed, see #576260
-	append-cflags -fgnu89-inline
-
-	# First build static
-	emake OPTIMIZE="${CFLAGS}" static
-	# Then build shared ...
-	emake OPTIMIZE="${CFLAGS}" shared
-	# Missing in some cases ...
-	ln -s libvga.so.${PV} sharedlib/libvga.so
-	# Build lrmi and tools ...
-	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
-		textutils lrmi utils
-	# Build the gl stuff tpp
-	emake OPTIMIZE="${CFLAGS}" -C gl
-	emake OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV}
-	# Missing in some cases ...
-	ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
-	emake OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV}
-	cp -pPR src/libvga.so.${PV} sharedlib/
-	# Build threeDKit ...
-	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
-		-C threeDKit lib3dkit.a
-	# Build demo's ...
-	emake OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS+=" -L../sharedlib" \
-		demoprogs
-
-	! use build && use kernel-helper && linux-mod_src_compile
-}
-
-src_install() {
-	local x
-
-	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
-
-	emake \
-		TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
-		install
-	! use build && use kernel-helper && linux-mod_src_install
-
-	insinto /usr/include
-	doins gl/vgagl.h
-	dolib.a staticlib/libvga.a
-	dolib.a gl/libvgagl.a
-	dolib.a threeDKit/lib3dkit.a
-	dolib.so gl/libvgagl.so.${PV}
-	local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg)
-	for x in lib3dkit libvga libvgagl ; do
-		dosym ${x}.so.${PV} /usr/lib/${x}.so
-		dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver}
-	done
-
-	insinto /usr/include
-	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
-	doins src/keyboard/vgakeyboard.h kernel/svgalib_helper/svgalib_helper.h
-
-	insinto /lib/udev/rules.d
-	newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
-
-	exeinto /usr/lib/svgalib/demos
-	for x in "${S}"/demos/* ; do
-		[[ -x ${x} ]] && doexe ${x}
-	done
-
-	cd "${S}"/threeDKit
-	exeinto /usr/lib/svgalib/threeDKit
-	local THREED_PROGS="plane wrapdemo"
-	doexe ${THREED_PROGS}
-
-	cd "${S}"
-	dodoc 0-README
-	cd "${S}"/doc
-	dodoc CHANGES DESIGN TODO
-	docinto txt
-	dodoc Driver-programming-HOWTO add_driver svgalib.lsm \
-		README.{joystick,keymap,multi-monitor,patching,vesa}
-	# avoid installation of a broken symlink
-	newdoc ../lrmi-0.6m/README README.lrmi
-}
-
-pkg_postinst() {
-	! use build && use kernel-helper && linux-mod_pkg_postinst
-}
diff --git a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
index 87dea240053f..9fea5896e39d 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE="build +kernel-helper"
 
 MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.25-no-man-compression.patch
 	"${FILESDIR}"/${PN}-1.9.25-wrapdemo-buf-overflow.patch
 	"${FILESDIR}"/${PN}-1.9.25-ar.patch
+	"${FILESDIR}"/${PN}-1.9.25-gl-asm-width.patch
 )
 
 pkg_setup() {
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index f5636d84cb7d..3054fa825d1f 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -1,5 +1,5 @@
 AUX svt-av1-0.8.6-fix-c-only-build.patch 5078 BLAKE2B c26a13dba8ac62ec2951d43d1419d6cacebbbb185841636845fb20a6aecb1c6fe4cabc1ab53748c3df0a4b2fcb8e25ff7b63447c486655fc8ec23144ed8388d4 SHA512 41f3c400bc6ff0c8df529cc5db125538367bc36468bc000936e76f58bfaff15d3fbf322ec2705ac20281753273ab834a1691e7852ede6baaec003b1d46285e1f
 DIST svt-av1-0.8.6.tar.gz 6416120 BLAKE2B c30d3bfc2dba6d7964625c4505bb135aa335adf195df91ad058fb02496276cabdc651b09854a2d14136352a434e08f4974148e03e7d54bde0924d25a1c4524cd SHA512 07e7353e35bc581b23c71913e65f5fd27566f4bf1d317d474d57d5bb2b82f380f713a00be19bd3f703935da50f81f3abf1d4ae38fbdf253385edf423737c0543
-EBUILD svt-av1-0.8.6.ebuild 1185 BLAKE2B 6fa6a312e218b319ceb4ab1c29615e848c6bb254d9053e7c0be47509c9ac2190e067db3339a0a29b5a51d3f9b8631453bbe1f7d04126c724d1fc2a4997f40116 SHA512 64d4f7446876408915e78af93cc56f6563788dfa0c48267983e0975abca43b4f16457855812df2c4611be1773b6334b5a4a6c2e3d64d94794caf4e25f285ed80
+EBUILD svt-av1-0.8.6.ebuild 1184 BLAKE2B f3ed01e5b0afd5a8651a70d39c379c821da594d8ee20c4eebe2a86a0dc9b6a5832f43bd4883be8af8a04f323b5d39677f9fc3eb711a4682ae9e9ae4528582229 SHA512 502d049655a4ba6b20e83bcb93cfdf5ddae75ff3ea18ae375d896eb62a825e4da3d2ca16e63d5e839293daadbde6d95c5a6a355f0224d01a9a5ab34761ee04f4
 EBUILD svt-av1-9999.ebuild 1090 BLAKE2B 130f31f96ac34ec20e237ff7134f09132b98795aaf1a4c94f3e4d12789e21599a8128fbbc12f94903cc9699de97cf769585f891917d32864a63fe2f0af873922 SHA512 0d40431b5fe9f11137499595ae6cf41d86ed05843ed121f01f499208db76814b83577a7ad7b18528a18698d098f098b0865d981b4b6614dea484c72b7c025da2
 MISC metadata.xml 561 BLAKE2B d7ef721d1c86b184505d2b16dc4ccc39f1e2b2077e377ef3e18e5db8b756148ac7c36c3664f5b5cbb6e0a01cb77cf690fec40de5e5b590e8fd59169572579b55 SHA512 de3456b47eb8342ce7a7156eeaff18e8b55c224df6c758010c9cec75cc88cc220a5d5f893467a40be6b900bf0a399e9a40a26afc894bb4496c746e1e5f2a643b
diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
index b28f25e57ab4..10541f1ec51c 100644
--- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild
+++ b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
 	S="${WORKDIR}/SVT-AV1-${PV}"
 fi
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 3b5a9f8da909..faa3e1ef9479 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 5207 BLAKE2B 40417e61e79213e1b0947d6273712e18037721921d55b64c9ffa4af4ce77a27e5ffe4072b68f7d003fd36a3d5005e53b618631ab39d36449b681dd217035cbae SHA512 1e916b2261d5d1d43aa33744ad177f9991c9e9cfe0bdf1e439b5c711c36daac35282ade02193662d0deeb00dcd756843756f3c603cc5df33ce017914443f2a2b
+EBUILD xine-lib-1.2.11.ebuild 5206 BLAKE2B b19a672d29763af7e3f5ea1a9effff5ed9d362d226f9d438defc67230c98b8d74851d4d9d399c29c8b4bb40aa8b8628d005aa846e1c6d6f3f1eec50a71f85e9a SHA512 f5f247b95cc880af7f2f10231637fff8a43b9d0c82f4645e8da214590ae5c903e439055ae352c0baf46facb0e2de0abebb9f62b7b76b4702b0947f90d5cf65fc
 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 813581de41fd..20e65d606921 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 )"