gentoo resync : 05.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
commit: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree: c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /media-libs
parent: e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
182 files changed, 2447 insertions, 3926 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 966833366a02..85492b917526 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index ab6d0d498bab..81f90a86b7d7 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -3,6 +3,6 @@ DIST babl-0.1.86.tar.xz 299868 BLAKE2B 2189659ef5b3890bc78329808dcff5e7577a85c97
 DIST babl-0.1.88.tar.xz 299972 BLAKE2B a22811196e306e3b846da63f361ecf792715d461cd8af85017af8dd353a406a38130f3e675214edc261557b6a0f6d3ed5586bfe7ecdf9b08ed5b8e7bc4aeb7f7 SHA512 1260133e44aa1878e13e2c64387e8540ca93edd7a905e2f8eebc58679444ba8815b9b6801b538a759c9b7b60294d7d7c33418bb1feee1879dcb8381450fe1742
 EBUILD babl-0.1.84.ebuild 1754 BLAKE2B df007b372ddcf5183259fb0cd84733dd6e199c876517a20c6befd0b771e04a4950a929282cb9e0d67246cdb7a521046ee22a9b7ac286ed73d50b5d23cb0e566f SHA512 874afe0607634738fd4ffef5a25df48c118d7a10f1e47919e085a3a2e34e38c9aeb21bac3af17c2b32e41cece3b9c4520395629d516574374319a7010a5a74a9
 EBUILD babl-0.1.86.ebuild 1765 BLAKE2B a3f06cca7426f8e7e2c434160d22add6d368d068191df0597c051f5c956d96ddec4bf1a86e1c75b77a2c2c23b4ba3ea043c64ee4ae4de01249265ad2c11d191c SHA512 241f433d0b28f96fa2daba465bd861e10d4e013e5e1f127a2507e6179e28e8b66a4cfc2282a2929234ee232a1a4b4ffbde34efbbfd7813f2a893d7f67e75d494
-EBUILD babl-0.1.88.ebuild 1762 BLAKE2B dbe5c57df6850c51b7e98f35c670a2eda0f17b987eca7c9273510af6b0bb178cbda3c9847b3518daca62bedc926e074fe4916c25240f0a1289919aac46018665 SHA512 69d017d8f5208cfa0282189d20cad1c6b5bc7d30ae28880efde58ac1487009abe9690856eaa02254b44a818256c60c8e7666a49b8704a040b997c74e5d4d57c6
+EBUILD babl-0.1.88.ebuild 1761 BLAKE2B 5a2bdf88fb83178a3e64ac744d2c8c87d2ef1d7496c7cb35fab80de297be56b60445e282f0cce2188000517f1f63b6b118c8d9ea7f1cf4fa7e32a50c5118cb22 SHA512 96aac9e6aef6489543f7cc1d287efd7e2e98f8ee3139cc96c354c13f976693ae8e53db1716f4cc13db6e183f257c53e57c097293b93d0ddcb5074650bf9d0360
 EBUILD babl-9999.ebuild 1765 BLAKE2B a3f06cca7426f8e7e2c434160d22add6d368d068191df0597c051f5c956d96ddec4bf1a86e1c75b77a2c2c23b4ba3ea043c64ee4ae4de01249265ad2c11d191c SHA512 241f433d0b28f96fa2daba465bd861e10d4e013e5e1f127a2507e6179e28e8b66a4cfc2282a2929234ee232a1a4b4ffbde34efbbfd7813f2a893d7f67e75d494
 MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
diff --git a/media-libs/babl/babl-0.1.88.ebuild b/media-libs/babl/babl-0.1.88.ebuild
index 1886912b7fd5..eddbea853de4 100644
--- a/media-libs/babl/babl-0.1.88.ebuild
+++ b/media-libs/babl/babl-0.1.88.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index e0c121c56dea..2f174f9b6604 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-1.26.4.tar.xz 5403168 BLAKE2B 642179423cc5f883f1920e90fafc3119fb735d2d7045d120e73b5a82bfec8750101e0cea51f5241f5326b801d5f881ffcc334d565184145e01b019c9350315b5 SHA512 6d43ac09df7671fa2bda74d1231166e8331f3ef1dbe0d167225033b3ddae7377d1062db81b73fc498c2e9f0db467bf4febb7306a6f40c9ef0266dac2a397f43a
-EBUILD clutter-1.26.4.ebuild 2917 BLAKE2B 3dbeededb103f67c51f8182500ce6c4e8435d3b6d77bfce381e5d1b9c5654ea24887da5f62602a7ecf0879ef5b6a91d28ec5dc7e57ffcd51727d085f96e5697c SHA512 46bb4ac745d52b5daf505cc9a650a5cd0bbad10deee4a8f97a9ed3e00df9ad47484b72530d68c73b7f6ca0704fe2e4e71c4c675b87cfbc687c657a0de47cf581
+EBUILD clutter-1.26.4.ebuild 2924 BLAKE2B 7dd5effa9dc73a42c023340916f38e1afc7fe05b558cf54d1ed918a53dbf5f809993ede291159f1817ffc46b2ae19874dc7f129268d8c4d14269f83b9baa92b8 SHA512 8aee1c4249d46bd9fdda6f0f69cac057a18fd4c62c28b9abaf3cae2810744624c1406950c251ca50e16742584f85bb13c3b6753ee803157b8b116f54eec24540
 MISC metadata.xml 405 BLAKE2B 1334c030265f2ef26dd6200dbaa8d747796d806a18817846aae94a103a5885a52b226f3a411617df01b2ac8b711827dd964f4af8df254bd1e7b47868c2db1bed SHA512 4547ab055b744f734592bce54913b2dd9f723484412fd34b92ccfc6cccf07859632b04489d067844305dbf35fbd0b7434bf191d84deab3e678998065bf1a7487
diff --git a/media-libs/clutter/clutter-1.26.4.ebuild b/media-libs/clutter/clutter-1.26.4.ebuild
index 656f9efb48e7..cf8a1f4f2a18 100644
--- a/media-libs/clutter/clutter-1.26.4.ebuild
+++ b/media-libs/clutter/clutter-1.26.4.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	wayland? ( egl )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # >=libX11-1.3.1 needed for X Generic Event support
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 9f640f0452a3..768df491671e 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,4 +1,7 @@
+AUX codec2-1.0.1-fix-freedv-callback.patch 2395 BLAKE2B 1fc590ea00f7160b301abf80a842667b3ee4129354bfc26e3d1535cf10797a7c6c5d538a8a91e57900ddef1d1eb20fe3ebccff2892aa99ec80e2f3285dcd60c2 SHA512 bdd9ed7be6f221716d93fd57f84da903f9a703e98d976e10b2ff3d8d61be70c8fa1f4affc0c50a841ce148a789e39b0c608611aa2863193b08e5150e94d1ef9e
 AUX codec2-1.0.1-static-rx_filter_coh.patch 688 BLAKE2B 9e80bfeacd28591128c863b81b41b447866b6f1c0c2c20905459c623e4dcf428efbf28fabf4a53470f74e739b55281761a0162112c076ee0c959d2e067b8c0c7 SHA512 abbd495022db2d695708f552a63274cab769f14d787092ca55f9f7f710d3d225e662d510d982553f77d14c59c35be1d82853e7b339bd55c8defb36abe3411e36
+DIST codec2-1.0.0.tar.gz 15019266 BLAKE2B fa33a8c30a7472e5f5ab0aac070431579913248d9d27cbc82542b6d7071f7a9fee6bafe374300bf6e09d636b9ddaf85795aabf12cbfd3923efd0cac82f06b38c SHA512 bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3
 DIST codec2-1.0.1.tar.gz 15062219 BLAKE2B 81f2784d7aa7180fcc4345fd27e7dd0beda0eba3bbee43d8379a48dc854fe1c9e50038c90c9ae41daacb5aef0f337841fa64ce061e2831523a71d5d52d1b8211 SHA512 e32b6ebb5480b4a6ae15e835abc0da4fac7fb46a2b14bcc2a3c52df2da6c8d3f5acbcf83d8039f1ee402b4d2e1e7445841e3c9c415bfb70af3a251e74ab3f3b6
-EBUILD codec2-1.0.1.ebuild 781 BLAKE2B 1cddaac24f448876fcd5156c46e741d6194f129bf1ea086bc70ce2c75af9696a47a44c386d933326f699a5d1fcaf472ac49d1f8cb8ed5eb4e7774afc57723b2e SHA512 0237fe4148225958fd54e2299b031f8023e7bf3fcd346ca03bc249c5069b117db4b14142c2c86d1a486aa730b21aeaccc83e950cf6455ba2da9f9a1a25a6dc02
+EBUILD codec2-1.0.0.ebuild 713 BLAKE2B 2709cf1ee94f8f3341e054dfe6f0564a9223a64e9cc0896e3b4b32dcf7c86f7a2aac7c75669714da87db9e629ac23cb46b852296f7702911d470b8f7fa5141f4 SHA512 c4a8f31bc89f740d5d14e2fb63936b1a4c9bb15c9ef4aa56d36c9523ef4346ac0ef80848174600d9e7e6d5c745e6665f82ca4b9249f0b07f11d2929de0fe78a7
+EBUILD codec2-1.0.1-r1.ebuild 840 BLAKE2B ab3d64c7a78ce1d4066dcd8be945189cdde4a0cba11556e8b852257dcdc31544ad7a04934c8aa91cc7773802327fd83bfdede314de716dfd5c88678091bfee3d SHA512 562d7765935008a6ad17e5858c4d445b85c703e7a9ed136517016380d13e99888707a0271e9707a8cc82db69343c88b520ed800a8cde5f828e42998b6ef14789
 MISC metadata.xml 326 BLAKE2B a7fc8408d6f6b58ad9d7019e858c703fd65ba38072dfefa381a5d00b500fe5d0ba024c2a3ed2d37e8e11da71f53bbfbeb80ead070935b9e83929d75d3a7852af SHA512 73c8e213262ac05ced95080d9e97a1e2abfdb2ad9e436ededda82de01feea321c3d499c8c2e8b3725a81b434e9efc4b12b321d738ab966d104e3344f4e29206b
diff --git a/media-libs/codec2/codec2-1.0.0.ebuild b/media-libs/codec2/codec2-1.0.0.ebuild
new file mode 100644
index 000000000000..f9d617bb6115
--- /dev/null
+++ b/media-libs/codec2/codec2-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Low bit rate speech codec"
+HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"
+SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1.0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+IUSE="examples test"
+# Not yet passing, but infrastructure added to run
+RESTRICT="test"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DUNITTEST=$(usex test)
+		-DINSTALL_EXAMPLES=$(usex examples)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/codec2/codec2-1.0.1.ebuild b/media-libs/codec2/codec2-1.0.1-r1.ebuild
index 6c5ac1bb8b37..07461c984992 100644
--- a/media-libs/codec2/codec2-1.0.1.ebuild
+++ b/media-libs/codec2/codec2-1.0.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
@@ -19,6 +19,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/codec2-1.0.1-static-rx_filter_coh.patch"
+	"${FILESDIR}/${P}-fix-freedv-callback.patch" # Bug 816453
 )
 
 multilib_src_configure() {
diff --git a/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch b/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch
new file mode 100644
index 000000000000..595e71a139dc
--- /dev/null
+++ b/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch
@@ -0,0 +1,48 @@
+From 7a554bad2f28a4cf19cddf43c619fe5921ddaea3 Mon Sep 17 00:00:00 2001
+From: drowe67 <david@rowetel.com>
+Date: Sat, 2 Oct 2021 15:48:09 +0930
+Subject: [PATCH] moved freedv_callback_rx_sym typedef and function into
+ freedv_api_internal.h
+
+Project-Bug-URL: https://github.com/drowe67/codec2/pull/235
+Gentoo-Bug-URL: https://bugs.gentoo.org/816453
+---
+ src/freedv_api.h          | 2 --
+ src/freedv_api_internal.h | 4 ++++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/freedv_api.h b/src/freedv_api.h
+index 23c5fef8..9393bd80 100644
+--- a/src/freedv_api.h
++++ b/src/freedv_api.h
+@@ -145,7 +145,6 @@ struct freedv_advanced {
+ 
+ // Called when text message char is decoded
+ typedef void (*freedv_callback_rx)(void *, char);
+-typedef void (*freedv_callback_rx_sym)(void *, _Complex float, float);
+ // Called when new text message char is needed
+ typedef char (*freedv_callback_tx)(void *);
+ typedef void (*freedv_calback_error_pattern)
+@@ -212,7 +211,6 @@ int freedv_check_crc16_unpacked(unsigned char *unpacked_bits, int nbits);
+ // Set parameters ------------------------------------------------------------
+ 
+ void freedv_set_callback_txt            (struct freedv *freedv, freedv_callback_rx rx, freedv_callback_tx tx, void *callback_state);
+-void freedv_set_callback_txt_sym        (struct freedv *freedv, freedv_callback_rx_sym rx, void *callback_state);
+ void freedv_set_callback_protocol       (struct freedv *freedv, freedv_callback_protorx rx, freedv_callback_prototx tx, void *callback_state);
+ void freedv_set_callback_data           (struct freedv *freedv, freedv_callback_datarx datarx, freedv_callback_datatx datatx, void *callback_state);
+ void freedv_set_test_frames		        (struct freedv *freedv, int test_frames);
+diff --git a/src/freedv_api_internal.h b/src/freedv_api_internal.h
+index 0197e184..e7a9526c 100644
+--- a/src/freedv_api_internal.h
++++ b/src/freedv_api_internal.h
+@@ -230,6 +230,10 @@ int freedv_rx_fsk_ldpc_data(struct freedv *f, COMP demod_in[]);
+ 
+ int freedv_bits_to_speech(struct freedv *f, short speech_out[], short demod_in[], int rx_status);
+ 
++// for the reliable text protocol we need to pass symbols back rather than text
++typedef void (*freedv_callback_rx_sym)(void *, _Complex float, float);
++void freedv_set_callback_txt_sym (struct freedv *freedv, freedv_callback_rx_sym rx, void *callback_state);
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 7c3c542f62c8..dad24afefd57 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -4,6 +4,6 @@ AUX ctl-1.5.2-fix-unit-tests.patch 1863 BLAKE2B 7fab88b476d9e5468d4195e8dc3f9c9c
 AUX ctl-1.5.2-install-dpx-library.patch 565 BLAKE2B 234ba1ca74575a0babcf080c74052ce433a7698afa86b4991d67fe29c51c2eb42ad8a2748a5c1187c6c865e1860695d11736da788f41be919334bd119456a66c SHA512 bcf3ee6e44193436f1e70f0fef739dee74f83d814cfac1ad7b652a908934f73bc9f00f83ed4327e82d917f8579b9b476416e68e523a747ba9e5bbf8bc82d0bec
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
-EBUILD ctl-1.5.2-r1.ebuild 690 BLAKE2B a87464dcb12e21d42906136e9e418e5a947fc50bcf8bed17fe49f78dfa69f1df0fa1ab1188cf8caf2fb0660b2216650b3bf4a2a79c21fe04042fbca6d6f8a256 SHA512 8e49101efa73e68f2f25af05c32a55dbb62f52775b6ed8c44f8647977f7c8f357a9df02203ddff18c3b4ae2b8d46636a5a0a8ab59093aa0d60a2b99f35f4321d
-EBUILD ctl-1.5.2-r2.ebuild 954 BLAKE2B 8deca6a05ddac60350a92a87e8c86855caf6a59a4b9f41923887f9d8b53a80fa7d2efb779c2dfd8df928cc99b4502935cfc913a60f27c0379de9e1d9dad4fcb7 SHA512 112425d0174a8eca5efd1fd61fcc5b4685e12ce737c6dd3a96c6630cdefafcce259438c7fce1ce4b3a1df513632c9b26e920f1553cd45ab7fc191b8722b2a497
+EBUILD ctl-1.5.2-r1.ebuild 691 BLAKE2B 144763f1cf205cd8a4414aaf06e17623b34dcf873bb9d9937c28ee87b8386b484d24be6b0fcfe675eab228ec7e78d388965328e082f67730b422b9710cc2a1f6 SHA512 3cf53a0b342f137fcb1a5911a622b8c4fe24c26cf3e81d5a5e0ee9f1168ab2f6824a8a056b9a902b9df05fbcd48b00528fa98b6b17dc34921d4b83bbf9486566
+EBUILD ctl-1.5.2-r2.ebuild 955 BLAKE2B 47a39c747919d9cf5bb06b7930520f9309cf8740430258875d7e50171e09c88306a35dee5d04ca18553fb621ef88445588f9922f5a233270eab89f72746396de SHA512 b54730ff744e871f7c806af273f1321b5e0daf0ca80f4d541ace12758be6354a5052ba99b8b388761bb7930799f18dc6e9c9a9637d5fa38cc911d974ce718be4
 MISC metadata.xml 298 BLAKE2B 6e4266628d090b71081fd7756e6e725250f41a8a670fa745eef96503c01915a93d41e82b84bca8f81b173b846f5437a40a1974491cb261adeb3e692e4750a40c SHA512 318801a89aef840e0aa9e823bc50bad3c95aa4f993a2a67097fe1ebe397d3702ad18165074e7887c090921f2e3330965b45114375ddb1ac60b40161a8acda8de
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index 068acadc2a9e..7562ed9c901c 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc64 x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 x86"
 
 RDEPEND="media-libs/ilmbase:=
 	media-libs/openexr:=
diff --git a/media-libs/ctl/ctl-1.5.2-r2.ebuild b/media-libs/ctl/ctl-1.5.2-r2.ebuild
index 3989ebd3bda8..45d613f9e712 100644
--- a/media-libs/ctl/ctl-1.5.2-r2.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/CTL-ctl-${PV}"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc64 x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index a496b5b4c3b9..b8d7ef08927e 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,3 +1,5 @@
 DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
+DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f
 EBUILD embree-3.13.0-r2.ebuild 3671 BLAKE2B f9833656184addff84fcd49024e8ad82bbb871de8ae5b82a19bf1baf9b2cdbb871b13f8919e6046f3aaaa043aabe8867b8ba17ab121c4b3cf1fc9aafe1b28428 SHA512 a5e7a50b44142baafadfd5157fb6af32a6e702688efa9ea72aa1c8c36fdbc8bf752cb9105d9e2e9f696ae6e8aa833f2a78c47e663d60821dd34e2c05acdb6c8a
+EBUILD embree-3.13.2.ebuild 3775 BLAKE2B ecfd7e1629e2250ac08d4e597e75c2edf9ff32f27180d9108907a31e4915a784b3d5a37f7818304ad205ca1aede6a73792c84ac1391b31a2735c4e13c752efe8 SHA512 edbefc1ee4277f3cf8f2dbb26f5740ae634cfe01b84bc65073b62bbd74df49789e134dd8d76c2e2ee85f7256bb935bce8168840c42b5019b25eaacdecadfdf9c
 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
diff --git a/media-libs/embree/embree-3.13.2.ebuild b/media-libs/embree/embree-3.13.2.ebuild
new file mode 100644
index 000000000000..94efef93e9b9
--- /dev/null
+++ b/media-libs/embree/embree-3.13.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
+# Let's be explicit here even though we could simplify it.
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 ) x86? ( cpu_flags_x86_sse2 )"
+
+RESTRICT="mirror"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=media-libs/glfw-3.2.1
+	virtual/opengl
+	ispc? ( dev-lang/ispc )
+	tbb? ( dev-cpp/tbb:= )
+	tutorial? (
+		>=media-libs/libpng-1.6.34:0=
+		>=media-libs/openimageio-1.8.7:0=
+		virtual/jpeg:0
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+pkg_setup() {
+	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable RPM package building
+	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	# NOTE: You can make embree accept custom CXXFLAGS by turning off
+	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+	# any "march" compile flags. This is because embree builds modules for the
+	# different supported ISAs and picks the correct one at runtime.
+	# "march" will pull in cpu instructions that shouldn't be in specific modules
+	# and it fails to link properly.
+	# https://github.com/embree/embree/issues/115
+
+	filter-flags -march=*
+
+	local mycmakeargs=(
+		# Currently Intel only host their test files on their internal network.
+		# So it seems like users can't easily get a hold of these and do
+		# regression testing on their own.
+		-DBUILD_TESTING:BOOL=OFF
+		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+		# default
+		-DEMBREE_BACKFACE_CULLING=OFF
+		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+		# default
+		-DEMBREE_FILTER_FUNCTION=ON
+		# default
+		-DEMBREE_GEOMETRY_CURVE=ON
+		# default
+		-DEMBREE_GEOMETRY_GRID=ON
+		# default
+		-DEMBREE_GEOMETRY_INSTANCE=ON
+		# default
+		-DEMBREE_GEOMETRY_POINT=ON
+		# default
+		-DEMBREE_GEOMETRY_QUAD=ON
+		# default
+		-DEMBREE_GEOMETRY_SUBDIVISION=ON
+		# default
+		-DEMBREE_GEOMETRY_TRIANGLE=ON
+		# default
+		-DEMBREE_GEOMETRY_USER=ON
+		# default
+		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+		# default
+		-DEMBREE_IGNORE_INVALID_RAYS=OFF
+
+		# Set to NONE so we can manually switch on ISAs below
+		-DEMBREE_MAX_ISA:STRING="NONE"
+		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+		-DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon)
+		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
+		-DEMBREE_RAY_MASK=$(usex raymask)
+		# default
+		-DEMBREE_RAY_PACKETS=ON
+		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
+		-DEMBREE_STATIC_LIB=$(usex static-libs)
+		-DEMBREE_STAT_COUNTERS=OFF
+		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+		-DEMBREE_TUTORIALS=$(usex tutorial))
+
+	# Disable asserts
+	append-cppflags -DNDEBUG
+
+	if use tutorial; then
+		mycmakeargs+=(
+			-DEMBREE_ISPC_ADDRESSING:STRING="64"
+			-DEMBREE_TUTORIALS_LIBJPEG=ON
+			-DEMBREE_TUTORIALS_LIBPNG=ON
+			-DEMBREE_TUTORIALS_OPENIMAGEIO=ON
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 05faa38b29f9..40cd120cf2f1 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -9,5 +9,5 @@ DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb5
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 EBUILD freeimage-3.18.0-r2.ebuild 3174 BLAKE2B fb299df99374303edc9f38dd38effe2a2aeff342446a4f2b44cb8878b393308cc1611801d32e23a892ffbf879616ee03f5216f75545e712a8c4211f5bce90858 SHA512 252093fc344316203110f98c1eca639e1834a8d5196f7cf86d6e6b0fe3adbbfdbc891b6d3d63ac4f08e2496e37b3fb82959794f3e7a9f83858a1306ebae0d21b
-EBUILD freeimage-3.18.0-r3.ebuild 3175 BLAKE2B 63bdcfce51c3ab40414cc320903314d34f30e8e4574c60648652a24b4801f71ac5b46400db4aec1dcc911440149671ec3cab28a1c27afaf8ff97d8da37808220 SHA512 8c7a9b8d5db8d071682b9358c18d0908eb64d69aab8a3be28e9881e35038e4e8746468ea1fbaa209b0fb21fc5a19a188e7b0326478d87164427c77023150b6f4
+EBUILD freeimage-3.18.0-r3.ebuild 3182 BLAKE2B e4279ecd9c3e8e00a998da85402efb3edd6845a20e1a2b25a61480d666d65a8702df19762615290e74fbdb8960d0d95f83e31a12865bb14c335fc7377139c7e4 SHA512 2113ca778f0116fc5ac12b74e9264e2fb04169af05d0b84e09ba3c3b42c9f51b30fab059fbc432d4c151a2761652cc0fd3296f661b9727f6a78d7a68b03923da
 MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
index c313772f8d8e..e0aea4f7eb1b 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index e0d36b8f3188..fd7c2cc97221 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,19 +1,16 @@
 AUX freetype-2.10.3-sizeof-types.patch 1038 BLAKE2B bb49e7d4195346b67f37c16f9f31e3d5b658398afa7209c5d7c89dbbf90c98385d0827960545b83573425c6be8e4615311f76d93e40ff6237977bfe160639587 SHA512 64e3cc7820bd0b8816ad34108fa174da90f2a0b8f96a3c94425900ba5f5eb8b01074fdfa3bee699815d7eb74ec44cf043239a932a228c2971557fad0caec912f
-AUX freetype-2.10.4-dont_hardcode_libtool.patch 1312 BLAKE2B 7cd7d9f5284a54a9667243ce1e2f16104f75b117b9b27367ccd2ceaf4c643829b3f1a031d51b6008d9300a31322634602cf281f09d56ecbfbf143b466894c4a4 SHA512 85f66eed284fe804857e1d651cbfc75cfcc4bad2126681dc36873cd9f9561c9d6c31fee39bc333e8ac936f491708e4b7b9d62de4b75015ac9a1f78b3c8647ec1
-AUX freetype-2.10.4-slibtool_build_fix.patch 1262 BLAKE2B b2e3fc0565f5b90c00628d44ec3d1633c3ccce0df3effabaf9e36636b78067d03c899c86a100e11df27ca299daf4afdc815924430b04a42bcabb4104d7f4a8b7 SHA512 5fd4fce61c4f1f78fc6e19477e89b8f989ad17a50ff48c49841f6a7499e0843525a489e622db8064799749b53e62f0177bbfde519fe03813eedd7ca6e752f238
 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 ft2demos-2.10.4-install_target.patch 1647 BLAKE2B 4409123fbb089c1312ff90ebbb32c70f3a0025d96b705dd6be24bdf33fa0b1956e512549c39e5b378c2a6f4a4cb8e7708c096c786fbf0bcc3e037f691f9aad21 SHA512 5d77f5892f7ce4ab1bc3dcbfb04cd86f2fc54e347c2b3ce7e701995b0f75efc0164797b18454b645a0cc1cc8b0f41816b5bca19d786a66f3bc145fa0ca2cd8b1
-DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
 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-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
+DIST freetype-2.11.1.tar.xz 2270728 BLAKE2B 15cc03e7b8ba93b2f240b0eee3f1cc07bca77d9ef67a1971d44d6c061a0dff2b13737fa417f7f2dc4e7e6df660223325931f69a107a6b2eaf14425fc71b7ca7b SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
 DIST freetype-doc-2.11.0.tar.xz 2070604 BLAKE2B a45fa2e97574868fc4f08c646cb815152dde462538a32fddfc5ddccb32343286765f3952b9fc8b66204dfeb62470d4fada1a2338c377efa1c716ab9c5885fd60 SHA512 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301
-DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
+DIST freetype-doc-2.11.1.tar.xz 2038348 BLAKE2B 2248d16bb12b29294226a67a10328c61b064c8e0ad7fb5f004c2e6da1237175f03d51a48d5df03a3de3bbe935307e573014c079c31468c9f59416bc4e9057a9c SHA512 c5e19d98425491682edc58230c48390925cc4b466169f655cf3b8575ba787a70feecdeb7a16224b132dcc32f17b041483d84056cda8e3132d98b531e46a26c36
 DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531
-EBUILD freetype-2.10.4.ebuild 6685 BLAKE2B ff901fcd11233f9c6a985704ff2296d86331618e02097274edc12fa792d9a11de530eb6f761514b4d03e11b00d42c993c73b3936a9b9bfa0cab15c9eea36f501 SHA512 e991118b3868791a4dd4cac750d4a31935766a97cc4998a0561f0a296f54e8bae7da7057226642e83cf61199dbaa463c17f97422edd73f30a65ad9dafd9ce750
+DIST ft2demos-2.11.1.tar.xz 257240 BLAKE2B 1d620af52e76d1152a0a6aeeb0036d2423e498e371b75c01c408cc0974845abfe2f3f562ad638ca5640ec1b24023d7a47e1688743ca738c2bb1ceea6ee05cfcf SHA512 93d68daefa8a49b4fc987a7356133299fe2a8e012415ea09ad7616ececcfd978fdf9fc7a2d855f7488f51a497d019acb89ef5774484babae66357b3083a883c5
 EBUILD freetype-2.11.0-r1.ebuild 7360 BLAKE2B e2237bf66903a9a48982762bd9db6496af2a902a2598103ae1dc6ff1c33178f1b3d8a4568622ef6d16d9e846a6cfec4f3f4e131e244bb689965541ed6b4210eb SHA512 6fa66ecb9285b1a49f058b4ec506cb60e2b616857c10c4336753cb8ca01a100164ed9f7f7ea8ed19cde69dbf1ddf1e72c80d8b9d95bf4473702de40688cfc707
 EBUILD freetype-2.11.0-r2.ebuild 7413 BLAKE2B 843335107d814566c2d4691b25112feb0764eeaee24aee7e3c057ae81c650546d1605fac8df4c221b60fe650741a53a98178c6b11bb34c929cb2980decd5fa91 SHA512 d660d1f931c66061676af5bc7303410ea6bddb8306e476b43720c855c80eb1183db183199d1ce0271844c0edceb4ed48635c2b97592c98b5189ee58ca58fcaaf
-EBUILD freetype-9999.ebuild 7149 BLAKE2B d9698283807a6799874f8a091e1defce0493d4595b59fe4b9eae558523bcdea09576342dbb5ea4c8c67982a74391e9ac2aa6c6d39f3ae29db752cbf12e5214d5 SHA512 faf5616c0a855be291e1613cc0c2082bda0092e106c053989a333c4b7d3ed2ef7d41094e7e174f516aed831e0701e378ba3bacebbd0a95022bed000b0b1fdc30
-MISC metadata.xml 1614 BLAKE2B 1f7da38175a6bb383328518d7a69a2378a3127fce884c35163b6144afdf21149acd857c6c26d65c1a1962afd370f025f6a3f496581ca28b767ae5960392a9c6c SHA512 ea0ec7da4ea7f2f71c06aea15694e6654808a780fd5a248088cb44af23dcb4c0961d7034d2e09b674d89098c152fd84c7f4c90831c0e275f6ebcd4a15659baa7
+EBUILD freetype-2.11.1.ebuild 7069 BLAKE2B 66b804a6d452535962c0e8f3a3bb8f98aebe66a5890940be32201dc06c54a2ea7468da0efb66a84495f19e62b3a456f35f9fa52361f40f765b6dc372a3e94b43 SHA512 da68528c0e9f21c2482e4fa30bfb663ef8f527c38c5179e11b6b15af3cbb184996a97afafe47d4f0719c46d3da187a67bac82c54f167f3834bdce8aa0c10e0b8
+EBUILD freetype-9999.ebuild 7069 BLAKE2B 66b804a6d452535962c0e8f3a3bb8f98aebe66a5890940be32201dc06c54a2ea7468da0efb66a84495f19e62b3a456f35f9fa52361f40f765b6dc372a3e94b43 SHA512 da68528c0e9f21c2482e4fa30bfb663ef8f527c38c5179e11b6b15af3cbb184996a97afafe47d4f0719c46d3da187a67bac82c54f167f3834bdce8aa0c10e0b8
+MISC metadata.xml 1361 BLAKE2B ec4f7fc1bd3a16f507b0ff18a637849744a5e470a26037a2ef7e0e9a6537408184ca722a003340128f962bcda1cedc044e411c58e5d315602095e1997dccc920 SHA512 16112a7dbc2231ebe0b9cecfd3b91bd966d49de1e04eb72694ef0a22c9495e6a91ac31da7bd027ce90fcda08ca10144d24c4e28b798a1074af147ab0f8b007c7
diff --git a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
deleted file mode 100644
index 310b5aaca935..000000000000
--- a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 597566b2301deeff4e9832aebdab1bf659a2accf Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 22 Mar 2021 16:15:37 -0700
-Subject: [PATCH] * Makefile, mac/Makefile (LINK_CMD): Don't hard-code
- `libtool`.
-
----
- Makefile     |    3 +--
- mac/Makefile |    3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 810142f..949402f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -165,8 +165,7 @@ else
- 
-   ifeq ($(PLATFORM),unix)
-     override CC = $(CCraw)
--    LINK_CMD    = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
--                  --mode=link $(CC) \
-+    LINK_CMD    = $(LIBTOOL) --mode=link $(CC) \
-                   $(subst /,$(COMPILER_SEP),$(LDFLAGS))
-     LINK_LIBS   = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME)
-   else
-diff --git a/mac/Makefile b/mac/Makefile
-index 73ae99c..52038a4 100644
---- a/mac/Makefile
-+++ b/mac/Makefile
-@@ -68,8 +68,7 @@ else
-   LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<)
- 
-   CC        = $(CCraw)
--  LINK_CMD  = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
--		--mode=link $(CC) \
-+  LINK_CMD  = $(LIBTOOL) --mode=link $(CC) \
- 		$(subst /,$(COMPILER_SEP),$(LDFLAGS))
-   ifeq ($(findstring CoreServices,$(LDFLAGS)),)
-     LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(MATH) \
--- 
-GitLab
-
diff --git a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
deleted file mode 100644
index 895a86c444d6..000000000000
--- a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8e9447b32dae7e6c95bee3f878ee1877f9b628a4 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 22 Mar 2021 16:15:09 -0700
-Subject: [PATCH] [graph] Fix build with `slibtool`.
-
-* graph/rules.mk (GRAPH_LIB): Handle the case specially where
-`LIBTOOL` is defined.
-(COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`.
----
- rules.mk |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/graph/rules.mk b/graph/rules.mk
-index 4903a38..a3f0de1 100644
---- a/graph/rules.mk
-+++ b/graph/rules.mk
-@@ -12,7 +12,6 @@
- 
- 
- GRAPH_INCLUDES := $(subst /,$(COMPILER_SEP),$(TOP_DIR_2)/graph)
--GRAPH_LIB      := $(OBJ_DIR_2)/graph.$(SA)
- 
- GRAPH := $(TOP_DIR_2)/graph
- 
-@@ -46,9 +45,11 @@ GRAPH_OBJS := $(OBJ_DIR_2)/gblblit.$(O)   \
- # this value can be modified by the system-specific graphics drivers.
- #
- ifneq ($(LIBTOOL),)
--  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -static \
-+  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(A)
-+  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -module -static \
-                                  -o $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
- else
-+  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(SA)
-   COMPILE_GRAPH_LIB = ar -r $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
- endif
- 
--- 
-GitLab
-
diff --git a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
deleted file mode 100644
index f3d7f8de43e4..000000000000
--- a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b88cd2f027e77bd26d1334fc13c4eda796423d19 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 24 Mar 2021 09:04:41 -0700
-Subject: [PATCH] [build] Add an `install` target for binaries and man pages.
-
-* Makefile (MANPAGES): New variable.
-(install) <unix>: New target.
----
- Makefile |   19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 949402f..8352f61 100644
---- a/Makefile
-+++ b/Makefile
-@@ -194,7 +194,7 @@ else
-                 $(LINK_LIBS) $(subst /,$(COMPILER_SEP),$(GRAPH_LIB)) \
-                 $(GRAPH_LINK) $(MATH)
- 
--  .PHONY: exes clean distclean
-+  .PHONY: exes clean distclean install
- 
- 
-   ###################################################################
-@@ -317,6 +317,11 @@ else
-   # EXES += fttimer
-   # EXES += testname
- 
-+  # Not all demo programs have a man page; we thus check for existence in a
-+  # loop.
-+  #
-+  MANPAGES := $(foreach man,$(EXES),$(wildcard $(TOP_DIR_2)/man/$(man).1))
-+
-   exes: $(EXES:%=$(BIN_DIR_2)/%$E)
- 
- 
-@@ -567,6 +572,18 @@ else
-                         $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
- 	  $(LINK_NEW)
- 
-+  ifeq ($(PLATFORM),unix)
-+    install: exes
-+	    $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \
-+                             $(DESTDIR)$(mandir)/man1
-+	    $(foreach bin,$(EXES), \
-+              $(LIBTOOL) --mode=install \
-+                $(INSTALL) $(BIN_DIR_2)/$(bin) \
-+                           $(DESTDIR)$(bindir)/$(bin);)
-+	    $(foreach man,$(MANPAGES), \
-+              $(INSTALL) $(man) \
-+                         $(DESTDIR)$(mandir)/man1/$(notdir $(man));)
-+  endif
- endif
- 
- 
--- 
-GitLab
-
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.11.1.ebuild
index 4bec88e1dd43..d0c71e729b9c 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.11.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
-DESCRIPTION="A high-quality and portable font engine"
+DESCRIPTION="High-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist 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 utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -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 ~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
@@ -24,7 +24,6 @@ fi
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
 
 RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
@@ -44,10 +43,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
-)
-
 _egit_repo_handler() {
 	if [[ "${PV}" == 9999 ]] ; then
 		local phase="${1}"
@@ -61,10 +56,10 @@ _egit_repo_handler() {
 		esac
 
 		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
+		EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
 		git-r3_src_${phase}
 		if use utils ; then
-			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
+			EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
 			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
 			git-r3_src_${phase}
 		fi
@@ -79,18 +74,36 @@ src_fetch() {
 
 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 -nf version.sed include/freetype/freetype.h)
+		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_major$freetype_minor$freetype_patch;" \
+		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
+		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
 		popd &>/dev/null || die
 	fi
 
@@ -114,11 +127,11 @@ src_prepare() {
 	# 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
+	if use infinality && use cleartype-hinting ; then
 		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
-	elif use infinality; then
+	elif use infinality ; then
 		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
-	elif use cleartype_hinting; then
+	elif use cleartype-hinting ; then
 		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
 	fi
 
@@ -126,32 +139,24 @@ src_prepare() {
 	# via environment (new since v2.8)
 	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
 
-	if ! use bindist; then
-		# See http://freetype.org/patents.html
-		# ClearType is covered by several Microsoft patents in the US
-		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-	fi
+	# See https://freetype.org/patents.html (expired!)
+	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
-	if ! use adobe-cff; then
+	if ! use adobe-cff ; then
 		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
 	fi
 
-	if use debug; then
+	if use debug ; then
 		enable_option FT_DEBUG_LEVEL_TRACE
 		enable_option FT_DEBUG_MEMORY
 	fi
 
-	if use utils; then
+	if use utils ; then
 		cd "${WORKDIR}/ft2demos-${PV}" || die
 		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X; then
+		if ! use X ; then
 			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
 		fi
-
-		# Taken from upstream (https://bugs.gentoo.org/775881)
-		eapply "${FILESDIR}/${P}-slibtool_build_fix.patch"
-		eapply "${FILESDIR}/${P}-dont_hardcode_libtool.patch"
-		eapply "${FILESDIR}/ft2demos-2.10.4-install_target.patch"
 		cd "${S}" || die
 	fi
 
@@ -170,8 +175,8 @@ multilib_src_configure() {
 
 	local myeconfargs=(
 		--disable-freetype-config
-		--enable-biarch-config
 		--enable-shared
+		--with-zlib
 		$(use_with brotli)
 		$(use_with bzip2)
 		$(use_with harfbuzz)
@@ -196,7 +201,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	default
 
-	if multilib_is_native_abi && use utils; then
+	if multilib_is_native_abi && use utils ; then
 		einfo "Building utils"
 		# fix for Prefix, bug #339334
 		emake \
@@ -216,12 +221,12 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	if use fontforge; then
+	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
+		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
@@ -233,5 +238,5 @@ multilib_src_install_all() {
 		dodoc -r docs/*
 	fi
 
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 85c3544019b3..d0c71e729b9c 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -43,10 +43,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
-)
-
 _egit_repo_handler() {
 	if [[ "${PV}" == 9999 ]] ; then
 		local phase="${1}"
@@ -179,8 +175,8 @@ multilib_src_configure() {
 
 	local myeconfargs=(
 		--disable-freetype-config
-		--enable-biarch-config
 		--enable-shared
+		--with-zlib
 		$(use_with brotli)
 		$(use_with bzip2)
 		$(use_with harfbuzz)
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index a1abb71c48e7..f57f580a8c2b 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -14,9 +14,6 @@
 		<flag name="brotli">Enable brotli decompression support via <pkg>app-arch/brotli</pkg></flag>
 		<flag name="cleartype-hinting">Bytecode hinting mode for TrueType fonts that
 			activates subpixel hinting (a.k.a. ClearType hinting) by default</flag>
-		<flag name="cleartype_hinting">New bytecode hinting mode for TrueType fonts that
-			activates subpixel hinting (a.k.a. ClearType hinting) by default</flag>
-		<flag name="bindist">Disable ClearType support (see http://freetype.org/patents.html)</flag>
 		<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
 		<flag name="fontforge">Install internal headers required for TrueType
 			debugger in <pkg>media-gfx/fontforge</pkg> (built with
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 79e0c580e5ac..acf77444b8ee 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -9,6 +9,6 @@ DIST gegl-0.4.32.tar.xz 5633796 BLAKE2B a4ba5d19291a61c6903dcc368e6cc3e1934e8d89
 EBUILD gegl-0.4.26-r1.ebuild 5022 BLAKE2B d76955b962ac995d1648152318607f4ebc4f74680e95e357eaf2ff0391800212c9cf0ba2bb7445ce89031ff0d0fc1c5c14046903de32bb4e49a6adc3267fb49e SHA512 14bf294c9c1b073d7c3dce07b61b0b02d298ed3fe9d53825c91c4ed6b10d28fdfebc73dcb63fff9dbd272d0278b688a64236ca0ddce5ca15722af2b17d009912
 EBUILD gegl-0.4.28.ebuild 5034 BLAKE2B aa7b52183ed7cf1047dc19be3343fd06efda464eb03aecd93959bbecde260a4d7aaf172bb91194d672fa8ae2512ef698e0b77492a8bc6307eda9c4f093271f73 SHA512 bb2ab17cfbab58b420bad3b957a2b84563d7294631a7b188fef6a5dc530b742da96b6dee5d0fc8103ee419e9ef2b587ee1011e02cb96bac372df7f68404fab8d
 EBUILD gegl-0.4.30.ebuild 4830 BLAKE2B fa94364b30d66a79315ea3590fadf06467c8b24ae4ed83b7d4e27435b4e0b54f48a7252e009165d1aacbd0db72673c9ed3d32cd593c0ab652e74aec635f2aeae SHA512 65935c4762ab9e6aae27e23fc0ea4498db7d4ce7cc3479c694b9fd665a1dbe90aed34c467fa7dfc72955ee522a955dbfa9944f8d665e4e06bd7c9039a6d9de69
-EBUILD gegl-0.4.32.ebuild 4769 BLAKE2B 01a33487ef738aaa4a985c2f002772a361cc8bacc04d39145b9f1eb7f2fc08c61e7878904bfe6f7ebfecbd660f759986dfffb8919db1f0ff8578a155583f6cc0 SHA512 1f5242bb03d896ed1c79a9d6a04cf853783adcf587607792263069e8f466388b4406f401238fd15a264e0c5947ab0e12dd5735cf35486ef822e891f10dd3f301
+EBUILD gegl-0.4.32.ebuild 4768 BLAKE2B 28e5d8e1a0f489a75a4189f9aba3a3ddf2c0b64969d3e82b0a73bc8a0e5291bf8a8101d80782b8d12b9786df3857e98dfdd05b0d3555b9e0e7792dc71e847413 SHA512 378d9dd8e728a4b9abf1c86beb2576d938ea8a28beb718c96580bcb7d6cb08d73a11b5a946610de8219b41f0218e7fb2d738a5f34d0c5b4325e05a12f67ee256
 EBUILD gegl-9999.ebuild 4502 BLAKE2B 9d432a8647e2d5b2e2f77025a602b92ceecca6080b1945e6a5e3971619ff00e918f277a10ca5accc9c0feb5aa7786d33d76fddc530aa9b4f56b740f5d5a0f7e1 SHA512 a9c920fdf717898e9722d11b59a1c78d7c0a7686494b904df2de29216a921a049e2687bc61457fd1cc9f347079990fc7200a6afd6f0bb1bda96e591ea74d7794
 MISC metadata.xml 581 BLAKE2B 180d0731a2d488b8772fc6aa8411871cb892a886ff93368a39a32b284702b7daeedfe32fdf19c0f11101304231ed1338cd8462d7788a08df1bc7ae1b8ac16a66 SHA512 bc5907cd42cbba848b57266cf1023a402296ed96f6ea53ede2501fb49923c23d636622ec569463df402dbb5db3c970353b92b110962945806222ec92257a12d9
diff --git a/media-libs/gegl/gegl-0.4.32.ebuild b/media-libs/gegl/gegl-0.4.32.ebuild
index 1cf6725eb2b9..dab149b166ad 100644
--- a/media-libs/gegl/gegl-0.4.32.ebuild
+++ b/media-libs/gegl/gegl-0.4.32.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index 032a7ef8edac..d439374e222b 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,5 +1,5 @@
 DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
 DIST glfw-3.3.5.tar.gz 776593 BLAKE2B ce92a42ef7361ae2580c9d6722d340106f9ca26e7fb436b9a4be2f25bf4a15d2b08d82ff71ad4ce4cd6a59e31d934d0fe6ab0e546474a3e7de38e229795ee0e8 SHA512 cbb8ebf25d3d826eb1daeff3ad2e0e965ce9def3352955f297743d918f625d96bc05bf87c90f7b57ec53376a0f2f6ce62f80b57fac4e81e023400de275e97beb
 EBUILD glfw-3.3.4-r3.ebuild 1272 BLAKE2B 690a73e355b3e4926e54285a63f81a22a48055acc3577857e9fc42cc90b0a4fdf5e56d647d4636e6034790bdce60b840f758c08f58169bc6da62d2b86f8f29a5 SHA512 241f3431d4bc380c192811005ce67c53ef5120cd99aa07024238d4f2629f56084469f1b814302f72c19061585adac03801d1af30406471ad094b282d29038452
-EBUILD glfw-3.3.5.ebuild 1132 BLAKE2B 444ec9d9260a341bb36f7bb42ce06f462f9ac51649ac9814282410ed9b0dd807e8a43a091791192b95f77f9b8a4e44f94bc4366ce4896f1e48ec08c6e0d874c1 SHA512 d4d39246710f94966c8c241adbe9de1b3ac47c572e8272d0f61db62b395990df295951312ffa6810ab13e9078ac948b9d7afb08572a7bece154ecc9d4e31e6be
+EBUILD glfw-3.3.5.ebuild 1130 BLAKE2B 31fcf6d5552672d702966981b39ad09f2cd3f2b314543aa86ba3bb3e5a34c9b36fb35dbf53dfe1907b4f6260d14b78f3da6003022508cc87bbadf244bcd3c1da SHA512 2a366687fc283b0247c7137487d5c28d218fc75491918ef0ab02f0c1d46ddc709a09c69f1bc63cf1825381676d6869ef5eefc2b71f35b4fc98616d036703ec5c
 MISC metadata.xml 486 BLAKE2B d62ee825d2d51b6090cd5de87ffcde75a6dea4e109f144ed1a8305e1fad19b578549118dc3f803069289341f6fb4b95772d34e7a5cd2faff8f84d99b29165c83 SHA512 e1225c91492f76382b91acf579c9fce1be411638ce82186b729bea4a9cb18eb73b6c97d4d6e84b42877faae97c8628cb61176e1fc32589a0f419146aca268d9a
diff --git a/media-libs/glfw/glfw-3.3.5.ebuild b/media-libs/glfw/glfw-3.3.5.ebuild
index c82e318544e2..3fcd9a61ae42 100644
--- a/media-libs/glfw/glfw-3.3.5.ebuild
+++ b/media-libs/glfw/glfw-3.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 IUSE="wayland-only"
 
 RDEPEND="
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index e6d564d1c5aa..572ce00b8d1e 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -5,9 +5,11 @@ DIST intel-gmmlib-21.2.1.tar.gz 746883 BLAKE2B 9ffd3319bca42558e139f81ab60e5db53
 DIST intel-gmmlib-21.2.2.tar.gz 746635 BLAKE2B abc73cfa209b8212bfe185e1f27a84cefb7ece9134f287e85e67c09bfd4f48e097e410a95d966d2f85c79bc95f753b6ae462a67db031dcd1fc6f46bec9452e22 SHA512 eaca3595c28afb8873b172fff3e178489b7ff736e6e9d80e75939ffd94af6c9c5f7f7429a74e98c9af478ab218cd25242d7c69037afb7193a983f8f02616e81f
 DIST intel-gmmlib-21.3.1.tar.gz 746732 BLAKE2B 537d446839136d6d048d15eb79e18214d797c68dd4288670448e4104e8d6d0701cb93366f77093f264f5392c0c37470b4fbdd0b0da43c9e319c2b334c3315bdf SHA512 54ae92bedadfe8cf7e39786f96bd29b5ace8bbafe8f32620034de8775c5e31fbbd99dd61b10e5fdf12c9f967196c11840e6a202cfb549e5f950f1743cb9b098b
 DIST intel-gmmlib-21.3.2.tar.gz 746990 BLAKE2B b9cc1937d551ff48e317b6a6b70a07f96e6ed1a4a1d27a4cf5be61e97a7ece71cf75a7f2d773f9a42e2c4ad8badf97c06a5cc0dd4a4fa38159a43839f1ac11ac SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be
+DIST intel-gmmlib-21.3.3.tar.gz 747305 BLAKE2B ef055bfdb6efccec5e2e7618677a97b38e314f44486c0d99e704281f2cb78acdf64a1737a8ae2c33b9dde6f60a284b83d9b5ca1949c5a5c7a34894cdbfbb9347 SHA512 9680b2c38f71467a7c4f2c1a6136d1de9c906355ca675ebbafc697daea15fe615aa45f3af3140330f1610946f9c55471038eeb815b1d677b64efb4896515d8fb
 EBUILD gmmlib-21.2.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5
 EBUILD gmmlib-21.2.2.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
 EBUILD gmmlib-21.3.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5
 EBUILD gmmlib-21.3.2.ebuild 763 BLAKE2B 29a714a5243bc8110253bea5950b177ea27eac9b8d044b8928b568fbb5f3aa8c06939457103ad7ac69b984199d907d316ddf34bd2baec8b5b7ed4c031f475d2a SHA512 56a203152fe945bca2fd90914e6941890fff8452c575fdf8306a497130e29afe4fc7018c334aae9ccf09ec4f07ceca9e590d3f51ef3d8e035ef6e61bd5c6f8a4
+EBUILD gmmlib-21.3.3.ebuild 763 BLAKE2B 29a714a5243bc8110253bea5950b177ea27eac9b8d044b8928b568fbb5f3aa8c06939457103ad7ac69b984199d907d316ddf34bd2baec8b5b7ed4c031f475d2a SHA512 56a203152fe945bca2fd90914e6941890fff8452c575fdf8306a497130e29afe4fc7018c334aae9ccf09ec4f07ceca9e590d3f51ef3d8e035ef6e61bd5c6f8a4
 EBUILD gmmlib-9999.ebuild 842 BLAKE2B b4791d7666070fc1f47b47888e6571c9844a85ec40a3c32e5b846fd7305af8943c97c6160f2995fe47a771067ab4be8d55b34d0393e3d0c13e44024f2897c609 SHA512 25f35b6bbf0033d0455585bfae6909b2bc204d4e43170c482e31b38b4b5f4302a9b6f0dd5a2f7fa2996693fe7cfa51b01165554784de03c71d4c271149608ed1
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/gmmlib-21.3.3.ebuild b/media-libs/gmmlib/gmmlib-21.3.3.ebuild
new file mode 100644
index 000000000000..75f21bc6ea03
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-21.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 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"
+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/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index a5c920ff73e9..a47f911fbb3e 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,5 +1,6 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
+DIST gst-plugins-bad-1.18.4-glib-volatile.patch.bz2 8492 BLAKE2B 7a6e4a3fc1d68c39ae08cb052eed1fcef9c5507c655525bcb48ab789f20027632136fb195643dc5d2e04728b4c3ac94b1dcbf9a14343333fb80d65c64244e1c8 SHA512 0d9e04b883a803cec518469f46dbcf47bfef614694cad6b2bb6e8cb31c3fcc80b0f3d81633b16cd05ca0516f49893aa67f4745dc22e80192ed385fb97ee8b97c
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-bad-1.16.3.ebuild 2204 BLAKE2B 4997f2c2c124f632229b3dbe185f553b53be5419d00479d4b9c712bade33bc4558800c9e64648e603cb007f2fc6bf9c67f25cc8215e66e65e32e579c373c2eed SHA512 a508b1e0d2521cbc35ddeeef9fee6a46d89d9c9670a8037875573cd34492acd2a222bd95d09e78dfd4996c977e81ec71ba382f6c68578d7e6dbb15d95653255a
-EBUILD gst-plugins-bad-1.18.4-r1.ebuild 2315 BLAKE2B c734f17e27eebfb1cfe87f17f9332c2e85ceef2e73ed5e357953fcbff3b76ae972046ce885cf0c9eb8be30ba5a794475324c7bf3b30850e0761bfd5d90556c90 SHA512 ae1ba5c45360585e8f7e5797863795fb2b019f4d97ce85d0b5d906196550b8e7cc16933e5c09f84d2c8527ccc5b0b323955e88bead4fc0bc57d2dcf7fa9ad865
+EBUILD gst-plugins-bad-1.18.4-r2.ebuild 2520 BLAKE2B fc209b678a90d89cbc46d3a14af232cf73a77f4f44505b9edeafae78aed812defd6d3c5ebb487968365f6506fd44d8cfac1e6b622150662bbb0ffb7b1e49d00c SHA512 b7ccbb6eff44af1fb65535297b158f63ebf8729771debcdd27380ae4e5e0100256b56d4b85e4ae202855bf23e4ea30a200d5c7a23578985c468dc1ddf4a26343
 MISC metadata.xml 440 BLAKE2B 7effc0f6ca218dae5cae9375491cefd7304006ed2e0ffdb9afdedd8ea3098fd1fa4eb0c2cec9381a3bbbef1c4336094070484b11e447381a1465af66ccbcdb8f SHA512 443bc8793f8c94ea7005445fab8292a17ff2be19f82a769a303e5b84dcbb3282f61813995695bb935d16d2647aae2947acade8f456f14ff6df36fc45cd72f4fc
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
index 1fd698e16f5f..93b00d92d833 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r1.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
@@ -8,6 +8,8 @@ inherit flag-o-matic gstreamer-meson
 
 DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
+# glib/misuse of volatile fix, can be dropped in 1.18.5
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glib-volatile.patch.bz2"
 
 LICENSE="LGPL-2"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
@@ -43,6 +45,10 @@ DEPEND="${RDEPEND}
 # FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
 RESTRICT="test"
 
+PATCHES=(
+	"${WORKDIR}"/${P}-glib-volatile.patch
+)
+
 src_prepare() {
 	default
 	addpredict /dev # Prevent sandbox violations bug #570624
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index a6ed770828e9..f50a23825c8f 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,7 @@
 DIST hamlib-4.2.tar.gz 2311775 BLAKE2B 4fe8d3e6d489369aede1a4cd59f01be44a7787ca71c21c5b92d436666c67de68013f488834d0f57238e6a947c24cd5b4c6c667397dec30392f1cccd695df252e SHA512 08ccf4e592fbae938ae1aaa5afede7e2e6ec7d23b449a65b00e093502f4aeb36930624f055d9802349f77df9dd2b7b983aa44d83f8c62a6de5789e7df627f804
 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.2.ebuild 2059 BLAKE2B bf20a9cf50751f9c569838e4e8e23a9f88b5fe2c2b8768c7dca910b7bd9e6f65ea5f81dda22df0e4aaf2c4e8851b179a184594a6a88debb53f7e2c1a2945560f SHA512 3d6caa23d7cf43e9744eb88aaee4ec978331bb02dedee767ddcdce81a7f02419a34f2bec2ffd91dd0757e934af4903879ad3485b70784aace027340ceebd4002
-EBUILD hamlib-4.3.1.ebuild 2059 BLAKE2B 265e085db190965643e3d1c297bcd6997a8fe90b2a955333ef54ba70a5a1a210815171d0e87955b362813918d8b14b4cfc2c2ca98a6d534f512bf5608db602d5 SHA512 69209a98f5e2cfbb82487854d6d3cb234ae97f076f64e61270dc61c9267fa860977eda8f1d0dc120ca1d2b6f5e7d09c5801dcc64cc8d04429816ad6265128afe
+EBUILD hamlib-4.3.1.ebuild 2087 BLAKE2B f9bcfec7f4c00bd47e11aef68fb7c654ef4aba2989f25a1b1092766e7fca445d5c24047e240ac65ab359432b9aa32d6d6b0fea54e2659e515280fb840def7ddf SHA512 759eecc58675fe9899cd50d5ec1fda46a61e328c91eeb6e4ede7a02d3000ed07b07e4d42e9c09e35db11cad56f757aa710cc4ae070f1c3a10a98301021d71f80
+EBUILD hamlib-4.4.ebuild 2089 BLAKE2B d4ef76d3358a875118c9bd3f9cd53e7f752ee00b0852ade92e7d2ac41fdd8baf5eb2307abe78912d9ec6b72bad0d80eb9b42696995c7685b33fa7504e3b9bc06 SHA512 404b570ff55fcd7ba41cf34a7a429354519dd847c43cfa72cc5b581ffbbd0fb76b4605959242f3d82c500ea8707601a71e45553d07512cf6c8bae7c90d02823f
 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
diff --git a/media-libs/hamlib/hamlib-4.3.1.ebuild b/media-libs/hamlib/hamlib-4.3.1.ebuild
index 352e4991f6ce..ab42e282b753 100644
--- a/media-libs/hamlib/hamlib-4.3.1.ebuild
+++ b/media-libs/hamlib/hamlib-4.3.1.ebuild
@@ -31,7 +31,8 @@ DEPEND=" ${RDEPEND}
 	virtual/pkgconfig
 	dev-lang/swig
 	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen
+		dev-util/source-highlight )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/hamlib/hamlib-4.4.ebuild b/media-libs/hamlib/hamlib-4.4.ebuild
new file mode 100644
index 000000000000..b741ce89b037
--- /dev/null
+++ b/media-libs/hamlib/hamlib-4.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+MY_P=${P/_rc2/~rc2}
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Ham radio backend rig control libraries"
+HOMEPAGE="http://www.hamlib.org"
+SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0/4.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc perl python tcl"
+
+RESTRICT="test"
+
+RDEPEND="
+	=virtual/libusb-0*
+	dev-libs/libxml2
+	sys-libs/readline:0=
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )"
+
+DEPEND=" ${RDEPEND}
+	virtual/pkgconfig
+	dev-lang/swig
+	>=sys-devel/libtool-2.2
+	doc? ( app-doc/doxygen
+		dev-util/source-highlight )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# fix hardcoded libdir paths
+	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
+		-e "s#fix}/include#fix}/include/hamlib#" \
+		hamlib.pc.in || die "sed failed"
+
+	# Correct install target to whatever INSTALLDIRS says and use vendor
+	# installdirs everywhere (bug #611550)
+	sed -i -e "s#install_site#install#"	\
+	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
+	bindings/Makefile.am || die "sed failed patching for perl"
+
+	# make building of documentation compatible with autotools-utils
+	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
+
+	eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)/hamlib \
+		--disable-static \
+		--with-xml-support \
+		$(use_with perl perl-binding) \
+		$(use_with python python-binding) \
+		$(use_with tcl tcl-binding)
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	use doc && HTML_DOCS=( doc/html/ )
+	einstalldocs
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins hamlib.pc
+
+	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
+	doenvd "${T}"/73hamlib
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 78c8384f3de9..a41147f05a3e 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,14 +1,8 @@
-DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
-DIST harfbuzz-2.8.2.tar.gz 18506485 BLAKE2B 39a43d643339a5bc27d886e418695d2864ad7b9094dc508f5ccf52bf635b340adb7ec6958a15349e0b2580444ec98c5850e4022f708287fbe44cb7ea90065881 SHA512 51eee8c8fa6f839512e0dfc5c80ae8ed1e09d747d0ffc6736e5a1cbf86de956322f23e6ea25a90985e2317e98229a133e208da2a7b5177d65894cc64706ee8d4
 DIST harfbuzz-2.9.1.tar.gz 19154048 BLAKE2B e6cdc3936606e3d9a4bacf385db13c54f328d5be6c20ab20f844650351dd34f8f2015954f4ac7a6e0b8a1258ed9a6e71f43871c768c892d87af5c399c4499c63 SHA512 f8bb1d75b498d1581e76c57e5a15999e2c0d745d7d73dad17bfc91daf000f96d17c4924e6fb31270c90c26693dd504a7e7b2add152a013acca2491a86256b07b
-DIST harfbuzz-3.0.0.tar.gz 20360786 BLAKE2B acc1e4d7d59908a23ae1015700cfbf1737cdb0b26ba811d752954356baffb2ab18c3d22b5964d200c4cc7e312a79655c3437aff9f5a85b72c472e324dc3257ba SHA512 69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5
-DIST harfbuzz-3.1.0.tar.gz 24969178 BLAKE2B b9a21de7648382a104c60c135f46719c36158a766ff445de0f6038b143f5e524feb2214ebc1b3591141bcb023b79ce0d35b8b20efd69e3166685644ef2e6e0a6 SHA512 da75297bc205036d5f4374d68cb71a96f7b4db5428384bec6f9412988682301a30094643e7d33359c985b7f309f7b3f88275488137e75a5a0d2d493b11f52ae9
 DIST harfbuzz-3.1.1.tar.gz 24966288 BLAKE2B f655d6a175dc495c00a76838d101705a32270668b7d989b8e82b9c34d2c16a5c10d210c0ed99a334515f73f7cad5c22e35c97f3a2c3f40f686380dd0559d0d7f SHA512 ccb1c840d07e28871893c40b2bb687cc78dfd25992ee20192f1faf8cae4356f401abd5947d7480a268edea10dd9f1d1d7e113b29b6e2d958220bf53799ae01b0
-EBUILD harfbuzz-2.8.1.ebuild 2497 BLAKE2B 89bb2b0796c1a151efc58f43abb0c87df3829361be12e37d43652dae4c002efd29405c61e2e66350ac5ae8b75693f385ce4594d8e480d7a389a3311af4c41621 SHA512 8093198447adef9c164c8fb8d7f9a39a39bfd3ca43e2210a2d4edfe6e51716378c009f0aa5b64e5560f4f174021b8b525d9a3d2837aea53eba6059efd1cf336e
-EBUILD harfbuzz-2.8.2-r1.ebuild 2546 BLAKE2B 4b74f8cdffa64a9ddcce411caabad933d046ce07f184303e73ac70941f9a4a1c4f6adbfe7b809e387b7de23e60bbf8205156b26622cf6980743f006d653db385 SHA512 e018e167e1346ad421a093ec4fa762738f5a9c43f759387109299147cb873082a1d16195ffa9281b67aac6a0dec7f30f270df4a5e86e125f142d83722528f3f6
+DIST harfbuzz-3.1.2.tar.gz 26678706 BLAKE2B 231687fa77983217cf60eda2b4796431c15a9efa79e8925363e6d8374ea2710d167eb1bcf5e14a7c738a98f6be06e24ee6b038ea5697b380b81425c9d4244dad SHA512 4d1093904bd450c6d65130b3d7198c07cfc5cce9a5d234fcb14bae1101b28e697ba42cb455217f863d8d5c83830784f716ae59a2dbb38e88156677213bdb4799
 EBUILD harfbuzz-2.9.1.ebuild 2505 BLAKE2B 1de2fdb70f4647273658b95cf2425c7c94d56d55c695d4df4b94b4c375d5dad50a04e2f279443061e721c19102345832d3be84cb857f9713e7ab9660e0ab3d82 SHA512 ed1bc1b2870766467bf808aa277c5db7fcda334e610378b84e739646c22cc71e810c6ad051abb0d4bb93af10a74be672b552054719a29979e653131ad4af4070
-EBUILD harfbuzz-3.0.0-r1.ebuild 2560 BLAKE2B 834b18435b9f86998faf43a40a61094064b93db75943d87ddf5b9b9d40600f7554c3d4a0cdb3eddb3ce7c9a836638b8773ef11da90fcb0630f18c210906d6eb0 SHA512 c44538f14327df10ec25f7f57afbe107a14286688c5d7912be9044abaa3e14a6ed3034601a9c354b89b9d26ced7559ece1e5c42dd2c94cb13cf0bd8bdf1e8a3a
-EBUILD harfbuzz-3.1.0.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
-EBUILD harfbuzz-3.1.1.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
+EBUILD harfbuzz-3.1.1.ebuild 2562 BLAKE2B 850d12ca96d06beb855e02816d5d4fb68e76a70004e4cfee848115ec77045171cd042872b8c7fd5083dce0809d298ebd887ce745b0cda8befd2bc68cc00ff58d SHA512 ac6d67696f14848dc2ae0ab25938a970142ab2009b519ac55e83e0e0fcfdea2d4478a752ef4e2836588db9db1fa9725226b80885ef248509849a0c33b679f23d
+EBUILD harfbuzz-3.1.2.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
 EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
deleted file mode 100644
index 4cb7ec1c415f..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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 ~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"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs 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 's:tests/macos.tests::' \
-		test/shaping/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 instrospection, bug #535852
-	local emesonargs=(
-		$(meson_native_use_feature cairo)
-		-Dcoretext="disabled"
-		$(meson_native_use_feature doc docs)
-		-Dfontconfig="disabled" #609300
-		$(meson_native_use_feature introspection)
-		$(meson_use static-libs static)
-		$(meson_feature glib)
-		$(meson_feature graphite)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
deleted file mode 100644
index c24312bb372e..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 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 ~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"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection static-libs 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 's:tests/macos.tests::' \
-		test/shaping/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 instrospection, bug #535852
-	local emesonargs=(
-		-Dcoretext="disabled"
-		-Dchafa="disabled"
-
-		$(meson_feature glib)
-		$(meson_feature graphite)
-		$(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_use static-libs static)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/harfbuzz/harfbuzz-3.0.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-3.0.0-r1.ebuild
deleted file mode 100644
index 64ba1e60df03..000000000000
--- a/media-libs/harfbuzz/harfbuzz-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 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 instrospection, bug #535852
-	local emesonargs=(
-		-Dcoretext="disabled"
-		-Dchafa="disabled"
-
-		$(meson_feature glib)
-		$(meson_feature graphite)
-		$(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.1.1.ebuild b/media-libs/harfbuzz/harfbuzz-3.1.1.ebuild
index f6617befe9b3..c342b2dfe8f7 100644
--- a/media-libs/harfbuzz/harfbuzz-3.1.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.1.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 ~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-3.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild
index f6617befe9b3..f6617befe9b3 100644
--- a/media-libs/harfbuzz/harfbuzz-3.1.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-3.1.2.ebuild
diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
index ebbf3d107adb..bedf1bf2883d 100644
--- a/media-libs/kcolorpicker/Manifest
+++ b/media-libs/kcolorpicker/Manifest
@@ -1,5 +1,3 @@
-DIST kColorPicker-0.1.5.tar.gz 12013 BLAKE2B b4141e45b44e05c4769d008014817327a560c8ad74996010a1d16d22b6503547ce2ba657eee01c3893bb9a72cecd8fc368afe8e503d2c582cb02f1ab4b371a12 SHA512 6792cb79fe96f00c073f3f4b84c2c0a713523c33ee9f29113a9ed4f4c5f8e5509fefa4127a28546b1b44f73e0df7be9364a1c04498c36efcb6c2764df25250a8
 DIST kColorPicker-0.1.6.tar.gz 12028 BLAKE2B dda08211b56186a34afa9049a2770d98b25659fb0e9fed344f9305420ddc5f69517684236d2d1b1613cec0661f6af43fc463a0cc403bead27d0b6c535030d7d4 SHA512 9702b0dfd9d340aa2b043711b27f2ac1994ff6cdd06e912deb410bd3500a2b68fa046d91bbd1392f3c95905e4cf7660819d70864cc85e55cb4c8879e820e7cec
-EBUILD kcolorpicker-0.1.5.ebuild 740 BLAKE2B 8b5acd88f5bef7eb1cef09ba7e4010adc2e7b55fdb054591dd3b9bd76e66d1ae9b6eb59f305941f987b610de682c7f3d4cf147ffd07229c9d7f5e5f1f6c83407 SHA512 329b50bea92f27a8d826274d167f4595e68ca0f47ea4f98927ec9cb2f0f0441c94272f15eb1c1f468e91c4bb7a4de8f8046bb4edbd7bac8c74ea240987a96fb2
-EBUILD kcolorpicker-0.1.6.ebuild 749 BLAKE2B 6869d2e477546e140d779d4a171aa97911b814e46577030bced2fc8f016848d89a10ee2fedce4ade19d5fb0389fb3803f63e1debc4b7feeae128fbc7e72a53bd SHA512 95d60dc088b5bc6a58e9f1b024839a863d12c3c3654bb1f181a1670ddd8318da2513bc57e80b133624a042bbb160c5930af69bcb9ba0d0e5ac33fd9666a61989
+EBUILD kcolorpicker-0.1.6.ebuild 746 BLAKE2B 3a9a0d72af85c2ab13233e75f94e67ea1b4d2c9257af716f18a6b4439f1a1e7c7abf1add00462a86aca387931bd41b2843283121a3e0d88dd3f52f036eec0dd9 SHA512 9edfc22cc8ae8d2e7177e8517d73b606a24a1dd8b6f52897b068d1d0df99d3948d9d34f274fd0b7cafe36dd3ccc4fb40bc5a48eeccc309d596bee9b4360a4e3b
 MISC metadata.xml 613 BLAKE2B b96e90131adc5be0575362e88ccaef939d42f532ef2694af9a77ba71dd6b6b930a30a12dba331e9819727fdc717e6374b128981004ce7af3f06728c1bea995f1 SHA512 e2b7fde171e6d3a528aa02f4130bf153e6a63eafce449a0a092e7a3d52b36a8126e3b496de1cc66d5dfe3c7623a62ea9693d96453cbf0ed5ae4fbde2c15c287d
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild
deleted file mode 100644
index 356f123bc91f..000000000000
--- a/media-libs/kcolorpicker/kcolorpicker-0.1.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
-
-MY_PN=kColorPicker
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Qt based color picker with popup menu"
-HOMEPAGE="https://github.com/ksnip/kColorPicker"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5[png]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs+=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
index 9b5805c87170..60dfc3b9c959 100644
--- a/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
+++ b/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index e0028c9cd303..ebc940c74273 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,9 +1,5 @@
-DIST kImageAnnotator-0.4.1.tar.gz 165976 BLAKE2B e25679416b411082aeaefa8d56aba203443c5a8fedef418caf7bd48b6facc07bfa4ed336d3f49970366023200bd4c0456ac631edc6b6c858b095f4410195761c SHA512 f133bfc81dc0aafd31a4deae2cb6a45b9d7941b27be3027ded7ffa59efe35c0f0a313b3076f672b93acbbfeccedf4832193fafe90c0fef004fab644d1da0dadb
-DIST kImageAnnotator-0.4.2.tar.gz 166061 BLAKE2B 83e53b89a09800ebd4fbbd23b893811b20375b24e43289bf4b21766f1b77851f86686a6c18f0da7baf78b7317ddc7f9348460d4c4c7cc0fb2b4767c549355fbe SHA512 33323c774bd3e6a72d3fb575c006c9e00111840c7a277e0f20554cef184b256d4e3b810bba11dd71cee8c257d0a48103e52b24b458bad2ece8b0d0cb94db4ec9
-DIST kImageAnnotator-0.5.1.tar.gz 214671 BLAKE2B 0dc6496534c045408e64fea7d9cc80acb7891fa009cfae5be28415e80914e726b4a2927d55156520414f35bed727e7d4470f593d5b3feb04da3e8c47a8d612c7 SHA512 221ed21c5a5156a9d7cdff70d7f4c1dd186fa40f7ba0d6d0bcfd87e6d045967b83c647378f1981b33307bd6e1b52722e2e9f4229c12fc18c840040fb4f405552
 DIST kImageAnnotator-0.5.2.tar.gz 219008 BLAKE2B 6d2d53a55b013b8bb87291ffcb13126437291145a4d869c9e4b031711b8592ef465eb2b24b6473c09f9d02067d2404da15a4170a2f4e288cb1475d3c5d7d00be SHA512 42785f92954bf8fe28f5114d8ba7da9a1a22e79d1c0356642e34754218e580b147670a119d94e3b6b704deb1230a0d0f4d998541d5532783e4d569c66789af99
-EBUILD kimageannotator-0.4.1.ebuild 838 BLAKE2B a666de99e75281c219b27779a053e54cd2acf6b429046f7e7f49854c5be4505b45318fb0e4958cd14cf8f911e2b7b05127a5b96195b5b93355872b1d77097a6f SHA512 2d0d66550b2365ddac5e2d4233a4bbe49ed69ccf4302840460d7f6fb2bfd352effe720240b9d647ab60e2a91a3f04ebc7a76a451bf721964d1f4a95f091b1041
-EBUILD kimageannotator-0.4.2.ebuild 840 BLAKE2B 40b7193f516e9aa5b29a1504ab19196fc0c6ffd53f061368c123a224c5b8737e879f9bcb66bdc1b5e0e4d60329d7df8dbd02ed876161bace8f67cc3cf050286d SHA512 05c581bd2fa267f5e1ddd718b8fb947f93d00bc303226ee0f6fbe8729c1eb2f8e299bf2327a99db1ed8769277f695924b5dfcdb6e8cc9f934d5057f9bae797b1
-EBUILD kimageannotator-0.5.1.ebuild 847 BLAKE2B c9016307e724398b7e8aa54e8ac8de1852b2caf852567b942a535d90ca5a9281075ccc87a6db0d7c29be80316248ceee3f24d89e4ec2cf7a17ed9779738d2951 SHA512 075f02e5de359b9b91ad0558953a680ddecccf7ff93db88e45ecfdb34fccf49eaeba8e941e24ba81fd0eda8f5debebbea4bed675545b13443b200170495367fc
-EBUILD kimageannotator-0.5.2.ebuild 847 BLAKE2B edef643ad565d58b4e7c83d7856af62a7a2d8e5eb6695bfa9907be7193695241437efdfda1336a2679bd07211c0b227dfc7bd486141b00e49b0877a1f781f071 SHA512 a9eb001da175ba238b8dfa51e0e537e3056eaa4bed32dfb9cdf20a8c78c3479fd9e3119cb370937a0c11a85eb66d2595099fb2253364f9d699f1986648b34bee
+DIST kImageAnnotator-0.5.3.tar.gz 219782 BLAKE2B 30f532a563761a665da1f926629ebd66888f820b305c98f2b0afc316d8a94010196e68221a4ffd4871ffbae19582eee685af56c763f873b38a7ac5219f4a3b3d SHA512 a858e0f8694f3f989c36db586e6e3a302ad2aa9bf32b26afa170c165327fa33b6f3053682420c788f701abdea4daa35158058edddf52af1566364976b2d2f9f7
+EBUILD kimageannotator-0.5.2.ebuild 844 BLAKE2B cfb64f43519cc673715dd7bac1d96f9e523223d12ba4165577e93f5239568612bd1d5f5639e682c558923b2a5259701d2d10dcbd9f87813da6ae8b8ae82f4ea8 SHA512 9378cf9e8a52a23f68cd743822d41a3c59673449971b8768c5455f95f3bda3ec0d9f47e1eef6100c2f99b8ce2621969e511eeae54224c4441eab9770dbe293a2
+EBUILD kimageannotator-0.5.3.ebuild 846 BLAKE2B 06e62015aa15f44349792f0dd9b3cbf3547de0c09aaa176c73a01b4de8f06c093a657c6ad20bae52fb8ecc0231a368f27669bedd5f8488fd20849ae43ae2dd57 SHA512 a430992cf16e743b7315969f78e1bbb1e7bcae8924ae53f04cf99b691f2a1c81b74f7e3f2b1e44b4364cc9dc4b83e1ea571d89240ea58fba7f517a03e50889a8
 MISC metadata.xml 398 BLAKE2B 200972ac3dfb66315d1fcb8a3920f79e02cb5e7af2d46edefac2bc3094d8ea114a2fc6517b47bc590bd30e79fd5fdd32964d4bb228bc204935b9db32b0caa7e7 SHA512 a778611b727bf8a2fddc15acfedd2d52024f2c8fc2c46a33950818f8296ce8f97411814caf01f918e2dfce1c283db2a2928c7758f7594d49493edd2ef9de9dbc
diff --git a/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild
deleted file mode 100644
index ae004e293da0..000000000000
--- a/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
-
-MY_PN=kImageAnnotator
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for annotating images"
-HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png]
-	>=media-libs/kcolorpicker-0.1.5
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs+=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
diff --git a/media-libs/kimageannotator/kimageannotator-0.4.2.ebuild b/media-libs/kimageannotator/kimageannotator-0.4.2.ebuild
deleted file mode 100644
index 0959a13d9764..000000000000
--- a/media-libs/kimageannotator/kimageannotator-0.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
-
-MY_PN=kImageAnnotator
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for annotating images"
-HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png]
-	>=media-libs/kcolorpicker-0.1.5
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
diff --git a/media-libs/kimageannotator/kimageannotator-0.5.2.ebuild b/media-libs/kimageannotator/kimageannotator-0.5.2.ebuild
index 50b04954eaa2..e9449c3b95f8 100644
--- a/media-libs/kimageannotator/kimageannotator-0.5.2.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.5.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/kimageannotator/kimageannotator-0.5.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
index f4810beb37c0..1fc3ed36ab23 100644
--- a/media-libs/kimageannotator/kimageannotator-0.5.1.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 VIRTUALX_REQUIRED="test"
 inherit cmake virtualx
@@ -12,6 +12,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Tool for annotating images"
 HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
 SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
@@ -33,8 +34,6 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 
-S="${WORKDIR}/${MY_P}"
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index f4a9b07e31d4..16af3bb54ff0 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,4 @@
-DIST libepoxy-1.5.5.tar.gz 332057 BLAKE2B bf9a1e089c620e710caa7d4b7d5d0ec0cef186c7881b1a61aa22f58d8e023706087c766ad970ea8950752d87d2f32d12e2ded3137502f35991afb5b4fb3648cd SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45
 DIST libepoxy-1.5.9.tar.gz 331982 BLAKE2B 2bac6dae7fa2fcc70c1a5cacb1e6b6d21aaf65a65792d3c60eb0745acc4967092136aad1fbba6009a8c8e9bb1091a5d0a38fca05e63be2b9141d9c7e3042b426 SHA512 2b7c269063dc1c156c1a2a525e27a0a323baaa7fa4ac091536e4cc5fc4c247efe9770d7979dbddb54deb14853008bb6f4d67fddd26d87cbd264eb1e6e65bc5a8
-EBUILD libepoxy-1.5.5-r1.ebuild 1057 BLAKE2B 02e7fe699e22e02a1d88c16f00c5b7b89496eac315dfba2402750efb06b102ac947089cae764d6193b44a4c8efab8396aeda5008807da06d5c7630a6f30c39fb SHA512 6c00bc24de88f4e799670ba16b8931bc285e037d5b6afec817056d21ea766e65ea0664285455e873e8004d7c6da70502e2354a5abe2eaa3c8286459c16c9b9df
-EBUILD libepoxy-1.5.9-r1.ebuild 1062 BLAKE2B 411bcabefbbb6513a834a8ae07ba79ea4a089297bf02c7a6edbe5966f651e40ac17182c08746d01531908457302319b61b3a05d7a66c22fb999862eac31017d9 SHA512 fd4936ba9c25814dc46b88cbcdb8177e4beb6c75801b164fd37599e7b0338e819181a05d7c51cf4f3fd8e9b7d9efbfd4a44494026609c87296be6f5b38bd1fb3
+EBUILD libepoxy-1.5.9-r1.ebuild 1056 BLAKE2B 30d5433e96f453c74dcd1d12da3047c9194eea9658b6914a64f1fee52a73aba5fce5fd2ef67fca87a692849b4122ac2fd83966e578c38951a48a7c4a054a3bd2 SHA512 3b8052007d1670460d3b0abb5f4b9b6ca4bd7aa3440f3a667a33af076213a80a50af2c4573a35acda842fdaf6784a5f72e3f36a162c18b6c865a8012c46d1230
 EBUILD libepoxy-9999.ebuild 1064 BLAKE2B 7dd53d9dcab52dc889fa6d60207bcf4f144fbe2c430a43a14641b69bb4e50436bd7ae87fba382c65f0d61047d89011ae92812eb05548bf996bc230887d52757e SHA512 cb89bd72d25043ab72078c4927b9f64f4e79c6bacd62dd16fca2118286eaac3ad9790e7f062d38ac40e000c4a590a5da1698f7d895bdbe6dcc22f57c6511e2fd
 MISC metadata.xml 376 BLAKE2B 980a035e0ac8a5a3126ee27c032e8f14353ca5e7f2920769b74a23aa827a1110ff8f55a49a1f3072889ea1fed9f76f39bb3c2fddc6f6e2e736773c961ea4be3b SHA512 d1b9e9349929118e39201157b34e7955b32301ceaea877025fdf929d1039af536618eec5a9b0c638622c390201cd4d3106d981f884cf0c1c6469534fa65797af
diff --git a/media-libs/libepoxy/libepoxy-1.5.5-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.5-r1.ebuild
deleted file mode 100644
index 332bb0aabe74..000000000000
--- a/media-libs/libepoxy/libepoxy-1.5.5-r1.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='xml(+)'
-inherit meson-multilib python-any-r1 virtualx
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
-	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"
-fi
-
-DESCRIPTION="Library for handling OpenGL function pointer management"
-HOMEPAGE="https://github.com/anholt/libepoxy"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+egl test +X"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	egl? ( media-libs/mesa[egl(+),${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Degl=$(usex egl)
-		-Dglx=$(usex X)
-		$(meson_use X x11)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
diff --git a/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
index 039349f53a02..653d6c7f0851 100644
--- a/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.9-r1.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 ~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 c2b1b5445d06..b2e7f3e51be4 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,4 +1,6 @@
 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 1228 BLAKE2B 56bc7cac5dcee342b1c9b108459769f4caac856d8a7059106c8b19c8cb7b2eb7e250aac653a349a38c1449f6b709d475e78791d38c25d3362ec6d8707290ab18 SHA512 bc03f8fae43f1d8c7729a1c85f993e419be15b44ce353093349393935f44183af318ee3956def8a8acb718f1c945714279e38faea3646417f630e726818fa9dd
 MISC metadata.xml 453 BLAKE2B a6539b21b1ea55bbd09ab7385ae771673a802a3dcc41d637fae7ad50f2f67aecc2c253cc77c86d80df83649972d8619f9e18e8b9d7c6259ecc1326617be8ffff SHA512 44b76d19654a28cfaedbd9627d9556554846ce48f142cdfd67753f395547cb3717772cdef6935a641354a5621c560a0b7d276dac4ab62d467d42946a8327e0cc
diff --git a/media-libs/libexif/libexif-0.6.24.ebuild b/media-libs/libexif/libexif-0.6.24.ebuild
new file mode 100644
index 000000000000..8d78a770bc8a
--- /dev/null
+++ b/media-libs/libexif/libexif-0.6.24.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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.bz2"
+
+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"
+
+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
+
+	# bug #390249
+	sed -i -e '/FLAGS=/s:-g::' configure.ac || die
+
+	# Previously elibtoolize for BSD
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable doc docs) \
+		$(use_enable nls) \
+		--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 104081eb005b..dfefcd76f839 100644
--- a/media-libs/libfreeaptx/Manifest
+++ b/media-libs/libfreeaptx/Manifest
@@ -1,5 +1,5 @@
 AUX libfreeaptx-0.1.1-fix-version.patch 571 BLAKE2B 0fa43bf3b7180b5ec90e3cb2fc633959d5b484954bd50f468903a6c0c9b0646fe77be1618b68746692b57224e46270e538133ccfeb3f320ff71780bc5cd4297d SHA512 b8d3bcadeba8534979c02e55ad129bfce147e920e2e881f99ac9d579095fb944b6e88351a74dc410d141e0a6b89f17c15ddc21019e63cc3cf362a20d5e9b37b6
 DIST libfreeaptx-0.1.1.tar.gz 27902 BLAKE2B 0aa015b0317db7f6dd61ae667cc1b7b10c7f7457d057144c1457572a214891848b81512960eb8643138c638a0f691b53a7bbcb36ad434ac29335d92b108a43fa SHA512 53dd7f348120fea0425b365f26668925dd435a8a3a0c5e98476764a452c7d729f2a3556e953c557d0ccaaa65391265c8c3c61fc29377cf60079fa0bed2cc20b1
-EBUILD libfreeaptx-0.1.1.ebuild 1065 BLAKE2B 4699fc1c765083725959be4038b74eaf112ba6df0626aa3d302a45bdf9ece28b9928114ee3020e1af0b4309f8a4a5fe5a12d351a4d4fcf055d03fbf687225f0b SHA512 da73e91c22f5056ca98aaebba13a7c4f7e9b1176a3b2d209c8598aa23748205bfa8aa4e3d4e4cb4f54dee38ea916a91e54a54565c82c2700f92141aa61346b6d
+EBUILD libfreeaptx-0.1.1.ebuild 1064 BLAKE2B e01207c4e23f52f93415e0773893052fe1a3c6d0e34c8a68b621613627d4d9f492df644ffd1ead185aa71d0d3e00c510b670950bacb5b811a33e83492d1fa537 SHA512 2604e506a76c7ee29dab662fcc94403be5d6fc23239cf951e2d26c380c85a45adde54d7cf3da59397dbe3054e8ba2ca11b209bd4214ba403b07bc09ea2a7ed9b
 EBUILD libfreeaptx-9999.ebuild 1104 BLAKE2B 9ab4ea981ac6243332276f0f17b3b941b4a49b658cabf5e6658efb7664cd71ae522683383f023788cc8dafb233d0ff94d4f21e16ed47a36f8d7273638d963706 SHA512 99f6b1912b7c00e7c2e0f55ee7c9210697b2b0d705a85920a02a58c9aaa443fa29e85128a699b76280a994b27b1a954e0c9e900c74ad41133a2484d2b671eae5
 MISC metadata.xml 443 BLAKE2B c6bc37f198358a17bb8c099093ed64f9318966930771426243e401e35d8c4c0b4d764532ded69a71ec6e5ed463d582106d8574d661bd9d9a144b71528b0d02ae SHA512 ab15fe16e8ab3e5cfc792dbbb65437e17ee76f4b9b94a08fa90f553f1d15a1c179e6cd791962ac9ddc764b50ac5410ddf0dd7c3618b2c274f6fcb5ef7c5982ea
diff --git a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
index b80bee6a5e72..d27cd8ed1912 100644
--- a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
+++ b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iamthehorker/${PN}"
 else
 	SRC_URI="https://github.com/iamthehorker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm 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 eaed069a331e..db4d83033bd5 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,6 +1,4 @@
-DIST libglvnd-1.3.3.tar.bz2 715179 BLAKE2B 781550cbda489dca31596115c78edd1d4f1fe66062218c83ccf6cb34707501fce839b649c2b0aee3621c283397acca8fb40ad16c0388551ce7caa7fd79b7dbf5 SHA512 7da9e12c010a8f109cd24ca4c2ffc846dd7d23f82157e1e39b8ae69575fabcc9592c0b639b23d2112fe2026b679f1536f1b705a5c948fefea105418803e1b629
 DIST libglvnd-1.3.4.tar.bz2 715616 BLAKE2B 77866bcd80b80dc27accbe960d63f45b5052ad110590890ed4707db0c2d7efd6882755f7258fc007b3b11bed9cee02477103ed65003185f9d7d2f6e82bef7df8 SHA512 3132bf2a547d5b7ffe12c6f1574b62c666cce8708d0311dccdbdb82063e5b6efd6f889ff1829d550af903305cd7c5bd2f7c5e0253234b25e0ea98234769e7ccf
-EBUILD libglvnd-1.3.3.ebuild 1420 BLAKE2B dba3d011a2574938b1e9ac2be10b39f57d0c115f4b151e9af2f7333e6d37f21a9da7b354832a3e7a7534d2a42c6e92ff8407d9c5b8554ea69785a446cc025461 SHA512 355ecf20261605a8f64661f3e00a733e0ebcc05ac399ee23f13836888843805664d120aaeef3703c9aad727afa8166c2f00cfaf3649fb5fef95bfafbd1514455
-EBUILD libglvnd-1.3.4.ebuild 1425 BLAKE2B 0596ef39fa64e63a6b405c577f6f943beb80adbc1a8f90dbfbe3e7662b8ece46129f265c336eb5f6c97af4230257ccc0a622e49e577172d790dd28071720729a SHA512 e8fdc748ac1fd0d5216d59e4931e6437f32f5b710924d30dacb07395527b986ab22396f341e4b8d87e84b0c5b2099a0ca008653fb6ffd411c7d2bfaf1af8ba80
+EBUILD libglvnd-1.3.4.ebuild 1420 BLAKE2B dba3d011a2574938b1e9ac2be10b39f57d0c115f4b151e9af2f7333e6d37f21a9da7b354832a3e7a7534d2a42c6e92ff8407d9c5b8554ea69785a446cc025461 SHA512 355ecf20261605a8f64661f3e00a733e0ebcc05ac399ee23f13836888843805664d120aaeef3703c9aad727afa8166c2f00cfaf3649fb5fef95bfafbd1514455
 EBUILD libglvnd-9999.ebuild 1428 BLAKE2B 35ad17719893213a5a0b18d75df985a5bb45415240c2dde7eca37e5f37c6b8787d9797b6aecbbdbf0c1fac4815524977425acf72d78e71f6fee68a48511064be SHA512 6931b29a79a836234703201b4e377940f110db26567d1da8e78a2b3402c2747cc0b106341e1bb48b8c00b6cc38b2c88b2cde298fd6daccfa97ef74cb889635a8
 MISC metadata.xml 315 BLAKE2B 138fe0ad285ae16426c77740c19a0740a9b882a421fd6a0dc39489ce5bfcd21254e3de2fcd315386e4cf10f6caff39ccfa4c3df0491ed4165d5a6a768e5f454c SHA512 958019318d542e273a11b6ab57d4dad10b375f85bda613279ddb2b5cc834c1a023b1f1b3d14e9450d5b48ee579506a8a904ecc540276138c1d5350a27d34e14a
diff --git a/media-libs/libglvnd/libglvnd-1.3.3.ebuild b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
deleted file mode 100644
index 8c83eaea5785..000000000000
--- a/media-libs/libglvnd/libglvnd-1.3.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{7..9} )
-VIRTUALX_REQUIRED=manual
-
-inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-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"
-	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
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-RDEPEND="
-	!media-libs/mesa[-libglvnd(+)]
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X x11)
-		$(meson_feature X glx)
-	)
-	use elibc_musl && emesonargs+=( -Dtls=disabled )
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use X; then
-		virtx meson_src_test
-	else
-		meson_src_test
-	fi
-}
diff --git a/media-libs/libglvnd/libglvnd-1.3.4.ebuild b/media-libs/libglvnd/libglvnd-1.3.4.ebuild
index 51fb9eba7d7b..8c83eaea5785 100644
--- a/media-libs/libglvnd/libglvnd-1.3.4.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index f203e9a63a0b..7bd57d011c11 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,5 +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 libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3308 BLAKE2B a564ec8e512f77cf44021081698ed5b0e14b441bfa8b3a112ecfc7a9d0fa2c1afdc9988a46a4a5fe29464b7dd1c46874fe70256d2f4dad8cfd98a28d11a10191 SHA512 59d55f613e9625be5ae27dd8942874ab632dca5e3db3cbc7eff7394f46558bbd8bbfac633d9266e92cfcc374929d47ac8af11c2d645aaeb74d5e6b9e573e5fb1
+EBUILD libjpeg-turbo-2.1.2-r1.ebuild 2958 BLAKE2B e6748a675d67b7c6bfa5ff9977df9a1e5c56693e9dbfb3b95896bfa6d08fc0c1dcde66e669b31d53c7d54b14604f796ce4a8ffedfa689986ebb6d4a5707306d9 SHA512 9c6ddf6c6aecf3e9fcd13279ad1db1aaeba5ac468a5e07b04eb222f7910f20e85e13238379e8e1ba891d188cc4ec748c885eb9255c24b470031a1e3b803ed8ca
 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
new file mode 100644
index 000000000000..2b46c483b248
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 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-fbsd? ( ${ASM_DEPEND} )
+	x86-fbsd? ( ${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/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index efb5e9978c3a..f0841ee2b9a5 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,3 +1,3 @@
 DIST libmatemixer-1.24.1.tar.xz 484864 BLAKE2B 21458cdfa14119364c564993f6e67c320332fabc0595d5422b75dd57ea13bfd2754549de29be6cb11708cb016b459494920000df4f86953d55e0102652dc9816 SHA512 c4620d70c66196521296d2d4197a6e025629faf1324e726df7dd7b0e0444ee17b83355c5059ec17ef36f9f15e6ab3bf3bb82a152b087a11e929d7749c1e1d4e6
-EBUILD libmatemixer-1.24.1.ebuild 767 BLAKE2B 207b442c3c948093073671172f536eb03d0da0fad57ebae5278fed961c2a5d45a173b0bc128f7d8f6a2c40361e36cdb619bfb5c5712818f3607adf08e2d5666d SHA512 03cdda5e95bba74868d5c838f469b8762446c0aa1d3ca261319d16b1d210415e15486ab67f32dc3b2a64a5862d99961e33cde7aa3120de0c274802b8a0adb136
+EBUILD libmatemixer-1.24.1.ebuild 774 BLAKE2B 5befe6b705c85f3a3718736beb28db3838e33a28faf1d987e0b81fc784a101d71d4e179b10348dd66634fb95350a4690b01e0690966d957bc642e45277e50366 SHA512 912e899e61151ea4bbd7f857c274216ef229b7ca4f3bcbd326c2991b276c9a2572ce2671088814933af243e7eb77f394654e8b2e254ebe35340b3fc5c7531175
 MISC metadata.xml 342 BLAKE2B 7003d4ae792752fb338346cf2dc5c76e54ea8bf8f3eb4b130bf55e65b7a3faaa64e311737920dacebd6a787d25b96ed71a476faa852d8a37df6397d3bada34f9 SHA512 04787f69a60ae67bdf2db0204bb4f01d968b4ce2cfad97e7ef50e16c9674b6d3016587aee3c08e9c2d35385dfb65c612568a1ffe79b52a858c4849155a25bbae
diff --git a/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild b/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
index 61b5f29e5087..f74391f426f8 100644
--- a/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 DESCRIPTION="Mixer library for MATE Desktop"
diff --git a/media-libs/libmpd/Manifest b/media-libs/libmpd/Manifest
index 3b28720789d3..9a660c451a75 100644
--- a/media-libs/libmpd/Manifest
+++ b/media-libs/libmpd/Manifest
@@ -1,4 +1,4 @@
 AUX libmpd-11.8.17-remove-strndup.patch 439 BLAKE2B 35f5f6efc5233ea61ce7967c52bf69d3aa44814d3506534d4272ef3df454e93e14005cce25b929d066dd4e4d1c1c28a08e7d6b59c490c1926e46fa61d1bf8511 SHA512 0b0c3b28abd7aaf540d6133ad5a72f5e0fc2cca593bc870106c17d9b1828a2bb35880436a489261ef1c56bbb176e0809d6f09165108bf867f776902cd5757fff
 DIST libmpd-11.8.17.tar.gz 365015 BLAKE2B ed6afc3a90fa8a6b6e53ecfd67d195133a6bbecf4ddb3960247b5b2944624f0851d73229145a2ccb7eb3ca84b1d3a245dd3cc1de39f3bd9d5bd21f58f6576e18 SHA512 ffe2880834a4a39745a5327d628781e16eeb8cd1ec17402dda46ad96ff402bc0d8b4312ba058a39242ad9bb8c3a0bb6feb2c5ea2a30ef9be97652fdb5c02572d
-EBUILD libmpd-11.8.17-r1.ebuild 837 BLAKE2B f8a57e6ec0a77c30c8b98b278a48549c17f7f43acedf45238452166e9aac31c21c823c923deb594b88df4afb2941356378171bd2d54b90981ccbf15502f3aa5a SHA512 9318f49b24ba571539193b63e13bd1bcf67652d14c22220eb4e881b64bfbd0cfa2caf2b42608417d7a07406d27343bcbb7b05f8be3261022daf01d7f9ef2126e
+EBUILD libmpd-11.8.17-r1.ebuild 844 BLAKE2B 12acd45448b7c7c39cda5612d2308d71b998fefa2af2e2414424a19d7eaea5ff5322ca121a79e7272d3c6c2efde62922bc8e101505e8da3e50b68cd013a7e4cc SHA512 38da6a33c95b0cbaf7b070898b72090aefcd1d0fd78833f44211a1ad8bf949ba8b3f06700cbdc46afe2d1610ab3ec812d002468565d9019e918900c1ef3c31aa
 MISC metadata.xml 252 BLAKE2B 648cca48f0a3b65ded6fd96d45d3f23cfae98bfa6b5f683383f1f49eedf763f99e034958d5a91ef3bf0904304eb7fa78dd7a582cf337762df4bd59c1eeaafb4e SHA512 cff6482e227806ef72806b8b925a4f5a3dfb87c26007a4614e1891524f18fb33c49d4d774d824676b02664d2703d8d8e8605e2f15983346868f4ba49405b75c4
diff --git a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
index 896019b910a0..b55583c788e2 100644
--- a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
+++ b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 0d35d14bbf31..1cda7a6a8cdc 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,3 +1,5 @@
 DIST libmpdclient-2.19.tar.xz 69144 BLAKE2B c045c4847d43f166a3e1549654784bd994fa4156e3ecebf7c02a412b34ca150940f3c43cdc385839cd7c281bd4ed4fd1935b757d8505133d146ea955ec2d0832 SHA512 5d67b95d4b615bc750641f6d5a0240122e8f59c66108838a96bd4bc5cdda8b15288ad03d0e35d92d6e562e67c600f68aad643ca541092121074952a1bc5b3590
+DIST libmpdclient-2.20.tar.xz 71552 BLAKE2B d80c343d7655ccddb253275694d40665d286bf9c59729d0c836c927ab479b1ab4819f36a69c62a29c3ad220fcbfa712da5418cf8c3cc9f9e24af4e3c39ce1e11 SHA512 3271c8eae017402976dbfabc51c7cb8d39912c8a3fd6cd075adc978d490f2eb850d86ccec9f7bccbda48c9d6ca1cda89918ac7c76b21f7f63ca1a276b67e94b6
 EBUILD libmpdclient-2.19.ebuild 1023 BLAKE2B 441e2a801eba069a9eaa33fbf6b1a0a679db0a71cd4b7571b738bb81c8e8b9142558842017f6d8f159ae63b4f7df8da33ba42a66ee802a8ee6096d0bd5496a55 SHA512 c588eb4d9d994d3ed75787d11d264a65df287562f2c226b19e1a03ccd8edad22ecf8ce0f98b2bb94eb6116e8039bf40c2add2d1c8f0b86151bd47bcac557dd0e
+EBUILD libmpdclient-2.20.ebuild 1028 BLAKE2B 83356d8ac5c4daab8bf40576dc6cf251189c8b3d00a52af49200ac341a6ac32266d4d03fb9b7777c5fcf92beea6997813c76896453dc8ca121208ec1b52ada25 SHA512 b254ee705b8e98ca556360d09f89f67b4da3d1e767c09258b96ab48802a692ca507ea803fb65e34dd27393c8a7659593f29e4f6de00f56368a9ac9bdb9815914
 MISC metadata.xml 349 BLAKE2B d4d0ea2f19d76de587387907f676073a9c162d1bfb19543a3b5ab9f8beebc68c790cd64027a897da33d1a73925c11b5ed63f9d8f1ae53394a61922311aba7e79 SHA512 7e1aace7ae0668b1855ec46371320e98fce2a7f4719847e7fb1675ae9ecb54bd6006d699f3fd6bbccd4e2789512493fac310e104b84f77efcbb080cdf9de7129
diff --git a/media-libs/libmpdclient/libmpdclient-2.20.ebuild b/media-libs/libmpdclient/libmpdclient-2.20.ebuild
new file mode 100644
index 000000000000..dbea91ce11a1
--- /dev/null
+++ b/media-libs/libmpdclient/libmpdclient-2.20.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Library for interfacing Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="test? ( dev-libs/check )"
+
+src_prepare() {
+	default
+
+	sed -e "s:@top_srcdir@:.:" -i doc/doxygen.conf.in || die
+
+	# meson doesn't support setting docdir
+	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+		-e "/^install_data(/s/'COPYING', //" \
+		-i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=$(usex doc true false)
+		-Dtest=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use examples && dodoc src/example.c
+}
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index b4c559dcb85c..38e04f898af3 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.12+release.autotools.tar.gz 1477744 BLAKE2B 1c3cb1424cba334ca9aa7adb0be19308551c51dec9b4bb4657be93f76c01804f15f9a98a4568c48a6c6d0ab44058c72e8ad1b60402f9542c580197b761933fe3 SHA512 e22a79737a825a5753429271bba7af94fd195fb0ff770a3e2091b941c3856bbad770eeeb88cd86d37e01b0138e820199d3650f55546f2e33bb2e99b1b14d9925
-EBUILD libopenmpt-0.5.12.ebuild 1539 BLAKE2B 55b4bd27473b615348ca62bc4c3739e4e7026f7e131c3b556ecfb36755b87c7b5214921440868e7a3f799858201907ba078d354869a241084f7b417d8b3ea927 SHA512 31689e5b8ccef179944e31e1f0ffb913c2659a33580c131ca348b15a68556feb9405dd25b8864d0bd0566e45b26fc4d3c8c1bc1caad7097c4d2b8bfe534d2462
+DIST libopenmpt-0.5.13+release.autotools.tar.gz 1479605 BLAKE2B dd8abffb89950e14843a19d8f8066b052a773a1ca8f441c5fd02b191886d605db693dc861ddc7d9d50979231554aea2e76b82d74d35f92a6218a6d1b3fc4c5b8 SHA512 5ddf293755ca9696acaeaf2130a38dece3bba9a45519e1d4b61b594b2e014e67e6f3f79f55d54e7cc2528b9e40feac6d36bbe78788b6f2a1888f89c090872242
+EBUILD libopenmpt-0.5.13.ebuild 1546 BLAKE2B 681d53024b675898c28c08ffd1541380fbc375b09c70cbb41e724d27fa76608f496c2ffaf164663ff01ea9243b65616ab191d93328812b24b3c18121d165c082 SHA512 1e0eedabe9d82f5493c590d3262f2fc61ae0ed402d90743101e6a07674134f725223d5573f729e2a411c3aa7eebbf013c98442fe808af443e5c9d11f9ad63d86
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-libs/libopenmpt/libopenmpt-0.5.12.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.13.ebuild
index 0e4a4efa3c62..ecc623d23085 100644
--- a/media-libs/libopenmpt/libopenmpt-0.5.12.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.13.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib-minimal
 
@@ -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 ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="examples mp3 ogg static-libs test vorbis zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index b35dcd3e46b0..84e75c7c0938 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -1,5 +1,7 @@
 DIST libopenshot-audio-0.2.0.tar.gz 1711504 BLAKE2B 144502ac7074039861b16309fdf7d79b4846f4fdc7e4e14cf8e96456bf974b82af289e37454b6a93fd393d5faaf46e2685851ecd867bd5bef8df9f798a00cbc2 SHA512 c014a619f32283a8482e0df9224785610a9563073fbd98378367f28f713afa1dc9873d212a40352d3c96040004344f16084e5fe30e4cf64c57309f96e66068c1
 DIST libopenshot-audio-0.2.1.tar.gz 1808335 BLAKE2B bde891328991050497f284b1ac9367c2102af9ec224fe0fb36db8bd80432aa86f5d189e74a9e1b3cfb3f8f1385c9b0a07f484210463e17f1e5b698b88d043dce SHA512 2d9182f6e25df188a4502cea331de15363e4fa013e7f6d173602326cce60530d317300682d057bf03c7af6fbdc930a76226c3c5b135ef040145c0c997bc394d6
+DIST libopenshot-audio-0.2.2.tar.gz 1808059 BLAKE2B fcf242bdd678d2e79e2775f3aff7507520a4e8b9ddc7696e1506beca0c1f8e0687d66dfa35a31748e2e622def6e1c22c160e9424c1c27527854ebcafc24413ca SHA512 9960c6225dd9b843d18134e851761bf12861220a2c63970055bc73d554725e56abd6d35339f7490b672faaf0699f58e3701ff8a966ab07af3264325a9d0dc472
 EBUILD libopenshot-audio-0.2.0.ebuild 554 BLAKE2B f5937c1896b69a32caf3425729513b3cb1525ef548166d042079901ed9ad8efd5e944a04b3b3ff580ec9b870acb4fe350201940e0615beccfd35873df4fefb2f SHA512 81d0b3ad6148f22111b9aaf709a59d6d9e8425e8526406869aa2b3c1162bfbdc723ddf146f2cf9f93ff94d61f6c0b03f4d2c4def5a73a0cf7aefebeb7f3e2bd1
 EBUILD libopenshot-audio-0.2.1.ebuild 553 BLAKE2B 746ed76cf3aedb2a64af91a95ee32c949aaead30b99f7794097e28825e5feb5ddcbd26745337a1f07dd109640f77143cc36e85276d33730eba4899bc2eee5d76 SHA512 f6fd578f07f9a7b2538ef500d8a3028be27955a8d91c7e05362cd9990cf07f6ec0171b7da3e292dc2e3ebe13d6fb5a825d6b93f322f172d462049d6bb7f8f639
+EBUILD libopenshot-audio-0.2.2.ebuild 553 BLAKE2B 1e88387f414a281ed507574dc95cc109bc24e15ed7429f970ce6d95d1273fb281ea0fc7b01239a9d6681bdf1ac5af51feccd0c912863813f78f68cf12d526af6 SHA512 f4e7c0f6ceb7c1b5822d55b5e8b05ca500d1584dd1a1d1f155ee152e5fb0322d3714956dfad840f3b208ae6125bd2875183dc8540910413d16e2db9da07aae47
 MISC metadata.xml 533 BLAKE2B 513039af39245d270280ce0c22f048c1a005a09f8ee29761123da25e6f1df0204cbf52784523ef388bd034c91167956686c912e975d5a2c9b400f2239e588e66 SHA512 a564455b0816ef467e8e85c4b38d47a2ca6337b5a92e1d1a918f53dc8f1c87105e8e7b468df51ef5a079b00de3feee78457b4b4f5d94c28847ecb08be32578a8
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild
new file mode 100644
index 000000000000..d3de3e1956dc
--- /dev/null
+++ b/media-libs/libopenshot-audio/libopenshot-audio-0.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for audio editing and playback used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/8"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/alsa-lib
+	media-libs/freetype
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}"
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 5dadfaa44947..c6cd9878359a 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -2,6 +2,8 @@ AUX libopenshot-0.2.5-gcc10.patch 2605 BLAKE2B 34967db6b59816738e7895f8c608603ea
 AUX libopenshot-0.2.5-no-hwaccel-testfix.patch 1691 BLAKE2B a587449964691bfd2940507f4a1d0b74342c0225bbe7b0a7620044603e0baffde73e7d71f6ca2ffa1ae7748e461ce661a86f11dd0b347a8c55eb07d19d7db75b SHA512 807c77c87a011e12e0a3c8696cbe83b4a6aea9c0770c5ac5194b4c3a6457e772795ca6ae309fdbbb458fefaaa03c7b930084e686e680b23e881f56a21493f85d
 DIST libopenshot-0.2.5.tar.gz 10295768 BLAKE2B 19205c4f02d8b863b48e920164302853c7a505893783161e6a146e7a9728cefa19d4e48bc82b862e920967f110988ac28f5f495912efabbbacc98f55ebb51856 SHA512 b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
 DIST libopenshot-0.2.6.tar.gz 22472140 BLAKE2B 7ad35cfb927e637c4ded38de751f3f484ab6f051a2eea15153dcf4a66a378023883e76ffde361725a2285018741765fece01a60443421d95a8a772065d9de199 SHA512 13706733280e8c70638a02ad220e6a84f3d26a5a35f5f8f1b820408236aeda8bd8683e19a85a0d466007a1d711ca31bb436f8d4ca4fb6ffbfe169b2976dea525
+DIST libopenshot-0.2.7.tar.gz 22472544 BLAKE2B 511ed214f0ecc43294a787e1c0119f036e274a1e8d051cb6e926bf7a9b5cea416325a2e051fca758d1f80ec2b9d746a4dd268e5ac5322fe8539fa2041a8c4d9d SHA512 71cb0e4010d8f3ff453486c3da3c7019c6569066845dcc58f438049a08b1c8663f31c29a728ce5461e9d3a1ca550038b757d4528e62a26eeb45ecbe600353988
 EBUILD libopenshot-0.2.5-r1.ebuild 2358 BLAKE2B 15048bc7befc3b2a4136af3b87ca1a59fc93f334ac1911c23ca054f523f90cc1fe0e21ec4db0d360f499e1b2b1fbad37345067a4bd1f97b52f75ba9ec5844d99 SHA512 ac7ad11b69bdbef10dc337a3a42a35ba119c289dd54b6a8c906db39cebd5c5458d18a3482e0945d6fa734ebe023a781b578e4ef8065c2f609409bd855dc0e4bf
 EBUILD libopenshot-0.2.6.ebuild 2477 BLAKE2B f2f81ec6736311d9b2e341d5322482cd6809105284cd225efed5fdf370f6afbdb35b771f66be239d13dd4c5e28a8e4c5fdd22e525ff551163ce9a01d0fdab4fb SHA512 2730faadf66448b29c8d999a478d22e5a6607a12d7cc355f0b18103d94f2c55ca678da5c40e7d95e4892403481241adc7d0607f0949c3209373c04123ce26207
+EBUILD libopenshot-0.2.7.ebuild 2477 BLAKE2B 6b4230fa798bfa36133b991138a6abf2dacb8eda02b188a3caac28ec7700954509bd73dafa160afcfae1ec7020091ea8572c5e2deed7782977749402d4e01159 SHA512 39fcaf9394c74b7341ece8ac7d6b158dc65d62eb731903793995990820eebf8b06941b08b862ee27be22828c6d6c05588ccb799250acf1bdc0eab774bf3626bb
 MISC metadata.xml 616 BLAKE2B de66c4287ffe372cf76e3b48be340b0c981595f2381f8b248de88586cf9cad05b0a9cfc6465b55832db2bc76a5755ad5692494f5f2dc1dc9ee8a569887d50b34 SHA512 b2569b3545ef8a08ae3bc4b1307ee4414c82d488dea41efd4c3c977f2bcde65df273dc8f9aa44ba09abfc3a2fc19c8d83a3dd61faabddabe07bdb8c37f963c46
diff --git a/media-libs/libopenshot/libopenshot-0.2.7.ebuild b/media-libs/libopenshot/libopenshot-0.2.7.ebuild
new file mode 100644
index 000000000000..45cad1c947ad
--- /dev/null
+++ b/media-libs/libopenshot/libopenshot-0.2.7.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit cmake python-single-r1 toolchain-funcs
+
+DESCRIPTION="Video editing library used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/21"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +imagemagick +opencv +python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/jsoncpp:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	>=media-libs/libopenshot-audio-0.2.1:0=
+	media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora,vorbis]
+	net-libs/cppzmq
+	net-libs/zeromq
+	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
+	opencv? ( >=media-libs/opencv-4.5.2:=[contrib,contribdnn] )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )
+	test? (
+		dev-cpp/catch:0
+		dev-libs/unittest++
+	)"
+
+check_compiler() {
+	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
+		eerror "${P} requires a compiler with OpenMP support. Your current"
+		eerror "compiler does not support it. If you use gcc, you can"
+		eerror "re-emerge it with the 'openmp' use flag enabled."
+		die "The current compiler does not support OpenMP"
+	fi
+}
+
+pkg_pretend() {
+	check_compiler
+}
+
+pkg_setup() {
+	check_compiler
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# https://github.com/OpenShot/libopenshot/issues/17
+	use test || cmake_comment_add_subdirectory tests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_BUNDLED_JSONCPP=ON
+		-DENABLE_MAGICK=$(usex imagemagick)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_RUBY=OFF # TODO: add ruby support
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_TESTS=$(usex test)
+		-DUSE_SYSTEM_JSONCPP=ON
+		$(cmake_use_find_package imagemagick ImageMagick)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_build doc
+}
+
+src_test() {
+	cmake_build test
+}
+
+src_install() {
+	local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
+	use examples && DOCS+=( examples/ )
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+	cmake_src_install
+	use python && python_optimize
+}
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 1998e0d02bb7..d72521d0b357 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -7,6 +7,6 @@ DIST libplacebo-v3.120.3.tar.gz 523749 BLAKE2B 6192570dba8de6e0bb98ccf3f0e4f13c0
 EBUILD libplacebo-2.43.0.ebuild 1462 BLAKE2B f040787c2e5848e5be23c77af1af76e68e2ac0e85bd178e00621e6c9fde8a69b01ba681e350d3d783a5812188ede1ea58e209be899b7a6b19c876fc7f5822118 SHA512 990a0551961a89f335e437ce984ffc0047816d655a7ba6be8202c6d791b840840aba63352ff6fd2af5d4cc41a36eb7ace63e51bb03019621768602154c5486b8
 EBUILD libplacebo-2.43.1.ebuild 1478 BLAKE2B 5184f42cdda1740d9b2fb33e05406517d076ad7d557da6c74b580200863fdc340cf208f716da38b172a4f06f9fb74fcc461afcd25ac886a10b398816f96f0689 SHA512 bddeac21c3635c87c7079477c02df39586e6a9604ac65a69b12714bbcf72373b1a9999a3b8bd1cdccff4f42a2c1c62757714162a97cc381419a481626834114d
 EBUILD libplacebo-2.72.2.ebuild 1854 BLAKE2B 707afa5008705ac6e26a4773b8af28e774ce1d43c3d5c6490d51ca01cec05b034dc0429dbb82a5bd14c7fad05e6633031bac645464afa29edf093d444368448f SHA512 3e2c29c2a24db7cdfa43c38c71e399774886359adfaa52ac8988334a3844c6ee519248a945ba9ebd39a93c045d4e3e8cd9e139b37fc299ca93ed3828587ad842
-EBUILD libplacebo-3.120.3.ebuild 1785 BLAKE2B d8b2f28674fe881a2c7e7ef9509146fc1ca004af2416dc40196a692505e910cf0f7ef8bbaa6643e1be2ea7e17af9e5e137a46eebe2794ff4ab34bfd72c5d0737 SHA512 92bb395234eb9cfac4954709ba1ea6b4e923b911a646c9cb399740d752af0f0b70fca1b9a94d3ccd2532385a24e008fca0073aaf0b5770a797d636a01f000b36
+EBUILD libplacebo-3.120.3.ebuild 2031 BLAKE2B e3baa1ed9a8ab3baa5e1577687030c289b9afe4c7cc244be59ca6e9c13848ae341838a1687fe5f357c668be5325ef4e48c6a801a58036183ef8c44619e510570 SHA512 9196702b9c256a7a1530d0e7a9bf9b64837fe7a37cc43efcd2625f06ae126549eecebfeba843174feea463fc8e1fb5f06855bffd1519cb74c63e621d3288e333
 EBUILD libplacebo-9999.ebuild 1820 BLAKE2B 7c8d8ca524b7b621e82ab66f9c303d09dfeb8371c1dcdde8101799026ff24e339a38b983fd6372caa3911fa7786c05008cb5d3e5a092323b5cefe640132b8c9c SHA512 590c110adbefe8362b9fb19a1ec148927d261d347ee5f0cb8c70fd2156b6d7eb85263e4c96255f6894463aa21cc97d455e914e7f5fc53455a4a4ddb2821ebf9d
 MISC metadata.xml 600 BLAKE2B 64be4c9fc7d6f967c7439d374ab5a8cb499066d9a6216ee14161db98359e69d6cfe4a57eafc18ac3f7e414234d4987ef0cb812e01552810ea4c6f29e06e42498 SHA512 2b62cdec3e8ca9ddc669cd0dad10888ec394dba889f4547b81e8a48603ae3657828f4d62a6aa45d3f8bf53c360b0870c76b259e93f0242c0d332e978091bd5b4
diff --git a/media-libs/libplacebo/libplacebo-3.120.3.ebuild b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
index 3fac521ec400..61eab11b1f73 100644
--- a/media-libs/libplacebo/libplacebo-3.120.3.ebuild
+++ b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
@@ -60,6 +60,10 @@ multilib_src_configure() {
 		$(meson_use test tests)
 		# hard-code path from dev-util/vulkan-headers
 		-Dvulkan-registry=/usr/share/vulkan/registry/vk.xml
+		-Ddemos=false
+		# ^ useless, and also semi-broken
+		# (well, actually, looks like it requires some new just-for-demos deps and even with versions restrictions (say, >=glfw-3.3))
+		# feel free to patch if you need demos for some strange reason.
 	)
 	meson_src_configure
 }
diff --git a/media-libs/libpng-compat/Manifest b/media-libs/libpng-compat/Manifest
index 7fbb17575e40..b6cfe9e42ec4 100644
--- a/media-libs/libpng-compat/Manifest
+++ b/media-libs/libpng-compat/Manifest
@@ -1,6 +1,5 @@
 DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
-DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
 DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
 EBUILD libpng-compat-1.2.59.ebuild 900 BLAKE2B f0cdaf25bd129a47fe60229973497b3d45d772eaefc6eac9406947d0acd72969e49bb9cfaf838a4798a9ca4edb00ff612c805a1e8b563ba99ed08a5b4c1ac6e7 SHA512 810dc61ed8cf6e17e6be2e3b3f9c4f8232dce3c20a32f7680a641f09b28e188130158a95f147405aafb9e164c43a44608c79d604517c022c5e3bbd59044d33e4
-EBUILD libpng-compat-1.5.30.ebuild 1873 BLAKE2B c2b9486cf1be90c256ff9de888e7dd487052c402812a84362eb8ede37b89ae71d3015f9ec098de45ccbf8940060cb0af2fc75c792d3dc8e800643cb7aabfbcfa SHA512 ceb42f3f8d3b88b9ee6f8ac7f3a761c01c0f4bd0ca4244c8ee5d9beaa8c0fb0e7f3d155c8e529e19074aa7747314a1dc8aaf3ef340659a59db3e0511770eab0a
-MISC metadata.xml 846 BLAKE2B f79773555242477ca4de8caf0ad930ba64b44494d7f6e7e6c457d8ff0e95e95823571624cb5b093939eb1e61dffa45f8a89aa9afd9c230bafea40985d0c37916 SHA512 5c09fcaf377b8d3f178ca72156794cedcf83a74fc0dbc7d2c8e929ec56955c18785957d60ae203c04cb479bbdd562d49943ddf184dd69e074186e82d921fefd1
+EBUILD libpng-compat-1.5.30.ebuild 1398 BLAKE2B b6cd70c28ac819f51a7f818e0847b70d66169f8ca5bf1a1fe5a521159a86f47e3768e5aa7e12422839ee8696a67a460bcf6f46508dff63f0479011756fd03ee8 SHA512 94fe6566944b17983f2c4f67b46f0589ee7ec4ef4630d909cd6ec0e7bfe3e8bf20981eefc87e43735f60a43bf7d420723af8eb113d3af527494970816a237d78
+MISC metadata.xml 750 BLAKE2B 4ab8b2f2e0787e4f877dd996e5e2af7d2d630b4c52064892fbfe0a68ce807a03217d4b57e90a5e13f7e41dc33b4bd8c34387e9dc30e87b06eb2c631401cc215c SHA512 1afb7c2085868832cf5b8f5afa309a3704ac941992db806e7b2befe35482e6be6f7e59ea0c0dd220f3db1008c92b489fbe2dd174f5859ec539e6e8e0158c4a73
diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
index 21c669bb96bf..a906a0b68259 100644
--- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
+++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild
@@ -10,14 +10,13 @@ inherit libtool multilib-minimal
 MY_P="libpng-${PV}"
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz
-	apng? ( https://dev.gentoo.org/~polynomial-c/${MY_P}-apng.patch.gz )"
+SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="libpng"
 SLOT="1.5"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng cpu_flags_arm_neon"
+IUSE="cpu_flags_arm_neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	!=media-libs/libpng-1.5*"
@@ -35,14 +34,6 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	if use apng; then
-		# fix windows path in patch file. Please check for each release if this can be removed again.
-		sed 's@scripts\\symbols.def@scripts/symbols.def@' \
-			-i "${WORKDIR}"/${PN/-compat}-*-apng.patch || die
-		eapply "${WORKDIR}"/${PN/-compat}-*-apng.patch
-		# Don't execute symbols check with apng patch wrt #378111
-		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
-	fi
 	elibtoolize
 }
 
diff --git a/media-libs/libpng-compat/metadata.xml b/media-libs/libpng-compat/metadata.xml
index 28e5b3dcd419..5f08da95b1cc 100644
--- a/media-libs/libpng-compat/metadata.xml
+++ b/media-libs/libpng-compat/metadata.xml
@@ -5,16 +5,15 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	<use>
-		<flag name="apng">support unofficial APNG (Animated PNG) spec</flag>
-	</use>
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Codec project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libpng:libpng</remote-id>
 		<remote-id type="sourceforge">libpng</remote-id>
 	</upstream>
 	<slots>
-		<slot name="0">For building against. This is the only slot
-			that provides headers and command line tools.</slot>
 		<slot name="1.2">For binary compatibility, provides libpng12.so.0
 			only.</slot>
 		<slot name="1.5">For binary compatibility, provides libpng15.so.15
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 1474a0c93e11..ad8ed933f78c 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
-MISC metadata.xml 1007 BLAKE2B 22b549fc5a953335a987b781a6552fa595dc611c5579278f7fa2954ef9485c865a78c29ec40c26072f632b847cffc92d39f3489bc998794e34de78e8ca89960f SHA512 dbc1dc9aa0155158cdd7a1cfbe77afbe9fb9cfeecfacce167c5feaa557e66571671f5a40499244f4200af91f051d01038beeefe1fbd34464c8e4fb17755270af
+MISC metadata.xml 721 BLAKE2B 71c9fe0c479b2f8269f6a56f6905afb196424d51ca2327e85fb29892ad028cd213e89737974895ca7f621dfe42af8ac0d75c0c572139b7ae7130771a2e3f3f0c SHA512 298a3989e7e7a57af032aea71795fb31387442411e14405ea99ae84c664644ede2248c8a54c3dfa64fed8917a3b2d8715fcd3c8b8d1d9f253f61ede18da29523
diff --git a/media-libs/libpng/metadata.xml b/media-libs/libpng/metadata.xml
index e798373f1df4..10e62abda656 100644
--- a/media-libs/libpng/metadata.xml
+++ b/media-libs/libpng/metadata.xml
@@ -18,12 +18,6 @@
 		<remote-id type="sourceforge">libpng</remote-id>
 	</upstream>
 	<slots>
-		<slot name="0">For building against. This is the only slot
-			that provides headers and command line tools.</slot>
-		<slot name="1.2">For binary compatibility, provides libpng12.so.0
-			only.</slot>
-		<slot name="1.5">For binary compatibility, provides libpng15.so.15
-			only.</slot>
 		<subslots>Reflect ABI compatibility for libpng.so.</subslots>
 	</slots>
 </pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 42ac9c4b8387..9ed34c15a3cf 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,13 +1,10 @@
-AUX 21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch 1732 BLAKE2B c06e24858e2020fba9ce8e5c633ee36d359666cfb272235309c23e3f207b7437cedfd9b4222c85cf159ed48ff0a8972919529cdfda77b63c044ed44fb5e17ac5 SHA512 eac084ba5c2dfa05c06d6c9fc567f4ac761516206ea8727b4cb058ecff38ed77c333900c3ca73253e7303428706c7b3d2925b8605d633dac58a26659bc7af64b
-DIST mesa-21.1.7.tar.xz 15391776 BLAKE2B a9138f189ef953d5efa4e287fbbe795ef2539c113dc7e0f565d3f35dcfaa59ab08674bf37fda196ba34e5963637c3ebb133db40b558bd275e29c8387b1acfdfa SHA512 1fd677437f292c30fbf08bfef8c1088557841f426090ccba20ab2a222b08fb5c3ec48a7a0301466e03a23019d09414c700a4f5e299479cacd6972a9f3ba030c8
-DIST mesa-21.1.8.tar.xz 15410504 BLAKE2B 430a1a5f3120bb69b7eaab13438d9a09201f5b11c9d4581d7dd39f48041a1b70d7c125f36553a5c504d1164fe6e0e3d50853c209c4280787f4fa6935ab385b86 SHA512 80fcf2b1d59b49e384e9aa1ae63a3ce709833059af1ffd8eb821054c1976709134098cfc79fac1578a2f08a003223f1c96b38e2e650c5be49821c6f2fe1047af
-DIST mesa-21.2.2.tar.xz 15755212 BLAKE2B a9c0f847d8d372fac076bd1a2a2113f34d4f5f57d5d459f88b2d1a14bd8a2a442d70c2959637ac17836d8be13941c2192bf639f42d3a7eaf7d8cdb5175268389 SHA512 0a4877b405384088c8bdac3031444cd22377d19552c41c08fb8928d6edf23d5f5a237ef1d6c5f96e3293c2e90c63f4702813226b85cb304fe5e01dd2710ba697
 DIST mesa-21.2.5.tar.xz 15829684 BLAKE2B a5d00d6c566e699acd1f8cfcf1b52024c92cfa8a4cc9a6fb1d6493526ea0d65790ed97c47c5c174d4369e589caf1a361351df6d43aba89f818970f87f9a81059 SHA512 aaa1ebaa1e18eea76c3784c9a65942c3e417c1079d7bf75dcede574999dc459fb4d68d041cf2f767afb9cbfa834a985e0a4edd5a56b0fc90f8fdc506359aa5da
-DIST mesa-21.3.0-rc3.tar.xz 16349156 BLAKE2B bc25478b7ee2c6186baf8f8540da7d5a6847146badd37653b65e2d3a47f8a7ae866825058ad54b68563ddb4f8409180ebb7415925409b6f0b401be81a45eca9d SHA512 14c3cdf2085077db3ec6d7e7b66304fccdaf441dfd64cc085d6d83960fcbdaa18a48d8f6bcdc096def06b6d389f51c1a5cb0a6793a236d668e22c592bc8b2e4c
-EBUILD mesa-21.1.7.ebuild 14933 BLAKE2B 9f7e8cc4f522d6a7b1fbd65e2e12010a7c4132cd403674aaef2170af7247a642b1dc61ca14bf4cb1595c6f14ac94f383a602d7320836b6ee5d0d26ef17886951 SHA512 ef20ed369384d62a639045bd60faffecf7583df00fc67ba5aa88df2263d5bb47ea753b21074194f81b7ab051acb8eedbcad09c5508c662dd50ebcc0fc3a75f24
-EBUILD mesa-21.1.8-r1.ebuild 15091 BLAKE2B e0f111b6f15f58ba68745aab2f4a59377ad897117320033968e032507bb01958981968d3a3cf14eb14a6b062d9cdd6aac4bb9f06d0b13f5fa1079349e7196707 SHA512 6f65a1454996469fddbfa0b0c9b3272555c225044feebc6ac78ff5e5fb054130fd5152f64579bba9f577b7f89ca0dc465902da54666ad46ad4268750eeefb252
-EBUILD mesa-21.2.2.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
-EBUILD mesa-21.2.5.ebuild 15218 BLAKE2B 5f930052b34ab6a81bb27776639283c2a80c5f48b1c416ab77fd6d2dc7700bac635cb9dbb986d466a4110cfe7cf17b9cea292403f30916b62c183d3d75d2ae40 SHA512 292b2522eefa556066d7986c881b6bef695e8d55a52ed81fd3be98631e9a8ddde1cfb98c8075cbbcc11c03507cb24351a9a9d8f51bc5445d28834471459bcf79
-EBUILD mesa-21.3.0_rc3.ebuild 15220 BLAKE2B ec66f903dd1b4c63600992de79860c1280c697b9a517d341a1fc0d8edf361e78cdd672d7c12c460bc4fb6c1ca4691dd5f4409af10048086d2f21327ab23d18da SHA512 8ed4b9a18a779e4570c8c070334596051a7835cf465d3e67c539c99f4843930a4190e5f53498bff1f467c6872761bca8caf77b14b7b536b26b052afb614248e2
-EBUILD mesa-9999.ebuild 15220 BLAKE2B ec66f903dd1b4c63600992de79860c1280c697b9a517d341a1fc0d8edf361e78cdd672d7c12c460bc4fb6c1ca4691dd5f4409af10048086d2f21327ab23d18da SHA512 8ed4b9a18a779e4570c8c070334596051a7835cf465d3e67c539c99f4843930a4190e5f53498bff1f467c6872761bca8caf77b14b7b536b26b052afb614248e2
-MISC metadata.xml 1896 BLAKE2B 579a066dd2fa70f2063ff020676fc6a342bc5d04555e4026868f14816a6ff6efb85824a8d689ce4984a1d7fae17548ad8331d209d9bfdb21ef186c895656ff9d SHA512 8c958d7cdd3bfa987683c6b2cb27b6f02d6ef4ddbf7954ec05ed1e5c2a046fbeb49b059e1a6f48d727855c575bd30f04c2898451ae5a02a40370e0bfba93f117
+DIST mesa-21.2.6.tar.xz 15868208 BLAKE2B aaa6447a2f5a472c2ee2b7d6b12effb79d02804684358fd233aa00bda945c66efa3850931cd9114c51ddd492033b9f66372380395540a11fe40229edfe7ee125 SHA512 e65d77e2609cba85bd2cdbd4ba2072729c1556a43defdd24a91e708e3223f84b23657e63a91b16c5729684ea12fe31f45bae88294c572e057f2981a5d6c0f5a0
+DIST mesa-21.3.0.tar.xz 16427424 BLAKE2B d3feac77b61ea724b841b88882569871eb8ff59561fa47b65a2358a0e912cd27f728a226795b23d63232daab6532b9931dd0d2fc8f001a1902dc6b75d474b44e SHA512 b27c0ccf2fc9b96bbece715612cec4f4e267ab25dc5386c3debd2346c385afa0146317c67a3d2eec198dbf5338fb182b458c5fe5567216b265153c0b7b560de1
+DIST mesa-21.3.1.tar.xz 16439988 BLAKE2B 0b6f8bbee2de199a4fedf0e663d5c19f29deeccc4da59327fbf3586a54747e16f12cd1e08a8653e9c86ca25e33db8a4bed86d453c864478a777bedbf937a4474 SHA512 43f019d4810bafd177b1a41207ae20a77982e4e6df3ab2b7a700273748cbc766694bd44594c898c4bd7848a94200fd28237a67d290c4e06595e6eab71cb716e8
+EBUILD mesa-21.2.5.ebuild 15212 BLAKE2B b4153c461e270495b87b56ccd708522216cafcf18635a5d488b011b85db0cd5ead8c908f3e7bc33a5ca21177b634c8adc0bd9da84ae3bee5c76a78b85188c481 SHA512 ae7ff35b6dd713950464d2d501b0ca136be7e3e0900dd3136c3181cf733523543edf87642ddba2e1175c5c6cc2906970f5da82c125b029a22c754031e85fa63f
+EBUILD mesa-21.2.6.ebuild 15220 BLAKE2B ec66f903dd1b4c63600992de79860c1280c697b9a517d341a1fc0d8edf361e78cdd672d7c12c460bc4fb6c1ca4691dd5f4409af10048086d2f21327ab23d18da SHA512 8ed4b9a18a779e4570c8c070334596051a7835cf465d3e67c539c99f4843930a4190e5f53498bff1f467c6872761bca8caf77b14b7b536b26b052afb614248e2
+EBUILD mesa-21.3.0.ebuild 15048 BLAKE2B af0132999074409fcfac5def4b0fafdc9b48351eb7d2e8d8143f91f9fcfab91f2fa2b92262c70adbac702d69a7ab2dbccd06e7ac6ff692aca9837f66df78d098 SHA512 0e443ea1742eac25023926fdbfad190f7f82647fd127ff9c546dd2f13d426749e0f85a3a7b78182428a071ef694c5c30ba5d162f17418cb89542f49e44d9b5cf
+EBUILD mesa-21.3.1.ebuild 15048 BLAKE2B af0132999074409fcfac5def4b0fafdc9b48351eb7d2e8d8143f91f9fcfab91f2fa2b92262c70adbac702d69a7ab2dbccd06e7ac6ff692aca9837f66df78d098 SHA512 0e443ea1742eac25023926fdbfad190f7f82647fd127ff9c546dd2f13d426749e0f85a3a7b78182428a071ef694c5c30ba5d162f17418cb89542f49e44d9b5cf
+EBUILD mesa-9999.ebuild 15069 BLAKE2B e8317832b9f913ef6d91774c3893c1b3b2853d0327bd4ffa4744110ff6acfc7424802e23782f39fa5ddc0cffebc74eaa342491c3f3e4d1569880e35d9e83915d SHA512 ad1c10f729a0b000bd4e59d2c6e70231ef0134b80d172cba6b3dc031ebaa1a56174b968d873244c487f7745f4f49a376a636986813e01fe3592f0791f29fcc7a
+MISC metadata.xml 1848 BLAKE2B d08b83f9a7b14353998d07602583ed2f8c4208b03562a0b1c45fc0d4e1ef40787ed2b37b512557af48f00b08e7ea8db65091cd6c01bdfc6c3e1f497e44268cdb SHA512 2076fd824999959ec819bf7aad9a33fe00419e8ae9f91b9ea70440538f8f2c30d9e934973c80883515479dddd038443257dcf960c566d66421f86898c79fbe94
diff --git a/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch b/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
deleted file mode 100644
index ebbb8abb1fe5..000000000000
--- a/media-libs/mesa/files/21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8de60a1654a875d0b55512a1508f541f706f9b97 Mon Sep 17 00:00:00 2001
-From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
-Date: Sat, 4 Sep 2021 03:32:21 +0200
-Subject: [PATCH] util/fossilize_db: Don't corrupt keys during entry read.
-
-We change the hash that is still used to set entry->key.
-
-Fixes: d2d642cc014 "util/fossilize_db: Only allocate entries after full read."
-Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12725>
----
- src/util/fossilize_db.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
-index e1709a1ff64..26024101b83 100644
---- a/src/util/fossilize_db.c
-+++ b/src/util/fossilize_db.c
-@@ -156,18 +156,18 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx)
-       offset += header->payload_size;
-       parsed_offset = offset;
- 
--      /* Truncate the entry's hash string to a 64bit hash for use with a
--       * 64bit hash table for looking up file offsets.
--       */
--      hash_str[16] = '\0';
--      uint64_t key = strtoull(hash_str, NULL, 16);
--
-       struct foz_db_entry *entry = ralloc(foz_db->mem_ctx,
-                                           struct foz_db_entry);
-       entry->header = *header;
-       entry->file_idx = file_idx;
-       _mesa_sha1_hex_to_sha1(entry->key, hash_str);
- 
-+      /* Truncate the entry's hash string to a 64bit hash for use with a
-+       * 64bit hash table for looking up file offsets.
-+       */
-+      hash_str[16] = '\0';
-+      uint64_t key = strtoull(hash_str, NULL, 16);
-+
-       entry->offset = cache_offset;
- 
-       _mesa_hash_table_u64_insert(foz_db->index_db, key, entry);
--- 
-2.32.0
-
diff --git a/media-libs/mesa/mesa-21.1.7.ebuild b/media-libs/mesa/mesa-21.1.7.ebuild
deleted file mode 100644
index 60dbbe0f7065..000000000000
--- a/media-libs/mesa/mesa-21.1.7.ebuild
+++ /dev/null
@@ -1,556 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	osmesa? ( gallium )
-	vulkan? ( dri3
-			  video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="12"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-		sys-devel/llvm:10[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable -- swrast
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	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
-		$(meson_feature dri3)
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--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.2.5.ebuild b/media-libs/mesa/mesa-21.2.5.ebuild
index 7a21ad22d7db..922ef8bc5f58 100644
--- a/media-libs/mesa/mesa-21.2.5.ebuild
+++ b/media-libs/mesa/mesa-21.2.5.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-21.3.0_rc3.ebuild b/media-libs/mesa/mesa-21.2.6.ebuild
index 5829adce48f2..5829adce48f2 100644
--- a/media-libs/mesa/mesa-21.3.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-21.2.6.ebuild
diff --git a/media-libs/mesa/mesa-21.2.2.ebuild b/media-libs/mesa/mesa-21.3.0.ebuild
index e3fd921bbaa0..47b93133f0dc 100644
--- a/media-libs/mesa/mesa-21.2.2.ebuild
+++ b/media-libs/mesa/mesa-21.3.0.ebuild
@@ -27,24 +27,22 @@ RESTRICT="
 "
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+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 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+	+classic cpu_flags_x86_sse2 d3d9 debug +gallium 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 ) )
@@ -63,7 +61,7 @@ REQUIRED_USE="
 	video_cards_v3d? ( gallium )
 	video_cards_vc4? ( gallium )
 	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
+	video_cards_vivante? ( gallium )
 	video_cards_vmware? ( gallium )
 	xa? ( X )
 	xvmc? ( X )
@@ -139,9 +137,10 @@ 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="12"
+LLVM_MAX_SLOT="13"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:13[${MULTILIB_USEDEP}]
 		sys-devel/llvm:12[${MULTILIB_USEDEP}]
 		sys-devel/llvm:11[${MULTILIB_USEDEP}]
 	)
@@ -253,11 +252,12 @@ llvm_check_deps() {
 
 pkg_pretend() {
 	if use vulkan; then
-		if ! use video_cards_i965 &&
+		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 i965, iris, radeonsi, or v3d"
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
 		fi
 	fi
 
@@ -381,12 +381,6 @@ multilib_src_configure() {
 	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)
@@ -466,6 +460,7 @@ multilib_src_configure() {
 			fi
 		fi
 
+		gallium_enable video_cards_crocus crocus
 		gallium_enable video_cards_iris iris
 
 		gallium_enable video_cards_r300 r300
@@ -486,6 +481,7 @@ multilib_src_configure() {
 	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
@@ -507,13 +503,17 @@ multilib_src_configure() {
 		-Dglx=$(usex X dri disabled)
 		-Dshared-glapi=enabled
 		-Ddri3=enabled
-		$(meson_feature egl)
-		$(meson_feature gbm)
+		-Degl=true
+		-Dgbm=true
+		-Dglvnd=true
 		$(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[*]}")
diff --git a/media-libs/mesa/mesa-21.1.8-r1.ebuild b/media-libs/mesa/mesa-21.3.1.ebuild
index 636dda43bd7e..47b93133f0dc 100644
--- a/media-libs/mesa/mesa-21.1.8-r1.ebuild
+++ b/media-libs/mesa/mesa-21.3.1.ebuild
@@ -3,12 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit llvm meson-multilib python-any-r1 linux-info
 
-OPENGL_DIR="xorg-x11"
-
 MY_P="${P/_/-}"
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -29,25 +27,22 @@ RESTRICT="
 "
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+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 +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+	+classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
 	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
 	vulkan-overlay wayland +X xa xvmc zink +zstd"
 
 REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
+	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
 	osmesa? ( gallium )
-	vulkan? ( dri3
-			  video_cards_radeonsi? ( llvm ) )
+	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 ) )
@@ -66,14 +61,14 @@ REQUIRED_USE="
 	video_cards_v3d? ( gallium )
 	video_cards_vc4? ( gallium )
 	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
+	video_cards_vivante? ( gallium )
 	video_cards_vmware? ( gallium )
 	xa? ( X )
 	xvmc? ( X )
 	zink? ( gallium vulkan )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
+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}]
@@ -142,12 +137,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="12"
+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:10[${MULTILIB_USEDEP}]
 	)
 	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
@@ -229,10 +224,6 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PV}-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch
-)
-
 S="${WORKDIR}/${MY_P}"
 EGIT_CHECKOUT_DIR=${S}
 
@@ -261,11 +252,12 @@ llvm_check_deps() {
 
 pkg_pretend() {
 	if use vulkan; then
-		if ! use video_cards_i965 &&
+		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 i965, iris, radeonsi, or v3d"
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
 		fi
 	fi
 
@@ -389,12 +381,6 @@ multilib_src_configure() {
 	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)
@@ -474,6 +460,7 @@ multilib_src_configure() {
 			fi
 		fi
 
+		gallium_enable video_cards_crocus crocus
 		gallium_enable video_cards_iris iris
 
 		gallium_enable video_cards_r300 r300
@@ -494,6 +481,7 @@ multilib_src_configure() {
 	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
@@ -514,16 +502,19 @@ multilib_src_configure() {
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
 		-Dshared-glapi=enabled
-		$(meson_feature dri3)
-		$(meson_feature egl)
-		$(meson_feature gbm)
+		-Ddri3=enabled
+		-Degl=true
+		-Dgbm=true
+		-Dglvnd=true
 		$(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 false)
+		-Dvalgrind=$(usex valgrind auto disabled)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
 		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5829adce48f2..d200a650255d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -33,18 +33,15 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+	+classic cpu_flags_x86_sse2 d3d9 debug +gallium 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 )
+	d3d9?   ( gallium || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
 	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 )
@@ -64,14 +61,14 @@ REQUIRED_USE="
 	video_cards_v3d? ( gallium )
 	video_cards_vc4? ( gallium )
 	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
+	video_cards_vivante? ( gallium )
 	video_cards_vmware? ( gallium )
 	xa? ( X )
 	xvmc? ( X )
 	zink? ( gallium vulkan )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
 RDEPEND="
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
@@ -104,7 +101,6 @@ RDEPEND="
 	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? (
@@ -210,6 +206,7 @@ unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
 
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.24 )
 	X? (
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-base/xorg-proto
@@ -384,12 +381,6 @@ multilib_src_configure() {
 	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)
@@ -512,8 +503,9 @@ multilib_src_configure() {
 		-Dglx=$(usex X dri disabled)
 		-Dshared-glapi=enabled
 		-Ddri3=enabled
-		$(meson_feature egl)
-		$(meson_feature gbm)
+		-Degl=true
+		-Dgbm=true
+		-Dglvnd=true
 		$(meson_feature gles1)
 		$(meson_feature gles2)
 		$(meson_use osmesa)
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index f94241f238a4..2b18aba1b084 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="classic">Build drivers based on the classic architecture.</flag>
 		<flag name="d3d9">Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
-		<flag name="dri3">Enable DRI3 support.</flag>
 		<flag name="egl">Enable EGL support.</flag>
 		<flag name="gallium">Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
 		<flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag>
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 2bf1e82f4d43..5b8621581f15 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,11 +1,6 @@
 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-6.26.1-fix-crash-w-ogg-album-art.patch 2476 BLAKE2B f11ae9637e014313499691431863cffd4b87aa9ee06b21a557b63cef3166d73b977acb9818267b0b21335929aa72c2444ec52b935faffe44e31f043cc2fc6acc SHA512 0961298be7798af4a4618224ed9b7d36d3ab0e5f976d087c01c455fce3220e282e03bef53cdb7532ff84ca64fab1d23cb1c4c2179c85d0a1475f4597ac963426
 AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f
-DIST mlt-6.26.1.tar.gz 1366022 BLAKE2B f5b7e733090ae60cb55556893775ab4a68847705e215b85c90d901d72022f5b57c08122cd8c08c1ba51b71eedc5341adaaad2ad002af76724a2d2cf6a7379974 SHA512 6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
-DIST mlt-7.0.1.tar.gz 1181298 BLAKE2B 90547ebeeb90b5ab20ec39e3fa97454e9c502af08981f20e433deafc5bbbb45caeea485c18b4229821fcdcef2ed7767e8936af273200a233f18251fa8bc73dd0 SHA512 9268889f0fbe69180651a592ac0b328d18f8b60c7d83f9d6c506dc21254afcb2281662f4d19faf3520976ae100600d00cd6eb2aa42c83880fa4c4c36e760c68a
 DIST mlt-7.2.0.tar.gz 1203489 BLAKE2B 2b53a813146f4868469c945208b4e7b509f67667357df615954a7d0f02ebe809dba0c15acd302f9a8609978929d00dd1e20fb03fc5d29a7dd5196253f37f70b7 SHA512 cee8d6cef2db5aae5747a80a292eca29d25adedd7754ea88a1857b429c0ccd35f689bcd9381c069c0e9e04b9eae5b7301e7c9548c536b43e4a9d54af664d629f
-EBUILD mlt-6.26.1-r1.ebuild 5389 BLAKE2B ba0720dcd769ea0dea32028acf4593854ec8ca21484e93141c908896085cd425f616ec70df73d9a62954ff99270fe41aa01d90b7b47cbebcdf615b4b53baf9f1 SHA512 4dd20f542553eb3e81dc944a0856efbe67a045881b7c38f0296a19ececa198d0508dda6c583835b2c5ed60a95fd0caf2e269086eaab3b1974decc310019e3d0e
-EBUILD mlt-7.0.1-r2.ebuild 3674 BLAKE2B 2dd9a40cef8ce16a5aa18851a6de79dd9e3ddd7180fda3f91e61e2df99cbd8171ab6f00185db04a99218225573c897adee3eeb53def52f1caca7e1417d481d34 SHA512 16333514c46b9f95a29fc83adf1cd9c3b614a87c001c283563ec979577990fd500206e2f29d10975b1bf273d7be728ef2ad036220323fac4636f2682a7cbb0bf
-EBUILD mlt-7.2.0.ebuild 3658 BLAKE2B 2c9bdca2fc5dfc34c1cf4a5531f9d6f3528d4983df462a16c4c601d3c85d847802d4045839d008e9888e5ee854005b89b26563e283f7c15033233faf1ad3d2d4 SHA512 d6aa64ccb3cc766c1d77342b7d6c8bc16fb8e53ee1d0b766a2999a4581d841f32b2036c32d083587d80d45eb9c60b924b6be3e42b962d926a2e5f9f3cf0006b6
-MISC metadata.xml 1537 BLAKE2B aadfa5445dbf5909835b5d49aee48ca802e601d67a080d9048a3b48c283681c52219ea9ddddc7a7f740e9543dee0eda980d152a1301137c589067d2099a3d14f SHA512 e1f4f1c0703aa0b896856f275c88363aeee35eb371471122893c6edd36abdb6dd8d557c813f1da72e2c51a7af7aa367757fcf7c356225800201ed2866777d6b9
+EBUILD mlt-7.2.0-r1.ebuild 3602 BLAKE2B 9d2bda7f53b8224bb837fc166e629ee187d5736ecbae7ca1e26ff8c98620c04f5a4a4f1cb798d772fec7f06dcb54e8919969df653020414749294208c73abf01 SHA512 f4600a86f66e0a1ea4a667fc13907ebc88fe03238b2f0211ec442bac3fccab546e8cf190427d8714b5e4be58c863cd8ff76bfdd1fc7614330468f467f2e38b03
+MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd
diff --git a/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch b/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch
deleted file mode 100644
index 4ad7ff5de416..000000000000
--- a/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7063e88e09977282470c4f2f93e56e05f21b7c2b Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Fri, 16 Apr 2021 11:15:37 -0700
-Subject: [PATCH] fix #704 by properly identifying cover art
-
-(cherry picked from commit 6b0829df726aa9a840b8b34e923e9faf17a3a5ca)
----
- src/modules/avformat/producer_avformat.c | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
-index 049452f9d..e079e6f70 100644
---- a/src/modules/avformat/producer_avformat.c
-+++ b/src/modules/avformat/producer_avformat.c
-@@ -398,10 +398,7 @@ static mlt_properties find_default_streams( producer_avformat self )
- 				if ( first_video_index < 0 )
- 					first_video_index = i;
- 				// Only set the video stream if not album art
--				if (self->video_index < 0 &&
--						(codec_params->codec_id != AV_CODEC_ID_MJPEG ||
--						 codec_context->time_base.num != 1 ||
--						 codec_context->time_base.den != 90000)) {
-+				if (self->video_index < 0 && !(context->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC)) {
- 					self->video_index = i;
- 				}
- 				mlt_properties_set( meta_media, key, "video" );
-@@ -1682,11 +1679,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
- 	codec_params = stream->codecpar;
- 
- 	// Always use the image cache for album art.
--	int is_album_art = ((codec_context->codec_id == AV_CODEC_ID_MJPEG
--		|| codec_context->codec_id == AV_CODEC_ID_GIF
--		|| codec_context->codec_id == AV_CODEC_ID_PNG)
--		&& mlt_properties_get_int(properties, "meta.media.frame_rate_num") == 90000
--		&& mlt_properties_get_int(properties, "meta.media.frame_rate_den") == 1);
-+	int is_album_art = stream->disposition & AV_DISPOSITION_ATTACHED_PIC;
- 	if (is_album_art)
- 		position = 0;
- 
-@@ -2296,8 +2289,8 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p
- 		mlt_properties_set_int( properties, "meta.media.frame_rate_num", frame_rate.num );
- 		mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den );
- 
--		// MP3 album art is a single JPEG at 90000 fps, which is not seekable.
--		if ( codec->id == AV_CODEC_ID_MJPEG && frame_rate.num == 90000 && frame_rate.den == 1 )
-+		// Cover art is a single image at 90000 fps, which is not seekable.
-+		if (stream->disposition & AV_DISPOSITION_ATTACHED_PIC)
- 			self->video_seekable = 0;
- 
- 		// Set the YUV colorspace from override or detect
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 70c25a2a106a..632bde59b9d1 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -10,9 +10,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="compressed-lumas">Compress the luma files in png.</flag>
 		<flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag>
-		<flag name="lua">Build SWIG bindings for Lua</flag>
 		<flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag>
 		<flag name="python">Build SWIG bindings for Python</flag>
 		<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms</flag>
diff --git a/media-libs/mlt/mlt-6.26.1-r1.ebuild b/media-libs/mlt/mlt-6.26.1-r1.ebuild
deleted file mode 100644
index ec1d953a549a..000000000000
--- a/media-libs/mlt/mlt-6.26.1-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit lua python-single-r1 qmake-utils toolchain-funcs
-
-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"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug
-ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python
-qt5 rtaudio rubberband sdl vdpau vidstab xine xml"
-# java perl php tcl
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.8:* )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-#	ruby? ( ${SWIG_DEPEND} )
-BDEPEND="
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-"
-#rtaudio will use OSS on non linux OSes
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	fftw? ( sci-libs/fftw:3.0= )
-	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 )
-	lua? ( ${LUA_DEPS} )
-	opencv? ( >=media-libs/opencv-4.5.1:= )
-	opengl? ( 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}"
-
-DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
-	"${FILESDIR}"/${P}-fix-crash-w-ogg-album-art.patch # git master
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	for x in python lua; do
-		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
-	done
-
-	use python && python_fix_shebang src/swig/python
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-kdenlive
-		--enable-melt
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-gtk2
-		--disable-kde
-		--disable-sdl
-		--disable-swfdec
-		$(use_enable debug)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable ffmpeg avformat)
-		$(use_enable fftw plus)
-		$(use_enable frei0r)
-		$(use_enable gtk gdk)
-		$(use_enable jack jackrack)
-		$(use_enable libsamplerate resample)
-		$(use_enable opencv)
-		$(use_enable opengl)
-		$(use_enable qt5 qt)
-		$(use_enable rtaudio)
-		$(use_enable rubberband)
-		$(use_enable sdl sdl2)
-		$(use_enable vidstab vid.stab)
-		$(use_enable xine)
-		$(use_enable xml)
-		--disable-sox
-	)
-		#$(use_enable sox) FIXME
-
-	use compressed-lumas && myconf+=( --luma-compress )
-	use ffmpeg && myconf+=( --avformat-swscale )
-	use vdpau && myconf+=( --avformat-vdpau )
-
-	if use qt5 ; then
-		myconf+=(
-			--qt-includedir=$(qt5_get_headerdir)
-			--qt-libdir=$(qt5_get_libdir)
-		)
-	fi
-
-	if use amd64 || use x86 ; then
-		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
-	else
-		myconf+=( --disable-mmx )
-	fi
-
-	# TODO: add swig language bindings
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	local swig_lang=()
-	# not done: java perl php ruby tcl
-	# handled separately: lua
-	for i in python; do
-		use $i && swig_lang+=( $i )
-	done
-	[[ -z "${swig_lang}" ]] && swig_lang=( none )
-
-	econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
-
-	sed -i -e s/^OPT/#OPT/ config.mak || die
-}
-
-src_compile() {
-	default
-
-	if use lua; then
-		# Only copy sources now to avoid unnecessary rebuilds
-		lua_copy_sources
-
-		lua_compile() {
-			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
-
-			sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die
-			./build
-
-			popd > /dev/null || die
-		}
-		lua_foreach_impl lua_compile
-	fi
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	#
-	# Install SWIG bindings
-	#
-
-	docinto swig
-
-	if use lua; then
-		lua_install() {
-			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
-
-			exeinto "$(lua_get_cmod_dir)"
-			doexe mlt.so
-
-			popd > /dev/null || die
-		}
-		lua_foreach_impl lua_install
-
-		dodoc "${S}"/src/swig/lua/play.lua
-	fi
-
-	if use python; then
-		cd "${S}"/src/swig/python || die
-		python_domodule mlt.py _mlt.so
-		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
-		dodoc play.py
-		python_optimize
-	fi
-
-	# not done: java perl php ruby tcl
-}
diff --git a/media-libs/mlt/mlt-7.0.1-r2.ebuild b/media-libs/mlt/mlt-7.0.1-r2.ebuild
deleted file mode 100644
index 643d91660279..000000000000
--- a/media-libs/mlt/mlt-7.0.1-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit python-single-r1 cmake toolchain-funcs
-
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug ffmpeg frei0r gtk jack kernel_linux 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
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	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
-		sci-libs/fftw:3.0=
-		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
-)
-
-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)
-		# TODO: does anything need plus?
-		# plus or qt
-		#$(use_enable fftw plus)
-		-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: We currently have USE=fftw but both Qt and plus require it, removing flag for now.
-	# 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/mlt/mlt-7.2.0.ebuild b/media-libs/mlt/mlt-7.2.0-r1.ebuild
index 8f733c14013f..9e992f95599e 100644
--- a/media-libs/mlt/mlt-7.2.0.ebuild
+++ b/media-libs/mlt/mlt-7.2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug ffmpeg frei0r gtk jack kernel_linux libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -21,8 +21,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 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? (
@@ -48,7 +51,6 @@ DEPEND="
 		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
 		media-libs/libexif
-		sci-libs/fftw:3.0=
 		x11-libs/libX11
 	)
 	rtaudio? (
@@ -108,9 +110,7 @@ src_configure() {
 		-DMOD_SDL1=OFF
 		-DMOD_SDL2=$(usex sdl)
 		-DMOD_AVFORMAT=$(usex ffmpeg)
-		# TODO: does anything need plus?
-		# plus or qt
-		#$(use_enable fftw plus)
+		-DMOD_PLUS=ON
 		-DMOD_FREI0R=$(usex frei0r)
 		-DMOD_GDK=$(usex gtk)
 		-DMOD_JACKRACK=$(usex jack)
@@ -126,7 +126,6 @@ src_configure() {
 		-DMOD_SOX=OFF
 	)
 
-	# TODO: We currently have USE=fftw but both Qt and plus require it, removing flag for now.
 	# 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
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 9ca660544dca..c414b4cf1567 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,19 +1,11 @@
 AUX make-tarball.sh 1895 BLAKE2B d6311e862d8b2fb10d88a90263f7187c04bde49ff0ecb7860d4b306a6553b41f24ed718e94113807f7b8cdfe21774de383baf7799f2a3c3a12acea6f7aedbd4f SHA512 8128d2d8c0fb60d1d3cba73b4b3d87e914a7ac284e5f049cfd0a596f772d705acb3222da2d6a6f7d1882c7221eeaae9daac9d1b855e61881600345dc615cc428
-AUX netpbm-10.31-build.patch 1641 BLAKE2B 2102aa5a41b89beea645842ebaf72d472464c161601673f25d100f030c8058c86a98ae1d402387c7ce09eaa2558d099ab6cc8551fe1f231ea5a7e71b813d84ee SHA512 352b4390c7b622a7509ce370ba03d596bdee9ed19f63ab72990f15cec74eee42e768525aeaff87a160c8edb0034189c0a09a86189f7324675091484652cc1abd
-AUX netpbm-10.66-test.patch 347 BLAKE2B e4f88878dd61c2d7e8ad642d5a32aec8351cdcf8ef2d4bf81dd9174a69d17b6c56fc3eb7160f63764360a7bdea99bcb2cb3e8dd47d04f881185f86e2a8f6cbf5 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74
-AUX netpbm-10.70-system-libs.patch 1024 BLAKE2B 8fe242dad22030b66613a9c3c3e1c5d0a00589581f68dccf2940b9991a16cf6e1c5deec86562ec696db65e0d1465e7dacf840c6d9220be1bce3505d9dccf96ff SHA512 e25f58186621820612923e50d1342262cc30a790725d31a8ff2a9e8eae8415db600b6601539e1124eb9dcc5fed2f7db9738d6b8effe9e8e118af1f517111eb81
-AUX netpbm-10.76.00-build.patch 1295 BLAKE2B 5ce1a973f503ded256fad7d8c2dddf24663466e8be04acbf52d30ca1ff50dae40dc24b0714cb50b00667f2d560c7f2ab5c7d457c90e8b31f322ca85498c3ba3d SHA512 db1d0593db6987933d7c937beeac65716866adaa079fb5329f8597b208c7dea9f6dd40b803f9dc4b3ef6cf61189c45dde9e139435b7d8e224bb83e037a7f076b
-AUX netpbm-10.76.00-misc-deps.patch 1677 BLAKE2B 2b54610958755b452bffd186e6bdbac16db9c7b0a0242776798a7cc4b6685c4b0a26bcea7810e392437bba25a8839b5852a84fc3acc2daa50e1a893d7c58d702 SHA512 a632c2eb9afd3fcd4ed7a9467293ad9ac6201296c0910d150f6a1c94121cf0dac9654531fd18c5aec7b412c3fae203a28e62b00cff877629f89e4f995ab730b2
-AUX netpbm-10.76.00-pbmtext-test.patch 711 BLAKE2B 7e1b825bd9735ace1e91c1e705df4843aebbec61d090ec3903e680aac3facba80075ffa518340140657e33cd6c36ae84cd669e9dcddb920d832caed218b6651e SHA512 32be11758652105a6964bca3a9b08c06ed34e2f9ea00370c8d3a961a0ba8b64102120881238fe016d0b0ca4f10882b25f655691bbd75be8ceb700e68a624d5ca
-AUX netpbm-10.76.00-test.patch 6045 BLAKE2B ec4bf18a2022e67b26b78a591f3949552e103d9dbaec0793707988265ecd9f1006e576b094e4a47c9a94de5aa0ac2be00702493d3234364e91e727ac90ca4f61 SHA512 36244194a688d7b3f9ef632ecc3a56ea9aae3e28ad68d4dc5f1a804c19203a76b76fd75c1d999661dea4aa6e529e7200fd195383d8585d129d6df088a0c633b5
 AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55cc6e990186f506c67496fce774fdfef1ba23843129fd493f8aa3e4ad5f74cfcf1d2388da95225ac2ef19f0c949f425 SHA512 459c54dac19067f2185a02ef812932e8fcb6a73d6267c32578bd3b7d3b12494052e929b24663407ad919e1e98aa2df58ed8e27be3f18eeb2fbe2402e4ff9e629
 AUX netpbm-10.86.21-misc-deps.patch 1565 BLAKE2B a4d629ea9fe01efc45c799dac4bd3764368be33f264929bdc338bb724ace03471949467e5c84144636a9f4ee9130395dad77e23aa6686998bf9700dbde224cbf SHA512 f274ede7d11ed0f2a1825a4412a52fd9e30f5caf470c6111b606a87f1e67b16278c9f2a901d512ea3516ba033e30a3c08386cc5af1a555f868b7d7175fbfeed0
 AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604706b373281bf4963385fe971991711cc6ed4f169cc45aa460ac1db20de69039b137da1a2ec3d6cb82b60ae5f745 SHA512 e5c1a88cc03e227c7a7a01e9586ceacaf24a6752f4285f228b0176a8a12a6a9ac83d8ce1c5965e8f56ab652b5e42aa2cd535f1e121449fe668312b7e49720e4f
 AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5181db57fd718a6fed268a8afb2fd2b5afab404c3be3c89dc25d178f8fe2edc4d386e33f22f7b3bc826e9c90307ef3895830f SHA512 a521c771d2384cb86d87b4efdf05e0835adcbefb84d4e66e744b2f8bc40df5358f20c4824dce5a942ccc24b18168276278d65e8e9a529b7c09b157b3e02438bb
-DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
-DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
+AUX netpbm-10.86.24-fix-test-ppc64.patch 634 BLAKE2B 41f42436d5f77a37a1e8cb9200cb470d894953f85a3ee3d0b754cb32960f1f60c28d7e2c4ac3578220f7f5f5b4eb68d98b3c0e8e5d5ac7a91a5851859c0ea555 SHA512 5f79bd90ea9ea8d1577a71ba9aebfb24d8c02f845b26b81a9403e411e284f4213af931769dfa367be6c5f4e0453771e480df684a64dedacc858f1e3171a39fd2
 DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
-EBUILD netpbm-10.70.00.ebuild 5382 BLAKE2B 8b5a70217742d7f87b59c16d777b040277cd582929a7ae5fdf3d7ca1287e598e5204d498a4b38cd3e54fd3411bfc2d2ead8cf2ee030ce34f0594d3894ff45f7d SHA512 bca0a73ebb20f6eb7543048c0e34eabf5c8a3652c8b43ab357ba3742b649bd1075ff97c522da910b80e9d9feb8125103eea4df5373b00cf7d44851bd9927c786
-EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B c94c55e373301f8506a9ee6275865f0702c0bcc5ceeccf2b8433dedf71f99834475dd27ef5328db4c9d9eda5b7a5ce3943cd59e3e19e8e6db22bc35741cbf911 SHA512 a79ddc4ab964ed64e29d644ca33fc0bed01e0c90e96a3aa38d6a6be30039b5cff2dd86f8c5a798982df9e353d286e461ae560e8be6c98e008cfdd345927c611f
-EBUILD netpbm-10.86.24.ebuild 5797 BLAKE2B 58fd9b7100c77de027803c7131b8dc41993596fa1a56cf93f196179f3384ab4eb35b58d0195d10246da9e4190996245882c92440176b053858f4d3088bda831c SHA512 0595cf621ec276e707de81631929303c0953aaaf02dbefb5f0c831157270cc46b7d0bf5287b04d7ec8be807a815b20121c3a436846112991c892b8da489b0d1b
+DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c
+EBUILD netpbm-10.86.24-r1.ebuild 5853 BLAKE2B 8ab739e81bee65f04f0f3468468c8193136781326bfff3efaadcb335d529fef3761d61e43ac8e7815700080568e097e0f61529d80363f2c404d77d6bd31c0920 SHA512 365e21e054dac809d2590d60700d8425e611fcaae2e73d07b084a7254b2f05911514fbbbbaadeb0ee05ac7a3fc2e7a7f2b845b62fb1fd569b0d7b435e4ba34ea
+EBUILD netpbm-10.86.27.ebuild 5832 BLAKE2B d7b07a579edfb2ec3a9e7ae760beee17fb21ccf063344bd0b194fdb24177c1ccb6f37594fdde85f3bd922c84961c5fc8e9cd7f79f59b232113ff8c8ebed672f6 SHA512 61a4ffc7241024db2725db4fd6023644e4b626c4bae0b0e5c53a392e59de7f12a7175538291619f203503092124a1b757d298b8d7ca87dc6da470411b47c7552
 MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch
deleted file mode 100644
index 281f8ee928f7..000000000000
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-- Make the libopt tool less 'helpful'
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -249,7 +249,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- 	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
--	  $(PKGDIR)/link
-+	  $(PKGDIR)/lib
- 
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time 
-@@ -257,9 +257,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
--	cd $(PKGDIR)/link ; \
-+	cd $(PKGDIR)/lib ; \
-           rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
--          $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-             libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -87,6 +87,9 @@
- 
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-+
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
- 
- OMIT_CONFIG_RULE = 1
- include $(SRCDIR)/Makefile.common
---- a/buildtools/libopt.c
-+++ b/buildtools/libopt.c
-@@ -502,7 +502,7 @@
- 
-     strcpy(outputLine, "");  /* initial value */
-     runtime = FALSE;  /* initial value */
--    quiet = FALSE;   /* initial value */
-+    quiet = TRUE;   /* initial value */
-     error = FALSE;  /* no error yet */
-     for (arg = 1; arg < argc && !error; arg++) {
-         if (strcmp(argv[arg], "-runtime") == 0)
diff --git a/media-libs/netpbm/files/netpbm-10.66-test.patch b/media-libs/netpbm/files/netpbm-10.66-test.patch
deleted file mode 100644
index 7c80648bafab..000000000000
--- a/media-libs/netpbm/files/netpbm-10.66-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/450530
-
-we disable fiascotopnm all the time, so delete the test too
-
---- a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -387,10 +387,6 @@ for i in $ordinary_testprogs
- 
- 
- 
--# Test fiascotopnm, which has a unique -v flag.
--
--${PBM_TESTPREFIX}fiascotopnm -v 2> /dev/null
--    testExitStatus fiascotopnm 2 $?
- 
- 
- 
diff --git a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
deleted file mode 100644
index efe9fd8dd3c4..000000000000
--- a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-when we disable the bundled libs, make sure we don't try to run install in them
-
---- a/converter/other/jbig/Makefile
-+++ b/converter/other/jbig/Makefile
-@@ -5,7 +5,7 @@ endif
- SUBDIR = converter/other/jbig
- VPATH=.:$(SRCDIR)/$(SUBDIR)
- 
--SUBDIRS = libjbig
-+SUBDIRS =
- 
- include $(BUILDDIR)/config.mk
- 
-@@ -35,6 +35,7 @@ SCRIPTS =
- 
- ifeq ($(JBIGLIB),$(INTERNAL_JBIGLIB))
-   JBIGLIB_DEP = $(JBIGLIB)
-+  SUBDIRS += libjbig
- else
-   # It's not our internal version; user's on his own to make sure it's built
- endif
---- a/converter/other/jpeg2000/Makefile
-+++ b/converter/other/jpeg2000/Makefile
-@@ -5,7 +5,7 @@ endif
- SUBDIR = converter/other/jpeg2000
- VPATH=.:$(SRCDIR)/$(SUBDIR)
- 
--SUBDIRS = libjasper
-+SUBDIRS =
- 
- include $(BUILDDIR)/config.mk
- 
-@@ -52,6 +52,7 @@ ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB)
-   # MERGE_OBJECTS contains relative paths, so $(INTERNAL_JASPERLIB) had better
-   # be relative to the current directory.
-   MERGE_OBJECTS += $(JASPERLIB)
-+  SUBDIRS += libjasper
- endif
- MERGEBINARIES = $(BINARIES)
- 
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-build.patch b/media-libs/netpbm/files/netpbm-10.76.00-build.patch
deleted file mode 100644
index 231da5446719..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -249,7 +249,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- 	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
--	  $(PKGDIR)/link
-+	  $(PKGDIR)/lib
- 
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time 
-@@ -257,9 +257,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
--	cd $(PKGDIR)/link ; \
-+	cd $(PKGDIR)/lib ; \
-           rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
--          $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-             libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -87,6 +87,9 @@
- 
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-+
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
- 
- # Parallel make (make --jobs) is not smart enough to coordinate builds
- # between submakes, so a naive parallel make would cause certain
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
deleted file mode 100644
index bd894bfb3159..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-do not autoprobe deps when we disabled them
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk
- 
- PROG_SUBDIRS = converter analyzer editor generator other
- PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
--SUPPORT_SUBDIRS = urt icon buildtools test
-+SUPPORT_SUBDIRS = icon buildtools test
-+ifeq ($(URTLIB),$(BUNDLED_URTLIB))
-+SUPPORT_SUBDIRS += urt
-+endif
- 
- SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
- 
---- a/converter/other/Makefile
-+++ b/converter/other/Makefile
-@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
- 
- include $(BUILDDIR)/config.mk
- 
-+ifneq ($(XML2_LIBS),NONE)
- TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
- 
- ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
-@@ -22,6 +23,7 @@ else
-     XML2_CFLAGS=$(shell xml2-config --cflags)
-   endif
- endif
-+endif
- 
- SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
- ifneq ($(BUILD_FIASCO), N)
-@@ -34,6 +36,7 @@ ifneq ($(TIFFLIB),NONE)
-   endif
- endif
- 
-+ifneq ($(PNGLIB),NONE)
- TEST_PKGCONFIG_LIBPNG = if pkg-config libpng$(PNGVER); then echo exists; fi
- 
- ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),)
-@@ -58,6 +61,7 @@ else
-     endif
-   endif
- endif
-+endif
- 
- ifneq ($(JPEGLIB),NONE)
-   ifneq ($(JPEGHDR_DIR)x,x)
---- a/other/pamx/Makefile
-+++ b/other/pamx/Makefile
-@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk
- 
- EXTERN_INCLUDE =
- 
-+ifneq ($(X11LIB),NONE)
- ifeq ($(shell pkg-config x11 --modversion --silence-errors),)
-   # Pkg-config has never heard of X11, or doesn't even exist
- 
-@@ -23,6 +24,7 @@ else
-   X11LIB = $(shell pkg-config x11 --libs)
-   EXTERN_INCLUDES += $(shell pkg-config x11 --cflags)
- endif
-+endif
- 
- ifeq ($(HAVE_X11LIB),Y)
-   PORTBINARIES += pamx
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
deleted file mode 100644
index 717c86a72ac5..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-the tool tries to generate binary output, but the current locale might change
-what awk generates.  force it to C/ASCII to avoid that.
-
-https://bugs.gentoo.org/601012
-
---- a/test/pbmtext.test
-+++ b/test/pbmtext.test
-@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm}
- 
- # One long row
- # Should print 3233136020 4535
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i);
-              for (i=160;i<=255;++i) printf("%c",i); }' | \
-     pbmtext -builtin bdf | cksum
- 
- # One tall column
- # Should print 1216262214 5711
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i);
-              for (i=160;i<=255;++i) printf("%c\n",i); }' | \
-     pbmtext -nomargins -builtin bdf | cksum
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
deleted file mode 100644
index 8bb1b17e15fa..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-automatically skip tests of disabled tools
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -455,6 +458,21 @@ deb:
- .PHONY: check-package
- .PHONY: check-install
- 
-+# Variables from the make env we pass down to the test scripts.
-+CHECK_VARS = \
-+	BUILDDIR=$(BUILDDIR) \
-+	RGBDEF=$(RGBDEF) \
-+	BUILD_FIASCO=$(BUILD_FIASCO) \
-+	JASPERLIB="$(JASPERLIB)" \
-+	JBIGLIB="$(JBIGLIB)" \
-+	JPEGLIB="$(JPEGLIB)" \
-+	PNGLIB="$(PNGLIB)" \
-+	TIFFLIB="$(TIFFLIB)" \
-+	URTLIB="$(URTLIB)" \
-+	X11LIB="$(X11LIB)" \
-+	XML2_LIBS="$(XML2_LIBS)" \
-+	ZLIB="$(ZLIB)"
-+
- # Test files in source tree.
- 
- check-tree : BUILDBINDIRS :=./analyzer \
-@@ -525,10 +543,10 @@ resultdir-backup: FORCE
- 
- check-tree: $(TESTRANDOM) resultdir-backup
- 	cd $(RESULTDIR); \
-+	  $(CHECK_VARS) \
- 	  CHECK_TYPE=tree \
--	  PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+	  PBM_TEST_PATH=$(PBM_TEST_PATH) \
- 	  LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
--	  RGBDEF=$(RGBDEF) \
- 	  $(SRCDIR)/test/Execute-Tests 2>&1
- 
- # Execute-Tests needs to know BUILDDIR in order to locate testrandom.
-@@ -545,19 +563,18 @@ check: check-package
- 
- check-package: $(TESTRANDOM) resultdir-backup
- 	cd $(RESULTDIR); \
-+	  $(CHECK_VARS) \
- 	  CHECK_TYPE=package \
--	  PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+	  PBM_TEST_PATH=$(PBM_TEST_PATH) \
- 	  LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
--	  RGBDEF=$(RGBDEF) \
- 	  $(SRCDIR)/test/Execute-Tests 2>&1
- 
- 
- # Check after install
- check-install: $(TESTRANDOM) resultdir-backup
- 	cd $(RESULTDIR); \
-+	  $(CHECK_VARS) \
- 	  CHECK_TYPE=install \
--	  BUILDDIR=$(BUILDDIR) \
--	  RGBDEF=$(RGBDEF) \
- 	  $(SRCDIR)/test/Execute-Tests 2>&1
- 
- 
---- a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -367,11 +367,62 @@ ordinary_testprogs="\
-   zeisstopnm \
- "
- 
-+enabled_testprog() {
-+    case $1 in
-+      fiascotopnm|\
-+      pnmtofiasco)
-+        [ "${BUILD_FIASCO}" = "N" ] && return 1 ;;
-+
-+      jpeg2ktopam|\
-+      pamtojpeg2k)
-+        [ "${JASPERLIB}" = "NONE" ] && return 1 ;;
-+
-+      jbigtopnm|\
-+      pnmtojbig)
-+        [ "${JBIGLIB}" = "NONE" ] && return 1 ;;
-+
-+      jpegtopnm|\
-+      pnmtojpeg|\
-+      ppmtojpeg)
-+        [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+      pamtopng|\
-+      pngtopam|\
-+      pnmtopng)
-+        [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+      svgtopam)
-+        [ "${PNGLIB}" = "NONE" ] && return 1
-+        [ "${XML2_LIBS}" = "NONE" ] && return 1
-+        ;;
-+
-+      pamtotiff|\
-+      pnmtotiffcmyk|\
-+      tifftopnm)
-+        [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+
-+      pnmtorle|\
-+      rletopnm)
-+        [ "${URTLIB}" = "NONE" ] && return 1 ;;
-+
-+      pamx)
-+        [ "${X11LIB}" = "NONE" ] && return 1 ;;
-+    esac
-+
-+    return 0
-+}
-+
- # The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm
- # has a slightly different version report format.
- 
- for i in $ordinary_testprogs
-   do
-+    # Stub out programs that aren't built.
-+    if ! enabled_testprog "$i"; then
-+      echo "$i: ok"
-+      continue
-+    fi
-+
-     $i --version  2>&1 | \
-     egrep -v -e fiascotopnm -e \
-     "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/fiasco-roundtrip.test
-+++ b/test/fiasco-roundtrip.test
-@@ -2,6 +2,10 @@
- # This script tests: pnmtofiasco fiascotopnm
- # Also requires: pnmpad
- 
-+if [ "${BUILD_FIASCO}" = "N" ]; then
-+  exit 80
-+fi
-+
- # Should print 215556145 102615
- 
- pnmpad --black --bottom 1 --left 1 testimg.ppm | \
---- a/test/jbig-roundtrip.test
-+++ b/test/jbig-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtojbig jbigtopnm
- # Also requires: pamchannel pamtopnm
- 
-+if [ "${JBIGLIB}" = "NONE" ]; then
-+  exit 80
-+fi
- 
- # Test 1.  Should print 2425386270 41
- pnmtojbig testgrid.pbm | jbigtopnm | cksum
---- a/test/legacy-names.test
-+++ b/test/legacy-names.test
-@@ -94,8 +94,30 @@ ordinary_testprogs="\
-   ppmtouil \
- "
- 
-+enabled_testprog() {
-+    case $1 in
-+      ppmtojpeg)
-+        [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+      pamrgbatopng|\
-+      pngtopnm)
-+        [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+      pnmtotiff)
-+        [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+    esac
-+
-+    return 0
-+}
-+
- for i in $ordinary_testprogs
-   do
-+    # Stub out programs that aren't built.
-+    if ! enabled_testprog "$i"; then
-+      echo "$i: ok"
-+      continue
-+    fi
-+
-     $i --version  2>&1 | \
-     egrep -v \
-     "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/png-roundtrip.test
-+++ b/test/png-roundtrip.test
-@@ -6,6 +6,10 @@
- ## If this test fails and pnm-roundtrip2.test succeeds, it indicates
- ## some problem with pnmtopng.
- 
-+if [ "${PNGLIB}" = "NONE" ]; then
-+  exit 80
-+fi
-+
- # Test 1.  Should print 1926073387 101484 18 times
- for flags in "" -interlace \
-   -gamma=.45 \
---- a/test/png-roundtrip2.test
-+++ b/test/png-roundtrip2.test
-@@ -9,6 +9,10 @@
- ## If both tests fail, the likely cause is a problem with pngtopam.
- ## It is also possible that there is some problem in libpng.
- 
-+if [ "${PNGLIB}" = "NONE" ]; then
-+  exit 80
-+fi
-+
- # Test 1.  Should print 1926073387 101484 twice
- for flags in "" -gamma=.45
-   do
---- a/test/ps-roundtrip.test
-+++ b/test/ps-roundtrip.test
-@@ -8,6 +8,10 @@
- ## (1) zlib was not linked.
- ## (2) ghostscript is not available.
- 
-+if [ "${ZLIB}" = "NONE" ]; then
-+  exit 80
-+fi
-+
- tmpdir=${tmpdir:-/tmp}
- 
- # pstopnm does not use libnetpbm functions for output.
---- a/test/tiff-roundtrip.test
-+++ b/test/tiff-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pamtotiff tifftopnm
- # Also requires:
- 
-+if [ "${TIFFLIB}" = "NONE" ]; then
-+  exit 80
-+fi
- 
- # Failure message
- ## Second test fails if Netpbm was built without the flate library
---- a/test/utahrle-roundtrip.test
-+++ b/test/utahrle-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtorle rletopnm
- # Also requires: pamchannel pamtopnm
- 
-+if [ "${URTLIB}" = "NONE" ]; then
-+  exit 80
-+fi
- 
- #Test 1.  Should produce 1571496937 33838, cksum of testimg.red
- pamchannel -infile=testimg.ppm -tupletype="GRAYSCALE" 0 | pamtopnm | \
diff --git a/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
new file mode 100644
index 000000000000..e1b558d59117
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
@@ -0,0 +1,22 @@
+char is unsigned by default on ppc64
+
+--- a/converter/other/pnmtopalm/palmtopnm.c
++++ b/converter/other/pnmtopalm/palmtopnm.c
+@@ -823,7 +823,7 @@
+     unsigned int j;
+ 
+     for (j = 0;  j < bytesPerRow; ) {
+-        char incount;
++        signed char incount;
+         pm_readchar(ifP, &incount);
+         if (incount < 0) {
+             /* How do we handle incount == -128 ? */
+@@ -865,7 +865,7 @@
+     unsigned int j;
+ 
+     for (j = 0;  j < bytesPerRow; ) {
+-        char incount;
++        signed char incount;
+         pm_readchar(ifP, &incount);
+         if (incount < 0) {
+             /* How do we handle incount == -128 ? */
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
deleted file mode 100644
index 595ad00ef034..000000000000
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-
-BDEPEND="app-arch/xz-utils
-	sys-devel/flex"
-RDEPEND="jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( >=media-libs/libpng-1.4:0 )
-	rle? ( media-libs/urt )
-	svga? ( media-libs/svgalib )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	xml? ( dev-libs/libxml2 )
-	zlib? ( sys-libs/zlib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/netpbm-10.31-build.patch
-	"${FILESDIR}"/netpbm-10.66-test.patch #450530
-	"${FILESDIR}"/netpbm-10.70-system-libs.patch
-)
-
-netpbm_libtype() {
-	case ${CHOST} in
-		*-darwin*) echo dylib;;
-		*)         echo unixshared;;
-	esac
-}
-
-netpbm_libsuffix() {
-	local suffix=$(get_libname)
-	echo "${suffix//\.}" || die
-}
-
-netpbm_ldshlib() {
-	case ${CHOST} in
-		*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
-		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
-	esac
-}
-
-netpbm_config() {
-	if use $1 ; then
-		[[ $2 != "!" ]] && echo -l${2:-$1}
-	else
-		echo NONE || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# make sure we use system libs
-	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
-	rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
-
-	# disable certain tests based on active USE flags
-	local del=(
-		$(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip')
-		$(usex rle '' 'utahrle-roundtrip')
-		$(usex tiff '' 'tiff-roundtrip')
-	)
-
-	if [[ "${#del[@]}" -gt 0 ]] ; then
-		sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die
-	fi
-
-	del=(
-		pnmtofiasco fiascotopnm # We always disable fiasco
-		$(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
-		$(usex jbig '' 'jbigtopnm pnmtojbig')
-		jpeg2ktopam pamtojpeg2k # jasper has been removed
-		$(usex rle '' 'pnmtorle rletopnm')
-		$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
-	)
-
-	if [[ "${#del[@]}" -gt 0 ]] ; then
-		sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die
-		sed -i '/^$/d' test/all-in-place.ok || die
-	fi
-
-	# take care of the importinc stuff ourselves by only doing it once
-	# at the top level and having all subdirs use that one set #149843
-	sed -i \
-		-e '/^importinc:/s|^|importinc:\nmanual_|' \
-		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
-		common.mk || die
-
-	sed -i \
-		-e '/%.c/s: importinc$::' \
-		common.mk lib/Makefile lib/util/Makefile || die
-
-	# avoid ugly depend.mk warnings
-	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
-	cat config.mk.in - >> config.mk <<-EOF
-	# Misc crap
-	BUILD_FIASCO = N
-	SYMLINK = ln -sf
-
-	# These vars let src_test work by default
-	PKGDIR_DEFAULT = ${T}/netpbm
-	RESULTDIR_DEFAULT = ${T}/netpbm-test
-
-	# Toolchain options
-	CC = $(tc-getCC) -Wall
-	LD = \$(CC)
-	CC_FOR_BUILD = $(tc-getBUILD_CC)
-	LD_FOR_BUILD = \$(CC_FOR_BUILD)
-	AR = $(tc-getAR)
-	RANLIB = $(tc-getRANLIB)
-
-	STRIPFLAG =
-	CFLAGS_SHLIB = -fPIC
-
-	LDRELOC = \$(LD) -r
-	LDSHLIB = $(netpbm_ldshlib)
-	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
-	LINKERISCOMPILER = Y
-	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
-	NETPBMLIBTYPE = $(netpbm_libtype)
-	STATICLIB_TOO = $(usex static-libs Y N)
-
-	# The var is called SSE, but the code is actually SSE2.
-	WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
-
-	# Gentoo build options
-	TIFFLIB = $(netpbm_config tiff)
-	# Let tiff worry about its own dependencies #395753
-	TIFFLIB_NEEDS_JPEG = N
-	TIFFLIB_NEEDS_Z = N
-	JPEGLIB = $(netpbm_config jpeg)
-	PNGLIB = $(netpbm_config png)
-	ZLIB = $(netpbm_config zlib z)
-	LINUXSVGALIB = $(netpbm_config svga vga)
-	XML2_LIBS = $(netpbm_config xml xml2)
-	JBIGLIB = $(netpbm_config jbig)
-	JBIGHDR_DIR =
-	JASPERLIB = NONE
-	JASPERHDR_DIR =
-	URTLIB = $(netpbm_config rle)
-	URTHDR_DIR =
-	X11LIB = $(netpbm_config X X11)
-	X11HDR_DIR =
-	EOF
-	# cannot chain the die with the heredoc above as bash-3
-	# has a parser bug in that setup #282902
-	[[ $? -eq 0 ]] || die "writing config.mk failed"
-}
-
-src_compile() {
-	emake -j1 pm_config.h version.h manual_importinc #149843
-	emake
-}
-
-src_test() {
-	# The code wants to install everything first and then test the result.
-	emake install.{bin,lib}
-	emake check
-}
-
-src_install() {
-	# Subdir make targets like to use `mkdir` all over the place
-	# without any actual dependencies, thus the -j1.
-	emake -j1 package pkgdir="${ED}"/usr
-
-	if [[ $(get_libdir) != "lib" ]] ; then
-		mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
-	fi
-
-	# Remove cruft that we don't need, and move around stuff we want
-	rm "${ED}"/usr/bin/{doc.url,manweb} || die
-	rm -r "${ED}"/usr/man/web || die
-	rm -r "${ED}"/usr/link || die
-	rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
-
-	dodir /usr/share
-	mv "${ED}"/usr/man "${ED}"/usr/share/ || die
-	mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
-	doman userguide/*.[0-9]
-	dodoc README
-
-	cd doc || die
-	dodoc HISTORY Netpbm.programming USERDOC
-
-	docinto html
-	dodoc -r *.html
-	use doc && dodoc -r ../userguide/*.html
-}
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
index b27af756a539..bef703001a86 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
@@ -1,41 +1,51 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib toolchain-funcs
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+# zlib USE flag is no longer used, enabled by default.
+# cannot remove it yet because of #801445
 
 BDEPEND="
 	app-arch/xz-utils
 	sys-devel/flex
 	virtual/pkgconfig
 "
-RDEPEND="jbig? ( media-libs/jbigkit )
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+RDEPEND="jbig? ( media-libs/jbigkit:= )
 	jpeg? ( virtual/jpeg:0 )
-	png? ( >=media-libs/libpng-1.4:0 )
-	postscript? ( app-text/ghostscript-gpl )
-	rle? ( media-libs/urt )
+	png? (
+		>=media-libs/libpng-1.4:0=
+		sys-libs/zlib
+	)
+	postscript? (
+		app-text/ghostscript-gpl
+		sys-libs/zlib
+	)
+	rle? ( media-libs/urt:= )
 	svga? ( media-libs/svgalib )
 	tiff? ( >=media-libs/tiff-3.5.5:0 )
 	xml? ( dev-libs/libxml2 )
-	zlib? ( sys-libs/zlib )
 	X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/netpbm-10.76.00-build.patch
-	"${FILESDIR}"/netpbm-10.76.00-test.patch #450530
-	"${FILESDIR}"/netpbm-10.76.00-misc-deps.patch
-	"${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012
+	"${FILESDIR}"/netpbm-10.86.21-build.patch
+	"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
+	"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
+	"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
+	"${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
 )
 
 netpbm_libtype() {
@@ -57,8 +67,8 @@ netpbm_ldshlib() {
 	esac
 }
 netpbm_config() {
-	if use $1 ; then
-		[[ $2 != "!" ]] && echo -l${2:-$1}
+	if use ${1} ; then
+		[[ ${2} != "!" ]] && echo -l${2:-$1}
 	else
 		echo NONE
 	fi
@@ -92,15 +102,32 @@ src_prepare() {
 		sed -i -r \
 			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
 			test/all-in-place.{ok,test} || die
+		sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
 		sed -i -e '/^$/d' test/all-in-place.ok || die
-		sed -i '2iexit 80' test/ps-{alt-,}roundtrip.test || die
+		sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
 	fi
 
-	# avoid ugly depend.mk warnings
-	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
+	# the new postscript test needs +x
+	chmod +x test/lps-roundtrip.test
+
+	# Do not test png if not built
+	if ! use png ; then
+		sed -i -r \
+			-e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+			test/all-in-place.{ok,test} || die
+		sed -i -e '/^$/d' test/all-in-place.ok || die
+
+		sed -i -r \
+			-e 's:(pamrgbatopng|pngtopnm).*::' \
+			test/legacy-names.{ok,test} || die
+		sed -i -e '/^$/d' test/legacy-names.ok || die
+		sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
+	fi
 }
 
 src_configure() {
+	# cannot chain the die with the heredoc
+	# repoman tries to parse the heredoc and fails
 	cat config.mk.in - >> config.mk <<-EOF
 	# Misc crap
 	BUILD_FIASCO = N
@@ -140,7 +167,7 @@ src_configure() {
 	TIFFLIB_NEEDS_Z = N
 	JPEGLIB = $(netpbm_config jpeg)
 	PNGLIB = $(netpbm_config png)
-	ZLIB = $(netpbm_config zlib z)
+	ZLIB = -lz
 	LINUXSVGALIB = $(netpbm_config svga vga)
 	XML2_LIBS = $(netpbm_config xml xml2)
 	JBIGLIB = $(netpbm_config jbig)
@@ -152,8 +179,6 @@ src_configure() {
 	X11LIB = $(netpbm_config X X11)
 	X11HDR_DIR =
 	EOF
-	# cannot chain the die with the heredoc above as bash-3
-	# has a parser bug in that setup #282902
 	[[ $? -eq 0 ]] || die "writing config.mk failed"
 }
 
@@ -178,13 +203,9 @@ src_install() {
 	fi
 
 	# Remove cruft that we don't need, and move around stuff we want
-	rm "${ED}"/usr/bin/{doc.url,manweb} || die
-	rm -r "${ED}"/usr/man/web || die
-	rm -r "${ED}"/usr/link || die
 	rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
 
 	dodir /usr/share
-	mv "${ED}"/usr/man "${ED}"/usr/share/ || die
 	mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
 
 	doman userguide/*.[0-9]
diff --git a/media-libs/netpbm/netpbm-10.86.24.ebuild b/media-libs/netpbm/netpbm-10.86.27.ebuild
index 70bebdd0051e..a4bc1a21670d 100644
--- a/media-libs/netpbm/netpbm-10.86.24.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.27.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="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 # zlib USE flag is no longer used, enabled by default.
 # cannot remove it yet because of #801445
@@ -166,7 +166,7 @@ src_configure() {
 	TIFFLIB_NEEDS_Z = N
 	JPEGLIB = $(netpbm_config jpeg)
 	PNGLIB = $(netpbm_config png)
-	ZLIB = -lz
+	ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
 	LINUXSVGALIB = $(netpbm_config svga vga)
 	XML2_LIBS = $(netpbm_config xml xml2)
 	JBIGLIB = $(netpbm_config jbig)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 939cb3d56930..9bf278e3e68b 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -3,6 +3,7 @@ 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
@@ -12,9 +13,12 @@ DIST opencv-4.5.1.tar.gz 88245766 BLAKE2B 219403844b459fcce012b942920a7a8264fb85
 DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c610228892e88c1e84575fb4efa612c8568df40a2e533f90ed2727ba7416e2ff08d9a655400b326841bf090fec79cd31f39334966e SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
 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 vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-4.5.0-r3.ebuild 20527 BLAKE2B c268b0a0e8c7e47a5b14af5dad3757c9df07096e285d23feb6c6b3af15138037c45f4bd7da104fa4a643b6329faa13e733bf76098b45a2db2efb60f96016746b SHA512 322e98d5a2ad73397880f27b03b9f3717d8387be382973d6ec4059ce7b87b7740e4c91f3180038651517800ad2d6868b90ab7df085d450d43f253aef9b4aadfb
 EBUILD opencv-4.5.1-r3.ebuild 20614 BLAKE2B 5377f4c1af0957ec9bc6f5d0ca83fa14977c4bbf5d0e2e2982c32bd9d3ea1f42ce5c9faec398010858109eaa3a04303141207573c5672ac749467e3f5b0c3fea SHA512 33a3028a698ddbeebd91afc006949cb4f1837df8fec4b20c6f5570dc3f65fac05bfa8109325bba8d26fa7faeece0b79974b7b9c6fd111a5e5a4189dfc0c58ba1
 EBUILD opencv-4.5.2-r3.ebuild 20667 BLAKE2B 1482e70d2c5dcaa6d568f6c4326eac12a5380433fb40267cd1961a83f4ea3a2ca2b2d2c4351b0304d9882a84b144d81a52a9da6ccc34fb05987356a8d21f6e86 SHA512 121fa6c8b4297290808ea1fd67d56dec075c96d90c7b60484294cc939fb5bd9595d6aa9cf833eefcd93f36ea31e1c3c032791a21074ebe6da460bc01fd2d0945
-EBUILD opencv-4.5.2-r5.ebuild 20673 BLAKE2B c403dd754baeb9205089c9b7743bdbf49e34c1d8c12e6a16a431dc32a430c984a948ba1e3b0043161f54b45db252ce6d9aa3fa01276462cfda54f8a4cba30210 SHA512 1290667db7132a004662d320bda45b068941ee4df535b29ad4cfa32a1646e32e97bc26fb168bb71ac61e60c7ad62e71c6d7d8a9eb388984bdf2541515847204c
+EBUILD opencv-4.5.2-r5.ebuild 20722 BLAKE2B 1eff4e40444049fa054ebe99b6675b9ae780310aaa85a678ac1216936773afffab32d372f181bbfc72bdd3ee86732639ae02383a16344a6fdb1a3bad55bec159 SHA512 c28a914751319a8fa7140838debba1d745fe09e4f2f6d5564549246c916f91b69446e823aa6262a7d94176d60404f37b271bf79299100f47d14a22a045ddc12b
+EBUILD opencv-4.5.4.ebuild 21209 BLAKE2B 88a04808917c5e68cf291714fc4cd7dace64b44cde914f15ef133848c282cf36b2069bf4649921ab71d7ee23ed1e8088d874f9d163da3e211bb4814770f83e01 SHA512 f0d2fdbc9df513a37c0278d3950c16363977a2c7cdc13986d708a9c47642a2b8afbd5c6adbcc627c6088d1115fa7de44a9fae65550c2f1eb359af1568c0f0f17
 MISC metadata.xml 3186 BLAKE2B 0293399368d675e350992184bcaad2de17e68aae0ea3fa15bb885ac975f14f0350efc5a00a17737be22cf8b5c0808b3853c77b66ff43294f443305ee188aaa06 SHA512 6d3ee73a3b78581b3e4f12287578cae84afa8747d2432fa436860c265ae92f1072cb83a1b41a2f80ed9141f4c097224df6280c78970d7d68e1c9baa92d383395
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
new file mode 100644
index 000000000000..31e2fc60d121
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch
@@ -0,0 +1,123 @@
+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-r5.ebuild b/media-libs/opencv/opencv-4.5.2-r5.ebuild
index 773e61c6fb4a..21f9624b9049 100644
--- a/media-libs/opencv/opencv-4.5.2-r5.ebuild
+++ b/media-libs/opencv/opencv-4.5.2-r5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+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
@@ -118,7 +118,7 @@ RDEPEND="
 	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
 	lapack? (
 		virtual/cblas
-		virtual/lapack
+		>=virtual/lapack-3.10
 	)
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
@@ -283,6 +283,7 @@ PATCHES=(
 	"${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() {
diff --git a/media-libs/opencv/opencv-4.5.4.ebuild b/media-libs/opencv/opencv-4.5.4.ebuild
new file mode 100644
index 000000000000..55c89688fe82
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.4.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+CMAKE_ECLASS=cmake
+inherit 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() {
+	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/openexr/Manifest b/media-libs/openexr/Manifest
index 93540f9c8eba..78e3234db359 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -9,9 +9,9 @@ DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f
 DIST openexr-3.1.1.tar.gz 25588029 BLAKE2B c2ce9622ad7b8a328ce556b6120a868cddb86e908917e001f543e70501b6d31ce549fc10d65806dd9d63e63872b273ad3a1d4f6813b5d23ea238c238f5815304 SHA512 430becbb214cedec5a57e9ff2363badd8a2d94e8a00edffbc75fbcf30d26d887a6eb3f4ff96e371cb26f9d44e63bf0fe2dc511493a0951171ddc64bba7aed735
 DIST openexr-3.1.2.tar.gz 20315253 BLAKE2B d11f26d3e2bb098c4c009271b40da1eca97b120e5683137a0b38f64e2862c226aebff7c17e79344da4a1be5a1967fb8ab0493ff919a7fb5bec16b34e494e49e2 SHA512 34fb28f149e49bb23b2dc230dd5277229f2c780de66aff0acc819601e6802a1dbf83110b5df455dffd63be6eaa286d4aedb4b0af559b8b034d98c3208ee9d969
 DIST openexr-3.1.3.tar.gz 20322346 BLAKE2B e65cb00d1d9ae7544f6d1adf9c6f05193986b8de7b657fa22d20466f2b6dfccf244b5aa3dbe7f2abb0c934aec68d2007dd9edb3eeee91b2bbd8aab331eea7e90 SHA512 12a8f3660104e68ccea0856caf334d1fafbf0ee79115aae23cdce5b835299294ab8a23bafed282acfacd159ce9bc7f6ffc620b1e0df0d40f9ca0eb15a288964d
-EBUILD openexr-2.5.6.ebuild 1743 BLAKE2B 8b2158c878589a878da14d945ff955e3b98b17c6da06470ac15965797a7f8096fb721f7ccbc2984394b0e4b341c0c5efe2c552453c702c095e725d997061eb98 SHA512 6bc52d858d7be2e73061572575658ca224e9bf696beff4e7015da3edca8b1da231e690b32cf152af4c046223d61bd9815da7e009f649bd658fafdc52618798b2
+EBUILD openexr-2.5.6.ebuild 1744 BLAKE2B 3d028aab6c0b047039c3fc2722560a51aba7c960c2c61e17ac7c440f7a4cb1588cf490cfafb84e47b3ac97731cc31dd4929138dd7d733652f4e452800fe3936f SHA512 46183a9a6c7eab770d9d50871cdcb028487ff62bbb9fdeaf07e83a809d770fc0e898cc86d03952cfff5d794150928bfb5d7dd85ef0f92ed2ac9ee57649893da4
 EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866fc55ee5de8211721745fbf048d2431aba65d1627ed9748862e751c04f58c51b50355fa34f3d22f163fbdde2a14 SHA512 4a91fa4d593dfc94aba295d5572ed9f7c73e9ccdba52b4f38053a0431bd4a89e1b195aa50aed4f5297464838815d62dbe388b24f72ff29ff40bcb0396c8c6e09
 EBUILD openexr-3.1.1.ebuild 2215 BLAKE2B a3916bf03903c147682f8e99d7e16c9dd7118293c07fe1fa8afb1da8290beb53a94cd26dd7d197f4c861b1e80615491ee138f115ec793ee64f8581fb6e057606 SHA512 d55549195644ae45c1eea31248973f43cc0b0166adedd40af303e24782f65523aee0f7974ff10617cd584915512eaf3d8add5718afe1b838c67aff403b43a709
-EBUILD openexr-3.1.2.ebuild 2108 BLAKE2B 4fb47f20b6619467ae947574d6eed1484f243b0b54cbb3ab5fef958c1999eb8b899778e8934062ac3b613b113b9120157519a3e67b57429dd2f9fee4181d204b SHA512 c77e344ab912f001f70f9e3c0a8bae484b8f8e686e88ebdf3166dfc4e7fe599cbc1304b7d03ae505caa522275ad30d93b948e1075ac93c32ef8009e8a9ec79be
-EBUILD openexr-3.1.3.ebuild 2110 BLAKE2B 69de4064b65a7a7588ad374fed0c65c903493c3986d56ed6c300949a3c50df333ef84e497aee650c6d9b4744445f85fd1748d2558aac3493e11c13dd542fd0b3 SHA512 f8e4ce99226ccab661f8e26f81026ada221655ef2744338b27b984096c442f4d792a90c71b10f391c8e497b45c2a94a4d063ab55da869972d70655e9c24b6822
+EBUILD openexr-3.1.2.ebuild 2164 BLAKE2B 0854070dc3718954071b167178050914b8ef463deb7a64312cf03d5ce05929e4dd3064b2cf9952b74332b12f95eac5cd4db5e355e6a2a1f282b0506fcb1c78f6 SHA512 b5ac054271964dfa4509d27d0b3fb4bbae35b2619ba84879d828b4bf4b0f6dfe33eaa144717e70aee861acc29260769376877473c405bc19d84b57efc0706f6e
+EBUILD openexr-3.1.3.ebuild 2166 BLAKE2B 95bfcd1dab5b03b5666e9b8286e94d790e581ca1c3b2d6952844e88a3a3c65c1c9fa4d8d311ea5d4dde3fb8e0e9f0f8b7f4110cb3f40d8fe15e2156308f37049 SHA512 17bdb6bf657752dd1d94f8ee0dfcf7d1e89429a95f600b7866f59c6120042a31bb9a22b62698ad013f7e507a052afd6524be01cb48cbdf1ff3ce3300d6ce9294
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-2.5.6.ebuild b/media-libs/openexr/openexr-2.5.6.ebuild
index 0583348afc4f..639ad56563a2 100644
--- a/media-libs/openexr/openexr-2.5.6.ebuild
+++ b/media-libs/openexr/openexr-2.5.6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/OpenEXR"
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openexr/openexr-3.1.2.ebuild b/media-libs/openexr/openexr-3.1.2.ebuild
index a421d40937b2..9a8c70d88e64 100644
--- a/media-libs/openexr/openexr-3.1.2.ebuild
+++ b/media-libs/openexr/openexr-3.1.2.ebuild
@@ -15,7 +15,8 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 
 LICENSE="BSD"
 SLOT="3/30" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openexr/openexr-3.1.3.ebuild b/media-libs/openexr/openexr-3.1.3.ebuild
index 7b41f0eca9df..d465d49cb95b 100644
--- a/media-libs/openexr/openexr-3.1.3.ebuild
+++ b/media-libs/openexr/openexr-3.1.3.ebuild
@@ -15,7 +15,8 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 
 LICENSE="BSD"
 SLOT="3/30" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 66694a19c891..bf3175cd2933 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,21 +1,9 @@
-DIST openimageio-2.2.12.0.tar.gz 29251419 BLAKE2B 7ab1b611f9354d4a8d3fc33bc30acfbc193d6fda012945af2e3b41343419755a211df1a051fc5e6f00149a78db0896ec0f8c59d559e06294dc2626401e66df87 SHA512 14c7ce8b5f71622ca5ffbcae36044a02ae760f6f0173d5efb90472c40970f1bbf355059ca06a47aba895e365892fdf91aa2fdb0f38a7ba04d148ed33f51db80d
-DIST openimageio-2.2.13.1.tar.gz 29265740 BLAKE2B 98403db440410d391ff150a988ac5cb970e0f8d30758c73200d54f07594b458d1f6a8bee58dc92bd254338da678fc4494555df94d8f865b09bd9c13bac7f8f6c SHA512 911e3671557df3c8bdbada00b83b7631750f5bf4dfc0568a4978c91d28a6e408c69dbe0e4e113b13702eab27176d3c84043d73778a0213eac0b2ac94d2e942d6
-DIST openimageio-2.2.14.0.tar.gz 29226972 BLAKE2B 29daaf4fb987b77dffdd8cb29c5f67a80c20c49cd5dc369e68a5588a61fae7119aeb22814886e68eb055f2a66e02e75afba25991f8edc14752ccacf6599d889f SHA512 063291c0bd742b79a7b6065a41856b84732af2e2e404265262aa9ba91d07209fb308ecf0403a139d7021b8062f9c3e1b92a725a7cad091af1bcf45499ae47a82
-DIST openimageio-2.2.15.0.tar.gz 29238071 BLAKE2B f74f779635b7ff068f87ab6231756cb22acb80185c717c556750d964025aa343f8b3a30b9e73acf6237328b8bdd3fcb6588321d37a3752a6f1d0dd1e3a976363 SHA512 7ade071ae8a78427fb51d75f81e6fcc2d9a3632f0854aea70b985794a53a386072fb171dc8179fa762de19067d402c7ab9f2ea1a44bd3196d3a201ea2cb9ec22
-DIST openimageio-2.2.15.1.tar.gz 29237852 BLAKE2B 0f5050e888e82721aa7012cc5c5eb229b5ac314b067406ef003369431241228d91904fbe455da8423ff978411052b2c960b0688a6b943a0e2bfdb47c489d26a5 SHA512 c06df310f91938b25f1f66cd98d995dcaba51c6a0041b47882c52f5ad4a098a9016fc99f41de250dd1b1b7af3ad22f6ed63d5e76f95f1f1cf0f45c80eee9c8e0
 DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be
-DIST openimageio-2.2.19.0.tar.gz 29252399 BLAKE2B f90b330944885271e117a01235a48f11e88960f5825d0c84e6e2c994479e76a26bf90e66afec4aae6a5c7164510963027bef79fe0265676ce0993235824d461d SHA512 63951d958daaa4bc62fc210efaeced51affd207be21c938ecd5da70217060bb9c8197bf95813e2fddb728a641e69d2889f9445b7d16653a110e45adf3cb86541
-DIST openimageio-2.3.8.0.tar.gz 29233320 BLAKE2B 3ad92641a336588941ff18637d6c72bc4765068438ea14b12e067ed7c104f26068c037fe2b38c58806143ff703c894bb97cbc78c3138e9798f063a93ec6626b3 SHA512 3ee9755f1dac6fdb63f582abe71e14e1abc50ebd3f8b9ffa66dc356dfb9905575385cb22c47386c0c0ec303db3e8897b4c8cf88a0f7cdc802408916db4b101e0
+DIST openimageio-2.3.10.0.tar.gz 32443970 BLAKE2B 90b4f39ed654cafe24905c3d9e32a04057d80d3fc1cb7a1b2ad5e1d3c239b112e9af8d28ee49d54721aa78778118562106c4bcfe2509a1337e15bd13993f144b SHA512 9e8768d743056a7d115b47611d4e6dfc43f3b8b155224e3746075b407a265fcd509d406e78f1b6a5aa0b55270729cbb2049cfeb9d5c1af9a9a8f05a7333292b1
 DIST openimageio-2.3.9.1.tar.gz 29248072 BLAKE2B 22cd31dc51670a388f232874d2f3831fb87df09de3fe8d2492a34f2c9d96f2e3ae13426e30c1b9627926a3ec3150ca9b37377642ea6621a184e14d7358e9d0e5 SHA512 0522d22eca5c9858ef2b6407053f8a74872b9b05214efe01d88f0abee6b21c48cf23444987a21364261e4addcc5cddef38d7f87deda8bc5167a1cd40770327bb
 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.12.0-r1.ebuild 3711 BLAKE2B c25183cfd5c4ede55c0fc76dfc14b0dde0e8983fd44fe5ca24271d6238ab6b89dd93180d7727c557d65f7c2d4e277a9d267a56be4063c4f67de36709ec0fc0f9 SHA512 acf73c45c5504e980633ad6233325b08410a8760bba3b857b3c1b1ac5f75b3e025befc3c59c1b6767adadc96a04f9be65d6ecdc7f8ed0977b24704c4c37deb68
-EBUILD openimageio-2.2.13.1-r1.ebuild 3711 BLAKE2B c25183cfd5c4ede55c0fc76dfc14b0dde0e8983fd44fe5ca24271d6238ab6b89dd93180d7727c557d65f7c2d4e277a9d267a56be4063c4f67de36709ec0fc0f9 SHA512 acf73c45c5504e980633ad6233325b08410a8760bba3b857b3c1b1ac5f75b3e025befc3c59c1b6767adadc96a04f9be65d6ecdc7f8ed0977b24704c4c37deb68
-EBUILD openimageio-2.2.14.0-r1.ebuild 3797 BLAKE2B 5fde669b95b7a8f8fa093e067696afa986d0d84ddbef9eabca38db24c9b2044956e39c8f1131bae03217fe2245349cded4314b560ea5f608264f27c6c1c4f261 SHA512 f227f29510c50890f0ff2fa398151d17bca8bc83c701d89b53a09e38c0b25cb52e3be59b08f1490cc32d42942dec2a460ff4ce6b8b8eccb06e5208ce9080ac67
-EBUILD openimageio-2.2.15.0-r1.ebuild 3797 BLAKE2B 5fde669b95b7a8f8fa093e067696afa986d0d84ddbef9eabca38db24c9b2044956e39c8f1131bae03217fe2245349cded4314b560ea5f608264f27c6c1c4f261 SHA512 f227f29510c50890f0ff2fa398151d17bca8bc83c701d89b53a09e38c0b25cb52e3be59b08f1490cc32d42942dec2a460ff4ce6b8b8eccb06e5208ce9080ac67
-EBUILD openimageio-2.2.15.1-r1.ebuild 3795 BLAKE2B 9e5ba0ab65d1bcf48cf46b63685841ea355faa3313d7576e3a5549db892fd13eac327ac4d958384e0ed9f13a8886127a7faed8a6468a19b03e91ea8353bfeeae SHA512 9e603a5a65562d867c2770d5d7fd7b7240a65411170b18f7aca0cd58703274e839e5d3fc31345737a8c096f55994ad908aecbf94dd6ec019936c5e1d17653d1d
 EBUILD openimageio-2.2.18.0-r1.ebuild 4192 BLAKE2B 00a910784e52d4d50a2920641278b41a53847963d9cc0d31badea2e3a3497242f3af9fe6acec43efce043f7acd724ac8f30f475d7697cdfd73b0f39a59e09fcd SHA512 ba24aa74cbe44ab72f8f33397d0d29409d90b8c0263d4551970cb8e35bae4f28fb975414cddf35cb777597c671a8474e81f4b3157194f9c60b3df9bff265a4f8
-EBUILD openimageio-2.2.19.0.ebuild 4194 BLAKE2B 8c06905190d31a31bab1aaa762b04b094bacdc1b605bdb34632d387083cded7a9ad3a1d9a7839104017e4d89c410242c225344884e8a5f8bc10bb14c581d0116 SHA512 1c0e7fcfb04b2f8bf5b4cdb93cbaa59c370d640d3607bab2d8fabc8853da2dbf893538caed1207bc77375b4afa35c10f6b7a6498574399ecf0f706cf91fad579
-EBUILD openimageio-2.3.8.0-r1.ebuild 5038 BLAKE2B ef78c98b0d518f3413f991507d132202a34cf5b3e914fdca258371b7b402fbd9a444e7e53071013e560740127b246c93d74115969d8d18c51564d8cd419e37d6 SHA512 09a80048febae0e1c5358577e2bf0eddd810f782e8aad945d8688671456de0febcd07446f1147aac45c8526a23542851b9448b6a330d76326f5ee23189c68b6b
+EBUILD openimageio-2.3.10.0.ebuild 4963 BLAKE2B e6b4094430e888bb0c8327a59fab806467f38a837d98db97891dd21976801a35c5fc53095bf0025ed95ed88d533e8af27238cb7b8e488fe8b09c573e46aa7592 SHA512 8b281a675dcaa05c6a9465edee46568efe8f39cac73c17875b0568aa1f9be928bc32bad8cfc92f4fb2e7f854e9612bd0616816ca7a3c373cbe5dc73dc37cf1b4
 EBUILD openimageio-2.3.9.1.ebuild 4963 BLAKE2B e6b4094430e888bb0c8327a59fab806467f38a837d98db97891dd21976801a35c5fc53095bf0025ed95ed88d533e8af27238cb7b8e488fe8b09c573e46aa7592 SHA512 8b281a675dcaa05c6a9465edee46568efe8f39cac73c17875b0568aa1f9be928bc32bad8cfc92f4fb2e7f854e9612bd0616816ca7a3c373cbe5dc73dc37cf1b4
-MISC metadata.xml 937 BLAKE2B f49461cd8f78f3206eb9016c01850a27017ac6964531769105804140d5d8363b46679d71eadb503221f6e3d03107228a6e66efc16187505cb4560e32bd42e3c1 SHA512 05cc82838184e93ed4064f8fc6519c89a512e6f1fe7abb94dcd624ed52eb004203f201745ec26f2ffd6aac3fb5cd4013917591164a18b0d56a097d6d4d81ae2d
+MISC metadata.xml 820 BLAKE2B fd092484e492bc042f5cfdbb717963a12596a00514f986cddccd5b8956891c95b996ac1f5831ab2314f0ee3fbe3fa1905e7601a7b017a9a91f2f7c1aba3a9d8f SHA512 5dfc9f4ab3300f94c611822d1b1badb785cfaeab90bdadf5db5e36d1eb6eff8851123470a1863e1a137f94ea4ce286d2b67f6c3a28cb18d65bb177e1d570b7b4
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 0ed335cbea35..82c6c1129ce1 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gentoo@aisha.cc</email>
-		<name>Aisha Tammy</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/media-libs/openimageio/openimageio-2.2.12.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.12.0-r1.ebuild
deleted file mode 100644
index a73e3cfbe823..000000000000
--- a/media-libs/openimageio/openimageio-2.2.12.0-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	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/openimageio/openimageio-2.2.13.1-r1.ebuild b/media-libs/openimageio/openimageio-2.2.13.1-r1.ebuild
deleted file mode 100644
index a73e3cfbe823..000000000000
--- a/media-libs/openimageio/openimageio-2.2.13.1-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	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/openimageio/openimageio-2.2.14.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.14.0-r1.ebuild
deleted file mode 100644
index 550f234d360d..000000000000
--- a/media-libs/openimageio/openimageio-2.2.14.0-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-	if use python; then
-		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.2.15.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.15.0-r1.ebuild
deleted file mode 100644
index 550f234d360d..000000000000
--- a/media-libs/openimageio/openimageio-2.2.15.0-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-	if use python; then
-		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.2.15.1-r1.ebuild b/media-libs/openimageio/openimageio-2.2.15.1-r1.ebuild
deleted file mode 100644
index becc29bb6994..000000000000
--- a/media-libs/openimageio/openimageio-2.2.15.1-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-	if use python; then
-		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.2.19.0.ebuild b/media-libs/openimageio/openimageio-2.2.19.0.ebuild
deleted file mode 100644
index 41c76a3bcd1a..000000000000
--- a/media-libs/openimageio/openimageio-2.2.19.0.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/opencolorio:=
-	>=media-libs/openexr-2.2.0-r2:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Note: on bumps, please try again with OpenEXR 3 + ilmmath!
-	# Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
-	# (because it mix and matches which version it uses; sed this to
-	# make sure it'll use OpenEXR 3 if it can, but it won't.)
-	# bug #821193
-	sed -i \
-		-e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
-		src/cmake/modules/FindOpenEXR.cmake || die
-
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TESTS=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-	if use python; then
-		mycmakeargs+=( -DPYTHON_SITE_DIR=$(python_get_sitedir) )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild b/media-libs/openimageio/openimageio-2.3.10.0.ebuild
index 77b43ff2ec14..88f1d6b8b497 100644
--- a/media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.10.0.ebuild
@@ -29,7 +29,7 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+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
@@ -63,7 +63,6 @@ RDEPEND="
 	virtual/jpeg:0
 	dicom? ( sci-libs/dcmtk )
 	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
 	gif? ( media-libs/giflib:0= )
 	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
 	opencv? ( media-libs/opencv:= )
@@ -146,7 +145,6 @@ src_configure() {
 		-DUSE_JPEGTURBO=ON
 		-DUSE_NUKE=OFF # not in Gentoo
 		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
 		-DUSE_GIF=$(usex gif)
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_OPENCV=$(usex opencv)
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index e8df5827e921..82bb0a35821c 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -2,8 +2,10 @@ AUX opensubdiv-3.3.0-add-CUDA9-compatibility.patch 897 BLAKE2B 528eaabdbe1613e6f
 AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
 AUX opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch 1620 BLAKE2B 5c7e721f8754d50fdffb468009a2cc67c926ecb8abe3c0c2e5c60f15cac5f778222074f639b0040b98f405eb392f3d9c97358ed3302832fb32a1417d6bc36311 SHA512 b919c3c3f8c3190b683c5bc02cb523821200bbe951d65e2543d6f0f818ee1bcc4117c3140857becf032c54fd58aa4ee2f06b8f8cf550f72f3df9c5b21f483cb1
 AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 2239 BLAKE2B d35a7118b742244f045aa5c0e5e1ab42a8eea98cac377b9fb0efd8948e2b13d2be973aa17714a8554a97061a8de0769861947cf9c890bcf81acff593b3f34ae5 SHA512 2e86d3f73568c16c839d783574abfb765432b3bf9171b73da8eab9c86be4c736912b892879cb04d974046fb90c5fdf2e60669cc94d468d5aec51573c0ffdcaa6
+AUX opensubdiv-3.4.4-add-CUDA11-compatibility.patch 846 BLAKE2B df2611fff3112eff3784306c6811285f895593a954f394d1a41b68a9e44ee2dbaae85b5f4e009dfe8edf95e8806f1c085728130c6e003a63a3918ab1ac586012 SHA512 c5c8e6705c0f93d632b45d3e645ff9b207b102ff7534f51b32400e4d60ab07afb18bf6b99a066d1556c55ba275ad586969d4460a6bd3d9c8a2bef83152183deb
 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
 DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445 SHA512 fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb
 EBUILD opensubdiv-3.4.3-r1.ebuild 2376 BLAKE2B 5662809ca588bfe52c46fcf0c2b3e9c3feb56006a1e1ec1f277add0ef0e485a2c863ff1bc137cc8a05b3395b1a221666966d0c27117db4d962f9c7be57a62852 SHA512 fa96d571158a3f7d6bf3fea1e1478e9a0a5e10a6561235d6e58030fd4bac1007df7348fa589ed1aa8e97a09ca3f9f5263fcb04ca12fbb8d438dbe70962170bbe
 EBUILD opensubdiv-3.4.4-r1.ebuild 2252 BLAKE2B 11dc22f927daaee1bbcb8b5014efc303a37228439387ed9c89fc49509b13d46e484b1850c5b46cb95666064dfcae2455feda07295ec0bb04270b170d36f59c0f SHA512 a9a117a29ddb15de9bbfe079e6d5ddc97e3fc81804f0e52052880294f30216f2b1fb6dd7719a62f632ec113f73fe3449d2e997697a4b97391d6cc7f1f54dffc9
+EBUILD opensubdiv-3.4.4-r2.ebuild 2415 BLAKE2B 8191238ef11d63e09fa843dcad76c553d4fb2676f09dec82ad75af8d6075383c47040370259f4174b79d3596763e2c00716397a475a9533bc61e9c202fc1c5b8 SHA512 637f09451ce22279e1b7e1d6f8778dc6937680615e0ee8b500e8cbbda4f836f03f17922f16906bcb92688263725cf5fce70cf6d8a9dac7c9177e22ee6f853118
 MISC metadata.xml 1036 BLAKE2B cc36d0e341535d825d18bc4485cadd6c46b907bacc5fb52421aecd4e194cae73165d9708502dff6ac748396176df6a29c2920b99cb2eb9f841ff26b5de1eb916 SHA512 057a0aa062daed49dcab313aaf049a1ce41a10fa98e6c73c809e7d441689505db27bc0f52785c407226f642c69f65b54a211bccd1690f43eb6f4246faef94984
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch b/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch
new file mode 100644
index 000000000000..8f5bfab43a92
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch
@@ -0,0 +1,19 @@
+From: "Alexander Golubev" <fatzer2@gmail.com>
+
+Set correct default minimal -arch for CUDA 9 and 11
+--- OpenSubdiv-3_4_4/CMakeLists.txt     2021-11-07 02:01:07.899484952 +0300
++++ OpenSubdiv-3_4_4/CMakeLists.txt.new 2021-11-07 02:01:23.402764409 +0300
+@@ -587,8 +587,12 @@
+         if (NOT DEFINED OSD_CUDA_NVCC_FLAGS)
+             if (CUDA_VERSION_MAJOR LESS 6)
+                 set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_11 )
+-            else()
++            elseif (CUDA_VERSION_MAJOR LESS 9)
+                 set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
++            elseif (CUDA_VERSION_MAJOR LESS 11)
++                set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_30 )
++            else()
++                set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_35 )
+             endif()
+         endif()
+     endif()
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild
new file mode 100644
index 000000000000..e175e9f49681
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake cuda toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cuda examples opencl openmp ptex tbb test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/glew:=
+	media-libs/glfw:=
+	x11-libs/libXinerama
+	cuda? ( dev-util/nvidia-cuda-toolkit:* )
+	opencl? ( virtual/opencl )
+	ptex? ( media-libs/ptex )
+"
+DEPEND="
+	${RDEPEND}
+	tbb? ( <dev-cpp/tbb-2021.4.0:= )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch"
+	"${FILESDIR}/${P}-add-CUDA11-compatibility.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	# GLTESTS are disabled as portage is unable to open a display during test phase
+	# TODO: virtx work?
+	local mycmakeargs=(
+		-DGLEW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+		-DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+		-DNO_CLEW=ON
+		-DNO_CUDA=$(usex !cuda)
+		# Docs needed Python 2 so disabled
+		# bug #815172
+		-DNO_DOC=ON
+		-DNO_EXAMPLES=$(usex !examples)
+		-DNO_GLTESTS=ON
+		-DNO_OMP=$(usex !openmp)
+		-DNO_OPENCL=$(usex !opencl)
+		-DNO_PTEX=$(usex !ptex)
+		-DNO_REGRESSION=$(usex !test)
+		-DNO_TBB=$(usex !tbb)
+		-DNO_TESTS=$(usex !test)
+		-DNO_TUTORIALS=$(usex !tutorials)
+	)
+
+	if use cuda; then
+		# old cmake CUDA module doesn't use environment variable to initialize flags
+		mycmakeargs+=( -DCUDA_NVCC_FLAGS="${NVCCFLAGS}" )
+
+		# check if user provided --gpu-architecture/-arch flag and prevent cmake from overriding it if so
+		for f in ${NVCCFLAGS}; do
+			if [[ ${f} == -arch* || ${f} == --gpu-architecture* ]]; then
+				mycmakeargs+=( -DOSD_CUDA_NVCC_FLAGS="" )
+				break
+			fi
+		done
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 8a9936936b83..ebc112f9c7ed 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,11 +1,12 @@
 AUX osl-1.11.15.0-fix-cmake.patch 644 BLAKE2B cd51bc2f59a59a80981d357c38a89ea2b7d4e128470616e9851ef28a0c55f3292e9ace6c681b7f15c5752b41ce1f07266adb97fffa5f1923c55242207a674fe9 SHA512 10546e4771f055fb06824113c9c77ec8cc8ea9929343a8a5a68a3ea7fc7d7e2ccb983269eed66782569275e6262fde872b56ce30008ee797ed65566f0f1359ba
+AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89bf2d86ac03ac1d316505b0d0bf1c539633265b92d5bece5873ff7547b85fe7fcb1f58388b669dd01eecf01a01582421 SHA512 ed8d5897968c00113d8a90ff10539c23c6cdf4debdef52acecf5559a599fcde85bdce87862c9327fa0c5548d1100b95864e681a53737a3d6e77f33d0527e9953
 AUX osl-1.12.0.2-llvm-11.patch 1405 BLAKE2B 9e6e162591d4450609c6759d3e9aa45acee0addf5be60bcd21067fa861e6e77fdac83656a3542b3d977987dad4da0627074e36b80b85e1af5e73ae5a7ade9a4b SHA512 a3986d9c458338d1002e119b2c16372fced00a10ddf734b790774f533500f4e3c2cf8fae88431f14a8709d916f9eae4f3f5bdff573e38a1808bc39b0a015ffbf
 AUX osl-1.12.0.2-llvm-12.patch 10828 BLAKE2B b172c99210b6874033a157ea4d98d902f9bf4a1d348619ba3180f08cd1a97dd945bd17b5af2f5a87ff8a0240ec82aeac498aeb448861f8f1de5623e80ac39570 SHA512 547254e9eb2bffacd43dbdebf4aa1929475132f42433b4df9b5535e720578af44ae2b08a01a51d80e539fcc22f424291dece51ee6ea55821a821fd0efd76d619
 DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
 DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
 DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
 EBUILD osl-1.11.15.0-r1.ebuild 2562 BLAKE2B 40df90315638c1651e2c5ab0e141de50eb59146baf900808a2db9757706f79e585f2904697fe479144d960f2c800c0d615203c1ba72904fc71589f39266e24a1 SHA512 108fc337ed3b098c32c8fa1a4c2f6d695b605aea00f4b65786413f722cbb04e77b4e9df64d76d181d4d123eed896d7603873fa0dff30e72ed429917638568004
-EBUILD osl-1.11.16.0.ebuild 2513 BLAKE2B f0e471a66d3ef4950d76c14cdb043f46b7caecaf908cb4e2567fec08f9e336b8369fe30a5f3faeb91088ac83d1a249249702b75884574a3f506d7c7c215abd9b SHA512 bbf760617e9e81505a0fe031b57e645956696f1cba89d4cb52ebc4230aa63f3e58a5c8f038120748fdd3ac61d4aef5752794b1ed57d1c9e06413e900fb0a6543
+EBUILD osl-1.11.16.0-r2.ebuild 2633 BLAKE2B d1e43e8757c4e1ef6ff3ba2a4f1a7fd6e49ba6ca8c184255ca3c37ff48d72cbebf71f6bd264788dff705510122940e1513e624b6dbad3f26faa301032e1965b3 SHA512 8e100f80a8d7ab1c9fdaa17f0c0b7416db60097a3f1210771f0eff9f4fc83294fc81dae7a80331071a8018a5e48de8929da252acb997a9bae0b28c72c6ba7670
 EBUILD osl-1.12.0.2-r3.ebuild 2343 BLAKE2B b8bed7e7922021e888578a3471858097f8a4a30813922ed4c9e5ce8dec9def9c97f90fac719290f3be6d86b7d1ac8458838b78e9aa499a8f838c15c013572abb SHA512 1c8b2863239a25734e3638b052ffb3a0fcf3f3229652dc7e8b2c22b173c9b51342c335c315b9e4063b9aaa296a78cabb4e139fa5b66110d0b2e717a209182d67
 EBUILD osl-1.12.0.2.ebuild 1970 BLAKE2B b872758587a5b15768212a2952b72da718550c0728b04b38ed769691794baf635d61032650244bfc918e54327d49c615cd47afd6743a5307c3115d03ca70ac1b SHA512 e6d6579f9ad2ae29a4df92004facf8301c018fc879b743124051647f85c1a32e760ccfbdf9a4cfacab410a72bad22cb24cc8809c0ed7613c44579e84893098ea
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/files/osl-1.11.16.0-no-imath.patch b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch
new file mode 100644
index 000000000000..a8e5c1f23116
--- /dev/null
+++ b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch
@@ -0,0 +1,49 @@
+Force finding OpenEXR / IlmBase instead of imath for now.
+--- a/src/cmake/modules/FindOpenEXR.cmake
++++ b/src/cmake/modules/FindOpenEXR.cmake
+@@ -39,43 +39,10 @@
+ #
+ 
+ # First, try to fine just the right config files
+-find_package(Imath CONFIG)
+-if (NOT TARGET Imath::Imath)
+-    # Couldn't find Imath::Imath, maybe it's older and has IlmBase?
+-    find_package(IlmBase CONFIG)
+-endif ()
++find_package(IlmBase CONFIG)
+ find_package(OpenEXR CONFIG)
+ 
+-if (TARGET OpenEXR::OpenEXR AND TARGET Imath::Imath)
+-    # OpenEXR 3.x if both of these targets are found
+-    set (FOUND_OPENEXR_WITH_CONFIG 1)
+-    if (NOT OpenEXR_FIND_QUIETLY)
+-        message (STATUS "Found CONFIG for OpenEXR 3 (OPENEXR_VERSION=${OpenEXR_VERSION})")
+-    endif ()
+-
+-    # Mimic old style variables
+-    set (OPENEXR_VERSION ${OpenEXR_VERSION})
+-    get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
+-    get_target_property(ILMBASE_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES)
+-    get_target_property(ILMBASE_IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES)
+-    get_target_property(IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES)
+-    get_target_property(OPENEXR_IEX_LIBRARY OpenEXR::Iex INTERFACE_LINK_LIBRARIES)
+-    get_target_property(OPENEXR_ILMTHREAD_LIBRARY OpenEXR::IlmThread INTERFACE_LINK_LIBRARIES)
+-    set (ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY})
+-    set (ILMBASE_FOUND true)
+-
+-    get_target_property(OPENEXR_INCLUDES OpenEXR::OpenEXR INTERFACE_INCLUDE_DIRECTORIES)
+-    get_target_property(OPENEXR_ILMIMF_LIBRARY OpenEXR::OpenEXR INTERFACE_LINK_LIBRARIES)
+-    set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_LIBRARIES})
+-    set (OPENEXR_FOUND true)
+-
+-    # Link with pthreads if required
+-    find_package (Threads)
+-    if (CMAKE_USE_PTHREADS_INIT)
+-        list (APPEND ILMBASE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+-    endif ()
+-
+-elseif (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
++if (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
+         (OPENEXR_VERSION VERSION_GREATER_EQUAL 2.4 OR OpenEXR_VERSION VERSION_GREATER_EQUAL 2.4))
+     # OpenEXR 2.4 or 2.5 with exported config
+     set (FOUND_OPENEXR_WITH_CONFIG 1)
diff --git a/media-libs/osl/osl-1.11.16.0.ebuild b/media-libs/osl/osl-1.11.16.0-r2.ebuild
index d4591a784b78..3dd9f84f2cf7 100644
--- a/media-libs/osl/osl-1.11.16.0.ebuild
+++ b/media-libs/osl/osl-1.11.16.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
 
 LICENSE="BSD"
 SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 X86_CPU_FEATURES=(
@@ -33,7 +33,8 @@ IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
-	media-libs/openexr:=
+	media-libs/openexr:0=
+	media-libs/ilmbase:=
 	<media-libs/openimageio-2.3:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	sys-libs/zlib
@@ -62,6 +63,10 @@ RESTRICT="test"
 
 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11.16.0-no-imath.patch
+)
+
 llvm_check_deps() {
 	has_version -r "sys-devel/clang:${LLVM_SLOT}"
 }
@@ -91,7 +96,8 @@ src_configure() {
 		-DUSE_CCACHE=OFF
 		-DLLVM_STATIC=OFF
 		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DOSL_BUILD_TESTS=$(usex test)
+		# Breaks build for now: bug #827949
+		#-DOSL_BUILD_TESTS=$(usex test)
 		-DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
 		-DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
 		-DSTOP_ON_WARNING=OFF
diff --git a/media-libs/pnglite/Manifest b/media-libs/pnglite/Manifest
index e4e124fc056b..9304277523cb 100644
--- a/media-libs/pnglite/Manifest
+++ b/media-libs/pnglite/Manifest
@@ -1,4 +1,5 @@
 AUX pnglite-0.1.17-include-stdio.patch 406 BLAKE2B 20f8f543906bf6c913b22de65c4ae1a1041fee3d674bf1f033b367021bbfbdb2fd5e10b9a9d62b5916791a77a6ad7523acef39d14690a9535af5bd5d6985c5e0 SHA512 96482d08c90ab90985c8694a99bf9ab1967a872fe32b441b3ac930a6af346f173859988132a339ed3e9b4935fbaaabc910276425955d8db20fa4f39b726a345a
 DIST pnglite-0.1.17.zip 6516 BLAKE2B 2c44855a5672bcbf633d600820f87f9f9ad42643bd0906fe62ed7c6da8b282d5c8adca684c828cc6064b1c6c02f3e7aca7a07df6c2317c674ed70ae577dacb1b SHA512 f728273a702287d1c299e2939a2e2da5a6c1fbc55372fe1869d7f93cfe59c016c9dcf02be0242c5fa77cda66b0016bbafe1b78f7a876ba2866c37f504d262ce8
-EBUILD pnglite-0.1.17.ebuild 1067 BLAKE2B 27b3f3b26054b89292a32ffb08a5e0d75f8c6ec0a160885b8d088543f2d04c087e3f01f554eefc1d2fab98a78ae64a1d506a6e0af4255606223df2ca1e0a61f5 SHA512 7498e04223948d2cfce12b013f6909925117bfa155a6c1348022679857b6b733f3a10b45cc3c3541cee5bbf222c73f800172f83c3971a5b71eee3c06b94178d5
+EBUILD pnglite-0.1.17-r1.ebuild 922 BLAKE2B 4cca0106d1cee5907027f01c1add80bbb44d45363c32c1b1c85ee3eef0aaf0b78ca5dd4fcc2e987ed8df95061ef8a48f9f55ffee14f3c3cda95c9a66c6c95a4d SHA512 66174057df302d11981ff7efd7b959e716cc1def066f0b65763f0a41acf42912835aeae31eab8ee8a7438f761592094a81ec29486c88f4833013757026f74762
+EBUILD pnglite-0.1.17.ebuild 1074 BLAKE2B 53f93b2b3707fb70c995d9dcb589f5bf560bd89d3717eb329da03e156e82ba5ff8faad552c4a50e6ec6b9a5ad8025d160785c729a8df43d4b45e605a0cefcad7 SHA512 8901996e379b76969ede359df34317c1f01fc6a6ae7597f50a019eefacc4d20df0d27913a84ddb01cab104c37be6c876bdcfaaac87fa30501f09fb76d1cd4def
 MISC metadata.xml 245 BLAKE2B a2d873aa3f0f9368560c1987ad3e2c8a8323bd1f5a0f235c6c981ad971c428484ad095a7e7c7bf3b5525c7bfa5e516cf12e29d651da8dca3f759d6516b9a6dcd SHA512 d1728fb91b8381e298bd2a6abf8819542fe34b1c0a0be44fd29706272909a357b39f417cfd9c0cb6ec3f258a1631bfdb5b129215471aecbe180d35f69186b558
diff --git a/media-libs/pnglite/pnglite-0.1.17-r1.ebuild b/media-libs/pnglite/pnglite-0.1.17-r1.ebuild
new file mode 100644
index 000000000000..fbbb21944154
--- /dev/null
+++ b/media-libs/pnglite/pnglite-0.1.17-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Small and simple library for loading and writing PNG images"
+HOMEPAGE="https://sourceforge.net/projects/pnglite/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-include-stdio.patch
+)
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	sed -ie "s:\"../zlib/zlib.h\":<zlib.h>:" pnglite.c || die
+}
+
+src_compile() {
+	tc-export CC
+	append-flags -fPIC
+	emake ${PN}.o
+	$(tc-getCC) ${LDFLAGS} -shared -Wl,-soname,lib${PN}.so.0 \
+		-o lib${PN}.so.0 ${PN}.o -lz || die
+}
+
+src_install() {
+	insinto /usr/include
+	doins ${PN}.h
+
+	dolib.so lib${PN}.so.0
+	dosym lib${PN}.so.0 /usr/$(get_libdir)/lib${PN}.so
+}
diff --git a/media-libs/pnglite/pnglite-0.1.17.ebuild b/media-libs/pnglite/pnglite-0.1.17.ebuild
index 2216647ba3f1..054f83b18d30 100644
--- a/media-libs/pnglite/pnglite-0.1.17.ebuild
+++ b/media-libs/pnglite/pnglite-0.1.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/zlib"
diff --git a/media-libs/pulseaudio-qt/Manifest b/media-libs/pulseaudio-qt/Manifest
index 31ffb38affc3..092f536066ea 100644
--- a/media-libs/pulseaudio-qt/Manifest
+++ b/media-libs/pulseaudio-qt/Manifest
@@ -1,5 +1,3 @@
-DIST pulseaudio-qt-1.2.tar.xz 30748 BLAKE2B f6f61eaad122795d6833934edd69e2c9b2f79b458b61a240f07f80b17e2f02fd46bfa639932e2824f2d19c782dc394d6b9e30b69c75f9c0da0c2d9ce3530c3c2 SHA512 20bddc4db80310bf46b37a1a386f714bfa3dc2a58871bdd0c0085675c43b42e24792d05cbe5543135a341588e17738525f03ccb08adbc73e1c65967039b35dc7
 DIST pulseaudio-qt-1.3.tar.xz 34148 BLAKE2B f283c369fcbeaf57537fe28d6f8aa02c34d7567ab8260ec8ba05edf8320b65e29e6ac88489ff0b49ae57b0bc8b8a49da83886f50ed9641850c84939a979e930c SHA512 2326277fd37327db29a5984056949fcf935c36e7b39184d1307a5d0a891efed4f0e4f32e783f3f7da2c7e6b7409eb908b2521064c6d24a28561ed38db9f8d4e8
-EBUILD pulseaudio-qt-1.2.ebuild 695 BLAKE2B 0ee51470b0234038d4e9a0efc113eeb5cc5d3502e4921200fd26676519b2dc4ec11a18190d19e5003206e46db4227fa65a1c91996ff7b5612eddbdf4a3b9402b SHA512 32552f5ed25986efdfd5abd1d2eb0223bab891b9cff9063232415749e966ed8782820e7c34dcebf057d837a22683a08d8a607f917a39b53a99c6d536c3ae6681
-EBUILD pulseaudio-qt-1.3-r1.ebuild 711 BLAKE2B be4908ffa7c8c7442eab1e33ba238d1451a2a92b3b91c8762b0d1f7501ca2b50b00df9a75ec53a5f6b20ec7de738f588ddc3e874b3b053f520c4051a523d2862 SHA512 34f5090f3e27b84063d7202bc9b4edf91269026df0250d3d521089fc671d96f9b4914dfa297d5054968ed4f203210939aced1be167df434b37777d30b5800038
+EBUILD pulseaudio-qt-1.3-r1.ebuild 708 BLAKE2B 76480f25a25e301e2ba571f8fddda6c1d231fc24484c4655e52b3c21e971eb71397d9c2efbcbdb0bf7b4c2cf01ba7386ff961b7b83d3995d73bb42869d8ab3c5 SHA512 7167e1608d6376d2b3f277d80696be62998336dde303ea6cefe72e02593900d1fb0204d7bdbf84c78e1d0c9d3bc0f66f5006687d06f46efc8c58f09868417a03
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
deleted file mode 100644
index 722ba8db7fca..000000000000
--- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="true"
-ECM_TEST="optional"
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Qt bindings for libpulse"
-HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	media-sound/pulseaudio
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-qt/qtdeclarative-${QTMIN}:5
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	)
-"
diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.3-r1.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.3-r1.ebuild
index 2b55fb14a3a1..0fd8a66fdd9f 100644
--- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.3-r1.ebuild
+++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 8aa022ae748a..a70a46670dc9 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,4 +1,4 @@
 AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654
 DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
-EBUILD qhull-2020.2-r3.ebuild 1519 BLAKE2B 23f325190f260ca5134382412bbe90f5b1b9261064b42fc091fb78b029ace70f2a21cf63f63de5a9a71c4f8dd6d8d3780dfb9f4c5d026f387ada46b83dddb135 SHA512 8b629cb0692893318ee8cbcd3b1fdbcf81c014350be34a421c0c82472043d2e056cbbbbf522658d12d79be4fabd1cfb4ea193e2d136265412275b57aaf69e20a
+EBUILD qhull-2020.2-r3.ebuild 1518 BLAKE2B 9a3a33b694bb425278ba1eee3d1a9573ed41f4242a51700d3f02651e7bc9e19059754a7fff3eaa79ec4e6ef53d221c6b5bd398d88fa00b7489fb061338c4fa3b SHA512 be7558a04c208efcb3625f7f2a8aeeab88ba04b508396eb42113bcd84eb4e42de429630757b210811f6c52f43f746e023ef24235b43ebf3cde68893a68d75c0f
 MISC metadata.xml 1095 BLAKE2B 49dc96f8c6bf1b318b263cdc5f9d8e981cbed127dcf4c0dd485d98676665127c89600db3f6e177463529db183d95c117e31210c2270e19dcecc62d4d380fbe6a SHA512 a220f6870bf5d73f761b9b97ec51285c37ec77d5917aacc73cb43719f378c6045b27e772f12336e353238ffbcf3e30a7fe7b6f9c8b5d934b0a385a0d33712d51
diff --git a/media-libs/qhull/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
index 1d78af59fc82..f3e4d41461d7 100644
--- a/media-libs/qhull/qhull-2020.2-r3.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0/8"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
diff --git a/media-libs/rtaudio/Manifest b/media-libs/rtaudio/Manifest
index 5a2ed01cde04..f3fe24496eed 100644
--- a/media-libs/rtaudio/Manifest
+++ b/media-libs/rtaudio/Manifest
@@ -1,4 +1,6 @@
 AUX rtaudio-5.1.0-cflags.patch 416 BLAKE2B 6bc60ee1056a56e84a349b9677ab20a00f50fc22e053e0a2a29167db5f631f57749e96c73bbe585adaa346b878b43c5529f10f18b7153b79c10a4ac418d3c04e SHA512 7afad0bf9b562a9ed91567509aacc94d0cb3d95d8241e2bb14b6c826a499a296b99b7ee13317b65fb3bf4bc2526f357c1a34a290290b3fbd82810a43c820fdbf
 DIST rtaudio-5.1.0.tar.gz 655613 BLAKE2B 9fee4a42a2fc040d3f8c8a18c4ef361bfd9cab22df189f6aff23098e299424d8cb4b54075f33ee4f1ab1f851125194228f65814838b091144431bd891a4c7dfe SHA512 221636cfac2286e17f1f2312be2094b6c89087230b95b649661f9ce91356c77fdd8996fd031f0895aba0b50e8091491cdf393a6aeee6f8508ed320180d8fccf6
+DIST rtaudio-5.2.0.tar.gz 247110 BLAKE2B 1949885c3cbb2846e083fd25ec06ed5ca716563dd4c121f6985e2487488d88b9ffb62078185fe2f4261083c8c1ed4c3e8502d25614767d70d2ab316d77f51eeb SHA512 34e78522778db13d95d4465d7c6a808a63b34d4e1bd0b88113b6390f7b192017e405d0d9ac8fbb1151129627688626d17569dc47da420f7b4631892eb1adff11
 EBUILD rtaudio-5.1.0.ebuild 1161 BLAKE2B 893a18efadf88519dfe3a1c6067ec0394b876a35b0095235d6c6809d9e512b9c5d0a6576746dc3aa7195370d92d742ef78cfd4533a59f99758cf363d118c58dd SHA512 4f39fbc63f7b16b6d6e579b2a6b97fda8c9e80b871e7d066704f9fbf7d8a6ba594e90f645bab19c97e98e651fda8b01b35494ef26e81ad4bded5e8a2d686450e
+EBUILD rtaudio-5.2.0.ebuild 1312 BLAKE2B 949a99ca00a6c817efcffd66a0cc39a35cfa8b6de90c5d562840a0331bc3bd2c0443da2c44cf2f5db6eb21a320723428aabad60a339ac5601b41ad909af7a5af SHA512 5b2ab3a2f4cbed443c5a3279a1fb2437f0bcfa2d2aacd25e9021b2d826b40b5d9c66485f778fd99614b4703a6f80741334d433dd3247705cf73484f34822d0ca
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-libs/rtaudio/rtaudio-5.2.0.ebuild b/media-libs/rtaudio/rtaudio-5.2.0.ebuild
new file mode 100644
index 000000000000..1c6db96f19c2
--- /dev/null
+++ b/media-libs/rtaudio/rtaudio-5.2.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A set of cross-platform C++ classes for realtime audio I/O"
+HOMEPAGE="https://www.music.mcgill.ca/~gary/rtaudio/"
+SRC_URI="https://github.com/thestk/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+alsa doc jack pulseaudio static-libs"
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? (
+		media-libs/alsa-lib
+		virtual/jack
+	)
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-cflags.patch
+)
+
+src_prepare() {
+	default
+
+	# don't rebuild docs
+	export ac_cv_prog_DOXYGEN=
+
+	eautoreconf
+}
+
+src_configure() {
+	# OSS support requires OSSv4
+	local myconf=(
+		$(use_enable static-libs static)
+		$(use_with jack)
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
+		--without-oss
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use doc; then
+		pushd doc
+		doxygen || die
+		popd
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc README.md doc/release.txt
+	if use doc; then
+		dodoc -r doc/html
+		dodoc -r doc/images
+	fi
+
+	find "${D}" -name "*.la" -delete
+}
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index c0b74fb60a74..7c4c6b0f451e 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -2,5 +2,5 @@ AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab0
 DIST rubberband-1.9.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2
 DIST rubberband-2.0.0.tar.bz2 175527 BLAKE2B 5b4b8c98ade57f8b7776902166e8aa33e8f89d4de3fe659425a7ef14c1cf3c8a48ad474d2fe0f13483844b4f931ca8128ca57bb7e6dbf6e9d96deadac8856ee0 SHA512 a915a3eea75f0345e83010cc3ffd3c5e0c68a0c1d88da11b11a5fd5010196167c81db611a38c2c2b8d5c5a1f828f2c74a134e6ca8bb3a543af3ef70ce8d56101
 EBUILD rubberband-1.9.2.ebuild 1327 BLAKE2B 664b970e19dfcd36c601c6f42fe0f8fdb9ac35cd6666c52e60cca2f9c45889297f502edf5aa2c1bbcd347a9c88ee96ac42f3e9c7bf59e28291759cb22baf124c SHA512 78686227e171bdea6b3056dc6d96739c5010dc62d06dfbbbdce11a46f9b3bbba503e0cc7d9ecbf64d32586209d8683c8e882d3ad3ad9aa4997e5b8df4d6e29d1
-EBUILD rubberband-2.0.0.ebuild 1340 BLAKE2B 1bec12af8e87a10b6f1aecb5eb7d65c8703080943fb287c2f59e6578fa0ef747a14f787b95ac4c57c62568a06aeeab26cdfcd56db8d5c6b5fb88d0968f28887e SHA512 0b399dc6c8cc39487c689cf62008623dcc19fd315a0258a04f990be9ae26892c1795ae15d1b5351a7b643e263a879bd41015d4cac72eb9572f0c2c48f1c88db3
+EBUILD rubberband-2.0.0.ebuild 1411 BLAKE2B 00aa35fe8fb784128e95e9ec878d7d81bb3d17f7261e7150c1e11b51104444910515fc007f27e042325f4dfeb8b7706569e6920790cb1930f44aa653b2400f8a SHA512 c18eee0aedaf43d85253228622334b002e7fdcfd34ccbdd2694138e44af478b812290da17b158c152a2ecb2d17ffe9ff16fecaaf1d3a719f62f761de36d7ba63
 MISC metadata.xml 491 BLAKE2B bda0db771d95de138274eb35f4c135f3bd9fb3a1b75ce60a8c57ad71e0c0a894924bb52060c8ca87e689f2a0f581213639de2ca5615a134dfecfa4f008698b2a SHA512 c549bcf465808927153a79f145b222379270d2813e150606382dcb1c15980a37a89d7f0178d3fee2fd3eb7216dd6ad989efe0a24e398f67af95872f6c92d570a
diff --git a/media-libs/rubberband/rubberband-2.0.0.ebuild b/media-libs/rubberband/rubberband-2.0.0.ebuild
index c364d1398383..93fc5e3e5a79 100644
--- a/media-libs/rubberband/rubberband-2.0.0.ebuild
+++ b/media-libs/rubberband/rubberband-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson-multilib
+inherit meson-multilib flag-o-matic
 
 DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
 HOMEPAGE="https://www.breakfastquay.com/rubberband/"
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="ladspa jni static-libs +programs vamp"
 
 BDEPEND="
@@ -33,6 +33,11 @@ PATCHES=(
 )
 
 multilib_src_configure() {
+	if use ppc ; then
+		# bug #827203
+		append-libs -latomic
+	fi
+
 	local emesonargs=(
 		--buildtype=release
 		-Dfft=fftw
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 1ee0d032d7b9..b099beb1bd81 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL2_image-2.0.5_p20210328.tar.gz 12397062 BLAKE2B ae4fe8c30b21bc7dca87e2e78cab43c83e891630962eb020c29ba84c2b206bb749491dccddd8bcc212f2fd07da651691151baf41212fb5ea954427543e3bf994 SHA512 9ba0b671dedfb7bde072424cebfa7d65e79d2d58416833d84548777aff6bf0edda8dbe30c3e423bbb724f794b4b191e609b148f38573b4166eef31203ab0005d
-EBUILD sdl2-image-2.0.5_p20210328.ebuild 1752 BLAKE2B 9fe2d4ea54b795e3456a6d6779b902505ddf940b392fd40cb89f7942f953cbbd85412f8f217a62b4d45d112bbf7042fad2ca7cea15d2ad098c43fb6013537e3c SHA512 4e0c736734c08fd2c32e812a98f042997944e854eb42f8726774b0040efce2189ae0b6869b9dfd338d42afb71a0b00591a21da5da9ed5236b8c38c13410dc475
+EBUILD sdl2-image-2.0.5_p20210328.ebuild 1751 BLAKE2B 71f5571b4917dc5b10ce0ac200e72a77d6cf2663577058061e65f350f067707661ee93c8af404cdd195e70c6c1dcf330bddfb5e61fa51941a958fbbd3d98110d SHA512 c0fc5e83c8c3807fd945a97b742b7b50a071725cd063729a674d255d7556706057a40505fae02780018d4c500fcc8fe8d85601a6bc45ff83e09e51d6ec819281
 MISC metadata.xml 477 BLAKE2B b82e6a76ba3ecb3440fb39021a80e05daf57cda15e373ad611a5cac6e5a46b88758416a2957b781c9066240d76811bf2a818f95664cdfa903cbe36ffd99c1df4 SHA512 7690ef20ad091d13e3713ccbc07457f15325abc7af62742a55b042085b8b7e300717a329832238c9eaddff08acb4e43145905c060e1e174baadfdf90d671e1ff
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild
index 5c03d2374e37..eb2a23bf368e 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libsdl-org/SDL_image/archive/${MY_COMMIT}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 6f5484e59552..2ab401509511 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,6 +1,6 @@
 AUX sdl2-mixer-2.0.4-fluidsynth.patch 1457 BLAKE2B 9b8914065ade05bcf70c3783ae22f732e5a401f74cdc39272865d5c6f0fa31c0ee89b16f642a5b5f69b77ecd9dc96cb7313d4dd6c55303efd5d128679f1cb6f3 SHA512 e268a5bf327f2203a7f48ed0cdc05f89fea778eac706555f21ee2b3cab761600988f385195c3078917c422bc70c7b96fff650a1a213370469fe07340dc7d7852
 AUX sdl2-mixer-2.0.4-slibtool.patch 3794 BLAKE2B 5e6f316a32a7c58abdbf764ada81c85e9db6509f99b3a7054de08ea90f1bf54d12bad6f177e7d76181d76f6b0d218acd1f44e8d50e91f7b3ef74056ddf3acd0b SHA512 da520853a59036ea413cc24964798fe40414c072612e2fa0bf79373be669b76d6b07a3853123317f25eb82db1a4dbd105b23469e6da14bb0596242fc1a9060d7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
-EBUILD sdl2-mixer-2.0.4-r1.ebuild 3548 BLAKE2B b8b16afe108d4eed662fa8dbdb6dfc269b628dc296c6215224e9482eecc155577a88c0e80bb5bef36bbc9e0bb6e481b54755db83d2fec1af122c148825b37979 SHA512 b532f013c6d177d434c5dc8327725467d9b956ab034bec70c875ba175d7362c5a9b1f7083aeabdc3a6af52eadf5f37cc20f5654fc110a81fa402c3729bfe05ca
+EBUILD sdl2-mixer-2.0.4-r1.ebuild 3545 BLAKE2B 5e61def0ea221c091e5b7425ad6f39fc26cfe988fa7835d8f36c5a203185221c2c9681e85cd4af81a35153766240a232a3099e18cbb6deaec1ac79f628802f15 SHA512 2480687ee0143beb10760b8ca30c2a4e2b20cd03e55fd46a0838bed5ce2fee94bce3d48ceb73396af6637a5e98f16876d2e73eb28b4c326a2a819082938f7f0c
 EBUILD sdl2-mixer-2.0.4.ebuild 3491 BLAKE2B 2f4d9ae4b9a0911f7721e355c48d8a60d4477f3f320b32fdeb9e7eb5e6ac147b5c57dcc03d115c20fe5df21f5812d3ff6b09acb9e4293edb199be5eff2f3419d SHA512 1b076b2813c946e514f13a950809ca5e3fedd67899c0110a99d88a6d7f6594be73a6d44f2bf41650bd7275123fff82f5dd5d6772e04f1717009a552a3a25ac55
 MISC metadata.xml 673 BLAKE2B 8cc1ebfc30f840ffb98cc60659f5d30f8cafc6e7c3e3ef156e6637ec8bab0ed203679e055917cb406debadbc45f44a3171337d5e13bbf91ca46f91420ba8df02 SHA512 560232a2d580ecb87832520448481c5cc4c07958c929f30bc9f5e5d0b17e957cf36ab70c13059b2bb28b609f3e89f3d02731bb8ad8a74404726147cd4f98be85
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
index bde8b7d9be29..4648beb4226c 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index b8ea462d9c9a..67d1de7ee9e2 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1,3 +1,3 @@
 DIST SDL2_ttf-2.0.15.tar.gz 4479718 BLAKE2B 8401ed4979dade5affa86be4463958d0c90f72d3b2874540cf868e460c5d6773a2b11eaf6d13792d23193085050970ebf877b707b0febaba9be29c4329be9d7c SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd
-EBUILD sdl2-ttf-2.0.15.ebuild 1013 BLAKE2B e797cfda55fcb26093a0b47ca8c1b5e8fe0738b3190a05856060ca09d285841284a8924580c2ed9e590019cd5675f4875e35c472ab2deac840d4f44127dc2531 SHA512 38ce6f418e178087230d8cf41c1ce5764cdf638523216589ff8c476b17493e717d7554117cf39de40fa6e53e7d4ff8cefa031b827237826c40c910031558c697
+EBUILD sdl2-ttf-2.0.15.ebuild 1012 BLAKE2B bf74f411dec169458fc2d3bbd4ef6767dd71dfdcb864a0ced60dafa9d66c1336ada53285218304c935389d1d8e76362bb0560a796302ea982a2030a96747f5d1 SHA512 7c4aea39529b338e10a3d005ea3563f49f8b38481fcfb47546112c7900ab59696f7b9c0591291b0528c3e24e4f0b4c7e7d3140a735688fb6021c267792e820ab
 MISC metadata.xml 502 BLAKE2B ed43304b5fa9efa9417d40c7611db12c2b48f515244c024b6d1ac00a5fd322e4005c3d2bef789ea74eca64a64e6e03648db8409d3f329bf82b900141bbef3e78 SHA512 00501014b13fd43c8cb4f801a391c2012523df2c4970b33d22776ec8934af94b5e0e851b6a3b2126c1a7458173dfe565f40b3f80588cd9516251fb2f44976ffa
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
index 84825ffb0264..06ad86a41cfd 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="static-libs X"
 
 RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 0ec6a227e7b5..e15e5954d4b4 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -3,8 +3,10 @@ DIST shaderc-2020.5_pre20201216.tar.gz 220278 BLAKE2B 9565873bd1d85c2800b26ba821
 DIST shaderc-2020.6_pre20210327.tar.gz 220258 BLAKE2B 5f3321d7bea0a39bec865cf3c6b25baba82068ecea6a5272a4c1e3432bb9f1c0062c1bcf9a57bac1e92dcd382dfb0837a03bbe434d19e83b755dc5da16e2f1dd SHA512 07f4a49faed28f23fb2f7b33c804c9909617e362f8046d6cafaaf3c74d6453ac53ea3f848dde8d2164a8827375e492c4fc544d7b9276c3e7ca80cae4baf1b47c
 DIST shaderc-2021.0.tar.gz 220308 BLAKE2B 7178b99ce726f73e4eee2eb1b81b9575cf5a97a1d29bf0ed6a64ffde1095f91e14ae2c7f62d21f33bf2f7551e94b6d3e3c8fd149446899276a67d7df33a8e679 SHA512 cec230949f98589eef2532b02048e3d1b4a2c07ceff1043bfe5b30cdbd3511cdfcbb625cc115d9cfa52252b20a486e146db7e2e1944d89f9371811d64f9f675c
 DIST shaderc-2021.2.tar.gz 221444 BLAKE2B 77ba2a6cd5a08d19ef1e3e81b186a4ce5478aeccdafa940192347026dc550666eaf0acbf9c0e3ab5c62eaacf3c56c7bfc888480a13490403d30b0edaa173f19a SHA512 44779d3ec8c3451c51ad1a51a5644565dd7feacb0695fe3adc5c46fd2b5b5ca1220ed92f2178e0c56352a73db7c89653eac829b5cdc6ae8394902e1805b73ed3
+DIST shaderc-2021.3.tar.gz 221509 BLAKE2B 5061073e4489bdf2245a7cd18968a5a874cd33c16b8944b5c781b78e648f20bc8cf49b52e61ee3fe5b2aa029fa8195687079865403bb662839917b142421c49c SHA512 759eca72564bea59c06d31f70a85571a391360d5d428db85a30f934d080bb25e254ecb5650f71a96742cf417f09d819f36d301e92294a5d0d294581ca554248a
 EBUILD shaderc-2020.5_pre20201216.ebuild 2155 BLAKE2B b9a0a6025f0c9e3a2b0ef62507691774030e3c231d8bad678aeed53597bd20de3ee4410f858c44ec5503b6b37d5fe542a3ffc57e3665beea30cc909a48d9f01b SHA512 61eaaff97c665286998865ebb1b85287b37b07ef04b0c813d58d2cc0c7519d6ae09f47ed08cf7fd8173c95fba777e17a9bc8a1c334f71f5a32d1f3b05c52765b
 EBUILD shaderc-2020.6_pre20210327.ebuild 2164 BLAKE2B a1ce8d176c93ac883ce5e1992786a40db675c550bfd9356fa4c2c4c7b58f7e0f8fff7ae9890a58b49e9288f67913f3b43669d3a2936f64b29a2c6ce4e62cbce0 SHA512 197e4e7e5f67e8e0d56359d87f4a695d77720a3ca48710420441488a497670cb0091d259cd0420639e46c4e236da837c955826c7fd86d8f41d9ac741f723bcc9
 EBUILD shaderc-2021.0.ebuild 2152 BLAKE2B a3d9bd6c67b5cc94e30ca130b6b74f565a24544e6678ee05ece37d1c2a958c8159e8d2585c07f1dd1e88e8419fe1b3b4f9faaee1375641a6e9aa4b51e61ff0de SHA512 39bf17ef5ad6c7830bfd92e508cbc0b852fa8cfea649540b2a0657ba6e9a84c75ae5a8b33ff6230527b21738bcbc7cb4ddc1bb1dbe525a8f0d12d84a758927b3
-EBUILD shaderc-2021.2.ebuild 2144 BLAKE2B 13c33ab36976191738860985beab1940509c0410bbf2ea4bb9a3f344b0b5a9f86476c9c3cdef3490ed5b822ed62a9517c6acb4f02db0f819aa832e233babba15 SHA512 33795f2d9cc199062825a9a5c18c3e15518fa3477fb0c218205f455692ab8690cd9dec7b50e6c5ab27a04f27fd108378b8e9a06758e286171d0e79b6ea666ba5
+EBUILD shaderc-2021.2.ebuild 2143 BLAKE2B a261b5b0633e101afdd6e19aed5249b487a4fe96f07219315123fe648fcc938bb577e4ed8110a92e19ac04ad643f411b689aa041720b4564569954fa0b86d495 SHA512 d4505504b470dea73ef871d9691fe268987e52420371b37a0ca57d04bd07ddfad218814113b5a0b0a47ced0bc54c84c9cd8faf14bf61644646561db3222ab935
+EBUILD shaderc-2021.3.ebuild 2108 BLAKE2B b9bf03bf7618b61b75417734ec10ebb5bb0204416ae2a3f32918a07752d45fe1edbd4a2e6b0660ac2cbdf3280ff0c5bac697c5973fd59bde006fe1025a197068 SHA512 d28e8f07ebfcd27e0414b419286b07b751351600e2f3315a48d4cc72c9ef2aeae5e82c64d60400a1d27860f84bb9b0a208f44d750ab8536a1a2c555842145546
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2021.2.ebuild b/media-libs/shaderc/shaderc-2021.2.ebuild
index 10a734059d4c..94f52642f34b 100644
--- a/media-libs/shaderc/shaderc-2021.2.ebuild
+++ b/media-libs/shaderc/shaderc-2021.2.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/shaderc/shaderc-2021.3.ebuild b/media-libs/shaderc/shaderc-2021.3.ebuild
new file mode 100644
index 000000000000..5fde20a88adf
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2021.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+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.2.198[${MULTILIB_USEDEP}]
+	~dev-util/spirv-tools-1.2.198[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	~dev-util/spirv-headers-1.2.198
+	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/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index 9cbb1ad2c0f4..f5ff12b89cf6 100644
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -1,5 +1,5 @@
 AUX smpeg2-2.0.0-gcc6.patch 772 BLAKE2B b4eece6aee658b484b65856dfb851c1560af589825b8c99ed387f4a938d607f0c62d801373feee112d7226fa052fea8fbfdcde80c34f961cb66a26b198040ade SHA512 96681218f04db64414a8bc014260686f96817b914bb17f83865a2babc6f476069b12eea71b1b0956edbb3b7e4c776d6de7ebf2f4c87206146a4f2b031d5a9ed4
 AUX smpeg2-2.0.0-smpeg2-config.patch 1022 BLAKE2B a7b81a5c3f5ae886d1ec6e17011b602f25d568f4b781abb0608378ff000e3ce3cbad873fdf4da6d99853c603d83ef07516b19eca68e47ec3b694fdd99da071fa SHA512 1f91228f9e00bd60d2a8cbb04f0d9b9a5fbd4b5a53ded9547ae1d577afa12388b43a662e4c4e15e6b12f4007bd800c4e49b9c88812aef0ecec71a4c666686b05
 DIST smpeg-2.0.0.tar.bz2 311846 BLAKE2B 311de560d367d718eab4e014d4ea196f7bcb4d3e58b8a4002d81f63b76809530dc81a32a4f1163bb5003810fa3cc7257e3b8f94396acca580ac88d619fecfe11 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950
-EBUILD smpeg2-2.0.0-r4.ebuild 1125 BLAKE2B 3209405079eb87c9086451ff5aee0727875b64ba28602acf4f4dbf45c13b5fdba6df622705a1ffc3426c6238e421feae43f176377b6d10c6ab08decfeca1c3a9 SHA512 6a130cf000985d94670f96bfa5f2b129e285c6a4ec43f7bed094761f899e41aee9335cb01b7255fdd3057a06dc895ebf76e1adfccbae0daf1e2ce974975d19ab
+EBUILD smpeg2-2.0.0-r4.ebuild 1124 BLAKE2B f50e3cf77a5b4c8462ac909df08a8dd4ab129ecf8d1ec56a3e0ecf42256f935305fee64173024822896c45bacf150eb5ac94320d5fa47806070fb8fcf00a8b2e SHA512 0c0ca70afa6ae498691afdb5d57b305f00f3026496dec5847f145258e44561ff67ec3eeaae2ffe129fb96558f4dc4b1bebb2db50e08d5ffadfa47acdde862c5c
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
index 5f2aca6cc8f5..8a534f8ecaa4 100644
--- a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx"
 
 DEPEND="media-libs/libsdl2[${MULTILIB_USEDEP}]"
diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index 8cd289bf0de3..15729f2cc0f7 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -1,3 +1,4 @@
 DIST spandsp-0.0.6.tar.gz 3309837 BLAKE2B 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4
+EBUILD spandsp-0.0.6-r1.ebuild 1828 BLAKE2B 6448de7450b4927de3363b03a1282c285249bae2bd41932306d0bdf626a0071f47d6aa8a8de4e9be7b1fbe9e0a7cba5342039a27ca13a376e95ab6e7848ef239 SHA512 e0c9113f4b68d9990cef75a1413efb139422231b61cfdf93bf72a688e5c02ad2d570507ba9527fb98eceb9bb18717788ac2450cc913fb87679be61dfbc33363c
 EBUILD spandsp-0.0.6.ebuild 1990 BLAKE2B 7665e0a1e4003e7f6c70331fdee881615df879f1f32272dbc8ff81ec53a4931a65cd458febf6e03ca700c4392f820858a7ca0b8f73f9f059e620266e3417a93e SHA512 9502da0b5fd038cdb6ed8e4f368ae1e6fc45d78ebe106f324653ed70b3be613da6f86a7b003050fcf920dcb52be4b6f63cf7a37662f12071fb0cdcf574a9af61
 MISC metadata.xml 244 BLAKE2B 55f7bb21fa829b545045078abd465615b8e8d3ba8ce19e1acf7466d14d45d695d771d9d78983749f8e0290166f3eab703ea332169a4fda45427ad4baa6ff8512 SHA512 2dde78e90a526f069d855081163e58cbcd9cd9e0429eb1615c9ef8bc5af93bcea4d145333feedd8adcf8421e3417c7ebf0b03b98227cad03431f20cb014f080a
diff --git a/media-libs/spandsp/spandsp-0.0.6-r1.ebuild b/media-libs/spandsp/spandsp-0.0.6-r1.ebuild
new file mode 100644
index 000000000000..bbbf322e189f
--- /dev/null
+++ b/media-libs/spandsp/spandsp-0.0.6-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="SpanDSP is a library of DSP functions for telephony"
+HOMEPAGE="https://www.soft-switch.org/"
+SRC_URI="https://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3"
+
+RDEPEND="media-libs/tiff
+	virtual/jpeg"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? (
+	app-doc/doxygen
+	dev-libs/libxslt
+)"
+
+# Enabled implicitly by the build system. Really useless.
+REQUIRED_USE="
+	cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )"
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-3)
+
+# TODO:
+# there are two tests options: tests and test-data
+# 	they need audiofile, fftw, libxml and probably more
+
+src_configure() {
+	# Note: flags over sse3 aren't really used -- they're only
+	# boilerplate. They also make some silly assumptions, e.g. that
+	# every CPU with SSE4* has SSSE3.
+	# Reference: https://bugs.funtoo.org/browse/FL-2069.
+	# If you want to re-add them, first check if the code started
+	# using them. If it did, figure out if the flags can be unbundled
+	# from one another. Otherwise, you'd have to do REQUIRED_USE.
+
+	econf \
+		$(use_enable doc) \
+		$(use_enable fixed-point) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog DueDiligence NEWS README
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/{api/html/*,t38_manual}
+	fi
+}
diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index 3519e637a13b..f6c5dd468e17 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -2,5 +2,7 @@ AUX stk-4.5.1/010_all_removeForcedFlags.patch 269 BLAKE2B a02fe10d9d3573e063174a
 AUX stk-4.5.1/020_all_noExamplesOrDemo.patch 1029 BLAKE2B 8ea62554a8a609a1365cbaf42cbfedb8fa257fcd531a01bd014cb41da80c98dbec9f74b9f45b400f2aa6a02dcfb3d58662fea4bf8584e760f5d66827f9760db6 SHA512 546851ad25e842b67a2a441e4e4d27295993a1cfeb659a620a6ebfaeb66c9cfe779c8f1ee506bb93a31bfea9687fbd378a881f11e5ffbe182d1d2b0eb478bbc0
 AUX stk-4.5.1/050_all_cxxflags.patch 306 BLAKE2B 58708b9f0aded3069be8150407d877c97406fe941da895c3e7d7ededeccbbdeeb5dc2c10ef5e1a4b262943cdc147b66605764d58876aeb931e73e86fa8474b72 SHA512 36ecc6f6a03b9df258affd92079d3da06a5506a5e53ddc98934c47401c5b6745de7d0cb82b241c0dffda3d3baea9a32a7462292f1079fffba88425158562fa7f
 DIST stk-4.6.1.tar.gz 2593348 BLAKE2B 2cb269b8fb5732d55a394d5b8842c380b6a3e82e7338e972c6d22baf5ba1edee3f03ed699b9950d4a92a7ae3102bbb54f844ffd728c6478ebfb36328a1b89f2a SHA512 2a22078cdb630f7c014a5ab38070fd6a6d1e9aa719401e3190a040cb06b61003cd3095fe1a8890eff59e4fc42594fe893b4c0a8327175e1701c75de7537e1830
+DIST stk-4.6.2.tar.gz 2618125 BLAKE2B 8673cabbc57c5b520af62def967bf3923a91c7b619bd29faaebaa4e3fa6aabcd9dc43e605663d8062650b105ae60ebefc44a3fa420ef711119861ce03e77f130 SHA512 35a7f559cca5c9b5998528a566ae27bace3cac56cefda7ae54c06179f5002d2906c6ede6274bf06100dd6aa9dc0d1459bb8fca4a2072c686c2abfd493b6f2f3c
 EBUILD stk-4.6.1.ebuild 1362 BLAKE2B 09add9614f9da7e45b8bc6850069ab55d70c7578824ab786ce6e6b84a6698ada3870de4b1af28bf9e2edeb555853bf67bddab480f54de1cf8ad9df35f9c53bc8 SHA512 6d040c30472a90c5f54c6b250a622d25da5d5abbfa99a6c3156181857dc4e66dd842df49a9337ee33374e506cfbc740541ddefa9d5219f178e0648e8ba78b7bd
+EBUILD stk-4.6.2.ebuild 1364 BLAKE2B f8d3282ac6149083e417f46a00b7841583659eb5aac32e5cff400934f6e36fdd0b8ff1f48fbdaf1e803ab178952be86b95114fa38df1768dd5e1d5db9980a86b SHA512 a0c96de6900c6e484d2af1ec26cee0354be013d05d9fa6613dfc20d4060bff3b1fa98d6fd89825e9fbdb6407365c2b546ec24de9bd73992d4352cc352dfb4c5b
 MISC metadata.xml 366 BLAKE2B eac66d7663dd4db0dba433e2e6a2715f6e5a41f111ae812ef32f661d03d04379eb8d5c47476ccdfff552d0722df65fd575d749411f7016dd575e17b05072e290 SHA512 0fb8de1d946df0c5e38e81e1a168fea0fdd80f5499b446e21bb68f7ec27046d3d3fae802cfbf3f1d59f8aa93495e742feae04587dabad9fe2ac393ad80bee9ab
diff --git a/media-libs/stk/stk-4.6.2.ebuild b/media-libs/stk/stk-4.6.2.ebuild
new file mode 100644
index 000000000000..725704b60639
--- /dev/null
+++ b/media-libs/stk/stk-4.6.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Synthesis ToolKit in C++"
+HOMEPAGE="https://ccrma.stanford.edu/software/stk/"
+SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc jack oss static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.1"
+)
+
+HTML_DOCS=(
+	doc/html/.
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	#breaks with --disable-foo...uses as --enable-foo
+	local myconf
+	if use debug; then
+		myconf="${myconf} --enable-debug"
+	fi
+	if use oss; then
+		myconf="${myconf} --with-oss"
+	fi
+	if use alsa; then
+		myconf="${myconf} --with-alsa"
+	fi
+	if use jack; then
+		myconf="${myconf} --with-jack"
+	fi
+
+	econf ${myconf} \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		RAWWAVE_PATH=/usr/share/stk/rawwaves/
+}
+
+src_install() {
+	dodoc README.md
+
+	# install the lib
+	dolib.so src/libstk*
+	use static-libs && dolib.a src/libstk*
+
+	# install headers
+	insinto /usr/include/stk
+	doins include/*.h
+
+	# install rawwaves
+	insinto /usr/share/stk/rawwaves
+	doins rawwaves/*.raw
+
+	# install docs
+	if use doc; then
+		einstalldocs
+	fi
+}
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index 258c41f6fcba..68a44f2fff87 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -3,6 +3,6 @@ AUX svt-av1-0.8.6-no-force-avx.patch 506 BLAKE2B 7cb33489a5777b39a5eb041560c1ea5
 DIST svt-av1-0.8.6-r1.tar.gz 6416293 BLAKE2B 98a0c5547f63a9d04b5365a242d1a6e7b8f54449547309e53e9907d11d61c853f07ea1d8a5988ec1b67ef94bfd137ff1664f4352d9181cf96b5629f292c97f1c SHA512 535c073e53d99ed55efa0b7577a886dff136ba41f2d92e84ef0463b707136e156b6c4029e3ff7709be8ce54b0a7e7257af833b706b4282d7fd2636635df757d5
 DIST svt-av1-0.8.7.tar.gz 6396358 BLAKE2B 21a0d319078887809d08276b1a11b6dcca1be90a79c6bda19b86749fabb623918b9112de8ae3c7740b14f23d52e4e1c12ec0190f49880b09993525a857f8e334 SHA512 812b794eda930f53dcba6bb02bc5a3f417346705d64f590d7acf2d45df8d10985bd40c313eaaed514601ab699e23c87852059b9eb0b0ff8a717ef9fd80a132f7
 EBUILD svt-av1-0.8.6.ebuild 1428 BLAKE2B e9fd41c7982d1ea876f99944e8a3bfb35d784e502ec7ad3450ff122ffcc925b948eeec73b96be8da0d16cccbfecde6e7654abcd82ea58f76d7a5a595823bb84e SHA512 452bce21bfd5740ad9a31f3e6aa044769202885ec0ff3104832dd059854ac8aceb331650a044938772d692c6b00c1d69fea5e83bf85d99dd8fef5e1dcadea7f0
-EBUILD svt-av1-0.8.7.ebuild 1158 BLAKE2B aa37b0d9cb413a6b7c3d0b5939061df435328980bb3f81f61b9c77f3017529e10c5281c4f33b47b82e7fd4d566b8e44467aaa2d60008931afe2b54463f8e6cee SHA512 8fa276aaa14336ad1c7d8b4e8395ac55efd11fef737eb04010683d2499d0b2f92d6016493427a4083b854ebf7d4fd13b41e9f054e30121f5aee26085b0c9e8ed
-EBUILD svt-av1-9999.ebuild 1160 BLAKE2B a5b97254cd5239460e578eb0aa14343d0729a0fee1f9629e1649053390ec9c0d090824eb9136b399d4a62622c9938dc21607074a12c54a4f59441fd54c161abb SHA512 80bc20a865834668297ddf65d134b30b6a39659686d828cd780ec48c7a3e2fc43b596dbab9834238162bffca3bfc66ef03cf3d106449f5627ab852d81b474196
+EBUILD svt-av1-0.8.7.ebuild 1218 BLAKE2B 3b13b4d13a1a4f3cdabb0132f31effd13a41d0fb82b8dc43f6d8f8d58197fcafde8f4552f6826a57bd659fc773061522d7baa99bcd22c51472061d433487be50 SHA512 040451e4fd48df4813a31ce88c62cc7b5ca5c98a03029cd67918f57d92908733a9cef7abb89bf6eb9f4685e3f179c2d0f54718d310af98fd4c7226b1aefc560d
+EBUILD svt-av1-9999.ebuild 1219 BLAKE2B 4d565f27a6b6c9a3f1058f185f424200acd0b7afcaf55600185afaa3c150d80bdc987a196f18d5dad28ad777738e97f77f3a3b1cfeeec32fcbc8960538ad8741 SHA512 1367ff846e66fedaa059759cd5ae9ad8d73d8ac1d3f7d5a070678d48cf5f6a4d3d1b285b11a987baf8b71992b9e7c3c0a02d2f88b96e1606dea38cb9f75b8956
 MISC metadata.xml 561 BLAKE2B 1effb05644507ea39fe071f9de1fe4c1a4feb30f9bc429985cf464aea9f9bc1f525e0c6f5e75da47d373f0acd60394a2bcec3b71e68bc3ab031334f95717d3b8 SHA512 1042fb94a9c0b93c007843585e0ea075d187cdd6b77bb8eb94d5fcfaa7d083a98916aedcbfccd1fa3da3307ef8bbe7d623efa7e39ccc9714d23973497bec7a89
diff --git a/media-libs/svt-av1/svt-av1-0.8.7.ebuild b/media-libs/svt-av1/svt-av1-0.8.7.ebuild
index 1e5096e5b839..bac2bdb4319b 100644
--- a/media-libs/svt-av1/svt-av1-0.8.7.ebuild
+++ b/media-libs/svt-av1/svt-av1-0.8.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)"
 HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1"
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
 	S="${WORKDIR}/SVT-AV1-v${PV}"
 fi
 
@@ -23,7 +23,7 @@ SLOT="0"
 
 BDEPEND="amd64? ( dev-lang/yasm )"
 
-src_configure() {
+multilib_src_configure() {
 	append-ldflags -Wl,-z,noexecstack
 
 	local mycmakeargs=(
@@ -31,7 +31,10 @@ src_configure() {
 		# undefined reference to `ifd_inspect'
 		# https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0
 		-DBUILD_TESTING=OFF
+		-DCMAKE_OUTPUT_DIRECTORY="${BUILD_DIR}"
 	)
 
+	[[ ${ABI} != amd64 ]] && mycmakeargs+=( -DCOMPILE_C_ONLY=ON )
+
 	cmake_src_configure
 }
diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-9999.ebuild
index fc254194ce68..5f5a2bb626bd 100644
--- a/media-libs/svt-av1/svt-av1-9999.ebuild
+++ b/media-libs/svt-av1/svt-av1-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)"
 HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1"
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
 	S="${WORKDIR}/SVT-AV1-v${PV}"
 fi
 
@@ -23,7 +23,7 @@ SLOT="0"
 
 BDEPEND="amd64? ( dev-lang/yasm )"
 
-src_configure() {
+multilib_src_configure() {
 	append-ldflags -Wl,-z,noexecstack
 
 	local mycmakeargs=(
@@ -31,7 +31,10 @@ src_configure() {
 		# undefined reference to `ifd_inspect'
 		# https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0
 		-DBUILD_TESTING=OFF
+		-DCMAKE_OUTPUT_DIRECTORY="${BUILD_DIR}"
 	)
 
+	[[ ${ABI} != amd64 ]] && mycmakeargs+=( -DCOMPILE_C_ONLY=ON )
+
 	cmake_src_configure
 }
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index f5550fe6739b..45ebd6baa78e 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -5,5 +5,5 @@ DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be
 DIST tg_owt-0_pre20210626.tar.gz 16264716 BLAKE2B de500e02789516527c814d0aba87cf1d0e772747f06acff7ac9295508c6e6bce1915cd3a703df618ff17ba8e04dc194538a6ef859fa85b301bb63eceab2c339a SHA512 a5d10011c427d8685bcf0743c356ff8c58c3cad6c59ac2409298b30b15cb04233889a5ed0a18107ac5b3477eee96741fdc85176d4330c866e8e3329753be7d73
 DIST tg_owt-0_pre20210914.tar.gz 16266351 BLAKE2B 048d6a77046b10af63f4e5c1530b6aeb9d423702a6e34e6e0082a10b06262e19c30aa766cc9ea38549605d8d2cc08bfcd5a4e715ab53c46031c23938f94af27e SHA512 bd46393d9a85fa38fcd560af4f68a4868b25528b134731070e8578217cb0b9bb8b5cf7b3990f619d321ba373e5630a52e467e14d93f71b24de3a5b3e591b8866
 EBUILD tg_owt-0_pre20210626-r1.ebuild 3365 BLAKE2B c1232b870dba6f5516256c9b667062099bdfbf4959486e52d5cb6ad7907ce7e723002eb8354dc06f4324d1349d24650a443b4e4629ab46511828367b7843424b SHA512 baccbacc571087336040fc5f24f0456be0dc395c115e748650ce43bb29ffd2859d6ea4686ff900c13fb63d12e20bcde001824524f5b0d7c5a1b8a252ae3e7fba
-EBUILD tg_owt-0_pre20210914.ebuild 3551 BLAKE2B 462afa298c4dcc8c93d95fb10053698cb8829a31e0c8e154547e39778e3a7f4000f369aaa802f3fe1f2c21ea99bdfba0c3ee80f7a33f1338ae25a2e264c0a709 SHA512 4c06fdb457ef8f39bcbba1502bb386b684ddfce82e3f34ac7402eedba0222802ce13e24393aa65ecaa16d7853e1a9ad5c32f48c191375bd81c4dee6af4bb7bc4
+EBUILD tg_owt-0_pre20210914.ebuild 3550 BLAKE2B bd23e195adc8d17d68a022319a859004edf8c5309a1eacb010414dc4844a5ea78db106db8f6ecbc3c32ab187cd243d7b3d87af49793bae841324470aaa7bac38 SHA512 dabe6b1c68316e7926c7b7b773bbfadbf32feac4d0bf597f2d1e0e6a7fa84e65eb309fde1bdc21e16855d25b71ddf4c1972a79422f748a0a11c3031108bd5052
 MISC metadata.xml 546 BLAKE2B 10baf770f70a00730c78dee6661096db60de2fd04ddd1f36c54d0ad2423ad78127eb70c56e15dba9dbd15ded61d3a9ee0587987e2bf1d6420204dc1a67a6d6c7 SHA512 cbd8187c0c2e0c7824f82d15a6f2162871339350953ff9f09b42f74077c5d53c9456059437360a823739bd06622ac37b86bd5c5ef17ae284dfe71fccb5862760
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210914.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210914.ebuild
index 44dc8909be7b..7b86c6adb9d5 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20210914.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20210914.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0/${PV##*pre}"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="screencast +X"
 
 # This package's USE flags may change the ABI and require a rebuild of
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 0cb3b3db44c8..b7df5f70623c 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -8,5 +8,5 @@ AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48d
 AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c222981de896c8c6e9d66a8dbb1cbe5b90e54e3f24b07bea23c508c260e0639720b4103ada81fea3277e06ca63939 SHA512 6403f48e858af2f8a177588e231367c09f8c939fc614198a10e45ca83ec000f9d5baf67681c5a65fe75177d59d34ab10c19c3621ac0eda6382793ed3b6bd8d84
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
-EBUILD urt-3.1b-r3.ebuild 2347 BLAKE2B 8570eb525f1bcf36f9f3912691bfbe63724e3a3d1eeb324f67235459c8186190fc47cbb4da269b2740bc1f0d40596b8c4cfb58bf8c8a498eefb5b13065e7fd29 SHA512 08fd522346aaab593e1c02d62fcb6e4a1e60d45973d2040224fcf6470cdc375b8bfdded73fe961e6cbadfcea9f0fb45f74064b8e70506aa61f5b37a8ea78f049
+EBUILD urt-3.1b-r3.ebuild 2373 BLAKE2B c60b28a56aff709c549f5d0184c8f3aff75022fafd624c7e8ad09ca27a08d33e6f9f5279b3998bb21754ed00d1a6b914f091805e241db7a5a27fed20ba2413ad SHA512 8cd65d6534ad28a32d0294dec03363a69d8528e132e9d1677fc6a24570bed7ae0833c8ce4a3d38175e6d1b0f9f7eef969acc79cab6a1d56616d6a64890731d2a
 MISC metadata.xml 225 BLAKE2B a54914e6c67f39dfe7ff921407b1ec063e68eab8292fbc6863e5bb41481f26cf474b7d3281669ea23545cedbed586350a99c305fb3d3a888a3848de13aeac5a4 SHA512 3fd10f5461db46d8be442335e29cdcfba7425e0d93443d45e4238c6767669ce5a0371fd4eb31df6129c089fd90e5433ed9d4366d288d6d2e8ac673bf435d4256
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 99e08abf1455..4bb63a9695dd 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit flag-o-matic multilib toolchain-funcs
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images"
 HOMEPAGE="https://www.cs.utah.edu/gdc/projects/urt/"
 SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
+S="${WORKDIR}"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
@@ -24,11 +26,6 @@ DEPEND="
 	X? ( x11-base/xorg-proto )
 "
 
-S=${WORKDIR}
-
-urt_config() {
-	use $1 && echo "#define $2" || echo "##define $2"
-}
 PATCHES=(
 	"${FILESDIR}"/${P}-rle-fixes.patch
 	"${FILESDIR}"/${P}-compile-updates.patch
@@ -40,13 +37,17 @@ PATCHES=(
 	"${FILESDIR}"/${P}-implicit-function-declarations.patch
 )
 
+urt_config() {
+	use $1 && echo "#define $2" || echo "##define $2"
+}
+
 src_prepare() {
-	rm -f bin/README
+	rm -f bin/README || die
 
 	default
 
 	# punt bogus manpage #109511
-	rm -f man/man1/template.1
+	rm -f man/man1/template.1 || die
 
 	# stupid OS X declares a stack_t type already #107428
 	sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c || die
@@ -56,9 +57,9 @@ src_prepare() {
 src_configure() {
 	append-cflags -fPIC
 
-	sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr
+	sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr || die
 
-	cp "${FILESDIR}"/gentoo-config config/gentoo
+	cp "${FILESDIR}"/gentoo-config config/gentoo || die
 	cat >> config/gentoo <<-EOF
 	$(urt_config X X11)
 	$(urt_config postscript POSTSCRIPT)
@@ -69,7 +70,7 @@ src_configure() {
 	$(has_version media-libs/giflib && urt_config gif GIF)
 	EOF
 
-	./Configure config/gentoo || die "config"
+	./Configure config/gentoo || die "configure failed"
 }
 
 src_compile() {
@@ -82,7 +83,7 @@ src_compile() {
 src_install() {
 	mkdir -p man-dest/man{1,3,5}
 	# this just installs it into some local dirs
-	make install || die
+	emake install
 
 	use tools && dobin bin/*
 
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 3d636585a14b..635b22b6c099 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,8 +1,8 @@
 DIST vulkan-layers-1.2.182.tar.gz 2791196 BLAKE2B e4c2a80708b7805425eb58bc360db8aa8ac9a671ef88a261f09887f59cbacb56e1375a868589864c30a9a812c91a7dc2c7d3ebc0eda5afc7cb99dfb7f70af2de SHA512 2c7541d18926507fb7f36193a5901e2d3f864749e5c9e456c32bc8e64bae58e661d01f8871c596a2b05e2e5bf86a4c80c6207d7cc942a51cafab81f052d91805
 DIST vulkan-layers-1.2.189.tar.gz 2869378 BLAKE2B 54a610c95487873c470ea304f8bbf0160a9def6a06118baced0a1b14a847cc116f3a2377cf0a287b866dffe9ff9657133ba1fa7109e0c23380412ca4f389c6f1 SHA512 7fd688365cbe69d763bb233d7be2498bb5aa286ba26c4ca9d4bdeddc28cf3f69992a89d6276d3f943d198146dcc01eca36b1d8de5747ae0893244bdb15665855
-EBUILD vulkan-layers-1.2.182-r1.ebuild 1628 BLAKE2B 992c3a0140cbc51b98537a764144943184a5c7b1157279b24ae39c9827bc7ddedfa8bcb607d71ef670056f2102ee223f512a6d2bed215fe39c2f40daf9a3f4d5 SHA512 7f0ca45cd8635bd819e260ef17d2b832d241e676d5533a4008e775c7edd4481967e088bb09bbe4e7bc382fc1fcce6890b411abf78fbc53ea707840bae5b277cd
+DIST vulkan-layers-1.2.198.tar.gz 3555293 BLAKE2B 1a419b1b4b50241f6f4225a8666b8f6f4fc00e30dba045deeca709f4b9ff777f8a66691ef094b72cbf059c9dafee9f1ad2986108e48c8ef3974ac805c103644e SHA512 c5ac3e458987f3aa8ca21a79aa7819fbc1ca6013b6e445a82407ac0664884b90b8f79a2593368f6264a509674aa1f9584614c7c464c88d74284601f0c7636ef0
 EBUILD vulkan-layers-1.2.182.ebuild 1533 BLAKE2B 992ec98e7c6d6787254dc7ceb65dbf23bc1eec6035fd1ea70800d578f3b1d16997249482492c9af907a88287571725f3445bdd3ad3f9f1d7ed83fdd6cb6d1518 SHA512 828502e90aac0998009a8def204569b7b87a341656e8dfa353f6447f695b1552023d357223a7ef9834338d435e5a4113347de238137a9de14d1239b763fe28c4
-EBUILD vulkan-layers-1.2.189-r1.ebuild 1623 BLAKE2B 6ae0f9d895fb1f88f0de6149e3de890b4b04db2d3eea92e6b2aeefdde1e818296e17f7820a7cfd46e95f7378896431ae12292ab36e66f7e175422a27c2592755 SHA512 4234d7522b4673625e8faf2c6b57a3826ab35fbe863f4c23771a632e6a2ad70ffc6c658692bf1f4843d164de274b009384afcafc917fc80c28382b7ce3da6816
-EBUILD vulkan-layers-1.2.189.ebuild 1618 BLAKE2B 8c28c096372ea7190f52c566205ca86831ff4e01a753bdaf568b282055c315b920c5b3da237918557aad45cef4ea84d70d0c6d2be06d9efb2048996d17c34b3a SHA512 48b844b83d549fca92cd008d650895fe056d8bcdf036cc42336eb3a80c5e0b960556ee35fdf7beab3b4fa5cc03a13fa42628e72a025d3d805542f3c060b3bf40
-EBUILD vulkan-layers-9999.ebuild 1625 BLAKE2B baf32cefd70c89313f33c8e3b2591d1cc524fc7c644fb78ccf4b1940b7b6bb2d193d7ff8d9b956ab2701f0e5643ae9d4cfce27c59bfaf679c2ba002a9438e597 SHA512 f3c67e938aa6f279abfce8f0cdd42a5c51d18ebbb39d2e412cf49208c554cfcb56b0647c8dca24a167c4689de6c1bacec42b49e7cda8b126791f33583882403b
+EBUILD vulkan-layers-1.2.189-r1.ebuild 1605 BLAKE2B caedc28c9debc00a11712c115acb39aa18603021463c79492e00bce8d09baa6edf8d5423076952baf96400be5484b4f5ba1d64c2746b36bd668936c08d59391a SHA512 5a20b176f821946dcb2be5e54b4d1fe9026d94d42b381c31571c33c96f050882f7ce7ec6f319b1d55ab63cb9c5be730d722478821daf62cc2fefdaa43e4e12a5
+EBUILD vulkan-layers-1.2.198.ebuild 1615 BLAKE2B 0bfc9cdcd1f3d1e587333f07edae3803a7667c2d0d80ac9c048dafda7267ed5a44d21611df70c0fc747f516290e1cc229a51c484a8ca6969af4a9e91043047aa SHA512 1bfd6b1a389c15d26844503247555bcabf59d3454e40fcaa5be96fd8cbc31de617e1f2dec39b473bd26179a93ffa0a3330a523dc1e17ad6751a65ddb85d4b188
+EBUILD vulkan-layers-9999.ebuild 1618 BLAKE2B b8adf8ca2c8004280335fd4954d93c311cfb20c036d23e02a9b487873e5d29e4aa5cb606b25f53bd8e7f2774da921fda534d5bdfcd88adf0cf250063054d1ff1 SHA512 5b7f8211e9df28f328e639ac742c7b92e09bc2565e559a1d4335c9575e4ea9344ebf4604224340fcf8d8dc00cc0de7c674ce7593c3b88e00ee3d947ad094d4cc
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.182-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.182-r1.ebuild
deleted file mode 100644
index 7e1ddb7b15e7..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.182-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{8,9} )
-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/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-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-2021.0_pre20210526:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-cpp/robin-hood-hashing
-	>=dev-util/glslang-11.4.0:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-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
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild
index 96afc66b53d7..8031ea7cdc59 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 
 multilib_src_configure() {
 	local mycmakeargs=(
-                -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
 		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_LAYER_SUPPORT_FILES=ON
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.189.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.198.ebuild
index f53561f9c1fe..614ac325de3e 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.189.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.198.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{8,9} )
 inherit cmake-multilib python-any-r1
 
@@ -14,9 +13,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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}-${PV}
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
 DESCRIPTION="Vulkan Validation Layers"
@@ -27,12 +26,12 @@ SLOT="0"
 IUSE="wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND=">=dev-util/spirv-tools-20210825:=[${MULTILIB_USEDEP}]"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-cpp/robin-hood-hashing
-	>=dev-util/glslang-11.6.0:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
@@ -40,12 +39,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
 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)
@@ -56,5 +53,5 @@ multilib_src_configure() {
 		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
 		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 3e0893062695..ecfbe9b339e3 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -13,9 +13,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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}-${PV}
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
 DESCRIPTION="Vulkan Validation Layers"
@@ -26,12 +26,12 @@ SLOT="0"
 IUSE="wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND=">=dev-util/spirv-tools-20210825:=[${MULTILIB_USEDEP}]"
+RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-cpp/robin-hood-hashing
-	>=dev-util/glslang-11.6.0:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 
 multilib_src_configure() {
 	local mycmakeargs=(
-                -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
 		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_LAYER_SUPPORT_FILES=ON
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 509a84a45607..4f9e12f3295d 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,8 +1,8 @@
 DIST vulkan-loader-1.2.182.tar.gz 1469024 BLAKE2B d180154bd0878c45327b1ad06a8efcc637b73fd75ad5ca349740d7f8d6944b2974828cb055a32150c4db4eb94f1b420d94852228d91e46bd8340229fa0ad30fd SHA512 06cf308caae1fd1992b279e8130b8f40bdcc7df44294c73e221d537950c689e552afeda4ae9406645b1d773693fa27c7727ab012daecbcff2793c4995c7f0db0
 DIST vulkan-loader-1.2.189.tar.gz 1508029 BLAKE2B d889c398d886e2bd6082bdd4f728078986b15610da478634475c2b17f860bf127fa5b81d409f1298d4d3705a1b9274bb982447a425a930ac5ac3fe44de6aaa08 SHA512 358bda8081bf86b0cc119c15ed791d63e4fc7273d95e550dac11dfadf3d3f9b709936207a9b0fc3b53595b9f46c41d47f573613c5d57e789b58405a5a5cd5b14
-EBUILD vulkan-loader-1.2.182-r1.ebuild 1768 BLAKE2B 843b07eaa32df0abf97b3c0d24e113ae375d41b81f846514bd33c71fb3d6ae2fd18d18816b299da59e2fe5a39c14c8304777156c95a546be1fa4ed1ac718dadd SHA512 741781dd57a026c7a65caf661b32871557397e55874756dbe100e609cb3ce2400b526e86f2df7e276559310702e95cd8d9cd277eeba4155ef9cd3fa9fe2c2936
+DIST vulkan-loader-1.2.198.tar.gz 1440922 BLAKE2B 5048a85155f94cd13f36fae48414ae3a0ea5f120a22f8b199fd43a2813b7168a9c5310ac6298ec2dee6488012d17d06043cf37dee38de265924e408f36498ed7 SHA512 92fc0cfa872e286abe4aa26a68a2bb90683b68425abbe001a62ac511c76850ad08102634e64ac06a88cf8ab225e60ddaf5bc80aa2c4bf68c25c0c47e5782f4fc
 EBUILD vulkan-loader-1.2.182.ebuild 1667 BLAKE2B 75d53c06a5e6e626a5bcb760e39906067b90fca29e4ddf8fca11f9f3da90541a7d3fc08fd4975e6a2c106c8473e3ec2fc852b3f2e37bbfc3ba9c33dc9dda7bf3 SHA512 43696cc21f3b86c0a6877e55477f50bc28c98794679b164266a3bd77f16ec98f4db8f0085c4551a698287c384f847a0d2e3cecf2072bb38eead9d3ebf87efe64
-EBUILD vulkan-loader-1.2.189-r1.ebuild 1753 BLAKE2B 4c6bea321968924514a5fe89ccd43aa33e9882e98ecc4d903b955595d513347d869c2fdb32bf5c411bcc00b7f3b0177c4a6468e6cd6cafe6edd9fad7f0edb147 SHA512 3ec16027e0b2e7b3dd4ebb58f974c97ef2c0a480c2a7046ac1946cb5dde2d2a48e0397d0773740e882426d23d31b2bb1bf0c95fd803cd0df29576f3061fe42bc
-EBUILD vulkan-loader-1.2.189.ebuild 1768 BLAKE2B 843b07eaa32df0abf97b3c0d24e113ae375d41b81f846514bd33c71fb3d6ae2fd18d18816b299da59e2fe5a39c14c8304777156c95a546be1fa4ed1ac718dadd SHA512 741781dd57a026c7a65caf661b32871557397e55874756dbe100e609cb3ce2400b526e86f2df7e276559310702e95cd8d9cd277eeba4155ef9cd3fa9fe2c2936
-EBUILD vulkan-loader-9999.ebuild 1755 BLAKE2B e8ebe917cf146debe19418fa2f3d7d0d2bdc38260ebaeb4fc5884858b8445969e3f29e2e09353e77eef5943d6862783b0634cac405ce70a8ba022d1fcde1cec4 SHA512 110b2dacae4a48440358113101da867628d4704fa597fe6d631c3b743e4e234a27e8c563278e8095562af6d9a0ca991707ac93dde1da7fea751001578b5cbe8f
-MISC metadata.xml 415 BLAKE2B 94633d326c90331f76a9c603a2217bf0ebb2fb397981417c00c45603d6e8c2c1b251f4b22a8905e3fa3dcb684ff0246e774b26c5c9d6ea83c8db75f40166da6e SHA512 2a85db4e86c896c5954f25ed21964d75f7a46d9f6f65bb9676834bb12ee23ba38d02b63aee0c0bc6c3616b9b9f7e6ff13ca0d1cfbfb71a42f07bfeeb242b7b42
+EBUILD vulkan-loader-1.2.189-r1.ebuild 1749 BLAKE2B 01a80f1c37d590fde2f2b08d91e0abadac06f5bd511b35a6b0a6ed447046973e0479c1296b70e937b1bdc8733b1d629c00a5b96d02ec34385947fc0488c984a8 SHA512 8622292a36a4b506822522efb64043ba676affa83d511a6e611b768f00548d663734e4d8f71f212701feb65cd210cc039ffb042a266c885e4d6d260d996c3cc0
+EBUILD vulkan-loader-1.2.198.ebuild 1766 BLAKE2B 49c51cbe49671126cb244fc0b91d7c44b431817462ba7a4ac7d36110308fa002fe83f3b26058c88407b812ab2404f8b392fcd88dcf6119686ae5835312c6a147 SHA512 133dec0c07c43dad42e5719171c54939b6850249321a994c67891f6797e0adc6f78ad434bb31b8004789a971c1fe2cea844983663915eaa4dc23a63d4c64b888
+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/metadata.xml b/media-libs/vulkan-loader/metadata.xml
index 292de6dc5063..ff730de5d43a 100644
--- a/media-libs/vulkan-loader/metadata.xml
+++ b/media-libs/vulkan-loader/metadata.xml
@@ -5,6 +5,10 @@
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">KhronosGroup/Vulkan-LoaderAndValidationLayers</remote-id>
 	</upstream>
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild
index a0cfbaaf12f3..788fdacbefeb 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.189.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.189.ebuild
deleted file mode 100644
index 45bfc80ea55b..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.189.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
-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/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${MY_PN}-${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}] )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-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_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-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-utils_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake-utils_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/vulkan-loader/vulkan-loader-1.2.182-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild
index 45bfc80ea55b..18dc41ace6c3 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.182-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_ECLASS="cmake"
 inherit flag-o-matic cmake-multilib toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
@@ -13,9 +12,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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}-${PV}
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
 DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
@@ -36,10 +35,6 @@ DEPEND="
 "
 PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
 
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
 multilib_src_configure() {
 	# Integrated clang assembler doesn't work with x86 - Bug #698164
 	if tc-is-clang && [[ ${ABI} == x86 ]]; then
@@ -47,6 +42,8 @@ multilib_src_configure() {
 	fi
 
 	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
 		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_TESTS=OFF
 		-DBUILD_LOADER=ON
@@ -55,13 +52,13 @@ multilib_src_configure() {
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install() {
 	keepdir /etc/vulkan/icd.d
 
-	cmake-utils_src_install
+	cmake_src_install
 }
 
 pkg_postinst() {
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 035beeeddcc0..18dc41ace6c3 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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}-${PV}
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
 DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 57609943e42e..a5f0d76424f5 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -3,10 +3,12 @@ AUX neon.patch 677 BLAKE2B 805177f9d3d3f703699adad93b0ca655065b9d093ecc3776600fa
 AUX test-ns.patch 14677 BLAKE2B fa48d03bca5d72b7b3eac7f6ac98c93bde12ec845f9eecdde2c4ed5ed4ac6688d74ea75e11f00d4f901967f81cd80f138eaae662bd6cc1f67948121c3c0b2e34 SHA512 c6d2752027e42403704c68948256c52a237f8b83ee97d4b8e21cc13654964342ed061e5f048984fb649e9980f4899a64931ec97d6dfa1b786db6346134b04281
 AUX tests.patch 650 BLAKE2B 21759b11966e12df1a72a1ed00935ff781ad8b912e734de65cf0872cf92400aef71d4aebbe067dd1059a1d445cd9819cef4dc4b1c7df63ca7b8e97b8e578045e SHA512 a4a3b69fa86e6910ff4f963b9667c8deaea4ff88f3396e8e426e61d036b12cbf550bff7867657da1ba98417f1ccae88db1887b94ea6271604060e01fb8698d79
 AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f05cf9c499412d491127c877c342b1900bb9d06d66126aca2f383da1a4986ce69670ebc392fec0fe9b59a9 SHA512 bb4ace2c4bc899a0ccdd17fb78e63980354f41ff0f201812d47c5df16b23fea6fcdbde086e737d0efd5d8cb8fa571a131c03433bec31999c71ff51bccd754950
+AUX x265-9999-arm.patch 2115 BLAKE2B 92f2225fd23030220531e6bfda7a3d4ce197090a7b1d996fe5995885fe332352e3628ca3fe307d2ae7af2d0342b183c5bbe4337201c51fb4092e273eae2f1308 SHA512 602725dc487397466c48d4d0aa09d8d63b3519fc72cd9538e732c2c82f6f3fa9c959f6f29ff3f810fec82dbdf609d9fd37fe05dd67496fc4c8bbda5f87c9f165
+AUX x265-9999-ppc64.patch 385 BLAKE2B c75bd6e0e7c1ded2b4858f4cbacc337d6015a0387a0fa8dab87964f1995e8e39cdce3f69dc2bb0bb338f5df5fff2051ef5dbcd065e59bd4905282349850e92f6 SHA512 5601b0f29136d5b36f237841b4d4ed6ad0d7cdaed559b8b450352d9fb406b1e0c91ccde11b32d7e32b9ebf6622c85aa2ed44c63bf6ebe5a08550a1b24ebe0eb8
 DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e
 DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
 EBUILD x265-3.4.ebuild 6377 BLAKE2B 8cc509d9a0d7c8d4b0ed2226f3eae682035f725648d0c43b3083c6db50ae8afb3351855f38204a55bd1b5dd8fec3d6f6e11c5f12a0b3533f051e16983cef10f2 SHA512 d634f733615b5c2abbb3ced26c867e18a997172869e7991066d9f7ca18486f2140ee8195edd2f3584a3479f5a556ddb7e4e428d5a2bf963b56c9fde993853843
 EBUILD x265-3.5-r2.ebuild 6350 BLAKE2B 0b952a0dc4f51ad94c34ce61afd4a89c4d581157016680ef2825b729e94f28dbeb4273052ac37dcc3ad66479b6369e771c6d678e63197e79ff132731a120080e SHA512 13821133cc698549521bc92cbe5644176db63a43c79b2f91ccdb373f5eec0b6384624ce50498978031e973c5eab3cb98a4ed814ed5651ff0f63b1839057eab5d
 EBUILD x265-3.5.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85
-EBUILD x265-9999.ebuild 6350 BLAKE2B 0b952a0dc4f51ad94c34ce61afd4a89c4d581157016680ef2825b729e94f28dbeb4273052ac37dcc3ad66479b6369e771c6d678e63197e79ff132731a120080e SHA512 13821133cc698549521bc92cbe5644176db63a43c79b2f91ccdb373f5eec0b6384624ce50498978031e973c5eab3cb98a4ed814ed5651ff0f63b1839057eab5d
+EBUILD x265-9999.ebuild 6361 BLAKE2B b48741992dbfbf59f5e67a2bfd0ffa0bb81aeea05ed27fe113e56d0ed3a713c6ddd686699b36539b8b7ef687ebeddfe519e117a25782eea229b8ac8eaa07ebd1 SHA512 d6f6a7b9562cf546f7baf7eee64ae93f9e25b5e17d264484487bdf88f217ef6b1f7b88cb5ef42350ae4e2085eadaa01443a32689410f2a97e1fe4d6f8d028375
 MISC metadata.xml 622 BLAKE2B 337e399c3be2dfc52c2f422a76ae80faad2424d221e074041e06cc0a10403bea1aca3975ae6afaf9bb4b50cc5069db8413928e8697458014c6f96d1856421f79 SHA512 be4f7c57f732fa836cda726da9426a0e4bdac2a681a4be3bb157e7cf7b8f517e3002653d9ee7a58ba81601d34fb6168680453bbdaa10389b65945f7b4d1a492c
diff --git a/media-libs/x265/files/x265-9999-arm.patch b/media-libs/x265/files/x265-9999-arm.patch
new file mode 100644
index 000000000000..218d92a0ab41
--- /dev/null
+++ b/media-libs/x265/files/x265-9999-arm.patch
@@ -0,0 +1,64 @@
+From 85ee373b0d1f03e7600366eae64a767e07298688 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 1 Dec 2021 15:42:38 +0000
+Subject: [PATCH] Respect CFLAGS for arm*
+
+---
+ CMakeLists.txt              | 6 +++---
+ dynamicHDR10/CMakeLists.txt | 8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9580413..737bf14 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -249,14 +249,14 @@ if(GCC)
+     endif()
+     if(ARM AND CROSS_COMPILE_ARM)
+         message(STATUS "cross compile arm")
+-		set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
++		set(ARM_ARGS -fPIC)
+     elseif(ARM)
+         find_package(Neon)
+         if(CPU_HAS_NEON)
+-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
++            set(ARM_ARGS -mfpu=neon -fPIC)
+             add_definitions(-DHAVE_NEON)
+         else()
+-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
++            set(ARM_ARGS -fPIC)
+         endif()
+     endif()
+ 	if(ARM64 OR CROSS_COMPILE_ARM64)
+diff --git a/dynamicHDR10/CMakeLists.txt b/dynamicHDR10/CMakeLists.txt
+index 22fb79d..3639281 100644
+--- a/dynamicHDR10/CMakeLists.txt
++++ b/dynamicHDR10/CMakeLists.txt
+@@ -43,14 +43,14 @@ if(GCC)
+         endif()
+     endif()
+     if(ARM AND CROSS_COMPILE_ARM)
+-        set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
++        set(ARM_ARGS -fPIC)
+     elseif(ARM)
+         find_package(Neon)
+         if(CPU_HAS_NEON)
+-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
++            set(ARM_ARGS -mfpu=neon -fPIC)
+             add_definitions(-DHAVE_NEON)
+         else()
+-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
++            set(ARM_ARGS -fPIC)
+         endif()
+     endif()
+     add_definitions(${ARM_ARGS})
+@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")
+ option(ENABLE_SHARED "Build shared library" OFF)
+ 
+ install(FILES hdr10plus.h DESTINATION include)
+-endif()
+\ No newline at end of file
++endif()
+-- 
+2.34.1
+
diff --git a/media-libs/x265/files/x265-9999-ppc64.patch b/media-libs/x265/files/x265-9999-ppc64.patch
new file mode 100644
index 000000000000..8219dabf7c4f
--- /dev/null
+++ b/media-libs/x265/files/x265-9999-ppc64.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+ list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)
+-set(POWER_ALIASES ppc64 ppc64le)
++set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le)
+ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
+ if(X86MATCH GREATER "-1")
+     set(X86 1)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 58018488f52c..d686f028c1da 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -31,9 +31,9 @@ BDEPEND="
 	abi_x86_64? ( ${ASM_DEPEND} )"
 
 PATCHES=(
-	"${FILESDIR}/arm-r1.patch"
-	"${FILESDIR}/neon.patch"
-	"${FILESDIR}/x265-3.3-ppc64.patch"
+	"${FILESDIR}/${PN}-9999-arm.patch"
+	#"${FILESDIR}/neon.patch"
+	"${FILESDIR}/${PN}-9999-ppc64.patch"
 	"${FILESDIR}/tests.patch"
 	"${FILESDIR}/test-ns.patch"
 )
diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
index 3d22fc52be74..f384025de9e5 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1,4 +1,5 @@
 AUX tests-gcc7.patch 677 BLAKE2B 23258f8fd35fd650524b8b79a324206e73ae8921792898f3b57ad9f2412b79517e4bdd9925ebb997b5066dacdad3d9c480ac8cd54d65b7eba44219ecd2f91f9b SHA512 88e19bbb5e81f506dc031a2d8c2232396840784d3b22cdc67f8358792020c060432881c3a8ca126a96e779f83a12dd8209d7691c14cd2857a536dc0c84f3f074
 DIST zvbi-0.2.35.tar.bz2 1047761 BLAKE2B 5fa5fec7e39c9adc6590f3f6841a40ca723ffb6a017854f71f92f32232103672a6f48678b244a84f0cad742c378ffdb247fe33e5e3cdb1ee4d737e92f650a548 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d
 EBUILD zvbi-0.2.35-r1.ebuild 1310 BLAKE2B 3a39874142819cbce255db14190f91ddb234311fa0659ba01c1a4f46cfb4f55aa77563a5a5a6cfd15a7bf070caae56d7a30fc8afbee9e60e507fb15e657900e7 SHA512 8e03bdd6ac6f30ff695e19d920ffa2c579f92409f9d0fdaf0be2eed98fb0662346221dc5df609c0392d5dde0183d697c6d6a49aedb4c0cde892dbdce139dcee3
+EBUILD zvbi-0.2.35-r2.ebuild 1402 BLAKE2B 3e004ba6900746b8285d54f92f1cf186c8d8f61f31ac92fb1b6dd41195c607c459f06f8b0b80a5321a241b149b1874d2412a5b021e5815d509370bac0484be8f SHA512 eebc6d0c851671d9e0001e2b62214a6ba22de93f05ff8854f301dd09ea12dfed1a558e626217d735788809936a4c70bfb9282103d28baf10a024fda98905ecb9
 MISC metadata.xml 245 BLAKE2B 894dfe5af9a598364710f2e49e15797eba64682c9ffe57083fb91326da36dd10551183dcd64e23e0aa859d781f09f20620bebb409938c36470bfac7c8284d443 SHA512 fe1a9e2524495b2d585056a05c6ab1a2495b62df868d6973f7c7cbc4b626c36e5b11650d42cde35053784cade7b8353eccf8c7e55822a4abf3d07918d9f7b77d
diff --git a/media-libs/zvbi/zvbi-0.2.35-r2.ebuild b/media-libs/zvbi/zvbi-0.2.35-r2.ebuild
new file mode 100644
index 000000000000..7e283497ec0b
--- /dev/null
+++ b/media-libs/zvbi/zvbi-0.2.35-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="VBI Decoding Library for Zapping"
+HOMEPAGE="http://zapping.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/zapping/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc dvb nls v4l X"
+
+RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	X? ( x11-libs/libXt )"
+BDEPEND="doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/tests-gcc7.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable v4l) \
+		$(use_enable dvb) \
+		$(use_enable nls) \
+		$(use_with X x) \
+		$(multilib_native_use_with doc doxygen)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		if use doc; then
+			docinto html
+			dodoc doc/html/*.{png,gif,html,css}
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	# This may have been left pointing to "html"
+	docinto
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index bb1046fce6f3..d30f62118de1 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,3 +1,3 @@
 DIST zxing-cpp-1.2.0.tar.gz 97942494 BLAKE2B dc220783fe8a9c1ea321ad5b7835553985a06318f909af1574131b55f3a4bb71f8cf90f56925dfe8338df5cc24f91d93d8a7626cd8d2c01473b1ccce09bad8b0 SHA512 e61b4e44ccaf0871b5d8badf9ce0a81576f55e5d6a9458907b9b599a66227adceabb8d51a0c47b32319d8aeff93e758b4785d3bd0440375247471d95999de487
-EBUILD zxing-cpp-1.2.0.ebuild 660 BLAKE2B d4d8812bdfbf4f3253cec8f4b65e3c54376e04dd786c6bdcd1fc1131825735b92dac9904ff3d3b732d93ad2101d5fb809f7405bdd670ce537f46cdbb007ff40c SHA512 49090a4c60e88be60100decb56f0d35e09449a49a8204714c860873f5f7750a739d035286086a839b7767983a9b826237dfe828358b0fbf201ed4b4d586447d0
+EBUILD zxing-cpp-1.2.0.ebuild 667 BLAKE2B c06f2ee502cc29e76b45db3717bfe9c44ff13ba3e608d6b71cac366bbbf5a885f80ca2c29a76b38f449c819f0a63f1728c34f90c5ce5546722480f28d0fba908 SHA512 71cfdac3c721210be90bd99f36cf21d332d9fd8d97e320c3af124619e8b2a2a580d949e0dd48c422c7d392be5e8a8d9acc48b0c7f9d6d4200996473219c584e9
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
index 9e660d195aee..dab05f6d9546 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 src_configure() {
author	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
commit	2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree	c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /media-libs
parent	e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)