gentoo auto-resync : 27:04:2024 - 23:59:42

14 files changed, 62 insertions, 1153 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index fab74c3b2426..7346e0c70ee8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index e3dc71794c26..82bc59ff008d 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -1,8 +1,9 @@
 AUX libgpod-0.8.3-comment.patch 611 BLAKE2B 6ed4cfbb6ca1ca6876f835bdad2b9d11a8ad147c0f0f584436791fa84e40e15dcbfe163a47dedc688eecf4db84610df81ab01ae2c1266324a8cebadd914627e2 SHA512 a9d042745d8095a8188e57d82c8e1b00acb41f45da1510b2615d29b607b52ae49e54d3482e5021d085501f3705f4ad0fa79796cd4262c74acd0b4f34f8450a44
 AUX libgpod-0.8.3-implicit-int.patch 638 BLAKE2B 55433e6709baf17bc18b9da9b5ca2c15601f3a5b364f52573c21ab49ab18b9089fa5ad318307dc107034faece88416ced565261b23243e42dcfcfdac400efaf3 SHA512 63a1f0c3871f34ae356f3b8f1b465e744d7f6ed656c7ee24a88f2a81742af76c0db44985759d9905dc6fa14b1e98b3654229d3c64c1010b87b16b71ec4059e93
 AUX libgpod-0.8.3-pkgconfig_overlinking.patch 640 BLAKE2B 74d924d61ce33c4fd0219e8dedb505bd66cd40e9912efb2dbbb5df31c2bea943ea4a4eb8b9e9baf2762966b02efae3f77c73293f8a4a581f6a43be4cc22eb727 SHA512 c8ebcc18ba7b44aef8fada3f9fea88fdaaf6bae12cf809b08f98e85ab6396ae032bfd7706809cd266be67c694749d4364a9cc591eb750478e095cbbcbe061419
+AUX libgpod-0.8.3-plist-2.3.patch 1013 BLAKE2B c67673febfc18b9a0af9b967ff0a7572bec622d1255e981923db00e385b6c25fb14cb40b75498f1b33a2093d9c1b84a3094f769766f8064a99aa3ba38782bb6a SHA512 abea5daa3a0a2d12f04b6f642b359981aa9a2d8f5e550dddbf88d3720f9e9793b4c39b565991b561c9f753b421ae6a4270b6a9a1ab1520133a2910a99486d51d
 AUX libgpod-0.8.3-segfault.patch 1171 BLAKE2B ae8f00ad8708f23ef83c9f03f5e9a7157c2bdeaf0cfa2ed4542f8cc96295dad0200e968cb180883efa0e93fd180088be84fa0d2f1b40c642ada0caf37f7f3b9a SHA512 9b2f9a4f4e8f41e5d11cbc943cbba915147b81ec66859b62a5986b5d1c5c90526ce522e24499daf3378c201126ac6e5da8ef855a5f2353b933806c5b3aa6effb
 DIST libgpod-0.8.3.tar.bz2 801903 BLAKE2B e9bc54d23be7f54a17eea3f8a07d7bf6a28224d9c0b0f90fb9d44d97af6cf64c31096de5d9fa4b446e1a9463a6e8f3a59929d73bf52ad8d638732868c3c1b7d0 SHA512 e39f22054c2d2bdf5fc764aa1f692de17a1a06c7c7e9c60883d126b216dacca7840bf818e7e7e039218fe2a64c0920ba96d8cbbe310e11c1c4e68b82e7cbbd8e
-EBUILD libgpod-0.8.3-r5.ebuild 1450 BLAKE2B 80a7b44a9987d805abf88772ad06863459b1c7b327f349ced501cf087d83c9b5431ca77eee08be4894d20e5e8265213034503922dcc6130e3b389242115c79c6 SHA512 04c1078723b69d425b3c551c4c14e7d583d2148937d45580fd2839f85262b7a644380a4341dc3b55ceb8c5647a69b67cd024dbf82e78ea8ac775f7ae1b94d3e5
 EBUILD libgpod-0.8.3-r6.ebuild 1589 BLAKE2B b0acee7c4046df4f25c1a068a07f2aec258eeb75bb4b590d6c95f26fe767e64bccd91ec3015ed577985a0fbe021a384360c082f7b13262e028a61dc809120e4d SHA512 12c163ab2fcc88aefaa84cdb27ad445d0961558b71b9bbdc31d1dbe600ef69b54ac92bbccd0c84681d894e1d160d10f9f7145dba7116d8798a5a689f4f7b1620
+EBUILD libgpod-0.8.3-r7.ebuild 1638 BLAKE2B c0b3113c64570ae9596ecbeaaa2fc3e5030b7dca8f81169506fc794716b43037902471a4fb6bb1abc88acadf05206efb8dcf71fcac053ae4c62b89cc4f2efd7c SHA512 d5819cc151f70312b7e3a9c78e5a1dbfd17e5ffc853c8283b95711839f3862e44987c8920b9c57d64aa9cbab94a005bb9ecc58936e2dc71741f11e4d219588c9
 MISC metadata.xml 484 BLAKE2B f3704943d01d8048940f1d359a12330aad167f6a7b3e67f37fd3c8b954aef0cde441b3e9b957414404e5a450a21acb899a8c07df838632063e45734cebea1b68 SHA512 40128d4bd5043e699ec2acdbc267eba5f2ca4cb54e7e05ca81d033fee88124e37824234ddfe2d51da7cbbb2757cb68801db4899c82c66895e5005bd85a211965
diff --git a/media-libs/libgpod/files/libgpod-0.8.3-plist-2.3.patch b/media-libs/libgpod/files/libgpod-0.8.3-plist-2.3.patch
new file mode 100644
index 000000000000..6baa712c9a96
--- /dev/null
+++ b/media-libs/libgpod/files/libgpod-0.8.3-plist-2.3.patch
@@ -0,0 +1,31 @@
+diff -Naur a/tools/ipod-lockdown.c b/tools/ipod-lockdown.c
+--- a/tools/ipod-lockdown.c	2013-07-10 14:57:39.000000000 +0100
++++ b/tools/ipod-lockdown.c	2024-04-27 22:28:10.334056758 +0100
+@@ -100,7 +100,7 @@
+ 	plist_get_string_val(ptr, &str);
+ 	if (str != NULL) {
+ 	    ptr = plist_new_string(str);
+-	    plist_dict_insert_item(value, "SerialNumber", ptr);
++	    plist_dict_set_item(value, "SerialNumber", ptr);
+ 	    free(str);
+ 	}
+ 
+@@ -112,15 +112,15 @@
+ 	plist_get_string_val(ptr, &str);
+ 	if (str != NULL) {
+ 	    ptr = plist_new_string(str);
+-	    plist_dict_insert_item(value, "VisibleBuildID", ptr);
++	    plist_dict_set_item(value, "VisibleBuildID", ptr);
+ 	    free(str);
+ 	}
+ 
+ 	ptr = plist_new_string(uuid);
+-	plist_dict_insert_item(value, "FireWireGUID", ptr);
++	plist_dict_set_item(value, "FireWireGUID", ptr);
+ 
+ 	ptr = plist_new_string(uuid);
+-	plist_dict_insert_item(value, "UniqueDeviceID", ptr);
++	plist_dict_set_item(value, "UniqueDeviceID", ptr);
+ 
+ 	plist_to_xml(value, &xml, &xml_length);
+ 
diff --git a/media-libs/libgpod/libgpod-0.8.3-r5.ebuild b/media-libs/libgpod/libgpod-0.8.3-r7.ebuild
index 741b728b3b47..959027f94d84 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r5.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools udev
 
@@ -11,11 +11,11 @@ SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 IUSE="+gtk ios +udev"
 
 RDEPEND="
-	>=app-pda/libplist-1.0:=
+	>=app-pda/libplist-2.3:=
 	>=dev-db/sqlite-3:3
 	>=dev-libs/glib-2.16:2
 	dev-libs/libxml2:2
@@ -39,6 +39,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-comment.patch # bug 537968
 	"${FILESDIR}"/${P}-segfault.patch # bug 565052
 	"${FILESDIR}"/${P}-pkgconfig_overlinking.patch
+	"${FILESDIR}"/${P}-implicit-int.patch
+	"${FILESDIR}"/${P}-plist-2.3.patch
 )
 
 src_prepare() {
@@ -64,6 +66,14 @@ src_configure() {
 src_install() {
 	default
 	rm "${ED}"/usr/$(get_libdir)/pkgconfig/libgpod-sharp.pc || die
-	rmdir "${ED}"/tmp || die
+	[[ -d ${ED}/tmp ]] && rmdir "${ED}"/tmp || die
 	find "${ED}" -name '*.la' -type f -delete || die
 }
+
+pkg_postinst() {
+	use udev && udev_reload
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+}
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index dbcb94d53923..e1ea24045451 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,15 +1,8 @@
 AUX libsdl2-2.0.16-static-libs.patch 2118 BLAKE2B 836fabd17be1520ad76baaf92a0ad357093bc08a5c1767edb1c81c9099fd27aadbf0525ab0666a560a3c728983f425864f1f513693801a8fa50edde5d32a3703 SHA512 f578e5ab1852705cfad4bf8b4a8aa36fb34637f3b26b83a9821716d08fc1152d7ea18daea623f540c860cd7a7566c4b8902b2cac2ae6d541e36e7bd15363d58a
-DIST SDL2-2.28.1.tar.gz 8109697 BLAKE2B c32537d42108dd75ea4f2ba907d6b045ba18d6be29f76a6f8a2f45400d069b0d43223a8855ba3103fa53c3b9d886b2e542133bcce1cd6cfcf5b17800dd5f9911 SHA512 1d5c1912c2a6d606b465938365a56ba5202367c47c6c88d303f4838f0c37826fe14aecbf588a3e86fa996d7118bd831f69559d2cc22c01bc4dbe56d03c5223b1
-DIST SDL2-2.28.3.tar.gz 7340914 BLAKE2B 1ef8950b7736fbbca4607ed9750114f94b8e6e944b2974941840c13b1677643126524cc41ad8c3ead699ea2f90295898888d3d0b31c7a80079420aa9187035fb SHA512 fb7ad4a41e85de3fcb414a3a3d19c3f61e286790a4936004d30025a8472a3f40f9fccf1241cf5cb34f48091567de65df463442fc2ce398ac85e51dbe677251e7
-DIST SDL2-2.28.4.tar.gz 7344208 BLAKE2B 03d1fec4c9c43d5b906ec9fafd69b75040f7c80696d9097b03c33a93760e579ff677b1dd9385c77d44209a5a8dbb295074d47595b8a2e39f00bc11ad32b7f154 SHA512 16950ccedcfdef42ee6eba1a6bf09ed7231ea0205fe8600388de2aed1aba94da2e5450d16e9732dce9f12569a238730b3727bf64b8699f1fed4cb3c5c94c3eaa
 DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d
 DIST SDL2-2.30.1.tar.gz 7428023 BLAKE2B 5cc651bcb38a1a3989a966351074b1a77f511b5bef0d3c9aef06d67d89f1d0ee926f5cba4bf2d45be28bb3f1e9da9b3f17a85f094c8547586072b24ee342777d SHA512 bb1863310d627e7b49cfc31bea7eb9100da1908cd83a97c533c28a2e32eac377c72dde83d2c2c4791007f534ea2e5ec8b1ac545a0d2e291dfdce1734a727c4af
 DIST SDL2-2.30.2.tar.gz 7426565 BLAKE2B 258084c6965281951b78619d7ebcd80b0f6873f54ded93d35b6b898f0533fef9a29bef4a8babe53df50bc589b0565b3a3b1378a930b43fdce575c4a5baa70864 SHA512 19316bb4c483a8c4be2140b70d906b7767beabada481873217a9207bd41e79c1854a837e1394325f59795da010f5344f791a7973a846b8189e3f9b662f408aca
-EBUILD libsdl2-2.28.1.ebuild 6445 BLAKE2B 6652314ff4c8d8d50fd0cb1db99b91f1df4a22ee9dcc16224902132a2e150f7a6a750451ed0e4df96dbaf1294a41b8b986e79d0e285b53a9241936eba06ce304 SHA512 f99bbdbde13745818af665bee635997d97491f29a056bac3ad69ed534b47a381cbc7cc7ec5c85998eb6a872d5af1824d924ef28fcba1b31e9ba73aa5ee19f624
-EBUILD libsdl2-2.28.3.ebuild 6444 BLAKE2B f84a1d6d5562d86a782bcf3c418fb1030312929bd18703473d28eb791c9447a4cacfbafc0b0fc84ce5c9fbc109f4abca97d46a0023211cca727507908d58169d SHA512 b22720936efbc140f2f867fce7fd257b8ffff011e679b79b25868e0947df246dfa4f9f5309bf64ac8f7b38e85f24b540558c6a8afc8335b7ca5a361083367fbb
-EBUILD libsdl2-2.28.4-r1.ebuild 6505 BLAKE2B 410574b56df4bc8c42c1b9c0e60a790a0d6c03e8d728c5714e40d10321410d4b10375935eb83d919fc71c819d66ea34009aceafee475b0910b2ef20be76ae4ce SHA512 4b03d2d64ef142b08e5e5f3584194ec9ba588e80a5dd4829f800842d858a6dc1a0f6c96a7d88c908253b8fb80e35f5355da9328da4b1fbd9ca36716cddb95f82
-EBUILD libsdl2-2.28.5-r1.ebuild 7326 BLAKE2B 2ba3da156fc246483847795c10c47fde1e6d26350bc4980734e49068685a36c601ed05225a6c161fb69f042594ef276a1e29c7bfa6dba4c482aeb9887bf924d1 SHA512 e3d7d0bf0680db8e8e8405fff5d3ed3408ea5cd15fec6c639d06abd3759f34646838ef5bd0904544a6e8180a1167835bc43fe5c2aeb7cf3bf3f5ec5099a40f74
-EBUILD libsdl2-2.28.5.ebuild 7355 BLAKE2B 77c6aeb0a7c56c67b20a3b536017ecefadf12f5987c9f932917179f0d8ae168955665ef9ae53f812f5a597c783db059519901de33e350b9168d6c86eb0dc7555 SHA512 50ca9c54dbba69850920cc66a8ceba855606bc2142914cee8b16f2d8bc593a9a747a0b934e01362c03c6264a4189ab7b21225bbaab2fe86f28c7f13ca05ab576
-EBUILD libsdl2-2.30.1.ebuild 7467 BLAKE2B c0173460424d8dab62c0fa4bc7c80078971b35604d126424be9683b88cb261968583c4d0a85c00688072cb9ebd8ec648a0fafa3ae092650fa127623d50b7e06e SHA512 848eddbb8aae40d5a06de89fb4a9418be89a6df3f6b5b14906c46e8e62c4f5a557145bd147c1882893a42ecdf3e8a494615a5b2b580eab0e884cd388fc3a9627
-EBUILD libsdl2-2.30.2.ebuild 5724 BLAKE2B bd326a7abdd15f68943863cc1afabadec82f9b37cc5000f0581348fffd70af1188296f18ca6c9cedd74786660865b4c8728e094c2a9e7e6801cd8cecc537cc59 SHA512 3ac6e32c86a42aa0a5a0617ef7f3a907d2a959ef883b932c77bb3ad4fd5b3644439681687411f7818bd94d72c9dcec59c586e1b1358333a00e426e20618cdca3
+EBUILD libsdl2-2.28.5-r1.ebuild 7364 BLAKE2B 49292871623fea2f3fab3e4463edab75d3546b917a125af7f51dde859ebca093fb276b809f113dfedc4e1f255a743d0dbe454c7988df3acef476ec208fc9849d SHA512 3d8e1d82746208b3d330ee63f30169c05aba1c49d9c336f7b6ab8998539bba7472b749b00a95bdaa3df3c9bfc4a5f932809739a1955ef6f08e99451fc0e845d9
+EBUILD libsdl2-2.30.1-r1.ebuild 7476 BLAKE2B 8bab87bd38cbd366c96cbfbad6b162203dc52cbc534e7cbfe40b9f9ef22fe14cf3c7a81fc6a619548a4e7cbd3fb5797d9bdaafa5ec457cca64dd08b7ea270eff SHA512 db2899de08ff90b46f27b1920661917ca2db3dc80313f40614c8b95edc9c4ea11e0be7ca0164bd0a50769b4a87db388b587a2934a7c76e45ecc466513ce86d8b
+EBUILD libsdl2-2.30.2-r1.ebuild 5733 BLAKE2B 1273e09d22913088d85bea63a86e028c519fc9d2b3daa7fd692ac791dba38652675a0bd526f3cb15c58313e65b9ade40fe67df910bef714df94f607cc666f04d SHA512 14830fad12f2af6ee408e94d2f5f7baece0c6028df4e48dae97594b9833ee3da02b80e1c0da148c574d169f42a414cd30e29f21101a132b7b33cdc122a80c127
 MISC metadata.xml 1945 BLAKE2B 0f4c4a1526296bfbef001169c45626f0393cfcb6f5003d3d644c1ff1ef0197fdd38ddc2f16f1c1590ef895448bd6aa85ea3619a31487609d9ea2569077decd64 SHA512 d25c6e3b2cf3055f2faf71d926d5ad01c5b528f1349284dc3097607015ed93c70116223db0078d8ae764b598bc13a99f1b82cebe1e65206ea737508bdede12df
diff --git a/media-libs/libsdl2/libsdl2-2.28.1.ebuild b/media-libs/libsdl2/libsdl2-2.28.1.ebuild
deleted file mode 100644
index ff041ecec8b3..000000000000
--- a/media-libs/libsdl2/libsdl2-2.28.1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# 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"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
-REQUIRED_USE="
-	alsa? ( sound )
-	fcitx4? ( dbus )
-	gles1? ( video )
-	gles2? ( video )
-	haptic? ( joystick )
-	ibus? ( dbus )
-	jack? ( sound )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	sndio? ( sound )
-	vulkan? ( video )
-	wayland? ( gles2 )
-	xscreensaver? ( X )"
-
-CDEPEND="
-	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}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)"
-RDEPEND="${CDEPEND}
-	vulkan? ( media-libs/vulkan-loader )"
-DEPEND="${CDEPEND}
-	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-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
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Unbundle some headers.
-	rm -r src/video/khronos || die
-	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
-
-	# SDL seems to customize SDL_config.h.in to remove macros like
-	# PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from
-	# being reintroduced.
-	# https://bugs.gentoo.org/764959
-	AT_NOEAUTOHEADER="yes" AT_M4DIR="${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-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 video_cards_vc4 video-rpi)
-		$(use_enable X video-x11)
-		--disable-x11-shared
-		$(use_enable X video-x11-xcursor)
-		$(use_enable X video-x11-xdbe)
-		$(use_enable X video-x11-xfixes)
-		$(use_enable X video-x11-xinput)
-		$(use_enable X video-x11-xrandr)
-		$(use_enable xscreensaver video-x11-scrnsaver)
-		$(use_enable X video-x11-xshape)
-		$(use_enable aqua video-cocoa)
-		--disable-video-directfb
-		--disable-fusionsound
-		--disable-fusionsound-shared
-		$(use_enable kms video-kmsdrm)
-		--disable-kmsdrm-shared
-		$(use_enable video video-dummy)
-		$(use_enable opengl video-opengl)
-		$(use_enable gles1 video-opengles1)
-		$(use_enable gles2 video-opengles2)
-		$(use_enable vulkan video-vulkan)
-		$(use_enable udev libudev)
-		$(use_enable dbus)
-		$(use_enable fcitx4 fcitx)
-		$(use_enable ibus)
-		--disable-directx
-		--disable-rpath
-		--disable-render-d3d
-		$(use_with X x)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		cd docs || die
-		doxygen || die
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# Do not delete the static .a libraries here as some are
-	# mandatory. They may be needed even when linking dynamically.
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
-	use doc && dodoc -r docs/output/html/
-}
diff --git a/media-libs/libsdl2/libsdl2-2.28.3.ebuild b/media-libs/libsdl2/libsdl2-2.28.3.ebuild
deleted file mode 100644
index 013e8a8044a1..000000000000
--- a/media-libs/libsdl2/libsdl2-2.28.3.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# 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"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
-REQUIRED_USE="
-	alsa? ( sound )
-	fcitx4? ( dbus )
-	gles1? ( video )
-	gles2? ( video )
-	haptic? ( joystick )
-	ibus? ( dbus )
-	jack? ( sound )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	sndio? ( sound )
-	vulkan? ( video )
-	wayland? ( gles2 )
-	xscreensaver? ( X )"
-
-CDEPEND="
-	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}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)"
-RDEPEND="${CDEPEND}
-	vulkan? ( media-libs/vulkan-loader )"
-DEPEND="${CDEPEND}
-	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-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
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Unbundle some headers.
-	rm -r src/video/khronos || die
-	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
-
-	# SDL seems to customize SDL_config.h.in to remove macros like
-	# PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from
-	# being reintroduced.
-	# https://bugs.gentoo.org/764959
-	AT_NOEAUTOHEADER="yes" AT_M4DIR="${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-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 video_cards_vc4 video-rpi)
-		$(use_enable X video-x11)
-		--disable-x11-shared
-		$(use_enable X video-x11-xcursor)
-		$(use_enable X video-x11-xdbe)
-		$(use_enable X video-x11-xfixes)
-		$(use_enable X video-x11-xinput)
-		$(use_enable X video-x11-xrandr)
-		$(use_enable xscreensaver video-x11-scrnsaver)
-		$(use_enable X video-x11-xshape)
-		$(use_enable aqua video-cocoa)
-		--disable-video-directfb
-		--disable-fusionsound
-		--disable-fusionsound-shared
-		$(use_enable kms video-kmsdrm)
-		--disable-kmsdrm-shared
-		$(use_enable video video-dummy)
-		$(use_enable opengl video-opengl)
-		$(use_enable gles1 video-opengles1)
-		$(use_enable gles2 video-opengles2)
-		$(use_enable vulkan video-vulkan)
-		$(use_enable udev libudev)
-		$(use_enable dbus)
-		$(use_enable fcitx4 fcitx)
-		$(use_enable ibus)
-		--disable-directx
-		--disable-rpath
-		--disable-render-d3d
-		$(use_with X x)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		cd docs || die
-		doxygen || die
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# Do not delete the static .a libraries here as some are
-	# mandatory. They may be needed even when linking dynamically.
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
-	use doc && dodoc -r docs/output/html/
-}
diff --git a/media-libs/libsdl2/libsdl2-2.28.4-r1.ebuild b/media-libs/libsdl2/libsdl2-2.28.4-r1.ebuild
deleted file mode 100644
index 3196de34da43..000000000000
--- a/media-libs/libsdl2/libsdl2-2.28.4-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# 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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
-REQUIRED_USE="
-	alsa? ( sound )
-	fcitx4? ( dbus )
-	gles1? ( video )
-	gles2? ( video )
-	haptic? ( joystick )
-	ibus? ( dbus )
-	jack? ( sound )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	sndio? ( sound )
-	vulkan? ( video )
-	wayland? ( gles2 )
-	xscreensaver? ( X )
-"
-
-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}]
-		>=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}] )
-	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
-
-	# 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 video_cards_vc4 video-rpi)
-		$(use_enable X video-x11)
-		--disable-x11-shared
-		$(use_enable X video-x11-xcursor)
-		$(use_enable X video-x11-xdbe)
-		$(use_enable X video-x11-xfixes)
-		$(use_enable X video-x11-xinput)
-		$(use_enable X video-x11-xrandr)
-		$(use_enable xscreensaver video-x11-scrnsaver)
-		$(use_enable X video-x11-xshape)
-		$(use_enable aqua video-cocoa)
-		--disable-video-directfb
-		--disable-fusionsound
-		--disable-fusionsound-shared
-		$(use_enable kms video-kmsdrm)
-		--disable-kmsdrm-shared
-		$(use_enable video video-dummy)
-		$(use_enable opengl video-opengl)
-		$(use_enable gles1 video-opengles1)
-		$(use_enable gles2 video-opengles2)
-		$(use_enable vulkan video-vulkan)
-		$(use_enable udev libudev)
-		$(use_enable dbus)
-		$(use_enable fcitx4 fcitx)
-		$(use_enable ibus)
-		--disable-directx
-		--disable-rpath
-		--disable-render-d3d
-		$(use_with X x)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		cd docs || die
-		doxygen || die
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# Do not delete the static .a libraries here as some are
-	# mandatory. They may be needed even when linking dynamically.
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
-	use doc && dodoc -r docs/output/html/
-}
diff --git a/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild b/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild
index d45c1d15eaa8..1cc51ae15ab6 100644
--- a/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.28.5-r1.ebuild
@@ -13,9 +13,9 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
-IUSE="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 vulkan wayland X xscreensaver"
+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 )
@@ -39,8 +39,8 @@ COMMON_DEPEND="
 	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] )
+	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? (
@@ -62,7 +62,7 @@ COMMON_DEPEND="
 	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland]
 		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
 	)
 	X? (
@@ -179,7 +179,7 @@ multilib_src_configure() {
 		$(use_enable sound dummyaudio)
 		$(use_enable wayland video-wayland)
 		--disable-wayland-shared
-		--disable-video-rpi
+		$(use_enable video_cards_vc4 video-rpi)
 		$(use_enable X video-x11)
 		--disable-x11-shared
 		$(use_enable X video-x11-xcursor)
diff --git a/media-libs/libsdl2/libsdl2-2.28.5.ebuild b/media-libs/libsdl2/libsdl2-2.28.5.ebuild
deleted file mode 100644
index a5af93abc261..000000000000
--- a/media-libs/libsdl2/libsdl2-2.28.5.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# 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}]
-		>=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 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/libsdl2/libsdl2-2.30.1.ebuild b/media-libs/libsdl2/libsdl2-2.30.1-r1.ebuild
index 757d81b9f933..4a3bbff8d5e6 100644
--- a/media-libs/libsdl2/libsdl2-2.30.1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.30.1-r1.ebuild
@@ -39,8 +39,8 @@ COMMON_DEPEND="
 	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] )
+	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? (
@@ -62,7 +62,7 @@ COMMON_DEPEND="
 	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland]
 		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
 	)
 	X? (
diff --git a/media-libs/libsdl2/libsdl2-2.30.2.ebuild b/media-libs/libsdl2/libsdl2-2.30.2-r1.ebuild
index 02c8eabacee0..92be437ab77e 100644
--- a/media-libs/libsdl2/libsdl2-2.30.2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.30.2-r1.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2(+),wayland]
 		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
 	)
 	X? (
@@ -76,8 +76,8 @@ COMMON_DEPEND="
 RDEPEND="
 	${COMMON_DEPEND}
 	fcitx4? ( app-i18n/fcitx:4 )
-	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] )
-	gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2] )
+	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] )
+	gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] )
 	vulkan? ( media-libs/vulkan-loader )
 "
 DEPEND="
diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest
index 0674534304ce..786efee7d374 100644
--- a/media-libs/vips/Manifest
+++ b/media-libs/vips/Manifest
@@ -1,5 +1,3 @@
-DIST vips-8.15.1.tar.xz 18648116 BLAKE2B 734f9d6bba794cf01ef38de0f0ed25fe93d2924579bbe966de94739ff1c7309815924e8926a86f90d9138daeeb6fba255be4be41496c1725e44cb52f22873628 SHA512 41f81c3bcb49e570c548d47494b0b705c5dbf870e16d67a85098a00c3f198a6f04e43899d97f92efe9bfdd5cedde79f51cc112c6953574748e1905d91d083dfa
 DIST vips-8.15.2.tar.xz 18653840 BLAKE2B fa46d58d77ec835cbb7036764bcc40554a72c2d6a854adee31905d04cb189de131340f990b432293935bc8563236816d14fa45c08ba858de6b1be5ee3ea148ec SHA512 f746e4590f0105cb40dbb4ee35fe4b177acbf09d7fc4202f623812018030b9cfdfcbe585742724b35f40ef9b68717ebd015243f3db293086621d9eac3d89a5b2
-EBUILD vips-8.15.1.ebuild 4146 BLAKE2B 9457ec33ef8f637376dfa089572c1976a3af667dc370e47c3724265c6eb57b2a446d1e0267fa03bf64da7fd6d1e081d832fd8a62ed1329f0b7eb7a0a57850ee8 SHA512 ea55af487b52230a364b3f7f78b92a6be748493f3be7f5411bb67172132748a42053aed22f19d4691bde5344067d18c55ba0692ed9bf74a601c36a6fa223b143
 EBUILD vips-8.15.2.ebuild 4183 BLAKE2B 3a4eaaa6491d4073a5f39f1202a7061df68c39ab58c4e3bd5cefb29798af67a27dc2980a5d70808d3d1ce0da5e670729c513dcb8176aac9a7aa80f30771d94e8 SHA512 c07f8697bd5223faac4b3473db8082854e76a66f4bec267668c2ed34c59b77e0891983443095a69d552d33c74f5ee1d98d6b73b84bcab4b32db281d050c1a001
 MISC metadata.xml 1040 BLAKE2B c8af14c5f65716cb6dfa16319ac8411cde2151f846c9fe7ab8ac0484a032d4c9d11e03e0ab82c1817f26e70194df7b88f5fad2e7b8998c951238449ff8f1e9e2 SHA512 d00ecc6c916d40a2b3ac3fd64ce2089afa75261f8c388d65cd6c12ad72c327e8c56df26f0d46285ed39088fb457447970ca8d16141adb4febfd8057755f30f76
diff --git a/media-libs/vips/vips-8.15.1.ebuild b/media-libs/vips/vips-8.15.1.ebuild
deleted file mode 100644
index e61cce4e087c..000000000000
--- a/media-libs/vips/vips-8.15.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic meson python-single-r1 toolchain-funcs vala
-
-DESCRIPTION="VIPS Image Processing Library"
-HOMEPAGE="https://libvips.github.io/libvips/"
-SRC_URI="https://github.com/libvips/libvips/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+ MIT"
-SLOT="0/42" # soname
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="
-	archive deprecated doc exif fftw fits fontconfig graphicsmagick
-	gtk-doc heif +highway imagemagick imagequant +introspection +jpeg
-	jpeg2k jpegxl lcms matio openexr orc pango pdf +png python svg
-	test tiff vala webp
-"
-REQUIRED_USE="
-	fontconfig? ( pango )
-	graphicsmagick? ( imagemagick )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( jpeg png webp )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/expat
-	virtual/libintl
-	archive? ( app-arch/libarchive:= )
-	exif? ( media-libs/libexif )
-	fftw? ( sci-libs/fftw:3.0= )
-	fits? ( sci-libs/cfitsio:= )
-	fontconfig? ( media-libs/fontconfig )
-	heif? ( media-libs/libheif:= )
-	highway? ( >=dev-cpp/highway-1.0.5 )
-	!highway? (
-		orc? ( dev-lang/orc )
-	)
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:= )
-		!graphicsmagick? ( media-gfx/imagemagick:= )
-	)
-	imagequant? ( media-gfx/libimagequant )
-	introspection? ( dev-libs/gobject-introspection )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:= )
-	jpegxl? ( media-libs/libjxl:= )
-	lcms? ( media-libs/lcms:2 )
-	matio? ( sci-libs/matio:= )
-	openexr? ( media-libs/openexr:= )
-	pango? (
-		x11-libs/cairo
-		x11-libs/pango
-	)
-	pdf? (
-		app-text/poppler[cairo]
-		x11-libs/cairo
-	)
-	png? ( media-libs/libpng:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
-	)
-	svg? (
-		gnome-base/librsvg:2
-		sys-libs/zlib:=
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:= )
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="
-	${RDEPEND}
-	pango? ( x11-base/xorg-proto )
-	pdf? ( x11-base/xorg-proto )
-	svg? ( x11-base/xorg-proto )
-	test? (
-		tiff? ( media-libs/tiff[jpeg] )
-	)
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/gettext
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	gtk-doc? ( dev-util/gtk-doc )
-	python? ( ${PYTHON_DEPS} )
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use vala && vala_setup
-
-	sed -i "s/'vips-doc'/'${PF}'/" cplusplus/meson.build || die
-
-	sed -i "/subdir('fuzz')/d" meson.build || die
-}
-
-src_configure() {
-	# workaround for bug in lld (bug #921728)
-	tc-ld-is-lld && filter-lto
-
-	local emesonargs=(
-		$(meson_use deprecated)
-		$(meson_use doc doxygen)
-		-Dexamples=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use vala vapi)
-		-Dcgif=disabled # not packaged, and not used to view gif (only saving)
-		$(meson_feature archive)
-		$(meson_feature exif)
-		$(meson_feature fftw)
-		$(meson_feature fits cfitsio)
-		$(meson_feature fontconfig)
-		$(meson_feature heif)
-		$(meson_feature highway)
-		$(meson_feature imagemagick magick)
-		-Dmagick-package=$(usex graphicsmagick GraphicsMagick MagickCore)
-		$(meson_feature imagequant)
-		$(meson_feature introspection)
-		$(meson_feature jpeg)
-		$(meson_feature jpeg2k openjpeg)
-		$(meson_feature jpegxl jpeg-xl)
-		$(meson_feature lcms)
-		$(meson_feature matio)
-		-Dnifti=disabled # not packaged
-		$(meson_feature openexr)
-		-Dopenslide=disabled # not packaged
-		$(meson_feature orc) # no-op if USE=highway is set
-		$(meson_feature pango pangocairo)
-		-Dpdfium=disabled # not packaged, can use poppler instead
-		$(meson_feature png)
-		$(meson_feature pdf poppler)
-		-Dquantizr=disabled # not packaged, can use imagequant instead
-		-Dspng=disabled # not packaged, can use libpng instead
-		$(meson_feature svg rsvg)
-		$(meson_feature tiff)
-		$(meson_feature webp)
-		$(meson_feature svg zlib) # zlib is currently only used by svgload.c
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python; then
-		python_fix_shebang "${ED}"/usr/bin/vipsprofile
-	else
-		rm -- "${ED}"/usr/{bin/vipsprofile,share/man/man1/vipsprofile.1} || die
-	fi
-}