gentoo auto-resync : 14:09:2022 - 11:10:10

76 files changed, 667 insertions, 269 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 55144ff8d5d9..e690f86ce012 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 46b5d8295777..5f18767e06b8 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -6,5 +6,5 @@ AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bb
 DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
 DIST allegro-5.2.7.0.tar.gz 7911231 BLAKE2B 9cc588a42d461ce06db94c1dd57642a2e9445c4930fcc164f2da57edfb463552a279a5e50f46740561a88c974c96605bb09fcc596e7bc6afb5e30b18ff7b74d5 SHA512 300bb951c661e7a220d913cca4116aba99afdcb5346af7c57b09bbdfa892d446cd64fde54397c57edb3c5f57d3380fbc2b6c4d9c9e17f48ff8180cfbf59e7d99
 EBUILD allegro-4.4.3.1.ebuild 2958 BLAKE2B a2a5844feb9a7157127fd2a67c2436b94a8b80caa5d15fc0d6780665b989a1887c5dc88f7f10c4a73352359638279ebf7b123e5f6eea406f739d39701735835b SHA512 8daae338653d3e6f333c546f478461a11838abaf24678de7c4a509b2a1b09eafd7509bf9b6016ecec03d86dbce786fe28fac7af7b4d38e3bc979a8152c7b2b74
-EBUILD allegro-5.2.7.0.ebuild 3223 BLAKE2B c45320caabe0e04960d3de915e298836b65ce6296e3e461dcc073ce0a864f9a94d0fc13b6f04567756328b10331b25a9ff25f195740847875d2091ef1842da27 SHA512 96eb8351bb39eb6e6bc05a7e4ed267c92577274432b5b21de3692c3965517cce9e6724324ab19332f9de21f2ff826d29293e6c33915c52863fdff9feeabcf344
+EBUILD allegro-5.2.7.0-r1.ebuild 3230 BLAKE2B 15b6a85bbc34e5a5b83f8dfa3d067b36aa285dec2f1c51bd51522c3c4b53e3490984a8f3c351bb7ed8b44b8a8a07777b8f9a237264734624674ee35415f9bfbd SHA512 38ecacdd1fb6b60d5076596ded5204f386fd223e19ab63dae37881cb89cbf015fef050c5a407a3cfe24c50206ea11eb6f5162f9384c4905806646d979b97445f
 MISC metadata.xml 1094 BLAKE2B 30dbd9ba5a9ac1adebf1eee05ced31ede45b3e3fdecd519a26c073f827af8188137592242c31c42c255d20dd8cc0ec541e8fe48c2748228934bfe98d44451012 SHA512 45d218016b3832602248801701c9c53ba79a82fdd35f776ca7bf845d9862ee62252d3899699b463bf81019823f91d025c9b539f984781e36e08cb4d9226ef0ce
diff --git a/media-libs/allegro/allegro-5.2.7.0.ebuild b/media-libs/allegro/allegro-5.2.7.0-r1.ebuild
index 00b721055d9b..07f038814d30 100644
--- a/media-libs/allegro/allegro-5.2.7.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.7.0-r1.ebuild
@@ -29,9 +29,9 @@ BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	dumb? ( >=media-libs/dumb-0.9.3-r2:=[${MULTILIB_USEDEP}] )
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
 	gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
 	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
 	opengl? (
 		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/alure/Manifest b/media-libs/alure/Manifest
index 866027acbbec..275c217392e3 100644
--- a/media-libs/alure/Manifest
+++ b/media-libs/alure/Manifest
@@ -1,5 +1,5 @@
 AUX alure-1.2-include-unistd.patch 192 BLAKE2B 61cfebb2c2f8d2ea0e228d81f37d25b6b59445711658a04e7e85c20624099aeb86c065e6d7ab4f3cdc65b5ba35248cde4c93104c971fd008c1aba19de259bd9f SHA512 ebb1f841ea28f7e7690f1cdf6991af6bd97486473b63ffd11d79b05d66faf44b8ee590e45b0b1ede69af99a3f817103e8e444885834defd4ccbc76e2104649e8
 AUX alure-1.2-new-dumb.patch 954 BLAKE2B e136519eb210cc003f8e66a02a1023cd5c169998dfef99b2dcf3d46b6259a04c3c7094bd4bd892f92b4a53a48cd3ca6028da4163d418b31eb5ae5a9380270582 SHA512 27000ad19dbd9278fea67c40e037745b182c4b067b30d5853274b1cc4216813ba0d9f3e292e4d997d93b870cfc0117cfd1a9a2f5adfc77defb908765f3fd03ea
 DIST alure-1.2.tar.bz2 65210 BLAKE2B 6e99e5bb56c96db27b2ab5ff67c98406636e5b1fc9e446356234c332edf0a4c167707068edf380f99a3744cf0f26a76c1c0325401977d1b3fe8bc989c4a1129c SHA512 f1a2dbbe6870c9d34da724e49cad993cabdca393482bf6476adc925ba5da2a34dc26d86e612e6ed829183c6df595d46921766f46063d0d478ddb18deeb8878a6
-EBUILD alure-1.2-r2.ebuild 1271 BLAKE2B 78b5e63d87f75f2e5d2ed5cefa8c03e7f39d5c8f8bf228999924782ecddd1df4c53b90b4046a68b481241b7139ef41cf89546a579d418438732b0a27d72643ce SHA512 5463bdd152423375b20b8b5a392bb7a3e7bad6f6de3b290563eb3a1b27e909fe09a763d4c42c7a123ef5bac43e9f0a1c73a5d3ebcf2254a2eb18d3dc2fd2e8d7
+EBUILD alure-1.2-r3.ebuild 1273 BLAKE2B 10986afe19fd150b0ec6c4aecf62e978bf4facf8c3ce2f7cbbd4e11a328f6fd04dcb79a5f1de70f834f582d20c53074ec2aa8d29c8d8771df65f502c48eae69e SHA512 c55ab8d3aacf518e968a6593202cd6a649b819db3ee039cffe29621ec60d6033675c1a6f3c9f18f625e6cb3109f2b6ed135e1a063d093af6c62a63b20778f80b
 MISC metadata.xml 441 BLAKE2B 2dde79d4d093760f8483f08e057ea520f2ec5f26dc4453bc4b0bfea8feff7e49a236148f9c3688f9c668c1f8e232f06f39ba1dc2466be0b962b16fe7e6f7cf18 SHA512 36cdf23d28482ca754e82574845575db0f231d89e8bbac4c7aa1b25315a04ccd83f7b3fbe97b9754e2fc13726fc7032b1fe97cf7de0b571da98d385d8222b55c
diff --git a/media-libs/alure/alure-1.2-r2.ebuild b/media-libs/alure/alure-1.2-r3.ebuild
index c1299529395d..ee620b3c4b69 100644
--- a/media-libs/alure/alure-1.2-r2.ebuild
+++ b/media-libs/alure/alure-1.2-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -17,7 +17,7 @@ IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis"
 RDEPEND="
 	>=media-libs/openal-1.1
 	dumb? ( media-libs/dumb:= )
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= )
 	mp3? ( media-sound/mpg123 )
 	sndfile? ( media-libs/libsndfile )
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index 79ab8c023eb1..5549967ef286 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -4,5 +4,5 @@ AUX audiofile-0.3.6-CVE-2018-13440-CVE-2018-17095.patch 2702 BLAKE2B f56d2bd5651
 AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc395c654c9bb25a1d914a6b57bc191ad36e55ca191f924d57d48834a05ea30913ddd744056e244654a96529b1c3632ef5b162252c76 SHA512 60837bcc9aa53d546708210e87a4f24db56c8a4b0c6896c8e39e0d213aafa15f59a65a60726e6abbf16681fc1fa6ca59cf1748a63caf5ff2652d55f10f62a976
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
-EBUILD audiofile-0.3.6-r4.ebuild 1416 BLAKE2B 6f9cd373d6b44060fa4112b2eebc5f7ffd105a07cf4f90bd5faba092bdf4c61b96b10267344d75e5ca4d0482f2326702db46d486656a8ac4a43a0d4fd0e34984 SHA512 ac0594b20467d54df456d6e720d652a5bb6aeea66fcaba513a2d66e5f53e9137d65ab53bea4d66c21cabad69ee2eb1d83bb3713a7931250a9cdb8a103f62a3f6
+EBUILD audiofile-0.3.6-r5.ebuild 1418 BLAKE2B 854e37dfafdd503c0961661f56bb05a567d30239467e318e7799034cfe28511e4b79d7636724ef341f9e3169783699b3a945fed1c5ac5d66dea030951fa02eb5 SHA512 00287eb0f0db4e69d95a628f4a64ecc1b7001f9fd6f1c60daa26fa7c07e812d053e638149f0b13d9c0351da99939154863748ef1488d4319e7a89770456ee629
 MISC metadata.xml 450 BLAKE2B 7aa693f92285a5d204d7206189e8c82c9a93146736db0cec6aa203c22f284bceca73b937bc962246f21668779c59a51504de7f52ba2901d4a8687fd28c5c4afb SHA512 eab3f3957975ecb7bb5bee29b221e19176461725fc9bdf5a6a382b8d8d9ed258db969af99fbcdfa9f5cdbfc628f4058605a9fe98fadc3971b227d811afcf185a
diff --git a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild b/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
index 6c7e04198274..2e9e462ef23b 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools gnome.org multilib-minimal
 
@@ -13,7 +13,7 @@ SLOT="0/1" # subslot = soname major version
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="flac"
 
-RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
+RDEPEND="flac? ( >=media-libs/flac-1.2.1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/flac-compat/Manifest b/media-libs/flac-compat/Manifest
new file mode 100644
index 000000000000..2b505707415a
--- /dev/null
+++ b/media-libs/flac-compat/Manifest
@@ -0,0 +1,3 @@
+DIST flac-1.3.4.tar.xz 1038356 BLAKE2B 0553cd42705f31d6a98d10e8b73953265e97c6b1e46bb59c7d97d12ec1b4aae4c3d6f5e85b9e5d1513f7efac82a65ea9dc59d89d8df0254ff3ab1188039c55c5 SHA512 4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9
+EBUILD flac-compat-1.3.4.ebuild 1435 BLAKE2B 76e5769961b53269f4caac7acfdb4a0220f60b5688a977a1d050c890f291f9670b4619a7a46575a38ceea4ce49d027a71068e4d697e3e5a75497492089da0ecf SHA512 0a9ad70a03e1e3b5fb8e2dedff528f847061b3c76cce73a9654dccc90b88fedc3d025e33996629b39c44e06994fab8d31a9ff0093680719477f39ef73a89e2a4
+MISC metadata.xml 328 BLAKE2B f204d66e57846152c096064928450d390da7ef9ff2c5b67b4cdd8b83638174363dff11f282e9a604159ec8713afcac56114b6705051af6b353dee5201526682c SHA512 a742889e639181db89974299b09a205320021bb577c55e467dc969950520f61981918f1ff2a990d788f73fda106aecf3cabe70fd40d0b0269038c16e9d08541e
diff --git a/media-libs/flac-compat/flac-compat-1.3.4.ebuild b/media-libs/flac-compat/flac-compat-1.3.4.ebuild
new file mode 100644
index 000000000000..90107a61cc6d
--- /dev/null
+++ b/media-libs/flac-compat/flac-compat-1.3.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Free lossless audio encoder and decoder"
+HOMEPAGE="https://xiph.org/flac/"
+SRC_URI="https://downloads.xiph.org/releases/${PN/-compat}/${P/-compat}.tar.xz"
+S="${WORKDIR}/${P/-compat}"
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
+SLOT="8.3.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cxx ogg cpu_flags_x86_sse"
+
+RDEPEND="
+	!media-libs/flac:0/0
+	ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	abi_x86_32? ( dev-lang/nasm )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-debug
+		--disable-altivec
+		--disable-vsx
+		--disable-doxygen-docs
+		--disable-examples
+		--disable-xmms-plugin
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cxx cpplibs)
+		$(use_enable ogg)
+
+		# cross-compile fix (bug #521446)
+		# no effect if ogg support is disabled
+		--with-ogg
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	if [[ ${UID} != 0 ]]; then
+		emake -j1 check
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+multilib_src_install_all() {
+	rm -r "${ED}"/usr/bin || die
+	rm -r "${ED}"/usr/include || die
+	rm -r "${ED}"/usr/share || die
+	rm -r "${ED}"/usr/lib*/pkgconfig || die
+	rm -r "${ED}"/usr/lib*/*.so || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/flac-compat/metadata.xml b/media-libs/flac-compat/metadata.xml
new file mode 100644
index 000000000000..e2a8eda2922f
--- /dev/null
+++ b/media-libs/flac-compat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">flac</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 330fbe5eead9..e51329b95f15 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,5 +1,5 @@
 DIST flac-1.3.4.tar.xz 1038356 BLAKE2B 0553cd42705f31d6a98d10e8b73953265e97c6b1e46bb59c7d97d12ec1b4aae4c3d6f5e85b9e5d1513f7efac82a65ea9dc59d89d8df0254ff3ab1188039c55c5 SHA512 4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9
 DIST flac-1.4.0.tar.xz 783372 BLAKE2B 69fd756ae6a41bdf84a1237cb24949ae24126a66432a0ecf1d9943a9ddd082629aa9ff480bf77ff60fcfc2401a4942bdc4549e22378841997e0d1a83f8f18f25 SHA512 b7310de7bcf49584c0a1fdc6d5ee7216a8ab3e2b1af85366fa0905752da13e1cbb9638e0d92f3b756568a69848abf4d5c2fe0d21a86c6fdb4840f2678daf0f8d
 EBUILD flac-1.3.4.ebuild 1564 BLAKE2B 8bd7aef1a3ad5d9d4acdb92d19df3b6c3d667c4614d9263d59e345a3683bd8e24adf72129be46e355266ec33ff2239efcede265bba8874a1f251b8f5a21ed085 SHA512 cd7b12fd21f8d09b09028c5fd1d128f2826f3894ef3072328e0e6f51d5c62220493f1f4ec953128354369f3aa3e6f9e2a00a301766be43724657d0c72f3deab8
-EBUILD flac-1.4.0.ebuild 1571 BLAKE2B 9fa21240605737670f50c3f655ec3af2441b3ad840b83c564af4801a3d43aa0fc5e4ce2ad1aaa6a067090c4a88224f4791b032b76a383ffee3759ef94bb7d760 SHA512 0bb85b285e8d003ab1c43ee66c871c35348d072ba537b6b0901419ef57f56fe32389d68f009fb754b77a097346d2d703487a73e60aa7f89257a1759b191665ff
-MISC metadata.xml 328 BLAKE2B f204d66e57846152c096064928450d390da7ef9ff2c5b67b4cdd8b83638174363dff11f282e9a604159ec8713afcac56114b6705051af6b353dee5201526682c SHA512 a742889e639181db89974299b09a205320021bb577c55e467dc969950520f61981918f1ff2a990d788f73fda106aecf3cabe70fd40d0b0269038c16e9d08541e
+EBUILD flac-1.4.0-r1.ebuild 1797 BLAKE2B 71ceb931c898a4b8b1a572559f4608d8060d217da2d2ea13190880fc8aa24a620fb617ce0153edf60c6628fcd8c00690153f1ced602c30082974ad521bc17a6a SHA512 cb9a1b2172435bbe9e4944398c957c02237a9900137a2fd70fb8f34f00891ca3fd42fc01aa90da44e01b03dbe1fa02006f9bf88bb0c7d3af9337a5202311d0e3
+MISC metadata.xml 377 BLAKE2B 9fa4c0dc0300b2d2deb791a29d7a2ce6b00e05399ccc29581bc4ab83b1bdff3fecd2edbe6cef3cf8b4111cae5064edf4ccec9205e6791fb57f41d363c6352e95 SHA512 9d9d3c80a5a7c0255476ddc86ebf2fc76e42fc278185e9d5c4c814ff395f6d7d74e9a3e680be2966e89113a76dd482e1fe53f761a59474cf46e8b2469849fc2e
diff --git a/media-libs/flac/flac-1.4.0.ebuild b/media-libs/flac/flac-1.4.0-r1.ebuild
index 2a50c9496016..04c10bfb50cb 100644
--- a/media-libs/flac/flac-1.4.0.ebuild
+++ b/media-libs/flac/flac-1.4.0-r1.ebuild
@@ -5,14 +5,20 @@ EAPI=8
 
 inherit multilib-minimal
 
-DESCRIPTION="free lossless audio encoder and decoder"
+DESCRIPTION="Free lossless audio encoder and decoder"
 HOMEPAGE="https://xiph.org/flac/"
 SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
-SLOT="0"
+# <libFLAC SONAME>-<libFLAC++ SONAME>
+SLOT="0/10-12"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse static-libs"
+IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_avx2 cpu_flags_x86_avx cpu_flags_x86_sse static-libs"
+
+# AVX configure switch is for both AVX & AVX2
+REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+"
 
 RDEPEND="ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
@@ -30,6 +36,7 @@ multilib_src_configure() {
 		$([[ ${CHOST} == *-darwin* ]] && echo "--disable-asm-optimizations")
 		$(use_enable cpu_flags_ppc_altivec altivec)
 		$(use_enable cpu_flags_ppc_vsx vsx)
+		$(use_enable cpu_flags_x86_avx avx)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable cxx cpplibs)
 		$(use_enable debug)
diff --git a/media-libs/flac/metadata.xml b/media-libs/flac/metadata.xml
index e2a8eda2922f..50801c93c5ea 100644
--- a/media-libs/flac/metadata.xml
+++ b/media-libs/flac/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">flac</remote-id>
+		<remote-id type="github">xiph/flac</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 3eacb7f75359..8ffc48dd4efd 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,6 +1,6 @@
 DIST freetype-2.12.1.tar.xz 2471916 BLAKE2B c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278 SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
 DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf23412270d19002bc5b07e94d946d41d089f798724982e354d1701488de37c35bf68f36de88796565f0ebaa3f9fb35c51f532 SHA512 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d
 DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
-EBUILD freetype-2.12.1.ebuild 7439 BLAKE2B 1a828b64d0270fe17298e88426f88fa0904fb20d7a3b4fc5d5fd6d45c13391c0190364cc3859613861a86298f97461300877246b7d4b4c08485b22568b5556cb SHA512 ef23497778486c59f66db7d7dff81e3708f59db63508bef5c7b8202c33f641e67a6dff8d9e8ecc7be5dee191e7f38b44d9f36495df35b37a147b51baadc096ab
-EBUILD freetype-9999.ebuild 7107 BLAKE2B 49c7d1ac429480f097baceba37ba0953b0a7a81a68636a9facee191643e8dce6c794f96e2250e5a17a72972bc8fcc400c24bb7f88f34162176490ab251d8076a SHA512 c4ecfed508b10a050c4d5957583d5fb370110f06753b1d439feedea1f859d11520a6dd2b7c26a0b3d0513ec2d6b6dd40dd13cf143531c548d9f533aa72384730
+EBUILD freetype-2.12.1-r1.ebuild 7496 BLAKE2B fcc0d3e6f1653833dd198ef64b8963209bc3bd4d1f797a55279b4e767fb38b029b159a4ce6074d783ce508e9d5a1697c9c2bf73390fdadba7bea5473884c0592 SHA512 c24692f86ca40baeba2b8edaff0a606ccbe1c9e28fb6d3e24b171a79c090da5bd7811594d1b6420769ec059307e721335d090752588413b7958ba6cc83cdc2f1
+EBUILD freetype-9999.ebuild 7164 BLAKE2B 89a5d64416841616e8b5508580bab7ad8d8903183abd8438daa55dadb536ffd3a82b460d5179de2d16adefade8a31a9f4e5a4ec7547e783a0df8c8b57fb7e43e SHA512 17dd4ff427348b166932e1b7614591eb382f50befdcc8c967f621db08005631356176198df7dde3a63e035dbb67023a7d40f38f849cb5a13ba70002251971b07
 MISC metadata.xml 1306 BLAKE2B db0f9487a62f002883a1850bbf90f5df4007215ce432440023a9c637ec79333576db4ebe4d3275f088a9225848eb508ef1b409c4c67ade051663d822ad5cb9ec SHA512 464c6f6810572f9f9194adba7b85ed8dfbe1c1b3dccafd5370fb555547b7a708768e2f302baa437cd5ab06a9da34a00d5aec7a48bc2903b24b8dab9f42aaa493
diff --git a/media-libs/freetype/freetype-2.12.1.ebuild b/media-libs/freetype/freetype-2.12.1-r1.ebuild
index 2b84c3cb6dbe..db6c3c0ecd1a 100644
--- a/media-libs/freetype/freetype-2.12.1.ebuild
+++ b/media-libs/freetype/freetype-2.12.1-r1.ebuild
@@ -172,6 +172,9 @@ src_prepare() {
 		cd "${S}" || die
 	fi
 
+	# bug #869803
+	rm docs/reference/sitemap.xml.gz || die
+
 	# we need non-/bin/sh to run configure
 	if [[ -n ${CONFIG_SHELL} ]] ; then
 		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 7e8918903023..011cc4310aba 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -160,6 +160,9 @@ src_prepare() {
 		cd "${S}" || die
 	fi
 
+	# bug #869803
+	rm docs/reference/sitemap.xml.gz || die
+
 	# we need non-/bin/sh to run configure
 	if [[ -n ${CONFIG_SHELL} ]] ; then
 		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 77f2b15206ae..a38c5d3ed9e9 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,5 @@
 DIST grilo-0.3.14.tar.xz 236620 BLAKE2B 25c81fb9b4ebce456f24aea19518d0a9c3b98a216e50fe9cbe9fa8b7e089535b5d695fb915497e8f812a0fc964b1f2b591fb0c0e382771af88318d94dd659fe8 SHA512 128464e51040ea121b19640c708fa996743a18e047ab11d4c3047db7d24732eac6da65393c16f987e834cb301385ef0c349eb0fabd7d67b2d10a230c8f03492a
 DIST grilo-0.3.15.tar.xz 241428 BLAKE2B 6b8841924c1b555abfcb852eddcaddaf0ea85dfe2922420e0e06b8fe2ea4fd4d8d5da47b011fd4c2f9c4edbe4fc08b36a3dd3c3779a92a0bd44abef3c3bffd9e SHA512 98616c1600bb7d7f5c92bbdc9b85d57da1e416f9207e60ad9b6c305c989f6d4ff6b21963f8f8c69f0daca68bf9d91b3397addfd0cea62f0553977fc0e69b2c31
 EBUILD grilo-0.3.14.ebuild 2169 BLAKE2B 3b93a248d911c19a83546185f10d75a1a0ca093c693bb99613834429080b8cea15bce40f843558ed579d7ec57ae17bad4a7c54c0da769a6765365828c10d51a1 SHA512 7452084985ed85209675d3d19ff1cf390e3f35a6f6634777af7cea9ade5ebe1fd82ff495020486af85d161a66269a9b4f779db79ced0ef1c3ca64fe44e4a3478
-EBUILD grilo-0.3.15.ebuild 2153 BLAKE2B 8fa2ba2bc931f36bf128659ae7a1861431f615f84472b02e7bec78be261490f53ce957e57c6ea3f6932c97a4af006fedf1f2219be23ae86ac4b08d97a14f88e7 SHA512 fddc7046711a6a60721d2d1dc2add344ab66f829f91d8134aecea9a5fe8a76a4e2983b53a0624ff6e41c2c0493980f7c2c8cd83535e6ec7484be53892e9eed4e
+EBUILD grilo-0.3.15.ebuild 2151 BLAKE2B 11070825a17f72a93f21f10ed4d2db0fce37e83c19d2d697bdbff8a24909fe3d416e52f29d2e5cf3d95d1d4e3dad1d3f4e3ecaa50e9faf51777f3110e1c8cc08 SHA512 622354010ecced169cf86c8d548f5bf185c4fd893c198c62c9e5df8c4096e8dbc30486e0d463f1408b91b2fd7f35d909c09a52f5ca02db3f2720b92176d1437b
 MISC metadata.xml 620 BLAKE2B e4868ed8fa4d41404a3ef8681bcd864c8baa047bcc612e57e1225007caa97de0455ff78810e8a46d68bd30415ed03172738a4b941f46a99024becf58d089b4a2 SHA512 5198d7b6f3730971a2ef0da47963699376750f9a0d66ac0ba29170313e455e1d05b85e34419c889a8f35fff389e9c074a602db96cff82834493b39e35565650d
diff --git a/media-libs/grilo/grilo-0.3.15.ebuild b/media-libs/grilo/grilo-0.3.15.ebuild
index 29c109107939..6052f88a32cc 100644
--- a/media-libs/grilo/grilo-0.3.15.ebuild
+++ b/media-libs/grilo/grilo-0.3.15.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk gtk-doc +introspection +playlist test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index cdc6bfa75499..29458b2e7bce 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.20.2.tar.xz 6216208 BLAKE2B bbbe77a1255991a2f96696996fb0c99f14f6d63fef455feb1ce90ae518bb9f80fd61bcfb223c20407b8d6240faaa93478495f8e9fda16fab36a311d167e88e25 SHA512 3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70
 DIST gst-plugins-bad-1.20.3.tar.xz 6222824 BLAKE2B 01aae59adbe76b8e50a49fb8bb8037e6f3aa93cbc2b658aab05ebbf30f8d1aef98c1981712caa39e3c9d08f1e0c9d76f2f874f7d2fdd994b3a0735b2809eafdf SHA512 cfcf126eabff550455decd7054a269b73489708c10a6b6090dddb5fde29bfba07ed330c339927ff170e025fa3a08d2ffb822322dc3798679366207a54132c71b
 EBUILD gst-plugins-bad-1.20.2.ebuild 2445 BLAKE2B 3c7437c545aeaef2e5533a91e5e067cda86c75f83be1ef1695914c10af6739423de6c0c09be1035f4d3a6c432bf63ab9c5c86b35b14a1c9ec00c10a3bdb3e9e8 SHA512 9f5ad19e161706b95ade80ccc9a712ca69949ab9f849e26a8600d6653f69bbb19318602fe237e307f55fbb648050653817cedd74fafd398d54a714e0d3c2ae67
-EBUILD gst-plugins-bad-1.20.3.ebuild 2438 BLAKE2B 610a73aa9d129c00383de6b14710cae608bd8ac54151843e6b49f61689551f3ec75f60a331215e412f99e82837006a9b08f742b8e79df9bd8755b1945a77f18e SHA512 39dc8f96b1e96dacee99e0076f7bfebc8f0401423a248b821b0e0665e40a05f85c4fbd77399fa802827108a8bbf8e40b1605877a065eeb36ec0a6e5197f86947
+EBUILD gst-plugins-bad-1.20.3.ebuild 2437 BLAKE2B 5a933a09d80ecbbf16a642bd532e413ae429819d3fad021b23e5ea7adcfc25d24dd5625ee4ef45c41e635c3f3a4a1f894b890b4d62e92be3ad7ddfb867fd81ee SHA512 4728d9c7a594f0f2f037f2b317890c009309c4f87f91eaf97ab303b6f3c145d40fab5626699023ee9cda2120eda0f5cbc38e5e6b63698fe8d4d440633bf27512
 MISC metadata.xml 440 BLAKE2B 7effc0f6ca218dae5cae9375491cefd7304006ed2e0ffdb9afdedd8ea3098fd1fa4eb0c2cec9381a3bbbef1c4336094070484b11e447381a1465af66ccbcdb8f SHA512 443bc8793f8c94ea7005445fab8292a17ff2be19f82a769a303e5b84dcbb3282f61813995695bb935d16d2647aae2947acade8f456f14ff6df36fc45cd72f4fc
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.3.ebuild
index 276f18d39a2f..19912c3a548c 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 487721963b47..c136c8c86ecd 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-base-1.20.2.tar.xz 3295552 BLAKE2B 23b306c566cdd57e31b84082bd14c93e84a10329d83ac71365c0ba7f523d1415ac36aa8217c982abe0c33a40da6e884fac66737227eb794b5bc0c64944d7ea36 SHA512 144ae965a3e487c70e9ac55099ae49f54bff7110d5a92867ebe8a91760dd94fb7f13dc23f34e55923c2150012f81b55be22c840fe89d97e4e78290cb6d51bc51
 DIST gst-plugins-base-1.20.3.tar.xz 3299976 BLAKE2B b397867561df763d5e762069c6ad20298857d4a30727a18a60e8df9a53658e52f6a189c3426d0f51a16e7cee1834b402470ecb0284aca65ecaa0300dc79d0c8a SHA512 258294291cb9b406c17dfe4e5c1ca9061580d0789293355c9b43d558630d360097b6867287edf1688f3edaf50b5900cdd177c1429c122a0415c56da8b0f21ed1
 EBUILD gst-plugins-base-1.20.2.ebuild 5596 BLAKE2B a7547c9a5191ebd6b52a79402342f04298d9bea226e12f3ac1297d8c3617322baa27346a82d5c5a8dc136e72effc6002a04e25d9bd6a6ad19549d56423f70ccd SHA512 9e23602dbe2aa50987194dbbe19b735a5a25a6a6ed2499ccebd014450f8c2947a24a66b345cd82f678ce9b3882ea1075d90af6d4358de42f5bc2cb8be51c31cf
-EBUILD gst-plugins-base-1.20.3.ebuild 5602 BLAKE2B 31364bd078d0690dc540fd4b6ea2f72a14efb19345e36839ecb7fbc32f24c546307cb2591af71eb14baeb4bab49b3a26c3c5bf29f15ed2931829a8d6dca52438 SHA512 b85f4dd4887028c004133c834738d8ce027b20475390e02afb3e6dc0702a72c618541eed02979aab480987ef94e27af1b4bfdfb969464540cc28ce055c1880fe
+EBUILD gst-plugins-base-1.20.3.ebuild 5601 BLAKE2B 9f2d44b319908865cafa6ee4bef4ca18855d2a6290efc214ffdf8655da83e4ba26c667524c64886bc3cea8ec5401c8ae109a79f1ebbb95d05dc09d2f55c18f60 SHA512 fa9252f12d36ccfc4ed9768a6cc56c0a3b612a01f122217b41da5fa219f2a42d205552eb763f665cca35102f0f8c0bf64ba22081d6af00d7d2ee833fcc5eedec
 MISC metadata.xml 1066 BLAKE2B 1d67f7f75e3f44459adfce03a6ab85a8c7d6a0b24ae83ef48d6b80c1d64845edb1ec5e7cbbb002585eb91663210025707887f5eff66eee41b14e0afcbdc0b4fd SHA512 227960f7c740d5131c1006854273d4b1047a3ceba07d5eda3d60c0f5baba4e8ed9926fab1737e1f97c5745f87f80fcddbdc7e239f5f2942902c92f8053074931
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.20.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.20.3.ebuild
index 4b0088147c15..47ea69ced653 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.20.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.20.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index d52e62940255..bf3378d1dd07 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.20.2.tar.xz 3411008 BLAKE2B 45eb497d240bf9b05cfbf85babe5ef85fb8a7f25f1b470f131f319064e1dc04f334d4b7dede4f0aedd73dca01605b7e00e2ddc587bcf9ccce6989a9e99776cb1 SHA512 a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933
 DIST gst-plugins-good-1.20.3.tar.xz 3417252 BLAKE2B 5f288541598d2c308fbb1d5e36e54e8dd4c6e9d7dd71f41b778fbdfe883ed48e8d13fa53d05518cc671de029d804f7dc1d93396de9d199d45ec131230926d33c SHA512 98bb2dd428edaa1a5846fb47b1f42a1e99541faf05cdb0fb632d4a1a1e4fb2c1f9d1229bf0aa2ddcbce139533e9fd51f8f9a1175cd8a8729c5179750ca84afa1
 EBUILD gst-plugins-good-1.20.2.ebuild 1170 BLAKE2B 8ec10376877aa1691a6073de4c6a5a1ae7cdeaca27572df657d528a9782b6768f020a71ff19e3eb8e2755ab3a11f3337f5dc6ef972f1c16c724a514bf0121723 SHA512 fd8cfde8c06c67b39b6acb66d12d5e6a6c69410ea14393c139308d107cbf6c256d024643458dbecabf9125b3b5c8773e45aa5c29072ad814cff2534474ebea90
-EBUILD gst-plugins-good-1.20.3.ebuild 1163 BLAKE2B 7f3633b7e70a5038164aed0301f3632b93e6ee7d13241ce083c71d00201b6c1c88f2e9b3279cd2fd6220f76c06a753b00e3ee442cc2984bddb93119e5a72057b SHA512 c55930c162ab6625d1294ba6990422c14f0c4657568c8b263be964bd68f22fce28221eff957a6e1cdc9498388481ccc56023a6c6f8721eaacc8ab6470a388661
+EBUILD gst-plugins-good-1.20.3.ebuild 1162 BLAKE2B ed91f69fc8ba876b2454a532a0e9ae1a1412026762a89afcc59f2c5a95291899e79393530b1f669d801e5db47d5c63b8185aea95cefb41bb534eade925c4c7b8 SHA512 a2eabd2a3c79738c5a099660acf84187478cb21de6684db6d7b28a63399b6f20b7864457f09574ceed0724c23ca52691c7f984ec3ec288ff5d6aa63f93327f4f
 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.20.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.20.3.ebuild
index 350fe1793a50..e7e968900a27 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.20.3.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.20.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 9c8e65dc68b8..e4542d6710cc 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.20.2.tar.xz 506672 BLAKE2B d1ca3075182a7fe431884c29f12ce9ec60bea3fa0e701a02981f1bf4f6ba393890712373be7a5f0b76734ccf80a5dc1240f62505f2ffe1ab12f1a314ce82bbe4 SHA512 bbe6c60003dc180084995aa00c8aefc5238f9e826db03f5cadac4a39900f2e9ca529b8f63787ca59c830e12bf4f426408b185ca228bd5e9255c2a4f452a48d6a
 DIST gst-plugins-ugly-1.20.3.tar.xz 508272 BLAKE2B 6aa1859e89e40f1b9595ccf0b7db3b91dcf82f68c2f659c48987ac3144ff9a4aefc2fc37a3a0850f2487190f7ff957a44ab3d0333a33850c3ac36dbd0f7a2ade SHA512 6a18bcd8d90060d14f07dc9f3ac014f7a06a7da13568ddcf871916f3d47878ab73929b71a9863bc7ec08b3ff9418404703c9423100ee844fafd1026ea0be0fb8
 EBUILD gst-plugins-ugly-1.20.2.ebuild 751 BLAKE2B 41936eed0f2d93a96f0c068efbea0ee249eeb9d451d9dc987aca0d9fca4d808fc3b78ae2842b794cd7c3d844680afc21e5b55465f42111eb8300f9a128b499e8 SHA512 9f3ec10ca0a1053545176d0e4d6026fcbfa0e064d000b530fbeffc7e8732dc6c6e31bee8c263957a853ca975014d770b4bcea585e9964376e0f089a21ca37a5b
-EBUILD gst-plugins-ugly-1.20.3.ebuild 753 BLAKE2B a24c39e108f706a5c2d95cd0eb1373471bb68a62b25a66bde3cda6e84c976371c0c1e6233d8e85ca5bdea9f2b7796e48e36819fd9e1407d1a03aea98339836bd SHA512 4be18aa48d35fe65055c54d0fc7177220ebbfc0af185876f1845ca9bd062db3cc44c4360365a2205763903bd67d88f0a4473d9b7ada28ba9e97764c9a9608f0f
+EBUILD gst-plugins-ugly-1.20.3.ebuild 752 BLAKE2B 2924db1f7116a1a32ee516a176850894efd05fd63e083cb0e63e3a696e010d6c56ed54090bad75600a63e3df56d93244c5bbcaed1e739b3aa797409d5aec25fe SHA512 d922c336d9311513eb302549f44664daee2559c9323c1af59960a05ca1e356096751998b31d56b4d969cb0b0112d40219eb17f52e2ce13215a100ab6309d5fb3
 MISC metadata.xml 346 BLAKE2B 940d96d0ed61860085f5f6ef81706c4bda670dd1b6bf4947e29e636d180a9bdf02c42e33fed50975f7da608f048dbe0d578f1b76c8e73b233bd7ac6d291dc653 SHA512 57dfe4552e5fa65043a0e5efba15df272f21d7c6838d705a83959991ff30a71ebf38526b5891cba93e4d1256f446258abd18cb368ec9782481f791e4815bd3b6
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.3.ebuild
index 2e9631b18474..1809441a5395 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE=""
 
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index d8b64110afe3..2d36e6fe9f8e 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -3,5 +3,5 @@ DIST gst-rtsp-server-1.20.2.tar.xz 360388 BLAKE2B 6593a83e8746001c26abe623608390
 DIST gst-rtsp-server-1.20.3.tar.xz 362348 BLAKE2B 45d5ff58d76b9b83baa6e5956976e1fdc10dae3200d30a877a26ddafda4f919ecaeca85fceec6fb3b7802303d152087d3f5813f6e3bf36a941a0c46fceeb1292 SHA512 15baf83d77d57d1e2517feffad68b4508e7a959863b5e6fa3d0f564c81786df8d3c1e57d8b8a9f9b623e19212feb137dfe89d8e385f518c86f205c4461802007
 EBUILD gst-rtsp-server-1.16.3.ebuild 1948 BLAKE2B 930640db6ad1288e443cc65333f9c84b175bc8bec63afd89fc947fc58737377db32c904fa427fce3b876b207ef33db73ad00d7b49726eb78b6ccedda0ae96485 SHA512 5850334f33b39fe3bbed46f48beecbecb604873d7751aaf570b0faf286b81e80027a2afa1ef1c76bac8851c6eac58b62be932d283a3145a1cb3e210c329b4a12
 EBUILD gst-rtsp-server-1.20.2.ebuild 1182 BLAKE2B 2b12602ed9f0fdf554d3b26c89d98b75f0e7a4218e431cd29af6a70e44cc6df201d1a68cb4863220b3a34d91320772c9fc738ee000c3f9282e76a460a422ca7c SHA512 72e7550b9be8447ccc4512ae707893a8b4e00d6bf1e85ba91bbf81f3ae0e1a5dec03f1d0fcb0443ab16406e923ab3a5f3b8d7e4cd4647bbac47efdd2f2b31ea0
-EBUILD gst-rtsp-server-1.20.3.ebuild 1184 BLAKE2B a199b9d3f7ea74c18c6591d9bd515fc62ab701dc32e6a1e3c08b54ad32b642df19357a2975a019389ab1509596ad699960fd42ba3164118442950de1580d5566 SHA512 6eb59c2ca5095ab1010fd49a70833bdfcb68121ee83ebd74b8ff2cc8e4326f2ca2f6b02695e0e10adcd70cc0ff8dd92465fdc5217e2eab1bacbf2e64b5f044e4
+EBUILD gst-rtsp-server-1.20.3.ebuild 1183 BLAKE2B 17d38cb8234cfa170eb22a9047abab453cbb3782e9890a808631e6c48de3ac96b8a376da498cceee1844f7abb225e9dbb845e3fdc1156725bb85e23ee42cd6e4 SHA512 c4ec7b0e716af387d4a3aa26e036111f9fe7e05a069288c371f5c030d8e8a678e51b462dba7d33253b3732757d25ea943df1eb2528359678f075b1ddbc7523e8
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.3.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.3.ebuild
index b48154a12921..093ab56db71c 100644
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.3.ebuild
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.20.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A GStreamer based RTSP server"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples +introspection static-libs"
 
 # gst-plugins-base for many used elements and API
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 4a68a9baaf76..a9a1146c1141 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -3,5 +3,5 @@ DIST gst-editing-services-1.20.3.tar.xz 979284 BLAKE2B 3d512a7bc17273dcb55c3a0dd
 DIST gstreamer-editing-services-1.16.3.tar.xz 1091208 BLAKE2B d88bed4e8958a6bad05aab8d6c19cd737c6812e0780c420fd144d58fe416cd5dbd01e019c3fc53417d65cb2d6e100de123dc8183c8c3dab329fd677ba55644c5 SHA512 c84cc2dab2b1644ab118794b7aeb98748f893a26070359850f48e87cf362fd53b54baf8754a07e1d412cacb85cf9cfcafb3cf10d79c67bbe077e4d763f9703ef
 EBUILD gstreamer-editing-services-1.16.3.ebuild 1857 BLAKE2B 9161678fd102cc9f249a289f7c6cccc97e9a3e4f4f4591cd598fbaaa736cf73a1b27c86cd1eaa2dfcbf5f0cad4c016796b533fd9567f1aa80c9deaa8d0be2105 SHA512 d5219ab71d71e520bfdf83c0ac58c5b442adc984893026675aeb2b5304c35c029b5debdbd1baf53655a1a097f1271f74e81701fcda3a6a2a02690ed8be2cc2c9
 EBUILD gstreamer-editing-services-1.20.2.ebuild 1335 BLAKE2B a34a15f71f4e9b53954025228eea348546dbb126a24f493586c3aa8e98ac7eba87f8770214659b3ef91462de4938a2ccdaa4ce4350679d0422a560d1728f3d19 SHA512 f0bc3aa9321e4edca9e25dce0be5e2642c106658feabddce325662e9b39357836226a68fbafa0e517b395ddf54f23e03f991d4d24e114821a8195f533601bfa2
-EBUILD gstreamer-editing-services-1.20.3.ebuild 1337 BLAKE2B d9f33b423025d4afb7dd1f11e7b1e61122dfd43d14138adb1055703c09044cae9b79df389d5e4c4a4d1cb5b4b2db26a9c76f660a24ad2c09ec841b337fe2231f SHA512 21ffc2092e4125d710422002d9c3dd4459cbbe92dc32ea03f10c6fff891a6b4a851877ea4fc2087c4491715c848e87c77806472414da341d85009aa3d232973d
+EBUILD gstreamer-editing-services-1.20.3.ebuild 1336 BLAKE2B 2cb3523df92926bde40fb24b05acee7b88091dc7940081d227ef9700857d6d23c21ab192e0f4fd2ca341f3decf8702aabae47f931df0e1c3ba32073d513e03e6 SHA512 a2b212068c3e792f0474b5e6bf01e80b5784add8031eccf994c4f3013105a71a9afd64dd6a8a6b46ed9e9306f440e26a8f5c3bf68820d73799fe534df510a0a8
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.20.3.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.20.3.ebuild
index 7caf66f5d784..d0cd139174de 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.20.3.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.20.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P/gstreamer/gst}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="+introspection test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 4cd73e4dd511..75c6d5504089 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -2,5 +2,5 @@ AUX gstreamer-1.20-loong.patch 2349 BLAKE2B ed0c7188709407438b5bb038dd5f1d6b24fb
 DIST gstreamer-1.20.2.tar.xz 2677552 BLAKE2B 0e6a818fd900c4f0c2748f15262e1d166755e3c419dfa04d7fc4a434ad9a84474d0eb43b9cf0286008497d7ff3e5340b737aeafc45d2994d7c713d5a12e3e2e3 SHA512 994378b656fa593e134624d5d4d5014e78074199d80152eafce29bc09864bd6d0f32a31eafda6cb8caec60aa85b0bda7c42a8c3b388b47d59f2cf4bc729d551f
 DIST gstreamer-1.20.3.tar.xz 2681088 BLAKE2B 423669ff2224cc5d9b979a1353eb1dbcaea5dacca374e83630abf23574f813cbecf5144cdd3209f638aeb50e6764004c3d8020db7f11b21726a9f4b56b513d10 SHA512 e93f9fbf2d7a839dcbe2030ed16dd53eb250741db7c2f1cea396c23e4fabf9a0caff6be4babf7c10aec4b56dc8319a970b1b0bfa6eea2e36aed3e6e1265d9278
 EBUILD gstreamer-1.20.2.ebuild 2015 BLAKE2B 9d667e7bb7b77205e6d10def6bb1b581087563a7041c31a3e10df0d1afb4ada70515e48618921f032cb36d13cba2072b02dd0c0e0da110c37a86d5dcd30282be SHA512 d5b0663a92617ba86d52d526070585976d40bd4d09a78ce536071cbd1b2830b90a1b23a08997108d0eae17412fe9fb2043eae9fd7efb0b33c2b32ee0b298f962
-EBUILD gstreamer-1.20.3.ebuild 1983 BLAKE2B 8316404ec235325a10bd18830fb5197c3171d3b646ad1056df4afafc5c568a43bc3157dedfde55153ced41957f5f0ca4a22ba3db85c71266a4430f80fa939b36 SHA512 526f0592ce97b9d61a7c3e7ee3f9ade255753fdbb73a0eecc55d91e72d93f59874c555492049949591396655f50b73529c44a59a517efe56c1889f752e41798f
+EBUILD gstreamer-1.20.3.ebuild 1982 BLAKE2B 66441fbf6acd27f68b26334534361f8331ec640bf7100799f879ee310b8c06dea18a8ab58330f21d40782e5148d434c8f97dac66ad43e159d8bdeb9392a2adc2 SHA512 027e515c6d7618692eb58301a8b254de876f7a4806929e36a2a466b4d445000404aadf9888b03f415c6b94f5475b14ebb87ad24c84407c2296f1c40463c59020
 MISC metadata.xml 587 BLAKE2B 6fbb8876aa30451f9ed4851b8da1698371f1d546fa13674ef87acae0a73f85770e17a5cec2232fabae28fc7cd28e76fdc177b9d016ea35f20094b40aef6a25c2 SHA512 d28f3793ddc86087854b04a2330e158f521761a45192ee32ac947f9affb400443205a3c0911864474738e2494626ba4fea66dac6549934fd5cdb32af6fe2ad4c
diff --git a/media-libs/gstreamer/gstreamer-1.20.3.ebuild b/media-libs/gstreamer/gstreamer-1.20.3.ebuild
index c44deb5aeb41..87d576070062 100644
--- a/media-libs/gstreamer/gstreamer-1.20.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.20.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection +orc unwind"
 
 RDEPEND="
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 75b4c54fadc8..227d6c91c34c 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,10 +1,8 @@
-DIST harfbuzz-4.3.0.tar.gz 29200217 BLAKE2B dfe5e3b47e3d89a5ad7c6eaf6d274027a0eb05d1994b922d3124c97270f34353384c0161d8815fb2e379e82c8bdf046843902ba53db38daa4348e99d99255900 SHA512 bccf7cfb06ac18a9a9bf465c30dbfb51d73762a6667b3a069a85f9f597e6d27858e9e39a36cce12e23ec5b002b9e572638bf00c76bdea66545ae67a2bb7915f4
 DIST harfbuzz-4.4.1.tar.gz 29231251 BLAKE2B 3947084ea2eedd76d64acfc5286ecd14d772ce0507163bc2c54a86579556a8799959ff4d47ea2919ee8472f8fe50d0266d325e3d0a7024f2ae8dcdf48d14f37e SHA512 bbc415d7b74408b1e8d34bfbc19a3cab002471fdd56d71b469c3129f0eae5532d5c7aaae7bb5cc3942fea6008d2ed9e96a7b20b10f4f5e46db63cecfa5c0248e
 DIST harfbuzz-5.0.1.tar.gz 29291175 BLAKE2B a30512dbceba7eb339164cfe77685e6ccd8338c297a080341236e90bbcf7451eb27d5227422e040d92ff4267f4d97c377a66cdcaff45ea2b1e69de0602047ae0 SHA512 9d05b97dfce248634b6b3ff69fac5cc344f0c8265bf05595b74b0b060049dba082d358184662b8ea045cd51c3d07e7c4a4804513052094566b777c33ec5af89c
 DIST harfbuzz-5.1.0.tar.gz 29358116 BLAKE2B 006e66e9c76b505214b948c7c8756af38171b85cc865923e4665a4dd3eb14d89d20456ad4490b11208d57d056b087da78e1742141e41f8a22e644f20d3ea4851 SHA512 bdd7c2ca0b6f2a3a3fffbf0324d3c8bfd64a1753314048f6f67f901d4098e90054eeda9155d134f03c5d3ddefb15e087f872d2d87b2ace07bac6625fb43c7f3e
-EBUILD harfbuzz-4.3.0.ebuild 2568 BLAKE2B cd0fd13772b43e47a8c90a5912ed5839c09599766e865e5fd7633a0694b9f379ad4c19c7c4b28af4aebaa839e5eefe45138254b075954427a9b105fa0247a52c SHA512 6d4ab2b384c575df4da788cb4042ce3ea88010d1513d1a84a340881e26efeefec5eb46179758eb06b377bedeba5ad999f69ef9a5e33c0779c4d25394b9d1aaf7
-EBUILD harfbuzz-4.4.1.ebuild 2569 BLAKE2B ace9be81da0121af94c87cb20af8d1f570a842f9398a17b4a5b656f25a729e0802407ed4d8aaee042827d7da1a5f0ea6e5332235727ce059f2a3a598e7622751 SHA512 d50032036a766c4ce2a458de19d7aa25f50971aa74a9d26f0231eb8c8e4ed9f3a3a8618204a0d37373a09dda01b1c3f2a8d9ee0cfca5d36dfaaa0d33c5ea18e1
+EBUILD harfbuzz-4.4.1.ebuild 2568 BLAKE2B 7e139034f21f106e2d3df102161487d788b49e6f52d2d109a922c0d38a9821fe090f71f5d844e04f495e16c69328b5b75c37dfd2faa05d1e120b19f4ccca66dd SHA512 0548def0efedc11cf90c9b57090e835a2f83a9e7f5b679166c04c16fc011dcf7919d5399c0ccbff1c7c8371c2480771d7a92da60573c3aa530e451cf5c2726c3
 EBUILD harfbuzz-5.0.1.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
-EBUILD harfbuzz-5.1.0.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
+EBUILD harfbuzz-5.1.0.ebuild 2580 BLAKE2B 7d5fa1f940381b0341c942a04050364410ff05b76f1aa9730342e90ce2770770de6c2a4a126605ae0939e03e9ea6596705c02d49738583d843359883c5a840b0 SHA512 90d5ebce65e271261a9dcc4113b30cdd1e13db8a9a0cd85455b1385f89619deb526ff8d7e6b5073267fe3f227550ab23efb4f6ae681398433b97859e1e801bdf
 EBUILD harfbuzz-9999.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
 MISC metadata.xml 763 BLAKE2B cb8679b8a67d692c73f1dc48facf6a98a442d34b51a90b2236070919b737d22e38a15babe5847cf4d30d4630c66d803f9d6e684c5e8b8b87a199d5d471a9e35c SHA512 0d87926c3e7a475bc84859d630cc8ed1b62e5766856e15b9aa74c87b5fd22345a9c05951508ccecadbea3513afdfd2244b1dbfbec8b41022d413a1401701e55e
diff --git a/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild b/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
deleted file mode 100644
index 52a16186c47d..000000000000
--- a/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-# 0.9.18 introduced the harfbuzz-icu split; bug #472416
-# 3.0.0 dropped some unstable APIs; bug #813705
-SLOT="0/4.0.0"
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i \
-		-e '/tests\/macos\.tests/d' \
-		test/shape/data/in-house/Makefile.sources \
-		|| die # bug 726120
-
-	# bug 618772
-	append-cxxflags -std=c++14
-
-	# bug 790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	# bug 762415
-	local pyscript
-	for pyscript in $(find -type f -name "*.py") ; do
-		python_fix_shebang -q "${pyscript}"
-	done
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		-Dcoretext="disabled"
-		-Dchafa="disabled"
-
-		$(meson_feature glib)
-		$(meson_feature graphite graphite2)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature cairo)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-
-		$(meson_use experimental experimental_api)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
index 9cd4d151975c..f6c627a4602b 100644
--- a/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-5.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-5.1.0.ebuild
index c3af9764765b..7489d689fe1d 100644
--- a/media-libs/harfbuzz/harfbuzz-5.1.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-5.1.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index c2fb469561ac..65810cb1f284 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,4 +1,6 @@
+AUX lcms-2.13.1-clang-15-configure.patch 975 BLAKE2B 61777175f340ae6e9302820f37fd842f80bccdbf5219928d34cdcfe21342e3d935d70761f07d39497336956c920100d3f9eb75db5cf8aa6c2610b534beb2c0fd SHA512 68e2aa1b12259fba37b02fcd22c3512167e5010733f3ff083f5b0d33ec0d7f7be40ef04ec49e46664522d2dca064c98ccffc08a96b18cdfd236f0d9c06fd2f95
 AUX lcms-2.13.1-fix-configure-bashisms.patch 544 BLAKE2B 8b129f74cea00033a5cf02c07d7102c7d2f6c5c442d570fd27998d6e9fcc32224822fbc6dac66a8ad07597d9dd02a4622643421459d2d62fc15710fb5887f03e SHA512 1df85b4372a1df8cebe49415c187d19a830eaaac5b1bc1946246bc1baf60bedf11fe2d4761c929fe58c61206420be96b5ab1fd0088cf4da8007de41d079262e1
 DIST lcms2-2.13.1.tar.gz 7276499 BLAKE2B ff4815fc4bcea94dc942f8072741c592f1bbde9c8e997f4e21e36cd271062a341ecc9b1f3c56e3e36ec19091fec049ee9faf75df04c2bc1e11174dc4cfe8da9e SHA512 214ec63fa086b580a6507d493a54ccf5faf02c40e149d71e41f9fc8510efdb16554621c96d91cc886f09682c9631b10aa194b4b67eb6ffcc871d5d4666b05617
+EBUILD lcms-2.13.1-r1.ebuild 1520 BLAKE2B 71f99c404c27bc66014b95b38fe15fa07e054228d736d5873ad392b81506616b446cbac980f614fec244b8e99bf341dd1be2af302339e27c5a72635ad2a1bb7b SHA512 a57782c274785c99c0a6069a77284739e0f8b4503ca688fd681b19fd246b4981eb7d1a1c1f5c62a2cd59fbc3f0a0391c7b6ed651c1df9347bf16307f647a3f20
 EBUILD lcms-2.13.1.ebuild 1455 BLAKE2B 5ec63c92f04001840a1884bb1c2b7d28623aeeeb8e627324f2a6cfff2d9b21f6fc7da90e79e12107e280ec6f3af3bc4816678f7be589c2441c62d3d65c398ef9 SHA512 e3e24d04b8dc487d5659d3893c1f52e6005e5a3fedd518350578b76bb3fcda3bad34e8d79f759b03e16aca453f6c310ab367cece38c3445a56455b2d538e9c18
 MISC metadata.xml 465 BLAKE2B eac440b8a48c75faaa51b0333582740e7e33b0b6222bf5376383764c9395cfa7a7936e19ec2dd22a043e3251ed4e40161c7a594f7f3157b8b809c620dd551430 SHA512 dabeaecc2fed3c2e63f2bb0219711961c51f7da710a5e90629df694c5c89deb9fd26c2329ed5ac577edbf60b51a8efd34f65fdd7e6759912c2513e4d8efa6f35
diff --git a/media-libs/lcms/files/lcms-2.13.1-clang-15-configure.patch b/media-libs/lcms/files/lcms-2.13.1-clang-15-configure.patch
new file mode 100644
index 000000000000..e723d1f4b3c7
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.13.1-clang-15-configure.patch
@@ -0,0 +1,29 @@
+https://github.com/mm2/Little-CMS/pull/338
+
+From 61493b49b91740a84dea61b72a8ce7dc40afa766 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 12 Sep 2022 17:56:31 +0100
+Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15
+ (-Wimplicit-int)
+
+Clang 15 makes -Wimplicit-int an error by default.
+
+Before this fix, configure would think SSE2 support is not present
+when it is:
+```
+checking whether compiler supports SSE2... no
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -212,7 +212,7 @@ AC_LANG_PUSH([C])
+ AC_MSG_CHECKING([whether compiler supports SSE2])
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+     #include <emmintrin.h>
+-    main() { __m128i n = _mm_set1_epi8(42); }]])],
++    int main() { __m128i n = _mm_set1_epi8(42); }]])],
+   [ac_compiler_supports_sse2=yes], [ac_compiler_supports_sse2=no])
+ AC_MSG_RESULT([$ac_compiler_supports_sse2])
+ AS_IF([test "x$ac_compiler_supports_sse2" != "xyes"],
+
diff --git a/media-libs/lcms/lcms-2.13.1-r1.ebuild b/media-libs/lcms/lcms-2.13.1-r1.ebuild
new file mode 100644
index 000000000000..b75acfc8ad46
--- /dev/null
+++ b/media-libs/lcms/lcms-2.13.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz"
+S="${WORKDIR}/lcms2-${PV}"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc jpeg static-libs test +threads tiff zlib"
+REQUIRED_USE="tiff? ( zlib )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.3-r6:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.13.1-fix-configure-bashisms.patch
+	"${FILESDIR}"/${PN}-2.13.1-clang-15-configure.patch
+)
+
+src_prepare() {
+	default
+
+	# TODO: Swap back to elibtoolize once dropped eautoreconf (for bashism patch)
+	# for Prefix/Solaris
+	#elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with jpeg)
+		$(use_enable static-libs static)
+		$(use_with threads)
+		$(use_with tiff)
+		$(use_with zlib)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	use doc && dodoc doc/*.pdf
+}
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 6266bbfe0f82..a4faf9344bca 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,5 +1,5 @@
 AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951cf548a2f1340ee24c180244f8ba2bbd85c7002c963d06257aac0b0457c2afeda755d0aaacb501280b995001f7bbd49d6de9 SHA512 6411df1498fd3594088b3488e490b25009e9243684b777d35fa26189c20f410b42496b5fb42f762c468df746a9bdcd6a310f645db5ab0bbe3bd121e82aa9d48c
 AUX libextractor-1.9-CVE-2019-15531.patch 518 BLAKE2B 2310c4863dcce5324706a96fb86cff7b72473d0027027bf8f40453cc863296a5c1880577af8a95f0875522da4d5251690c77cd8571e87d5c048f18240b8aee03 SHA512 5b50c20ce0e77f664578e1383e481694388e6200f01e3eef0029296deb3cc35cc76b2277d4a1f879f3f1d1b4d24235d2e17f26eacf0a5b963f1c1433a615eaa2
 DIST libextractor-1.9.tar.gz 8323852 BLAKE2B 71e81e57ce7857b7b7f0180a7b130b0808573d71384c61a1a079b0ce9c02bc4f1386d3b27c68d668b555a692e523a7998d6fbc675d15f8ee26b487b0b5b31927 SHA512 c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149
-EBUILD libextractor-1.9-r2.ebuild 2835 BLAKE2B c41f1c145f094016db5b287467b27eba67a3aae73604972b26d777e5165a2d0fdef9385f7daf5c7428a9c25533eed39de5ea11cc184cab8a15c968b6770a174d SHA512 c6680897028b6ac3e54f7bcee2d3c714c2306f811fcf82bc41c385373cb4834aaee97046b32d83253d8548a67bcdd2eadac85f18f081119864edea88cdadd85f
-MISC metadata.xml 561 BLAKE2B 530fe5df16396fdf04dea559e6d13c0eb0bc17da4fa50d1f418b193277d5ae9dcfd98ef41b4599d2961065d431c56b6d86e82f868ed5a45ce56049c8108cae44 SHA512 6c8e8b1d62d1ae7b5950d8a3decf451681b677904f63cac7bcd505a2498f7e864164afcafc54049d7ea5773b8756c97b03a05a2517a8185df0116648af853d58
+EBUILD libextractor-1.9-r3.ebuild 2847 BLAKE2B 7127c16646b09201fb68c92e063c94288be9766a9a8cc648860fa3b4387a628341d37f8a45f53a6b839563fbe2d465ef6931247f4eae4d710a349b4932fffb86 SHA512 e3ee099de134402ff30cf74e8f2c85cac586184197b72a909f8cf61a8bee90f315ce493aec5f672b5fc5cf2bfcc02c1f0d19a6ff04f4472bc3adcbe2c7761f4d
+MISC metadata.xml 466 BLAKE2B 824c0c14cec6429d914b33c019e3a38e52e1635b3371003769713193285c66de9beb63583be6c437e6b2a9cd283fa46115818009ab953276bf3fa585d6660048 SHA512 c8b484ff176f279e75f6948fd2d28dbc78d70bf5c50b1e54ab92180a356febc646dfdb0463e2198b591cdb1d3a818da9e85b560844daa2acfeb7e7ea7a92b816
diff --git a/media-libs/libextractor/libextractor-1.9-r2.ebuild b/media-libs/libextractor/libextractor-1.9-r3.ebuild
index 0fdd4b76eed1..f2c66376f63a 100644
--- a/media-libs/libextractor/libextractor-1.9-r2.ebuild
+++ b/media-libs/libextractor/libextractor-1.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,9 +24,9 @@ DEPEND="
 	apparmor? ( sys-libs/libapparmor )
 	archive? ( app-arch/libarchive:= )
 	bzip2? ( app-arch/bzip2 )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg:= )
 	flac? (
-		media-libs/flac
+		media-libs/flac:=
 		media-libs/libogg
 	)
 	gif? ( media-libs/giflib:= )
@@ -36,13 +36,13 @@ DEPEND="
 		media-libs/gst-plugins-base:1.0
 	)
 	gtk? ( x11-libs/gtk+:3 )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	magic? ( sys-apps/file )
 	midi? ( media-libs/libsmf )
-	mp4? ( media-libs/libmp4v2:0 )
+	mp4? ( media-libs/libmp4v2 )
 	mpeg? ( media-libs/libmpeg2 )
 	tidy? ( >=app-text/htmltidy-5.0.0 )
-	tiff? ( media-libs/tiff:0 )
+	tiff? ( media-libs/tiff )
 	vorbis? (
 		media-libs/libogg
 		media-libs/libvorbis
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
index c746a433d520..bcc04da57cce 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <!--maintainer-needed-->
   <use>
-    <flag name="apparmor">Enable apparmor support using <pkg>sys-libs/libapparmor</pkg></flag>
     <flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
     <flag name="gsf">Enable OLE2 (MS Office) plug-in support using <pkg>gnome-extra/libgsf</pkg></flag>
     <flag name="midi">Enable MIDI support through <pkg>media-libs/libsmf</pkg></flag>
diff --git a/media-libs/libfishsound/Manifest b/media-libs/libfishsound/Manifest
index c68d6f852937..977afaea8959 100644
--- a/media-libs/libfishsound/Manifest
+++ b/media-libs/libfishsound/Manifest
@@ -1,4 +1,4 @@
 AUX libfishsound-1.0.0-pc.patch 410 BLAKE2B a949e5c3e843017f7c901ef936da4dac2f9d3300cc6fe57032d28bfba94919baee9a77054464cd97c567bc90733bbd6cd92fa25f7fb4a41cc38e5f502b075eae SHA512 b4b5f70363633702ed1932454bf8133d24ff7703f432ebd0c8721e33d48c1a21fc996c4759713fb2272f230038b40fe6cc773aea715726dfee13066669e32f1e
 DIST libfishsound-1.0.0.tar.gz 444980 BLAKE2B eadb6bed80d51fa7399f9557a38b65183a4f583e431bc68ee961dcca947856c79f011206fdcb04ed6ee5f709e1045b2a9c4fd4a34afa00b09656b1a4623c3ab0 SHA512 97d850fb42b394fca098a96b1784da431a0af1d54d57127179b612e4b88a7a2e406eb1411f55536e5a11ec2e8956f2659182c60ac46d49f6d14250e39a740339
-EBUILD libfishsound-1.0.0.ebuild 1021 BLAKE2B 6f658088e2fddb7f1ca3ff4bdc32f24daacff699650a96ab603e2fb8127207cd162b80a5f283763a78c42cb02b20a117294dffacfadd2c2978d1af1ab2e01505 SHA512 50605d6f5398ec70b5c5479420a948e562470b7aaa501b26046b1b4294700dc36a3f5fc6890fb9ee863f3c92845a70fb29ee9b1963bb366b74abe09f7828ab49
+EBUILD libfishsound-1.0.0-r1.ebuild 1032 BLAKE2B ff5e7d72437f40cddb70ae1b594adbbe2cb0f670e8ebe576581e98abc2a3d4e4a81f76f71214ae0925d988eb3e50dd856a288861e6924e7c6e2ffe2fb3912214 SHA512 513e4edaf38566bc12b408817515ffd2eeacf00d4a85f0859e3ebc2a2341de0054567989a0a374597817b01eee8188ff6263a588e3c02b674d6c0e25f4fa7012
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-libs/libfishsound/libfishsound-1.0.0.ebuild b/media-libs/libfishsound/libfishsound-1.0.0-r1.ebuild
index 3422916b0400..ab35ecbfcc2e 100644
--- a/media-libs/libfishsound/libfishsound-1.0.0.ebuild
+++ b/media-libs/libfishsound/libfishsound-1.0.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Simple programming interface to decode and encode audio with vorbis or speex"
 HOMEPAGE="https://www.xiph.org/fishsound/"
@@ -15,10 +15,10 @@ IUSE="flac speex"
 RDEPEND="
 	media-libs/libogg
 	media-libs/libvorbis
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 # bug #395153
 RESTRICT="test"
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index bade1d06ad0b..5acbff91ec0a 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,7 +1,9 @@
 AUX libheif-1.12.0-dav1d-1.0.0.patch 1569 BLAKE2B 1cd1629a3d519ef574a5b98ce5cfc5b8f074847b5d4fc6544fdeab3476c35b764739c98fda9a8d0a4f4921fd25412b08e124118f07694fe540b04f306716f6c2 SHA512 62a1afe3f42d1a61b3c314aaae9804dbd436f141075fa4daac415db07a1542c1033dd42cef6906b29ea0f072726888f5ef5f9b7c13c6ec8dca57b6e2bfdfd119
 AUX libheif-1.12.0-fix-bashism.patch 1325 BLAKE2B 5a43b5f2611e256a48603ce9f5d59ae9e08fec30c58af829a82d62ba04e09eb263d0f439b3aecd39d8a053ccfdb4b4f5dbdc5ec8792cd5ffb767e0c2c64e4e66 SHA512 47250ccf9ad920f2067477728f79d46cf9ee70d581b72fecacd33b927c77cb3af2744a6995c7f6b21aad64a9477bcdf702a3cea30bebf99980d93c8c3a560718
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
+DIST libheif-1.13.0.tar.gz 1703950 BLAKE2B e79af787c514c02f49eb9deb42c9727a4719584d16ebb73b8ab276d9e5452c5463f359a1ace30819466f4dab30db69fec5afa2eefeaadc828e2272e91c7d4cf7 SHA512 44cb12ec7191bdf8ef2193c075d5d7a064a7a90c00625e5346624de1ebbedd064601998d042c8336d6c5b2aaef4cd3b439b850d0ab5882daa2e22dcc8722c779
 EBUILD libheif-1.12.0-r2.ebuild 1895 BLAKE2B 22e34da2f3c0512e86b02c7b6e0e2fdf118d899b06f584d4b74a3dcdf15dcfe1c5dcaf17661633dc8807270c581c6400fbdf671b0c33400778e0a4cd48e7ce04 SHA512 41d8674f6f5ef8e93dbd50b01cae52bdd18e0b741a7396ff952c75d3cd8c4ab63013d96baaae269da39f3e1b0ea3af77a63d96809a37c594a6a692df65211033
 EBUILD libheif-1.12.0-r3.ebuild 2098 BLAKE2B 91e8397a6cc92d9c572995c1ba754c96fc78abf31aebdd3ab7176756a5233cc76f9306a4282a4eed12c00d9d6d54c9d973fb599367bee27ebbbd4f0215f8c6bc SHA512 f25e1194186b95ceb70ca437566eca639da45f5ac5d6f3fda29fbb539085d51896a2655470e14a37dbd90372317b0678921cf90673b3c4b6a0c5d2105b24aa8c
-EBUILD libheif-9999.ebuild 2060 BLAKE2B a8609b3bd278265e09c3152e96c712bb800d14f0a3d97a629252ee45b877ae26cf4805f69b845c8bff1d57b822855792f13284be5ee44ead16b63d356e256e85 SHA512 83a48b52f508b0411bd3fac84e23f829fc8e50399f16b5f72e8bb01abdfd077f648276cbd8e12b42dc6241dfaab91333897f3856e0e691d9e33dd27b21a931de
+EBUILD libheif-1.13.0.ebuild 2062 BLAKE2B 4ef68466e7a0055237d111e12a2ea87bea83361aa80fbbb65f04d198011ac7834e01395e493cb64a55b55907a3083223364e3ca45dbeb47ffcf01c4117ec26e4 SHA512 fcadc356a313ec5788e6464aacc675f4df94b566568a25ab86c8b4fbbd543d5d68f7116a7bf2e34a19b5017456e23aefc15cd5b470cb3d3948ea95a13adebab2
+EBUILD libheif-9999.ebuild 2001 BLAKE2B 02130e50e78e847a881aeab0b1f4f86e1aab701500d42b430d3ba073715369bd444eff39150e8d948e1482341cd4e1c685a7eda59dfa697a4517de11c34799c7 SHA512 ad3efd5f606d0c5e5f747353f22d5953d4e1f68e964e945b9bc8c652753dd36ed85ea681ae41b7c270f34c9a131f84e229b49eb41eb4787d80ee909eb1ed9a62
 MISC metadata.xml 805 BLAKE2B 99457c3561cc5ad915c5503f96e52b6261981157de467073ac7a8ece68af3798b9db516b40b7db9e0bd92388b083898926d877fb3bbc8fd1701b280bfd4baa09 SHA512 e5461f86bd18b9878a0e4857fc25ad7554e4095b8b71b2a8de2334b49b7d6c62ccbc2d6bc31e016e65ba3c8bd3a872b5f00b2c2bf39e1d04306124bfedb8486f
diff --git a/media-libs/libheif/libheif-1.13.0.ebuild b/media-libs/libheif/libheif-1.13.0.ebuild
new file mode 100644
index 000000000000..fdb1864f132c
--- /dev/null
+++ b/media-libs/libheif/libheif-1.13.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.12"
+IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
+REQUIRED_USE="test? ( go )"
+RESTRICT="!test? ( test )"
+
+# Bug 865351: tests requires <dev-cpp/catch-3
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3
+		dev-lang/go
+	)
+"
+DEPEND="
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
+	go? ( dev-lang/go )
+	rav1e? ( media-video/rav1e:= )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' configure.ac || die
+
+	if use test ; then
+		# bug 865351
+		rm tests/catch.hpp || die
+		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
+	fi
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export GO111MODULE=auto
+	local econf_args=(
+		--enable-libde265
+		--disable-static
+		$(multilib_is_native_abi && use go || echo --disable-go)
+		$(use_enable aom)
+		$(use_enable gdk-pixbuf)
+		$(use_enable rav1e)
+		$(use_enable threads multithreading)
+		$(use_enable test tests)
+		$(use_enable x265)
+	)
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_test() {
+	default
+	emake -C go test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index 457096c4b4e2..2b2d106acf2d 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -41,10 +41,6 @@ DEPEND="
 	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.0-fix-bashism.patch
-)
-
 src_prepare() {
 	default
 
diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index e7c25b96f9ad..4f903fe436b0 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -1,6 +1,6 @@
 AUX CVE-2017-15185.patch 1088 BLAKE2B e823a30ec18735deb5ba22592165e7828266888d4cdb435ddb88b606b6312c18444e2b3395c3f155fb12d6749a3371baa9b18d7972086c19e750deb253b17162 SHA512 d5ef327e47681bd74ef7488965805727d8e905f65ee46698b06f88d971003c65c309fc8b6714e07c7a12803657db302b15522d6e4f4a75c0dce1217deaa07439
 AUX libmp3splt-0.9.2-drop-libltdl.patch 7164 BLAKE2B 29332a97ffa8b4acd6580e1c10ae73b3038c2c56b3e01eaaea10da8379c1c157624a7577e4b4bda5de279f07db326e4f48b48a815c52ad9266c78f48aa98809c SHA512 b527eda408df9123ef254ab28be850535042eb9b28de910fda6852b78287a55ea26d03326dc08d8c35b9c08ee2ef47797a6be14883c945bac7e051e7e0664fdd
-AUX libmp3splt-0.9.2-fix-implicit-decl.patch 5820 BLAKE2B b7ed33d91c7fe26a528ed678e8d174208cb4415bdb573d415c0523241672b6ecd5280e28c28314a17249187ce36af589336ea2669b461c03f03b4fee9e3775be SHA512 8fcc35dd7c1c6110b302bd67d07d2023bf5c1bd428b5387782ea5b9a4b233739b9544b4814b3a3db780d2c275bacc53ea37378c004c5029984cecb21867775e5
+AUX libmp3splt-0.9.2-fix-implicit-decl.patch 6289 BLAKE2B 18675213ab276f7149d6b1094a18b5cde54fa729d95f1a57f9263e635db6c44e12f42b5196a6c9ee08ad379202a2bdf24d9a0827c33ff2ea575b47cff498c9e1 SHA512 18083aa6c20b883cd5b37b034ed8fe83744c3c1c02cdae9ee58b554fc230c15ddaf8c96d119dcbe17ccfc4fc0f7a8f1a929ca578d51777239307c5aa179f5c6b
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
-EBUILD libmp3splt-0.9.2-r5.ebuild 1421 BLAKE2B 7e7d46270517ab95136b51e132390b3c4fdf5494fed3090f640f542c393f84c0da2e067d80f8cd9d56a3a0fed8f848b9d3aa1346ec73dc5892a43ea91f4775b0 SHA512 d48a54e8057ec1b58f8d9034452e6661fc353d4580f708ac7c9c7e38f5004589c596b2097e63f5ae203d30bb801aabe4d964b364861155511f23e36ae9a0ae55
+EBUILD libmp3splt-0.9.2-r6.ebuild 1423 BLAKE2B 9f9131ac1c92c75e678514793508d5ac11b5b48ce76917cdfe093938d75f148c53b883ee18da6a79e5812163421c3fdfee08e02a2c56f9bdeec367febfa72975 SHA512 f077643d9512b5a3fa691ba634fb25df8b966c1ea9102ac97c88141e1058e88d21b0fcc242919b8c014460428f29682bca52573918a39ac30e21dd52fa0c651c
 MISC metadata.xml 331 BLAKE2B 7379cfa8f753c45d53b0dd3b7afd45fc322af7154b6d5ceae3d889b66397fbfc54433b25a0eec8ca4c9dd81646434740bf931dc3dec676fcea512d7d62a440b2 SHA512 0f66e375bcfffd51e16f8c9c6b37c7c317903820f92a0e9f57860bd29914261e496b034c826111a8bbd651dc115276173c0f4fca773d245da9ea27d51a3ef200
diff --git a/media-libs/libmp3splt/files/libmp3splt-0.9.2-fix-implicit-decl.patch b/media-libs/libmp3splt/files/libmp3splt-0.9.2-fix-implicit-decl.patch
index 16420e934f57..c5f1fe1f10aa 100644
--- a/media-libs/libmp3splt/files/libmp3splt-0.9.2-fix-implicit-decl.patch
+++ b/media-libs/libmp3splt/files/libmp3splt-0.9.2-fix-implicit-decl.patch
@@ -302,3 +302,25 @@
  #include <string.h>
  
  #include "splt.h"
+--- a/plugins/mp3.c
++++ b/plugins/mp3.c
+@@ -28,6 +28,8 @@
+ The Plug-in that handles mp3 files
+ */
+ 
++#include <stdlib.h>
++
+ #include "splt.h"
+ #include "cddb_cue_common.h"
+ 
+--- a/plugins/mp3_utils.c
++++ b/plugins/mp3_utils.c
+@@ -63,6 +63,8 @@
+  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  *********************************************************/
+ 
++#include <stdlib.h>
++
+ #include "mp3_utils.h"
+ 
+ //! Initializes a stream frame
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r5.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r6.ebuild
index a7a142a80879..bb6d0c64135c 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r5.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools flag-o-matic
 
@@ -19,7 +19,7 @@ RDEPEND="
 	media-libs/libid3tag:=
 	media-libs/libogg
 	media-libs/libvorbis
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	pcre? ( dev-libs/libpcre )
 "
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 96f0d438448d..4af1149fec75 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,4 +1,5 @@
 AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839ce266dafe8cd79167911bceac5341e58c5ff13ff9604b741ee8726bd4990238345327038cf2cd61df5c28d7a15eeae67b62 SHA512 da34e0da810b119d230e40b17b8f3bb3b3f7c9414960bc41c528a366c9b5f5b2afb321bdfa5871d898ba2bcb98610c2848619ef0f0bc54a0675f75a40a6ce8d4
+AUX libsdl2-2.24.0-clang-15-configure.patch 768 BLAKE2B f21f01da86fed778f5ef88cfc692b0588d1ea6de1bd05c0f6d1b9b480175c79a1f7bcc62cca123beb387f174fcf70676997f1e37b6b2baef59143b9222db0d5d SHA512 7d1822a05fae900f572809ba7de7a46cffaa03be7ec2f6d4b1cfa3b164a468ad7c4bea2606da32598519d2f8abb0d9bfcc3268f2cb7858de784244dbe0a68804
 AUX libsdl2-2.24.0-cmake-target-fixes.patch 6489 BLAKE2B 3703cae1f4220d6ca7899a2a1b61c083f560db30996f032eb6570f80e7b0bb3969b2c929ec104d461297502d5e46a8ae0a34d38f04d76b274894d124aa486905 SHA512 43710fa7d5321b688b2bd65460fff77d16943ff25280b7ba25c2676112db8e1ce9daeb2c144d41ed5473dcb4b38ad0a91686859949ff4a10ed4bea8769188b15
 DIST SDL2-2.0.20.tar.gz 7207221 BLAKE2B 03c6d462674aeb90559003e9f4c74f66833e193d2de3f3975f1e1684c5bdccb5c1b3c64c22c822777a63ee218d87fd04ff047b012d8db30a1565dafa34161623 SHA512 4889949eaa674948bdb0a01bb2a842a0943b15b08ff27ec0079b0fd4f79d071ffb32488a5a51c12ad7c74ed5fe73b608cdf6336a44c95dae8a0fb3f47d0f01de
 DIST SDL2-2.0.22.tar.gz 7250633 BLAKE2B 7f8b3efa709a0514f6a76df4ffc8b756d287d1e372ed107d0525a22cb5e6a168709136d375b6708b2073a76dd30d1bf06203d2c5c3eb2990e80519c7d1558df5 SHA512 ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a
@@ -6,5 +7,6 @@ DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c
 EBUILD libsdl2-2.0.20-r1.ebuild 6517 BLAKE2B 89efe9162d5573532ef96dc696b62761430ea8e15e45dd40a2091775d192427c467b57869eeebdba6eb2f7bfaa4e0a51fb894d67a81f55cf45d1b6f2fac0c2c6 SHA512 de9198b77019e8afe0599084d88cc1cf1bf564079d5bb79e7f914e150b2b4640e0b38d835d329b6902f0cffcb0da26103e3213a1a211b82140af3ffffd95c2d2
 EBUILD libsdl2-2.0.22.ebuild 6496 BLAKE2B efc239ff9990aa047ca2364d169d70ef0c7c862c8ff3f9fd6b51a80af9799a638890b9a59eadfc5497e5f15441f00b7f8e193f6b3675d2ec91a6ffde542ee5ad SHA512 948022ba842ae928f73b5213aa042b163f7bbfe8096e5c1629865e9a0c0d3c9b89238f13d3713a8b65e7de1b012336f7ed97674c0bc1ec9b7cdb624ee2007be7
 EBUILD libsdl2-2.24.0-r1.ebuild 6418 BLAKE2B 54e9a9d42d25e56793b9516f36f7bac92eba16f5151bbd750c090dbb9cf448fbb3df0b99d9a5c6b2e73a0ddc902db012868f2cc9a0afbb671feca61acf3ed11c SHA512 3472a2c282c9505fb55539b8552943c479d5a6766f1f37faaecc22a7d34a3d903dc43af597f424dc421c962bbf6a16f0f6d2bc58bd0da07a4ca39cdb796d4161
+EBUILD libsdl2-2.24.0-r2.ebuild 6471 BLAKE2B 542901225a93a446e8de9c158a7fe9b78e763bdc62eaa341aadf7213c2872b102596be9f6e3fc1588f702fdad5a8b39553b7c76fe9d8af259e38122a45f48d49 SHA512 2c13795459c1aa029da629233450c30305c3ca5331adb44f9594084ccaf45e5b933c5209f9b203a53933b873db17f96928fe3480318652086aea394ddf62f1b4
 EBUILD libsdl2-2.24.0.ebuild 6373 BLAKE2B 174e817baa1a7203465903ee1b94edff04c5dd931e1c945a30afe5f19375b98632d327fdeff1ef2b5561452ef8643bc1623daa170b33bffd460aac6bee2ab3f5 SHA512 3c3512a3a2d9bd9f708f021c872e6b703efd9554dddaa65974fae10674256eff5ab634faeb967195882cefa4961213167b13589bb2e681c7503fb5e2d4fa38a9
 MISC metadata.xml 2054 BLAKE2B 611185e0b090bc8865c6ef61cf0dfab07a1806fd2db9fc50f2e3eaefba6ccb26127a51d61afd0a96c520d3d11be5a1a789631554705d7aa36270626d69ddfe89 SHA512 3a9bcecb9e0a8bc74ff8eb36d9dc4e8c1f7bf892428b3f6edd91b97082dd16e591117d45ee3d4558fc1b8137f16b54d01703b9c9c7c24cc149856ccc14bed2c1
diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch
new file mode 100644
index 000000000000..f5dc8ea6b50b
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.24.0-clang-15-configure.patch
@@ -0,0 +1,24 @@
+https://github.com/libsdl-org/SDL/pull/6217
+
+From 04b9178a6746cfe9e4f8708befd3e00f95912a18 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 12 Sep 2022 18:02:21 +0100
+Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15
+ (implicit function declarations)
+
+Clang 15 makes implicit function declarations fatal by default which
+leads to some configure tests silently failing/returning
+the wrong result.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -2728,6 +2728,7 @@ CheckInputKD()
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+       #include <linux/kd.h>
+       #include <linux/keyboard.h>
++      #include <sys/ioctl.h>
+     ]], [[
+         struct kbentry kbe;
+         kbe.kb_table = KG_CTRL;
+
diff --git a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild
new file mode 100644
index 000000000000..78a8adc8cfe1
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+MY_P="SDL2-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="https://www.libsdl.org/"
+SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
+REQUIRED_USE="
+	alsa? ( sound )
+	fcitx4? ( dbus )
+	gles1? ( video )
+	gles2? ( video )
+	haptic? ( joystick )
+	ibus? ( dbus )
+	jack? ( sound )
+	nas? ( sound )
+	opengl? ( video )
+	pulseaudio? ( sound )
+	sndio? ( sound )
+	vulkan? ( video )
+	wayland? ( gles2 )
+	xscreensaver? ( X )"
+
+CDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	fcitx4? ( app-i18n/fcitx:4 )
+	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] )
+	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	ibus? ( app-i18n/ibus )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	kms? (
+		>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)]
+	)
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	)
+	pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
+		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)"
+RDEPEND="${CDEPEND}
+	vulkan? ( media-libs/vulkan-loader )"
+DEPEND="${CDEPEND}
+	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	wayland? ( >=dev-util/wayland-scanner-1.20 )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/SDL2/SDL_config.h
+	/usr/include/SDL2/SDL_platform.h
+	/usr/include/SDL2/begin_code.h
+	/usr/include/SDL2/close_code.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.16-static-libs.patch
+	"${FILESDIR}"/${PN}-2.24.0-clang-15-configure.patch
+	"${FILESDIR}"/${P}-cmake-target-fixes.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Unbundle some headers.
+	rm -r src/video/khronos || die
+	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
+
+	# SDL seems to customize SDL_config.h.in to remove macros like
+	# PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from
+	# being reintroduced.
+	# https://bugs.gentoo.org/764959
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="/usr/share/aclocal acinclude" \
+		eautoreconf
+}
+
+multilib_src_configure() {
+	use custom-cflags || strip-flags
+
+	if use ibus; then
+		local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
+	fi
+
+	# sorted by `./configure --help`
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--enable-atomic
+		$(use_enable sound audio)
+		$(use_enable video)
+		--enable-render
+		--enable-events
+		$(use_enable joystick)
+		$(use_enable haptic)
+		--enable-power
+		--enable-filesystem
+		$(use_enable threads pthreads)
+		--enable-timers
+		--enable-file
+		--enable-loadso
+		--enable-cpuinfo
+		--enable-assembly
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_sse ssemath)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable oss)
+		$(use_enable alsa)
+		--disable-alsa-shared
+		$(use_enable jack)
+		--disable-jack-shared
+		--disable-esd
+		$(use_enable pipewire)
+		--disable-pipewire-shared
+		$(use_enable pulseaudio)
+		--disable-pulseaudio-shared
+		--disable-arts
+		$(use_enable libsamplerate)
+		$(use_enable nas)
+		--disable-nas-shared
+		$(use_enable sndio)
+		--disable-sndio-shared
+		$(use_enable sound diskaudio)
+		$(use_enable sound dummyaudio)
+		$(use_enable wayland video-wayland)
+		--disable-wayland-shared
+		$(use_enable video_cards_vc4 video-rpi)
+		$(use_enable X video-x11)
+		--disable-x11-shared
+		$(use_enable X video-x11-xcursor)
+		$(use_enable X video-x11-xdbe)
+		$(use_enable X video-x11-xfixes)
+		$(use_enable X video-x11-xinput)
+		$(use_enable X video-x11-xrandr)
+		$(use_enable xscreensaver video-x11-scrnsaver)
+		$(use_enable X video-x11-xshape)
+		$(use_enable aqua video-cocoa)
+		--disable-video-directfb
+		--disable-fusionsound
+		--disable-fusionsound-shared
+		$(use_enable kms video-kmsdrm)
+		--disable-kmsdrm-shared
+		$(use_enable video video-dummy)
+		$(use_enable opengl video-opengl)
+		$(use_enable gles1 video-opengles1)
+		$(use_enable gles2 video-opengles2)
+		$(use_enable vulkan video-vulkan)
+		$(use_enable udev libudev)
+		$(use_enable dbus)
+		$(use_enable fcitx4 fcitx)
+		$(use_enable ibus)
+		--disable-directx
+		--disable-rpath
+		--disable-render-d3d
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		cd docs || die
+		doxygen || die
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# Do not delete the static .a libraries here as some are
+	# mandatory. They may be needed even when linking dynamically.
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
+	use doc && dodoc -r docs/output/html/
+}
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index e5438e1fd354..644048cd790a 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,4 +1,4 @@
 AUX libsfml-2.5.1-musl-1.2.3-nullptr.patch 626 BLAKE2B dac65018937df6088b5f44f57678b6acde4f67a4f03180428374f26c7248181058185bce053bb79fdd4d4044c6369740daed5db95f803965d2b15a3250bedd1c SHA512 76535c8d01f21cc32df1c66ba1567356737a9c14b73be1c03606305f905d31a615759054b60fbf3347a57d3b24ab9b3978c96f898262000fe4c58af697b7dac7
 DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
-EBUILD libsfml-2.5.1.ebuild 1573 BLAKE2B 27f840625a839fc3a38e1b46d0d9ba8baeb650e9afcf2f0dd042915c7ad697488f40bcb10cd9edbe62e179aeba58ad21abe33e50b7abfcac2e3568ef0c13161b SHA512 30eb01c19ef1c3e80c9efa5108620a886f07445924bbcab75540deec07223435f285c982bf9cbba1bed9f0b3c126f7a633633a5527d0c1fb18b0b97fe5dce3a6
+EBUILD libsfml-2.5.1-r1.ebuild 1586 BLAKE2B 5c8737acc16ec583094421051565c9aefffadc81fcaf0dfae9aa22d0e29bd26f0385609f7542458d0a125c555954736a99865d3e4f02961ab27d1814ae56b14a SHA512 08fa36b4468bbe120c44d370e98d828b589f8d706b7c08d6e383897ee6a738c17ed3ceb18bdbe1814a12902d5c745aa59e1cc7017456d806351b5d3c7ff6e278
 MISC metadata.xml 733 BLAKE2B c5b2bf1cea8b01c89531f68544f8b82dc3f8b8e26327ec868cf2ce1beabd6b1b0e977ad4a5dd3cdcbe3ae0fd66930f0c411023d77f9c4a5f7464d90209fa6f6d SHA512 ffb4954d9d55f0ab147c8ef2d5e970ef728b0dd1ad78f04aac16346583a9b858d3861f6f3bfe0940ca4b41c23abf8904bf3e0160d347d9e007efa047e663ccda
diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1-r1.ebuild
index 42bc3556d5ac..15eb89648658 100644
--- a/media-libs/libsfml/libsfml-2.5.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.5.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -15,16 +15,16 @@ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="debug doc examples"
 
 RDEPEND="
-	media-libs/flac
+	media-libs/flac:=
 	media-libs/freetype:2
-	media-libs/libpng:0=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
 	media-libs/libogg
 	media-libs/libvorbis
 	media-libs/openal
 	sys-libs/zlib
-	virtual/jpeg:0
-	kernel_linux? ( virtual/libudev:0 )
 	virtual/opengl
+	kernel_linux? ( virtual/libudev:= )
 	!kernel_Winnt? (
 		x11-libs/libX11
 		x11-libs/libXrandr
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 24223fb9b140..8624169a34b1 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -3,5 +3,5 @@ AUX libtheora-1.1.1-fix-UB.patch 1499 BLAKE2B b2336cac99a2810d1ba5733e09dde80d42
 AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b42ef39f0f83d306666caf80808de023e2c4c77de51009c5dd668e230b169e5073539ee11e69e3e0201d6def1a4c7401d SHA512 5ed8c35eee6fb533fbbfc835fe62eddea18ddc956b453b1062a4d1534b6d69db2e70a03bdf3300a8b1a5832feef2c7536bfad4274e8e89769e07a8a3f635b1b5
 AUX libtheora-1.1.1-underlinking.patch 481 BLAKE2B 0939e1789eee97d999d229bb37620fe787b0da17253e15e6fbdf3109dd2c11cf201c6d77133529a779730acdd23806a52bb033d909509a6065ff6ac08db4b4d5 SHA512 9e8219ab32993470a4566b59b544eb04175577f4c82174924aa53b2ef61f0b94496a0de5afa630da291322fc6fbc640978152de8b61edd50231818838a330b0b
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
-EBUILD libtheora-1.1.1-r2.ebuild 2177 BLAKE2B 25681339b2bfee42d953c62318c8b6f8b07ac4767a45d851121560284a47b9063e65886c93a36f722eb84b0cac4b10cbe2c57d9bbd8cc4a77ab7ea53364b997c SHA512 1cf78379bd87d53934e393f417f26484f3a3df986ad4803a4aeaa64e9ff81795bacd3499f5d0b734caee9c412fb476e7c4cbaa2464a7f14340eb89ccab611148
+EBUILD libtheora-1.1.1-r2.ebuild 2215 BLAKE2B 622a3fb60e0d9628d1c262365f503b00ecf1c8c994846a26bc73d9d21cad3fc3d0196315d9f2bbee442277cf6bcc9fba140caef7056224cdc67c129d4ed114f1 SHA512 0a884987dee76e8a34f6235bbffa55cd6dc883ed429ed0854543c39c83289acbd89f94fda4c5290bbeb5cf82579e3abe7b1779747f07d75d7040a59d9e4b5d08
 MISC metadata.xml 222 BLAKE2B 96fcf0d83a18e2c1f4611d550e7e2123a06fe8b3b2890cb5757284d8fc7d3bebdf1aeb4f82affbc7c51268749cac9fdcbf43888e3bec0e68e1b6548a3f6eca76 SHA512 c3657a6bf2503e6585ee53453bf0ba26b5eed2e894342087358b5f4306a960db915de61036b6c8dc57cdb7a7f3326d57ff3badf7b3ecefaa99291289a73997de
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
index ff35ecea75a0..7d778ea82a67 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -71,6 +71,15 @@ multilib_src_install() {
 		DESTDIR="${D}" \
 		docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		install
+
+	if multilib_is_native_abi && use examples ; then
+		dobin examples/.libs/png2theora
+
+		local bin
+		for bin in dump_{psnr,video} {encoder,player}_example; do
+			newbin examples/.libs/${bin} theora_${bin}
+		done
+	fi
 }
 
 multilib_src_install_all() {
@@ -79,16 +88,9 @@ multilib_src_install_all() {
 	einstalldocs
 
 	if use examples ; then
-		dobin examples/.libs/png2theora
-		for bin in dump_{psnr,video} {encoder,player}_example; do
-			newbin examples/.libs/${bin} theora_${bin}
-		done
-
-		if use doc ; then
-			docinto examples
-			dodoc examples/*.[ch]
-			docompress -x /usr/share/doc/${PF}/examples
-			docinto .
-		fi
+		docinto examples
+		dodoc examples/*.[ch]
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto .
 	fi
 }
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index e11be47e3bdd..9ee0308619a9 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,4 +1,3 @@
-AUX openh264-2.1.0-pkgconfig-pathfix.patch 1949 BLAKE2B a3894b7cb65fcdb444d389ccf6644e404bb8375a910bd51bbe5e1b6b773e4d6890a17d2f1a09400d6d0cadc41be9321d86a09b93f861812f2d72a6c1c5e39fde SHA512 00c59bd1d6fe6355ce81ead4ba898f1f602e9f9c93e382c2ead3c353d5fd1f2bf3c46a30f3b248896c9a74d347a24e200644387ce3c70e886d941c115bb42088
 AUX openh264-2.3.0-pkgconfig-pathfix.patch 2023 BLAKE2B 9d380302efe14b45959123f69591aed9f552a954dd9f2f079ba1dc95edfc59869db9ece0ea65d52e58201829e0e4bb791f0380b36b35d288b40769c1c144005e SHA512 24fb7e1bf54d5c1512dab9f5b6cbd61863022d99a1a5d07d5a69037ad3b3857f2ac01fdfae4a1477f1b200c8a4b107247fb9f46af1219e71220e55167f1620ec
 DIST gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz 10464 BLAKE2B db6990a55b4128c267ee5ffa4e38edd2551c862e549776b4092d5683818001366665830c6304642cdd9c2c0afe06035edebafde769693082ae7a5236cdc463e8 SHA512 a6383834391d98754177b54df31d006144b5cad952df60115fd12fb6f0c87e571a10f9ce7276b817e4137efd97ffa7bca5092e289b0eb7cde2a3ad923319e874
 DIST openh264-2.3.0.tar.gz 60290792 BLAKE2B 08aa571471188c72bb0f098fa1cfaf9ba46ee4311f50518de868a2d7bbd61d9d4547cf5d33b3140d56c09a1ea7ea411bfaa96ed960e159876e6cc803f081b5d3 SHA512 5f0ccbb3c0026a010d9830e973312486f9d5ea8152afa3653ab6b3c43906a1169cebea70532134c1624846cc03b586e85b12cfd0621af505bd532a7dd833defd
diff --git a/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch
deleted file mode 100644
index 275322a01906..000000000000
--- a/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/Makefile b/Makefile
-index bf398d7..c72b024 100644
---- a/Makefile
-+++ b/Makefile
-@@ -27,6 +27,7 @@ OBJ=o
- DESTDIR=
- LIBDIR_NAME=lib
- SHAREDLIB_DIR=$(PREFIX)/lib
-+INCLUDES_DIR=$(PREFIX)/include
- PROJECT_NAME=openh264
- MODULE_NAME=gmpopenh264
- GMP_API_BRANCH=Firefox39
-@@ -285,14 +286,14 @@ endif
- endif
- 
- $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
--	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
-+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
- 
- $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
--	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
-+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
- 
- install-headers:
--	mkdir -p $(DESTDIR)$(PREFIX)/include/wels
--	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels
-+	mkdir -p $(DESTDIR)$(INCLUDES_DIR)/wels
-+	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(INCLUDES_DIR)/wels
- 
- install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
- 	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
-diff --git a/openh264.pc.in b/openh264.pc.in
-index f86225c..bee78bc 100644
---- a/openh264.pc.in
-+++ b/openh264.pc.in
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- libdir=@libdir@
--includedir=${prefix}/include
-+includedir=@includesdir@
- 
- Name: OpenH264
- Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index e36561358878..c7eb7eb7b902 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -5,5 +5,5 @@ AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf9
 AUX sdl-mixer-1.2.12-parallel-build-slibtool.patch 4288 BLAKE2B 3beaeddf4e3ff97dc2778dfc79f800b3749a0b0fa511872f353587a3e01ded1cdc9c57c3a89cb3e1a6a34d6848b19aaacba5a2a81c3129906f521c2afc71e2c0 SHA512 b6e42b2ee43b57a3a4f3e8b47b96aa5d94b37f0326cbecca7128eb8b34f0ac00dded506a4d5164156ca23cf1aeaca6aa92f40ec43991fa73a97274a2262fe679
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r4.ebuild 3436 BLAKE2B 95a2a3a0389ec656f2e36cdac75378a82cdb85863a9a1d28ac1baac8df23a65fc8c6bc284426ecd12f804521a68aabd40e7287937c7cbc1be81185fbce987b07 SHA512 05cd8c12f237c85757c08f17e43761e7a4edf035018d8af5632106c1d5b463d8e160562e2d52964f8b31af1d9b7c17ea17c97c528223fe669f05697f272d61f8
+EBUILD sdl-mixer-1.2.12-r5.ebuild 3438 BLAKE2B bbc1c4b67af067f344be5fb91c72b610065916a5f0a66362049a16cdd813532b0a93d525d25e695b1c8f2fd5b14bdd3b9f4a3ddea7d8e0ffd0520b6bc27f9fde SHA512 c7e8022f9960b8ae369805e62c55b2bec8c6c078f37427c94d44f014303cae0e463ca0218bc919ffb9554e7101f809665b659c91f1d2ba54f86883c9ec21ba53
 MISC metadata.xml 664 BLAKE2B 95d73b3e7ecc6b155cfad0d5043b63e245ccae5666b80d7ca6acccc71df7c1e76def7ede91a0bfd87b4084a14d3a7b2407a6f5ab537e619ed3cc32c5658248db SHA512 c8d112e07ceaa7c3ca71f023147024ead1fbda761fbb290fa5c1e7a76d17de48a69a8a4859e19df7ac5e36f08bc42805df768bcfe81f3c06afca0d00173cd46a
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
index a5a0b15fce59..1e21b42d4cad 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
 	midi? (
 		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
 		timidity? ( media-sound/timidity++ )
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index 054e5cbeec9d..079dcf8e6b6e 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -2,5 +2,5 @@ AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d
 AUX sdl-sound-1.0.3-physfs-3.0.1.patch 1574 BLAKE2B 9829f6429041322c0eaa41d547dbebfe03bf730e80d76b5b15afc66c123a87e0ab1fd9819372e37ed505c1a9e214c27583cb56e12920b3fe0c88a211177c79bc SHA512 ac228520e1c8e682b58919335ea117289087962b4b98fae23e743830709d8dca60a3d22c7171ee13bdbf84f528cfddcad70231edbba64a7cec88c7dd77295eca
 AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c
 DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
-EBUILD sdl-sound-1.0.3-r2.ebuild 1971 BLAKE2B b791129c6811ee4f85e04a4d56687473aa522a60e154d6a55783d8ba5b2c2116ba5e196d362f17b3726b4e3ab2d6969d9903df66dfd7cf467f7a706f8085f0c6 SHA512 99f4e2ebe8c7465a6a6ccd60cd5baabaae0ffa7f7a4a9b824d887142e190953275b56d71106117c2a855949918488f0abca70c010c0ab031e39d430dcc271346
+EBUILD sdl-sound-1.0.3-r3.ebuild 1973 BLAKE2B 2d974028041ac4bfdece43556dfac3cb7438b054c14f4fe63dcaa2ae21d9f874b735423dbe4b47d83d34ff2f8f54e87403958e05aad636dfaba96009f252f050 SHA512 1da80c71270781faa3a33c8ea8fd66c916f706de850f31284595e1a84ceb204602326b56a40e94ea5fbaec7ef8c4ae3bbb26919c076ba354bf84fe0ca14a0b99
 MISC metadata.xml 444 BLAKE2B 5a67655b6e48cd4bbbb1f985a879d5060a7b1ae25a336d837d25001b2a15bcca1ef257ac1425467cf1b89f9a3eb5ad555639709e470e91aec7712a1920bdd4ea SHA512 2d6709b7fc8eefdfa5cd403eecff74a3f54ab08bf7043f5b966bdb09194eabc4d6aae4b4225c77210f6e452a9297fcf4b03a0cc6998d0967bc437e505c9133e3
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild
index 02c6018c0b60..eb34c69194cf 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools multilib-minimal
 
@@ -18,7 +18,7 @@ IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
 
 RDEPEND="
 	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
 	mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] )
 	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
 	mpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 85c0aee649d9..1a7275d1af15 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,6 +1,6 @@
 AUX sdl2-mixer-2.0.4-fluidsynth.patch 1457 BLAKE2B 9b8914065ade05bcf70c3783ae22f732e5a401f74cdc39272865d5c6f0fa31c0ee89b16f642a5b5f69b77ecd9dc96cb7313d4dd6c55303efd5d128679f1cb6f3 SHA512 e268a5bf327f2203a7f48ed0cdc05f89fea778eac706555f21ee2b3cab761600988f385195c3078917c422bc70c7b96fff650a1a213370469fe07340dc7d7852
 AUX sdl2-mixer-2.0.4-slibtool.patch 3794 BLAKE2B 5e6f316a32a7c58abdbf764ada81c85e9db6509f99b3a7054de08ea90f1bf54d12bad6f177e7d76181d76f6b0d218acd1f44e8d50e91f7b3ef74056ddf3acd0b SHA512 da520853a59036ea413cc24964798fe40414c072612e2fa0bf79373be669b76d6b07a3853123317f25eb82db1a4dbd105b23469e6da14bb0596242fc1a9060d7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
-EBUILD sdl2-mixer-2.0.4-r1.ebuild 3545 BLAKE2B 503f4a296306447e9ac324faeb16708eb589436429ed090f5af80256b4caf3f4de0a3d02ea129c5a9baabc81d66ee9ebd3484d4e8a3ba2e14604cd9ec16ab521 SHA512 84e7df6b7166552fbc0c941f839640a85833f93cfd4a2b7adf2b49d01901755190f51edce799a2c829b6acf8a0cf844393f78258d79301aa15b69eae8adf1135
-EBUILD sdl2-mixer-2.0.4.ebuild 3493 BLAKE2B 0b82c1a732cafc36fa99e13a9ae454b94f4aac657040e52a8fcc2e7f2c2427220d7e088610cddaeaf3d1e2750aeaa5381ca177a419c8a510899ddd1963472877 SHA512 e01e37c1c51e3412cc5a20213453d6a7f6b5850249a9cb70533440449c50e9a6653e6128aa70fd57c5e1209726f3c61dab05b9057afd9cd6e82e2f161123a22f
+EBUILD sdl2-mixer-2.0.4-r2.ebuild 3495 BLAKE2B e60946ff082f2e56017b3c2ff569fc1d414c9bf78e484e43f628e1ac8bba37216cc20197ab056306295defb303680a42a22769fb6d85f4b908f97fa60f679648 SHA512 f887456d210183651b46a502a001e3d8656c88aa85896d045b76311014a523e5c3c027c17d61591f8342ed63f54d0748635c3af0e2b9415e6d4a90ef19ac210d
+EBUILD sdl2-mixer-2.0.4-r3.ebuild 3547 BLAKE2B d87698586e5254f68a101bf6512fca733fadddba9188fe0e125d2d74194e9c14fb0c876df32c2f957a80e14c7a91bf2b01b9a9c392950563de472ffd67471663 SHA512 c52bf308bab225a1a17a0d40c7ed09843a9c95c06cef6379995a73f43ee33db0d10932f862e4144890fa3361906b5412482ffe59ebaa8ade19c7fcfbe68c40b3
 MISC metadata.xml 758 BLAKE2B 1f95dea5a9ad3e40050cb55bf829e89bc51d7c03525b5f91e3239d30ab6131390c0af595ca52ffb2257d11a11efe3c617291028dddd2a9fce76a815a74aa4389 SHA512 94bbb6ea83a1e975a701f7d885f83b56d8511eb69e8121126f46755377a3e966c89f3a3745530f5780d6bf81bb0a47b3b93dceb63ce44bcbe459718aebcf672d
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r2.ebuild
index 750b421f35d9..284b373f782f 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=media-libs/libsdl2-2.0.7[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
 	midi? (
 		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
 		timidity? ( media-sound/timidity++ )
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r3.ebuild
index 307f5ee53b3f..5c41abfd3b64 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=media-libs/libsdl2-2.0.7[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
 	midi? (
 		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
 		timidity? ( media-sound/timidity++ )
diff --git a/media-libs/sdl_audiolib/Manifest b/media-libs/sdl_audiolib/Manifest
index 522a07cc4ab6..f4fa2d2da408 100644
--- a/media-libs/sdl_audiolib/Manifest
+++ b/media-libs/sdl_audiolib/Manifest
@@ -1,4 +1,4 @@
 DIST sdl_audiolib-0_p20220622.tar.gz 1138752 BLAKE2B 01e565506b29e922f3eb5ff2705a0614e53c6afd43526d781eb83d86f54dab6692689de51d618e07779fe8c97ee2cfbe3de744f29c1798e3f10205141dcb28ea SHA512 ec6267665fb1a98fcfb91a40ebbd86f7bb14e9fed36509a903ba5408d0f4b8672b19421943de6a4b3d2d0b187f9531dae4b7c9f766ee07f9c1aefa08ab6a51e3
-EBUILD sdl_audiolib-0_p20220622.ebuild 2068 BLAKE2B 5a575eec91c86e2cddc675ec52012a7a7c5a94d9e9c2e9b63a2b6b616a3992a60899726288e031810402b2ed7f2f29069542a7793de5fef2c1955ebafc4b0212 SHA512 ca1fa86ed95a01a336f7d9319739f38e182f335d39841777145ed42629adc033cbbc1e34c116083cbcfb5d8fe6ee25672b44d0e07461318f2b1ea53753341a34
-EBUILD sdl_audiolib-9999.ebuild 2028 BLAKE2B 456872876217570077b442a244c311f3f58db78e159228a058a656bce28d7182800a46fb0c8b0ccd6883ada1f3772c661767feb637a50a5c5e26156a1ab9cb8f SHA512 0b92b69cb613b388144dae7468d0dc58ae5dba11d7eb3c9cc9d73cc4ac5346bdc132b3827119d6733b3140f5edccc6968d977dbb67127de82ae53159f50cb576
+EBUILD sdl_audiolib-0_p20220622-r1.ebuild 2070 BLAKE2B 2d25f831bb3c85039e3a3ec58d4cc53afa751c83a8ab5906255097b56e0fc69cd7379d3c404c5129fcca248e9161f193ee0ca85e47e398db1c2871162a638e3b SHA512 29abb0dfa7bbadda416de8c26b5e9f5d5a03b11db2e6a3f14935ba03f62f816c3e29841dae5b0b423dcec7f4e2310de3cac2bd345e66a0f5ea5dad1c4b62953a
+EBUILD sdl_audiolib-9999.ebuild 2030 BLAKE2B 8ea89e13651f02ac698179a8b9894d212ee6b4838138124ef36fd71475841faf54a24d17c3fd57a277053b1da830b529235d0a765229dabba8e46d969774caab SHA512 7040a2e060583a4fd27c3e7eb0350420f8753f3363b6a8410dc0bf16ebe8dfda02cae996560f07bdb657a8605a9e8ab143c4a684caad1de83c3f6f229cf1b2ef
 MISC metadata.xml 826 BLAKE2B 6bf43ce9d28875ebb58e21eedafd36f61944646dd863f0810b25ae1e44d2e0234f002af4473ca265b09a7a77f5e65862e1c5fe90f48e81a450e9167a57351fa3 SHA512 b3353de39f31147e500a9d0138f3531404f342dd01d8d8634365289dfb206a0628d4ce4504726387eb9f91ea8a39fae70182545d52a59a853390a81283187908
diff --git a/media-libs/sdl_audiolib/sdl_audiolib-0_p20220622.ebuild b/media-libs/sdl_audiolib/sdl_audiolib-0_p20220622-r1.ebuild
index 2a3199706b09..172fc78d30db 100644
--- a/media-libs/sdl_audiolib/sdl_audiolib-0_p20220622.ebuild
+++ b/media-libs/sdl_audiolib/sdl_audiolib-0_p20220622-r1.ebuild
@@ -25,7 +25,7 @@ IUSE="doc flac fluidsynth libsamplerate modplug mpg123 musepack openmpt opus snd
 RDEPEND="
 	dev-libs/libfmt:=
 	media-libs/libsdl2[sound]
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	fluidsynth? ( media-sound/fluidsynth:= )
 	libsamplerate? ( media-libs/libsamplerate )
 	modplug? ( media-libs/libmodplug )
diff --git a/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild b/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild
index 961a40fde5e4..da13e7166551 100644
--- a/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild
+++ b/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild
@@ -25,7 +25,7 @@ IUSE="doc flac fluidsynth libsamplerate modplug mpg123 musepack openmpt opus snd
 RDEPEND="
 	dev-libs/libfmt:=
 	media-libs/libsdl2[sound]
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	fluidsynth? ( media-sound/fluidsynth:= )
 	libsamplerate? ( media-libs/libsamplerate )
 	modplug? ( media-libs/libmodplug )
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 94af13e2c35a..917cd4366f90 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -8,6 +8,6 @@ AUX simage-1.8.1-fail-on-missing-quicktime.patch 453 BLAKE2B 23592fb30537aabd5c3
 DIST simage-1.8.0-src.tar.gz 797069 BLAKE2B 6f9e3512c9815974b1b2799306c6567f6b5aec6771fe31e0a5fa47a827819df02e80e976063ddbae3e3aa3a4d33da68a23c9067e7b91f82c28592f83d0e782cc SHA512 fb4943c38f418461b087d5d013c2054f25d553a872fc80f9445a5e907901eb40265d838c5cc1031032dd84885f066f1c640a1949bc450591fb0ea88c05d1e38f
 DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe
 EBUILD simage-1.8.0-r1.ebuild 2239 BLAKE2B a9a205e8eab2e7593e81f5cea619764fa92e5ea6ee6003f39ec02bda59c84a9082c59ced21464d7a9484f11b3c522da4472f2fe275d18178d48af468d62d32da SHA512 5c890d96f4507fc924d0967b42327bcf099c75eafa8f748eae08e93836a6f88f87ced49f602371f447717f415e61ede23ef5ae78b63105ffba437bb9ad5dc885
-EBUILD simage-1.8.1.ebuild 2216 BLAKE2B 90da90810212fb4af49aa5a7993901b7c6d52d25dcf9b3f272cee356547445382e0bfeb84a6c04368d79d41594aed16b43286426316c175bc10b65d2bc2c2491 SHA512 a120984d52c11f587840e89604b6868ca3bed0835eea3d48e122fe181dfa4a90ab0167ae2399b78fb185e050e12e12a9d6b1f403a627e7c73a25473fb74c5ce1
-EBUILD simage-9999.ebuild 2161 BLAKE2B 9550de5e7bfc93f6dc04ce7625c33fbbf6c9111ed2c75da0cc7c60a24e36a720fa13abff9f2ad5b7b651aebe9e7ba8fc04df25613968db812a9b9141fb55477c SHA512 d9e1f039e6315f48c6d69a1433f5c60617b31844aaee15342b146a4a8a6d4d664e0350d7baa3200bb3913358c7bef47226fdc860afde04876bdf2b5a5e9bd5f0
+EBUILD simage-1.8.1-r1.ebuild 2229 BLAKE2B dd9ee9006abc0ab005826d8b23c3cd9d9b24613ec67fb7451856c0361a15e38987df471586c1c37a6b5c5270466e00d96682dad20254fff4cb858ca7d23bc031 SHA512 13a800c834f08cec2d3ffecfae43d0030e45275b58088fa0b47f677f8f5e3549baf6ad0102e39d1f760d422f9a9227438f7a3818d698f494f15c08789a517426
+EBUILD simage-9999.ebuild 2174 BLAKE2B 6ed75e681cfb750f0d1333f751fecf60c035bff542486fa4fe05b79d0f9600c3ed01ad41892e0e30b90b1f52f9bfdae7fdb3c2b0e0ca4100943cbe977fdb32fb SHA512 115d943fd573d20862e3534f5f11f9d198f4ef3ef24e1fac7071d47cc76773c8c3dac5b0cc66349c4f95ae55017b52586b3e4f9325e7148732762008dc1f9be1
 MISC metadata.xml 298 BLAKE2B bbb65357f89a126895f808f22a14211302edac1ef368ceea547a0cb8b0a4d62e50e61572a47a2d9a123d22f33f384cd7fe6b0604d78ce83701608db0725a076d SHA512 70fe0d52216ae4902962671d07b6667c1aad035e9d6a737700a44d3f0ef08670e965cf692dcb3fe106a0dd62125b9fd433bd980cc46a3be4d34cfef7d79da06e
diff --git a/media-libs/simage/simage-1.8.1.ebuild b/media-libs/simage/simage-1.8.1-r1.ebuild
index 16a7636b4951..2d36730f8427 100644
--- a/media-libs/simage/simage-1.8.1.ebuild
+++ b/media-libs/simage/simage-1.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,15 +24,15 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	gif? ( media-libs/giflib:= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 	)
 	sndfile? (
 		media-libs/libsndfile
-		media-libs/flac
+		media-libs/flac:=
 	)
 	tiff? (
 		media-libs/tiff[lzma,zstd]
diff --git a/media-libs/simage/simage-9999.ebuild b/media-libs/simage/simage-9999.ebuild
index f18a1bb093a3..de344b494368 100644
--- a/media-libs/simage/simage-9999.ebuild
+++ b/media-libs/simage/simage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,15 +24,15 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	gif? ( media-libs/giflib:= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 	)
 	sndfile? (
 		media-libs/libsndfile
-		media-libs/flac
+		media-libs/flac:=
 	)
 	tiff? (
 		media-libs/tiff[lzma,zstd]
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 79f7c8cfae71..a8601ee7f166 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -2,7 +2,7 @@ AUX xine-lib-1.2.12-dav1d-1.0.0.patch 805 BLAKE2B 83b97835c46ff547636c9a39836ee4
 AUX xine-lib-1.2.12-fix-mmap-crash.patch 535 BLAKE2B 6b6782a7923754c29daf8263bc267f57124de6b80705214537c9d788bafb3f80bcec35915ca50fb50935ffcbc612187dc1f0e0d71e80279d4d9e3fcbe54a4ebd SHA512 f642612419abd03b765f8dbf787aa675a1e5a031878db9b51c7f2a829caa19c153f9cabe733dbd21cbbbe55ce1ce5d5793b75e9b32c229e3fb57b548d39a6aa5
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
-EBUILD xine-lib-1.2.11-r1.ebuild 5279 BLAKE2B e633122ea0b8054e6bf31243c3aa21d62fe237b2d3215b81869a79688cf7d59aa9718ded6fdb45af4dc9b10b7a3cc6ac58af82f980beb81c9cbf258a756c68ed SHA512 bb7ac4c59028a55ce70650ea6d346a56e5df4b785be9a7b20f1e2f413fb6a88df928d4aa3124ab3a6776be166f75a97cb45e1235be0be6a42d442a93ecf83620
-EBUILD xine-lib-1.2.12-r3.ebuild 5480 BLAKE2B 90e2e42f79bd29fe988b7e15b7efae75e3f810f36c7acf1d20d7c93c7908f90120f45e42d8085aed28403a9a406b6039550c607078863b4a0987772373ce4024 SHA512 e84cd2a4f0f1d66bb45b0c77c0179a358b56fbe5ee65aea1d62a90714f844e630970a1bea7acf391809f3db55aaf960b3629357dae98d79b4b4c55b452956fee
-EBUILD xine-lib-1.2.9999.ebuild 5375 BLAKE2B 3fa27f23bdcf5e5a9d66cc177088d4e381a1ea253e9941e64dabda91362ddae73a2b11520a3443e869578755cabda5fef6fe680da1dea4fd7defdbfb9bdbfbcc SHA512 35c9b0e12f193458d8f9620a22645e5037beb7a9adf73480bc3d0bd976ef108d7981f670379c59b7f9bb5120c77d53afb604f9730bac35eb350cbc9509bd0bc2
+EBUILD xine-lib-1.2.11-r2.ebuild 5279 BLAKE2B b496cf182c84a620588ee425de0a4a31246e8361a3bcaadbc705c1fa21a4fbb62867073593c6d2974553fcb47847381b133ed9d4da9d7388b8ecef0e7be67a89 SHA512 87dffc4f789b73a7dfd40dd125718f4758a59e022a2841bcb053bc04efa0f32e5b68497ca3feed09bd0fd36c9d01e5fa8643b8ab7b73c7e8727abcc2f3a0f062
+EBUILD xine-lib-1.2.12-r4.ebuild 5478 BLAKE2B e8c894e47e1afa400442a3511c329bf70163b6033c754064a1fe281951405fb297bfa55660e2240f4c1d51b16f1e262224e5d3ca582191791bd50df2e643dab6 SHA512 7f7342a5fb11b65f3b8c41d39f91e0eb596c9a132ea57310555a99d69b54a35dd072c987734440a1819a8d58bd9aa2b48ed314de1f8745c1b982cdcd30778098
+EBUILD xine-lib-1.2.9999.ebuild 5375 BLAKE2B df0e592f24da6fc9f693593e26af53d45a0025bdda61bed897a7851b772877ae8bc8877324110852046ed83d06df7d890cd59816d29009304d181dc0c7c9a289 SHA512 bdac51b5520a8f3b90b3c348c05216a22d0b7b3cd269678a510456e8d38714f8c52a424790d877294fc959b1c7b6af28975d148f05f4bfca3c463a8831f68354
 MISC metadata.xml 2784 BLAKE2B 636cdb7ad93aa8941a36a23b9bc70cde66878f7628cab7e697582733b8ce85d58c09a5c63fcfbc009f098001399407055c449412dabd52178548c0c41d572c5a SHA512 5b644f501953bbc34020f0955991363d558a23a9610eb37f46499bd2d5415849a10a3306625e50d5cfdf094e67a38da5175bb981387841bae63c33ae74e17757
diff --git a/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.11-r2.ebuild
index d6b4b9882a0a..658a811779ee 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11-r2.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
-	media-video/ffmpeg:0=
+	media-video/ffmpeg:=
 	sys-libs/zlib:=
 	virtual/libiconv
 	a52? ( media-libs/a52dec )
@@ -45,7 +45,7 @@ RDEPEND="${NLS_RDEPEND}
 	css? ( >=media-libs/libdvdcss-1.2.10 )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	imagemagick? ( virtual/imagemagick-tools )
 	jack? ( virtual/jack )
@@ -77,23 +77,23 @@ RDEPEND="${NLS_RDEPEND}
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva:0=[X,opengl] )
+	vaapi? ( x11-libs/libva:=[X,opengl] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
-		dev-libs/libcdio:0=[-minimal]
+		dev-libs/libcdio:=[-minimal]
 	)
 	vdpau? ( x11-libs/libvdpau )
 	vorbis? (
 		media-libs/libogg
 		media-libs/libvorbis
 	)
-	vpx? ( media-libs/libvpx:0= )
+	vpx? ( media-libs/libvpx:= )
 	wavpack? ( media-sound/wavpack )
 	wayland? ( dev-libs/wayland )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/libxcb
+		x11-libs/libxcb:=
 	)
 	xinerama? ( x11-libs/libXinerama )
 	xv? ( x11-libs/libXv )
diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
index aa0cbc19cc29..2d39b5534149 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 RDEPEND="
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
-	media-video/ffmpeg:0=
+	media-video/ffmpeg:=
 	sys-libs/zlib:=
 	virtual/libiconv
 	a52? ( media-libs/a52dec )
@@ -46,7 +46,7 @@ RDEPEND="
 	dav1d? ( media-libs/dav1d:= )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	imagemagick? ( virtual/imagemagick-tools )
 	jack? ( virtual/jack )
@@ -78,17 +78,17 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva:0=[X] )
+	vaapi? ( x11-libs/libva:=[X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
-		dev-libs/libcdio:0=[-minimal]
+		dev-libs/libcdio:=[-minimal]
 	)
 	vdpau? ( x11-libs/libvdpau )
 	vorbis? (
 		media-libs/libogg
 		media-libs/libvorbis
 	)
-	vpx? ( media-libs/libvpx:0= )
+	vpx? ( media-libs/libvpx:= )
 	wavpack? ( media-sound/wavpack )
 	wayland? ( dev-libs/wayland )
 	X? (
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 83fc34a5b4ce..645dce42fdb3 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 RDEPEND="
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
-	media-video/ffmpeg:0=
+	media-video/ffmpeg:=
 	sys-libs/zlib:=
 	virtual/libiconv
 	a52? ( media-libs/a52dec )
@@ -46,7 +46,7 @@ RDEPEND="
 	dav1d? ( media-libs/dav1d:= )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
-	flac? ( media-libs/flac )
+	flac? ( media-libs/flac:= )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	imagemagick? ( virtual/imagemagick-tools )
 	jack? ( virtual/jack )
@@ -78,23 +78,23 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva:0=[X] )
+	vaapi? ( x11-libs/libva:=[X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
-		dev-libs/libcdio:0=[-minimal]
+		dev-libs/libcdio:=[-minimal]
 	)
 	vdpau? ( x11-libs/libvdpau )
 	vorbis? (
 		media-libs/libogg
 		media-libs/libvorbis
 	)
-	vpx? ( media-libs/libvpx:0= )
+	vpx? ( media-libs/libvpx:= )
 	wavpack? ( media-sound/wavpack )
 	wayland? ( dev-libs/wayland )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/libxcb
+		x11-libs/libxcb:=
 	)
 	xinerama? ( x11-libs/libXinerama )
 	xv? ( x11-libs/libXv )