gentoo resync : 17.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
commit: 463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree: 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /media-libs
parent: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)
113 files changed, 1302 insertions, 996 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 26e298742a8a..f72ad27e0d98 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 2ffad0ac7870..4c2f1dffc0cc 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -6,5 +6,5 @@ AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bb
 DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
 DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febdcecddfda864559e1e9621f99c9ff7584fb422594c6fd3a1c352c892533c825faef10e35ecbf97058396fbb46fc7d SHA512 a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721
 EBUILD allegro-4.4.3.1.ebuild 2970 BLAKE2B 9286e322b7397b7ad99f42170b6e260d586e896af3396bb5e8d315d1a120ad0445dacf22825ea180264cec3236ffa967f5346695a13e2a934d70e63894619505 SHA512 caa42406b233bec316d1f57285cec04928f470cc4ac57c0a6b50a5ccf39816b43d4fc376bf06f46daa954af6795b06a811851a50124fc8259d2a93b293aaa594
-EBUILD allegro-5.2.6.0.ebuild 2948 BLAKE2B 6a09a2460d6d002dc2760e1d9651ec610eb0b1cd3ff8de0dc4c0713fe86824f28ac1798e4b814352425468f9627a60292ff1cb76f8a3fa4ae835be7678910cf8 SHA512 1b17d768dc4797f36ff940d6e9f9f22b2a0ff5c716700fc903b2779f7e779a82cd13ae3e4ff4a1f46b5f55bb6cd88271f0d69a7fbf521c67cae7217bfc21281d
+EBUILD allegro-5.2.6.0.ebuild 2969 BLAKE2B cbc457b3bc7486368625b4e68f0e2113bf2ec6d7c8c06ac2a04f2f52845c3d24bbb35ebb421d3a036daaec70d08384a803fd6b9c18af3d6407f05c1af55b8ef5 SHA512 ae3061752943fadcfd1500014476f164699233d54a4d1f853f852476fd0e65d04a6f4942283a9bbff37fc29020506f987a80b8e8d792f9978c084f633d7d43fa
 MISC metadata.xml 1093 BLAKE2B 8cc4e85959faafa86e52e526676ae7bc69cbdfde6ea829db073f27dd2bf205130618673dca511f02b2d57ded95261ee5b47ffd337c6e1ce8f15a02a82929e77c SHA512 b66c3f858aba247b1ec1c0e77ff8bbf9fb11f2b98e827984af1fbdaa5af5a396e463aab40eeecdbde27e10be2c4c4ff836b197ed6dbb2afd6be30303004070ae
diff --git a/media-libs/allegro/allegro-5.2.6.0.ebuild b/media-libs/allegro/allegro-5.2.6.0.ebuild
index f2bc18f1a0ba..32f11a6aac4c 100644
--- a/media-libs/allegro/allegro-5.2.6.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.6.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_ECLASS="cmake"
 inherit cmake-multilib
 
 DESCRIPTION="Cross-platform library aimed at video game and multimedia programming"
@@ -19,6 +20,7 @@ REQUIRED_USE="X? ( opengl )
 	xinerama? ( X )
 	|| ( alsa openal oss pulseaudio )"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	dumb? ( >=media-libs/dumb-0.9.3-r2:=[${MULTILIB_USEDEP}] )
@@ -47,7 +49,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
 
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index e394ebc451c5..ffbf8d29526c 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -6,5 +6,5 @@ DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5ae
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
 EBUILD alsa-lib-1.2.2-r1.ebuild 2166 BLAKE2B 58967742d15b0a540b7e2fe327c99380904d7ac04937896c0720965a9fd35e170a53f8549355e5b96c498ae0b9f1fdb21a3085aa1eb02a9a93daa8f0a63968fb SHA512 bc1f41efe336615cbd10d236aacbcbdd1b65a6ffeccd1f20cb4107153e7ceb1d1f3bffd0bc2ef9c39a320dc7bfafbc54c2078aa5288e9f6a50d6f720478aa55b
 EBUILD alsa-lib-1.2.3.2-r1.ebuild 2103 BLAKE2B 124b90973277ca6e2c491a9cecdd5431eefac44f945735d2beeb237b9085194aab6e9b9cbc4c2218f922f387bae104557f8d9e0c9dd4aaf9ca7f2150dc9c37e7 SHA512 35f88e0b6228c8ea9aa87c10b2cca397f5d03a679cbaf61f080a43d633bc789bea3abe7efdb52c80188b8a5af36929378abea999a5bc8c4fc81d63368ad30160
-EBUILD alsa-lib-1.2.4.ebuild 2110 BLAKE2B d501431e7ba57a22cf823e1540e7cd92f4fe8a19f772cfdc57a3b89fcd13b0045d3e44258ac36e3584660b389d5cd06c9faa6049dbc814e34e1f64e6ade5ed8a SHA512 c4ecf78aa256aa2876badd84f2d2c0e5a4473e4f0cab6bbd71fb79fc7cfce1ef1c2cd236f3228e97ff6ad09d15ae6f107d8252de7a349554173c5313928ba1fa
+EBUILD alsa-lib-1.2.4.ebuild 2112 BLAKE2B 91c2f450e20782deda86225614a1e238135417a2154000abd6dd2a73896531694d0ecf5010bd811606152e0feaccc89bdaab311bb1df3be10391a0121c3913d8 SHA512 f93b769a808911c68284abeea0d0dec43585da9ead9151723a0706fa62400e1b4be15978b265a1944ca5c129ca397293ca2073e8965d83253bfefafb8d19f891
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
index 0ca96e710bcc..17c3ec172b77 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
diff --git a/media-libs/elgato-streamdeck/Manifest b/media-libs/elgato-streamdeck/Manifest
index eac4aeba155b..ad0bb88c7b69 100644
--- a/media-libs/elgato-streamdeck/Manifest
+++ b/media-libs/elgato-streamdeck/Manifest
@@ -1,4 +1,4 @@
 DIST elgato-streamdeck-0.8.1.tar.gz 2552919 BLAKE2B 505a7ad71b04473b3eb2c719304c224829ebf5abc366bea0d38daf882099d92308b1099815435ac03f65542bdb908a2cafbdc96f10168351fd06644050b69f06 SHA512 c65b90ab0ee5c6e17a6f7af670c54a12c96b705ef4bec359a51ba6671a3908626a9658f5a5829266102fa249628b82ee04c525db995f4984f26f802620598e6c
-EBUILD elgato-streamdeck-0.8.1.ebuild 676 BLAKE2B d8bcd86606eee419cf0c5be22641cf0c31ea3cab98b7b4e70051aabde3ec24aa0a0de2a9b9437a82d8b578f1f2eccccee3f822b620841d9067eaf4f1b5a8f502 SHA512 75cd80cc0b91d9a213f83ba60ac8a31953973577ed5a5bf5a753a32e639e852f2dc3afda3e31c105170eddf77e2975654dc8df244b0665b97ccddae3f892b1e8
-EBUILD elgato-streamdeck-9999.ebuild 676 BLAKE2B d8bcd86606eee419cf0c5be22641cf0c31ea3cab98b7b4e70051aabde3ec24aa0a0de2a9b9437a82d8b578f1f2eccccee3f822b620841d9067eaf4f1b5a8f502 SHA512 75cd80cc0b91d9a213f83ba60ac8a31953973577ed5a5bf5a753a32e639e852f2dc3afda3e31c105170eddf77e2975654dc8df244b0665b97ccddae3f892b1e8
+EBUILD elgato-streamdeck-0.8.1.ebuild 683 BLAKE2B a9d38df3ff5e4dee5968089d7d9dc998c72267d0ff24a1e4497056b42cdad70ec28ea172834d093e6703b52224922d571ab5f8cf001c40346664263091ba7402 SHA512 ee79e8baab58f5cd66deeb2ef56a5e811223926387e36c5b37adf7bf59b5b788a61fe3549d071f329c32ec8d3c38e29e338483e412a7c0a65799148933282710
+EBUILD elgato-streamdeck-9999.ebuild 683 BLAKE2B a9d38df3ff5e4dee5968089d7d9dc998c72267d0ff24a1e4497056b42cdad70ec28ea172834d093e6703b52224922d571ab5f8cf001c40346664263091ba7402 SHA512 ee79e8baab58f5cd66deeb2ef56a5e811223926387e36c5b37adf7bf59b5b788a61fe3549d071f329c32ec8d3c38e29e338483e412a7c0a65799148933282710
 MISC metadata.xml 348 BLAKE2B cb56a80dd311cb9182715619ad17b40dc832adbc3800410aa788684b39890f164eccc98025616ea42ed6098cb7bdf5de2b074d04cd8ed89a71ba7a9b427b63e2 SHA512 95599f43d0440d499b92acb9fe90f1e93514672aec977f7be692e1957be3b255c18a3b0e54eebfa1b80868fd34c1141376a2ff10316e371fe4c55c2cdad0d60e
diff --git a/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild b/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild
index 1cd62855b0b4..bb5356a1314f 100644
--- a/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild
+++ b/media-libs/elgato-streamdeck/elgato-streamdeck-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to control the Elgato Stream Deck"
diff --git a/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild b/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild
index 1cd62855b0b4..bb5356a1314f 100644
--- a/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild
+++ b/media-libs/elgato-streamdeck/elgato-streamdeck-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to control the Elgato Stream Deck"
diff --git a/media-libs/flickcurl/Manifest b/media-libs/flickcurl/Manifest
index c9ccbe9520c8..992acddc394a 100644
--- a/media-libs/flickcurl/Manifest
+++ b/media-libs/flickcurl/Manifest
@@ -1,3 +1,3 @@
 DIST flickcurl-1.26.tar.gz 1870073 BLAKE2B 2e14565ee076b5fd83987fc4aadc00ef1561714ea30cefef9d79260ebefa4856eca18ada5afdf6b02ad6e8ed293dd0872927346083d9eb8209bece1f456ea6bf SHA512 5ffdef58e67cbf99da2e8eefad57e845627703d5b22c85d5635557cd2df53e47e74d8e3387523495708c5cc8952c290da5c4d5f1e86bd482312fc7e46e9af6cd
-EBUILD flickcurl-1.26.ebuild 968 BLAKE2B a054359ff97a9c20ed3e4a85c6129954273ce4a24879d3b86a9af2f154e5b2ebadddf40d7f3ff09c9804e70bbfd35fc019ceaa48b231da93fa40ee08b719b919 SHA512 2b3421ca8f224cf178640e4a22b242c0f0d4590d501888713a5d8c892e9e0cd5be1a8b53586a3a184a7ae9085f458a20000f54bbddf8bffd85d6204f45f936c6
+EBUILD flickcurl-1.26.ebuild 967 BLAKE2B 41ff9ba2eb7d74deb7884ebe3663fabfbdcaa10a2cd55213371e8fa8bbe70a81b539de59c016744349ea8ff5ba44c2e7ba08d88ea8612970a6fccb2a2e3f4f4c SHA512 558227f401a3798714e5b3c0e12e1d00857cb01ffd84b882be7e8a3647c1bd284a8c12136d748a4b005e9b7828f147f1cce2e786544fef4f0184e6091a89ee92
 MISC metadata.xml 352 BLAKE2B b6f3d74efcfaf4e6dcfbaa16d9d85cec8969314e8cbb35803b8b47d2767ec8f5270377a4168a0142b1d19be15f46103bc6aff5b61d3529903b8bb694995b53c4 SHA512 70c66b003401b481e348eb3d94d9d6ac1d3961b1fb4e8a964b93dbf6806ac9f888076b8b3de5f0b5905d1185c044a078b0510377087056e1c3c9957ec58874ed
diff --git a/media-libs/flickcurl/flickcurl-1.26.ebuild b/media-libs/flickcurl/flickcurl-1.26.ebuild
index ecaad8742122..ef6b41c2723c 100644
--- a/media-libs/flickcurl/flickcurl-1.26.ebuild
+++ b/media-libs/flickcurl/flickcurl-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://download.dajobe.org/flickcurl/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="doc raptor static-libs"
 
 RDEPEND=">=net-misc/curl-7.10.0
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index d31ec36e057d..a5972b701165 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,4 +1,4 @@
 AUX game-music-emu-0.6.2-gcc10.patch 546 BLAKE2B ef04c95fbb0fc51afbfaf27d93cb38c689ff07499f3b7362a0c50ccf726082bf68f4b7d6bc36a3abdff9d81a8bb87f650ddac362e989da590471ebbece810e92 SHA512 a09190e164c969760eded45474c965db1ebd53d78485b748d31e067eccc42f32f370ccab80d4ed51bab393d535ccc499ec8212eb4258428417c60b79399691c9
 DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
-EBUILD game-music-emu-0.6.2.ebuild 526 BLAKE2B c74fa0fd11ceff2781fa702d710f2974c3007228d112cf2b8625eb51183a705ba0c6899cfb0042af73d1e5c5741f6ec0c9003c1612e92f36f30d762929e3bf20 SHA512 0d407ebde76ff506a516a0190c5fd277eba121200bd35ba0901d814aeb69b7bd17007c851581556db69f90d99fd8d3dbfb82a931ab367cd406faf59328643b0b
+EBUILD game-music-emu-0.6.2.ebuild 544 BLAKE2B cfc296de059a13c0d684ee037cebd5088044792b04a2b78b4c3bd316e2ed5d61d1011a67bbfb40262a6bf8778737156aa48eeb651be2824d2c577849b757fb42 SHA512 d0d62797c51dc871ae10fb137cfa700f2ea2c7055d05d15450c0dea2ab89592330e5be913a28a11fba5a6e97b42c78e9459cbdb5d50aa7b8f8ae9dc9bc2f2823
 MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
index 54d6d0478cd6..4f0e7ce5c127 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Video game music file emulators"
@@ -16,6 +17,4 @@ IUSE=""
 
 DOCS=( changes.txt design.txt gme.txt readme.txt )
 
-PATCHES=(
-	"${FILESDIR}/game-music-emu-0.6.2-gcc10.patch"
-)
+PATCHES=( "${FILESDIR}/game-music-emu-0.6.2-gcc10.patch" )
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index fc0880287784..e04b5bbb9e39 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,5 +1,3 @@
-DIST glfw-3.2.1.tar.gz 472450 BLAKE2B abffe6580dee968baa23f8f4f38af164f7479fe0bf3c4d64cc6386b1450aee4a8e8de5f963faecd536e2bbbc925da7ac1dcc16f219984758950263e6b6d022e1 SHA512 c7921f993b9a99b3b9421fefadb039cd475c42d85f5b5a35d7c5401c70491349bb885a02fd31e527de06a8b40d9d49a1fdb92c964e13c04ae092c6b98eb491dc
 DIST glfw-3.3.2.tar.gz 759972 BLAKE2B a246681d580dd569a045b76db71c18f8dbfacb8483c2d825aa68094d655468d093c52ba3770b2b5d566de62149a775001f5acd7c7539a8235c43e3e9ab58df28 SHA512 f5af749d33b5b900ccf07988ad0bf51bd766a18e4cf2bc2a76020c88e98a2528ff1b965224184fe0d290cfe34b1af1e6f633600660d81194fe354078e2f35c56
-EBUILD glfw-3.2.1.ebuild 890 BLAKE2B 1547fc4dbaba7dcc405c6768cbce0fc351e1d1b089136e0ddda290ce80667c4293d9cf2b9f3c7039f5b11e83ab3886354038eaf5e96f8f2bcbeba7751227ecc6 SHA512 9f3b7e2b0c15b3883a88244b8c7e89e1dec2513a968f44839ae83471e060b29663ea343e80693bf818267ab0505e237fa03e5f081a508caa048758bd3059ce44
 EBUILD glfw-3.3.2.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
 MISC metadata.xml 327 BLAKE2B fd8eb3b2c083a3f02e52ae8290f0e1105847ff17cd052eb0211bd007cddf452f34009ad2eaee0809f90a633e60baf4cd2a47e2184d21f691a16219c409ebc907 SHA512 d9d3fe05c0a07b0e0ea3f49589117dc9e3d7859bb0207dcea3d95451858b040c27bba2eaf422b2dcdc6aa8e08b0147ff32d12fea93b648fd861df0e70960a650
diff --git a/media-libs/glfw/glfw-3.2.1.ebuild b/media-libs/glfw/glfw-3.2.1.ebuild
deleted file mode 100644
index 3f8a54aea0a2..000000000000
--- a/media-libs/glfw/glfw-3.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="https://www.glfw.org/"
-SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa x86"
-IUSE="examples wayland"
-
-RDEPEND="
-	x11-libs/libxkbcommon
-	!wayland? (
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-	)
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[egl,wayland]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	wayland? (
-		dev-libs/wayland-protocols
-		kde-frameworks/extra-cmake-modules
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLFW_BUILD_EXAMPLES="$(usex examples)"
-		-DGLFW_USE_WAYLAND="$(usex wayland)"
-		-DBUILD_SHARED_LIBS=1
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 2c35e6e00035..767eb589ddab 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -4,9 +4,9 @@ DIST intel-gmmlib-20.2.2.tar.gz 728309 BLAKE2B 1c26661c5317d66797ca8a72fe910ae73
 DIST intel-gmmlib-20.2.5.tar.gz 728792 BLAKE2B c78cebcfad9f314e3ee298deaa78586cb5c1c8e2e5bba9051a8b17c26001b72aaa675443fcdc9757031977c548a0360e2511bd29873fc7302922b33a2c1a0324 SHA512 354363b0944e4f0e08065fa7a0cb85d477f522858a55f4998a2374ef8e115e331961cc269db886dac3b1e5825d11e036ebc0b4ab65b1618653810e4bfc4751ec
 DIST intel-gmmlib-20.3.2.tar.gz 729059 BLAKE2B 3cc07d9dc07fecd483c35bde41802c8a433a751310fe4d0273625f3a6e245a2dd6e5546b4e5bed40b04b22c4e00a648cce66b221c25da8c6f3f3637a890508bd SHA512 1d8ea369b5b22ca747f8bdaee0be24584b79ccdecaad6c85e5f0a41ac171459261c8c5b220797ffc525e7e29cfa1664f9eaca07f5e72d4a260f327d8980fb2dd
 DIST intel-gmmlib-20.4.1.tar.gz 732088 BLAKE2B 80873ee7a4b7428197352e77b82315068d6217e025b33e719c6fdc24aa4e5f97fe64b290f2d4461bb701eb8c14e747c8eac0b62f226f044f9a7c71de0455dfbd SHA512 a4f6fb8cd3ae2dc837586d6b51495bcceda5d4a9ecaa59fa730d3240a0da359b4449cd9aec96905f7c572f6425cdc19bb419681d99269ca8541542d7abf03c96
-EBUILD gmmlib-20.2.2.ebuild 888 BLAKE2B bb3f30b545eabfe214fa659f887c082f1fa45fd1bbbd823ad7a98ee9a24ff78d121a0dcc59ea0ce18e343c2a666fa5a1b6d948dd41b118c2f5bb6711b9c65828 SHA512 04b82961035d0297f4f2323f63e48c09d03b1d354f452cc1c626b5f91e6d81300af3109fe2bef55168a440d98ab29bc544591d22a1b1149fa470f27db54122da
-EBUILD gmmlib-20.2.5.ebuild 884 BLAKE2B 424f9213091b171856cfa6980d30b38de1bdf8ed58ef70ba05292b7a00799ebc53f4dbdb0fd9d40447113a0637d1c91ca3a4f94c0f1b77853a996700074ff6bb SHA512 384e50e434e5efdd7b43c2532707d5571b30b5fa3ff934118d66d3a29e4e2d3e73fecdb2d430ead8391ddfa451733f0b9c8eddfd949984f09b86d856309c0c7c
-EBUILD gmmlib-20.3.2.ebuild 884 BLAKE2B 424f9213091b171856cfa6980d30b38de1bdf8ed58ef70ba05292b7a00799ebc53f4dbdb0fd9d40447113a0637d1c91ca3a4f94c0f1b77853a996700074ff6bb SHA512 384e50e434e5efdd7b43c2532707d5571b30b5fa3ff934118d66d3a29e4e2d3e73fecdb2d430ead8391ddfa451733f0b9c8eddfd949984f09b86d856309c0c7c
-EBUILD gmmlib-20.4.1.ebuild 1021 BLAKE2B 94334db99ac85f71ffe275c078d859c01ec57976e1f9beeaec20f729800502dff88dbb36595358134e3fe0dd47d36ec05ede742bcb8cf96486a26ac8b511d40e SHA512 52721f3e6bf12c6c7cb5ba62ac689cddaf942ac90ecddb2d991ef0957cf491ec90ca55cdae61b4928dfa6a3c584c377a09e8fadb9fa59d0ba2ba487e3cfc81d0
-EBUILD gmmlib-9999.ebuild 1021 BLAKE2B 94334db99ac85f71ffe275c078d859c01ec57976e1f9beeaec20f729800502dff88dbb36595358134e3fe0dd47d36ec05ede742bcb8cf96486a26ac8b511d40e SHA512 52721f3e6bf12c6c7cb5ba62ac689cddaf942ac90ecddb2d991ef0957cf491ec90ca55cdae61b4928dfa6a3c584c377a09e8fadb9fa59d0ba2ba487e3cfc81d0
+EBUILD gmmlib-20.2.2.ebuild 870 BLAKE2B cbcec1f9012ff1e89324231daf1a9e70840ef6f108d4048ffae04d33a8d399597ad85bba83e843b4c8a6a504e66a4eac2ed966976c3c588ceb97fbe0cd5ada86 SHA512 ed2200c4cec251bbf0903ef5af0e3141aac3ccd4dac77b3613b21f81346da2ebf101b9cc176a302586ea3fb8fc67f48103018854a3a59be66736a0cfe34acd78
+EBUILD gmmlib-20.2.5.ebuild 871 BLAKE2B 09e0697e955cca1ba573fbee7f47a6f0ac691fdc4e481343079d82702ea37b8f6040fc2a5786530d269a19fc9b7b40bbb8a85a701009ae13f8643420b347c210 SHA512 1414c4b738aad2d13dd78e45db2d5dff3e5dd9bbfa946991980e0df21bcdaa6d9b87e83530d5bd01b6a9d81ebb1df214ae3f9b26377e9740c022e73f08756817
+EBUILD gmmlib-20.3.2.ebuild 871 BLAKE2B 09e0697e955cca1ba573fbee7f47a6f0ac691fdc4e481343079d82702ea37b8f6040fc2a5786530d269a19fc9b7b40bbb8a85a701009ae13f8643420b347c210 SHA512 1414c4b738aad2d13dd78e45db2d5dff3e5dd9bbfa946991980e0df21bcdaa6d9b87e83530d5bd01b6a9d81ebb1df214ae3f9b26377e9740c022e73f08756817
+EBUILD gmmlib-20.4.1.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
+EBUILD gmmlib-9999.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
 MISC metadata.xml 490 BLAKE2B 306c3fddcc4a5569f5bd040f7cfb545b78a052d6786b54fa0751cf980b753d9097b09b2a03c0c9d11be40c0dab7dde2a92d1c1bbeb3775e1e77dec847230a93d SHA512 30cbe0310e14e2ebd354ece2d7b710db50ee9cbb7d697370f5bda57b2b823f9d93a6e3c07844c3f8d90b91fabf9236ac450c9fbaa5aca5438ef0d4d5feaaac0b
diff --git a/media-libs/gmmlib/gmmlib-20.2.2.ebuild b/media-libs/gmmlib/gmmlib-20.2.2.ebuild
index cc8bd01ae170..1c6172411ec8 100644
--- a/media-libs/gmmlib/gmmlib-20.2.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,6 @@ DESCRIPTION="Intel Graphics Memory Management Library"
 HOMEPAGE="https://github.com/intel/gmmlib"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-	KEYWORDS="amd64"
 else
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
diff --git a/media-libs/gmmlib/gmmlib-20.2.5.ebuild b/media-libs/gmmlib/gmmlib-20.2.5.ebuild
index 2cb36edcb25f..5dae8781fc44 100644
--- a/media-libs/gmmlib/gmmlib-20.2.5.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,6 @@ DESCRIPTION="Intel Graphics Memory Management Library"
 HOMEPAGE="https://github.com/intel/gmmlib"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
diff --git a/media-libs/gmmlib/gmmlib-20.3.2.ebuild b/media-libs/gmmlib/gmmlib-20.3.2.ebuild
index 2cb36edcb25f..5dae8781fc44 100644
--- a/media-libs/gmmlib/gmmlib-20.3.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,6 @@ DESCRIPTION="Intel Graphics Memory Management Library"
 HOMEPAGE="https://github.com/intel/gmmlib"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
diff --git a/media-libs/gmmlib/gmmlib-20.4.1.ebuild b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
index 09b5bcec53f0..4e796e2186d3 100644
--- a/media-libs/gmmlib/gmmlib-20.4.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
@@ -19,7 +19,6 @@ DESCRIPTION="Intel Graphics Memory Management Library"
 HOMEPAGE="https://github.com/intel/gmmlib"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index 09b5bcec53f0..4e796e2186d3 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -19,7 +19,6 @@ DESCRIPTION="Intel Graphics Memory Management Library"
 HOMEPAGE="https://github.com/intel/gmmlib"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index eecb3c0eae00..9f6f541a01f0 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,3 +1,4 @@
 DIST graphene-1.10.2.tar.xz 292372 BLAKE2B 94553a32dc57216402a9676e11525552c010d970caeb1256dde50ca842b4d673ad78d004d57e7c7a017b8c6e64ad75fc3b03603cba746027ab10befa76d32955 SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0
+EBUILD graphene-1.10.2-r1.ebuild 1706 BLAKE2B ff096a29e3b6184afdadb0d0a253a1aa35ccac54becd12f49c2c036dcd0aef29b536cbf3d6c6ce70cc8fd59429ed5b2261cefd5faf8d6abfd60b1e969cb21dfc SHA512 e1545d9d6bbcedfdbe59aa222075fd6920b15403a50268d7142f39a5bc33b81d97364cbc268c85f688dad50f79271fc44aa9afb63d92d4b5ff0103ccf07b5ac7
 EBUILD graphene-1.10.2.ebuild 1699 BLAKE2B dbfa70bea4f57e2d759cbe4bcbd43d381e485f6fffce1dc412c3d0bd9e51888138afceb49597067bf34aec9f244d941aea64c09c27d693e2367ba5ddd7a5808f SHA512 31368e60b6c0c4b44435e5972352de0748536be54a343b919b0fd4b615cae966ca106b667d9e39c95656866d340226df06cfc2d1e88206099d98059cc7d029f3
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.10.2-r1.ebuild b/media-libs/graphene/graphene-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..0de3c1124ed5
--- /dev/null
+++ b/media-libs/graphene/graphene-1.10.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit xdg-utils meson multilib-minimal python-any-r1
+
+DESCRIPTION="A thin layer of types for graphic libraries"
+HOMEPAGE="https://ebassi.github.io/graphene/"
+SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.30.0:2[${MULTILIB_USEDEP}]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+# Python is only needed with USE=introspection or FEATURES=test, but not bothering with conditional python_setup, as meson uses it too anyway
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	# TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
+	local emesonargs=(
+		-Dgtk_doc=$(multilib_native_usex doc true false)
+		-Dgobject_types=true
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		$(meson_use cpu_flags_arm_neon arm_neon)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 4142802bb309..44d619d6deb9 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b4
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 EBUILD gst-plugins-bad-1.14.5.ebuild 2681 BLAKE2B bc85aecf70149241ab47bf8fe6dc2f4a172feac1a445d713f7dd8a948efd0e2ab1c216c972e744c16f058aaa70b5c6641b49ccc8a2e598462dfeec57a31be9b5 SHA512 b4cbdeea64bbb9f86eace388008b5102a32e1101629a5dac7cd049dbb2c6adf021b91becc4ae6abed9ca6e58b7d66e3f11c94ff4780cc8e836034da552f3b9c0
 EBUILD gst-plugins-bad-1.16.2.ebuild 2303 BLAKE2B d2a38f50c1ee5806ffb1be74b1ce92e532521624457b69284b334ba728cb3b4c97180e07bb69620f413a635cd52c78d8ae7fd9a3fa028eb7b68a25396e032b67 SHA512 c5e7d28c33f5b146aaa979999c4c2b2e4b827977d0f342f7bc5b4a7350c459020efdbbcdaf2791aa4303b1ed67a500db639f1c08a4eb423615639a3c6633293c
-EBUILD gst-plugins-bad-1.16.3.ebuild 2210 BLAKE2B bbaa52ce245c0cb0542ceb033c9dd0ca03c97972c1a6562c8a6528ae8e6c01590e0e7b1197bb154c95aa02e0cbc0249ca4edade7178bced7f0d46195af900913 SHA512 15c474b89d9444dac8fbabc62ef6ac2d00099b651a2e2b70894be74f75fd3efb772dc34e7f13d839d7127f0c8091def5a850137a446b216edb70e0c5d25b220c
+EBUILD gst-plugins-bad-1.16.3.ebuild 2206 BLAKE2B bcc5873674924143be5cce2d9e50dabea919f53a7ea2bb518d1f218cd3cb0500886fd62dad170e65c48c75d598038e50d35eeb8c73dcd1ceef2a3a4a57a2f338 SHA512 b9c8f1863c3a3e71f35013689cb0ec5bacda0ed1b66207eab8428e1d4a447551a402c4652d6a77bf2c7bf0fea259a6f1aa3b23adb839992bb9d51eb66e71b0ed
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
index c7d3b2537f67..faecf4215dad 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="X bzip2 +introspection +orc vnc wayland"
 
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 0fd304f82d7f..418051b57fda 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -6,5 +6,5 @@ DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7
 EBUILD gst-plugins-base-1.14.5-r1.ebuild 6025 BLAKE2B 0b7698e494efef8651973fb3ad48af145c9d7c94afa9964aa5598beacbd64d4e85147caa3b2d89d34925851bcdb3a6558f7e515fd3430c6bc35cf6a82b9adb46 SHA512 e19f197d53cc5758645db08e32e336004433270f897f8253200eac634480ea41ccfe162b625e27a0722e005e35ea05bf6fe9943ab9317803d91de21f6f225bb6
 EBUILD gst-plugins-base-1.14.5.ebuild 5939 BLAKE2B ee15054730e0119af1d6b0203f5b6e0f479bfa5f01be60f2956c0431ba26692a4814c723b33b049e6d692ddeb29505889f52d5eb1003739fa1a0e907d8a1c1bf SHA512 b7c4d12d8c029a184711e54d7eeee23e6427d79d36f18dbf5f15a8b26dbe078a057a312930b708684808f31b1a519d57a94939f602754ffe012c2730fb4fd95a
 EBUILD gst-plugins-base-1.16.2.ebuild 6046 BLAKE2B 1925848df988f12d58b5da0963744b5304654fa88acd78c84fd2d7a5da6c4300e368e91753e095cba4acfca0bad97a7355af87a22a148c6a4f081d55cc06d9c2 SHA512 7cf8736921c8ea16058fa84c796ab8182ddb60e90c01851cea41cc5d33de0bdd31d142192536a0925287a33a625cff7e856aeb835d391e798e5cf78646c0c6bb
-EBUILD gst-plugins-base-1.16.3.ebuild 5953 BLAKE2B e5799a848023f74fef8cbfd0acc38d2e79952cc70bb77cd9817e014d8c824da8f9947301fb1175ddfd0cc2d31122ee833e63a7fdb29dc785885b6ba607942e51 SHA512 4fc5cef8b21d42736ce81d9805842b02b2de3e4f51f9d8ed0a03f348cb4adb633a7d060e4507f8e5d36e920832f1d96ce2c0bf2f4dd634c47778a89b3d796fc1
+EBUILD gst-plugins-base-1.16.3.ebuild 5949 BLAKE2B 292ae91fc3691c69506cb9198b8f14e868b975d28f60ad6653a706cbc53f80bcd4e90430a717417c89b84c87fbcf36a1e55e3a06a1512f7fb4a0934a1b982bd1 SHA512 7efff63bdf5dc907756785d14a22066f0582a56736dad8d22eb84bd6fa12e758679c446bfec1312354629e3dd94bf5aa4ab28bce28596ef6808d7b3570de7616
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
index 165995426bfc..a12eacc9b07c 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 5a2487833cdd..d20a1991f7b3 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f187
 DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
 EBUILD gst-plugins-good-1.14.5.ebuild 1506 BLAKE2B 4f7fa9ec216eba6ba101b8ffdfa9d35151f2c6956bb40fdfbacfc88fe8b800a0cdc5e645fc662f183d41eb569885da7036e5a82cfdb370d15485efc47110c212 SHA512 54bebe46bbede74adcb733677f92f4694cc770edae5cd1e45fe7aa0056cd67e4838a7612215f0ccee160eaa51d274d2fa0a38513cb695805966549d495767b32
 EBUILD gst-plugins-good-1.16.2.ebuild 1506 BLAKE2B c55b6d76f96fd092f316a507f8623f45db960b3f630660c39a4fa664f88a80938d3afcc46330e807e5b83df54c2dc6e6be6c713d6d922b514b0def2b66cd32ac SHA512 c9a04a15948cc29977c6cf6faafc7e0d13cb068decdaee0807fc06b771f9f11497e02c1e49b2bdbf4c2b5184ebd3582656750408535c1331b0eee503498cc5d5
-EBUILD gst-plugins-good-1.16.3.ebuild 1413 BLAKE2B f975d21df39043eee9252dbc054777d91e6fe28e462c9ebeec1622c9aac7da05f66823d2a382a6c6dadf5666787bdf2e9b505af67ee252af98bd3a412b877f55 SHA512 8e16c9ab5cf8c672f4bdc524f80463bf96fe8134e1812648959b4a184a95503a64ecfbe93d89332bb274cb8f8f4ec9660763259a3db3fcaa31ac77b7c7ba52e5
+EBUILD gst-plugins-good-1.16.3.ebuild 1409 BLAKE2B ae9049f25027ab42ea1c1a090b4bf136518d3a768bba32e11c9f9777088cac35beaf727ea63d5362f952566d8f691b1acd2ff65b884c8b2181c9637b3e08a728 SHA512 a04d47a2df01a9704214d9c97d1ba839349e9777c9dc9df4fcf441c62df527bc7579787ba127049b574b6d29fa128b9ff2639376b24a8ffb21fd628c1978b77c
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild
index d0532e13c92f..4e2a8542d1d5 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index de3561fd9db7..36ffe1f7790e 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -4,5 +4,5 @@ DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705
 DIST gst-plugins-ugly-1.16.3.tar.xz 899124 BLAKE2B f848c7bbf36cdfca6e3dec4893b9b1bdc363feb697ee7cc89f4c664aa7aa700b76678873e5dae23f277ad99d6034c1e3617d760acc9cd075e0044fae3f4bb88d SHA512 0223f4ceebd1482329cfc7c3faa094d9f3b1d3eaa51eab3ff42da781f0aede8e838221bdc8d1a3ffc43318fb424421447d5548ebaf9ecaf8a290975d178df9ca
 EBUILD gst-plugins-ugly-1.14.3.ebuild 1040 BLAKE2B b407e5fd151f84fdad9b7b15fcf3a26911a741fb38fe7e87cc8f85e983b7a98628bfc41ab1db9ebbd72542b0232f268b58c3bd86f90bf384de6ea4728fa1d98f SHA512 2dea55696ecad8c8e71dda5f882908a41eec0b29f127235eda786721052d28cee41a8fadd5b0bc44145b1b71a64829f053a8f45284e1c17854b6ea11c8e92945
 EBUILD gst-plugins-ugly-1.16.2.ebuild 1040 BLAKE2B b407e5fd151f84fdad9b7b15fcf3a26911a741fb38fe7e87cc8f85e983b7a98628bfc41ab1db9ebbd72542b0232f268b58c3bd86f90bf384de6ea4728fa1d98f SHA512 2dea55696ecad8c8e71dda5f882908a41eec0b29f127235eda786721052d28cee41a8fadd5b0bc44145b1b71a64829f053a8f45284e1c17854b6ea11c8e92945
-EBUILD gst-plugins-ugly-1.16.3.ebuild 947 BLAKE2B 5d1575dee8b89c3b68457480e0cb15a56faec5ffa46327c3d72217ceab1a187c553c797e4017cd92e62da8e1bf9d2e40fa54df8a35e1c425d9de0d047527f5dd SHA512 c24e5153f0c238622faba345bac767b5e39ed3c00c62175b0b18dad8725a14330957a621f2acfb867b5c4b15332e3d331f54cd6f41b81b61f35ee463c8781240
+EBUILD gst-plugins-ugly-1.16.3.ebuild 943 BLAKE2B 50eca7c070bc2965003682dce199e4bcd3bbdf28f188eb3765c3c76be15250251f31670646929e8eb61391b3c8e896e6531be3dfb363212c77460a4c1ab300a7 SHA512 32fd8c313e3ad3b1294191984de092ee9640031c7b9ff6232a350355a718e3b1d2512e7dfebe9a6d404dd26c601fbe03379c56629ffd4d484fec131a32acd27a
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild
index 12578b75f6ed..43c49b62c45f 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index ac45d914a604..34391765a541 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -2,5 +2,7 @@ AUX 1.16.2-CVE-2020-6095.patch 1517 BLAKE2B f317ca6e3443b4b4255759c31a0bdac46237
 AUX 1.16.2-glib-deprecation-fix.patch 1992 BLAKE2B 74833b158bcf855b6548b01899aa1c910e2c9b8502753fc74349c212427d1c760de4762493f831eb2567b22ac53cce1631cc898a781e8c7e21f1a70d4cda56cc SHA512 e08b895c6108c845601107f56be5ce711629208fa7f9277c083752b14fdc77d48ccae7097b85e1d0e6fd68c770bf8e779c6dce518247537b1b9ca2e3f324d9b4
 AUX 1.16.2-leak-fix.patch 774 BLAKE2B 739fb1d5b0097e0426646731c01036339e9f63deb2a784032cd9758f89bd154acec6eb54661b9fa27671bd97ef195ddc4b617a3cbed9d677f9973d6db0f51cbd SHA512 192acc9f27f87f797a0ce28db213cee36f590d6db790e84038cec6a15bfd3957f0aa961965761225eabe30495bc868f43802b739ef6753209158d4ec9b298ea1
 DIST gst-rtsp-server-1.16.2.tar.xz 693368 BLAKE2B 612b59bc3a08167a81790c8d5164efebb8756ce3d3c9c278a0363bd640929b14d2fb1c26454a513dbaa9e093a702e7553950b6210ef57a6e9188a059c81650d3 SHA512 e18d87ae309594ffd7917b1804e595b83d5002518608f0ee03b9e68ab9bdf771ec2f691e50408618a6d1a39495c123e8288b3179e6cdaef65a38ef404544e0eb
+DIST gst-rtsp-server-1.16.3.tar.xz 699472 BLAKE2B 8937ce9d0550b11657496dec5a79c00f74de4da9deb9236693a25f4e266a779c8d4f439b127c2af87c874327e10f01f6a1d74fc1cd1bd0eca20093341568cb82 SHA512 f9ca08cfef92b74a63279a5480cfc1b18557f3062aadc765dd4d3de57d62b9ddf3ca98a4680dcd0f050812128c5c03592cdbf9d8329b85a6c2f3a39209c07701
 EBUILD gst-rtsp-server-1.16.2.ebuild 2107 BLAKE2B 9db192f48783a16277efc845550777dd1d9a94ef9d8f8f22e92aca4e115762520f14cbc89b30f367a107d7f0b0587174eeffb05dfd540c155a49658dbc8c2bf2 SHA512 442d7df4389cde8d455f69bbeaaa33c7dd51cb42050fc81e5f9b040d8efef332753cc732fef28b7ec1f195c273cc53e8b244d98f9fa36b082077b60833e766b5
+EBUILD gst-rtsp-server-1.16.3.ebuild 1969 BLAKE2B 573c21027d9acd09e9b15e086a1909e94e1d281ba1acb2d31612ce101a7a71bad18f943f3be9c2fe71d00c3f866c876cae134c402ec8bd2e775cde0c2d05a4ff SHA512 ceed93d572043b1f6aa49075efebad5e2e15203b6a5ce325264c9df5ab9711089ae212dc8dd933dd26d883ba6c7725fce3ff5363a58c579fe8a4fead42fa1fb1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.3.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.3.ebuild
new file mode 100644
index 000000000000..9eb60c01a7a8
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.16.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gstreamer
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 x86"
+IUSE="examples +introspection static-libs"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+# Due to gstreamer src_configure
+QA_CONFIGURE_OPTIONS="--enable-nls"
+
+multilib_src_configure() {
+	# debug: only adds -g to CFLAGS
+	# docbook: nothing behind that switch
+	# libcgroup is automagic and only used in examples
+	gstreamer_multilib_src_configure \
+		--disable-debug \
+		--disable-valgrind \
+		--disable-examples \
+		--disable-docbook \
+		--disable-gtk-doc \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static) \
+		--disable-tests \
+		LIBCGROUP_LIBS= \
+		LIBCGROUP_FLAGS=
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi ; then
+		ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	# Handle broken upstream modifications to defaults of gtk-doc
+	emake install -C docs/libs DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index bcf941e4b3c4..4c028f1c8e35 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,3 +1,5 @@
 DIST gstreamer-editing-services-1.14.5.tar.xz 1069356 BLAKE2B 95ddff56b56b3ae59872a340258af0277d9b5c3619fe25861ce3f65238d3802bdda3c51cf84f0a206f7ccf095ab81ff3f178b7c0322dc7687741626c3b8da947 SHA512 9b3d0336e596004a51069900c61f293eaf213a83655799139373c77cf5637a3511ba4ec6a1c75f53d81643539e32f7d130fd0cd58090b948f81e8e081226b5c3
+DIST gstreamer-editing-services-1.16.3.tar.xz 1091208 BLAKE2B d88bed4e8958a6bad05aab8d6c19cd737c6812e0780c420fd144d58fe416cd5dbd01e019c3fc53417d65cb2d6e100de123dc8183c8c3dab329fd677ba55644c5 SHA512 c84cc2dab2b1644ab118794b7aeb98748f893a26070359850f48e87cf362fd53b54baf8754a07e1d412cacb85cf9cfcafb3cf10d79c67bbe077e4d763f9703ef
 EBUILD gstreamer-editing-services-1.14.5.ebuild 1523 BLAKE2B fe1402365b5b5756648a8bbc767ec2aef7e7d301697ee4c1dc1598f299bcc343d178aec0f757e2f2769d720908ca0139f11874dd221daffa74f435765547c6f3 SHA512 4f70b7f7eb13ddeb8a7a551b94c5e33b54ade8a00df5dad6619a63f6b55410f1745b1be21fa6d38f6028d397cb14c92a7a8f53d816cd8597798227b5b53952be
+EBUILD gstreamer-editing-services-1.16.3.ebuild 1854 BLAKE2B ca2103e20fe4db1494a3bfd0292cd14a8c6984bb6eb176cb1b8832e996fd246002077fc053c65d93c1dce510138d8fb1d004bc1261b4c23470512e3c5fbf4d9a SHA512 80b202bc6983adf3b29015bcdba91a60c0bc6d36021f741169648af133e96cf87c214b2063ee61901b8ec0b6e99381902546696080912f8e470cc9c40ed21c27
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild
new file mode 100644
index 000000000000..8b428d9256fb
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+GNOME2_LA_PUNT="yes"
+
+inherit bash-completion-r1 gnome2 python-r1
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="amd64 x86"
+
+IUSE="+introspection"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+"
+# XXX: tests do pass but need g-e-s to be installed due to missing
+# AM_TEST_ENVIRONMENT setup.
+RESTRICT="test"
+
+src_prepare() {
+	gnome2_src_prepare
+	# Install python overrides manually for each python and old upstream
+	# autotools code prefers python2 and installs in wrong location
+	sed -e '/WITH_PYTHON/d' -i bindings/Makefile.in || die
+}
+
+src_configure() {
+	# gtk is only used for examples
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-examples \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--with-package-name="GStreamer editing services ebuild for Gentoo" \
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #538888
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	addpredict /dev
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+	python_moduleinto gi.overrides
+	python_foreach_impl python_domodule bindings/python/gi/overrides/GES.py
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index a13cb529076c..009df8125e26 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -5,5 +5,5 @@ DIST gstreamer-1.16.2.tar.xz 3328600 BLAKE2B 9bc12330fc5a7fa3a65e2c03f9d06172d78
 DIST gstreamer-1.16.3.tar.xz 3338692 BLAKE2B 79eb08bc446073fadf881adea0f60a2caf6384836df975f80ce0e57db6469e6a016cab38413d3de00d11b491a0281f95dcbcd1f782b31f2d1a07b866c1ed7dd5 SHA512 4a879e71f65c89609c2e106dc79222853e6f37830638d5b9624c436fc9d8974cc6474d399eff02cdc13ff7189fcd13e9450450d36c3a6092aa53cb97056f5854
 EBUILD gstreamer-1.14.5.ebuild 3028 BLAKE2B ef82e9743fd2fc3e3a58e440898923cd95a25b522834d16f8f8c7aa54e94b482453e4eee356f38b84f8485cc7dff771909305dd304da18e45fe288d38ba9792b SHA512 a8fc136c373baa98d9ff27ce5edc1bb95fbd5f43de35468d13cd4b071cb1696523737ed5926dc00c5930ae3836ff4323eb43a508c40a4976f9899867c8a297c6
 EBUILD gstreamer-1.16.2.ebuild 2946 BLAKE2B 00ac2a8067a0847131146f7c74ebdfc9a4ace5091eb8a27c31913d08cbc08685602ad6c2dc1836a5566b7aa8d40b126962b019021c3f32d35b632b6716468441 SHA512 25b99b349aec91c480fbb18425904463d034936d22747d9e5f7ef96937791ad46b76ab4b308f6db46a408f4f4e74935d1609b260f9fb3404ad033b291dd4eeb4
-EBUILD gstreamer-1.16.3.ebuild 2853 BLAKE2B 428184b8359c5d82e183493d159f205123d29fe284604cc0ddadde4673378d3d05acdeaeeb9fad5a61d911586f0138853b5c38a05ec104ae49a53730d8f97ddf SHA512 aefa024ad1716f7bc182c5244e26396840fcd29e1865aea672b3f95a787f492d9191c6a16c9d15b10fedbfce2a4353b8668c6c72633a19bb27be87a6fe3c7d44
+EBUILD gstreamer-1.16.3.ebuild 2849 BLAKE2B 4bb6b27cbcf237967fbbca8adceca3ae5922f6135fa565af49e2e5e1863cb3ba2a892c272c6b361da944ca74c16f55598605b7c1cd1ed5837b39a167a4a79318 SHA512 ca40695f371fba53684ba3d5a816c8b31a03ce23134da16afd8edfdc5a3f5f78adc30726a8a8a7e08830393a0b77dd465bf8a2b4f866ae6165d52f623ad02baa
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.16.3.ebuild b/media-libs/gstreamer/gstreamer-1.16.3.ebuild
index a2493d6e8ff2..953410b343b6 100644
--- a/media-libs/gstreamer/gstreamer-1.16.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.16.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+caps +introspection nls +orc test unwind"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 5a066e9a1e5a..3717c7252169 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -5,7 +5,9 @@ AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e5
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
 DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
 DIST ilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
+DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290
 EBUILD ilmbase-2.5.2.ebuild 1326 BLAKE2B f58d3ad532feb4f6b285b4ae66102aa7426b66c97c2d96f8adf594301df833e8d2e9877a35dae22b508ac3a3728030860e3df2e257b170fa1ba664fb7e515f3c SHA512 31b8c62f4c271c275a9e45b7852d75bb84035f82e9f43951f7f5ab34367783d7257f6148b1c593ab9ce51d565a240962d19df023a1ad30b93595813c7b991363
 EBUILD ilmbase-2.5.4.ebuild 1067 BLAKE2B e67250c33c6a71e67868382cd1348bcde9b6d0e033b0c8db4058d19c4b93505ebb52fee00ada46d7a651764144b94e415a20c7b7a11eb4ec7b2f28f491acb6dc SHA512 787d029ece0615e6e7d3ab32d78d9b9229e70c2bb2a743bf063ccf0ee238e4300074c0d73210ea432fc86a04ea6a74c8293c3e3978b3a68d8632380ae670da02
+EBUILD ilmbase-2.5.5.ebuild 1076 BLAKE2B 9e8c0f76dea3230d17b096fa3661a8ea4281061e80dad43d5763da19de578ecd9ddfffdf80758a5a9ef55b35c63f1c29110811b777af86317c84d5c5f6a3cd4d SHA512 154a92f3d3a1f1cbbb537af9e36a65048283d0955c79fa90fdd0773a6a8b9984fcea102854a06d02a0097fbe58f3e59cc486fcffd759506c61bd02bf1d226a3a
 MISC metadata.xml 661 BLAKE2B 3392b45aa602d98cd1f9403766c7829cc2744893629489e267d2a6c568a5d934114012f8b6ec84acda5bd42f06c3b2ebad8bf25cb540a27b80485696c82c7469 SHA512 6a0773377471b23316f73e7aba924a7421432a1d75da858354c72685eb6602cce7c7e16a5232ca47df3d8f9f3465f1bc5c1f58259733fcdfaeeeaa2b0327bdef
diff --git a/media-libs/ilmbase/ilmbase-2.5.5.ebuild b/media-libs/ilmbase/ilmbase-2.5.5.ebuild
new file mode 100644
index 000000000000..c8c99d2fd039
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.5.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="large-stack static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/openexr-${PV}/IlmBase"
+
+DOCS=( README.md )
+
+src_prepare() {
+	if use abi_x86_32; then
+		eapply "${FILESDIR}"/${PN}-2.5.4-0001-disable-failing-test-on-x86_32.patch
+	fi
+
+	multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DILMBASE_INSTALL_PKG_CONFIG=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index 6738caeb14ab..f65e382d008f 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,6 +1,6 @@
 DIST intel-mediasdk-18.3.0.tar.gz 6313246 BLAKE2B cd8658252594aa8cec08839783c41e2f6e0a9c56366a35d7f900a7a625df77bdef8dd9d69feea1a1ed93c60699fdae5d90ea131ace39641cbb396c9ea9ea07f6 SHA512 7a5f91b2ecdca375dd5dd4c1678d61b34d96b0f4dfa1b64efe61962f66eab9bfdfac6cecb9610180c8cdcb624c467716fe5f34027950bfaed1dabd6add7585ee
 DIST intel-mediasdk-18.4.1.tar.gz 7636782 BLAKE2B ced3d0892f884a099427b2f30516f58ec634fc968d9fa89fd3a38e4713f1bd7ee6fdd2a5f178b8012cf07494d170b97fc796789179112ecea06fb1e829a3f2f6 SHA512 7b4396792a259359a9d63a44a471bb48cae580f43f5ac23ed13b8b0b18e2040b44e94fb29264bd8c8d5f99856ce39a27473f0ffa6c6328d2f9b127556c7ea35c
-EBUILD intel-mediasdk-18.3.0.ebuild 822 BLAKE2B 5d15143bac0195c6022b150445c4895384a5b5f63ab22d9ccd11ffc0b072a0e7b407961e19775138f79faf780d5d9d91035f5cf5afa9df2d2319c900b4ddef13 SHA512 3fdcc2fb60cf7fa9ba4ae3f57100e15e1f82adc756709daa0924c223ee917dbf8830dff17990611566f7b4d93ee11dd949f5008286b3f57e37532f31ae71901b
-EBUILD intel-mediasdk-18.4.1.ebuild 852 BLAKE2B 17642548dfae16fc8b5c7465149b56ecae3e87c833023ab7e3512f536029debf2b85a657b9742d4823b2cf03196dd52bea77579890c0f6f85c78f886289d2b6e SHA512 06a1d4fc267b0e3b4983b9c39261dfd4727518d7d67ed17a07943eac9473d989dd3d62110acc67a7e26016188452878f7525761e16bb74ff5bf7aacdda511acd
-EBUILD intel-mediasdk-9999.ebuild 822 BLAKE2B 5d15143bac0195c6022b150445c4895384a5b5f63ab22d9ccd11ffc0b072a0e7b407961e19775138f79faf780d5d9d91035f5cf5afa9df2d2319c900b4ddef13 SHA512 3fdcc2fb60cf7fa9ba4ae3f57100e15e1f82adc756709daa0924c223ee917dbf8830dff17990611566f7b4d93ee11dd949f5008286b3f57e37532f31ae71901b
+EBUILD intel-mediasdk-18.3.0.ebuild 809 BLAKE2B 2c4dd2ac73a2f9e0c2743fdbe5005077cc18508e31e67e89c551117288eef5840face13e2249add33b5e07765f42b18be77a2e4f72d4397e52563f279d9e1901 SHA512 e309764a75224a324687a4d7f557104fe115cd9844b1d81890e0d06ef0723c0c8ffb4a1dd51b738e654f74b5795008c3829b1b42da9c7d2d02f70bff1c2e1644
+EBUILD intel-mediasdk-18.4.1.ebuild 839 BLAKE2B 729f269dc573a8f84af0feae7fecf0467949dad707c44f5ae5bdea387c0579fbb51ca9b5a3a7f4b367b4e409eebfa9e2dbc5e159407ee8e2ceec1dbcc1a4c646 SHA512 73f27870a72610d0007610c9aa13d5cc77217cc9957877aea6ffe495d86070d6a2990f3197d748d1a0579b877f358edd4aa64897c875b2b06b4d3d5599261f92
+EBUILD intel-mediasdk-9999.ebuild 809 BLAKE2B 2c4dd2ac73a2f9e0c2743fdbe5005077cc18508e31e67e89c551117288eef5840face13e2249add33b5e07765f42b18be77a2e4f72d4397e52563f279d9e1901 SHA512 e309764a75224a324687a4d7f557104fe115cd9844b1d81890e0d06ef0723c0c8ffb4a1dd51b738e654f74b5795008c3829b1b42da9c7d2d02f70bff1c2e1644
 MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-18.3.0.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-18.3.0.ebuild
index a900ffb25996..84124095543e 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-18.3.0.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-18.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,6 @@ DESCRIPTION="Intel Media SDK"
 HOMEPAGE="http://mediasdk.intel.com"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
 	S="${WORKDIR}/media-driver-intel-media-${PV}"
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-18.4.1.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-18.4.1.ebuild
index 3f4c49c46abb..505c3be4882a 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-18.4.1.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-18.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,6 @@ DESCRIPTION="Intel Media SDK"
 HOMEPAGE="http://mediasdk.intel.com"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
 	S="${WORKDIR}/media-driver-intel-media-${PV}"
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
index a900ffb25996..84124095543e 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,6 @@ DESCRIPTION="Intel Media SDK"
 HOMEPAGE="http://mediasdk.intel.com"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
 	S="${WORKDIR}/media-driver-intel-media-${PV}"
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index 294cd7c94a1d..d72b4b37cbe9 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -5,5 +5,5 @@ AUX lasi-1.1.3-pkgconfig.patch 400 BLAKE2B b15c712c16bd70e92f80d0ab9b48edeadca75
 DIST libLASi-1.1.2.tar.gz 260948 BLAKE2B 044d906abadd902f91726c0e07e6ec364a3419bcea855a58cfeb44be30b2b9e0334c61931d3210750167ebc7599d8d4022960c40b0be68727385cf01b65780bb SHA512 5a03890b822946805025157497ce5f29fdfbcf5f2941bcd07841d9865cac9653697dbbba426f8527528affd4157e49d0f31a6dad79abdd52222dfcccf135ac91
 DIST libLASi-1.1.3.tar.gz 726769 BLAKE2B d8d06fb56e82b78f4342c959965de3908d70d1cec6147a6e3cc3d58ab4e9f978b7966c8e4507c0ff69e4ba3716270f38f3cfcafdc834001e3a0069a3495eda31 SHA512 036fb0ea1536d4ae04c0d9b5bd193ca6828228afe2cba6c1c7e12febd9b936bf3ac677711c122c44d3b12ab2f7b67f5e9dd18f44a4938ceaa2fbcc430a5748ac
 EBUILD lasi-1.1.2.ebuild 1296 BLAKE2B b5d56d8377396591ff84f093723001dabf498b1b70258092305ea70054eeebbab72c5ef2b79ca91da517131f936fa4caacb0fa11a67315c3f219da882418799c SHA512 2d2c91e1eae07f4776ddc86f228e1edda4358fb9ebb60a6c896a98c8731bf4b592fc1a11f49f346a6ce2df6156286feebe0f57dee9e11f4222e283127b72e12d
-EBUILD lasi-1.1.3.ebuild 1271 BLAKE2B a3600e94e1c380dfd0ed12c250ba5eb4cd5402c6bb2ec4716ba5ea4e792ac90864761dbd71e27fd50363b36ca17ec8e6c01a85ec9b03891a16f04c13c7c51e63 SHA512 75813b4a827626eab9d1821cc0e91364f93e64f64cc4d6676744c896219921d581e282262319e0549160ee84b21210519cf8b5050b7d498e8030475be028be16
+EBUILD lasi-1.1.3.ebuild 1280 BLAKE2B 62c28f2564b00325934bcaa9d2d0271fd0187b3ce294f27208f13ce14a6c61161946e659c0e9a84190c92792889d2d3881be9cdb4e9eef7430fcf56424b635bc SHA512 76fa56954e54499212925179ec54415819fb88129b1f5aab632a89b6910aadd5f2948602886f0882d43e05c46957465569aa449ea4e032752c14f69bfcafe465
 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 e2e42d403fd0..574329452bea 100644
--- a/media-libs/lasi/lasi-1.1.3.ebuild
+++ b/media-libs/lasi/lasi-1.1.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.unifont.org/lasi"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
@@ -44,7 +44,7 @@ src_prepare() {
 		examples/CMakeLists.txt || die
 
 	if use !examples; then
-		sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt
+		sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt || die
 	fi
 }
 
diff --git a/media-libs/lastfmlib/Manifest b/media-libs/lastfmlib/Manifest
index fef57f36cb69..ec2aba342c37 100644
--- a/media-libs/lastfmlib/Manifest
+++ b/media-libs/lastfmlib/Manifest
@@ -1,5 +1,4 @@
 AUX lastfmlib-0.4.0-string-conv.patch 510 BLAKE2B 088c8deb83ad96450b21e1d7a8e99d34a5421ccaa72ad75e102f89f011d494ee4e54c9799a1a6296543f7d230dcb41dec48a083d4c0a09a8a52f87744c7256ab SHA512 cd212e173559822586c97fe175791b7ca2ca7239cc511d5b4d07ff7dfc9ec87b5f3a126acf58c4bd95a7cb19cfc04b067ecb99fab6cb1815e59f56fe9c70ee4f
 DIST lastfmlib-0.4.0.tar.gz 333224 BLAKE2B 2e38adb90a468eccf959950d89e2e0b903e7e96c871b4d20216ee233933392fda7cd3bd86d90472e0f305922dc11e1dc998206c669a13be76eab7fdd07e6b45b SHA512 88e26bab04eda06f77f4684a5fe14aa9761acfcb5d7d8726c4d3ae5e1a4acd73e6b0c9bedff5d51bce07afd7b883085f1adba98714e8ebfc5bbd20b8aca66748
-EBUILD lastfmlib-0.4.0-r1.ebuild 711 BLAKE2B 6c28c50e9c74b3ae1248073210fab0366072d4750d8db46dac198b6c30b6447ef512b2c634884d88ab5f068f785c64dffd5ef6dc935b0ac0ad022ceab50dcd0b SHA512 2cfe0f60ac54bd863ab6beded4d7590bcfb90e33d8bdbe6d7317286018e891ea776297bd389ab49e930d0ce9103229eb98b76647d7b7498c9e423fdd0e08a240
-EBUILD lastfmlib-0.4.0.ebuild 659 BLAKE2B 66b6202bd89d9e8053e998080c978ec5f7ac2406964e19817051c06f17670a8a60d9166d4a108292ef9902d9b9b6fe26687f4cd1b5f2888b7413b029224bed34 SHA512 a46ef097334b5520a3dc5cd76857af5fa6560de31cdac835a215d96aca920f59bf95f1c9c64cd0aa55bc44b1a4f8f1e61c936f6d8101995a304ec91772deef21
+EBUILD lastfmlib-0.4.0-r1.ebuild 710 BLAKE2B c234e5d75dc5511b741bc18d58bd5247ac47305bd02897983cac8620db176bbfe237f9035fd308e965c1232718083d9aade0e90493121c9f6358d865863c0e6b SHA512 d02034422add0eb6203083d54c1d9a2868d535e575e323562dcfd57d2eb552fe5cd4e7ba93a3e78939e80c385037465c859beb669a5c4259490903fcdc46d9b4
 MISC metadata.xml 335 BLAKE2B dabbb4b4997e73611fb77582fbb5b2f07bb0f41106dd68de366039342d2d1de1021e5d2133dc606baa6cc7f0510f7e532a955740c1735377d122f2387883fb9d SHA512 ecbb5547e38a68d686192d03224578355575915d90db53615a0b9aba928e4e2d1eec4b40a08da2eb8fb8e1a26a8b06e861cbad9b31a6af61087fe048e98b814f
diff --git a/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild b/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
index a8aad24e884f..4b5293e5a3bf 100644
--- a/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
+++ b/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/dirkvdb/lastfmlib/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug syslog"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild b/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild
deleted file mode 100644
index 36000699d5c8..000000000000
--- a/media-libs/lastfmlib/lastfmlib-0.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ library to scrobble tracks on Last.fm"
-HOMEPAGE="https://github.com/dirkvdb/lastfmlib/releases"
-SRC_URI="https://github.com/dirkvdb/lastfmlib/archive/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug syslog"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable syslog logging) \
-		--disable-unittests
-}
-
-src_install() {
-	default
-	find "${D}"/usr -name '*.la' -delete || die "Pruning failed"
-}
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index d6829aef6922..fc9baf4e14ee 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -1,6 +1,6 @@
 DIST libavif-0.8.1.tar.gz 2915941 BLAKE2B 40030a5a002e68231adf48ecc6e8012f7ec53506770872fc79dfd73496fa3a214c10cf5fb5826f145fe1f881adf2a3ecca13c33989b2f048aa72e455ab6950e0 SHA512 03692fbba49fde08d76cebb847d0404a81113824e9e65edc6a0977f323d060c394d111e2a7647788fa3115f3ae80b0fc92d4fe5be53852e6734b96a8f1c1a078
 DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d9f82e1b7ca5876cb9859b96ac5b60ad86c2345654f85e97cb6d920f286b683d0bb588ce7db04f50322b158678c SHA512 92c5df26da70ca113ff3b217a4a09e3dea0b7c4737e0924bd2b232502cfda0c79f4f0785bc7992c973491af7660338cda481bae7b999632815142564bf3275ba
 EBUILD libavif-0.8.1.ebuild 1664 BLAKE2B 4d23f517dfb7afe074b36a3aef30ffde2ecddc49c0570e69aa54cedf31ae5dc2a499dd1e8f944fa44b606fb6302b49231ed8337d81f6e4fa6fde503794d80844 SHA512 32cb7970ba5fc28330c6b9575e693417c36116b7a57ff5aa1c4f88d6db039b3d14ec36b325d8df0f09bc56581b928725ed33f9093a46c39151409b103ffac9f6
-EBUILD libavif-0.8.4.ebuild 1697 BLAKE2B 9705a54ae8ea790bbdb4f5449efebefa4189fb3ef4288a3b8481ca59969cc0057ce349440365ed7a9e02399921b24abad07931da4b1ff7559641a5270ce844ba SHA512 b7a1371247ea03a5d92aef835243fa9e15f4e677f940dc4ff0feac19f7fb5e038f4d54c00b33e9a9fa308c4e8467b03aa644a2a8796f379867a15e853a2b8440
+EBUILD libavif-0.8.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6
 EBUILD libavif-9999.ebuild 1728 BLAKE2B b05566cc98406688badc4551f3fb8be04649b768d0a03ce093d3cdc94dae7df6909fd4b030ac8d7cae557a32e630bcf8eeae0e02a8ca470d4b0cf23ab83f81f0 SHA512 82e73423d625c76c7199d6e6afce22c99f4bf82485da39e148448493a8cdfbd4fc6ce6c0af98ccca374b80e2452eb44ba748e47bcd0a921bfc67770c6448581d
 MISC metadata.xml 843 BLAKE2B f95582a72acc4b86d02f246fca2a8c080ee96be8e649008f4b684cbf616c8201c3f6df1e258beb2e402add6da06fb3203254c902cf3613c4fd8d867f7f62b3e9 SHA512 80a0962deb24701c3b920c287875f26f4cdd8d282f0dc1af60039190833097bcdb78dabc0f82283035746a85a9a7b2d95241819fe6e0d36f3194bb2c62ea98e3
diff --git a/media-libs/libavif/libavif-0.8.4.ebuild b/media-libs/libavif/libavif-0.8.4.ebuild
index ce1a11a44f40..156e8afb6ac4 100644
--- a/media-libs/libavif/libavif-0.8.4.ebuild
+++ b/media-libs/libavif/libavif-0.8.4.ebuild
@@ -11,7 +11,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"
 
 DEPEND="media-libs/libpng
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index 4a15bd076e8b..c1f9b1489f58 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,5 +1,5 @@
 DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
 DIST libdvbpsi-1.3.3.tar.bz2 488020 BLAKE2B 923d58012dfdbbd5d2807a186f36c58826199f27a89b750669273b741333ab5c23781b7e992a380ba6e283c357d4e3081d397a1980c21b7568e12ecfb2a3cac2 SHA512 70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69
 EBUILD libdvbpsi-1.3.2.ebuild 936 BLAKE2B a174ce8218ecb469431fc2b1bb1795b47c328c193814ef230ff65977134d64bbf50ede8220748709f90d805668a8a07f4fba6b31ce1a196f7fc845357901e4a5 SHA512 7c0f8ed4a3d19edddd8e0d971b84aa83d50fe6f920333a9dd99395ee5357fdc789464914271719ab41772bc371a84c5be7da3a521d9dddb0b69ef3845d206948
-EBUILD libdvbpsi-1.3.3.ebuild 930 BLAKE2B 5b0f20046bbbeeaaa892c30bc3f88cfe456ab51feef8494f1632aa33165571b5097c0ad98396c291222c2e9a18acd1afee8617bc69531585a9e92fc1b0da47bd SHA512 8db7eed595da863ca3ba3a132796ffa473228a4cc7dab1879279870f2b4edb36bf5aca0b3602c5e3c6b0c89a587ddd91dd51bdcae653cbe9cfb35bdc5d96c014
+EBUILD libdvbpsi-1.3.3.ebuild 927 BLAKE2B 254ae502f37717eec6cf629464d2f05a9ff965ce3bf4be50e8538ff4f671f9a4f4676472124492d6f87f9d7faeb86f49a4f47f14eec94e9bdc1adcc3f2595b43 SHA512 670204f62ed10927d9d30e2e37f97fa7f9df4f4074bc2969c72013c6fae854076fc8b4ac98700c1515db61327c3526517530f5f496db65e4afe2fa7b821bf7e6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild
index 8545df6730c4..a50d9de1fda7 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 46821872233e..2908fe34700b 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -1,4 +1,6 @@
 DIST ebu-loudness-test-setv05.zip 91631421 BLAKE2B 95a345b0700893ab96854c7563ecc9c667db30e8137352226d1f1ac7a666f6b08d1748d88ef11f72056d0a4bd513f365a1336de568ea45917a6ba9af5bc526ea SHA512 60d022fdac47ad0be2688411be9daecbff85da994d6fa4921bba6cffab841b081d8b15d9ce284ad2253efb686463450a84a0d19cb0bad7a934546cc52dd73771
 DIST libebur128-1.2.4.tar.gz 23140 BLAKE2B 4095a11b976109c82ffbd133d5e509b60a2fa27871982d4a81c1927cb23783e89f907bcce52e78d3c743d1e41d1bd823b9b7b510792137649e4b3b680c93eca7 SHA512 d9aec133aca9240f7e859aae30cfcab07ba7aa20378187d53dfeec4cd3840d49bb117fa0698591bac04d95f9d8b5cd0b1fbe41c364694f2fa8267dd690b2dc02
+DIST libebur128-1.2.6.tar.gz 25890 BLAKE2B 8f497091d201f05efc02c423ac3e83e9d056c11ac0dd67cc89d43b7d50f1a28f22ea0f35d329e6f7c8e3df4fb1f245e729fcf7201bdf0c83477211f67472fd00 SHA512 ab188c6d32cd14613119258313a8a3fb1167b55501c9f5b6d3ba738d674bc58f24ac3034c23d9730ed8dc3e95a23619bfb81719e4c79807a9a16c1a5b3423582
 EBUILD libebur128-1.2.4.ebuild 999 BLAKE2B febcd841988f5d74572a2650aa9988d6b9c4fc4437f0173d4a126d68b911662be02101563cf9eea82681004378509fa6152d3b172a60113c164ce0eed886e79f SHA512 01e7974db9c780d5653dead79759463680f75bbd84b590aca82bacb2d465f01b20bc5971befb10bf9568dd632b85058891d7970587b0ebf5f20a91e549bb5159
+EBUILD libebur128-1.2.6.ebuild 969 BLAKE2B af5eb618043df7fbda6f48a43b2d3c93144cb0167d9baf8ec6fab93bc2d8ba898d49a1af0bd69c229c21275da5896b443cb6685a583a7a905a4389042675310a SHA512 4f51791f4f5b34e7e1ed6c40c5086995a3243137d8631196acd879a47c8034dddbe85e586919732d3bb303b6a15f5e604ab143bbe284369375549855857e821d
 MISC metadata.xml 613 BLAKE2B 2c03f77d7bfec26a031ccce628f06d91621870a1f557c9dd09cb8ca85443523268a6ee87ae7048efbce6f934c0e1f4424886e453727b150e2e5570d63167bec2 SHA512 58133a2f99fd62b3fb5da2be5351648d12dc3e8046dcc9a4cb65211db9990f7c5fc46a728e85a588c859fc2ce1dd452fe83d3b677e59631ebaff47a5cc67439e
diff --git a/media-libs/libebur128/libebur128-1.2.6.ebuild b/media-libs/libebur128/libebur128-1.2.6.ebuild
new file mode 100644
index 000000000000..f031bb7c263e
--- /dev/null
+++ b/media-libs/libebur128/libebur128-1.2.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing the EBU R128 loudness standard"
+HOMEPAGE="https://github.com/jiixyj/libebur128"
+SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		app-arch/unzip
+		media-libs/libsndfile[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cd "${WORKDIR}" || die
+	"${BUILD_DIR}"/r128-test-library | tee test-results
+	grep -c "^FAILED" test-results > /dev/null \
+		&& die "At least one test failed"
+}
diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index 09f8cb24aa97..7ede4baac883 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -1,8 +1,4 @@
-AUX libilbc-2.0.2-ppc_ppc64_sparc.patch 933 BLAKE2B 90bb615cb33dfb1eae9d276b08df85ed37b47f127fe9e88a983120d25c57cf669ed0e166d63b3b51e5ac29701107b9be9b683bb36b3e868177bdb2efb1b22e88 SHA512 6a468dff6c42d2e0628466cb9c71639052a17640c78134ee98634c473e4da60296b86eec8f8b8214f64d298d80587dcd03722a9cfc2e588efb73f72f4954eba1
-AUX libilbc-3.0.4-respect-CFLAGS.patch 1217 BLAKE2B 69e46ed5ee1f9ef082b54b6049d078dfa3a007d63b8d0a79c1f07dd8335eaa0402dcc08bc30c0bf8c9329b1244d638231c10fa46396a9c07cdcdab8539fa6c5a SHA512 7de1bb74f552dadccbe3a31c4a2cef7da7525fae47dc7e5d22c78e59604ac9e07e3f4123acc35e174dcf9fe25f4c7e3b6e51a092f77c4f604b23af1ed724cf4a
-DIST libilbc-2.0.2.tar.bz2 392643 BLAKE2B 1b1772c415a823a63c2fdb64913eeee8becdda0438c3942e74dc0be5dc6e000538c8f0feb796d23eb815e792d9b9e695f598869a31dd69a90c1fb12823a09e28 SHA512 ad0ef3326144fa1e9b6983be9aeefcec0064930a0124980f0fa2b38967f145e4cef7be75d8eae72f4a9650f297f15968944e73ef256e642116125dea326d8ba8
 DIST libilbc-3.0.4.tar.gz 1307591 BLAKE2B a914b79c1134536f45910d367216b1ac27d4acb08f4c9b9dd3f01eaf181ecf0f6dc351b944039b05445217360a7e4b868b3aba9f8d6265eeee62a90ce0641a42 SHA512 2239a915263c2a73d83836354d42c670e4fe1173a38b3d1a9cef169778038ae5f4901d8202d6c5367d00db76e034e72bcdf6ac81bf0188f6a3f928e7d36d5a31
-EBUILD libilbc-2.0.2.ebuild 887 BLAKE2B 823f2b98b090736d98a07eb2ad8e1489d02f12f33de72cfa2749058c499ae71098dfac05b875a02a2d9fac09e33fa6e4009ceac866162a168ff6e5a70156509e SHA512 eb28d8e92974fb0b2367bea26bae5443838f45e84535ce2a1890fccf1ecfbafc661a7baf3bf96bf64e89ee375adde735b3965fc11c4b85aa1cd17e8d31790d90
-EBUILD libilbc-3.0.4.ebuild 601 BLAKE2B bbf6689f567a203ac35391a2c04eade1ef5b1249f032e287eb666dd5e1369ce5695f9b6dc3e71892883671fbd8c8e65f903663c791a0cd22e6fe3210c3bc9f7a SHA512 d47330ee4ffe67d47a29886ae72feb30e527b202ae4167fbb6f797f549a00e3205887028b3f3c6f505f513010e6812b4b2fe879a810404041e2c4aa2056ab660
+EBUILD libilbc-3.0.4.ebuild 599 BLAKE2B 5476326bb06e7c351926ab0364a42ffcdbc025af8e03ec2663edffab7b78307a12ab021a5af977303887fb46e4f2ad5698af1d321d7104abc0c8640ae357b49d SHA512 40e44020521fbae740f457a9e104c412f4cebfe8c295cb06b5a7490825239b7b371ef16fc03f3d9806339df00eb9206646942cd89bdc177fea73d01544986626
 EBUILD libilbc-9999.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
 MISC metadata.xml 333 BLAKE2B b0f35100492df931d4a504ea070e7c5df977bb452e013cdbcb6b82d949b42d9b751862c5b9462b67d3669bc401f843eef664e5e1612400cb9418f22b208b2f3a SHA512 9081154d8e099e7b355ef3b11a49e7580bf1ef2a62dfe3f183694041a0a1ef247a111a982af1ba9cefb3a64dc26a4b0edd45b374087e4bbf044f468eff7195ec
diff --git a/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64_sparc.patch b/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64_sparc.patch
deleted file mode 100644
index dcca9c2ac321..000000000000
--- a/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64_sparc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4d0c2edf1f9477f80e361e17de638806b1399a51 Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eike@sf-mail.de>
-Date: Fri, 23 Mar 2018 01:08:17 +0100
-Subject: [PATCH] add platform definitions for PPC and Sparc (#23)
-
-The PPC flags are taken from a Gentoo patch.
----
- typedefs.h | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/typedefs.h b/typedefs.h
-index 669451626..2f9fe77ea 100644
---- a/typedefs.h
-+++ b/typedefs.h
-@@ -47,6 +47,20 @@
- #elif defined(__pnacl__)
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif defined(__PPC__)
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#if defined(__PPC64__)
-+#define WEBRTC_ARCH_64_BITS
-+#else
-+#define WEBRTC_ARCH_32_BITS
-+#endif
-+#elif defined(__sparc__)
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#if __SIZEOF_LONG__ == 8
-+#define WEBRTC_ARCH_64_BITS
-+#else
-+#define WEBRTC_ARCH_32_BITS
-+#endif
- #else
- #error Please add support for your architecture in typedefs.h
- #endif
diff --git a/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch b/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch
deleted file mode 100644
index feb3a2255e10..000000000000
--- a/media-libs/libilbc/files/libilbc-3.0.4-respect-CFLAGS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cda8105..b766ec2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,15 +52,15 @@ set(CMAKE_CXX_STANDARD 14)
- 
- if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR
-    (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU"))
--    set(CMAKE_C_FLAGS "-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing")
--    set(CMAKE_C_FLAGS_DEBUG "-g")
--    set(CMAKE_C_FLAGS_RELEASE "-O2")
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing")
-+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS}")
-+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS}")
- endif()
- if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
-    (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU"))
-     set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing")
--    set(CMAKE_CXX_FLAGS_DEBUG "-g")
--    set(CMAKE_CXX_FLAGS_RELEASE "-O2")
-+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS}")
-+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS}")
- endif()
- 
- if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
diff --git a/media-libs/libilbc/libilbc-2.0.2.ebuild b/media-libs/libilbc/libilbc-2.0.2.ebuild
deleted file mode 100644
index d01615a69b31..000000000000
--- a/media-libs/libilbc/libilbc-2.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
-else
-	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
-HOMEPAGE="https://github.com/TimothyGu/libilbc"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="static-libs"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64_sparc.patch )
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libilbc/libilbc-3.0.4.ebuild b/media-libs/libilbc/libilbc-3.0.4.ebuild
index 9d95e85d4879..2425e78987a0 100644
--- a/media-libs/libilbc/libilbc-3.0.4.ebuild
+++ b/media-libs/libilbc/libilbc-3.0.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index ca2d6e2d3b6f..43dbf06f10e1 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,6 +1,4 @@
-DIST libmtp-1.1.17.tar.gz 829529 BLAKE2B 7e7393aaf0e988029382d30e260d651ad1166a89a2af32a3da544cdb85eeec1a026eaa40d131096eaec0686b92c4e25663ec5cfbe3916a522ebafd38f107744e SHA512 f2648e259529bd3dfe74a7049a79c4b0042bcaf63cc1fec8b232b66312d62e9620280e4f725312c9ef8207f1f1ceac19f460a0a8772a3cc6c7f0b00ead01add2
 DIST libmtp-1.1.18.tar.gz 832463 BLAKE2B 136033e9700fcce6d5092f8f5f896ce40b2ef659d638bd2e432fb7522c1c4e7e930171198ada5c67c0f5dc7c94ed36ec7d2ac8f4faa3bb335d4a8abb032ae2ef SHA512 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8
-EBUILD libmtp-1.1.17.ebuild 1582 BLAKE2B 6598ad68e51ea6071dba3cad5a51944277301b30864400eb9803b9259a2715360b9d7ed6241fc6f59142d5ccbf1c4d33595067e22c0151354f04ba35e3a86fc3 SHA512 1ccdb125a2fc6f0cce2e3a087db830a7559c094afc87cb11f291834eb42b9719cd4da57e0c41ab61e34b0dca334fd5d19fdc33282806752a052e7701759aab70
-EBUILD libmtp-1.1.18.ebuild 1601 BLAKE2B 365ba8eddd73d828277b69bdf3b7ae5321df1cc7eeb31ddce71d20b9859df734a3f9d5abd22e06f4b987ff71a9b83679ba2104c2b53fa7ebdede11092dea420e SHA512 b8247b6e49d2e63ed82c0cc8c83fa99fccaa6df4fbefb3301b8ea23f0d8d42f087d6b43ba49bb78c9aaa8a45f0ef91e19b377e8a0ef15e3a2d8e2a4ef409cf8f
+EBUILD libmtp-1.1.18.ebuild 1600 BLAKE2B 02cb07d298b779099a9dc7aafcb84d6b461fd0d0396566c272bbcd697bbb219b1dde176b8098c061608ea54ba0b042d19f15713fe21d90dacad784857ad9fe5a SHA512 e7e8ccc8e62f7c0294531b029e23924a88962e4d15b28914d7e3741d9ef321cab880ba2e18e961e7b3f1c8fff290322e7e8970b19d5667eb4491c77c7408be0f
 EBUILD libmtp-9999.ebuild 1587 BLAKE2B db65f8bbe716f8ecc2b2700c56b430fe239230e2950acca1f6f732d3d92c25e2f2d8a77f55735ece0b31075b1e131d9704f39d1e5865ff60de6edd37791c8218 SHA512 c35a6b0fc775992d78b84e6028c6480e7744e400b1543c25f64936c4b46816aa63104f82602e00f7af25705e9d7832b7f049a36ea6edc739e672ad57649a837c
 MISC metadata.xml 447 BLAKE2B 93dc7722951975ded85fabe8f53c75317b6981561f8848ff52ffa277a93b31ed626e9c97fbce4ce62d40fc186f473059cc036398f218abaecf692e0683e2f439 SHA512 4ddbe48062ced53c6ce5473a837e449251933ae248d04c14c2008d35ce8f290bfcef67aeb31a9d29e53bb54377df5043e89c98ea2744896c1f106785e3b4c212
diff --git a/media-libs/libmtp/libmtp-1.1.17.ebuild b/media-libs/libmtp/libmtp-1.1.17.ebuild
deleted file mode 100644
index 0c0f57bd929b..000000000000
--- a/media-libs/libmtp/libmtp-1.1.17.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/"
-
-LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
-SLOT="0/9" # Based on SONAME of libmtp shared library
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="
-	acct-group/plugdev
-	virtual/libusb:1
-	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	default
-
-	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
-	rm ChangeLog || die
-
-	if [[ ${PV} == 9999* ]]; then
-		if [[ -e /usr/share/gettext/config.rpath ]]; then
-			cp /usr/share/gettext/config.rpath . || die
-		else
-			touch config.rpath || die # This is from upstream autogen.sh
-		fi
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable crypt mtpz)
-		$(use_enable doc doxygen)
-		$(use_enable static-libs static)
-		--with-udev="$(get_udevdir)"
-		--with-udev-group=plugdev
-		--with-udev-mode=0660
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
diff --git a/media-libs/libmtp/libmtp-1.1.18.ebuild b/media-libs/libmtp/libmtp-1.1.18.ebuild
index a7c0f68898fb..ab54811e2432 100644
--- a/media-libs/libmtp/libmtp-1.1.18.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.18.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest
index 1c7f8b8f5550..4078398fa408 100644
--- a/media-libs/libmygpo-qt/Manifest
+++ b/media-libs/libmygpo-qt/Manifest
@@ -1,5 +1,5 @@
 AUX libmygpo-qt-1.1.0-qt-5.11b3.patch 4991 BLAKE2B b79e01b8c72c9248ebcdda72f7051e799a399a8153785ec35cc223ff64e0707baa856846720e79acd5fc93bd73ea7e1ac8b48e8fc4a853970019b0eaac227a55 SHA512 91617ce03cfb94c9524f06dc5dd3af0c84b5b7af279cc8e13b8d4cc221b6d86c4f28347039a944f9002c57ba65bdf8c870e6076b7877ee1c88e1fefa31c1776c
 DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a
-EBUILD libmygpo-qt-1.1.0.ebuild 948 BLAKE2B 5261e354486c02be3c1a8d8df3fe8c7234996aaa8eb38271f43f64c7f104d59e56ebde6df7f721229f083e0769c635079b2db5d6fd3f719abb0d72fe589c5d9c SHA512 2258cbb11dfabf600e72ee085ea8145cac244ed106336955177c3cef22854396e009f5368566d5b93da4148d5c0be0701ac0d81677c65c9ac778d4fe4814c735
+EBUILD libmygpo-qt-1.1.0.ebuild 955 BLAKE2B 65f78497d97db14a20a6f03374c8dac38b80b401a61b07f6dc47d241a8f7dbd6b954f963fe790718f25eeeea6ae83e0eaf0fd4c153538e8668891387b82fd21c SHA512 168a9ee0d73f06eb397b328afbd73b2d1490372611234d17a849dacd27b2231547fa3e6efbba5d104da4195001cfb19c5eca54ce2296cdf5807be1f9d3c58597
 EBUILD libmygpo-qt-9999.ebuild 787 BLAKE2B 47d3d8048f378ac0f07856e97896dece83d51aae984f6cacfddc35740b864f646710504c5834bf671fb67e0cd3ba75bd00ef055fa06998970f4403e251a80347 SHA512 ba87fcc11692dfff8978caeeeefd77060635f722a924800d77117502642aa04989dddbf8aacbbc49e6594a7d3a616f8b0f12df73ba29bb2e479f30a77e1ad377
 MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
index d8ce4b379feb..cda56925c14d 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index eb2eaa20ad09..674eeb73a1cf 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,5 +1,3 @@
-DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
 DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029
-EBUILD libopenraw-0.1.2.ebuild 1123 BLAKE2B 4cbed60099d06ae4a7743a1e0b51ec96cb46056c9c6edd297780ea1e2b381d5a982d5eead5638e427af6915e159637997f5779e1791a9ce0d55b69e1103a55b3 SHA512 22d5fab05fb48453bcb7af6b752d4aca51e6574369795b8188fc0375476b82e7953aab98fedc87756175a96b98ea267d779fc68c87f32b662deb2f1048a31835
-EBUILD libopenraw-0.1.3.ebuild 1052 BLAKE2B c28a0abcc23ff14ab20bd6c255a83a477696a0e164b0937fd36d9c1537b39e5f90410852a5a41ae704b2081615f550b11471f9627750271d8937f6036e94d46a SHA512 a2ec47772e7c9360533e7b44b8d8fe28a7a426435ddb8a8b2d4930c96566e99db04befcd78fe8056c9dd4f7f5308399ada24a02ad781ef2c4ae92e9dcb569f2c
+EBUILD libopenraw-0.1.3.ebuild 1051 BLAKE2B 71204e173f34b437b3757db62307890a9a5557c5e8014f04187c075d1020582a04eb6c5ee5dd54452900198e1814302aa0297e17f8518f3681b24c9699f97e02 SHA512 cb6050515ee8f35f790387d6c2c5771befb2b876622b284c8357bf544f14528da0306e4090929ea98597c2afb9c2f258372bf6bcedfd7b21b6ce554b0e0ac998
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
deleted file mode 100644
index 1b84536a906d..000000000000
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A decoding library for RAW image formats"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/"
-SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/7"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="gtk static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libxml2
-	virtual/jpeg:0
-	gtk? (
-		dev-libs/glib:2
-		>=x11-libs/gdk-pixbuf-2.24.0:2
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.35
-	virtual/pkgconfig
-	test? ( net-misc/curl )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	econf \
-		--with-boost="${EPREFIX}"/usr \
-		$(use_enable static-libs static) \
-		$(use_enable gtk gnome)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	use gtk && gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_gdk_pixbuf_update
-}
diff --git a/media-libs/libopenraw/libopenraw-0.1.3.ebuild b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
index 5112dfe394de..a09c541263fa 100644
--- a/media-libs/libopenraw/libopenraw-0.1.3.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index fd2063cce57f..37ee57e9e0ab 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,9 +1,12 @@
 AUX libprojectm-2.1.0-fix-c++14.patch 1505 BLAKE2B 102d3e8aa719fa42e92e81c5dd4fa0f7395672bd0b94fe83ac35d1961acc58f3aba0529d49c5579e8ad4c3661268dd7bdacdd1f5445d1d08cd894daca65b4156 SHA512 071070f2f8c890cccdba09bbe9cb1a68451ebdf30ae339263e322afbaccf974be41a0eabeab12e1432382bc94bff4df46a4f1e2c227c3de77577f5a8776aa3c6
 AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd04699938f08bfe2b9dbebe95f19abcd1e16c4f7f9619c44639586611f3c7b69784af92d2fbff02ab301503ca626ff9da0d7c0 SHA512 562e9616500a49b52e29d50d7c40b8db2b8eb36dbcf28c2b415975b0ce751d21d8ecc06747c3c810303078a2e83ee1c6ed438818d936ddd86efe94900d1a348d
 AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
+DIST libprojectm-3.1.11.tar.gz 52831435 BLAKE2B 286cbe5d7c497b0955da38d3ccfd4a5c97d80bc102a4bb739f98ee6c39afb1420d780c989997c16be9d2e7d54718a498769f98e15e2443bc7ac8ad850ecbb2df SHA512 da2c34ce5798205d31906c401d98ad2f16a45b6123975a291657c892db41c86d05d38edee34b52f2415c4442d8302c8c0dc5bb89e5932a057df17f7ccac7db22
 DIST libprojectm-3.1.8.tar.gz 55482686 BLAKE2B 226cc62ce84932e81c650dac8dcf89eed4d71513324b3bb3a7250c450cb002870f2c2c2eaf6947f6056b35efa5159ea7956bfec420e9f545df445f7654a76d05 SHA512 efbcd5e867ab9e710d11018d580ae6c3bc7aaba46e3ce2a3d682e9ec341756db6ecf613deab0a9d13ed6ace3d05dcf19a384c00ee21832acd5b6ebfe2b806f44
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
 EBUILD libprojectm-2.1.0-r2.ebuild 1462 BLAKE2B 02bd1446c7250f0313805c051814ea9114b881ab8cfa7b5ccde11c88c636826600660026935bdbf7a9a283c540c220080f98b28bce7f626ea21dce830723e73a SHA512 b82ecdef0da92c14e0993d099cad1741ff5f7d5407c2d31c275ce3a9664929001ed3099b554767ca49626a2e104bbb5c4ac90a68689f20f1e0e9e3f58b66c40c
+EBUILD libprojectm-3.1.11.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
+EBUILD libprojectm-3.1.8-r1.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
 EBUILD libprojectm-3.1.8.ebuild 1359 BLAKE2B 35125d135a787204760525a533d86d8b49b9c2006ce1e067460d68a61451cb9bd4ce96e71eb1ef02e5806d09b2d1c1bd05724af05e6abad55773deeed3c1df19 SHA512 5250de2e327f8f411273a819881d158fa28e93bc3f1f8d993b197892277bf436568eb946185ca740c974324501b4e39e76d918c92eff97034de253dd261deec9
-EBUILD libprojectm-9999.ebuild 1359 BLAKE2B f68f5127f00e1f011c1be28b64c013ea655f2d0f8b47bd790b3a9878737a09098633902697f2c5a802c193157137f0c52fe89dbfde9860c80173ea4900c4aef8 SHA512 76da921f433287a3a46c14f8dd766239c084516f913768440bb465e1d6a3acb081cd469eade3127f6b7314875961cd28c5a822126cd1981f6eb3b460c41b6e12
+EBUILD libprojectm-9999.ebuild 1410 BLAKE2B 034d7b404dcd9d6ae7e6e38225a0345fddd8a19625dec7e7512345c6a1832ee5e0f377e94c56873fb950b9b1dd876f33b6037049e4ba91856bf4c69ecaa72906 SHA512 8223287f7bc757f48f1b148c1fa931a5c00501e59ef431ffe5cb7958a623c372f93c7f3eea6d04c4f01e1ec9536951837c043cb332d937dc09910434e1e09564
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-3.1.11.ebuild b/media-libs/libprojectm/libprojectm-3.1.11.ebuild
new file mode 100644
index 000000000000..a273f50c063e
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.11.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	S=${WORKDIR}/projectm-${MY_PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0/2"
+IUSE="gles2 jack pulseaudio qt5 sdl"
+REQUIRED_USE="
+	jack? ( qt5 )
+	pulseaudio? ( qt5 )
+"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+	media-libs/glm
+	media-libs/mesa[X(+)]
+	jack? (
+		virtual/jack
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtopengl:5
+	)
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	sdl? ( >=media-libs/libsdl2-2.0.5 )
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gles2 gles)
+		$(use_enable jack)
+		$(use_enable qt5 qt)
+		$(use_enable pulseaudio)
+		$(use_enable sdl)
+		--enable-emscripten=no
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libprojectm/libprojectm-3.1.8-r1.ebuild b/media-libs/libprojectm/libprojectm-3.1.8-r1.ebuild
new file mode 100644
index 000000000000..a273f50c063e
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.8-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	S=${WORKDIR}/projectm-${MY_PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0/2"
+IUSE="gles2 jack pulseaudio qt5 sdl"
+REQUIRED_USE="
+	jack? ( qt5 )
+	pulseaudio? ( qt5 )
+"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+	media-libs/glm
+	media-libs/mesa[X(+)]
+	jack? (
+		virtual/jack
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtopengl:5
+	)
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	sdl? ( >=media-libs/libsdl2-2.0.5 )
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gles2 gles)
+		$(use_enable jack)
+		$(use_enable qt5 qt)
+		$(use_enable pulseaudio)
+		$(use_enable sdl)
+		--enable-emscripten=no
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-9999.ebuild
index cd148676740c..a273f50c063e 100644
--- a/media-libs/libprojectm/libprojectm-9999.ebuild
+++ b/media-libs/libprojectm/libprojectm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,21 +14,22 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	MY_PV="${PV/_/-}"
 	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 	S=${WORKDIR}/projectm-${MY_PV}/
 fi
 
 LICENSE="LGPL-2"
 SLOT="0/2"
-IUSE="gles2 jack qt5 sdl"
+IUSE="gles2 jack pulseaudio qt5 sdl"
+REQUIRED_USE="
+	jack? ( qt5 )
+	pulseaudio? ( qt5 )
+"
 
 RDEPEND="gles2? ( media-libs/mesa[gles2] )
 	media-libs/glm
 	media-libs/mesa[X(+)]
 	jack? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtopengl:5
 		virtual/jack
 	)
 	qt5? (
@@ -37,6 +38,8 @@ RDEPEND="gles2? ( media-libs/mesa[gles2] )
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 		dev-qt/qtopengl:5
+	)
+	pulseaudio? (
 		media-sound/pulseaudio
 	)
 	sdl? ( >=media-libs/libsdl2-2.0.5 )
@@ -57,6 +60,7 @@ src_configure() {
 		$(use_enable gles2 gles)
 		$(use_enable jack)
 		$(use_enable qt5 qt)
+		$(use_enable pulseaudio)
 		$(use_enable sdl)
 		--enable-emscripten=no
 	)
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 4c4f998bb687..7dc78c2fcb88 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,5 +1,5 @@
 DIST LibRaw-0.20.0.tar.gz 1431412 BLAKE2B 455649b600926a6a53924e4cfea33143fdd8658804cc5c19f0bb6ff5bc4a0f73ce6e45385a0edd5c78e290c8a1e32a6e3cb5a2a4c53318c046b6c4c5e6476acf SHA512 98c1d61b01fd8d408297960f63ba56d23f170ca820db7cb2c2ad5f0c9494ce79d4d615d76a6835e046589e76031a553d6e1c692e7e3e66655bc96f4d4847d7ac
 DIST LibRaw-0.20.2.tar.gz 1432141 BLAKE2B 6e41d91b560951ad4595c41a1d089505ca91337f4fc6b98bafe44211971bee143709482a070bacb7daebbd643bbbf17730f544d791c0237bf1689a7a59133079 SHA512 96b1aaf09e2d46448d1b3619270c1f1c32e9bcbd866567cec67d5b1f889362f0fae3f3533ea9bf6a11a917be3b61ee6c9938bad09209d93453039ed04eaeae4a
 EBUILD libraw-0.20.0.ebuild 1382 BLAKE2B f37c63dcdbbf7bdd93af2fd7bf67d04c02d0c5c3d95b9b89c30ae806f6a5c31ab8862f4a7cc1c4851584e46f76a2805e6981f0a088f672e609ed1424ebdcf2ab SHA512 4941a712d519ac88903e1912de2e8bea816339fce8695af416a6229b627df14718576d43d30b715775eb26c5f5ba5d9bce152293cce96ea3289682f367d302cb
-EBUILD libraw-0.20.2.ebuild 1384 BLAKE2B b0a3620b3dadcdabd977e38411ab2fe83728f18a86f66e3a47b47c2a3694566fd61f86036b9a72686dcd8d65b3eb11cec6e3ecadca1082b73466be7eb218cd77 SHA512 00070cf429d62c66916840e8e88a4af4d40514eb53374f2e0daa09535ce5c313aa03f2959c6ce62e2beab8872138193d9bebda24181d458ff76bc1f7ddcd42fd
+EBUILD libraw-0.20.2.ebuild 1382 BLAKE2B 40bdf98afe011d6754a1476e96612ae5e5ffe657de738573a472a71329cbf59973ea7ab3b880739d9f252f47f083f92662f433adec3f213129762a866f0d7b93 SHA512 5f100e8dade61085db182b07777a6d24d716185e46055aae44b1f33bb6a8a285544ca1dcb9d5214738fdcc2583c571d079a7b8919e5060b5632e8023093da198
 MISC metadata.xml 383 BLAKE2B 3e4195c6cba775cc80e977738b81f527ef45c4fdde631a9c0591b26500cbda7c09267e993d4a21b72b98ec681e1a80d7d99e3d6ce0e48d0d2870abbb1ae64add SHA512 710ff0b177c64460965225e90584cddbf3bc439aa5cc900bb5a3877207fd5ad8f275cca03330366357eff9e08b4effec9d29271e90fc1bdd7befac4eccf56c1b
diff --git a/media-libs/libraw/libraw-0.20.2.ebuild b/media-libs/libraw/libraw-0.20.2.ebuild
index b2174bace6b6..62c86a68ef2f 100644
--- a/media-libs/libraw/libraw-0.20.2.ebuild
+++ b/media-libs/libraw/libraw-0.20.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/20"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples jpeg +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index a3a131edebb6..a57aadb3077a 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -1,6 +1,3 @@
-AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe3fe68b304521a1d7185e865f4ac254d2bd313686e0d6a59e5aa50a0fe41a0e0214980aefe1fe3dcb8a45d827d4962fb153 SHA512 4717ee913ff50e276cca9983543a046271c34385bca2525bc64f6de90a25c7becc7e780807ff2534147dc17b1f57b57e23746948ea78288addfbeca7c495f78e
-DIST libshout-2.4.3.tar.gz 529563 BLAKE2B 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5 SHA512 fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34
 DIST libshout-2.4.5.tar.gz 543991 BLAKE2B a3ceabd150413e9d1cee2118fe9576959bfa05d86e261b2574969a9a665aba3da4ac1c39db2b27d033fe587232a69a569d80362f856bba667277b5454dd170ca SHA512 290844185da16961f03434d3e341573dd6cb0139e5fa81902903021b641382d2629302d7c356bc591b35656754e07f4e44a8d9e782e092b17a051b9ae8f54341
-EBUILD libshout-2.4.3.ebuild 1312 BLAKE2B e409e9f703a351d6e0df5dcac4beb3ae9de6c4773257e0d2ef541ea5d3120822f7ddc7938d0f123e250c38669aa6596928c8329b15a620a67b2a422dd40a3358 SHA512 e2b159724aff657070e9fe692981e94cd73d00b7f8d57110364154575ddbf27a111953f04dbec4c2479b3db88f1806afbb5bd201fa1dd95e05547247a3945fca
-EBUILD libshout-2.4.5.ebuild 1233 BLAKE2B d7db0b2fd29286e7c0fd6aa0e23cfdad2a9a99a5daa1510f96ee087ace066b43d2ea2484603a1d71b3131931b918d86f25c54c885864c2aadd5c493f71770069 SHA512 fe6d0ef23491b20202c2650d4ca7402d2555e7a5a5d1a1937f82fee5be1f4123e164abe64a8102528e7ee121213c8fa784f2ce9265138d59dad7d093ec5cfdc5
+EBUILD libshout-2.4.5.ebuild 1232 BLAKE2B 8cc0aaf280320e3e36ac89892a273d801999257f8f983666cff99920d297190ae4a49d2ad1910a902eb1abfb627737946ada9e808700144280f60c9fe0919d10 SHA512 0978109abab884d5a6134b72b02ad31836fd6c819d42d968f710ee369d0639837e98ae1d114e31fad957ce9bbea3be89da8f18700b85ddc3defa6725260602a9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/files/libshout-2.4.1-underlinking.patch b/media-libs/libshout/files/libshout-2.4.1-underlinking.patch
deleted file mode 100644
index 0c6b7f2f5a71..000000000000
--- a/media-libs/libshout/files/libshout-2.4.1-underlinking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/499458
-
---- libshout-2.4.1/src/Makefile.am
-+++ libshout-2.4.1/src/Makefile.am
-@@ -33,7 +33,7 @@
- AM_CFLAGS = @XIPH_CFLAGS@
- 
- libshout_la_LIBADD = common/net/libicenet.la common/timing/libicetiming.la common/avl/libiceavl.la\
--		common/httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS) @XIPH_LIBS@
-+		common/httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(OGG_LIBS) $(VORBIS_LIBS) $(THEORA_LIBS) $(SPEEX_LIBS) @XIPH_LIBS@
- 
- INCLUDES = -I$(top_builddir)/include -I./common/
- 
diff --git a/media-libs/libshout/libshout-2.4.3.ebuild b/media-libs/libshout/libshout-2.4.3.ebuild
deleted file mode 100644
index 3d9eb17139be..000000000000
--- a/media-libs/libshout/libshout-2.4.3.ebuild
+++ /dev/null
@@ -1,56 +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="library for connecting and sending data to icecast servers"
-HOMEPAGE="https://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="libressl speex static-libs theora"
-
-RDEPEND="
-	>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/shout/shout.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.1-underlinking.patch
-)
-
-src_prepare() {
-	default
-	# Fix docdir
-	sed '/^docdir/s@$(PACKAGE)@$(PF)@' -i Makefile.am || die
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable speex)
-		$(use_enable static-libs static)
-		$(use_enable theora)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libshout/libshout-2.4.5.ebuild b/media-libs/libshout/libshout-2.4.5.ebuild
index 802fe33ff774..847b1829fedb 100644
--- a/media-libs/libshout/libshout-2.4.5.ebuild
+++ b/media-libs/libshout/libshout-2.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libxmi/Manifest b/media-libs/libxmi/Manifest
index cf7a40ad9b87..34a01399a6fa 100644
--- a/media-libs/libxmi/Manifest
+++ b/media-libs/libxmi/Manifest
@@ -1,4 +1,3 @@
 DIST libxmi-1.3.tar.xz 258672 BLAKE2B 7eb50a9a7804bd37fdacd238e41241d54e9b0ee00aac9267e9d6a62a1a61338522c26df56021821fd7af74123550f99305a233dadb55a6a9514feb124fd70d32 SHA512 f54b0925e2b848f7cfb31bd0f9eed27df6fd6e704ffeeb58eb490d49e7ca76f46e03eee6ed89d6644f6a3bad05c7b0b986f9634d0cd23c49f31ee80f23ff8262
-EBUILD libxmi-1.3-r1.ebuild 698 BLAKE2B a5ddbd4ec9b6a6775ce89495aeee36ef28ea8c1093a81bc9adcc8f3546620f36438b44c79e7449cb6ff94d943a27efb33d1484ca3c50e3f0a25dc031b0df3950 SHA512 1961c838b2bd9bde597caa618b7f7b32d454718267ea8116b5a289443bac5d69c42f4062fe2b51405c8c2b206b7ce78ca6a442f51c27ad8a2558b59277b9767d
-EBUILD libxmi-1.3.ebuild 614 BLAKE2B 14b43337437614721d4ce91bf120dce2df33efef6c1fe2330a627e3a09d0e4e530959f8bda76382a94f310f77fb661994c3e0ab26d87af5389288ed6858f1293 SHA512 d95bc3984fcccf56c3135381203084d80eceafc72104aee623371ac5a82589245bd96e1d04e07417f86f1d000c64c115d7630d9be981859fa3700d3609baf0bf
+EBUILD libxmi-1.3-r1.ebuild 697 BLAKE2B 32b8be7e61fde560e810d0afa3ab42474e91ccf7c4fea251e9d4cb5d9fec626f543e5535dd92e1616c4eda318bb30aecb6206dd2bd86b4578b273fbc21529927 SHA512 779f59dc00dde09b7cba67402459db4d56dd50d976f8cda7cda85e8afd23139535d5fb0f5924fd9006dab0827c726177ab38f4add98538c3e1a026582d1f1d1c
 MISC metadata.xml 1174 BLAKE2B 9dae17714124bc3fbb5625b58a78353eb64aa9131e541943819b35ec6231fc1009d11bf90219fab08e34187eff0c0902d5e6a2a6ad64e586bc8e7cb464edef62 SHA512 0fc60c658a5e56b8d6d49c0251b2678c07d19e9a32ad59f08ae98120f28b412642030692f8c51bef994c14b4d01d9979f3286b22cd417c8a1b1211a27355b03a
diff --git a/media-libs/libxmi/libxmi-1.3-r1.ebuild b/media-libs/libxmi/libxmi-1.3-r1.ebuild
index 8492b22697ad..de24622b7049 100644
--- a/media-libs/libxmi/libxmi-1.3-r1.ebuild
+++ b/media-libs/libxmi/libxmi-1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
 	default
diff --git a/media-libs/libxmi/libxmi-1.3.ebuild b/media-libs/libxmi/libxmi-1.3.ebuild
deleted file mode 100644
index 8b2d6b65194c..000000000000
--- a/media-libs/libxmi/libxmi-1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="C/C++ function library for rasterizing 2-D vector graphics"
-HOMEPAGE="https://www.gnu.org/software/libxmi/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-#mirror://gnu/${PN}/${P}.tar.gz"
-# Version unbundled from plotutils
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="!<=media-libs/plotutils-2.6"
-RDEPEND="${DEPEND}"
diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
index 247c97a546de..a69d00ceb6be 100644
--- a/media-libs/libyami/Manifest
+++ b/media-libs/libyami/Manifest
@@ -1,4 +1,4 @@
 DIST libyami-1.3.2.tar.gz 820517 BLAKE2B 189ef95bcd504422550f6df38433d042a45e2a1c36b30b1b5445ce69076c95f4d1b60e12e09ff4b11245e3fcdc70a4fa5e0879e3976c4891ca98fa00d79360c1 SHA512 25300d589119b5f5211b5a2445b408dbb35aea83bf18bc3d3b42d6b29151495f5118cf0f32bcc8c3756ac58fccb16932e78c8b6e7b29daffcc9ee08a3e0b5b54
-EBUILD libyami-1.3.2.ebuild 2377 BLAKE2B f1b3d291cdfad965ffa37ffd4926a75612ba66c79cc096399bb19dcb125ba0a89f3fb0df8a0073cb184a88a157fbb4cc69af06c8de79f831741cd2d1e44ea772 SHA512 a2c946869512c855da4ca12a68952a597d268473b4256790ea7cbc4f57f1d1fd9058dd836beb6bc31cab91dcd09e54404a9fc141f971099dbb3035da3d578cc2
-EBUILD libyami-9999.ebuild 2377 BLAKE2B f1b3d291cdfad965ffa37ffd4926a75612ba66c79cc096399bb19dcb125ba0a89f3fb0df8a0073cb184a88a157fbb4cc69af06c8de79f831741cd2d1e44ea772 SHA512 a2c946869512c855da4ca12a68952a597d268473b4256790ea7cbc4f57f1d1fd9058dd836beb6bc31cab91dcd09e54404a9fc141f971099dbb3035da3d578cc2
+EBUILD libyami-1.3.2.ebuild 2364 BLAKE2B 244b524a391fa95c11612e3608d89519b17da55cc6cb529ae1b74fb997c1a0a9bb07d208b74b22bba16d1f553feb7d0e696576a0584fdf2b5c0629e329951c38 SHA512 c770356969f42966976cd7977e6a583a22ea16770175aabd2bf5e80ac2ef69a2a2248a2ca1eb6cb77c5bd1226aa8f6d4d8faffb1d1e3304be65d94b4e34fbde0
+EBUILD libyami-9999.ebuild 2364 BLAKE2B 244b524a391fa95c11612e3608d89519b17da55cc6cb529ae1b74fb997c1a0a9bb07d208b74b22bba16d1f553feb7d0e696576a0584fdf2b5c0629e329951c38 SHA512 c770356969f42966976cd7977e6a583a22ea16770175aabd2bf5e80ac2ef69a2a2248a2ca1eb6cb77c5bd1226aa8f6d4d8faffb1d1e3304be65d94b4e34fbde0
 MISC metadata.xml 564 BLAKE2B 5e0cdea946bb891106c1c04123df9ec34b6de1e92dc3ab8002ff0ae9d38eb580da6f7765efb99a299e073f5fa35f8d91c190aedb2040a6c8a95b71142c9495ea SHA512 db74b69f443e310f95f17b9c8112cb9f6ed5ba4600971b7eff65a1c98ccc2391d5d5a53f46efee8b4b6aa87a0becf8883a0a5dafb10e5d708dc8a8e584865008
diff --git a/media-libs/libyami/libyami-1.3.2.ebuild b/media-libs/libyami/libyami-1.3.2.ebuild
index 6cd57db8c9f2..b521ead3f995 100644
--- a/media-libs/libyami/libyami-1.3.2.ebuild
+++ b/media-libs/libyami/libyami-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,6 @@ DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceler
 HOMEPAGE="https://github.com/01org/libyami"
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
diff --git a/media-libs/libyami/libyami-9999.ebuild b/media-libs/libyami/libyami-9999.ebuild
index 6cd57db8c9f2..b521ead3f995 100644
--- a/media-libs/libyami/libyami-9999.ebuild
+++ b/media-libs/libyami/libyami-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,6 @@ DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceler
 HOMEPAGE="https://github.com/01org/libyami"
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 7901593a8b25..abafcfa2aba7 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,5 +1,3 @@
-DIST lv2-1.18.0.tar.bz2 530172 BLAKE2B 2d9c7fe6e4de1d68762445061907873ff98871277fe0e423c34b0e9586cc8bfc7674787c020f3c01731204e80262a52902676f6cec8c8a6c18a97953cc626d3e SHA512 9e8dd9c1f30371260d21efc105b1d4d4ad03d9e332d4d3877d873f20b9527bcd0e917ff23fc6e0a9cc4337bda85882c742f225f7cf4fbc8a8a0964565c91f9d9
 DIST lv2-1.18.2.tar.bz2 538345 BLAKE2B 824c7bc2ce62de858308d856d0f89c6285c183764be3727eba5074f42543a1bb8a5e1cdd8a85bf0a4ba1103e1243c843013bd516d2d6e7ade09c46380bca3cee SHA512 d5bdcf94d3cf9a569e29964002a038ae73cd6ae7f09f7d973f8fd74858c8cf9d01bbed85ae8bf0a00efcb2b3611357a64571222a89972091941449c36d76b0ef
-EBUILD lv2-1.18.0.ebuild 1364 BLAKE2B 257076159121287c575f5366b5473df431f941366ccefa8057127c903a4b4b299a932f4046ff54c0f2eed92330a45831d04288a800a8454857f96758cfa2ecf8 SHA512 dbcaa0e94b0b8533ed5efc73c37139262ce46c5bec88427fbe4fe5b7155a5cbeb7a7f0561fb188b7c8a12c4d39f57190acf6c9122e767c4d6dcd5bfa6c84ac10
-EBUILD lv2-1.18.2.ebuild 1367 BLAKE2B 6f376d337de517f0c248c2d6e3e6775d82f47e03553ab85881c8fc1ef5e5f18bb42da4087f7b29b28fe1c647746506c6cbebb8f5d0546ad5406c0d8b6624752c SHA512 dc6601f199936c87f1f3e2fa29491d2e1d659e7670fe597855de54c54d2f89cf4c8649b094a82c5077036ba14163094570506382bdf8509c68bf45c1dae24770
+EBUILD lv2-1.18.2.ebuild 1364 BLAKE2B 883cb424f35f350d20353917654aa72789f177a2af186a8cc0b2c2db126a79ecca24f1696fa63ddc3fea7c13ec850e4e56aa6dba6033372f024d94df5161a0a2 SHA512 f8a0f05fa0781ca71b814989cf8405b99ac446dd7249cd2f7486415d93d5e5b74a5be6222afd57151b3e1c8c7378fbf697657bb53bcbdec16b576fca5b23f1bb
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.18.0.ebuild b/media-libs/lv2/lv2-1.18.0.ebuild
deleted file mode 100644
index 8f6e3688728a..000000000000
--- a/media-libs/lv2/lv2-1.18.0.ebuild
+++ /dev/null
@@ -1,62 +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 multilib-build multilib-minimal
-
-DESCRIPTION="A simple but extensible successor of LADSPA"
-HOMEPAGE="https://lv2plug.in/"
-SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="doc plugins"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	plugins? ( virtual/pkgconfig )
-	doc? ( app-doc/doxygen dev-python/rdflib )
-"
-CDEPEND="
-	${PYTHON_DEPS}
-	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
-"
-DEPEND="
-	${CDEPEND}
-	doc? ( dev-python/markdown )
-"
-RDEPEND="
-	${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-		dev-python/rdflib[${PYTHON_MULTI_USEDEP}]
-	')
-"
-DOCS=( "README.md" "NEWS" )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
-		$(use plugins || echo " --no-plugins") \
-		$(multilib_native_usex doc --docs "")
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${D}"
-}
diff --git a/media-libs/lv2/lv2-1.18.2.ebuild b/media-libs/lv2/lv2-1.18.2.ebuild
index 834996898bdb..9ee27fda790e 100644
--- a/media-libs/lv2/lv2-1.18.2.ebuild
+++ b/media-libs/lv2/lv2-1.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 5de239418b3f..ae0aba9cb57e 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,7 +1,5 @@
-DIST openal-soft-1.20.1.tar.bz2 512971 BLAKE2B be0abb32698d5ea77e8667e1b00fb123673325b0361c711d6c232d96d1add6d5c9a3e2ba7a3d04afcad27fe4f18ae803f690b14c98d198b77c75f1865679081f SHA512 a8a03a2162b5d35e66adc079e81d7fa075b83a3ee1cec3412cb40f7789263ed8bd005beefb7ef995f464dfa43aac22ea0f547b752dfc7533ed9120a95fb92513
 DIST openal-soft-1.21.0.tar.bz2 525483 BLAKE2B 28d44cfddd93bf6637b476cdcc44c5f69a1a8036c17d63be2defdce47d038bf54c29c9248070a65e7c6f86497ed3b79fd5548832bd67a1ebb67ffc363e46de9b SHA512 12e7dca4040765e06658d2945e984af01f21c65b7d44f9daee3a55457c27bd050bf74665e91ebfefdac09739774ace3e7a4bfc02870778cd65268941314aeb3b
 DIST openal-soft-1.21.1.tar.bz2 524787 BLAKE2B ca052ee3ba18188a9b8342540b8a9ffa95a0c19c137f5e799fa69768d51ec30da55afa46bddf3d9b65e589b94423bc5b23f2090e07bb9fc2a34937f9c199ee89 SHA512 420eec18149a9b784daaabe8a2865de3b87d5550cf2e8e06569464d0b5ba6e51d904c18f1461af08676bf8c8b76ef270e860008d79545a5f85131299e89bffd4
-EBUILD openal-1.20.1.ebuild 2092 BLAKE2B e3d8a78ee57873a648aa998fae198327fc903717cea53a0fc4caba1ff407df3618049d8911898edad6b90c546242c32afb3e71858ab54443495d92e459dc7e14 SHA512 c900f925cb5895ce903541043890e2c8289b520c2ebbbd5727da01f166712e6b27ac74513d5322180db2bbe3a134b0c2ebd3d3aeb3206b680324f54a1ecce421
-EBUILD openal-1.21.0.ebuild 2094 BLAKE2B cb05c70385c7b4cbfd1a4a64e30471cf5f31aadb8a1144c870f65c99b23f13ace01cc7f4e3f61ff8ba7a70fbabae6d36e7a8b2db75681148365ccb34f9689ea2 SHA512 6af14cfb26780ca6ae0d516b73c7216f4ac656708485da17bd61afb8502399e7ca0f3ceb7baaf39b2e98cbf8b78e3f8b2ebbc0a370c8bac714092215cdd7eea5
+EBUILD openal-1.21.0.ebuild 2092 BLAKE2B ff9f3883ba0b67c509849715f445d056fb7dedee605a96e19524b3f3e7108285f5edd50fd7f2d8b938095c47b604c75c318980a828ef5f384ef1b2fa6e66b10c SHA512 b5b63a5963c0fcbd09c0596c2067f077373520d9d606a1be32481b4dc5731d5b41eae173065f94002102b77031b02ed792b8caf37db74e95cccbfec530d8ef95
 EBUILD openal-1.21.1-r1.ebuild 2464 BLAKE2B ad7eb12ae49bed75b6bce15b685782ca28512b93841e985fae51f225f95d102bab9512b9da5824a217626c1e92b35f215313be5962f29c2b63470e8f979167aa SHA512 3e1f15a76985ffb0dc42110ecfbe956fcacd2f72e067ab62f101304c8918d095078bda23c7584757ea55260b289eaf79b6bba9801810a97288bb64e9d2fe3300
 MISC metadata.xml 437 BLAKE2B 9f220770b5df968956b8e4deb86df9a6ddbd58494978992dfc2169f8066d8799f36d8e4df6f5870276af9f51f73fd485582c0d718e51cb39049697854b4fb94c SHA512 0e54e8d8677dc4a7a21bf4488a5db6345a394f9602de367e263d1ed4d309e54ca8c1e2406e635aa13ed9d2dff5557a2e0270b591fe07d8f4093796f5f57b5ff0
diff --git a/media-libs/openal/openal-1.20.1.ebuild b/media-libs/openal/openal-1.20.1.ebuild
deleted file mode 100644
index bd39df18ecf9..000000000000
--- a/media-libs/openal/openal-1.20.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-MY_P="${PN}-soft-${PV}"
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="https://www.openal-soft.org/"
-SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	cpu_flags_arm_neon
-"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
-			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
-			-DALSOFT_REQUIRE_JACK=$(usex jack)
-			-DALSOFT_REQUIRE_OSS=$(usex oss)
-			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
-			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
-			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
-			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
-			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
-			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
-			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
-			-DALSOFT_EXAMPLES=OFF
-		)
-
-		use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
-
-		cmake_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/openal/openal-1.21.0.ebuild b/media-libs/openal/openal-1.21.0.ebuild
index 715c546a8ece..27025fcebb02 100644
--- a/media-libs/openal/openal-1.21.0.ebuild
+++ b/media-libs/openal/openal-1.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index d7e05be922af..8ca9c781c188 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -12,7 +12,9 @@ AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 DIST openexr-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
 DIST openexr-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
+DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382
 EBUILD openexr-2.5.2-r1.ebuild 1673 BLAKE2B 6cb66a92a938e9e6878fa2550a9dba69afe2dd70853ca1fd1e0278c8dfdc774b4f164bb8c61b578210fe9183bb37fda5803e6b36c31d1a4f44f6492328a98bd5 SHA512 6731b8406a8b454366e96774003a1da4640fb6261c665d8327a4bbc83ab3fd8f59c1dc2b3d9ec3d3e148f4162de46c7a44ef034b073d55e3c472809ae570b18e
 EBUILD openexr-2.5.4.ebuild 1696 BLAKE2B 6090335e9c7eb793c43642efcf7ca9158ee6589c7752cf021d457c1b037cbd95d73f0755739822311a386e0c907e1d291710056de85b23b32bc56081194f817e SHA512 fb64443451b2ca0d8df6a31053ee3ee9a1ba70cd60855122ec5e0ca7059f388dd39eb51a4e1db75a4b12c53254d0e22db8ef563346c8351d608e237041ad0366
+EBUILD openexr-2.5.5.ebuild 1698 BLAKE2B a0e3e116800767c03b5eecb1afdd4bc543701edbd88d8a35a14c034fa0eb8bd9e3098d87e0674b2a9404553ebcb9a7fd3166600f88920fc91e0e895adcc0be19 SHA512 51bd2ed3daddc725f595209ff505421914a3bc312b727b6af19200f47fab209f03eda95269573e8a6d27bb29b657772ab920e4f819f88f0854c9c214459f575a
 MISC metadata.xml 674 BLAKE2B e6f57d2c1adb7d004da06cd8667031bcebbd1dbcc30dc4e8e7238fc6dc9a57dc5277c8b94e66510533933fe57610c5899e1e1ab82679c66c4c705a35052cc240 SHA512 027357eccaa8494c0a79b19f14a3e7356f08255d7c62b227701d98d770b3d58f0dea1bc71bb87989e453379bd9eba7ecc658ac7d02a44b6e983db7767864ac5e
diff --git a/media-libs/openexr/openexr-2.5.5.ebuild b/media-libs/openexr/openexr-2.5.5.ebuild
new file mode 100644
index 000000000000..888a4b92902a
--- /dev/null
+++ b/media-libs/openexr/openexr-2.5.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${P}/OpenEXR"
+
+DOCS=( PATENTS README.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
+
+	if use abi_x86_32 && use test; then
+		eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
+	fi
+
+	multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DINSTALL_OPENEXR_DOCS=$(usex doc)
+		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
+		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+		-DOPENEXR_BUILD_UTILS=$(usex utils)
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON
+		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		DOCS+=( doc/*.pdf )
+	fi
+	einstalldocs
+
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index e76662b945b9..06f681cf7831 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,12 +1,7 @@
 AUX opensubdiv-3.3.0-add-CUDA9-compatibility.patch 897 BLAKE2B 528eaabdbe1613e6fde30f3e0688c64d796c599a7c9efa49575b817de559938344326b8606f9c9ed013a97c46037a49805ee1d1c27fa9beb78b3d9153771e119 SHA512 0a4c20dff82f6500019f45ef88539a32fb7e5b885d48c7108f05d6c018890518cd735e20a020cf058d47cf68e19f74e14e8496c5facabfa90e9401478d315ffa
-AUX opensubdiv-3.3.0-fix-quotes.patch 432 BLAKE2B e2b80762392cfe6b9ddb714780adbfffed3eb05feb5072c4b1856164eb01896eb9298723aac4bc032e0aaba8ec55d84bb1dfa6664f1def32af2bd93b553c396b SHA512 89eca174bf991920f71fd278e61f04bb90d143491ec05575507013215c92bca18f0274b6084d61750a66f877d928f01f0e779d08dd3b2372d8119aecaa8b58a9
 AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
-AUX opensubdiv-3.3.3-install-tutorials-into-bin.patch 5952 BLAKE2B 02b44fb3ceb5b3cbffda13c91c518a6ab1c5e549085ca19680c068343ccb38f4ceeff8d98ef106c5b3b9c3db59e540ac31cf6e77023e3eadb8a319cf52a01ca9 SHA512 2c45710c2d0349f931d1a1a2d984bc1a83d99cee58a362d5a843b5540fb33cd33a21befd29fd541e8457a568a1939296095e0ee1494acea43b5e125a3c55cb91
 AUX opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch 1620 BLAKE2B 5c7e721f8754d50fdffb468009a2cc67c926ecb8abe3c0c2e5c60f15cac5f778222074f639b0040b98f405eb392f3d9c97358ed3302832fb32a1417d6bc36311 SHA512 b919c3c3f8c3190b683c5bc02cb523821200bbe951d65e2543d6f0f818ee1bcc4117c3140857becf032c54fd58aa4ee2f06b8f8cf550f72f3df9c5b21f483cb1
 AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 2239 BLAKE2B d35a7118b742244f045aa5c0e5e1ab42a8eea98cac377b9fb0efd8948e2b13d2be973aa17714a8554a97061a8de0769861947cf9c890bcf81acff593b3f34ae5 SHA512 2e86d3f73568c16c839d783574abfb765432b3bf9171b73da8eab9c86be4c736912b892879cb04d974046fb90c5fdf2e60669cc94d468d5aec51573c0ffdcaa6
-DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d SHA512 65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81
 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
-EBUILD opensubdiv-3.3.3-r1.ebuild 2353 BLAKE2B 4eccc2e751cbce369404a84cf63e4df2d34af2a4294d881318517b9720ec1907c9066596f8eab720753ad3113de2589ae20eedcaf1fe29439f3d6ce3f7e5f339 SHA512 c56ea6354772d7837b7649d43e2e221b76a0abbca1d5d2ef7aa0e422596d9e85d0faf9d61b1b75b5fd5bb42518793c0595bc2bd27f1fab3e618ac2ebc3a5f0b9
-EBUILD opensubdiv-3.3.3.ebuild 1598 BLAKE2B bdd3778c1189c2237ca5b2fbc4b68645c055654a877b125545fa2c528431ef0fcc73bff69118e3997289f7d5698043358c4aedea42fd6236bd4f2cef0629cade SHA512 643d0fc5dde3b521b3a4e794f836df3bf7f0a097626719858b86caa19ee05443961b16823ef3f72dc9e263326966fe07cec2532e4f0908c7ab4634a65e60a82f
 EBUILD opensubdiv-3.4.3.ebuild 2352 BLAKE2B 4f63d66a6e3f273fb78cccfde28f9f32d0cb77751ca8fb728450c3db8309c4bbe8326f849b339a13b24778db6939789d15c1a81669c3690a7ddfa961ded16c5b SHA512 ff3f3bcda330f307973e8ac2cf3e3e550d45b40ba141f59883083b6bbc9f3a07e3ffa74b40a709af710104dcfead3505d91acb15b2554504087d26de571f8316
 MISC metadata.xml 1005 BLAKE2B 8672aa4423818052199d3a4d3e594b1d838accbb5e332f9eeb075593c7a466f93698d171a543a6e39829028baaf62a1713d09682aefeb4a904ab41dde43ea4f0 SHA512 cd592ca220b954b57199944e41a9904bfe5efde067eb4d7640d008adc2dacfb02ebebb3783f5bbc99436f7213b2b9397b2e1d4408cb837462909070649aa093d
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch
deleted file mode 100644
index 2b5c71a37cb5..000000000000
--- a/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e02ce90c..6d4f5342 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,7 +48,7 @@ endif()
-     string(REGEX REPLACE "^v" "" OSD_SONAME ${OSD_SONAME})
- 
-     add_definitions(
--        -DOPENSUBDIV_VERSION_STRING="${OSD_SONAME}"
-+        -DOPENSUBDIV_VERSION_STRING=\\\"${OSD_SONAME}\\\"
-     )
- 
- #-------------------------------------------------------------------------------
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch
deleted file mode 100644
index ec63f47b4404..000000000000
--- a/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur a/tutorials/far/tutorial_0/CMakeLists.txt b/tutorials/far/tutorial_0/CMakeLists.txt
---- a/tutorials/far/tutorial_0/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/far/tutorial_0/CMakeLists.txt	2020-05-13 16:06:40.857855388 +1000
-@@ -33,5 +33,5 @@
-     $<TARGET_OBJECTS:far_obj>
- )
- 
--install(TARGETS far_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_1/CMakeLists.txt b/tutorials/far/tutorial_1/CMakeLists.txt
---- a/tutorials/far/tutorial_1/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/far/tutorial_1/CMakeLists.txt	2020-05-13 16:06:53.137874901 +1000
-@@ -33,5 +33,5 @@
-     $<TARGET_OBJECTS:far_obj>
- )
- 
--install(TARGETS far_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_2/CMakeLists.txt b/tutorials/far/tutorial_2/CMakeLists.txt
---- a/tutorials/far/tutorial_2/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/far/tutorial_2/CMakeLists.txt	2020-05-13 16:07:04.297892363 +1000
-@@ -33,5 +33,5 @@
-     $<TARGET_OBJECTS:far_obj>
- )
- 
--install(TARGETS far_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_3/CMakeLists.txt b/tutorials/far/tutorial_3/CMakeLists.txt
---- a/tutorials/far/tutorial_3/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/far/tutorial_3/CMakeLists.txt	2020-05-13 16:07:20.377917078 +1000
-@@ -33,5 +33,5 @@
-     $<TARGET_OBJECTS:far_obj>
- )
- 
--install(TARGETS far_tutorial_3 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_3 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_4/CMakeLists.txt b/tutorials/far/tutorial_4/CMakeLists.txt
---- a/tutorials/far/tutorial_4/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/far/tutorial_4/CMakeLists.txt	2020-05-13 16:07:36.727941691 +1000
-@@ -33,5 +33,5 @@
-     $<TARGET_OBJECTS:far_obj>
- )
- 
--install(TARGETS far_tutorial_4 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_4 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_5/CMakeLists.txt b/tutorials/far/tutorial_5/CMakeLists.txt
---- a/tutorials/far/tutorial_5/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/far/tutorial_5/CMakeLists.txt	2020-05-13 16:07:44.797953646 +1000
-@@ -33,5 +33,5 @@
-     $<TARGET_OBJECTS:far_obj>
- )
- 
--install(TARGETS far_tutorial_5 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_5 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_6/CMakeLists.txt b/tutorials/far/tutorial_6/CMakeLists.txt
---- a/tutorials/far/tutorial_6/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/far/tutorial_6/CMakeLists.txt	2020-05-13 16:07:53.847966914 +1000
-@@ -33,5 +33,5 @@
-     $<TARGET_OBJECTS:far_obj>
- )
- 
--install(TARGETS far_tutorial_6 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_6 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_7/CMakeLists.txt b/tutorials/far/tutorial_7/CMakeLists.txt
---- a/tutorials/far/tutorial_7/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/far/tutorial_7/CMakeLists.txt	2020-05-13 16:08:02.047978804 +1000
-@@ -33,5 +33,5 @@
-     $<TARGET_OBJECTS:far_obj>
- )
- 
--install(TARGETS far_tutorial_7 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_7 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_8/CMakeLists.txt b/tutorials/far/tutorial_8/CMakeLists.txt
---- a/tutorials/far/tutorial_8/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/far/tutorial_8/CMakeLists.txt	2020-05-13 16:08:16.287999162 +1000
-@@ -33,5 +33,5 @@
-     $<TARGET_OBJECTS:far_obj>
- )
- 
--install(TARGETS far_tutorial_8 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_8 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/hbr/tutorial_0/CMakeLists.txt b/tutorials/hbr/tutorial_0/CMakeLists.txt
---- a/tutorials/hbr/tutorial_0/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/hbr/tutorial_0/CMakeLists.txt	2020-05-13 16:08:37.278028518 +1000
-@@ -30,5 +30,5 @@
-     ${SOURCE_FILES}
- )
- 
--install(TARGETS hbr_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS hbr_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/hbr/tutorial_1/CMakeLists.txt b/tutorials/hbr/tutorial_1/CMakeLists.txt
---- a/tutorials/hbr/tutorial_1/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/hbr/tutorial_1/CMakeLists.txt	2020-05-13 16:08:45.028039168 +1000
-@@ -30,5 +30,5 @@
-     ${SOURCE_FILES}
- )
- 
--install(TARGETS hbr_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS hbr_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/hbr/tutorial_2/CMakeLists.txt b/tutorials/hbr/tutorial_2/CMakeLists.txt
---- a/tutorials/hbr/tutorial_2/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/hbr/tutorial_2/CMakeLists.txt	2020-05-13 16:08:54.138051562 +1000
-@@ -30,5 +30,5 @@
-     ${SOURCE_FILES}
- )
- 
--install(TARGETS hbr_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS hbr_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/osd/tutorial_0/CMakeLists.txt b/tutorials/osd/tutorial_0/CMakeLists.txt
---- a/tutorials/osd/tutorial_0/CMakeLists.txt	2020-05-13 16:06:02.537792402 +1000
-+++ b/tutorials/osd/tutorial_0/CMakeLists.txt	2020-05-13 16:09:10.748073802 +1000
-@@ -35,5 +35,5 @@
-     osd_static_cpu
- )
- 
--install(TARGETS osd_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS osd_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild
deleted file mode 100644
index 92f1b42c70ad..000000000000
--- a/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake python-utils-r1 toolchain-funcs
-
-MY_PV="$(ver_rs "1-3" '_')"
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-# Modfied Apache-2.0 license, where section 6 has been replaced.
-# See for example CMakeLists.txt for details.
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	media-libs/glew:=
-	media-libs/glfw:=
-	x11-libs/libXinerama
-	cuda? ( dev-util/nvidia-cuda-toolkit:* )
-	opencl? ( virtual/opencl )
-	ptex? ( media-libs/ptex )
-"
-DEPEND="
-	${RDEPEND}
-	tbb? ( dev-cpp/tbb )
-"
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/docutils
-	)
-	cuda? ( <sys-devel/gcc-9[cxx] )
-"
-
-S="${WORKDIR}/OpenSubdiv-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
-	"${FILESDIR}/${PN}-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch"
-	"${FILESDIR}/${P}-install-tutorials-into-bin.patch"
-)
-
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	if use cuda; then
-		[[ $(gcc-major-version) -gt 8 ]] && \
-		eerror "USE=cuda requires gcc < 9. Run gcc-config to switch your default compiler" && \
-		die "Need gcc version earlier than 9"
-	fi
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	# GLTESTS are disabled as portage is unable to open a display during test phase
-	local mycmakeargs=(
-		-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-		-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-		-DNO_CLEW=ON
-		-DNO_CUDA=$(usex !cuda)
-		-DNO_DOC=$(usex !doc)
-		-DNO_EXAMPLES=$(usex !examples)
-		-DNO_GLTESTS=ON
-		-DNO_OMP=$(usex !openmp)
-		-DNO_OPENCL=$(usex !opencl)
-		-DNO_PTEX=$(usex !ptex)
-		-DNO_REGRESSION=$(usex !test)
-		-DNO_TBB=$(usex !tbb)
-		-DNO_TESTS=$(usex !test)
-		-DNO_TUTORIALS=$(usex !tutorials)
-	)
-
-	# fails with building cuda kernels when using multiple jobs
-	export MAKEOPTS="-j1"
-	cmake_src_configure
-}
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
deleted file mode 100644
index cbbf0be097d8..000000000000
--- a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs eapi7-ver
-
-MY_PV="$(ver_rs "1-3" '_')"
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="cuda doc opencl openmp ptex tbb"
-
-RDEPEND="media-libs/glew:=
-	media-libs/glfw:=
-	cuda? ( dev-util/nvidia-cuda-toolkit:* )
-	opencl? ( virtual/opencl )
-	ptex? ( media-libs/ptex )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/docutils
-		app-doc/doxygen
-	)
-	tbb? ( dev-cpp/tbb )"
-
-S="${WORKDIR}/OpenSubdiv-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.0-fix-quotes.patch"
-	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_CLEW=1
-		-DNO_DOC=$(usex !doc)
-		-DNO_TBB=$(usex !tbb)
-		-DNO_PTEX=$(usex !ptex)
-		-DNO_OMP=$(usex !openmp)
-		-DNO_OPENCL=$(usex !opencl)
-		-DNO_CUDA=$(usex !cuda)
-		-DNO_REGRESSION=1 # They don't work with certain settings
-		-DNO_EXAMPLES=1 # Not needed.
-		-DNO_TUTORIALS=1 # They install illegally. Need to find a better solution.
-		-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-		-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/raspberrypi-userland-bin/Manifest b/media-libs/raspberrypi-userland-bin/Manifest
index 26183f780035..8e7d9d98f837 100644
--- a/media-libs/raspberrypi-userland-bin/Manifest
+++ b/media-libs/raspberrypi-userland-bin/Manifest
@@ -1,6 +1,4 @@
 AUX 04raspberrypi-userland-bin 21 BLAKE2B c494bde8627a6068bf924d722cbc7ccb48e4d49cf9b875f0420e621018b61d83fc27de0017586f21cb839414e4aa49118bf3e2ab90e049e47a7a9e15658d2f87 SHA512 15fc252a183d45f0d80cc27edc93c40a7b577abed3e2f664c8bf635178e73875245835e770b82fda0e983c7c5878975ffe3008a937fbb7656fc01860c2219854
-DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
 DIST raspberrypi-firmware-1.20201201.tar.gz 189332299 BLAKE2B b3ec91f07b4713d26c29be5412d018a220129eef7ddf7c5c09d85e645c2c5754a95f13be7e690ab40648a982e3974cc760aa5b33c76612da836227d38c4ee3a5 SHA512 a7f4591552718956bd7f2d0d377234277e2e6f18cc9714ea30fe13f26d5ae1164b982f39dcf72ae4a18663369ef06d0187d8182713763262371c13107aac4c65
-EBUILD raspberrypi-userland-bin-1.20201022.ebuild 863 BLAKE2B 93a8fb6979dc8916f73a103f2591382f541fef829f8cff70e11f3d0dc99ade47a2a2aa67dbc6a87dcfb16633ff0f8e7d7468d5c08ee10e9f2ac69b80841c8d12 SHA512 2731ce73606bd16a94903d4a44adc5f1f13f231c70e7616195e19403bd3eb8c6b8177a933772095bfa507d190f2f131b850062c10a91f90fe68a95fadbd67f67
-EBUILD raspberrypi-userland-bin-1.20201201.ebuild 864 BLAKE2B f0136b2b79a2bb8d2a5e189bba7b513f36c641e7f4ff65536b9d43c8191ad51f45d5aa46ad0b8f416fa53b4b9088bc1d267bfcae90e02f7fcdf1fc28bf252071 SHA512 01e962b667b3ab4516f75cdaf4e1f66c54b7b80204fd89af81fef5a35f73ed78122041cbdb569c926f627c97395f350d0113c15987f8b9a734d923b39e5cff11
+EBUILD raspberrypi-userland-bin-1.20201201.ebuild 863 BLAKE2B 7fb57c01334ee9c3bb4113d486f8908c7413869534a28679ea95f0efac71f68df6e007a81c59862c936fe9a4b159ed2a5a59dc11035d7379ddbc4e9282042038 SHA512 66d2074fbc5bf58d3b2ff0016c55ac3c19f84ae2ea87bd19bff5db38c4acffadc6746a8d57878bcd161ae688d66395a9a08c6bfab75d45d9130bcb9cccac102a
 MISC metadata.xml 389 BLAKE2B d3577d29c94a74d9cc3cbf749fe2cdc46e37ffc5aeed828e280e04fec248f71a1dcbea5aee4c1e178c9699771c88bbb03228aba956069be5f07818d21ea65a67 SHA512 83074595bc89f763ca63b370aeaf44ca973ddfe6cd411de09dc89bc90f986078a7e2af98354f5ed7442a2b526d41851e8312d6b70e131d13377a69daf32e4f54
diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild
deleted file mode 100644
index 840a9172aa63..000000000000
--- a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="raspberrypi-firmware-${PV}"
-DESCRIPTION="Raspberry Pi userspace tools and libraries"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/firmware-${PV}"
-
-LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-KEYWORDS="-* arm"
-IUSE="+hardfp examples"
-
-RDEPEND="!media-libs/raspberrypi-userland"
-DEPEND="${DEPEND}"
-RESTRICT="binchecks strip"
-
-src_install() {
-	cd $(usex hardfp hardfp/ "")opt/vc || die
-
-	insinto /opt/vc
-	doins -r include
-
-	into /opt
-	dobin bin/*
-
-	insopts -m 0755
-	insinto "/opt/vc/lib"
-	doins -r lib/*
-
-	doenvd "${FILESDIR}"/04${PN}
-
-	if use examples ; then
-		insopts -m 0644
-		docinto examples
-		dodoc -r src/hello_pi
-	fi
-}
diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild
index 9ce4a8fd7918..ca662960c5dc 100644
--- a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild
+++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/firmware-${PV}"
 
 LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
-KEYWORDS="-* ~arm"
+KEYWORDS="-* arm"
 IUSE="+hardfp examples"
 
 RDEPEND="!media-libs/raspberrypi-userland"
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 5d0a1c1e130d..a53519ec657d 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -8,7 +8,9 @@ AUX raspberrypi-userland-include.patch 1484 BLAKE2B 7563874b54b168bd4858ecb65112
 AUX raspberrypi-userland-libdir.patch 12348 BLAKE2B ed0dcc454b13589244204cf2cb26d9e38b75887c2d4d1ec4db02e7d4a206661f0ae4fc9d06467e353310a6b69f49a72a53b2882acab6a3959d57c7c0d34434b5 SHA512 213f04d859a0134143cf0e98650ed69096934c1600577d28bb24d62272f9da7ca12d0f3b59a19d3ff06a5fc67547f8e5a8684738b534bfa6e429722b320fee9f
 AUX raspberrypi-userland-libfdt-static.patch 724 BLAKE2B 1e2901c69d9bf855c1db9e7f5776041d9d83e9e3025a31ab54fa136bfd67dd944ed631017de33ef15a948324b1392711fb2535b65fea4e4d5a59177b866114ea SHA512 1841061596a98157d7ed25f358e5d63d78f7f808f777b909c271c0b4aa9b45c4dfa498d5623bc53466d9b81e5c064ae45423910d180816b7e39563cedb1809d8
 AUX raspberrypi-userland-pkgconf-arm64.patch 1453 BLAKE2B 42dae98ead22bf8c37adae584ca5b8230176f290202124cf61677b9d13deb627637f5eef230db4e4628524c2056096139a1a9311b9530d7cceaa246111f70780 SHA512 fa259fe0ea348dfe4b5718dfc27b4b18289abd10d7b160a29fd01c62b4ed95e518259adaeadb1b300e7957d2a824ce1748b9216cc7679be2aed105d6883ad042
+DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b
 DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9
+EBUILD raspberrypi-userland-0_pre20160424.ebuild 3283 BLAKE2B 5b1965844bdac077be5be7a705cdb5971530f33de8dbb26d53eb3e383c1db494380b26b9209349847d9f6daf2d5c05472c4d4cce115be87cd7e33942206cd640 SHA512 13243919f97559533a4ada9f2d822a9c4c5ee1776921929e5a4b076ee7b1dc02fec26232348d9f08ac841b9c85178ffa0fadba752f9b3b58f0a002eab5d82da4
 EBUILD raspberrypi-userland-0_pre20201022.ebuild 2163 BLAKE2B d0062c18d97543b8598cc7defc4d5d3a13237a62278e6d23a3bff8452ef472e12736fe6a4f6e5e4b2594b72c8c2c99577b13d1f5111ac8006cc09822259fc222 SHA512 2d6fc20602126da4d75acc44e80b7bfef20bb9b9cb4c099f68df9d3be094c70f07d0779569ddeb62351077598bca9347979860cbd606464dc04e95c8ab5f267c
 EBUILD raspberrypi-userland-9999.ebuild 2165 BLAKE2B 11958652dcfbab355a9bd8187a8736f4f8ba2e0b71cb594eabcb1cf61173cf18344541463d21c22778ae39b158e681bb860efb0f3eab4c6495c538dc3ae2f4f1 SHA512 6d50e25e52580d0dbc4932329eae3f63f465bfebe1209b4832e80dccb7bd3ecd87b59b9c776d8c3b32f805a3a712ad57a673a21b75501599a11ed92412e62f65
 MISC metadata.xml 351 BLAKE2B ba576d7f61b104574b6a6691584dd75e632a637ded0bce055a267822a86574e35a6d71f5bb3616939af1a964aa007cbe49fd5cf3b64939b387dc0d46d356fc82 SHA512 f0d9ddcb8e1e7df5ff767f33824c5f2b6ab5a9afc508e1d39864a046f2ffc05665011a1a08e2624dd41d6e1c150ed0d14ce888401cb5c52069eb4a8958d167e2
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
new file mode 100644
index 000000000000..8c43fe24aa99
--- /dev/null
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Raspberry Pi userspace tools and libraries"
+HOMEPAGE="https://github.com/raspberrypi/userland"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+else
+	GIT_COMMIT="dff5760"
+	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+	KEYWORDS="arm"
+	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
+fi
+
+RDEPEND="
+	!media-libs/raspberrypi-userland-bin
+	wayland? ( dev-libs/wayland )"
+
+DEPEND="
+	${RDEPEND}
+	wayland? ( virtual/pkgconfig )"
+
+IUSE="examples wayland"
+LICENSE="BSD"
+SLOT="0"
+
+# TODO:
+# * port vcfiled init script
+# * stuff is still installed to hardcoded /opt/vc location, investigate whether
+#   anything else depends on it being there
+# * live ebuild
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# init script for Debian, not useful on Gentoo
+	sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die
+
+	# wayland egl support
+	eapply "${FILESDIR}"/next-resource-handle.patch
+
+	cmake_src_prepare
+}
+
+src_install() {
+	cmake_src_install
+
+	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
+	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so
+
+	doenvd "${FILESDIR}"/04${PN}
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
+
+	# enable dynamic switching of the GL implementation
+	dodir /usr/lib/opengl
+	dosym ../../../opt/vc /usr/lib/opengl/${PN}
+
+	# tell eselect opengl that we do not have libGL
+	touch "${ED}"/opt/vc/.gles-only || die
+
+	insinto /opt/vc/lib/pkgconfig
+	doins "${FILESDIR}"/bcm_host.pc
+	doins "${FILESDIR}"/egl.pc
+	doins "${FILESDIR}"/glesv2.pc
+	if use wayland; then
+	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
+		sed -i -e 's/Version:  /Version: 9.0/' "${ED}/opt/vc/lib/pkgconfig/wayland-egl.pc" || die
+		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
+	fi
+
+	# some #include instructions are wrong so we need to fix them
+	einfo "Fixing #include \"vcos_platform_types.h\""
+	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file} || die
+	done
+
+	einfo "Fixing #include \"vcos_platform.h\""
+	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+		sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file} || die
+	done
+
+	einfo "Fixing #include \"vchost_config.h\""
+	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file} || die
+	done
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
+	fi
+
+	rm -rfv "${D}"/opt/vc/src || die
+}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 5fc6e737c219..516bee2aacd6 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -2,5 +2,5 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b3773557
 DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f SHA512 99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2
 DIST shaderc-2020.5_pre20201216.tar.gz 220278 BLAKE2B 9565873bd1d85c2800b26ba821da8044aecf7ef7268b4843570b18bfbe07e0c9891b4f67b3ef58d7ac0813a2ca306ec2af8ef8bacb15047903d2d9bd1b723b6f SHA512 6b133b83f300c09408efa61f56b299b5ee3900fb739f2ada37e0ee3b8af4bf50423f0f9ca9a637d845bb02eeb61347456ddae9d616b5e46d2e481994ca3d35f3
 EBUILD shaderc-2020.4_pre20201106.ebuild 2159 BLAKE2B 5a1ae3c49778a45be4c9e468618890ae370d7024e302e43337afa5d93a3e90ba72647d256c5242f07a15ca50b63b2cb0fc14e1b1f4b8a2b911bcc825d60b5a48 SHA512 68339ba7418738a0eefb1577f54268c7ce12c2dfc14f4fb3b47fc98257dc428c355cc7e5c4e0736fe1437756ccbd4005b9195066ffec9632395f59b648604664
-EBUILD shaderc-2020.5_pre20201216.ebuild 2153 BLAKE2B f6b8eb754b715c2fa7b92051145ffd834857f4aa5c90380d5889dc96f9ee1d42c95b05651f521f3cb0770801bd3addfe82fe50856ae3deaba3a78f8d2facf0c4 SHA512 077512d094ce32ad15b35734df87f62b5017efec51bf88d363ccfdbd97bfc2619b77e7a0d24c4a0e8ba9e2841515be4119513ccd52791fee1b5d076f8934bfcd
+EBUILD shaderc-2020.5_pre20201216.ebuild 2152 BLAKE2B e9779b48efd4dc8233ba298ca956e536a8ddb8fce6451b960b94209d750539c4bf25227b5466c8009a5edcfb7fe0cad78bc9fb33f35a6ea02dbf69e751c77c9b SHA512 190557755660bac2d52542e435fa0ebd50bf1b5971dba4cc84dc775835b60d53f945d84f58e64393ae8da57260bc83d684560bd5cdc7e0b2a3ecc5cd2a6d3745
 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 92aad0f298bc..aea9fc518e26 100644
--- a/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
+++ b/media-libs/shaderc/shaderc-2020.5_pre20201216.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/soxr/Manifest b/media-libs/soxr/Manifest
index c228e953bfe8..32cd739bc986 100644
--- a/media-libs/soxr/Manifest
+++ b/media-libs/soxr/Manifest
@@ -1,5 +1,5 @@
 AUX soxr-0.1.1-nodoc.patch 480 BLAKE2B e7e31df74004b58e584964eed26acb18717faa912fa5eae84d03a62f40d2260e039595c33518ff6fdcf2c5db7fe0bc7f73680bc64418e387ff30f2488d0ebae1 SHA512 6c585eacc6919bfe6f158f1ab45fe5dd0b3a0b3f534ff5d2f5e07e3e8e505a7c7da3bb16d2d4b6dc2f0a361190bd21639f74ae09abd3e0209b33ae2174726017
 AUX soxr-0.1.3-fix-pkgconfig.patch 595 BLAKE2B f35e4c8ca382db0d05b9c50c3a02c568befc1dbf671fb503c610f2b4fa05dd7361d6b8184aeb4be050d224bc534e87ae760130e1e3ce1c36e6042ff4208411fe SHA512 45206a00747d387e4bec62edf93e9fa19b04096240f567773070b7c87667713ca7bcfea2e2df665f128b6b4d4c53fdb87571bdf018e2066ff6e6acf39870b762
 DIST soxr-0.1.3-Source.tar.xz 94384 BLAKE2B 5b7078f71404b9ef83917dcabc0c99cf17fd625d3e033d1b934382a7b60e55e359931a6ab53f8adaf955c0d811d6cbf231cd6a226549560b3506a3867e845607 SHA512 f4883ed298d5650399283238aac3dbe78d605b988246bea51fa343d4a8ce5ce97c6e143f6c3f50a3ff81795d9c19e7a07217c586d4020f6ced102aceac46aaa8
-EBUILD soxr-0.1.3-r1.ebuild 1101 BLAKE2B 70e0e40518df05ecba1f7944cf7a4e86895d7337fe5588a6f6d147d1180920aad6c2243a639b0451257542ec46adec4dcf561edded8eaa5f8990f5e629de4a40 SHA512 0a639ab74144bcc412b68669597e2e6f7f81ea3b0ce2dfadf1cdb227d02871702ca276bc3a8fe432b777aadf5dd7ea48acccfad9d10a1c75efabcb4483c489cf
+EBUILD soxr-0.1.3-r1.ebuild 1085 BLAKE2B b5cbc79bfdccb25772b9c313049baa4511c38a59f2f7df71a12d6776e5980cded02fb2464fe8959a04648378abcd5a0be93d40ecb72b52766dda92faf29c9efb SHA512 0d5df4b3a503c2a78a7e707ac962440025c9aaaa98347c33629c91ca811855d2bce91b80bd129bf4a8be1e80c8918ae8661aedbc4739e5ec5d8a2a66eec33774
 MISC metadata.xml 337 BLAKE2B 9b011942361de08f2263ad43a16d18bc8940e539b045a4907ced6c93dce455450bd754bce933ad33591b001dab99c253c781b26ffc26f0972425f75837186f7b SHA512 7f028b48874ab0d30aadbf0370e3ef5b555785aa4e7ab1bd1755ec2cb5c33d3e99e83ed166d011a94773b3c50b0e5a5403b42ed6d9d0c51ff7f7f2ddf48d064e
diff --git a/media-libs/soxr/soxr-0.1.3-r1.ebuild b/media-libs/soxr/soxr-0.1.3-r1.ebuild
index afc642ea6234..e969cfb04de4 100644
--- a/media-libs/soxr/soxr-0.1.3-r1.ebuild
+++ b/media-libs/soxr/soxr-0.1.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 MY_P="${P}-Source"
@@ -14,18 +15,16 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="examples test"
-RESTRICT="!test? ( test )"
 
 # CMakeLists.txt builds examples if either test or examples USE flag is enabled.
 REQUIRED_USE="test? ( examples )"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-DOCS=( README TODO NEWS AUTHORS )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-0.1.1-nodoc.patch"
 	"${FILESDIR}/${P}-fix-pkgconfig.patch"
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 7e1bb16a80a2..76d7e9f76756 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,6 +1,9 @@
 AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6bd25e2f5152c14743fa49c6c44a14f93a961f08a4d53337efe0800d98126a8aa58627a330e19386283cc16d8f20c9637262 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37
 AUX taglib-1.11.1_p20181028-libdir.patch 721 BLAKE2B de84d157b6da665c6e2dee504bfd68409500fa00366d83adc67735bfb7962cdadcfa6e3ff838115521f66db12ae2d8ef9963981f452944b100e475653fb9064c SHA512 fa9082f58257a3250a54eba49dc1b0d6f25e59f2fa500a7d41571b7c5fa8b2e8e5a7d4426ee2046dbe556c3dd2cf1c271cb4e0e1e9b78b8733a84de9420974ab
 AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
+AUX taglib-1.12-cmake.patch 18074 BLAKE2B f4f9dedd614d7bb2f981f7e4e8dc0b257847e9627e1fdc24d85a615cac7d894402b6901e39297a5a9473d9b1eecb6bc0be6183950abc3196245c1c8921f930aa SHA512 2003f02a843c3982c7c50db77bbda9ca75c36f25a371df03cca5139bd78e2efd7b083672bb06c5f9b0d114253fdaf6adeb995304877ff84085d8d1b07ef2c779
 DIST taglib-1.11.1_p20190920.tar.gz 1290100 BLAKE2B 38f65450b5e7c33b14187ab461bfd18d77f93d1ecab5ccf0c898ca6e67fd05aebac09318d4e1cabf1fdbca38800332ef9d0d5d1317087e69672734d1dec1dfe2 SHA512 4f7ad2a0713d38e8885b10d08041abdfb6c669369edd16e8345d7d679c16c15f191ca378e6690e06347f29e0e9cadebcb95ba26dc583c1127c4531558df27173
+DIST taglib-1.12.tar.gz 1364231 BLAKE2B 414a61a302fbdd1af8dae70fcec96311023d3ef85a659b8dc598c8c73cf31142b4a254c843f4d415eff0fda84e62e18f1bb63921f1868400990f023aa01b1a41 SHA512 63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6
 EBUILD taglib-1.11.1_p20190920-r1.ebuild 1328 BLAKE2B 43e1d33fa7e6b77bfab239ccfb2ba01c46ee9feb9977839e8525ed465f7c3eb4d4f1fdb61c6885d7873b76fb7cb6057c5c68ee51a5079e5852dcf98c24f863c5 SHA512 477b4ed7c0665740e450c346e9b5bcf3be976181490ce443d10aed7bae1114984848342774a2f7a2c3cec1cad006ba89d7a361c2cf4d4e84eae6a68b5e25a982
+EBUILD taglib-1.12.ebuild 1308 BLAKE2B c976322a2b8442f6e17a75b72ab2940c64c54bb427777080b17d7314f2b856c5deb8aa4a0154fae06de2d6cee3e7c86dd2cc8ba90671f35a26ee7f13a297b4c0 SHA512 3760f6b71d648921a629c0999727d0313e2a04cc1972c125afba818737de4909bfee9820f5d7972874c27d00c10e65c6c8c7e6d52d3a48d2015763ed5db2e104
 MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/files/taglib-1.12-cmake.patch b/media-libs/taglib/files/taglib-1.12-cmake.patch
new file mode 100644
index 000000000000..185a1e23ed20
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.12-cmake.patch
@@ -0,0 +1,525 @@
+From 5d5315c5ddf2e3a6d92d6b5dba8a120b7c04f46a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Feb 2021 22:50:56 +0100
+Subject: [PATCH 1/7] Use CMake's CTest which includes BUILD_TESTING option
+
+BUILD_TESTING is default enabled, which is a good default anyway.
+Move the CppUnit check to the root CMakeLists.txt, simpler and clearer.
+BUILD_TESTS is obsolete.
+
+The need for BUILD_SHARED_LIBS=OFF for testing is not clear, it works on Linux.
+But I kept it in the instructions for now.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt        | 13 +++++++++----
+ ConfigureChecks.cmake | 10 ----------
+ INSTALL.md            |  6 +++---
+ 3 files changed, 12 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5fc91cc6..770fa046 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,8 @@ project(taglib)
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ 
++include(CTest)
++
+ if(DEFINED ENABLE_STATIC)
+   message(FATAL_ERROR "This option is no longer available, use BUILD_SHARED_LIBS instead")
+ endif()
+@@ -32,7 +34,6 @@ if(ENABLE_CCACHE)
+ endif()
+ 
+ option(VISIBILITY_HIDDEN "Build with -fvisibility=hidden" OFF)
+-option(BUILD_TESTS "Build the test suite" OFF)
+ option(BUILD_EXAMPLES "Build the examples" OFF)
+ option(BUILD_BINDINGS "Build the bindings" ON)
+ 
+@@ -147,9 +148,13 @@ if(BUILD_BINDINGS)
+   add_subdirectory(bindings)
+ endif()
+ 
+-if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
+-  enable_testing()
+-  add_subdirectory(tests)
++if(BUILD_TESTING)
++  find_package(CppUnit)
++  if(CppUnit_FOUND)
++    add_subdirectory(tests)
++  else()
++    message(WARNING "BUILD_TESTING requested, but CppUnit not found, skipping tests.")
++  endif()
+ endif()
+ 
+ if(BUILD_EXAMPLES)
+diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
+index bcdbfe20..2fe2f129 100644
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
+@@ -187,16 +187,6 @@ if(NOT ZLIB_SOURCE)
+   endif()
+ endif()
+ 
+-# Determine whether CppUnit is installed.
+-
+-if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
+-  find_package(CppUnit)
+-  if(NOT CppUnit_FOUND)
+-    message(STATUS "CppUnit not found, disabling tests.")
+-    set(BUILD_TESTS OFF)
+-  endif()
+-endif()
+-
+ # Detect WinRT mode
+ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ 	set(PLATFORM WINRT 1)
+diff --git a/INSTALL.md b/INSTALL.md
+index a398654e..19771aca 100644
+--- a/INSTALL.md
++++ b/INSTALL.md
+@@ -167,7 +167,7 @@ Unit Tests
+ 
+ If you want to run the test suite to make sure TagLib works properly on your
+ system, you need to have cppunit installed. To build the tests, include
+-the option `-DBUILD_TESTS=ON -DBUILD_SHARED_LIBS=OFF` when running cmake.
++the option `-DBUILD_TESTING=ON` when running cmake.
+ 
+ The test suite has a custom target in the build system, so you can run
+ the tests using make:
+@@ -183,7 +183,7 @@ Windows MinGW:
+   - `mingw32-make; mingw32-make install DESTDIR=/path/to/install/dir`
+ * Build TagLib with testing enabled:
+   - ```
+-    cmake -G "MinGW Makefiles" -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_SHARED_LIBS=OFF \
++    cmake -G "MinGW Makefiles" -DBUILD_TESTING=ON -DBUILD_EXAMPLES=ON -DBUILD_SHARED_LIBS=OFF \
+     -DCPPUNIT_INCLUDE_DIR=/path/to/cppunit/include \
+     -DCPPUNIT_LIBRARIES=/path/to/cppunit/lib/libcppunit.a \
+     -DCPPUNIT_INSTALLED_VERSION=1.15.1
+@@ -200,7 +200,7 @@ Windows MSVS:
+   - It may fail, but the needed libraries should be available in src\cppunit\DebugDll.
+ * Build TagLib with testing enabled:
+   - ```
+-    cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON
++    cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DBUILD_EXAMPLES=ON
+     -DBUILD_SHARED_LIBS=OFF -DENABLE_STATIC_RUNTIME=ON
+     -DCPPUNIT_INCLUDE_DIR=\path\to\cppunit\include
+     -DCPPUNIT_LIBRARIES=\path\to\cppunit\DebugDll\cppunitd_dll.lib
+-- 
+2.30.1
+
+
+From 2cb339f46cc5b544ad1c2bb5528fe39c07d9f56b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Feb 2021 23:11:38 +0100
+Subject: [PATCH 2/7] Move finding ZLIB to root CMakeLists.txt
+
+Small line decrease, but also easier to read what is happening.
+Now all dependencies can be read from the root CMakeLists.txt file.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt        | 22 +++++++++++++++-------
+ ConfigureChecks.cmake | 11 -----------
+ 2 files changed, 15 insertions(+), 18 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 770fa046..e537aeb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -101,8 +101,21 @@ math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}")
+ 
+ include(ConfigureChecks.cmake)
+ 
+-if(${ZLIB_FOUND})
+-  set(ZLIB_LIBRARIES_FLAGS -lz)
++# Determine whether zlib is installed.
++
++if(NOT ZLIB_SOURCE)
++  find_package(ZLIB)
++  if(ZLIB_FOUND)
++    set(HAVE_ZLIB 1)
++    set(ZLIB_LIBRARIES_FLAGS -lz)
++  else()
++    set(HAVE_ZLIB 0)
++  endif()
++endif()
++
++if(NOT HAVE_ZLIB AND ZLIB_SOURCE)
++  set(HAVE_ZLIB 1)
++  set(HAVE_ZLIB_SOURCE 1)
+ endif()
+ 
+ if(NOT WIN32)
+@@ -120,11 +133,6 @@ if(NOT BUILD_FRAMEWORK)
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
+ endif()
+ 
+-if(NOT HAVE_ZLIB AND ZLIB_SOURCE)
+-  set(HAVE_ZLIB 1)
+-  set(HAVE_ZLIB_SOURCE 1)
+-endif()
+-
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h")
+ 
+diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
+index 2fe2f129..7d2ff953 100644
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
+@@ -176,17 +176,6 @@ check_cxx_source_compiles("
+   }
+ " HAVE_ISO_STRDUP)
+ 
+-# Determine whether zlib is installed.
+-
+-if(NOT ZLIB_SOURCE)
+-  find_package(ZLIB)
+-  if(ZLIB_FOUND)
+-    set(HAVE_ZLIB 1)
+-  else()
+-    set(HAVE_ZLIB 0)
+-  endif()
+-endif()
+-
+ # Detect WinRT mode
+ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ 	set(PLATFORM WINRT 1)
+-- 
+2.30.1
+
+
+From 6d94166dc6d2f12d9b913d8b672af32cec211440 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Feb 2021 23:28:45 +0100
+Subject: [PATCH 3/7] Use GNUInstallDirs
+
+Well-established CMake standard for installation directories.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt               | 14 ++++----------
+ bindings/c/CMakeLists.txt    | 12 ++++++------
+ bindings/c/taglib_c.pc.cmake |  8 ++++----
+ taglib-config.cmake          |  4 ++--
+ taglib-config.cmd.cmake      |  4 ++--
+ taglib.pc.cmake              |  6 +++---
+ taglib/CMakeLists.txt        | 10 +++++-----
+ 7 files changed, 26 insertions(+), 32 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e537aeb3..fb047350 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,7 @@ project(taglib)
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ 
+ include(CTest)
++include(GNUInstallDirs)
+ 
+ if(DEFINED ENABLE_STATIC)
+   message(FATAL_ERROR "This option is no longer available, use BUILD_SHARED_LIBS instead")
+@@ -47,13 +48,6 @@ endif()
+ add_definitions(-DHAVE_CONFIG_H)
+ set(TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/")
+ 
+-## the following are directories where stuff will be installed to
+-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+-set(EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Base directory for executables and libraries")
+-set(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" CACHE PATH "The subdirectory to the binaries prefix (default prefix/bin)")
+-set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})")
+-set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The subdirectory to the header prefix")
+-
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+@@ -120,17 +114,17 @@ endif()
+ 
+ if(NOT WIN32)
+   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" @ONLY)
+-  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" DESTINATION "${BIN_INSTALL_DIR}")
++  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ endif()
+ 
+ if(WIN32)
+   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmd.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd")
+-  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd" DESTINATION "${BIN_INSTALL_DIR}")
++  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd" DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ endif()
+ 
+ if(NOT BUILD_FRAMEWORK)
+   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" @ONLY)
+-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
++  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ endif()
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
+index ebb1267f..15f4e440 100644
+--- a/bindings/c/CMakeLists.txt
++++ b/bindings/c/CMakeLists.txt
+@@ -58,18 +58,18 @@ set_target_properties(tag_c PROPERTIES
+   VERSION 0.0.0
+   SOVERSION 0
+   DEFINE_SYMBOL MAKE_TAGLIB_C_LIB
+-  INSTALL_NAME_DIR ${LIB_INSTALL_DIR}
++  INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
+ )
+ install(TARGETS tag_c
+ 	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
+-	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+-	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+-	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+-	PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
++	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/taglib
+ )
+ 
+ if(NOT BUILD_FRAMEWORK)
+ 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc)
+-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
++	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
+ 
+diff --git a/bindings/c/taglib_c.pc.cmake b/bindings/c/taglib_c.pc.cmake
+index 232f4f78..97f0b5a1 100644
+--- a/bindings/c/taglib_c.pc.cmake
++++ b/bindings/c/taglib_c.pc.cmake
+@@ -1,12 +1,12 @@
+ prefix=${CMAKE_INSTALL_PREFIX}
+ exec_prefix=${CMAKE_INSTALL_PREFIX}
+-libdir=${LIB_INSTALL_DIR}
+-includedir=${INCLUDE_INSTALL_DIR}
++libdir=${CMAKE_INSTALL_FULL_LIBDIR}
++includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}
+ 
+ 
+ Name: TagLib C Bindings
+ Description: Audio meta-data library (C bindings)
+ Requires: taglib
+ Version: ${TAGLIB_LIB_VERSION_STRING}
+-Libs: -L${LIB_INSTALL_DIR} -ltag_c
+-Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 
++Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -ltag_c
++Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}/taglib
+diff --git a/taglib-config.cmake b/taglib-config.cmake
+index d500fe60..9f251178 100644
+--- a/taglib-config.cmake
++++ b/taglib-config.cmake
+@@ -16,8 +16,8 @@ EOH
+ 
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_INSTALL_DIR@
+-includedir=@INCLUDE_INSTALL_DIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ flags=""
+ 
+diff --git a/taglib-config.cmd.cmake b/taglib-config.cmd.cmake
+index 1b807ec8..4e615c5e 100644
+--- a/taglib-config.cmd.cmake
++++ b/taglib-config.cmd.cmake
+@@ -27,8 +27,8 @@ goto theend
+   *       to allow for static, shared or debug builds.
+   * It would be preferable if the top level CMakeLists.txt provided the library name during config. ??
+ :doit
+-if /i "%1#" == "--libs#"    echo -L${LIB_INSTALL_DIR} -llibtag
+-if /i "%1#" == "--cflags#"  echo -I${INCLUDE_INSTALL_DIR} -I${INCLUDE_INSTALL_DIR}/taglib
++if /i "%1#" == "--libs#"    echo -L${CMAKE_INSTALL_FULL_LIBDIR} -llibtag
++if /i "%1#" == "--cflags#"  echo -I${CMAKE_INSTALL_FULL_INCLUDEDIR} -I${CMAKE_INSTALL_FULL_INCLUDEDIR}/taglib
+ if /i "%1#" == "--version#" echo ${TAGLIB_LIB_VERSION_STRING}
+ if /i "%1#" == "--prefix#"  echo ${CMAKE_INSTALL_PREFIX}
+ 
+diff --git a/taglib.pc.cmake b/taglib.pc.cmake
+index 71ee09af..4ddabe12 100644
+--- a/taglib.pc.cmake
++++ b/taglib.pc.cmake
+@@ -1,11 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_INSTALL_DIR@
+-includedir=@INCLUDE_INSTALL_DIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: TagLib
+ Description: Audio meta-data library
+-Requires: 
++Requires:
+ Version: @TAGLIB_LIB_VERSION_STRING@
+ Libs: -L${libdir} -ltag @ZLIB_LIBRARIES_FLAGS@
+ Cflags: -I${includedir} -I${includedir}/taglib
+diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
+index 563583ef..527c0073 100644
+--- a/taglib/CMakeLists.txt
++++ b/taglib/CMakeLists.txt
+@@ -344,7 +344,7 @@ endif()
+ set_target_properties(tag PROPERTIES
+   VERSION ${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH}
+   SOVERSION ${TAGLIB_SOVERSION_MAJOR}
+-  INSTALL_NAME_DIR ${LIB_INSTALL_DIR}
++  INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
+   DEFINE_SYMBOL MAKE_TAGLIB_LIB
+   LINK_INTERFACE_LIBRARIES ""
+   PUBLIC_HEADER "${tag_HDRS}"
+@@ -365,8 +365,8 @@ endif()
+ 
+ install(TARGETS tag
+   FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
+-  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+-  RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+-  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+-  PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/taglib
+ )
+-- 
+2.30.1
+
+
+From b23eb1f4208ca8a5806648bf1a442c55a06aeeae Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Feb 2021 23:31:00 +0100
+Subject: [PATCH 4/7] Use FeatureSummary for a nice CMake summary output
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fb047350..0370bd05 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,7 @@ project(taglib)
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ 
+ include(CTest)
++include(FeatureSummary)
+ include(GNUInstallDirs)
+ 
+ if(DEFINED ENABLE_STATIC)
+@@ -173,3 +174,5 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_C
+ if(NOT TARGET uninstall)
+   add_custom_target(uninstall COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+ endif()
++
++feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.30.1
+
+
+From bcdae81dee3ff7e044e862b31f92b4a281fa19d1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Feb 2021 23:44:11 +0100
+Subject: [PATCH 5/7] Just set CMAKE_MODULE_PATH instead of list(APPEND), drop
+ ENABLE_STATIC err
+
+ENABLE_STATIC error has been there since 2014, that is long enough.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0370bd05..f5b1c479 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,16 +2,12 @@ cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
+ 
+ project(taglib)
+ 
+-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
++set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ 
+ include(CTest)
+ include(FeatureSummary)
+ include(GNUInstallDirs)
+ 
+-if(DEFINED ENABLE_STATIC)
+-  message(FATAL_ERROR "This option is no longer available, use BUILD_SHARED_LIBS instead")
+-endif()
+-
+ option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
+ if(APPLE)
+   option(BUILD_FRAMEWORK "Build an OS X framework" OFF)
+-- 
+2.30.1
+
+
+From 5b94ac436b02ee9280de7fd705e7d02d77bd1a43 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Feb 2021 23:47:26 +0100
+Subject: [PATCH 6/7] Install examples after we selected to build them
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ examples/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index f991739d..2360ada0 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -38,3 +38,8 @@ target_link_libraries(framelist tag)
+ add_executable(strip-id3v1 strip-id3v1.cpp)
+ target_link_libraries(strip-id3v1 tag)
+ 
++install(TARGETS tagreader tagreader_c tagwriter framelist strip-id3v1
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++)
+-- 
+2.30.1
+
+
+From b8ee92c5b53df4259fae6499a7e1f9d1cb275a85 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 16 Feb 2021 00:19:05 +0100
+Subject: [PATCH 7/7] Install taglib.png icon into html folder structure
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt      | 2 +-
+ doc/api-header.html | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f5b1c479..759b23c9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -161,7 +161,7 @@ if(BUILD_EXAMPLES)
+ endif()
+ 
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
+-file(COPY doc/taglib.png DESTINATION doc)
++file(COPY doc/taglib.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/doc/html)
+ add_custom_target(docs doxygen)
+ 
+ # uninstall target
+diff --git a/doc/api-header.html b/doc/api-header.html
+index ab133c25..52617513 100644
+--- a/doc/api-header.html
++++ b/doc/api-header.html
+@@ -12,7 +12,7 @@
+       <table border="0" width="100%">
+           <tr>
+             <td width="1">
+-              <img src="../taglib.png">
++              <img src="taglib.png">
+             </td>
+             <td>
+               <div id="intro">
+-- 
+2.30.1
+
diff --git a/media-libs/taglib/taglib-1.12.ebuild b/media-libs/taglib/taglib-1.12.ebuild
new file mode 100644
index 000000000000..22ad368018c4
--- /dev/null
+++ b/media-libs/taglib/taglib-1.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Library for reading and editing audio meta data"
+HOMEPAGE="https://taglib.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+SLOT="0"
+IUSE="debug doc examples test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) # PR#996
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/taglib-config
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	if multilib_is_native_abi; then
+		use doc && cmake_build docs
+	fi
+}
+
+multilib_src_test() {
+	eninja check
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	if multilib_is_native_abi && use doc; then
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 14f00374ab70..c5764d0a2477 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-layers-1.2.154.tar.gz 2312569 BLAKE2B 01415b6bb1a2b3e89569ac1a5010be12f752d1a6cb8885aa8ba2d062e5742313f75c8cb51c078b2020afcecffbbf8139a8a97220beae556191427bbcbc7a21e7 SHA512 44cdf3c72d6933969959ee959121de8e32a225bb941d9d7f3b2785bbae26d56cfdb0efb072c11649c316b5cef00b44f2f2415071c39faa0fe00a9e7c66098b7f
 DIST vulkan-layers-1.2.162.tar.gz 2398927 BLAKE2B febfcc88584cb7d69ac2f2bd95a73921d2dc92524b05f17e7d2a9f99336416260da60eefc560d93ad788d9a185d4dd865881f5bc8faf0dae388bacca59a21b7a SHA512 85eba0e1d07cafad212ef611fb1aef3113b6609361476cda7176a49110fe62d257b815f7c622d6ba959872785242e2231c7245242e7794ff5e60325d10f3061b
 EBUILD vulkan-layers-1.2.154.ebuild 1498 BLAKE2B 915c22156cdcb9385f539484a18d1b9ce60b29e116642d6cb480c0e8ba07591ffb8ab14f34d7d4b7190328584cfe11efed0b8f0b51c9a4b09f57438581f40fa7 SHA512 75c07e0eb319bef4cdd7f718c733765f1e13ada5a76fc35c57c73766eeda24f7631ad517805fa4c116bd754c0e16802d4b78207759a24e19f7d63bbbbe45588e
-EBUILD vulkan-layers-1.2.162.ebuild 1488 BLAKE2B fa4699929b134307d7ca78e0c1ac939456886019d3e784d230ed77b19fd8a7dbcd7db02245c5e31d605d9617bc888c07cf7bb4e8a9e05342ad0c99d8a64043ca SHA512 51e92d38d7eedea207bd1329659c84b4541c3ab001efbb9448fda8fd3a4ffe0626bb0c17020b4d902d224b8fe074a2c11d44e0ee2b68e86c25e13858dbedcb5a
+EBUILD vulkan-layers-1.2.162.ebuild 1487 BLAKE2B 39f16295cadbfcd4921db6699ffad0acb9006b11fd6d2b73a4d00ea1bfb3d19586e172656610129af32e01125e8d3f8b0ac9d7434976dd09aa43e217f40da183 SHA512 4d4e14abebaebc304004c7256d4f81ee9522d2f46dfc4450d70f935d1d1ecf87b631d13eb7765be8c8a3570ff2ed6b384971939cd37d33fe698c9a54f0a92781
 EBUILD vulkan-layers-9999.ebuild 1498 BLAKE2B 1aae6c33c685e3992dad9456fc09a174c0e13a2cab4d9b34ff95636f52a539b7545ff450c0fa03b069eec903eae1e5732495608b936603b5f6797478c9335db8 SHA512 142d147fae940ec7215ddd610a80f417e1049e3eea565b15bb17336e23b061268b22497f1a5048a8a7a076d423950762aed5c65658d8aa04cf2f15f06ccbc50d
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
index 944323d60a27..63373bcbcb50 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 8839d3e1b1e6..474db2e11def 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,6 +2,6 @@ AUX vulkan-loader-1.2.162-Fix-pkgconfig.patch 1421 BLAKE2B 6271cbf4b9b91976a2e0e
 DIST vulkan-loader-1.2.154.tar.gz 1417349 BLAKE2B b134932b31325884639e94ef74f7b97c9111554ef904777df9b4e398d927e89bdf2394593ce8e4483e9fda1cd1f299df0841471ac11263580b04bc97786ac973 SHA512 003f16bff7eb24791e458b757d0fee5db9ab68d6e7b56eae623af0c4702c534cc19099c79d2ec2493cd3c30c796f1dff060bc3aaa4057b9215749de65566c157
 DIST vulkan-loader-1.2.162.tar.gz 1421710 BLAKE2B 94b739821c5a12a94a52d8f0a9d79c13055ef3b45b907d53b82325b7be13db52b77d01397534e939bed5629d7a405ff8a09f8da374274a066986b4126fae9863 SHA512 89a99f282b73ec59dde30e4c8c09056b40416185a14ff9b7f7bd496754840e5ac764e7624f1f9a0f11792e786b00f19c3c9e55ccbb22a3c501d8ea9e815d84f9
 EBUILD vulkan-loader-1.2.154.ebuild 1730 BLAKE2B 21d41b6e01f498c6d1b2da28fc037513bdbf8b9c377c0dd47c8ae1220a119584c47f8d88c14a0277034a10c64a4a5d2f43a2d448e9e7ad8993bff4c68598af31 SHA512 a3e4e650d272f24405960540ad651c8b3b5d064f1d45891e137cadb4883bd3670ceae1f82a543d19bf6f1d714838220d972f9fe03d1aefc9419b28ad54e30f65
-EBUILD vulkan-loader-1.2.162-r1.ebuild 1789 BLAKE2B cd3f7c6cd562969195ade408960131de13c5ea3e506bb0cf8ca6ef6c8aef4d10ef00f5f614ce9e0436d64b064774420760d59c4afcf3c0d86f1634d2cc9f72a0 SHA512 99e814d3df672fc449368ab657680fb3c2ab887a729ab66031b4e6ec940cfb6fa3ad26687bad0761bc0cd4027dff5dd040d0ee1a2d6949de88f80f7a4068a906
+EBUILD vulkan-loader-1.2.162-r1.ebuild 1788 BLAKE2B e6b9dbcb8a6ff5cc1d4f1a445f7505a6dd4749eee774ad500eeeb8e4b966308b842e76ecf2e507c4144f9fa852a66f128ff954ecd4d1bb8917bfbf3b73547bfc SHA512 e2fe1e5a4322c8d7896a55551fe3b059cca82fefbe521846d9e8fdfca237876f6da7a9df1ffba1cef446fcac3a1f3e8adc106349eb0f584a5abb6f744a2f170c
 EBUILD vulkan-loader-9999.ebuild 1729 BLAKE2B e7bf2f7b33ba980cba5bc56e7fe30ad84e80801fe8171222944832f3c2af5afd6736fdc0baed62b77162d75fcbef03a69125febf93adba4af9ac3ea36317b8b2 SHA512 14a7d4da4c473d59203ebe1f8625a62a7aa8a8bf9dd3b55f89b22871fa0e9967c33ca449d768a81412d473cee5be4475c74d15058b989d6c06b15ba22246d061
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
index acb20e20edf6..ab38465a7c77 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest
index 05d58d8adbf7..51ee0392a17f 100644
--- a/media-libs/zita-resampler/Manifest
+++ b/media-libs/zita-resampler/Manifest
@@ -3,5 +3,5 @@ AUX zita-resampler-1.8.0-makefile.patch 3222 BLAKE2B d13a3e6b2beeb6eb4b440f68431
 DIST zita-resampler-1.6.2.tar.bz2 125539 BLAKE2B d2e04fb5e0efbde3432ce973df59a11d2a184146d124b662712a5de2d9c243f6564899f190f7a7b68a9e01bcaab05c92b91ebcbf942473134a12a85e4e08c603 SHA512 d547419dd222c8a399d8f196efa1ec88a3f781275b696ae2fe1bb6e2fc329285affb8aace85972c304ad256becc4a155534dd5ef4ce3c57cbc9dcca0122b670c
 DIST zita-resampler-1.8.0.tar.bz2 131161 BLAKE2B 1ba5d255fff9c66e18e6177bc7e48a4710fdf54f58c07f162f8c8801f4f449b22dea9922645e7e33b70e07739c2b381176714e704f9840305f194f3c23d66de2 SHA512 adf1f465ac09104be5a02c1cf0f052a44b4c1a448312f3aca016a889e98cfcdebfded38f60300ad85d18ae03eadca7e8e95efb2875267bc36435ccfac881a8e7
 EBUILD zita-resampler-1.6.2.ebuild 899 BLAKE2B ab844529d67e9284f42fbd8a7e7a6ba536188ace3e778c370e30c39d46fd8de400869d6093cfbc6cb461008667a7cd9f253ab4e4634adaaa6d3326631f9e99f1 SHA512 deaf05a05be70b4d72f07495a64a880cab200d259315314736c192528efe6a502918cd074f7750dc48344b468907ea4727d10faad3d1f761f36149762f8cb091
-EBUILD zita-resampler-1.8.0.ebuild 1008 BLAKE2B 7e7ece6fd29e22f16d3099cb2fc49ec5f72647aed596aeb62add7f9901ff5b04a120ce6a805b37129d7cdde8535c92e6d88e2fcab0f33ee8e96cac36571efb8a SHA512 a50cbe37238c4959e0286c271adb0c8322091ffdc9f4ea28270c6d38fcf1e7dfe02d44ed0089097900b679f3146a10c505f8c754a4918b3727d9c3a0ed495d8c
+EBUILD zita-resampler-1.8.0.ebuild 1005 BLAKE2B d60c6d6b1edfd161b241440b27db610c6750e77debe8e20a5b2dba8172b5144ad2fd51f7c848dea511542f2b2ed13f9ccaf93ffcda4118ddbf5dccf75c2492ad SHA512 e2c11ddf31cd41df94c986a88a05fcb843e121ce4773aa2f70b365ed8e676e4ea70d53f2b38be0c7430607b246e8c458104bb486efbce12dfec41c875dd3b29b
 MISC metadata.xml 692 BLAKE2B fad59853ee366f99db8e9c0dfa932c564eb0d8194808b809182ce64f286d39de2a363eb86f192d124adbbc92b1e7801a9fa5be0752fad1725f147d468484f589 SHA512 be926699e99357b49f5fe90a78c60b0fd701229fd603dca5988b40611ae5bb0c271a6a346469e0ebaff62bdc718c400954491ccc2557e5799a4fba08c67207cf
diff --git a/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild b/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
index 48b57888ad18..17d7f10a52c7 100644
--- a/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
+++ b/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
 IUSE="cpu_flags_x86_sse2 tools"
 
 RDEPEND="tools? ( media-libs/libsndfile )"
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
commit	463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree	9aa75eefc5154eaf0e3c33658b830fc54dc68052 /media-libs
parent	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)