gentoo resync : 25.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
commit: c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree: 620cbf137661399a3fb1eff92914204f9a970713 /media-libs
parent: cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)
136 files changed, 1852 insertions, 616 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4f0113d8e3d4..32db448cd636 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 943e9b2eecc1..2c217034bb33 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -3,7 +3,7 @@ AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
 DIST alsa-lib-1.2.5.1.tar.bz2 1069073 BLAKE2B 5464cc7f263bdf7b10aa7e1f542ad6dbc55bf300156fd1bded00375c41a518d4b14f96e28eb1c60a6ce7cc6e27da4b2e8598cd867f15417f260fc23513f93e11 SHA512 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
 DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
-EBUILD alsa-lib-1.2.4.ebuild 2184 BLAKE2B ec54b9d6096709fffee836715f2eda6539091ee7dca58a9b131fff6301c54e5069204569082f1ef8d99f5c832eed7e216233e7add1bf8050cb029431940f3018 SHA512 9267b26b819bc407c21986c60086d0503b108395c1ef238302956ea7a55fdd41ec72963e4fb30617f79a9981e3232be51517913fe0158bf91027b551d6cdcc4c
+EBUILD alsa-lib-1.2.4.ebuild 2183 BLAKE2B 0ae13b0987dc0f55b08b2cc7e6bf565acc782469e7502512b4bafc6cd7ebf80ce54dbbd492cd3d11e8bac04f00d3df50777f92504bf482a8bd03086162d58459 SHA512 68e17a8e334f955cc403386f0e430d07ea9c116c21450fbdf4d071e68e260bfe6189ae612fa4b5efd88d4562885ab84824faa210d5736b7879e36e0dcb9de979
 EBUILD alsa-lib-1.2.5.1.ebuild 2505 BLAKE2B efc2a4c86f03f45019d8dc127f9ce84765718cf12d6948865600db6f5a17bbb07eaaaee4f8e1f814754b8278984c2bff12274124d1817a892e6844435dc86078 SHA512 6c7d07cdbfc6313c21afe7e95e6c34256bf5d9e6bb1a41074d8a24394f57b8def194d396a720105a401bddc60926675d4ef37026d6211926cee32c06ace7d2f1
 EBUILD alsa-lib-1.2.5_p20210604.ebuild 2977 BLAKE2B e0434a80ecf3694f1d5d483f55e6983db087e804027f2896cd98ca1f11f429f4cf29c6caa80ac1f937f6c26e86e23a13acc2dac48b4103935d077adb19c8288c SHA512 349716f1956ad1a37de3283347d83808232fe7bdd2dcdf13a6105c5d5901a4d54ef298684d4efada4b7c90cb7ca707b8e3c7c6466add7fc59716ae17390752a7
 MISC metadata.xml 503 BLAKE2B 89b5c41a55784ff388766f60c106e719edd59a3bd47a1f2c240ad185ce750b1dc1a2efec704361b09c5e6e30d965514955f32fffa304200db7ff031a27d7fd85 SHA512 43f3a7e18f13ac58b4cbf31a92bd809c0618be1dd34a6a47d03e00ededd66343c3082bddac98cc286683ba32436b62aa2d61102de832f5fb21925ecfb2b54755
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 4932c2e1dc7b..dcdaabb33203 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index f4ff433c45a8..0eae62eb33a8 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,7 +1,7 @@
 DIST alsa-topology-conf-1.2.4.tar.bz2 11631 BLAKE2B 57df107b255e598e2fb79b56dc34d84130a023050db42e7925082ce5efb7048658ed6a8cd1854d2d9e23e8a833dbe90d7aa11ca7c1874f39caf392b292147ab7 SHA512 e5b367a23f42ed2c2a83f3dd9df264b4e054f5ba7c4be98520418598f0b06a11627498a8a6ef943522b209951645f83bbbbfb32db7c9c8260aa5db08358970cb
 DIST alsa-topology-conf-1.2.5.1.tar.bz2 11697 BLAKE2B 1f8bb172510d86bd0530f2ba437dd1132401c0bd436085c07c61e5ef296a6da6a1c24fb8d585572186fc0073172c82d40948c5c39fd293a01762d49c9c393662 SHA512 b34176b213e1afcb61fee19b569d6422a7692b62cf08b0ef651f2fbb1eefe49f25ca6386d0bfcec7152d4b5ed3daa84edb900181d40169e777751ae033125374
 DIST alsa-topology-conf-1.2.5.tar.bz2 11657 BLAKE2B 0870aa5db05d7b82e5312ac5bd3c2d887f0cafc25a317cbc416ce0ac6982ce296620833c4459ccb357b4b014d300329fc3d0028d3ec2024495cc21f9cc122e1f SHA512 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51
-EBUILD alsa-topology-conf-1.2.4.ebuild 511 BLAKE2B 3f2b857f3e199c575363bdfe68c2041f56a7b0a9fe1a49ba03206d30470f3a44f1da9175a90877c2ff7098726a274e9549136c9e675857933494b72d41b607c9 SHA512 b3c0b066e83ff53c70183a74b65a4646784591c9d5c10ec72c2205be647b372acad38b0edfdf975de82c95b65e13072b6e8a1abcdd8bb92297fd84c3c9286bac
+EBUILD alsa-topology-conf-1.2.4.ebuild 510 BLAKE2B 0f2292e5e8932f6ef2fca2ab17a8d6548653d859d45ecf639b9d40ab74ba4c23a1fe86e4877448852378e16ce9b0c161de8b135e980014b53ce75259adabd9a9 SHA512 bbf4c4e5d11101f50bdf331f416657222cc290fe8af4d14a845ad60454f531beab9f1b0357705c9d6443f6d6d23f6e6e0367322019dd2f602ad837fd950baac2
 EBUILD alsa-topology-conf-1.2.5.1.ebuild 518 BLAKE2B f9e65fcddf4e222a88c2462241b04f41ceceb6545229a3ccc56d622e418de5004612e6c78b23c1dc5bcf18d5108ea788032a4e8a0781a7c8626c559368aec545 SHA512 7d90e1feda4ea1ac1cc8a385e492855a8e785363fc72ecdb5fadf8d5c274591d3a64ad4d9bb429c559ed68fda9069a86cc009693e09517d00030b83d161b739e
 EBUILD alsa-topology-conf-1.2.5.ebuild 569 BLAKE2B 031df6bdb91155682e5fcf7b7ccc0dc5280850b5db1d6e37a9abb9dd68c570b176a3479e11a782ced1c0d38758d720c11c18d42545b83b30c50b3318f43653f0 SHA512 e187ed4d6ce42d5be288cfd94d19915245063096ffc1ea36814f2403460292f1ece6ee2bec2e937dfc39a4eff8b30b34f0dad542cd5aa4739cfcf05454a52400
 MISC metadata.xml 330 BLAKE2B 483666d5c3505dbe28c41bb0484959a794c67e56b1581cd00ceb96cfc17a77e4f4426a528c225ad65d23b73e0bdd3a6609438d4686da64f0be9ea1fc600cab37 SHA512 198a3560c3e2458d2947ea934457ff7d04df9277146f3c6ccdc06ed0043950dad30200986c7dece3a5620c495365ef835bd38bf3608e0b3c69cb6b127ce5602c
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
index 6e3a2eaf2d62..299c1f7b34b7 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 817eb56c218d..27de63f4ff17 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -2,7 +2,7 @@ AUX alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
 DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
 DIST alsa-ucm-conf-1.2.5.1.tar.bz2 24124 BLAKE2B 317bcb8e866a68fe467047c67bd15fc88dc1e745e9bbe05f7b091ea1febdac6bd0fd512c2ce410970eb2593c0f8500c28c8405098de2bc56e1438e5b33b00d4a SHA512 774d6da1a0ee6fb1fcd764c1d4b3eb5812a35508cf27db71f6c82784f125eca207992da9081d25783fecb31e548d8b34124d4b3b3d506e33215b76ea48f71012
 DIST alsa-ucm-conf-1.2.5.tar.bz2 23992 BLAKE2B 8ecd5adee6c9f429ab2791dfd57b0f9b1d58272b04d2c6cd3ad9aba36b53b380cfe626cae1e5c40f703eb7f891fb53b0bf70a78f9e5d2d8ae6b2dfb30fd6f659 SHA512 f16e8f04018c65de5e24f2a3eb0b3edff26cbce78cc1820c42c46907c903913c571797b59e803ae36b8ec3136487d0a5aacd034e2a8df3e15ed998b7a70152b7
-EBUILD alsa-ucm-conf-1.2.4.ebuild 505 BLAKE2B 8877c4840182eb78b2359c503599aed365024c0954cc3d2dca5c0e21802010acb3f0c05f694404b3d4a281e76d2d15a4fa7d7906d9147e4fb7e6484e53bfde9e SHA512 f8ce73bcf18ac0237386fb9fc097ccba571d377a10ba588013660ce38389ce6355314d540ec2c4ef2b5b7032e1911619d79d481902aaf82a7436db77d565b3c9
+EBUILD alsa-ucm-conf-1.2.4.ebuild 504 BLAKE2B 84cbca14794d2060a35db13528fd65f694508771bce1c9e75bafe50e437472f2f3bd33365286526b9f3dc2c4ae70fa199fb08f8d37ef0f9fb2bb9d031763fff3 SHA512 1a3f3b2189b0a198720b84fe730386f285abd8b628ff52dc682813d55f375ee4e37cde4e164bc82738c4b15585e113ffcff29307f0dd057fc6bef2d6c4e09d5b
 EBUILD alsa-ucm-conf-1.2.5-r1.ebuild 673 BLAKE2B 1e2b6c7a59bb27e2a0c97a4fea11250a2d51c5c3ad927fb6ac9a1b7229ef892fb8aa1d023cd215387a7446db873ba88d1be37794a40f1692066683298784f164 SHA512 ee6e0d1ee59f3f83bcfe4c7b815c408753bef852a0370d42f01b1c0f5bf44c02cac46a4c53d30256df08e79db14d52e94dd92446ee61196384b8eb4bd7c775dc
 EBUILD alsa-ucm-conf-1.2.5.1.ebuild 512 BLAKE2B 963c281c3a8fb363cb579404b838616052e1ba221353d540ea62ce5bc0365f5de4f408d7c6b75a5cc9d56cff28fe63b4e7d0765815c4928bf320bc70fc20dbae SHA512 e991d220034b9b59486782f5da8e311bcf09ef4e66774ced814cdd0911ec3205067e968af63b02ca3abd44e01afae72461d74fde98a68adfaa359fb797317d8d
 MISC metadata.xml 325 BLAKE2B 02b18895e880cd1da866d0290d992a060c3a6fb797df776ea270be86b0c32e9c712536efb1ef91c0a69e78238cf5898ef1b737826cf7e9f9ac57cdd8dfba5162 SHA512 f444b018e6d93287bcbc7d886e0962ab3e0fb67b387fe4f0f31f2ba7cc6706d760a2e9db0f29318ca2211cb14cadf2ff4b8e0fa0bb72ff5e238c81996cbd29e2
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
index 555b0339b236..3434a596acd9 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/ampache_browser/Manifest b/media-libs/ampache_browser/Manifest
index 14f8d543a09c..3dd3273f8c7f 100644
--- a/media-libs/ampache_browser/Manifest
+++ b/media-libs/ampache_browser/Manifest
@@ -1,3 +1,3 @@
 DIST ampache_browser-1.0.3.tar.gz 73608 BLAKE2B 057143939fba168e55e450bf7a702eb9f0093432191de5103117b0bd661618704183d40bf468aea08368cab2f0a3eab63c7ca016a305793cf922d03f02380058 SHA512 3179aa78983b9f630ce33f0b6ae6db7581262f5d93f300e94325f8d868c1a7ac614892974ed95a0f45eeaf72c739e4a4a0ba6a2886f003912da74e846d81ea9c
-EBUILD ampache_browser-1.0.3.ebuild 607 BLAKE2B 1b22490b3989ea447cecf7d3e026f93e3ee8ead1f37441cfff1fd408caf5baeb9ef9357709fad3d11d8d4f29bf5e01e1880936422bcbf38fd19a5b1366c0ea96 SHA512 8c806aaa54a8e27171c9519e200e062f0b53dd39b27adab2268adfa10194fb62e59a774708b39208fb13644d0759a195ef7ae0eadb1a9ce23f576b8d74502c50
+EBUILD ampache_browser-1.0.3.ebuild 614 BLAKE2B 6ee8de40294482f5d8759565ba93d0f0d7c420d52e11479860e0683f1c968fe571131b95645762b8c047e90406c0211b452152078fc4d58cd17f013204c0a305 SHA512 2d0e0a2a198cecf02cd74e0618e505b4cd39ae9e7580914c28049d2cc1550c1ce3ef1cbfce615e42fffdbabac107ba882c1e06bf302acd11171efac82da1c2c4
 MISC metadata.xml 500 BLAKE2B 9fa6175e5bd94abd07d8ef2eb25bcb825bda7f4029ad7319f7838f4ac67ab9fd8cc5bfa3ee73f2e859927a647ce90131f91134315c5f82360e24ae3f996654eb SHA512 2c1a8e1ad4010812d6bf2a726b9810eae6796c1f90020f80301af4e39f8dd55ff6bbbb3f6bb02b8b9e3a4f1d758739ce7b5ba76a68dc5efdac1a02435427813a
diff --git a/media-libs/ampache_browser/ampache_browser-1.0.3.ebuild b/media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
index d60c2d49f48f..93aa27316072 100644
--- a/media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
+++ b/media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ampache-browser/ampache_browser/archive/v${PV}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="debug nls"
 
 RDEPEND="dev-qt/qtconcurrent:5
diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest
index 0ddca5b88436..9df7a50cb2b8 100644
--- a/media-libs/bio2jack/Manifest
+++ b/media-libs/bio2jack/Manifest
@@ -1,3 +1,3 @@
 DIST bio2jack-0.9.tar.gz 527385 BLAKE2B 9f977e8f03a9de272c0b440c256569382876a62875dfc3d1f896c80388bd219d195d5544ba1dd5fb6b2141e63368f4293c3cb5081e1d2d8d3cdceef29a54285d SHA512 8faf73b9aa81d48eddb624146c0144094e466f16cad89fad3670f927963a5944d78f0342aba0f29cece422e3f012faf3e1a0c459fd5cef279406f5bebe66e66a
-EBUILD bio2jack-0.9-r2.ebuild 1044 BLAKE2B 15e0119a17062a46f106a4008aa6d546041527bbf1f914ccaf076b3bc87099d1143eaf392b8df1d7babecbaa015d6624126b40f46f32c15c26e92986fffc35d3 SHA512 e9b141bcca5424555c42c88057222093dfd4e2abf800474f3076fecd0e6d74edc91f87d7b48ef4bd3bdcac973a510bd04a8277b54493ac7ac914c3d42a8428dd
+EBUILD bio2jack-0.9-r2.ebuild 1051 BLAKE2B c4474b5b7842b404fdccd4d7e0d80752130b2fafc37eb98794e513db0ceb0720f76019e9af22d0de64c3e9477fc583ef126d9586d3e6b7ead2079298544a6ba6 SHA512 fc6d216087243e94571922988ddaf4a75d1d7d25e42a24ef109e0da14f023f1dcbf4770491d79d086d13f421a632e7555bed38f7c0006b7e50234367a50fd6e6
 MISC metadata.xml 332 BLAKE2B dd142b9ced0a4e8c6f54c7eb6b2661bb1d20e4fe592ca297f4027acdc66cb96769165a1c4d5393d2b6971e85890366190b8a30b2623b52cc0ffa6a813ebdb03b SHA512 6ff4956429610be173b4db574e22f7372e15113d43bc0bb2c2d35ba2a59f3b6e6aee44855bebe88466c32342e949bf24db4fc6044b36989402114f175a84bea9
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index abd96bd163f8..77de2718000d 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bio2jack/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 BDEPEND="
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index ae18bfcca619..391783834c1e 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,5 +1,5 @@
 DIST codec2-0.9.2.tar.gz 12244006 BLAKE2B b7fdff34e41f93f237235db5cf1352e7165565ae13bc88cfe41bc6eb280e16f49c71f6b9947ced81612b0fa6b2630a9f2f75fe257ff09bae5eef1a0b6b39c95b SHA512 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c
 DIST codec2-1.0.0.tar.gz 15019266 BLAKE2B fa33a8c30a7472e5f5ab0aac070431579913248d9d27cbc82542b6d7071f7a9fee6bafe374300bf6e09d636b9ddaf85795aabf12cbfd3923efd0cac82f06b38c SHA512 bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3
 EBUILD codec2-0.9.2-r1.ebuild 706 BLAKE2B a218f37e38b20790cc280773b409675fb38bdbb242e1c5a7ed580428af548fc74af642a922994ad1e660b2aedbbe9bca856e67e7e30bbe540e70d83f3b560fc7 SHA512 5643f89600c13da66732d4ebae57cc6679b66c4d0b1ebc9551ed546d71c3efb9f33613df88ae6315283553c5eff4e010df5e7b13d53618a1eae353b73006905f
-EBUILD codec2-1.0.0.ebuild 719 BLAKE2B 4916b9c96aae9b647bb1035900de6c8b336fd7107d51b7d970d2b6d29cbb680962b80efc58bf6c5e4e723ae707ef5c1dc926f3305fc345441b061358c13693f8 SHA512 92d7dbcbe6632f5b64209b5aa208df6cebf5e0d2cd17dbb40e531bfaa404605fdd91a956ac3d2982f1401f385bd31b05c5709aff662260dbb3d03da05a29a336
+EBUILD codec2-1.0.0.ebuild 715 BLAKE2B 89ee2ccb98ff237e235c166f1a7a87fb72594dad57f83e3d546f5d7be560fae9ce01eb059bdef10050fedb14d19fdb38145ea99651869d2ede7e41dcc5dd0efe SHA512 4d6c31b654805cf26df5f0444f59fb2baa43d7f81ce54e35aca1f15c5ffb29248a083531b06738b4ca0a4ef2893493efe084df237b07ab297839218abb9b6702
 MISC metadata.xml 326 BLAKE2B a7fc8408d6f6b58ad9d7019e858c703fd65ba38072dfefa381a5d00b500fe5d0ba024c2a3ed2d37e8e11da71f53bbfbeb80ead070935b9e83929d75d3a7852af SHA512 73c8e213262ac05ced95080d9e97a1e2abfdb2ad9e436ededda82de01feea321c3d499c8c2e8b3725a81b434e9efc4b12b321d738ab966d104e3344f4e29206b
diff --git a/media-libs/codec2/codec2-1.0.0.ebuild b/media-libs/codec2/codec2-1.0.0.ebuild
index 43e5b77c8f43..b403037a4ae8 100644
--- a/media-libs/codec2/codec2-1.0.0.ebuild
+++ b/media-libs/codec2/codec2-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples test"
 # Not yet passing, but infrastructure added to run
 RESTRICT="test"
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index 5d0022615dc1..6222b3683853 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,3 +1,3 @@
 DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
-EBUILD embree-3.13.0-r1.ebuild 3651 BLAKE2B 65fa6bda49493f6eef10eb47ebbff48aa04a2d0215db0c3d3b804bf463100c3f5d8eaab8ae2f1ef5957ac503d97ea425d51530b0829d4e20be8efa978336b850 SHA512 9dcfcc5703680ca291495205dd66f911d4c708e5cbf665c08579a6afc63de43074bc092c1bcd5565ed3a1fdb02ad3089031824da4b735684eb44ee393c9baa4f
+EBUILD embree-3.13.0-r1.ebuild 3670 BLAKE2B 90b2c55b68f0b42abc0827a211c9c37770731a49f0a8468adac36f5494c897aa567a94938cc86bc4766e9c44e83ae6e1957ac835e97ba04342cf4b73c81bd069 SHA512 993ba6f8273258fca20486a55978c1321df2d28540fbe539d2c21675515b9cf6552e465b2c16d3874bd1bb5117f63512922dceb0ef0c3cd3bf7d26166a4f0e90
 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
diff --git a/media-libs/embree/embree-3.13.0-r1.ebuild b/media-libs/embree/embree-3.13.0-r1.ebuild
index f77d5a1eb87c..ad1b682ba099 100644
--- a/media-libs/embree/embree-3.13.0-r1.ebuild
+++ b/media-libs/embree/embree-3.13.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
 CPU_FLAGS=( ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
 IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index 46fd71f64972..23c9ff38c153 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,4 +1,4 @@
 DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
 EBUILD glfw-3.3.4-r2.ebuild 920 BLAKE2B 1eea6a698f674045f0a5aceccb17a91970dcebb6df2b5a9c35a8296db0fb679764dfcaa84c5e5dca0cc34fa4762f318628770204e25c7a3a9741c719edc80462 SHA512 6eaf04bc7d9cd04725a78984f425fe35de49527ece075cf8ac9336b5a7b05c1f1643f7f1fcaf938e7697aa25b8aab39b9c6c3bc35aac242e820be189f0eaaf30
-EBUILD glfw-3.3.4-r3.ebuild 1274 BLAKE2B 9913c1bb47a27d7184740d7815e2aaac4548d95e354f11456d7348971c04b54c4ae617c1e77fc14b8ef95257ded33aea9b22ea07cd2b7735054c68098dd36e94 SHA512 632d68dc987ae90322f1bb13a7d5eb5e9611d3712e3e74947448a7eff5f17729765611a853e560256ad848683469e1a34ec5d9c0747d92d757cb7d554e2b0b0e
+EBUILD glfw-3.3.4-r3.ebuild 1272 BLAKE2B 690a73e355b3e4926e54285a63f81a22a48055acc3577857e9fc42cc90b0a4fdf5e56d647d4636e6034790bdce60b840f758c08f58169bc6da62d2b86f8f29a5 SHA512 241f3431d4bc380c192811005ce67c53ef5120cd99aa07024238d4f2629f56084469f1b814302f72c19061585adac03801d1af30406471ad094b282d29038452
 MISC metadata.xml 486 BLAKE2B d62ee825d2d51b6090cd5de87ffcde75a6dea4e109f144ed1a8305e1fad19b578549118dc3f803069289341f6fb4b95772d34e7a5cd2faff8f84d99b29165c83 SHA512 e1225c91492f76382b91acf579c9fce1be411638ce82186b729bea4a9cb18eb73b6c97d4d6e84b42877faae97c8628cb61176e1fc32589a0f419146aca268d9a
diff --git a/media-libs/glfw/glfw-3.3.4-r3.ebuild b/media-libs/glfw/glfw-3.3.4-r3.ebuild
index 499e6061c4fe..73e3566ec70b 100644
--- a/media-libs/glfw/glfw-3.3.4-r3.ebuild
+++ b/media-libs/glfw/glfw-3.3.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 IUSE="wayland-only"
 
 # note: libglfw uses dlopen() for most of these at runtime
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index f34e59694bbc..6313cd3b12a7 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,20 +1,10 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d739e1a06df138fe7f3ff5fd5b4c788f9115f9284a8967b02832ab71ed0f19a4d202e81b865e65ea0c7aa2225a818c366ed465 SHA512 7d4d82aa320ca1aa8f281162e39cc5f9f2e50cb70d2a8df572dd544a8a1b60ed52c903131ee41dd8454f2d1836a8d0a2bf82257f8648d419e0b550c6fe5795bf
-DIST intel-gmmlib-20.2.2.tar.gz 728309 BLAKE2B 1c26661c5317d66797ca8a72fe910ae73a97c7bc3b5730b6c270daa3eac753287cd83334085c90ce081ff4a8a4d1f79b46e832059b08c36602c5c39f3b3a1af5 SHA512 ebd23658aec78ebdf7cd13577f5ca408e2995c4df6135c951d3bea4a59a84461690d71f6e7ebc2014daa5508e07d32ff20c25019d90255150e7c93e241d403fc
-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
-DIST intel-gmmlib-21.1.1.tar.gz 737024 BLAKE2B d8a3b3bf1abe7faf7821ca120ebc40e0407dd8edf074ec8a8c05063c3ea48c0b4b33694210562aa4e6bd32fae30f45fcd23b04bb961535ffb10684ff180a9e2d SHA512 06becc986eb04c5243389686121bcc597ab16620fcb47943de14f901938dd906ad884b132da0e46ff939e7e599899d4262006efe19d14b3ed87b6f799ca40787
-DIST intel-gmmlib-21.1.3.tar.gz 745864 BLAKE2B 57a7d869d98ae28f942e90f54d46047bfda5e33912e6077c4499c4b81865ea3ec473e60fc1da2096c716f0904d0dfc298e8d6f603476ead29366dadab5ab797d SHA512 eccde1dcfd5e2c45ccd65463e092d6d7625c572705db12c4b3b6c6c01b45b81da8751a206a8fcf35acc26000ed1edca72d4bb9ed48e354aad2d79bc68293e555
 DIST intel-gmmlib-21.2.1.tar.gz 746883 BLAKE2B 9ffd3319bca42558e139f81ab60e5db5328d155b591c08b763c2b02f2728c04c6f96b79547ff3a1e6b8b8cb940cdd01b33ee04f946ac6fa9eefda5439cc49414 SHA512 457d2815204c8e12292fbe6e642a7409df4b3de597972e3c956d5dfae23b5032fc07cf60c0a10bd58aa6dc62a89225a5b704c98689112d23b81f91c1129bcb97
 DIST intel-gmmlib-21.2.2.tar.gz 746635 BLAKE2B abc73cfa209b8212bfe185e1f27a84cefb7ece9134f287e85e67c09bfd4f48e097e410a95d966d2f85c79bc95f753b6ae462a67db031dcd1fc6f46bec9452e22 SHA512 eaca3595c28afb8873b172fff3e178489b7ff736e6e9d80e75939ffd94af6c9c5f7f7429a74e98c9af478ab218cd25242d7c69037afb7193a983f8f02616e81f
-EBUILD gmmlib-20.2.2.ebuild 849 BLAKE2B 2cdd2eecc70572bdc19867c91a00c3ee07053877f23b31620fb8e1b8f9036f4b23487e88fa025adf96dd90b121902be81385abb290166df3936ccc21ab8b86e7 SHA512 5b40d4a632ffd9f0e16195e58701b0e5485aeb7e6ae34443295313722522f76f8000b6a0fbc7b6cba4ee8e6c6abb0c6967e9495b0510b7b1a40554eca4d2db02
-EBUILD gmmlib-20.2.5.ebuild 850 BLAKE2B 6ed565043380da387123c75f902c44ee33f82b2b3514768da9c0428dc4cfff894c41603e05b0e7a55d3f5afb5321609808251b1959a130c084415933abc3a84d SHA512 949074be31cf55106b9fb02b0b78ca62b31e47f3d0520b6447b16618f6a686510c385899cac61d886047ccdb5741e7d87ff7d935845251d7b8e5054a5eba4409
-EBUILD gmmlib-20.3.2.ebuild 850 BLAKE2B 6ed565043380da387123c75f902c44ee33f82b2b3514768da9c0428dc4cfff894c41603e05b0e7a55d3f5afb5321609808251b1959a130c084415933abc3a84d SHA512 949074be31cf55106b9fb02b0b78ca62b31e47f3d0520b6447b16618f6a686510c385899cac61d886047ccdb5741e7d87ff7d935845251d7b8e5054a5eba4409
-EBUILD gmmlib-20.4.1.ebuild 986 BLAKE2B 64a5e72660d7d7649fd9246dee574cf86305da9e2ac7ba29d2867588f8edb41fbb95a61379ed9fdd5f66fc55dc9f472215761de7b7100764e0b43fb548839feb SHA512 7bae5f3c22f2e85b4c373e4c08a6a40f1c6dce76e0969d811ff112f72442c6c27c05ef833ac43c56eeea0d59dda5a58e5511e6e2648171a7060822961548a592
-EBUILD gmmlib-21.1.1.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
-EBUILD gmmlib-21.1.3.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
-EBUILD gmmlib-21.2.1.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
+DIST intel-gmmlib-21.3.1.tar.gz 746732 BLAKE2B 537d446839136d6d048d15eb79e18214d797c68dd4288670448e4104e8d6d0701cb93366f77093f264f5392c0c37470b4fbdd0b0da43c9e319c2b334c3315bdf SHA512 54ae92bedadfe8cf7e39786f96bd29b5ace8bbafe8f32620034de8775c5e31fbbd99dd61b10e5fdf12c9f967196c11840e6a202cfb549e5f950f1743cb9b098b
+EBUILD gmmlib-21.2.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5
 EBUILD gmmlib-21.2.2.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
+EBUILD gmmlib-21.3.1.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
 EBUILD gmmlib-9999.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
 MISC metadata.xml 505 BLAKE2B 83d6dbe0db28839e3f78541cdeb4da1056a7674369b2a6d6956ec02d411eaaee11dc8baa41c5f3a58c863459ec3673539d16691b18875248cc5ccf97912c59e9 SHA512 552cfca4c3a312374f3873be3817deca55c6935903ca3fa6aa04c3d58ecdd07f346818c349192267bcaff4d0173125858fe490ce5ebb28c955832c47c2a46f3d
diff --git a/media-libs/gmmlib/gmmlib-20.2.2.ebuild b/media-libs/gmmlib/gmmlib-20.2.2.ebuild
deleted file mode 100644
index 0360af62aaac..000000000000
--- a/media-libs/gmmlib/gmmlib-20.2.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-20.2.5.ebuild b/media-libs/gmmlib/gmmlib-20.2.5.ebuild
deleted file mode 100644
index c2ccec30beac..000000000000
--- a/media-libs/gmmlib/gmmlib-20.2.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-20.3.2.ebuild b/media-libs/gmmlib/gmmlib-20.3.2.ebuild
deleted file mode 100644
index c2ccec30beac..000000000000
--- a/media-libs/gmmlib/gmmlib-20.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-20.4.1.ebuild b/media-libs/gmmlib/gmmlib-20.4.1.ebuild
deleted file mode 100644
index cd84eca98c8b..000000000000
--- a/media-libs/gmmlib/gmmlib-20.4.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test +custom-cflags"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TYPE=Release
-		-DBUILD_TESTING=$(usex test)
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-21.1.3.ebuild b/media-libs/gmmlib/gmmlib-21.1.3.ebuild
deleted file mode 100644
index 4e796e2186d3..000000000000
--- a/media-libs/gmmlib/gmmlib-21.1.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test +custom-cflags"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TYPE=Release
-		-DBUILD_TESTING=$(usex test)
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-21.2.1.ebuild b/media-libs/gmmlib/gmmlib-21.2.1.ebuild
index 4e796e2186d3..daef825f99e2 100644
--- a/media-libs/gmmlib/gmmlib-21.2.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-21.2.1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/gmmlib/gmmlib-21.1.1.ebuild b/media-libs/gmmlib/gmmlib-21.3.1.ebuild
index 4e796e2186d3..4e796e2186d3 100644
--- a/media-libs/gmmlib/gmmlib-21.1.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-21.3.1.ebuild
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index 18981c9d4080..ef2cbde291a4 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1,5 +1,5 @@
 DIST gsound-1.0.2.tar.xz 282068 BLAKE2B b85aa42c82c346b4541b38c971be46a35f0276d6cc34420cfc1a0e0ab0b4e25aa02829c17e8cb1d4258acc32d1d9c70a51dfac576046820f84e9ce9821c203ce SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0
 DIST gsound-1.0.3.tar.xz 22592 BLAKE2B 01c61e859aa6b726ba6f49a4791b22d769b495d589d6d8b1c15c92d217433e6dc9a1e17ee2741f451b3ef32b4252677b47d46e149635ad4a58a5b323639c4ecb SHA512 5d7c4f17154b840abb94b432c33ba950929ddc5aba8c2795b54834d6c6b0280d3d8846acebb1e4e02688045bfb44cfac7dbb96fef44af5a73a12a70f3ece84eb
 EBUILD gsound-1.0.2-r1.ebuild 864 BLAKE2B 45e478569ec31fb1db30dc9b159b7a3de4d38cadc0ab1258f4f746b8a1461f3ee158d635fabc1fa0df70611b9a005d9a9e7cc7b3cdba71ac0e0b6b218a85be5d SHA512 6150dba82397aee436c6277f490185ccfd12bf4c2648f590372b2906e9eab5559d5fd6b574523c55d29179b5de8346954ed2ff1ceeeb3d0c5fa6c1d28c199c75
-EBUILD gsound-1.0.3.ebuild 914 BLAKE2B 90ed143654907f2b9e717c9bb36ef4d218c372e7122bd34acc505a30a3d3261dc5ce6b8e032fa7a748bd2649cb47cff01886a5a65cd4468858ad8cc1edf1fd6c SHA512 784800dc953c091016ae40aeb43eb35895024345fda3497ad9bfcbb8f7fbc61e4faafa982a1b336a04fdb21c98624b2d8b2d30f8d84331fdf3d6467ecce0d374
+EBUILD gsound-1.0.3.ebuild 945 BLAKE2B a63b47f1bfaeeba51eae1976ddf3c249674af9905265f2df8c5aa09d5ec94b15551f8998e8c886f2215521e47c4c6e8874dfb853858856bb129ce1540d551fa8 SHA512 91a12905d4fcf20c2fa0a7e4ea13b56c9000338328e884d45be978efe8fa3e6076bb3f5623f5d8a8894246ac5644ef1879b52c44f6f97b2760b1b0e66774d8d4
 MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
diff --git a/media-libs/gsound/gsound-1.0.3.ebuild b/media-libs/gsound/gsound-1.0.3.ebuild
index 713f009ada32..4f9abaad4bf1 100644
--- a/media-libs/gsound/gsound-1.0.3.ebuild
+++ b/media-libs/gsound/gsound-1.0.3.ebuild
@@ -23,7 +23,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
 	vala? ( $(vala_depend) )
 "
 
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 1684dc6defe2..0dcea1358591 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,5 @@
-DIST hamlib-4.1.tar.gz 2260629 BLAKE2B e53249f476005f3ec8afcbba6d875d913cdc45eb741fdb8b8718c1c5bda9cf8d50087165b72055600bc9ff364117f7d72235a3d68a9fb0882a77a6fdbf366605 SHA512 a5fca5dc89a7408628bc77fe22c6d8c77474b3dabee7b2b6d0b280becb6cb63f5619e4a620ad11aeb81b8412145b0f8cb0291a2d4cd3751c643cb1709b2dfa78
 DIST hamlib-4.2.tar.gz 2311775 BLAKE2B 4fe8d3e6d489369aede1a4cd59f01be44a7787ca71c21c5b92d436666c67de68013f488834d0f57238e6a947c24cd5b4c6c667397dec30392f1cccd695df252e SHA512 08ccf4e592fbae938ae1aaa5afede7e2e6ec7d23b449a65b00e093502f4aeb36930624f055d9802349f77df9dd2b7b983aa44d83f8c62a6de5789e7df627f804
-EBUILD hamlib-4.1.ebuild 2057 BLAKE2B cfc7560c85e7c826ffe23a87393a1eafc96805d5a2c0efd40ac538869bf5b66fe9ede92f3317421e5f84e516bc1556c52d4584df264f1dbc050b58a2fc37e5e4 SHA512 8fc1a8b6ce0943fcb8f53b341e39fd927fe108001f59e89ff45dd036c1213697a3044becf1ecf0ae821e17f45d629e2b0f235a45e57567171a83646fa78e7853
+DIST hamlib-4.3.1.tar.gz 2356944 BLAKE2B c803d253c867303cbde98b6f2e10f610aac111b7bd81fd343e1396cb86384b1c26942e5ccb8e395e073f9aa3d48e6f9edc1b64da14b2ec5ca09f98fbd3dee667 SHA512 8dee4676a19de7ac1ef733a4285b76e918f11aad6594d0557d36df295faf04c615e0993edb2f9ed5e7aea718c184603fec831caf28b75026c705f0b2e4b9eca7
 EBUILD hamlib-4.2.ebuild 2059 BLAKE2B bf20a9cf50751f9c569838e4e8e23a9f88b5fe2c2b8768c7dca910b7bd9e6f65ea5f81dda22df0e4aaf2c4e8851b179a184594a6a88debb53f7e2c1a2945560f SHA512 3d6caa23d7cf43e9744eb88aaee4ec978331bb02dedee767ddcdce81a7f02419a34f2bec2ffd91dd0757e934af4903879ad3485b70784aace027340ceebd4002
+EBUILD hamlib-4.3.1.ebuild 2061 BLAKE2B bf8289dacf981e7cc9bddf15ea0bc2f1bb1629c1e7bd36ed115ca13526c8693361acb7ec8ce8a5c8b7398ca62aa11ccbd3160a4d4f274ca3a368795381f493ce SHA512 949301fdcecf60fc04f072629fa667030cb11cabcae83c428d330a7a677b2b755c57fe3df49349a48b7f64f21e789e08009dfa4a1bc2edec6f672b0e34ce8a81
 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
diff --git a/media-libs/hamlib/hamlib-4.1.ebuild b/media-libs/hamlib/hamlib-4.3.1.ebuild
index c8e30755a905..f7d9f12e8a35 100644
--- a/media-libs/hamlib/hamlib-4.1.ebuild
+++ b/media-libs/hamlib/hamlib-4.3.1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 MY_P=${P/_rc2/~rc2}
 
 inherit autotools python-single-r1
 
 DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="https://www.hamlib.org"
+HOMEPAGE="http://www.hamlib.org"
 SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
-SLOT="0/4"
-KEYWORDS="amd64 x86"
+SLOT="0/4.2"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 503627ad6d52..d80ebddd8727 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,10 +1,10 @@
 DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
 DIST harfbuzz-2.8.2.tar.gz 18506485 BLAKE2B 39a43d643339a5bc27d886e418695d2864ad7b9094dc508f5ccf52bf635b340adb7ec6958a15349e0b2580444ec98c5850e4022f708287fbe44cb7ea90065881 SHA512 51eee8c8fa6f839512e0dfc5c80ae8ed1e09d747d0ffc6736e5a1cbf86de956322f23e6ea25a90985e2317e98229a133e208da2a7b5177d65894cc64706ee8d4
-DIST harfbuzz-2.9.0.tar.gz 18794661 BLAKE2B f11f8e744e8d344b340006cc2f3a4f90e32ca62a7f6d737fa339b646ebfa95a92b4ce1bc558fb814ecc95f8b04135c2ae2824d2c31d76411f6e0c1223691c393 SHA512 6c9f32b91d261b3d3a3b5110300ecff750958f889d23b23e407817526efaad9dfd94c4979414f299f9d23a7313e24aaad0da48d02d374b873583d5419c420803
 DIST harfbuzz-2.9.1.tar.gz 19154048 BLAKE2B e6cdc3936606e3d9a4bacf385db13c54f328d5be6c20ab20f844650351dd34f8f2015954f4ac7a6e0b8a1258ed9a6e71f43871c768c892d87af5c399c4499c63 SHA512 f8bb1d75b498d1581e76c57e5a15999e2c0d745d7d73dad17bfc91daf000f96d17c4924e6fb31270c90c26693dd504a7e7b2add152a013acca2491a86256b07b
+DIST harfbuzz-3.0.0.tar.gz 20360786 BLAKE2B acc1e4d7d59908a23ae1015700cfbf1737cdb0b26ba811d752954356baffb2ab18c3d22b5964d200c4cc7e312a79655c3437aff9f5a85b72c472e324dc3257ba SHA512 69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5
 EBUILD harfbuzz-2.8.1.ebuild 2497 BLAKE2B 89bb2b0796c1a151efc58f43abb0c87df3829361be12e37d43652dae4c002efd29405c61e2e66350ac5ae8b75693f385ce4594d8e480d7a389a3311af4c41621 SHA512 8093198447adef9c164c8fb8d7f9a39a39bfd3ca43e2210a2d4edfe6e51716378c009f0aa5b64e5560f4f174021b8b525d9a3d2837aea53eba6059efd1cf336e
 EBUILD harfbuzz-2.8.2-r1.ebuild 2547 BLAKE2B 8c1cc61fda1ffbd7bb0c6bba79e7b0f2121b6a533a994536723f1ce6f58ed9cab2ef5c08f704a7cd66775e9f65e7f426fd3cb3c9ae8e01aeafc4ba8160ff2cd5 SHA512 7f6e6715df93de2ece043f2e651463241bb6095d5fc5e1e1b90a24647eafe94ffc845f0814ac52b59804e546140f8f3d929e1ea225e228cb1018c32cbe893ca4
-EBUILD harfbuzz-2.9.0.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
-EBUILD harfbuzz-2.9.1.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
+EBUILD harfbuzz-2.9.1.ebuild 2508 BLAKE2B 8a0cca52dd12e8048ef4080b9b283c3321a63681db85ee76a6d1bd478d9e92fde3a04f5d06016a21aa154ec5cd961a48ab0063719470b7339872a5f86fd35e33 SHA512 7556bd49fb22c181f72db9918bfe494a41978fae9ec5d5841bd582c4c9f4e3a48d325f6d5ae5fbddf5e530878b77a267ec8ea49d656b6e2be8c555848cac4d19
+EBUILD harfbuzz-3.0.0.ebuild 2513 BLAKE2B ed6f714333a7f48d93bdfb6bb1bdf0638bd40ac8b53817e4c147dddc82e97e02c6d5907fe7ff0171cb1e6a3f5bb1e0e32900319813aafb6a9a7c957ef053c593 SHA512 f4065a49bef78aaad3d2ddd76bd0ba5ad9b076d82c49f375dda1d1d2e2b5fa9c5e1b1c6467a836872d0e37b73f5997a15528d9c607d981e5a1964975922e26cf
 EBUILD harfbuzz-9999.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
index 6b8cea0dd156..d7c9f253d308 100644
--- a/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.9.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild
index 6b8cea0dd156..27e92e9b2b49 100644
--- a/media-libs/harfbuzz/harfbuzz-2.9.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index 8f4d2ccbe90d..10d796cb7363 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -7,5 +7,5 @@ AUX id3lib-3.8.3-test_io.patch 254 BLAKE2B 3b38a82fb990de47a8f65d46171ef8273b180
 AUX id3lib-3.8.3-unicode16.patch 1490 BLAKE2B 8e9c23cacc11fe87e846830c91946e16641a32baa9717647999fc32522d10e553480d9b5ac5e5e3f12fc4fa72e31667df1c90b734016d0c1adc88d74d0a1901e SHA512 270e498a0586d25ae7cee45dcd45d5d143b0ba5799be34ef10b1577d766a82239bb949c9463cb59d1bf3a92070063252680441cb0691829c963fb4b4520ff4ab
 AUX id3lib-3.8.3-zlib.patch 779 BLAKE2B e7379e6d3136ebc93ddc8b79ce52ba92a41d911b883a74bfdb58d0ac6f774483f821ef66b453fef96649e5e67dbb1afa9c871d104c0dd29a8e1bf11ae8caa853 SHA512 e9c29883731ef417602812d714a14e1b7547d89581ffe40d0d0400218b0491f38cf50b24ab6dd8bcfcc94c95af914c6d34b53429a2789d7c27f0cb7661474dae
 DIST id3lib-3.8.3.tar.gz 950726 BLAKE2B 37afb1292d598e8416251e18beb1d1b4402d11ebd971d3e9b151ae9e092884ec4b0b7f9c19bbd8296fbb7fe7320ced7ba1f733a367662d378d2d82b2b52b7bb2 SHA512 3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf
-EBUILD id3lib-3.8.3-r8.ebuild 1333 BLAKE2B fd0fce8596c54ab0feabae81d0317c8ba0f285359a1790029c8ad9596310484dc98911dcd7448911e41158c6c3749f92c5c88c35dc3ea5d61264e8eb1d8de7c1 SHA512 ab1179d19b285b5f329e3c9ebc4d6523f0f10d44de95116bc1a90cde78e1c8c67c0b6bb1bc91549433bc9b650eb6dc8c3b544ac9fb29f036a5137bc37f69948d
+EBUILD id3lib-3.8.3-r8.ebuild 1340 BLAKE2B 201f8dfc4cfcb23f8929b7ab743b10d70a0783bdd646734ca270a05044d83f126d8c09b117587f1ecb25e7411dc3b733cfa5264bf8fa6ca95ab5e925696d30ca SHA512 3fd91fcb01764e83de56d47773a270424f87421933014caaa2b2673d8ad6e65b80e1329e71bf6898800b45256c7d00ed077e7e40bd953849dcb06336e3f17d75
 MISC metadata.xml 340 BLAKE2B 044771ca278e771cff50aec79a2031b0af2aac34de8bd96b21c3598f9ce96bc4c269314e24e4644e8f4e7edc299cc7cce6b149d9ebbebbff6487cfe20b578c3a SHA512 fb2a9db289fcff5b18ccd2d2f7b2228774d560ae42e14339dce47f67148b94586de9e470d6e65fd5e4c91b4d606cde158dcf22e49fbf5eeca4f90e750ae8cad1
diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
index 0d9c789a12c8..bdd432daa774 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND="sys-libs/zlib:="
diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
index 27f9dbb3ee78..ebbf3d107adb 100644
--- a/media-libs/kcolorpicker/Manifest
+++ b/media-libs/kcolorpicker/Manifest
@@ -1,5 +1,5 @@
 DIST kColorPicker-0.1.5.tar.gz 12013 BLAKE2B b4141e45b44e05c4769d008014817327a560c8ad74996010a1d16d22b6503547ce2ba657eee01c3893bb9a72cecd8fc368afe8e503d2c582cb02f1ab4b371a12 SHA512 6792cb79fe96f00c073f3f4b84c2c0a713523c33ee9f29113a9ed4f4c5f8e5509fefa4127a28546b1b44f73e0df7be9364a1c04498c36efcb6c2764df25250a8
 DIST kColorPicker-0.1.6.tar.gz 12028 BLAKE2B dda08211b56186a34afa9049a2770d98b25659fb0e9fed344f9305420ddc5f69517684236d2d1b1613cec0661f6af43fc463a0cc403bead27d0b6c535030d7d4 SHA512 9702b0dfd9d340aa2b043711b27f2ac1994ff6cdd06e912deb410bd3500a2b68fa046d91bbd1392f3c95905e4cf7660819d70864cc85e55cb4c8879e820e7cec
 EBUILD kcolorpicker-0.1.5.ebuild 740 BLAKE2B 8b5acd88f5bef7eb1cef09ba7e4010adc2e7b55fdb054591dd3b9bd76e66d1ae9b6eb59f305941f987b610de682c7f3d4cf147ffd07229c9d7f5e5f1f6c83407 SHA512 329b50bea92f27a8d826274d167f4595e68ca0f47ea4f98927ec9cb2f0f0441c94272f15eb1c1f468e91c4bb7a4de8f8046bb4edbd7bac8c74ea240987a96fb2
-EBUILD kcolorpicker-0.1.6.ebuild 742 BLAKE2B 7dbe2130bfd93a657067a2eab8b9ecdc127e87c598a313f1990509f81efef19984eb99aeeaec4b5068267b7e18df86f65951e3bff302d788502b3a8e619871ba SHA512 5c10b9532f1434a133a45c9498c26afc61d92955678dae69193e450d73c611a5f90bafc89f98da107597f88ecf0260b1af6247dfa9f4e263fb1359bca279bc15
+EBUILD kcolorpicker-0.1.6.ebuild 749 BLAKE2B 6869d2e477546e140d779d4a171aa97911b814e46577030bced2fc8f016848d89a10ee2fedce4ade19d5fb0389fb3803f63e1debc4b7feeae128fbc7e72a53bd SHA512 95d60dc088b5bc6a58e9f1b024839a863d12c3c3654bb1f181a1670ddd8318da2513bc57e80b133624a042bbb160c5930af69bcb9ba0d0e5ac33fd9666a61989
 MISC metadata.xml 613 BLAKE2B b96e90131adc5be0575362e88ccaef939d42f532ef2694af9a77ba71dd6b6b930a30a12dba331e9819727fdc717e6374b128981004ce7af3f06728c1bea995f1 SHA512 e2b7fde171e6d3a528aa02f4130bf153e6a63eafce449a0a092e7a3d52b36a8126e3b496de1cc66d5dfe3c7623a62ea9693d96453cbf0ed5ae4fbde2c15c287d
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
index db84df681163..9b5805c87170 100644
--- a/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
+++ b/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 1c12795a0ceb..5b1f01c3da56 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -3,5 +3,5 @@ DIST kImageAnnotator-0.4.2.tar.gz 166061 BLAKE2B 83e53b89a09800ebd4fbbd23b893811
 DIST kImageAnnotator-0.5.1.tar.gz 214671 BLAKE2B 0dc6496534c045408e64fea7d9cc80acb7891fa009cfae5be28415e80914e726b4a2927d55156520414f35bed727e7d4470f593d5b3feb04da3e8c47a8d612c7 SHA512 221ed21c5a5156a9d7cdff70d7f4c1dd186fa40f7ba0d6d0bcfd87e6d045967b83c647378f1981b33307bd6e1b52722e2e9f4229c12fc18c840040fb4f405552
 EBUILD kimageannotator-0.4.1.ebuild 838 BLAKE2B a666de99e75281c219b27779a053e54cd2acf6b429046f7e7f49854c5be4505b45318fb0e4958cd14cf8f911e2b7b05127a5b96195b5b93355872b1d77097a6f SHA512 2d0d66550b2365ddac5e2d4233a4bbe49ed69ccf4302840460d7f6fb2bfd352effe720240b9d647ab60e2a91a3f04ebc7a76a451bf721964d1f4a95f091b1041
 EBUILD kimageannotator-0.4.2.ebuild 840 BLAKE2B 40b7193f516e9aa5b29a1504ab19196fc0c6ffd53f061368c123a224c5b8737e879f9bcb66bdc1b5e0e4d60329d7df8dbd02ed876161bace8f67cc3cf050286d SHA512 05c581bd2fa267f5e1ddd718b8fb947f93d00bc303226ee0f6fbe8729c1eb2f8e299bf2327a99db1ed8769277f695924b5dfcdb6e8cc9f934d5057f9bae797b1
-EBUILD kimageannotator-0.5.1.ebuild 840 BLAKE2B 1d0698a475baab5a437b858286ff20cb4f20df49bedadaddc2f3e82bdfc2fead1a7676a6099345dbd59826f7493c9d16abdd3db85cc8be89745b04288b793e72 SHA512 c95f8c352513d43a2e52f0c06b2f6414447a35c55be4721decc37c2a7473ddefa0f299030adb06cff864019612efdd8addba2c1943bf1fb47a564a550b907357
+EBUILD kimageannotator-0.5.1.ebuild 847 BLAKE2B c9016307e724398b7e8aa54e8ac8de1852b2caf852567b942a535d90ca5a9281075ccc87a6db0d7c29be80316248ceee3f24d89e4ec2cf7a17ed9779738d2951 SHA512 075f02e5de359b9b91ad0558953a680ddecccf7ff93db88e45ecfdb34fccf49eaeba8e941e24ba81fd0eda8f5debebbea4bed675545b13443b200170495367fc
 MISC metadata.xml 398 BLAKE2B 200972ac3dfb66315d1fcb8a3920f79e02cb5e7af2d46edefac2bc3094d8ea114a2fc6517b47bc590bd30e79fd5fdd32964d4bb228bc204935b9db32b0caa7e7 SHA512 a778611b727bf8a2fddc15acfedd2d52024f2c8fc2c46a33950818f8296ce8f97411814caf01f918e2dfce1c283db2a2928c7758f7594d49493edd2ef9de9dbc
diff --git a/media-libs/kimageannotator/kimageannotator-0.5.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.5.1.ebuild
index 80ea9eb9139a..f4810beb37c0 100644
--- a/media-libs/kimageannotator/kimageannotator-0.5.1.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index 6a2964d6fa67..69d826e3a3ea 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -1,4 +1,7 @@
 AUX ladspa-sdk-1.15-properbuild.patch 3933 BLAKE2B bbddaddd99c24db14306443b82106c17a096aee2ec684b717c8fccb76dd028e62f0ac8a575777450a0037cc154ea6e1515a6e732dd9822ddff39980afeb0c154 SHA512 bc276c02b9f23643616372477d5b2e9d186977ae1f3aef3a984162d46c362df06dd6e0b8a3156f1eb7e37dc66cbb4db8768cebcd0879ba6b36ab0245db2dbb9b
+AUX ladspa-sdk-1.17-properbuild.patch 3984 BLAKE2B 12a65c1118a070a4f408cf4ec9ffaf8331fd7beb9625503a5bbcad2ab937508333e64b8ba0418fd8db0bcbfe03bf29befbbbd290ad9af2b890f5ee1ee9c20061 SHA512 05c40e4a60716a0f3a2ce98fe268179cdb37dbeac59bc85314155484bacc469691fb7db397e40ba0f078ec38be7ec9f1c4d36ebe561869491c8b7710c74e6ed1
 DIST ladspa_sdk_1.15.tgz 71179 BLAKE2B 7a201fd968433241fda190874d51b835f425c8f35270dc8fac9acf4e9e1546fa20d48f85e894b9eb263dd5d84c2b407481d168e18256dfe2cdd026fe0c805a65 SHA512 a521622e23d988284244003e4ccfc3b42f6ddc7944cb00e7949b87e09d7f39a0cbb64b6d8b5a5af0a5ccf7179f88815416a88f02d3912957167e54b74accfc65
+DIST ladspa_sdk_1.17.tgz 71052 BLAKE2B cfb80e8ced314d5cc62fcb7f0b82e58f572503f2a732b2bb8a58343e8f69e417c0b0a2919bbb40629567fb331bf60a7f0c6f186db47e5b2651725b039526cdbb SHA512 37f94aa52b5a2f8709528989dea289eb01342f3bcb9e85d0f4829ddd9d90b2934a113db11100f09375a50f6612122b78156fec916f2c78a22406253d5cb394c7
 EBUILD ladspa-sdk-1.15-r1.ebuild 1218 BLAKE2B 4975611ec6f2d6f8f53645bc2354c9c5bd456343a27846875529cd0e6811fe7193bf89e9df0a4045a4a2a2335ee0301f09ddffe9d35af6f1a6caecb96c3307cd SHA512 4d77ec73526b2e9e67e1f78671155787ad3f6c70b362b1d4dcb6bab2f1528fdc03803185cd61968bd1bf9f7a872e3f5af6d7a75e4469a361f29b200062132dfc
+EBUILD ladspa-sdk-1.17.ebuild 1260 BLAKE2B 6aa65c004ff1589c571a0eeb213579d0203584af86097a35c5ce48d8d3f5941141fc630a0ebb90c6e94354a3b7277350a91f87a4de9d839066a6eb347f05aed0 SHA512 a44d002f899096a82d98996aac401ce2af992fbd32f5be06df3bf6de54a2bb4a53d58d9a8a6411e8a36399c9a4d4d36d893c625df981b0329965972f273bc6a6
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-libs/ladspa-sdk/files/ladspa-sdk-1.17-properbuild.patch b/media-libs/ladspa-sdk/files/ladspa-sdk-1.17-properbuild.patch
new file mode 100644
index 000000000000..341970939290
--- /dev/null
+++ b/media-libs/ladspa-sdk/files/ladspa-sdk-1.17-properbuild.patch
@@ -0,0 +1,116 @@
+diff --git a/src/Makefile b/src/Makefile
+index 774930a..765f66e 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -14,11 +14,10 @@ INSTALL_BINARY_DIR	=	/usr/bin/
+ #
+ 
+ INCLUDES	=	-I.
+-LIBRARIES	=	-ldl -lm -lsndfile
+-CFLAGS		=	$(INCLUDES) -Wall -Werror -O2 -fPIC 		\
+-			-DDEFAULT_LADSPA_PATH=$(INSTALL_PLUGINS_DIR)
+-BINFLAGS	=	-fPIE -pie
+-CXXFLAGS	=	$(CFLAGS)
++DYNAMIC_LD_LIBS =      -ldl
++LIBRARIES       =       $(DYNAMIC_LD_LIBS) -lm -lsndfile
++CFLAGS          =       -Wall -Werror -O3
++CXXFLAGS        =       -Wall -Werror -O3
+ PLUGINS		=	../plugins/amp.so				\
+ 			../plugins/delay.so				\
+ 			../plugins/filter.so				\
+@@ -28,34 +27,25 @@ PROGRAMS	=	../bin/analyseplugin				\
+ 			../bin/applyplugin 				\
+ 			../bin/listplugins
+ CC		=	cc
+-CPP		=	c++
++CXX		=	c++
++MKDIR_P		=	mkdirhier
+ 
+ ###############################################################################
+ #
+ # RULES TO BUILD PLUGINS FROM C OR C++ CODE
+ #
+ 
++../plugins/filter.so:	plugins/filter.c ladspa.h gcc_exports.map
++	$(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/filter.o -c plugins/filter.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/filter.so plugins/filter.o -nostartfiles -shared -lm
++
+ ../plugins/%.so:	plugins/%.c ladspa.h gcc_exports.map
+-	$(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
+-	$(CC)	-o ../plugins/$*.so					\
+-		plugins/$*.o						\
+-		-shared							\
+-		$(CFLAGS)						\
+-		-fvisibility=hidden					\
+-		-fvisibility-inlines-hidden				\
+-		-s							\
+-		-Wl,--version-script=gcc_exports.map			
++	$(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -nostartfiles -shared
+ 
+ ../plugins/%.so:	plugins/%.cpp ladspa.h gcc_exports.map
+-	$(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
+-	$(CPP)	-o ../plugins/$*.so					\
+-		plugins/$*.o						\
+-		-shared							\
+-		$(CXXFLAGS)						\
+-		-fvisibility=hidden					\
+-		-fvisibility-inlines-hidden				\
+-		-s							\
+-		-Wl,--version-script=gcc_exports.map			
++	$(CXX) $(CXXFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.cpp
++	$(CXX) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared
+ 
+ ###############################################################################
+ #
+@@ -66,7 +56,7 @@ test:	/tmp/test.wav ../snd/noise.wav always
+ 	@echo ---------------------------------------------
+ 	@echo First listen to the white noise input signal:
+ 	@echo ---------------------------------------------
+-	-sndfile-play ../snd/noise.wav
++	@echo -sndfile-play ../snd/noise.wav
+ 	@echo -------------------------
+ 	@echo Compare to plugin output.
+ 	@echo -------------------------
+@@ -75,12 +65,12 @@ test:	/tmp/test.wav ../snd/noise.wav always
+ 	@echo Test complete.
+ 
+ install:	targets
+-	-mkdir -p $(INSTALL_PLUGINS_DIR)
+-	-mkdir -p $(INSTALL_INCLUDE_DIR)
+-	-mkdir -p $(INSTALL_BINARY_DIR)
+-	cp ../plugins/* $(INSTALL_PLUGINS_DIR)
+-	cp ladspa.h $(INSTALL_INCLUDE_DIR)
+-	cp ../bin/* $(INSTALL_BINARY_DIR)
++	-$(MKDIR_P) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
++	-$(MKDIR_P) $(DESTDIR)$(INSTALL_INCLUDE_DIR)
++	-$(MKDIR_P) $(DESTDIR)$(INSTALL_BINARY_DIR)
++	cp ../plugins/* $(DESTDIR)$(INSTALL_PLUGINS_DIR)
++	cp ladspa.h $(DESTDIR)$(INSTALL_INCLUDE_DIR)
++	cp ../bin/* $(DESTDIR)$(INSTALL_BINARY_DIR)
+ 
+ /tmp/test.wav:	targets ../snd/noise.wav
+ 	../bin/listplugins
+@@ -106,19 +96,19 @@ targets:	$(PLUGINS) $(PROGRAMS)
+ #
+ 
+ ../bin/applyplugin:	applyplugin.o load.o default.o
+-	$(CC) $(CFLAGS) $(BINFLAGS)					\
++	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)					\
+ 		-o ../bin/applyplugin					\
+ 		applyplugin.o load.o default.o				\
+ 		$(LIBRARIES)
+ 
+ ../bin/analyseplugin:	analyseplugin.o load.o default.o
+-	$(CC) $(CFLAGS) $(BINFLAGS)					\
++	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)					\
+ 		-o ../bin/analyseplugin 				\
+ 		analyseplugin.o load.o default.o			\
+ 		$(LIBRARIES)
+ 
+ ../bin/listplugins:	listplugins.o search.o
+-	$(CC) $(CFLAGS) $(BINFLAGS)					\
++	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)					\
+ 		-o ../bin/listplugins	 				\
+ 		listplugins.o search.o					\
+ 		$(LIBRARIES)
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild
new file mode 100644
index 000000000000..209b002aa3ed
--- /dev/null
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs portability multilib-minimal
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="The Linux Audio Developer's Simple Plugin API"
+HOMEPAGE="http://www.ladspa.org/"
+SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+CDEPEND="media-libs/libsndfile"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	>=sys-apps/sed-4
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-properbuild.patch"
+)
+
+HTML_DOCS="doc/*.html"
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	cd src
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		DYNAMIC_LD_LIBS="$(dlopen_lib)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		targets
+}
+
+multilib_src_test() {
+	cd src
+	emake test
+}
+
+multilib_src_install() {
+	cd src
+	emake INSTALL_PLUGINS_DIR="/usr/$(get_libdir)/ladspa" \
+		DESTDIR="${ED}" \
+		MKDIR_P="mkdir -p" \
+		install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Needed for apps like rezound
+	dodir /etc/env.d
+	echo "LADSPA_PATH=${EPREFIX}/usr/$(get_libdir)/ladspa" > "${ED}/etc/env.d/60ladspa"
+}
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index f5256cd96755..4c7d4b2d8895 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -1,5 +1,5 @@
 AUX lasi-1.1.3-cmake.patch 365 BLAKE2B 9e3944665e416a157c8cb5fa029723db5b551d7690fe6c7471f9e589093e5c136b17ec339ba0a93f96ce463be7fa1b01d734c361b3fe5061a445e13d64b036a3 SHA512 b1d6b6cb1d1f2d0006e1cac26d42f3b024f86687de87043208ad4a6c8cb94f9cd1b36d62df10bedd20729081d944c52645323420016cbf0d046c633f46f1b7cf
 AUX lasi-1.1.3-pkgconfig.patch 400 BLAKE2B b15c712c16bd70e92f80d0ab9b48edeadca75382191b54a34ac6c6dc2e0929491a7104e09c21c816b108e946f842d38f4506b71a62435785cf55acbaad13065d SHA512 fa7286b524163a6d2783758f368d60a2385012a10567ae30843daa9b72a22ddeb1fe767c24f271463bc60e27a370cd5292a6f35e6a5b5cf6f17b185f0797551a
 DIST libLASi-1.1.3.tar.gz 726769 BLAKE2B d8d06fb56e82b78f4342c959965de3908d70d1cec6147a6e3cc3d58ab4e9f978b7966c8e4507c0ff69e4ba3716270f38f3cfcafdc834001e3a0069a3495eda31 SHA512 036fb0ea1536d4ae04c0d9b5bd193ca6828228afe2cba6c1c7e12febd9b936bf3ac677711c122c44d3b12ab2f7b67f5e9dd18f44a4938ceaa2fbcc430a5748ac
-EBUILD lasi-1.1.3.ebuild 1327 BLAKE2B 65564c86cb9f07ffeee748573de79e35d30f3751d3395a7c1605340f7c57d84de1e5845fcd2c92849a83c10028871f008ded1eb80f857b0d3d01c274e4c5af26 SHA512 0013cedebf95e044b521a194be95fda2790c544f3cbffcf182bf9e50f972ea8db24a4ab907fd909c526bfeb190108cc877140412dc4d2d148de58f29caa6ab49
+EBUILD lasi-1.1.3.ebuild 1333 BLAKE2B bbe50a0dbef07dbc8128132082d4f6d8c80c16f46c9ce06b7f36b4a69fdb01c29431ce094672b94b5b0c3af0f59b6e0c6770d15225c041bd17fb585c40208f0e SHA512 65084e4ba4a7a3cc5a7e0435c821e74f7d1fe19b5a0c69e62df0b41787d2fb50f9db768f13d921eb1f76647a70dcd0eb734bc07a8a658ba5d0c873a14e717710
 MISC metadata.xml 1219 BLAKE2B db4d4d366731690cb78f6a0d92708e948f059b84b074acd2f8115537575558c5e13c5acee3d21833cd146260aa4ac1f52d139e73fedfb89f39537c8aa0bd6246 SHA512 0697769219ba779cad793ea34504562a88717e927d4e180b186e82f34a496eceb19411029317807c5eb67a332c20c7cca60f827d96eb1f2fa23be888200fff75
diff --git a/media-libs/lasi/lasi-1.1.3.ebuild b/media-libs/lasi/lasi-1.1.3.ebuild
index df41f56e078e..01ac413b454e 100644
--- a/media-libs/lasi/lasi-1.1.3.ebuild
+++ b/media-libs/lasi/lasi-1.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 70f28ca7d71e..19233b41456e 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -8,10 +8,12 @@ DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e7
 DIST libaom-2.0.1.tar.xz 2391756 BLAKE2B 46d5938c49e720ec773d55e461f38d86a4307358fe8d3d9cc0e16e63dd52e54d41163bd14a583c059c9881a6980b1a8c54323b499dbef8301e9fa90094cd0e02 SHA512 2e7e2a9f456d51641ded44cb3ff639982e996276157d34e6a38895a68b7a8f36e209bcbad3dea7a04bd5b45b8cfe8a3bf202ab630f93388ea6dfb516f13ed82f
 DIST libaom-3.0.0.tar.xz 3272588 BLAKE2B ffe3dae3d275818e1fa8819d016ed7a1f01d374ea058a1daa0cfde2a43f3d065a0be08bcd55db7cb823e0a1802a0cf0ae8cdcae63d7fadad9fa1b53e3f654e13 SHA512 6845d7139b1f5d49a0dea98b08de66904909ed0280d90ac56e740f26f17fe1ec3f49c454aded311db5505d7a4133eedc05a09eb6a0c45a43a4895223f5dc35a2
 DIST libaom-3.1.1.tar.gz 4604400 BLAKE2B b5e5030639fd7e33a4d0479cf0b5a174f2e0d0f67f6338bec6df7de333fd9bafa3821c7eb721959c1733a678209981f4893e4f228ed339e93f7b0b6fd136d967 SHA512 de91a47c23200ae83c34899c487db7f3b71872890f0506ffa7e2d9a1153ec389fc121b4df5ab1b30b28020599af34bb5d301eac3cdf2a34ce48dd26e07d7fc5b
+DIST libaom-3.1.2.tar.gz 4605501 BLAKE2B 7aac22da4103408f04a5c2e5d11a96d5a12651fd52e980b547427ebe3e235ba7c16700a131f4bb1b6b4e8a7f82f3175e526281eb593cf604ad491bd7fed0184e SHA512 466c2923115dcf0b0e29fafc8922a057814a84d0e61780ab9b6816bea31d0b741695326183884da5a04afffa5c925ff8ec8f6073e0a1e48ed4914066da975c3b
 EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5
 EBUILD libaom-2.0.0.ebuild 2309 BLAKE2B 58f2c55f85387c62abe184863c934979033c63f0b966664a11e13bddf4abf22ead334a94a645bb1cc28ae05ae58f9398cb462e9384f7b087e1ec1983257d1870 SHA512 6fa8b6e03dd556b84abebb271047c58b3936eb7e9479360d87f6f2f4b3bb7815911e43a10de03c4acc431a60897457a39de65ce4e2087ec238bf3afdfd8c285e
 EBUILD libaom-2.0.1.ebuild 2319 BLAKE2B 072057d02485e70a557be99c7e0eb0d52b8382a3cd11afd9c6ac375b830965cb1291488e7a599e4226d4fc553287b618b50ae1cfea27c2e935ce259c2870431a SHA512 4b284f8049d487a178b280c9bb18bfd757f4e8a9f0b673c4cda337085c0fb7192632b46540081967fd03dd9c982cd488155751bb008cc114d4d38f5e98cc8c35
 EBUILD libaom-3.0.0.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
 EBUILD libaom-3.1.1.ebuild 2328 BLAKE2B be9c7b100dcad9afb4413eab3396bb83abf7ee958fe9f08c1716bf20159f24556e50322c3031f120b66d2419a0d707c3d2e5e7ab021a45084c4acf42882ec5fb SHA512 09fbf070bef621b010c7c33a04a2d1776d28866504080c192439f6a93c0bd8731518519913f0bea65dc42650803bb36e61eda8faae3d8bfc613a6c43804ec136
+EBUILD libaom-3.1.2.ebuild 2328 BLAKE2B be9c7b100dcad9afb4413eab3396bb83abf7ee958fe9f08c1716bf20159f24556e50322c3031f120b66d2419a0d707c3d2e5e7ab021a45084c4acf42882ec5fb SHA512 09fbf070bef621b010c7c33a04a2d1776d28866504080c192439f6a93c0bd8731518519913f0bea65dc42650803bb36e61eda8faae3d8bfc613a6c43804ec136
 EBUILD libaom-9999.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.1.2.ebuild b/media-libs/libaom/libaom-3.1.2.ebuild
new file mode 100644
index 000000000000..32590cb16b0a
--- /dev/null
+++ b/media-libs/libaom/libaom-3.1.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
+	S="${WORKDIR}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# the PATENTS file is required to be distributed with this package bug #682214
+DOCS=( PATENTS )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index dfc09b7417f4..921b5f1ab189 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,3 +1,3 @@
 DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
-EBUILD libffado-2.4.4-r1.ebuild 2639 BLAKE2B 0d1265016b1e1cde78561155c347a4e82742a70050759121147d35e72f0eddd9b0eed124047047f712acae4f81d0a5dcb0c8aa248389a6b73f45f9b24a70d91c SHA512 fbf65b5061e9d790fd20363f991ff0b70e9c672e9049609fba5ec8400f9accf007824263f0879021c962de5644d1dcaf40abfdaa243b52a58d462fa27d9dafbe
+EBUILD libffado-2.4.4-r1.ebuild 2749 BLAKE2B 95fdbd0c43c4c9d396d3be9c9b00036b249ec3d1d78d89844203721f00a027416e5d72454c41d6d78a671f7afc84ee3b57eec6609bc00182051c6e6562d8ee08 SHA512 04a62a67a23f1b6b58c9af9a212f705b62a61bbc6ee829d06f562bf852a1b078310b1741698a46b3b2b0df839da74206d8e3554b5d6ce43a42cb08ab34ea88a7
 MISC metadata.xml 597 BLAKE2B 4fc750b04079094c4251e60cc4067847ba015a9bef54c83ac9ecc2b53a24048279df06711b5fa1482e379e25a7cce7aed491a67129469bca46ee747a30f7427d SHA512 9f0823e3554c7602b27d39d565af89079e6a5260f19f6850bf3f2f228a4cd6e40a27f94c1a85e6aed0226918beb6dcefdd85b830fbbe438bdcb899dccd51e4f8
diff --git a/media-libs/libffado/libffado-2.4.4-r1.ebuild b/media-libs/libffado/libffado-2.4.4-r1.ebuild
index 1945430cb85d..b9daf2d2a40b 100644
--- a/media-libs/libffado/libffado-2.4.4-r1.ebuild
+++ b/media-libs/libffado/libffado-2.4.4-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = "9999" ]]; then
 	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
 else
 	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-3"
@@ -79,6 +79,9 @@ myescons() {
 src_prepare() {
 	default
 
+	# Bug #808853
+	cp "${BROOT}"/usr/share/gnuconfig/config.guess admin/ || die "Failed to update config.guess"
+
 	# Always use Qt5
 	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
 
diff --git a/media-libs/libfreeaptx/Manifest b/media-libs/libfreeaptx/Manifest
index 45ae9422d4ab..9f8915c62686 100644
--- a/media-libs/libfreeaptx/Manifest
+++ b/media-libs/libfreeaptx/Manifest
@@ -1,5 +1,5 @@
 AUX libfreeaptx-0.1.1-fix-version.patch 571 BLAKE2B 0fa43bf3b7180b5ec90e3cb2fc633959d5b484954bd50f468903a6c0c9b0646fe77be1618b68746692b57224e46270e538133ccfeb3f320ff71780bc5cd4297d SHA512 b8d3bcadeba8534979c02e55ad129bfce147e920e2e881f99ac9d579095fb944b6e88351a74dc410d141e0a6b89f17c15ddc21019e63cc3cf362a20d5e9b37b6
 DIST libfreeaptx-0.1.1.tar.gz 27902 BLAKE2B 0aa015b0317db7f6dd61ae667cc1b7b10c7f7457d057144c1457572a214891848b81512960eb8643138c638a0f691b53a7bbcb36ad434ac29335d92b108a43fa SHA512 53dd7f348120fea0425b365f26668925dd435a8a3a0c5e98476764a452c7d729f2a3556e953c557d0ccaaa65391265c8c3c61fc29377cf60079fa0bed2cc20b1
-EBUILD libfreeaptx-0.1.1.ebuild 1045 BLAKE2B b58a175ed799e07c94dfd612d07a138d1a9788f5fb9cdf1722eca262238e8f0fed6d79031dcf84e0a541094a42acaef26325be0d78183e77ebc2b48ea2fded54 SHA512 de8fdd9f5f2463e312d6eafdb6d0a74d11cc91a5bd811f64b9856ab1d32ce02d34edc4494c0d7674109e16b2f80d15487a5cc66abc4e16d270eefc47f1980f3e
-EBUILD libfreeaptx-9999.ebuild 1068 BLAKE2B dfdd16452e91a07ec2b728c737bbd233c1b72c8a00605929992e52d8e6ca6b77e60ad1a5acae67007040a829699ac415d27e47b640df7f96c4ebba0d7fc1491b SHA512 a1f4554be7a4c9b070f771a486955a412cdffbb6963ecb98f6eaefc9a14ea003dd663e43270b36ac2af8050a77be8bcc2681912061f8e74ceaca08398c0a7add
+EBUILD libfreeaptx-0.1.1.ebuild 1069 BLAKE2B 906828ba330b8c2cc2cb6c7bdbe5f14ce1f7406b227403bb16e87faa092c3191ca987173f4f391230366171c1222c27436b77ecc3d949e42550006ae63da563b SHA512 891ec16859505dc41b98de582e826c9d9b3bcf6dfef1e64f09bb011b15b38f16e1c2c13d5e46da80171ea499fcb6be9a7c6e551198486c4f0d53255d7d75e5b9
+EBUILD libfreeaptx-9999.ebuild 1104 BLAKE2B 9ab4ea981ac6243332276f0f17b3b941b4a49b658cabf5e6658efb7664cd71ae522683383f023788cc8dafb233d0ff94d4f21e16ed47a36f8d7273638d963706 SHA512 99f6b1912b7c00e7c2e0f55ee7c9210697b2b0d705a85920a02a58c9aaa443fa29e85128a699b76280a994b27b1a954e0c9e900c74ad41133a2484d2b671eae5
 MISC metadata.xml 443 BLAKE2B c6bc37f198358a17bb8c099093ed64f9318966930771426243e401e35d8c4c0b4d764532ded69a71ec6e5ed463d582106d8574d661bd9d9a144b71528b0d02ae SHA512 ab15fe16e8ab3e5cfc792dbbb65437e17ee76f4b9b94a08fa90f553f1d15a1c179e6cd791962ac9ddc764b50ac5410ddf0dd7c3618b2c274f6fcb5ef7c5982ea
diff --git a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
index 1672154abe8b..db0223a7362b 100644
--- a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
+++ b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iamthehorker/${PN}"
 else
 	SRC_URI="https://github.com/iamthehorker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/libfreeaptx/libfreeaptx-9999.ebuild b/media-libs/libfreeaptx/libfreeaptx-9999.ebuild
index f849a9cc545a..d8ca8e91d1bc 100644
--- a/media-libs/libfreeaptx/libfreeaptx-9999.ebuild
+++ b/media-libs/libfreeaptx/libfreeaptx-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iamthehorker/${PN}"
 else
 	SRC_URI="https://github.com/iamthehorker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index b4c35d37be3b..df960d82107b 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,6 +1,6 @@
 DIST libglvnd-1.3.3.tar.bz2 715179 BLAKE2B 781550cbda489dca31596115c78edd1d4f1fe66062218c83ccf6cb34707501fce839b649c2b0aee3621c283397acca8fb40ad16c0388551ce7caa7fd79b7dbf5 SHA512 7da9e12c010a8f109cd24ca4c2ffc846dd7d23f82157e1e39b8ae69575fabcc9592c0b639b23d2112fe2026b679f1536f1b705a5c948fefea105418803e1b629
 DIST libglvnd-1.3.4.tar.bz2 715616 BLAKE2B 77866bcd80b80dc27accbe960d63f45b5052ad110590890ed4707db0c2d7efd6882755f7258fc007b3b11bed9cee02477103ed65003185f9d7d2f6e82bef7df8 SHA512 3132bf2a547d5b7ffe12c6f1574b62c666cce8708d0311dccdbdb82063e5b6efd6f889ff1829d550af903305cd7c5bd2f7c5e0253234b25e0ea98234769e7ccf
-EBUILD libglvnd-1.3.3.ebuild 1421 BLAKE2B 57e539198bac90ce3aae81b68c211fa6a31e707078d524a19cd02707eee3fb7ce7bce4cb4f2c7a8d6be3605a45a2580704ca035445a1b588ca7e0c5508644ae0 SHA512 d9a6a3a57915fa03117c5b9d252478718e818adbfe2663bf045858980b98191c7fd77358caf8b8fecf989501e24cabfdf55428464079eec08f99f8b11e3d89ec
+EBUILD libglvnd-1.3.3.ebuild 1420 BLAKE2B dba3d011a2574938b1e9ac2be10b39f57d0c115f4b151e9af2f7333e6d37f21a9da7b354832a3e7a7534d2a42c6e92ff8407d9c5b8554ea69785a446cc025461 SHA512 355ecf20261605a8f64661f3e00a733e0ebcc05ac399ee23f13836888843805664d120aaeef3703c9aad727afa8166c2f00cfaf3649fb5fef95bfafbd1514455
 EBUILD libglvnd-1.3.4.ebuild 1428 BLAKE2B 35ad17719893213a5a0b18d75df985a5bb45415240c2dde7eca37e5f37c6b8787d9797b6aecbbdbf0c1fac4815524977425acf72d78e71f6fee68a48511064be SHA512 6931b29a79a836234703201b4e377940f110db26567d1da8e78a2b3402c2747cc0b106341e1bb48b8c00b6cc38b2c88b2cde298fd6daccfa97ef74cb889635a8
 EBUILD libglvnd-9999.ebuild 1428 BLAKE2B 35ad17719893213a5a0b18d75df985a5bb45415240c2dde7eca37e5f37c6b8787d9797b6aecbbdbf0c1fac4815524977425acf72d78e71f6fee68a48511064be SHA512 6931b29a79a836234703201b4e377940f110db26567d1da8e78a2b3402c2747cc0b106341e1bb48b8c00b6cc38b2c88b2cde298fd6daccfa97ef74cb889635a8
 MISC metadata.xml 315 BLAKE2B 138fe0ad285ae16426c77740c19a0740a9b882a421fd6a0dc39489ce5bfcd21254e3de2fcd315386e4cf10f6caff39ccfa4c3df0491ed4165d5a6a768e5f454c SHA512 958019318d542e273a11b6ab57d4dad10b375f85bda613279ddb2b5cc834c1a023b1f1b3d14e9450d5b48ee579506a8a904ecc540276138c1d5350a27d34e14a
diff --git a/media-libs/libglvnd/libglvnd-1.3.3.ebuild b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
index d7d545a2ab89..8c83eaea5785 100644
--- a/media-libs/libglvnd/libglvnd-1.3.3.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index c32cb2f8ccc7..bfbb9941c6cd 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -2,5 +2,5 @@ AUX libgpod-0.8.3-comment.patch 611 BLAKE2B 6ed4cfbb6ca1ca6876f835bdad2b9d11a8ad
 AUX libgpod-0.8.3-pkgconfig_overlinking.patch 640 BLAKE2B 74d924d61ce33c4fd0219e8dedb505bd66cd40e9912efb2dbbb5df31c2bea943ea4a4eb8b9e9baf2762966b02efae3f77c73293f8a4a581f6a43be4cc22eb727 SHA512 c8ebcc18ba7b44aef8fada3f9fea88fdaaf6bae12cf809b08f98e85ab6396ae032bfd7706809cd266be67c694749d4364a9cc591eb750478e095cbbcbe061419
 AUX libgpod-0.8.3-segfault.patch 1171 BLAKE2B ae8f00ad8708f23ef83c9f03f5e9a7157c2bdeaf0cfa2ed4542f8cc96295dad0200e968cb180883efa0e93fd180088be84fa0d2f1b40c642ada0caf37f7f3b9a SHA512 9b2f9a4f4e8f41e5d11cbc943cbba915147b81ec66859b62a5986b5d1c5c90526ce522e24499daf3378c201126ac6e5da8ef855a5f2353b933806c5b3aa6effb
 DIST libgpod-0.8.3.tar.bz2 801903 BLAKE2B e9bc54d23be7f54a17eea3f8a07d7bf6a28224d9c0b0f90fb9d44d97af6cf64c31096de5d9fa4b446e1a9463a6e8f3a59929d73bf52ad8d638732868c3c1b7d0 SHA512 e39f22054c2d2bdf5fc764aa1f692de17a1a06c7c7e9c60883d126b216dacca7840bf818e7e7e039218fe2a64c0920ba96d8cbbe310e11c1c4e68b82e7cbbd8e
-EBUILD libgpod-0.8.3-r5.ebuild 1442 BLAKE2B ae8cf010fd070cb8606bf68f86b62026117c963ae171df07f9fc349069b5d4ab8529f9fe7909aff745189f1927deadd3a33e4bdc92581ee80678fc55567d5f4f SHA512 78debbb5e4f2cc5be53339afdae48c54491639c9e77629dc0e7b1f9fbf50c4859b2d02e0b964c6cbf6af85f5f5eb2374443e5d5bc7972ef4338b2214253d3398
+EBUILD libgpod-0.8.3-r5.ebuild 1449 BLAKE2B e059e7023637550c93bf22c2fa234c30945a95dac0617217cd2f8ff5e3db20ebb40d48bf8b991a1622c42fcdb4d0b43cb05a74784604a7f4f49e40c9d363a80f SHA512 95ba31e85a5f89faebe5d6fcf47e1abfbb41a3a14644db8e101bdc8bd4cc04f7adf5b71781ebdf2f07de0e66478d180c201a538ad39a0e5fc5ccf199fc8b6151
 MISC metadata.xml 484 BLAKE2B f3704943d01d8048940f1d359a12330aad167f6a7b3e67f37fd3c8b954aef0cde441b3e9b957414404e5a450a21acb899a8c07df838632063e45734cebea1b68 SHA512 40128d4bd5043e699ec2acdbc267eba5f2ca4cb54e7e05ca81d033fee88124e37824234ddfe2d51da7cbbb2757cb68801db4899c82c66895e5005bd85a211965
diff --git a/media-libs/libgpod/libgpod-0.8.3-r5.ebuild b/media-libs/libgpod/libgpod-0.8.3-r5.ebuild
index 3cef30ca197a..f3b68368bf55 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r5.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="+gtk ios +udev"
 
 RDEPEND="
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 6228d1e032be..7cb371975ecc 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,4 @@
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
-EBUILD libheif-1.12.0.ebuild 1835 BLAKE2B c21969387578f87523a38ff435138b3cd08e8fdf4c882b68fb828866201bbe187b773c2d320c82566587be7646d220fcd7aad24768584fdfa9742ebbd750fcd0 SHA512 5f188ca76492d5b6288b0daf0c43093cff79adfb26e86d2439725ce0f99e7afcf49b6085231e020eefe1b68604d3292543937a60d1522fb5553d90484fecc9f7
-EBUILD libheif-9999.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7
-MISC metadata.xml 888 BLAKE2B de7d9a5aa166d517b8b15b36ba3dc465cb438b162e9c8807df8bd5a901d18e492ae78fa5232868b95f66b6a47f52ce9a93d0d14bfa4a614daf0b1bbbcdac93d8 SHA512 e5f46f35e8e30c38318e074e5492e08dd6e17d1c7627bedd6d7962410dfb6025141f8e2e5c45b66d2f1e64a93ee6b41bc020ab7ca5e6cbacff80d33a00c222c3
+EBUILD libheif-1.12.0-r1.ebuild 1798 BLAKE2B 737d57dde4f9a3a0566c0a91b1d6ec0c167dc6bb59c16b3acb9ffa28135eac395328b41418381ac2e22999852d1182580845d2227b9fa8e2c0e13bd4eff42e63 SHA512 112f937a560ef0e3dd666c7e4c7e0e973738fd31942cfd52e3c5f27b1e4aa4c3305e4a0d9ee66d6a24f3a02d47a895f511684688fdbed88ad709ff1be783309a
+EBUILD libheif-9999.ebuild 1803 BLAKE2B 28cd644e40633597b07806b39f19cfdc8251132f99d5687337f68e4cbfadf578f4cee9aa198888a610c1df515e9824ada89b36a326cc6211ea30a704fb7fa7f3 SHA512 8e5af8dd952faf2bd431631ffae82faeb7adfa4cdd369741a1f031cbb12676dbead9157fbaeb16bc365da4034ab82deac627e9cfd4bbfd2e9b098a996d8ebd8a
+MISC metadata.xml 805 BLAKE2B 99457c3561cc5ad915c5503f96e52b6261981157de467073ac7a8ece68af3798b9db516b40b7db9e0bd92388b083898926d877fb3bbc8fd1701b280bfd4baa09 SHA512 e5461f86bd18b9878a0e4857fc25ad7554e4095b8b71b2a8de2334b49b7d6c62ccbc2d6bc31e016e65ba3c8bd3a872b5f00b2c2bf39e1d04306124bfedb8486f
diff --git a/media-libs/libheif/libheif-1.12.0.ebuild b/media-libs/libheif/libheif-1.12.0-r1.ebuild
index 6dc4980f1f24..f90f0e7b6ccb 100644
--- a/media-libs/libheif/libheif-1.12.0.ebuild
+++ b/media-libs/libheif/libheif-1.12.0-r1.ebuild
@@ -18,20 +18,20 @@ HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
 SLOT="0/1.12"
-IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
-REQUIRED_USE="test? ( go libde265 )"
+IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
+REQUIRED_USE="test? ( go )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
 DEPEND="
 	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/jpeg:0=[${MULTILIB_USEDEP}]
 	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	go? ( dev-lang/go )
-	libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e:= )
 	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
@@ -50,10 +50,10 @@ src_prepare() {
 multilib_src_configure() {
 	export GO111MODULE=auto
 	local econf_args=(
+		--enable-libde265
 		--disable-static
 		$(multilib_is_native_abi && use go || echo --disable-go)
 		$(use_enable aom)
-		$(use_enable libde265)
 		$(use_enable gdk-pixbuf)
 		$(use_enable rav1e)
 		$(use_enable threads multithreading)
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index 05d7c5f68ed0..a1837ad0964d 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -18,20 +18,20 @@ HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
 SLOT="0/1.12"
-IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
-REQUIRED_USE="test? ( go libde265 )"
+IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
+REQUIRED_USE="test? ( go )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
 DEPEND="
 	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/jpeg:0=[${MULTILIB_USEDEP}]
 	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	go? ( dev-lang/go )
-	libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e:= )
 	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
@@ -50,10 +50,10 @@ src_prepare() {
 multilib_src_configure() {
 	export GO111MODULE=auto
 	local econf_args=(
+		--enable-libde265
 		--disable-static
 		$(multilib_is_native_abi && use go || echo --disable-go)
 		$(use_enable aom)
-		$(use_enable libde265)
 		$(use_enable gdk-pixbuf)
 		$(use_enable rav1e)
 		$(use_enable threads multithreading)
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index c8f0f34e8094..2d2f28772dda 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -9,7 +9,6 @@
 	<flag name="aom">Use <pkg>media-libs/libaom</pkg> for AVIF encoding/decoding</flag>
 	<flag name="gdk-pixbuf">Enable <pkg>x11-libs/gdk-pixbuf</pkg> plugin</flag>
 	<flag name="go">Enable building <pkg>dev-lang/go</pkg> code/examples</flag>
-	<flag name="libde265">Use <pkg>media-libs/libde265</pkg> for HEIF decoding</flag>
 	<flag name="rav1e">Use <pkg>media-video/rav1e</pkg> for AVIF encoding</flag>
 	<flag name="x265">Use <pkg> media-libs/x265</pkg> for HEIF encoding</flag>
 	</use>
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index add0731a724f..fd21d7384ab1 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -11,5 +11,5 @@ AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
 DIST libid3tag-0.16.1.tar.gz 98074 BLAKE2B f7acbe4117ef54e5d1705289af3b31ded7e87a7d2ba6e19a02863a391ce4fffee9110011cae42568d7ccbe256f899d7868182f02ed0b662d46f3f78e14c1eb43 SHA512 621cbdf7a0ea5cdca6a9133c88fb07ff0c519ed73bc26a535de3928f4784b912bb44315b45362600d53cd03083b66f38d674d1880ca30e5f6c342321977a6eb2
 EBUILD libid3tag-0.15.1b-r4.ebuild 1649 BLAKE2B 994ad52c6bad887199f6039839dbe51a966bd4b70b78bbdd38230a7a6d704e2ec1a68b5ede12aea6e8b8a5bbf9a48209dfbf31f8e8072128191b4b8e995a6a4f SHA512 18faa050ebab9e177ad4be3c64216fc46690fb57ae65c63ce845746d46b7c115f16e416a2e58c4280c13c709fac1e6775a947c7ead5dd1bedad4a64f09803668
-EBUILD libid3tag-0.16.1-r1.ebuild 586 BLAKE2B fc0694e59e57249eca3d820f0a977788a60bbeb825f797c20202e5e693df2bd3f22b1670a030539967db01096af7e248f1a1cb28891df167b0a2f0965a034cf9 SHA512 865781343687450e8c7b5fc26d2bcef2eb96f1b43f0962f2de2338c16cfcf925a284d01eb5db32cbc098fb50f533bc3aabafec5b5dc84a28385d5981cfa0fca9
+EBUILD libid3tag-0.16.1-r1.ebuild 581 BLAKE2B 37fbd8d48b46c1448b364b1385a49581229a89e1bdc51e126b464b264e36771779dcd82823adac2b575c509f6710e8de00c1a823d73c24cfcce6abdfd0b8b52e SHA512 caa8053953dee07c099960bda4ccc632738a24fc3fc6d7b33a52a95f3c50f784912ac21801a3e89f63dd5060b1aeaabb1a729f31b948e8995991d1d8ca438cd6
 MISC metadata.xml 327 BLAKE2B a160fc0168c9b0eef874a76a9b6ad1bfbbb2818750ec2d1b14b76f16fd7659fa401889fb5d19a5abc628ed1a6142c9f9b445c3314b58591409b0a31692156630 SHA512 1b879933bdd99c3cab5e88bb24ed77961ec7d4e9f0890fdf9ccc098ca1a95e6c9fe1a7b55f5f0b6c10909ddcf73af7e176228f615998653fc25d9c888af9f8fa
diff --git a/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild b/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
index ad7d73f508f3..98b57a4b19ab 100644
--- a/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tenacityteam/libid3tag/archive/refs/tags/${PV}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0/${PV}" # SOVERSION = ${CMAKE_PROJECT_VERSION} in CMakeLists.txt
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 9be94f617779..bcfa7a32c75e 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -2,11 +2,12 @@ AUX libjpeg-turbo-1.2.0-x32.patch 1248 BLAKE2B 760f35a02c6a565a43702a4188186732f
 AUX libjpeg-turbo-1.5.3-CVE-2020-13790.patch 1744 BLAKE2B 7cfd68e3f29b530ad573c5f6476ef539e3499d2cfafbe5be129c1a246cf2f3e7f170e71bfb33adbaebe6b3812ccdfd72d99c5961011e093f740d7182fd7c1398 SHA512 1f97899970327fb6dabe521e93029a518f1493bdf45f9a345f55e803f97af7f36b65d569e4921c1aab7478006b4cd34c4f17bf150a7ffdd3760f14d9acb5b303
 AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca8892050507bc7566cacb0b7ff2d2914428971a994bb41d9d717be7fe0a4908cee2ee57a74f6ca8112bee53cb021f4fadbef201536ebee979 SHA512 2542833a6afdbf1f2112695c524197bf5a319ef99c1c6ecea0fe0436681c45321bb6eb59e25fa97d8fa923717452f609e3f85d25547751fa4f8fe99f4ee789c9
 AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
+AUX libjpeg-turbo-2.1.1-arm64-relro.patch 679 BLAKE2B f6ea6f311cc05ff960d76cdc49afc1d14bf4d638052d1f6007defe239757002ecad18823d706a2e5f5e51245a2447c237c97daf0862e2e1889c751b52f3890b7 SHA512 56ef2f905fe54921618a0c4f79de67cf74070d1ee595d3b4b41f19b33e23701d8045b250b28b8c53b1bd8911f4179dd3b1594a5e85ac9dbce8c869feef1ad124
 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
 DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9c4fd370c5ec4fc0dc3696ead7b4cd031228aaaf0eef3ceba194bb96bac6134b9c951162c0b81e88637edd6e71f4577f7 SHA512 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605
 DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866
 EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3224 BLAKE2B e96c8b4aea2e7b1f445c80f4c4cff87b83169f7c273df39bc06dfe95cd3609e7213c685118097ca549efed282e1c315a9a1901d5001f3aa8e155fbc6def1a8f9 SHA512 7d91d57218b278bcc19010250be0446c4d85982c063469553649cfaa7038e00fce92bb59820e24c397915a5f7e8a4f952b64fb84d57caa70a6b73ba7496fd745
-EBUILD libjpeg-turbo-2.1.1.ebuild 3232 BLAKE2B 789ebf33027f218a795226880ccc4d0c64055a1c8ec6fa0f0556b26affcae2b3db4469090acdf2462cb14f908562af77d3850b001aa6099cc79dcb9cc899f06a SHA512 ff846c4d7a91de095a2af7ef38d66041aaae616776c0b0e46f2a33a924c711424717fbd67ad91be99a4b45452d19a03acdc226d00f621774aba0f116265a2c16
+EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3311 BLAKE2B 8aa7f14c4ad7aede5ab08ff430a9bd924add907cb193aa620f2a3f15949b7f5804e65518e34adb5b875ba1add63d32a12159cbc65646746f27c0954f3583c135 SHA512 4f0cc2631c5b954b438862f68ae412ba5367b203384ff44d0f8d551d55fa37a76b9ded1938ae6d8ef8d0040c9579dedb9fdca0e6093e6de54f5feedf4cf6d74a
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch
new file mode 100644
index 000000000000..7784ae513d16
--- /dev/null
+++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch
@@ -0,0 +1,20 @@
+https://github.com/libjpeg-turbo/libjpeg-turbo/commit/129f0cb76346ceede8f4d8d87dea8acb0809056c
+
+From: DRC <information@libjpeg-turbo.org>
+Date: Wed, 25 Aug 2021 12:07:58 -0500
+Subject: [PATCH] Neon/AArch64: Don't put GAS functions in .rodata
+
+Regression introduced by 240ba417aa4b3174850d05ea0d22dbe5f80553c1
+
+Closes #546
+--- a/simd/arm/aarch64/jsimd_neon.S
++++ b/simd/arm/aarch64/jsimd_neon.S
+@@ -182,6 +182,8 @@ Ljsimd_huff_encode_one_block_neon_consts:
+     .byte    4,   5,   6,   7, 255, 255, 255, 255, \
+            255, 255, 255, 255, 255, 255, 255, 255  /* L7 : 1 line OK */
+ 
++.text
++
+ 
+ /*****************************************************************************/
+ 
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
index 78714e29ba7e..0c1d2b1f4403 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="cpu_flags_arm_neon java static-libs"
 
@@ -34,13 +34,18 @@ BDEPEND=">=dev-util/cmake-3.16.5
 	x64-cygwin? ( ${ASM_DEPEND} )"
 
 DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:* )"
+	java? ( >=virtual/jdk-1.8:*[-headless-awt] )"
 
 RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.8:* )"
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
 
+PATCHES=(
+	# Upstream patch
+	"${FILESDIR}"/${P}-arm64-relro.patch
+)
+
 src_prepare() {
 	local FILE
 	ln -snf ../debian/extra/*.c . || die
diff --git a/media-libs/libldac/Manifest b/media-libs/libldac/Manifest
index 9fb3c2083a1a..ca260cbeea8f 100644
--- a/media-libs/libldac/Manifest
+++ b/media-libs/libldac/Manifest
@@ -1,3 +1,3 @@
 DIST ldacBT-2.0.2.3.tar.gz 75708 BLAKE2B 9f9ec1aa8a9603927067cd01058745db615a89652d16e870d9eb0a4db270a4076b7bb70ba091948249969087e5b26b86e22656314e3d26e43311fae982472347 SHA512 0e42723a1e7d748b28b13d73823fd5378a64100d5e27ae90cf3214494f3e199c526e219efd1329b2ec2b3195e1a6b3c98c8210ab7e4e6b98077199ef0f64c02e
-EBUILD libldac-2.0.2.3.ebuild 612 BLAKE2B f5c82bb1503ab0f58161717aee20dd41074b957d62d513e9e857118e7ea2012605974cd0a4fd0fd117c63995c643c1a96555b9ede569611cb76670b69cb091ff SHA512 321f0a0eb129ee36893b7b8f106cc269c6875a89ff40ee0d54ada98d030a657df9e9e8903be25ae4121a227f8f757f2593c43779f1108b21812d1f037ff0866f
+EBUILD libldac-2.0.2.3.ebuild 611 BLAKE2B 1f843fc9b9156edf8839d84a7842156936999593bb0061764bdb2a4e3f2bd1a3180e243ff2c651b8d2decbfa9e20ea2e1cf35b0539869194d5ba7e4e54d166a8 SHA512 453fc5044c33de0eedc92e483bd2cf965ac31226dbd011788dbcde2858e08fb728de2273087afb87386d4f23f3658c552079e20a531f7966cc0dd3ab8a239c38
 MISC metadata.xml 295 BLAKE2B 23ffbd8cccd6184716f9d45199f0aeefb4c8629b2b75b0205ee7b76ef4851eabccd9e912f5612a58cd5cc9cc7582d3154efa19a6c3391fbde03b335f81e098a8 SHA512 dff2d678a578497377ce964d374e5690721cf1cf9aa8955ecdfd5acde1a00b987b67b22b78b782b3d9350f01611b81d816f88d00ecd3d00375afe586858c570d
diff --git a/media-libs/libldac/libldac-2.0.2.3.ebuild b/media-libs/libldac/libldac-2.0.2.3.ebuild
index 77f62cf5a7c2..611a50404c67 100644
--- a/media-libs/libldac/libldac-2.0.2.3.ebuild
+++ b/media-libs/libldac/libldac-2.0.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/EHfive/ldacBT/releases/download/v${PV}/ldacBT-${PV}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/ldacBT"
 
diff --git a/media-libs/libopenaptx/Manifest b/media-libs/libopenaptx/Manifest
index 6b29b354c7d4..dd6ff9e6592a 100644
--- a/media-libs/libopenaptx/Manifest
+++ b/media-libs/libopenaptx/Manifest
@@ -1,6 +1,6 @@
 DIST libopenaptx-0.2.0.tar.gz 27797 BLAKE2B b178a9aaf78796c9219d9e7066ff985ce9f5dd86a6926ae22e373f2822090ad313efe04d5cf607940f1042bd27ddf5484d7e8298dfff91a8ae5596cec7ad5fa9 SHA512 d57e5084b398eec2ad49c9893baa496651c139abfb95692c834a4691bc4bb951d0b1afdd499a8b67c84b873407b584965d3a045d8ef3d9e62b3ccf45de22809a
 DIST libopenaptx-0.2.1.tar.gz 31575 BLAKE2B 531a1b4e8f4a711bf1b36dfea2424b23821dd4f0b50cc367e1298fc7a41f32ec494fdb25907173d1e2685bd0af74d3ebe5a7a3f221f2e57e92bd6d6e2b8b80c8 SHA512 7c7f515585ed41cd276cd3141037ce21e3ebdb713dc932bcdb33320d9910c734bc81e581e2c09b3399b3516c789e5da7128fdab5ab6b5e4f42a86b6ac6d3f28c
-EBUILD libopenaptx-0.2.0.ebuild 1053 BLAKE2B 7148a8c1ff2920630943fc82fa27e2673ce052fc1c03cc27d868a768265ae8ea45bfc252ea9da60b16c38254def2943ac15d45340a8997dd01600378e121250f SHA512 a654349535e1b4638e85fd6cf350de111b4e26cc4133ef144d9f1dcd16cf91121408dec00610d3363e73e366d486aaf4025448e609141ede9fea1d833e900187
+EBUILD libopenaptx-0.2.0.ebuild 1052 BLAKE2B 0bd31710677fd210a422d93af0f3ebac5a5670764c488e8e4be5f9b93c8e17c2d011df8fc229bab4b3ca3c4f9cd68d2906de85086dc4d3a4bfbf047886e71f73 SHA512 01b8bbddfe2d9fb4227bbade0960334e007af4337266735fa2f959cbfd000fa49f79a09c2c9c4e348b373201eca3d9988a8c8add1af43a068f716a7e4e8379df
 EBUILD libopenaptx-0.2.1.ebuild 1012 BLAKE2B 8b4ab8722197e813535dfa19cd15884f72101e4ce7861c18c551834b3303f81242a91a71e931d1d88fe4eb0d58cbb85212f9412262c867b38646b8451f0d41a1 SHA512 9a9e7fbc7eb610b1ef5d0da3a56d968352a68252c26a204cdbee35a9a15d6b1b860eae3349c2cc76cb00be44038885422bddf79015abba4f20e1bf14374b4f85
 EBUILD libopenaptx-9999.ebuild 1022 BLAKE2B ed3d85400142cf3d3fd9de1bf37e2cda897a952f07d2168252c575b0701d5a9003846f4b5605690512bf42f76c69b1f25c9e3a8ca2f0e52943dead7930504179 SHA512 4e9477a48a0cf0d4daea89bef6819b23eefbd8e619cf0973554e56306a450090a3ee7d723d23cb6be7b02c901136cff38c6be8f72844a01c76104b86f34992e9
 MISC metadata.xml 476 BLAKE2B be4271abb0887a42331d01cf6a071b7fcf6b6c9260a6aa0032cb2219fd97a809fccbbc391d5be002b8839d6d1fb78b5c58350053d7198524281dc6520174c0d3 SHA512 7fd6ade1cde67518d8957de391520995cbb0f00559031f7acec69010da500569103f87842dc9ca29921a2c9482354d7ed11c402cb080a79b9d88d3458cf1a78c
diff --git a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
index 2a92d2f71867..4a08c59202ca 100644
--- a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
+++ b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/pali/${PN}"
 else
 	SRC_URI="https://github.com/pali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
new file mode 100644
index 000000000000..2f583295f423
--- /dev/null
+++ b/media-libs/libpulse/Manifest
@@ -0,0 +1,5 @@
+AUX 15.0-no-aec.patch 1709 BLAKE2B 0e31e8a4595525905163453b5f37751aecd63006c791005a74de259958b72be0b1e0e6a4597c839e84b7297c5122c0d0d3f4ccada143a28174a57797baa22a90 SHA512 5547d1d400967dffb868109ff6ebb51a723338d94f6da0b4ff18cb021b898469ef11f00fceddc1afe51643ad13443fc51ee26f3096f2dbd1626710c5895f8e58
+AUX pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch 1045 BLAKE2B f654fb6fefff1eb289b133ca83313ec2c0ba77f63d86134d7ec31616f238b66553ab8817614946bfc5fb0a807edc055f837091ee028fe5f9fc2496e89fefbe6d SHA512 b8ca56b37fd120bd7ba83f7fac32d7908a426588cca9b286189783cb464fb09ca34ef8dc367cc1470b042b5c3a210de3cff3e07a7c93fd7a85c01fbf5ffb56f0
+DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
+EBUILD libpulse-15.0.ebuild 5125 BLAKE2B e6d706d8bd455c9080fe8eb585e1701c9c27e199b17e35f3b7926749732ce9dc3e69551a7d497986120caf6e72aadb4ff8c029640ed565e4e221ca93cab770bc SHA512 71604e06517f74b82d93c4ce52eb137b5bc12419e0dc3be031e143cb8a59d38ee7fc67c8a822963efa2076561bc5f3d7f74a416e0e8754f66f4f936347ea4714
+MISC metadata.xml 622 BLAKE2B 4d143ef69b028fc7668d69fca9cae2b57a2c7e654d415807142098bd1a764e57b335280426d4dccaf2b1a8834bb7f2f18d07148539f0b00266c9851f45881a36 SHA512 efefb947045f47d0e5ddfd8c6a2a575ec2b51165a71b6cba9667e82c86265427d0832cb4f14f0f783e2d1d5261bf453f6730a452a9521b1c88e9989733e1402f
diff --git a/media-libs/libpulse/files/15.0-no-aec.patch b/media-libs/libpulse/files/15.0-no-aec.patch
new file mode 100644
index 000000000000..bd0b4d58b789
--- /dev/null
+++ b/media-libs/libpulse/files/15.0-no-aec.patch
@@ -0,0 +1,45 @@
+From 4ea50aa41ff0131b380aef97623be578b702cac7 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <mart@leio.tech>
+Date: Fri, 24 Sep 2021 00:02:40 +0300
+Subject: [PATCH] build-sys: meson: Relax sanity checks for daemonless builds
+
+Echo canceller, udev and speex resampling is only used by the daemon, so
+don't error or warn about those in -Ddaemon=false builds.
+---
+ meson.build | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index d7e468cab..63ed62342 100644
+--- a/meson.build
++++ b/meson.build
+@@ -961,7 +961,7 @@ message('\n    '.join(summary))
+ 
+ # Sanity checks
+ 
+-if not speex_dep.found() and not webrtc_dep.found() and not get_option('adrian-aec')
++if get_option('daemon') and not speex_dep.found() and not webrtc_dep.found() and not get_option('adrian-aec')
+   error('At least one echo canceller implementation must be available!')
+ endif
+ 
+@@ -981,7 +981,7 @@ if host_machine.system() != 'windows'
+     ]
+     warning('\n' + '\n'.join(message))
+   endif
+-  if host_machine.system() == 'linux' and not udev_dep.found()
++  if host_machine.system() == 'linux' and not udev_dep.found() and get_option('daemon')
+     message = [
+       'You do not have udev support enabled. It is strongly recommended',
+       'that you enable udev support if your platform supports it as it is',
+@@ -990,7 +990,7 @@ if host_machine.system() != 'windows'
+     ]
+     warning('\n' + '\n'.join(message))
+   endif
+-  if not speex_dep.found()
++  if not speex_dep.found() and get_option('daemon')
+     message = [
+       'You do not have speex support enabled. It is strongly recommended',
+       'that you enable speex support if your platform supports it as it is',
+-- 
+2.32.0
+
diff --git a/media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch b/media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
new file mode 100644
index 000000000000..f3df62031d34
--- /dev/null
+++ b/media-libs/libpulse/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/806052
+
+commit 42af3ee08381faa5807fde68d4c8ec0d7ad5e9a5
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Tue Aug 3 09:43:32 2021 +0300
+
+    build-sys: meson: Require xice, xsm and xtst for daemon only
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/613>
+
+--- a/meson.build
++++ b/meson.build
+@@ -681,9 +681,9 @@ endif
+ x11_dep = dependency('x11-xcb', required : get_option('x11'))
+ if x11_dep.found()
+   xcb_dep  = dependency('xcb',  required : true, version : '>= 1.6')
+-  ice_dep  = dependency('ice',  required : true)
+-  sm_dep   = dependency('sm',   required : true)
+-  xtst_dep = dependency('xtst', required : true)
++  ice_dep  = dependency('ice',  required : get_option('daemon'))
++  sm_dep   = dependency('sm',   required : get_option('daemon'))
++  xtst_dep = dependency('xtst', required : get_option('daemon'))
+   cdata.set('HAVE_X11', 1)
+   if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
+     cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
diff --git a/media-libs/libpulse/libpulse-15.0.ebuild b/media-libs/libpulse/libpulse-15.0.ebuild
new file mode 100644
index 000000000000..92f3abe61083
--- /dev/null
+++ b/media-libs/libpulse/libpulse-15.0.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="pulseaudio-${MY_PV}"
+
+inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
+
+DESCRIPTION="Libraries for PulseAudio clients"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
+else
+	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1+"
+
+SLOT="0"
+IUSE="+asyncns dbus doc +glib gtk selinux systemd tcpd test X"
+RESTRICT="!test? ( test )"
+
+# NOTE: libpcre needed in some cases, bug #472228
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+RDEPEND="
+	dev-libs/libatomic_ops
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	virtual/libc
+	asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	selinux? ( sec-policy/selinux-pulseaudio )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	X? ( >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] )
+	|| (
+		elibc_glibc? ( virtual/libc )
+		elibc_uclibc? ( virtual/libc )
+		dev-libs/libpcre:3
+	)
+	!<media-sound/pulseaudio-15.0-r100
+"
+
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )
+	X? ( x11-base/xorg-proto )
+"
+
+# pulseaudio ships a bundled xmltoman, which uses XML::Parser
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	sys-devel/m4
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
+	"${FILESDIR}"/${PV}-no-aec.patch
+)
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		-Ddaemon=false
+		$(meson_native_use_bool doc doxygen)
+		-Dgcov=false
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_native_use_bool test tests)
+		-Ddatabase=simple # Not used for non-daemon, simple database avoids external dep checks
+		-Dstream-restore-clear-old-devices=true
+		-Drunning-from-build-tree=false
+
+		# Paths
+		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
+		-Dsystemduserunitdir=$(systemd_get_userunitdir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+
+		# Optional features
+		-Dalsa=disabled
+		$(meson_feature asyncns)
+		-Davahi=disabled
+		-Dbluez5=disabled
+		-Dbluez5-gstreamer=disabled
+		-Dbluez5-native-headset=false
+		-Dbluez5-ofono-headset=false
+		$(meson_feature dbus)
+		-Delogind=disabled
+		-Dfftw=disabled
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		-Dgsettings=disabled
+		-Dgstreamer=disabled
+		$(meson_native_use_feature gtk)
+		-Dhal-compat=false
+		-Dipv6=true
+		-Djack=disabled
+		-Dlirc=disabled
+		-Dopenssl=disabled
+		-Dorc=disabled
+		-Doss-output=disabled
+		-Dsamplerate=disabled # Matches upstream
+		-Dsoxr=disabled
+		-Dspeex=disabled
+		$(meson_native_use_feature systemd)
+		$(meson_native_use_feature tcpd tcpwrap)
+		-Dudev=disabled
+		-Dvalgrind=auto
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false
+		-Dwebrtc-aec=disabled
+	)
+
+	if multilib_is_native_abi; then
+		# Make padsp work for non-native ABI, supposedly only possible with glibc;
+		# this is used by /usr/bin/padsp that comes from native build, thus we need
+		# this argument for native build
+		if use elibc_glibc; then
+			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
+		fi
+	else
+		emesonargs+=( -Dman=false )
+		if ! use elibc_glibc; then
+			# Non-glibc multilib is probably non-existent but just in case:
+			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
+		fi
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+
+	if multilib_is_native_abi; then
+		if use doc; then
+			einfo "Generating documentation ..."
+			meson_src_compile doxygen
+		fi
+	fi
+}
+
+multilib_src_install() {
+	# The files referenced in the DOCS array do not exist in the multilib source directory,
+	# therefore clear the variable when calling the function that will access it.
+	DOCS= meson_src_install
+
+	if multilib_is_native_abi; then
+		if use doc; then
+			einfo "Installing documentation ..."
+			docinto html
+			dodoc -r doxygen/html/.
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	optfeature_header "PulseAudio can be enhanced by installing the following:"
+	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+}
diff --git a/media-libs/libpulse/metadata.xml b/media-libs/libpulse/metadata.xml
new file mode 100644
index 000000000000..afe3111f5cf9
--- /dev/null
+++ b/media-libs/libpulse/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="glib">
+      Add support to <pkg>dev-libs/glib</pkg>-based mainloop for the
+      libpulse client library, to allow using libpulse on glib-based
+      programs.
+    </flag>
+    <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
+    <flag name="doc">Build the doxygen-described API documentation.</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-libs/libsbsms/Manifest b/media-libs/libsbsms/Manifest
index 3527416aa026..7db20a551636 100644
--- a/media-libs/libsbsms/Manifest
+++ b/media-libs/libsbsms/Manifest
@@ -1,4 +1,6 @@
 AUX libsbsms-2.0.2-cflags.patch 688 BLAKE2B f42728c599064927973f65a1eb3443cdf7a931f4f5d971a61d749ba4f0b990b34d8c47a2d52b08c5720202732e8409f006dae481b94634ba5b97a57f76bfdf40 SHA512 330a26e5b4b99f00546a2f625c4bae90f8a8645e855379e7de4f833a1c561c3c8e23f0faa954a989359f0de09a1310374ff93644d2f646bae3b9788293cfcd29
 DIST libsbsms-2.0.2.tar.gz 450170 BLAKE2B a9e75f1f2a3da2a407d21bd267fe842d2c2367f85e4cb588902ae34e56b76297c2f60968113ae7a08a6652e57bc20376f1a60e97d6d59863f9f1ae30589e0723 SHA512 8aaab3e191f3e10e559683ab4ebdcb8d951cf0e776390234f25675a98640d60d20aed872061ba72fdc3bd7827b7d46bc27225fe947cdd7fa4312f75cbdd78e6c
-EBUILD libsbsms-2.0.2-r1.ebuild 777 BLAKE2B a57fac08003143c2548da453a21a2d0d64a681e9a8a519d91d517e3e58c24b76be684a139ba80009369a39c61feff9c4e50ce32f9b7751d53e02105be9991710 SHA512 ac99a488a13e16b2f304e0c66b10445a13181302518114c10814df0c98ce96466287cf333693a30f25b8df00f0c05cb4384deec3a46bcd28c4c38c882d1a5713
-MISC metadata.xml 335 BLAKE2B b1569910868518fc27b94e4e4c229b9838120b4e881c30cac741329485c948f831fa621dd4c88aa206557478eb89718ebecefac4e2a9675f60e987d50a3a866b SHA512 95c7187884ff8dd166d4b0cd420283e1370d673805d566f9f8fe01cb0198ac5276bf461ed7850aef357182fd6708ef9ccfd1649c4afae1ace2ebd8dec32abbda
+DIST libsbsms-2.3.0.tar.gz 450111 BLAKE2B 3707b573ffef414e5373526704d4e54bf0f53b6bc5d9ce6e69bf22e11e5380eccb65a6c26e3598ee4bf43f341a7dcc6e1a7d7f5113bb649ef9e94b01ba36cc0f SHA512 e5b544c2bdbaa2169236987c7a043838c8d1761b25280c476d7a32656d482c6485cb33f579ea9d1ce586ec7b2913ed8fdcf1abe5c7cc8b9e4eef9ce87de54627
+EBUILD libsbsms-2.0.2-r1.ebuild 784 BLAKE2B 414e5f2dc92fc10d170c6c2cbed4f357b72ad24d2044f040622d0887880af25ee93bd02a23d14c748cce8288d7877b5951e8b8a950dd5ff502b7a53b9eec5bf7 SHA512 b9894035166644c45ace5ec82b0437f6dbdad6d82b6b29bbf780f35c39012fb762fffea6d2260ee5197a59f226ff2fc402e0a15e767c4f58f97335b7fa64dfd7
+EBUILD libsbsms-2.3.0.ebuild 879 BLAKE2B 5ef94cdaffbd1d5f67df68cb47c2085dcc37bbafceb0db07690db64034f5c3e43078aa2c8764288ff7e36045b80675686b84a5c5611a5dc3d51400420ef96cac SHA512 f1014c1987b3c852a20763307f1f90c2d64939e52957033774a0f4e5de8e8e81eb1d3b046455a55518b0625c9ff679e4159f425f2c5ebf0cfaf9a66e55029ee7
+MISC metadata.xml 345 BLAKE2B 6c5e16098765be40aa9fbdcc21c4d9bc154f481481a6968dc186d209e598fc52e4429db625e637d22a52faa482a2fa6a2782ec93f9f2e22e63596fc68a0a297a SHA512 3c20434b2fbcf7e55b76f8fd5df7637b5e9ffef12db88948530036f9474f6960cdc1277378b3dcee3c81d9de75e60bc1363b43c55a5a03062118d6372b6b9a29
diff --git a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
index f4f5d9217be2..cc6a6e5d89ea 100644
--- a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sbsms/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86"
 IUSE="cpu_flags_x86_sse static-libs"
 
 PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
diff --git a/media-libs/libsbsms/libsbsms-2.3.0.ebuild b/media-libs/libsbsms/libsbsms-2.3.0.ebuild
new file mode 100644
index 000000000000..0519a044dd73
--- /dev/null
+++ b/media-libs/libsbsms/libsbsms-2.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+AUTOTOOLS_AUTORECONF=true
+inherit autotools
+
+DESCRIPTION="A library for high quality time and pitch scale modification"
+HOMEPAGE="https://github.com/claytonotey/libsbsms http://sbsms.sourceforge.net/"
+SRC_URI="https://github.com/claytonotey/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="cpu_flags_x86_sse static-libs"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.2-cflags.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		--disable-multithreaded
+		# threaded version causes segfaults
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsbsms/metadata.xml b/media-libs/libsbsms/metadata.xml
index 8af19e1a74b8..7342d79ed0ba 100644
--- a/media-libs/libsbsms/metadata.xml
+++ b/media-libs/libsbsms/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">sbsms</remote-id>
+		<remote-id type="github">claytonotey/libsbsms</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 286322caebf7..42a2fd7f43e6 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,6 +4,5 @@ AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839c
 DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
 DIST SDL2-2.0.16.tar.gz 7227262 BLAKE2B b17c531bc51157c7e64c6ea457342f0707f3f069f0cc096bcd658acc9d70c52416427d9e84bb18f36abe2d6e85095f1704ce6e7bba9e45a9766d78cbe93a5d17 SHA512 ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f
 EBUILD libsdl2-2.0.14-r1.ebuild 6040 BLAKE2B 568f3cf2814d110c76c5eebbb5ecad94315c6b1406afebf10c8d2d92a7a8095126499fafdecc2b87032840e555264053d176688d57977f031c9b89f9bdbddcc4 SHA512 f3ab38be41cf3450e3943dcfb4426f36e81e172acd05b58a847927e83257051daec0f9f5f600bafd20939899279f1dfa466f3f9aeb0ad9030dd603e5a196770a
-EBUILD libsdl2-2.0.14-r2.ebuild 6150 BLAKE2B 724b518edfc15b4cbb98a302d687b090f9450ad2939f9e37b080951a48c8c9ee439e7fd091d6225ff1833220778003fa633e9a22ad6a0a86ec4c347bb20f53de SHA512 9871ab81c2182bdf8110e858593c6ef936d0edb68e007e47056cbc804e519eb1762f88cfbc7e00d719f77836e70645a84ad52173de15c753f99bb227aedb9ded
-EBUILD libsdl2-2.0.16.ebuild 6444 BLAKE2B 25d510c118bf9eaa067944a527643f9e73bd94ae537473840a2b6f6395cb3ccc81556d45f1e01f92b274055638e5d92bccb28ee809b2d7c30ef002139b92077c SHA512 9d5ec0094a1d16e72254c852f16b204495c7a414f4c4641ceded77349a675bdeb64e5d5bc2ab70611d2a4cf089af8c702d1c52fd6719544341ff301ce7633d26
+EBUILD libsdl2-2.0.16.ebuild 6462 BLAKE2B bb87aa2bc641139ee7d2a4f5975140b0ade7f04effe78e88a335715e2ad1ef4589a889fea103d8754ef012664c7f4bc3bb6d04b55d514fd2f95fd3eca045990e SHA512 ab8e573d0a02f9b8298409b6d65b3f82c824dfcfef64132a2c998dac163512cb8a1263936adaa930be6935ff782038e5cec78b324f954383275daca9f0647021
 MISC metadata.xml 1975 BLAKE2B 7ebb6f5306b8d525ff7564f19e86d11ba36579e376b9b691f421fc47f2ac887cda3baa3ad0cac3ab5d761b7df5ee50ce0c6636ed77287eb86a7fd7e587c70dfb SHA512 e163aaa04637301da96ac9fca8c68582227b24fac1ca929f2ff1f2db8b0e0f7c84914b3a4ccb54367d41082d2e24c761228b2110bf099afed9599a5cb3014db7
diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild
deleted file mode 100644
index ff5ea17121fe..000000000000
--- a/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal
-
-MY_P="SDL2-${PV}"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="https://www.libsdl.org/"
-SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
-REQUIRED_USE="
-	alsa? ( sound )
-	fcitx4? ( dbus )
-	gles1? ( video )
-	gles2? ( video )
-	ibus? ( dbus )
-	jack? ( sound )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	sndio? ( sound )
-	vulkan? ( video )
-	wayland? ( gles2 )
-	xinerama? ( X )
-	xscreensaver? ( X )"
-
-CDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	fcitx4? ( app-i18n/fcitx:4 )
-	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] )
-	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
-	ibus? ( app-i18n/ibus )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	kms? (
-		>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm]
-	)
-	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
-	nas? (
-		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	)
-	opengl? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)"
-RDEPEND="${CDEPEND}
-	vulkan? ( media-libs/vulkan-loader )"
-DEPEND="${CDEPEND}
-	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/SDL2/SDL_config.h
-	/usr/include/SDL2/SDL_platform.h
-	/usr/include/SDL2/begin_code.h
-	/usr/include/SDL2/close_code.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.14-static-libs.patch
-	"${FILESDIR}"/${PN}-2.0.14-vulkan.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Unbundle some headers.
-	rm -r src/video/khronos || die
-	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
-
-	# SDL seems to customize SDL_config.h.in to remove macros like
-	# PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from
-	# being reintroduced.
-	# https://bugs.gentoo.org/764959
-	AT_NOEAUTOHEADER="yes" AT_M4DIR="/usr/share/aclocal acinclude" \
-		eautoreconf
-}
-
-multilib_src_configure() {
-	use custom-cflags || strip-flags
-
-	if use ibus; then
-		local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
-	fi
-
-	# sorted by `./configure --help`
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--enable-atomic
-		$(use_enable sound audio)
-		$(use_enable video)
-		--enable-render
-		--enable-events
-		$(use_enable joystick)
-		$(use_enable haptic)
-		--enable-power
-		--enable-filesystem
-		$(use_enable threads)
-		--enable-timers
-		--enable-file
-		--enable-loadso
-		--enable-cpuinfo
-		--enable-assembly
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_sse ssemath)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_3dnow 3dnow)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable oss)
-		$(use_enable alsa)
-		--disable-alsa-shared
-		$(use_enable jack)
-		--disable-jack-shared
-		--disable-esd
-		$(use_enable pulseaudio)
-		--disable-pulseaudio-shared
-		--disable-arts
-		$(use_enable libsamplerate)
-		$(use_enable nas)
-		--disable-nas-shared
-		$(use_enable sndio)
-		--disable-sndio-shared
-		$(use_enable sound diskaudio)
-		$(use_enable sound dummyaudio)
-		$(use_enable wayland video-wayland)
-		--disable-wayland-shared
-		$(use_enable video_cards_vc4 video-rpi)
-		$(use_enable X video-x11)
-		--disable-x11-shared
-		$(use_enable X video-x11-xcursor)
-		$(use_enable X video-x11-xdbe)
-		$(use_enable xinerama video-x11-xinerama)
-		$(use_enable X video-x11-xinput)
-		$(use_enable X video-x11-xrandr)
-		$(use_enable xscreensaver video-x11-scrnsaver)
-		$(use_enable X video-x11-xshape)
-		$(use_enable X video-x11-vm)
-		$(use_enable aqua video-cocoa)
-		--disable-video-directfb
-		--disable-fusionsound
-		--disable-fusionsound-shared
-		$(use_enable kms video-kmsdrm)
-		--disable-kmsdrm-shared
-		$(use_enable video video-dummy)
-		$(use_enable opengl video-opengl)
-		$(use_enable gles1 video-opengles1)
-		$(use_enable gles2 video-opengles2)
-		$(use_enable vulkan video-vulkan)
-		$(use_enable udev libudev)
-		$(use_enable dbus)
-		$(use_enable fcitx4 fcitx)
-		$(use_enable ibus)
-		--disable-directx
-		--disable-rpath
-		--disable-render-d3d
-		$(use_with X x)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# Do not delete the static .a libraries here as some are
-	# mandatory. They may be needed even when linking dynamically.
-	find "${ED}" -type f -name "*.la" -delete || die
-	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
-}
diff --git a/media-libs/libsdl2/libsdl2-2.0.16.ebuild b/media-libs/libsdl2/libsdl2-2.0.16.ebuild
index 1b9c8bdf53b8..b36fbd0f755a 100644
--- a/media-libs/libsdl2/libsdl2-2.0.16.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
@@ -20,6 +20,7 @@ REQUIRED_USE="
 	fcitx4? ( dbus )
 	gles1? ( video )
 	gles2? ( video )
+	haptic? ( joystick )
 	ibus? ( dbus )
 	jack? ( sound )
 	nas? ( sound )
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index 67aaec75f44d..3d30a36f9ee7 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,5 +1,5 @@
-DIST libsidplayfp-2.2.1.tar.gz 793924 BLAKE2B a1f11cc4100f18bdd1732c704ac87093d5626627f3b6fc215292e43e63061a79ca8870c3e5a6ea945e24f40a4207d3173e7fed5e05ea52981784389bcfb2af29 SHA512 34a8f6abf6a60ea3fa774e5884736e6dfdff1de9290b656e4ae783e1e15d7b197b03bf400ca0018fd569cfc16a2e30ccb41d0008e800c30f895cd6e3432b048e
 DIST libsidplayfp-2.2.2.tar.gz 794119 BLAKE2B eb0fd39e8bffdce45d081f5dab9074db9642e74f9bd06a5f17453254bb1ab4f0348a9b49e43a00a0f5cbff57fe3ddd1408cbf048bd228784fd5b1ac19700f944 SHA512 46882c5edd20a5b00ee5b46b0b6c65c0987c33406532f0b1f1750b0f8faf2968ee45e68ee65e6ca9cc39123273b08e139a8614ba9878d14099388e647e3bad1b
-EBUILD libsidplayfp-2.2.1.ebuild 665 BLAKE2B 563e14bd896eb511e1ce667406a261d5c52ab95b0373da739fd03027637bf1f1fc5acc63f5402a40748c3bc6a13920f7e92de8ee837ac3dc325ef04a83746c56 SHA512 65e3fb6b69d93de476b10cbe0c19581e3354d005eb4c3abb89e3f1ec883e8f9b7c75c169dc8cc86157b78817ea2d0a67ab2d1b11fc4a09dd2991a446b317de05
-EBUILD libsidplayfp-2.2.2.ebuild 667 BLAKE2B 967fc98eaf34234ffa21cc42000363ebd8c897d16aa627b8620f1042759d08edafdd7882d038e42e1d8d64650ab84073d52365ddb9722137b2e07123fb9f0ce9 SHA512 90a1367d0ce9d9022c83636dd8ed761606abb211580c882ad1fc83992d1e3b7161a1b5a2ccdd7c55bf494518fc2d27580d8a249ed7df98374a0f519a5de418eb
+DIST libsidplayfp-2.3.0.tar.gz 794863 BLAKE2B 5727cdaf155711f8fe582cfa49d868be89fcf7e9f58cb7b8d83fefecbb04830a04957f8f176527928da26cb47c7508d534c1b35607cc713610ddcd920b760049 SHA512 2141bc9768353fadbb8c6f4ba6904388048d4d1432424b87fe60162135059d5c9312f7bf01c67a75eda8b4697d801bc2020f88b696794311eef88864ae65d974
+EBUILD libsidplayfp-2.2.2.ebuild 672 BLAKE2B 876f2522a085c81373bc6b92462523b10b5f7a1e31f1685ba4f7d28eadc54df685b131c7c2dd9a0cdf1536aa188f05c03c74d79b54007593678cd8bc8108e5ea SHA512 065c651fb8242df4f9d7d050fa8f74a5457ae35080535ca1ca0f399f013c72ca4bc3dcf1b30190bddaa2e43f1865bf703c3f26728edce4333c2867005b4804d0
+EBUILD libsidplayfp-2.3.0.ebuild 674 BLAKE2B 25a34a5a8039a3874789b69dbdd54d79512e86a99b7a8e968739084b33c325fec6ef16d033b17662bedfba990b624db23e5385b66be796458174f3187b677863 SHA512 39c4e36c7d1a4aea65993b8e0f04a1f533ffd3d0f9829b7f2e0511016e2d0f3991ee376a30a361fd95b391c6c51cd57671991b4b705429106185e122475802d8
 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild
index 219eebf19780..c7f632d763da 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~riscv x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild
index ecc3f9988790..59fb066277dc 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="~amd64 ~hppa ~riscv ~x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index a780ba768279..ff23e1d0952c 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,5 +1,5 @@
-DIST soundtouch-2.2.tar.bz2 527571 BLAKE2B 0ed67604f0996a9112cbabad9eda39c314aa1f3b1b70aac2a014f76880cb5ad06aeb697f44e9229ad197c9245ce8f684f5fb9b31ce31ae631400a17fe825679f SHA512 8bc1b9aa60031145e8be7ab48d10d93da84b0f5032eb2d8cf46291d4267b6810513f284f6fa72dd6f343e30eeec03070a7485cd933f30bace2ebf995bc843143
 DIST soundtouch-2.3.0.tar.bz2 528840 BLAKE2B e76627c323c223a067db6fd65a08661f39c9b55e0eb8ead7d643f92707dc56b8d235eded27a95d5eb1ea751d15336d4cb4b757c4abb2f6780258d81899484241 SHA512 f85974d7afd010bd874a4ffc51abf4013694334bfb09071f1c4d478641d34b5eecb9efc6ac41d8f0e6a5d1cb4095289316c124c522b4ca3fbd6a91b6cfc83083
-EBUILD libsoundtouch-2.2.ebuild 1520 BLAKE2B 705d5129d3a63288122abea8678e54ef1e390dd5ff7257eec7843b4e1f41e3eeaf121922d30fac9ce0c231fd864eb6c441a2dc735d04db5786797427941cfe17 SHA512 78764152c7b4cc941422515013cc82c63c4fe992de1dfbea87213fbf81fec3122405905837ec26da80d93d7ba4dbfdf75453d0427acfa37d5a51c3bc858a39f5
-EBUILD libsoundtouch-2.3.0.ebuild 1524 BLAKE2B 5dfeb54696c03bcc4d95d28798230ffd4dd60c63a40abfcf1498ff5dfd10300e84e568aff4ed7a01715d315b953f92d935182550c8cfb0d9570894837039ed08 SHA512 d8b236a447e751fbf04d45069748260efb46db7628b4e5e9e0fffcc8d86f2c8088ebecb830b6155780214bbe97ffda2bf4079d1c2398b15cd89909b0b38c5fe3
+DIST soundtouch-2.3.1.tar.bz2 529126 BLAKE2B f8ba587ac199cd1e91f3d3487b81457b7c7bb2b4dca8867376ae47f92bf4d5e60aef3d310eab56510995d5ce72e94ce55ecc4e601bfb3b4eba52c40982032d6b SHA512 9fac7484aead1a20aae019b29847ea13ad6d8cb72272313fcffd859b31479d2ab2fe2f69cfef2b3fd35e9b03923d095bf44a67b46f2b313ac711aa31df0fdd59
+EBUILD libsoundtouch-2.3.0.ebuild 1527 BLAKE2B 6c3759c10c61cb7e44003227b62768af264078d9b37dd0b68dbf32744ed37b9a307a5de2f580ecdd17ff67bfa21abccb8b42e41b6585a0c6f293ea0085d9533f SHA512 7a8e5cd0c311e36615cfad4fe79977df0ce8ab61b82cd5ed79f923ac111ca21b244a07c6148b49395571ede4d1f001b602361932bf5fc988294b9f3b325ae50c
+EBUILD libsoundtouch-2.3.1.ebuild 1518 BLAKE2B 95f57cf52e851fb89a435d1c4811ec6ead5bb74761d6ced365192c5c197c5ef6e46715a3d683e0f50a678b26daf09f5ac58ee79d0310275355a12def455be53f SHA512 550619d5a61fc8653bf8d852cfc402b0df53e5ae5aa2b14c631eb352c7be46965cf6bc4428dcd819369921a72d5fb24736dd3608cfd7bfddf302950070cc8ac0
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild
index 05a3b1ff14d0..6d1ccebfc717 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild
index 1a94984f85b0..f9bd26503556 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.2.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+inherit autotools multilib-minimal toolchain-funcs
 
 MY_PN=${PN/lib}
 MY_P=${MY_PN}-${PV}
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index ed9ed5c2d0c0..0a9af0753997 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,3 +1,3 @@
 DIST libtgvoip-2.4.4_p20210302.tar.gz 1097895 BLAKE2B 36551fb915ee5b5895d8ea68196be5a910739e46886c879bd9f932fa2294a94c22ec3215a94d9bad05a5d24519291676a686c594b74f513f594eb063c83de012 SHA512 d8e27be18e521f367a30c63665300496dbd8fe250261fddf5576325afc27d855e280ee31e46d5fcc2294d79a91c4003732e22f2bfb6db0472e357508b5053d29
-EBUILD libtgvoip-2.4.4_p20210302-r2.ebuild 1437 BLAKE2B 09e583c81ae311569e4efa058e8ef191c293a093b5c28fd340b4802577d5625cebe2306f20d0d89e6fdb8ad5925f6728b6472c355637c40686acf113cfeb3e1d SHA512 5517782545491e9813bb6141f1f02bcd18a0f629e0290bc621c45bd68be316262678ae0fcaee20669962dd4c1b5ffe1154665bddda1cd39b53b773f14e84d9fd
+EBUILD libtgvoip-2.4.4_p20210302-r3.ebuild 1490 BLAKE2B 22e7ae002cd408f8dcb1e4ad80a5a83c9976e28a82a41c73536cc7b349c7a43c9484beed9be686de3f163f0fc300c7933aef5d1890532c0b30622ad5ff1a4231 SHA512 a54c06cbed0e525dd22451e21450a1b83d2d6bb886624a05e314d17907330169318209ba6d55af95d6a458df9cf9c5e98719184f0987eeb5e9097ace032e1c0b
 MISC metadata.xml 543 BLAKE2B 56f3e74859e09ff7ecaa4f068e1872257213a7239cd946c920c0b2e7e12cfc0bdb314ca1fb0a75b489abd5ae5c4e5b4218ced1b3ee78e60a4e82558100d68e1f SHA512 83e39833446eb97c76280a81e428bdd64b5c46a052e1b87bdc19a5db31478f1004e3ae6f323c7983992541bf9d15f155037523990964ccae4ad8653396f7534b
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r3.ebuild
index 99fafdec5f31..0707106c59bf 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r3.ebuild
@@ -18,7 +18,8 @@ KEYWORDS="amd64 ~ppc64"
 IUSE="+dsp +alsa pulseaudio"
 
 DEPEND="
-	media-libs/opus:=
+	dev-libs/openssl:=
+	media-libs/opus
 	alsa? ( media-libs/alsa-lib )
 	dsp? ( media-libs/tg_owt:= )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -40,6 +41,7 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		# EAPI8: Remove --disable-static
 		--disable-static
 		--disable-dsp  # WebRTC is linked from tg_owt
 		$(use_with alsa)
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index cd5d28c26954..a233a9b2d826 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,5 +1,5 @@
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
 DIST libwebp-1.2.0.tar.gz 4092120 BLAKE2B 213b2385f646dd0fbaa7c9103b0d33a9cb5e7285d9df91107db722f514428ab8cc896704d71a3913ca1aedffeb706fcda4c7a59a3960ebc21c74ca9422632605 SHA512 c46b41899a543cc80914c89646dd607dbb5d025a9727dd83ef70994b9310eedc697666bd812141a90aa16632a9a354a031d9360a9ee1112295c7e154e69f0b74
 EBUILD libwebp-1.1.0.ebuild 1838 BLAKE2B 104227fcf8dc4c6abae133dde661f269ca77bacd915fc502c38b0123a9df48006ebdd96b607cdcc187a7e1da6eb4d4903e57988878a844269e3dcaf13cf4071e SHA512 cf3218f03cd046b6a8d8e5236a13f418b346feab3a4b1004ba3925da6e55f7b82cfc009606afd418082f4ebb7eb81b60b523a2dec903a18b1ef8d4f26aad29f8
-EBUILD libwebp-1.2.0.ebuild 1846 BLAKE2B 251fdfc4a1b25cc1ebd333199709d3f70335393c7d86602ccc6ed7626ba41babe7a512b075ac81e3102dcb50de0f47e91628c894f95af9716e11b75a8a0e6fee SHA512 a54f5f102f1e539088872280ca43bba45070eb9ee060ebf8245d0a04b69810a3a86e2a671f65005562683006d11907ad0ddf998be099db87de16e1c3d6b77cc8
+EBUILD libwebp-1.2.0.ebuild 1852 BLAKE2B 0d52ceb076a72cbd0399213cb507fd705ab34ea0fa021b90384cfd6e718920827a80b1c98c8866a01e404cc92a1f1942c5bc888615d5450d7ba3d7a904398ba7 SHA512 d894ec1c5427d9a396b46bae6675739dd3aaecc32297d0843282b87a61d9dff89fff7ce674172f95a7704d5bd6735041c8d80bde88404aa1d6fd539985ba6211
 MISC metadata.xml 432 BLAKE2B e1d2cb38a6bfc88fa08fdb597f334d735eb85252978698de1a19157c3ebd2cd7e362c5d4a19b7ff4c383030e5829007b6e3439cb06b5c2a3adff81479c864bd3 SHA512 923d26fcb2dc0be5cf51ad21fe5aa3de712d2a491f14d8b5e0c263e555757f35b3ddb10a49ce4de33eaae5ff2774994e5751edabeac6bac2c0e50a7fa78b68cd
diff --git a/media-libs/libwebp/libwebp-1.2.0.ebuild b/media-libs/libwebp/libwebp-1.2.0.ebuild
index 958ddc327555..ac28d36ff548 100644
--- a/media-libs/libwebp/libwebp-1.2.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index ba4d7e1e28f5..264d82772693 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,9 @@
+AUX 21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch 1732 BLAKE2B c06e24858e2020fba9ce8e5c633ee36d359666cfb272235309c23e3f207b7437cedfd9b4222c85cf159ed48ff0a8972919529cdfda77b63c044ed44fb5e17ac5 SHA512 eac084ba5c2dfa05c06d6c9fc567f4ac761516206ea8727b4cb058ecff38ed77c333900c3ca73253e7303428706c7b3d2925b8605d633dac58a26659bc7af64b
 DIST mesa-21.1.7.tar.xz 15391776 BLAKE2B a9138f189ef953d5efa4e287fbbe795ef2539c113dc7e0f565d3f35dcfaa59ab08674bf37fda196ba34e5963637c3ebb133db40b558bd275e29c8387b1acfdfa SHA512 1fd677437f292c30fbf08bfef8c1088557841f426090ccba20ab2a222b08fb5c3ec48a7a0301466e03a23019d09414c700a4f5e299479cacd6972a9f3ba030c8
 DIST mesa-21.1.8.tar.xz 15410504 BLAKE2B 430a1a5f3120bb69b7eaab13438d9a09201f5b11c9d4581d7dd39f48041a1b70d7c125f36553a5c504d1164fe6e0e3d50853c209c4280787f4fa6935ab385b86 SHA512 80fcf2b1d59b49e384e9aa1ae63a3ce709833059af1ffd8eb821054c1976709134098cfc79fac1578a2f08a003223f1c96b38e2e650c5be49821c6f2fe1047af
-DIST mesa-21.2.1.tar.xz 15703468 BLAKE2B 5f92833237d2a570506e309472a6a8d1335870f151d31288cc01e41b0861694de16f7d6361c04d527e49a750758319da046ddba9876b18a5404cceaa865024a7 SHA512 d4056287ec86f7a95ce534a251a1ccbc3a3b08a2f7112152def2f054fc8a9424501d5883c463554ee95fe2dafb832613efd7145e989ee8281948233942730c2c
+DIST mesa-21.2.2.tar.xz 15755212 BLAKE2B a9c0f847d8d372fac076bd1a2a2113f34d4f5f57d5d459f88b2d1a14bd8a2a442d70c2959637ac17836d8be13941c2192bf639f42d3a7eaf7d8cdb5175268389 SHA512 0a4877b405384088c8bdac3031444cd22377d19552c41c08fb8928d6edf23d5f5a237ef1d6c5f96e3293c2e90c63f4702813226b85cb304fe5e01dd2710ba697
 EBUILD mesa-21.1.7.ebuild 14933 BLAKE2B 9f7e8cc4f522d6a7b1fbd65e2e12010a7c4132cd403674aaef2170af7247a642b1dc61ca14bf4cb1595c6f14ac94f383a602d7320836b6ee5d0d26ef17886951 SHA512 ef20ed369384d62a639045bd60faffecf7583df00fc67ba5aa88df2263d5bb47ea753b21074194f81b7ab051acb8eedbcad09c5508c662dd50ebcc0fc3a75f24
-EBUILD mesa-21.1.8.ebuild 14940 BLAKE2B 9f807ce55721b04414263282a07b055520f4dc6f56da01271ae2c9f3e8f837f6fb056f4ac1073cf382ff2aa713d0782d7b60f9217f424f593dcc76e447c33efd SHA512 ab0dc007520319f7cc591b784d59e315785691ab081d00a1ae5e8658011e2e1fe293cacece60850217f13a1493dd49d83e8ecb71cece3a6790025f4d66f3a392
-EBUILD mesa-21.2.1.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
+EBUILD mesa-21.1.8-r1.ebuild 15033 BLAKE2B cbc17e08f8e8647f83b57d8d0c27389287a17ca499acd449a25819db92aa7a86004acd0b6c05a34e104f518b3f47439082e8c2dcd37e0253521809540baee1e4 SHA512 2525f91bae3559ef3e016aa38e53c8bdff3442ac36325b90615e9ef5971fef418506df0f852fb823d4a7f41462d4c9a7730084e19ad864650b9fe5762387ea86
+EBUILD mesa-21.2.2.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 EBUILD mesa-9999.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 MISC metadata.xml 1896 BLAKE2B 579a066dd2fa70f2063ff020676fc6a342bc5d04555e4026868f14816a6ff6efb85824a8d689ce4984a1d7fae17548ad8331d209d9bfdb21ef186c895656ff9d SHA512 8c958d7cdd3bfa987683c6b2cb27b6f02d6ef4ddbf7954ec05ed1e5c2a046fbeb49b059e1a6f48d727855c575bd30f04c2898451ae5a02a40370e0bfba93f117
diff --git a/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch b/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
new file mode 100644
index 000000000000..ebbb8abb1fe5
--- /dev/null
+++ b/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
@@ -0,0 +1,46 @@
+From 8de60a1654a875d0b55512a1508f541f706f9b97 Mon Sep 17 00:00:00 2001
+From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
+Date: Sat, 4 Sep 2021 03:32:21 +0200
+Subject: [PATCH] util/fossilize_db: Don't corrupt keys during entry read.
+
+We change the hash that is still used to set entry->key.
+
+Fixes: d2d642cc014 "util/fossilize_db: Only allocate entries after full read."
+Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12725>
+---
+ src/util/fossilize_db.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
+index e1709a1ff64..26024101b83 100644
+--- a/src/util/fossilize_db.c
++++ b/src/util/fossilize_db.c
+@@ -156,18 +156,18 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx)
+       offset += header->payload_size;
+       parsed_offset = offset;
+ 
+-      /* Truncate the entry's hash string to a 64bit hash for use with a
+-       * 64bit hash table for looking up file offsets.
+-       */
+-      hash_str[16] = '\0';
+-      uint64_t key = strtoull(hash_str, NULL, 16);
+-
+       struct foz_db_entry *entry = ralloc(foz_db->mem_ctx,
+                                           struct foz_db_entry);
+       entry->header = *header;
+       entry->file_idx = file_idx;
+       _mesa_sha1_hex_to_sha1(entry->key, hash_str);
+ 
++      /* Truncate the entry's hash string to a 64bit hash for use with a
++       * 64bit hash table for looking up file offsets.
++       */
++      hash_str[16] = '\0';
++      uint64_t key = strtoull(hash_str, NULL, 16);
++
+       entry->offset = cache_offset;
+ 
+       _mesa_hash_table_u64_insert(foz_db->index_db, key, entry);
+-- 
+2.32.0
+
diff --git a/media-libs/mesa/mesa-21.1.8.ebuild b/media-libs/mesa/mesa-21.1.8-r1.ebuild
index 2849134b7198..482b96c702ab 100644
--- a/media-libs/mesa/mesa-21.1.8.ebuild
+++ b/media-libs/mesa/mesa-21.1.8-r1.ebuild
@@ -229,6 +229,10 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
+)
+
 S="${WORKDIR}/${MY_P}"
 EGIT_CHECKOUT_DIR=${S}
 
diff --git a/media-libs/mesa/mesa-21.2.1.ebuild b/media-libs/mesa/mesa-21.2.2.ebuild
index e3fd921bbaa0..e3fd921bbaa0 100644
--- a/media-libs/mesa/mesa-21.2.1.ebuild
+++ b/media-libs/mesa/mesa-21.2.2.ebuild
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 5787e92d9bb8..8beaa7b9b65d 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -16,5 +16,5 @@ DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa390
 DIST netpbm-10.86.22.tar.xz 3696588 BLAKE2B eabc11b4928681f2d96c8b6da1e23284868d7ba2f610f496d1ddf5b6ceb34c991160780f79c69b2c905e5210b024a1a5868656b89e23d6b63e587ce0cd70a950 SHA512 5840d0e88158ac77be7dfc5430e696701a740d56c98efdaf02b3c4e92bdf10268572ef0087b3bf263937073e0fbda3183aa7ed56bfe12dba30b3a3ff382bd4ff
 EBUILD netpbm-10.70.00.ebuild 5382 BLAKE2B 8b5a70217742d7f87b59c16d777b040277cd582929a7ae5fdf3d7ca1287e598e5204d498a4b38cd3e54fd3411bfc2d2ead8cf2ee030ce34f0594d3894ff45f7d SHA512 bca0a73ebb20f6eb7543048c0e34eabf5c8a3652c8b43ab357ba3742b649bd1075ff97c522da910b80e9d9feb8125103eea4df5373b00cf7d44851bd9927c786
 EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B c94c55e373301f8506a9ee6275865f0702c0bcc5ceeccf2b8433dedf71f99834475dd27ef5328db4c9d9eda5b7a5ce3943cd59e3e19e8e6db22bc35741cbf911 SHA512 a79ddc4ab964ed64e29d644ca33fc0bed01e0c90e96a3aa38d6a6be30039b5cff2dd86f8c5a798982df9e353d286e461ae560e8be6c98e008cfdd345927c611f
-EBUILD netpbm-10.86.22.ebuild 5748 BLAKE2B dd65cbbe4e7928f99c2e4f60bccb0aa86d9c8110ea82a9016ec0ed30faafb9fd2ed9f65629bb59fc99026465cab98b78ccd2f58df5855fc12b07ab8e4ed66d69 SHA512 00095708dc7a5eb74f8620b203875e9cefdc70bc57535b8a2c3371c8b98464a9f9779fde43ed3b9b69059f8dc6db70d880f90fcd210c55fdeae6959886da12f0
+EBUILD netpbm-10.86.22.ebuild 5754 BLAKE2B c554f780abcdfd3c410fd449543a3db724d95e0bc3aec1338b87c97a83b8b2a6ff2271143049abf1ad331a4b8a8e5c70ee8a2cf4b69bd55164774221459f4eeb SHA512 bf47679b311c675a3f641dc3eb96782f0466378fc6805a6ae1055c1a5abbea2469effe68bcc64a6ccf0b19bc44ed4ad5cfabf44b12cd041d493b28af2dc16b27
 MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/netpbm-10.86.22.ebuild b/media-libs/netpbm/netpbm-10.86.22.ebuild
index 4fd56a25b07c..402cbd40216d 100644
--- a/media-libs/netpbm/netpbm-10.86.22.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 BDEPEND="
diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index 67b2026cd4ee..79b689ba1527 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -2,5 +2,5 @@ DIST oidn-1.3.0-glibc.patch.bz2 6359 BLAKE2B 743cd87f92bc89182de716254f89136e690
 DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a SHA512 19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
 DIST oidn-1.4.1.tar.gz 50448597 BLAKE2B f5a1dcafa058eb1fa46f1b397599075f45ca0145e51692014a47405e9d1ac2f681a1a23ead50d6bdfcf1750f7504a992218b65d984a6daf2780e829598172f3c SHA512 6551bb038692a1c00a0a408f1682d8609a8c74470a2c4f439af80c1332d4237e723a655a9b7ef95f93c6cbe52fdb3a46a84539f5cdc90073d716afd7b48c3615
 EBUILD oidn-1.3.0.ebuild 917 BLAKE2B e757f6fe8a21d1e8d53cc2025010f05deb66cd8e1759e904a3bee61edd580de3dc37660c824cbb0a6453cca6e30e098fd3ca0c086ed789e758d912ac6b673d2f SHA512 c9afe0e8a5aac18a1e9ee9df43097f640dd4fb48a2f7a456e3a06c88684f6605355d944235813e73bee68466feabfcc0dd4d8ed28e3886ae1255c5244c339b19
-EBUILD oidn-1.4.1.ebuild 778 BLAKE2B 69f7306b9a97da2d1dd116ec6b509a9db0ad4f16bdf313d459a4a99bab3a1e9d3b0bd7855d8d60f7931742c71b87c728cbdaaff6b93779bc7302083f717a588c SHA512 f29c961b0f4cea0f7958e754d3dd9239ac75a6d473016fc8bdfe76117ece39cd27fa62e367ddbab4bae98b18b2841f2510cff10d33c16098af36a360910b6697
+EBUILD oidn-1.4.1.ebuild 797 BLAKE2B 825895defd577f7a247dd2878ef648e7128f2290ba500584332bb5705436576d00405b88372a189a063f28be3a10ece5e290cb74694eed674db2ec0694fe65ab SHA512 6c57123fcb4449f8aab863f64c0eafbe3bf28ae76798f8812d57b6872f7ccff8c1ac4d0fdca220e4aa65f2f71f63fcc35e3f715e52ad9b708f1869212fe242b6
 MISC metadata.xml 754 BLAKE2B b1be901e2f498cb917222e495a89f5515c2837a83e086e5a7c8db5f571ce50401d3ca82546e61ab3507de3d3068eee4ee8c85b3430565eb3db7c3cfc3194f827 SHA512 1806e677d62ae2b3cc2857eb05d106abf840a1e1fc21d1a875716441ffe3db1a13c5d96ca9316b2285c43fda4e2d62829ceb4b32ad13ecea2a521a1b1ed84096
diff --git a/media-libs/oidn/oidn-1.4.1.ebuild b/media-libs/oidn/oidn-1.4.1.ebuild
index c93dbc1e24ad..86732c4f1ae6 100644
--- a/media-libs/oidn/oidn-1.4.1.ebuild
+++ b/media-libs/oidn/oidn-1.4.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 31a6b700dfb6..18a9eab9e2e8 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -9,7 +9,9 @@ AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf44
 DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
 DIST opencolorio-2.0.0.tar.gz 9892414 BLAKE2B fdff2e144eadb444624f059f7582ea99d4e2dbd53cad5b89f92d19c7ca9dda2ff9ec4f8c8d00e6ac083da21134f9bc783b297c553a8e7d11936c936e5c41a2f3 SHA512 7110a1a30a5fa64b81d7fc5e33234673aaddbad5e19ce7f21436c590edd7d2ce767650c9a934011a96e53132c030bd0b654fcf93ad79c1bfc8c050762c57f6d0
 DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159 SHA512 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338
+DIST opencolorio-2.0.2.tar.gz 10812416 BLAKE2B 36f008035c36bef9473f9f79e9362eec20abb8e217a2131d3a2be5766de60cdab36e137547d414bf18e97ad368e30fb89a0ad4d8095b24bd184704d88ef192ae SHA512 ebc6b4b4251f69cb69f7203bc9ae962010f7f60ed5d53eb3ff14b64d5ef8cac2b98d0482485f1adaaf6b8c065cd4edd01c4e0577324a86ed4ebfe8e33e9fa667
 EBUILD opencolorio-1.1.1-r1.ebuild 2627 BLAKE2B 3a04ff5740dd6e830ba17f2356f2a2b87e1de465e7d103fea654ac95438160abd3dda92a7d6503fd2749542fb8d5717f547adf8a445a98db9c39e690949e6200 SHA512 f58868e63953ee16aa995cb6042458c510bfc3892f11f0e2f37a048b28678189d3fd4a787b5d2d4975e5b2fbdbc119d4cb2131d9fc1227bd3b594f807766aabe
 EBUILD opencolorio-2.0.0.ebuild 2773 BLAKE2B f1469f1917fa14f9cec3a9e5bb799a8c4a38b670a5fae43f9468fe7f97f0e49fdffd49f77958e0dee2d2b8367492fa61642b8177bc06290bd37e256cf72d49e4 SHA512 e527cc50a8d148ddb36ebb9d2e661e2be3c5b0558b7d8b8eaa4b2fc935a835954cffab1fb17f60a985b193818f3951d3e305398885ea329713fa7acfb3048650
-EBUILD opencolorio-2.0.1.ebuild 2685 BLAKE2B 5001664e0d729861378707bba636f8af2cb89592a10ffe10b091a5c04d89aff567b8ef67baf6914e670b8b95d16c9dbab8ff720d436533a8f8cdfdb3e08718f0 SHA512 f9aa4dc1c2335c828635ad578df7bba3fe9d4c208cae3208d51f6eac03aa6894884bfc3327d1877547a9ef77b3c7e4239becec172e85048a2fe694fbefdf66d0
+EBUILD opencolorio-2.0.1.ebuild 2702 BLAKE2B 6733c6ba420b54df3479186798392f4ed923b8cebebbce75b00b0b40c67175719908511ff47ea25bacb4c36e1d93301a418b77339fc4bd18ca90ec23b9d85d14 SHA512 1565919a9cdcbc8bcc82fd9ec916db28691e86067942b17568d5ecbfaaf3e1695bdc429fdef0b55ec2777305275976b5f8e572dff20c9bc82b552897d940b390
+EBUILD opencolorio-2.0.2.ebuild 2708 BLAKE2B 3e1081e167d56e1eed3f0b9a211442b9568153efc6c74d8b4ba9718c770d6cbfc12547d6dee1693f76e2336c6a74ab4d060d10548aa684bd02582c38b1c7bb81 SHA512 efee09f6ce289b679d4c9035ee33eb62f773f9fa5460af1cf04ce405b8beca91f4cebe2d5875a1eda40377fa332cf834b07bf4aa5498a2c45cb6c4e1619594e3
 MISC metadata.xml 460 BLAKE2B 564c46a6d12ec479bfbe92401cda933760a3fbfd72b83221f8edc927a01eb5f18ecab877184b95aa5bcc8af20a0c36fbff8c6f45bf7ce2996c795b0f8fac1c9c SHA512 d58b105d94f1f11e52f1e88b9cb24885b5369207c3fa2a6ab4c2133c22e2b47a887a8358b79ea53cc9bdd63a44bb18672e5d26d614074e0bc08539cb4e73b49a
diff --git a/media-libs/opencolorio/opencolorio-2.0.1.ebuild b/media-libs/opencolorio/opencolorio-2.0.1.ebuild
index ecaac6c1a4aa..48d1c400dd1a 100644
--- a/media-libs/opencolorio/opencolorio-2.0.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/O
 SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/OpenColorIO-${PV}"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="BSD"
 SLOT="0"
 IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
diff --git a/media-libs/opencolorio/opencolorio-2.0.2.ebuild b/media-libs/opencolorio/opencolorio-2.0.2.ebuild
new file mode 100644
index 000000000000..1367951a8fda
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.0.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
+SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-cpp/pystring
+	dev-python/pybind11
+	media-libs/ilmbase
+	dev-cpp/yaml-cpp:=
+	dev-libs/tinyxml
+	opengl? (
+		media-libs/lcms:2
+		>=media-libs/openimageio-2.2.13.0
+		media-libs/glew:=
+		media-libs/freeglut
+		virtual/opengl
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16.2-r1
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/testresources[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+	sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+}
+
+src_configure() {
+	# Missing features:
+	# - Truelight and Nuke are not in portage for now, so their support are disabled
+	# - Java bindings was not tested, so disabled
+	# Notes:
+	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DOCIO_BUILD_STATIC=$(usex static-libs)
+		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_APPS=$(usex opengl)
+		-DOCIO_BUILD_PYTHON=$(usex python)
+		-DOCIO_BUILD_JAVA=OFF
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_BUILD_TESTS=$(usex test)
+		-DOCIO_BUILD_GPU_TESTS=$(usex test)
+		-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
+		-DOCIO_INSTALL_EXT_PACKAGES=NONE
+	)
+
+	# We need this to work around asserts that can trigger even in proper use cases.
+	# See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
+	append-flags -DNDEBUG
+
+	cmake_src_configure
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index fa5bf2b934f7..fbadac381b08 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -3,9 +3,11 @@ DIST openimageio-2.2.13.1.tar.gz 29265740 BLAKE2B 98403db440410d391ff150a988ac5c
 DIST openimageio-2.2.14.0.tar.gz 29226972 BLAKE2B 29daaf4fb987b77dffdd8cb29c5f67a80c20c49cd5dc369e68a5588a61fae7119aeb22814886e68eb055f2a66e02e75afba25991f8edc14752ccacf6599d889f SHA512 063291c0bd742b79a7b6065a41856b84732af2e2e404265262aa9ba91d07209fb308ecf0403a139d7021b8062f9c3e1b92a725a7cad091af1bcf45499ae47a82
 DIST openimageio-2.2.15.0.tar.gz 29238071 BLAKE2B f74f779635b7ff068f87ab6231756cb22acb80185c717c556750d964025aa343f8b3a30b9e73acf6237328b8bdd3fcb6588321d37a3752a6f1d0dd1e3a976363 SHA512 7ade071ae8a78427fb51d75f81e6fcc2d9a3632f0854aea70b985794a53a386072fb171dc8179fa762de19067d402c7ab9f2ea1a44bd3196d3a201ea2cb9ec22
 DIST openimageio-2.2.15.1.tar.gz 29237852 BLAKE2B 0f5050e888e82721aa7012cc5c5eb229b5ac314b067406ef003369431241228d91904fbe455da8423ff978411052b2c960b0688a6b943a0e2bfdb47c489d26a5 SHA512 c06df310f91938b25f1f66cd98d995dcaba51c6a0041b47882c52f5ad4a098a9016fc99f41de250dd1b1b7af3ad22f6ed63d5e76f95f1f1cf0f45c80eee9c8e0
+DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be
 EBUILD openimageio-2.2.12.0.ebuild 3710 BLAKE2B 2076161c441805358fc03c4ed31a283a6851d59486c2cce1b4eed6a5f14171ce10f2e3c72916d00418d03488b7d38b6a777e5907a9414570428f597fb63be5a8 SHA512 d5a4a577c06d712ed7c6f55af24bdaa5be2bba5f9da838348f418da5c3d5958d5b36bffc5e33e72a02efa415d60e0f263c8e0db67f5b653e46d0ea1e8bdb0171
 EBUILD openimageio-2.2.13.1.ebuild 3710 BLAKE2B 2076161c441805358fc03c4ed31a283a6851d59486c2cce1b4eed6a5f14171ce10f2e3c72916d00418d03488b7d38b6a777e5907a9414570428f597fb63be5a8 SHA512 d5a4a577c06d712ed7c6f55af24bdaa5be2bba5f9da838348f418da5c3d5958d5b36bffc5e33e72a02efa415d60e0f263c8e0db67f5b653e46d0ea1e8bdb0171
 EBUILD openimageio-2.2.14.0.ebuild 3796 BLAKE2B 5cfefbf0405c513ff43d6baf459adae1700d446883646cdfdf29b650d9242209d3f7e77b0b3c835c71e61d6c7c065bd700d6287699b30754b9376526a5034fff SHA512 ff91ac8f04e6977506ad2cbfcc69d0ded458f0da9740a856ec25921f016f35e212f36af517a05c76d487cc263a597def610c772e8ba646e7de0689e99b558af3
 EBUILD openimageio-2.2.15.0.ebuild 3796 BLAKE2B 5cfefbf0405c513ff43d6baf459adae1700d446883646cdfdf29b650d9242209d3f7e77b0b3c835c71e61d6c7c065bd700d6287699b30754b9376526a5034fff SHA512 ff91ac8f04e6977506ad2cbfcc69d0ded458f0da9740a856ec25921f016f35e212f36af517a05c76d487cc263a597def610c772e8ba646e7de0689e99b558af3
 EBUILD openimageio-2.2.15.1.ebuild 3794 BLAKE2B 268bfcdecae67835a2da461d2ffdcbfb226bc5f46b3a988bf183eb4b6d95700e385cfd51e65026bd0f51a89f33765028948ce270e9c6189ddc6b4b0f579126b5 SHA512 e54417237b52b942e0fbd7ba4b5f60026bd41a2ad70fde07487217a14cce883c8c01b6b86677680045d3d70af198af8e18d3b9e8bd860fb924ad44b74d52915f
+EBUILD openimageio-2.2.18.0.ebuild 3797 BLAKE2B df2ad91dae751e61572e2c2bfe04baab9fe30d51d4df782d064ab7e867409cc9ecb9261628d4f31d03bf24f6a81e9cd58a1623d3e1c842e094f0709a4eeba9d8 SHA512 f0202f6d26164956afb1c3dc82ea6248ba1f0646964769498a39be94a66627115ee78baa8ae515f403efb2f2a6147e4e91177df795f0259026d565221fd1e23c
 MISC metadata.xml 937 BLAKE2B f49461cd8f78f3206eb9016c01850a27017ac6964531769105804140d5d8363b46679d71eadb503221f6e3d03107228a6e66efc16187505cb4560e32bd42e3c1 SHA512 05cc82838184e93ed4064f8fc6519c89a512e6f1fe7abb94dcd624ed52eb004203f201745ec26f2ffd6aac3fb5cd4013917591164a18b0d56a097d6d4d81ae2d
diff --git a/media-libs/openimageio/openimageio-2.2.18.0.ebuild b/media-libs/openimageio/openimageio-2.2.18.0.ebuild
new file mode 100644
index 000000000000..c1a41b46db0f
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.18.0.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+	if use python; then
+		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 8cc920d822fb..39fd8d3312da 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,5 +1,5 @@
 AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670
 DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
 DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
-EBUILD openjpeg-2.4.0.ebuild 4461 BLAKE2B b79a28655f492c4e0762ad50a8c44e1ba96476d8d575df9f14ac1811cb5aeb142aeac4beb1d652a5772c2a15ed6ea58d5ecd80f827e63d578c763208c804d931 SHA512 a6b3397492243f211427ef62ebd01e1632e25a96dcbff9fc01f8dc8050b9e50450c3abd4b050aba8b76ab93b3b424a62c200c0e542716517239819fe35d3e15b
+EBUILD openjpeg-2.4.0.ebuild 4467 BLAKE2B c1940c9c26d9e010fee76fe1c5c894a0fbffa5be2bc8eba8bb6d1d74b28e37f3a1e1eaad6a9bab60e58ce82942019a7fe796b2672c518c7c519b5cd05d2778fb SHA512 40d63968fb5f16b086ed154ef407a02f1cac452e82ce4fbd853f05ec76ef336db75be867dd1767c2845019eab72e3a6142d0de526b870b1b9f6d8b847441def2
 MISC metadata.xml 364 BLAKE2B ad5ed0f600df870752a5bed4046b38b4eb3e369033589cf1212a75717739154f9fdff9537dba125229caea63091b5991b631d828489bc14aa4e4a85f30203782 SHA512 9f551fc5a5c78854563cade31d7c66b3aef14ff7326232073d27f14edf9aa6b9c902d29b50985e5ac713fbcc033ca4d462075faaaa2f5ff9f0f311b421095bbc
diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index 58bad868b8f3..2541abf1fe5b 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 13190f79b2b0..46f604ca83b7 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,10 +1,15 @@
 AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385caf9c2a9291d2f7db30b2ed1dab99d1d8da25ad5487edc7961a62809811eca45066eaa4bfa0524d0e9c9daa25489fb84be2965b2 SHA512 bc7d5e2c1306fa540d51f425d4b1303c5ad9ab624ba7f44d03ed9d8df77f36a71c334b05049d0a880cabe068947f7936258e3e52479334987b7ae68f55631cc4
+AUX osl-1.11.15.0-fix-cmake.patch 644 BLAKE2B cd51bc2f59a59a80981d357c38a89ea2b7d4e128470616e9851ef28a0c55f3292e9ace6c681b7f15c5752b41ce1f07266adb97fffa5f1923c55242207a674fe9 SHA512 10546e4771f055fb06824113c9c77ec8cc8ea9929343a8a5a68a3ea7fc7d7e2ccb983269eed66782569275e6262fde872b56ce30008ee797ed65566f0f1359ba
 AUX osl-1.12.0.2-llvm-11.patch 1405 BLAKE2B 9e6e162591d4450609c6759d3e9aa45acee0addf5be60bcd21067fa861e6e77fdac83656a3542b3d977987dad4da0627074e36b80b85e1af5e73ae5a7ade9a4b SHA512 a3986d9c458338d1002e119b2c16372fced00a10ddf734b790774f533500f4e3c2cf8fae88431f14a8709d916f9eae4f3f5bdff573e38a1808bc39b0a015ffbf
 AUX osl-1.12.0.2-llvm-12.patch 10828 BLAKE2B b172c99210b6874033a157ea4d98d902f9bf4a1d348619ba3180f08cd1a97dd945bd17b5af2f5a87ff8a0240ec82aeac498aeb448861f8f1de5623e80ac39570 SHA512 547254e9eb2bffacd43dbdebf4aa1929475132f42433b4df9b5535e720578af44ae2b08a01a51d80e539fcc22f424291dece51ee6ea55821a821fd0efd76d619
 DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
+DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
 DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
 DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
 EBUILD osl-1.10.13.ebuild 1982 BLAKE2B ba5db5bb799f094356b034d82a322a7f189b671b4b04f8e0573ff3f5b6478d1787ac4e9a91cfff3ad3444ca95f6e678b4b9f2829b425b84fc348057363e7089e SHA512 0b198ebc63420aad4adb20b29640d2a00d8b4b3cf8e62f68e454aefed2e60c5f7af977b9762a1d26074bac8e5016c6703ccf9d7a038cfa2649a701eda24045fd
+EBUILD osl-1.11.15.0.ebuild 2548 BLAKE2B a8fce08c238a82586720a336e8c8f2b3c98cc33f1b9cbaafe1b8c504416379045dc07e7852b18a9247e750643625adf2c40562e8d958b209b19be33121303f4c SHA512 4b6c0aa9dce8d5874d78f724fc4f4a72734d578558b2a030d51ff317903b6779486eb6e69f8c37fb2e3fc64336644a1c1a486c5f489b7459e2791fea6995f46c
+EBUILD osl-1.11.9.0-r1.ebuild 2481 BLAKE2B 8fa1fc232512feed8cd6b6ba72d457fd6626c87e6aed9e39244fe0138f33ba49f20a126a1e25c42258c3ee033807b4ce3fc3155f9d55a9720afa783487071b27 SHA512 2f526342d1f0cbbdf6822b24b46e23884b9753caf4159968e9ff7353678f67270911d3dc04be376a7016e140fe8daa4cb0f04676481258d9621c17d1f421795a
 EBUILD osl-1.11.9.0.ebuild 2144 BLAKE2B 74b8721250769b65c88f9f73441262414390c0d7d3ade2ebc9e15be7d7b14d6a58e578b11949ed1fc0f76373fd3ffe26b2fd1168f44e73d9fe029f07dd024ddf SHA512 2f1f7510283d594ac97e295e3201c5dc4470a0002a4f8067cb153e210e1145c96aa47755a3f6b57b2690b6ee2b300fa6cd0875fb438912f58303106c2ce3a952
-EBUILD osl-1.12.0.2.ebuild 1953 BLAKE2B 4b28ea43245f16be814cf4fea8862f935bc739a8b8a70d3c8a4ccab7770f4fac906a666db4f6be01a3d7a09b8e8b67f94b777c93f8f17721792ecdc539d05f26 SHA512 b6f1362e3014030cd8fc74a6aac0c817950f1f531fc87f9326a1105989b95a80cbab9b9bfa783b2472f07638bf67b1d82e566e6a54d304b066101f36b667f37b
+EBUILD osl-1.12.0.2-r1.ebuild 2299 BLAKE2B 496ea04a4a228a70cec0df481f6fb4f81cef95ce8c9efd0a2a94b0d7593c030562856d8de39f0a17740387622adb903d4716310b0449378cc832c05254ccd0dd SHA512 25f81545a2d2b912927b4d7afa99842313c82bb4272fee433f6ff5eb1626cd6659107cb5e2f14fc62efe77d50aa5fa809303e29593e748928b19727d74fb94b3
+EBUILD osl-1.12.0.2.ebuild 1971 BLAKE2B 4a1666b2b89899f32138a6fa5eb5ef0eca2c10919277974ae90670e60f46957ebfcac0d6f8af2e96f2801b51bde691cf1766bab9bde102d95f9904ec6d308aa8 SHA512 ebced39e709be034247d7dc90deb4e20aedf13d64e31712c6cb66b0a5833e3c76eddac52cf39aeaf12593757233ef0cc5f8a6954baf7b91e608a2419bff793b2
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
new file mode 100644
index 000000000000..020370d54bca
--- /dev/null
+++ b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
@@ -0,0 +1,24 @@
+https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/commit/14bd942f1bbb621c729f01c982925acd6d263d58.patch
+
+From: debaetsd <debaetsd@gmail.com>
+Date: Tue, 29 Dec 2020 22:01:21 +0100
+Subject: [PATCH] fixed cmake setup when tests are disabled (#1319)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
+         FILE ${OSL_TARGETS_EXPORT_NAME}
+         NAMESPACE ${PROJECT_NAME}::)
+ 
+-
+-
+-
+-osl_add_all_tests()
+-
++if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
++	osl_add_all_tests()
++endif ()
+ 
+ if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
+     include (packaging)
+
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild
new file mode 100644
index 000000000000..f4a19303d28c
--- /dev/null
+++ b/media-libs/osl/osl-1.11.15.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+# check this on updates
+LLVM_MAX_SLOT=13
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/11"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	media-libs/openimageio:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	sys-libs/zlib
+	partio? ( media-libs/partio )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-cmake.patch
+)
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local gcc=$(tc-getCC)
+
+	local mycmakeargs=(
+		# LLVM 10+ needs C++14
+		-DCMAKE_CXX_STANDARD=14
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DUSE_CCACHE=OFF
+		-DLLVM_STATIC=OFF
+		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
+		-DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/osl/osl-1.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.9.0-r1.ebuild
new file mode 100644
index 000000000000..10bd18b8492e
--- /dev/null
+++ b/media-libs/osl/osl-1.11.9.0-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+# check this on updates
+LLVM_MAX_SLOT=10
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/11"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	media-libs/openimageio:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	sys-libs/zlib
+	partio? ( media-libs/partio )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=()
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local gcc=$(tc-getCC)
+
+	local mycmakeargs=(
+		# LLVM 10+ needs C++14
+		-DCMAKE_CXX_STANDARD=14
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DUSE_CCACHE=OFF
+		-DLLVM_STATIC=OFF
+		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
+		-DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r1.ebuild
new file mode 100644
index 000000000000..d8094d703716
--- /dev/null
+++ b/media-libs/osl/osl-1.12.0.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+# check this on updates
+LLVM_MAX_SLOT=13
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}-dev.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	media-libs/openimageio:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	sys-libs/zlib:=
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	partio? ( media-libs/partio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	${FILESDIR}/${P}-llvm-11.patch
+	${FILESDIR}/${P}-llvm-12.patch
+)
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local gcc=$(tc-getCC)
+	# LLVM needs CPP11. Do not disable.
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=14
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DUSE_CCACHE=OFF
+		-DLLVM_STATIC=OFF
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
index a312fa3bc86e..7532e89f4dd6 100644
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 X86_CPU_FEATURES=(
 	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index fbca811017a7..942278bc9b9e 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,4 +1,4 @@
 DIST partio-1.10.1.tar.gz 333129 BLAKE2B 82d1dd36e9854e221af036d386ecdc558ac032ad7cd720403787ddc83ac236f05fd86e8c07ade07ca93b06a12ac2b834c96a6d43265e396934e44a815df003d3 SHA512 7d3c6449ebd1e8b8a29298a3119acfd1036970b287e9cd5f288a63c7e2b3bf451e9e1ba8fc72f203e225eb2b062d59cd7373817ccc6467de67427d02c0b12477
-EBUILD partio-1.10.1.ebuild 1016 BLAKE2B f299a2d45d8d7cb384e2036a48a6bbb8052460c341d860d8548b282c27f0a6ed95a0571e7839df7c934a3e83db7abb9161670e79ac63e7bfbce6e9567b88e858 SHA512 5f522ae58b71252dd1da74c73c80ac75bca3d9e97bd4f76dd3c3f152a77254894bba0a193dea97f78341c25a2801fecd031836af0dc82a1e9102e327049960b6
+EBUILD partio-1.10.1.ebuild 1023 BLAKE2B cbccd3f0286665474ef8b0b18571bb623bda5a9f5ffeaab29d454470f1b0fad474efbc022f63cdad0385253096bdde91c77ee987c37813344525d03c493bf16f SHA512 d674c8ccf3217857f727db21460618584dc476a399ab91ac4a92dd871f5901ff3b2a88c0b748d7cc063927b3a36339e3a207ed20364e36aaac57586325fafa51
 EBUILD partio-9999.ebuild 1007 BLAKE2B 0ef6f815874a53c90a329598fa1fb74ffbe8df5d54594b4bca6c13de3836c50417f5185e2e6adf84c0ff5111fce8dbc850e5901e33cefb2eb274048dcf4bddc4 SHA512 42c9ce2cb8ac4ae9cf89a3bedcb2e7ff10c7adfe8c7c22cc39ed592f359a8d102ae736321fae802b18e29664c29e9201691ecd402f12e523a5e2b30ce32785d7
 MISC metadata.xml 475 BLAKE2B c8260e899b75f38caf77d3742e752758705e5cfb937fb7e8cc8f925cead54d97bd5d308b2cd3bd74fd63b87060f27be27adafa2a70c28991802abdfd2273cc24 SHA512 a67d143e48e71c2d0c649d66e348177d843f7a3607c4da92e0da98d9228a3a16c8c7e12b9d26df03175ff9c4a2082c71c19f91f3d13b91cb2337a6bb0ed6ce8c
diff --git a/media-libs/partio/partio-1.10.1.ebuild b/media-libs/partio/partio-1.10.1.ebuild
index 02a27dab96e1..d9c20375307f 100644
--- a/media-libs/partio/partio-1.10.1.ebuild
+++ b/media-libs/partio/partio-1.10.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wdas/partio.git"
 else
 	SRC_URI="https://github.com/wdas/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Library for particle IO and manipulation"
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index b067fbb9f6a6..fc33d4835be9 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -3,6 +3,5 @@ AUX plib-1.8.5-CVE-2012-4552.patch 1322 BLAKE2B 384a50a970012b7dd41bcb0362ee88ee
 AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1613e0cbddcfb90ae250d87b672d1738d854c9d546ec1d5d8ebf78b501e3dca9e41dc7e1f891b101e3c0ca23c SHA512 3222424f668ba4267d150034fc3ac67770501c543cdd7849c8eda4d491d7cb4d3120101c7d548a20d3122561f0f27e8fb0592773c736d7fbf4bc500121bf9dc3
 AUX plib-1.8.5-shared-libs.patch 9520 BLAKE2B 1bfb85c5065e33a9c8be14861f4fd8978e1dcacf4c045c9b1e30dfd2715873ac1b953bfeed5e298e1140264f8c0d191bef28b6631e2bb98f4d7228c7576aaf9c SHA512 0fb342e726412885531188a05e3b05b2076398b1ec8eaaf22ba3e20f48248351917d5418a7086b1b8eeb0bfccae049e8cfa0f5d05cbd4bb7c20c3e69685065b5
 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
-EBUILD plib-1.8.5-r2.ebuild 829 BLAKE2B ccf66bea4824b818c08a421975d5b89dfc9403e36504dddd66b41b0119e47b70b30cc1727464ff9545e591b0a3cbf679dad89048f634173e15ef190d5ac31c86 SHA512 9c2810449ce8aa529a360dabbaf7d8bff92dccb9def0bff12cf3e580517e0c297391e3a32e0009d93bfd2b806e895761b96b4fbb94adc521b56294c5bbbc6105
 EBUILD plib-1.8.5-r3.ebuild 927 BLAKE2B bedaeeabac3ffd43ec0c75ad8e5c9adf5b6e4f330565aecc0ee7554ffcc9bf2977cb2e88ae28ac62c1037962d14fd2d16bb03d44d34fdbef74c8633d05fb1b1c SHA512 2409a27ca687ade0da9e7c1c1fbe665354139837e1c17d3955fd4159a28eea570a83a304fa85c670cb015c0cca655daa67e4762143e61456994cb09fe0e9063f
 MISC metadata.xml 328 BLAKE2B a7a65e3a3905acfbe9ccada6071937f3cee936ba6bca021348f8960b3b1b83837136b1da21f10c5c511c8058655be268467e260da2fb841061f931d39baea368 SHA512 f7ed0e87ef2c31bf2890a202835482f9d174d08b591beabcceccb11f63fd09d586f735ed6e2978480d0a37bd0e23592146a982fc7b8067c1a5c28249d555a629
diff --git a/media-libs/plib/plib-1.8.5-r2.ebuild b/media-libs/plib/plib-1.8.5-r2.ebuild
deleted file mode 100644
index 8f5e07ec690f..000000000000
--- a/media-libs/plib/plib-1.8.5-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit flag-o-matic autotools
-
-DESCRIPTION="multimedia library used by many games"
-HOMEPAGE="http://plib.sourceforge.net/"
-SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
-
-DEPEND="virtual/opengl"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-X11-r1.patch
-	"${FILESDIR}"/${P}-CVE-2011-4620.patch
-	"${FILESDIR}"/${P}-CVE-2012-4552.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-
-	# Since plib only provides static libraries, force
-	# building as PIC or plib is useless to amd64/etc...
-	append-flags -fPIC
-}
-
-src_install() {
-	DOCS=( AUTHORS ChangeLog KNOWN_BUGS NOTICE README* TODO* )
-
-	default
-}
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index f1270c0e20be..1ee40edb155a 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,5 +1,5 @@
 AUX portmidi-217-r4-python.patch 1540 BLAKE2B a5fe8c48e8d312cead822fc8893f8a610bf5cf280dd2445da04ab42ed13a5a121174afa2e8874dcf3f7a7b89cd60894a819404438c6d5cb2b99a8e2ae6f3aba8 SHA512 d7ded737346f9756450ff3eaf35daf33da941a109d7db07598ea57593ef3272213b889a9ab33bed71bead4583cb080439813bf7fc4a6d1a6cbb84ed4cd25b51f
 AUX portmidi-234-cmake.patch 13979 BLAKE2B cc6b4193e9008899c89545e2e416c75779d08a6ef100e7a37c21a7c745ac3416c31b044664ba439368c8bb0f3a7fde119343a86d31efe3482c4a88718affdd6d SHA512 b07cd643699084f8e02ffc53d3721a53dd17b421d8ff5b2889a14ab99ff709c14f68b30adc2e7db818cbe7884f93cab8290ff9466ac8616d0db58b3e7aab1f75
 DIST portmedia-code-r234.zip 1342298 BLAKE2B 3c3686b79ca0c8cbfaa6c44ae8c4f294630e1c5940576709ff1ca5854bfcfba1af7b067471656f2b39ae28cecea9b6c4403f72d5a2552355760c795eff123243 SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794
-EBUILD portmidi-234.ebuild 3311 BLAKE2B 7eed7609f74534778b2b6418e68036c902dd33f50d21aaa7229f8056f6c5f64e630769eae71651ee8d53709a308a433b5b3f32275dd466c76649c57ae597d98b SHA512 df5b8eba368e02c8791e1eb0ae0e71def202dbb315888b87c7d3be6f2670649a856fb90114a014ab477e4d70ba723c6ec257539ae1ec241cc4814dbf67b1e5f2
+EBUILD portmidi-234.ebuild 3318 BLAKE2B 1bf3ca9a6fe6a080f57c2cf1c62ca8b6da3fd4a195613ac9945d2ee5d6b63242951192bb2083a5fc3ef0cacbbedf2de173a7ed754c8e82acc9db83d6287e61e9 SHA512 491629c99bb489b7ed966d136a013f5108bc0113b81665cf4bfb214b5e63238e9d42dca4bdb5fccd817cc9c76aa8a7afa9bcce77b753ae185f351d259ce247dd
 MISC metadata.xml 437 BLAKE2B 8560766f0e6d8f0484374ed827f14ffddc01cd7ee4df2b75ccf62f6b0f4b804eac1dad8f06931328aac3910b0382c0125ea1bd71aa786bcb674531d88ed85de1 SHA512 a932e03068f3971eb8e40c1f18646652f0fe04a898cb10e9b7156cfe2b712285cf83c247a19cb887aaa2e575bc95ffad58d5fcfbb44d9e8d39f3d7b2d0cadd76
diff --git a/media-libs/portmidi/portmidi-234.ebuild b/media-libs/portmidi/portmidi-234.ebuild
index c8634feae893..7ba9b89652ce 100644
--- a/media-libs/portmidi/portmidi-234.ebuild
+++ b/media-libs/portmidi/portmidi-234.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/project/portmedia/${MY_P}.zip"
 
 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 ~riscv sparc x86"
 IUSE="debug doc java python static-libs test-programs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/quesoglc/Manifest b/media-libs/quesoglc/Manifest
index 1b3eec04071f..85c4151e94ae 100644
--- a/media-libs/quesoglc/Manifest
+++ b/media-libs/quesoglc/Manifest
@@ -1,4 +1,4 @@
 DIST quesoglc-0.7.2-free.tar.bz2 657394 BLAKE2B 73798b80fea5be9a66aa7c0090ec0564d517417a8597d102d057fcd91bc4c6d0c48352470b02182705d135cb04434178b206a964d539283cc4ac69d2f1dc5cb9 SHA512 107cc28fe85722614bc6c222a64914eeef0de1c5dfa01cef9ec611e5caff54fdbcf2b387d413c0b56533d33e06741ca8dee99fc0c5ee1e63d9a95d86c6c69190
-EBUILD quesoglc-0.7.2-r1.ebuild 980 BLAKE2B 2cfb087464181f6019c5f83748c8d3bb4baee854104c7b252bb9a16b96d18d0852cbddc9057ff2c086dd35b48f7ac3416522fc802462cef5f24addbb6056bf3a SHA512 1bcdcf0b2f95874a1f16b71d0f83ccbb32ea8f250e6686525a4f46cecc53fd8fac3e740f9737fc911f55bbdc9d84fe2de831d186fe966b58b136f20797e2b474
+EBUILD quesoglc-0.7.2-r1.ebuild 977 BLAKE2B f3d8792ef601bfe5260c5c098b3f520e658657ba963e7e4fe2c7df143b48ac2b9dc25d2d16e5b220623e318a63eb4a757e09b4035649b72ed51f79695d8a8b31 SHA512 235e6a68e3107bf41b7324ad7b093303c353abeb2afecfcfd587c204cd0c8d5f3f4286b68188a6688b07f4e3e238449c370494935f9b9860d1909b1109cabe43
 EBUILD quesoglc-0.7.2.ebuild 1070 BLAKE2B d47799a691ff92458be513ceb7c3cb450a536eb9bf5083ab1af805d8d52666ba6c5fcdfbb1a17ea7eb84a6e434e8a36ba2d664f55002e59ddcf9e29276b08829 SHA512 2d718bd3914ffb01fe1e4453ce6198754b2ffb67cfb6ff6863b457bdfc1b6d1832d57e8c2d6dd451bc2c39a94c42e271ad7592acf24ef55aeb65864f0153932f
 MISC metadata.xml 332 BLAKE2B 1a4176bc587552b145f0d3b28082632ab19ae2832813a639acf0eeae83a200528d35b045a26a1b015c25dca9c03dd238bd59bcd56ab1ba029f7be0f90901857a SHA512 aff8552c5203af4956d6d79b6fcdaa79a98dc2e43e1e5ec223c9d2520ddf3d6da40ccc6cf0245efd96747cd566a66f4175b4f3ef4cab8d3c680621a3868121cf
diff --git a/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild b/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
index 6f4fe15c6eb7..25361aaf211d 100644
--- a/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
+++ b/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-free.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index 47630ffe915a..79e62404aab5 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,4 +1,4 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
 EBUILD sdl-net-1.2.8-r1.ebuild 950 BLAKE2B eace10eddbb039153f4de12e426cc8e7f170857541a4e4502522140bce44786e45c1e214b724fe3a57df25350bbfdc0e9447e5a8683decc72480cfa3c488b440 SHA512 5e8c3e5cf9112b614a082c9f5420cfcbae3af78fd011967fe4b2f6b81c4fa76a682a3b955eb96df2d0c72bcc14ca13bffb38e7b29c71b9fcea16b58fb04b07dd
-EBUILD sdl-net-1.2.8-r2.ebuild 741 BLAKE2B 5bf3efc99c552dc2e49f309ab784fdbcfcc44bb01b100ac230e4cd4682ac0b3e5f499f8354f5639d384a3faf357dabc495144fe08eb7edc79d4e5dafd0affd55 SHA512 a7bac88177b621a81476bf966cac977cb979e0094e2014d58116285bcdb9330abace1afd418faa354a77e820fe25fce01dfa769a35789d1811cf2c07a121fcb2
+EBUILD sdl-net-1.2.8-r2.ebuild 736 BLAKE2B c3edf28be584c3b50b753977612e4789e19c863c7d17d930cc892a50577097e018e6e7fb0aca8558beef7e3c3452f9b7422ed11634d28fc20c9a364f892c49ab SHA512 4f4080490d6ce4a5271ab353ad33932e1b0d1de5dec53887deec8ba795446824cb31866a07177e7198a1b67a895e2da540dea28adc38beb6dbc44095caa244a7
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
index c84784f71651..250ce0a30680 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="media-libs/libsdl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 57042030c339..67dea09da9e5 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -13,5 +13,5 @@ AUX smpeg-0.4.4-mmx.patch 252 BLAKE2B f5d0761bb38c021996eb19b534122d8fd9e697c5ee
 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 BLAKE2B 0ea9258a057108a462d9c4b9d9bcb21cdff71714507a3d09538f56817b206ec54681b3d2546b64c07f239ea3381f3644d26234853a239a2fe49353ba1c9b2759 SHA512 30370e0edd41767ce260d10de515be0087f47b479ec0085ec186506c93be0b2a404c1bcb1626f9a6a1f575160d9c382708d2769dddfe6dca6236fe0eaa58602d
 DIST smpeg-0.4.4.tar.gz 315054 BLAKE2B 16a7b87a207874deaaad64b5233964d4b0e244d35cc475cf0ed37302529ca4eb044393777fc98c202b5965de420f75bc5fb398ecc3eb0f97992d90e365f8a039 SHA512 d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
 EBUILD smpeg-0.4.4-r10.ebuild 2079 BLAKE2B 93b766c2825d23e4624d1cd8e9c6af891bc0f59d8d007609e311a5e67871f97f790da9dda29010d469e03da60bb103622ba5bccc32b6a4bdf5df9fa48729076c SHA512 36dcdbbbb3c40c987320b7639b50d5ddcb120b5286bad751e2bb16f198530ee002739b9527b5fa9463de474028d824f4f2d1e046548e4dee65e6b7cbaf937c7f
-EBUILD smpeg-0.4.4-r11.ebuild 1705 BLAKE2B 3975d6a5b57cc25ebb469b5cabd5f44ffbebe228cb45a1d3925cbbd70b9391a6d8194eb71bf829b31ac6a1466ebe594dada3b6fc4709007f7311b214e68b2750 SHA512 4450f327c620ddcab539250b4bbd3416bd482f9afdb55a04e93e5e5fd5272c7efd4425da8c8bca09b8a714297963d1be749008a196d00983a1217b2415fc665a
+EBUILD smpeg-0.4.4-r11.ebuild 1700 BLAKE2B ecf32f7d3190907208c4bcacdb1f870cea8ee630331b1de09649478200a3e8235b3ff87acfecb66f84c027cf711bdf0d7861843c5998c202ab12188cccbe2e14 SHA512 2703b7b3daf913edffb240943fde93974b46c7205a5679b1c499d963b644f6e21bca00aea6ad40eed786bd8f86de22492206f4def58456037d367b6e31e5ce03
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
index e79dae9392a0..895fdd7e7b36 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.dotsrc.org/lokigames/open-source/smpeg/${P}.tar.gz
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cpu_flags_x86_mmx opengl"
 
 RDEPEND="
diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index 7b169da1b412..9e68663c121f 100644
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -2,5 +2,5 @@ AUX smpeg2-2.0.0-gcc6.patch 772 BLAKE2B b4eece6aee658b484b65856dfb851c1560af5898
 AUX smpeg2-2.0.0-smpeg2-config.patch 1022 BLAKE2B a7b81a5c3f5ae886d1ec6e17011b602f25d568f4b781abb0608378ff000e3ce3cbad873fdf4da6d99853c603d83ef07516b19eca68e47ec3b694fdd99da071fa SHA512 1f91228f9e00bd60d2a8cbb04f0d9b9a5fbd4b5a53ded9547ae1d577afa12388b43a662e4c4e15e6b12f4007bd800c4e49b9c88812aef0ecec71a4c666686b05
 DIST smpeg-2.0.0.tar.bz2 311846 BLAKE2B 311de560d367d718eab4e014d4ea196f7bcb4d3e58b8a4002d81f63b76809530dc81a32a4f1163bb5003810fa3cc7257e3b8f94396acca580ac88d619fecfe11 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950
 EBUILD smpeg2-2.0.0-r3.ebuild 1351 BLAKE2B d9bbba882d9e765495ce653ed2cb37023f7abe1088c1dcd8e5b19f9b168de0dfb362f3a70062324058a076c7ac89d7008c086f117d305b2e46e1a51bd1199851 SHA512 7e57e72f115bc2d2f779b0dbf41d240577ffb0ec637a65245fc6cdb0b7ae2511252e052424a7bdf5f354f3a12a84b0fb16f313c6c4bddecd0fe826cbde873644
-EBUILD smpeg2-2.0.0-r4.ebuild 1131 BLAKE2B 703aaf59c86bd5140dda05b0b869b7e954198dcf0a160b43e73f0a0292188d4f3bafb0e921375857716c9eebd4ffe14218d77cd3d70444dffa6a163fe33ad332 SHA512 30364d9e187038465dce5b1b14b42e8cba82a4b09862865e6d76594bd625bf96398a000e006d8163940efad1e22eb4852b7e28bf11e76fc28db1caca5c0c6023
+EBUILD smpeg2-2.0.0-r4.ebuild 1127 BLAKE2B 585b66a577dcad832a42198dd35d41794d0ddcf2f23d967d2feb6da7757b5280aa9579709ce1c371af816248517a2a3d20097762f28ecd7310f0fc4a00607844 SHA512 f84af4812e479bbe1ba8f0576d43cb1f728a1b1a9c39a39872c1f9e40a2255bc63e67cea91e825e2a2063b7a294621e5e3694d11d563d1fdbeebb29875f51ddf
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
index fc1598ddc4aa..718580f7843f 100644
--- a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 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="cpu_flags_x86_mmx"
 
 DEPEND="media-libs/libsdl2[${MULTILIB_USEDEP}]"
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index da02e6e19850..5fe3985c5b14 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,3 +1,3 @@
 DIST suil-0.10.10.tar.bz2 339906 BLAKE2B 03d1ac744fa3fa487bbf44d6e006f6cfcc73dc4aa6eb79d1ac5d024dc9493e3e426ff6054705d1de514286b2d43f5a1448bfcf7e573fa95d61c41790ca06c405 SHA512 e442022096150b2f71d65bbd625e2e262cb3e3865c57f5a30f0472dac8ef90ad2fbbf67235823055019017e3751b46330f6e98b8e1745e5845eb02c4d2a4fc21
-EBUILD suil-0.10.10.ebuild 1086 BLAKE2B 6c25bd0f3c1cc1dd73a9b0d6e4941525e7b4c30ae69962ea807826d5fcbcebd25ba45559159592df367428a6eace66453df2c0bea2ea9fa72ff89e73aea2c4c1 SHA512 1e6a7064805c5062182e9cbd5e1ac3036f9b27f24c844eb4e4608d6c4f1ad3f84a031460c0f4ba7ae3d464ee1616df2b4d62e07112eda939789e09903d38a28a
+EBUILD suil-0.10.10.ebuild 1093 BLAKE2B ce653da53ada5454f39bccca70db588fa741cd752c3fadafa5e19d148e7d69a456c2efc0a3ec540691c22d5dc91529e6e6012a1b46038bd41f244a795cda093e SHA512 41aab7bb2f5e688bc8cfaf9b754504182d90fa1af3101632f0c6c8d3db66ea2961ddaee254c9de3be87abdf8d52cfa2ad9afa42a806f4208c9dc02969c88fe9f
 MISC metadata.xml 492 BLAKE2B 08b9c4faabd0b31d5397307c0a025e49b25124edf27fb2972e3d77f93b221985dc8a94eb7626e0b6f845877cdf4c714ead49c25dee3e7346efb92c7fa98ba0c1 SHA512 2505c885384508559d1ee43cd2c5f382d444299de05abb7395cad7510cb9dd40c55b3c33a0f4348b278ac4c7c52d3f083d7996a44d8f5bda4611f038822c5500
diff --git a/media-libs/suil/suil-0.10.10.ebuild b/media-libs/suil/suil-0.10.10.ebuild
index 49482f204a2f..53b4ea3b8b66 100644
--- a/media-libs/suil/suil-0.10.10.ebuild
+++ b/media-libs/suil/suil-0.10.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 IUSE="doc gtk qt5"
 
 BDEPEND="
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index c63ce642a3e3..f5550fe6739b 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -3,5 +3,7 @@ AUX tg_owt-0_pre20210626-allow-disabling-pipewire.patch 1030 BLAKE2B e81b7fa348a
 AUX tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch 3322 BLAKE2B 61f04506af251a52f77a5b1289471e6519bc00aab1f0e2b0b703deec094109537506297dac55d6ece747beab889a2509a71ae862683c87e6f0c006573b3dffab SHA512 7c5a4851cfe982b069c1ce752414a7771805ab1edf00a88d16e46b11cda8a85692cc2534e04a562aba1519638e2c128b66b11f24ac93f7b8e3b2b9be6d031d55
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
 DIST tg_owt-0_pre20210626.tar.gz 16264716 BLAKE2B de500e02789516527c814d0aba87cf1d0e772747f06acff7ac9295508c6e6bce1915cd3a703df618ff17ba8e04dc194538a6ef859fa85b301bb63eceab2c339a SHA512 a5d10011c427d8685bcf0743c356ff8c58c3cad6c59ac2409298b30b15cb04233889a5ed0a18107ac5b3477eee96741fdc85176d4330c866e8e3329753be7d73
-EBUILD tg_owt-0_pre20210626-r1.ebuild 3351 BLAKE2B 34e2e5065a860f7753234058968d630ec3860bf192eb30f047db2552d94f0f978cd69f48f5cab92be8ad70fdfd59ffa54aaa68d6c974c85dc517d9f2fb065eff SHA512 9ead14f282706b2363057f7e43117395171e733e06f1b189b1f9f0ddeaf2e8aea8c69c2f4eeece93b732cb71202afd1d6efaeb63694e7465e7173cf2a2e67e8d
+DIST tg_owt-0_pre20210914.tar.gz 16266351 BLAKE2B 048d6a77046b10af63f4e5c1530b6aeb9d423702a6e34e6e0082a10b06262e19c30aa766cc9ea38549605d8d2cc08bfcd5a4e715ab53c46031c23938f94af27e SHA512 bd46393d9a85fa38fcd560af4f68a4868b25528b134731070e8578217cb0b9bb8b5cf7b3990f619d321ba373e5630a52e467e14d93f71b24de3a5b3e591b8866
+EBUILD tg_owt-0_pre20210626-r1.ebuild 3365 BLAKE2B c1232b870dba6f5516256c9b667062099bdfbf4959486e52d5cb6ad7907ce7e723002eb8354dc06f4324d1349d24650a443b4e4629ab46511828367b7843424b SHA512 baccbacc571087336040fc5f24f0456be0dc395c115e748650ce43bb29ffd2859d6ea4686ff900c13fb63d12e20bcde001824524f5b0d7c5a1b8a252ae3e7fba
+EBUILD tg_owt-0_pre20210914.ebuild 3551 BLAKE2B 462afa298c4dcc8c93d95fb10053698cb8829a31e0c8e154547e39778e3a7f4000f369aaa802f3fe1f2c21ea99bdfba0c3ee80f7a33f1338ae25a2e264c0a709 SHA512 4c06fdb457ef8f39bcbba1502bb386b684ddfce82e3f34ac7402eedba0222802ce13e24393aa65ecaa16d7853e1a9ad5c32f48c191375bd81c4dee6af4bb7bc4
 MISC metadata.xml 546 BLAKE2B 10baf770f70a00730c78dee6661096db60de2fd04ddd1f36c54d0ad2423ad78127eb70c56e15dba9dbd15ded61d3a9ee0587987e2bf1d6420204dc1a67a6d6c7 SHA512 cbd8187c0c2e0c7824f82d15a6f2162871339350953ff9f09b42f74077c5d53c9456059437360a823739bd06622ac37b86bd5c5ef17ae284dfe71fccb5862760
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild
index 8f7f9f6f3d3d..5a261d38d4b2 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild
@@ -108,6 +108,6 @@ src_install() {
 
 	# Install third_party/libyuv anyway...
 	dodir /usr/include/tg_owt/third_party/libyuv/include
-	cd "${S}/src/third_party/libyuv/include"
-	find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/third_party/libyuv/include/{}" \;
+	cd "${S}/src/third_party/libyuv/include" || die
+	find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/third_party/libyuv/include/{}" \; || die
 }
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210914.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210914.ebuild
new file mode 100644
index 000000000000..44dc8909be7b
--- /dev/null
+++ b/media-libs/tg_owt/tg_owt-0_pre20210914.ebuild
@@ -0,0 +1,116 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="WebRTC build for Telegram"
+HOMEPAGE="https://github.com/desktop-app/tg_owt"
+
+TG_OWT_COMMIT="575fb17d2853c43329e45f6693370f5e41668055"
+LIBYUV_COMMIT="ad890067f661dc747a975bc55ba3767fe30d4452"
+SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://archive.org/download/libyuv-${LIBYUV_COMMIT}.tar/libyuv-${LIBYUV_COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
+# Fetch libyuv archive from: https://chromium.googlesource.com/libyuv/libyuv/+archive/${LIBYUV_COMMIT}.tar.gz
+
+LICENSE="BSD"
+SLOT="0/${PV##*pre}"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="screencast +X"
+
+# This package's USE flags may change the ABI and require a rebuild of
+#  dependent pacakges. As such, one should make sure to depend on
+#  media-libs/tg_owt[x=,y=,z=] for any package that uses this.
+
+# Bundled libs:
+# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it)
+# - libsrtp (project uses private APIs)
+# - pffft (no stable versioning, patched)
+# media-libs/libjpeg-turbo is required for libyuv
+DEPEND="
+	dev-cpp/abseil-cpp:=[cxx17(+)]
+	dev-libs/libevent:=
+	dev-libs/openssl:=
+	dev-libs/protobuf:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libvpx-1.10.0:=
+	media-libs/openh264:=
+	media-libs/opus
+	media-video/ffmpeg:=
+	net-libs/usrsctp
+	screencast? (
+		dev-libs/glib:2
+		media-video/pipewire:=
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrender
+		x11-libs/libXrandr
+		x11-libs/libXtst
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pipewire.patch"
+	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-X11.patch"
+	"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch"
+)
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}/src/third_party/libyuv" || die
+	unpack "libyuv-${LIBYUV_COMMIT}.tar.gz"
+}
+
+src_prepare() {
+	# libvpx source files aren't included in the repository
+	sed -i '/include(cmake\/libvpx.cmake)/d' CMakeLists.txt || die
+
+	# libopenh264 has GENERATED files with yasm that aren't excluded by
+	# EXCLUDE_FROM_ALL, and I have no clue how to avoid this.
+	# These source files aren't used with system-openh264, anyway.
+	sed -i '/include(cmake\/libopenh264.cmake)/d' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
+	# see https://bugs.gentoo.org/754012
+	append-cppflags '-DNDEBUG'
+
+	local mycmakeargs=(
+		-DTG_OWT_USE_X11=$(usex X)
+		-DTG_OWT_USE_PIPEWIRE=$(usex screencast)
+
+		# Not required by net-im/telegram-desktop right now, I'd rather avoid
+		#  the (ABI compatibility) headache.
+		-DTG_OWT_BUILD_AUDIO_BACKENDS=OFF
+		#-DTG_OWT_BUILD_AUDIO_BACKENDS=$(usex alsa)
+		#-DTG_OWT_BUILD_PULSE_BACKEND=$(usex pulseaudio)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Save about 15MB of useless headers
+	rm -r "${ED}/usr/include/tg_owt/base/third_party" || die
+	rm -r "${ED}/usr/include/tg_owt/common_audio/third_party" || die
+	rm -r "${ED}/usr/include/tg_owt/modules/third_party" || die
+	rm -r "${ED}/usr/include/tg_owt/third_party" || die
+
+	# Install third_party/libyuv anyway...
+	dodir /usr/include/tg_owt/third_party/libyuv/include
+	cd "${S}/src/third_party/libyuv/include" || die
+	find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/third_party/libyuv/include/{}" \; || die
+}
diff --git a/media-libs/webrtc-audio-processing/Manifest b/media-libs/webrtc-audio-processing/Manifest
index 3614a3c8f3b2..b23d088e75a7 100644
--- a/media-libs/webrtc-audio-processing/Manifest
+++ b/media-libs/webrtc-audio-processing/Manifest
@@ -1,4 +1,7 @@
+AUX 1.0-abseil-cmake.patch 2049 BLAKE2B 56f46f78c48efd04203b7c931a1022eacc4ecea6490473e0d5c4198c454ca04da9010f75894da615e38ad65a64ed1c807f97746a3d0293739008920c42b4059f SHA512 2b4718fda6b515637187ea1b247ed016a8177565ab30c1d6472784d52de041af423962a0f16008eca811e1b8762f551929a9ca757a7e54055921b74b5c46c5b3
 AUX webrtc-audio-processing-0.3-proper_detection_cxxabi_execinfo.patch 2251 BLAKE2B f534e6f58d86693d257fa653d92ca07db2c1d34b88fda3b112237cff99eed81252f4111d64070f96a4265dc2655896843dbbfa01785ed18c6ea10b0eec74aeb9 SHA512 592345960101a9538c6e1197bc8cb296ca0fb0f8c6b9b64f1f4fd906ae4a9c7e9e92de740bf6e1e38cc4efca7cab8265b59542ffcad5d04bb6f1abb399851f0f
 DIST webrtc-audio-processing-0.3.1.tar.xz 695920 BLAKE2B 833c6d12b358918d95dee5b165308c8cc382f98264349fd38649bfe478557765b85d9112a35194676ee52a8ef297fb7cb7e3a570d9c2295785b6fb97d35be948 SHA512 1c7a2d16f7f6c03cf6d60405d0dcd224caae6e80c9c4d43f8373bad2446affcdf49a02efb0085387328289aa79c8981dcaedff876cde55be9602dbde9c3f440b
+DIST webrtc-audio-processing-1.0.tar.gz 856721 BLAKE2B bbf5bee4887ca9929cdc62ded5a9b12563371e75cf1d3e3a3d7c8ccc766cb00bd718bc1ddf96d713a47342694394cc853067fba531c61c7e28e493a4dcdc895f SHA512 fced98beeb58155e86aed9649413e2f28ee6814e711bd57e946ec0db30ddabcc65bbf425b85892f4ad8803e87f0ece9fdde5595948145b90f436c2592da55961
 EBUILD webrtc-audio-processing-0.3.1.ebuild 773 BLAKE2B 12e270e41f5627ac71643e916daef2f6d721f064cca840b184dd6577149833efab7d0a058a635575282aa45f952e9449b9dd16a5febe0384fbe8d8bb63d8b9da SHA512 98ff08027c74dce02fa0eb98c603bddb2fdd1e7cbbb50014769f22cf7e4723b66e0f142c636c4bbd6de9e1d7ba0bc31a25f3ceb28d38b21abfd1e2429462fa18
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD webrtc-audio-processing-1.0.ebuild 754 BLAKE2B a8aba51d9fe717bed7df8c785fb387414439a5266ef597318c09ede3e1921c654fb36e06f77a0ae7b3f24de6a3b49aff99c9498f9d2367c84b3cb9039e11df72 SHA512 fc790450279e4f2674f97c5bfa6a7721c8bc0491ab09d5e88fa22448364b7e57a00fdb9a5207a9731a9aab6fa300ef912e9d647a44e1d76f799221e6c34ec302
+MISC metadata.xml 245 BLAKE2B ab350a90c1ad1c92a5501fc0cc1ebc4e74b4e4cd7ae62d799d0c6252aa2b7870d097491c1652d8802ff3f09d2c32168dc8352925e2e7e634c0765c8e058767ee SHA512 7c8642b6ad51f52af088bfa8d4794519ef6cf59752bf428ba1c6be407b47336a30a7a9a4c6a5a52957efb3f8b695adeaf87ebafa49e61d0b8131b65a2a527afc
diff --git a/media-libs/webrtc-audio-processing/files/1.0-abseil-cmake.patch b/media-libs/webrtc-audio-processing/files/1.0-abseil-cmake.patch
new file mode 100644
index 000000000000..ca1e825469a5
--- /dev/null
+++ b/media-libs/webrtc-audio-processing/files/1.0-abseil-cmake.patch
@@ -0,0 +1,69 @@
+From 3f9907f93d3983033e176e95f5134a57900a7f6e Mon Sep 17 00:00:00 2001
+From: Arun Raghavan <arun@asymptotic.io>
+Date: Thu, 10 Dec 2020 19:06:31 -0500
+Subject: [PATCH] build: Use cmake to look up abseil dependency
+
+This should be much more robust than looking up the library directly.
+
+Fixes: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4
+---
+ .gitlab-ci.yml |  3 ++-
+ meson.build    | 21 ++++++++-------------
+ 2 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+index 11a3b78..42cd589 100644
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -19,7 +19,7 @@ variables:
+   # CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES.
+   # The tag is an arbitrary string that identifies the exact container
+   # contents.
+-  BASE_TAG: '2020-11-27.1'
++  BASE_TAG: '2020-12-10.1'
+   FDO_DISTRIBUTION_VERSION: '20.10'
+   FDO_UPSTREAM_REPO: 'pulseaudio/webrtc-audio-processing'
+ 
+@@ -43,6 +43,7 @@ include:
+     FDO_DISTRIBUTION_PACKAGES: >-
+       g++
+       gcc
++      cmake
+       libabsl-dev
+       meson
+       ninja-build
+diff --git a/meson.build b/meson.build
+index bae155e..96d84d7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -40,19 +40,14 @@ os_deps = []
+ have_posix = false
+ have_win = false
+ 
+-absl_dep = [
+-  cpp.find_library('absl_base'),
+-  cpp.find_library('absl_bad_optional_access'),
+-  cpp.find_library('absl_flags_internal'),
+-  cpp.find_library('absl_flags_marshalling'),
+-  cpp.find_library('absl_flags_parse'),
+-  cpp.find_library('absl_flags_registry'),
+-  cpp.find_library('absl_flags_usage_internal'),
+-  cpp.find_library('absl_raw_logging_internal'),
+-  cpp.find_library('absl_strings'),
+-  cpp.find_library('absl_synchronization'),
+-  cpp.find_library('absl_throw_delegate'),
+-]
++absl_dep = dependency('absl', method : 'cmake',
++  modules : [
++    'absl::base',
++    'absl::flags_parse',
++    'absl::strings',
++    'absl::synchronization',
++  ]
++)
+ 
+ if ['darwin', 'ios'].contains(host_system)
+   os_cflags = ['-DWEBRTC_MAC']
+-- 
+GitLab
+
diff --git a/media-libs/webrtc-audio-processing/metadata.xml b/media-libs/webrtc-audio-processing/metadata.xml
index 85e4ed814fa2..f3a2d1816285 100644
--- a/media-libs/webrtc-audio-processing/metadata.xml
+++ b/media-libs/webrtc-audio-processing/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>leio@gentoo.org</email>
+		<name>Mart Raudsepp</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.0.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.0.ebuild
new file mode 100644
index 000000000000..6f1978a3eab3
--- /dev/null
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="AudioProcessing library from the webrtc.org codebase"
+HOMEPAGE="https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="cpu_flags_arm_neon"
+
+RDEPEND="dev-cpp/abseil-cpp[-cxx17(+)]" # TODO: resolve cxx14 requirement
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-abseil-cmake.patch
+)
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_configure() {
+	local emesonargs=(
+		-Dneon=$(usex cpu_flags_arm_neon yes no)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 8b5d8f21661f..c3437dcff8c8 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -6,6 +6,7 @@ AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f
 DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e
 DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
 EBUILD x265-3.4.ebuild 6377 BLAKE2B 8cc509d9a0d7c8d4b0ed2226f3eae682035f725648d0c43b3083c6db50ae8afb3351855f38204a55bd1b5dd8fec3d6f6e11c5f12a0b3533f051e16983cef10f2 SHA512 d634f733615b5c2abbb3ced26c867e18a997172869e7991066d9f7ca18486f2140ee8195edd2f3584a3479f5a556ddb7e4e428d5a2bf963b56c9fde993853843
+EBUILD x265-3.5-r1.ebuild 6323 BLAKE2B 44ca896e96db19607d459260f0d08b21127a16110f30ddccf022880c285b81046915f0b21fc6a3e6b3565fb05ae582ec2589e95e4053af4aa278c2a70034bb06 SHA512 dcb576be87c85b898be29daa033381803675ff39424374340954a4e7cd04918c16c15667e43966d9efb1f9809792e5917f00fa1c1f749f6192b44f85a3c02bb7
 EBUILD x265-3.5.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85
-EBUILD x265-9999.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85
+EBUILD x265-9999.ebuild 6323 BLAKE2B 44ca896e96db19607d459260f0d08b21127a16110f30ddccf022880c285b81046915f0b21fc6a3e6b3565fb05ae582ec2589e95e4053af4aa278c2a70034bb06 SHA512 dcb576be87c85b898be29daa033381803675ff39424374340954a4e7cd04918c16c15667e43966d9efb1f9809792e5917f00fa1c1f749f6192b44f85a3c02bb7
 MISC metadata.xml 622 BLAKE2B 337e399c3be2dfc52c2f422a76ae80faad2424d221e074041e06cc0a10403bea1aca3975ae6afaf9bb4b50cc5069db8413928e8697458014c6f96d1856421f79 SHA512 be4f7c57f732fa836cda726da9426a0e4bdac2a681a4be3bb157e7cf7b8f517e3002653d9ee7a58ba81601d34fb6168680453bbdaa10389b65945f7b4d1a492c
diff --git a/media-libs/x265/x265-3.5-r1.ebuild b/media-libs/x265/x265-3.5-r1.ebuild
new file mode 100644
index 000000000000..3e0116c5da00
--- /dev/null
+++ b/media-libs/x265/x265-3.5-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
+	S=${WORKDIR}/${P}/source
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/199"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+BDEPEND="
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/arm-r1.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/x265-3.3-ppc64.patch"
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/test-ns.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm* ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			# disable altivec for 12bit build #607802#c5
+			if [[ ${ABI} = ppc* ]] ; then
+				mycmakeargs+=(
+					-DENABLE_ALTIVEC=OFF
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+				)
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm* ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			# disable altivec for 10bit build #607802#c5
+			if [[ ${ABI} = ppc* ]] ; then
+				mycmakeargs+=(
+					-DENABLE_ALTIVEC=OFF
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+				)
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist="" v=
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+				if [[ ${ABI} = ppc* ]] ; then
+					# upstream uses mix of altivec + power8 vectors
+					# it's impossible to enable altivec without CPU_POWER8
+					# and it does not work on ppc32
+					# so we toggle both variables together
+					mycmakeargs+=(
+						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
+					)
+				fi
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	local myabicmakeargs=(
+		-DENABLE_TESTS=$(usex test ON OFF)
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_PIC=ON
+		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DGIT_ARCHETYPE=1 #814116
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = arm ]] ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+
+	# we don't install *.a files for all variants,
+	# so just delete these files instead of pretending
+	# real USE=static-libs support
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index e956de4eab01..3e0116c5da00 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -161,6 +161,7 @@ multilib_src_configure() {
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_PIC=ON
 		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DGIT_ARCHETYPE=1 #814116
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
commit	c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree	620cbf137661399a3fb1eff92914204f9a970713 /media-libs
parent	cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)