9 files changed, 170 insertions, 11 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index bd3d31629679..fdf36749287b 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 232ee476d53c..333c3a3b5119 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -12,13 +12,16 @@ DIST libaom-3.7.0-testdata.tar.xz 374076136 BLAKE2B 17036f37fbb04d59b50e13e5e225
 DIST libaom-3.7.0.tar.gz 5347924 BLAKE2B 2693d60f5afa810e00ab6aadcf8ca763e328bc64e47b3678eeba9993db89b25cfa0380beeff5a5938f19da74410ce83068c318cff2aea30e5fe39680ac67e937 SHA512 b763a877db26dcaddea5513825900917e55bc131bf78a83f941f1e74b534a514cb599fb64c3ac18a8202ac0a72c511dfef6eeff21dfbe59ed9816887ca3ec5f3
 DIST libaom-3.7.1-testdata.tar.xz 373814716 BLAKE2B 2aecab88d36998d72ccbd170400425912404cffad0594749bd862c56ee732fa2a21898872db3898f5706459d45e13a026b6bb79ffb5ee9a6b284765ebf3cd8f6 SHA512 89a598e549602daeeb1a488303503644c4cf3f05b28706df3075c52592d3fdad13d29e56f36e571621db3d32f354af4b6978c02e9af8665f87c82f8c9918de9a
 DIST libaom-3.7.1.tar.gz 5349727 BLAKE2B a5bc8aaa538353fa405520fc096459d0009348c590dc585377e53971df252bac0b5bea40b6483c8be54caa7a0e8fccd761c5b3ec0db4144becec3cc12a91a5e9 SHA512 2ac90997065fcbdfa028e09945c10cbdad405569b98e03592a46971aebb189014ebd59553589804ba0a03c386af41bfbc37dd0a12320eb0fc6c9fd03e2149ee3
+DIST libaom-3.8.0-testdata.tar.xz 426384840 BLAKE2B a195f44aa8f55e869ea613f587a101162723be643d272c08b5ac50afc9c55e2240d84f63489402482699f6c306d96116f7808f47f529ce4d0ec8149495b72b49 SHA512 18ba3468e770e274e8a1556160c8524d309d6ea80e3cca971d6858cccc5ba4f2d3764f484e19d23df83ebc50e047aa1ef6fb1a92aad90668cfee7daa95447db2
+DIST libaom-3.8.0.tar.gz 5448720 BLAKE2B 276e50c134a5a5925591cbc5c76a11383d288854bc5f4db79d97f1e4e41e74f5739ee916df127112cb678673f09aeb5dfa91f1d8696b0894923837cea991bd73 SHA512 201a3ef00c0de3f90ed2486b306b836ec3e5c891c0ea05cb4607523f084f957849d38cd1e2684c05af2a93180a1b151ccc7a99ba8d5d52a84d8cb17cb25b0e8a
 EBUILD libaom-3.4.0.ebuild 3246 BLAKE2B d42b5eb01f7383b4f4abc0000614251af08d02e1560babcc41f74d13711d6f3d17205b4fbe82011e1be39ce89a7a5694ea000f26df94676a7d7179bb0737034c SHA512 a965cec35285846c6df630d59ce520f37f423946e6a9130d8af72aaa48e9f80bc8df80e020b73bf4e5be8584e23f44fd054bbb6a0d7fb9c1002de4442b4301c4
 EBUILD libaom-3.5.0.ebuild 3314 BLAKE2B 60443b958e7edf5345af61c71bfff8c8614ae51edf1cd6f34bea2aa42cd42941c7d259a2a947ca063e3add31c532c0ea4a894de212de625241cd1c3d5e928a87 SHA512 d88224575368b6aa4dbc83edf5970e7a1c5bfef9c1500a9b28e3bb91e2d1586c8b86c03a3756743d8e7c5ec63028b269a276572f9a1c9dc9fff5e02fd6b3f5ed
 EBUILD libaom-3.6.0.ebuild 4001 BLAKE2B 0f6af46ea95f891dc9ae55fb2fd276c304977dd9d0ce51ed72a3ba11ccec51e6f815e0f3466a10289e102b161a41440c71c0f3b78e4253ede4f7f17b3aa07147 SHA512 80c392f5721c6f913d7fc403f83354eb067f3d8d753b76d1905f82aee6fa430a87a0875070ffae7c6edda3e2529413c6577c8c0144ff38e98cc1973d1df44886
 EBUILD libaom-3.6.1.ebuild 4084 BLAKE2B 48ae40602af98e63e02fbbcbf64737fd0e9f9f0b278c311b8e43d46b92b848f089103c2a6191a931f0c6575d713915a2f8145b4afa488fb5b66158136021cad9 SHA512 48e6ba74685f7b6625ff63b5614362a5fac8b2e1cf089ef5eef92eda9666722f8afab6c754cf4a20d9de51061e8e5b30d6877dfe3f275a508892fcc004bc2bc6
 EBUILD libaom-3.7.0-r1.ebuild 4077 BLAKE2B 90d69ac4b74320819a390734af21bd1118455028aa300b92e42a524714f7be00f1561e694dfb62070c819974ae166387d111ba0eb4756cb6f70ac5e1c045759d SHA512 354d28904c1a4fe1ee70bfd8a48266556ac654dbe14c0fff1d72c81281246f94bf27957bf9c2481e9fcede85447626dd87e44f1be6bb4972a03162fe44e2132f
-EBUILD libaom-3.7.0-r2.ebuild 4407 BLAKE2B 85cc0c39cbd3e9837384f5dd9d511fd92d09204c9e3c53eb6f4db3b61bf34147edb39057e0416dd2a761a96b1ea3698785ae760da9090c66e52ea68af030ea8c SHA512 ac35584e8ca005bfda5f96189c99fa7b4fca78ba2508762239231dce639c1b73171cc698d7de832add815c74e56f2903b6551fd2056b184fa63cd938c035d045
+EBUILD libaom-3.7.0-r2.ebuild 4406 BLAKE2B 13bc894a3aacb8b9ecf9efe48749cc87f032b2f0b4a49973bae13255a8138e47857227d038c39323a6a341e00c6d35d147ab7779ef1de2d53ada0c84dde943dc SHA512 c98add5d2f5b00b708d853170d3c0c701ef191e2000c0c981f85b34fc9ab0b5fdb3c8dcdd784bde04f5631914ceed2242ad94561b6765181d479056bf9334a62
 EBUILD libaom-3.7.0.ebuild 4023 BLAKE2B aea1f5e374ba3075baa8e72e135fecf063743909f5aa972a1a9b1503be1868e0dad9ae10809a7905f87151f6cd3634104b4493fddf86ddc174b0581d5c971218 SHA512 9d8f6e81729c4c875b4d7d7b986547c68f1024ad01e21d2b16e95572b146c159b4f32196c9e5c8008f64079d03d8216e393c70ffefd9f2a121e918e1c39dd996
 EBUILD libaom-3.7.1.ebuild 4423 BLAKE2B 05afb91037b2c90df89a7034db363a049cd349b7fee3dde73de9a12afae8a28184b9f0a7b277f6b5980b76dddc64ca4616f2cf1fdbd4aba81fd38f11cf803f9b SHA512 9e41b03f29a7464e298dd247f65fc0a7a74802f54d61d5a17a645dc0a4aaa481674f5d0d52e79426eb11ffcd15cc522c18a0bab2a3a7a4f0f5761601b18161d3
-EBUILD libaom-9999.ebuild 4329 BLAKE2B 946765ae1ece82e006ecd0ffe60e28617b1715309ad6cd5a7b935ba50bd464f520cb1ed3505c6c13b02eed54076e68c1e65c55de374eb054658fee1a190fb131 SHA512 22ce0e5ec7125d6815831b4994dc0be8d001d250779779ad385308cdb2299a9d27a2379d8d476ecee75dd19071289cb30fe415240d483658e483539f3ba73fdb
+EBUILD libaom-3.8.0.ebuild 4487 BLAKE2B 189f3b91d38e807c60d343fc36c83d52dbfc2837f9ff16eb8fd6f738e66a1a94e5f01a7f16f3413288614068387c27ddf944707d1add269e75b487625f387213 SHA512 c7f63e840008b66e7fd391a3bb87dac66208e24be36a578b8bb85a99681030c8cd9061ef36f60de41a33919318f4ddaac8fa1d50f598c4b20be0a797344284c0
+EBUILD libaom-9999.ebuild 4487 BLAKE2B 189f3b91d38e807c60d343fc36c83d52dbfc2837f9ff16eb8fd6f738e66a1a94e5f01a7f16f3413288614068387c27ddf944707d1add269e75b487625f387213 SHA512 c7f63e840008b66e7fd391a3bb87dac66208e24be36a578b8bb85a99681030c8cd9061ef36f60de41a33919318f4ddaac8fa1d50f598c4b20be0a797344284c0
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.7.0-r2.ebuild b/media-libs/libaom/libaom-3.7.0-r2.ebuild
index 484985245c81..bf34b1dca583 100644
--- a/media-libs/libaom/libaom-3.7.0-r2.ebuild
+++ b/media-libs/libaom/libaom-3.7.0-r2.ebuild
@@ -25,7 +25,7 @@ else
 		https://storage.googleapis.com/aom-releases/${P}.tar.gz
 		test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libaom/libaom-3.8.0.ebuild b/media-libs/libaom/libaom-3.8.0.ebuild
new file mode 100644
index 000000000000..90505353bef1
--- /dev/null
+++ b/media-libs/libaom/libaom-3.8.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	# To update test data tarball, follow these steps:
+	# 1.  Clone the upstream repo and check out the relevant tag,
+	#	  or download the release tarball
+	# 2.  Regular cmake configure (options don't matter here):
+	#     cd build && cmake ..
+	# 3.  Set LIBAOM_TEST_DATA_PATH to the directory you want and
+	#     run the "make testdata" target:
+	#     LIBAOM_TEST_DATA_PATH=../libaom-3.7.1-testdata make testdata
+	#     This will download the test data from the internet.
+	# 4.  Create a tarball out of that directory.
+	#     cd .. && tar cvaf libaom-3.7.1-testdata.tar.xz libaom-3.7.1-testdata
+	SRC_URI="
+		https://storage.googleapis.com/aom-releases/${P}.tar.gz
+		test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="big-endian doc +examples test"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_crc32 cpu_flags_arm_neon cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# The PATENTS file is required to be distributed with this package, bug #682214
+DOCS=( PATENTS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
+	"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CCACHE=OFF
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+		# https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 shows
+		# that big endian detection doesn't really work otherwise.
+		-DCONFIG_BIG_ENDIAN=$(usex big-endian 1 0)
+
+		# Needs libjxl, currently unpackaged.
+		-DCONFIG_TUNE_BUTTERAUGLI=0
+
+		# arm
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_ARM_CRC32=$(usex cpu_flags_arm_crc32 ON OFF)
+		# bug #917277
+		-DENABLE_NEON_DOTPROD=OFF
+		# bug #917278
+		-DENABLE_NEON_I8MM=OFF
+		# bug #920474
+		-DENABLE_SVE=OFF
+
+		# mips
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+
+		# amd64
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+
+		# ppc
+		-DENABLE_VSX=$(usex cpu_flags_ppc_vsx ON OFF)
+	)
+
+	# For 32-bit multilib builds, force some intrinsics on to work around
+	# bug #816027. libaom seems to do runtime detection for some targets
+	# at least, so this isn't an issue.
+	if ! multilib_is_native_abi && use amd64 ; then
+		mycmakeargs+=(
+			-DENABLE_SSE3=ON
+			-DENABLE_SSSE3=ON
+		)
+	fi
+
+	# On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456
+	# Just force generic, given it's a niche situation.
+	# TODO: could try forcing armv7 or similar?
+	if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then
+		ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)"
+		mycmakeargs+=(
+			-DAOM_TARGET_CPU=generic
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" "${BUILD_DIR}"/test_libaom || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 342fbbcdf1db..90505353bef1 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -36,7 +36,7 @@ SLOT="0/3"
 IUSE="big-endian doc +examples test"
 IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
 IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
-IUSE="${IUSE} cpu_flags_arm_neon cpu_flags_ppc_vsx"
+IUSE="${IUSE} cpu_flags_arm_crc32 cpu_flags_arm_neon cpu_flags_ppc_vsx"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -76,9 +76,20 @@ multilib_src_configure() {
 		# Needs libjxl, currently unpackaged.
 		-DCONFIG_TUNE_BUTTERAUGLI=0
 
-		# neon support is assumed to be always enabled on arm64
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# arm
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_ARM_CRC32=$(usex cpu_flags_arm_crc32 ON OFF)
+		# bug #917277
+		-DENABLE_NEON_DOTPROD=OFF
+		# bug #917278
+		-DENABLE_NEON_I8MM=OFF
+		# bug #920474
+		-DENABLE_SVE=OFF
+
+		# mips
 		# ENABLE_DSPR2 / ENABLE_MSA for mips
+
+		# amd64
 		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
 		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
 		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
@@ -89,6 +100,7 @@ multilib_src_configure() {
 		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
 		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
 
+		# ppc
 		-DENABLE_VSX=$(usex cpu_flags_ppc_vsx ON OFF)
 	)
 
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 4071f06c6d0a..237d2871eb89 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -5,7 +5,7 @@ AUX openexr-3.1.5-drop-failing-testDwaLookups.patch 868 BLAKE2B 6ae9b57b222e038a
 DIST openexr-3.1.11.tar.gz 20539852 BLAKE2B 9d57362c656a646a5b909063ff57eccfacbc70929a802561c2be71b050e97e7087221f78110f2686fcc1ea960d87880ccdbcb57b474f635a3392f3fa169ef3c5 SHA512 ebbad4b22315522f43cafefca77cf92ce38cac87f024c8dc6429aed04a6dad1f0a3d717faaab39c4c3605e440442952acc4630c5393754ea138929be4ad8a0d4
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
 DIST openexr-3.1.7.tar.gz 20494812 BLAKE2B 2cc03ed8da77f4a9523b7a0f55c78e78ab55f8f6de67cb68f1b2b4ad4b512448d80f39d60a0cc9eab451da35539027a573a0c6d6900e7f81b39f90703909b5af SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5
-EBUILD openexr-3.1.11.ebuild 1887 BLAKE2B 00e103f23ea537f070f50f6ef6e17bbdb1a7516445e2786fed8b558f2ea3ea2cecf2d82cd50bda448b8215ea41b17c5342951e67c475b509f88bd0e7fd06b20b SHA512 df2c7eee75ebaaa9713a5ce9fb575c8f48e60c0ee97c2aba70e5406a4de293071ad14c5670e06edf16710a40c4d76731cf508cf466780fb23d073bbaf48a60c6
+EBUILD openexr-3.1.11.ebuild 1886 BLAKE2B 3f13fc12406c10c3da06bbb4c2914f690ef4540e4fedff3d6d635e3209ec41366077b80ce53f51d0c4eb7526674a3c9f6241a6273d5df90d2538f083f8f4ed43 SHA512 1420ff8b3d87761afa55ab0801175dcc3550f04491f0b3412d0bd65fcd223c608de053e324fbef4da59639c60407cfa7c0df7d9a380a655c9fb55a367e27c0e8
 EBUILD openexr-3.1.5-r1.ebuild 2037 BLAKE2B d68fc1c11c5ae3ec8f90660242ece6056d85391aeb8dac72419b3a96225a2d455f15b010464c81d1da570ce1d695da63e0ac597bee277c8708f989a2ba8ae372 SHA512 4ba3295a8bbe3fce99b639668274bce3c813b468c9f7b5a927704e36b485106f92b9aa6a86e70c533691447859e7bea3380e039d7a75783584b624772d599eeb
 EBUILD openexr-3.1.7.ebuild 1885 BLAKE2B 9ecdacff210c9c46bab899ffc5ce2cfd2047b46a914b355f2cf18b98628a5e2f235846e41eabd0710c430d5a14aef8895e12acd798b7790063ed55e9d25d327d SHA512 320a267b67c85221ee7bd50e21695f78dd8ed3d1ee64803aa5c96e78fcfb3044c14608bf93b49103cf1e262b10c764f4c100b1c0d8372cb11b6735398478e23b
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-3.1.11.ebuild b/media-libs/openexr/openexr-3.1.11.ebuild
index 9c89846096d5..b974fff11309 100644
--- a/media-libs/openexr/openexr-3.1.11.ebuild
+++ b/media-libs/openexr/openexr-3.1.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 LICENSE="BSD"
 SLOT="0/30" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cpu_flags_x86_avx examples large-stack utils test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 9b8c124cd484..cc4596a9f080 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,7 +1,7 @@
 DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
 DIST x264-0.0.20231114.tar.bz2 833229 BLAKE2B e8e60767d16ea11e55f9dd56f1c74535a06b07a498b91d4372872925915563b67fb917c5856e2e40e1f58acbab3142509d036cae8d56820bef0e16ee7bc35196 SHA512 7705c2827c6b280afc7403bce206f82ee94c1ba76c582d3e6ae017b9c4f08c4475ac70373f8a0bcda73046221456efc3f338c57aaf03c11f4d8e63f69bb94db5
 EBUILD x264-0.0.20220222.ebuild 2101 BLAKE2B e31719349399dfa83e5d0c97b3684b2f9484d051951f740e12d478b1a57448add56c5d5ff9e461f05d89cb9012205074d7a3e9246af65079cbbe5a88c191ed22 SHA512 ea9bb23667b27e6b14a1b0d3b751509c2fdd5dab93de26d1f4c2a73067bddbec2d76edf839a6bf096338b97f3e17b8866163950e2b99af7c3f1e4e64cda46cd1
-EBUILD x264-0.0.20231114-r1.ebuild 2067 BLAKE2B 64d7537f07a0c8a6d1002700768ef46bb69032b385f9617f359005e2ce91fc93c585c79f205e3447be81d74e8799d6beeecd4ec770807d39e01d11f480f6147e SHA512 502ec4165f85f876852991bcfb7406c868a8a04810a8f19984b2bdf776beae750c25e4055c03c2b85ce33f625423e44273250db1e79279fa186f45ee4aec72d1
+EBUILD x264-0.0.20231114-r1.ebuild 2065 BLAKE2B 173b55b028567b3e2f8320b692aeb3dbd28287584f684865b4c721210d0ac5ce68081e8dbff95e9b79ebe59f2e397cf1545f6bd978515350b6032983a27f4429 SHA512 4effeaa7f2c8dba8cc4830084a80c83ef09147746b3cae360ccd13ddbbfcc1e8c0b5381e42e6854998dd56a1c042bd2b5e9c3b37ca8dd5ebd8e07aa38d26d935
 EBUILD x264-0.0.20231114.ebuild 2137 BLAKE2B 52fd9c1d3fd59454498fcb75a39f930e91fc27588e7f649530acc04b3d3b975e4721948c170c7cd34e2f32245a2fc5e6b2f8bcf5114d3171f8336ee8e2ec3fd4 SHA512 0e1f1ab79148090f34f80bd4eb2456c98a9f3c895098123d90e0afa059f5197270f6c0b6b6d4c85011d32acca4cedd7a5e5d85990d7725e7add5e0fa6bcb753b
 EBUILD x264-9999.ebuild 2072 BLAKE2B 9bdcafd4e77166eb346221e7deb98d86580105ff41dbbe972247c13b28f281024a533cc7eeb3358a10ae4ce0f901680e07d5bb57da745b8f23e73dfda4c866b7 SHA512 2be132a6554c9cd368e9c64c80811065f0f2beb1007f87eaf59e2d3e2bc76180c8e4425a7ccecbb7969cceff3366f6f638919cc52bb53d735dd82f02673a9a8e
 MISC metadata.xml 436 BLAKE2B ae066438ad1ac844f1c212b463498e0d4ee3e0b38d24b7a85a36dca419cfffc83799c69fed3af8d7ae35e619a961ca7aa3b4cbb86ade79eff318e05da836ea68 SHA512 f019ace06237e2e0244efd5cee86fdadafb03dfd0f2dec16dfce3d39ffe5a80292840c14378eed2270b47bcc6f32d5b59d358461f93bc7fc25ff14f35be4b41c
diff --git a/media-libs/x264/x264-0.0.20231114-r1.ebuild b/media-libs/x264/x264-0.0.20231114-r1.ebuild
index 19b15f5939e2..7ad94e41440d 100644
--- a/media-libs/x264/x264-0.0.20231114-r1.ebuild
+++ b/media-libs/x264/x264-0.0.20231114-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7"
 	SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${PN}-${X264_COMMIT}"
 fi