gentoo resync : 12.07.2021

27 files changed, 225 insertions, 209 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a9c581e2c18b..0668acb45546 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gmtk/Manifest b/media-libs/gmtk/Manifest
deleted file mode 100644
index d7de14736837..000000000000
--- a/media-libs/gmtk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gmtk-1.0.9.tar.gz 411609 BLAKE2B 6c5c7b3390a3d7ab6593484247447f1016475b5f785cb7cf77810aac37034ce704286e9512cc5d091a04ae6362f8a0634db21599ff6bb78141aa3c5a5405db9d SHA512 61da4bbba5b74510c5ad5d6b5e10606fb99f54732cf412aa6245add2dc2b0df12b75e4e6f1474b4cab0541063ba6f95893e366f1c8b52a055521b667c182dcdf
-EBUILD gmtk-1.0.9.ebuild 1014 BLAKE2B 7bb5ef24e115520f8e2d56199f65dbcbb190328f47d8c9f568f5399b9bf206367e332b094dea50b714af59e13a315e1923f27ad026f939582686cfe43108e9a7 SHA512 470288647b145c81d6b60363991c0f321fc13e43087e8e6d8744dc0e77ad1d75722c4360aa59a909f8d1f1b9c868e9489058611930edc1808cb8979c68032430
-MISC metadata.xml 321 BLAKE2B 9ee0f6f0335977fcf934de319b5c6b43c490de8c6e2e84563e962f10bf781186b04a1db77d420f2c13782723eec266b1b150b2bf72d96c55edc5aee6b4b5aa88 SHA512 e89aecb354cbcd3e1df953d02b20ade390b417179779efc7f8e5d3753a583502bb87637f26b205c883abbfca8022fe4f9119e7129f2599aaf5a434e974bc8247
diff --git a/media-libs/gmtk/gmtk-1.0.9.ebuild b/media-libs/gmtk/gmtk-1.0.9.ebuild
deleted file mode 100644
index 60068053a53e..000000000000
--- a/media-libs/gmtk/gmtk-1.0.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="GTK+ widget and function libraries for gnome-mplayer"
-HOMEPAGE="https://code.google.com/p/gmtk/"
-SRC_URI="https://${PN}.googlecode.com/svn/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
-IUSE="alsa +dconf pulseaudio"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30
-	>=x11-libs/gtk+-3.2:3
-	x11-libs/libX11
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-RDEPEND="${COMMON_DEPEND}
-	dconf? ( gnome-base/dconf )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS="ChangeLog"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-gtk3 \
-		$(use_enable dconf gsettings) \
-		--disable-gconf \
-		$(use_enable !dconf keystore) \
-		--with-gio \
-		$(use_with alsa) \
-		$(use_with pulseaudio)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gmtk/metadata.xml b/media-libs/gmtk/metadata.xml
deleted file mode 100644
index 6d48667c643e..000000000000
--- a/media-libs/gmtk/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="dconf">Enable support for <pkg>gnome-base/dconf</pkg></flag>
-  </use>
-</pkgmetadata>
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 595b69aa9cc0..f3f573b7a234 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,4 +1,7 @@
 DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
+DIST harfbuzz-2.8.2.tar.gz 18506485 BLAKE2B 39a43d643339a5bc27d886e418695d2864ad7b9094dc508f5ccf52bf635b340adb7ec6958a15349e0b2580444ec98c5850e4022f708287fbe44cb7ea90065881 SHA512 51eee8c8fa6f839512e0dfc5c80ae8ed1e09d747d0ffc6736e5a1cbf86de956322f23e6ea25a90985e2317e98229a133e208da2a7b5177d65894cc64706ee8d4
 EBUILD harfbuzz-2.8.1.ebuild 2492 BLAKE2B fa89daa0b745c7b5035bcb4e94dfee1e8d7bcdaac1a59e2f394a5f705254fe463922251d95e87868c78e8d4123fda3bb946757a18054cd86337de1484a6a679d SHA512 582d14b536c6a9bddfe6a74b00e0e30672d5e4fc86786cf7dfa5d6fb52432b2fc31ad081c44f7b1a4c07d8f2b5362a0448ef04bc28827e836a1b648e0254f20b
-EBUILD harfbuzz-9999.ebuild 2500 BLAKE2B 93be2b3189be9c9b6506e0741743c0c76231aaccf619d1021cccd00bafc2c8506f8e3209d849a8762b2c12e9f4accb9bd9492de81228cb99d7da1c510e682a15 SHA512 a0d35c7158d698fe597be089897aaeeb22ed2f1a61e0f2d72fd42562d8466482e04736f46ca493f07cb10d88a39e70bfd36bf4d7346a359bc54bb1ac0f5aea2d
-MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
+EBUILD harfbuzz-2.8.2-r1.ebuild 2562 BLAKE2B 6f1ba8d515f3387f59bd2b3c443d61984eebc495bacd241fce9feca138e3139f7617b0ef49ad96dcd737936a3f8951d72ad9ae983e52a6e6d48450c855845e67 SHA512 a455f7884e3569d42b4bd8331fe8e11cf76e8d6321add9ccd850f80d478177ca9e55aa5284377c91a3df670e3038690c5b7925324e6ef82148e003569952b48b
+EBUILD harfbuzz-2.8.2.ebuild 2500 BLAKE2B 93be2b3189be9c9b6506e0741743c0c76231aaccf619d1021cccd00bafc2c8506f8e3209d849a8762b2c12e9f4accb9bd9492de81228cb99d7da1c510e682a15 SHA512 a0d35c7158d698fe597be089897aaeeb22ed2f1a61e0f2d72fd42562d8466482e04736f46ca493f07cb10d88a39e70bfd36bf4d7346a359bc54bb1ac0f5aea2d
+EBUILD harfbuzz-9999.ebuild 2562 BLAKE2B 6f1ba8d515f3387f59bd2b3c443d61984eebc495bacd241fce9feca138e3139f7617b0ef49ad96dcd737936a3f8951d72ad9ae983e52a6e6d48450c855845e67 SHA512 a455f7884e3569d42b4bd8331fe8e11cf76e8d6321add9ccd850f80d478177ca9e55aa5284377c91a3df670e3038690c5b7925324e6ef82148e003569952b48b
+MISC metadata.xml 817 BLAKE2B c5e4059fe45c0727f6fc831402f6ea0617ffcd70db271b8c36365c8f815347ba12f6a0193ebef2ebb614ef382ddf690e686997045f0eb6e9ec3ebced9147c475 SHA512 9516b81d89c29a1545555925a377c303c69842808915a1a4e376dce77af29a9f9d1f1c0eb0cf4ae5f6698378bffbb81943df5add554cf8a4207fc4aa0978ab84
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
new file mode 100644
index 000000000000..e77ca3c2cf7a
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild
@@ -0,0 +1,97 @@
+# 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"
+		-Dfontconfig="disabled" #609300
+
+		$(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)
+		$(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-2.8.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild
new file mode 100644
index 000000000000..9f52c19d3421
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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)
+		-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-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 9f52c19d3421..e77ca3c2cf7a 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
 
@@ -21,7 +21,7 @@ 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"
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection static-libs test +truetype"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="introspection? ( glib )"
 
@@ -76,18 +76,22 @@ src_prepare() {
 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)
 		-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_native_use_feature cairo)
+		$(meson_native_use_feature doc)
+		$(meson_native_use_feature introspection)
+
+		$(meson_use experimental experimental_api)
+		$(meson_use static-libs static)
 	)
 	meson_src_configure
 }
diff --git a/media-libs/harfbuzz/metadata.xml b/media-libs/harfbuzz/metadata.xml
index 1c768f83411d..6d22e7368956 100644
--- a/media-libs/harfbuzz/metadata.xml
+++ b/media-libs/harfbuzz/metadata.xml
@@ -17,7 +17,8 @@
 		<remote-id type="cpe">cpe:/a:harfbuzz_project:harfbuzz</remote-id>
 	</upstream>
 	<use>
-		<flag name="glib">Compile with GLib Unicode support</flag>
-		<flag name="graphite">Use graphite to render complex non-Roman writing systems</flag>
+		<flag name="experimental">Enable experimental APIs</flag>
+		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> unicode functions</flag>
+		<flag name="graphite">Enable <pkg>media-gfx/graphite2</pkg> complementary shaper</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 98904d4a22e2..6cf3905ad375 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,8 +1,6 @@
 AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e554fa65342c4c364ba51f13717c3c96806417cc7ae814a34a59137da3a93c442cc436bfe7f4330f0a537ba7ed9579a45a4b8c986b443fdfab3fcb42f2 SHA512 06318e4c019fd02c49f7e3c2cf0ecbf0701ee625607763709b010984fa96f2681e19955ad0538397ac9ee3c1a514840f84423b0fe98bafad5e399c43e619175b
-DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 DIST ilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
-EBUILD ilmbase-2.5.5.ebuild 1069 BLAKE2B ac5419454146e4df6f7d22c3ef83765261e0638951f76e8f9928010be9a6c1e6b142ff4761afefc2a665d50d5f981aa55839410a627b4b1bcf4c6a5ca4612d9c SHA512 1a5ca247caa34c8d0551be377e3bef91d4ec8fa5c02aeea0102ea8d867f396211f6d23b4598a9064042f9a42f26f6c01f9dc9e130de3b3ab283ad425faa43001
-EBUILD ilmbase-2.5.6.ebuild 1082 BLAKE2B 53e4c6df7933cb12a162a83049233ecc46130a74b78d2d517d11fa0609abcb4ff25ad6cd32a758646a6791769b81552862625225825e72422f8e8e15437e788b SHA512 6c83dac92cc3ea34d9806269e8ebbbb13a78a096676e42f55520b95a8257b7dbe3e61cc6cc11a7d2a89938a54a5663b4e38f0d8c04cbd8ea48c24beba16c0584
-EBUILD ilmbase-2.5.7.ebuild 1094 BLAKE2B 57ac6d3eaa517ebebf6ef7096023d5ae9db6a32d33c99a2815528bece8f118abb4f5895dbe69dc3a37bf5db098b7b160621f71bfcf20792c02bbe7f84b24d366 SHA512 489d668a514e7ab5a389328712e72eaeb7fda69449d0a4ac2486761dcc5b9849fe000616ab2a4b30dd36924ccb88b4c48e006eb8b00dc343317a1ad41fe85ee0
+EBUILD ilmbase-2.5.6.ebuild 1080 BLAKE2B 6d186c002551cde60e7c6d2642bbea2087e247a6619cbb625558130bb7c743b3c4d9dae94c7078165eb78be1c51d4f02301706a67cb71b63e111403eb80a871e SHA512 1431d949d5687df526a45d8bc41e0e6c958c15d4e0c873e82548ab5f22414fcfedd5a12a59fee6a105b92813c14decc4271cba7c6e68acf2fe4017b675525359
+EBUILD ilmbase-2.5.7.ebuild 1091 BLAKE2B d8ef6e5ff67d0f6482d9e6f29d300e26f373443cfddd325cdd06cf7f4423ed4b5294e264271045806fc2d477f6818009d5ba6ec198873153f3dc331508285605 SHA512 f3cf1d268678b80252696ffd59640cccf1f7d73ef45ac8c2aa3274a377a60337bcdc776098ebe68ab9d623418d8da212cc2f9bd4501b37d042d493d72e8fbe15
 MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6
diff --git a/media-libs/ilmbase/ilmbase-2.5.5.ebuild b/media-libs/ilmbase/ilmbase-2.5.5.ebuild
deleted file mode 100644
index 3575c02a3284..000000000000
--- a/media-libs/ilmbase/ilmbase-2.5.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="large-stack static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/openexr-${PV}/IlmBase"
-
-DOCS=( README.md )
-
-src_prepare() {
-	if use abi_x86_32; then
-		eapply "${FILESDIR}"/${PN}-2.5.4-0001-disable-failing-test-on-x86_32.patch
-	fi
-
-	multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DILMBASE_INSTALL_PKG_CONFIG=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/ilmbase/ilmbase-2.5.6.ebuild b/media-libs/ilmbase/ilmbase-2.5.6.ebuild
index c6b716115975..98ea51175b76 100644
--- a/media-libs/ilmbase/ilmbase-2.5.6.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/openexr-${PV}/IlmBase"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="large-stack static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/ilmbase/ilmbase-2.5.7.ebuild b/media-libs/ilmbase/ilmbase-2.5.7.ebuild
index 54ab57444991..937df9029dd0 100644
--- a/media-libs/ilmbase/ilmbase-2.5.7.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/openexr-${PV}/IlmBase"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="large-stack static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index ca521aa14de0..3f51d0103cb9 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -6,7 +6,6 @@ AUX Fix-a-problem-in-the-caca_resize-overflow-detection-.patch 4951 BLAKE2B c664
 AUX canvas-fix-an-integer-overflow-in-caca_resize.patch 5265 BLAKE2B e75b3366a8e93971baecdc808ff4cc3d9bb1801836b80d4ee97905eb474af0ab65af762b5ee7a16490fa836c2381cf7cda8dad4df35f2d3ac9bf36c6f7db646f SHA512 626e91a2af949f79438529db454f4fad0ca335dd89d6e783eabcf66b76b972a648afa54951c34b4e1ee33017e14edce9cb94d7579ae484403bfdceb08e6d32de
 AUX fix-css-path.patch 502 BLAKE2B c494c458524f98017dceb41266ed051cb3bc9f00c57185715d2ec7846ea5ea3990419d5b8a99062ace0f63ca06e68a45eb4c85210aacc2a6f29255b1088683ac SHA512 de6c43fb73d86dd8e8ee1e22e329ee2201bf09947568382c4637145b297edfae206c269edd05e08000d5670734f8e2c3373c5095682ac850cce588c4cd0cb636
 AUX libcaca-0.99_beta18-fix-tests.patch 1886 BLAKE2B 8961c617ae568ab19b0404a8ddb1e4da743f7792b36fd32ace460071c04754f8e5845200333f96e4b9602f547d3249da301c3df62cee7bb20235da6a3242789f SHA512 583b440f93d2d468b14a707946eda928811b8c6573b1a48a1f6010d2f3713399689434531b0068ebbc1999dc82867c7ae6da0bdea9fb754277eda484fe39b1f6
-AUX libcaca-0.99_beta18-latex_hacks.patch 645 BLAKE2B 8b72799bdb19accf044c590a144ec7330532aebb7faa3076b12cc49ca82e8e127126b7d1ec8930d0a0871476e4f7632c6ebb6d10ae36146a3006040be72157d6 SHA512 9c1fc4aba3eecf94f47f296ebf11441de60ddf7a335c11bae4da4aa04e5cbbddd07d8cacf40b2b0aaf96312923c24cc0f1a3f031284cac13e8dd9c29ce36aa18
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
 EBUILD libcaca-0.99_beta19-r7.ebuild 4480 BLAKE2B 111efd3fba0668074f78a2346d84e16e1df15990dfa10e2ee99fc253aca4c4d6ed11ff1eb8c506b80c535e7150672a41668f7c6211d17bb2f1a7118bef7c6f03 SHA512 8f4988bce594b728b31d0e283844213dcb1c7a154de4ee180d3d2d1acd7a77c965a5f0ecebc0d15f1dd5b39d91d2c43c558a5ed538e7c4f924445c19e515684f
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch b/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch
deleted file mode 100644
index 15e17d2f95e2..000000000000
--- a/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Hack it a bit differently so that it works with texlive 2013, see http://bugs.gentoo.org/480862
-Turns out this patch is required also for texlive 2012, see http://bugs.gentoo.org/517474
-
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -29,7 +29,7 @@ if BUILD_DOCUMENTATION
- if USE_LATEX
- 	rm -f latex/libcaca.tex latex/libcaca.pdf
- 	mv latex/refman.tex latex/libcaca.tex
--	sed 's/setlength{/renewcommand{/' latex/libcaca.tex \
-+	sed 's/\\setlength{/%\0/' latex/libcaca.tex \
- 	  | sed 's/.*usepackage.*times.*//' > latex/refman.tex
- 	cd latex && $(MAKE) $(AM_CFLAGS) refman.pdf || (cat refman.log; exit 1)
- 	mv latex/refman.pdf latex/libcaca.pdf
diff --git a/media-libs/libldac/Manifest b/media-libs/libldac/Manifest
index ed076a3c1bf8..b0e9b1cedf98 100644
--- a/media-libs/libldac/Manifest
+++ b/media-libs/libldac/Manifest
@@ -1,3 +1,3 @@
 DIST ldacBT-2.0.2.3.tar.gz 75708 BLAKE2B 9f9ec1aa8a9603927067cd01058745db615a89652d16e870d9eb0a4db270a4076b7bb70ba091948249969087e5b26b86e22656314e3d26e43311fae982472347 SHA512 0e42723a1e7d748b28b13d73823fd5378a64100d5e27ae90cf3214494f3e199c526e219efd1329b2ec2b3195e1a6b3c98c8210ab7e4e6b98077199ef0f64c02e
-EBUILD libldac-2.0.2.3.ebuild 608 BLAKE2B 69235a995ed37a3ff78a876a81dec9dc2ec94b13d11659ec73a787ca0b07bcce72e45a1826a4d2f59e0b21ae2229a8c3f42120cb8e21e3c457ca508a7c7cbe59 SHA512 9157bf3b196a6995fd79bd59dc94a85b803ce1df3344e2db87dde983674f982f6b6630356a67ddeca7b967fed8f2950d2e4ca70a8a028974ba13cb9c8d3ddf05
+EBUILD libldac-2.0.2.3.ebuild 606 BLAKE2B 6151a6c99671886fa09e5feee6b1c47aa5effd97ca5aaf33ad424c08ae20d73c8d95812867fb0c5850254be7e06784c1be9ea2f805de17ba626c0c6e2ab3d6f2 SHA512 ecf7a9e606c72c76d26bc15634cfbc0d195c3fa0474698a71e4e4e0e4df9e50281a4635ac2044c179bc86658caec71262e38c20ebdad080bbf49d230cfaef858
 MISC metadata.xml 294 BLAKE2B b538426aee9fd5b62c00e4ff45c2ad8f1debc01fd47c73888f00bc8af07565f0d64adcaab29836efa44dc78ee286bdca31302230fb3de99e48bfcfb91be3ae8d SHA512 a0446763cd8f9d5650a05beea3fc24712565c60585b70d2f1b704bc606f9fbb62a8905da2bd392b45c0b6f3855c23d4eb6139a58c005c705aecd64212a7fd47d
diff --git a/media-libs/libldac/libldac-2.0.2.3.ebuild b/media-libs/libldac/libldac-2.0.2.3.ebuild
index 06be1dbec91a..539bc249a444 100644
--- a/media-libs/libldac/libldac-2.0.2.3.ebuild
+++ b/media-libs/libldac/libldac-2.0.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/EHfive/ldacBT/releases/download/v${PV}/ldacBT-${PV}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/ldacBT"
 
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index e679b914558f..28fb95fc21cc 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -2,5 +2,5 @@ AUX libogg-1.3.4-libdir-m4.patch 409 BLAKE2B 68ff8990afa20d42cd527ef9b46ddf0861f
 DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
 DIST libogg-1.3.5.tar.xz 429076 BLAKE2B 464cf767902bd8bd463d3faaae01fecbe33d4cc87dabf38388ac961bfbe24e6d113f4ee88542e6bed6fd7eaaf0709c7f5cb7a306ee910527f79810054ccdbae7 SHA512 5d1cbc2a3a1fcf5543f5729bd5eb560cfc740c5d17a2492ead137970c45e6203ec1f5de536d77c4b73ece9e3b0046eaa9181c02a09de72ac7ae51b1fca1e1ee7
 EBUILD libogg-1.3.4-r1.ebuild 796 BLAKE2B 08a72998e40a302156f66999b90e2677834b50c9ed289453fdeb33c95ecaa15056d9171e93b177811e989a0449049ea15a9d1be7d8f8187c1c0dec1999717132 SHA512 1e06f19cbb3d33d1ea9abc7632e9ba6dff1df2d2c9b4269841932075f58896fad1e39cb1f96c4eff0440a6491c74ef61af778ca6cf5829baa6b1d355c0af3ebd
-EBUILD libogg-1.3.5.ebuild 798 BLAKE2B 7cf1578591a5fbbe2ff8e58b3f13232639b36a1cfaed8857b4a1b9baead59cb2b15f0e98a2baf43c0c44810c21ab514db50db674ecd0a0da463d8b165572b833 SHA512 318a566d61ffdb3dee8851cb20c0d8862561f40399cac903cfe0a4daff2ebc5012b6809e65ec079e049860d560086fe96fc052b34032cc8ffc8950b531c57360
+EBUILD libogg-1.3.5.ebuild 797 BLAKE2B fe69e740292c2098e78321c186df2f36df5025cc28cc7c245f4877f0cf8646da20b89e535a0a59d3f52224e581a88074fba0442c29f77bbb3853ea36cfb245ce SHA512 4d23206edd824e3002feaf27386ba764e38088e1d1436cc619a1d5e0baf51672aa20fceaf3526f722360d198f02701019efced04e09e610730b2e7fc6aa23054
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.5.ebuild b/media-libs/libogg/libogg-1.3.5.ebuild
index 97ef86b585ac..e410ca255528 100644
--- a/media-libs/libogg/libogg-1.3.5.ebuild
+++ b/media-libs/libogg/libogg-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/media-libs/libopenaptx/Manifest b/media-libs/libopenaptx/Manifest
index e178c6832ae7..e15da47b8cbc 100644
--- a/media-libs/libopenaptx/Manifest
+++ b/media-libs/libopenaptx/Manifest
@@ -1,6 +1,6 @@
 DIST libopenaptx-0.2.0.tar.gz 27797 BLAKE2B b178a9aaf78796c9219d9e7066ff985ce9f5dd86a6926ae22e373f2822090ad313efe04d5cf607940f1042bd27ddf5484d7e8298dfff91a8ae5596cec7ad5fa9 SHA512 d57e5084b398eec2ad49c9893baa496651c139abfb95692c834a4691bc4bb951d0b1afdd499a8b67c84b873407b584965d3a045d8ef3d9e62b3ccf45de22809a
 DIST libopenaptx-0.2.1.tar.gz 31575 BLAKE2B 531a1b4e8f4a711bf1b36dfea2424b23821dd4f0b50cc367e1298fc7a41f32ec494fdb25907173d1e2685bd0af74d3ebe5a7a3f221f2e57e92bd6d6e2b8b80c8 SHA512 7c7f515585ed41cd276cd3141037ce21e3ebdb713dc932bcdb33320d9910c734bc81e581e2c09b3399b3516c789e5da7128fdab5ab6b5e4f42a86b6ac6d3f28c
-EBUILD libopenaptx-0.2.0.ebuild 1051 BLAKE2B d59142413d5366e0f3b324499e49ba72e39764c746fb7b1add12a2e10b5dbe5864a829f359e8a397bc9400e235b9e4378b5f29c95e7d8e8601af7edcb73495e8 SHA512 dbcfbe7e5ac7ec5681a75012ea7a38e0049f3f2b90a425c1f0aa9506ab378fc6a3101bff86616e7e042c74f79fa21762f2fee0ee075c7e98db8fd72d5847882e
+EBUILD libopenaptx-0.2.0.ebuild 1047 BLAKE2B dbe9c841082b67a52acdd1984cba4c44b21f18d2fd36fc3912c4160766ea87d84873900b1dfbf91e9c38999b8295bb1cd5f52f5210fe48ba64e8b8140cd18d4c SHA512 a3eb916ed066267a9020faf08b76b93a0297a30bbb830a596f4f88b079a561658290e27220dd23004286cb53977ca562ff3b509aa57affd4a07a2018cab62ef6
 EBUILD libopenaptx-0.2.1.ebuild 1005 BLAKE2B cd47a46e7e6ca06e1007e2f10a0da8000bddfc0eb4b8d6242816e387dd88d6c4242875fc9c1546753651fca17c495b1485f59ff1ba7541046584531f3e1944b8 SHA512 0aeac424ce3c78db1c5d8853c35b39fdd2748cef984db7c5e20ca5dd298506a508712e2b09274ba6e23fdb5f604305dc84d30b06d22fc1ac6f951205697a5fc8
 EBUILD libopenaptx-9999.ebuild 1022 BLAKE2B ed3d85400142cf3d3fd9de1bf37e2cda897a952f07d2168252c575b0701d5a9003846f4b5605690512bf42f76c69b1f25c9e3a8ca2f0e52943dead7930504179 SHA512 4e9477a48a0cf0d4daea89bef6819b23eefbd8e619cf0973554e56306a450090a3ee7d723d23cb6be7b02c901136cff38c6be8f72844a01c76104b86f34992e9
 MISC metadata.xml 475 BLAKE2B ce3ccc5f113c6178230b372c55e9992731ff55477bdde2efcca199b73d7b2ec66419dcba89c3f368ff9b7ef54011bd92c6cecaf9b3cd64b5a6ab8ea2e0b0d1ec SHA512 7bde88afdf7a137ea5ec1b491dda467eec36d2897f0bd009ca22066614db64531fe5b343cdb426b1e80ef6cf8011db1c43a0a525b9b302496e04cd7d2e97dbc0
diff --git a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
index f90b9b0868a1..a7298efb98ce 100644
--- a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
+++ b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/pali/${PN}"
 else
 	SRC_URI="https://github.com/pali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 088c5148af39..6dcae8c46e8d 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,11 +1,9 @@
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 AUX openexr-2.5.7-0001-disable-testRgba-on-sparc.patch 937 BLAKE2B e2e432649100457a3273b50aa6725625ac50f48bf95bb04b85a2587a44d4c9e87662a36b68c3b7ac0c741068223e439fb51c1b69d5ae8f852794b0a7ee238d4a SHA512 8c640d67f2db6ed2789b8e25dd25e6ba8db6b3ed0ddb2138027ca579b3fe5db43b60d5bffc4de3f31ba60521c6479cf89f1ff7a8b2bbba97dd22c13279b92f81
-DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 DIST openexr-3.0.1.tar.gz 25059445 BLAKE2B 76bce1ff830b5e32362bfaf91d39945add171c5c1f453968b2fa8ba41e0996064d3a104eb7759cea87477e96e8a52d548743c7d83f5c6131dd38aecdd47bd6dd SHA512 e450c55d150e4c0a8a9147f78fe1c73ea9134976444f8c77c832d0671d4c3796f96fee74d23f26cdb9383e658a33d6d57c989e9207d1edfc8556ad688ff25a5b
-EBUILD openexr-2.5.5.ebuild 1691 BLAKE2B ddaa5c3bca30159e1c1349a8d3ec8b79e670c0739f98abe62dac2286b8207352361f15461ec06577a9c90ab566bc0081372d2fd6f305e6a91fe7083eece97b9a SHA512 840e4a1652df0f5968b015dfcb14ea35f6587338f8b22e3e4b78dc4358dd33108cf7edf01c1406163f8e9a11e3b7c4e7582855d1784c8c4adb1f7d85f8c28015
-EBUILD openexr-2.5.6.ebuild 1692 BLAKE2B 644e3bfa7eb4159c36f7708b5e2dd46fe6c7df9a8f577a37b280e493b3e69eb54b0fc1251aac294e0679d57881b0a386caac1a38b927f21fd9dd69a6e67c1731 SHA512 eb6240b6c7ba5a9ebf6ba59743a76c508d9638ddccc26a12b75ffd3f22ae5c3eceaec724d074941b60bcc014d3c7aa52b0670654b3848506a654fb7042010524
-EBUILD openexr-2.5.7.ebuild 1847 BLAKE2B 8e9bc6b427d4703961c723a191adb1435a84e354ccf828332aabacb6bf414093563d53a3e678a5c817aeaf391285250e234d094a4f06d7e747230589842b0ac5 SHA512 d872265619f1c39bcdb0889ffe64027c59d76fe2ac1c15409c2e7a2c486cbcabfd21e448eb50ad81ec2e35c1f879e058b458451e324b07a40c514f1d7536e523
+EBUILD openexr-2.5.6.ebuild 1690 BLAKE2B eab42b0f5ce389e642e80fc4a53a3721d883d22332f5e773a86aa19ae85cf0f0002b38e9cc0266f2dc00c1b8aac722957a987e266efbdb304dda674fcc958e9a SHA512 100e7b271952985f3e576aca1965345a7ed5dfbbef070cb22ba1d8907a22de436a57b2eeb2500707c11db1ed2e1179778e75820b651309557ef5d20cc73da87c
+EBUILD openexr-2.5.7.ebuild 1844 BLAKE2B 46fd538c32594befd9cf01c4f0d7c8f2d351605052c6973972f9822a03111012783c5846dbe42b5c9163fe6ec915a28de48ce13416ec2d4e609663a0fb26db18 SHA512 7d7217c198dd99dbb37471ed4e74c95e21fa6d67b4d050fa2e14cfe098c53e1dbc5663e267677effab868a39bedc5f8f5149143884def484f3c8738b1a2a8ad1
 EBUILD openexr-3.0.1.ebuild 1913 BLAKE2B cc37bc00d13d64d5eb0787c165f051572b92ecb23798e6e753e5a723143ad4e93081b04877bbe2232b4480564b751b6be4b584d535bea5e303c703482fbe1684 SHA512 147d8abb4af8ba2f56ffc17632436e42621da0289fe0b0585299da55c16e7055d454e13db0da8011f25ccac878034e741d1f5b227013388a67d28b6ffa18c5a3
 MISC metadata.xml 796 BLAKE2B dacf5230d89550bae31517f5babc9cf7ea99ef94ab223e4acf1abb39d1042d146e71352f4b55a6bebff88689f32efc3d098f5d7ac04a207211f784a9b5e2ed30 SHA512 3deb6a5e83a03fabbbfce2845529a7c2f1aacdc6038ffb4a35ed16bd3f93521ea490ff0fc1576291b5e1d84d19dc4d4123aecf228e270e6b55b01c09ea2a6b56
diff --git a/media-libs/openexr/openexr-2.5.5.ebuild b/media-libs/openexr/openexr-2.5.5.ebuild
deleted file mode 100644
index c60a06f6f05a..000000000000
--- a/media-libs/openexr/openexr-2.5.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/OpenEXR"
-
-DOCS=( PATENTS README.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
-
-	if use abi_x86_32 && use test; then
-		eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
-	fi
-
-	multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DINSTALL_OPENEXR_DOCS=$(usex doc)
-		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
-		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON
-		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		DOCS+=( doc/*.pdf )
-	fi
-	einstalldocs
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/openexr/openexr-2.5.6.ebuild b/media-libs/openexr/openexr-2.5.6.ebuild
index 8d513079a9e5..ec9bb6f201d0 100644
--- a/media-libs/openexr/openexr-2.5.6.ebuild
+++ b/media-libs/openexr/openexr-2.5.6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/OpenEXR"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild
index 7850aca1b9e5..d94729d81f27 100644
--- a/media-libs/openexr/openexr-2.5.7.ebuild
+++ b/media-libs/openexr/openexr-2.5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/OpenEXR"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 0ccf5c12d221..f2b34aff7362 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -3,5 +3,5 @@ AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab0
 DIST rubberband-1.9.1.tar.bz2 164644 BLAKE2B 1bbbd0056b2131ac16bf427db93e19bdd6adb5433733e62523f4a04c8a74d1a48e82dbace09e7ffe6dddfeec699e3aeee8e84344c9e7cbe75067316dde6268d6 SHA512 cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3
 DIST rubberband-1.9.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2
 EBUILD rubberband-1.9.1-r1.ebuild 1320 BLAKE2B a5aed87ad51ebd6db178862b58eaf6dcd783fd18e6b0dc7479a85e67350c433cdf6ea2febf662fdac1920767e5e802e020bde2e6954d11ec726d146352d02642 SHA512 5392bc5bcb1a46696207161b557a78f6b0fcfa12f32bd360ea3d73da0bbe00c0e3c1d5840a3dcae390e9b16eccf106814eec0ae97560646bbb69fbb9b61a76cd
-EBUILD rubberband-1.9.2.ebuild 1326 BLAKE2B 9ab4882838e917285e22e81c4667bdd9ea19b72ef0056a39fb3722d7029abe1e0f3f0fac9e17f1644a0a9773563aadfb08358a26a81d0a7987354113f2dfae1c SHA512 321ba173805d590586840fea7dbf9d101d99ab194540cca1f17f62f86cfec946b94440dbb2d6748feb014168fd1d2bf23d52a67b266e4bf7cc5f20585261bb0f
+EBUILD rubberband-1.9.2.ebuild 1322 BLAKE2B e32ea62b4d2b2e3099d0d91cb350586c2d5128a3f8cd3be2435cc63f3907450fff49b36fba516ba99c98d123354614d409ed97aaba7d1ee2f82b9046f2505a55 SHA512 e508ffe705e1220c2b5d981db6a0851f2ae3ccaa400b5acaf21a27bcafd30c476caa77c7e94a9a3ba5f0cb332e2b0bc8a715da151f6fcc5c3656bec8df73ad2e
 MISC metadata.xml 490 BLAKE2B 849555ada519e1a558d37977b952b8338d4d19ac3a7e8523a15cc3924b7b7b5faca70df7782597e322c362af7d05b1a35dae64b8cd8f2a998cc5d074ee81f090 SHA512 a1e8673326887e5582aa7a948543341d3061a149e0232a01ef8aa3b6778a499393aae434d5f1c2181910aa309a3cd2f0d80820922dfe668745f75314e0526e31
diff --git a/media-libs/rubberband/rubberband-1.9.2.ebuild b/media-libs/rubberband/rubberband-1.9.2.ebuild
index f390295a8a94..c559f5862dd3 100644
--- a/media-libs/rubberband/rubberband-1.9.2.ebuild
+++ b/media-libs/rubberband/rubberband-1.9.2.ebuild
@@ -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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="ladspa jni static-libs +programs vamp"
 
 BDEPEND="