gentoo auto-resync : 20:07:2024 - 12:29:37

19 files changed, 565 insertions, 267 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3bb998b3f252..e4865ef23156 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/faun/Manifest b/media-libs/faun/Manifest
new file mode 100644
index 000000000000..b3c03b42735f
--- /dev/null
+++ b/media-libs/faun/Manifest
@@ -0,0 +1,4 @@
+AUX faun-0.1.2_makefile.patch 2362 BLAKE2B caeaeafeafb42508cc276de36142a59b7a5106b0592012f8811ef54d1b06a94555f6a4ce7e0713f5d6ec80c89b8ac22f5bd8cd7e3256ccc5d18815a6a161bd9e SHA512 1c3407800aff5ebf3706c23b72f17c8e448f2a75cb2feb76cf9d91b9c6edca1ab9b70193154fe0b67fffbfc0d4c8141cbfb8824d152f3b95270c1250c209f286
+DIST faun-0.1.2.tar.gz 107751 BLAKE2B 5c8655aad59dfb8292f098af7f90d13e25c8df0d9cf7b3d2d5a0d7c94e68389c898e8d66abb67cb93ef70a4e4d81d63aca9e60afe48afcd4e96ef7371b6611e0 SHA512 b0ec4b7fccc4f17e1f37ed87c45b41f75faa42393143313264d77a117dbc76b37f9418886f425cf06d8baeebfe1269bcdabbe16aead634177021bc50ba1c5260
+EBUILD faun-0.1.2.ebuild 723 BLAKE2B 9f810398222999017b1c20751446cea6bd9dc0e1e2a81ac7477618561e92b181bf752daab6f79385ab2e9a733ce353ea16861d2b848e01d5fc7a765d8ee8bc53 SHA512 0f4c91835c44194183cdd86ba5ccfa204d34326c7620f1cf837e1a73ce269275074c4cd13af600bd72a33e2a540e7cd517a65d0319611b26ac2ea361cb1edca4
+MISC metadata.xml 474 BLAKE2B 681b365b3146371dac7b778ee37ba9401215ab28cf98f3a01527f4496b2b215f9bf3ff12e60be6f08478a05719b7d1ee3169a7dff86948b3a7c766d6d83efc31 SHA512 511f1ee5ff692e2999da9de2d8dc1ba4a5a840635d70ffaabe2e7efb93694a995a1dad813f4d2f928d83722a86c8b175000835b907522daf698d396d64a945bb
diff --git a/media-libs/faun/faun-0.1.2.ebuild b/media-libs/faun/faun-0.1.2.ebuild
new file mode 100644
index 000000000000..a5b0eb2e7089
--- /dev/null
+++ b/media-libs/faun/faun-0.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="A high-level C audio library"
+HOMEPAGE="https://wickedsmoke.github.io/faun/"
+SRC_URI="https://github.com/WickedSmoke/faun/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# based on COPYING file
+LICENSE="MIT flac? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac"
+
+DEPEND="
+	media-libs/libpulse
+	media-libs/libvorbis
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.2_makefile.patch"
+)
+
+src_configure() {
+	tc-export CC
+	# custom configure
+	edo ./configure $(usex !flac --no_flac "")
+}
+
+src_install() {
+	emake DESTDIR="${D}/usr" install
+	dodoc README.md
+}
diff --git a/media-libs/faun/files/faun-0.1.2_makefile.patch b/media-libs/faun/files/faun-0.1.2_makefile.patch
new file mode 100644
index 000000000000..5bc22077aad2
--- /dev/null
+++ b/media-libs/faun/files/faun-0.1.2_makefile.patch
@@ -0,0 +1,79 @@
+From 7d87d5e2fc52c1d429fe99b505bf2db643c82da2 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Fri, 28 Apr 2023 14:58:02 +0300
+Subject: [PATCH] Fix buildsystem
+
+* Respect CC, CFLAGS, LDFLAGS
+* Don't strip binaries on install
+--- a/Makefile
++++ b/Makefile
+@@ -6,10 +6,13 @@ ifeq ($(STATIC),1)
+     STATIC_LIB=true
+ endif
+
+-CFLAGS=-O3 -DNDEBUG
++CC ?= cc
++PKG_CONFIG ?= pkg-config
++
++CFLAGS ?= -O3 -DNDEBUG
+ #CFLAGS=-g -DDEBUG
+
+-OPT=-DUSE_SFX_GEN
++OPT=-DUSE_SFX_GEN `$(PKG_CONFIG) --cflags libpulse-simple libpulse vorbisfile`
+ ifeq ($(FLAC),1)
+ 	OPT+=-DUSE_FLAC
+ endif
+@@ -25,7 +28,7 @@ else
+ LIB_DIR=$(DESTDIR)/lib
+ endif
+
+-DEP_LIB = -lpulse-simple -lpulse -lvorbisfile -lpthread -lm
++DEP_LIB = `$(PKG_CONFIG) --libs libpulse-simple libpulse vorbisfile` -lpthread -lm
+
+ ifdef STATIC_LIB
+ FAUN_LIB=libfaun.a
+@@ -49,10 +52,10 @@ obj:
+ 	mkdir obj
+
+ obj/tmsg.o: support/tmsg.c obj
+-	cc -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@
++	$(CC) -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@
+
+ obj/faun.o: faun.c support/wav_write.c support/wav_read.c support/flac.c support/sfx_gen.c support/well512.c support/os_thread.h support/tmsg.h support/flac.h support/sfx_gen.h support/well512.h obj
+-	cc -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@
++	$(CC) -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@
+
+ $(FAUN_LIB): obj/tmsg.o obj/faun.o
+ ifdef STATIC_LIB
+@@ -60,16 +63,16 @@ ifdef STATIC_LIB
+ 	ranlib $@
+ 	#strip -d $@
+ else
+-	cc -o $@ $^ -shared -Wl,-soname,$(FAUN_SO) $(DEP_LIB)
++	$(CC) -o $@ $^ -shared -Wl,-soname,$(FAUN_SO) $(LDFLAGS) $(DEP_LIB)
+ 	ln -sf $@ $(FAUN_SO)
+ 	ln -sf $@ libfaun.so
+ endif
+
+ faun_test: faun_test.c $(FAUN_LIB)
+-	cc -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) -o $@
++	$(CC) -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) $(LDFLAGS) -o $@
+
+ basic: example/basic.c $(FAUN_LIB)
+-	cc -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) -o $@
++	$(CC) -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) $(LDFLAGS) -o $@
+
+ install:
+ 	mkdir -p $(DESTDIR)/include $(LIB_DIR)
+@@ -77,7 +80,7 @@ install:
+ ifdef STATIC_LIB
+ 	install -m 644 $(FAUN_LIB) $(LIB_DIR)
+ else
+-	install -m 755 -s $(FAUN_LIB) $(LIB_DIR)
++	install -m 755 $(FAUN_LIB) $(LIB_DIR)
+ 	ln -s $(FAUN_LIB) $(LIB_DIR)/$(FAUN_SO)
+ 	ln -s $(FAUN_LIB) $(LIB_DIR)/libfaun.so
+ endif
+--
+2.39.2
+
diff --git a/media-libs/faun/metadata.xml b/media-libs/faun/metadata.xml
new file mode 100644
index 000000000000..a4800f6c9069
--- /dev/null
+++ b/media-libs/faun/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">WickedSmoke/faun</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/libiptcdata/Manifest b/media-libs/libiptcdata/Manifest
index 1932c0cc72b8..38be89910521 100644
--- a/media-libs/libiptcdata/Manifest
+++ b/media-libs/libiptcdata/Manifest
@@ -1,3 +1,4 @@
 DIST libiptcdata-1.0.5.tar.gz 593779 BLAKE2B 7e5226a289fed5c2f4b662efaa693a8b38e95ac34bc1365af05d1af649be876d3e5b58fecea4818255879bd7518aa482cb623540601fb3c8065acd428439a29c SHA512 64ef44b1e639890004f31d5d42844ba25ed558f0a118f1dad9bc3f4dcad2457e51b825a13df849659b0e15afc78f528f330b03be94cdf156bd95b62dc419494a
+EBUILD libiptcdata-1.0.5-r1.ebuild 1634 BLAKE2B 78ca5b5779b7f1088e7dbf7ae043ec0506547741847b199236a030f710c7f8ec1c3cace433319ebc8a415f2e0c2fb9177d537254fca9a4ccda04388d1d425c06 SHA512 4ee5399c12184c4951cd5678e84571e1f8b970a11f02880d32bf385633657ed785c51e81ff7624dd6fa7aa15be83fd9b54808a429210164df744c8f8136b6031
 EBUILD libiptcdata-1.0.5.ebuild 1160 BLAKE2B 5472a979846b09c26b910b3c335e500ade2755d66309d834794d7e8db6d60a21c79ee9847f6feab6851f5ec9728ff88b457eaa04e0deae2babb0a5736e40754a SHA512 a1fe02239489469f46a2fe34a4eb21fddd0009d1e79d38f11f1fd1f9c19378a1ec4bd052f0d44b896eaaa0e84d6f9a34d6f958af475448cdf19edb1fd95862e7
 MISC metadata.xml 948 BLAKE2B 2eb9fc81cf1795cfc57e9b89e5880a3f34b21937bc41e802ab09d3fd508ad9e9c67a6c621558e2cf56683a4641b8160a3cfac3ff6ea578ee12e7543f73e1d9e1 SHA512 8dbf6854415f937c99f88fd1c1159acbc94a40b992c8eeaf5edb855a7830d4d11ea8ae9929e2af3e3d11c8ce5c7163e723110fad5f15259d5a21b7451fbaa9ac
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.5-r1.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..53e7ef439208
--- /dev/null
+++ b/media-libs/libiptcdata/libiptcdata-1.0.5-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit autotools distutils-r1
+
+DESCRIPTION="Library for International Press Telecommunications Council (IPTC) metadata"
+HOMEPAGE="https://github.com/ianw/libiptcdata https://libiptcdata.sourceforge.net/"
+SRC_URI="https://github.com/ianw/${PN}/releases/download/release_1_0_5/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples nls python"
+
+RDEPEND="
+	nls? ( virtual/libintl )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/gtk-doc-am
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1 )
+	nls? ( >=sys-devel/gettext-0.13.1 )
+	python? (
+		${DISTUTILS_DEPS}
+		${PYTHON_DEPS}
+	)
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	default
+	eautoreconf
+	if use python; then
+		cd python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure () {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_enable python)
+		$(use_enable doc gtk-doc)
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install () {
+	default
+
+	find "${D}" -name '*.la' -delete || die "failed to remove *.la files"
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+
+	if use examples; then
+		dodoc python/README
+		dodoc -r python/examples
+	fi
+}
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 702db0b86c04..408af999e5fe 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,13 +1,9 @@
 AUX libjpeg-turbo-3.0.0-tests.patch 4077 BLAKE2B 437adbca7b2689508fbe8e025a1d30b706984e082167c855164bcb250829b9231a29df2117db0cb006f86e9ca9e29ece85707e2047f60483da40ef58c6d7d026 SHA512 c17c81ab4130bcb193ecc0754d00916d53ce6be9cdf6f04f6457c125951263c3a085d2baf440ec988feaf5fc45b593db59def096b3f988e9b704690394e2923e
 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 libjpeg-turbo-3.0.3.tar.gz 2832827 BLAKE2B 9d141dadd0dce970bf857b51352c57a8e15180438abd7d6d66f9dfd24e23889add8c6c89120b84026e40ab61611516b0567984bd1db37e9c45b41917cf32e9a6 SHA512 7c3a6660e7a54527eaa40929f5cc3d519842ffb7e961c32630ae7232b71ecaa19e89dbf5600c61038f0c5db289b607c2316fe9b6b03d482d770bcac29288d129
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-2.1.5.1.ebuild 3149 BLAKE2B 8b73e64a8f5386673bda5a5a09da56058abe71f1dde75556f56e0e4c9baf591c89a5b3e38d52491f80a7fdb6b97e911f02ca272c856724f587915783da130805 SHA512 7159ea794deadcb2a964746c41473b8ccab55e95b586caff97f2de0586e2b11aabb16dc9f111b824f6810703b826c6d3af294111aeab2c7fbff37a7837098829
 EBUILD libjpeg-turbo-3.0.0.ebuild 3182 BLAKE2B 472c575770a21a680d3c62c4575641be8ff69fcae6b13943b8fc5ae65694716c9280b3e3a9c3decbe42d2694e5be6db827a79694169397200f1d2709a9c176d2 SHA512 3ab80cca3c3f025d2b2bbef64ba2a46ec2f3ed4b7445e62278d0575084daa0bbe9c14be846b756841f035be191cc8769e5216be1a65315240f350cbd4be32383
-EBUILD libjpeg-turbo-3.0.1.ebuild 3141 BLAKE2B fd2fc17811629aa018df39323ea447164f6371aaabecb98047ea2ec02e7a743dcc375a10d2822f4d54fe7311eb4ee49e7be1cb609a47be4a23293e4f7396be52 SHA512 b7ab892ec8d249e0ae53504646b7879f1ce392888d3d60680e964dbe18ff751095fee79f0da72af4f7b77bbc64f0af881cc101d286363c86c02682dad8c1f0c3
-EBUILD libjpeg-turbo-3.0.2.ebuild 3212 BLAKE2B 6b2f3f58c4f7dd0e87808f7a28bacabd1a39c7971a7238f0d32762f6d310d99cc4203de0f29d68ce679da31e1587431fcacecace023d4400192f331cc4476dcb SHA512 cd6dbb415ef13c0cd342f15f300b937941b993d33a2231b5022dfe443a3ad7b8e421c67b5db79691027b5182b753acae64f29f81b361ebe8f58bad4b5bd06a8d
-EBUILD libjpeg-turbo-3.0.3.ebuild 3212 BLAKE2B 6b2f3f58c4f7dd0e87808f7a28bacabd1a39c7971a7238f0d32762f6d310d99cc4203de0f29d68ce679da31e1587431fcacecace023d4400192f331cc4476dcb SHA512 cd6dbb415ef13c0cd342f15f300b937941b993d33a2231b5022dfe443a3ad7b8e421c67b5db79691027b5182b753acae64f29f81b361ebe8f58bad4b5bd06a8d
+EBUILD libjpeg-turbo-3.0.3-r1.ebuild 3256 BLAKE2B 5aca25133509dcc570c9d852c8265e2fa24f18e1a0124e89e6f4d6e516aa3a993e9967768efacc7395eaa63922d89c443db389c0db2014fadd04eff42c3acc7c SHA512 a5abb5eec7cece80deb2dc48dcb56544fc6d7bc02f0d5a65a72fd5a80c4c8906a99ece74ada219239f81ffe17f44c9751ec178dcaf1a50676de12951deaa82f9
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.1.ebuild
deleted file mode 100644
index 43f76e0689fb..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.1.ebuild
+++ /dev/null
@@ -1,128 +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="
-	https://downloads.sourceforge.net/${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 ~arm64-macos ~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
-"
-DEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:*[-headless-awt] )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-BDEPEND="
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-"
-
-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)"
-	)
-
-	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON, bug #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-3.0.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3-r1.ebuild
index 8a6082694031..fff7d27ac9d5 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3-r1.ebuild
@@ -60,6 +60,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	if multilib_is_native_abi && use java ; then
+		export JAVAFLAGS="$(java-pkg_javac-args)"
 		export JAVACFLAGS="$(java-pkg_javac-args)"
 		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
 	fi
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3.ebuild
deleted file mode 100644
index 8a6082694031..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3.ebuild
+++ /dev/null
@@ -1,128 +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://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 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 ~arm64-macos ~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
-"
-DEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:*[-headless-awt] )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-BDEPEND="
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-"
-
-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)"
-	)
-
-	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON, bug #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/liblscp/Manifest b/media-libs/liblscp/Manifest
index b451ddc3da5f..361197c5f433 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -4,6 +4,6 @@ DIST liblscp-0.9.91.tar.gz 99118 BLAKE2B 8385f0e1468deb3f49ef124b6aa2d3e57f14852
 DIST liblscp-1.0.0.tar.gz 99190 BLAKE2B d44b69ed180b22d66eab5f8a0bb2b8d24794d7aeedc9213729cc1787a1db6546f2a4d28c4177732b8281c5c4a103dd6f37f3af155caed886d694bafe74e718a3 SHA512 2f407d5461dcf20204a1f37fba9456076e8e052a47528d4f10da6a5e123758261cde2dffd99b45a16e3855b6d42ca6cce714bfeb8602aefb95f6dd2a825597d5
 EBUILD liblscp-0.9.12.ebuild 749 BLAKE2B a0a21dd4b3ba982ada8e76d476f1331cc3ea88222333e4badb63054037ae1e4f03de5ec4eec7e4d4382aeb57150cf9780e2e6850c8284038f708f6f4e7bb4b0d SHA512 c312e96c8deaa41fa59e3d8b15292b8f0091bf209ca8a6d9f530f5a7ac6e5f7d990da44b3d13777d85c2ffd5d22693d8d20258dbc287c5e15c240434c9c7470e
 EBUILD liblscp-0.9.91.ebuild 750 BLAKE2B cabe577a40f5ba898182c2b6cf86f885ebd69ed84cef2c144dc47e77e560fec97eb553c05e3fb94efa17840337b79e94d470d9e9d349d090791b71535efc92f9 SHA512 2bd95460a437b8ece27b4fd13d7f9e364a03690c7575968ec7288db6eacd97d64781af701d474f42301f434db3b96490bcfc9f217acad907ee473c5520b80069
-EBUILD liblscp-1.0.0.ebuild 751 BLAKE2B af9d1c298f2b444cde35901c0d8cd2e2ceb1da7409d86ff43ad417b1c891a605a4b08e51292e4abc2057faa77668d8209a6a9c88f3663f180b8c2a7e51482d9a SHA512 4a68c8d9804f5ee934cf558d8af1f82d01bbf889162a1164197aa67b08b65f52cc53b9ab3884acf2527c3c1b137e42aec984a953671a53bd58f486dc6008dfb9
+EBUILD liblscp-1.0.0.ebuild 749 BLAKE2B a0a21dd4b3ba982ada8e76d476f1331cc3ea88222333e4badb63054037ae1e4f03de5ec4eec7e4d4382aeb57150cf9780e2e6850c8284038f708f6f4e7bb4b0d SHA512 c312e96c8deaa41fa59e3d8b15292b8f0091bf209ca8a6d9f530f5a7ac6e5f7d990da44b3d13777d85c2ffd5d22693d8d20258dbc287c5e15c240434c9c7470e
 EBUILD liblscp-9999.ebuild 751 BLAKE2B af9d1c298f2b444cde35901c0d8cd2e2ceb1da7409d86ff43ad417b1c891a605a4b08e51292e4abc2057faa77668d8209a6a9c88f3663f180b8c2a7e51482d9a SHA512 4a68c8d9804f5ee934cf558d8af1f82d01bbf889162a1164197aa67b08b65f52cc53b9ab3884acf2527c3c1b137e42aec984a953671a53bd58f486dc6008dfb9
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/liblscp/liblscp-1.0.0.ebuild b/media-libs/liblscp/liblscp-1.0.0.ebuild
index ae4c4afb8276..8814d6bb81c4 100644
--- a/media-libs/liblscp/liblscp-1.0.0.ebuild
+++ b/media-libs/liblscp/liblscp-1.0.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
 		https://download.linuxsampler.org/packages/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 334d66ed583d..20951c6abfa9 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -2,7 +2,8 @@ AUX libsdl2-2.0.16-static-libs.patch 2118 BLAKE2B 836fabd17be1520ad76baaf92a0ad3
 DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d
 DIST SDL2-2.30.2.tar.gz 7426565 BLAKE2B 258084c6965281951b78619d7ebcd80b0f6873f54ded93d35b6b898f0533fef9a29bef4a8babe53df50bc589b0565b3a3b1378a930b43fdce575c4a5baa70864 SHA512 19316bb4c483a8c4be2140b70d906b7767beabada481873217a9207bd41e79c1854a837e1394325f59795da010f5344f791a7973a846b8189e3f9b662f408aca
 DIST SDL2-2.30.3.tar.gz 7425677 BLAKE2B 9918723bc3a0bc3abfc6d47b4fc7eeabcafdc9925ee93e4f31b3637e843a5b060ae61aef9b93743340a9df914248cff510e5d38e758e032b5ed4df9eed587746 SHA512 75ddea9ac3c2130e9f6036b4718dbe3d9d1b40dab3cd48d3d488d5a397dd0c226c0573bf18d82eb41498800accf045e259d2ae305f069fad7b34e47a017f2372
-EBUILD libsdl2-2.28.5-r1.ebuild 7364 BLAKE2B 49292871623fea2f3fab3e4463edab75d3546b917a125af7f51dde859ebca093fb276b809f113dfedc4e1f255a743d0dbe454c7988df3acef476ec208fc9849d SHA512 3d8e1d82746208b3d330ee63f30169c05aba1c49d9c336f7b6ab8998539bba7472b749b00a95bdaa3df3c9bfc4a5f932809739a1955ef6f08e99451fc0e845d9
+EBUILD libsdl2-2.28.5-r1.ebuild 7385 BLAKE2B 74314d489f7d6b6d87223779f4a559492ad50b2efe9731b7696149756ddce40d3a193eb72a405d38cff3a88bf26faf2d65339a874f7e68c0316e0d91d5c0aaf4 SHA512 82e8160883795b7dd0a996bd86fad3dcc0c56847e531ecaea28f4edf0a7e449931589697b9e0eeb10328ca768b8be2081b3b9065d49167286d99b77ecb20bd7e
+EBUILD libsdl2-2.28.5-r2.ebuild 7465 BLAKE2B 25732ecd5c4e7998727ce7eb3fc64afe5c3c7337ca9bd554cd90a7639102a2026d06af795d392b5161976e7b5a446c0ed3e60b8fa361442c2a86b373fcf55f2c SHA512 a0a804ac31060141d8add1b6f5a1a0c6a2af01ba0b45db1f579d222580bc94b34675efa5942ce76a71987f8090c2a6c72d43bf96864187991427a9b03741597d
 EBUILD libsdl2-2.30.2-r1.ebuild 5733 BLAKE2B 1273e09d22913088d85bea63a86e028c519fc9d2b3daa7fd692ac791dba38652675a0bd526f3cb15c58313e65b9ade40fe67df910bef714df94f607cc666f04d SHA512 14830fad12f2af6ee408e94d2f5f7baece0c6028df4e48dae97594b9833ee3da02b80e1c0da148c574d169f42a414cd30e29f21101a132b7b33cdc122a80c127
 EBUILD libsdl2-2.30.3.ebuild 5869 BLAKE2B 0d0d966f51d216b50c7123bb8a888dd059ff4dbd36e78a1b53a52fa0ed39c38d518ddc9da27ea26f12ee655a4d3335a0fc2eb9612c7efca62767fb1b20f73c60 SHA512 b288f5412d8b50816132f98777f4a34d0859270214dff6f68fd734c99316ec2a7a83de8d9c0e90d8362163583c587a35683caf8ebabb71cd626d839b0c992b47
 MISC metadata.xml 1945 BLAKE2B 0f4c4a1526296bfbef001169c45626f0393cfcb6f5003d3d644c1ff1ef0197fdd38ddc2f16f1c1590ef895448bd6aa85ea3619a31487609d9ea2569077decd64 SHA512 d25c6e3b2cf3055f2faf71d926d5ad01c5b528f1349284dc3097607015ed93c70116223db0078d8ae764b598bc13a99f1b82cebe1e65206ea737508bdede12df
diff --git a/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild b/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild
index 1cc51ae15ab6..e45f84fe9aed 100644
--- a/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild
@@ -179,6 +179,7 @@ multilib_src_configure() {
 		$(use_enable sound dummyaudio)
 		$(use_enable wayland video-wayland)
 		--disable-wayland-shared
+		--disable-libdecor
 		$(use_enable video_cards_vc4 video-rpi)
 		$(use_enable X video-x11)
 		--disable-x11-shared
diff --git a/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild b/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild
new file mode 100644
index 000000000000..fef18b072fbe
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2024 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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips 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 test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
+RESTRICT="!test? ( test )"
+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 )
+"
+
+COMMON_DEPEND="
+	virtual/libiconv[${MULTILIB_USEDEP}]
+	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-libs/libpulse[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
+		gui-libs/libdecor[${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="
+	${COMMON_DEPEND}
+	vulkan? ( media-libs/vulkan-loader )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	test? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/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
+)
+
+src_prepare() {
+	default
+
+	# Unbundle some headers.
+	rm -r src/video/khronos || die
+	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
+	if ! use vulkan
+	then
+		sed -i '/testvulkan$(EXE) \\/d' "test/Makefile.in" || die
+	fi
+
+	# 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="${BROOT}/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-system-iconv
+		--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)
+		--disable-libsamplerate-shared
+		--disable-werror
+		$(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 wayland libdecor)
+		--disable-libdecor-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)
+		ac_cv_header_libunwind_h=no
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if use test; then
+		# Most of these workarounds courtesy Debian
+		# https://salsa.debian.org/sdl-team/libsdl2/-/blob/debian/latest/debian/rules
+		local mytestargs=(
+			--x-includes="/usr/include"
+			--x-libraries="/usr/$(get_libdir)"
+			SDL_CFLAGS="-I${S}/include"
+			SDL_LIBS="-L${BUILD_DIR}/build/.libs -lSDL2"
+			ac_cv_lib_SDL2_ttf_TTF_Init=no
+			CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+		)
+
+		mkdir "${BUILD_DIR}/test" || die
+		cd "${BUILD_DIR}/test" || die
+		ECONF_SOURCE="${S}/test" econf "${mytestargs[@]}"
+	fi
+}
+
+multilib_src_compile() {
+	emake all V=1
+	use test && emake -C test all V=1
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		cd docs || die
+		doxygen || die
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/build/.libs" emake -C test check V=1
+}
+
+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/libva/Manifest b/media-libs/libva/Manifest
index a4fb518df735..d048916ebba2 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,5 +1,7 @@
 AUX libva-2.21.0-no-undefined-version.patch 1686 BLAKE2B 91423e339768f6efcd1a3704dd697c53f0e9459477cc2e967e12642d28ec46b27b98440ab7119764981e0cee2410112af2b6597f9e3c7c8e61340d20d1202d49 SHA512 da0aa0a288cc434f3ad143fc5f375d76ec8ea9125befb2f7eb628da0c4e95ddc833a167eff69fa9e2653a8e379fbb8cce80c27eccbd9d8ccc368280dbb485123
 DIST libva-2.21.0.tar.gz 281515 BLAKE2B bd430162b07987d8982d8f81296e94623efea68624f34b7e159ebefeb37a2b062f2c0d809e16e76c172d6c2df11b59691174fb9a1d65d0938949ac2a025b746c SHA512 93654bb892e0e269d7682a1344fe6f7298432d1f2b347396c63aa1bd84ac0f707af34950a93098fe86a9bc8986fc9f97f75f0f15d8495ffd2caf8cf0eed9612c
+DIST libva-2.22.0.tar.gz 301705 BLAKE2B b438c95613628b8eb1150238016bafdf2ef33fc01ed78742cd50768238cedf5475752a6dd7413ee217961a705abcd7628219ddf3f13c5aa77015b6bbb4e77929 SHA512 cd633e5e09eac1ed10f1fc12b0f664f836e0eda9e47c17e1295b746cfd643a18fd0564a06a148ced3cf1e2321aa4d21275918bcf8c717d3981e98a598179f370
 EBUILD libva-2.21.0.ebuild 1645 BLAKE2B 51e1e15f5aa4e42650b6967d404f04cabfd9a56bb55aee81ef998e23be2a42580c4bb1a7546b0f0ceb1b923ad2b0656a31390a1c8df8cb595263235d4cec394b SHA512 65810a2e5cdf56d0ba0556e87ecf586016eab7692d58e996a1a9cec59abc8a8e8e710acf8027d05a770c74bbdbeca305c43aab5b9d25df9825ec0e4c38a2068f
-EBUILD libva-9999.ebuild 1544 BLAKE2B 3b5b3112bafca3f8e6efdf15f214135cb7e8d4ebc0a64040bcd6ab39a4f40fbd4df03af84101f25280780768512706a25568361187c9c3684332211b36b54a8f SHA512 cbb0614ff00b592a4ca71561acab24d5c1053bab5ed7a8c75353a0b1e3182c589035019536254dd44bc2377b841bd77fb2fcd45d2e9dbe4e7951e8cc5c4740f7
+EBUILD libva-2.22.0.ebuild 1581 BLAKE2B 22d553df498d1e92da44fb4bd250f68c3d46f135427d6fe06425a8a203b74c5df2e7ed3f2fbbc13478335933c7bb4331049b3eb9258ec25abedb8028a6fde3cb SHA512 878745dd47c6daea25ac23cfa8ef801ed56a41e9154c4d11d917af853affdac603404be166b91928cf257da5f18081978dd0a57a9cd5bb17305209ebccc2b928
+EBUILD libva-9999.ebuild 1544 BLAKE2B 9a11667941f748b7de6ee372496a659d71d32f409b98e8a77e922fbff6b2a1852828c9f2674e45a2570783d42a4e92a04ad26949afde51fc3ecabe4a2d0deee9 SHA512 4463670469882e5e3e56c0f92bbb7c375ee6bf0e7ead0306f717b0e8f96ac21d5e1ba8b0922df18909fb5002224b4dfba32981b6a48aa926b45dfc64b82b53a0
 MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0
diff --git a/media-libs/libva/libva-2.22.0.ebuild b/media-libs/libva/libva-2.22.0.ebuild
new file mode 100644
index 000000000000..428ba181bbd3
--- /dev/null
+++ b/media-libs/libva/libva-2.22.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib optfeature
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+else
+	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="wayland X"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.75[${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	wayland? ( dev-util/wayland-scanner )
+	virtual/pkgconfig
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/va/va_x11.h
+	/usr/include/va/va_dri2.h
+	/usr/include/va/va_dricommon.h
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=no
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature_header
+	optfeature "Older Intel GPU support up to Gen8" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support from Gen9+" media-libs/libva-intel-media-driver
+}
diff --git a/media-libs/libva/libva-9999.ebuild b/media-libs/libva/libva-9999.ebuild
index 2271f036b522..bfc76885c3de 100644
--- a/media-libs/libva/libva-9999.ebuild
+++ b/media-libs/libva/libva-9999.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
@@ -22,7 +22,7 @@ SLOT="0/$(ver_cut 1)"
 IUSE="wayland X"
 
 RDEPEND="
-	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.75[${MULTILIB_USEDEP}]
 	wayland? (
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 	)