gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /media-libs
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
218 files changed, 2564 insertions, 6139 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 712272101544..d0ae0da7706a 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 9eefa5fa29a0..3346525e9835 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -6,6 +6,6 @@ DIST alsa-lib-1.2.6.1.tar.bz2 1079670 BLAKE2B 4f3d1d078678773b4f6a569d0eea95d0cf
 DIST alsa-lib-1.2.6.tar.bz2 1079598 BLAKE2B 84a7a20fbea4025f2ac08acefa3a9ea9d2737585c5d5f09c8df3b5ccb998eaa09a7ec16a019a40c4d3e3e4b5209b961f9da23ec57c0bb9824bade9a3a0dd4350 SHA512 ae95718813abf62811fe44c6df2a8de5a1227da4b022c4dd97dd8e7c1001f48307ba36bf04208bdbe24e8a8eebf4ed5a59f40ee6750dcbe976678071c3f2f5b7
 EBUILD alsa-lib-1.2.4.ebuild 1986 BLAKE2B 75c4ca91c6f79e7a639341f8ea27f11ef704c42ba00eb9dc0f58884d257c505b069433559bbab92db87113bdf050e1c611131a02c989465957d17f3c92b6a3d0 SHA512 2bb97a7ae3fa3e7531957e42e8978fbd7b41408671db0f906c668687897180f168db6d0e67a354bc687f873cc95156921b6277f4c8bd335feadd0bbe5ebb528c
 EBUILD alsa-lib-1.2.5.1.ebuild 2314 BLAKE2B 00075780d4b4f7421556ff3ea10965e9f8a98433f786cc539fd72f3e039098f10a11cc7fa69f3d5a2b63f0f3297b40eec28afbed912e812452b8f2e3a3adbcef SHA512 159fb7ca0549fe84b86d9faf3e1f9b98d20b57be00b1d1055ba1d1926998c52e30838029907b74523b706d9fcc30fc2a3ac19568df3e083e00aed1da9fbd04d6
-EBUILD alsa-lib-1.2.6.1.ebuild 2314 BLAKE2B 884305ffaf821401f6b9f20726612d04ce65beb330c122c45a99540062fd96270c4872b02e1743a98cf7045b134d34121a4b7924568e24566f332e4b8cd562df SHA512 8acba14cf89e03f43e9b0caece170688b1139a49c65dd80ed62a044f20721787b8b341d2985e3e771cf523286d97059ffae2048696ff7cf2bbaf05a4be27e29e
+EBUILD alsa-lib-1.2.6.1.ebuild 2306 BLAKE2B aa32972911c915e2f235e69392d34b11034aac3d5b83ca2ccaf0cb82a959815d65fc86aee7fb8d42eda9f12d9de79a80c1b68165e542c181af944bab17d06023 SHA512 7f335702d57aa771955a5f18f18ae206dc02ef03540b4c7de047ea81d2b8f27e0856104daa458711e739f24cd450f29f2d8c52c2fca2cfc75b61d7b9390940f1
 EBUILD alsa-lib-1.2.6.ebuild 2314 BLAKE2B 884305ffaf821401f6b9f20726612d04ce65beb330c122c45a99540062fd96270c4872b02e1743a98cf7045b134d34121a4b7924568e24566f332e4b8cd562df SHA512 8acba14cf89e03f43e9b0caece170688b1139a49c65dd80ed62a044f20721787b8b341d2985e3e771cf523286d97059ffae2048696ff7cf2bbaf05a4be27e29e
 MISC metadata.xml 503 BLAKE2B 89b5c41a55784ff388766f60c106e719edd59a3bd47a1f2c240ad185ce750b1dc1a2efec704361b09c5e6e30d965514955f32fffa304200db7ff031a27d7fd85 SHA512 43f3a7e18f13ac58b4cbf31a92bd809c0618be1dd34a6a47d03e00ededd66343c3082bddac98cc286683ba32436b62aa2d61102de832f5fb21925ecfb2b54755
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
index c9ea9965ca37..d495e667ccef 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc 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 38b9cd9b2cb8..eeb6ad7e81b7 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD alsa-topology-conf-1.2.4.ebuild 510 BLAKE2B 0f2292e5e8932f6ef2fca2ab17a8d6548653d859d45ecf639b9d40ab74ba4c23a1fe86e4877448852378e16ce9b0c161de8b135e980014b53ce75259adabd9a9 SHA512 bbf4c4e5d11101f50bdf331f416657222cc290fe8af4d14a845ad60454f531beab9f1b0357705c9d6443f6d6d23f6e6e0367322019dd2f602ad837fd950baac2
-EBUILD alsa-topology-conf-1.2.5.1.ebuild 524 BLAKE2B eceaa5eaf04d1de79032c6da45f6f9ce0d3f8dfcc63819d3a3621c8a08bc69e1f6751a322ef13d848fd851a1a46e4c5a89871b71594da291a0da35d84a58888b SHA512 d7e751ba791f143ea9870f7e77b806e3c8f3be83264eb027520df1d8602272033303c9a71cf50451a28bf68a868cc16ec08c33dc6a39dfb8cd9c052b843a3a37
+EBUILD alsa-topology-conf-1.2.5.1.ebuild 516 BLAKE2B aee0dfb10f3875ec3b11de242daab637bed709cb857261e27863219cd59189e8f42b6a4bf74ad6ceb1c881fe9cb0643201f6bce01aea2015ac8181e538375479 SHA512 b491f7b4173ea4d93292d07b2b6b0e9d68226d0fb2bb8fc728389c2a3bc22410cbb728971db5a840ef62ecec3199bcd07f4ecbc419e2f6fe975dfdb8f8c82d94
 MISC metadata.xml 330 BLAKE2B 483666d5c3505dbe28c41bb0484959a794c67e56b1581cd00ceb96cfc17a77e4f4426a528c225ad65d23b73e0bdd3a6609438d4686da64f0be9ea1fc600cab37 SHA512 198a3560c3e2458d2947ea934457ff7d04df9277146f3c6ccdc06ed0043950dad30200986c7dece3a5620c495365ef835bd38bf3608e0b3c69cb6b127ce5602c
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild
index 886558fd2b44..0f448332b591 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 216e5304643b..b1d38a86b972 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -8,6 +8,6 @@ EBUILD alsa-ucm-conf-1.2.4.ebuild 504 BLAKE2B 84cbca14794d2060a35db13528fd65f694
 EBUILD alsa-ucm-conf-1.2.5.1.ebuild 518 BLAKE2B ec4d80331565113f921b711d4a1d501ff189b614d92989eaa120c480dbbf2e1ad181eeaea6fb696a4d184e20b2602fc7122b1e4e1d4a135f97b4b0b3abb93712 SHA512 76d07e86b7d9af05646ff92ceddce0e10c8cf3bf0c1a0cb6a3645db259c5c2c93c9fe330278a0b6d4dbf8faf40aea31abe7a8c2f50d8dc0723c4f52bc5651944
 EBUILD alsa-ucm-conf-1.2.6.1.ebuild 518 BLAKE2B 3d13771958e9bec9e2c4f67661f9fe6534145fc0fd0ed92c8052dac55d370a4cd1c1f615f5ec4ad4846f4cc112d5d55259f9b322858024770d1f4b4252e866fb SHA512 17b1549906eb2d572d8d094e9ae2e92b1155da03e86cf5829612b2c2b5db9a02ae06564ca70de5e354364ec7cdeb34b8f69b7ea40e48d0764a52585045c6f6f3
 EBUILD alsa-ucm-conf-1.2.6.2.ebuild 518 BLAKE2B 3d13771958e9bec9e2c4f67661f9fe6534145fc0fd0ed92c8052dac55d370a4cd1c1f615f5ec4ad4846f4cc112d5d55259f9b322858024770d1f4b4252e866fb SHA512 17b1549906eb2d572d8d094e9ae2e92b1155da03e86cf5829612b2c2b5db9a02ae06564ca70de5e354364ec7cdeb34b8f69b7ea40e48d0764a52585045c6f6f3
-EBUILD alsa-ucm-conf-1.2.6.3.ebuild 518 BLAKE2B 3d13771958e9bec9e2c4f67661f9fe6534145fc0fd0ed92c8052dac55d370a4cd1c1f615f5ec4ad4846f4cc112d5d55259f9b322858024770d1f4b4252e866fb SHA512 17b1549906eb2d572d8d094e9ae2e92b1155da03e86cf5829612b2c2b5db9a02ae06564ca70de5e354364ec7cdeb34b8f69b7ea40e48d0764a52585045c6f6f3
+EBUILD alsa-ucm-conf-1.2.6.3.ebuild 510 BLAKE2B da6e46c66c1de402d56e7a64ead16dda3ffecb9e5cbabe0c6efb9846d7fb79ca05750e183f099c85c35ea7a69f5adebf92085298907ed4261abe3e512d2c5392 SHA512 6091f1068d4c2a966c3fcc5f945edf1787e3622a5ea49a6e6e408f11d19495468eacffb1a1d84aafb60d1214ed80e81d37a0a23ff987080c679531f555c0119b
 EBUILD alsa-ucm-conf-1.2.6.ebuild 518 BLAKE2B 3d13771958e9bec9e2c4f67661f9fe6534145fc0fd0ed92c8052dac55d370a4cd1c1f615f5ec4ad4846f4cc112d5d55259f9b322858024770d1f4b4252e866fb SHA512 17b1549906eb2d572d8d094e9ae2e92b1155da03e86cf5829612b2c2b5db9a02ae06564ca70de5e354364ec7cdeb34b8f69b7ea40e48d0764a52585045c6f6f3
 MISC metadata.xml 325 BLAKE2B 02b18895e880cd1da866d0290d992a060c3a6fb797df776ea270be86b0c32e9c712536efb1ef91c0a69e78238cf5898ef1b737826cf7e9f9ac57cdd8dfba5162 SHA512 f444b018e6d93287bcbc7d886e0962ab3e0fb67b387fe4f0f31f2ba7cc6706d760a2e9db0f29318ca2211cb14cadf2ff4b8e0fa0bb72ff5e238c81996cbd29e2
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild
index fc541a8256d6..afdef18fdc6e 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/amdgpu-pro-vulkan/Manifest b/media-libs/amdgpu-pro-vulkan/Manifest
index 02d5a98fbdbf..695f40e9c9e9 100644
--- a/media-libs/amdgpu-pro-vulkan/Manifest
+++ b/media-libs/amdgpu-pro-vulkan/Manifest
@@ -9,4 +9,4 @@ DIST amdgpu-pro-vulkan-22.10.0.1395274-i386.deb 8992376 BLAKE2B 7b3ea214e5cc6a98
 EBUILD amdgpu-pro-vulkan-21.50.1.1376756.ebuild 2842 BLAKE2B 22dbb1146620527c2815d33952de07436c9c8982daee2ad216217d853a3f80c5622c67882c448dc6b90b9999147b4f66135c580785b89fdf042dfeed85b1dd09 SHA512 5278c756dd3684d4cc61295d8bff1c1e9a00cdd404a1478c623f85d21fc901c8d2f856149b4fb87d31a3647d17e5f39193501de4f5a7ac5a72eaef65352c9c77
 EBUILD amdgpu-pro-vulkan-21.50.2.1384496.ebuild 2842 BLAKE2B 22dbb1146620527c2815d33952de07436c9c8982daee2ad216217d853a3f80c5622c67882c448dc6b90b9999147b4f66135c580785b89fdf042dfeed85b1dd09 SHA512 5278c756dd3684d4cc61295d8bff1c1e9a00cdd404a1478c623f85d21fc901c8d2f856149b4fb87d31a3647d17e5f39193501de4f5a7ac5a72eaef65352c9c77
 EBUILD amdgpu-pro-vulkan-22.10.0.1395274.ebuild 3792 BLAKE2B 2d09ae3c28e6cec3f648c8e4ea1eee0101e66e79aa82277f84508810437ce239776cf9818bbee8e89333e61f2e94de557c7b2e3d620ec808140088b4f61f73f1 SHA512 28d54066de38baa0466fd295bd11e9e708d96777972136bc492c790bf78558257a663975fcf8f8154e9d03ee9aabf30f5646e0fd99c6c8f6b5ec941ed48adeb8
-MISC metadata.xml 401 BLAKE2B c46c3e3729fe8721b57a97a504997e1dd773fceb8ba0ff302f985eca3053abba5ac5f1103d6e4437074b854a3c4c55f7fc6991def0054fb768c8db9eec27ce16 SHA512 08ef778f6f5675ec9848b8f0a8e9296d41a4f21f18a344ba5a0f915a5933280dbd21e66692aaee5ca854785b3a639707d41c0912fdbe43373b51aa173c751383
+MISC metadata.xml 402 BLAKE2B 45f4e6adffb186b9a9b36b420aaa5727f025206eca039d9f6fbe3eb302f7200cc24c079480d91c9d92ccd932bef86b87401400f17eba2fd8b4baa3fca66cf236 SHA512 dc9e5a699437291c5f768d66bdfd9d2aaa00e931f358e6d0045e764638332a8db14bd19a782aac0918dc4b42b8658a5974bdfec2971690e6718be247fff512b3
diff --git a/media-libs/amdgpu-pro-vulkan/metadata.xml b/media-libs/amdgpu-pro-vulkan/metadata.xml
index 03e31d9fc34c..6d07c8aa6259 100644
--- a/media-libs/amdgpu-pro-vulkan/metadata.xml
+++ b/media-libs/amdgpu-pro-vulkan/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<name>Adel Kara Slimane</name>
diff --git a/media-libs/amf-headers/Manifest b/media-libs/amf-headers/Manifest
index ea05b289cabe..c1e804e4cab5 100644
--- a/media-libs/amf-headers/Manifest
+++ b/media-libs/amf-headers/Manifest
@@ -1,3 +1,3 @@
 DIST amf-headers-1.4.23.tar.gz 14971091 BLAKE2B d569851ccb5b3cd57bfff3e6475207e9f01681c2215add160a83165653efce2f0c8acc41a49c227952a649f0cfe92e7e713fbee8bd45b0489844c19e83fa5c74 SHA512 98b2b7d634ac24be5c5234fad99d58c9668b2dab83e89162a0508f9b06efec5de29b307534dc1dd677f9586be2c4fa58c8f04a535d5e66fa0be3b233a117a5d7
 EBUILD amf-headers-1.4.23.ebuild 694 BLAKE2B ba44b78cd69804530554bea8c710fb7f00789ad42d3612144d633d16930d9ba2aa09e77b0ed70a4d1ead0dfc04d02d4411f041633cd03ee521922a7c29f4d464 SHA512 f5fe23c9a18fc573b9b15da064f8c67a4339e3e6c8d9af7d2c3071c48f3b1b3240224009025ae5b8be5d68a7382ea57842b50392b45d6a143104e6757aa3d21d
-MISC metadata.xml 570 BLAKE2B efe03e3d179662de4a0a63ad87d6ed0650a06931c9ba6aadba4fd8a35266012f224105ca3b1d87e4e7622cc355b8c3391db90d48e2c96540341a50c0cff7d454 SHA512 b43fde2f2714f5aac813edf978029347cbac784dd9f388bd0f5a8f0ea800ddeff396095cb40e0ffc4e068895a72db66101a70dab2d70f7f9a28bf29bafe6c382
+MISC metadata.xml 571 BLAKE2B 921f83bae051789cf587663b4168174eab058dc2866b4d9e24dcb9f3ff5f3b64ea85c7e45282c2eeea42716f7f79a971171333ece1dd72d7d2e49e84efe2ef57 SHA512 ed0a057d7f1c738308eed226c562b5a83bf6ae421f1487f98a1c8361afa65276c5ea2f83f3d8187229d88fe0fe02a41178d37347d28ddc5b22695ae3f4740368
diff --git a/media-libs/amf-headers/metadata.xml b/media-libs/amf-headers/metadata.xml
index 2e81ecdb16ab..4c80ed580014 100644
--- a/media-libs/amf-headers/metadata.xml
+++ b/media-libs/amf-headers/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<name>Adel Kara Slimane</name>
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 4568d0351dbc..c9bd7c095ac2 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -8,11 +8,13 @@ AUX assimp-5.0.1-projectversion.patch 686 BLAKE2B 0b521adc80aaa2350a8225c40a2e1a
 AUX assimp-5.0.1-versiontest.patch 779 BLAKE2B 7d48c4070917589808a04ba370a682a4b96bf7cb116befee9c8c110fafc17878b7cf8729d6321968670ecedb763a93c237ade4af9f1194e6850b34d4dd6a3be3 SHA512 1b29ba91ecd6d4650e1f44ac7dbbd14e508b85adef78c4396d820567fdabf98d9098ea8f3e2be7368ffeb42b220fe4749d459dfb38edc99be2f09b4aefcb80c3
 AUX assimp-5.2.2-disable-failing-tests.patch 1889 BLAKE2B 7f1f72ca6851dbe07d2493ee81a3c18e7118658b76ad5a41f31626cf0099b8bc7bb2fec83ef64c7ab6feb4fe01994cf106440d7a284d5af66b06b2a5ccb086d9 SHA512 128e420ae01246f46deab243bf09e4a0012935e34d5273792c22538bc9353641203450388c19aa5a7670d0f1a3a40e1d4e31a550711f64c8e2d4d0b0e6b3fba2
 AUX assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch 855 BLAKE2B a6f526719d65b8aeb3c8ec1333973bd273589f7a1bb03a6838331740fd1961d63d121bf07636918dd221ba9af3a32a600c3fed3f0dd3135c7e37655d5bfa1fba SHA512 2103864934bd4a3469b419536da4604839b3b1a1b412612dd5a631f578d7c54538e7c97ca612e28425e5f1dd0ce71c11117165f1cbcb5f3604113ae4be259734
+AUX assimp-5.2.3-drop-Werror-gcc-option.patch 766 BLAKE2B 3e9b4a7fb369752de6a73b72f943c5a5d82b2b57b5e5a4c2c46b43b0a88d5ca7b8cfd36ee50a69389ddfe8e6fec0ac96f4797d7803695cb51585b79f80998f77 SHA512 774abd8d0334605a1d48889036376d16fed683dd0f0f86fcfc39792e97d088383ca7eb49f8df842feedba1d2790b8a86c7d752aab38ca6fcf0f7819cc1a96d73
+AUX assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch 4743 BLAKE2B 93f9bbc8d3bf8d97a3bbcfedabbeaba380055104da8cd776324b6a232ed121242e767de32eeefde6d7a76ddc002397277f7c4edf4fd719dbf17486b21c7b0226 SHA512 dc1767fd121fe3087dc63ee47c87302e2198f97bd8794ef4cbc5815aa5752e00f5ec4450b08553767b2f3c24b2603e444fdedf1edf94efce13c81d1aa988d382
 DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
 DIST assimp-5.2.2.tar.gz 49600909 BLAKE2B f5f8b5fc43a44c59c95ac3a1f2ce861a5198851ca910ec7688a818550aa0cde787901f7a7beb9f90f7fe731e18f3c31c7350d3b3070f7437153ff9d041f6ffdf SHA512 7f11f3e53bdcd43a81be49ce2ad90d97769ae1c3c6157f57e8a0b2b41c72f394ad1afcdc5f5fa6fbfa1a44233fed4b9a578d5548ec5b9aae2113ef88c2ec843a
 DIST assimp-5.2.3.tar.gz 49606233 BLAKE2B d6904769f1812b875a3b30de9edf35d9ca1774aecefe4d84edaaaa2975be1350de46e259e14b40f7749921c398490e7aea08c30c0ee89a69aedeab8f02a3e863 SHA512 accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa
 DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
 EBUILD assimp-5.0.1.ebuild 1483 BLAKE2B a0342beeb4a2c258836d8109714887b965c938c8c9503d30a5e7421a0c12a5de7fb7e87a7c75d3770328471aa0308e2461080063c8584a72c7fe8e947b87a6f9 SHA512 f5dd6f5610cb896a25288f9924cd8a52dd0f386934e7c43dec8f8af59ce7d44b21f3a04ded400f2de6679fb83a499b941037dfee9047e526e85a8065b2547b1b
 EBUILD assimp-5.2.2.ebuild 1170 BLAKE2B 0e87a8edaa8e4fe0b9a33d1dd5c95f63e041eafec91d40af902bc39f5be2aff4c998c4cc43b33b585f3b4a6a302a95f6f288599c29979e60a6aeb04c2c283e24 SHA512 dcc9ee9470c6b63f87c20e1ae2f3d75f8cc9e8b28ef25838b2558f932f0e775b3521380a903f3cffbfc1a9137403d2ffec2ff2386c2d74c227a8789ffcf8166d
-EBUILD assimp-5.2.3.ebuild 1225 BLAKE2B 0a59b57212b0324facedd18f2c71941567c6a5801906159e0c0d5810e730e720069422974d2f1c81a504e50cd430d169f6e3747454f1ee363fcbd2249790c170 SHA512 0cbd1b881aab6319321e8cfb73623e02bcda2b8dbe4806d8a967255cdbc9d4eadfca31516fd1349ef6dfb7fc1aeda932258dced0d8e21687961d120a9ed7e833
+EBUILD assimp-5.2.3.ebuild 1404 BLAKE2B b6c7882d2b15060f4ef07eb31133f8bec2241016af23eb5597b3017f8a38905ed601566e4b726e5ac19e5162332836fea784871bfd4c1f07bcd6ce7c920bbf03 SHA512 7e07aa5d4dbd61dd87bfee6c99d3ba01a0709248c68ff861f5fd7fbd6ea2a931250c2d69ee551a71fa6fe9590d789e644180d4def7fc4ee62f78264ca7328007
 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a
diff --git a/media-libs/assimp/assimp-5.2.3.ebuild b/media-libs/assimp/assimp-5.2.3.ebuild
index ba654ddd393f..d74e3f10d1f0 100644
--- a/media-libs/assimp/assimp-5.2.3.ebuild
+++ b/media-libs/assimp/assimp-5.2.3.ebuild
@@ -32,11 +32,20 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
+	"${FILESDIR}"/${P}-drop-Werror-gcc-option.patch
 	"${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
 )
 
 DOCS=( CodeConventions.md Readme.md )
 
+src_prepare() {
+	if use x86 ; then
+		eapply "${FILESDIR}"/${P}-drop-failing-tests-for-abi_x86_32.patch
+	fi
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DASSIMP_ASAN=OFF
diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
new file mode 100644
index 000000000000..736757693774
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/840616
+https://github.com/assimp/assimp/issues/4433
+
+From dea8b4d8c533c131bd546c316f8df8af8897ac75 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 25 Apr 2022 17:39:33 +0200
+Subject: [PATCH] drop -Werror gcc option
+
+Temporary hack to allow building with gcc-12
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/code/CMakeLists.txt
++++ b/code/CMakeLists.txt
+@@ -1179,8 +1179,6 @@ TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp)
+ # enable warnings as errors ########################################
+ IF (MSVC)
+   TARGET_COMPILE_OPTIONS(assimp PRIVATE /WX)
+-ELSE()
+-  TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)
+ ENDIF()
+ 
+ # adds C_FLAGS required to compile zip.c on old GCC 4.x compiler
+-- 
+2.35.1
+
diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
new file mode 100644
index 000000000000..1de4f661fa55
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
@@ -0,0 +1,134 @@
+https://bugs.gentoo.org/840767
+https://github.com/assimp/assimp/issues/4438
+
+From f963a15bbbcfa1e3c4bd0c24173f90151e023469 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 28 Apr 2022 07:59:26 +0200
+Subject: [PATCH] drop failing tests for abi_x86_32
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
++++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
+@@ -68,13 +68,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromMatrix4Test) {
+     EXPECT_EQ(result_cpp, result_c);
+ }
+ 
+-TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromQuaternionTest) {
+-    const auto q = random_quat();
+-    result_cpp = q.GetMatrix();
+-    aiMatrix3FromQuaternion(&result_c, &q);
+-    EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3AreEqualTest) {
+     result_c = result_cpp = random_mat3();
+     EXPECT_EQ(result_cpp == result_c,
+--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
++++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
+@@ -78,15 +78,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromMatrix3Test) {
+     EXPECT_EQ(result_cpp, result_c);
+ }
+ 
+-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromScalingQuaternionPositionTest) {
+-    const aiVector3D s = random_vec3();
+-    const aiQuaternion q = random_quat();
+-    const aiVector3D t = random_vec3();
+-    result_cpp = aiMatrix4x4(s, q, t);
+-    aiMatrix4FromScalingQuaternionPosition(&result_c, &s, &q, &t);
+-    EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4AddTest) {
+     const aiMatrix4x4 temp = random_mat4();
+     result_c = result_cpp = random_mat4();
+@@ -135,12 +126,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4InverseTest) {
+     EXPECT_EQ(result_cpp, result_c);
+ }
+ 
+-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DeterminantTest) {
+-    result_c = result_cpp = random_mat4();
+-    EXPECT_EQ(result_cpp.Determinant(),
+-        aiMatrix4Determinant(&result_c));
+-}
+-
+ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4IsIdentityTest) {
+     EXPECT_EQ(result_cpp.IsIdentity(),
+         (bool)aiMatrix4IsIdentity(&result_c));
+--- a/test/unit/AssimpAPITest_aiQuaternion.cpp
++++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
+@@ -54,19 +54,6 @@ protected:
+     aiQuaternion result_c, result_cpp;
+ };
+ 
+-TEST_F(AssimpAPITest_aiQuaternion, aiCreateQuaternionFromMatrixTest) {
+-    // Use a predetermined transformation matrix
+-    // to prevent running into division by zero.
+-    aiMatrix3x3 m, r;
+-    aiMatrix3x3::Translation(aiVector2D(14,-25), m);
+-    aiMatrix3x3::RotationZ(Math::aiPi<float>() / 4.0f, r);
+-    m = m * r;
+-
+-    result_cpp = aiQuaternion(m);
+-    aiCreateQuaternionFromMatrix(&result_c, &m);
+-    EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromEulerAnglesTest) {
+     const float x(RandPI.next()),
+         y(RandPI.next()),
+--- a/test/unit/AssimpAPITest_aiVector2D.cpp
++++ b/test/unit/AssimpAPITest_aiVector2D.cpp
+@@ -67,28 +67,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AreEqualEpsilonTest) {
+         (bool)aiVector2AreEqualEpsilon(&result_cpp, &result_c, Epsilon));
+ }
+ 
+-TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) {
+-    result_c = result_cpp = random_vec2();
+-    result_cpp += temp;
+-    aiVector2Add(&result_c, &temp);
+-    EXPECT_EQ(result_cpp, result_c);
+-}
+-
+-TEST_F(AssimpAPITest_aiVector2D, aiVector2SubtractTest) {
+-    result_c = result_cpp = random_vec2();
+-    result_cpp -= temp;
+-    aiVector2Subtract(&result_c, &temp);
+-    EXPECT_EQ(result_cpp, result_c);
+-}
+-
+-TEST_F(AssimpAPITest_aiVector2D, aiVector2ScaleTest) {
+-    const float FACTOR = RandNonZero.next();
+-    result_c = result_cpp = random_vec2();
+-    result_cpp *= FACTOR;
+-    aiVector2Scale(&result_c, FACTOR);
+-    EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
+     result_c = result_cpp = random_vec2();
+     result_cpp = result_cpp.SymMul(temp);
+@@ -96,21 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
+     EXPECT_EQ(result_cpp, result_c);
+ }
+ 
+-TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) {
+-    const float DIVISOR = RandNonZero.next();
+-    result_c = result_cpp = random_vec2();
+-    result_cpp /= DIVISOR;
+-    aiVector2DivideByScalar(&result_c, DIVISOR);
+-    EXPECT_EQ(result_cpp, result_c);
+-}
+-
+-TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByVectorTest) {
+-    result_c = result_cpp = random_vec2();
+-    result_cpp = result_cpp / temp;
+-    aiVector2DivideByVector(&result_c, &temp);
+-    EXPECT_EQ(result_cpp, result_c);
+-}
+-
+ TEST_F(AssimpAPITest_aiVector2D, aiVector2LengthTest) {
+     result_c = result_cpp = random_vec2();
+     EXPECT_EQ(result_cpp.Length(), aiVector2Length(&result_c));
+-- 
+2.35.1
+
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index da1b5b1e6053..c9f917f88825 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,5 +1,4 @@
 DIST chromaprint-1.5.1.tar.gz 1581159 BLAKE2B 9f7f030e97d3114cf679df298d313ea826c0fb05e7e7d8a10090d0a27ed0811b380b81b29fce973e0493826c478964367396311fd0484619cb2fc4c2d8e0d4c0 SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
 DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
-EBUILD chromaprint-1.5.1-r2.ebuild 1635 BLAKE2B 8687c05e31d18cd12285fe6b2befc8e30f3e29c769e5c91bf3206b1593a71bc6c3d744f437d53e515dfde9b8f324cfbf643ca749c8b5d758a84160bfb29de7c5 SHA512 c38844e269f1045c4b5d3e51e1f315a1fe6dc381f3c65fd2ec19960361e3b3f4782c4b54c6fc191a3772165554cadeedceeb6df1b39bf1c4f79dd9eadf05117c
-EBUILD chromaprint-1.5.1.ebuild 1300 BLAKE2B ac5a54d0965f922f3b29e65b42a02eb47ed2707ed7cf2b338e37a3791596f7b67bd78b913fbee3613c9bf20be1180bb28da0210ad1a019216b972077113351d6 SHA512 deb96d762d15d06c584839806b1487b9088236d41e7e284ab2de4837e247053a1e6ce271b2a9c89eb2988d2cc7229eedd9515e0d90eae9c0a5732e4119e9e906
+EBUILD chromaprint-1.5.1-r2.ebuild 1628 BLAKE2B eeb24b160b059cc607771bcb04ba51d1c23520043d87cc52e41a16a46f130ac17eaa12c0ad3ab1b0d272ba7a8dac173407a7b44292d5205f0aa75e90a0f03e4f SHA512 0fc3ce04321d4b9b83238964b8fa9b7ceb07736eb8b6c13250c7fb21d5d96621fc405cfe74522331c6d91259849c0601c245b26aba6b5434eb1299b73f5b03d6
 MISC metadata.xml 503 BLAKE2B badb1250c59d72306e528508fe7016028a5aec5f349ad050437ba4c818ed0fc9d63efcdab5774b5ad94956067fe4243f6f4aff5423e25a2ac9685e147590d976 SHA512 b10104402e9b04d904a9ef4e6876bb52764ccf4a0b38b1f5ef7b5b9534737e64b285bfafdb3e9f7582fc21d0204f52014cd7eea6e22c8097ac46f15c111971c3
diff --git a/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
index a3f156b7c867..123873b60767 100644
--- a/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/chromaprint/chromaprint-1.5.1.ebuild b/media-libs/chromaprint/chromaprint-1.5.1.ebuild
deleted file mode 100644
index 77fd5792ba01..000000000000
--- a/media-libs/chromaprint/chromaprint-1.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-GTEST_VERSION="1.10.0"
-GTEST_DIR_VERSION="1.10.x"
-inherit cmake-multilib
-
-DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
-	test? ( https://github.com/google/googletest/archive/v$(ver_cut 1-2 ${GTEST_VERSION}).x.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test tools"
-RESTRICT="!test? ( test )"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND="media-video/ffmpeg:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-DOCS=( NEWS.txt README.md )
-
-multilib_src_configure() {
-	export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_DIR_VERSION}/googletest/"
-	local mycmakeargs=(
-		-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DFFT_LIB=avfft
-		-DAUDIO_PROCESSOR_LIB="swresample"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cd tests && (./all_tests || die "Tests failed")
-}
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 219c859f696e..4333680f6900 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -6,6 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7
 AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
-EBUILD devil-1.7.8-r2.ebuild 2142 BLAKE2B d9ef2e6223ea2de918726a6f73f6cb342aea5a092be8a2e0ead630bcf0ef31af3f6ef79ef043c0e9eca2b8701d9ce2462b801bb8405acc92f0c6aacfc1dab14a SHA512 0539a865a64ffc14e0afec959e28277c81bd83f1c4e31155bd43b24429000e983e839e71c8b8639b2145ee374d94ec2c0501b9752b9bb01483c87d5f910331e4
-EBUILD devil-1.7.8-r3.ebuild 2160 BLAKE2B 570703c1faf8fb03c0b112e36b7246cdbdfd3e7bdb6257c5e7470bfbb855b8871687e35455c0305127fe52a9c02ed4429eb2aab7cb65d3591d80935afe8f462d SHA512 91b32333c10c9dc2e35018660d1165b88e2a3d236806d8ccc4bc9cbfaf04295147aa993db6675fbf632123be4dac4d76005deb9a4d8267cb2a92b1b50c716b83
-MISC metadata.xml 500 BLAKE2B ea23c56af001f0fc76e8f5a1e718a7fe7f011139bed10081f9a1b220b82f43da353722fe3e6a80fa8de7162d7c55da109617df50f428a0b973ddf1bfe27158d5 SHA512 7902a135b51029e4cf8fe5f9baf5e38250d5e471d820b98b9440a0be72c90902694b89e8d32de1d8e595384642ade6a7435aeba85c928e6d3f4cacde72925dc6
+EBUILD devil-1.7.8-r4.ebuild 2131 BLAKE2B 85c969d64a766a4141b6f9140fae95a2742c522eb9461af896bfd863e2faf363466451c8c5856d5f99148611551ea6f817f09e0780a0f3ac80077cbc2907003a SHA512 4acf8115f3238d73d84b1c7fbef9ca0b4893baaa0fd6f7eddf2d0fe1e440e05a0bff089f4365e52042489b27d30b972bb10dafd03d31cd3658ebb86192d119ce
+MISC metadata.xml 399 BLAKE2B 2c15e4e1bc8e8252fdf09f8a8efd4e0f5ad5c50b4680854dc971535afc4685b20f271d3a172176694911d7bdd57e8f61e390cbf06cecf19b3f00f3c50cda0e53 SHA512 2fc67e0217b66285f8b29157ae9630245b59bfd0e989b045705e54fe95b86d870933db9f820932ddbbb51b230433a12a98a57f52baa6f9944325c5f34835e3f1
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
deleted file mode 100644
index 2e70bc70215e..000000000000
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P=DevIL-${PV}
-
-DESCRIPTION="DevIL image library"
-HOMEPAGE="http://openil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
-IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm"
-
-RDEPEND="
-	allegro? ( media-libs/allegro:0 )
-	gif? ( media-libs/giflib:= )
-	glut? ( media-libs/freeglut )
-	jpeg? ( virtual/jpeg:0 )
-	mng? ( media-libs/libmng:= )
-	nvtt? ( media-gfx/nvidia-texture-tools )
-	openexr? ( media-libs/openexr:= )
-	opengl? ( virtual/opengl
-		virtual/glu )
-	png? ( media-libs/libpng:0= )
-	sdl? ( media-libs/libsdl )
-	tiff? ( media-libs/tiff:0 )
-	X? ( x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXrender )
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-CVE-2009-3994.patch
-	"${FILESDIR}/${P}"-libpng14.patch
-	"${FILESDIR}/${P}"-nvtt-glut.patch
-	"${FILESDIR}/${P}"-ILUT.patch
-	"${FILESDIR}/${P}"-restrict.patch
-	"${FILESDIR}/${P}"-fix-test.patch
-	"${FILESDIR}/${P}"-jasper-remove-uchar.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-lcms \
-		--enable-ILU \
-		--enable-ILUT \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable openexr exr) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		--enable-jp2 \
-		$(use_enable mng) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_enable xpm) \
-		$(use_enable allegro) \
-		--disable-directx8 \
-		--disable-directx9 \
-		$(use_enable opengl) \
-		$(use_enable sdl) \
-		$(use_enable X x11) \
-		$(use_enable X shm) \
-		$(use_enable X render) \
-		$(use_enable glut) \
-		$(use_with X x) \
-		$(use_with nvtt)
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/devil/devil-1.7.8-r3.ebuild b/media-libs/devil/devil-1.7.8-r4.ebuild
index 113a199ada8a..4abab857c9b5 100644
--- a/media-libs/devil/devil-1.7.8-r3.ebuild
+++ b/media-libs/devil/devil-1.7.8-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
-IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt opengl png sdl static-libs tiff X xpm"
+IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng opengl png sdl static-libs tiff X xpm"
 
 # OpenEXR support dropped b/c no support for OpenEXR 3
 # See bug #833833
@@ -22,21 +22,25 @@ RDEPEND="
 	allegro? ( media-libs/allegro:0 )
 	gif? ( media-libs/giflib:= )
 	glut? ( media-libs/freeglut )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	mng? ( media-libs/libmng:= )
-	nvtt? ( media-gfx/nvidia-texture-tools )
-	opengl? ( virtual/opengl
-		virtual/glu )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
 	png? ( media-libs/libpng:0= )
 	sdl? ( media-libs/libsdl )
 	tiff? ( media-libs/tiff:0 )
-	X? ( x11-libs/libXext
+	X? (
+		x11-libs/libXext
 		x11-libs/libX11
-		x11-libs/libXrender )
+		x11-libs/libXrender
+	)
 	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+DEPEND="
+	${RDEPEND}
 	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}"-CVE-2009-3994.patch
@@ -80,7 +84,7 @@ src_configure() {
 		$(use_enable X render) \
 		$(use_enable glut) \
 		$(use_with X x) \
-		$(use_with nvtt)
+		--without-nvtt
 }
 
 src_install() {
diff --git a/media-libs/devil/metadata.xml b/media-libs/devil/metadata.xml
index 58783541108a..5b50790d86f4 100644
--- a/media-libs/devil/metadata.xml
+++ b/media-libs/devil/metadata.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="allegro">Add support for Allegro</flag>
-    <flag name="nvtt">Add support for <pkg>media-gfx/nvidia-texture-tools</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">openil</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="allegro">Add support for Allegro</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">openil</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/fcft/Manifest b/media-libs/fcft/Manifest
index 1eff52b17475..bb8dc2086de1 100644
--- a/media-libs/fcft/Manifest
+++ b/media-libs/fcft/Manifest
@@ -1,5 +1,7 @@
 DIST fcft-3.0.0.tar.gz 441458 BLAKE2B 9ff83691435953285f1b3f8b51dac7b17453a457eeb910f035e39c6fa3bb39098d3adbb7179f734261a4034e9ea8b034dd03a20ba0c364b7de2efe9b781dfdaa SHA512 fbf7ac7d777bdb530b90b79a0bd8b90d3f7ae8b099c2733304dbe89fbcc1a1a3493d1eac0478bcdee291d8c804da21461737fc3e34164637e86ff737023622b1
 DIST fcft-3.0.1.tar.gz 441493 BLAKE2B 79fe864edf04b21fe88fa167e3390836e5c7254710082312068ff4c39624508e086f4eed2ea5706b52421b2276a6f2d1f2211ff0b256112d989764e667c44fe2 SHA512 856bec504a253678a2962c0a7c5029e5fd3d26e305ca3fcae8d9df398bcc84a03e9d67522673d1f1bb0ec91606c0627d6ab4bf2780cbb5965a01c91e6f0aac89
+DIST fcft-3.1.1.tar.gz 741229 BLAKE2B ef3fdca8f88893f0c69ed48181dce2a185d5e67ba6fc94d2f782b64f3078700c6be909560448f2625d43517f94aac2d82f58df29804b0fae5a72372a5b4a4004 SHA512 0344fc55906dee2588162f805ad703fe0efd26f3a8ce794273721d6111dd29bdb3589bd863f24998346018932f78b4c2dc04c4e2c8b49286db1efa9ecbc5521f
 EBUILD fcft-3.0.0.ebuild 1923 BLAKE2B fd4c2103f14439e1f6efa03950724995e1a3b15847e42bea11e067d02ed98234f122071ca101c96fe5fcc3aeb41e851244355f847b7f61a450bf403033daead7 SHA512 35a61954dcb546d9cf90277e1e835133a72680d6cbcf2e6601b70eb4510943d6946c744e4bade1bb2e1fd20c0f09dca6fa01369771214c8ae44c968c040a932f
 EBUILD fcft-3.0.1.ebuild 1930 BLAKE2B 13d1c5b14964a7abb19d9951511753ebf61fe6dc868189e2a9a1fb9c690674d1b2664748e7b572de5d6230eca06eb66b57bf0f725a73a91705f8f3d71b0f9d0b SHA512 0a9b5eb6c76a1571a94ff256a58644b1595f7b00b87df6969681c5d6ccaf7cb64bf76a8a9446ff9223c973b8947e92a79c13ae134a882eac951bca0c882dc6b2
+EBUILD fcft-3.1.1.ebuild 2061 BLAKE2B caf555f515ab6c2a2553026f8500396cbf04f4635571faaefea487d07b3a1e22e8e8cbf3a3cf426043d3c3f50a03e6290de4f5ae81ecb18f9fa8577ec1223abe SHA512 b7fe11484b87835c7a93fd2aa5221bfbd941c708061a0b2b1ac57476a3ba3d2ccae1d7bb04148556f25dc0b5bde4327e66393ff2a241a78405b75564b8b7b283
 MISC metadata.xml 631 BLAKE2B 464952a9c2b5959cbcb732323c54d57c4e67cb65efe87b4fe63b8369568531b0c6a0988990ea1756ee6012f81e6226600d638f2008fcdf452da36adeb5e204c0 SHA512 c2d704df7eeb25403bdbb7bd39c58c20d3c95dcf1c00051b8b558389344f9176fd4027349337ac7bb29249feefc997d0ef38e4ddc611d13a0c04a7880c048164
diff --git a/media-libs/fcft/fcft-3.1.1.ebuild b/media-libs/fcft/fcft-3.1.1.ebuild
new file mode 100644
index 000000000000..efecb5e0640c
--- /dev/null
+++ b/media-libs/fcft/fcft-3.1.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1
+
+DESCRIPTION="Simple library for font loading and glyph rasterization"
+HOMEPAGE="https://codeberg.org/dnkl/fcft"
+SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+# MIT for fcft
+# ZLIB for nanosvg
+LICENSE="MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="examples +harfbuzz +libutf8proc test"
+REQUIRED_USE="
+	libutf8proc? ( harfbuzz )
+	examples? ( libutf8proc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/pixman
+	examples? (
+		dev-libs/libutf8proc:=
+		dev-libs/wayland
+	)
+	harfbuzz? (
+		media-libs/harfbuzz:=
+	)
+	libutf8proc? (
+		dev-libs/libutf8proc:=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-i18n/unicode-data
+	dev-libs/tllist
+	examples? (
+		dev-libs/wayland-protocols
+	)
+	test? (
+		dev-libs/check
+		harfbuzz? ( media-fonts/noto-emoji )
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/scdoc
+	examples? (
+		dev-util/wayland-scanner
+	)
+"
+
+src_prepare() {
+	default
+
+	rm -r unicode || die "Failed removing vendored unicode-data"
+
+	sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
+		meson.build || die "Failed changing UnicodeData.txt to system's copy"
+	sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
+		meson.build || die "Failed changing emoji-data.txt to system's copy"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature harfbuzz grapheme-shaping)
+		$(meson_feature libutf8proc run-shaping)
+		$(meson_use examples)
+		$(use test && meson_use harfbuzz test-text-shaping)
+		# bundled, tiny, I believe this means we should always include it
+		-Dsvg-backend=nanosvg
+		-Ddocs=enabled
+		-Dwerror=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.md README.md )
+	meson_src_install
+
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+
+	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
+}
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index d75ad73a8948..80f86cd8f568 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -10,7 +10,7 @@ AUX fontconfig-2.14.0-skip-bubblewrap-tests.patch 408 BLAKE2B 911a87e91dcdf49088
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
-EBUILD fontconfig-2.13.1-r2.ebuild 5608 BLAKE2B c2dae524023fc7ba003263ab64efce755ce51f58da635c395fe72cd688ae865a975bc6000ed179e95298696693015b24cd5cb4309d84606583aaad2aaeed5dbd SHA512 b3b447d031b424b4e8d94b12efae6248cb432727c7aee7bb6c0ed4ec692199c9b0df1cff102be37eedd20ea93c1dff99f1cf5acd1de260c96012d53de04c828d
-EBUILD fontconfig-2.13.93.ebuild 6052 BLAKE2B 8b8776533738da7a8b4c2a0d2e4364ff800f688c1dee7e12fc2d7f18c8a0ecb810435960148132a184ec88156433449e8655a5007afac77513d6dcdbff48e216 SHA512 5efb40c14064ee4ed26073b8e10e2ba3f0b2debd6d06b1c3c523897374ae3dfe23c94fab0fcf94dd028965cbee207856fb9c884eaafe1eb752c4831439a2de8f
-EBUILD fontconfig-2.14.0-r1.ebuild 6710 BLAKE2B 2cbb75c57a8b3fc840bddc2b80ff43d23c6b736bce548db98e5f0991c87eec3b5b65cc2d0076a9da47a22affb8239eb419307dbc048bc41421befe753ee77670 SHA512 42b6e28bb6cec9ff12472ee84282af4428176042ed68ce40b89d060e70bb7a7bb87ec840653e0e51afc3aea63a347bd27bcd33eedb12c5c940fca89a33b5b945
+EBUILD fontconfig-2.13.1-r2.ebuild 5605 BLAKE2B e58809be4f34d16eea7cc6f2d66f41de4bcd166b3d598f4304056b8815476a9dbefb100d2aad9593a7bba3cdf5c9e41843a5f76ee8a14165633e019cfc0e11ef SHA512 1677fb0199d018ffe19148823d4640abe7477e6d563a6bf8f54df1fd3d77d31b96271ae3dec689b523ada35c6abdef20c5c65ca8969ef2ae7505908158a16d51
+EBUILD fontconfig-2.13.93.ebuild 6049 BLAKE2B e1a16b3f9f8a4a2ebcc33914a59f4fad3adc65319a60ded78655e1103889c3ad2cf96435b83c0937291dbf2c3a37d85d598e83cdf1df34746ae04c354f29e426 SHA512 acf465d234c792be216b84e37202edcee6432ae043960f81b71dc072a873a38e401ee6edc9591b19967c109107079dbd498c7c749c31d4390c4f0de87a47fe65
+EBUILD fontconfig-2.14.0-r1.ebuild 6717 BLAKE2B 92dc2093eba618709248a459ace0396c03b53341b76dd1af270de592f0a562223598c61695f0aa87bb21ba2cfe92fc4fe023c9c3d1c5d2f14b1b37fc62f7ad13 SHA512 35dfdaee83adff2f9e33682ed28067862c562c9be8b76b4ed553a1d605c650aad9e1493c5bc74f897f4f61157a1b1cd3dea6c3cac33f017abf631cbfb4e9bd3d
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index ddf062068696..b00c1b232b14 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -170,7 +170,7 @@ pkg_postinst() {
 
 	readme.gentoo_print_elog
 
-	if [[ ${ROOT} == "" ]]; then
+	if [[ -z ${ROOT} ]]; then
 		multilib_pkg_postinst() {
 			ebegin "Creating global font cache for ${ABI}"
 			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index a47819b7d743..deaa7fcd009a 100644
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -186,7 +186,7 @@ pkg_postinst() {
 
 	readme.gentoo_print_elog
 
-	if [[ ${ROOT} == "" ]] ; then
+	if [[ -z ${ROOT} ]] ; then
 		multilib_pkg_postinst() {
 			ebegin "Creating global font cache for ${ABI}"
 			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
diff --git a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
index 569d95035ed8..e476d074801d 100644
--- a/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index be11953664d5..0c919c73c559 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -2,5 +2,5 @@ AUX freeglut-3.2.1-gcc10-fno-common.patch 3500 BLAKE2B 7163acef56f8f1bfebeaed554
 DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
 DIST freeglut-3.2.2.tar.gz 397203 BLAKE2B e4151d9bd984504edb02fadf2983c750c1c81557f3467c01d4202d34e9e082a62f07d373908d3517f9b3fd3253b7b409f882cfe2187d4ff1787f3cdc09eecfe4 SHA512 190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9
 EBUILD freeglut-3.2.1-r2.ebuild 1499 BLAKE2B 5fe6ab2def7d44b129fe22ed721303324e5deda66a0d572e990760371cf6c661cd0804a2db8b3c7e876b2834d027bb0bd01727655f86d468f7a638a8ed097bdb SHA512 321c424e287b5e4b0a1e1f7c02f34639b952a85ca4ca81f8f8479b732bd47ad93d8d141dd00ba61cfbed4bdadfeabf70e2608e02acdd6a5195b15d84da088957
-EBUILD freeglut-3.2.2.ebuild 1418 BLAKE2B 904326a455872b0255c4f55a1590a085361903a03b8a66262afba6d1e8cdbe335df3dde6337a0e068e980033a5930e80d8b91c7108c7f04d64043c9b494ca48a SHA512 177a9073edea80520aaff5da7771f0d8995d6371519e883ce8872c86382fb3c76cf63264bbdc32a8b336d28d89c98dcbd76595e82bd4022c831c0cb76fb44854
+EBUILD freeglut-3.2.2.ebuild 1415 BLAKE2B 79da6e517e0d5558fbe75acb32a310e672fdf4a6b87bbade2320da0f83441d81d853c549eb11ba676c5e510626943fba39e5e986a4577f0fdba5607d0fd69761 SHA512 e5f739ffc6dcf1e4a3fe839442ab5bd767ea247d1004965ed837537fbe8fc50e9f0956e3441a2a5354e9480ffae4684d3b88cb214c894caa60585c54c7e7956b
 MISC metadata.xml 529 BLAKE2B ef8eb49e76fa342486804eb88393b0b80710761c9255e8971f99cd40a41cdfa7ac4734d66a2d2b285d9493ae9b6c56706235749f4958985e15bb22796a81908b SHA512 fe290b4e32aaecbc3f604adf0ef295d8fb1e9a2dee4fd4c3b61a56a82e4d6c4395cb6b6e4e91a6c196d632cf65102539d8f91dd7556ab7d63e539866d83dc8e5
diff --git a/media-libs/freeglut/freeglut-3.2.2.ebuild b/media-libs/freeglut/freeglut-3.2.2.ebuild
index e874bf8c151d..12a6c509bb4c 100644
--- a/media-libs/freeglut/freeglut-3.2.2.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 # enabling GLES support seems to cause build failures
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 68068df9fba1..85eb05d2d504 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,21 +1,12 @@
-AUX freetype-2.10.3-sizeof-types.patch 1038 BLAKE2B bb49e7d4195346b67f37c16f9f31e3d5b658398afa7209c5d7c89dbbf90c98385d0827960545b83573425c6be8e4615311f76d93e40ff6237977bfe160639587 SHA512 64e3cc7820bd0b8816ad34108fa174da90f2a0b8f96a3c94425900ba5f5eb8b01074fdfa3bee699815d7eb74ec44cf043239a932a228c2971557fad0caec912f
-AUX freetype-2.11.0-COLR_missing_blend_mode.patch 2304 BLAKE2B 002fa132591422fc4ef9180dd2ee667d42d57cc5be08e253dec182a345280e42ec15f2dd8d30891e13d168bf0da77279216b4fdc8e56c4e59a11f3f3438525b9 SHA512 4e55f43b86f2d54867dd62558b7a02312e82581a9469395ef24f8b6f0ec2e9ec14776a828c2520970758d8d67cec0c659087e48b8ed3ae30c77a725a92a9ffc1
-AUX freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch 681 BLAKE2B addd6b85be20b48b92af7f21dafab7014fae110163ed7d6a9341d958505d46a76dc131a54b1c954f3157737429b3b4a87ea0c7c621bfb3cb8f4f101ae2ce9398 SHA512 36060458da10c1afeaf3303010235e2b9adfd0273a7b8c0c0b5e4d4c30a3eac79485919613de892a1b0f2637d5f98fd5314477e833b78819421f134d6cdf40a3
-AUX freetype-2.11.0-quiet_noop.patch 1304 BLAKE2B 57276cf6480a4807e8e9704e5a9ea5d3a0d288e8af17f935e2911932fbe517d845b68abb503cfde697f6e6778a14c44334482d8917914817ec4c7f454dc005eb SHA512 f7261da6d457ce1c9ecd49d17a251f349f2786a3d12e42555a605a95b73573fdba90e70855b38e2c79ab6f4dabb8a8e6a3d1abc9fc8ca87d3ba29a04f9ee802f
+AUX freetype-2.12.0-cffgload_segfault_fix.patch 886 BLAKE2B 504ce78a28163b57d8fca45bfea2f1a13ba3b522176bba99b80f06759612bdbd996877e6336adcd2ef158820f711d8fcf834bef14cdeecf1cfdafe1ddd4eaf8c SHA512 bc1573a0d2c50606ea8b4ac8731011d0c93c67874a8a215092eb4900e23c03087fc7357dc03d22671571bd9f601c76bc716beb0fa82629d9c35266109f76671d
 AUX freetype-2.12.0-librsvg_automagic.patch 2213 BLAKE2B b5e0b7e5c57650b7371fde47ab87be7e18385e7190a5c9e2d14a285a91e035427c44dde12a988fa993ca782e5f8396b9bbe0418078c9462b442852a911ec8f05 SHA512 cdce3b4b40f4ce1ef7ed3d58a0f1a916ba81f0788a4e6136fe53ba84ed53e48f91e5f670d3ef1dfbd367cd741dc366d88da6e1f34bdcf0b082324dd69d94f584
-DIST freetype-2.11.0-COLR_v1_clipbox.patch.xz 3940 BLAKE2B 45b84b1070a9a9e1e13058ce7200555f4f9e26df4fe25eab4a644869df86f267cc91bfcf2ab10a9f0673be51504f05eec730300dee13ca34bb6f8afdc32ee354 SHA512 bf0cc00b3f27cb3408881cec46654be57b96b099cfd3df06e33b94aa47f35a7c9499a9935837be0f652d4f17ab2b6c78bc1fcef328754cde64f0b139d00ceb29
-DIST freetype-2.11.0.tar.xz 2256640 BLAKE2B ed14b566b8ac31a85dde4c8d26dd8b001f6a2cb506cfafd550b31bb90a3f592376d6f9f6bbe1b6c21e27e4ad23d0eafa7ea886211174b978e101fb6a77261324 SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d
-DIST freetype-2.11.1.tar.xz 2270728 BLAKE2B 15cc03e7b8ba93b2f240b0eee3f1cc07bca77d9ef67a1971d44d6c061a0dff2b13737fa417f7f2dc4e7e6df660223325931f69a107a6b2eaf14425fc71b7ca7b SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
 DIST freetype-2.12.0.tar.xz 2340352 BLAKE2B 09227c883e52b4e4aefd68d8e4bfaf36eed0c4d92d22d6f5f88e2a69a94be6040ecff7285ca92f30cd9ce71a4af0ffa74141f3263f7a75e29d87b8a4fe27bf08 SHA512 d2426b46ef56268f5030951840a73be9a626129c6fc6ad2ab06e572c9325d0192f47b007798c2ffa3608fe50e296ad129ac41312b1fd3f8864d7e55e8c237c54
-DIST freetype-doc-2.11.0.tar.xz 2070604 BLAKE2B a45fa2e97574868fc4f08c646cb815152dde462538a32fddfc5ddccb32343286765f3952b9fc8b66204dfeb62470d4fada1a2338c377efa1c716ab9c5885fd60 SHA512 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301
-DIST freetype-doc-2.11.1.tar.xz 2038348 BLAKE2B 2248d16bb12b29294226a67a10328c61b064c8e0ad7fb5f004c2e6da1237175f03d51a48d5df03a3de3bbe935307e573014c079c31468c9f59416bc4e9057a9c SHA512 c5e19d98425491682edc58230c48390925cc4b466169f655cf3b8575ba787a70feecdeb7a16224b132dcc32f17b041483d84056cda8e3132d98b531e46a26c36
+DIST freetype-2.12.1.tar.xz 2471916 BLAKE2B c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278 SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
 DIST freetype-doc-2.12.0.tar.xz 2038684 BLAKE2B ac5197f1a31a4c29a218c0a35af4658a289afbea9ad6b5a200dd0518d63a1b647467b3c460b72863a4048269c249ca2fbc83146ba3de6594e00bfa88a701d979 SHA512 49d2ab0f39bafefe18da5bdc28aa11103caa2c130767179945e10183b7efe79b1ee6319e101dd86b7aacd2975d4b206edaf42129dd2516c2424a1d9954c946c6
-DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531
-DIST ft2demos-2.11.1.tar.xz 257240 BLAKE2B 1d620af52e76d1152a0a6aeeb0036d2423e498e371b75c01c408cc0974845abfe2f3f562ad638ca5640ec1b24023d7a47e1688743ca738c2bb1ceea6ee05cfcf SHA512 93d68daefa8a49b4fc987a7356133299fe2a8e012415ea09ad7616ececcfd978fdf9fc7a2d855f7488f51a497d019acb89ef5774484babae66357b3083a883c5
+DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf23412270d19002bc5b07e94d946d41d089f798724982e354d1701488de37c35bf68f36de88796565f0ebaa3f9fb35c51f532 SHA512 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d
 DIST ft2demos-2.12.0.tar.xz 263612 BLAKE2B d0cc154084a28a965798ba34c00368d70163d748f52fe360a6bd920bc9b6b962492efe05b7206b9bc4c4fd4770aa7db4279a287d6ba65a81daf7fc2b7a679a96 SHA512 70176ad89eab0121e9f5610f777da7e2f8478e24fbe9aded7f7fc3d7685019d40a0d0d6b586f3499f8589a2923082e3a9bc8ddc66482b8898642230bff5eaae2
-EBUILD freetype-2.11.0-r1.ebuild 7398 BLAKE2B e4cdd82b1241ebce56f26477bf6557192fba0420da1b1b6adc6c268bd26cfbeab506f3c82df07d843e5ad8173d653f45a891485d7662bdfe9a344d2f9cf478c2 SHA512 ef9c9bb1e172c89c9f1db6e005e69fa0ef7031accf4a82be4b76d73968b92ded8cb80bd5075cb676c26b58c2db90f2e99162b13ebd15f9c1361f56373f40aced
-EBUILD freetype-2.11.0-r2.ebuild 7451 BLAKE2B e672e09cf5521eb9a7c345b38b3b28858d12629b2906811d1afd40cd882ce26414506c60a7d315692b524d1fb6d4471fb9c90dc136e942aeab3323188e3947f8 SHA512 a508bef0b6221eb6902cdb632af9a73953bf630923797d70a21287a93f8cd2afa1a08a75f5d48c31c4bfbcc3b368494c8969d2a84daf26f57255bd792a22e813
-EBUILD freetype-2.11.1.ebuild 7099 BLAKE2B 5ab262853bedba65e8ca456dda75263a7a2851d86d640cec35dcf650940d23729c49400c5f7e4af531aebfb6e2128e1e30abfe70d80c7949dbf35333ce252bec SHA512 599adba85e1a3526bc9135b1384db9898971fca4de7fbe8df2b47f52605955603bb4ec2a3a158505f449fe46a2af2ba98ed78c7f3197a035fe3ec876b6b14df7
-EBUILD freetype-2.12.0.ebuild 7492 BLAKE2B fcc365d9d8fe42e5b145ae577782f40d0a00a3592ec82b9f8fe1195a2290508651fab32f9c02cd62131a48195db727b62558b48b20599f08080238d38f648a9b SHA512 3dea41ca1c7bfd9d7f7b6fa190fc64bb120f9a6441b5deae1bbf4d365d282e623a7120230ee3ca8cd272332a4150be082df3f579296de709f1f15d45cc1150d0
+DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
+EBUILD freetype-2.12.0-r1.ebuild 7567 BLAKE2B 4754c8239a201e8ed1fb307887c6ac513aae84521b2632a99a176e43d16596a1d2ddfb260a598ae11a935d512e9f09dbae652f95f0bb06b49ea411dd26266fe5 SHA512 0dd511f51361c3d6aef8dd4da09d2ca53c704bdd7dd57e91191f884f7e1f5af681c0237a7da8ee1c792a979978104f7f6653cd08897fd43ebd079413efc041a8
+EBUILD freetype-2.12.1.ebuild 7447 BLAKE2B 1caec0c5febded8d74a03454388b7854ff893491bbed4b2f7bc3e78adcea022e10461b7d4ee7fba94f5775ca9dab76d90508c420564ea2b61c1b434b1d5600fc SHA512 0683f7a1916e754649ba2ae993bbb3a8f83dbe91b4668b164008b0cabca728748e735e4cc6f32e9c63de907bd1102a5176650bd48ad2102856533b5bda75563b
 EBUILD freetype-9999.ebuild 7107 BLAKE2B 49c7d1ac429480f097baceba37ba0953b0a7a81a68636a9facee191643e8dce6c794f96e2250e5a17a72972bc8fcc400c24bb7f88f34162176490ab251d8076a SHA512 c4ecfed508b10a050c4d5957583d5fb370110f06753b1d439feedea1f859d11520a6dd2b7c26a0b3d0513ec2d6b6dd40dd13cf143531c548d9f533aa72384730
 MISC metadata.xml 1361 BLAKE2B ec4f7fc1bd3a16f507b0ff18a637849744a5e470a26037a2ef7e0e9a6537408184ca722a003340128f962bcda1cedc044e411c58e5d315602095e1997dccc920 SHA512 16112a7dbc2231ebe0b9cecfd3b91bd966d49de1e04eb72694ef0a22c9495e6a91ac31da7bd027ce90fcda08ca10144d24c4e28b798a1074af147ab0f8b007c7
diff --git a/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch b/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch
deleted file mode 100644
index ea02a15df115..000000000000
--- a/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 56e6ee69d298c0d150e2b76d2cfa2306e901df40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 11 Oct 2020 08:59:08 +0200
-Subject: [PATCH] Prevent apps from using the autoconf sizeof branch.
-
-Use #error to make sure that any app trying to enable that branch fails
-miserably. This guarantees the code to be multilib-friendly and also
-removes the header differences triggering QA errors.
----
- builds/unix/ftconfig.h.in | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/builds/unix/ftconfig.h.in b/builds/unix/ftconfig.h.in
-index 00b5a8226..020593a95 100644
---- a/builds/unix/ftconfig.h.in
-+++ b/builds/unix/ftconfig.h.in
-@@ -45,10 +45,7 @@
- #undef FT_USE_AUTOCONF_SIZEOF_TYPES
- #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES
- 
--#undef SIZEOF_INT
--#undef SIZEOF_LONG
--#define FT_SIZEOF_INT  SIZEOF_INT
--#define FT_SIZEOF_LONG SIZEOF_LONG
-+#error "Unsupported code branch enabled. Please report a bug to bugs.gentoo.org."
- 
- #endif /* FT_USE_AUTOCONF_SIZEOF_TYPES */
- 
--- 
-2.28.0
-
diff --git a/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch b/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch
deleted file mode 100644
index af24a09ef213..000000000000
--- a/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e40ae7569aa4ef591f66ff9066df2f91de75bb77 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <drott@chromium.org>
-Date: Mon, 9 Aug 2021 13:44:55 +0300
-Subject: [PATCH] [sfnt] Add missing blend mode 'plus' to 'COLR' v1.
-
-* include/freetype/ftcolor.h (FT_Composite_Mode): Add missing blend mode
-'plus' after it was added to the spec.
----
- include/freetype/ftcolor.h | 33 +++++++++++++++++----------------
- 1 file changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/include/freetype/ftcolor.h b/include/freetype/ftcolor.h
-index b98289917..cbd2d85bb 100644
---- a/include/freetype/ftcolor.h
-+++ b/include/freetype/ftcolor.h
-@@ -740,22 +740,23 @@ FT_BEGIN_HEADER
-     FT_COLR_COMPOSITE_SRC_ATOP       = 9,
-     FT_COLR_COMPOSITE_DEST_ATOP      = 10,
-     FT_COLR_COMPOSITE_XOR            = 11,
--    FT_COLR_COMPOSITE_SCREEN         = 12,
--    FT_COLR_COMPOSITE_OVERLAY        = 13,
--    FT_COLR_COMPOSITE_DARKEN         = 14,
--    FT_COLR_COMPOSITE_LIGHTEN        = 15,
--    FT_COLR_COMPOSITE_COLOR_DODGE    = 16,
--    FT_COLR_COMPOSITE_COLOR_BURN     = 17,
--    FT_COLR_COMPOSITE_HARD_LIGHT     = 18,
--    FT_COLR_COMPOSITE_SOFT_LIGHT     = 19,
--    FT_COLR_COMPOSITE_DIFFERENCE     = 20,
--    FT_COLR_COMPOSITE_EXCLUSION      = 21,
--    FT_COLR_COMPOSITE_MULTIPLY       = 22,
--    FT_COLR_COMPOSITE_HSL_HUE        = 23,
--    FT_COLR_COMPOSITE_HSL_SATURATION = 24,
--    FT_COLR_COMPOSITE_HSL_COLOR      = 25,
--    FT_COLR_COMPOSITE_HSL_LUMINOSITY = 26,
--    FT_COLR_COMPOSITE_MAX            = 27
-+    FT_COLR_COMPOSITE_PLUS           = 12,
-+    FT_COLR_COMPOSITE_SCREEN         = 13,
-+    FT_COLR_COMPOSITE_OVERLAY        = 14,
-+    FT_COLR_COMPOSITE_DARKEN         = 15,
-+    FT_COLR_COMPOSITE_LIGHTEN        = 16,
-+    FT_COLR_COMPOSITE_COLOR_DODGE    = 17,
-+    FT_COLR_COMPOSITE_COLOR_BURN     = 18,
-+    FT_COLR_COMPOSITE_HARD_LIGHT     = 19,
-+    FT_COLR_COMPOSITE_SOFT_LIGHT     = 20,
-+    FT_COLR_COMPOSITE_DIFFERENCE     = 21,
-+    FT_COLR_COMPOSITE_EXCLUSION      = 22,
-+    FT_COLR_COMPOSITE_MULTIPLY       = 23,
-+    FT_COLR_COMPOSITE_HSL_HUE        = 24,
-+    FT_COLR_COMPOSITE_HSL_SATURATION = 25,
-+    FT_COLR_COMPOSITE_HSL_COLOR      = 26,
-+    FT_COLR_COMPOSITE_HSL_LUMINOSITY = 27,
-+    FT_COLR_COMPOSITE_MAX            = 28
- 
-   } FT_Composite_Mode;
- 
--- 
-GitLab
-
diff --git a/media-libs/freetype/files/freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch b/media-libs/freetype/files/freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch
deleted file mode 100644
index f602866f591a..000000000000
--- a/media-libs/freetype/files/freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fed5521016227bf8cc4475f66450a9963568d162 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Mon, 9 Aug 2021 19:27:34 +0200
-Subject: [PATCH] * src/sfnt/ttcolr.c (tt_face_get_color_glyph_clipbox): Minor
- fix.
-
----
- src/sfnt/ttcolr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
-index 2f3e8846d..68807127f 100644
---- a/src/sfnt/ttcolr.c
-+++ b/src/sfnt/ttcolr.c
-@@ -863,7 +863,7 @@
- 
-         format = FT_NEXT_BYTE( p1 );
- 
--        if ( format < 0 || format > 1 )
-+        if ( format > 1 )
-           return 0;
- 
-         /* `face->root.size->metrics.x_scale` and `y_scale` are factors   */
--- 
-GitLab
-
diff --git a/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch b/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch
deleted file mode 100644
index 46206465ffaf..000000000000
--- a/media-libs/freetype/files/freetype-2.11.0-quiet_noop.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001
-From: Alexei Podtelezhnikov <apodtele@gmail.com>
-Date: Fri, 20 Aug 2021 16:01:32 -0400
-Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs.
-
-Fixes #1076.
-
-* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when
-rendering a bitmap glyph.
----
- src/base/ftobjs.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
-index 342ac4a27..7b40c6421 100644
---- a/src/base/ftobjs.c
-+++ b/src/base/ftobjs.c
-@@ -4703,7 +4703,7 @@
-         else
-           renderer = FT_Lookup_Renderer( library, slot->format, &node );
- 
--        error = FT_ERR( Unimplemented_Feature );
-+        error = FT_ERR( Cannot_Render_Glyph );
-         while ( renderer )
-         {
-           error = renderer->render( renderer, slot, render_mode, NULL );
-@@ -4719,6 +4719,11 @@
-           /* format.                                               */
-           renderer = FT_Lookup_Renderer( library, slot->format, &node );
-         }
-+
-+        /* it is not an error if we cannot render a bitmat glyph */
-+        if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) &&
-+             slot->format == FT_GLYPH_FORMAT_BITMAP  )
-+          error = FT_Err_Ok;
-       }
-     }
- 
--- 
-GitLab
-
diff --git a/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch b/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch
new file mode 100644
index 000000000000..6578475f4d7f
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch
@@ -0,0 +1,31 @@
+From 978eefee5401abee6bf702c6bcde9afb47893145 Mon Sep 17 00:00:00 2001
+From: Georg Brandl <georg@python.org>
+Date: Tue, 12 Apr 2022 11:43:37 +0000
+Subject: [PATCH] * src/cff/cffgload.c (cff_slot_load) [FT_CONFIG_OPTION_SVG]:
+ Fix segfault.
+
+This can happen if the function is called with `size` being `NULL`.
+
+Fixes #1147.
+---
+ src/cff/cffgload.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
+index 5c15c804b..7586b886f 100644
+--- a/src/cff/cffgload.c
++++ b/src/cff/cffgload.c
+@@ -370,8 +370,8 @@
+       SFNT_Service  sfnt;
+ 
+ 
+-      if ( size->root.metrics.x_ppem < 1 ||
+-           size->root.metrics.y_ppem < 1 )
++      if ( size && (size->root.metrics.x_ppem < 1 ||
++                    size->root.metrics.y_ppem < 1 ) )
+       {
+         error = FT_THROW( Invalid_Size_Handle );
+         return error;
+-- 
+GitLab
+
diff --git a/media-libs/freetype/freetype-2.11.0-r1.ebuild b/media-libs/freetype/freetype-2.11.0-r1.ebuild
deleted file mode 100644
index c9d88a7e1080..000000000000
--- a/media-libs/freetype/freetype-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="High-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
-		mirror://nongnu/freetype/${P/_/}.tar.xz
-		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
-			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
-		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
-			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-COLR_v1_clipbox.patch.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	IUSE+=" doc"
-else
-	inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
-	utils? (
-		X? (
-			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-		)
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
-	"${WORKDIR}"/${P}-COLR_v1_clipbox.patch
-	"${FILESDIR}"/${P}-COLR_v1_clipbox_minor_fix.patch
-	"${FILESDIR}"/${P}-COLR_missing_blend_mode.patch
-)
-
-_egit_repo_handler() {
-	if [[ "${PV}" == 9999 ]] ; then
-		local phase="${1}"
-		case ${phase} in
-			fetch|unpack)
-				:;
-			;;
-			*)
-				die "Please use this function with either \"fetch\" or \"unpack\""
-			;;
-		esac
-
-		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
-		git-r3_src_${phase}
-		if use utils ; then
-			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
-			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
-			git-r3_src_${phase}
-		fi
-	else
-		default
-	fi
-}
-
-src_fetch() {
-	_egit_repo_handler ${EBUILD_PHASE}
-}
-
-src_unpack() {
-	_egit_repo_handler ${EBUILD_PHASE}
-
-	if [[ "${PV}" == 9999 ]] ; then
-		# Need to copy stuff from dlg subproject (#758902)
-		local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
-		local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
-		local dlg_dest_dir="${S}/include"
-		mkdir -p "${dlg_dest_dir}/dlg" || die
-		cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
-		cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
-	fi
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# Do NOT automagically mess with submodules!!!
-		sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
-		# inspired by shipped autogen.sh script
-		eval $(sed -n \
-			-e 's/^#define  *\(FREETYPE_MAJOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
-			-e 's/^#define  *\(FREETYPE_MINOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
-			-e 's/^#define  *\(FREETYPE_PATCH\)  *\([0-9][0-9]*\).*/\1=\2/p' \
-			include/freetype/freetype.h || die)
-		FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
-		[[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;${FREETYPE};" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
-		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	# This is the same as the 01 patch from infinality
-	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
-
-	enable_option() {
-		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to enable option $1"
-	}
-
-	disable_option() {
-		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to disable option $1"
-	}
-
-	# Will be the new default for >=freetype-2.7.0
-	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-
-	if use infinality && use cleartype-hinting ; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
-	elif use infinality ; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
-	elif use cleartype-hinting ; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-	fi
-
-	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
-	# via environment (new since v2.8)
-	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
-	# See https://freetype.org/patents.html (expired!)
-	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-	if ! use adobe-cff ; then
-		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
-	fi
-
-	if use debug ; then
-		enable_option FT_DEBUG_LEVEL_TRACE
-		enable_option FT_DEBUG_MEMORY
-	fi
-
-	if use utils ; then
-		cd "${WORKDIR}/ft2demos-${PV}" || die
-		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X ; then
-			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
-		fi
-		cd "${S}" || die
-	fi
-
-	# we need non-/bin/sh to run configure
-	if [[ -n ${CONFIG_SHELL} ]] ; then
-		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
-			"${S}"/builds/unix/configure || die
-	fi
-
-	elibtoolize --patch-only
-}
-
-multilib_src_configure() {
-	append-flags -fno-strict-aliasing
-	type -P gmake &> /dev/null && export GNUMAKE=gmake
-
-	local myeconfargs=(
-		--disable-freetype-config
-		--enable-biarch-config
-		--enable-shared
-		$(use_with brotli)
-		$(use_with bzip2)
-		$(use_with harfbuzz)
-		$(use_with png)
-		$(use_enable static-libs static)
-
-		# avoid using libpng-config
-		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
-		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
-	)
-
-	case ${CHOST} in
-		mingw*|*-mingw*) ;;
-		# Workaround windows mis-detection: bug #654712
-		# Have to do it for both ${CHOST}-windres and windres
-		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
-	esac
-
-	export CC_BUILD="$(tc-getBUILD_CC)"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use utils ; then
-		einfo "Building utils"
-		# fix for Prefix, bug #339334
-		emake \
-			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
-			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use utils ; then
-		einfo "Installing utils"
-		emake DESTDIR="${D}" FT2DEMOS=1 \
-			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
-	fi
-}
-
-multilib_src_install_all() {
-	if use fontforge ; then
-		# Probably fontforge needs less but this way makes things simplier...
-		einfo "Installing internal headers required for fontforge"
-		local header
-		find src/truetype include/freetype/internal -name '*.h' | \
-		while read header ; do
-			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-		done
-	fi
-
-	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
-	if [[ "${PV}" != 9999 ]] && use doc ; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/media-libs/freetype/freetype-2.11.0-r2.ebuild b/media-libs/freetype/freetype-2.11.0-r2.ebuild
deleted file mode 100644
index 27f4cfde1ab2..000000000000
--- a/media-libs/freetype/freetype-2.11.0-r2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="High-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
-		mirror://nongnu/freetype/${P/_/}.tar.xz
-		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
-			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
-		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
-			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-COLR_v1_clipbox.patch.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	IUSE+=" doc"
-else
-	inherit autotools git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
-	utils? (
-		X? (
-			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-		)
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
-	"${WORKDIR}"/${P}-COLR_v1_clipbox.patch
-	"${FILESDIR}"/${P}-COLR_v1_clipbox_minor_fix.patch
-	"${FILESDIR}"/${P}-COLR_missing_blend_mode.patch
-	"${FILESDIR}"/${P}-quiet_noop.patch #820500
-)
-
-_egit_repo_handler() {
-	if [[ "${PV}" == 9999 ]] ; then
-		local phase="${1}"
-		case ${phase} in
-			fetch|unpack)
-				:;
-			;;
-			*)
-				die "Please use this function with either \"fetch\" or \"unpack\""
-			;;
-		esac
-
-		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
-		git-r3_src_${phase}
-		if use utils ; then
-			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
-			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
-			git-r3_src_${phase}
-		fi
-	else
-		default
-	fi
-}
-
-src_fetch() {
-	_egit_repo_handler ${EBUILD_PHASE}
-}
-
-src_unpack() {
-	_egit_repo_handler ${EBUILD_PHASE}
-
-	if [[ "${PV}" == 9999 ]] ; then
-		# Need to copy stuff from dlg subproject (#758902)
-		local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
-		local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
-		local dlg_dest_dir="${S}/include"
-		mkdir -p "${dlg_dest_dir}/dlg" || die
-		cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
-		cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
-	fi
-}
-
-src_prepare() {
-	if [[ "${PV}" == 9999 ]] ; then
-		# Do NOT automagically mess with submodules!!!
-		sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
-		# inspired by shipped autogen.sh script
-		eval $(sed -n \
-			-e 's/^#define  *\(FREETYPE_MAJOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
-			-e 's/^#define  *\(FREETYPE_MINOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
-			-e 's/^#define  *\(FREETYPE_PATCH\)  *\([0-9][0-9]*\).*/\1=\2/p' \
-			include/freetype/freetype.h || die)
-		FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
-		[[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
-		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;${FREETYPE};" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
-		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	# This is the same as the 01 patch from infinality
-	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
-
-	enable_option() {
-		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to enable option $1"
-	}
-
-	disable_option() {
-		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to disable option $1"
-	}
-
-	# Will be the new default for >=freetype-2.7.0
-	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-
-	if use infinality && use cleartype-hinting ; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
-	elif use infinality ; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
-	elif use cleartype-hinting ; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-	fi
-
-	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
-	# via environment (new since v2.8)
-	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
-	# See https://freetype.org/patents.html (expired!)
-	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-	if ! use adobe-cff ; then
-		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
-	fi
-
-	if use debug ; then
-		enable_option FT_DEBUG_LEVEL_TRACE
-		enable_option FT_DEBUG_MEMORY
-	fi
-
-	if use utils ; then
-		cd "${WORKDIR}/ft2demos-${PV}" || die
-		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X ; then
-			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
-		fi
-		cd "${S}" || die
-	fi
-
-	# we need non-/bin/sh to run configure
-	if [[ -n ${CONFIG_SHELL} ]] ; then
-		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
-			"${S}"/builds/unix/configure || die
-	fi
-
-	elibtoolize --patch-only
-}
-
-multilib_src_configure() {
-	append-flags -fno-strict-aliasing
-	type -P gmake &> /dev/null && export GNUMAKE=gmake
-
-	local myeconfargs=(
-		--disable-freetype-config
-		--enable-biarch-config
-		--enable-shared
-		$(use_with brotli)
-		$(use_with bzip2)
-		$(use_with harfbuzz)
-		$(use_with png)
-		$(use_enable static-libs static)
-
-		# avoid using libpng-config
-		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
-		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
-	)
-
-	case ${CHOST} in
-		mingw*|*-mingw*) ;;
-		# Workaround windows mis-detection: bug #654712
-		# Have to do it for both ${CHOST}-windres and windres
-		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
-	esac
-
-	export CC_BUILD="$(tc-getBUILD_CC)"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use utils ; then
-		einfo "Building utils"
-		# fix for Prefix, bug #339334
-		emake \
-			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
-			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use utils ; then
-		einfo "Installing utils"
-		emake DESTDIR="${D}" FT2DEMOS=1 \
-			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
-	fi
-}
-
-multilib_src_install_all() {
-	if use fontforge ; then
-		# Probably fontforge needs less but this way makes things simplier...
-		einfo "Installing internal headers required for fontforge"
-		local header
-		find src/truetype include/freetype/internal -name '*.h' | \
-		while read header ; do
-			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-		done
-	fi
-
-	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
-	if [[ "${PV}" != 9999 ]] && use doc ; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/media-libs/freetype/freetype-2.11.1.ebuild b/media-libs/freetype/freetype-2.12.0-r1.ebuild
index e2ef9bdbfa37..51df8e5fb2dd 100644
--- a/media-libs/freetype/freetype-2.11.1.ebuild
+++ b/media-libs/freetype/freetype-2.12.0-r1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="High-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -19,7 +19,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
-	inherit autotools git-r3
+	inherit git-r3
 fi
 
 LICENSE="|| ( FTL GPL-2+ )"
@@ -32,17 +32,22 @@ RDEPEND="
 	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
 	utils? (
-		X? (
-			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-		)
-	)"
+		svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
+		X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	)
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.12.0-librsvg_automagic.patch"
+
+	# https://bugs.gentoo.org/836898
+	"${FILESDIR}/${P}-cffgload_segfault_fix.patch"
+)
+
 _egit_repo_handler() {
 	if [[ "${PV}" == 9999 ]] ; then
 		local phase="${1}"
@@ -68,6 +73,12 @@ _egit_repo_handler() {
 	fi
 }
 
+pkg_pretend() {
+	if use svg && ! use utils ; then
+		einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
+	fi
+}
+
 src_fetch() {
 	_egit_repo_handler ${EBUILD_PHASE}
 }
@@ -109,6 +120,11 @@ src_prepare() {
 
 	default
 
+	pushd builds/unix &>/dev/null || die
+	# eautoheader produces broken ftconfig.in
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+	popd &>/dev/null || die
+
 	# This is the same as the 01 patch from infinality
 	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
 
@@ -182,6 +198,7 @@ multilib_src_configure() {
 		$(use_with harfbuzz)
 		$(use_with png)
 		$(use_enable static-libs static)
+		$(usex utils $(use_with svg librsvg) --without-librsvg)
 
 		# avoid using libpng-config
 		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
diff --git a/media-libs/freetype/freetype-2.12.0.ebuild b/media-libs/freetype/freetype-2.12.1.ebuild
index 6dddbb78b16f..7ff4910e41ee 100644
--- a/media-libs/freetype/freetype-2.12.0.ebuild
+++ b/media-libs/freetype/freetype-2.12.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit git-r3
@@ -42,7 +42,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.12.0-librsvg_automagic.patch"
 )
 
 _egit_repo_handler() {
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 01f145a5f403..903d2c58b36b 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,12 +1,6 @@
 AUX gd-2.3.0-disable-flaky-tests.patch 792 BLAKE2B 81d4d56f0365e51fd1f406f3f27cd788a670bc091e13c8d39e8fb8234dd934896d6161940e010e2c0118000a36012bc2f878674a7409bcc19662686afaf99cb3 SHA512 285c542ca60f25597c29c040c95bd1885dbd3c29d3c1af52123646bc06abbd271bd37d4dedc1fc0bb218a84063814c8d8176a30c1da8a19445064469e26a5ea6
-AUX gd-2.3.0-fix-tests-bug722448.patch 2231 BLAKE2B 629caa9cd7dbd63cab93c97466921ee9131c5542618fdb5ce772a9b1bd3fcf2e64f93da999ca9011917cf8e726cae914c76529eca1a24cd2c31f55c4e75aaa7c SHA512 6d66af4e5d70e1e919f81bf0fd7261bd13216da4873927826d5c4925cf1673a9a3e98d588f693bab7505ee02e7a231c19687e27c1efc1a606bab3b3ab20a93dd
-AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244d0b858f520da1835547853d693f7c71621222744fe438f393aaaefa1fc6316ef27442a426af09df95c0faa2 SHA512 24d4774af36ca832504063c8327ff9a84956ae1a48cda3ef6f27d819e8a18b31a9083f2ce6d2587d5acb237d8c96c3d68cfe8eb8350a10715c15d16aca1cf37c
-DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
-DIST libgd-2.3.1.tar.xz 2632076 BLAKE2B 22457c4a2fc493872ccbc8a2c45283e785ab200ca671c48f00f3f22a037fac3b97afb35534f5ec7288714a16dfaa59ed53acbbd39c3e7f89f16cdec72ef1bed1 SHA512 0b96406a1d62129d7d63f78fc4558062c223a3bfbf9719be86362fd922b72b5dac294524dd1b0a996a4a7a709ee9d2dfc790ee32564add70adad41d044a0ed80
 DIST libgd-2.3.2.tar.xz 2821096 BLAKE2B a126fbac1c20113fe8f27187e70b1b81712212b7da01c9a0b3e5e38fb4d4356b7992a0cfd7db55a2f94877f6ecf82d775c39977a523db1f948cf215c6c0d7672 SHA512 a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2
 DIST libgd-2.3.3.tar.xz 2809056 BLAKE2B bde7a3218e5b07758b0beb96a654a44a97ba79abfe1ebe115ffd44aa34301be8e76f33840824362826dbfe93b16a4c4403b00b34aa631a0b18398cd46a09889d SHA512 aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c
-EBUILD gd-2.3.0.ebuild 2562 BLAKE2B 439023b5e0794151ac045b0fc9e7686db50b71044e7866c65a756398720473cb9c887a7323ac9914e2ff3c4339d4055af4b0100b3ab7ee9f6e3319b6169b4c81 SHA512 401ae121978ea066367e26dfbfeaa6ca98588830b60f7f0ba89c0aa95be486811f91a33c3c6922d34adf1ef1b8ca82b3df688d546760e2e91c03a1e2e29cff72
-EBUILD gd-2.3.1.ebuild 2474 BLAKE2B 330a280915eec3c018663ce118d62e6bec06d22b9e6bf99c873af74e2362451a7b1bbc2cb63401d805ad2230d94a9f93688d3269a25204e77d0c47330e22d230 SHA512 959c4948cd62837b7000f733d64575ad624bf316c0ce628eb4e1f1171d1096f303dd04c1928679a9cda2769eae71f34214a7ce4dabc67bdbcd4498c03a2a3c01
 EBUILD gd-2.3.2-r1.ebuild 2634 BLAKE2B 4746729ee31a6ec9a5a8a41210a2de5f8529bca0822e8ce187e070582694a57ba43c1f63d3e01e716602c9574c3a83839bb0b51284e33ef04e53fc87919f9bab SHA512 8be8b59df981b11333debcaa821d198eef57a9c22f064905c9d9bc49a40475fa9af53760c573030d133a47360b7a403e395e8765c89622188fc3b77d9e7125df
 EBUILD gd-2.3.3-r1.ebuild 2783 BLAKE2B 2ca3bcfedd498cb2cb34cec1554571d63494eb2edc1e9dbc228b32623e6a6c6aed67ae8f3c20dd76134cbb963da07c0be764b8b62dff6eb60dee3d214fccb62a SHA512 b59e2e135bd8e41f72270691d170f4663fa0d62874fb9de9fde80d498d5fd1484179778e6f0acd9b543e809aa81c36c0d8432d7a1de9096706711041c21b0086
 MISC metadata.xml 1637 BLAKE2B 68ed864c268f2f84f341e7281d68c2f227c6e65b78bf490cea11dd09208f7cad4426c94b8100f8f7be1fb1725e5aca0b699bf08286135996e39f61de3d0006d1 SHA512 63c490455fa6bd7d6f3cc2b8b4d68c49eb28d14e4d83696df270bebebe8186ca04e58f4dc73e381d0f932e1f273a8c13b4f9f3a0a926debc4173bc8b4ba94d0e
diff --git a/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch b/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch
deleted file mode 100644
index eef62fca676b..000000000000
--- a/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ec0b4397698bd358557d33641aac4beb1912f43b Mon Sep 17 00:00:00 2001
-From: wilson chen <willson.chenwx@gmail.com>
-Date: Wed, 15 Apr 2020 00:25:01 +0800
-Subject: [PATCH] Improve test cases for gdImageString16 and gdImageStringUp16
- (#625)
-
-Fixed #623. wchar_t is 32 bits on 64-bits AIX, which will result in test case failure.
-So we replace wchar_t with unsigned short array.
----
- tests/gdimagestring16/gdimagestring16.c     | 6 ++----
- tests/gdimagestringup16/gdimagestringup16.c | 6 ++----
- 2 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/tests/gdimagestring16/gdimagestring16.c b/tests/gdimagestring16/gdimagestring16.c
-index 57eae978..0ca06680 100644
---- a/tests/gdimagestring16/gdimagestring16.c
-+++ b/tests/gdimagestring16/gdimagestring16.c
-@@ -9,9 +9,7 @@ int main()
- {
- 	/* Declare the image */
- 	gdImagePtr im = NULL;
--	wchar_t *wchr = L"H";
--	unsigned short *sptr;
--	sptr = (unsigned short *)wchr;
-+	unsigned short s[2] = {'H', 0};
- 	int foreground;
- 	int errorcode = 0;
- 	gdFontPtr fontptr = gdFontGetLarge();
-@@ -20,7 +18,7 @@ int main()
- 	gdImageColorAllocate(im, 255, 255, 255);
- 	foreground = gdImageColorAllocate(im, 22, 4, 238);
- 
--	gdImageString16(im, fontptr, 2, 2, sptr, foreground);
-+	gdImageString16(im, fontptr, 2, 2, s, foreground);
- 
- 	if (!gdAssertImageEqualsToFile("gdimagestring16/gdimagestring16_exp.png", im))
- 		errorcode = 1;
-diff --git a/tests/gdimagestringup16/gdimagestringup16.c b/tests/gdimagestringup16/gdimagestringup16.c
-index c843abec..c24639fd 100644
---- a/tests/gdimagestringup16/gdimagestringup16.c
-+++ b/tests/gdimagestringup16/gdimagestringup16.c
-@@ -9,9 +9,7 @@ int main()
- {
- 	/* Declare the image */
- 	gdImagePtr im = NULL;
--	wchar_t *wchr = L"H";
--	unsigned short *sptr;
--	sptr = (unsigned short *)wchr;
-+	unsigned short s[2] = {'H', 0};
- 	int foreground;
- 	int errorcode = 0;
- 	gdFontPtr fontptr = gdFontGetLarge();
-@@ -20,7 +18,7 @@ int main()
- 	gdImageColorAllocate(im, 255, 255, 255);
- 	foreground = gdImageColorAllocate(im, 22, 4, 238);
- 
--	gdImageStringUp16(im, fontptr, 2, 18, sptr, foreground);
-+	gdImageStringUp16(im, fontptr, 2, 18, s, foreground);
- 
- 	if (!gdAssertImageEqualsToFile("gdimagestringup16/gdimagestringup16_exp.png", im))
- 		errorcode = 1;
-
diff --git a/media-libs/gd/files/gd-2.3.0-getlib.patch b/media-libs/gd/files/gd-2.3.0-getlib.patch
deleted file mode 100644
index 91884e93292d..000000000000
--- a/media-libs/gd/files/gd-2.3.0-getlib.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 635dd9a3065ed88e1741e6b963044b80e913f96a Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 24 Mar 2020 08:01:01 +0100
-Subject: [PATCH] distribute getlib.sh
-
----
- config/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/Makefile.am b/config/Makefile.am
-index 122287ee..6416dda4 100644
---- a/config/Makefile.am
-+++ b/config/Makefile.am
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in -*-Makefile-*-
--EXTRA_DIST = gdlib.pc.cmake gdlib.pc.in getver.pl
-+EXTRA_DIST = gdlib.pc.cmake gdlib.pc.in getlib.sh getver.pl
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = gdlib.pc
-
-diff -ruN a/config/getlib.sh b/config/getlib.sh
---- a/config/getlib.sh	1970-01-01 00:00:00.000000000 -0000
-+++ b/config/getlib.sh	2020-05-05 17:37:31.638896089 -0000
-@@ -0,0 +1,43 @@
-+#!/bin/sh
-+
-+GETVER="${0%/*}/getver.pl"
-+GDLIB_MAJOR=$("${GETVER}" MAJOR)
-+GDLIB_MINOR=$("${GETVER}" MINOR)
-+GDLIB_REVISION=$("${GETVER}" RELEASE)
-+
-+# Dynamic library version information
-+# See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-+
-+GDLIB_LT_CURRENT=3
-+# This is the version where the soname (current above) changes.  We use it
-+# to reset the revision base back to zero.  It's a bit of a pain, but some
-+# systems restrict the revision range below to [0..255] (like OS X).
-+GDLIB_PREV_MAJOR=2
-+GDLIB_PREV_MINOR=2
-+# This isn't 100% correct, but it tends to be a close enough approximation
-+# for how we manage the codebase.  It's rare to do a release that doesn't
-+# modify the library since this project is centered around the library.
-+GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION ))
-+GDLIB_LT_AGE=0
-+
-+# The first three fields we feed into libtool and the OS target determines how
-+# they get used.  The last two fields we feed into cmake.  We use the same rules
-+# as Linux SONAME versioning in libtool, but cmake should handle it for us.
-+case $1 in
-+CURRENT)
-+	printf '%s' "${GDLIB_LT_CURRENT}"
-+	;;
-+REVISION)
-+	printf '%s' "${GDLIB_LT_REVISION}"
-+	;;
-+AGE)
-+	printf '%s' "${GDLIB_LT_AGE}"
-+	;;
-+VERSION)
-+	printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE )).${GDLIB_LT_AGE}.${GDLIB_LT_REVISION}"
-+	;;
-+SONAME)
-+	printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))"
-+	;;
-+esac
-+
-diff --git a/configure.ac b/configure.ac
-index 8996053..86d0bc9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ AC_CANONICAL_HOST
- 
- dnl Keep the libtool version details in an external script so cmake can
- dnl access the values too.
--define([lt_gv], [config/getlib.sh ]$1)
-+define([lt_gv], [${SHELL} config/getlib.sh ]$1)
- m4_define([gd_LT_CURRENT], esyscmd(lt_gv(CURRENT)))
- m4_define([gd_LT_REVISION], esyscmd(lt_gv(REVISION)))
- m4_define([gd_LT_AGE], esyscmd(lt_gv(AGE)))
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
deleted file mode 100644
index 2bbd3e5bb1d8..000000000000
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ /dev/null
@@ -1,83 +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 multilib-minimal
-
-DESCRIPTION="Graphics library for fast image creation"
-HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
-SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
-S="${WORKDIR}/lib${P}"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
-RESTRICT="!test? ( test )"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="
-	prefix? ( fontconfig )
-	test? ( png )
-"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"
-	"${FILESDIR}/${PN}-2.3.0-getlib.patch"
-	"${FILESDIR}/${P}-fix-tests-bug722448.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
-	if use cpu_flags_x86_sse ; then
-		append-cflags -msse -mfpmath=sse
-	else
-		append-cflags -ffloat-store
-	fi
-
-	# bug 632076, https://github.com/libgd/libgd/issues/278
-	if use arm64 || use ppc64 || use s390 ; then
-		append-cflags -ffp-contract=off
-	fi
-
-	# we aren't actually {en,dis}abling X here ... the configure
-	# script uses it just to add explicit -I/-L paths which we
-	# don't care about on Gentoo systems.
-	local myeconfargs=(
-		--disable-werror
-		--without-x
-		--without-liq
-		$(use_enable static-libs static)
-		$(use_with fontconfig)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype freetype)
-		$(use_with jpeg)
-		$(use_with webp)
-		$(use_with xpm)
-		$(use_with zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gd/gd-2.3.1.ebuild b/media-libs/gd/gd-2.3.1.ebuild
deleted file mode 100644
index 99fe254589bc..000000000000
--- a/media-libs/gd/gd-2.3.1.ebuild
+++ /dev/null
@@ -1,81 +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 multilib-minimal
-
-DESCRIPTION="Graphics library for fast image creation"
-HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
-SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
-S="${WORKDIR}/lib${P}"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
-RESTRICT="!test? ( test )"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="
-	prefix? ( fontconfig )
-	test? ( png )
-"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
-	if use cpu_flags_x86_sse ; then
-		append-cflags -msse -mfpmath=sse
-	else
-		append-cflags -ffloat-store
-	fi
-
-	# bug 632076, https://github.com/libgd/libgd/issues/278
-	if use arm64 || use ppc64 || use s390 ; then
-		append-cflags -ffp-contract=off
-	fi
-
-	# we aren't actually {en,dis}abling X here ... the configure
-	# script uses it just to add explicit -I/-L paths which we
-	# don't care about on Gentoo systems.
-	local myeconfargs=(
-		--disable-werror
-		--without-x
-		--without-liq
-		$(use_enable static-libs static)
-		$(use_with fontconfig)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype freetype)
-		$(use_with jpeg)
-		$(use_with webp)
-		$(use_with xpm)
-		$(use_with zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 1a29fbfd9df2..09564626b207 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,12 +1,7 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
-AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d739e1a06df138fe7f3ff5fd5b4c788f9115f9284a8967b02832ab71ed0f19a4d202e81b865e65ea0c7aa2225a818c366ed465 SHA512 7d4d82aa320ca1aa8f281162e39cc5f9f2e50cb70d2a8df572dd544a8a1b60ed52c903131ee41dd8454f2d1836a8d0a2bf82257f8648d419e0b550c6fe5795bf
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
-DIST intel-gmmlib-22.0.3.tar.gz 757738 BLAKE2B 37247195cfbfa787f8f0d9c4541bb03034a492a2edc4f8747740abecd5519f7803048d3be1f7f26965d78121deb2865e703764e8f1aeb8b9d944ab0967453da7 SHA512 ee4d51153e498540ba1528d7f1f792ff7c6b3684a38094af41ca323b0467e30b231ac346411aa12efd53cbc5f4dfb83869472a03181669e79074f3fcdf2c1e9d
-DIST intel-gmmlib-22.1.1.tar.gz 813482 BLAKE2B 756741d0624a55a9ec3fdcf42a3d98a7e396424901f9035d1540c42f4b5bac281c1eb6dcc3753e0495fb52597a5b90f831cb7c5ef7fc4e5b0014b5cfe9584001 SHA512 5640d3d2b01ffa980be867d63bacefef5a241ca7dc3a1f39d48f9538cfefcc7274f40e3cc259c958e0f5abd1d12edd4e64377dbc245962781c6f0dd922ab298e
 DIST intel-gmmlib-22.1.2.tar.gz 813247 BLAKE2B 5d2c632239bbe12779f3aa07744de966501a5182ae415746f9bdf141f1ec9f94fae67df21424effeefbbfe2b5bd58d267687ca7623e7d1e736c92da09135868b SHA512 fa265f8cdb1a0c6ec067073cf5e188c86540709d98d384c61dfb34863f61d93d78cfaadba1b5bfb04bb8808bb1702282f76b57507c2a8946d0291419ac558c53
-EBUILD gmmlib-22.0.3-r1.ebuild 961 BLAKE2B 2f5c2d6559bd93f099d0fe52483d251a099472c7a028b5c1773b6ee9e6bf9060129cf239166998d25619a8fc56510a98061faf243fea9093c2037298f6b2d420 SHA512 a39b38a83da902d4c7e072ac0e4bdffc19c5b1438c96789d58a05b0c142bccec0367ab38a4858a7511b3685e5f8ca96f4085db52f430915aa86e05579453ea87
-EBUILD gmmlib-22.1.1.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd
-EBUILD gmmlib-22.1.2.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd
-EBUILD gmmlib-9999.ebuild 847 BLAKE2B c9b0e8885ed3223e349447caa3253b3ddca1f2bc1a98404271c0d26085b107240aeaa27bb535a6251707899e204cd7b87a7d3e84a0843c4af4c55418a2eb982a SHA512 93cc4374dfcb1b5af52c1c7fa0845ba57940a823eb0313add092a72dd039afd323cbc73918fdd044426238553c65c2ab95b6e8f90f5e4939761e458d6b0e7423
+EBUILD gmmlib-22.1.2.ebuild 767 BLAKE2B 76d22a835768e7f4296804a0f99e7939a273ac151b5e4e2fc6ddcc724f85fc8e74462b55a4bb1822095d118d376a0759a56d986e6defa629ea356783545e18b9 SHA512 bc04c984fe8c8823ce45bf50fc3b013932411e069726254d9623e1d509f08c98789415d8905c8d60e917c71920317ab83a551d3e501efcd5f14a06c4acd35902
+EBUILD gmmlib-9999.ebuild 847 BLAKE2B 2d9e1f688b9fe423ed988ca5199dce548db51647063eb047ddeefb064c84f4621d2c9ac7e302755a7b2e81556a0b79ff85fd9cd77b95757b644a7d0cc0b6f7f6 SHA512 d6e6a865ffdfeddf30740cad5c31b2530d5fe60f906d4273b9b7eadccbb992eb25f914a938d2a8066c5f57b1fbb2b3e57c3e357ee8350fd89a1bebd93f8b4f40
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch b/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch
deleted file mode 100644
index befd33f83bb6..000000000000
--- a/media-libs/gmmlib/files/gmmlib-20.4.1_custom_cflags.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Prevent overriding of user-define CFLAGS, including -march flag.
-The flag -msse4.1 is required otherwise compile will not be able to inline sse4.1 code.
-Note: code should detect CPU features at runtime and use sse4.1 paths only if supported by CPU.
-
---- a/Source/GmmLib/CMakeLists.txt
-+++ b/Source/GmmLib/CMakeLists.txt
-@@ -54,6 +54,10 @@ if(NOT DEFINED BS_USE_OSDM_BUILD_SYSTEM)
-     endif()
- endif()
- 
-+if(NOT DEFINED OVERRIDE_COMPILER_FLAGS)
-+    option(OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON)
-+endif()
-+
- # begin -- label bldsys file prologue
- # WARNING: The "project" statement triggers reading of CMAKE_TOOLCHAIN_FILE
- #   and so must precede the inclusion below of bs_init.cmake .
---- a/Source/GmmLib/Linux.cmake
-+++ b/Source/GmmLib/Linux.cmake
-@@ -38,7 +38,10 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
-     -Werror=format-security
-     -Werror=non-virtual-dtor
-     -Werror=return-type
-+    )
- 
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
-     # General optimization options
-     -march=${GMMLIB_MARCH}
-     -mpopcnt
-@@ -47,19 +50,31 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
-     -msse3
-     -mssse3
-     -msse4
--    -msse4.1
-     -msse4.2
-+    )
-+endif()
-+
-+list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
-+    -msse4.1 # SSE4.1 compiler support is required to build
-     -mfpmath=sse
-     -finline-functions
-     -fno-short-enums
-     -Wa,--noexecstack
-     -fno-strict-aliasing
-+    )
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
-     # Common defines
-     -DUSE_MMX
-     -DUSE_SSE
-     -DUSE_SSE2
-     -DUSE_SSE3
-     -DUSE_SSSE3
-+    )
-+endif()
-+
-+list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
-     # Other common flags
-     -fstack-protector
-     -fdata-sections
-@@ -67,10 +82,15 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON
-     -fmessage-length=0
-     -fvisibility=hidden
-     -fPIC
-+    )
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND GMMLIB_COMPILER_FLAGS_COMMON
-     -g
-     # -m32 or -m64
-     -m${GMMLIB_ARCH}
-     )
-+endif()
- 
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- #Gcc only flags
-@@ -128,13 +148,17 @@ SET( GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL  ${GMMLIB_COMPILER_FLAGS_RELEASE})
- 
- #set predefined compiler flags set
- add_compile_options("${GMMLIB_COMPILER_FLAGS_COMMON}")
-+if (OVERRIDE_COMPILER_FLAGS)
- add_compile_options("$<$<CONFIG:Debug>:${GMMLIB_COMPILER_FLAGS_DEBUG}>")
- add_compile_options("$<$<CONFIG:Release>:${GMMLIB_COMPILER_FLAGS_RELEASE}>")
- add_compile_options("$<$<CONFIG:ReleaseInternal>:${GMMLIB_COMPILER_FLAGS_RELEASEINTERNAL}>")
- #cmake 3.3+, add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${GMMLIB_COMPILER_CXX_FLAGS_COMMON}>")
-+endif()
- foreach (flag ${GMMLIB_COMPILER_CXX_FLAGS_COMMON})
-     SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
- endforeach()
- 
-+if (OVERRIDE_COMPILER_FLAGS)
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m${GMMLIB_ARCH}")
- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m${GMMLIB_ARCH}")
-+endif()
-
diff --git a/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild b/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild
deleted file mode 100644
index bb933ef7407b..000000000000
--- a/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-S="${WORKDIR}/${PN}-intel-${P}"
-
-KEYWORDS="amd64"
-LICENSE="MIT"
-# gmmlib version 22.0.3 made breaking ABI changes without changing the
-# soname, so the "_1" subslot suffix was added. There is no need to keep
-# this suffix after the next soname version bump.
-SLOT="0/12_1"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_TYPE="Release"
-		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-22.1.1.ebuild b/media-libs/gmmlib/gmmlib-22.1.1.ebuild
deleted file mode 100644
index f0fd281de976..000000000000
--- a/media-libs/gmmlib/gmmlib-22.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-S="${WORKDIR}/${PN}-intel-${P}"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0/12.1"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
-	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_TYPE="Release"
-		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-22.1.2.ebuild b/media-libs/gmmlib/gmmlib-22.1.2.ebuild
index f0fd281de976..7d8a6f81eb26 100644
--- a/media-libs/gmmlib/gmmlib-22.1.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.1.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 S="${WORKDIR}/${PN}-intel-${P}"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="MIT"
 SLOT="0/12.1"
 IUSE="+custom-cflags test"
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index a8ca9840f39e..c70f66b3948d 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -24,8 +24,8 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
 	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
 )
 
 src_configure() {
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 7bdecab0d0e9..95012fd4b9b8 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,6 @@
+AUX hamlib-4.4-slibtool.patch 2414 BLAKE2B 798b95d72e57d1b68a1d26c36f631b084722a32ae3c20238f7cb2495412e200ee7e909d2e614ad27db7016654a6e662834b8c95f86dbec609754fe817a49a1b8 SHA512 743a5be7160e80453810873ea074fd62934524fcf7fc9b8e224c93a2876760c96793ebb13e6e40c32b648065b034a2355935862d540c6620babaeacb7fc2f88c
 DIST hamlib-4.3.1.tar.gz 2356944 BLAKE2B c803d253c867303cbde98b6f2e10f610aac111b7bd81fd343e1396cb86384b1c26942e5ccb8e395e073f9aa3d48e6f9edc1b64da14b2ec5ca09f98fbd3dee667 SHA512 8dee4676a19de7ac1ef733a4285b76e918f11aad6594d0557d36df295faf04c615e0993edb2f9ed5e7aea718c184603fec831caf28b75026c705f0b2e4b9eca7
 DIST hamlib-4.4.tar.gz 2401399 BLAKE2B 4256b5b4374c62ef4fb957d29deda95aa9d15a8b52b81c5db1c07f3ebbf4c8e48c6c082769cef82c8457b3f813ac00ef7a37136615747f2c93e5275a112891e7 SHA512 37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b
-EBUILD hamlib-4.3.1.ebuild 2087 BLAKE2B f9bcfec7f4c00bd47e11aef68fb7c654ef4aba2989f25a1b1092766e7fca445d5c24047e240ac65ab359432b9aa32d6d6b0fea54e2659e515280fb840def7ddf SHA512 759eecc58675fe9899cd50d5ec1fda46a61e328c91eeb6e4ede7a02d3000ed07b07e4d42e9c09e35db11cad56f757aa710cc4ae070f1c3a10a98301021d71f80
-EBUILD hamlib-4.4.ebuild 2101 BLAKE2B 0f79cbf701ba16823387ec54b3f238b7bf566645da15b5ab94d905471b3328e7b0fcf034246a0f3f0035050fb15e80bb297b2c1c48d38b02f848144b778e73bf SHA512 f8e3db88a05bc7c2e26fba93c07c52c8d26558d13ce34dee006b6b2e3529d736f7538edc4ca0290b7ba2b6be616bd405d24f5d204db59e1f9f6e80a854a83383
+EBUILD hamlib-4.3.1.ebuild 2130 BLAKE2B a84beb5f391f6114ac71438a3d4a5f07e48759d63ec9de84533c3fcd47930ca1e2c245ce8c303bb7b18ba3cc664dfe9b40fc333510c877480fb90b49e22c6769 SHA512 f8bfd63869e2efcdc6fec97a66c63427d8e8338eab3fe5bfe45224fb2c9741cfd313dee20642ccca50b86a52dbbd3aba51025c3b68f7fbe854b5fc995797cc7c
+EBUILD hamlib-4.4.ebuild 2202 BLAKE2B 89d6c0167fad4c364306ae47bdd6771f113a8ea5347479eed2a8a961ade22cf54f2a45964c8f251117d1a2bc39c7bdb46a3a2dc78c433e69fd419ed529c8fb1f SHA512 67a69077113be053ebf53a8047cb4ba7838185b9e9f027e0162cb3bb87e6928ba951002ed435d5c11bc00ed20c7a179ee60f1d6bd820410e57e04d0adf672eef
 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
diff --git a/media-libs/hamlib/files/hamlib-4.4-slibtool.patch b/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
new file mode 100644
index 000000000000..140534e744b0
--- /dev/null
+++ b/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
@@ -0,0 +1,73 @@
+From 4fa9a211adbcb1ae9329db41c27854af70f39d64 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 6 May 2022 17:13:36 -0700
+Subject: [PATCH] bindings: Fix tcl build with slibtool
+
+---
+ bindings/Makefile.am |  3 ++-
+ configure.ac         | 16 ++++++++++++----
+ macros/tcl.m4        |  1 +
+ 3 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/bindings/Makefile.am b/bindings/Makefile.am
+index f9f17d567..7e2647945 100644
+--- a/bindings/Makefile.am
++++ b/bindings/Makefile.am
+@@ -149,8 +149,9 @@ PKG_VER = $(ABI_VERSION).$(ABI_REVISION)
+ DLL = hamlibtcl-$(PKG_VER)$(TCL_SHLIB_SUFFIX)
+ 
+ nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
++hamlibtcl_la_CFLAGS = $(TCL_CFLAGS)
+ hamlibtcl_la_LDFLAGS = -no-undefined -module -release $(PKG_VER) -avoid-version
+-hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC)
++hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC) $(TCL_LIBS)
+ 
+ hamlibtcl_ladir = $(tcldir)
+ hamlibtcl_la_DATA = pkgIndex.tcl
+diff --git a/configure.ac b/configure.ac
+index f58eb0925..ab6e120f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -589,11 +589,16 @@ AC_ARG_WITH([tcl-binding],
+     [build_tcl=no])
+ AC_MSG_RESULT([$build_tcl])
+ 
+-dnl SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG from macros/tcl.m4
++dnl tcl.pc or SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG from macros/tcl.m4
+ AS_IF([test x"${build_tcl}" = "xyes"],[
+-    dnl Search for and load tclConfig.sh.
+-    SC_PATH_TCLCONFIG
+-    SC_LOAD_TCLCONFIG
++    dnl Search for and load tcl.pc or tclConfig.sh.
++    PKG_CHECK_MODULES([TCL], [tcl],
++        [],
++        [
++            AC_MSG_WARN([Unable to find Tcl pkgconfig])
++            SC_PATH_TCLCONFIG
++            SC_LOAD_TCLCONFIG
++        ])
+ 
+     tcl_save_CPPFLAGS=$CPPFLAGS
+     CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
+@@ -617,6 +622,9 @@ AC_SUBST([TCL_VERSION])
+ AC_SUBST([TCL_LIB_SPEC])
+ AC_SUBST([TCL_INCLUDE_SPEC])
+ AC_SUBST([TCL_SHLIB_SUFFIX])
++dnl These variables are set once tcl.pc is found.
++AC_SUBST([TCL_LIBS])
++AC_SUBST([TCL_CFLAGS])
+ 
+ 
+ dnl Check for lua availability, so we can enable HamlibLua
+diff --git a/macros/tcl.m4 b/macros/tcl.m4
+index feed05ce3..c1d308cf4 100644
+--- a/macros/tcl.m4
++++ b/macros/tcl.m4
+@@ -130,6 +130,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
+ 	. $TCL_BIN_DIR/tclConfig.sh
+     else
+         AC_MSG_RESULT([file not found])
++        AC_MSG_ERROR([failed to load tclConfig.sh])
+     fi
+ 
+     #
diff --git a/media-libs/hamlib/hamlib-4.3.1.ebuild b/media-libs/hamlib/hamlib-4.3.1.ebuild
index ab42e282b753..905bf3bb1fd3 100644
--- a/media-libs/hamlib/hamlib-4.3.1.ebuild
+++ b/media-libs/hamlib/hamlib-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -92,4 +92,6 @@ src_install() {
 
 	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
 	doenvd "${T}"/73hamlib
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/hamlib/hamlib-4.4.ebuild b/media-libs/hamlib/hamlib-4.4.ebuild
index e29daf2b83f0..7a49e5967232 100644
--- a/media-libs/hamlib/hamlib-4.4.ebuild
+++ b/media-libs/hamlib/hamlib-4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0/4.2"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
@@ -38,6 +38,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
 
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch" # 798273
+)
+
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -45,6 +49,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# fix hardcoded libdir paths
 	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
 		-e "s#fix}/include#fix}/include/hamlib#" \
@@ -60,8 +66,6 @@ src_prepare() {
 	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
 
 	eautoreconf
-
-	eapply_user
 }
 
 src_configure() {
@@ -92,4 +96,6 @@ src_install() {
 
 	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
 	doenvd "${T}"/73hamlib
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 4ff04973b82a..e2a71fe6e496 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,13 +1,11 @@
 AUX harfbuzz-3.4.0-multiple_icu_defs.patch 777 BLAKE2B 78eabdcdfc8dc54c53113157b9a05d44f90fb75bea1c4333837519b3782a7cd8107919a98c19a19bd792be1192f02dee441a8ca1932ca2309248a278ec0f589e SHA512 0d993fa05fc2b783c50edfb6309448c12d45ed7a434a9b2a6a9930e87bca08bb380a2329b7807ce2b3519512f24e445cf55ac483b38cd00f50a523b21483ec31
-DIST harfbuzz-3.2.0.tar.gz 28221148 BLAKE2B 55ff832d3f740e2d3819f66ddfadd10312533addc975a8871e549ad33f27f4a6da33cc190e3de17bd12c9716258bd0cb165c4c04da5057f92cc53e8673d4c10a SHA512 5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18
 DIST harfbuzz-3.4.0.tar.gz 29043149 BLAKE2B 7b779149b34353ebb85143f74e9efdd8f8ba3616cd192df63ae43aa86f3f08d9a4104554f1f43624824549cf957625e496a307470dd1a9599e492cbf490ab1f3 SHA512 c0b3802fc084cb781acb717f07ca7811685e6834d97ae1a2f13ddc68ce0a31d672cb92e1192705c6d5ed870cb735f5d37150f7bf661b95d806a9d8f362520c01
-DIST harfbuzz-4.0.1.tar.gz 29070744 BLAKE2B c88aa93908a8203d53eff0e2dabe29fd619ee75ca32932fe836270fa0eaae535746029d917c1b378c598bf50d4b50a062f9bd70f22f24aa1d7d7bba6e65ad24f SHA512 771be2493e35c9ba101e1c173bd2bcab13d733d83a93ca1a0dceec1db217197bc0ba2bd8b85a3052857aea5c509de827715074c16717d7133fc95afb5a7e89e2
 DIST harfbuzz-4.1.0.tar.gz 29069953 BLAKE2B 6f8fd1889e36b20309609cc0e0d75c06167345273c78998a481c00e14fb219c3f61538c85e1956d14141b475bbe7cbffed5dfe26313e30ac970231c4e1eb50fb SHA512 e558b58233a13570693cc35764ce2824dea8b6388f47ced228f1317a9f08b6f482c1bc8d5c46352b74e84e709f569b164bea81647212c7e82467e19dfcb703a6
 DIST harfbuzz-4.2.0.tar.gz 29092181 BLAKE2B 75e2461932a17b2da50331b5bbdddd4c68ddafeea59088e2ad34e2de6b9f679154fddaf6579de1ef244f5f55baf61fa0b7f66459d9e16b365e152f973471f649 SHA512 2aff1e6a41d6186b71f2915296c46c0b2ffc67371e1f05c13a62c237ff7a84d7d78d414d7a395e1616a2861c83c4792ef5936a492713780564b994d18e2d3e38
-EBUILD harfbuzz-3.2.0.ebuild 2561 BLAKE2B e495672f81b0d3cc4c3dea9c811b9c305415b7a49345baeef24ea4d13f2460402c059c7e2733750865b47de4be03ec7270980797e8ef601ba3d89abed90c7442 SHA512 59cbf266b6046116e503a783345fc53e517b012b0fb2ade0409a99d2470d330d8411fd6cc9b850dbf114f7c157241ac0b16aa28973344a537960dd26c322aae8
-EBUILD harfbuzz-3.4.0-r1.ebuild 2629 BLAKE2B caa8a6b067b8d95ec5a43d060bbca12b6a04674526e2aa0824fc1845ced4271f9826476ab2de094989dee20d2cd6dfd8d1b70e49ac50c69a7f1f97950452aadd SHA512 b2c741b61779855dc2745b45f1f337a2f7e27da6f066c62569b040a9434334bbdd352b427369c6002e8a491dcadd15500856ed4cb1dca48d98a2a7edf440ef76
-EBUILD harfbuzz-4.0.1.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+DIST harfbuzz-4.2.1.tar.gz 29096419 BLAKE2B eb523c2e3c956559e2445bd12719b14c244cfdedd239041afec71a17912e489adb94c0b6fe148c60ae9e908cc3e740752de2a33a255c123ef937debe6008d78b SHA512 de14b673f6bd03d561c45f94e9bda44ee41897a643ab8837493260a83b1eb1f1ca0fe105c1bee241f2ecd6ab869dbccf3ffba8e2c4ee9a3a1fca4e1c6c7ca4f3
+EBUILD harfbuzz-3.4.0-r1.ebuild 2626 BLAKE2B 7b50e89680cea5a8eb4dd83428747639d57f8c5978f40504ef28250626c8409fd0b7a3794ba511e02049d14931b93f65215fdfa19c5a9ab6bfca08fe88c2bca9 SHA512 493089edcfdea0f074e83b34c5fd54c1beeddd2762bc5874877081833c0ba74d431f428c2fe1e18cd8436fabedbb39bf9f1f46c8d276e22c2efd61c0b6b43006
 EBUILD harfbuzz-4.1.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
 EBUILD harfbuzz-4.2.0.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
+EBUILD harfbuzz-4.2.1.ebuild 2576 BLAKE2B 3921b398fb8bc79f565017c58c0dfa65b719fd973416a28a58e012decab39367c23145b4ee11a00d563e02c9fdb8ea94e4cbbbf423861902760f7a8446500f28 SHA512 1d922c3524ac2ee0ce98e72c2d333ab575d7971b3cf5a5fa60187e433083fe69d826dc614e9ee9a1f98212a27aa3445f4a06bd294e455cdec73d13bde5e33066
 EBUILD harfbuzz-9999.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
deleted file mode 100644
index 04e6837e2000..000000000000
--- a/media-libs/harfbuzz/harfbuzz-3.2.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	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 ~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"
-# 0.9.18 introduced the harfbuzz-icu split; bug #472416
-# 3.0.0 dropped some unstable APIs; bug #813705
-SLOT="0/3.0.0"
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i \
-		-e '/tests\/macos\.tests/d' \
-		test/shape/data/in-house/Makefile.sources \
-		|| die # bug 726120
-
-	# bug 618772
-	append-cxxflags -std=c++14
-
-	# bug 790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	# bug 762415
-	local pyscript
-	for pyscript in $(find -type f -name "*.py") ; do
-		python_fix_shebang -q "${pyscript}"
-	done
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		-Dcoretext="disabled"
-		-Dchafa="disabled"
-
-		$(meson_feature glib)
-		$(meson_feature graphite graphite2)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature cairo)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-
-		$(meson_use experimental experimental_api)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
index 68b9e0f0ae42..7966387b760c 100644
--- a/media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.4.0-r1.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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
index 899f139ec716..36d9b9aebfcd 100644
--- a/media-libs/harfbuzz/harfbuzz-4.0.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.2.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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/imlib2/Manifest b/media-libs/imlib2/Manifest
index 7956c9aa2272..266fc5edb393 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,5 +1,7 @@
 DIST imlib2-1.7.1.tar.bz2 893631 BLAKE2B 637bf70ea223a63c51def0fac4102683a090de41a1f5904d6232fd2fa004915e3dcde54eac51d16532d2df83a0f8df127266766ac3700ae2948d39fefef512b8 SHA512 36e457855da0f129c7e7ba3dfcb44162b6624b1d56df5f84448495a96fe9ad1ce3e6c628222630be7274476722c4feaa8e1648d1e463439ca758e66ce9645970
 DIST imlib2-1.7.5.tar.xz 793124 BLAKE2B bc47f81aeb635ca2f3d4962e1be5c53111a25a88ccbfcd8f9a7c87717b256966ca6b8cd78fb897287dab656ef2ade41a0955f7d3770d6d670e675954f000cebb SHA512 6e0a79359d6cac297b7a074a75bf577c8c1e3932d9993616834ea9076a7df544fafcfa960fe8ed7468f1291533f3c828260ccb809a882dadb3f3650ba9dd3f28
+DIST imlib2-1.9.0.tar.xz 807740 BLAKE2B 5fc1694a4a419434d2308f0bd76e7a2fe086a00159c5fe73a383bee4d0c721f2bf294e9a9e7cb86416f702d1991646b56fd3a876c573584c4a18c7bd5e5f5f88 SHA512 958fdabc938ec03ab48001ca4df72c8352cb261b12b09334d38348b22b8859cff16a1cda0d4447b73261723f223f62a799f80eb85a710ac5a44a3fa4f90734fd
 EBUILD imlib2-1.7.1-r2.ebuild 2284 BLAKE2B 2a28255e74bda9cc886d9d48d92da8bcdc9902d3a19c18278ed04985020a07c70f1ab766e2fecbeae2f229cb81ad87f05ac074d3d802d9f3f832fc0731135664 SHA512 6a2e1b5fdeb0a18c82232c576030b50856d7ff17a7176db10a9897e38f0a9da8c6c14177362e30c2c21c4c0d93792c8b91014ab366f1124b818fb260151c1d06
 EBUILD imlib2-1.7.5.ebuild 2318 BLAKE2B f3f1dc9bf3219b184b000f6238c9a18d9a62c66e2849ef5785547e0fd6e80b41f5a8f2cc21dbe66197b0ea8132c1dfd43170c845ae1a384dbb2286764091f5b2 SHA512 e1bc42489625c97160f896596704d89c89bf98165bd3c43aa2e42ab7c632ba577bd58f3ce9cfaca4c447b912ecdb120b10579e7c7c4726a5acd97ad942f32d52
-MISC metadata.xml 3008 BLAKE2B 42b78b02b69a368870d24358d98004198d7626296f1bc260e44db410a4eb75de7dabcb120473733957dfd92487f3191e2268317edb61c853e250be80ce24d3de SHA512 b106c8bc74a34815fcca8af4e6a7791c72e0693371154a426690d4263405aee1171e70bab5deb84b881d857400d9aa5a61ae97732f67fa1fbdb640f918fb4cf4
+EBUILD imlib2-1.9.0.ebuild 2734 BLAKE2B 8da7639474f6e9fc308ea14ca66413f484e12c2ff8e39e28ce78a34eb907f08b7c67e5ca5692fb2c8014014f3bb7cfd869fbc853019658b971a467614c162d1f SHA512 e49a3317da27fdf8d2e14f5412b8c49fd628d31774952c3573303ab76aff5ff7b6b189f86d4975255339e9cb5c4452e0389068b53ab5650fdf245bf4671bb5e0
+MISC metadata.xml 3175 BLAKE2B 23d595a150441ffba1f7dfde5948a44d08dbd72e6511c7a5358739d1b4f6cb8abcb33ae4e3b46482b11d6af6b4642435a3cdc42294efac9a5c8eee88b2ba2202 SHA512 2751efc349097390fe3f2ff821fa0a0d97bf2e5eaddbe0036368699a746ae7b3a3e7c66419931561d8ed7307f7c3f537e8cb878cd3cd104891912a159054bff6
diff --git a/media-libs/imlib2/imlib2-1.9.0.ebuild b/media-libs/imlib2/imlib2-1.9.0.ebuild
new file mode 100644
index 000000000000..9687be6e1dde
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.9.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
+HOMEPAGE="https://www.enlightenment.org/
+	https://sourceforge.net/projects/enlightenment/files/imlib2-src/"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 debug doc +gif +jpeg mp3 +png +shm
+	static-libs +tiff +webp zlib svg heif eps jpeg2k jpegxl"
+
+REQUIRED_USE="shm? ( X )"
+
+RDEPEND="
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	mp3? ( media-libs/libid3tag:=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.4:0[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	svg? ( >=gnome-base/librsvg-2.46.0:=[${MULTILIB_USEDEP}] )
+	heif? ( media-libs/libheif:=[${MULTILIB_USEDEP}] )
+	eps? ( app-text/libspectre )
+	jpeg2k? ( media-libs/openjpeg:=[${MULTILIB_USEDEP}] )
+	jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	!<media-plugins/imlib2_loaders-1.7.0
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with X x)
+		$(use_with bzip2 bz2)
+		$(use_enable debug)
+		$(use_with gif)
+		$(use_with jpeg)
+		$(use_with mp3 id3)
+		$(use_with png)
+		$(use_with shm x-shm-fd)
+		$(use_enable static-libs static)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with zlib)
+		$(use_with svg)
+		$(use_with heif)
+		$(multilib_native_use_with eps ps)
+		$(use_with jpeg2k j2k)
+		$(use_with jpegxl jxl)
+	)
+
+	# imlib2 has different configure options for x86/amd64 assembly
+	if [[ $(tc-arch) == amd64 ]]; then
+		myeconfargs+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
+	else
+		myeconfargs+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	V=1 emake install DESTDIR="${D}"
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doc/. )
+		rm "${S}"/doc/Makefile.{am,in} || die
+	fi
+	einstalldocs
+}
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 9194df3a2ef1..6129b2fd00f8 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -10,6 +10,9 @@
 		<flag name="bzip2">Bzip2 loader support</flag>
 		<flag name="gif">Gif image loader support</flag>
 		<flag name="jpeg">Jpeg image loader support</flag>
+		<flag name="heif">Heif and Avif image loader support</flag>
+		<flag name="eps">Eps image loader support</flag>
+		<flag name="jpegxl">Jxl image loader support</flag>
 		<flag name="mp3">ID3 loader support</flag>
 		<flag name="png">PNG image loader support</flag>
 		<flag name="shm">Use MIT shared memory support for X image transfer</flag>
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 00c1bf227809..50dd2c8da083 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -7,5 +7,5 @@ DIST lcms2-2.13.tar.gz 7259337 BLAKE2B 243e45852a31fb980c80f4468da14eaf1a2b6824c
 EBUILD lcms-2.11.ebuild 1161 BLAKE2B 6544d7c87de96c0bb45bc117c190419149322d86d5169af3d2da67d5764cec68b7adea5e13b28109c8ee33b19ca696bc205140e56f21c6d9654732466a803797 SHA512 67668031db5c0b28115fa4c94bbfd7229bd0e901d1fc03138b741bf04002b794f1bfac019b3d936ba5d70cf4688ffee03d394ef3b86af27704dbb3d6fa6a6178
 EBUILD lcms-2.12.ebuild 1283 BLAKE2B 4491db59f78ff4242cb145e0013a08d004cdacfeb16d382869f26696649adca511cd6979914b6e56948352dca7811983161136c1bfad99ae6e592f7c9713a003 SHA512 93052efb79a9102e2558a83c289aecf88c519a233cf6c7cc436aed8e2055b5e8fd858403244691293e778f892458e9e475ca5bcabc8531856c56edad391b96f3
 EBUILD lcms-2.13-r1.ebuild 1351 BLAKE2B 59c944d988c637f0522a7d4ac5796834a2ae10aaf0b56ed8d8cffab406b0166d3d85fc7d763a8af5958c72ee6f5045af428f9ad434a59f6ae2267bc798dd3585 SHA512 a5c1a3ebfeba65ca1d7d02d6ccdbdddb9aea6fde725b6ea4b04a68b1c02e37cd48ccfc74004bdf47a487e16b75db41d32b5a8bdaa5d9875261d78585cca0e8ad
-EBUILD lcms-2.13.1.ebuild 1456 BLAKE2B 3b18cf1b4696e6d4c4618b7cc65c363fdfe9a2eaeb8c6b82589b10dd967b75b18c4780091efee1d8e43b5933c8ba682e67ebbf0a4835c8918fba8132417fb855 SHA512 696c7a1edf1fd2150319bbfd59c224f3ef585a81ac0b16abca4deebca14073e08585c12fa87c62acb9dc9bce42b62589660fb22156331eae05daf397908bb261
+EBUILD lcms-2.13.1.ebuild 1448 BLAKE2B 1904071dea492114d8ac09ea6c1be6ebefd76489015857ceff301439ca3873fca2afbccf1d5da45a22a457e70afafe67beafb0051e24cdd02477afca3cb2f97a SHA512 085f203ac268822e0c5040163e8039dc4b516e75613b66b9564c2516f96f7e69897eccb4cf9046d64fcbbeb2141592250b7aff3899d26d43b07d7210b211a945
 MISC metadata.xml 465 BLAKE2B eac440b8a48c75faaa51b0333582740e7e33b0b6222bf5376383764c9395cfa7a7936e19ec2dd22a043e3251ed4e40161c7a594f7f3157b8b809c620dd551430 SHA512 dabeaecc2fed3c2e63f2bb0219711961c51f7da710a5e90629df694c5c89deb9fd26c2329ed5ac577edbf60b51a8efd34f65fdd7e6759912c2513e4d8efa6f35
diff --git a/media-libs/lcms/lcms-2.13.1.ebuild b/media-libs/lcms/lcms-2.13.1.ebuild
index d1f7d6df39a5..7d2f4466c1f9 100644
--- a/media-libs/lcms/lcms-2.13.1.ebuild
+++ b/media-libs/lcms/lcms-2.13.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lcms2-${PV}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff zlib"
 REQUIRED_USE="tiff? ( zlib )"
 
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index e9929b8a518d..2be2bab63967 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1,9 +1,6 @@
 AUX lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch 1067 BLAKE2B 1c56383b9a791ea5bcc8762a23c92426d308d6f55e5b51ec9268a779bb202144958f9cfa02686d72bf260d2beeb08b3ddf0c58441bf1a899032c408fd137df93 SHA512 af9930e67b6a0a3db26a97326e68a8e8a2d3ac57c378cf8f79397f514ec18ab600efb84b941d0449ffc8d620564082f8942a428c1fefa3cf199d972a7a4f9622
-AUX lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch 5462 BLAKE2B 73ebe5037f11673232363ee4ec99aea828b37ea24469ddced15593310e8f7f7806c08bddde40583640471d2566985d5002970dcc6f8f3d64ff369cfe3a3567e7 SHA512 1f5fb5c3b0dd115da478bdcf9c47e9c269c13613604905df8b0a80fccf5b039ee2c1ce0f433c68f783b11e5faf1756fb66772f0e313bdb0ae6af3c2a5cf35ab3
 AUX lib3mf-2.2.0-0001-use-system-provided-act-binary.patch 5370 BLAKE2B c5d3cfe734311995f9fb98a4c7083267af04740e9cc94f6251ec01a837cce8e52587bae4f587a246317976eb60be931c44d1b6bb5f0d72599d07845cadd1a8c4 SHA512 4832d2661dab796e78a737f7aca2f7516e4f4b8c29d0897779ad82be91ec523941f51d39564ad61b01a158a5f313c365a26d5499ce2ccc85793fca8f81b75aee
 AUX lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch 936 BLAKE2B ac89b89c223eaa81334da6ae84d1c785beccea2687b883954a93ede0d7fa49d11afc91ff5a6d41e195d7feb959d4317986cc97ac58047328ce372e40e787cefa SHA512 42c9ede93e79c7548b5ed9bed2f5ec0e275441ab5daa5cf9eb72f31610da512b7a3f118a075a8cfc21d1244c96ba42efadaee8c26c1b1837295e8a2ce4a93255
-DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846
 DIST lib3mf-2.2.0.tar.gz 16439833 BLAKE2B c98f57ea99f90625f2bfbdbcde9df8dbd8aeccc655e1bd9be165c24b2d9fb74471e4b01c816d8f665e5793db77c7bcf52016f030ec1947f908d6647e9ad12745 SHA512 2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
-EBUILD lib3mf-2.1.1-r1.ebuild 1422 BLAKE2B 2a5d1bba2b34e3aba7f8b852ed81af4056247e586ebad940d48cbf07d1b1e28b03ded6ed85c958eba45c0ee7d9b40368c57415c212b51862c92745accdf8e100 SHA512 86bd28c9587a9f081049e0fe839cd39b0dc45b7eb90e87b2494fb4855f27a056ca87b114a730160b16591c63bf75ead6229bd5305bfedb8d38ae21c3d5ce2278
 EBUILD lib3mf-2.2.0.ebuild 1471 BLAKE2B c0f87010353a92281a46af2798bb7eb74ffb3ef196d5f56cd05f36c9712efd5b7f92037bf4ad8e0966b23b269d6a1c1e3aa300ee2a2f138fd76bf05a04ec64eb SHA512 83037eccc8db148790fa4e950767bdc6bb8d4b01c04afc59ad059ba601142bb847bedc50651093f7fdc8347ef7a2a90ee969b22e70dc4db5d1a12d081c989c5d
 MISC metadata.xml 936 BLAKE2B 55b169d62c7b8e9ef8ab789c16a286ee545f6c5519833e9c27e23765fe279b059050f526b5ceb2c59eb63d8568348c403326ec5b5d2d9925728298f3875673e8 SHA512 dee8668538fab0a6ea13cce39c0b817d59ee4dca58fa3f15e1c7b995dbfbb2abe63e1ec27b5b47c7d40521daeffc1db4a357c3c9d07e39f60c9b8851066ad9fe
diff --git a/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch b/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch
deleted file mode 100644
index 00089c58468f..000000000000
--- a/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From c4e004aa8580f799dbbb7ec6951e0826dc387811 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 6 Apr 2021 08:45:45 +0200
-Subject: [PATCH] patch to use system-provided act binary
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt | 109 +++++++++++++++++++++++++++++++++----------------
- 1 file changed, 73 insertions(+), 36 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 64a11d9..55abdde 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,14 +54,19 @@ if (${MSVC})
- endif()
- 
- ### The API generation target
--if(CMAKE_HOST_UNIX)
--  if(APPLE)
--    set(ACT_COMMANDENDING darwin)
--  else()
--    set(ACT_COMMANDENDING linux)
-+option(USE_SYSTEM_ACT "Use system-provided act binary" OFF)
-+if(NOT USE_SYSTEM_ACT)
-+  if(CMAKE_HOST_UNIX)
-+    if(APPLE)
-+      set(ACT_COMMANDENDING darwin)
-+    else()
-+      set(ACT_COMMANDENDING linux)
-+    endif()
-+  elseif(CMAKE_HOST_WIN32)
-+    set(ACT_COMMANDENDING exe)
-   endif()
--elseif(CMAKE_HOST_WIN32)
--  set(ACT_COMMANDENDING exe)
-+else()
-+  find_program(ACT act)
- endif()
- 
- set(CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED ${CMAKE_CURRENT_BINARY_DIR}/Autogenerated)
-@@ -71,35 +76,67 @@ set(ACT_GENERATED_SOURCE
-   ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation/lib3mf_interfacewrapper.cpp
-   ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation/lib3mf_interfacejournal.cpp 
- )
--add_custom_command(
--  BYPRODUCTS
--    ${ACT_GENERATED_SOURCE}
--  OUTPUT
--    ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
--  WORKING_DIRECTORY
--    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
--  COMMAND
--    cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
--  COMMAND
--    cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
--  COMMAND
--    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
--  COMMAND
--    cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
--  COMMAND
--    cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
--  COMMAND
--    cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
--  COMMAND
--    cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
--  COMMAND
--    cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
--  COMMENT
--    "Generating hourglass API bindings and implementation stub"
--  DEPENDS
--    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
--  VERBATIM
--)
-+if(NOT USE_SYSTEM_ACT)
-+  add_custom_command(
-+    BYPRODUCTS
-+      ${ACT_GENERATED_SOURCE}
-+    OUTPUT
-+      ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
-+    WORKING_DIRECTORY
-+      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
-+    COMMAND
-+      cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
-+    COMMAND
-+      cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
-+    COMMAND
-+      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
-+    COMMAND
-+      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
-+    COMMAND
-+      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
-+    COMMENT
-+      "Generating hourglass API bindings and implementation stub"
-+    DEPENDS
-+      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+    VERBATIM
-+  )
-+else()
-+  add_custom_command(
-+    BYPRODUCTS
-+      ${ACT_GENERATED_SOURCE}
-+    OUTPUT
-+      ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
-+    WORKING_DIRECTORY
-+      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
-+    COMMAND
-+      cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
-+    COMMAND
-+      cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
-+    COMMAND
-+      ${ACT} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
-+    COMMAND
-+      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
-+    COMMAND
-+      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
-+    COMMENT
-+      "Generating hourglass API bindings and implementation stub"
-+    DEPENDS
-+      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+    VERBATIM
-+  )
-+endif()
- 
- add_custom_target(lib3mfACT
-   DEPENDS
--- 
-2.31.1
-
diff --git a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
deleted file mode 100644
index bae4219d6bb8..000000000000
--- a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake eapi8-dosym
-
-DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
-HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
-SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+system-act test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	sys-apps/util-linux
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	system-act? ( dev-go/act )
-	test? (
-		dev-cpp/gtest
-		dev-libs/openssl
-		dev-util/valgrind
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
-	"${FILESDIR}"/${P}-0001-patch-to-use-system-provided-act-binary.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
-		-DLIB3MF_TESTS=$(usex test)
-		-DUSE_INCLUDED_LIBZIP=OFF
-		-DUSE_INCLUDED_ZLIB=OFF
-		-DUSE_SYSTEM_ACT=$(usex system-act)
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DUSE_INCLUDED_GTEST=OFF
-			# code says it uses libressl, but works with openssl too
-			-DUSE_INCLUDED_SSL=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	for suf in abi types implicit; do
-		dosym8 -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
-	done
-}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 2556c45c19fb..3dc89c695108 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,6 +1,4 @@
-DIST libaom-3.2.0.tar.gz 4717955 BLAKE2B b247c9092bf3b8080b33671f182b10eea060a2eafd94eeb1b92177d2c7b5c32de2342f9cf1c7e500b28fdac2b00ea8d43b1e56c9d1c8c0efe1bbc4e40285a52a SHA512 649bebde85c1a42b0c1c3d2d3b7110b999e3ee1c8e76595259e4e75a8b0f3918e23ff7c7e2c313da4d579882f55bf29765bb882570280adc81f3bc1e82f1ee19
 DIST libaom-3.3.0.tar.gz 4768475 BLAKE2B 22060694019bcd925cb38c365063b8f2be60aed4cc6f9b0aa95cf8b4c4c5b40f5c603359d8c0728c5650fe9f7eea7573b8fd4a93975481c67409b201b4c48428 SHA512 9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
-EBUILD libaom-3.2.0.ebuild 2422 BLAKE2B 3bc74e6923f44c3daefdbed351e6fabb3ace367981499af4051205d3e8d5e0200a072ba8f9d91302d7a32be751c64f1f89a4d7fe095f8354c56d147a04ec55e6 SHA512 34767df5f510f6ba88eef3475d4e52765ba8967150854635c363cca2c7e42fc3646205d6aea64b9f6e1397dc87a582bfbf3e42f472355e5527cb294bd473742a
 EBUILD libaom-3.3.0.ebuild 3090 BLAKE2B 5174985df97a5ce713c16230bb2744a71e3cd5203d5e1301c58cf90353df3af9c7790a2ea817b2fa78064ae8b2a30223d29258f1df8027b91fc22be44969decc SHA512 1ddd6c41017f2236c03c0a3d0f4c14cbc8a926f6eae2a92f52547a02b450964c3b5b284c3d8367ad6a799dcebec9ae828bda8e922cbc5960f8da5d6972622205
 EBUILD libaom-9999.ebuild 2432 BLAKE2B e5dea7087d3d0dc2a5ed9e671c0a3e044c0cd079299f851b63d10c4e5d446002b47f0707a8e31d0427355df0b77cfd71bbdc41bdbdba6cdb36bd23707a8451d4 SHA512 316469183bc7b44a60db5ab0ffd59ebc634426901bf56cde8658e28cfd95815af9d31f4e9215e09c7e2ed1f335eef407da74096e82060cd413356841cf7fe371
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.2.0.ebuild b/media-libs/libaom/libaom-3.2.0.ebuild
deleted file mode 100644
index 5dd0318c3279..000000000000
--- a/media-libs/libaom/libaom-3.2.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake-multilib python-any-r1
-
-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="${PYTHON_DEPS}
-	abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( 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_CCACHE=OFF
-		-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
-
-		# Needs libjxl, currently unpackaged.
-		-DCONFIG_TUNE_BUTTERAUGLI=0
-
-		# 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/libass/Manifest b/media-libs/libass/Manifest
index cf2a543eee30..ca92b2c6d170 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,5 +1,3 @@
-DIST libass-0.15.1.tar.xz 369884 BLAKE2B d5b7a4e474aa847ace6ba36085b7c2ef6de3e70fe00e3ea99be0f6c54d807969d90bb08d651357445e2158b01058f4c2995e1bb1d5f895479cdc0fb67fa3495e SHA512 e5a1cca7a72b21de7da2f83fc46db6b35e822593b67fa16563451f4121965e16e825a1665996a0e6022992e6b0365fc2b9b898932dd8086d2ee87b48851ef307
 DIST libass-0.15.2.tar.xz 382036 BLAKE2B 6448bbb152787e813c2f32544694b4854723d97fcac281355f61b3efd3499c65a0a27f7405060c0a4aa200795b564a1907d3db04dda6ecaa892ad3fc78e9cb77 SHA512 4a352d2d21d8a7f25d593f0456cd057912589e55c0709dbf33150d23253fa7859da41584238f03c51782e066a0f92c6849c36b6210324cdb57ed01539921a39b
-EBUILD libass-0.15.1-r2.ebuild 1195 BLAKE2B eddb9a6b968ac94ce771b139e6e5961c5ef94a7863370feebbccb88c438eb020d10b134889966118a50e345ac10abec813e860c3b9aec042a018ad80e66b22ed SHA512 f4cc0d36a9d8119b14cfe433f70ea35b2220a190e1dc4d1345b2f324be819368247afe037a44655e35bcec4afb9607389ab87622e4679a7d6bbac574056f8810
 EBUILD libass-0.15.2.ebuild 1195 BLAKE2B 32c63c8e9c0d12e742f1e43571f715c804082dfec08eabadd4bee2b1f80db62eb28f59878249c689bc7718f997892bd43f2bc10d2f8195fe3fd3d456d0a61c05 SHA512 0491131050348caeacd6633d754fb234ef29c8d35e634109df068cb9f2f8fe9212885622afc3c1ea1291fd832bfa437bbec0f197f3e2cd63ca38af83d1e78504
 MISC metadata.xml 310 BLAKE2B 32f2b0eb7f05223e3d092b3d75b7b1095afdac6dc322bd21fc8d32b6089cfccdc46300801e9d7566269fc0fb54780b6c1efff6e41be8de0aa31b26bdc52a44fd SHA512 97c76a4e387bbf43b14bf7799fe889c27e74e8e0b18c2027fc0c365e25ec5186ead530afe6d8e4d6b95440f0cb781d7ebc46e1eae1cc7b2161a199d38bd2a186
diff --git a/media-libs/libass/libass-0.15.1-r2.ebuild b/media-libs/libass/libass-0.15.1-r2.ebuild
deleted file mode 100644
index 37b64e258e07..000000000000
--- a/media-libs/libass/libass-0.15.1-r2.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
-
-inherit multilib-minimal
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://github.com/libass/libass"
-SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="+fontconfig"
-
-BDEPEND="
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	virtual/pkgconfig"
-RDEPEND="
-	>=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-0.9.12:=[truetype,${MULTILIB_USEDEP}]
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( Changelog )
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable fontconfig) \
-		--disable-static \
-		--disable-require-system-font-provider
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index f96a4fc49a84..77f8c88a975e 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -1,6 +1,8 @@
 AUX libavif-0.9.3-dav1d-1.0.0.patch 1428 BLAKE2B 51780bdeb22874bb23b8f461da1a98dad9b88f6e559ee9de60588a586c7009726d5b9a2db40d53ee660705110d1a61730b60c3caed876b359cdc1302e7a09c6e SHA512 905d5893d2a82717d0e488220a4e6e8dc46c0a3c04b2bea1feb5f618cddb9171e2c8d9fa72d6eabf898d0cc8abe41e3a9f510c7a1eef68c55cbe81b2736130e3
+DIST libavif-0.10.1.tar.gz 2085698 BLAKE2B 5be3f9adf7e0a5747e42c90ce2768eba90053c821805cc8e39915d6cbc4cd42554b1473118b41eb25010d20a2b5a3c141b9cbd6ff55c46abd79eb97cdee6b0e5 SHA512 2f6f248c56c983761149d3c201fc2a2ea5072a32516578a7fdb2c66e3cd22491540f400e23581f873b15454250eeec8d433924ae2c1de9371b7924a5d82bef6b
 DIST libavif-0.9.3.tar.gz 2000521 BLAKE2B b9dbaf01e58058a1ab9191081242a0f669b714d319075b6330963bc8ae31f576fb77b108de4745125eb42d39682e74a3174d062a029ccb765b3030f4092a96b8 SHA512 8e95666c784d1badc7e18d27a7c21cae3b8ef3b8da9a762eb8f7216d77fba29b9ca309c01d13bcf4890e03c6bc335ba4baf3f5877396bd0584be9ea60018daa7
+EBUILD libavif-0.10.1.ebuild 2719 BLAKE2B b24be64a47213d451ee8efc4b2986c4cbfca494f81ced0f7ce8811e05138090a718bd2fe1d797f5451b7e232e034851561eb392fef66c353c07264d290c40e36 SHA512 77146847cbbdc75fe685e4501a5dff30a56ca08f1791f738fc0fa647dcf6d5b761e47a371fdd967a73d97eb91ff888dfa648a6ed91e0fffbff0f0f3e40420545
 EBUILD libavif-0.9.3-r2.ebuild 2717 BLAKE2B 88dbe135fd388326eb14beb585e57d241760679839433bf7ba8dc6d2a195e4b5e266a50177b77d061d8c3824fa422613bd65b48bed42017592b50ef1582dff23 SHA512 ad18814f39af7148b016341f7a0a88cb343050a2f4c39acb4202999e2753d3921b3651780f4ead68b581c6ffe657c1e69dacab0da37b3e536acbb7611421eb97
 EBUILD libavif-0.9.3-r3.ebuild 2754 BLAKE2B f6dfc1db692f53625edbe69ae667dd31f1cd99a12d45e5503ea4c226dcc7894e32781923714deef7200f327dc81e4a6672e5ef4145a97adbb808a9cf0142ae01 SHA512 2a232a397fede6063ef17a6886ff3543675d4bd24a5723dd7157f0a41785cab58262454ba421df4a8a5348119f6b3d7184c7623c943b4242a247cb5bab69dd6b
-EBUILD libavif-9999.ebuild 2665 BLAKE2B 24519aec2d7556da651acff664ec486fccbd88a0fa362ea6d06c34441a53cb2dc7d5cce56a3aa6d42a58aca59e385609aaba0fcfd82c74f3b46b19ef4e86f24d SHA512 e7d9bd31c3bbc293069809a6bb39664a474608b91a22a9fd6849e764e97e8d9a46ad40ed51c039a7a73fab4f1c38c73a4e0968d8bce89d642a40133a6272405c
+EBUILD libavif-9999.ebuild 2681 BLAKE2B 929277db0f99ee7b1ccfc46331f5c5febe05be72ecb48b1f94c04edae76be3938f9de2dcda40ddfe237a7dddedab9e9f629af60ee6272ea6523373f28c164118 SHA512 4db77d974fe980c3b5373b6ea37e909f7c20d1ddfae1969d6a76d7126c942f68d9d73ae6e0ec3e81c5d27351c0114ef7fb2bbc56a2db83e5f044582765d67466
 MISC metadata.xml 874 BLAKE2B dff9e32442e51d4a3ef60fc1059cb2303b3f0a8c0d026ee8703086509fbed4205e28f4bf043b90af2f57ccbaf7dc861dcefb633b1f306bea1d3f32a5373a5643 SHA512 9f5c37e9ebe71fe47512a7ccc493559bc46132874dc00f16b0b60ad108fee9eda6c2a2c87b21309505e46cce46776a9917ec587874906d1d62b1c2e28b0ea31f
diff --git a/media-libs/libavif/libavif-0.10.1.ebuild b/media-libs/libavif/libavif-0.10.1.ebuild
new file mode 100644
index 000000000000..0b126b8eea65
--- /dev/null
+++ b/media-libs/libavif/libavif-0.10.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+# See bug #822336 re subslot
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
+
+REQUIRED_USE="|| ( aom dav1d )"
+
+DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-3.3.0:=[${MULTILIB_USEDEP}] )
+	dav1d? ( >=media-libs/dav1d-1.0.0:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
+	rav1e? ( >=media-video/rav1e-0.5.1[capi] )
+	svt-av1? ( >=media-libs/svt-av1-0.9.1 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
+		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+		-DAVIF_CODEC_LIBGAV1=OFF
+
+		# Use system libraries.
+		-DAVIF_LOCAL_ZLIBPNG=OFF
+		-DAVIF_LOCAL_JPEG=OFF
+
+		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+		-DAVIF_ENABLE_WERROR=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+			-DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
+
+			-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+			-DAVIF_BUILD_APPS=$(usex extras ON OFF)
+			-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+		)
+	else
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=OFF
+			-DAVIF_CODEC_SVT=OFF
+
+			-DAVIF_BUILD_EXAMPLES=OFF
+			-DAVIF_BUILD_APPS=OFF
+			-DAVIF_BUILD_TESTS=OFF
+		)
+
+		if ! use aom ; then
+			if use rav1e || use svt-av1 ; then
+				ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode."
+				ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}"
+				ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}"
+			fi
+		fi
+	fi
+
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if ! use aom && ! use rav1e && ! use svt-av1 ; then
+		ewarn "No AV1 encoder is set,"
+		ewarn "libavif will work in read-only mode."
+		ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
+	fi
+
+	if use gdk-pixbuf ; then
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
+	fi
+}
+
+pkg_postrm() {
+	if use gdk-pixbuf ; then
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
+	fi
+}
diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild
index 80ef7d093431..1caa84d6e040 100644
--- a/media-libs/libavif/libavif-9999.ebuild
+++ b/media-libs/libavif/libavif-9999.ebuild
@@ -21,11 +21,11 @@ REQUIRED_USE="|| ( aom dav1d )"
 DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/jpeg[${MULTILIB_USEDEP}]
-	aom? ( >=media-libs/libaom-3.1.2:=[${MULTILIB_USEDEP}] )
-	dav1d? ( media-libs/dav1d:=[${MULTILIB_USEDEP}] )
+	aom? ( >=media-libs/libaom-3.3.0:=[${MULTILIB_USEDEP}] )
+	dav1d? ( >=media-libs/dav1d-1.0.0:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
-	rav1e? ( media-video/rav1e[capi] )
-	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
+	rav1e? ( >=media-video/rav1e-0.5.1[capi] )
+	svt-av1? ( >=media-libs/svt-av1-0.9.1 )"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 3a99ef269691..357902f9b193 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,10 +1,6 @@
 AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b279d9222ad94bf4c3875522db75ba585566b0609d1a27cbd4e25066832b19351acf05f5b00295ed5364c2984 SHA512 2b376149680edf6891f2129de2fc074dfc32a236d8eb19b3d899e1f7d3ac98eaf8cdf6e13c7b548ab59354c558e2c149f06d85c1c5be61c5e05cc5ec4382d86d
-DIST libbluray-1.2.0.tar.bz2 747265 BLAKE2B d9f0d1c321faa9008431b17aecba495e44d2795cea2973f9772b5be2c0193af53e3c947b9dd0b2d4d22c4085e163461252f895618e98491184d85eb7fbf5bd54 SHA512 d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324
-DIST libbluray-1.2.1.tar.bz2 751063 BLAKE2B af353e03a70b0202776c2190d927506225bbe1147fe5bfb19039839f5d82d0beb4fd7c2813a9ce10a2bc6f9d07e2a2080b54f1442e02e5f8e72564a5bcaf0a2a SHA512 e9eeee433034266e88c05ae3469c0bd2bf700d7f16e17ad706f48426c143c823e83c16ab79a637f1e85e4eb858aa0577630671f87ba35d179db2a1d8bc8545c4
 DIST libbluray-1.3.0.tar.bz2 754069 BLAKE2B d4c699ce28d2e5b1d4dda461a1359d3a446afe72368e9d76066ca4d5c49d1f24b4bcec307608d96913d0c668168a86267416b9db37ad942628c2926b79ec47d9 SHA512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc
 DIST libbluray-1.3.1.tar.bz2 754867 BLAKE2B 471963bc5b77f9da31c2ad900e7bbb1528943d2341aa4f12471e5d9a0db6964e62e917c4f19e29115c8c129bb7f8730780b44dbb1c8939c94c686f39d8521fe8 SHA512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a
-EBUILD libbluray-1.2.0.ebuild 2056 BLAKE2B 812ebe0d1aaab6226efa607b79bf8c04f792f7261900b5dcb0a4024b3bfa16d5fe688422bfd3503cd7dc79364bfcad3342d5aaed7bfdbe6abcd429f85607aca9 SHA512 de7cb76efd10b6a5ef3e906bb17c78fbec7bff47d11bf20073b8316e70d6938b8dd87f9aac1f7c7433fe0689c4ea5122848e22901fbe3a46bc9b48c3295ad05d
-EBUILD libbluray-1.2.1.ebuild 2022 BLAKE2B 8c0219e09ebd99b7184e13c36530721479c996c213cebe6990cad3172f152365c141c3e6046d31c6315e97313c1486732f8c855001353a6493aff52ac3e0b57e SHA512 682887926431df5790ef7c1a01a7a91a47100852184ce4d98b80bb9396a268fcb5918ff47b67906d94cdba83463bf73bba95e5a149a33408423546e36c5a59fe
 EBUILD libbluray-1.3.0-r1.ebuild 2026 BLAKE2B afdec663eeda2df1dfda5bab20fadc416b718c0f1fa9198c9d382316f79220dd7773b3e8fc16cb37c96202fd6a2bb2004093b785caf572debe94e410fc70965e SHA512 ad3e56facfd5a192c3787096414baeaf0fd29a7f2e9550739c42ef76670aac2ff8cfd6390f46dd3fc6076b1384217c02b19d8739369fd969ad1913475a3d7b02
 EBUILD libbluray-1.3.1.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
 EBUILD libbluray-9999.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
diff --git a/media-libs/libbluray/libbluray-1.2.0.ebuild b/media-libs/libbluray/libbluray-1.2.0.ebuild
deleted file mode 100644
index db894afbff0b..000000000000
--- a/media-libs/libbluray/libbluray-1.2.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV#9999}" != "${PV}" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
-else
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-fi
-
-inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
-
-COMMON_DEPEND="
-	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
-	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.6 )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.6 )
-"
-BDEPEND="
-	java? (
-		>=virtual/jdk-1.6
-		dev-java/ant-core
-	)
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-jars.patch
-)
-
-DOCS=(
-	ChangeLog
-	README.txt
-)
-
-src_prepare() {
-	default
-
-	# bug #714610
-	append-cflags -fcommon
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	use java || unset JDK_HOME # Bug #621992.
-
-	ECONF_SOURCE="${S}" econf \
-		--disable-optimizations \
-		$(multilib_native_use_enable utils examples) \
-		$(multilib_native_use_enable java bdjava-jar) \
-		$(use_with fontconfig) \
-		$(use_with truetype freetype) \
-		$(use_enable static-libs static) \
-		$(use_with xml libxml2)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi || return
-
-	use utils &&
-		find .libs/ -type f -executable ! -name "${PN}.*" \
-			 $(use java || echo '! -name bdj_test') -exec dobin {} +
-
-	use java &&
-		java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libbluray/libbluray-1.2.1.ebuild b/media-libs/libbluray/libbluray-1.2.1.ebuild
deleted file mode 100644
index f8e57cc06fb2..000000000000
--- a/media-libs/libbluray/libbluray-1.2.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV#9999}" != "${PV}" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-fi
-
-inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
-
-COMMON_DEPEND="
-	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
-	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.6 )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.6 )
-"
-BDEPEND="
-	java? (
-		>=virtual/jdk-1.6
-		dev-java/ant-core
-	)
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-jars.patch
-)
-
-DOCS=(
-	ChangeLog
-	README.txt
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	use java || unset JDK_HOME # Bug #621992.
-
-	ECONF_SOURCE="${S}" econf \
-		--disable-optimizations \
-		$(multilib_native_use_enable utils examples) \
-		$(multilib_native_use_enable java bdjava-jar) \
-		$(use_with fontconfig) \
-		$(use_with truetype freetype) \
-		$(use_enable static-libs static) \
-		$(use_with xml libxml2)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi || return
-
-	use utils &&
-		find .libs/ -type f -executable ! -name "${PN}.*" \
-			 $(use java || echo '! -name bdj_test') -exec dobin {} +
-
-	use java &&
-		java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index 59cfb8ff2900..d8fc614ea37b 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,5 +1,3 @@
-DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0b0ce0d2781c0d68d9d5e08f9c6154b43c4b2e0cd2db0d530eb0a94914161384e788b307af4c4fca3351d270cbe9a SHA512 e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
 DIST libdvdcss-1.4.3.tar.bz2 388404 BLAKE2B ce654b78ce3b30961dddd3a4b80d6fb520ed07e5e1ccf76ed09b65c7a4164212b12868a6c0bf91bc8893498539ae0400208087ef7c00dd1fd1cfd18fbc4352ae SHA512 0f9c0244feff5ca62459823810a39ede745b63fedb682707fcbaf0dff11fff42998cef31a281bb6380930123d079780d37a79871f6e628cdca9cfa06c64befb6
-EBUILD libdvdcss-1.4.2-r1.ebuild 765 BLAKE2B f4b85c73b1ea1633927f92e91f95cb10297094ed27808418624cc21f2f4b35e683a128ea47c32216476f109c1beb05361a726b4f0ab362677b73b92ee0e2e19a SHA512 cf7f224e80f7a945ed71547df5441467b7bb2b0b9c5072f23cd8c8411fff0108f39d118afb4aaa81eaf72a84adbb6546771b5b5c99c2298b36caf7a2c4e21d48
 EBUILD libdvdcss-1.4.3.ebuild 772 BLAKE2B fd7bf4b6ab87afb9703d36484c187c7f484d77342760a2b59566fa300db2179ffa33ee317f2bf638514dae3111d52a91e159afe23fbf86f46b95d0e2bf621edc SHA512 a250b24fc9384927e6474cd836111ca2d53f0440bc0e7dba812f07b7c044a5f996477859cd6b3f59a221023ed43aec6b6742558ace8e05eb603d97ad71dffe86
 MISC metadata.xml 220 BLAKE2B 6f39345ea8474519439cc9768baf57bf07c0d8051eba252c30638ce35f30f8cbd1ecb06f7448893fa72ab9338630c83211fd366d66136b6ed090558fb376982c SHA512 3a2781821a74f9512a2b1fa55c8982a23f880b96b1707fdedf129d37685c2793eefe75a8080afe2bac64ed44d5f24648e6a25e163f87fe76a2b6be76b995647a
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
deleted file mode 100644
index 6de638d90341..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="A portable abstraction library for DVD decryption"
-HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
-SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		--disable-static \
-		$(multilib_native_use_enable doc)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index c93ad89d7cb1..b48e9d20f153 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,6 +1,4 @@
-DIST libdvdnav-6.1.0.tar.bz2 370145 BLAKE2B c0bd54d94e58eeddcc422e24ef1b400775f28c0eff516db3cd13a5dfcfe103a122fca59734d73e83784b4f0b7ebebddaacf89709991f1485b55f897bf8de7fc7 SHA512 40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71
 DIST libdvdnav-6.1.1.tar.bz2 367606 BLAKE2B 680e9636d407b0fb1eceb2c435d91fb5f7480b65e3c272f2750b3c9957ab5b85815ff12715fb98a5a91e5c0e4b2b2d488823525455c5ec2acd92b8dab197d518 SHA512 889bc987113189bfdfc1ebf603b256e5b228be37196455dcfdc7f66debe18e7298b82b807e86ff18a8925e491395ed4007c87cf18ba1ff1ccc213d86f5342a10
-EBUILD libdvdnav-6.1.0.ebuild 1161 BLAKE2B 09537c986127ac91b5a1814c3f7bb08dd2e11f31ce70b65c8f4886d679ed69d5c46aa75fe022764a4a4114b1a5703d09cda4a52588284acbfc45d85019ba10f2 SHA512 ccc8df9101b8f19790c143cdd9c27b1b7d7f65b29ffe9d463df799868f254846a430f8491e839d2e6d448dcf5d7b257656bc40b0e44e61fadc1d6280063bcd46
 EBUILD libdvdnav-6.1.1.ebuild 1168 BLAKE2B 2f6ce4b3a30c07f70045733e963ea4b7614bff4ce9cbafd9455e2acc3b9dd30a01a79669571210e376054f03af1fef9bdbcf5c194fe044e9e6f7561542c76d59 SHA512 5dc1dfd4520f651c68f72c403e05967cc00395e961658cd2b6141af405c62ed3c5b49cb559b768b8e70c9fa3594e5152558656f14f1ffd59cfa7cb110e7c9afb
 EBUILD libdvdnav-9999.ebuild 1168 BLAKE2B 629811112d595ae73b3c54386d9e5861f577394bca82c2918726938d59c3104ad7dffe221bc35d0abc6871e5f5659be13f878eff694265c90a2ff2dc5bd01c62 SHA512 dbb0a6742fb2a6a5c27ce359722f92e94e7b1213e576006050e44335658004059a0f0838fd7f879fd1066045f783e1da836ff3b1c161dda3a354e37469d12b12
 MISC metadata.xml 222 BLAKE2B 96fcf0d83a18e2c1f4611d550e7e2123a06fe8b3b2890cb5757284d8fc7d3bebdf1aeb4f82affbc7c51268749cac9fdcbf43888e3bec0e68e1b6548a3f6eca76 SHA512 c3657a6bf2503e6585ee53453bf0ba26b5eed2e894342087358b5f4306a960db915de61036b6c8dc57cdb7a7f3326d57ff3badf7b3ecefaa99291289a73997de
diff --git a/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.1.0.ebuild
deleted file mode 100644
index 8eb352aae945..000000000000
--- a/media-libs/libdvdnav/libdvdnav-6.1.0.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
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library for DVD navigation tools"
-HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
-else
-	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libdvdread-6.0.0:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-# To get pkg.m4 for eautoreconf #414391
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 086e3d54f545..06525588ff8e 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,6 +1,4 @@
-DIST libdvdread-6.1.1.tar.bz2 392134 BLAKE2B 42c7eb2f83b215714e24a7d4748b60fd9eee9fbf7a09b3a9f28974fb5f2a3bb44c80c865348b051f099421159ad87ac3359a299c1d259a79cc51063b9d957bb3 SHA512 f02c2d33ec3e79a4efd0b4ed9172935b092c9f827eb6810ed354328c34b5206ee4ffd646239ce50b9401cab1758f1a746113e004461b20df4f44bc7fa6bc2278
 DIST libdvdread-6.1.2.tar.bz2 391536 BLAKE2B 870f8c2bba7f1a1c0f6a010c0a75517b488a466186f76f752c67e16f87b55d8fc9450aeaa69d044b42b6a26a2fc51297290be301f5a449b4b8269f6c812f35cd SHA512 5cbee11ec701b7625d71184fd712de48a129f235b08797b499d0f5b06a1c73bfec1d0e52e897585017ab63b1d81b042257eab5ab1f19fb340b05b3e8d794f86c
-EBUILD libdvdread-6.1.1.ebuild 1152 BLAKE2B 6231fdf23f33d7138d9c7b3f7c256989476cd6856f5a678cce8d9651a9575ad44cd9b592545e58dc5b8c9423dd114a44e4c19b853a028df7e23488c536c8e897 SHA512 6417d7e0c59cac471a53a1963b4aa698c1817dd59c4e67a0c6e81e62c36e2486e486e735cc882f6bd7840fa8246b4498cf06c1e1e9534241d846d27df9ddf1ac
 EBUILD libdvdread-6.1.2.ebuild 1159 BLAKE2B e261dc67a127951b589f73db2b4c6f929b3729a120e4f1f3b94d21c4e5251fd39f624acf968ed8b70b1b02443017bebdd08fc0b41814f79e1d8df35e1b86e697 SHA512 6c47b5d9ca1fe9727a6829605d5c284f425df1c5f51bdcc35cf8658972a596f1785317cdd9b20c18b34c0b9005c0a7bb39910385540d83b045c2bf83cf0ae596
 EBUILD libdvdread-9999.ebuild 1159 BLAKE2B c20416ea4b21ca2bea20b563ed49cb9f2a0697b30d21b79576950274d77618ad6ce29d36a33e444af94d5f55e042130e129939abc34979b25b8905b01d991fee SHA512 d63372b5c05eaa80efa1faf8f5f811a35ba1de3bb05d744003c8cb62938fa8cbea7f2a2a4e63ed10ddf3a72545bc2564d59f2dac98fc8b5bf876ad99b414ec7e
 MISC metadata.xml 222 BLAKE2B 96fcf0d83a18e2c1f4611d550e7e2123a06fe8b3b2890cb5757284d8fc7d3bebdf1aeb4f82affbc7c51268749cac9fdcbf43888e3bec0e68e1b6548a3f6eca76 SHA512 c3657a6bf2503e6585ee53453bf0ba26b5eed2e894342087358b5f4306a960db915de61036b6c8dc57cdb7a7f3326d57ff3badf7b3ecefaa99291289a73997de
diff --git a/media-libs/libdvdread/libdvdread-6.1.1.ebuild b/media-libs/libdvdread/libdvdread-6.1.1.ebuild
deleted file mode 100644
index 1ceaffdb4e64..000000000000
--- a/media-libs/libdvdread/libdvdread-6.1.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library for DVD navigation tools"
-HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
-else
-	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/8" # libdvdread.so.VERSION
-IUSE="+css static-libs"
-
-RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS TODO README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_with css libdvdcss)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 27d95b42f1b7..34733dc4e0f2 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
 DIST libepoxy-1.5.10.tar.gz 332078 BLAKE2B d56b45a8fc38901fdb23c50b569a667fce8ca289103a8d7ca19f96a76c75d3c2ff9d6959ed2ed47bd64806add95dafe42dc85dfc5bc60af14b5500b70070e008 SHA512 6786f31c6e2865e68a90eb912900a86bf56fd3df4d78a477356886ac3b6ef52ac887b9c7a77aa027525f868ae9e88b12e5927ba56069c2e115acd631fca3abee
 DIST libepoxy-1.5.9.tar.gz 331982 BLAKE2B 2bac6dae7fa2fcc70c1a5cacb1e6b6d21aaf65a65792d3c60eb0745acc4967092136aad1fbba6009a8c8e9bb1091a5d0a38fca05e63be2b9141d9c7e3042b426 SHA512 2b7c269063dc1c156c1a2a525e27a0a323baaa7fa4ac091536e4cc5fc4c247efe9770d7979dbddb54deb14853008bb6f4d67fddd26d87cbd264eb1e6e65bc5a8
-EBUILD libepoxy-1.5.10.ebuild 1064 BLAKE2B c701d43e518995aa880d1ea01d6a9d2a2f7523d89ed3b2a8c30337e34313acc3dbc534e39abd2cd41635e8d53a3a70a1345bbd02190e59a54985d84165a3ed27 SHA512 64a984a035a3798da1af0d055d131286e6d93be12048d3ea3aa0ee9cb649e49015a9c6ec88781022f65e2db0020ced2bc74e8956255fa895169277912cb0f697
-EBUILD libepoxy-1.5.9-r1.ebuild 1056 BLAKE2B 30d5433e96f453c74dcd1d12da3047c9194eea9658b6914a64f1fee52a73aba5fce5fd2ef67fca87a692849b4122ac2fd83966e578c38951a48a7c4a054a3bd2 SHA512 3b8052007d1670460d3b0abb5f4b9b6ca4bd7aa3440f3a667a33af076213a80a50af2c4573a35acda842fdaf6784a5f72e3f36a162c18b6c865a8012c46d1230
-EBUILD libepoxy-9999.ebuild 1064 BLAKE2B c701d43e518995aa880d1ea01d6a9d2a2f7523d89ed3b2a8c30337e34313acc3dbc534e39abd2cd41635e8d53a3a70a1345bbd02190e59a54985d84165a3ed27 SHA512 64a984a035a3798da1af0d055d131286e6d93be12048d3ea3aa0ee9cb649e49015a9c6ec88781022f65e2db0020ced2bc74e8956255fa895169277912cb0f697
+EBUILD libepoxy-1.5.10.ebuild 1067 BLAKE2B 4d264a225cf22ea07db960c91693906ca46615073b3543a37e78e4972930f002566f6d48adf13f5eb4645e62be33eabf945d70ad9485d82b5027c5641cce1a34 SHA512 11fd739b8f79f6372ee1e7e3253e27ff14951e13924d653e423b1f66fd1e3d048a35b9d2fe185c06f1fe5513eda048358106d2686367f3dbbdc3d815d87e01a3
+EBUILD libepoxy-1.5.9-r1.ebuild 1063 BLAKE2B 1a71ee8959c3e61b63fa1b4ea10f24641559d9ab6a691ee0f238d7a917b5c62e996bd84a0b82bd81532c57a48a8342940512f9693cf404e3c05dd1278239b495 SHA512 31503d253f341f102425516acab418eff73b58975e312a20624659657b85727226e58c7946ce2ce9c74054bb2aa8bb4943b8a9cdf02b9c420755bf495ad138a1
+EBUILD libepoxy-9999.ebuild 1071 BLAKE2B 880dc225465d58b7cd81322253bcc9b04541e2fb48570fd1f0b8d5228c026cc938e602df97b21413360a0f432628f9bc64c2a44959f2a0fd74c3139afe96cf1c SHA512 e9cef595b5fffe659e990b64b323b62cf1fc36f7755ce7774aa813122f3ad86512cbd1c75eb871424233fa84cef320c9791bd1a3574e556e9c9bafea265472f3
 MISC metadata.xml 376 BLAKE2B 980a035e0ac8a5a3126ee27c032e8f14353ca5e7f2920769b74a23aa827a1110ff8f55a49a1f3072889ea1fed9f76f39bb3c2fddc6f6e2e736773c961ea4be3b SHA512 d1b9e9349929118e39201157b34e7955b32301ceaea877025fdf929d1039af536618eec5a9b0c638622c390201cd4d3106d981f884cf0c1c6469534fa65797af
diff --git a/media-libs/libepoxy/libepoxy-1.5.10.ebuild b/media-libs/libepoxy/libepoxy-1.5.10.ebuild
index e6be2aed6eca..2f254719a4f5 100644
--- a/media-libs/libepoxy/libepoxy-1.5.10.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.10.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
index 653d6c7f0851..486240d79bdb 100644
--- a/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index e6be2aed6eca..9af6e42c5e71 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index b4b34698e089..b3e3f8e8e4b3 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,6 +1,4 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
-DIST libexif-0.6.23.tar.gz 2764684 BLAKE2B 517eaadc71b6ccaa7899b89b770a14fc051f365c728d5518fe6f0c05aa14690eaa6a33323c9305d02398df6ba2fceb806537202224a3c00018f7bcf835a3ff84 SHA512 c382b5f36e4fc1501664e3bad18553abb1b18f752f93111af5081e996bcc37b425ac9f0b0e1ffd7145270254ac44a4adb7875d5b0d8379113da6162b17442e23
 DIST libexif-0.6.24.tar.bz2 1992163 BLAKE2B 75d3a2b4fefd7b7706226e70d31250ef7e99eeb81a4839ddc36cc9e3180534542d8a02851f8e6fd5034bbc925a616ead8c4bfb0cce8bc5886c3ec54811914a6b SHA512 35c9e7af2c3d44a638dc6bbe8f96962d41c0f3fe4a257494f7a73baefab9aba507477175289ccf9002a66cc16ca53d5d1f44d6fef9e014b27f687ecdc58f5111
-EBUILD libexif-0.6.23.ebuild 1259 BLAKE2B 37fbb51a58132fd41e93dd1bb739027b333c685fbf359936d706a4835a682f289238905fda934e3d92ac966ae4e997c7a5e179fc8e3fde1fd03163824e309d4e SHA512 06aba07cca26cbe47f175ca566004972cb6de84b4396bd74c37858351057d8bb4421f094e9d664981740873234d4a7d3bfd97bcbd6201bb166b14ff12ee53c40
 EBUILD libexif-0.6.24.ebuild 1221 BLAKE2B 401acaf75dcadb4d84fcb67d3f93594ce1f4319c659ccbe2336fb801795acfb694035a39dd59c3e89a690f6d77cf4a33c1a8304868a5d8dd6c3c0ec78e647468 SHA512 1c8b91de1488327b2146e7b977d3c56655aa348bf8ce0ee2cf95fe2a16f92903f7052de1bbf1108f1925b1802134be92dcebfdde1253cb772848460c59d330c2
 MISC metadata.xml 453 BLAKE2B a6539b21b1ea55bbd09ab7385ae771673a802a3dcc41d637fae7ad50f2f67aecc2c253cc77c86d80df83649972d8619f9e18e8b9d7c6259ecc1326617be8ffff SHA512 44b76d19654a28cfaedbd9627d9556554846ce48f142cdfd67753f395547cb3717772cdef6935a641354a5621c560a0b7d276dac4ab62d467d42946a8327e0cc
diff --git a/media-libs/libexif/libexif-0.6.23.ebuild b/media-libs/libexif/libexif-0.6.23.ebuild
deleted file mode 100644
index c195ebb72b5f..000000000000
--- a/media-libs/libexif/libexif-0.6.23.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="https://libexif.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '/FLAGS=/s:-g::' configure.ac || die #390249
-	# Previously elibtoolize for BSD
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable doc docs) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
-}
diff --git a/media-libs/libfreeaptx/Manifest b/media-libs/libfreeaptx/Manifest
index 628481c0faca..b7b0801311ec 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-r1.ebuild 1171 BLAKE2B 22e52588a9cd332920862f5195f66b5787439e5b044d056505607d98d11146b41a7d559082f0cd8e763d3f695a7f5517d7b81eaac2065808da7fae92a951be78 SHA512 2c8a6a215dcc2fb60b38541201e8b5ad8e1494d45858e9afe8de43678abe561ab43fa305c35586ac555c0866f1ee5ed5b1897b8ac4afa7c31381433ee834cf9a
+EBUILD libfreeaptx-0.1.1-r1.ebuild 1170 BLAKE2B 90f0df99db3f4ac4e80feb06a12632bbbcb3549975381759cbea452f19e9288c27c46e1369220cd318bb8c638804963baabdb3bd0eb90b3992e066003046a513 SHA512 f548667534c0fd62ac68b1773f2da1e75ea345184e38923eb0d34d317c4d1946412b68bcb172ac419b645dc0b16c865b8295d229e99c6e6ff91d6d235f020908
 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-r1.ebuild b/media-libs/libfreeaptx/libfreeaptx-0.1.1-r1.ebuild
index 349cf9fa588b..6df92202b98a 100644
--- a/media-libs/libfreeaptx/libfreeaptx-0.1.1-r1.ebuild
+++ b/media-libs/libfreeaptx/libfreeaptx-0.1.1-r1.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 arm64 ppc ~ppc64 ~riscv x86"
+	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 53d96e671121..ae951cb3e42d 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,4 @@
 DIST libglvnd-1.4.0.tar.bz2 563441 BLAKE2B 079b37571da7f1eb3cf8f87ea727aeec04a27158f015889552787ff269cc779f33c10a426a7113d4e45b13008b6540c2a2eec2ac69cb1cb5c551ac82e11475e5 SHA512 a887044b6b3b8bb2dae74f28a9b92ffa0ab7b65adc74d788e28c292b99ed618f93deb1ddc041b9a9460cf46eba5f63a4ba1c20f120dea868659a022428689287
-EBUILD libglvnd-1.4.0.ebuild 1424 BLAKE2B 50a8c3a6a5541a1794a783c81ce0c446dd50e0c7927bc40498199c29fc931adf36e39d895cc81e5d0c0a195f11c380484655a014fe2ed5653e1ee411b2ae7100 SHA512 6116bd1538f71ff9a6ddaf500b668508129a5cbd679da2110dfd37568f5404ffa37fcb9c7a1207ff20c5364427dcaaf5e7dab7ec4d1bf1473073301d2da7d129
-EBUILD libglvnd-9999.ebuild 1426 BLAKE2B 3ea571c65e40145ea193dcd978cee912e367b82ff84f27861e82ca1cb5ef073f2c6326975bea77ac344751173f1a48f8f2d8460041e0e4370de5929a728ca1c5 SHA512 c8af8a78d63eb8f65c96b5a4e031a5667eb5272ced4ab3837f17a3d5d9253bef2810cb499bd24f94c084a284fafceaeaa34ec17314a2b27831c7f4af1553a5e4
+EBUILD libglvnd-1.4.0.ebuild 1437 BLAKE2B 772798de493e8afbb5b97b12aa776d86a100efafab9a4f944cad088d689f7cb262caf5074e625432377e2c1cea1f949634798e310e95eac9e22de14ab5e5628e SHA512 141e6413f34ce6febcee77a086cf137400a21f5b71465a6e97477e14fb8029d05bb6803d7b231f581664962bda92d548611bebfad9d4659ac15774e15c76d603
+EBUILD libglvnd-9999.ebuild 1433 BLAKE2B 7aaac93d01e92dace9000a9fb3891ccb3a915678ae45fbc957315c4e6cb7d918f60a0824fb9c92d0b16ea4701d91acf2367dd5bb3e57c91f1fcc18bebacb55b8 SHA512 13ff33f4a1916762714c29ac7bcbac8518fd335467825c049fb0c1bd1e11d09d8b02016cf616871a6c2dcbf7a813e068e777e22f12313d1f5f648e84b6d2c496
 MISC metadata.xml 315 BLAKE2B 138fe0ad285ae16426c77740c19a0740a9b882a421fd6a0dc39489ce5bfcd21254e3de2fcd315386e4cf10f6caff39ccfa4c3df0491ed4165d5a6a768e5f454c SHA512 958019318d542e273a11b6ab57d4dad10b375f85bda613279ddb2b5cc834c1a023b1f1b3d14e9450d5b48ee579506a8a904ecc540276138c1d5350a27d34e14a
diff --git a/media-libs/libglvnd/libglvnd-1.4.0.ebuild b/media-libs/libglvnd/libglvnd-1.4.0.ebuild
index e423bc734b47..63e4908d53c2 100644
--- a/media-libs/libglvnd/libglvnd-1.4.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.4.0.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 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 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/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index f6b7cee43834..d91a97d0eb74 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2021 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~loong ~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/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 192e8d8f7b11..6f63c6abe3b2 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -1,3 +1,3 @@
-DIST libid3tag-0.16.1.tar.gz 98074 BLAKE2B f7acbe4117ef54e5d1705289af3b31ded7e87a7d2ba6e19a02863a391ce4fffee9110011cae42568d7ccbe256f899d7868182f02ed0b662d46f3f78e14c1eb43 SHA512 621cbdf7a0ea5cdca6a9133c88fb07ff0c519ed73bc26a535de3928f4784b912bb44315b45362600d53cd03083b66f38d674d1880ca30e5f6c342321977a6eb2
-EBUILD libid3tag-0.16.1-r1.ebuild 585 BLAKE2B 5b1597559102c771052c6d99474c94c9bd08105bf9e9137ad02b5dee64c494c9788255e7d8e1367425bc181c13e0eb5f39ede4da981de9451a2b5f595a2d3866 SHA512 c6fccb72d59c70567151dc9dcfc162ee19675c385a7c0176528cb880a4065bfb5d9536320a081268a3b765ac370446121a3577c9594303ef0098af557ccbc236
+DIST libid3tag-0.16.2.tar.gz 53065 BLAKE2B b83a23340c34e23b831b9fee7f28d84ead7ce7b90a789596e22cd252cec67ecb5341e0b750febec96ef0c8f41d78b1028ba93880fcc4bbdb19bae7d3faaa1698 SHA512 93fae5d42ce9dacaa9927692ce9b8447d11c696c07fb74e2966b26be46d57f087e7b64cae8f3321fd9a83a213814fae7df39796f6e6dc1f2e2fdc6165e085b71
+EBUILD libid3tag-0.16.2.ebuild 585 BLAKE2B 2e0661ab6d3289fd50fa56aa58253cff7b5eaa7e4a235d4c454f5ba78205775c51c6f1d90efec9943cb5ef7e9487b0754d5a7358d151b58a45a70def1f7b5bdb SHA512 0e805b8d5fe94c4c1c0ed3babf9dde1998f577365fdc0f793185782fce3cf060bd3caecd210f8ac1473b73008a07f1fd51cfeb0c21952daae42c4cb1eb187281
 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.2.ebuild
index 3c41650c2211..73dffcd28726 100644
--- a/media-libs/libid3tag/libid3tag-0.16.1-r1.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index cabbb42c8453..7dd11da5413e 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,9 +1,7 @@
 AUX libjpeg-turbo-2.1.1-arm64-relro.patch 679 BLAKE2B f6ea6f311cc05ff960d76cdc49afc1d14bf4d638052d1f6007defe239757002ecad18823d706a2e5f5e51245a2447c237c97daf0862e2e1889c751b52f3890b7 SHA512 56ef2f905fe54921618a0c4f79de67cf74070d1ee595d3b4b41f19b33e23701d8045b250b28b8c53b1bd8911f4179dd3b1594a5e85ac9dbce8c869feef1ad124
 DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673
-DIST libjpeg-turbo-2.1.2.tar.gz 2257645 BLAKE2B ae8b7db9fd634b3b29a916098e2b54a8e045cb7a9d883de1f2e8a34542154a724e5d7788fb4b4d816c36d6503fc2a7427165dc3af9d47c77bfb7c51a42bc1d51 SHA512 f0377b58d00310b2e644da31f807ac6c3425823f362ea88bcbed32991dddbea4e7a478676a7c1c4874a34bc578f262bf1d32c925e2f14fa517a50fd911ba8dd5
 DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c SHA512 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3248 BLAKE2B a2b9fcc4939e064ebb0f73875ce3a4cfa5e3233c0c8125905f66f8f76320fda29cd4ad4c0c08b66844dc7f36e9bce696ece323798c897c7e03243a8982e9117e SHA512 aa15cb2b8f08cd54d590a8ac76d3eb8b512ad8c62235a239cf36fda55f818a71462834b7e3579f4becc8269e2b3bccdbd6f6f809305fb2f6578587e03338a416
-EBUILD libjpeg-turbo-2.1.2-r1.ebuild 2898 BLAKE2B 0dfb36277ffab99dd91be4b5861ee7f2f09ebfbfdf0e296ed55d6b45d65a05a43bc521a335dafbaeb851c945745974dd5c158fd7731453714658d943353f9f93 SHA512 f70c4d19f544e834369c2087d178b40acef209455ee025f41e78bf47feedd0c99e7f88c4b4689ba70fbefbcc2c083547db151b002e8f71e8474abbba6528ff51
-EBUILD libjpeg-turbo-2.1.3.ebuild 2928 BLAKE2B 37dad1918b06c2953612b3a81a569c9df80728b4c1ecb56cfdd7316ea5e01695ec6e7ad1b9f5b2fcd2dc511313b2a4945f3ba33f3073eb048bcb3b10d913e43a SHA512 34a80fd44958235f3ffc2c919479a3fc24c075c47e5a09c1d895c632b3341f07a81cc6eb34c18b7709662cb1db4066932454b5cedef3171ccc18a1c2fbad5fc8
+EBUILD libjpeg-turbo-2.1.3.ebuild 3187 BLAKE2B 623a11d7914d3dc4b27f27e9e0ed9076f6cb8f7b02c4d9d919e7241580f308f5811087708da4ddf3face0192fd8275293ff5dafa8c594be6574b425b823be020 SHA512 671ae874b977ca8414c300cc9ad393c6764247783dac6874804586ba31c2f991600ec1516422fea4ce095bfaa07721883f52aefcb7d5c7db4162126ae8a51f0d
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild
deleted file mode 100644
index aaa564414263..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG ZLIB"
-SLOT="0/0.2"
-if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="cpu_flags_arm_neon java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-
-COMMON_DEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-
-BDEPEND=">=dev-util/cmake-3.16.5
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:*[-headless-awt] )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
-	local FILE
-	ln -snf ../debian/extra/*.c . || die
-
-	for FILE in ../debian/extra/*.c; do
-		FILE=${FILE##*/}
-		cat >> CMakeLists.txt <<EOF || die
-add_executable(${FILE%.c} ${FILE})
-install(TARGETS ${FILE%.c})
-EOF
-	done
-
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && use java ; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DWITH_JAVA="$(multilib_native_usex java)"
-		-DWITH_MEM_SRCDST=ON
-	)
-
-	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810
-	if use arm; then
-		mycmakeargs+=(
-			-DWITH_SIMD:BOOL=$(usex cpu_flags_arm_neon ON OFF)
-		)
-	fi
-
-	# mostly for Prefix, ensure that we use our yasm if installed and
-	# not pick up host-provided nasm
-	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
-		mycmakeargs+=(
-			-DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	if multilib_is_native_abi && use java ; then
-		rm -rf "${ED}"/usr/classes || die
-		java-pkg_dojar java/turbojpeg.jar
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	local -a DOCS=( README.md ChangeLog.md )
-	einstalldocs
-
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-	dobin "${WORKDIR}"/debian/extra/exifautotran
-	doman "${WORKDIR}"/debian/extra/*.[0-9]*
-
-	docinto html
-	dodoc -r "${S}"/doc/html/.
-
-	if use java; then
-		docinto html/java
-		dodoc -r "${S}"/java/doc/.
-		newdoc "${S}"/java/README README.java
-	fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
index 19d0c5004701..303151384efd 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
@@ -13,7 +13,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 ~loong ~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"
 
@@ -75,6 +75,15 @@ multilib_src_configure() {
 		)
 	fi
 
+	# We should tell the test suite which floating-point flavor we are
+	# expecting: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/597
+	# For now, mark loong as fp-contract.
+	if use loong; then
+		mycmakeargs+=(
+			-DFLOATTEST=fp-contract
+		)
+	fi
+
 	# mostly for Prefix, ensure that we use our yasm if installed and
 	# not pick up host-provided nasm
 	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 73942bfa3965..a70176e92bfe 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -2,6 +2,6 @@ AUX libjxl-0.7.0-atomic.patch 4461 BLAKE2B e2c1edf952ba13d2ffb55c1e1122a4ed8ae69
 DIST libjxl-0.7.0_pre20220311.tar.gz 17322724 BLAKE2B a3cf970ea3db67e0890e94a5c74ea66610d4fed608fa3d079e6934a1d5f2bdc3ef4264c1df85e4b4efcd22c060087c712009f6c4a6b69a41f6e96ff3674c6de5 SHA512 f3e46ddea462b31de6df3c615c3cd628adc58c7ff41588e2ec4cc8929590c9272603a66ed4620b9ba550d85b3d1a6da3f51b1c4f8650ef8901347fea8af5d474
 DIST libjxl-0.7.0_pre20220329.tar.gz 21282311 BLAKE2B 8ced9811adba47e5ccac4d55cb7133a863bedceebeb51e649fa79ecb17b785e747532f1f36fd39e3627d0a29406f5f403dee8fa42a9958c713c1296c2f83260a SHA512 deb17dd2eb3e2c39d624d97c6959940aee5beafcb009f6cb2ac14dd83c73d2601df8c81f6cec5d8032d9e66d1fdabfe620dcbf9bfa5e90eb9978265896816242
 EBUILD libjxl-0.7.0_pre20220311.ebuild 2131 BLAKE2B 9292dbc20406ba9544c66d5658b1d782d7b601b29f87b585426adc400fd1dad883003ce730f7db96b75fe8715c48ca7160492155e7088929b050c58367c97b63 SHA512 c625e4a3151f68986c3632b27f2c730084756b293e6a4d50c17d192c445ce925a37ad88da18dbcca4c684f53e504880768ee3def4cceca14dbf870f0aa1f9e7c
-EBUILD libjxl-0.7.0_pre20220329.ebuild 1973 BLAKE2B 0bd9bdf88b23e9e511f1e9cfb1608b160e1c441806cbdedcf2809eb65aa7e3578172986b6bffa5397d32baa8a53f57e22677beacc3f64f097a8ec68606d63a15 SHA512 581844e5aeee26cdd1a670c45a1f3fcc4416428382577458f7f72afae24149184fa51ac3369c83e33933d4c9c7887bedb58f2f1b05d13822b5b04167ed07eacb
-EBUILD libjxl-9999.ebuild 2024 BLAKE2B 73aabbd86aa96d03d516a3699f069d9d3a625d84aae2e76683230b6a4dce99f3e68ec4661e3ed74c9b466001289a0ba789527c926c08feb8a1704412b73ed761 SHA512 7fa2de19a8876d6f567f8e1c12411a7b9349cd7938fe200f9eeb966bd3f8f76c7fddc70dde65d2279e72306a584f12f12eede1a45cfa3e92fbfb84978b1dde7b
-MISC metadata.xml 736 BLAKE2B b4c49d06f4888fe4714add21be0d8c8b0e5961a03307165384692a07dda463cc0438dfe5a99a878555e5d15f0ad56fe4c66c4dd39c90603147150b4d9d3e088b SHA512 feb1910542331c2c3e8769e172081d59c20bfa082cb353787cb718dbd562114210e5da38c5dd87bba9f11ee5756f426c71b835cd178c5d2bd7bfd661cbeb10ce
+EBUILD libjxl-0.7.0_pre20220329.ebuild 1970 BLAKE2B e6f15860545873a4c47a62ba249338ebc50cf8a51ff7e1bf7ab25b8cf71d9224d74e4e33d8754099f7146978ded5416fea71b7eaa785aa1628c248098e523606 SHA512 aac2677f9a25fc42ee474ef130a7c5bacb439c1c609cbb0dd5df8538d0dec451514142c5093de0a2a1f9cb85eaf3515bc1998c1edb9a745f8cf43dfdec570d86
+EBUILD libjxl-9999.ebuild 1838 BLAKE2B 4683772cc20a5fe8d62df7bc0e438495976068f2cd5442a4ed680daed5310db6acac73c778856acf9fb1c411c7754ac243e6dfe09df2710da55b0f8a3979edc5 SHA512 8a181ccc8442a4263f2907c49d7ad32f652dc930e9fb55e966d029f43cb4948fc219071615c9ba6a5d81f397372495a30640af7ee8e7141fc19893dccc715a0e
+MISC metadata.xml 737 BLAKE2B c6d720ad6e51168ebab6cc33b8c3af44149f19a8331f1b834fcf4e33f9b90050fae96bdd03202a83960ec7d01d9427e6eaf0be51d47efa736533b8bb5affaac5 SHA512 6b461b43818da3626a59c7d040c7f3cf470624b6205001445a0ede4ceffa4f1ad6233ea85cf3616dd4bfd7cbbd50ce28e0f509e13ec06b64ba4b724e2a90d602
diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild b/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
index 5407dd894d8b..8b0cf58831f0 100644
--- a/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
+++ b/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
 
 SRC_URI="https://api.github.com/repos/libjxl/libjxl/tarball/fde214c5f4dc5ffd0360401a68df33182edf9226 -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 0dcf64fe11d8..87e4061707c8 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -13,7 +13,7 @@ EGIT_SUBMODULES=(third_party/skcms)
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples gdk-pixbuf gimp210 openexr"
+IUSE="gdk-pixbuf gimp210 openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
@@ -50,12 +50,12 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_MANPAGES=OFF
 		-DJPEGXL_ENABLE_JNI=OFF
 		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
 	)
 
 	if multilib_is_native_abi; then
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=ON
-			-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
 			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
 			-DJPEGXL_ENABLE_PLUGINS=ON
 			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
@@ -65,7 +65,6 @@ multilib_src_configure() {
 	else
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=OFF
-			-DJPEGXL_ENABLE_EXAMPLES=OFF
 			-DJPEGXL_ENABLE_OPENEXR=OFF
 			-DJPEGXL_ENABLE_PLUGINS=OFF
 		)
@@ -73,10 +72,3 @@ multilib_src_configure() {
 
 	cmake_src_configure
 }
-
-multilib_src_install() {
-	cmake_src_install
-	if use examples && multilib_is_native_abi; then
-		dobin "${BUILD_DIR}/jxlinfo"
-	fi
-}
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index fe211671a1a3..f39fa860738c 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person" proxied="yes">
     <email>dnovomesky@gmail.com</email>
diff --git a/media-libs/libkeyfinder/Manifest b/media-libs/libkeyfinder/Manifest
index e996d4819869..4e0ff673905a 100644
--- a/media-libs/libkeyfinder/Manifest
+++ b/media-libs/libkeyfinder/Manifest
@@ -1,3 +1,3 @@
 DIST libkeyfinder-2.2.6.tar.gz 79371 BLAKE2B dbc1b531098686169cf358a631ce2dfd8d053df93cbcc31b4fd1320ee01f84e60f0b4e290d57b31f0ba09b7d81430574b98dbc4a181953119a732f019c437f48 SHA512 c1b771cebfb925db521a344e28fd1d3bc6e6e921e45dcc81f90926e5b2020fea201a4bc05a65177d3559208a45746fd7784eb6f37352bb10ab7d7b820b40c0b6
-EBUILD libkeyfinder-2.2.6.ebuild 632 BLAKE2B 47da5f4d0e30c7079f2a272069b34f09b257be64601e95d73d2d5d3dab3b509e43b592198d7173b7ac1f4c2eb329945274f397e7b7a40922e2209e5617e0d99c SHA512 0ac33a037a00e4834bd0d828b095a47d3df68c18225651e2862a3e0fbe705f0842afe4c6cedd22f0ffd735a39a49dc0ea6570f775c20efa9276445f060a6e94b
+EBUILD libkeyfinder-2.2.6.ebuild 631 BLAKE2B f9be84792bee989c2044c083898002f29c5f5bd226112922d2abd15650872745b331e6e6ef8b403929a3d8618d041422e768be8fc32d68a7f0adbe2190d3c854 SHA512 c29a983e817e32f18b31a703f2463b8c489f1b8e634a134a4cce5bf29515345476e982bb635d704c46a04637fda9c87b4da0b65821217c2c3443caf06b828495
 MISC metadata.xml 260 BLAKE2B 67e6833093739454709d11437f08f56992d87b35e1f70405c5667ce6f35164e50891bd5a590f67a234c7a6bcfaa53bbd3b0034324a70aaabf1dfbdac16c20681 SHA512 ec587e23153929573978a938c94e2e87519f5e08fba1e07d0aedfa782f6ce09480299149ad874c04f7f5acf21c1ca8275efcb2a3589d16842041ce1c11cb63ab
diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.6.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.6.ebuild
index 453059773918..b9af9a83940c 100644
--- a/media-libs/libkeyfinder/libkeyfinder-2.2.6.ebuild
+++ b/media-libs/libkeyfinder/libkeyfinder-2.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mixxxdj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 8f6d6cc2928f..3a3aaf3bac4d 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,5 +1,3 @@
-DIST libmatroska-1.6.2.tar.xz 65460 BLAKE2B f746f0dd519b8e3b4f98057d3f83e23a79595ab95e71f0c45c1128b2cbe093d5955a38d9d0565be9336f3d53279e20bddf0a2b4a54378c78faf4ee8f94586686 SHA512 c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1
 DIST libmatroska-1.6.3.tar.xz 65612 BLAKE2B b72553ba32358b996b98fb1b4a3d05b4026c95406c31312d43cf7ad875192683de05d8813e5f0bed04502543c80b83524b02c7caeb860f79860760d926b92754 SHA512 271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41
-EBUILD libmatroska-1.6.2.ebuild 629 BLAKE2B ac32392e700a32fad8bf0c12f43a6a784d77590370a94286b76dfbab95636c2db91d3919eda79c5a3f862d3f0c9a39518ec80d927d1b4d83b488c31b7ed42788 SHA512 250be02d4b44d04d462f336cc5f0850ac3d7464ea89ea3c4f413d44ea8a0458f7eedd54dd88dd33616094397a59d4243f90badabdf2a5220029226031a0c602a
 EBUILD libmatroska-1.6.3.ebuild 628 BLAKE2B c26a6f32eda428d34c3eca51cdd4d1c7cd69190306305725e9e15be7da5a048696ff84e1ea3804752da9d09fece8c68ebba55239e6d904e8095f28c7ee62a2a5 SHA512 ed358879e9a78200ed609e07fd37ac000b22b98af5cd3025fdafce7946257ae72edce5fb0a093f51cdd4317be338484187e3cb289f0f53eafd91fe85f09910b2
 MISC metadata.xml 321 BLAKE2B 15cf5ad5472b1ec2e1d6b26276d5103cb58b546c079ab14ec45003d5ed7112b6027439e7f6bd26f531acde56ac0568205f250f2c3dd2c001c7ea0ff771a25727 SHA512 35eb2dfeb5d238dd2831030be9498fa7e21999b0b00fa67a834c051995d81b269b4495f4666d1f0b4f73b6deefd756a2445826dbb9bc81447cf61dd031e190dc
diff --git a/media-libs/libmatroska/libmatroska-1.6.2.ebuild b/media-libs/libmatroska/libmatroska-1.6.2.ebuild
deleted file mode 100644
index 674a1f0ac019..000000000000
--- a/media-libs/libmatroska/libmatroska-1.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Extensible multimedia container format based on EBML"
-HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
-SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/7" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/libebml-1.4.0:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_SHARED_LIBS=YES )
-	cmake_src_configure
-}
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 65cb5c3e6769..36355d021d95 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -2,6 +2,8 @@ AUX libmediainfo-20.09-pkgconfig.patch 229 BLAKE2B 98a35093f464be14204ab1f722eb6
 AUX libmediainfo-21.09-link-fix.patch 1209 BLAKE2B d9e6662f594cca7166f01334e431bab0ceb51055d021ee918a3d63648fbd72fd01e9a2f192b77e57d99a36f16e60193d944d0d9e5c3f0f881441d6e774520ba4 SHA512 123362d1f8db82cb4954091c3929b488d808e150fc022ad05bb86517fa53ec1fd8e05d505d7376960f21f60c7aa1768c5eb690349cae391dd8a0a76cda041d5a
 DIST libmediainfo_20.09.tar.xz 1827744 BLAKE2B 4073da6b85a2871e815a3a374933bae614c25899f8ad77174f63b2055d2220f8b5b785a765f85583289398ce9ade7c014da4d19303b6ed5224e13ffcc2952fdb SHA512 dce5b787866984fd0fefdcb739851212d5a145b657a557fd41c19c7548d32449a3b07d7759bf9a790c5ddebdc9537a0b9f0d5c58b8b2fbb152e456386897a354
 DIST libmediainfo_21.09.tar.xz 1850688 BLAKE2B ac6b32a23a82f0c5f0901ef9b6a22b850a59efab80952fcc7cbcbd28951a43d0abb7065ca19adde4715e06f1798ac2992e3f3e82c16c9cf152ff95c42f15b27d SHA512 a0b5ea9c6fce3f5551176d411b8c227927f579c3f09442316f6c380926acc545ea346e044f808b66403b1f0aac6f88ed4413c8231e792256d3cd7676133ef3be
+DIST libmediainfo_22.03.tar.xz 1871232 BLAKE2B 1dd1a1a04adf98dbb3c28cc6fb43e393a4fd32fbc42d110e61d8a72ec8c5603570629e4a756606ccb548873b450944e642b9422f8b00703c91c2832c635e3bd9 SHA512 cae1df09f38e60363ef3c1d0f7324301b701f21c3fde84318f6389f91311b706037699fe83448f8e5b4d1f8af81ddf357b1630fe5f03aeccfa90fe0f9ae86477
 EBUILD libmediainfo-20.09-r1.ebuild 1795 BLAKE2B ebc2af15dffb2639a0074e57e0f0c822e7931fa85170412b919dd5ba36924cb971a1c337e80402eb97766537a1d2c389c22ef0e9ec4c9be7693af377c65afe68 SHA512 2df425e3944cd74d61f4eaa0b0e189ff58b78595052472fdac0532c73b736563f96dd551cbfbea07b2b26376bcd104c6309dbef9427d3cd961665152cae9ac75
-EBUILD libmediainfo-21.09.ebuild 1834 BLAKE2B 5e05537b31d6a3b62c18096495c16daa94576e73b5eca52e9fd2086de5c97570e48c37c47f74d15cdd3778f0634b71d58d41f9a5b05dda35cc3836e6a87af1c0 SHA512 aeeb6b3bb76a069b8456c634fc67f298a36cc8e658291a6ac6c9cb2708e1c6bad8a0fd449f52a630db77b30784911fd668f1071172e75b64939d749e44bbf600
+EBUILD libmediainfo-21.09.ebuild 1832 BLAKE2B 2a3344ff28752d49dcff446590ee9cbb947f6dd5ec50eeb30b80cb3cd57c802ab929830423c91c246e9312e6308941a94a02f48f84af00d63f5a2ed877fba240 SHA512 338167801c0ceb7fb1afa9378391a04c443c91fc660ce5f1c4da9940c5d0abd0f97cac4cc5431d16ea424c63ca5877c0b28cf08cfa0b4197913c707e8e49adaf
+EBUILD libmediainfo-22.03.ebuild 1786 BLAKE2B ab1d79333fda2734c51da1122f54d16c186d3a9ef2521b0ff75e14547d64d88a1e50e992b22029f4fd4ed7f7a25c1b258de89061001ffc788a721219155c99c8 SHA512 1d98af32551307d4b9241ed721ff2272dcd3749e42d5e1a0dbde8b05b865c6fc38ceddb7a88c9d298deb3e787eac432045a13fed1b76dc35599ea2a2027f8af3
 MISC metadata.xml 347 BLAKE2B 66f84361f792efe1817c3427292038fd8dc244aea4263c2e2b571b7c5adfc9bd3fd4801cfc3154512a1892590f91c8248f603273d3e1c8d241285a7d863871fb SHA512 b33309009eb8ce3104f5995a4baf050ffe93d53e5a9e422e58abdfbc5c3c4c32406b126b9e1d0421656a73ed42ee662a1b5cec052f73e85ce16d4d278669b607
diff --git a/media-libs/libmediainfo/libmediainfo-21.09.ebuild b/media-libs/libmediainfo/libmediainfo-21.09.ebuild
index d3f8394fc420..2ab091dabee5 100644
--- a/media-libs/libmediainfo/libmediainfo-21.09.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-21.09.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_PN}Lib/Project/GNU/Library
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl doc mms"
 
 # Tests try to fetch data from online sources
diff --git a/media-libs/libmediainfo/libmediainfo-22.03.ebuild b/media-libs/libmediainfo/libmediainfo-22.03.ebuild
new file mode 100644
index 000000000000..86f328565ea3
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-22.03.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with media-video/mediainfo!
+
+MY_PN="MediaInfo"
+inherit autotools edos2unix flag-o-matic
+
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${MY_PN}Lib/Project/GNU/Library
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms"
+
+# Tests try to fetch data from online sources
+RESTRICT="test"
+
+RDEPEND="dev-libs/tinyxml2:=
+	>=media-libs/libzen-0.4.37
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+
+	sed -i 's:-O2::' configure.ac || die
+
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static \
+		--disable-staticlibs \
+		--with-libtinyxml2 \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc || die
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
+	fi
+
+	default
+
+	edos2unix ${PN}.pc #414545
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 47cfcea44dc9..f05a7ec59fab 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,4 +1,4 @@
 AUX libogg-1.3.4-libdir-m4.patch 409 BLAKE2B 68ff8990afa20d42cd527ef9b46ddf0861f167648bba14661e00fc453d8b9df33e4feb94050c13d33bd6da38e68b44e0e179e4c7049582765b3d1e4b3bbf8c84 SHA512 f285cea745d8eb5c2f3356b007b9bd686a9a0331e1a0c96f85da48b258e6544de0c3cf8ba9cd8f0caaf7c0cccc9ea033162c7b4e9fa18c93463bc43d176e8316
 DIST libogg-1.3.5.tar.xz 429076 BLAKE2B 464cf767902bd8bd463d3faaae01fecbe33d4cc87dabf38388ac961bfbe24e6d113f4ee88542e6bed6fd7eaaf0709c7f5cb7a306ee910527f79810054ccdbae7 SHA512 5d1cbc2a3a1fcf5543f5729bd5eb560cfc740c5d17a2492ead137970c45e6203ec1f5de536d77c4b73ece9e3b0046eaa9181c02a09de72ac7ae51b1fca1e1ee7
-EBUILD libogg-1.3.5.ebuild 802 BLAKE2B a674af7a7c801bda9a9205fb5e92f66110783c148b36606ea713f558deabdb50e06b841dee6214ba0fa4795e6c224411eb6a6800183b10f654bdaa05e0cb610d SHA512 ad2e8d3f449ff344d733631d9ca9617a81ae4c892024c505a3ce66dd772926daade72f00c01f2ff1efa90a2ce30e97791a4ee2baf0526cc919362c11b3c069c8
+EBUILD libogg-1.3.5.ebuild 808 BLAKE2B 2267fc909c37c93857b8d4829ae9a3c4b49b3d1e5a535f3f3658f9c2451d795488486d99fd1e233212a4ad3ea042084f23433d050ca15cfd47a4ea759c18ed3c SHA512 ca28401cd90585eadd5fb1915ad0ed81d4431c19d319aa5e09b39751fb689164fe2f9b5313c4eac6ab0225a73e408b04690ee9859e2f43e8957ec2bf7dcd8d11
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/libogg/libogg-1.3.5.ebuild b/media-libs/libogg/libogg-1.3.5.ebuild
index 4bf0577da51c..5791b67decec 100644
--- a/media-libs/libogg/libogg-1.3.5.ebuild
+++ b/media-libs/libogg/libogg-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index 577583738b71..e3bcc7e8f6b3 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,7 +1,7 @@
 DIST libopenmpt-0.5.14+release.autotools.tar.gz 1446898 BLAKE2B ab6ff8db2e19d859fecca882aea3e569b58d96d5055ec0dd42494a7eb38fefa9c8b88f4700d354de71346c71c6d9a96327db1c2b7b48e227928dcba0ce7347d6 SHA512 8897549c18afb57c5bf54f4dd8a1d80983829bca958052d76cda1315ef4a37f4201575817b7cedfe17a44ee79051a52aa35b26a51b554091e92c9d2dcf5924a3
-DIST libopenmpt-0.6.1+release.autotools.tar.gz 1511280 BLAKE2B 222e71f0cc1343ff76c9ffc295664c52db74906b20a9c7cdd7d7e7d05a4795a2cda1d0de265f0e1b2dabc1bfb6757342046117222b5d035f633ae9da7e7d2301 SHA512 b43124746fc7c8bdbcfcf24c5cff1cd8330cab664fd1641ac7a35416ed25bb80c74f31db74085c13f4beb9774c17c12a4486c8c5e976f3fbb70a27c236c0f4fb
 DIST libopenmpt-0.6.2+release.autotools.tar.gz 1514140 BLAKE2B 38e8d24352cce92b38ddf8e1f33af7fb72571b88b8f4cbddff626affe2f00bdb73635872d502417e37c68aa0f2254338088bb493b47c688a22d342b3ba54f725 SHA512 a4bbf804d4be72d11216173371ab81703877071cf15e2daaaf59b0eb892d5948072af00bd1ec8c097c23bb3f77bc2c0be6cf853dcf3c7c24aa6109a9f74d0948
+DIST libopenmpt-0.6.3+release.autotools.tar.gz 1514410 BLAKE2B e61473b3dcb1c88450b72fdd29b7e22f794134ffdf23222a79bf715c6e1c1810e19a5fb48cd6e1536d1f892349cf90cfa34b90e0a67e1c208e993f2db51af082 SHA512 b9f9cce9ef7d87ad8f18d17603b613fd153d5effdf04de566daabe26afa08b84eb0aa089b94fcbf7cb724befd0a3d93ffdaf5b578f2a3afa31f7aa517f39c62f
 EBUILD libopenmpt-0.5.14.ebuild 1544 BLAKE2B ce1beb9e386a70e598f295b4caedab63a9bfb273e4d31a7b78047d68b176dc6b46bf673ca97a395bb30067629785ef9f9117502c3bb0f6a50c25d7045203f51c SHA512 9b834a31821d7fae8e409241b4acf5c298a539c815191cef68219ed6ce6a4edb1cf85f50254c6ea61d17898fbbb0f58ed5c40f4ca35c7cc5965aadadcaa4a5d9
-EBUILD libopenmpt-0.6.1.ebuild 1546 BLAKE2B d286b4a71a7b0717b004a3cd48756cffee5a0d628da54ff12f06a3876562bd5ba4ff8a4986c0f38ab62e242f36f543977860d4d41a55ef8baf149088e05ea2cd SHA512 2039890692c50e32ddc36a5e48be90c125076e9000bce1b16efca2ce83c0531d912c09fd4b9f1bbab99aebf6d42b799b59f055051017c46c8b1274800ac9e512
-EBUILD libopenmpt-0.6.2.ebuild 1546 BLAKE2B d286b4a71a7b0717b004a3cd48756cffee5a0d628da54ff12f06a3876562bd5ba4ff8a4986c0f38ab62e242f36f543977860d4d41a55ef8baf149088e05ea2cd SHA512 2039890692c50e32ddc36a5e48be90c125076e9000bce1b16efca2ce83c0531d912c09fd4b9f1bbab99aebf6d42b799b59f055051017c46c8b1274800ac9e512
+EBUILD libopenmpt-0.6.2.ebuild 1551 BLAKE2B 44c3ffff067a83d111690a20c950d46da2490b344156ada664be7e944637f2afd05951d522cb6308aeeb70bc85bbd37b45041725b44e20777a8093b9c662b0c7 SHA512 7d3d33c13c74d8992409615d41954ec54a9d20bdd3c05724f4282dd0a1e040b4fba6c4ec3000aad411e1cf07483501e771d106030a4f3a26cfc2c0a5c8dec8aa
+EBUILD libopenmpt-0.6.3.ebuild 1551 BLAKE2B 44c3ffff067a83d111690a20c950d46da2490b344156ada664be7e944637f2afd05951d522cb6308aeeb70bc85bbd37b45041725b44e20777a8093b9c662b0c7 SHA512 7d3d33c13c74d8992409615d41954ec54a9d20bdd3c05724f4282dd0a1e040b4fba6c4ec3000aad411e1cf07483501e771d106030a4f3a26cfc2c0a5c8dec8aa
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-libs/libopenmpt/libopenmpt-0.6.2.ebuild b/media-libs/libopenmpt/libopenmpt-0.6.2.ebuild
index 80d66a784a6e..857e12042a27 100644
--- a/media-libs/libopenmpt/libopenmpt-0.6.2.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.6.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
 SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
 IUSE="examples mp3 ogg static-libs test vorbis zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libopenmpt/libopenmpt-0.6.1.ebuild b/media-libs/libopenmpt/libopenmpt-0.6.3.ebuild
index 80d66a784a6e..857e12042a27 100644
--- a/media-libs/libopenmpt/libopenmpt-0.6.1.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.6.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
 SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
 IUSE="examples mp3 ogg static-libs test vorbis zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index ad8ed933f78c..9827a331c661 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,4 +1,4 @@
 DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f
 DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
-EBUILD libpng-1.6.37-r2.ebuild 1351 BLAKE2B 80d8da8c8884ba9fa526d0e9aa4e5bafb252f63741be0a5a19cdbc09aab1379044d44d4fbf5a0841226c4da2565c8fa932c7eb5721f69f40c55cb115e314ebd7 SHA512 662669111df09cff11631d6bd75ee2f73327128779a0d86622d796fc59e2c337b9d49e3ffd4e7be98f678025e68f3240a399fa3fad2b7af743b7c468da9d982d
+EBUILD libpng-1.6.37-r2.ebuild 1358 BLAKE2B 7c3f016cff4e270addcd3e6b5ba5859f9d9733e60dadb309b4d9a3279abba56f4f1b886bfc1433047f3a82f8139fa66b180215d17f97dea40e5d07b072d0b1d1 SHA512 cb2963cafe245a958278824f882dc2657340203f9b1b584a68347f4a0bbbad4e9a7ff6dec0ed9cdefddec61d20da24874ffa6de1f5d2f40fa9d567876cb6a6b2
 MISC metadata.xml 721 BLAKE2B 71c9fe0c479b2f8269f6a56f6905afb196424d51ca2327e85fb29892ad028cd213e89737974895ca7f621dfe42af8ac0d75c0c572139b7ae7130771a2e3f3f0c SHA512 298a3989e7e7a57af032aea71795fb31387442411e14405ea99ae84c664644ede2248c8a54c3dfa64fed8917a3b2d8715fcd3c8b8d1d9f253f61ede18da29523
diff --git a/media-libs/libpng/libpng-1.6.37-r2.ebuild b/media-libs/libpng/libpng-1.6.37-r2.ebuild
index 38d7b6e61955..c3b5ba86bb88 100644
--- a/media-libs/libpng/libpng-1.6.37-r2.ebuild
+++ b/media-libs/libpng/libpng-1.6.37-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 590d76b6f770..355b1ab43bfc 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -1,3 +1,3 @@
 DIST pulseaudio-15.99.1.tar.xz 1546536 BLAKE2B d77b7f9d05c1ffe1490b72dbf58b479962798d6e961d4efc935cbab0a6ad7fcd6ecb99de5efa5b85658b58e59024087cfd446ac4e7eeef1cd38fa7e579b5fb3c SHA512 3eb7cdc9795204513d43336836d12709e78ebb001a97e9bab81969a4981a10df2d68a5fad34aef2660f37b72d269cb01e4c6e76c42a5c5742ac56c0f575778d5
-EBUILD libpulse-15.99.1.ebuild 5549 BLAKE2B 65717b18f084134215884dd2f1580bb5fb242c757a1ad30e75724d517a585600168bf5023e8701a9c0e423b22ecb651e442398d972e25f6849d5e37ccc77adc7 SHA512 300f4e11a6e521ccb9fcad128e0aa17d189aba1367ce48f63c7d805723426ef1ac9aef38e15eeed647133d7df6743c06eb2073fd905209ac43ee9d7611f85272
+EBUILD libpulse-15.99.1-r1.ebuild 5663 BLAKE2B 0e3659148b5adbad94608420a241bb7301923a123f685f7845a4cd4a8ce1d3371ff80d994527a9a388ad22dc749aedd4dce41955853d3c7e3d516866c3631a30 SHA512 6d55dd54be3c00210757323bc57b5a08c3ce1bb2ff469007d2c7bbd78f7fa8b02c052702bfdfe29d56e0a3f9232e35d669113a392139a559613bf29a7f187219
 MISC metadata.xml 622 BLAKE2B 4d143ef69b028fc7668d69fca9cae2b57a2c7e654d415807142098bd1a764e57b335280426d4dccaf2b1a8834bb7f2f18d07148539f0b00266c9851f45881a36 SHA512 efefb947045f47d0e5ddfd8c6a2a575ec2b51165a71b6cba9667e82c86265427d0832cb4f14f0f783e2d1d5261bf453f6730a452a9521b1c88e9989733e1402f
diff --git a/media-libs/libpulse/libpulse-15.99.1.ebuild b/media-libs/libpulse/libpulse-15.99.1-r1.ebuild
index 357eea6b8537..4fc935f42f75 100644
--- a/media-libs/libpulse/libpulse-15.99.1.ebuild
+++ b/media-libs/libpulse/libpulse-15.99.1-r1.ebuild
@@ -77,6 +77,9 @@ PATCHES=(
 src_prepare() {
 	default
 
+	# disable autospawn by client
+	sed -i -e 's:; autospawn = yes:autospawn = no:g' src/pulse/client.conf.in || die
+
 	gnome2_environment_reset
 }
 
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index a31b7caf67b6..a2fc766b04fd 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,4 +1,4 @@
 DIST libsamplerate-0.2.2.tar.xz 3319468 BLAKE2B 71b1e8a1644a94fff019abc6bf98c557df84994293f1e9bc651ad3ad3f0afeb24f54b8c75fc26e5202ae7c3a3e34e783fd1be7f7c6fdefe9eac9a5dfe7100b91 SHA512 d23ae54d23209ba22baae9e5fd178dd8e0e99205dada7e7c3a7b3a3d8cf816ed427a411bfeb008427f64da7767d645edce40811f238af11c8c386f5ef25a9f0c
-EBUILD libsamplerate-0.2.2.ebuild 1267 BLAKE2B 56d1f2a6c2175336b734e14441d1ac98949f6f8af9fc95f5dd89c217f8947589c0b67e06b95f60009217c1526bc358752280e7873593d4d9507256f2beca3e3b SHA512 9872c6a9d58da2c9731ee839a3f37764da145ef478be7edf2088db3b525d2f611dc4a8346e331d40e7f9f48b9c00595091734dab14a7fa8b8a81f5e72c9f6d19
-EBUILD libsamplerate-9999.ebuild 1268 BLAKE2B 87baa5925767b94b377850cb1285d2097073880f46e8954f6c4936acf70e5a7da5285ba6df9a2cc6e6d19617f7db012990d9fda418377d821c4bed53d11b4d78 SHA512 11cf28cd637b9731502f15def1ee77ae7e1f3dc454ef9c7f3fd36c2b8e7f12638e52603605e1064ae36e08ec2f96848369a48cc0b1d552374974a4052462bd62
+EBUILD libsamplerate-0.2.2.ebuild 1261 BLAKE2B 346d8baac770afc8251a84d61463b2ea6e757300b71da13df26335daad6e32b925d7be6fb43889de148d2c1ab605571280d9e68f46abbad59f2242bac1a39803 SHA512 f23eedbf463589005caff7b57d046295f187f6a5ee2b63a4457723b67e06ffb0e8672107e2c9b1be90d2aad5d1c1bd3e6f749e939310b0e7e9ce1ff1811a9f79
+EBUILD libsamplerate-9999.ebuild 1262 BLAKE2B 3e9481973d24f9f3ef7158de891f716a19a491b35923576a0bf6141cf4af5fc3b1330c958c29b4e02fe08e952b98c5ff1266468f1ea94c12a996ad712bfc0d21 SHA512 da4e8640d4383f07f33a8c6db7819473469fc1dae664120ac492f340c2245a97d76cfe10ae920c2333dfcc799d12c03136963f0e8bf8f3e7e5f22228693deff6
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
index 9daa1aa4828c..cbd16c404dba 100644
--- a/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
index 698fa623a51a..43ebe11fdc0d 100644
--- a/media-libs/libsamplerate/libsamplerate-9999.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 9dacd4a76da0..b2956db08d88 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,3 +1,4 @@
+AUX libsfml-2.5.1-musl-1.2.3-nullptr.patch 626 BLAKE2B dac65018937df6088b5f44f57678b6acde4f67a4f03180428374f26c7248181058185bce053bb79fdd4d4044c6369740daed5db95f803965d2b15a3250bedd1c SHA512 76535c8d01f21cc32df1c66ba1567356737a9c14b73be1c03606305f905d31a615759054b60fbf3347a57d3b24ab9b3978c96f898262000fe4c58af697b7dac7
 DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
-EBUILD libsfml-2.5.1.ebuild 1508 BLAKE2B 328a493cfb7af830c186fc74c4a04f5b873608e21792bd6a5aa7f47efc0ef87461665c1866b5741a8018459efd236a22f5d97845e84256cab3dcbdf0f1681104 SHA512 6aed973829b0a14545900247993707489c76011f808a717f0b8411e9e33bf129f6f19c8d16ad6650340e718daf4a2b22af995c266f4268cdfee7832eae442d95
+EBUILD libsfml-2.5.1.ebuild 1566 BLAKE2B 19ca987a73fb2fedca0c7e8918a52c26b1c3ffff5992fade729b2474efd13b0c82d09e2b11fe3b9d81a05818b261b9c6feaca63704fefddf7469bee1c22f8185 SHA512 2d671cbe31f649d14ed1c37dacb924c6fe6e2b454d9d46ec386733f02a39fd2a4a8e4fed148679e7cced185c4bc3e9b1c8426298d7a1aacb5b59e81c1ea9dd23
 MISC metadata.xml 733 BLAKE2B c5b2bf1cea8b01c89531f68544f8b82dc3f8b8e26327ec868cf2ce1beabd6b1b0e977ad4a5dd3cdcbe3ae0fd66930f0c411023d77f9c4a5f7464d90209fa6f6d SHA512 ffb4954d9d55f0ab147c8ef2d5e970ef728b0dd1ad78f04aac16346583a9b858d3861f6f3bfe0940ca4b41c23abf8904bf3e0160d347d9e007efa047e663ccda
diff --git a/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch b/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch
new file mode 100644
index 000000000000..dc26ba285e17
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-2.5.1-musl-1.2.3-nullptr.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/839639
+https://github.com/SFML/SFML/commit/c9f7cb3d525a995912fc62507802f3f265de2728.patch
+https://git.alpinelinux.org/aports/plain/community/sfml/musl-1.2.3.patch
+--- a/src/SFML/Window/Unix/WindowImplX11.cpp
++++ b/src/SFML/Window/Unix/WindowImplX11.cpp
+@@ -1556,7 +1556,7 @@
+                                    m_window,
+                                    XNInputStyle,
+                                    XIMPreeditNothing | XIMStatusNothing,
+-                                   reinterpret_cast<void*>(NULL));
++                                   reinterpret_cast<void*>(0));
+     }
+     else
+     {
diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
index d7a9017536bd..8131a7a919d6 100644
--- a/media-libs/libsfml/libsfml-2.5.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,10 @@ DOCS=( changelog.md readme.md )
 
 S="${WORKDIR}/SFML-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-musl-1.2.3-nullptr.patch
+)
+
 src_prepare() {
 	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
 		doc/CMakeLists.txt || die
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 606cb88827dd..208b5d0f81ce 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -1,13 +1,16 @@
 AUX 65resid 63 BLAKE2B a50f13bb14d227e543b43b0a5969102431ae5903bb3c90106ec8b944d808317c0eacaeb06307774217f958335eead953847e28d07a0c615f89ba435020b11e16 SHA512 3233f4ec47f5ec6bb64aede57af5caf81a18d1cf258b6f3032e4df43a89e64c3e91a2aefaedbc767dc6c9d9de60a4634698968a59a21c592ed506f9afa10e4c2
 AUX libsidplay-1.36.59-fix-c++14.patch 786 BLAKE2B 4267e1c1ef3b982a4ff69c9e68b9a85a94c54866a9a2857bc290f6dc0ce4b268250439cab3ebfb093b8698456e660a003d53f94e1438ba1d8c80d64dc6295e36 SHA512 8fe86933a6009d2035e1a987c3da9050535a956833271cb59892c8093d5a66be6e2b3bf9d940a2f3e8c54fe54d2f70106a1796235f11ff11fff099ca040cd140
 AUX libsidplay-1.36.59-gcc43.patch 1338 BLAKE2B 8132fb754fd6fa3c9b5d34898f3a27c7db3ee221f91d89fa0b21cfc70a1bf689be6aa1f4bf6bc5409c98c7452077e706ae9358f0ade5faeb8aa90d67ff3c2671 SHA512 a3b795aef3bdfe3d435117b0d52a2f2bdd87f60b3ff1b21e0a3c08214396db897b75d8f97b8587a3cd4cb366598c01292f023003d3e055f542c903e91cb69cf6
+AUX libsidplay-2.1.1-autoconf.patch 5339 BLAKE2B 2658f312eadee4862279ed90635963c886c23402655f02a19f415379372b5f3d1f7204afaa5f4466f1fa1c03daaf490978dcda97a584a0eec0ed13bdc2991198 SHA512 fe67569cd0f4d7202f6dc4121c15365fbb6c97c57c4620f7bbc55c92dc28c72433f29e61241ca10e08a47db703718a03dfed3829b712bdcfd7dfc1fdf09f8954
 AUX libsidplay-2.1.1-fbsd.patch 333 BLAKE2B b55f14ba3aa8e73fd107a768991bc81aca78ce871f9933fef47cafa138fd11aabc286cad5b8a53ac829e371ffdda43be0514d244b4094b5f25469a13d2984559 SHA512 bb2f7f16a4932e49efa7353c4d13d4f50f226fe8dcd4ba2fd3eba0ddb5e7a967aef3fadf0c2c919cf10007b3d0c79deeb7f52c088b1843849223296a057a4f7c
 AUX libsidplay-2.1.1-gcc41.patch 1063 BLAKE2B 464044df0215d8b4af5ec688b275a0841ae2aacf7db43996a46f3999e820fbfbad36c7215efe93b9026791462cff7caa9b7d65e3b4f32bdaed94fb222ab95731 SHA512 f27ec81273af62271903102f87f904c8031e1b7fef963714e8a4479ac4227ea9b881843782ced003b80461ec3e07d9be3f2d0e2ecb5ab38c73a8a2bd4e8cda72
 AUX libsidplay-2.1.1-gcc43.patch 2057 BLAKE2B b66469b17702fa74fffc6ec554696898767f20fd4fb01d1e8dff56a52f1ba699c103c9949db4e8da2b12a9920e3dfd0e53d82d3776c5609f0de9f79f82924dde SHA512 77078813d4862628372bf1293747c38d55811cc4c68ef3001252a520a89d83a91e1ba102f861825bb534039c4811bb8bbbea2e47609b5762ad2353477561d9ce
 AUX libsidplay-2.1.1-gcc6.patch 906 BLAKE2B 8d9682c5a3a9ee2b44547d1ce2091c6f727fb55431f53060a913be8fcf6267c5e2f29d2efec49b756b458d656be3f67fca66b65d9c413ba72961b6636e8ed993 SHA512 5853b9f66d26b6027b54591b1f2fc8db9addfabdfd3e90a8182f06282f38cc646f6b3bb1eb75caa400a7c080f30d4f61cfc48a9529974e2e8ede5fcbba677e46
 AUX libsidplay-2.1.1-no_libtool_reference.patch 558 BLAKE2B 7f115c941dc0f9dd8201fd42368d55ee247032ecc4b70c20b89253593e7f6259d533ac724aed22e2229c0c0168f465ac41cb49f3a634e8c9bd618100a5d98dc0 SHA512 826531798593a0e597d2a8a310da584e0097256fe580f7858aa84d9be70f77e1a0b0f9af7e6c94a91602e73f9aff6197f10f2a22ecf1f6fce85ce1f408e04b86
+AUX libsidplay-2.1.1-slibtool.patch 967 BLAKE2B ed31c7ac9c567fae2d802103d8f8f1f9e7b47929423c01d2dd4a1da15058716de268ab7a26619d58ffb0fb771e3d1203f37551b7dcfc23deab5a99b2cd8f9224 SHA512 fa8f3abe5df90e85d97fad36b77d987a4c8339a961b42573b9e9555ce29f98cafc19bea5134e79262f2be782044d24ecd7f3ef51d3b40a80097dc0165eb80295
 DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
 EBUILD libsidplay-1.36.59-r2.ebuild 766 BLAKE2B 33fb576676adfe11e1eb49fec9072fcbbb1200d6d1a084ce9332178529f798e74a37a16d2a47b15e18cb738af0d03830c865f00f7b583936357b8dbea92cd87a SHA512 54426f91c6bf5753f523e8a73154773396ddfb040315e91476e2dda2aa32641c1cf09258ed4777638f42779ac3e8732b8551e9ff9c582479201fa5e6a70885e9
 EBUILD libsidplay-2.1.1-r5.ebuild 1233 BLAKE2B cfb102036b715eabf1ad4b28c27be0d56e01c5403ed8a6a26d271d12b3a03a3162aa53a0771ad7634262630f6292ea3887ba5f164be2e2793b3729eaee06ef69 SHA512 da1a7fdbda9b46a6133de346d756d295d674ba1e1bb5a646fcd897384e0d3fd83e17934ec862f90ce99630d904e2904d2fde6120f9474f6f202003d4497787b8
+EBUILD libsidplay-2.1.1-r6.ebuild 1524 BLAKE2B 0e2718cfb22054596cb50b146e6e07a48122986147dc016a6a744d2fa4d6286b2bc6ce0f1c154daf1a11d350a3a4fd869b2c443d29bd6a47beebd1ba8aadf6b1 SHA512 6aad8bc4af5a2238236b975185b046c5dd8a5f16c22509051e8ba7f14d70a82a502adf74b0f6a63b15f668400beb1da615b6fa9f7bc225a85691ac721916a825
 MISC metadata.xml 246 BLAKE2B 5791eec1fea2211cdfa2d13a89732df17195754dddcb9122157536f9f398f783de194f304cc545db22ae0506f69cb13cb1b9e03449959edc96097b2f0eac2d13 SHA512 8f5558a12be53599ddda50ec08e80a33b37ee1f4c73048b4a02983121e22c149dca53abda7985c840aedc506a9945a66ef94e034f168d868b9933b8c5c2c9fdb
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-autoconf.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-autoconf.patch
new file mode 100644
index 000000000000..cdb92c63a034
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-autoconf.patch
@@ -0,0 +1,172 @@
+From 426bebc250c24cb4482c85131927303cbf7c606d Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 7 May 2022 13:47:57 -0700
+Subject: [PATCH 1/2] build: Fix autoreconf
+
+---
+ builders/hardsid-builder/configure.ac |   1 +
+ builders/resid-builder/configure.ac   |   1 +
+ configure.ac                          |  75 ++----
+ libsidplay/configure.ac               |   1 +
+ libsidutils/configure.ac              |   1 +
+ resid/{configure.in => configure.ac}  |   0
+ 6 files changed, 30 insertions(+), 49 deletions(-)
+ rename resid/{configure.in => configure.ac} (100%)
+ create mode 100644 unix/ax_subdirs_configure.m4
+
+diff --git a/builders/hardsid-builder/configure.ac b/builders/hardsid-builder/configure.ac
+index a54cf26..bdc2bd0 100644
+--- a/builders/hardsid-builder/configure.ac
++++ b/builders/hardsid-builder/configure.ac
+@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
+ AC_CONFIG_AUX_DIR(unix)
+ AM_CONFIG_HEADER(unix/config.h)
++AC_CONFIG_MACRO_DIR([unix])
+ 
+ dnl Setup library CURRENT, REVISION and AGE
+ LIBCUR=0
+diff --git a/builders/resid-builder/configure.ac b/builders/resid-builder/configure.ac
+index 4a98801..5f5561b 100644
+--- a/builders/resid-builder/configure.ac
++++ b/builders/resid-builder/configure.ac
+@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
+ AC_CONFIG_AUX_DIR(unix)
+ AM_CONFIG_HEADER(unix/config.h)
++AC_CONFIG_MACRO_DIR([unix])
+ 
+ dnl Setup library CURRENT, REVISION and AGE
+ LIBCUR=0
+diff --git a/configure.ac b/configure.ac
+index 5724156..d622982 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,70 +3,47 @@ AC_INIT(Makefile.am)
+ #Variables
+ pwd=`pwd`
+ builders='${libdir}'/sidplay/builders
+-ac_configure_args="$ac_configure_args --disable-library-checks"
+ 
+ AC_CONFIG_AUX_DIR(unix)
++AC_CONFIG_MACRO_DIR([unix])
+ AM_INIT_AUTOMAKE(sidplay-libs,2.1.1)
+ AC_CANONICAL_HOST
+ 
+ hardsid=false
+ case "$host" in
+-    *linux*) hardsid=true
+-        ;;
++    *linux*) hardsid=true ;;
+ esac
+-AM_CONDITIONAL(HARDSID, test x$hardsid = xtrue)
+ 
+-echo; echo "Configuring libsidplay..."
+-cd $pwd/libsidplay
+-if ! eval ./configure $ac_configure_args \
+---with-sidbuilders=$builders;
+-then
+-exit
+-fi
++AX_SUBDIRS_CONFIGURE([libsidplay], [
++        [--disable-library-checks],
++        [--with-sidbuilders=$builders]])
+ 
+-echo; echo "Configuring resid..."
+-cd "$pwd/resid"
+-if ! eval ./configure $ac_configure_args \
+---disable-resid-install;
+-then
+-exit
+-fi
++AX_SUBDIRS_CONFIGURE([resid], [
++       [--disable-library-checks],
++       [--disable-resid-install]])
+ 
+-echo; echo "Configuring resid-builder..."
+-cd $pwd/builders/resid-builder
+-if ! eval ./configure $ac_configure_args \
+---with-sidplay2-includes=$pwd/libsidplay/include \
+---with-sidplay2-library=$pwd/libsidplay/src \
+---with-resid-includes=$pwd/resid \
+---with-resid-library=$pwd/resid \
+---libdir=$builders;
+-then
+-exit
+-fi
++AX_SUBDIRS_CONFIGURE([builders/resid-builder], [
++        [--disable-library-checks],
++        [--with-sidplay2-includes=$pwd/libsidplay/include],
++        [--with-sidplay2-library=$pwd/libsidplay/src],
++        [--with-resid-includes=$pwd/resid],
++        [--with-resid-library=$pwd/resid],
++        [--libdir=$builders]])
+ 
+-if test x$hardsid = xtrue; then
+-    echo; echo "Configuring hardsid-builder..."
+-    cd $pwd/builders/hardsid-builder
+-    if ! eval ./configure $ac_configure_args \
+-        --with-sidplay2-includes=$pwd/libsidplay/include \
+-        --with-sidplay2-library=$pwd/libsidplay/src \
+-        --libdir=$builders;
+-    then
+-    exit
+-    fi
+-fi
++AM_CONDITIONAL(HARDSID, test x$hardsid = xtrue)
+ 
+-echo; echo "Configuring libsidutils..."
+-cd $pwd/libsidutils
+-if ! eval ./configure $ac_configure_args \
+---with-sidplay2-includes=$pwd/libsidplay/include \
+---with-sidplay2-library=$pwd/libsidplay/src;
+-then
+-exit
++if test x$hardsid = xtrue; then
++    AX_SUBDIRS_CONFIGURE([builders/hardsid-builder], [
++            [--disable-library-checks],
++            [--with-sidplay2-includes=$pwd/libsidplay/include],
++            [--with-sidplay2-library=$pwd/libsidplay/src],
++            [--libdir=$builders]])
+ fi
+ 
+-echo
+-cd $pwd
++AX_SUBDIRS_CONFIGURE([libsidutils], [
++        [--disable-library-checks],
++        [--with-sidplay2-includes=$pwd/libsidplay/include],
++        [--with-sidplay2-library=$pwd/libsidplay/src]])
+ 
+ AC_OUTPUT(
+ Makefile \
+diff --git a/libsidplay/configure.ac b/libsidplay/configure.ac
+index 1946508..9c9d808 100644
+--- a/libsidplay/configure.ac
++++ b/libsidplay/configure.ac
+@@ -8,6 +8,7 @@ AC_INIT(libsidplay,2.LIBCUR.LIBREV)
+ AC_CONFIG_HEADER(unix/config.h)
+ AC_CONFIG_SRCDIR(Makefile.am)
+ AC_CONFIG_AUX_DIR(unix)
++AC_CONFIG_MACRO_DIR([unix])
+ AM_INIT_AUTOMAKE(no-define)
+ 
+ dnl libtool-style version-info number
+diff --git a/libsidutils/configure.ac b/libsidutils/configure.ac
+index 1e38d14..4461aa1 100644
+--- a/libsidutils/configure.ac
++++ b/libsidutils/configure.ac
+@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
+ AC_CONFIG_AUX_DIR(unix)
+ AM_CONFIG_HEADER(unix/config.h)
++AC_CONFIG_MACRO_DIR([unix])
+ 
+ dnl Setup library CURRENT, REVISION and AGE
+ LIBCUR=0
+diff --git a/resid/configure.in b/resid/configure.ac
+similarity index 100%
+rename from resid/configure.in
+rename to resid/configure.ac
+-- 
+2.35.1
+
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-slibtool.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-slibtool.patch
new file mode 100644
index 000000000000..f549ed7c6d97
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-slibtool.patch
@@ -0,0 +1,39 @@
+From 6536bf3ceb05e4d32f985a896354b98310c49b5b Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 7 May 2022 14:04:08 -0700
+Subject: [PATCH 2/2] resid: Fix build with slibtool
+
+---
+ resid/Makefile.am | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/resid/Makefile.am b/resid/Makefile.am
+index bbec226..0a32647 100644
+--- a/resid/Makefile.am
++++ b/resid/Makefile.am
+@@ -7,20 +7,15 @@ if INSTALL_RESID
+ lib_LTLIBRARIES = libresid.la
+ pkginclude_HEADERS = $(resid_headers)
+ else
+-noinst_LTLIBRARIES = libresidc.la
++noinst_LTLIBRARIES = libresid.la
+ noinst_HEADERS = $(resid_headers)
+-
+-all-local:
+-	ln -sf libresidc.la libresid.la
+-
+ endif
+ 
+ ## Make sure these will be cleaned even when they're not built by
+ ## default.
+-CLEANFILES = libresid.la libresidc.la
++CLEANFILES = libresid.la
+ 
+ libresid_la_SOURCES = $(resid_sources)
+-libresidc_la_SOURCES = $(resid_sources)
+ 
+ BUILT_SOURCES = $(noinst_DATA:.dat=.cc)
+ 
+-- 
+2.35.1
+
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild
new file mode 100644
index 000000000000..b56e698d40da
--- /dev/null
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_P=sidplay-libs-${PV}
+
+DESCRIPTION="C64 SID player library"
+HOMEPAGE="http://sidplay2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs"
+
+BDEPEND="sys-devel/autoconf-archive"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/sidplay/sidconfig.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-fbsd.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-no_libtool_reference.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	local subdirs=(
+		builders/hardsid-builder
+		builders/resid-builder
+		libsidplay
+		libsidutils
+		resid
+		.
+	)
+
+	for i in ${subdirs[@]}; do
+		(
+			cd "$i" || die
+			eautoreconf
+		)
+	done
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--with-pic
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	docinto libsidplay
+	dodoc libsidplay/{AUTHORS,ChangeLog,README,TODO}
+
+	docinto libsidutils
+	dodoc libsidutils/{AUTHORS,ChangeLog,README,TODO}
+
+	docinto resid
+	dodoc resid/{AUTHORS,ChangeLog,NEWS,README,THANKS,TODO}
+
+	doenvd "${FILESDIR}"/65resid
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index f3f1fb9af6bf..4ecd976636e9 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,6 +1,4 @@
-DIST libsndfile-1.0.31.tar.bz2 875335 BLAKE2B 33e3c3d111427e829d8233aec52c227188834936839da9a04cf1ea5d2595d6a3127e7ce86d7686ca0336cca2017e6e2466845c27c7fc399efae34a0902316e41 SHA512 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1
 DIST libsndfile-1.1.0.tar.xz 730604 BLAKE2B ff2d27bff460c4d3c549bdf70c84c6f17a2c3e10674a44216ed83e657e603ddfbc33afe0827676fc4f5dc7745a9fb6aa866023fe589d0c00714477e3a246e5f2 SHA512 d01696a8a88a4444e5eb91a137cf7b26b55b12c1fe3b648653f7e78674bbdf61870066216c9ff2f6a1e63bdf7b558af9a759480cf6523b607d29347b12762006
-EBUILD libsndfile-1.0.31.ebuild 1796 BLAKE2B bcc411b71c822a9d427e71c682bf3613f5f79958bd76f7664c2d0fbf7e20ff44ee2496defd1fbdc9484c9c96c083515341f0ed30051af471060d6e1270a2e8ab SHA512 787cb47d84d230460a735fa73fe137f4a8d0d1319e47fc034decb3275ace8b4843807787dc5c837251e54deb4cb8a2c20625c3545b49972c43e6d7016e70157c
-EBUILD libsndfile-1.1.0-r1.ebuild 1912 BLAKE2B 99412566285e27002762c9a46a849a7e61a880c168746dfbe25d0a1b9430d597fc719d3b35332993ccf566e5d29fff1f25499b3874f774ce764d6cb33af77ade SHA512 5149a95f5398c3cd19e12e2a07dfd7a4124d1f82f585997f8ef26eedc144969a56c4e0b44a37cd929dc4664aa37804bb35fad9c91fbf9eb4d5cceceaedaf8f56
-EBUILD libsndfile-9999.ebuild 1918 BLAKE2B b89768d09324e9276f402ede221311bfd8dc2e9acbcf83bc8d38d31503bce38f01896d0f1c0fa08af0491f9ad8647ef83c0d9366e2630d9365df3f26f44e5c10 SHA512 5fa0004d35d6e6132bcd9ce5e289e8edbdcaa8eff8aadb5f393f0a277793a708b35c9d0b28af2c6d39ac86defaebda87fb192d2f9c55ac552f4aea2fc7e212b2
+EBUILD libsndfile-1.1.0-r1.ebuild 1905 BLAKE2B 6fbcc2a1e1af8c6712e543bbe79a0c0382a255c0f86c3893308944afb3f4e572e1af14a66a248b2736d556a4b356375c6b605bd9a41bf77370451a4de900efe4 SHA512 31efe2d60095ab00b4705bc80b96fa4c2bebf23294721f558dcfb2c1ed6e9afd647deeed278acce8371737f620e6fe1e284e5b128b83cfcea2505ee5465409f7
+EBUILD libsndfile-9999.ebuild 1912 BLAKE2B 84e666034a8e8ac0d4c0185b7b3f472fe3cef78f58a6a312bab6f63b3e171fa0120eacf38ebcac3b44c3252c925f8f337a08b7bf84ab0ca65d673e5eed83cbdd SHA512 c1fe0949539460c485d7f9169147bd0117b3ac577c70c94c6513ea6b662613e701d61d30949860eb062fc8016b0056bbc503274301ee477bf83be8e5e8cbd631
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-libs/libsndfile/libsndfile-1.0.31.ebuild b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
deleted file mode 100644
index aa0df067763b..000000000000
--- a/media-libs/libsndfile/libsndfile-1.0.31.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
-else
-	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-inherit python-any-r1 multilib-minimal
-
-DESCRIPTION="C library for reading and writing files containing sampled sound"
-HOMEPAGE="https://libsndfile.github.io/libsndfile/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa minimal sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!minimal? (
-		media-libs/flac:=[${MULTILIB_USEDEP}]
-		media-libs/libogg:=[${MULTILIB_USEDEP}]
-		media-libs/libvorbis:=[${MULTILIB_USEDEP}]
-		media-libs/opus:=[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib:= )
-	sqlite? ( dev-db/sqlite )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )"
-if [[ ${PV} == *9999 ]]; then
-	BDEPEND+="
-		${PYTHON_DEPS}
-		sys-devel/autogen
-	"
-fi
-
-pkg_setup() {
-	if use test || [[ ${PV} == *9999 ]]; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-octave \
-		--disable-static \
-		--disable-werror \
-		$(use_enable !minimal external-libs) \
-		$(multilib_native_enable full-suite) \
-		$(multilib_native_use_enable alsa) \
-		$(multilib_native_use_enable sqlite) \
-		PYTHON="${EPYTHON}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild b/media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild
index 16d64ad88d7a..31ca425e0fd4 100644
--- a/media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index 7518292d8465..a069371aa9e3 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libtaginfo/Manifest b/media-libs/libtaginfo/Manifest
deleted file mode 100644
index 61dc0a9f0311..000000000000
--- a/media-libs/libtaginfo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libtaginfo-0.2.1.tar.gz 2093070 BLAKE2B 0b0c83c1cfe15cbc2fd19936bcba4377cfeea13a95d085dff95b42c9b547b8bf8c21a2187ebb7d0d8510644be8db38a98a6beefe22ea83be7303762fa590214a SHA512 f1a79b1f7ea12bce10c82c0a4106f855c95b6efeef25e7548fc629d4f8977f50fe62637426a53ec0333902d5e2a81980c189719d030d7f85897ecfa8cbb1ba41
-EBUILD libtaginfo-0.2.1.ebuild 478 BLAKE2B e6c3ab51bc7326aa4923078b12b145984fe2334f4eba9362c3104ffa002796bfcd03388ca0919e9031b6a779c0a7b3910d29b3e51890a80c72b2095de2c07388 SHA512 51a669680e99a4afe2a89f4038b3211df3b251ba5dcf37bf711ca2d62f2738cf4901cfa9af1b1e949a9b2b107294fee11636b78a3cdb68982ef9c61882e38b57
-MISC metadata.xml 344 BLAKE2B 0d5aa10cfb0397f3b39d460d14943bbf80b69672a971374881d50ea173fd9dd2ff68b41e6f95f50b160d0409d5bc7b7c3c0c6b79e8b2c8cd973f3d89d7b6b5cc SHA512 2271041773ddfbf52cad97d9565b4af561453c3c0c65d8414d16763df228faee48f30dfa5186a1dd8e4283babf4612ed7d765e2986d39ec0151c003f126fcedf
diff --git a/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild b/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
deleted file mode 100644
index 6f7a3f5ee7c4..000000000000
--- a/media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A library for reading media metadata"
-HOMEPAGE="https://bitbucket.org/shuerhaaken/libtaginfo"
-SRC_URI="https://bitbucket.org/shuerhaaken/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="media-libs/taglib
-	!<media-sound/xnoise-0.2.16"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README TODO )
diff --git a/media-libs/libtaginfo/metadata.xml b/media-libs/libtaginfo/metadata.xml
deleted file mode 100644
index 036a86c1d8f2..000000000000
--- a/media-libs/libtaginfo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">shuerhaaken/libtaginfo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/libvmaf/Manifest b/media-libs/libvmaf/Manifest
index 4be1bfae01ce..c300a4bd2311 100644
--- a/media-libs/libvmaf/Manifest
+++ b/media-libs/libvmaf/Manifest
@@ -1,3 +1,3 @@
 DIST libvmaf-2.3.0.tar.gz 18373659 BLAKE2B a08f18cabf99bf421c61c1fa60b946ee62027f06d5ec2a1b78c7d14ef7541a850b83216eed815f586711365ac2e31bdc6b5be811ae4fd6882717bf030d9ffc0f SHA512 10f0af2b1e868d9780a2766c6c06451ea79f4a8cd8f6c546473382587011f9a7c8c5bf80952021980ede62e2188bcb388337c8903a906d50c739be7cdbb8f61b
-EBUILD libvmaf-2.3.0-r1.ebuild 1120 BLAKE2B b618cf7ec8db20ce4114af5b5318d393d44dd33eaf8808291bd0f485fb4e86d9023f5caf0efc0d381850f205c33cd6ac1c2f395fa3e725cf0bdcc3e3ab5487ea SHA512 acf24ec08c15c15f0d9bb517e7d9a4286b55461f863af8fe2d2741a99996342951e99e40e44a97adbb9046bcf9d075ca2e94abfc6177c46bb9ca9c0592bad9cb
-MISC metadata.xml 721 BLAKE2B f0e82d2d6d28429c7d0a91b111b82d3a5df006f27142f063d527b73ee37ed82892c4d85db473098ca32ce09d3a1eca926666830e2d1ea3256f0598b413861c7d SHA512 741de386e11eeb0cde13121604fa60d1c22012f9e4c351ec423ce3d7cbc164006441e37d49682c0f1ab64dffc6b949a39ed971755b2f026bb6964e53acc6ff95
+EBUILD libvmaf-2.3.0-r2.ebuild 1312 BLAKE2B da51d69bf496e41b64f8bbb44b44be651a30f52045ec0ccf82c1dfdda87ea63c56cd4bb4342bc9267e541af8abd065bbeb9ea9d15e58c3b6bc08ff679f67f00b SHA512 5dfa37dee35a92467337d4e0b9741a4db26bce9a3d0dbe15bc07507103d45251204b054ce982714ce14d25c2293875d0f46744451f15c199ca2e959f365fd9c6
+MISC metadata.xml 857 BLAKE2B 418ddef5fe12e5d06e978bedb739e26e119939d056c03761a3493851a69c7bfd110fe7cb31505fa3bd52104ec11045b05eae84fd2f5558007779b7bf776ef16a SHA512 52fd19cf32b9b24ae427ff9a1254ac0b514de79df6e7a47f638c304bbaab799294a29d9e7e8467c2fdb1ab0a208e3704f95c8a276fde9ad176c38e2786a962b3
diff --git a/media-libs/libvmaf/libvmaf-2.3.0-r1.ebuild b/media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild
index d83062357877..9276f49b516c 100644
--- a/media-libs/libvmaf/libvmaf-2.3.0-r1.ebuild
+++ b/media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild
@@ -20,20 +20,33 @@ fi
 
 LICENSE="BSD-2-with-patent"
 SLOT="0"
+IUSE="+embed-models test"
+
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-lang/nasm
-	app-editors/vim-core
+	embed-models? ( app-editors/vim-core )
 "
-# The app-editors/vim-core dep is needed to embed models within the library
-# could be made into a useflag if someones express the need for it
-# see https://github.com/Netflix/vmaf/blob/master/libvmaf/meson_options.txt#L21
 
 RDEPEND="${BDEPEND}"
 
 S="${WORKDIR}/vmaf-${PV}"
 
+src_prepare() {
+	default
+
+	# Workaround for https://bugs.gentoo.org/837221
+	# The paths in the tests are hard coded to look for the model folder as "../../model"
+	sed -i "s|\"../../model|\"../vmaf-${PV}/model|g" ${S}/libvmaf/test/* || die
+}
+
 multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use embed-models built_in_models)
+		$(meson_use test enable_tests)
+	)
+
 	EMESON_SOURCE="${S}/libvmaf"
 	meson_src_configure
 }
diff --git a/media-libs/libvmaf/metadata.xml b/media-libs/libvmaf/metadata.xml
index fe7546eb5ac1..01039a20cb19 100644
--- a/media-libs/libvmaf/metadata.xml
+++ b/media-libs/libvmaf/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>adel.ks@zegrapher.com</email>
@@ -16,4 +16,7 @@
 		<remote-id type="github">Netflix/vmaf</remote-id>
 		<bugs-to>https://github.com/Netflix/vmaf/issues</bugs-to>
 	</upstream>
+	<use>
+		<flag name="embed-models">Compile default vmaf models into the library (needs <pkg>app-editors/vim-core</pkg>)</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 5f7a9647e57c..097c5af74548 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,3 +1,3 @@
 DIST libvorbis-1.3.7.tar.xz 1203792 BLAKE2B 849e3f1129313646471e2bb7e9beeb3766d6a121fe09984e39a353cae7dacd0a970900b0cb6f68b1d69e759515298d901fcc0cba1edb91dbc4bae4456f4bd6ea SHA512 bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd
-EBUILD libvorbis-1.3.7.ebuild 1281 BLAKE2B 3e4ad1552df346d9efabd12fcf6e823c7d1c18d2b954aa3c4de4434ce6cf7b4f429e4f6b6dd571839e37e5a93580032f2c43311c12957625f66db95eb2a7f897 SHA512 1fe81c4f9bac5e753e8ac4eea28f54e600ac4ff53641dee4282dbd7de96e785644f198ecf8f95ff72a67a686094678142f4f57e1a9c3fcfd38070622a46e6c81
+EBUILD libvorbis-1.3.7.ebuild 1287 BLAKE2B f16e4cb8b589ed99e411b2973cb358a84df3af0bda2a4b2cc4f8d8ce2283ed4ea2bcc36a89521c004134930a5f900c90aa26c6bdb96654520e28cb462b072d2a SHA512 7033851dbc1f7e2d889508e3e8befedf0d221133eaf9c7f880f36715d40ae87c48553e03361015418cbf610f1439460e9b0f9a5312eefffcf1c06566fc6ba821
 MISC metadata.xml 330 BLAKE2B ef2876f07a60f57ac3309470378db229270bd5a8162e0f4d46a4aa5ae452576824c2e48a67a9ca07e30f79d5e3537eb0256250e5a32b90ff124c9fe350f8dde4 SHA512 cc71c708a55c934552da506a07db9809036ae5432005ca52b23db5fb71c830e1536565ad499b2bd926905dcc88e08cc8c248989df77e48b60b14fae9f6c81d78
diff --git a/media-libs/libvorbis/libvorbis-1.3.7.ebuild b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
index cde578a12b47..3c10b157961e 100644
--- a/media-libs/libvorbis/libvorbis-1.3.7.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 9568742137bd..238a5fec3cf0 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,15 +1,8 @@
 AUX libvpx-1.3.0-sparc-configure.patch 406 BLAKE2B 02b1f0484a9659fdc90eb567db517a8b63f679521ae9ab510bfaa88b9fd5e1430d0eceeb8e4a138b00cb43ac4a1db6451dd29a808367973dc885fe5b9eacd665 SHA512 159ba5577fc0eee3e958740d8607a7570f374a8f64a36f1e7832a126482ec0bb96ba2be451eefdf50d84a412a2be73ae75da3d69da78ec13dfe0e24a14685035
-AUX libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch 8035 BLAKE2B 785a8769741e5af10ce0f18f6ef9f091d1335ca1c8515c9b653d3a177a620a8b3360b7df03f058b63e42259d6e4ccb6863e0ec9acd69886627a222ea3b8beb2d SHA512 b5af677b7f8fc6c61ea1c99c094103549cbe1a0163da70f51d4c34eec40b507a7bf8f84f97ee141a15c33bfaf2a6cb36c572a08465407fb17eb9b6a1364a3819
-DIST libvpx-1.10.0.tar.gz 5340421 BLAKE2B 25ef346b9dce92d37cc4f4612ed351d0f93a60c9021ed5f9145a9128efa8b0af7cf30b6279c40481ab043b9922b93f6b502cdffc3feedaf4bca310fdaf8b1502 SHA512 f88c588145b5164e98531b75215e119056cd806a9dbe6599bb9dab35c0af0ecd4b3daabee7d795e412a58aeb543d5c7dc0107457c4bd8f4d434e966e8e22a32d
 DIST libvpx-1.11.0.tar.gz 5347256 BLAKE2B 2c350e14fc3b8a3c10a71e230e893fbb9a68e6eeb6a413cc359bdbfddda21cc5c15d0de4b6110889845f88f8a946ef1266980c0a1b26aaf55b52330fe038e261 SHA512 7aa5d30afa956dccda60917fd82f6f9992944ca893437c8cd53a04d1b7a94e0210431954aa136594dc400340123cc166dcc855753e493c8d929667f4c42b65a5
-DIST libvpx-1.7.0.tar.gz 2679797 BLAKE2B de7992adb517e375c5be2a9facf2b4a73174adcaef11185ed6d3102c2f6b73f378b0d415c5e3a4d915b3a6889bd8b31ba3e8c007a87a433a345ef7696a1dd899 SHA512 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0
 DIST libvpx-1.9.0.tar.gz 5326239 BLAKE2B 6403a5d8326235a8d27ca3727f45398556cbe72cd125ae358c22f729cc01d6a81917cca8a6e97ad0ed01e7fc04ca4212baf21f371323b93ccc8830c4a11acf91 SHA512 8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298
-DIST libvpx-testdata-1.10.0.tar.xz 448090752 BLAKE2B 88391427d35c538d114df188a899f8de7247dcd861d8438a32530909430feceef48c2c35a53c5a57268dccd85bcd40ec92bb053cfc2b4588bde6447747e10803 SHA512 6d4f0d08f32b34e95c1a75a4340e0340c83b26008852fac4293f1f3c4b9e9ce0f8e2290de678e2f2c9e1309f6995857add4e98796e1a3f474ce1402c9cc862f4
 DIST libvpx-testdata-1.11.0.tar.xz 444614504 BLAKE2B ab6de4c46a771dc1c0dfb19326e580a492768c629eebbfb276db7da02e13256b2a66fdaadf76e5856879e871c7a17fcff657139582b1a3a84ad39c6018b912be SHA512 772e9d69dc9fc8e5a9411e1a532d908e86d90b03019e958349115a74697dcb35972ce71325312193d3a84030c3ff1d9bdbd09ed58918fffcba39c120ce4be868
-DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
 DIST libvpx-testdata-1.9.0.tar.xz 450868860 BLAKE2B aaed7f2ef4f70ff352e39be2630e3a5cd803e8d2408c4fd5c3e06e040a75d2f593a10bc267a497aa91eaceb64286e81f69e86ca0940160e4f34b62c08e91df7b SHA512 bcc89062a436d652d15d5852a842cb4985c4783855b943ab11667c022b5082887129fd9579b8da3af209a3031f95ff8dc625c380f79559db160501cd676736ea
-EBUILD libvpx-1.10.0.ebuild 3513 BLAKE2B b0c213f4895736a46bfd766c46d325dc9b38f24df3c5a8fb89785ce2ea3907043b09aab0a18e61ec42d0a1c1765e698b9c377ab2bf4444d7c2160efbf2df3982 SHA512 63b2f6b8a4341c2d77826be4f7e261dff02c56324dcbd1c4665a290ad8824dbb3a7f2fce17fdbc014034e425e24240bc176f12769c19ef8040514c236687b8ef
 EBUILD libvpx-1.11.0.ebuild 4338 BLAKE2B a83124c9a4f0d72185eb9d8e474c19c2ba1ff0673f25df0220bcca8acc07c23b518390a73a6a533f22417b5cfa24558c72b3779f06597447c14d4543b7d2c596 SHA512 4bc994c6127712d2374bd01a6499b4bedf5204126555ab18044ee9ea8f91b336fcfae8dbeb001fe7ff7144a5158352bf7e1a81b3d7d3f003159f00d7fbd80708
-EBUILD libvpx-1.7.0-r1.ebuild 4008 BLAKE2B d97bc37287825a027d6732955e0563ec899d434401c648894a203208576c9de7e2142d9922a70d8d99a65086f55ade1003d413202c1c91e60321903addc99693 SHA512 3369709c5882d692fac2d225639c82927ce8a69b85517673a0b5a85b891fdcac022ed5d78a5ab22715b9d1d4b1843c8c433dfb3642bcb45bdada596247814ff4
-EBUILD libvpx-1.9.0.ebuild 3504 BLAKE2B 65b08b6e66e759de5a2ab1df71dcadabeb62b0f2eae7c77f7816b43a9d5427b1c103b1b6113f76a5d40a7495d28377c496afc8ad64a2a1bc1d068b32dff2cda6 SHA512 25e856ba85868de2ed61e4b3b704118e2ab9771c9272670626ac0bb2e876793a0e80ebe3b49d5eebe78c57cd68879c55b537c4689dd866b5ae2349f4e94db0d1
-MISC metadata.xml 665 BLAKE2B e30c009a656ccd33080da9a63ef68797a70881ff88a16d8913feaea04861736c6a4d0f49645f1217974bd0382f0d7de889e98282ef799e21517d52ede3b2bb68 SHA512 5210762c246e48c97437d77b071f72d9b859203ae21e2644e1e2cbbc09cc7c0b6a5055d3b074cb8bc7b6b786b926b6123d4851a85ea0cbcd968913ed72865bc8
+EBUILD libvpx-1.9.0.ebuild 3505 BLAKE2B d680f2ffeff02eda59a858acde96a24e5a3e77576aa3e5abbd45664b01f186bf20d9f69976792a08553a8a9a348ed08abb860eacb395050182398a6495a4966f SHA512 a690c1fcad0f7daf7c772e4186216274c310151b9b4c135f65fecec91fe1e9628b70ea7dd82e05e9b06304f8bc8c32af4c0970755805ab852e3a9a26b984fa96
+MISC metadata.xml 597 BLAKE2B 1263453efd220f9f2f506be9e08199dffa817380e6c83766e60183c7d29bbe2fb7036f5c61a1bc0b0dd7361d26385a1bb153bd912d205bfcf75436006132911c SHA512 86bd27e8e07aee052c14373e0af5379926b492c92dbebcb168d3c12622a74db2fe26f67cfb27ec4ac46548a73de1f247cb233907bf9fc0a69171820e70f314ea
diff --git a/media-libs/libvpx/files/libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch b/media-libs/libvpx/files/libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch
deleted file mode 100644
index 623eccda902d..000000000000
--- a/media-libs/libvpx/files/libvpx-1.7.0-CVE-2019-9232_9325_9371_9433.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Backports of
-
-From 46e17f0cb4a80b36755c84b8bf15731d3386c08f Mon Sep 17 00:00:00 2001
-From: kyslov <kyslov@google.com>
-Date: Fri, 4 Jan 2019 17:04:09 -0800
-Subject: [PATCH] Fix OOB memory access on fuzzed data
-
-From 0681cff1ad36b3ef8ec242f59b5a6c4234ccfb88 Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Tue, 24 Jul 2018 21:36:50 -0700
-Subject: [PATCH] vp9: fix OOB read in decoder_peek_si_internal
-
-From f00890eecdf8365ea125ac16769a83aa6b68792d Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Tue, 11 Dec 2018 18:06:20 -0800
-Subject: [PATCH] update libwebm to libwebm-1.0.0.27-352-g6ab9fcf
-
-From 34d54b04e98dd0bac32e9aab0fbda0bf501bc742 Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-Date: Tue, 9 Apr 2019 18:37:44 -0700
-Subject: [PATCH] update libwebm to libwebm-1.0.0.27-358-gdbf1d10
-
-From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001
-From: Jerome Jiang <jianj@google.com>
-Date: Wed, 23 May 2018 15:43:00 -0700
-Subject: [PATCH] VP8: Fix use-after-free in postproc.
-
-to address CVE-2019-9232 CVE-2019-9325 CVE-2019-9371 CVE-2019-9433
-
-
---- a/test/decode_api_test.cc
-+++ b/test/decode_api_test.cc
-@@ -138,8 +138,30 @@ TEST(DecodeAPI, Vp9InvalidDecode) {
-   EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
- }
- 
--TEST(DecodeAPI, Vp9PeekSI) {
-+void TestPeekInfo(const uint8_t *const data, uint32_t data_sz,
-+                  uint32_t peek_size) {
-   const vpx_codec_iface_t *const codec = &vpx_codec_vp9_dx_algo;
-+  // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
-+  // to decoder_peek_si_internal on frames of size < 8.
-+  if (data_sz >= 8) {
-+    vpx_codec_ctx_t dec;
-+    EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
-+    EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM
-+                                    : VPX_CODEC_CORRUPT_FRAME,
-+              vpx_codec_decode(&dec, data, data_sz, NULL, 0));
-+    vpx_codec_iter_t iter = NULL;
-+    EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
-+    EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
-+  }
-+
-+  // Verify behavior of vpx_codec_peek_stream_info.
-+  vpx_codec_stream_info_t si;
-+  si.sz = sizeof(si);
-+  EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
-+            vpx_codec_peek_stream_info(codec, data, data_sz, &si));
-+}
-+
-+TEST(DecodeAPI, Vp9PeekStreamInfo) {
-   // The first 9 bytes are valid and the rest of the bytes are made up. Until
-   // size 10, this should return VPX_CODEC_UNSUP_BITSTREAM and after that it
-   // should return VPX_CODEC_CORRUPT_FRAME.
-@@ -150,24 +172,18 @@ TEST(DecodeAPI, Vp9PeekSI) {
-   };
- 
-   for (uint32_t data_sz = 1; data_sz <= 32; ++data_sz) {
--    // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
--    // to decoder_peek_si_internal on frames of size < 8.
--    if (data_sz >= 8) {
--      vpx_codec_ctx_t dec;
--      EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
--      EXPECT_EQ(
--          (data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_CORRUPT_FRAME,
--          vpx_codec_decode(&dec, data, data_sz, NULL, 0));
--      vpx_codec_iter_t iter = NULL;
--      EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
--      EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
--    }
-+    TestPeekInfo(data, data_sz, 10);
-+  }
-+}
-+
-+TEST(DecodeAPI, Vp9PeekStreamInfoTruncated) {
-+  // This profile 1 header requires 10.25 bytes, ensure
-+  // vpx_codec_peek_stream_info doesn't over read.
-+  const uint8_t profile1_data[10] = { 0xa4, 0xe9, 0x30, 0x68, 0x53,
-+                                      0xe9, 0x30, 0x68, 0x53, 0x04 };
- 
--    // Verify behavior of vpx_codec_peek_stream_info.
--    vpx_codec_stream_info_t si;
--    si.sz = sizeof(si);
--    EXPECT_EQ((data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
--              vpx_codec_peek_stream_info(codec, data, data_sz, &si));
-+  for (uint32_t data_sz = 1; data_sz <= 10; ++data_sz) {
-+    TestPeekInfo(profile1_data, data_sz, 11);
-   }
- }
- #endif  // CONFIG_VP9_DECODER
---- a/third_party/libwebm/mkvparser/mkvparser.cc
-+++ b/third_party/libwebm/mkvparser/mkvparser.cc
-@@ -5307,8 +5307,8 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
- 
-   const long long stop = pos + s.size;
- 
--  Colour* colour = NULL;
--  Projection* projection = NULL;
-+  std::unique_ptr<Colour> colour_ptr;
-+  std::unique_ptr<Projection> projection_ptr;
- 
-   while (pos < stop) {
-     long long id, size;
-@@ -5357,11 +5357,19 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
-       if (rate <= 0)
-         return E_FILE_FORMAT_INVALID;
-     } else if (id == libwebm::kMkvColour) {
--      if (!Colour::Parse(pReader, pos, size, &colour))
-+      Colour* colour = NULL;
-+      if (!Colour::Parse(pReader, pos, size, &colour)) {
-         return E_FILE_FORMAT_INVALID;
-+      } else {
-+        colour_ptr.reset(colour);
-+      }
-     } else if (id == libwebm::kMkvProjection) {
--      if (!Projection::Parse(pReader, pos, size, &projection))
-+      Projection* projection = NULL;
-+      if (!Projection::Parse(pReader, pos, size, &projection)) {
-         return E_FILE_FORMAT_INVALID;
-+      } else {
-+        projection_ptr.reset(projection);
-+      }
-     }
- 
-     pos += size;  // consume payload
-@@ -5392,8 +5400,8 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
-   pTrack->m_display_unit = display_unit;
-   pTrack->m_stereo_mode = stereo_mode;
-   pTrack->m_rate = rate;
--  pTrack->m_colour = colour;
--  pTrack->m_projection = projection;
-+  pTrack->m_colour = colour_ptr.release();
-+  pTrack->m_projection = projection_ptr.release();
- 
-   pResult = pTrack;
-   return 0;  // success
---- a/vp8/common/postproc.c
-+++ b/vp8/common/postproc.c
-@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source,
-   double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
-   int ppl = (int)(level + .5);
- 
--  const MODE_INFO *mode_info_context = cm->show_frame_mi;
-+  const MODE_INFO *mode_info_context = cm->mi;
-   int mbr, mbc;
- 
-   /* The pixel thresholds are adjusted according to if or not the macroblock
---- a/vp8/decoder/dboolhuff.h
-+++ b/vp8/decoder/dboolhuff.h
-@@ -76,7 +76,7 @@ static int vp8dx_decode_bool(BOOL_DECODER *br, int probability) {
-   }
- 
-   {
--    register int shift = vp8_norm[range];
-+    const unsigned char shift = vp8_norm[(unsigned char)range];
-     range <<= shift;
-     value <<= shift;
-     count -= shift;
---- a/vp9/vp9_dx_iface.c
-+++ b/vp9/vp9_dx_iface.c
-@@ -97,7 +97,7 @@ static vpx_codec_err_t decoder_peek_si_internal(
-     const uint8_t *data, unsigned int data_sz, vpx_codec_stream_info_t *si,
-     int *is_intra_only, vpx_decrypt_cb decrypt_cb, void *decrypt_state) {
-   int intra_only_flag = 0;
--  uint8_t clear_buffer[10];
-+  uint8_t clear_buffer[11];
- 
-   if (data + data_sz <= data) return VPX_CODEC_INVALID_PARAM;
- 
-@@ -158,6 +158,9 @@ static vpx_codec_err_t decoder_peek_si_internal(
-         if (profile > PROFILE_0) {
-           if (!parse_bitdepth_colorspace_sampling(profile, &rb))
-             return VPX_CODEC_UNSUP_BITSTREAM;
-+          // The colorspace info may cause vp9_read_frame_size() to need 11
-+          // bytes.
-+          if (data_sz < 11) return VPX_CODEC_UNSUP_BITSTREAM;
-         }
-         rb.bit_offset += REF_FRAMES;  // refresh_frame_flags
-         vp9_read_frame_size(&rb, (int *)&si->w, (int *)&si->h);
---- a/vpx_dsp/bitreader.h
-+++ b/vpx_dsp/bitreader.h
-@@ -94,7 +94,7 @@ static INLINE int vpx_read(vpx_reader *r, int prob) {
-   }
- 
-   {
--    register int shift = vpx_norm[range];
-+    const unsigned char shift = vpx_norm[(unsigned char)range];
-     range <<= shift;
-     value <<= shift;
-     count -= shift;
---- a/vpx_dsp/bitreader_buffer.c
-+++ b/vpx_dsp/bitreader_buffer.c
-@@ -23,7 +23,7 @@ int vpx_rb_read_bit(struct vpx_read_bit_buffer *rb) {
-     rb->bit_offset = off + 1;
-     return bit;
-   } else {
--    rb->error_handler(rb->error_handler_data);
-+    if (rb->error_handler != NULL) rb->error_handler(rb->error_handler_data);
-     return 0;
-   }
- }
diff --git a/media-libs/libvpx/libvpx-1.10.0.ebuild b/media-libs/libvpx/libvpx-1.10.0.ebuild
deleted file mode 100644
index 9cce08a6ecf0..000000000000
--- a/media-libs/libvpx/libvpx-1.10.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs multilib-minimal
-
-# To create a new testdata tarball:
-# 1. Unpack source tarball or checkout git tag
-# 2. mkdir libvpx-testdata
-# 3. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
-# 4. configure --enable-unit-tests --enable-vp9-highbitdepth
-# 5. make testdata
-# 6. tar -caf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
-
-LIBVPX_TESTDATA_VER=1.10.0
-
-DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://dev.gentoo.org/~whissi/dist/libvpx/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0/6"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc +highbitdepth postproc static-libs test +threads"
-
-REQUIRED_USE="test? ( threads )"
-
-# Disable test phase when USE="-test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/perl
-	abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
-)
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/ #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-	addpredict /session_mm_cli0.sem #nowarn
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	unset CODECS #357487
-
-	# #498364: sse doesn't work without sse2 enabled,
-	local myconfargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-pic
-		--enable-vp8
-		--enable-vp9
-		--enable-shared
-		--disable-optimizations
-		$(use_enable postproc)
-		$(use_enable static-libs static)
-		$(use_enable test unit-tests)
-		$(use_enable threads multithread)
-		$(use_enable highbitdepth vp9-highbitdepth)
-	)
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	tc-export AS
-	case "${CHOST}" in
-		i?86*) export AS=yasm;;
-		x86_64*) export AS=yasm;;
-	esac
-
-	# powerpc toolchain is not recognized anymore, #694368
-	[[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
-
-	# Build with correct toolchain.
-	tc-export CC CXX AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	if multilib_is_native_abi; then
-		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
-	fi
-
-	echo "${S}"/configure "${myconfargs[@]}" >&2
-	"${S}"/configure "${myconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# build verbose by default and do not build examples that will not be installed
-	# disable stripping of debug info, bug #752057
-	# (only works as long as upstream does not use non-gnu strip)
-	emake verbose=yes GEN_EXAMPLES= HAVE_GNU_STRIP=no
-}
-
-multilib_src_test() {
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
-	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
-	emake verbose=yes GEN_EXAMPLES= test
-}
-
-multilib_src_install() {
-	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc -r docs/html
-}
diff --git a/media-libs/libvpx/libvpx-1.7.0-r1.ebuild b/media-libs/libvpx/libvpx-1.7.0-r1.ebuild
deleted file mode 100644
index d91f9a9f7b52..000000000000
--- a/media-libs/libvpx/libvpx-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs multilib-minimal
-
-# To create a new testdata tarball:
-# 1. Unpack source tarbll or checkout git tag
-# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
-# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
-# 4. make testdata
-# 5. tar -cjf libvpx-testdata-${MY_PV}.tar.bz2 libvpx-testdata
-
-LIBVPX_TESTDATA_VER=1.7.0
-
-DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-	test? ( threads )
-"
-
-# Disable test phase when USE="-test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/perl
-	abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	doc? (
-		app-doc/doxygen
-		dev-lang/php
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/libvpx-1.3.0-sparc-configure.patch # 501010
-	"${FILESDIR}"/${P}-CVE-2019-9232_9325_9371_9433.patch
-)
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=384585
-	# https://bugs.gentoo.org/show_bug.cgi?id=465988
-	# copied from php-pear-r1.eclass
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/ #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-	addpredict /session_mm_cli0.sem #nowarn
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	unset CODECS #357487
-
-	# #498364: sse doesn't work without sse2 enabled,
-	local myconfargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-pic
-		--enable-vp8
-		--enable-vp9
-		--enable-shared
-		--extra-cflags="${CFLAGS}"
-		$(use_enable cpu_flags_x86_avx avx)
-		$(use_enable cpu_flags_x86_avx2 avx2)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable postproc)
-		$(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse3 sse3)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-		$(use_enable svc experimental) $(use_enable svc spatial-svc)
-		$(use_enable static-libs static)
-		$(use_enable test unit-tests)
-		$(use_enable threads multithread)
-		$(use_enable highbitdepth vp9-highbitdepth)
-	)
-
-	# let the build system decide which AS to use (it honours $AS but
-	# then feeds it with yasm flags without checking...) #345161
-	tc-export AS
-	case "${CHOST}" in
-		i?86*) export AS=yasm;;
-		x86_64*) export AS=yasm;;
-	esac
-
-	# powerpc toolchain is not recognized anymore, #694368
-	[[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
-
-	# Build with correct toolchain.
-	tc-export CC CXX AR NM
-	# Link with gcc by default, the build system should override this if needed.
-	export LD="${CC}"
-
-	if multilib_is_native_abi; then
-		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
-	fi
-
-	"${S}"/configure "${myconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# build verbose by default and do not build examples that will not be installed
-	emake verbose=yes GEN_EXAMPLES=
-}
-
-multilib_src_test() {
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
-	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
-	emake verbose=yes GEN_EXAMPLES= test
-}
-
-multilib_src_install() {
-	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc -r docs/html
-}
diff --git a/media-libs/libvpx/libvpx-1.9.0.ebuild b/media-libs/libvpx/libvpx-1.9.0.ebuild
index 32585b2f6260..70a6d2fe44fd 100644
--- a/media-libs/libvpx/libvpx-1.9.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.9.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/6"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc +highbitdepth postproc static-libs test +threads"
 
 REQUIRED_USE="test? ( threads )"
diff --git a/media-libs/libvpx/metadata.xml b/media-libs/libvpx/metadata.xml
index 994223d7cd1f..fd4d8b9106d1 100644
--- a/media-libs/libvpx/metadata.xml
+++ b/media-libs/libvpx/metadata.xml
@@ -11,7 +11,6 @@
 	<use>
 		<flag name="highbitdepth">Enable 10 and 12 bit support for VP9.</flag>
 		<flag name="postproc">Enable additional post processing filters</flag>
-		<flag name="svc">Enable spatial-svc support (experimental)</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:john_koleszar:libvpx</remote-id>
diff --git a/media-libs/libzen/Manifest b/media-libs/libzen/Manifest
index 0a20f1c40aa0..a93f4e0ba760 100644
--- a/media-libs/libzen/Manifest
+++ b/media-libs/libzen/Manifest
@@ -1,3 +1,5 @@
 DIST libzen_0.4.38.tar.bz2 129706 BLAKE2B 3e40e31663f655885f47b7674936a765cce032da25fcc3f57604b116414bf4348db363a4745bf98126879de9d2de5d4443af1fe3a1f64a7bafd3525eb1ca38da SHA512 d946cd2349848925e13a3fb6aab5ad4f5aca28bc89b3263faca3096d7bbcae3a4ff9ed2552bf005b4ca1f4c8c8f59856f4c4aafa7c734ecebd078e6fc40a9a0b
+DIST libzen_0.4.39.tar.bz2 129816 BLAKE2B ff3ffe1b53234e567be12e86deb5dddd54584c112d297bd50764a980f4a3bcd51a08af630d482cca3157fcc9b8452f644807d6055d88420dcc6c311725ed402d SHA512 f261a676cbde9a877b85df536306a035ede1acdc5d827049698d19b3ecd8a65e5f6cfe66851fda034e1b31c95f6d6e82b78b0bc35989ec1568a010fb88a5a2d8
 EBUILD libzen-0.4.38.ebuild 1286 BLAKE2B 7f666b78875bc270bfa1d6dae4863e4975a373ad817fd5ca6fa7c2a3acf340759360a0a8ee4a3f3921c71a19f6da10f0a1ce24e1c74e16deef8c5226e40afcbd SHA512 5f7e0a4cb84edbf021e06e6b0fad7ba3f9c23940b0fa4fb8d7f1abf1d10121fba40b9a1f732f662bc3b74ed810cf41939d3bdb19e24f2c5026d82524f29873c2
+EBUILD libzen-0.4.39.ebuild 1289 BLAKE2B ba69168321b49bce391b6d77bbe347c36f1187a4ffe68ae73553c5a4e9b3f919effbefaccf7897546aaa20bb6bb984a91bfdfa99c3316038ccbd3a1c06194382 SHA512 ebaf7173d0fc753ec01090fef8339759e361b32793a0493bef019d041a273eace4a5bf14bebde93ef59a5b5f845a4202fe6f9d610c0a46a5e3160004cf53defb
 MISC metadata.xml 392 BLAKE2B a57d4f857e1716b904183c862184654212a31e3d3ce089891f85c88b627b9a4b956d542c434e9565843b582e9f35c9e5fc8d4c14b647131c9bf239c383df9bba SHA512 77eff51f73560975ee03ea94a3d0880ad8adb4c6a2ae4930d986436562fcafa09677d18843c2dac366b74e8233f7a900f8ae74b7b82335c8b4067a703f6b3d6b
diff --git a/media-libs/libzen/libzen-0.4.39.ebuild b/media-libs/libzen/libzen-0.4.39.ebuild
new file mode 100644
index 000000000000..f4c444cbce43
--- /dev/null
+++ b/media-libs/libzen/libzen-0.4.39.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN="ZenLib"
+DESCRIPTION="Shared library for libmediainfo and mediainfo"
+HOMEPAGE="https://github.com/MediaArea/ZenLib"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_PN}/Project/GNU/Library
+
+src_prepare() {
+	default
+
+	sed -i 's:-O2::' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-unicode \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		cd "${WORKDIR}"/${MY_PN}/Source/Doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	default
+
+	# remove since the pkgconfig file should be used instead
+	rm "${D}"/usr/bin/libzen-config
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	for x in ./ Format/Html Format/Http HTTP_Client ; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}/Source/${MY_PN}/${x}/*.h
+	done
+
+	dodoc "${WORKDIR}"/${MY_PN}/History.txt
+	if use doc ; then
+		docinto html
+		dodoc "${WORKDIR}"/${MY_PN}/Doc/*
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 659da8af06fb..d168cdc5b253 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,3 +1,3 @@
 DIST lv2-1.18.2.tar.bz2 538345 BLAKE2B 824c7bc2ce62de858308d856d0f89c6285c183764be3727eba5074f42543a1bb8a5e1cdd8a85bf0a4ba1103e1243c843013bd516d2d6e7ade09c46380bca3cee SHA512 d5bdcf94d3cf9a569e29964002a038ae73cd6ae7f09f7d973f8fd74858c8cf9d01bbed85ae8bf0a00efcb2b3611357a64571222a89972091941449c36d76b0ef
-EBUILD lv2-1.18.2.ebuild 1351 BLAKE2B aed3b80bd3e44053a840f12880c29fb35cbec56b65a6d7d4fd6a029e3ba9cfaf97a284755f36bc2f0ae77a2a54e3e12528e01cf19ff3a6c74f1173bb73cff19b SHA512 0de0b39cb1291003b15e6839c111eff8850fc2c171ce1e616f28f82e98b11f65bcded5e48b9d4d27a580f2513bc8d4d4d2948648941efcf7f2fa4259ff6dd1f6
+EBUILD lv2-1.18.2.ebuild 1353 BLAKE2B 2570bea49f79de9acefa1539f19788fb2129e59375491d0802e6070ed766e9d48d77e04c21e6f64e354d23e31487738d1448f696ba2ef15da0a7b2d6d89b5c4a SHA512 51bfeb0cc93da2ee4dfd9af0109983e7118641e340060d0a142b79615a78ab8053d581c4044c42ef25dd1a5188057504e2c3a0297171237aab5e45bb2ed3268c
 MISC metadata.xml 341 BLAKE2B 041aa9ea5ba80d8639da9242b14896da75fe648666ec6f4a59de8449a2daf7c741a05187e3265da96c8032ca0ae5a1430dc516fd667b9a0826d561462b5079ca SHA512 7a949f5da6524129d3edbde9917ae3a996b67a36d362a1bbba8a842d70eacb3d3cc5040a62a4daddfd776733635e49b5e70d02001d2a0bf09e9421fc22f3b894
diff --git a/media-libs/lv2/lv2-1.18.2.ebuild b/media-libs/lv2/lv2-1.18.2.ebuild
index 7c9f510ca0a5..515e321d0440 100644
--- a/media-libs/lv2/lv2-1.18.2.ebuild
+++ b/media-libs/lv2/lv2-1.18.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 442582a73330..96e46cdc60b4 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,9 @@
-DIST mesa-21.3.7.tar.xz 16569592 BLAKE2B 7c5a3f144b1ce9e8bbb3560ae2bf46afda9d5c4a3e7b825d406f9a5090dfd51e2b3cc6ee2c10df09c817f5836ffbd09bfc86fbaf63bcc907caef290fd44baee6 SHA512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88
 DIST mesa-21.3.8.tar.xz 16593540 BLAKE2B 89a471af3354ae0cf0597c1b6bcd2aff8074d58c16504154291f86cd9a9701f98883cf1077f60a8f17d24be800691a5bfb7ef4ddb10dfa355181bf87805b660c SHA512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9
-DIST mesa-22.0.0.tar.xz 15565680 BLAKE2B 65dd09e1864f353f07ab01cb21cb89f858a071d74043b1913b0abe3ee3b3a992ca3878d40ffe52cc45546770d5ad9e198c93a24a8564ffeb9c8a05da38af300c SHA512 9faef66adbacba24d11dfe8e2d1a753295798883a10a7cc91e6df9d678c64a8286a12e60c0d8576d944a8cc76f00c30d27c3a71d3458bbe3dbcd66c88a454c3b
-DIST mesa-22.0.1.tar.xz 15634448 BLAKE2B c102643a81f47b36da24148564968dd5578b01970d14769eeb501d00ba43f49052893625ac7a8d67638f3d9bfe610440f300eb5657322387d8e5dc15b62f13b2 SHA512 cc8012b8f3fcbecfbb153d0e009e6522c3776023501da8499c06f1eaa9ab0a555ca597e16e4d7a2b954b05c8c0737ae6567e0d8549fb63aa86ae587eb31cd01e
-EBUILD mesa-21.3.7.ebuild 15192 BLAKE2B 647d7b0865d39dd575ae9264cbcdbc07c6f92cda7d8dacbb5ce6bb5c92f0c0b38f322536e486802c8911415ed0e40ad14467bc900d9983e22b917ef1a3c4e75a SHA512 59ed639bd6904ee343f5297bc755ab9bc0dec759459f5b20c7a36c3abc7a3dbb349caca46b7c81909d8d9f0b317525973a24a0486291feeb47356d0d0718606d
-EBUILD mesa-21.3.8.ebuild 15216 BLAKE2B cdbff5f19caf5e784e950f306374d10f2ed61a2ba0b13c7970be201b4c84701bc42a66ec6c45c4701a54e23e1c44072a2c285b33d2d34f6c0e858894cc13eb5b SHA512 4c2eb36699727015f9f1251cf66e0c350f2659c8f91aa0ac3485e1c1c2d2f6d6cfac5a23bdacc1d6acbfc18d74a58b24b417eaa6570dda8df0381043d453217a
-EBUILD mesa-22.0.0.ebuild 12072 BLAKE2B 641589a121140b79cb48fdb9b56c92dea7843f72fa68e0916f39b966985b5884e18e1d734cd65780f7b6b2c7af3b4c60d34320766fe7c929d467ea5308c191dd SHA512 ffc2387028e069ceb90a15dbeac67e88d4597a87ea04b04cb36e7efafccd1e742b6b53c2c3a0c466991b0f9c4a559d18b0fe567f8db8c19fbe30d2cded66af62
-EBUILD mesa-22.0.1.ebuild 12072 BLAKE2B 641589a121140b79cb48fdb9b56c92dea7843f72fa68e0916f39b966985b5884e18e1d734cd65780f7b6b2c7af3b4c60d34320766fe7c929d467ea5308c191dd SHA512 ffc2387028e069ceb90a15dbeac67e88d4597a87ea04b04cb36e7efafccd1e742b6b53c2c3a0c466991b0f9c4a559d18b0fe567f8db8c19fbe30d2cded66af62
-EBUILD mesa-9999.ebuild 12072 BLAKE2B 641589a121140b79cb48fdb9b56c92dea7843f72fa68e0916f39b966985b5884e18e1d734cd65780f7b6b2c7af3b4c60d34320766fe7c929d467ea5308c191dd SHA512 ffc2387028e069ceb90a15dbeac67e88d4597a87ea04b04cb36e7efafccd1e742b6b53c2c3a0c466991b0f9c4a559d18b0fe567f8db8c19fbe30d2cded66af62
-MISC metadata.xml 1848 BLAKE2B d08b83f9a7b14353998d07602583ed2f8c4208b03562a0b1c45fc0d4e1ef40787ed2b37b512557af48f00b08e7ea8db65091cd6c01bdfc6c3e1f497e44268cdb SHA512 2076fd824999959ec819bf7aad9a33fe00419e8ae9f91b9ea70440538f8f2c30d9e934973c80883515479dddd038443257dcf960c566d66421f86898c79fbe94
+DIST mesa-22.0.3.tar.xz 15711916 BLAKE2B 2ecf9bc2293861e93abcc66cd5df6651a9eb7e533573273063df76ef01d0a39d6097c7a49ec682439bd6f4f0dfd55cd8e61051a731405759174c55b91dbd7725 SHA512 3982cd2fadca5349b2513885ed734c2422e3f2dced85f471f245b120ffaf018acafcd929dc5ec317f2c568bb5f619f5a3475d3a92495f766a2eefb225efcac14
+DIST mesa-22.1.0-rc4.tar.xz 15852292 BLAKE2B 87b18ab81f58e7778fa0df902a6f020bf9e0e910be7ddc2d7d4af72c68211b7543be8f123a2952c0d640e5c13a277a0ce72c9163d61e7286159ba31ac8854c46 SHA512 755027304eef52b88da94e035c391ed75cdf780099fb5d2c0e4e48b69da3713a9250ba29bbea4e468f280f5112b975cd49fe11a7a89b957c30071bfb0151fc6d
+EBUILD mesa-21.3.8-r1.ebuild 4982 BLAKE2B a89e25f87c48d8302b4bca26451bf666bb85a1f708874adba1339ead52ccd934f536a78119654b26edfe418f3a8e290a7f9455f046d3f0f8e6035bb6e1bb33f9 SHA512 648c855fa7bb2e3fd7edf7d367436f79e862cd2f4ea0ba498f9b49b20ed02c52e07dd21f9a8234f4ac245291fe4e6e9d1ed7fa3ba504b157ea82c7bda2ee9034
+EBUILD mesa-21.3.8.ebuild 15208 BLAKE2B e383920612d00be64c1f03c445c0e02ebe59fdd03aad6dd6df2d7498f9168ae292e9356ff109bb1c9843b0ecd3c1dfef4b213d54a2b84104779a5759bb410169 SHA512 fe018844f36039c46d1d7a0f85c7756d7b90ea43aa60acb0ae6e728455998e4120ed410ce184161d89cd2e7467166d483d03cf0bd5b31033f4971d53f6cc168b
+EBUILD mesa-22.0.3.ebuild 12028 BLAKE2B a9e1c080ffba65ba3572dc2c5dff05686a425627dc0f152276bf4b4c35d2869927208b2d114fba91e8d36a0567030e420a18b71a21d961e599195993e450c151 SHA512 aadce9e16804098d560985c0084cb3340858325bc3d64ea5e3bab3797b9f5e1944e4bf8bef3e970baad5a61cecc1c0f53741dda7a0306dc62b8258dd7473d7bd
+EBUILD mesa-22.1.0_rc4.ebuild 12079 BLAKE2B ef06ee48009df2890208ede0f404e69df0592fa889c7de6ba392d3ea5405ce2f56f80a7d74891f78c72a2902f7ba27d30a90d9cdd4595b31955a8b0b9678355f SHA512 66bd17f3913468b6e6b9dcc5e3010ab5b19a81eb97d6633e5aef220a6a4964a0c3c1cc29acd28c727f3a4bfd8d784a87df975a404ad81b5f67b5fcea9e8a2323
+EBUILD mesa-9999.ebuild 12181 BLAKE2B b11c4aaeb03b375af654d5fd43dce4f25f2c59824baf597ef1d39295e063b3ea5df9e87740aa840b2bf80b746fb89ae9a1db701afa0d0573dade2b63b050066f SHA512 5c1587ac5bf4c73d5eddd35ff6ed34c84a022dad319335f446708c341d0054005f4857d4a056e1dfdbe08483c54da6934e085595279dc541f2cdc87d113fd6ff
+MISC metadata.xml 1950 BLAKE2B c6d41161e75c88313936009bb7ecc137a22fe7b4c177ca9453f30b5b9e06945e92d11d1c6886a4811dd8772af0ba71b5d4287440f6c9306735129a95d7429b7b SHA512 6073cd6191c9044214bb76297aeb59fce73746b3b382500cbae4ef28f77d9c7cb9383a20ad49503d218f8207dc3c43438de1ba684d40d96469bccc689950c330
diff --git a/media-libs/mesa/mesa-21.3.7.ebuild b/media-libs/mesa/mesa-21.3.7.ebuild
deleted file mode 100644
index f94b6c9c9f55..000000000000
--- a/media-libs/mesa/mesa-21.3.7.ebuild
+++ /dev/null
@@ -1,560 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	osmesa? ( gallium )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_crocus? ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable -- swrast
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_crocus crocus
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		$(meson_use video_cards_crocus prefer-crocus)
-		$(meson_use video_cards_iris prefer-iris)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-21.3.8-r1.ebuild b/media-libs/mesa/mesa-21.3.8-r1.ebuild
new file mode 100644
index 000000000000..8174164bb866
--- /dev/null
+++ b/media-libs/mesa/mesa-21.3.8-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="amber"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r100 r200 radeon"
+VIDEO_CARDS="${RADEON_CARDS} i915 i965 intel nouveau"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 debug gles1 +gles2 selinux test valgrind wayland +X
+	+zstd"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+RDEPEND="
+	!<=media-libs/mesa-21.3.8
+
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_nouveau?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib/libGLX_amber.so.0.0.0
+)"
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	if use video_cards_i965; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	# Intel code
+	dri_driver_enable video_cards_i915 i915
+	dri_driver_enable video_cards_i965 i965
+	if ! use video_cards_i915 && \
+		! use video_cards_i965; then
+		dri_driver_enable video_cards_intel i915 i965
+	fi
+
+	# Nouveau code
+	dri_driver_enable video_cards_nouveau nouveau
+
+	# ATI code
+	dri_driver_enable video_cards_r100 r100
+	dri_driver_enable video_cards_r200 r200
+	if ! use video_cards_r100 && \
+		! use video_cards_r200; then
+		dri_driver_enable video_cards_radeon r100 r200
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		-Damber=true
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=enabled
+		-Dgbm=enabled
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		-Dglvnd=true
+		-Dosmesa=false
+		-Dllvm=disabled
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+multilib_src_install_all() {
+	# These are provided by media-libs/mesa:0
+	local files=(
+		"${ED}"/usr/lib*/libgbm.so*
+		"${ED}"/usr/lib*/libglapi.so*
+		"${ED}"/usr/include
+		"${ED}"/usr/lib*/pkgconfig
+		"${ED}"/usr/share/drirc.d/00-mesa-defaults.conf
+	)
+	rm -r "${files[@]}" || die
+
+	# Move i915_dri.so -> i915c_dri.so to not conflict with media-libs/mesa:0.
+	for dridir in "${ED}"/usr/lib*/dri; do
+		if [[ -e ${dridir}/i915_dri.so ]]; then
+			mv ${dridir}/i915{,c}_dri.so || die
+		fi
+	done
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-21.3.8.ebuild b/media-libs/mesa/mesa-21.3.8.ebuild
index 082bfd9f9739..3175801c7230 100644
--- a/media-libs/mesa/mesa-21.3.8.ebuild
+++ b/media-libs/mesa/mesa-21.3.8.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-22.0.0.ebuild b/media-libs/mesa/mesa-22.0.3.ebuild
index 15b5138f55fb..844f0e338d37 100644
--- a/media-libs/mesa/mesa-22.0.0.ebuild
+++ b/media-libs/mesa/mesa-22.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -116,7 +116,6 @@ LLVM_DEPSTR="
 	|| (
 		sys-devel/llvm:13[${MULTILIB_USEDEP}]
 		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
 	)
 	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
diff --git a/media-libs/mesa/mesa-22.0.1.ebuild b/media-libs/mesa/mesa-22.1.0_rc4.ebuild
index 15b5138f55fb..47832d49429b 100644
--- a/media-libs/mesa/mesa-22.0.1.ebuild
+++ b/media-libs/mesa/mesa-22.1.0_rc4.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -49,7 +49,7 @@ REQUIRED_USE="
 	zink? ( vulkan )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
 RDEPEND="
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
@@ -111,12 +111,12 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 10.
 # 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
+LLVM_MAX_SLOT="14"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:14[${MULTILIB_USEDEP}]
 		sys-devel/llvm:13[${MULTILIB_USEDEP}]
 		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
 	)
 	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 15b5138f55fb..1946beb71fda 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -34,7 +34,8 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	lm-sensors opencl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
 	vulkan-overlay wayland +X xa xvmc zink +zstd"
 
 REQUIRED_USE="
@@ -49,7 +50,7 @@ REQUIRED_USE="
 	zink? ( vulkan )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
 RDEPEND="
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
@@ -111,12 +112,12 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 10.
 # 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
+LLVM_MAX_SLOT="14"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:14[${MULTILIB_USEDEP}]
 		sys-devel/llvm:13[${MULTILIB_USEDEP}]
 		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
 	)
 	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
@@ -434,6 +435,7 @@ multilib_src_configure() {
 		$(meson_feature zstd)
 		$(meson_use cpu_flags_x86_sse2 sse2)
 		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
 		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
 		--buildtype $(usex debug debug plain)
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 2b18aba1b084..ccfa51c3b7c0 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="lm-sensors">Enable Gallium HUD lm-sensors support.</flag>
 		<flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
 		<flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
+		<flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag>
 		<flag name="valgrind">Compile in valgrind memory hints</flag>
 		<flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 		<flag name="vulkan">Enable Vulkan drivers</flag>
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 625efcf93a0e..a2e62a1b0446 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,6 +1,9 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
 AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f
+AUX mlt-7.6.0-impl-func-decl-gps_parser.patch 521 BLAKE2B f5d3044b801b3b733d2c0221a59f709e960e4f03e7c4247b442358c1f2b99f31df7cc79f71d165921b849d7a641bc194f62e45f70c5164432b0bfe3a8cd33aae SHA512 32da3e14d79602b6e3ac5aca5f27597c73af498966925c1ac6812af8bac84444437466bcdf930855d9a465a290b5c88d8f939b0fa3643a6ff690c79e1d5d2f05
 DIST mlt-7.4.0.tar.gz 1206316 BLAKE2B 56e6ea7a5545b80de45cffd206e555a577ada8e59f9b63c6487491e130ba7e4fdca5dc1b3836fcff22d49b6dcb048779dc8db1e9888b1137653c80196bdb81e2 SHA512 e9a65e76ca0a2464fb923d19d6f21bd49f13d637b0a974eeeb1e123ab753914d742e373f9fdcfe07cdeb9f39ebd2f0dde75a7299c0b6cd4807ee48ec710b3fd4
+DIST mlt-7.6.0.tar.gz 1217853 BLAKE2B 5faa8ad518871d8d690cd0c018bebfa258daef03cf0d95cda1aeb21848ee008ec5e5e2a76ab52085cdd11b7f60f9c3248eedc05779a84d0cb33118ef98154374 SHA512 203ea7184e03246a8fcf7d284c7c7b26f57ab27867e97c43d9cf26c3906f6358f361d95593aa47abe79654106b934ffe997335304df967a40742ba060d2e4f38
 EBUILD mlt-7.4.0.ebuild 3596 BLAKE2B 215102d8ca8e712d0f90d7ecb67a8b60d0e6c152475816e788a7d4601ea7fda06e6e6a9ad7ff05a43ecf8c9c0eb741c7365968b5d4ed834639418f39f7079cd5 SHA512 0ff79cba34831b6ad96815703934369d79e42dc153dd96c7b839333752421ae0df45d5bcfd4ed6dd8be2ac102c2f31c772b2587fa3bce734e5dae6404dba8243
+EBUILD mlt-7.6.0.ebuild 3651 BLAKE2B 359b496434049d2e2c45fc0400a95920e27dfd7c31ccd67e3a21648eeb66d99c19fc5b5b93c6689b35517823088ff12f01d12ae3253a19715805d4406f5976b9 SHA512 fc5aac607caf06a58a78a81959828bce0170c22265f58d9a2f0b67fd7d5ffef50ed8f329e21ccde5010a3378553fb6522df7ce8cf1f65bd7b2ef2447e6840703
 MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd
diff --git a/media-libs/mlt/files/mlt-7.6.0-impl-func-decl-gps_parser.patch b/media-libs/mlt/files/mlt-7.6.0-impl-func-decl-gps_parser.patch
new file mode 100644
index 000000000000..7961d3118b79
--- /dev/null
+++ b/media-libs/mlt/files/mlt-7.6.0-impl-func-decl-gps_parser.patch
@@ -0,0 +1,19 @@
+https://github.com/mltframework/mlt/commit/ec02baf63fd062c1b2492de6aef17ff600f08571
+https://github.com/mltframework/mlt/issues/788
+
+From: Dan Dennedy <dan@dennedy.org>
+Date: Thu, 28 Apr 2022 21:20:44 -0700
+Subject: [PATCH] fix #788 compile warning
+
+--- a/src/modules/xml/gps_parser.c
++++ b/src/modules/xml/gps_parser.c
+@@ -17,6 +17,9 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#define __USE_XOPEN
++#define _GNU_SOURCE
++
+ #include "gps_parser.h"
+ #include <inttypes.h>
+ 
diff --git a/media-libs/mlt/mlt-7.6.0.ebuild b/media-libs/mlt/mlt-7.6.0.ebuild
new file mode 100644
index 000000000000..d55bd87549e8
--- /dev/null
+++ b/media-libs/mlt/mlt-7.6.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit python-single-r1 cmake
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Needs unpackaged 'kwalify'
+RESTRICT="test"
+
+# rtaudio will use OSS on non linux OSes
+# Qt already needs FFTW/PLUS so let's just always have it on to ensure
+# MLT is useful: bug #603168.
+DEPEND="
+	>=media-libs/libebur128-1.2.2:=
+	sci-libs/fftw:3.0=
+	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		virtual/jack
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	opencv? ( >=media-libs/opencv-4.5.1:=[contrib] )
+	opengl? (
+		media-libs/libglvnd
+		media-video/movit
+	)
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		x11-libs/libX11
+	)
+	rtaudio? (
+		>=media-libs/rtaudio-4.1.2
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	rubberband? ( media-libs/rubberband )
+	sdl? (
+		media-libs/libsdl2[X,opengl,video]
+		media-libs/sdl2-image
+	)
+	vidstab? ( media-libs/vidstab )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )
+"
+#	java? ( >=virtual/jre-1.8:* )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	ruby? ( ${RUBY_DEPS} )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0 )
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
+	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
+	"${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch
+	"${FILESDIR}"/${P}-impl-func-decl-gps_parser.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	if use python; then
+		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/python/build || die
+		python_fix_shebang src/swig/python
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DGPL=ON
+		-DGPL3=ON
+		-DBUILD_TESTING=$(usex test)
+		-DMOD_KDENLIVE=ON
+		-DMOD_SDL1=OFF
+		-DMOD_SDL2=$(usex sdl)
+		-DMOD_AVFORMAT=$(usex ffmpeg)
+		-DMOD_PLUS=ON
+		-DMOD_FREI0R=$(usex frei0r)
+		-DMOD_GDK=$(usex gtk)
+		-DMOD_JACKRACK=$(usex jack)
+		-DMOD_RESAMPLE=$(usex libsamplerate)
+		-DMOD_OPENCV=$(usex opencv)
+		-DMOD_MOVIT=$(usex opengl)
+		-DMOD_QT=$(usex qt5)
+		-DMOD_RTAUDIO=$(usex rtaudio)
+		-DMOD_RUBBERBAND=$(usex rubberband)
+		-DMOD_VIDSTAB=$(usex vidstab)
+		-DMOD_XINE=$(usex xine)
+		-DMOD_XML=$(usex xml)
+		-DMOD_SOX=OFF
+	)
+
+	# TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2
+	# TODO: add swig language bindings?
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	if use python; then
+		mycmakeargs+=( -DSWIG_PYTHON=ON )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	#
+	# Install SWIG bindings
+	#
+
+	docinto swig
+
+	if use python; then
+		dodoc "${S}"/src/swig/python/play.py
+		python_optimize
+	fi
+}
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
index 4231dddbf11e..219108d43a5d 100644
--- a/media-libs/munt-mt32emu/Manifest
+++ b/media-libs/munt-mt32emu/Manifest
@@ -1,7 +1,4 @@
-AUX munt-mt32emu-2.4.2-docs.patch 518 BLAKE2B 15ed5513d3ef11dbfdd9304a1295d82b3e54f223dcf448285392c9cdc24635c5823a8b5ad4b0954908627ba2ebd450e2f849a9cd725fd78b70e578d0a3d68c43 SHA512 2a1ba4731a13c2f54d5eccad6971b0544b75787df922d31ab2ae68471f078e0585d2c386f09461b89db38fa2bf57b2e402ad98c07f6d5773fbd93856d1c27d6d
 AUX munt-mt32emu-2.6.1-docs.patch 527 BLAKE2B dd86c30bddab89a25eecb158cebc7370d0df1bdea2cf5fcf3a8dcb4d39573bd3f3c22c8877461dd793dab75fd47d87ab1cff3ab1b7025f3adbfa0e7905acb959 SHA512 23696b724b8fc11a6b392653382e31237593428ec661bff77c85135f8f9dc44d2e7e8fb62a32c1ac558978d6b1264990bff28dc64fba51a5f44522bd8ed9a8c5
-DIST libmt32emu_2_5_3.tar.gz 527698 BLAKE2B 1ca31f2da92d77f9c3d34bb8c9f19e34e83cc82751ba08dfda1240a28b49e36c2acf3a6d8aab6e62107df4d88645e77d447e332968007fe865882d54e71475de SHA512 c801e22e861898281316109533ca6264f5a9cf778d4f0bb14b49bb6d04d53b7e60cd8320d5b29a63534f6c470b4feb67c881e86c49b7860a98639ce01b99debf
-DIST libmt32emu_2_6_1.tar.gz 572860 BLAKE2B 3ba8ec7d9b73a83341eafc990e2c5a2c5c439564ad43ac3d6f9ab3325225c863418fd901e5424e57343b40cb8cc873345003fd299d6a22d02ff3872681ff164e SHA512 888c417cce04b31b45858220a6615105611471567be8cce91c2053885c4b677a09667310bfab702bbf62f4b7230bb7c2357cb480087f6e4daecbd58e464e4212
-EBUILD munt-mt32emu-2.5.3-r1.ebuild 684 BLAKE2B 8ecf48e04870afd899d5ec983188095e240a031d2dca08df1e9c175d4d4cc59e9978a3f8d2cfeceeadf2e0dd6fda17a6d792adacb5c8272af982e544353ef3f4 SHA512 ba6776449ec18ecca8c6d8f9ee48449dcc0055784f6a79277f62f3a2ac69b6b1bf5fd65db40154f65ae910b19ae9144b6fdb5b0ea6a5830101f3622a5f43b83b
-EBUILD munt-mt32emu-2.6.1.ebuild 684 BLAKE2B d7f4d5cbc4246c1c3bce9595222cc4fde6c7bd506877d9fcab6f4d0291a094b68a371ece3c8bfdd79fb15c05c4347da583fc05858c25590fe5bbb81af5145d05 SHA512 0a509e89a6b852c9bbf45375cbbe596e7f6e3dbf3e1616968d60c94a0f1eff075068c5c24e1a13496e666d96b5b7c5da48649ae4707abce668523a6bf0936696
+DIST libmt32emu_2_6_3.tar.gz 573978 BLAKE2B 74f838380824cb334df2f2ef56709585e0cffd0ef4e317554f7df434b0c945eb0a18a994130766b3a5401abbbefe70df0be32c690ef8b21bcc3ac604291b020d SHA512 c81b80d63e7da5f57465ea09a0b7d9415591e30a4eb8797210d6409f7b985eec0f0fcff8b1d5d9e0f51805f5e0692c660a435c12ca5e0670c11d24cf0a327a24
+EBUILD munt-mt32emu-2.6.3.ebuild 684 BLAKE2B d7f4d5cbc4246c1c3bce9595222cc4fde6c7bd506877d9fcab6f4d0291a094b68a371ece3c8bfdd79fb15c05c4347da583fc05858c25590fe5bbb81af5145d05 SHA512 0a509e89a6b852c9bbf45375cbbe596e7f6e3dbf3e1616968d60c94a0f1eff075068c5c24e1a13496e666d96b5b7c5da48649ae4707abce668523a6bf0936696
 MISC metadata.xml 621 BLAKE2B 52ec37202ec80fc7b37c23087264133c670058b8ae6428377abbccd7b7728314463b13b42f85abbe6b7befdb66a2447d5bb4614767ae94769ae850547c0ec18c SHA512 20c482a847d5b9511d54765ff0d7a8b634a5f5f14e4f0a2abdcc8fea4a424836ff80b7526ebfb39ccf2c848ce02bd52eb7b3088fedfde5b5760f5f9b0bf113c4
diff --git a/media-libs/munt-mt32emu/files/munt-mt32emu-2.4.2-docs.patch b/media-libs/munt-mt32emu/files/munt-mt32emu-2.4.2-docs.patch
deleted file mode 100644
index df84d643762a..000000000000
--- a/media-libs/munt-mt32emu/files/munt-mt32emu-2.4.2-docs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --color -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2021-01-17 13:16:00.000000000 +0000
-+++ b/CMakeLists.txt	2021-01-30 22:56:28.027134357 +0000
-@@ -261,8 +261,8 @@
- 
- if(libmt32emu_PACKAGE_TYPE STREQUAL "Runtime" OR NOT libmt32emu_PACKAGE_TYPE STREQUAL "Devel")
-   install(FILES
--    AUTHORS.txt COPYING.txt COPYING.LESSER.txt NEWS.txt README.md TODO.txt
--    DESTINATION share/doc/munt/libmt32emu
-+    AUTHORS.txt NEWS.txt README.md TODO.txt
-+    DESTINATION share/doc/$ENV{PF}
-   )
- endif()
- 
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild
deleted file mode 100644
index ccfcba7eded4..000000000000
--- a/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P="libmt32emu_${PV//./_}"
-DESCRIPTION="Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
-HOMEPAGE="https://github.com/munt/munt"
-SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/munt-${MY_P}/mt32emu"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.2-docs.patch
-)
-
-src_configure() {
-	local libdir=${EPREFIX}/usr/$(get_libdir)
-
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${libdir}"
-		-Dlibmt32emu_PKGCONFIG_INSTALL_PREFIX="${libdir}"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.6.1.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.6.3.ebuild
index 4a07225533b4..4a07225533b4 100644
--- a/media-libs/munt-mt32emu/munt-mt32emu-2.6.1.ebuild
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.6.3.ebuild
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 02aef3cc5842..356bfe532039 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -9,5 +9,5 @@ DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46
 DIST netpbm-10.86.30.tar.xz 3692036 BLAKE2B 2529adfe7f93cf2400547c107cf04b03478aef95bce6573195a6a9e20767b04371bcff13744aa547885ffa3137d948076de01ad0a979f4464c13e3fdeeb37bf7 SHA512 7643b279c59717b30130e7178be82638085d2ae28c0cea8c7595f5ff3a1cd3c5dd0201a051bed8997f8a8354b5eeb08949d4e8587d3e807df7859a4cb1a44534
 EBUILD netpbm-10.86.24-r1.ebuild 5853 BLAKE2B 8ab739e81bee65f04f0f3468468c8193136781326bfff3efaadcb335d529fef3761d61e43ac8e7815700080568e097e0f61529d80363f2c404d77d6bd31c0920 SHA512 365e21e054dac809d2590d60700d8425e611fcaae2e73d07b084a7254b2f05911514fbbbbaadeb0ee05ac7a3fc2e7a7f2b845b62fb1fd569b0d7b435e4ba34ea
 EBUILD netpbm-10.86.27.ebuild 5980 BLAKE2B 4d7ce3a06f36b2b2f9ae01609c9cb260047911f59eb0ddcdb01696c9f5d689850df3206472724c916001e5b26e50666d336e417a52be069c852c4781e98b4e87 SHA512 1638dd2207a544f7ccc1ad54473f0ca19ca057a1f88f14183c875fd52414e16244f49d7ecd4d8a89f4e88c0148576992181ae4a9ee7c4b36b56538f1de4798c8
-EBUILD netpbm-10.86.30.ebuild 5863 BLAKE2B 5c53e0e2e9b273966cd7cbac3e304da38e7ddefc4540136198d4dbabe7930dcda963a2257c1e8e1f43031fe96035aa30f06db3160616232e8fa97e426f1348af SHA512 9a6023c5711328028ad50d83c7a420c8af274748f23b57f6762faea1d9853f5535570196461b5ee57e79cf43b55a3f0d9afd23137ba3850199753909a4f8ff13
+EBUILD netpbm-10.86.30.ebuild 6019 BLAKE2B 7d764380cd8b12369e6b727ba53fca185bdbaad3db0881667fdbc17a800fbbc3406b0ccd6b40e5ae245eb789a18b16c24ca48235b991ae511a868cf2daef0e90 SHA512 1571d0f373833767270588e54873410f71f67a946ddeedc792c81957ae5b454130c83106c52e142c4521a3e8c60ddc8cac27cf7aea491bfaddca2f4a0c29dc14
 MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/netpbm-10.86.30.ebuild b/media-libs/netpbm/netpbm-10.86.30.ebuild
index f6fe77349f2f..a4da791fe6e8 100644
--- a/media-libs/netpbm/netpbm-10.86.30.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.30.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 ~m68k ~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="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
 
 BDEPEND="
@@ -127,6 +127,11 @@ src_prepare() {
 		sed -i -e '/^$/d' test/legacy-names.ok || die
 		sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
 	fi
+
+	# this test requires LC_ALL=en_US.iso88591, not available on musl
+	if use elibc_musl; then
+		sed -i -e 's:pbmtext-iso88591.*::' test/Test-Order || die
+	fi
 }
 
 src_configure() {
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 0492b1debb9b..6aa7f3de4c60 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,5 @@
 DIST openal-soft-1.21.1.tar.bz2 524787 BLAKE2B ca052ee3ba18188a9b8342540b8a9ffa95a0c19c137f5e799fa69768d51ec30da55afa46bddf3d9b65e589b94423bc5b23f2090e07bb9fc2a34937f9c199ee89 SHA512 420eec18149a9b784daaabe8a2865de3b87d5550cf2e8e06569464d0b5ba6e51d904c18f1461af08676bf8c8b76ef270e860008d79545a5f85131299e89bffd4
+DIST openal-soft-1.22.0.tar.bz2 606420 BLAKE2B c244c28a253168a6651230d31608449b885d3519d07bf66669befb51a5618c2cab6166496f69230969ff38982eb2c82e1e467a741376a2af38dfe59687143411 SHA512 1e3df371d126e19e369dd01e3c5e95d6a32b664adf54ee37836d51ca7bc829f275d945388d8a40a3ac92c1151380bd68bbab4f8a08f59ea67dd1bd9b9a1d0cbd
 EBUILD openal-1.21.1-r2.ebuild 2532 BLAKE2B 80a398b31959e557a700267c836c36080d1d8443e375d821ac718af5c45c5b7ed7c30da324f14dd3fcea83151aa0fce508caa559ef633470589c94872293db9e SHA512 c373e3095112286474d127e5280b869c28dee1297da5c03085c61e919ba19196801525477148d382cbb679210b216bb8f898a9ad4ad5feaaa293c94df52ac617
+EBUILD openal-1.22.0.ebuild 2539 BLAKE2B bc49ab36bd490e478fbeee998ecd16f67d27bfff2fe316ded3b6fb6aea22529ba515170e3fbe2a12143c555cd4b989cfd6e014f682258744fa1a06e37e211c67 SHA512 0b2a32218db5f57debe85188a0045efbcb450d27f2e6d5628c8ef82c65001455f4a3642753a14fc5826538b839f9d0fb1e54fc2ffbdb77e7968229caa624790a
 MISC metadata.xml 438 BLAKE2B 27d299451c7845881fb3167a7147ddd0efa55af8bcc1e7b69cebbb8b27d9f66282962e0ebc7392fe48c1dec5ec287203a0407fd3ae4aa272cd4c112d446af1c7 SHA512 4733496e5f7aeb692f6218cc7a9ed3b44636746c44a7b8e9e86ac0395c0586c761fa877e49976abd6ae5cceae94265e1d0a7c3b25cb892c73268bfd1a76b82ba
diff --git a/media-libs/openal/openal-1.22.0.ebuild b/media-libs/openal/openal-1.22.0.ebuild
new file mode 100644
index 000000000000..b3cf7951460b
--- /dev/null
+++ b/media-libs/openal/openal-1.22.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+MY_P="${PN}-soft-${PV}"
+
+DESCRIPTION="A software implementation of the OpenAL 3D audio API"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+
+# See https://github.com/kcat/openal-soft/blob/e0097c18b82d5da37248c4823fde48b6e0002cdd/BSD-3Clause
+# Some components are under BSD
+LICENSE="LGPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="
+	alsa coreaudio debug jack oss portaudio pulseaudio sdl sndio qt5
+	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+	cpu_flags_arm_neon
+"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
+
+src_configure() {
+	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
+	my_configure() {
+		local mycmakeargs=(
+			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
+			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
+			-DALSOFT_REQUIRE_JACK=$(usex jack)
+			-DALSOFT_REQUIRE_OSS=$(usex oss)
+			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
+			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
+			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
+			# See bug #809314 for getting both options for sndio
+			-DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
+			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
+			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
+			-DALSOFT_EXAMPLES=OFF
+		)
+
+		# Avoid unused variable warnings, bug #738240
+		if use amd64 || use x86 ; then
+			mycmakeargs+=(
+				-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+				-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+				-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+			)
+		fi
+
+		if use arm || use arm64 ; then
+			mycmakeargs+=(
+				-DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
+			)
+		fi
+
+		cmake_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index c0bb05fe0ed0..b19fab1d488e 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -6,6 +6,7 @@ AUX opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch 1
 AUX opencolorio-1.1.1-fix-self-assign-clang.patch 493 BLAKE2B fbe85fc4385556deacd173ab44f5a5cbe32c2cd5b4541f1aaf20037840d5d8c7a61d5c314176cde7d0f08c80b6436b0b937c9fef10c3841948b6881601073df5 SHA512 8132a8352a36994550dd089a4858e11459fcbe0495bd07b6bc599a4b8bb7191da8ca6ae061cd1c04f52f586ac993e3656e8c03c6665f7160fa50b4a117f0cb22
 AUX opencolorio-1.1.1-no-werror.patch 349 BLAKE2B 79788a964466a884754dbdead8e252ff2422a52b56f3da8b0f256a52c714120fd2538b16e476271766a6130b97ec5025859e1320ca0a90c3ef5502fb0005f630 SHA512 d80fc47d8c4a768100cae38edcbf6741583507119d8cd8e2b6620cdc727599e5a1c170380cc25c711279b59c3432782c30315c7ffacbb78fcd1536dc12e3481a
 AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b
+AUX opencolorio-2.1.1-gcc12.patch 421 BLAKE2B 9a16bf4f0fbf1a2fc277a46b547339415de07c07093f45fd7f4f445735f2c7bda437f75b5f7b30e72fd522af97e4995887312b7828d954ff4bc8a179f476f2c3 SHA512 1738924260ee3abf556207f3323c8cc45e3e5f9210ff46b8b1e9ac1766c39ac06cc50a61d0c77bdf10a318405f6f5dda84d15f4c004be950dce40e2dd3087f2b
 DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
 DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159 SHA512 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338
 DIST opencolorio-2.0.3.tar.gz 10813503 BLAKE2B a853f2a39b4c3c0005056f0278355f01a8d62ec90054d3f1ce29501ce8fc96628d68eb3d942bb0cc33c71dcaa1a7421684bdd79b190a5eda5c5b5c6b9190017c SHA512 cb8d6d4e2481bfe9449f665ff888ad6ffb2d2e82f1a132b7cd3a74c88b2084f469c362511e57b964d3aee7c1badd41422640ab3a857402fa6a90c8bdf4cc60bb
@@ -14,5 +15,5 @@ EBUILD opencolorio-1.1.1-r3.ebuild 2750 BLAKE2B 22842c149b2d415b04932511630704b7
 EBUILD opencolorio-2.0.1-r2.ebuild 2820 BLAKE2B 7efa8a9aba25285125fce2d7a6ffbe990764cfc5593ef323411547f9c99b351e1511432df6cdad27effa314984f8e81db6606a3f8d958773459074d02fd845ab SHA512 922483a225a736443a67bbcc1e318ca4969be6d161692f0a42bdf88d723f07b6b9b7a398e11af20e68291c956e0ba9825b71554058dbd8adce9dae67b674f7f2
 EBUILD opencolorio-2.0.3.ebuild 2865 BLAKE2B f59dc08bda96088c88cd2108353932f0781610d8c8b2148e4994e4653b8a80fa74585ab516acf04451c6596ef0467e232c487bffa540c2e7ddf18b4e7b835490 SHA512 2ef41f4c4c4d2009dc7624b22091245c1600387f87ae21439ba2e4e3e685e77ecc51a6c323901ecb37fa8e76055c1a591568bd6eb224d85d1e2e1098b5541cda
 EBUILD opencolorio-2.1.1-r2.ebuild 2987 BLAKE2B 84232f4da90329934d2dd430a058ee25cc9b9229f7cb583cd5a2ff103c71eab9a48013612410395c083f7d3cda02fc027f72c29f53753cf142e16736799e48c9 SHA512 59448793311c5833b07f5f7d5894178f92a787d208a08e13c93f3225884f0902e222e6066ae7f7090498a16b6da8a30561f916a4016257c767f4a12e06f0ce42
-EBUILD opencolorio-2.1.1-r7.ebuild 3190 BLAKE2B d49d2bb4d1ec714ef5d43a4488be16d785df6518043fe2fb70b2cb3f7181f6f10da12150c9c250bd8eb3d7ae698b415bf9988b4abac3648f367fd2c6683310c0 SHA512 8cc360bc62150e7ff1a6f4cf059a10bae3dfd6f5a457dd3ca1e1f34875a1d17e0924de77bd63e24b5e257ab2f3d9bea7ae56d2888bde1d3d1cd4270ac2e1efff
+EBUILD opencolorio-2.1.1-r7.ebuild 3235 BLAKE2B fc8fcf4425f54319d1682adbb75d10e826c0427e6e88df3235f8fc5eb0296ad95582d637adca5a4f8edc3acdb819ce5544c88e5da8ce5366c4fbae30959958d5 SHA512 a68e6e983ee08be66d6732304de7c775a4292797c13b350f93bdf4410cb2d47720869c7d4d66514be011df6aea70c407a6ddfccd975c2eef87cddab42f73e54c
 MISC metadata.xml 460 BLAKE2B 564c46a6d12ec479bfbe92401cda933760a3fbfd72b83221f8edc927a01eb5f18ecab877184b95aa5bcc8af20a0c36fbff8c6f45bf7ce2996c795b0f8fac1c9c SHA512 d58b105d94f1f11e52f1e88b9cb24885b5369207c3fa2a6ab4c2133c22e2b47a887a8358b79ea53cc9bdd63a44bb18672e5d26d614074e0bc08539cb4e73b49a
diff --git a/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch
new file mode 100644
index 000000000000..0bf00862e51b
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch
@@ -0,0 +1,14 @@
+https://src.fedoraproject.org/rpms/OpenColorIO/raw/rawhide/f/OCIO-strlen.patch
+https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/4fa94918c2cf572dcaf61ca07016f3b5c231c14c
+https://bugs.gentoo.org/841479
+--- a/src/OpenColorIO/FileRules.cpp
++++ b/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ #include <map>
+ #include <regex>
+ #include <sstream>
+
diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
index 942486329016..b8d6102d7296 100644
--- a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
@@ -55,6 +55,10 @@ RESTRICT="test"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc12.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index afcae2ef45ff..812c93976c89 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -3,20 +3,11 @@ AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e30
 AUX opencv-4.1.2-opencl-license.patch 519 BLAKE2B 6dcdf809c3c75a39d0e44f02e157a0c0ee074fd15144565ed51ade7e7849cb313c084100f499cc1240424f4647a2ff73c8d5e61cbdf6d0499846db61b8a30729 SHA512 2874a5140ef5028eb6c64f36325904000edd722560cf876fc49d63b040633bcfea01cae27c156b18191564805cafd2986f26eea322b1376af4f2982d66ed7653
 AUX opencv-4.4.0-disable-native-cpuflag-detect.patch 1218 BLAKE2B 06569f6b7d33eccb11cae74624a2cc7d7e1eb788145813509220dc8436d2380892392be8c4af03fec845f3eade74b6277985cf80e38785317b15f17890bcaa4c SHA512 3be60f7ee28e3b001ef0c791e3ce1c849ff6fa9fdb70731716668b2698eed9abb24ee3aead1dbc857ed68fc46a645c70a1e3831e8a3e5a5b1791aa06bd2f9ee1
 AUX opencv-4.5.0-link-with-cblas-for-lapack.patch 726 BLAKE2B adbffd961c88229bf810e13fe20705352ff506a653c1d55bb0687c03d8daf9e05aed0f2ba9cd6e306c625837d6ddf64eeb99dc6cbf2b15fae833f4a7eea6aad0 SHA512 4c3108e304721c2cd78eb82f5d7bccc18831db5f47bc628a98ae6a37da389deef30e7e9b6dc5644e3bc0e0fafdd907dc37822a58a25555999698527d2ac364b0
-AUX opencv-4.5.2-lapack-3.10.patch 6646 BLAKE2B e4e379b638fff6779fc9baae9f17a43d6cbddbc4c3c2f9435f1409dc547c6ef3fe729c9f35859644cabb45763f013bc7c1434a1d413a4be9aa2030587892650b SHA512 ca3ba2517cc02e633807871048099c175f9b8f73cf7a44a67632d48595b1e3c5a7a1160e6692fc3fdb4e79551b34cc8421277a62e9bddfe2a227dc012a9ec855
 DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c SHA512 2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23
 DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
 DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
-DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3 SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec
-DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
-DIST opencv-4.5.4.tar.gz 89724634 BLAKE2B 76ce5ab8182c87e5f9e18faf62f2ee0eb629e4997877c59aa0f6ac334c27d737cf5205f4b85f64cabfdd587a57096fa3241ae6e48cebbd963ec8ad3ebe07ad35 SHA512 39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954
-DIST opencv-4.5.4_contrib.tar.gz 61054226 BLAKE2B c553bfc6fd1b5fd17f562b27248ddd4bd946089cd8cce346f152b47d4a8a22faa35ceb9bd501c31901189b884d782fbfec1dc041d69e1b8cc0ac0d5d079e610e SHA512 a48d4b5d764170814d9027fdf50f61bb4a24f0b5a547dded79d06b948f86443f14734efc7bbb708b3870781cafc6bc9e3092d35dac34a81da2bf1740d5f93ff9
 DIST opencv-4.5.5.tar.gz 89879893 BLAKE2B 6f2ce34b33132ad544d661417f730e17aedfbe17a22048ad0b8d287970626756c51309410d0fb5bf487af773ff4415d36b6768158ebc3cb963b37bb888ee4ba6 SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02
 DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 4a020824688e379f1d127fb834b0008b3cbf78acea4847cb4994e9e0b6ddfeec3f06867967b8546725cf050c1fd0df042a18caff80463ad101cf14dc66daea9a SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-4.5.2-r3.ebuild 20738 BLAKE2B ae2fe653392330cd42b4cd5eeb2d2ac2fdf94f2ce16ab5fb842866323b8dcb1e2373452e48b2ba3030d8734938df84bf577c7039ee6fa1918044c396770b468f SHA512 043b5e2fa1a1620d0e107f43ed26957b9e2353948d7f105354d82b419e552443d68e25319f3739ba1d4dfb22edc9671a80bfd8ecfd2f64a5f650e329b2babf78
-EBUILD opencv-4.5.2-r5.ebuild 20793 BLAKE2B 42bb20d0e21de9354fbdc141b4235b7f2c5225c244615e699638b92cb223c7f227fb8818fbc20c6cf156cb476f168d4e9e0c6509da59104d8848e8e5f7ffcdfe SHA512 056d75e7b8c587e326eb837a8fd1aca0d61e6b2a32b298498217c9fa21b0172371938284014c4d577936cab78ebad15356161018b211999c88b06ed1176358d1
-EBUILD opencv-4.5.4.ebuild 21277 BLAKE2B 6a6102565d52e2711d92cf8d7456986cffac8a0f34b669c7f3d77e12e53e9146870d997d9fb4bbe0fd53811e85786bc0f84f49d7d7be6bb663601385d167d2e4 SHA512 809bc5b748b9a1c098bf06d9fd925d989d8ffa88d3de210e62dd287649b23439b2b97c26a789b7c38ef02443f83dc3fdc2d091639b946a8956e5902bacc5debd
 EBUILD opencv-4.5.5-r1.ebuild 21143 BLAKE2B 450b67dc03ee0105d1bce190b807de37444b41c8ac90d9e72438e194aef388ac32ecef75398c99fb66bb5a67bd43f516d74749193f721cd1b4f17e189fe8d1af SHA512 8776814f44bcaef3c6ff1382f31d58caee045da504062e13493e42b7c7af9734122635b3a82699df7696d291c9d1085b470db03dac48719721812ac466806c8d
-EBUILD opencv-4.5.5.ebuild 21265 BLAKE2B a58a5315af741c43c0686cb9f25bfd7afd08f54a3482a76952264e5a6cfdc9892746555cbf786bea8d080d26917ea43925be969db110e66e7032ff97e39135c4 SHA512 3be510f4e0639baf3957877028a5d6081d52467e7df87a68cfed7a421babd8ea3774d04c51d617c9034b58bba8d9118193093d55725c412325cdeca144634efb
 MISC metadata.xml 3110 BLAKE2B 56215511d99a98894fdb70f5db8423b307b4a487acbc88a836a78cf48e249015856e33b85ce741a4cde9d55fbf8d653d1197a9a4abb692284ab03457e14453ff SHA512 93df09d61b5be54d8d14ec15a3274326db1bd7de9cc56c876d788d5e5d94b62de311b30cb46a9d864f3c8b0974c5a9e59418519de7a9d28666ffee33572bab23
diff --git a/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch b/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch
deleted file mode 100644
index 31e2fc60d121..000000000000
--- a/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-https://bugs.gentoo.org/800539
-
---- a/modules/core/src/hal_internal.cpp
-+++ b/modules/core/src/hal_internal.cpp
-@@ -163,9 +163,9 @@
-         if(n == 1 && b_step == sizeof(fptype))
-         {
-             if(typeid(fptype) == typeid(float))
--                sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
-+                LAPACK_sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
-             else if(typeid(fptype) == typeid(double))
--                dposv_(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
-+                LAPACK_dposv_(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
-         }
-         else
-         {
-@@ -174,9 +174,9 @@
-             transpose(b, ldb, tmpB, m, m, n);
- 
-             if(typeid(fptype) == typeid(float))
--                sposv_(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
-+                LAPACK_sposv_(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
-             else if(typeid(fptype) == typeid(double))
--                dposv_(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
-+                LAPACK_dposv_(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
- 
-             transpose(tmpB, m, b, ldb, n, m);
-             delete[] tmpB;
-@@ -185,9 +185,9 @@
-     else
-     {
-         if(typeid(fptype) == typeid(float))
--            spotrf_(L, &m, (float*)a, &lda, &lapackStatus);
-+            LAPACK_spotrf_(L, &m, (float*)a, &lda, &lapackStatus);
-         else if(typeid(fptype) == typeid(double))
--            dpotrf_(L, &m, (double*)a, &lda, &lapackStatus);
-+            LAPACK_dpotrf_(L, &m, (double*)a, &lda, &lapackStatus);
-     }
- 
-     if(lapackStatus == 0) *info = true;
-@@ -227,17 +227,17 @@
-     }
- 
-     if(typeid(fptype) == typeid(float))
--        sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
-+        LAPACK_sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
-     else if(typeid(fptype) == typeid(double))
--        dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
-+        LAPACK_dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
- 
-     lwork = (int)round(work1); //optimal buffer size
-     fptype* buffer = new fptype[lwork + 1];
- 
-     if(typeid(fptype) == typeid(float))
--        sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
-+        LAPACK_sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
-     else if(typeid(fptype) == typeid(double))
--        dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
-+        LAPACK_dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
- 
-     if(!(flags & CV_HAL_SVD_NO_UV))
-         transpose_square_inplace(vt, ldv, n);
-@@ -288,18 +288,18 @@
-         if (k == 1 && b_step == sizeof(fptype))
-         {
-             if (typeid(fptype) == typeid(float))
--                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
-+                LAPACK_sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
-             else if (typeid(fptype) == typeid(double))
--                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
-+                LAPACK_dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
- 
-             lwork = cvRound(work1); //optimal buffer size
-             std::vector<fptype> workBufMemHolder(lwork + 1);
-             fptype* buffer = &workBufMemHolder.front();
- 
-             if (typeid(fptype) == typeid(float))
--                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
-+                LAPACK_sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
-             else if (typeid(fptype) == typeid(double))
--                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
-+                LAPACK_dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
-         }
-         else
-         {
-@@ -309,18 +309,18 @@
-             transpose(b, ldb, tmpB, m, m, k);
- 
-             if (typeid(fptype) == typeid(float))
--                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
-+                LAPACK_sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
-             else if (typeid(fptype) == typeid(double))
--                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
-+                LAPACK_dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
- 
-             lwork = cvRound(work1); //optimal buffer size
-             std::vector<fptype> workBufMemHolder(lwork + 1);
-             fptype* buffer = &workBufMemHolder.front();
- 
-             if (typeid(fptype) == typeid(float))
--                sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
-+                LAPACK_sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
-             else if (typeid(fptype) == typeid(double))
--                dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
-+                LAPACK_dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
- 
-             transpose(tmpB, m, b, ldb, k, m);
-         }
---- a/cmake/checks/lapack_check.cpp
-+++ b/cmake/checks/lapack_check.cpp
-@@ -2,9 +2,9 @@
- #include "opencv_lapack.h"
- 
- static char* check_fn1 = (char*)sgesv_;
--static char* check_fn2 = (char*)sposv_;
--static char* check_fn3 = (char*)spotrf_;
--static char* check_fn4 = (char*)sgesdd_;
-+static char* check_fn2 = (char*)LAPACK_sposv_;
-+static char* check_fn3 = (char*)LAPACK_spotrf_;
-+static char* check_fn4 = (char*)LAPACK_sgesdd_;
- 
- int main(int argc, char* argv[])
- {
diff --git a/media-libs/opencv/opencv-4.5.2-r3.ebuild b/media-libs/opencv/opencv-4.5.2-r3.ebuild
deleted file mode 100644
index 9b3f36c342d0..000000000000
--- a/media-libs/opencv/opencv-4.5.2-r3.ebuild
+++ /dev/null
@@ -1,573 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-CMAKE_ECLASS=cmake
-inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
-		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_neon:NEON
-	cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
-	cpu_flags_ppc_vsx:VSX
-	cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
-	avx:AVX
-	avx2:AVX2
-	avx512f:AVX_512F
-	f16c:FP16
-	fma3:FMA3
-	popcnt:POPCNT
-	sse:SSE
-	sse2:SSE2
-	sse3:SSE3
-	ssse3:SSSE3
-	sse4_1:SSE4_1
-	sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-# cuda needs contrib, bug #701712
-REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
-	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
-	cuda? ( contrib
-		tesseract? ( opencl ) )
-	dnnsamples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contribcvv? ( contrib qt5 )
-	contribdnn? ( contrib )
-	contribfreetype? ( contrib )
-	contribhdf? ( contrib )
-	contribovis? ( contrib )
-	contribsfm? ( contrib eigen gflags glog )
-	contribxfeatures2d? ( contrib download )
-	examples? ( contribdnn )
-	java? ( python )
-	opengl? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )
-	?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	<dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contribhdf? ( sci-libs/hdf5:= )
-	contribfreetype? (
-		media-libs/freetype:2[${MULTILIB_USEDEP}]
-		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
-	)
-	contribovis? ( dev-games/ogre:0/1.12 )
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk3? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.8:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	lapack? (
-		virtual/cblas
-		virtual/lapack
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtgui:5=
-		dev-qt/qtwidgets:5=
-		dev-qt/qttest:5=
-		dev-qt/qtconcurrent:5=
-		opengl? ( dev-qt/qtopengl:5= )
-	)
-	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
-	threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
-DEPEND="${RDEPEND}
-	eigen? (
-		|| (
-			>=dev-cpp/eigen-3.3.8-r1:3
-			<dev-cpp/eigen-3.3.8:3
-		)
-	)
-	java? ( >=virtual/jdk-1.8:* )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# [opencv4]
-	/usr/include/opencv4/opencv2/cvconfig.h
-	/usr/include/opencv4/opencv2/opencv_modules.hpp
-	# [cudev]
-	/usr/include/opencv4/opencv2/cudaarithm.hpp
-	/usr/include/opencv4/opencv2/cudabgsegm.hpp
-	/usr/include/opencv4/opencv2/cudacodec.hpp
-	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv4/opencv2/cudafilters.hpp
-	/usr/include/opencv4/opencv2/cudaimgproc.hpp
-	/usr/include/opencv4/opencv2/cudalegacy.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv4/opencv2/cudaoptflow.hpp
-	/usr/include/opencv4/opencv2/cudastereo.hpp
-	/usr/include/opencv4/opencv2/cudawarping.hpp
-	/usr/include/opencv4/opencv2/cudev/block/block.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv4/opencv2/cudev/common.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
-	# [contrib_cvv]
-	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv4/opencv2/cvv/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv4/opencv2/cvv/filter.hpp
-	/usr/include/opencv4/opencv2/cvv/final_show.hpp
-	/usr/include/opencv4/opencv2/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
-	/usr/include/opencv4/opencv2/hdf.hpp
-	# [contrib_ovis]
-	/usr/include/opencv4/opencv2/ovis.hpp
-	# [vtk]
-	/usr/include/opencv4/opencv2/viz.hpp
-	/usr/include/opencv4/opencv2/viz/types.hpp
-	/usr/include/opencv4/opencv2/viz/viz3d.hpp
-	/usr/include/opencv4/opencv2/viz/vizcore.hpp
-	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
-	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
-	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
-	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
-	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/838274
-	replace-flags -O3 -O2
-
-	cmake_src_prepare
-
-	# remove bundled stuff
-	rm -r 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnnsamples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		if use contribxfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	if use download; then
-		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=$(usex download)
-		-DWITH_QUIRC=OFF # Do not have dependencies
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk3)
-		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
-		-DWITH_IPP=OFF
-		# Jasper was removed from tree because of security problems.
-		# Upstream were/are making progress. We use openjpeg instead.
-		# bug 734284
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OPENJPEG=$(usex jpeg2k)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-	#	-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-	#	-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=OFF
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		-DOPENCV_GENERATE_PKGCONFIG=ON
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		# bug 733796, but PCH is a risky game in CMake anyway
-		-DENABLE_PRECOMPILED_HEADERS=OFF
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-		-DENABLE_LTO=$(usex lto)
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
-	)
-
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-	local CPU_BASELINE=""
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
-			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
-		fi
-	done
-
-	GLOBALCMAKEARGS+=(
-		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-		-DCPU_BASELINE=${CPU_BASELINE}
-		-DCPU_DISPATCH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
-			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
-			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=(
-		${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-		-DBUILD_opencv_python2=OFF
-		-DBUILD_opencv_python3=OFF
-	)
-
-	cmake_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contribdnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR="${orig_BUILD_DIR}"
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# python_setup alters PATH and sets this as wrapper
-		# to the correct interpreter we are building for
-		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm CMakeCache.txt || die "rm failed"
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -r modules/python3 || die "rm failed"
-
-	python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-4.5.2-r5.ebuild b/media-libs/opencv/opencv-4.5.2-r5.ebuild
deleted file mode 100644
index 2b66d2c57956..000000000000
--- a/media-libs/opencv/opencv-4.5.2-r5.ebuild
+++ /dev/null
@@ -1,574 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-CMAKE_ECLASS=cmake
-inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
-		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_neon:NEON
-	cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
-	cpu_flags_ppc_vsx:VSX
-	cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
-	avx:AVX
-	avx2:AVX2
-	avx512f:AVX_512F
-	f16c:FP16
-	fma3:FMA3
-	popcnt:POPCNT
-	sse:SSE
-	sse2:SSE2
-	sse3:SSE3
-	ssse3:SSSE3
-	sse4_1:SSE4_1
-	sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-# cuda needs contrib, bug #701712
-REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
-	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
-	cuda? ( contrib
-		tesseract? ( opencl ) )
-	dnnsamples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contribcvv? ( contrib qt5 )
-	contribdnn? ( contrib )
-	contribfreetype? ( contrib )
-	contribhdf? ( contrib )
-	contribovis? ( contrib )
-	contribsfm? ( contrib eigen gflags glog )
-	contribxfeatures2d? ( contrib download )
-	examples? ( contribdnn )
-	java? ( python )
-	opengl? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )
-	?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	<dev-libs/protobuf-3.19:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contribhdf? ( sci-libs/hdf5:= )
-	contribfreetype? (
-		media-libs/freetype:2[${MULTILIB_USEDEP}]
-		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
-	)
-	contribovis? ( dev-games/ogre:0/1.12 )
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk3? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.8:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	lapack? (
-		virtual/cblas
-		>=virtual/lapack-3.10
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtgui:5=
-		dev-qt/qtwidgets:5=
-		dev-qt/qttest:5=
-		dev-qt/qtconcurrent:5=
-		opengl? ( dev-qt/qtopengl:5= )
-	)
-	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
-	threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
-DEPEND="${RDEPEND}
-	eigen? (
-		|| (
-			>=dev-cpp/eigen-3.3.8-r1:3
-			<dev-cpp/eigen-3.3.8:3
-		)
-	)
-	java? ( >=virtual/jdk-1.8:* )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# [opencv4]
-	/usr/include/opencv4/opencv2/cvconfig.h
-	/usr/include/opencv4/opencv2/opencv_modules.hpp
-	# [cudev]
-	/usr/include/opencv4/opencv2/cudaarithm.hpp
-	/usr/include/opencv4/opencv2/cudabgsegm.hpp
-	/usr/include/opencv4/opencv2/cudacodec.hpp
-	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv4/opencv2/cudafilters.hpp
-	/usr/include/opencv4/opencv2/cudaimgproc.hpp
-	/usr/include/opencv4/opencv2/cudalegacy.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv4/opencv2/cudaoptflow.hpp
-	/usr/include/opencv4/opencv2/cudastereo.hpp
-	/usr/include/opencv4/opencv2/cudawarping.hpp
-	/usr/include/opencv4/opencv2/cudev/block/block.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv4/opencv2/cudev/common.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
-	# [contrib_cvv]
-	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv4/opencv2/cvv/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv4/opencv2/cvv/filter.hpp
-	/usr/include/opencv4/opencv2/cvv/final_show.hpp
-	/usr/include/opencv4/opencv2/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
-	/usr/include/opencv4/opencv2/hdf.hpp
-	# [contrib_ovis]
-	/usr/include/opencv4/opencv2/ovis.hpp
-	# [vtk]
-	/usr/include/opencv4/opencv2/viz.hpp
-	/usr/include/opencv4/opencv2/viz/types.hpp
-	/usr/include/opencv4/opencv2/viz/viz3d.hpp
-	/usr/include/opencv4/opencv2/viz/vizcore.hpp
-	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
-	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
-	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
-	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
-	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
-	"${FILESDIR}"/${PN}-4.5.2-lapack-3.10.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/838274
-	replace-flags -O3 -O2
-
-	cmake_src_prepare
-
-	# remove bundled stuff
-	rm -r 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnnsamples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		if use contribxfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	if use download; then
-		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=$(usex download)
-		-DWITH_QUIRC=OFF # Do not have dependencies
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk3)
-		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
-		-DWITH_IPP=OFF
-		# Jasper was removed from tree because of security problems.
-		# Upstream were/are making progress. We use openjpeg instead.
-		# bug 734284
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OPENJPEG=$(usex jpeg2k)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-	#	-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-	#	-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=OFF
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		-DOPENCV_GENERATE_PKGCONFIG=ON
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		# bug 733796, but PCH is a risky game in CMake anyway
-		-DENABLE_PRECOMPILED_HEADERS=OFF
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-		-DENABLE_LTO=$(usex lto)
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
-	)
-
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-	local CPU_BASELINE=""
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
-			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
-		fi
-	done
-
-	GLOBALCMAKEARGS+=(
-		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-		-DCPU_BASELINE=${CPU_BASELINE}
-		-DCPU_DISPATCH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
-			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
-			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=(
-		${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-		-DBUILD_opencv_python2=OFF
-		-DBUILD_opencv_python3=OFF
-	)
-
-	cmake_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contribdnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR="${orig_BUILD_DIR}"
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# python_setup alters PATH and sets this as wrapper
-		# to the correct interpreter we are building for
-		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm CMakeCache.txt || die "rm failed"
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -r modules/python3 || die "rm failed"
-
-	python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild
deleted file mode 100644
index 24070fe0c2e4..000000000000
--- a/media-libs/opencv/opencv-4.5.4.ebuild
+++ /dev/null
@@ -1,585 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-CMAKE_ECLASS=cmake
-inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
-		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_neon:NEON
-	cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
-	cpu_flags_ppc_vsx:VSX
-	cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
-	avx:AVX
-	avx2:AVX2
-	avx512f:AVX_512F
-	f16c:FP16
-	fma3:FMA3
-	popcnt:POPCNT
-	sse:SSE
-	sse2:SSE2
-	sse3:SSE3
-	ssse3:SSSE3
-	sse4_1:SSE4_1
-	sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-# cuda needs contrib, bug #701712
-REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
-	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
-	cuda? ( contrib
-		tesseract? ( opencl ) )
-	dnnsamples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contribcvv? ( contrib qt5 )
-	contribdnn? ( contrib )
-	contribfreetype? ( contrib )
-	contribhdf? ( contrib )
-	contribovis? ( contrib )
-	contribsfm? ( contrib eigen gflags glog )
-	contribxfeatures2d? ( contrib download )
-	examples? ( contribdnn )
-	java? ( python )
-	opengl? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )
-	?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contribhdf? ( sci-libs/hdf5:= )
-	contribfreetype? (
-		media-libs/freetype:2[${MULTILIB_USEDEP}]
-		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
-	)
-	contribovis? ( dev-games/ogre:0/1.12 )
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk3? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.8:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	lapack? (
-		virtual/cblas
-		>=virtual/lapack-3.10
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtgui:5=
-		dev-qt/qtwidgets:5=
-		dev-qt/qttest:5=
-		dev-qt/qtconcurrent:5=
-		opengl? ( dev-qt/qtopengl:5= )
-	)
-	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
-	threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
-DEPEND="${RDEPEND}
-	eigen? (
-		|| (
-			>=dev-cpp/eigen-3.3.8-r1:3
-			<dev-cpp/eigen-3.3.8:3
-		)
-	)
-	java? ( >=virtual/jdk-1.8:* )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# [opencv4]
-	/usr/include/opencv4/opencv2/cvconfig.h
-	/usr/include/opencv4/opencv2/opencv_modules.hpp
-	# [cudev]
-	/usr/include/opencv4/opencv2/cudaarithm.hpp
-	/usr/include/opencv4/opencv2/cudabgsegm.hpp
-	/usr/include/opencv4/opencv2/cudacodec.hpp
-	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv4/opencv2/cudafilters.hpp
-	/usr/include/opencv4/opencv2/cudaimgproc.hpp
-	/usr/include/opencv4/opencv2/cudalegacy.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv4/opencv2/cudaoptflow.hpp
-	/usr/include/opencv4/opencv2/cudastereo.hpp
-	/usr/include/opencv4/opencv2/cudawarping.hpp
-	/usr/include/opencv4/opencv2/cudev/block/block.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv4/opencv2/cudev/common.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
-	# [contrib_cvv]
-	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv4/opencv2/cvv/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv4/opencv2/cvv/filter.hpp
-	/usr/include/opencv4/opencv2/cvv/final_show.hpp
-	/usr/include/opencv4/opencv2/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
-	/usr/include/opencv4/opencv2/hdf.hpp
-	# [contrib_ovis]
-	/usr/include/opencv4/opencv2/ovis.hpp
-	# [contrib_sfm]
-	/usr/include/opencv4/opencv2/sfm.hpp
-	/usr/include/opencv4/opencv2/sfm/conditioning.hpp
-	/usr/include/opencv4/opencv2/sfm/fundamental.hpp
-	/usr/include/opencv4/opencv2/sfm/io.hpp
-	/usr/include/opencv4/opencv2/sfm/numeric.hpp
-	/usr/include/opencv4/opencv2/sfm/projection.hpp
-	/usr/include/opencv4/opencv2/sfm/reconstruct.hpp
-	/usr/include/opencv4/opencv2/sfm/robust.hpp
-	/usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
-	/usr/include/opencv4/opencv2/sfm/triangulation.hpp
-	# [vtk]
-	/usr/include/opencv4/opencv2/viz.hpp
-	/usr/include/opencv4/opencv2/viz/types.hpp
-	/usr/include/opencv4/opencv2/viz/viz3d.hpp
-	/usr/include/opencv4/opencv2/viz/vizcore.hpp
-	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
-	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
-	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
-	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
-	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
-	"${FILESDIR}"/${PN}-4.5.2-lapack-3.10.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/838274
-	replace-flags -O3 -O2
-
-	cmake_src_prepare
-
-	# remove bundled stuff
-	rm -r 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnnsamples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		if use contribxfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	if use download; then
-		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=$(usex download)
-		-DWITH_QUIRC=OFF # Do not have dependencies
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk3)
-		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
-		-DWITH_IPP=OFF
-		# Jasper was removed from tree because of security problems.
-		# Upstream were/are making progress. We use openjpeg instead.
-		# bug 734284
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OPENJPEG=$(usex jpeg2k)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-	#	-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-	#	-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=OFF
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		-DOPENCV_GENERATE_PKGCONFIG=ON
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		# bug 733796, but PCH is a risky game in CMake anyway
-		-DENABLE_PRECOMPILED_HEADERS=OFF
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-		-DENABLE_LTO=$(usex lto)
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
-	)
-
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-	local CPU_BASELINE=""
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
-			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
-		fi
-	done
-
-	GLOBALCMAKEARGS+=(
-		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-		-DCPU_BASELINE=${CPU_BASELINE}
-		-DCPU_DISPATCH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
-			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
-			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=(
-		${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-		-DBUILD_opencv_python2=OFF
-		-DBUILD_opencv_python3=OFF
-	)
-
-	cmake_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contribdnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR="${orig_BUILD_DIR}"
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# python_setup alters PATH and sets this as wrapper
-		# to the correct interpreter we are building for
-		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm CMakeCache.txt || die "rm failed"
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -r modules/python3 || die "rm failed"
-
-	python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-4.5.5.ebuild b/media-libs/opencv/opencv-4.5.5.ebuild
deleted file mode 100644
index 7eddbcd042ce..000000000000
--- a/media-libs/opencv/opencv-4.5.5.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-CMAKE_ECLASS=cmake
-inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
-		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-
-# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_neon:NEON
-	cpu_flags_arm_vfpv3:VFPV3
-)
-PPC_CPU_FEATURES=(
-	cpu_flags_ppc_vsx:VSX
-	cpu_flags_ppc_vsx3:VSX3
-)
-X86_CPU_FEATURES_RAW=(
-	avx:AVX
-	avx2:AVX2
-	avx512f:AVX_512F
-	f16c:FP16
-	fma3:FMA3
-	popcnt:POPCNT
-	sse:SSE
-	sse2:SSE2
-	sse3:SSE3
-	ssse3:SSSE3
-	sse4_1:SSE4_1
-	sse4_2:SSE4_2
-)
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-# cuda needs contrib, bug #701712
-REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
-	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
-	cuda? ( contrib
-		tesseract? ( opencl ) )
-	dnnsamples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contribcvv? ( contrib qt5 )
-	contribdnn? ( contrib )
-	contribfreetype? ( contrib )
-	contribhdf? ( contrib )
-	contribovis? ( contrib )
-	contribsfm? ( contrib eigen gflags glog )
-	contribxfeatures2d? ( contrib download )
-	examples? ( contribdnn )
-	java? ( python )
-	opengl? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )
-	?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contribhdf? ( sci-libs/hdf5:= )
-	contribfreetype? (
-		media-libs/freetype:2[${MULTILIB_USEDEP}]
-		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
-	)
-	contribovis? ( dev-games/ogre:0/1.12 )
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk3? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.8:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	lapack? (
-		virtual/cblas
-		>=virtual/lapack-3.10
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? (
-		<media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}]
-		media-libs/ilmbase:=[${MULTILIB_USEDEP}]
-	)
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtgui:5=
-		dev-qt/qtwidgets:5=
-		dev-qt/qttest:5=
-		dev-qt/qtconcurrent:5=
-		opengl? ( dev-qt/qtopengl:5= )
-	)
-	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
-	threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
-	eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 )
-	java? ( >=virtual/jdk-1.8:* )"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# [opencv4]
-	/usr/include/opencv4/opencv2/cvconfig.h
-	/usr/include/opencv4/opencv2/opencv_modules.hpp
-	# [cudev]
-	/usr/include/opencv4/opencv2/cudaarithm.hpp
-	/usr/include/opencv4/opencv2/cudabgsegm.hpp
-	/usr/include/opencv4/opencv2/cudacodec.hpp
-	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv4/opencv2/cudafilters.hpp
-	/usr/include/opencv4/opencv2/cudaimgproc.hpp
-	/usr/include/opencv4/opencv2/cudalegacy.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv4/opencv2/cudaoptflow.hpp
-	/usr/include/opencv4/opencv2/cudastereo.hpp
-	/usr/include/opencv4/opencv2/cudawarping.hpp
-	/usr/include/opencv4/opencv2/cudev/block/block.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv4/opencv2/cudev/common.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv4/opencv2/cudev.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
-	# [contrib_cvv]
-	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv4/opencv2/cvv/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv4/opencv2/cvv/filter.hpp
-	/usr/include/opencv4/opencv2/cvv/final_show.hpp
-	/usr/include/opencv4/opencv2/cvv.hpp
-	/usr/include/opencv4/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
-	/usr/include/opencv4/opencv2/hdf.hpp
-	# [contrib_ovis]
-	/usr/include/opencv4/opencv2/ovis.hpp
-	# [contrib_sfm]
-	/usr/include/opencv4/opencv2/sfm.hpp
-	/usr/include/opencv4/opencv2/sfm/conditioning.hpp
-	/usr/include/opencv4/opencv2/sfm/fundamental.hpp
-	/usr/include/opencv4/opencv2/sfm/io.hpp
-	/usr/include/opencv4/opencv2/sfm/numeric.hpp
-	/usr/include/opencv4/opencv2/sfm/projection.hpp
-	/usr/include/opencv4/opencv2/sfm/reconstruct.hpp
-	/usr/include/opencv4/opencv2/sfm/robust.hpp
-	/usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp
-	/usr/include/opencv4/opencv2/sfm/triangulation.hpp
-	# [vtk]
-	/usr/include/opencv4/opencv2/viz.hpp
-	/usr/include/opencv4/opencv2/viz/types.hpp
-	/usr/include/opencv4/opencv2/viz/viz3d.hpp
-	/usr/include/opencv4/opencv2/viz/vizcore.hpp
-	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv4/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
-	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
-	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
-	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
-	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/838274
-	replace-flags -O3 -O2
-
-	cmake_src_prepare
-
-	# remove bundled stuff
-	rm -r 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnnsamples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		if use contribxfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	if use download; then
-		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=$(usex download)
-		-DWITH_QUIRC=OFF # Do not have dependencies
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk3)
-		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
-		-DWITH_IPP=OFF
-		# Jasper was removed from tree because of security problems.
-		# Upstream were/are making progress. We use openjpeg instead.
-		# bug 734284
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OPENJPEG=$(usex jpeg2k)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		# Try to force OpenEXR 2 for now. bug #830124
-		-DOPENEXR_ROOT="${ESYSROOT}"/usr
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-	#	-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-	#	-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=OFF
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		-DOPENCV_GENERATE_PKGCONFIG=ON
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		# bug 733796, but PCH is a risky game in CMake anyway
-		-DENABLE_PRECOMPILED_HEADERS=OFF
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-		-DENABLE_LTO=$(usex lto)
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
-	)
-
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-	local CPU_BASELINE=""
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
-			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
-		fi
-	done
-
-	GLOBALCMAKEARGS+=(
-		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
-		-DCPU_BASELINE=${CPU_BASELINE}
-		-DCPU_DISPATCH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
-			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
-			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=(
-		${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-		-DBUILD_opencv_python2=OFF
-		-DBUILD_opencv_python3=OFF
-	)
-
-	cmake_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contribdnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR="${orig_BUILD_DIR}"
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# python_setup alters PATH and sets this as wrapper
-		# to the correct interpreter we are building for
-		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm CMakeCache.txt || die "rm failed"
-	cmake_src_configure
-	cmake_src_compile
-	cmake_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -r modules/python3 || die "rm failed"
-
-	python_optimize "${ED}"/$(python_get_sitedir)
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 9d32e634dfa6..998a77ac6a65 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -5,7 +5,9 @@ AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278
 DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
 DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12
+DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
 EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866fc55ee5de8211721745fbf048d2431aba65d1627ed9748862e751c04f58c51b50355fa34f3d22f163fbdde2a14 SHA512 4a91fa4d593dfc94aba295d5572ed9f7c73e9ccdba52b4f38053a0431bd4a89e1b195aa50aed4f5297464838815d62dbe388b24f72ff29ff40bcb0396c8c6e09
 EBUILD openexr-2.5.8.ebuild 2145 BLAKE2B 49a39e572b88139d1291d298f7f5f5eca6379e7ac604b92d91aebe6b71df3d0ffd3286eede949f9b31650062c448c5e76d1deaa7f134ceb0da4255efa3d4f565 SHA512 65c858b33cda707d99a751821a9cd10c77084890f8aa8e5b594eddca41df74444cce8a5426e95119b24d15786d102297e2801882f47d81f209e0b80633c8ce03
 EBUILD openexr-3.1.4-r1.ebuild 1910 BLAKE2B 2eb8cad3ae2a3951a534b5d3173f0788ba8a3792eb0bf4462321fe073580b3b71c04b99669e1a2ab6d599c9e0ed2062ceeb9185d0b48fb8c307c670123272bcd SHA512 b65c849f91b3226cc751052511f517e10607ad2c64eb7f17f80ad4e0cb8b2e9b28767741057095ef661787c327815cae16b1d15dc49c330522203d3b38b41c21
+EBUILD openexr-3.1.5.ebuild 1796 BLAKE2B e1e6efb27cd0eda51152e9dc75341f0c6ea071bdfbd544ff37e29fe121fcc42d3166052443c6be240ad50f466933ec6dd98a3f660a02947263f89d2c10f58c50 SHA512 f28c74eab87f2f4904d02d568cc512b50be1f7555645021e82e7b4c9a623c48abe52d99bcd2522f805b5d56369b90d629b75417bda6acc2308ffb992857009d9
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-3.1.5.ebuild b/media-libs/openexr/openexr-3.1.5.ebuild
new file mode 100644
index 000000000000..ca85d54594e3
--- /dev/null
+++ b/media-libs/openexr/openexr-3.1.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN=OpenEXR
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/30" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~dev-libs/imath-${PV}:=
+	sys-libs/zlib
+	!media-libs/openexr:3
+	!media-libs/ilmbase
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( dev-python/breathe )
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch )
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -e "s:/var/tmp/:${T}:" \
+		-i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DDOCS=$(usex doc)
+		-DOPENEXR_BUILD_TOOLS=$(usex utils)
+		-DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DOPENEXR_ENABLE_THREADING=$(usex threads)
+		-DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON
+		-DOPENEXR_INSTALL_TOOLS=$(usex utils)
+		-DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
+	)
+
+	use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
+
+	cmake_src_configure
+}
+
+src_install() {
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+
+	cmake_src_install
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 1275c535b354..d2f191e5678c 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -2,10 +2,12 @@ DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0
 DIST openimageio-2.2.19.0.tar.gz 29252399 BLAKE2B f90b330944885271e117a01235a48f11e88960f5825d0c84e6e2c994479e76a26bf90e66afec4aae6a5c7164510963027bef79fe0265676ce0993235824d461d SHA512 63951d958daaa4bc62fc210efaeced51affd207be21c938ecd5da70217060bb9c8197bf95813e2fddb728a641e69d2889f9445b7d16653a110e45adf3cb86541
 DIST openimageio-2.3.12.0.tar.gz 32452689 BLAKE2B f5fd428c597b573586a4749b56225ad3c035ab1c2122ff3e93df8e90be5796cc57978aa9fc5b102f2cf64d2407e70a11683b5bbee118c9fac3536b965ed044cc SHA512 c8ec0ead8396717b218d937b9193ef9162c68446f6f1d477f3f0ee4b5656c3d7d53b58bf55aa300fbf57d367a47d795861b5683157e0d0271e0ea56f0460c58d
 DIST openimageio-2.3.13.0.tar.gz 32456755 BLAKE2B 897a7db0eabb9a7cc29ab8fea368c32fc70b63b5ecebbcfa8d1fffe55c2435d9638f8a1f69069c45fad3723a2b7dc40e83971f48892afc631a7593a7629fb92a SHA512 fbefa341a11fd502ec9313ca48a0fe433c5822699e4934f6a14089f670314cbe1c9c0b9a491b1d1927bda0223e38a62192c6ddeec6c4c5e6215a8b3fb6900dd8
+DIST openimageio-2.3.15.0.tar.gz 32626322 BLAKE2B 1367e40dbed3d43b53db1b7117c563782396b255e366ea9586438a5c81cb8ae96ff42a0e445c7932bc92dc327adae921b383c2e6d787dc6e67cf71946d6174c1 SHA512 8ed0303fd9314e01cbf6d45627eb6e88e3fd356387a7657a4b31bbe455a4a493f88a2b511c1d5cf86a9c00346dbc03f9b32d2a6df9da033e7e78e86142ce888c
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
 EBUILD openimageio-2.2.18.0-r1.ebuild 4192 BLAKE2B 00a910784e52d4d50a2920641278b41a53847963d9cc0d31badea2e3a3497242f3af9fe6acec43efce043f7acd724ac8f30f475d7697cdfd73b0f39a59e09fcd SHA512 ba24aa74cbe44ab72f8f33397d0d29409d90b8c0263d4551970cb8e35bae4f28fb975414cddf35cb777597c671a8474e81f4b3157194f9c60b3df9bff265a4f8
 EBUILD openimageio-2.2.19.0.ebuild 4205 BLAKE2B ef7cdd667669625a80665df60a203498603704ebdfd8b55eb9f7d4a81dbd62e94401d3e89c086d72f44ee8b82930d89714fdce4a9362925200627220df08365c SHA512 19ed3037b747b83a11ba5bb26f286545db12cb4eda9ac94ce3803f77b45ea37f87f6aa38deea87cf0ae6c955b7dcd34f13881e884254a6ae048111a2b3d5107d
 EBUILD openimageio-2.3.12.0-r3.ebuild 4640 BLAKE2B 7eeca5be1bd3c8e1fc81bf0fd1116aa5448df61d8cacab682a68472171e430c3cc9e1e30640972a927f76770954b5d2491abcde1a1b552bce4695d177971386f SHA512 0bf5d25e8a636a7c1a670d4481d46258f1ed3b6bb33ad64f5203bb0d0f32abf75ab35870f54311b5c4285ef87c383ce88747806269d7659646ff97fa6ea5bd0e
 EBUILD openimageio-2.3.13.0.ebuild 4642 BLAKE2B 74fa8fee521c7fc17e340b5c3932d3a119fb39a76e908a5d48654650651940f0cce2a7cdbe406da51c57e631301d105df4da59fb9c62765f0758abc6fa6eeee5 SHA512 901764f59f9482769688c5bd5fb1a18592197c6cee09889a88dd190206cd84a0028d40355fd8e46e16953ab4e055ed4ff834734283ade41c2354bafb51e2ab5a
+EBUILD openimageio-2.3.15.0.ebuild 4654 BLAKE2B 8686c7931471c93232a81551d477a1db6dce6c0f12439eb23c9f8c39c97186f5688d7744730276b420c163a33f61a2816227077eb2eb18544e3fc7eedb2620d4 SHA512 475e831ad4c82683d31b092734d9fd21e32b35731379598dc82c6b4b2d3029ad7bba36fb5e6f910fa3aa350c5d57c3e8efe2baabd11613523922be3430df937c
 MISC metadata.xml 820 BLAKE2B fd092484e492bc042f5cfdbb717963a12596a00514f986cddccd5b8956891c95b996ac1f5831ab2314f0ee3fbe3fa1905e7601a7b017a9a91f2f7c1aba3a9d8f SHA512 5dfc9f4ab3300f94c611822d1b1badb785cfaeab90bdadf5db5e36d1eb6eff8851123470a1863e1a137f94ea4ce286d2b67f6c3a28cb18d65bb177e1d570b7b4
diff --git a/media-libs/openimageio/openimageio-2.3.15.0.ebuild b/media-libs/openimageio/openimageio-2.3.15.0.ebuild
new file mode 100644
index 000000000000..01a5f74fd9da
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.15.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+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/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
+# for changing to openexr 3 which broke ABI.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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 gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test ) 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/libheif-1.7.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	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
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+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
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-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_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_VERSION=${EPYTHON#python}
+			-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 55a846866a83..4914ac27872f 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,9 +1,12 @@
 AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670
 AUX openjpeg-2.4.0-r1-gnuinstalldirs.patch 15897 BLAKE2B ee5b28985348d9da58d930782420aa43d284efd64574d8f8b250e6d115d6bbb6f4756de2ce6e17251f03c1b6b3dbde2c0fa71b2308724eb84354b15fad650ea2 SHA512 899a112fc8dc65d1c17ec68bf80dc0e892e619bfc67b97784e72c0878ed1a0dc44345b9f5b86e4453df27124b20444ab81511fc66f3e871475a93d8f1f7700bc
 AUX openjpeg-2.4.0-r2-fix-segfault.patch 721 BLAKE2B b26eaa1de6fc64e21477dbf1baeffae5a7df5f78228be117ff48d1d330e58702b516bcb345eddff03e344338c46b0ce66b6ac64198a9bf8a065e036be1e6c19a SHA512 adda72abdf46b9bd2aa0ddf8a653726181271bf1e680cd8caaa28150ee4ef83437246b563f26607b64305a50d68e7f24da81ccba306ad7451375d71fb896c702
+AUX openjpeg-2.4.0-r3-avoid-mult-overflow.patch 2081 BLAKE2B a83ee2926242667dfc0d4dba87a225bf44a5432be9165083d5b371dbbae1b28d171a5ea5b4013f7e05399a2c6910adb76e77dcf3dc88d8e4c0a3dc820012d41e SHA512 7134a62e81d8e7cca3fb714911642e5d5d37db319116104f41d93a2f7d8f1a98ba52bc5edbe89a215ce563e027a012739f1480696ddefff67a3f5735fad88cfb
+AUX openjpeg-2.4.0-r3-fix-integer-overflow.patch 2566 BLAKE2B 01823fb90e763b56eac390b4fb75b57f75e8508baf59ec5e078ce6d36bcf86d58fa9b5ee7327e54526f87a1ae9738fa166adca3af8e1e02e727a543b74caacb8 SHA512 196fa9edfb39e381d17bac0d4aaf2ab026a16bb8a8d3b780118af4395e4f40f8889049cd8ed59db278254adf0b5424bf0c346ae7f271576119aac59b74169451
 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-r1.ebuild 4478 BLAKE2B 46a5f1d2ea203610cb86b081c34477f1e8ff10d3467cbdecb5c218870d0e74aeffafd0925c90de5650a775f1b6f417df6ec2afbda3591ad6e9d2b044a11fc315 SHA512 686fdd68d37aa2b40a712b1f51711f509653f553e0dc0d3ad232c721e58146150c23f4eb5ec8c61d4fd147b7a32210664c0990035b2027001cd84c2bfe81db12
 EBUILD openjpeg-2.4.0-r2.ebuild 4540 BLAKE2B 4687d9a0481facc18df6ca69fd4f6065186cae265b0dfd187faf312a4a6258dc5ba18c2cebd9bbf16c99b3942476983fa5a47ae3ed5a4242854b75e6fd178a31 SHA512 92c25bce2326243646e2c9d7cf95053dd64f4ca2727e4a4c38fe03c58b08840ce95e0ea52d21d850528e4b8732f63cf07c4003b46a4b93cd2f6eae5aebe98779
+EBUILD openjpeg-2.4.0-r3.ebuild 4679 BLAKE2B d8d7ca67a4d429980e3a65e2d7a9c365c8fafa4b021837c052fff542008008b183ba08f54488dfa6ff4893104a2ddb680394610574829c01406729037f3218b8 SHA512 0884421d7728d35218c98a232df1d64c2bfc7996a938e146e8722ff3817438de0c4af42a3cc5673566deed39058cb4f3f4df6991007d395d5c248ad94b1184fd
 EBUILD openjpeg-2.4.0.ebuild 4467 BLAKE2B c1940c9c26d9e010fee76fe1c5c894a0fbffa5be2bc8eba8bb6d1d74b28e37f3a1e1eaad6a9bab60e58ce82942019a7fe796b2672c518c7c519b5cd05d2778fb SHA512 40d63968fb5f16b086ed154ef407a02f1cac452e82ce4fbd853f05ec76ef336db75be867dd1767c2845019eab72e3a6142d0de526b870b1b9f6d8b847441def2
-MISC metadata.xml 311 BLAKE2B f7da3c88ae13437c6dbd48c7468f091d1b87bea39a53a85b4abc97d6beb3869c5bb9bd0aeafb065961611be1098a25fdafd8f9b0eb6e395a0de734fc2df53dd5 SHA512 a5a60bfea83513d0eba56f9873bc2d38ca89bc2fade19744d32b767120b5c9e29f56ebddb903648643517f6e2488525e538a1810d91cc864640312c05b7031b2
+MISC metadata.xml 551 BLAKE2B 39647e4fca09d2f613785e350aed813dedb0fb109d718a2ab9b08f7d30d55eaeab4abcf3c58b1434ad239548c966aefac7ebcc3a13d50220ad4a2e59054a75d6 SHA512 a2d0283f5b3d97b6d942d865fa3433f007127dbc63e9479bdf06b8e33c8885dfe6c642cb1b1a8595164fa7fe9961ed44a8c8e70086d7b4dea2f75c1816bbf793
diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch
new file mode 100644
index 000000000000..3733a1b94545
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch
@@ -0,0 +1,52 @@
+Upstream: https://github.com/uclouvain/openjpeg/commit/1daaa0b909aebdf71be36238d16dfbec83c494ed
+Bug: https://bugs.gentoo.org/783513
+CVE-2021-29338
+--- a/src/bin/jp2/opj_compress.c
++++ b/src/bin/jp2/opj_compress.c
+@@ -1967,7 +1967,7 @@ int main(int argc, char **argv)
+                 goto fin;
+             }
+             for (i = 0; i < num_images; i++) {
+-                dirptr->filename[i] = dirptr->filename_buf + i * OPJ_PATH_LEN;
++                dirptr->filename[i] = dirptr->filename_buf + (size_t)i * OPJ_PATH_LEN;
+             }
+         }
+         if (load_images(dirptr, img_fol.imgdirpath) == 1) {
+--- a/src/bin/jp2/opj_decompress.c
++++ b/src/bin/jp2/opj_decompress.c
+@@ -1367,7 +1367,6 @@ int main(int argc, char **argv)
+     if (img_fol.set_imgdir == 1) {
+         int it_image;
+         num_images = get_num_images(img_fol.imgdirpath);
+-
+         dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t));
+         if (!dirptr) {
+             destroy_parameters(&parameters);
+@@ -1387,7 +1386,8 @@ int main(int argc, char **argv)
+             goto fin;
+         }
+         for (it_image = 0; it_image < num_images; it_image++) {
+-            dirptr->filename[it_image] = dirptr->filename_buf + it_image * OPJ_PATH_LEN;
++            dirptr->filename[it_image] = dirptr->filename_buf + (size_t)it_image *
++                                         OPJ_PATH_LEN;
+         }
+ 
+         if (load_images(dirptr, img_fol.imgdirpath) == 1) {
+--- a/src/bin/jp2/opj_dump.c
++++ b/src/bin/jp2/opj_dump.c
+@@ -529,13 +529,13 @@ int main(int argc, char *argv[])
+         }
+ 
+         for (it_image = 0; it_image < num_images; it_image++) {
+-            dirptr->filename[it_image] = dirptr->filename_buf + it_image * OPJ_PATH_LEN;
++            dirptr->filename[it_image] = dirptr->filename_buf + (size_t)it_image *
++                                         OPJ_PATH_LEN;
+         }
+ 
+         if (load_images(dirptr, img_fol.imgdirpath) == 1) {
+             goto fails;
+         }
+-
+         if (num_images == 0) {
+             fprintf(stdout, "Folder is empty\n");
+             goto fails;
diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch
new file mode 100644
index 000000000000..6ceb5be8f6d1
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch
@@ -0,0 +1,57 @@
+opj_compress/opj_uncompress: fix integer overflow in num_images
+CVE-2021-29338
+Bug 783513
+Upstream: https://github.com/uclouvain/openjpeg/commit/79c7d7af598b778c3cdcb455df23d50efc95eb3c
+--- a/src/bin/jp2/opj_compress.c
++++ b/src/bin/jp2/opj_compress.c
+@@ -1959,9 +1959,9 @@ int main(int argc, char **argv)
+         num_images = get_num_images(img_fol.imgdirpath);
+         dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
+         if (dirptr) {
+-            dirptr->filename_buf = (char*)malloc(num_images * OPJ_PATH_LEN * sizeof(
++            dirptr->filename_buf = (char*)calloc(num_images, OPJ_PATH_LEN * sizeof(
+                     char)); /* Stores at max 10 image file names*/
+-            dirptr->filename = (char**) malloc(num_images * sizeof(char*));
++            dirptr->filename = (char**) calloc(num_images, sizeof(char*));
+             if (!dirptr->filename_buf) {
+                 ret = 0;
+                 goto fin;
+--- a/src/bin/jp2/opj_decompress.c
++++ b/src/bin/jp2/opj_decompress.c
+@@ -1374,14 +1374,13 @@ int main(int argc, char **argv)
+             return EXIT_FAILURE;
+         }
+         /* Stores at max 10 image file names */
+-        dirptr->filename_buf = (char*)malloc(sizeof(char) *
+-                                             (size_t)num_images * OPJ_PATH_LEN);
++        dirptr->filename_buf = calloc((size_t) num_images, sizeof(char) * OPJ_PATH_LEN);
+         if (!dirptr->filename_buf) {
+             failed = 1;
+             goto fin;
+         }
+ 
+-        dirptr->filename = (char**) malloc((size_t)num_images * sizeof(char*));
++        dirptr->filename = (char**) calloc((size_t) num_images, sizeof(char*));
+ 
+         if (!dirptr->filename) {
+             failed = 1;
+--- a/src/bin/jp2/opj_dump.c
++++ b/src/bin/jp2/opj_dump.c
+@@ -515,13 +515,14 @@ int main(int argc, char *argv[])
+         if (!dirptr) {
+             return EXIT_FAILURE;
+         }
+-        dirptr->filename_buf = (char*)malloc((size_t)num_images * OPJ_PATH_LEN * sizeof(
+-                char)); /* Stores at max 10 image file names*/
++        /* Stores at max 10 image file names*/
++        dirptr->filename_buf = (char*) calloc((size_t) num_images,
++                                              OPJ_PATH_LEN * sizeof(char));
+         if (!dirptr->filename_buf) {
+             free(dirptr);
+             return EXIT_FAILURE;
+         }
+-        dirptr->filename = (char**) malloc((size_t)num_images * sizeof(char*));
++        dirptr->filename = (char**) calloc((size_t) num_images, sizeof(char*));
+ 
+         if (!dirptr->filename) {
+             goto fails;
diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index 7fa8ba2aacfa..de80c41403bb 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>t@laumann.xyz</email>
+		<name>Thomas Bracht Laumann Jespersen</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openjpeg.mirror</remote-id>
 		<remote-id type="github">uclouvain/openjpeg</remote-id>
diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild b/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild
new file mode 100644
index 000000000000..7405a4c46f4e
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+# Make sure that test data are not newer than release;
+# otherwise we will see "Found-But-No-Test" test failures!
+MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60"
+
+DESCRIPTION="Open-source JPEG 2000 library"
+HOMEPAGE="https://www.openjpeg.org"
+SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )"
+
+LICENSE="BSD-2"
+SLOT="2/7" # based on SONAME
+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 )"
+
+RDEPEND="
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0-r1-gnuinstalldirs.patch" # bug 667150
+	"${FILESDIR}/${PN}-2.4.0-r2-fix-segfault.patch" # bug 832007
+	"${FILESDIR}/${PN}-2.4.0-r3-fix-integer-overflow.patch" # bug 783513
+	"${FILESDIR}/${PN}-2.4.0-r3-avoid-mult-overflow.patch" # bug 783513
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
+			die "Failed to rename test data"
+	fi
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834
+		-DBUILD_TESTING="$(multilib_native_usex test)"
+		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
+		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	# Cheat a little bit and force disabling fixed point magic
+	# The test suite is extremely fragile to small changes
+	# bug 715130, bug 715422
+	# https://github.com/uclouvain/openjpeg/issues/1017
+	multilib_is_native_abi && use test && append-cflags "-ffp-contract=off"
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		elog "Cannot run tests for non-multilib abi."
+		return 0
+	fi
+
+	local myctestargs=
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
+
+	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
+
+	echo ctest "${myctestargs[@]}" "$@"
+	if ctest "${myctestargs[@]}" "$@" ; then
+		einfo "Tests succeeded."
+		popd > /dev/null || die
+		return 0
+	else
+		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
+
+		if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
+			# Should never happen
+			die "Cannot analyze test failures: LastTestsFailed.log is missing!"
+		fi
+
+		echo ""
+		einfo "Note: Upstream is maintaining a list of known test failures."
+		einfo "We will now compare our test results against this list and sort out any known failure."
+
+		local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
+		cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die
+
+		local ARCH_SPECIFIC_FAILURES=
+		if use amd64 ; then
+			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+		elif use x86 || use arm || use arm64; then
+			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+		fi
+
+		if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
+			einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
+			cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die
+		fi
+
+		# Logic copied from $S/tools/travis-ci/run.sh
+		local FAILEDTEST=
+		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
+		local HAS_UNKNOWN_TEST_FAILURES=0
+
+		echo ""
+
+		awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
+		while read FAILEDTEST; do
+			# is this failure known?
+			if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then
+				ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
+				continue
+			fi
+
+			eerror "New/unknown test failure found: '${FAILEDTEST}'"
+			HAS_UNKNOWN_TEST_FAILURES=1
+		done < "${FAILURES_LOG}"
+
+		if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
+			die "Test suite failed. New/unknown test failure(s) found!"
+		else
+			echo ""
+			einfo "Test suite passed. No new/unknown test failure(s) found!"
+		fi
+
+		return 0
+	fi
+}
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 2c2b5d19d56b..68ec942d6403 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,4 +1,4 @@
 AUX opus-1.3.1-libdir-macro.patch 359 BLAKE2B 901a1f09417bb962b3268a1d9a85cfc356df9c67b05452e31599c37cf9c0a2267c50e6b9bd820af2445d54a290d4170492bff692566c01e9b1841ed755b9c020 SHA512 ec9643035203e70589eeed1079cf4da7af548fc1e2f8f30645217042e6adb3f9e0f874dcbd96ad49c07637abb3abca94c201cfc7dd41ad1d687ecbc00320eb2c
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
-EBUILD opus-1.3.1-r2.ebuild 1317 BLAKE2B 03c8ede9678bd117d1e9d2617035663d02dd3421c489a7cf7291a91e646154594d52dde151d6928ef152f2b7cc3d461326a5c725940eca08bfdafdb33dd93e57 SHA512 4350a5fce87e08e51f807a9dfb0a7c15a4a6b40150ffce822c1cc9ea9b37f2617e4623ec14fbc4ca13a6c33617c4f27d65e018bf295071adf3cddbcd731c5cc9
+EBUILD opus-1.3.1-r3.ebuild 1315 BLAKE2B 898194c1e2d1f2b14a89f8b8e2def04a4a8b1a84cbdf6f73bfe38ffe790b9cfa78280396d2997d18c7ca22a9d307e2aea292b61a1b39cbe90f4e17337aae822a SHA512 b56706cf87ac99b4be8f83c840debdc91a19fddf1e2fdf1d7d63c9e10e9596c924c4d1f494ee7ed799409fea6a58c9491d8ac8e9ac9a89be5cdbaeeeda1c360a
 MISC metadata.xml 464 BLAKE2B af27614c44aeb6d0d0eb053566be211c7997afe134138f7331276e406ad981e7e72303ae6ea9ad01d1a5772d6bce373d03f2996f4a126ce5414fd27626f90593 SHA512 e8d7151b3c61c6cdc6630f743237622bbb57128d1ae507b0ecee718a075f41133f68975ac805f2e886446508a73c158071ea0552a33c5dcd1ef434929f878c90
diff --git a/media-libs/opus/opus-1.3.1-r2.ebuild b/media-libs/opus/opus-1.3.1-r3.ebuild
index 10c7e4876985..e250256c7441 100644
--- a/media-libs/opus/opus-1.3.1-r2.ebuild
+++ b/media-libs/opus/opus-1.3.1-r3.ebuild
@@ -37,7 +37,7 @@ multilib_src_configure() {
 	# We want to disable intrinsics if no flags are enabled
 	# (This is a fun Bash construct to do that!)
 	# bug #752069
-	for i in "${INTRINSIC_FLAGS}" ; do
+	for i in ${INTRINSIC_FLAGS} ; do
 		use ${i} && myeconfargs+=( --enable-intrinsics ) && break
 	done || myeconfargs+=( --disable-intrinsics )
 
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 942278bc9b9e..dad9a52cc4fd 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,4 +1,5 @@
 DIST partio-1.10.1.tar.gz 333129 BLAKE2B 82d1dd36e9854e221af036d386ecdc558ac032ad7cd720403787ddc83ac236f05fd86e8c07ade07ca93b06a12ac2b834c96a6d43265e396934e44a815df003d3 SHA512 7d3c6449ebd1e8b8a29298a3119acfd1036970b287e9cd5f288a63c7e2b3bf451e9e1ba8fc72f203e225eb2b062d59cd7373817ccc6467de67427d02c0b12477
+DIST partio-1.14.6.tar.gz 336527 BLAKE2B 60c9c6ad9d5a7b58967e7633180d4f8d399bd129cc7b76fc4329b3d191ce0d381df7f977d5ec11ccedbdbcd8afa0fde2f946960f08a242338c2f674b4c94343e SHA512 5479d00b3124e8e06abbc65b1cdc01cdac37b9207c0615029e488baa0835e4ad545be2fb07dda5b4541dd846115059aaca5950ff904bddec6bb1fd72180ebcc0
 EBUILD partio-1.10.1.ebuild 1023 BLAKE2B cbccd3f0286665474ef8b0b18571bb623bda5a9f5ffeaab29d454470f1b0fad474efbc022f63cdad0385253096bdde91c77ee987c37813344525d03c493bf16f SHA512 d674c8ccf3217857f727db21460618584dc476a399ab91ac4a92dd871f5901ff3b2a88c0b748d7cc063927b3a36339e3a207ed20364e36aaac57586325fafa51
-EBUILD partio-9999.ebuild 1007 BLAKE2B 0ef6f815874a53c90a329598fa1fb74ffbe8df5d54594b4bca6c13de3836c50417f5185e2e6adf84c0ff5111fce8dbc850e5901e33cefb2eb274048dcf4bddc4 SHA512 42c9ce2cb8ac4ae9cf89a3bedcb2e7ff10c7adfe8c7c22cc39ed592f359a8d102ae736321fae802b18e29664c29e9201691ecd402f12e523a5e2b30ce32785d7
+EBUILD partio-1.14.6.ebuild 1001 BLAKE2B a8143617d9bfcc77019aa77a5c689503865be4887f103536545193c1fd55abbf1aac9a33b5204c8579f151e865464b7c55ba954f897cd606f497ede31d63ec35 SHA512 02a1d3f158484033775e00c281cf2d3b3a0119bab87ae99408eafbf2da779aad518d9d3ca38a16aa9d44d4b9d240c37fbeff54d14bdeadcf72438d1df20a9da5
 MISC metadata.xml 475 BLAKE2B c8260e899b75f38caf77d3742e752758705e5cfb937fb7e8cc8f925cead54d97bd5d308b2cd3bd74fd63b87060f27be27adafa2a70c28991802abdfd2273cc24 SHA512 a67d143e48e71c2d0c649d66e348177d843f7a3607c4da92e0da98d9228a3a16c8c7e12b9d26df03175ff9c4a2082c71c19f91f3d13b91cb2337a6bb0ed6ce8c
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-1.14.6.ebuild
index e5a82c3417e2..05488dad4747 100644
--- a/media-libs/partio/partio-9999.ebuild
+++ b/media-libs/partio/partio-1.14.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
@@ -11,11 +11,11 @@ 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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Library for particle IO and manipulation"
-HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
+HOMEPAGE="http://partio.us/"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,7 +24,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	media-libs/freeglut
-	sys-libs/zlib:=
+	media-libs/glu
+	sys-libs/zlib
 	virtual/opengl
 "
 
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index add9dc4079f5..4da67f46c706 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -10,7 +10,7 @@ AUX raspberrypi-userland-libfdt-static.patch 724 BLAKE2B 1e2901c69d9bf855c1db9e7
 AUX raspberrypi-userland-pkgconf-arm64.patch 1453 BLAKE2B 42dae98ead22bf8c37adae584ca5b8230176f290202124cf61677b9d13deb627637f5eef230db4e4628524c2056096139a1a9311b9530d7cceaa246111f70780 SHA512 fa259fe0ea348dfe4b5718dfc27b4b18289abd10d7b160a29fd01c62b4ed95e518259adaeadb1b300e7957d2a824ce1748b9216cc7679be2aed105d6883ad042
 DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b
 DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9
-EBUILD raspberrypi-userland-0_pre20160424.ebuild 3283 BLAKE2B 5b1965844bdac077be5be7a705cdb5971530f33de8dbb26d53eb3e383c1db494380b26b9209349847d9f6daf2d5c05472c4d4cce115be87cd7e33942206cd640 SHA512 13243919f97559533a4ada9f2d822a9c4c5ee1776921929e5a4b076ee7b1dc02fec26232348d9f08ac841b9c85178ffa0fadba752f9b3b58f0a002eab5d82da4
-EBUILD raspberrypi-userland-0_pre20201022.ebuild 2163 BLAKE2B d0062c18d97543b8598cc7defc4d5d3a13237a62278e6d23a3bff8452ef472e12736fe6a4f6e5e4b2594b72c8c2c99577b13d1f5111ac8006cc09822259fc222 SHA512 2d6fc20602126da4d75acc44e80b7bfef20bb9b9cb4c099f68df9d3be094c70f07d0779569ddeb62351077598bca9347979860cbd606464dc04e95c8ab5f267c
-EBUILD raspberrypi-userland-9999.ebuild 2165 BLAKE2B 11958652dcfbab355a9bd8187a8736f4f8ba2e0b71cb594eabcb1cf61173cf18344541463d21c22778ae39b158e681bb860efb0f3eab4c6495c538dc3ae2f4f1 SHA512 6d50e25e52580d0dbc4932329eae3f63f465bfebe1209b4832e80dccb7bd3ecd87b59b9c776d8c3b32f805a3a712ad57a673a21b75501599a11ed92412e62f65
+EBUILD raspberrypi-userland-0_pre20160424.ebuild 3301 BLAKE2B e161b79ed582cd8a2e296240ab69a4e93d35db235b4b1bc362a00fdc2bd08a7fe2667297ec088f7769d0e94c66bd4dacc70dede2700f1f4e5d326810e032c828 SHA512 f74586db6a6a0790f29a2007fc2e6abd8892df6024c83ad71d21757e9f3d490b8f6643c255c60a4d617cc53c0d1d2193fd5a78dbbf5ec165b97c87df7ae87574
+EBUILD raspberrypi-userland-0_pre20201022.ebuild 2196 BLAKE2B 642b00c7d84402d89b221b1cb3cbad841967564b65a647ac22335e0ecaabad2855d9360c4a0b03d9aff5a934d33a0b94ae3d2bd7e9507993dfc3ac63aded398a SHA512 5f55c812d3157038c07290bc6fa1ab6e5b599f597035a8d4002773204b9b70337a850cfcc112ac449860074435b4a080bb6086af886fae0c02fa16b0ea476428
+EBUILD raspberrypi-userland-9999.ebuild 2198 BLAKE2B b319169a6cb94cfae89bdbe11814a59e61127bfd3919a3ef55c946fb87bee93b946ce5bc52d717cf63d6785b8487b53ce276643a176f30676ea8cd2fb2008379 SHA512 71e2caf3c5791eeb42b330a3f47050afed43abff461bb295f24a378c41446842431c03305d81f1f0784e631cb8d23949c58233c8c25820fb013ceefe86532dc5
 MISC metadata.xml 352 BLAKE2B 4824c9e6ed48717baa59e11b0efe49446163a2371964c4062d8797da53f842c9bd8e1f2c2717f6d8a2541ef26bbe9ada9fbe1a1a04bb7bc31cf96153dab63465 SHA512 56890e790e423f487613ec16aa317463f459d6400b81d09d826c2a96524e05cb6a27b16f4f664e4c0880d790cd69fcd12bcb2ff02c5eca5995055e3a295beb0b
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
index 8c43fe24aa99..7f5d733485a6 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
+inherit cmake udev
 
 DESCRIPTION="Raspberry Pi userspace tools and libraries"
 HOMEPAGE="https://github.com/raspberrypi/userland"
@@ -64,8 +64,7 @@ src_install() {
 
 	doenvd "${FILESDIR}"/04${PN}
 
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
+	udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules"
 
 	# enable dynamic switching of the GL implementation
 	dodir /usr/lib/opengl
@@ -110,3 +109,7 @@ src_install() {
 
 	rm -rfv "${D}"/opt/vc/src || die
 }
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
index 7f27f6655647..112896ef1dde 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -69,3 +69,7 @@ src_install() {
 	cmake_src_install
 	udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules"
 }
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
index 7fa3e5909284..f05820d71ac0 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -69,3 +69,7 @@ src_install() {
 	cmake_src_install
 	udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules"
 }
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index bc22e7f38501..1eb374686ad0 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -2,5 +2,6 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b3773557
 DIST shaderc-2021.3.tar.gz 221509 BLAKE2B 5061073e4489bdf2245a7cd18968a5a874cd33c16b8944b5c781b78e648f20bc8cf49b52e61ee3fe5b2aa029fa8195687079865403bb662839917b142421c49c SHA512 759eca72564bea59c06d31f70a85571a391360d5d428db85a30f934d080bb25e254ecb5650f71a96742cf417f09d819f36d301e92294a5d0d294581ca554248a
 DIST shaderc-2022.1.tar.gz 222009 BLAKE2B c6707699a49c130b2669620e11f52862790999954a84b05f9f54d238fb0ae68e2523cc4b86104b3d4bce4528db31be89e441b278a97a375b90d7e0f458075f51 SHA512 21c2462cb434d94da87c71ba660f6cd5b161450d7faeff8789b41db25e64f2baa7c560e78aa856d128c5a73699215d6b1085b5ca19a4640237adf194793ad44b
 EBUILD shaderc-2021.3.ebuild 2101 BLAKE2B 42f3908ff4b993f0d42ebee384c8dcc5ca37b1519fcb4e46be80aeea3ff4bc3d6ae6b7c03900c50a78fd7b25d5b24bf3a8b7dedeb1ab6bd6764feb1aab56e95f SHA512 a64488699535d988181ff860af17010990d4db9abf467f00d3c579b9a64c7b8dd60eb256908f63fe9c5bfcbaf3701330729cd854b125b3160c5ab2a1c20a1fa0
-EBUILD shaderc-2022.1.ebuild 2104 BLAKE2B 8224d797fd9caf1b75bc12cc5f040fa06920823ab33d1a9dc242e579bd892359f857e88aceb72717e8af9329531bc76411dce0014ae2bfaa4c0275237007175c SHA512 29be822f9d7cf796171dd2cdd0469fc2d67025d7bb9dcd747c285d3b9b203c020d7cb1e694635a53fcc112e70e88a7d5c4b83e0a9cd3738fd5473774b834a5e3
+EBUILD shaderc-2022.1-r1.ebuild 2107 BLAKE2B a2cb20b74828c14469bfb3506da763cfce58e2ee2749dd6b7ee91e8de637ff191e0179fb786c307c380f0185a1026b5ef437da2ba72e723fa0a550097e1530ec SHA512 585d833159ca9e71d60d64feeb68d697102e0a6fae2f85e875631d5cb35d75da9b39bdb3afe82a35dc2147d2c9fb68c9862af4b6b3687a8e9ac65c5afa593363
+EBUILD shaderc-2022.1.ebuild 2101 BLAKE2B 064ac4b89d4d563e7aec3744f4feb06c201e28e63e3bc5e8b2e8964975eb92ab6e098aa0d5a43d1eebc8cec14b2a70d0aae70ae32f993f7988f2facda38bae7f SHA512 6d3539448103e896a26850b74bcefa840b61bf83786b651eabb32ee39e9ff01d4aacc3d480ff68912a0a9278c7a94a297a3769e29cdc5e6b15af28cac210eaa7
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2022.1-r1.ebuild b/media-libs/shaderc/shaderc-2022.1-r1.ebuild
new file mode 100644
index 000000000000..3312ef71f4e5
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2022.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+EGIT_COMMIT="${PV}"
+SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-util/glslang-1.3.204[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-1.3.204[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.3.204
+	doc? ( dev-ruby/asciidoctor )
+	test? (
+		dev-cpp/gtest
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2020.4-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+python_check_deps() {
+	if use test; then
+		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	cmake_comment_add_subdirectory examples
+
+	# Unbundle glslang, spirv-headers, spirv-tools
+	cmake_comment_add_subdirectory third_party
+	sed -i \
+		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
+		glslc/test/CMakeLists.txt || die
+
+	# Disable git versioning
+	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
+
+	# Manually create build-version.inc as we disabled git versioning
+	cat <<- EOF > glslc/src/build-version.inc || die
+		"${P}\n"
+		"$(best_version dev-util/spirv-tools)\n"
+		"$(best_version dev-util/glslang)\n"
+	EOF
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="$(usex !test)"
+		-DSHADERC_ENABLE_WERROR_COMPILE="false"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake_src_compile glslc_doc_README
+	fi
+	cmake_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake_src_install
+}
diff --git a/media-libs/shaderc/shaderc-2022.1.ebuild b/media-libs/shaderc/shaderc-2022.1.ebuild
index 6158ee5f04dc..d560e31f8453 100644
--- a/media-libs/shaderc/shaderc-2022.1.ebuild
+++ b/media-libs/shaderc/shaderc-2022.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 2e7cfb163e65..6ab38d2805e6 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -15,5 +15,5 @@ AUX svgalib-1.9.25-vga_reset.patch 747 BLAKE2B 73e459c902be26584bc727bdb4c48398e
 AUX svgalib-1.9.25-wrapdemo-buf-overflow.patch 516 BLAKE2B 504bdd01a0bde6858648f5e640fda34f337e6cef3f08f46b77fa453741fd556964fc09b48f494cf30b644fc1ff416c9728750d1c58502811d292d9b96ad415cc SHA512 e4e58a065f721f3c71d13f9ba0ffecf35ff32b25c6e46217eb9a0184b012e5be13c96c597df153ad7a27a5e41cc5a845cecae04d2d6c3dc6771bc238f8c75232
 AUX svgalib.udev.rules.d.2 44 BLAKE2B 513532c74e5172a5f2882df1912508f12adf1347c3af1bf0a44f66781d139a28b7aa332f5a5e630d099b381b9a94931ba0b7ad787393228bf694878f442279ab SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82
 DIST svgalib-1.9.25.tar.gz 987084 BLAKE2B 0ca81483d754796d8c96abef2940c506dd8c6f69ac015f0b34995a81db91c0540f405271f3c9e337ead551c783e9d6a336ef53bfb1531481115bd1228b679ea8 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7
-EBUILD svgalib-1.9.25-r8.ebuild 3504 BLAKE2B 2ec78840d5c87d819eaff0d23d92b961069b8b454714d55e470ece080019dfb73965057b67434edd62528f5ed66d052234e57880db81590b5e75e0a220384c0b SHA512 64614af94bfc89abe7d03b030fa4dc5c5450a01e4a7f59d94e3c89ecc7a6a6df448c066110865c2a83827ed2fdd0d1c1538abf285572f4092c419ad032716b22
+EBUILD svgalib-1.9.25-r8.ebuild 3503 BLAKE2B ea02543d91030084635685b0a940eb7d987ba3c9f012a3921b6758131bcec4ec05da6cd26b9beeb76e8475d98f260d19879cffb19f4b148eecf22b16e9bc8c74 SHA512 0a0bc54606251e9dc975d0a3025ae951b55e1a5fcbaacc9b548d8ac9e90f2ed610715e9914f5ff1de473e50c5b5bd017d7f227ca0cd3a28e57b5f1a7e5233d6c
 MISC metadata.xml 326 BLAKE2B 4403b7e534ef31f31b3cad2ea20647984808446350df90be49f97cc712edc687970b380ccfdb43feaadca48f01396fab9c309221595ada96f1aa29add601a978 SHA512 c313667c47c7b201ae46f1c46bbe448db0b8bb9a11b54057dd379121f97f6110069047e856c3ecb12b172e7b328714b55787edf0ca8d13263791b1804021f145
diff --git a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
index 4199e5163324..437e486ad5aa 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic linux-mod toolchain-funcs
+inherit flag-o-matic linux-mod toolchain-funcs udev
 
 DESCRIPTION="A library for running svga graphics on the console"
 HOMEPAGE="http://www.svgalib.org/"
@@ -89,8 +89,7 @@ src_install() {
 	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
 	doins src/keyboard/vgakeyboard.h kernel/svgalib_helper/svgalib_helper.h
 
-	insinto /lib/udev/rules.d
-	newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
+	udev_newrules "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
 
 	exeinto /usr/lib/svgalib/demos
 	for x in "${S}"/demos/* ; do
@@ -122,5 +121,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	! use build && use kernel-helper && linux-mod_pkg_postinst
 }
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 9ffe5d6922c8..008f0381e0ef 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,3 +1,3 @@
 DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175b0d73b4af3aa301af2dee3d76184e4689e7b2f1f9b73567ac78d50456ee94fffe00bad6da05375cf2d94d92 SHA512 e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493
-EBUILD tiff-4.3.0.ebuild 2049 BLAKE2B 3698f96feeafe136a25898946f7b5a003fd40e62eea9463696831d97f12bdfb2ad6e916a9d2adb5e5e59eec6ad8648887b5dd1b26a5f0fe9da28c29d072b1b16 SHA512 3748ebce45e493316c50e99491be799ee9faf78fae345bc5791f6788fdb9a9a2e79bf9ebf801baa2ff6cf0732cc9e70ab3b3a848d73e89d96d1884527d433765
+EBUILD tiff-4.3.0.ebuild 2056 BLAKE2B 424dba5d1ffb1699a268dabb5498fe6a46a21b70123bc1cba04b5e9bcb637151b4ff49262f9a53adf95766293a4a2c7d9bfaeb192c92e083ae5cefa21931a436 SHA512 09d81e358ed7af8dd65c73dfb8c857e5d48d7cdaf764a5a5fbcfe400133915d074a2c6c15bb0a617d0fdd271f10de20402a807a4e265dfc96dbe65af8b016bb3
 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469
diff --git a/media-libs/tiff/tiff-4.3.0.ebuild b/media-libs/tiff/tiff-4.3.0.ebuild
index 714507392efe..370541992ed6 100644
--- a/media-libs/tiff/tiff-4.3.0.ebuild
+++ b/media-libs/tiff/tiff-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/vitamtp/Manifest b/media-libs/vitamtp/Manifest
index e500202c7910..1b315bfd39eb 100644
--- a/media-libs/vitamtp/Manifest
+++ b/media-libs/vitamtp/Manifest
@@ -1,4 +1,4 @@
 DIST vitamtp-2.5.9_pre20160829.tar.gz 201289 BLAKE2B 1ef7d55afd32ac27cc7f4ce233644ab54d760c906e4073a77b3e0b0d2d5c90289d5bba22d54448effe675e28275068f9c20cd15c7b6223e6d6f42950dd5c6da8 SHA512 fae1c509d30610191e20ed12426118599feb95b7a3aa0e31b43f6c0ac72a3dc9d72407ccb4f14818574c313548f521c35ad0a3264b861b745ec991b5cfda4c97
-EBUILD vitamtp-2.5.9_pre20160829.ebuild 1005 BLAKE2B 0261569f80ac090f43f56293bd611fb8111b6680844f1fcef65c43dcf4dbb9a67a55b3d3211f6de96f3a0d8894a72c3eb3a11819e6bfbe529c8372e5c6d63416 SHA512 eff12aa9b54fa8cb8ef369f62d1626da91a2962160846fd5ae62d76f6bf5f41daa11b43a3345856f3c3f17d844ca29a888ef6dd6b7c45aa07026adc2b869c182
-EBUILD vitamtp-9999.ebuild 874 BLAKE2B 8fdb370defa3abd6c2a72bc1b629067c7b01e844659bf7da1dfc20189c4cf8d2575e0f909f1f780bcbf35188395cbad48c4b3dd258169e8a59791312071487e4 SHA512 15f8a62ea5dffe7e6bebec364fcebcb5f0b7fa812bc9ae256649765285e537934a4968ae9083298afb83149fa447f0543ee813b0c6b4808a91db338cbb37616e
+EBUILD vitamtp-2.5.9_pre20160829.ebuild 1025 BLAKE2B e759e45dc914879bb162a5f2e3877446c492e092a063514acc4d2361c2639d003d3f8261a0f89c14163acf671c38a385f62ac616f7d623aa0c46d3df42011def SHA512 d375408d2f0df13355fae6c45a31b7de9589fa61b238f8f9fc0067d76ff9fb8d5e7abfbc09188c4467d47f4d0568a2a8b72a84d82595bbd82f29671e92543062
+EBUILD vitamtp-9999.ebuild 894 BLAKE2B 3582d66196bfb42b8009dece9f573ae4350accce96c9a46d2228dc1ac1b0d6d316dcd6a7e8cfd4b9bc38b35c32b8cf0ed67ecedd1ea9ef62ebaf50a44db0613f SHA512 43875f1d211fa2086599877327cc840c68e84bbe46f8fe90d3bafbe92e71c6290cbe7177885af229d19b18eef6628ad876b978da114d035e74f7bc0ad6280677
 MISC metadata.xml 337 BLAKE2B 53194a84dd8bcfd64822850b068a80418179852a4575b7ddf19af0b9bfd72a5dd7cd4c6dfe3332a597c93e98cca89a054da7f2b32796d0a41b344c69cc79f9a6 SHA512 bd5f8df77b0926d2794be618294fb4a140947bef58089e4880142d4dfe50520d251e48637dec595ffa4e9e7d2f0ead7d84af6a84337a5981796a6838d7253c2a
diff --git a/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild b/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild
index c1a028b1ab19..a57b5ab082cd 100644
--- a/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild
+++ b/media-libs/vitamtp/vitamtp-2.5.9_pre20160829.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools vcs-snapshot
+inherit autotools vcs-snapshot udev
 
 GIT_COMMIT="7ab537a4f45e34984cbeb9cf1b1af543a75a3dc0"
 
@@ -40,7 +40,12 @@ src_configure() {
 
 src_install() {
 	default
+
 	find "${ED}" -name '*.la' -delete || die
-	insinto /lib/udev/rules.d
-	newins debian/libvitamtp5.udev 10-vitamtp.rules
+
+	udev_newrules debian/libvitamtp5.udev 10-vitamtp.rules
+}
+
+pkg_postinst() {
+	udev_reload
 }
diff --git a/media-libs/vitamtp/vitamtp-9999.ebuild b/media-libs/vitamtp/vitamtp-9999.ebuild
index 90e58fb32077..158230be609f 100644
--- a/media-libs/vitamtp/vitamtp-9999.ebuild
+++ b/media-libs/vitamtp/vitamtp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools git-r3
+inherit autotools git-r3 udev
 
 DESCRIPTION="Library to interact with PS Vita's USB MTP protocol"
 HOMEPAGE="https://github.com/codestation/vitamtp"
@@ -36,7 +36,12 @@ src_configure() {
 
 src_install() {
 	default
+
 	find "${ED}" -name '*.la' -delete || die
-	insinto /lib/udev/rules.d
-	newins debian/libvitamtp5.udev 10-vitamtp.rules
+
+	udev_newrules debian/libvitamtp5.udev 10-vitamtp.rules
+}
+
+pkg_postinst() {
+	udev_reload
 }
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 062f6de3a0b2..a58291325d91 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -2,7 +2,9 @@ AUX vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch 1068 BLAKE2B 4a91aa7
 AUX vulkan-layers-1.3.204-Fix-dependency-detection.patch 3923 BLAKE2B 7c07fb98dd07855e38d52b5af7fa557f722b83e6afa1c22bba027f2ffd6d6fee71dd27e4782b40d5e62734e7b913e332dfbf2d01b69eaad1a563337f9ac5df19 SHA512 4d4323acac168e5d9ea2b530c69400e980278bf5ec4450dcb2ff865c9714e02646ce90918dc4aa2f9dda932e46e3ff90c1639e4507ce5bf498a512b26f6b0417
 DIST vulkan-layers-1.2.198.tar.gz 3555293 BLAKE2B 1a419b1b4b50241f6f4225a8666b8f6f4fc00e30dba045deeca709f4b9ff777f8a66691ef094b72cbf059c9dafee9f1ad2986108e48c8ef3974ac805c103644e SHA512 c5ac3e458987f3aa8ca21a79aa7819fbc1ca6013b6e445a82407ac0664884b90b8f79a2593368f6264a509674aa1f9584614c7c464c88d74284601f0c7636ef0
 DIST vulkan-layers-1.3.204.tar.gz 3662632 BLAKE2B 277ab312fa8b127fadb2df37933b7eaf11b6ff5dc40246fb35c7e5d35f7d80b17bdc55e5a5686b5222500f416f462be06a3991bf786100bf0fc1af57be569a6f SHA512 9f0649d2e3eccd52a093b4d9c3446d7f05ad4938a6950042fc2c3cf05f6ca2f513706385fc39cf4559344a4770fcc4375306904a233d0edd48b6eff5f17f1b0f
+DIST vulkan-layers-1.3.211.tar.gz 3967709 BLAKE2B f86ff0fa053e0138a0bbdbec30e2fe0a59cfc24f43fe787b007ae352db81a700442d777637e1fc577332a47f36bc09383dd29416b5170fcf5d735562b6a58230 SHA512 e494ba793064f0d32fbdeaddaa01dcd730a36a5c793625bb4671a4e8067364171416ec8fb7361f946cc5d5e8dc16d58e2194c3eb5d3a57d58f4ace2e7ed34f5f
 EBUILD vulkan-layers-1.2.198-r1.ebuild 1602 BLAKE2B 8eacbcfd0c71f721bfcefd5487570635c2113067104c3ef97cfe448a2ba4bec2a8c17fc162603060dce5ee83c1cc08f08cb59435c0cb97ac3c6e1d00d0bc187d SHA512 313a2f169ce77b408715cf6f6122d6856d5cff491f5160e8d594337ed21e94e3f314b635de00beecbb228a68020591a633b93c707e879a4abc3e600c923b70aa
-EBUILD vulkan-layers-1.3.204.ebuild 1631 BLAKE2B 3a33173fec35bf49cda2777aa38d6b6be02c8d26ec253dbbd1b0218dbc8c436ddc513584eba2ae1d7db8d539b58f861b855755e0f9adff7bccd2cb1c68cbc8d9 SHA512 33e854009921cfc83287241143db5e50f88f31fb3060d2a15967f0134aca747c8778ea80b971307c3b175eeb4e423a8857923f3d1489083b763ee037ac78eb51
-EBUILD vulkan-layers-9999.ebuild 1578 BLAKE2B 9de9bc4610ddd8be733ff703e6b181e693d31c6ac3819c21e2c62b644b213ef561b4515c4c60c8aa318550038182e0e1807af210029bdba55b146d06dbee2aa5 SHA512 87d4953f698930b71808e4df361294bed60c7deb92e09fe1a03ee1e8b4da00f6187c0b3b4a436e8fe41a8d25dfc748133b347957f585a50bd373fd967e365bb8
+EBUILD vulkan-layers-1.3.204.ebuild 1625 BLAKE2B 185afc830eea2ef233b17f445dac3f800b7b48bd30608589f693af0bbcf07b68ea43520566f12b116e48395f3539fe20f561f07b3585b05fa199e518d187d832 SHA512 993ab073216fb6086e61373244093a69857d67ec909df5c234f574fea73ea0474a75e2aa21d78f5c86f834b3175963485687877298d9f89f7441661ff94b1365
+EBUILD vulkan-layers-1.3.211.ebuild 1515 BLAKE2B 9bd2188639f752c469053660fa149254708045c879e696c02750817483411ec58b46121988911a51a9aca38f49c1a9959f3539056b7b2b73dd222edd800bfc99 SHA512 0f3cc41164869c868fe38b69703a9731ce60ff3a206ce1505a0f3e24c059df0e8d29af6a996b4efd31f099532bab2331f87b4303b6c312d569912b2350fd4b0c
+EBUILD vulkan-layers-9999.ebuild 1580 BLAKE2B 03665b8beed8a159df389fd81393541088511469fe9305495d6e1a5a9bebfe2e3649f4d2caa2ff4a1f83e8899ad00fde7e0895818d7803844cf27b5c51e131d1 SHA512 7a624fe100dc6a7bff7155a73b9faba422eb2ad83eee4a3d4924432e838ec95e7251ef73f0f12a3fdbee30b762a3b455a3687c3e2d6edeed99ee2e89a916fd2f
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
index 3b60f6688ddf..9ae97ee6a3f7 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild
new file mode 100644
index 000000000000..71a5b3ebe001
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-cpp/robin-hood-hashing-3.11.5
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index d907a6f8f9b1..ced265c1f55b 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 3209ff94e197..39538ab2712b 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,8 +1,10 @@
 DIST vulkan-loader-1.2.198.1.tar.gz 1441540 BLAKE2B c34fe5c0b97ee01038749754eb76b0fa7f1e4b9ad5ee78fa63ed9bf27e49362b215b39fd9fadcc5592097db80f3e655d109d6c92ae97829bdc75f5a28085d234 SHA512 dff0d8d9f6ffe4da6b94d491133c79d8fdbc724577387ae6f1522d7e557e39067ba66de60cc075bc469ad755dbe77d6e6728238a7ab4c07c36cf16964936e641
 DIST vulkan-loader-1.2.198.tar.gz 1440922 BLAKE2B 5048a85155f94cd13f36fae48414ae3a0ea5f120a22f8b199fd43a2813b7168a9c5310ac6298ec2dee6488012d17d06043cf37dee38de265924e408f36498ed7 SHA512 92fc0cfa872e286abe4aa26a68a2bb90683b68425abbe001a62ac511c76850ad08102634e64ac06a88cf8ab225e60ddaf5bc80aa2c4bf68c25c0c47e5782f4fc
 DIST vulkan-loader-1.3.204.tar.gz 1465828 BLAKE2B 92716a01958a851374c037b325f7dcd1f3dcb45c1ee0086102c71424965255a3ce9423ed8c1312023f445050cf112c9312110c2d6f4d43ec9980270eca2bbb67 SHA512 f78778783a4981a2b0b38c651e87358afad5c15d220bd1cb95e907f9afe2a81073b6ee12992c7038d0c8227cadcd7a64c93d21b2155585db3d807982354989d1
+DIST vulkan-loader-1.3.211.tar.gz 1581450 BLAKE2B d7ea8cf54693733d78a0f4d96119c8b693f88f38c1a7664f2dc14b10bee3558fdf32279a51978c2d77a282a33b93ea6e0d6769e9d17345117bc2e048c4645707 SHA512 2c363909b975d3b286f2ac277e7ff8ea26347d7eb1b6bac9580ceba83822978d51e11fdb58e91e103b00b324f67b776f0e5917e781b3278d7edcba4669cbbd6c
 EBUILD vulkan-loader-1.2.198-r1.ebuild 1768 BLAKE2B 0b0369e7612be07e579dfdf9827d43c3c03251be8f0aef04ca6f79f260c89ec645fef83186aa573f830cbb898e58df3a778dc5a7da42c74d3195ce2dd2d24ce8 SHA512 362dcaedd4423ed385e6e03420f11570611abffbb413366ec9aca326783218693f8c9a378b722394f2f00a36196b87e173341f22b3ad6a70390a58c40ce42606
 EBUILD vulkan-loader-1.2.198.ebuild 1760 BLAKE2B 0744e4e484ed2b0c1161e5941f5f0c4ac2f9fa6edfa6ac692ce0935c92cb1d71c5183035fde85abc22b57c3088b74410487a93f0a82ac5441ca0b53f6f47c6b1 SHA512 905a76ff689729fc9f40778d0a007c5729ec2ae54e4d146b14c5f69e00a8df6ffeeaceb307fdde441eff9702b4cfeeccb0f6e8c9ed049f15423ec2164d184fdb
-EBUILD vulkan-loader-1.3.204.ebuild 1762 BLAKE2B 8974c48cc3d535cf8e97fa759a50d3116f036db664344b8fac392f60c144385c6ffbc1ca40b2ea4145c9385890232096815558b69ef82094c9775ffd65ca57f3 SHA512 bcda2e11f00a4198867eef6190603c5e4cbed54dc1c990df24d3a6c4a8efa8672a3a0533b2aa40a75a7ca3b31ab5c31757f21aeb52a7e75529541bf726c32086
+EBUILD vulkan-loader-1.3.204.ebuild 1756 BLAKE2B 96d71d10ebb9a26f1594f10c1d6c0d667b49ae27ac06ff84cb34c729005229afac23f7665b4ba7d233412de7753edcf7238522cd316d40d9955d03808393d079 SHA512 e1ec1f2da7bcaffd0541139db2f526e63a2cbde079e40eabe12ccf41144f99a925f80f3151a5544137d11c4710b6c18aaabe72169f5b803d1175cbf55f80ab25
+EBUILD vulkan-loader-1.3.211.ebuild 1742 BLAKE2B 68ac5fdddd022f0c75bd25ddb3c4db4bf1a675d787fa5a6903af584521f334bd8edb819905947af9af651382efd580ceb8519b78e5cc8a893272067e34d1ecc8 SHA512 e6bcb7cb53d23e7c26edb845df106c0dbc739f5140c093df562cb1adc666df6650023397589828958dd431e08a8b9830329fe53e74957b771d8007c567c01909
 EBUILD vulkan-loader-9999.ebuild 1766 BLAKE2B 49c51cbe49671126cb244fc0b91d7c44b431817462ba7a4ac7d36110308fa002fe83f3b26058c88407b812ab2404f8b392fcd88dcf6119686ae5835312c6a147 SHA512 133dec0c07c43dad42e5719171c54939b6850249321a994c67891f6797e0adc6f78ad434bb31b8004789a971c1fe2cea844983663915eaa4dc23a63d4c64b888
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild
index ce4d1ef79739..758e14eb4eba 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.211.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.211.ebuild
new file mode 100644
index 000000000000..2ab60aca789d
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.211.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Loader
+CMAKE_ECLASS="cmake"
+inherit flag-o-matic cmake-multilib toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index ffdac656414f..b486d61559c2 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,4 +1,3 @@
 DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
-EBUILD woff2-1.0.2-r4.ebuild 875 BLAKE2B a476d41e48546fda707c634bc66921ddb0ce26cb70634017c8ea1ec686f7c2ee575a4fdde64e19c53c5224d2b78bf91a1c96daf21d84b636307155363a5bd5b8 SHA512 c9c5d23377043fa0b99dcbdcd74a2a31491aba7f8088276ac4ee15529eb0131980d66dc97692bb71365fc2dfad0aa1e98f06ede88d3eabaacb010e52e42b8595
-EBUILD woff2-1.0.2-r5.ebuild 858 BLAKE2B 183d7cd6bc4f92f2d67ef75f027b5301646b755ec202ad1d13fb8619686c2bf337e4283759c7ca7f0433d89a26f3076462bf9a2878597f4857427a347ba5a310 SHA512 37d6dbd4c787f6c8d1f3e88d659e3b3bcaca8654be18b16ea4d3f4867817cbf43db44c4224e08440b87b435e776c4196c80a9b22c2685abd29cf9ced47f1e07b
+EBUILD woff2-1.0.2-r5.ebuild 857 BLAKE2B 30cfc2b1fd8a1e46e4b00c6363922b9126efcba0e2c4ac91655f325f988c2b5dfb1fe23188ec0cbf8601a5a5ea07cda2725a9e0945011cd674eb453b78a381e2 SHA512 710319fdb217bf94ea10d99e4452aafc8067f71ca363891571f557fd2e47843aa445008e4455b71f9d8758175c2ff3e512468246f70a78e979404ac2c95cefb6
 MISC metadata.xml 354 BLAKE2B ad57a794365a6750452e942c5570e3357d829c917f09f7d79d7cd14612d0adfe6d0dc4f0e6697a3d0ab91dbc8b4927270b7ecff99c1ca0b5f95c88d07b78d23a SHA512 c42129cdbfc646eb68afe8f1cabaefa9aacd6444a99dd469b686bea805ffe3929382ebbab79c1936d5c1b3c4709647aba751e7a73baba367687ba63f1e605afe
diff --git a/media-libs/woff2/woff2-1.0.2-r4.ebuild b/media-libs/woff2/woff2-1.0.2-r4.ebuild
deleted file mode 100644
index b492cdab3cfc..000000000000
--- a/media-libs/woff2/woff2-1.0.2-r4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Encode/decode WOFF2 font format"
-HOMEPAGE="https://github.com/google/woff2"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND="app-arch/brotli:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON # needed, causes QA warnings otherwise
-		-DCANONICAL_PREFIXES=ON #661942
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dobin ${BUILD_DIR}/woff2_compress
-	dobin ${BUILD_DIR}/woff2_decompress
-	dobin ${BUILD_DIR}/woff2_info
-
-	einstalldocs
-}
diff --git a/media-libs/woff2/woff2-1.0.2-r5.ebuild b/media-libs/woff2/woff2-1.0.2-r5.ebuild
index 0f7be738f97b..60d6227ae5f6 100644
--- a/media-libs/woff2/woff2-1.0.2-r5.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli:="
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 5b9002da1ba2..f707b6f1e566 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -4,6 +4,6 @@ DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
 EBUILD xine-lib-1.2.10.ebuild 5196 BLAKE2B 3ab9183a937bf5e72058dc6309a1258e8177b2e1d2044e6b164e525be497688cdfcd12c176f9aa1fe809588c5511de060935ed29189886c4a24ba5f81991170e SHA512 569b9418b0671eba865429434ebdccb52b9a1d387027f70fb7484f4d32b99b9bda5658c1c6a9f58d43bf026e625cd0666ea0d8cb657952cb88e7460543914910
 EBUILD xine-lib-1.2.11.ebuild 5213 BLAKE2B fb1aa47ca34bdc267a2923d55ecfc1d642248e9bb072f782e9dbbcc66a926a1c4278037650d0ae3809ac2021a89e3504bf2586031883979ce5cc7faad1e62333 SHA512 bf042d0761c3320e5a94fd83d6aed7642bb1b3f982befaf05697c9139e1e062bf25624fd23090a656654b2c62d4ed2fa2b75c20ca04b6db11172a76d117bf5a3
-EBUILD xine-lib-1.2.12-r1.ebuild 5393 BLAKE2B 0d6a58768d9f722a2577d81b850d76980ce88584c1da50da164b0673c0f2523dc32c92079571732d83ccf3e4052bd1f8e5c598884a12977e3c44e8212d488fd3 SHA512 b40304d09c5a5dd11a708b57168da37acf467d8952230b7c18f42c8ac0ca920692a1bf74c8784331e8c72d3cff08beedf08dc19d0bd228d803643e4c515282d3
+EBUILD xine-lib-1.2.12-r1.ebuild 5388 BLAKE2B 5ceb9a9383c66643363a4e6bfee321f2133d54d1b67f056eae63f6b53adbb583bc86b228d9427afe02ac2ecc830253372a9b84c1eea3ac6e339641f7cde6a469 SHA512 193b2585d68b4fae94582f66ae108ce35a311076bd3735f7c19c7f808c3dd686fa3f0b0456e8dfa1dc643459d37acf3395667fa26aac59b309d6523f4a15768a
 EBUILD xine-lib-1.2.9999.ebuild 5334 BLAKE2B 578ebe981aeb5ad23b40a0ae3a88947c194d5733a6296a9709b72bb1661554ff18206ee2f9796284aca3a76d63d3f34fb478f26fede38e07ea74f15f3f036bbd SHA512 2d0435f0de8ca9f5920bbbdf93d90de0e9f8ead98b96d3225fa7f45dfe5bfc26033760faf53a955c19167fc40b7942d0f531021cb4c7c022f9e939d0f861db51
 MISC metadata.xml 2773 BLAKE2B 5f143a245bde88888f0b8e73601f62cfa7e8c23b9ed9c44b6baa13d8f78e8a05aba513996c323ecdcea83c91c938e86ef454571065eb110b11e9ea6285d89231 SHA512 9ed8a950a2c87b1c63ccab900a5cd80b37a0330bd5c859100559c7e8ec68581f7fda45ad6dc01dca98665798265dd0611e2cde4f9e7d2b9bff84249dfe2fd0c2
diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
index 29f22fbfac90..b25bf07dcef8 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /media-libs
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)