gentoo auto-resync : 02:02:2024 - 05:44:58

18 files changed, 584 insertions, 161 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 54fd293fd410..e1511e5ed49d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index d1aded1ee59f..68a7fa33a655 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -6,6 +6,6 @@ DIST Image-ExifTool-12.72.tar.gz 5310864 BLAKE2B 3ad4b03ba234e45d1eaf8b8b4724d21
 EBUILD exiftool-12.50.ebuild 717 BLAKE2B 76991bf0377bea98b0a5275909becd0e8642e35c42336505850f6ccde0f71333cd283baa7cab45971a0aab273d5108a3944418981f8322e0292f91b04710f211 SHA512 cadea77ec19090e51ceb3aaeac992824127c55e231c544e7e3175cf898cbea8eb2e4543e99335e2303968dc980c179d6c459e3b90d5bacec41f3913fe9e2e37a
 EBUILD exiftool-12.60.ebuild 722 BLAKE2B ba10b759ee4ebd70b75fdf6088299e05892595a1e105fd555bcb4723e2227d6277a1e016d9e49187846e17c91b961a4c6f87207c90b0dd5efebf6672c6248784 SHA512 6ab655af269d29f118827c77023ff5c80a8da0d8471f4fab17dc2e07ec2d4b23e24b53a2f058828a910edebad14fa58712f5e325458657bdd44e38cf6f348f06
 EBUILD exiftool-12.64.ebuild 717 BLAKE2B 76991bf0377bea98b0a5275909becd0e8642e35c42336505850f6ccde0f71333cd283baa7cab45971a0aab273d5108a3944418981f8322e0292f91b04710f211 SHA512 cadea77ec19090e51ceb3aaeac992824127c55e231c544e7e3175cf898cbea8eb2e4543e99335e2303968dc980c179d6c459e3b90d5bacec41f3913fe9e2e37a
-EBUILD exiftool-12.68.ebuild 722 BLAKE2B ba10b759ee4ebd70b75fdf6088299e05892595a1e105fd555bcb4723e2227d6277a1e016d9e49187846e17c91b961a4c6f87207c90b0dd5efebf6672c6248784 SHA512 6ab655af269d29f118827c77023ff5c80a8da0d8471f4fab17dc2e07ec2d4b23e24b53a2f058828a910edebad14fa58712f5e325458657bdd44e38cf6f348f06
+EBUILD exiftool-12.68.ebuild 721 BLAKE2B 5be01eb725c0d3b6c2994f7da8b52ddb28c722f11169f841a8d1887475090495ffc819b603a15f5f669e5e0250be16919c088543405f99f51eec53e07aef3b2b SHA512 7963bf2f4b23fb8f9b9a7daf01688ab07de51f70b20a22cf1ef355c843d01662ada57c591f1fc8f993238eef32f86b4fec5d0301f59e54dd38e47ab1b7d6e05e
 EBUILD exiftool-12.72.ebuild 722 BLAKE2B ba10b759ee4ebd70b75fdf6088299e05892595a1e105fd555bcb4723e2227d6277a1e016d9e49187846e17c91b961a4c6f87207c90b0dd5efebf6672c6248784 SHA512 6ab655af269d29f118827c77023ff5c80a8da0d8471f4fab17dc2e07ec2d4b23e24b53a2f058828a910edebad14fa58712f5e325458657bdd44e38cf6f348f06
 MISC metadata.xml 10040 BLAKE2B 8bcecde1df2dd3e79c3bcfbd38dcd9d3db9564a7abd5a684e0204779bcb685946f2eeb83a62efaa03efc841f0414b82f1087a3da3c6bd5f43e85561e43d7fb3e SHA512 af79302b57833d1368eff738b2326dd9cd47de47baf42426bfb00f61c1c6f52fcdc41d74bf95d8f65b2b0b00578ce07c3471b8cf4923e2f47c2c0b9d58dea35f
diff --git a/media-libs/exiftool/exiftool-12.68.ebuild b/media-libs/exiftool/exiftool-12.68.ebuild
index be671cae8267..918d2d47ae9b 100644
--- a/media-libs/exiftool/exiftool-12.68.ebuild
+++ b/media-libs/exiftool/exiftool-12.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://exiftool.org/ https://exiftool.sourceforge.net"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86 ~x64-macos"
 IUSE="doc"
 
 src_install() {
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 2be4420cec05..13e0382b57e7 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -2,6 +2,7 @@ AUX libaom-3.4.0-posix-c-source-ftello.patch 429 BLAKE2B 3e6ff2b95dbf39d2d90a46c
 AUX libaom-3.7.0-allow-fortify-source.patch 467 BLAKE2B 405f87a6467daae59823eedc9fd7cac959909d5c07df6b4930b55af129750bfd0ed2749b41c6a4fbdb2a8dd49a6881e9de0af526972d27c8c731ce29ab34d1af SHA512 ab69882b8652cb61bdfa14b5fbf5e5cef3344df3aee852f42192af1e935299be1029947a3cb80527362b2db57c93197b889fb45dc562123353b7a3871feaa811
 AUX libaom-3.7.0-big-endian-tests.patch 1611 BLAKE2B 9c0ab0a6a5788fdbc87f30ef5f2a6524521dcf1ec1911544827acb912551c08fcf370c369abfde1567d691a8b814ec897d90819431d7ad091dc247dc7e7396e0 SHA512 299f511b45ba9f1511ab508159f7341ff6ca433118feefd66e96266131588203fc651b4b88be79487b1cbb688c7946dddeeba1b07d88c471da95465e6782fb87
 AUX libaom-3.7.0-big-endian.patch 4168 BLAKE2B 6c9a9ac0933b29b3ee8111d8068dfff144385ae68ebf693a335672c3138cc31ef346486af44b0b0fff9bad58ad72d2335962b78bc82e40b1a7f4a4c9b5d3ca28 SHA512 aebd3f9d16f0cc6a6a0b7a240d5d8cb55d28fc8fe4a00444b26c4b54fed0536ff3577aab5aa624cd9900858770dfdad50f9429d91ee0638058d4be34873e8be6
+AUX libaom-3.8.1-tests-parallel.patch 907 BLAKE2B 3c969182fed047b6075ebd0d19f50dfe19028658da42eefc991eaf4ed15736ac95219f5562dc8c04e34849c615fe74a5c940701e274ed7485387092d8d46fb50 SHA512 293924e8732640977c706dcf7fe811f76f093402faa3db8e61d35e32552df889dc63073f004dce4bc4230ceb647f78d0085c9a0099b597b148b9a29fc38f2544
 DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
 DIST libaom-3.7.0-testdata.tar.xz 374076136 BLAKE2B 17036f37fbb04d59b50e13e5e2258215e99cab4b6f64ac558213009477bc22f43267b60bcbb30ec10325de2aed48b22237b12cd6220f4330e300b62bafedac0b SHA512 c08ef4c9c45f1a27e6c31b8cc9799d8e65d895663a79d7be51da1733be6d8013adaad3a8f1d7491f555a2eea58aead44b9ce935c3e9bb957cb8bbb93f6f4fd98
 DIST libaom-3.7.0.tar.gz 5347924 BLAKE2B 2693d60f5afa810e00ab6aadcf8ca763e328bc64e47b3678eeba9993db89b25cfa0380beeff5a5938f19da74410ce83068c318cff2aea30e5fe39680ac67e937 SHA512 b763a877db26dcaddea5513825900917e55bc131bf78a83f941f1e74b534a514cb599fb64c3ac18a8202ac0a72c511dfef6eeff21dfbe59ed9816887ca3ec5f3
@@ -9,9 +10,13 @@ DIST libaom-3.7.1-testdata.tar.xz 373814716 BLAKE2B 2aecab88d36998d72ccbd1704004
 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
+DIST libaom-3.8.1-testdata.tar.xz 426372276 BLAKE2B 4d6194a98612045023f4d35ca851a37ffc69cbfbfd015d5c1f4e3aebb6789096d7b7f82b9641c545e4203b44fe8a9243de83bb23a8c53aced30ec26aed0376e0 SHA512 03bf5d521c613728dd12fd33bb76fc64a20798e276dbdc2501446e1fb9891552e88adb25f0e4ff65d6c8aad301a550aec195498ab1f1a506bce3fe384e24cc0e
+DIST libaom-3.8.1.tar.gz 5450909 BLAKE2B fec3123f8ee68b1027a1a2019969c098b730da72be2902274659b983857f2d8f62dae5b563543b3f144ae8bc51b6d6fdd4fcd6aadf2ca04d5a4dd5be987fbbac SHA512 f9ee918a37699cfaf2bcb5aa16a4d8b077feb1fc577d8c5437ed3fa1a1c0a5d734c9564e3c8c0f0b1baf43dc5abb7ff0196a77607b10d926c0be7858778ac1e3
 EBUILD libaom-3.5.0.ebuild 3315 BLAKE2B afdd6a434aef5df50c5994bbb9354e41f695a3f91b2a7d68ee37e567d9bd0bea178f1612ff40917b6d56b3446a0e69dbec07b2ba4c2fbe80d62b0d2e859ff65f SHA512 1d3ac1927aace364c0d2e68ac060cf1ecc7af3c9544ac00e8910d940f38221548ec831ff3596498e0c40308a49d24104861603bb204fd8c7db2546466627e9f7
 EBUILD libaom-3.7.0-r2.ebuild 4406 BLAKE2B af21096b90e2d22986715e2399ed37879ea36fe0b7e8bc082a27da285745a8baa6b6485e780cd4062c255268d5c3885dbcc43c7231c2aa446478872ebf390b14 SHA512 e4cf9710930b9979dd5672a776189ce6f7e2f11913621cde8e5a919bb2eaa62f2cca227bf90fd6c1e4e1af65cd4ad3b89e3a63bb69ce2abcb2467406472eb151
 EBUILD libaom-3.7.1.ebuild 4424 BLAKE2B 27cd85e96fb5f742e2e5e2d2c357dc6933078f3e081c07759408a0fb2e57bd03d2a5976f7e872d0b6ae575c19c844346443b5e0ca659f689d2417a099c6d60b4 SHA512 2fafb54f79b1547b99d9226e80c08cb86ae65fc923b6f9ac46e398f86c89c89386becaafde8dd2d55c964446252c035cafa00c0827c0fb5a1810dc91330fa63c
+EBUILD libaom-3.8.0-r1.ebuild 4674 BLAKE2B 91313c4b6dc82e2473f46dc672f92dfb6a8ecd4628b155b6c8e82cc76e9f5599ae8230205933a7bf29b1ae3a44eb11dad7ca401d1293c6d902f3d255d88e1c93 SHA512 2e71635cdb31012b0ddc84e2a8373f0bcc6926c930dc8329ad3ca193da8273219b1d9ab6ec32d3b1f54e6faac37a9e7bcb98de78b6d4cf620d57dae8165163d6
 EBUILD libaom-3.8.0.ebuild 4488 BLAKE2B 19eb7ed010ecd5ad0470700111a8625cc61a5fd0ddfaae587ab120daeb1aafb116732a09c96c2089d40827bd358fa815e71facbb8b22f25862c403143d1d5999 SHA512 67f03711966f111421e0022e7d800d550e69d492d7dedced36fc2385893e5c7ce2b29a141bfcf7e0ff23682ce81e2e9fb7ba526cbea2bbff8d3ebff59c81e592
-EBUILD libaom-9999.ebuild 4488 BLAKE2B 19eb7ed010ecd5ad0470700111a8625cc61a5fd0ddfaae587ab120daeb1aafb116732a09c96c2089d40827bd358fa815e71facbb8b22f25862c403143d1d5999 SHA512 67f03711966f111421e0022e7d800d550e69d492d7dedced36fc2385893e5c7ce2b29a141bfcf7e0ff23682ce81e2e9fb7ba526cbea2bbff8d3ebff59c81e592
+EBUILD libaom-3.8.1.ebuild 5044 BLAKE2B 3dae69c761955553fb028649655a5e11be43cf0d04d78646e5f2edc7f5fa8cf657e992eede7453d43494826c63744984059fee35ebcad87b48f381793680cc01 SHA512 88032345724411d6cf0761052a8f2d46e62e255736dc3740d5ca367b0bdeabe5296b79763f7c6672a0c2f92975158bdaf3fb0365e2e30c4afa042e70eed66679
+EBUILD libaom-9999.ebuild 5044 BLAKE2B 3dae69c761955553fb028649655a5e11be43cf0d04d78646e5f2edc7f5fa8cf657e992eede7453d43494826c63744984059fee35ebcad87b48f381793680cc01 SHA512 88032345724411d6cf0761052a8f2d46e62e255736dc3740d5ca367b0bdeabe5296b79763f7c6672a0c2f92975158bdaf3fb0365e2e30c4afa042e70eed66679
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/files/libaom-3.8.1-tests-parallel.patch b/media-libs/libaom/files/libaom-3.8.1-tests-parallel.patch
new file mode 100644
index 000000000000..8c090764681c
--- /dev/null
+++ b/media-libs/libaom/files/libaom-3.8.1-tests-parallel.patch
@@ -0,0 +1,21 @@
+--- a/test/test.cmake
++++ b/test/test.cmake
+@@ -573,10 +573,14 @@ function(setup_aom_test_targets)
+     if(((NOT MSVC) AND (NOT XCODE)) OR ENABLE_IDE_TEST_HOSTING)
+ 
+       # Pick a reasonable number of targets (this controls parallelization).
+-      processorcount(num_test_targets)
+-      if(num_test_targets EQUAL 0) # Just default to 10 targets when there's no
+-                                   # processor count available.
+-        set(num_test_targets 10)
++      if(DEFINED ENV{LIBAOM_TEST_PROCS})
++          set(num_test_targets $ENV{LIBAOM_TEST_PROCS})
++      else()
++          processorcount(num_test_targets)
++          if(num_test_targets EQUAL 0) # Just default to 10 targets when there's no
++                                       # processor count available.
++          set(num_test_targets 10)
++          endif()
+       endif()
+ 
+       math(EXPR max_shard_index "${num_test_targets} - 1")
diff --git a/media-libs/libaom/libaom-3.8.0-r1.ebuild b/media-libs/libaom/libaom-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..19cc803b77f6
--- /dev/null
+++ b/media-libs/libaom/libaom-3.8.0-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake-multilib flag-o-matic 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 debug 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-text/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() {
+	# Follow upstream recommendations in README (bug #921438) and avoid
+	# asserts during common use (bug #914614).
+	append-cppflags $(usex debug '-UNDEBUG' '-DNDEBUG')
+
+	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-3.8.1.ebuild b/media-libs/libaom/libaom-3.8.1.ebuild
new file mode 100644
index 000000000000..9ea4cca0ff7e
--- /dev/null
+++ b/media-libs/libaom/libaom-3.8.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake-multilib flag-o-matic multiprocessing 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 debug 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-text/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
+	"${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch
+)
+
+multilib_src_configure() {
+	# Follow upstream recommendations in README (bug #921438) and avoid
+	# asserts during common use (bug #914614).
+	append-cppflags $(usex debug '-UNDEBUG' '-DNDEBUG')
+
+	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
+
+	# LIBAOM_TEST_PROCS is added by our tests-parallel.patch
+	export LIBAOM_TEST_PROCS="$(makeopts_jobs)"
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	einfo "Running quiet tests which take hours."
+	# We use ninja rather than test_libaom directly so we can run it in parallel
+	# with sharding, see https://aomedia.googlesource.com/aom/#sharded-testing.
+	LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" eninja -C "${BUILD_DIR}" runtests
+}
+
+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 9316ed29f90d..9ea4cca0ff7e 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib python-any-r1
+inherit cmake-multilib flag-o-matic multiprocessing python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -33,7 +33,7 @@ HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
 
 LICENSE="BSD-2"
 SLOT="0/3"
-IUSE="big-endian doc +examples test"
+IUSE="big-endian debug 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"
@@ -58,9 +58,14 @@ DOCS=( PATENTS )
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
 	"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
+	"${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch
 )
 
 multilib_src_configure() {
+	# Follow upstream recommendations in README (bug #921438) and avoid
+	# asserts during common use (bug #914614).
+	append-cppflags $(usex debug '-UNDEBUG' '-DNDEBUG')
+
 	local mycmakeargs=(
 		-DENABLE_CCACHE=OFF
 		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
@@ -124,11 +129,17 @@ multilib_src_configure() {
 		)
 	fi
 
+	# LIBAOM_TEST_PROCS is added by our tests-parallel.patch
+	export LIBAOM_TEST_PROCS="$(makeopts_jobs)"
+
 	cmake_src_configure
 }
 
 multilib_src_test() {
-	LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" "${BUILD_DIR}"/test_libaom || die
+	einfo "Running quiet tests which take hours."
+	# We use ninja rather than test_libaom directly so we can run it in parallel
+	# with sharding, see https://aomedia.googlesource.com/aom/#sharded-testing.
+	LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" eninja -C "${BUILD_DIR}" runtests
 }
 
 multilib_src_install() {
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index ee2939e038a2..012628740ab5 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,13 +1,11 @@
 AUX libjpeg-turbo-3.0.0-tests.patch 4077 BLAKE2B 437adbca7b2689508fbe8e025a1d30b706984e082167c855164bcb250829b9231a29df2117db0cb006f86e9ca9e29ece85707e2047f60483da40ef58c6d7d026 SHA512 c17c81ab4130bcb193ecc0754d00916d53ce6be9cdf6f04f6457c125951263c3a085d2baf440ec988feaf5fc45b593db59def096b3f988e9b704690394e2923e
-DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c SHA512 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d
-DIST libjpeg-turbo-2.1.4.tar.gz 2261822 BLAKE2B 80ffd77d58a37eae0bdc1868d994f34ea52c13e2624c720b1d0b6ec4d6d14b16911163ccd4009c8d6eda214f31e1fff78bb7eb4739ae6589d0fd8c7008c0e972 SHA512 511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70
 DIST libjpeg-turbo-2.1.5.1.tar.gz 2264936 BLAKE2B 9583a0a91e45347d651de6bf5192a23bfe4e64cef67cdbb18f5b578b424fc46fc114e5649e93a467906cf047948e43a11b6d17b48c47f879c51cff1a4ef356ff SHA512 86a7248d064043b26b09755633ef4872a2a6133c9e677a9fe4be6645b2e0fde102cf01e09119967b3b6b85f4cb93f3f7c49ec4973944d5eff99b5b90ce8b0be6
 DIST libjpeg-turbo-3.0.0.tar.gz 2799663 BLAKE2B 9a4b74aad81c2999ab7f3cd7d8695e1132edda141f4cc8a57e671f42cad4ac16b66b0f19cf4b874b61a82c008287ad88cd81d85547c195ed30456e29cb505285 SHA512 2307a2e240faf5b3119cdc5cf6a0255813d74591d4a4201fd2374940683cb9de90cb5926367e633f3624b27edd292209c7cd3c38d64522716e83fc81361289b4
 DIST libjpeg-turbo-3.0.1.tar.gz 2800900 BLAKE2B 9d2c784edd6493c4d9e2379fc4a8f0844e440d7afe774b231f611034d481dcf1be35979fb7d731a5a8f99000780f1343b7934a59df22c1dcaef295b6294ea494 SHA512 26a2c821a023579e82a7c2a00582747f5f24089aa0820ba304f1ff71c6894b7a6bd0468acc5ff90e2655e0a1c23a5a35a779df51f5cfa3e9eba527c709fab55b
+DIST libjpeg-turbo-3.0.2.tar.gz 2831164 BLAKE2B b6eff81657707852ee9ea81099179c6e20914f513fd32b12b1bfbf5233f850f54a1062a98150044aa34476f0c54e42a67c88633a59834a764d3f8bb394f374f0 SHA512 f5eadda0712feb810a8c3bb2621fda24a4c30574998ce30f423b3ffa25225c7a87cb14b696232bc0270485f422a2853a5c32eafb65bc5eeab1b41d8aeb32ad29
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
-EBUILD libjpeg-turbo-2.1.3.ebuild 3136 BLAKE2B 7fa89be134ff2be2dc768740245cb196678f119116dcd92561963778555f6300cb2228e6b21cfcee659d598733faf5b4e55c4c27925f6ea45e1ec71b98a64b9d SHA512 08792c3741f7463e8318211cced5399d607bfb394a66e606e6053d2e3892ae9f30dd0bfbabc8c60c4bdfe5e6370586b94e91d98383ebb22dc0ca5154f9187f1e
-EBUILD libjpeg-turbo-2.1.4.ebuild 3120 BLAKE2B e3d070e19bbe3e2bd308ddd062e3a4a96d627655e5602579b34090cce05706bd699e343e91e5ffeb2bdc4eed3c43d6eaa10890601fa3a23694e8f593f2eb088e SHA512 b607bf5308c23b64d9fbd77d9015227d7b58a228a0e3d9a40353ba061582a8284c3430873a9282417a360f9e55acdfd8af50b56596b9394739d5120441614b5d
 EBUILD libjpeg-turbo-2.1.5.1.ebuild 3136 BLAKE2B 3eddebb52183591f3d5f15d6bc2bc28cf090d91c265efc4a214e41d0f6af771fe9a15ca2c773052c3de5926a9b1b6a31ccafec678a1201b6fcabf91df0f68f02 SHA512 61ed92cbde855620a86b0894d2bbd3921c87056cd9c258e7f3c1754044d3e1457a26f71a12792702c2d9c27b5faae3130e580b48c65ce1d0f9914b368ab979fd
 EBUILD libjpeg-turbo-3.0.0.ebuild 3169 BLAKE2B 2587d49f88bf2d2ab7cd717863d5911877f4a4e5ddb3c28b7e5016e32d874fd8d004eb03ce05d5762addbc0b0e622b0ec0cfe97f9c21b9aa0a39a5a284c2f8b9 SHA512 39054961507d7c7bf6c35744d061e515d3b5aeeffab7ed14052433627b653bfb93b83ad8189b6601d661e4bdb32c79ff32d0c92bebbcf5ab9372c8a7a226f64a
 EBUILD libjpeg-turbo-3.0.1.ebuild 3128 BLAKE2B be6b7269d96feef188abb9a2cbe0319deda1a576210beb8e8b48ede1da70986bf3252ecf0f311e83f96700b269260942059a89f54a30b2ceb3b58c31e9d83f76 SHA512 cfbe0c5d2cb8e5111825c76961b6857dceb94bf501f455b73b695306375ed403587bcdffd39a45d8e9e1cc9099a42192d8826d31a38103bfe5e6c46c7b84f827
+EBUILD libjpeg-turbo-3.0.2.ebuild 3212 BLAKE2B 6b2f3f58c4f7dd0e87808f7a28bacabd1a39c7971a7238f0d32762f6d310d99cc4203de0f29d68ce679da31e1587431fcacecace023d4400192f331cc4476dcb SHA512 cd6dbb415ef13c0cd342f15f300b937941b993d33a2231b5022dfe443a3ad7b8e421c67b5db79691027b5182b753acae64f29f81b361ebe8f58bad4b5bd06a8d
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
deleted file mode 100644
index e708ac1f5770..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib java-pkg-opt-2
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG ZLIB"
-SLOT="0/0.2"
-if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-IUSE="cpu_flags_arm_neon java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-
-COMMON_DEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-
-BDEPEND=">=dev-build/cmake-3.16.5
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:*[-headless-awt] )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
-	local FILE
-	ln -snf ../debian/extra/*.c . || die
-
-	for FILE in ../debian/extra/*.c; do
-		FILE=${FILE##*/}
-		cat >> CMakeLists.txt <<EOF || die
-add_executable(${FILE%.c} ${FILE})
-install(TARGETS ${FILE%.c})
-EOF
-	done
-
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && use java ; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DWITH_JAVA="$(multilib_native_usex java)"
-		-DWITH_MEM_SRCDST=ON
-	)
-
-	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810
-	if use arm || use arm64; then
-		mycmakeargs+=(
-			-DWITH_SIMD=$(usex cpu_flags_arm_neon)
-			-DNEON_INTRINSICS=$(usex cpu_flags_arm_neon)
-		)
-	fi
-
-	# We should tell the test suite which floating-point flavor we are
-	# expecting: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/597
-	# For now, mark loong as fp-contract.
-	if use loong; then
-		mycmakeargs+=(
-			-DFLOATTEST=fp-contract
-		)
-	fi
-
-	# mostly for Prefix, ensure that we use our yasm if installed and
-	# not pick up host-provided nasm
-	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
-		mycmakeargs+=(
-			-DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	if multilib_is_native_abi && use java ; then
-		rm -rf "${ED}"/usr/classes || die
-		java-pkg_dojar java/turbojpeg.jar
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	local -a DOCS=( README.md ChangeLog.md )
-	einstalldocs
-
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-	dobin "${WORKDIR}"/debian/extra/exifautotran
-	doman "${WORKDIR}"/debian/extra/*.[0-9]*
-
-	docinto html
-	dodoc -r "${S}"/doc/html/.
-
-	if use java; then
-		docinto html/java
-		dodoc -r "${S}"/java/doc/.
-		newdoc "${S}"/java/README README.java
-	fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.2.ebuild
index 4242ea996790..8a6082694031 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.4.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,14 +6,16 @@ EAPI=8
 inherit cmake-multilib java-pkg-opt-2
 
 DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+HOMEPAGE="https://libjpeg-turbo.org/ https://github.com/libjpeg-turbo/libjpeg-turbo"
+SRC_URI="
+	https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/${PV}/${P}.tar.gz
+	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
+"
 
-LICENSE="BSD IJG ZLIB"
+LICENSE="BSD IJG ZLIB java? ( GPL-2-with-classpath-exception )"
 SLOT="0/0.2"
 if [[ $(ver_cut 3) -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="cpu_flags_arm_neon java static-libs"
 
@@ -46,10 +48,10 @@ src_prepare() {
 
 	for FILE in ../debian/extra/*.c; do
 		FILE=${FILE##*/}
-		cat >> CMakeLists.txt <<EOF || die
-add_executable(${FILE%.c} ${FILE})
-install(TARGETS ${FILE%.c})
-EOF
+		cat >> CMakeLists.txt <<-EOF || die
+		add_executable(${FILE%.c} ${FILE})
+		install(TARGETS ${FILE%.c})
+		EOF
 	done
 
 	cmake_src_prepare
@@ -66,7 +68,6 @@ multilib_src_configure() {
 		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DENABLE_STATIC="$(usex static-libs)"
 		-DWITH_JAVA="$(multilib_native_usex java)"
-		-DWITH_MEM_SRCDST=ON
 	)
 
 	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON, bug #792810
@@ -86,7 +87,7 @@ multilib_src_configure() {
 		)
 	fi
 
-	# mostly for Prefix, ensure that we use our yasm if installed and
+	# Mostly for Prefix, ensure that we use our yasm if installed and
 	# not pick up host-provided nasm
 	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
 		mycmakeargs+=(
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 319673641cae..de7acbd41716 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -7,9 +7,11 @@ AUX pulseaudio-16.1-smoother-time-calculation.patch 1354 BLAKE2B 2fc644c66a0329a
 AUX pulseaudio-16.99.1-memfd-compat.patch 971 BLAKE2B 6228f8b01cd8799221d5e121a8c1bc2f3635acebf2c75f1538abf88f2f717da93c3d90ebee038a5fb3bfe8d015c6d3a4f5d6e20026eb44b889fde3d45f6c6769 SHA512 498f86291cb5837494a6b698ea7590ae778edf58ca9b82d58b2d93e30f5e424b93f3ecf8a0a203817eba7bcea7702bf3f1a6cdd346b02088f1748cd1231787bf
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
 DIST pulseaudio-16.99.1.tar.xz 1565020 BLAKE2B 02aad918e2b76dcf250bd55e03460206c7781cd1b43aa2efe46b25258626892e07f478b9966fa5027c9ae0a370145f5204dba05d2f5dfbfd3ba956225ccb3cad SHA512 1a3347e4c892ba0e321d39184f8bd52cfd16f59e66e52a753d6f706dfbf3f170f87b7ff27c0a6cdf3e462e6dd531ecde6829d48a374d0be2622688fb85abaac2
+DIST pulseaudio-17.0.tar.xz 1566556 BLAKE2B 781ece3d507916aa681d3b0132689730a621b4d92e45f86570e4d2fdebc4c0025ebe7f7a05046545f9b26caca513e8975f12498fa314524bc67eacaea72842fa SHA512 be0aec46204d9c9188a796fbe41b4cf6f0f5e6b16fa08ce359b8f0f51253f0ade364b89448bbf5faa2af7e59deb6c72194734c3233944250dcfd4f31968a5e97
 EBUILD libpulse-16.1-r2.ebuild 5882 BLAKE2B 82a1b54af068c843e675d0c1e1caae6b658aed9ba84cf47813a404509eabcd10fa76cc571c3c8f1a47849b0afacb5e77bf6f8302efa1b251ab390471b0a17906 SHA512 d5ea7bdc3720b275ddc637f7ed5e60da10386cfb92bc124369d24a35cf334a0da3784cc7cd9ae6c5792bca1d2c0f83bdf4afa642cb0b88aa8c5c48410f8439cb
 EBUILD libpulse-16.1-r4.ebuild 6469 BLAKE2B 2b1be94822fb82f06d6bbc5c4dc3a5031444f66a9ee9b1dc19a427f672e84d156bcdc547aec7384eaab35d3206b63919608399cf70ccd34e918084ccc4abea41 SHA512 a4442c8c838a8d8c3a13a25dd7765c0299d8952b5af56b5c46ebd9c0589e157925ec85c63ba509dc2ab4fad488329949de76fa300eb7cf78562ad5a9e71d670a
 EBUILD libpulse-16.1-r5.ebuild 6252 BLAKE2B 7aa539bc2db1ce828946a4ce92c3420ebd7b8ad4caa17e2364c878b9822473986f44ca5dfedd6d62b98ab780ab3085d26ddca99df53c464f09f04cb2f875f9f2 SHA512 9d99f50cc467148b05ccf0ae8566209be71ad5fd8d841cd67adb600cfb21131e55ae42cf80570c5514ea50b1929481986c9313fb43d4a7a7b9a82965162f27e5
 EBUILD libpulse-16.99.1-r1.ebuild 5939 BLAKE2B 6015e5cdd36382c088b5ec3494ce10d4a00225bea7352a27dd91b6239ff6480405fda646fca640b9106da9eb56c2989bc5ea496fbaaa1ce086a244629250b64d SHA512 7f7ee2fda432abf2c9734fb9896d9122f1e1dc68eb8dbe8b48b61a1aa81592bc4194e68bf21af1874ec53d28a7ee8c9abd804ba43988c766fce0e17fec729a03
 EBUILD libpulse-16.99.1.ebuild 6154 BLAKE2B d5d29a6ce1dbf7173c93454802402196385a56f348ef8be546588463471d36fb8b2f1d4d3822e2f56514992b31cde6473bceacfe3466b3bf504ee3964e039948 SHA512 88bb80a292fdf2fa84517619fbefe694b46b7cdcea101f5ca886bb78003f50ee5cc3d2c0849ece158490e5da99781430b6405f336ea734811f8dff42d2ca2bd3
+EBUILD libpulse-17.0.ebuild 5847 BLAKE2B b01ed3fc58bc13dd2f274433bd9024ab0df63a80e4de3ec51c7297c35d5b7220098ebf6de83442da3a3c909cc3ad5d3421fbc6a02a3ef6f6ed548f47994d8a7c SHA512 81670f1205477e3be8e1a1a37eb2af0c777e9a3840eab0c701cbaebfcdeadd7a98ad61dd34fae4a416d8e3e10c26b8522bffec18a1fddb5a228520aa53fbcd9b
 MISC metadata.xml 961 BLAKE2B 0aea6824645ccb54d4da477c5f65728abe5100176c5bb05f30c30704b0209f83dccda23380de7231a5fc0a5ffb31650c96d024b4d0511ced9806fc5652f51f9f SHA512 408206d9da60312898a87c2b400292178bd20b57b7a17b74e768c154ec3fc95f9ec9412ba497a03b32558e8ffaa21e8a50b0478c8908930f90ecd9b6aa81548e
diff --git a/media-libs/libpulse/libpulse-17.0.ebuild b/media-libs/libpulse/libpulse-17.0.ebuild
new file mode 100644
index 000000000000..8c0d652e0a6f
--- /dev/null
+++ b/media-libs/libpulse/libpulse-17.0.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="pulseaudio-${MY_PV}"
+inherit bash-completion-r1 flag-o-matic gnome2-utils meson-multilib optfeature systemd udev
+
+DESCRIPTION="Libraries for PulseAudio clients"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
+else
+	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1+"
+
+SLOT="0"
+IUSE="+asyncns dbus doc +glib gtk selinux systemd test valgrind X"
+RESTRICT="!test? ( test )"
+
+# NOTE: libpcre needed in some cases, bug #472228
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+RDEPEND="
+	dev-libs/libatomic_ops
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
+	elibc_mingw? ( dev-libs/libpcre:3 )
+	glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	selinux? ( sec-policy/selinux-pulseaudio )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-debug/valgrind )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+	)
+	!<media-sound/pulseaudio-16.1
+	!<media-sound/pulseaudio-daemon-16.99.1
+"
+
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )
+	X? ( x11-base/xorg-proto )
+"
+
+# pulseaudio ships a bundled xmltoman, which uses XML::Parser
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	sys-devel/m4
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+PDEPEND="
+	|| (
+		media-video/pipewire[sound-server(+)]
+		media-sound/pulseaudio-daemon
+	)
+"
+
+DOCS=( NEWS README )
+
+# patches merged upstream, to be removed with 17.1 or later bump
+PATCHES=(
+)
+
+src_prepare() {
+	default
+
+	# disable autospawn by client
+	sed -i -e 's:; autospawn = yes:autospawn = no:g' src/pulse/client.conf.in || die
+
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		-Ddaemon=false
+		-Dclient=true
+		$(meson_native_use_bool doc doxygen)
+		-Dgcov=false
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_native_use_bool test tests)
+		-Ddatabase=simple # Not used for non-daemon, simple database avoids external dep checks
+		-Dstream-restore-clear-old-devices=true
+		-Drunning-from-build-tree=false
+
+		# Paths
+		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
+		-Dsystemduserunitdir=$(systemd_get_userunitdir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+
+		# Optional features
+		-Dalsa=disabled
+		$(meson_feature asyncns)
+		-Davahi=disabled
+		-Dbluez5=disabled
+		-Dbluez5-gstreamer=disabled
+		-Dbluez5-native-headset=false
+		-Dbluez5-ofono-headset=false
+		$(meson_feature dbus)
+		-Delogind=disabled
+		-Dfftw=disabled
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		-Dgsettings=disabled
+		-Dgstreamer=disabled
+		$(meson_native_use_feature gtk)
+		-Dhal-compat=false
+		-Dipv6=true
+		-Djack=disabled
+		-Dlirc=disabled
+		-Dopenssl=disabled
+		-Dorc=disabled
+		-Doss-output=disabled
+		-Dsamplerate=disabled # Matches upstream
+		-Dsoxr=disabled
+		-Dspeex=disabled
+		$(meson_native_use_feature systemd)
+		-Dtcpwrap=disabled
+		-Dudev=disabled
+		$(meson_native_use_feature valgrind)
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false
+		-Dwebrtc-aec=disabled
+	)
+
+	if multilib_is_native_abi; then
+		# Make padsp work for non-native ABI, supposedly only possible with glibc;
+		# this is used by /usr/bin/padsp that comes from native build, thus we need
+		# this argument for native build
+		if use elibc_glibc; then
+			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
+		fi
+	else
+		emesonargs+=( -Dman=false )
+		if ! use elibc_glibc; then
+			# Non-glibc multilib is probably non-existent but just in case:
+			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
+		fi
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+
+	if multilib_is_native_abi; then
+		if use doc; then
+			einfo "Generating documentation ..."
+			meson_src_compile doxygen
+		fi
+	fi
+}
+
+multilib_src_install() {
+	# The files referenced in the DOCS array do not exist in the multilib source directory,
+	# therefore clear the variable when calling the function that will access it.
+	DOCS= meson_src_install
+
+	# Upstream installs 'pactl' if client is built, with all symlinks except for
+	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
+	# This trips QA warning, workaround:
+	# - install missing aliases in media-libs/libpulse (client build)
+	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
+	bashcomp_alias pactl pulseaudio
+	bashcomp_alias pactl pacmd
+	bashcomp_alias pactl pasuspender
+
+	if multilib_is_native_abi; then
+		if use doc; then
+			einfo "Installing documentation ..."
+			docinto html
+			dodoc -r doxygen/html/.
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	optfeature_header "PulseAudio can be enhanced by installing the following:"
+	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6601f222b46c..16dfa2019c2a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -10,6 +10,6 @@ EBUILD mesa-23.3.1.ebuild 12405 BLAKE2B 5de3b3e3351eace4405a8279aec2959848b733ac
 EBUILD mesa-23.3.3.ebuild 12449 BLAKE2B 7ba9ccd4a2006cbaff89b5179cfa8ff03ca2947948d78164b7c56065e11ddf364b5811503b04ad294a0673662643e45f974d73ba2127640ce255d5af6aef1faa SHA512 eb15ad6e7d9a606e642460f8d5171a161f3650dea984ac3321089e5efe71a60ab5b8e2828229ec627377e9abae194ff691e8f83c18cacf3d3a53a3cecd9b581d
 EBUILD mesa-23.3.4.ebuild 12331 BLAKE2B cc6bec787020cbda9333823a94aeead4c0390492e4e10485e7bc823735a1e37098066b55f607c9688959936ac81337b2b5a8b1fafd3bb4bb73ccbb1c4b6af8f9 SHA512 71855871d00f4b07c7ccbf1f01d2ee1df3c49efff17460669da7d057ce7af62d761f815e6873a3d8a55859f0125c66e488be74d0d56f712fe4e1ab12f795e621
 EBUILD mesa-23.3.5.ebuild 12331 BLAKE2B cc6bec787020cbda9333823a94aeead4c0390492e4e10485e7bc823735a1e37098066b55f607c9688959936ac81337b2b5a8b1fafd3bb4bb73ccbb1c4b6af8f9 SHA512 71855871d00f4b07c7ccbf1f01d2ee1df3c49efff17460669da7d057ce7af62d761f815e6873a3d8a55859f0125c66e488be74d0d56f712fe4e1ab12f795e621
-EBUILD mesa-24.0.0.ebuild 12497 BLAKE2B 2a9210b4b78e39b2e457224aabf0ec2e0927aa62b6caf7bfea24ad18d3cadb03bc54920cc2febd7d06aaf0d3a21354b9d8e140d2c3261e23dafa5b8945f0510d SHA512 9cdb514d7da249c4fd4e8c53bac58d5a43d51b613be36e9e8d06e84e8128ec5bb0707fc25a013f2a03057a3fbb1fe04cd4fdee37de6e976dc7a270da66c81c39
-EBUILD mesa-9999.ebuild 12497 BLAKE2B 2a9210b4b78e39b2e457224aabf0ec2e0927aa62b6caf7bfea24ad18d3cadb03bc54920cc2febd7d06aaf0d3a21354b9d8e140d2c3261e23dafa5b8945f0510d SHA512 9cdb514d7da249c4fd4e8c53bac58d5a43d51b613be36e9e8d06e84e8128ec5bb0707fc25a013f2a03057a3fbb1fe04cd4fdee37de6e976dc7a270da66c81c39
+EBUILD mesa-24.0.0.ebuild 12450 BLAKE2B c6a2343a417cd730f1f5784d8c4f38500f5a96e5b78b94ae05733d3bc45b1e458a0e1ba8cec4c8d60dd65d6ad215cdc0e4b8051317e39ef56effcc99801f87ba SHA512 1cb89e320386bacd28f66050afffadb01508b5cc6c348fbe6b52abf44f726cc75075c06a0bc10a248dea2a726cf72d37d6ffc9c7f59235a08d45ef65a9a850d4
+EBUILD mesa-9999.ebuild 12450 BLAKE2B c6a2343a417cd730f1f5784d8c4f38500f5a96e5b78b94ae05733d3bc45b1e458a0e1ba8cec4c8d60dd65d6ad215cdc0e4b8051317e39ef56effcc99801f87ba SHA512 1cb89e320386bacd28f66050afffadb01508b5cc6c348fbe6b52abf44f726cc75075c06a0bc10a248dea2a726cf72d37d6ffc9c7f59235a08d45ef65a9a850d4
 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
diff --git a/media-libs/mesa/mesa-24.0.0.ebuild b/media-libs/mesa/mesa-24.0.0.ebuild
index 28a5b5573daa..7d7f3b5ed165 100644
--- a/media-libs/mesa/mesa-24.0.0.ebuild
+++ b/media-libs/mesa/mesa-24.0.0.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 RESTRICT="!test? ( test )"
 
 RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel swrast lima nouveau panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau panfrost v3d vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -47,9 +47,8 @@ REQUIRED_USE="
 			video_cards_vmware
 		)
 	)
-	osmesa? ( video_cards_swrast )
 	vulkan-overlay? ( vulkan )
-	video_cards_swrast? ( vulkan? ( llvm ) )
+	video_cards_lavapipe? ( llvm vulkan )
 	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
 	vdpau? ( X )
@@ -341,7 +340,7 @@ multilib_src_configure() {
 		gallium_enable -- kmsro
 	fi
 
-	gallium_enable video_cards_swrast swrast
+	gallium_enable -- swrast
 	gallium_enable video_cards_freedreno freedreno
 	gallium_enable video_cards_intel crocus i915 iris
 	gallium_enable video_cards_lima lima
@@ -373,7 +372,7 @@ multilib_src_configure() {
 	fi
 
 	if use vulkan; then
-		vulkan_enable video_cards_swrast swrast
+		vulkan_enable video_cards_lavapipe swrast
 		vulkan_enable video_cards_freedreno freedreno
 		vulkan_enable video_cards_intel intel intel_hasvk
 		vulkan_enable video_cards_d3d12 microsoft-experimental
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 28a5b5573daa..7d7f3b5ed165 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 RESTRICT="!test? ( test )"
 
 RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel swrast lima nouveau panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau panfrost v3d vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -47,9 +47,8 @@ REQUIRED_USE="
 			video_cards_vmware
 		)
 	)
-	osmesa? ( video_cards_swrast )
 	vulkan-overlay? ( vulkan )
-	video_cards_swrast? ( vulkan? ( llvm ) )
+	video_cards_lavapipe? ( llvm vulkan )
 	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
 	vdpau? ( X )
@@ -341,7 +340,7 @@ multilib_src_configure() {
 		gallium_enable -- kmsro
 	fi
 
-	gallium_enable video_cards_swrast swrast
+	gallium_enable -- swrast
 	gallium_enable video_cards_freedreno freedreno
 	gallium_enable video_cards_intel crocus i915 iris
 	gallium_enable video_cards_lima lima
@@ -373,7 +372,7 @@ multilib_src_configure() {
 	fi
 
 	if use vulkan; then
-		vulkan_enable video_cards_swrast swrast
+		vulkan_enable video_cards_lavapipe swrast
 		vulkan_enable video_cards_freedreno freedreno
 		vulkan_enable video_cards_intel intel intel_hasvk
 		vulkan_enable video_cards_d3d12 microsoft-experimental
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 4e6d1b13f051..7b70b6df5eb1 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -6,5 +6,5 @@ DIST gmp-api-Firefox114_2-e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7.tar.gz 10915
 DIST openh264-2.3.1.tar.gz 60290897 BLAKE2B b4480150cfe7c44b89c7b294698db06f93d96f5f9f3ef4345108c4e360e99bc6133407cead54e720e6e74aa17ab9f2e4342287a42f19463a54eb44c9d3141c80 SHA512 fd59c767794cdfb934d692d5929e4500d78606cbf1e403bc7c7dce048cc07e40daa0794357adb856d29479427a53460c76338e156b6bbeaa36139afcd603c8e1
 DIST openh264-2.4.0.tar.gz 60297968 BLAKE2B d725896979e8178277e304ac0d94e59f0971a7f0f443f6dee0abffbadc53cce8ba7fe6612a966c697296bf46c3035bd03ac9a65e63d6d87853317b178b06a236 SHA512 dc66986e84ad328e1615384e7bff93d6eaac42a68e87d9c9b59f55d9f90efd13dc87637a7e3b8c9694634dfa82351c5944828f3f478286608e362e014dd70ca1
 EBUILD openh264-2.3.1-r3.ebuild 3949 BLAKE2B 68b79ae51de85dc5c4c19fe2f1d5460ce8d0a076e3201d68cafbe0155d9c2d49f127919e30b1d16ce6dc8b0b2359bcdbf8d586c42c95cef2b77afc072fb4f91b SHA512 50aec0bab131871d007a1915c5305b76ea3e1c1f91741ab3596d05a6ac8b0269e57243e4b0ed2a56464c5ddce8a95916a4f8035a1bf5440c4dab75ea09e404fb
-EBUILD openh264-2.4.0-r1.ebuild 4080 BLAKE2B b140349a73c9e1ced397a36b2ffdc5c2461ae2b17c8d2666c40877574b024e65d8a7a8ea8528ebe45a3f749b71f5a95e9a82db6e662ffcdf8888abcc8208c615 SHA512 bd6bdf419ab3c7a700bdb4d4fdda7a0568baa09ba7c3adcb17197501f92e1fdf60e8257412d124c35f9ae2902eda70fedb411639f7cdb37e6d6bde92ae4e137d
+EBUILD openh264-2.4.0-r1.ebuild 4075 BLAKE2B 13b56a985102aa4ae61278ec4105fa7f41898b4e69a617b569aa3b6217bc9f6db0da1ed2c199cd3e34892ce9f51d9ab4dcc4daeb57b54cff7f322f6b5a67ee6f SHA512 09d887692e0434fc324b8b76db18e2d7f3ee225d31ed757f188f4192863af7913a7e2884d3360fce636445f832e111e69705369d62efd9ea665b578218a72987
 MISC metadata.xml 627 BLAKE2B aa6bcd394a1b792f8d0fc89030f34df7f0366f049f52ee11a90af301ca901a07acfc1d34a0d6d237a7d713db53b707b3b9f08d3c86574d6067f6ff7e8cf99c3a SHA512 55a7a5ee5f716e9eb1e5711d45a93fe27f057b54240511de72ade7f88c53eeac72f1bf1b524d22278c0fafbea70e1b5892262ee1b97370d70a0258bad7220e30
diff --git a/media-libs/openh264/openh264-2.4.0-r1.ebuild b/media-libs/openh264/openh264-2.4.0-r1.ebuild
index e0acfe3b4b15..5824fdfe525a 100644
--- a/media-libs/openh264/openh264-2.4.0-r1.ebuild
+++ b/media-libs/openh264/openh264-2.4.0-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
 #  https://github.com/cisco/openh264/issues/3459 )
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc64 ~riscv ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin test utils"
 
 RESTRICT="bindist !test? ( test )"