gentoo resync : 25.10.2021

32 files changed, 502 insertions, 146 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f215a25b6965..0d3f56e34265 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 7874472a7a13..b5612cf112b1 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 1765 BLAKE2B a3f06cca7426f8e7e2c434160d22add6d368d068191df0597c051f5c956d96ddec4bf1a86e1c75b77a2c2c23b4ba3ea043c64ee4ae4de01249265ad2c11d191c SHA512 241f433d0b28f96fa2daba465bd861e10d4e013e5e1f127a2507e6179e28e8b66a4cfc2282a2929234ee232a1a4b4ffbde34efbbfd7813f2a893d7f67e75d494
+EBUILD babl-0.1.88.ebuild 1764 BLAKE2B a8639a733775e68891695369b91789dd72c470a82716f59bffbdf8bb9b5a8734d1c8231750eec76007df10b35edeefefef13e09c7bfd46d5a1b5fa6248f6e5cb SHA512 397967060ce7396bfabe010598f93f8a2b2164d7534c6da78673f32301208cc1ffa0881a188b4ac15f83b4db89dde225c81e7a94e380d17a64a7b2454374ff2e
 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 4efedaf83c70..c6e3624b8c8c 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/exiftool/Manifest b/media-libs/exiftool/Manifest
index 427ffd381a42..d45ca4546e24 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,5 @@
-DIST Image-ExifTool-12.26.tar.gz 4933296 BLAKE2B e45683243b82f8276aee498d52a88d5b34eaf8b28aebdd631f70e30bb91ceb52224dc994ed189b914f024be4eb471b07bf9f1d860d96af2ab211e482b9ea194e SHA512 15bbff738e151d3ed5c77a17c99ded6cc3da2050fe7df94c42aea544aa31d7f539d70d07fd5336ae018af05b7f168712f1367046d8004861fce58442c03f82bd
 DIST Image-ExifTool-12.30.tar.gz 4948601 BLAKE2B 359c06dc5d4f71e186d7a265488cb16e47e40438d8a0e2d4e74f75b6aac7efd1c5b3271a158cb8b822eace5f6b437d5d39458c31ae8e6e886e93f2e643f8c9a9 SHA512 2966854d8fd163fd5aaaca5608eeab2a3f0681fe9e22e006840acacd2ff2aaecd6076bcec23989facb7baf64aa96425ad7eeceb4045da44004421b8f10050935
 DIST Image-ExifTool-12.33.tar.gz 4958375 BLAKE2B 699529e71e87cf2a5b4d1a69049f48b7b00ce8e720918cb25c2f2b35453fd44c580444bca2ff14d6cef76de99568b2e22b98ea87f45e550d69b40dda464831fe SHA512 7d6bb1942597535cc982e77397b4dc2edee3f361338f82cf2b5f24fd7fa94c148312b125d1d4f37c8dd303eed45173a805eb79ba61a6e74205e21c52f7561d90
-EBUILD exiftool-12.26.ebuild 543 BLAKE2B 3c64bd7b7a5a26358572ebb599df5c815200cee69bb7121a60d51f94eac2ffec1d6b19027150acf57474e05d8921272c1012dc71d95b1bfcf4abe54d2be44d2d SHA512 d98a45ba549b24053b9fb21a2bf61250fd73f5ca478dd24db1f1925e7d0c6956d183f235b7a4542b96794500284916e10d6c2eef73a82ea94338f74f5c35dfac
 EBUILD exiftool-12.30.ebuild 543 BLAKE2B 3c64bd7b7a5a26358572ebb599df5c815200cee69bb7121a60d51f94eac2ffec1d6b19027150acf57474e05d8921272c1012dc71d95b1bfcf4abe54d2be44d2d SHA512 d98a45ba549b24053b9fb21a2bf61250fd73f5ca478dd24db1f1925e7d0c6956d183f235b7a4542b96794500284916e10d6c2eef73a82ea94338f74f5c35dfac
 EBUILD exiftool-12.33.ebuild 533 BLAKE2B 9aaa41daac00428adb11e56e14aaa1bcc69ea84234230b889d643c1ffb354241ac05a2dada47cf48c8eb434c0449c8967d259ca5332b624548ac4b1574d282bd SHA512 a8b9220b794ff46809c4f35a1edde7ef2415fed4a0b2a53cc6c2ae2ad88fae0581f1f14b4f79d4c6e70e938a9695cc1e191901b18d60ccc65d861591ef0dd6d3
 MISC metadata.xml 10040 BLAKE2B 8bcecde1df2dd3e79c3bcfbd38dcd9d3db9564a7abd5a684e0204779bcb685946f2eeb83a62efaa03efc841f0414b82f1087a3da3c6bd5f43e85561e43d7fb3e SHA512 af79302b57833d1368eff738b2326dd9cd47de47baf42426bfb00f61c1c6f52fcdc41d74bf95d8f65b2b0b00578ce07c3471b8cf4923e2f47c2c0b9d58dea35f
diff --git a/media-libs/exiftool/exiftool-12.26.ebuild b/media-libs/exiftool/exiftool-12.26.ebuild
deleted file mode 100644
index 579e441d9422..000000000000
--- a/media-libs/exiftool/exiftool-12.26.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://exiftool.org/"
-SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 1a50dbe32e72..58ada722ca39 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 4772 BLAKE2B f836d4e8dec2fcc1e980b7f4f455558d92878939fc5cf5ebefef9eccad28f7559bd5e799834a340a324b515a6d360e257b01414b08ae410410a1f28332841534 SHA512 f59ca98ae2590ac71a9cbf1698f91bb1c5db9fbddd0e5fb675bce3f99f589356779c0c5279aa6558dceab5ac4573f9e5586318ff99773b856e282fd86ec23d69
+EBUILD gegl-0.4.32.ebuild 4771 BLAKE2B 6b31d6828ab6d41ac54c8c047638735056035aa87e57784bcaebd33550a2234ff7358024c6a71170977302b464dc6ca0000e338f59a073d12a7f49a94ab9862f SHA512 0d20581dd9220c7928c78b9425d9f6516ad9d396b1e6855097c8c6ec8ef660f26e8c34ca45b8f116167ab62ed65f88635c274e56285bdc441d7e330520e6ac85
 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 95d000ce76ab..755a9e960031 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/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index 69d826e3a3ea..606625306a17 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -3,5 +3,5 @@ AUX ladspa-sdk-1.17-properbuild.patch 3984 BLAKE2B 12a65c1118a070a4f408cf4ec9ffa
 DIST ladspa_sdk_1.15.tgz 71179 BLAKE2B 7a201fd968433241fda190874d51b835f425c8f35270dc8fac9acf4e9e1546fa20d48f85e894b9eb263dd5d84c2b407481d168e18256dfe2cdd026fe0c805a65 SHA512 a521622e23d988284244003e4ccfc3b42f6ddc7944cb00e7949b87e09d7f39a0cbb64b6d8b5a5af0a5ccf7179f88815416a88f02d3912957167e54b74accfc65
 DIST ladspa_sdk_1.17.tgz 71052 BLAKE2B cfb80e8ced314d5cc62fcb7f0b82e58f572503f2a732b2bb8a58343e8f69e417c0b0a2919bbb40629567fb331bf60a7f0c6f186db47e5b2651725b039526cdbb SHA512 37f94aa52b5a2f8709528989dea289eb01342f3bcb9e85d0f4829ddd9d90b2934a113db11100f09375a50f6612122b78156fec916f2c78a22406253d5cb394c7
 EBUILD ladspa-sdk-1.15-r1.ebuild 1218 BLAKE2B 4975611ec6f2d6f8f53645bc2354c9c5bd456343a27846875529cd0e6811fe7193bf89e9df0a4045a4a2a2335ee0301f09ddffe9d35af6f1a6caecb96c3307cd SHA512 4d77ec73526b2e9e67e1f78671155787ad3f6c70b362b1d4dcb6bab2f1528fdc03803185cd61968bd1bf9f7a872e3f5af6d7a75e4469a361f29b200062132dfc
-EBUILD ladspa-sdk-1.17.ebuild 1260 BLAKE2B 6aa65c004ff1589c571a0eeb213579d0203584af86097a35c5ce48d8d3f5941141fc630a0ebb90c6e94354a3b7277350a91f87a4de9d839066a6eb347f05aed0 SHA512 a44d002f899096a82d98996aac401ce2af992fbd32f5be06df3bf6de54a2bb4a53d58d9a8a6411e8a36399c9a4d4d36d893c625df981b0329965972f273bc6a6
+EBUILD ladspa-sdk-1.17.ebuild 1255 BLAKE2B 1c7ba763494785af7d07216ab5a40bf2d4242e4f64c46ae7d7eb1fd332d01df4d1b97918e876a08062c029a36d028306e5d7380e1c59e13914f6ed484f00a0ea SHA512 247dca4458b89d1443a73c13239e086bb4daac8b42072255faa63f8633b360381a67b9786a2322a90c33bcaef8de06dede248544f51f20bdf475f5607e4dc4c0
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild
index 209b002aa3ed..401c28e7dea1 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 CDEPEND="media-libs/libsndfile"
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 36f54567a56a..d9a2e6957d95 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1,5 +1,9 @@
 AUX lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch 1067 BLAKE2B 1c56383b9a791ea5bcc8762a23c92426d308d6f55e5b51ec9268a779bb202144958f9cfa02686d72bf260d2beeb08b3ddf0c58441bf1a899032c408fd137df93 SHA512 af9930e67b6a0a3db26a97326e68a8e8a2d3ac57c378cf8f79397f514ec18ab600efb84b941d0449ffc8d620564082f8942a428c1fefa3cf199d972a7a4f9622
 AUX lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch 5462 BLAKE2B 73ebe5037f11673232363ee4ec99aea828b37ea24469ddced15593310e8f7f7806c08bddde40583640471d2566985d5002970dcc6f8f3d64ff369cfe3a3567e7 SHA512 1f5fb5c3b0dd115da478bdcf9c47e9c269c13613604905df8b0a80fccf5b039ee2c1ce0f433c68f783b11e5faf1756fb66772f0e313bdb0ae6af3c2a5cf35ab3
+AUX lib3mf-2.2.0-0001-use-system-provided-act-binary.patch 5370 BLAKE2B c5d3cfe734311995f9fb98a4c7083267af04740e9cc94f6251ec01a837cce8e52587bae4f587a246317976eb60be931c44d1b6bb5f0d72599d07845cadd1a8c4 SHA512 4832d2661dab796e78a737f7aca2f7516e4f4b8c29d0897779ad82be91ec523941f51d39564ad61b01a158a5f313c365a26d5499ce2ccc85793fca8f81b75aee
+AUX lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch 936 BLAKE2B ac89b89c223eaa81334da6ae84d1c785beccea2687b883954a93ede0d7fa49d11afc91ff5a6d41e195d7feb959d4317986cc97ac58047328ce372e40e787cefa SHA512 42c9ede93e79c7548b5ed9bed2f5ec0e275441ab5daa5cf9eb72f31610da512b7a3f118a075a8cfc21d1244c96ba42efadaee8c26c1b1837295e8a2ce4a93255
 DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846
+DIST lib3mf-2.2.0.tar.gz 16439833 BLAKE2B c98f57ea99f90625f2bfbdbcde9df8dbd8aeccc655e1bd9be165c24b2d9fb74471e4b01c816d8f665e5793db77c7bcf52016f030ec1947f908d6647e9ad12745 SHA512 2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
 EBUILD lib3mf-2.1.1-r1.ebuild 1422 BLAKE2B 2a5d1bba2b34e3aba7f8b852ed81af4056247e586ebad940d48cbf07d1b1e28b03ded6ed85c958eba45c0ee7d9b40368c57415c212b51862c92745accdf8e100 SHA512 86bd28c9587a9f081049e0fe839cd39b0dc45b7eb90e87b2494fb4855f27a056ca87b114a730160b16591c63bf75ead6229bd5305bfedb8d38ae21c3d5ce2278
+EBUILD lib3mf-2.2.0.ebuild 1473 BLAKE2B 8d54e479362e612ada18f5f7f83697af1acca76dbeec229aea371d2243403c93841b58140ab1077d3291402036ad5067cf6d9f71a6bd00975c589e28e44fec19 SHA512 6e5c41f2d4808af2c91671f4e37f1a4a344c1fe36f5310d8867bde1ed4bfc260a8ab7f8be9cc5c8872c18f8d618230b5d78e23c12f645696a6b037d37a4e2bbe
 MISC metadata.xml 936 BLAKE2B 55b169d62c7b8e9ef8ab789c16a286ee545f6c5519833e9c27e23765fe279b059050f526b5ceb2c59eb63d8568348c403326ec5b5d2d9925728298f3875673e8 SHA512 dee8668538fab0a6ea13cce39c0b817d59ee4dca58fa3f15e1c7b995dbfbb2abe63e1ec27b5b47c7d40521daeffc1db4a357c3c9d07e39f60c9b8851066ad9fe
diff --git a/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch
new file mode 100644
index 000000000000..35beebf19306
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch
@@ -0,0 +1,141 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 25 Aug 2021 09:29:17 +0200
+Subject: [PATCH] use system provided act binary
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 110 ++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 73 insertions(+), 37 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d70a030..9c91496 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,14 +62,19 @@ endif()
+ 
+ 
+ ### The API generation target
+-if(CMAKE_HOST_UNIX)
+-  if(APPLE)
+-    set(ACT_COMMANDENDING darwin)
+-  else()
+-    set(ACT_COMMANDENDING linux)
++option(USE_SYSTEM_ACT "Use system provided act binary" OFF)
++if(NOT USE_SYSTEM_ACT)
++  if(CMAKE_HOST_UNIX)
++    if(APPLE)
++      set(ACT_COMMANDENDING darwin)
++    else()
++      set(ACT_COMMANDENDING linux)
++    endif()
++  elseif(CMAKE_HOST_WIN32)
++    set(ACT_COMMANDENDING exe)
+   endif()
+-elseif(CMAKE_HOST_WIN32)
+-  set(ACT_COMMANDENDING exe)
++else()
++  find_program(ACT act)
+ endif()
+ 
+ set(CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED ${CMAKE_CURRENT_SOURCE_DIR}/Autogenerated)
+@@ -80,36 +85,67 @@ set(ACT_GENERATED_SOURCE
+   ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/lib3mf_interfacewrapper.cpp
+   ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/lib3mf_interfacejournal.cpp
+ )
+-add_custom_command(
+-  BYPRODUCTS
+-    ${ACT_GENERATED_SOURCE}
+-  OUTPUT
+-    ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
+-  WORKING_DIRECTORY
+-    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
+-  COMMAND
+-    cmake -E make_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}"
+-  COMMAND
+-    cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
+-  COMMAND
+-    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
+-  COMMAND
+-    cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source"
+-  COMMAND
+-    cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings"
+-  COMMAND
+-    cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings
+-  COMMAND
+-    cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/"
+-  COMMAND
+-    cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
+-  COMMENT
+-    "Generating hourglass API bindings and implementation stub"
+-  DEPENDS
+-    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
+-  VERBATIM
+-)
+-
++if(NOT USE_SYSTEM_ACT)
++  add_custom_command(
++    BYPRODUCTS
++      ${ACT_GENERATED_SOURCE}
++    OUTPUT
++      ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
++    WORKING_DIRECTORY
++      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
++    COMMAND
++      cmake -E make_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}"
++    COMMAND
++      cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
++    COMMAND
++      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++    COMMAND
++      cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source"
++    COMMAND
++      cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings"
++    COMMAND
++      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings
++    COMMAND
++      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/"
++    COMMAND
++      cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
++    COMMENT
++      "Generating hourglass API bindings and implementation stub"
++    DEPENDS
++      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++    VERBATIM
++  )
++else()
++  add_custom_command(
++    BYPRODUCTS
++      ${ACT_GENERATED_SOURCE}
++    OUTPUT
++      ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
++    WORKING_DIRECTORY
++      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
++    COMMAND
++      cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
++    COMMAND
++      cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
++    COMMAND
++      ${ACT} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++    COMMAND
++      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
++    COMMAND
++      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
++    COMMAND
++      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
++    COMMAND
++      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/"
++    COMMAND
++      cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
++    COMMENT
++      "Generating hourglass API bindings and implementation stub"
++    DEPENDS
++      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++    VERBATIM
++  )
++endif()
+ add_custom_target(lib3mfACT
+   DEPENDS
+     ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
+-- 
+2.32.0
+
diff --git a/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch
new file mode 100644
index 000000000000..742c877e2b41
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch
@@ -0,0 +1,29 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 25 Aug 2021 18:19:25 +0200
+Subject: [PATCH] [Gentoo specific] remove add_dependencies
+
+Remove the add_dependencies commands on ssl and crypto.
+We use global openssl support instead of package libressl.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ Tests/CPP_Bindings/CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Tests/CPP_Bindings/CMakeLists.txt b/Tests/CPP_Bindings/CMakeLists.txt
+index 4a816a5..c26c498 100644
+--- a/Tests/CPP_Bindings/CMakeLists.txt
++++ b/Tests/CPP_Bindings/CMakeLists.txt
+@@ -47,9 +47,6 @@ if (WIN32)
+ 	target_compile_options(${TESTNAME} PUBLIC "$<$<CONFIG:RELEASE>:/O2;/sdl;/WX;/Oi;/Gy;/FC;/MD;/wd4996>")
+ endif()
+ 
+-add_dependencies(${TESTNAME} ssl)
+-add_dependencies(${TESTNAME} crypto)
+-
+ target_include_directories(${TESTNAME} PRIVATE
+ 	${CMAKE_CURRENT_SOURCE_DIR}/Include
+ 	${gtest_SOURCE_DIR}/include
+-- 
+2.32.0
+
diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
new file mode 100644
index 000000000000..d37a2212018b
--- /dev/null
+++ b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
+HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
+SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+system-act test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libzip:=
+	sys-apps/util-linux
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	system-act? ( dev-go/act )
+	test? (
+		dev-cpp/gtest
+		dev-libs/openssl
+		dev-util/valgrind
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
+	"${FILESDIR}"/${P}-0001-use-system-provided-act-binary.patch
+	"${FILESDIR}"/${P}-0002-Gentoo-specific-remove-add_dependencies.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
+		-DLIB3MF_TESTS=$(usex test)
+		-DUSE_INCLUDED_LIBZIP=OFF
+		-DUSE_INCLUDED_ZLIB=OFF
+		-DUSE_SYSTEM_ACT=$(usex system-act)
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DUSE_INCLUDED_GTEST=OFF
+			# code says it uses libressl, but works with openssl too
+			-DUSE_INCLUDED_SSL=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	for suf in abi types implicit; do
+		dosym -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
+	done
+}
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index fbab1db913b2..31fdd2510604 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -3,9 +3,11 @@ DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d
 DIST libavif-0.9.0.tar.gz 2961252 BLAKE2B 75a3d9c0f9ada1934fdafb8208571c6a863ffe04210d84b26207952028280d4e5c4efe42a6d4bc1fe417e3bbc06e8b93c416472c79ccd08d760ab65a663e16d9 SHA512 220ef27edf716af4ffc5b035c63f84e2848f165a3fe9c1b74dc0ba29f0de65147610fd4266f1b2419f60cfbb72159368da840fcb574c7a07364a60548d3db179
 DIST libavif-0.9.1.tar.gz 1985366 BLAKE2B b498f00c56fe3058cf11f10cc629aad618ad297b625155ec8012f88493f8ae076933e4a4ebc7d97249019a64f01b68db34ab7ff5f9c35db0b1b74dd9048bd191 SHA512 15fa857ee40aeae2ee077d244c6e11a34193f2348e922b5dfa8579a91fa6ceff05c7146e85f9222ebaa6ef2d76e876ea050e8056990cad80850fb4d9581de9a5
 DIST libavif-0.9.2.tar.gz 1987058 BLAKE2B a734014945498d29121d64e54f34b367582688bd230f16b58635c363a9722b36ccd58ae0a95918c0322c0cb38b3e29b68bdc344bb99f61adc1397969db39f480 SHA512 04400ae76214d2f0361a14897d6ee97be675375865bb96c8d237e9a4a1152ac1a966db903c11df82da71b0bc68599a5857e038cc90d63c5d3bc77b13169a3e75
+DIST libavif-0.9.3.tar.gz 2000521 BLAKE2B b9dbaf01e58058a1ab9191081242a0f669b714d319075b6330963bc8ae31f576fb77b108de4745125eb42d39682e74a3174d062a029ccb765b3030f4092a96b8 SHA512 8e95666c784d1badc7e18d27a7c21cae3b8ef3b8da9a762eb8f7216d77fba29b9ca309c01d13bcf4890e03c6bc335ba4baf3f5877396bd0584be9ea60018daa7
 EBUILD libavif-0.8.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6
 EBUILD libavif-0.9.0-r2.ebuild 2721 BLAKE2B 6978875aceb7269de52fca731e0686d7e611ceb42fc37986bf6f1b12b145647671d976dc16e9babfa96fd865658134986d6e6f64610a284cfeda3264ca5c9cd5 SHA512 cd4c6b648e88b27cd18f05f83e58759ebc9809db3fa4fca1957af1d2561f62adf99c632033de704c8ab5131e3ab3d03977bf5636a221db8f5e20e4fce221438a
 EBUILD libavif-0.9.1.ebuild 2676 BLAKE2B f7bc18c5ff496903a50754a83aa5389726a6758879e978f602221770a952b6d0e9dfc8f2642e9782325bbe9041d2c13ed4eb77e712461f2e73d6a95c794dc0e1 SHA512 bf7780568db50757782179613174d49eb89b5a9ad6f02d68ce99adb84e36e83b5543220d49dc491152b13f9457a2de850d045fa6965c803112f854b3e647916a
 EBUILD libavif-0.9.2.ebuild 2685 BLAKE2B b5fd74a300dd3167c34ea9f871a35406884c9112cf27d708029099bd5b5bf42ce0521b0a4fcd31e738d8ed649962905413155eda86ddeb79047c7c5fc6a7548d SHA512 1087e0d6b53ec58c8ed480b04698effb05d21023ab61c46721926cc964398e76434db47c34605ff1d2d16a1874992b4cd4917d36e098b9963b80770139cb3f25
-EBUILD libavif-9999.ebuild 2598 BLAKE2B 30eb997ed8776849fe1a6c075b93169da72ac416ca84e7d0c6a4b8ea6a83eff005a1586eabe28955a8bc453161953dda15f9a90ba94340f239f41b819b0eb9d6 SHA512 f4b650f6ddd67b4a230d4560311f2419c4b8c5c8efc0811350631dfd08f43fced574dc522a36426164fe43a8f77ad6b956c0f25d2c149a067fd7b1d678c25961
+EBUILD libavif-0.9.3.ebuild 2685 BLAKE2B 0f6cc7db239d213abfdb46f9ce06a0cb1a0653a415b1768e83685969285a4dfb1c02dc8abe9a090864917d997e57b6f2f083cc4844276cb81e0eea610e063e7a SHA512 2223df3902818becf0eafcecc2132b0c7b93bba2dcbc16bd37d041ea214cb5b5a479e6d64c44c7588eb7f95cc0a18422c87d67a60f27e3f737cf7fc95dcafc70
+EBUILD libavif-9999.ebuild 2628 BLAKE2B 67bd1403f9cf9979656c700e2721504b5a1722d9a2118cf65ae68c7a5318de24c4ac369c687951923850d405bfce3e4b946e308065a70152bb2d1024351e11ca SHA512 365228304035635158d9e985ee9d3db7b90079f604fce794a900dddff11d1310adfe07533a4592121e0abd9a402f1e7092fbe7153d582bb41f7bb0594207ce3c
 MISC metadata.xml 874 BLAKE2B dff9e32442e51d4a3ef60fc1059cb2303b3f0a8c0d026ee8703086509fbed4205e28f4bf043b90af2f57ccbaf7dc861dcefb633b1f306bea1d3f32a5373a5643 SHA512 9f5c37e9ebe71fe47512a7ccc493559bc46132874dc00f16b0b60ad108fee9eda6c2a2c87b21309505e46cce46776a9917ec587874906d1d62b1c2e28b0ea31f
diff --git a/media-libs/libavif/libavif-0.9.3.ebuild b/media-libs/libavif/libavif-0.9.3.ebuild
new file mode 100644
index 000000000000..fa6ad1dca623
--- /dev/null
+++ b/media-libs/libavif/libavif-0.9.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
+
+REQUIRED_USE="|| ( aom dav1d )"
+
+DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-3.1.2:=[${MULTILIB_USEDEP}] )
+	dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
+	rav1e? ( media-video/rav1e[capi] )
+	svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
+		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+		-DAVIF_CODEC_LIBGAV1=OFF
+
+		# Use system libraries.
+		-DAVIF_LOCAL_ZLIBPNG=OFF
+		-DAVIF_LOCAL_JPEG=OFF
+
+		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+		-DAVIF_ENABLE_WERROR=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+			-DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
+
+			-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+			-DAVIF_BUILD_APPS=$(usex extras ON OFF)
+			-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+		)
+	else
+		mycmakeargs+=(
+			-DAVIF_CODEC_RAV1E=OFF
+			-DAVIF_CODEC_SVT=OFF
+
+			-DAVIF_BUILD_EXAMPLES=OFF
+			-DAVIF_BUILD_APPS=OFF
+			-DAVIF_BUILD_TESTS=OFF
+		)
+
+		if ! use aom ; then
+			if use rav1e || use svt-av1 ; then
+				ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode."
+				ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}"
+				ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}"
+			fi
+		fi
+	fi
+
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if ! use aom && ! use rav1e && ! use svt-av1 ; then
+		ewarn "No AV1 encoder is set,"
+		ewarn "libavif will work in read-only mode."
+		ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
+	fi
+
+	if use gdk-pixbuf ; then
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
+	fi
+}
+
+pkg_postrm() {
+	if use gdk-pixbuf ; then
+		# causes segfault if set, see bug 375615
+		unset __GL_NO_DSO_FINALIZER
+		multilib_foreach_abi gnome2_gdk_pixbuf_update
+	fi
+}
diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild
index 1cb15d73dc44..1be688c4b5e7 100644
--- a/media-libs/libavif/libavif-9999.ebuild
+++ b/media-libs/libavif/libavif-9999.ebuild
@@ -15,10 +15,12 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
+REQUIRED_USE="|| ( aom dav1d )"
+
 DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/jpeg[${MULTILIB_USEDEP}]
-	aom? ( >=media-libs/libaom-2.0.0[${MULTILIB_USEDEP}] )
+	aom? ( >=media-libs/libaom-3.1.2:=[${MULTILIB_USEDEP}] )
 	dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
 	rav1e? ( media-video/rav1e[capi] )
@@ -26,8 +28,6 @@ DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-REQUIRED_USE="|| ( aom dav1d )"
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
@@ -40,6 +40,8 @@ multilib_src_configure() {
 		-DAVIF_LOCAL_JPEG=OFF
 
 		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+		-DAVIF_ENABLE_WERROR=OFF
 	)
 
 	if multilib_is_native_abi; then
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 74cbc00afa3f..476c10db9da0 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -7,5 +7,5 @@ AUX canvas-fix-an-integer-overflow-in-caca_resize.patch 5265 BLAKE2B e75b3366a8e
 AUX fix-css-path.patch 502 BLAKE2B c494c458524f98017dceb41266ed051cb3bc9f00c57185715d2ec7846ea5ea3990419d5b8a99062ace0f63ca06e68a45eb4c85210aacc2a6f29255b1088683ac SHA512 de6c43fb73d86dd8e8ee1e22e329ee2201bf09947568382c4637145b297edfae206c269edd05e08000d5670734f8e2c3373c5095682ac850cce588c4cd0cb636
 AUX libcaca-0.99_beta18-fix-tests.patch 1886 BLAKE2B 8961c617ae568ab19b0404a8ddb1e4da743f7792b36fd32ace460071c04754f8e5845200333f96e4b9602f547d3249da301c3df62cee7bb20235da6a3242789f SHA512 583b440f93d2d468b14a707946eda928811b8c6573b1a48a1f6010d2f3713399689434531b0068ebbc1999dc82867c7ae6da0bdea9fb754277eda484fe39b1f6
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19-r7.ebuild 4486 BLAKE2B 6dcb00531ad0b499562a307beba7a2ed4573510c79c2ae5c9a213dca35844920ce8905c42ba43eb73e98e8879139bcf9c138ce462f7d945e81494538a109f241 SHA512 a730447208e7d604e7dea5dac7d68ccb4aea0fd90574c47d0386973d9418df1dacdd7267251b5cb492b425066f288012a6f804b336c3d7e3ccf4441c186011ba
+EBUILD libcaca-0.99_beta19-r8.ebuild 4490 BLAKE2B 2e53735e7b60e1f8224217724cbaf1f019329ec374520c915b4c0a73d9066c241e4ab21a2f9e144c4d26fda5bf4da4e9e84cecd8b43dca2883b77a9128f5dac2 SHA512 42f35bb2b657d16eabf6afe1a6323ae892edae5bd6bc87f8ec17647751831a7d9f6ec2c6ddfabcede558b22b21cb93a33ec17504a7e3a0864b6a7c0f0fef04cf
 MISC metadata.xml 220 BLAKE2B 6f39345ea8474519439cc9768baf57bf07c0d8051eba252c30638ce35f30f8cbd1ecb06f7448893fa72ab9338630c83211fd366d66136b6ed090558fb376982c SHA512 3a2781821a74f9512a2b1fa55c8982a23f880b96b1707fdedf129d37685c2793eefe75a8080afe2bac64ed44d5f24648e6a25e163f87fe76a2b6be76b995647a
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
index 1fbb143b911f..07175fc779eb 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
 	)
 "
-RDEPEND="java? ( >=virtual/jre-1.5 )"
+RDEPEND="java? ( >=virtual/jre-1.8:* )"
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
@@ -50,7 +50,7 @@ BDEPEND="
 		>=dev-texlive/texlive-latexextra-2012
 		dev-texlive/texlive-latexrecommended
 	)
-	java? ( >=virtual/jdk-1.5 )
+	java? ( >=virtual/jdk-1.8:* )
 	test? ( dev-util/cppunit )
 "
 
diff --git a/media-libs/libsbsms/Manifest b/media-libs/libsbsms/Manifest
index 7db20a551636..6d0c66dcc3fc 100644
--- a/media-libs/libsbsms/Manifest
+++ b/media-libs/libsbsms/Manifest
@@ -1,6 +1,4 @@
 AUX libsbsms-2.0.2-cflags.patch 688 BLAKE2B f42728c599064927973f65a1eb3443cdf7a931f4f5d971a61d749ba4f0b990b34d8c47a2d52b08c5720202732e8409f006dae481b94634ba5b97a57f76bfdf40 SHA512 330a26e5b4b99f00546a2f625c4bae90f8a8645e855379e7de4f833a1c561c3c8e23f0faa954a989359f0de09a1310374ff93644d2f646bae3b9788293cfcd29
-DIST libsbsms-2.0.2.tar.gz 450170 BLAKE2B a9e75f1f2a3da2a407d21bd267fe842d2c2367f85e4cb588902ae34e56b76297c2f60968113ae7a08a6652e57bc20376f1a60e97d6d59863f9f1ae30589e0723 SHA512 8aaab3e191f3e10e559683ab4ebdcb8d951cf0e776390234f25675a98640d60d20aed872061ba72fdc3bd7827b7d46bc27225fe947cdd7fa4312f75cbdd78e6c
 DIST libsbsms-2.3.0.tar.gz 450111 BLAKE2B 3707b573ffef414e5373526704d4e54bf0f53b6bc5d9ce6e69bf22e11e5380eccb65a6c26e3598ee4bf43f341a7dcc6e1a7d7f5113bb649ef9e94b01ba36cc0f SHA512 e5b544c2bdbaa2169236987c7a043838c8d1761b25280c476d7a32656d482c6485cb33f579ea9d1ce586ec7b2913ed8fdcf1abe5c7cc8b9e4eef9ce87de54627
-EBUILD libsbsms-2.0.2-r1.ebuild 784 BLAKE2B 414e5f2dc92fc10d170c6c2cbed4f357b72ad24d2044f040622d0887880af25ee93bd02a23d14c748cce8288d7877b5951e8b8a950dd5ff502b7a53b9eec5bf7 SHA512 b9894035166644c45ace5ec82b0437f6dbdad6d82b6b29bbf780f35c39012fb762fffea6d2260ee5197a59f226ff2fc402e0a15e767c4f58f97335b7fa64dfd7
-EBUILD libsbsms-2.3.0.ebuild 879 BLAKE2B 5ef94cdaffbd1d5f67df68cb47c2085dcc37bbafceb0db07690db64034f5c3e43078aa2c8764288ff7e36045b80675686b84a5c5611a5dc3d51400420ef96cac SHA512 f1014c1987b3c852a20763307f1f90c2d64939e52957033774a0f4e5de8e8e81eb1d3b046455a55518b0625c9ff679e4159f425f2c5ebf0cfaf9a66e55029ee7
+EBUILD libsbsms-2.3.0.ebuild 875 BLAKE2B 2c0fa9149e46023e980cbb1f1ff5b2afebacf9d194068947180f7ed9a889520595c99fe8854b97f2ab66919022e78de27d8616ad1bcf3b8a7f9a9c9ebfec056f SHA512 7906a3c7887a014d43b198d009ac3590b0e25f5d512efb5897529251e237ee8dcb616cfcd6389b0ec4d81b60981ca66d40360a81205e32c58ef19bcb6fc260e8
 MISC metadata.xml 345 BLAKE2B 6c5e16098765be40aa9fbdcc21c4d9bc154f481481a6968dc186d209e598fc52e4429db625e637d22a52faa482a2fa6a2782ec93f9f2e22e63596fc68a0a297a SHA512 3c20434b2fbcf7e55b76f8fd5df7637b5e9ffef12db88948530036f9474f6960cdc1277378b3dcee3c81d9de75e60bc1363b43c55a5a03062118d6372b6b9a29
diff --git a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
deleted file mode 100644
index cc6a6e5d89ea..000000000000
--- a/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-AUTOTOOLS_AUTORECONF=true
-inherit autotools
-
-DESCRIPTION="A library for high quality time and pitch scale modification"
-HOMEPAGE="http://sbsms.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbsms/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86"
-IUSE="cpu_flags_x86_sse static-libs"
-
-PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		--disable-multithreaded
-		# threaded version causes segfaults
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsbsms/libsbsms-2.3.0.ebuild b/media-libs/libsbsms/libsbsms-2.3.0.ebuild
index 0519a044dd73..a3e87db0a454 100644
--- a/media-libs/libsbsms/libsbsms-2.3.0.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/claytonotey/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86"
 IUSE="cpu_flags_x86_sse static-libs"
 
 PATCHES=( "${FILESDIR}/${PN}-2.0.2-cflags.patch" )
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index ff23e1d0952c..ba5012cbad20 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,5 +1,3 @@
-DIST soundtouch-2.3.0.tar.bz2 528840 BLAKE2B e76627c323c223a067db6fd65a08661f39c9b55e0eb8ead7d643f92707dc56b8d235eded27a95d5eb1ea751d15336d4cb4b757c4abb2f6780258d81899484241 SHA512 f85974d7afd010bd874a4ffc51abf4013694334bfb09071f1c4d478641d34b5eecb9efc6ac41d8f0e6a5d1cb4095289316c124c522b4ca3fbd6a91b6cfc83083
 DIST soundtouch-2.3.1.tar.bz2 529126 BLAKE2B f8ba587ac199cd1e91f3d3487b81457b7c7bb2b4dca8867376ae47f92bf4d5e60aef3d310eab56510995d5ce72e94ce55ecc4e601bfb3b4eba52c40982032d6b SHA512 9fac7484aead1a20aae019b29847ea13ad6d8cb72272313fcffd859b31479d2ab2fe2f69cfef2b3fd35e9b03923d095bf44a67b46f2b313ac711aa31df0fdd59
-EBUILD libsoundtouch-2.3.0.ebuild 1527 BLAKE2B 6c3759c10c61cb7e44003227b62768af264078d9b37dd0b68dbf32744ed37b9a307a5de2f580ecdd17ff67bfa21abccb8b42e41b6585a0c6f293ea0085d9533f SHA512 7a8e5cd0c311e36615cfad4fe79977df0ce8ab61b82cd5ed79f923ac111ca21b244a07c6148b49395571ede4d1f001b602361932bf5fc988294b9f3b325ae50c
-EBUILD libsoundtouch-2.3.1.ebuild 1518 BLAKE2B 95f57cf52e851fb89a435d1c4811ec6ead5bb74761d6ced365192c5c197c5ef6e46715a3d683e0f50a678b26daf09f5ac58ee79d0310275355a12def455be53f SHA512 550619d5a61fc8653bf8d852cfc402b0df53e5ae5aa2b14c631eb352c7be46965cf6bc4428dcd819369921a72d5fb24736dd3608cfd7bfddf302950070cc8ac0
+EBUILD libsoundtouch-2.3.1.ebuild 1514 BLAKE2B 8d6742e5ae65ddc54eea1d1830434a2261e5514f894cdce7fcf5245f6ddb92cce335bc9dd6ebafe6bfd3705205acdb53a12af3042fc38525a9f0df33416eef9c SHA512 ccdb561f9577440aa162e66a47962530b1e22033720b652190083a8623b1279091793667ec3ff85d58a0cbdf5c8f08301802d57672e307a6ba1ca7274f71ae1a
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild
deleted file mode 100644
index 6d1ccebfc717..000000000000
--- a/media-libs/libsoundtouch/libsoundtouch-2.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-MY_PN=${PN/lib}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
-HOMEPAGE="https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch"
-SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-# subslot = libSoundTouch.so soname
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="cpu_flags_x86_sse openmp static-libs"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--disable-integer-samples
-		$(use_enable cpu_flags_x86_sse x86-optimizations)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild
index f9bd26503556..fd181f34ded2 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # subslot = libSoundTouch.so soname
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="cpu_flags_x86_sse openmp static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 06334dee7df9..b1d62c798d8f 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,4 +1,6 @@
 AUX libv4l-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
+DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
 EBUILD libv4l-1.20.0.ebuild 1516 BLAKE2B 9c9efeeb9d02ea98df998efc4a0996fb64a60837941cc4095a1bd3ff7c03d57cc21c68796fef729281d782095c14ce4bfaa429c59aa99dd647062da31291700c SHA512 d857040a48458d67154d08ef5d70b55a25a192b41278a1f098f215f025a098b35d8d69391b14b855dd6b989a2afec56c0437056843082318c8bdcc8d73213147
+EBUILD libv4l-1.22.1.ebuild 1474 BLAKE2B 51965a0c6c96baae98b62827facfb9b93c019d1cbfdea78145eb28d4a03c611e01caae7e8be798a42310041221129f2ed28bfb3ee6378ee8aea72241d20b28b1 SHA512 5b4d029d0e745e7f42d792c8216298a7f1b0098f0c2034f1ff1da3adf43ce884eb254172bb66be9ae73c0551e9f08006471c3f8067bf7f90bb3935ce9f02d6b1
 MISC metadata.xml 1117 BLAKE2B 1d9a1bb6f3e6f2fdeb8c892b8714f8e36ccee4e95defb2ddd9e2fe43e4e9901636e7fa717475b13efe111a2b4be89d78b1b610c153de778ab625b9bee566b783 SHA512 63617e7fccd7394ba402cde356011429b60d7781197fcbfaf473ff88a788fd0a7b631ab10e6cc198bd5a5985cef7ccf026359d4c4ff7a28616661cd8cef1b07d
diff --git a/media-libs/libv4l/libv4l-1.22.1.ebuild b/media-libs/libv4l/libv4l-1.22.1.ebuild
new file mode 100644
index 000000000000..af9048e8367b
--- /dev/null
+++ b/media-libs/libv4l/libv4l-1.22.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info multilib-minimal
+
+MY_P="v4l-utils-${PV}"
+
+DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dvb jpeg"
+
+RDEPEND="
+	dvb? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~SHMEM"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Hard disable the flags that apply only to the utils.
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		$(use_enable dvb libdvbv5) \
+		--disable-qv4l2 \
+		--disable-qvidcap \
+		--disable-v4l-utils \
+		$(use_with jpeg) \
+		$(use_with dvb libudev)
+}
+
+multilib_src_compile() {
+	emake -C lib
+}
+
+multilib_src_install() {
+	emake -j1 -C lib DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README.lib* TODO
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index aad93178aff3..8e955cca0e8b 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -13,5 +13,5 @@ DIST opencolorio-2.0.2.tar.gz 10812416 BLAKE2B 36f008035c36bef9473f9f79e9362eec2
 EBUILD opencolorio-1.1.1-r1.ebuild 2627 BLAKE2B 3a04ff5740dd6e830ba17f2356f2a2b87e1de465e7d103fea654ac95438160abd3dda92a7d6503fd2749542fb8d5717f547adf8a445a98db9c39e690949e6200 SHA512 f58868e63953ee16aa995cb6042458c510bfc3892f11f0e2f37a048b28678189d3fd4a787b5d2d4975e5b2fbdbc119d4cb2131d9fc1227bd3b594f807766aabe
 EBUILD opencolorio-2.0.0.ebuild 2773 BLAKE2B f1469f1917fa14f9cec3a9e5bb799a8c4a38b670a5fae43f9468fe7f97f0e49fdffd49f77958e0dee2d2b8367492fa61642b8177bc06290bd37e256cf72d49e4 SHA512 e527cc50a8d148ddb36ebb9d2e661e2be3c5b0558b7d8b8eaa4b2fc935a835954cffab1fb17f60a985b193818f3951d3e305398885ea329713fa7acfb3048650
 EBUILD opencolorio-2.0.1.ebuild 2709 BLAKE2B aa368b450adc2a11c09179d573bbc9999a220500b377bcaec4630dd4c05f2465987e01450744abea60edffee88119564e210eab96d4024aba59829ef8e863564 SHA512 5528729ab388d3045d5847963daddd038bd06d814a0c1078641c312117febbad76bdc56fcbed70b265f0c5c05955784c57d66df3735f49a1b31dbdd316f6db55
-EBUILD opencolorio-2.0.2.ebuild 2745 BLAKE2B 60e63b2ab268d418d3e7a846f31f301d7ca27e8a96e22a7ccd12d6e74c6138de2c3cfc93aafe79cbda980fa310a8d28debf615a01bc98500e4d27fb7f5e25225 SHA512 480def1802d5112fa44c21ecaa6ff0d1a31a0dae2054a3980a658b4bb7a3810635b0f31080b516e15e68a3fc6dcd47fb519a06d348c52efd930cc8ff38eb0035
+EBUILD opencolorio-2.0.2.ebuild 2753 BLAKE2B c923b54f54aecf466f0ec37cf684fa9502f8cf41224c3270ecbe89a161a3189615f630c3ac870a5eebaa513312aea410859b23d7794960bf7e3ebbe3a30f0725 SHA512 5cefbce1d9ff3ec23ab4127c174a3ae1906dc0f110783694d5c6cb29ff71f257bf524fc913b4298d93f6726adb55d9f888bd5439d2de7097169650e239d36e4c
 MISC metadata.xml 460 BLAKE2B 564c46a6d12ec479bfbe92401cda933760a3fbfd72b83221f8edc927a01eb5f18ecab877184b95aa5bcc8af20a0c36fbff8c6f45bf7ce2996c795b0f8fac1c9c SHA512 d58b105d94f1f11e52f1e88b9cb24885b5369207c3fa2a6ab4c2133c22e2b47a887a8358b79ea53cc9bdd63a44bb18672e5d26d614074e0bc08539cb4e73b49a
diff --git a/media-libs/opencolorio/opencolorio-2.0.2.ebuild b/media-libs/opencolorio/opencolorio-2.0.2.ebuild
index 7bef3bb4a1b0..1d263c5aee8f 100644
--- a/media-libs/opencolorio/opencolorio-2.0.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.2.ebuild
@@ -77,7 +77,7 @@ src_configure() {
 		-DOCIO_BUILD_DOCS=$(usex doc)
 		-DOCIO_BUILD_APPS=$(usex opengl)
 		-DOCIO_BUILD_PYTHON=$(usex python)
-		-DOCIO_PYTHON_VERSION="${EPYTHON}"
+		-DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
 		-DOCIO_BUILD_JAVA=OFF
 		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
 		-DOCIO_BUILD_TESTS=$(usex test)
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 5159ad18d18c..c0b74fb60a74 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,4 +1,6 @@
 AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab02d1712b920a3c6c41b8981aa13ac5d7155bfd11e33577cb7b1e49a079ca5ea9840d37aaf477deffa0dea609b03fed7 SHA512 035f5549c902c1517ad5e09ee472eca578eed7d7f87f7ee20166dc46f495d5abaebc32902472b9ac6a3a367176c130bfa6fc743159b9efa3227873a16d8b4877
 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
 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
new file mode 100644
index 000000000000..c364d1398383
--- /dev/null
+++ b/media-libs/rubberband/rubberband-2.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
+HOMEPAGE="https://www.breakfastquay.com/rubberband/"
+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"
+IUSE="ladspa jni static-libs +programs vamp"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	media-libs/libsamplerate[${MULTILIB_USEDEP}]
+	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
+	jni? ( >=virtual/jdk-1.8:* )
+	ladspa? ( media-libs/ladspa-sdk )
+	programs? ( media-libs/libsndfile )
+	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.2-build.patch"
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		--buildtype=release
+		-Dfft=fftw
+		-Dresampler=libsamplerate
+		$(meson_use static-libs static)
+		$(meson_use ladspa)
+		$(meson_use jni)
+		$(meson_use programs)
+		$(meson_use vamp)
+	)
+	use jni && emesonargs+=(
+		-Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux"
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	! use jni && find "${ED}" -name "*.a" -delete
+}
diff --git a/media-libs/stops/Manifest b/media-libs/stops/Manifest
index b15864f392ef..7b674287fc49 100644
--- a/media-libs/stops/Manifest
+++ b/media-libs/stops/Manifest
@@ -1,3 +1,3 @@
 DIST stops-0.3.0.tar.bz2 24766 BLAKE2B 6a5756fa1dfde1574895f75ae6f2da6ebfded7058bf0fad1a9097bb1fcda9c072b2ecc3d251b9dc24d5602110224062cabb23bc9cc78715b9196c747749a5afe SHA512 a6572a42c6796aa08b9085bfc4cb9e252091310224a0b8867eaf5d41f399b2649744c357506ae5fb64a82018f0da702bacbdc7e96965a1116f08d0a248d28ad3
-EBUILD stops-0.3.0-r1.ebuild 479 BLAKE2B e7f18f964b61e13d173310caa050e9b050d5bbcb40b2e9d8cc88aa5ebfbec57150d76b443eb22204fb9a46f18bd19d9235cac3a687a3809889d412b7ca07c391 SHA512 20a0c873e4f22acb5511f6db592b2686b9b208cea05064472180e2b4da51038ea7a79dfc65dc6f8b585c4a60c85ff032127b98c1bf209341be3555dd0ce8386c
+EBUILD stops-0.3.0-r1.ebuild 471 BLAKE2B 02ca6d671da0f0521c89bddd23f879ec7f9d7bbc08b2c8cdd1d5e33c59c4c029ed4d8ae9ccb56c46d2bb4cab3c0749e2bf5c73f50872b0ef549a36efb53b3d56 SHA512 1831ffc52d72560011c450ed6f4c64db2f23808ac8477126d424e54b9a41d65972d0e787d71c07cce722959419f09f2fff9d2515c4fce36dcfe5ab196918f2b7
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-libs/stops/stops-0.3.0-r1.ebuild b/media-libs/stops/stops-0.3.0-r1.ebuild
index cbd327d7a9bc..38b07d1fdfcd 100644
--- a/media-libs/stops/stops-0.3.0-r1.ebuild
+++ b/media-libs/stops/stops-0.3.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Organ stops for aeolus by Fons Adriaensen <fons.adriaensen@skynet.be>"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
@@ -10,7 +10,6 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 src_install() {
 	insinto /usr/share/${PN}