gentoo auto-resync : 16:12:2022 - 09:35:57

author: V3n3RiX <venerix@koprulu.sector> 2022-12-16 09:35:57 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-16 09:35:57 +0000
commit: b982051e7c8e12c3810a0d21d30d687b406b3ae5 (patch)
tree: 1f40c63a302b92f633c075f289851ab62633babe /media-libs
parent: b62381b18b4bf2e919cbfbae11ebcad391e38e77 (diff)
46 files changed, 507 insertions, 1089 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9d6a99e34062..4ae7e2157946 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 83f1489ba96a..92994cc5e18e 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -4,5 +4,5 @@ DIST gegl-0.4.40.tar.xz 5784744 BLAKE2B c4466a76ec4f7939161e9ead6980b8a701f3fc45
 EBUILD gegl-0.4.36-r3.ebuild 4599 BLAKE2B c1e04c0fcfa76493d3e5dc501c4400a754dc78667862408ea2e309f8482738ad8b07de3d02b0f5e3bfb8261d73839d2103f16dbf9bbbe94965b8f9506db27785 SHA512 3350d0f98ebf2dac66b6659b8bc1a6528bf64072df9eacd4eb55de4133990d11d6c97056a8fb4acd8a8a34ff74fa4997b80acbed92ffa358a1bc63608206aa14
 EBUILD gegl-0.4.38-r1.ebuild 4693 BLAKE2B 62f7a02f2341c64d72296d81a899f7b03dd601a2ee5665bca3c31e96184d6d0fc09a95e915753650100832737979aa4d08c84f65077ff3511463061142c4092b SHA512 160dd2e08274c9d4dfe4f84c374a9f5d44a7b1dc86259891dc5532cfe85cce4d8b5dd9301448edeb66b19efb766473e86aeb4bfad1fed7e60487fa1486a6af48
 EBUILD gegl-0.4.40-r1.ebuild 4949 BLAKE2B 107eb892d89a3694e9159381432825fab11120b265aab27cd6665bca39bb9ddc6d693abd0411d6f42180e963ad3a94ffd5728aae44ea525b183e22a454529fa1 SHA512 6e2cff14a8f3c4f71acf8af04aee00ef1373f80d7c7560d6a892b805845e1cd45d854c9f2fde7b970131c572eeba054c260f1c9dda491bb96972eb4fed5180f9
-EBUILD gegl-9999-r1.ebuild 4728 BLAKE2B e9d14bff6af0009d3a57401bc94e5edcfd6a52c8e2a3bc9c7e6d611f9fc0ad734dec74b641f7d52b5d546e293adba4d04335168bda14377bd6797af4e3f129f0 SHA512 13c729974a1769f7ec55d69702338dd7f5f6176bb4f2b85f86fd2166a34b900ab1f832029b60cd117b3872386c6476efb6194476f93199d645ff34de45e6ee61
+EBUILD gegl-9999.ebuild 4728 BLAKE2B e9d14bff6af0009d3a57401bc94e5edcfd6a52c8e2a3bc9c7e6d611f9fc0ad734dec74b641f7d52b5d546e293adba4d04335168bda14377bd6797af4e3f129f0 SHA512 13c729974a1769f7ec55d69702338dd7f5f6176bb4f2b85f86fd2166a34b900ab1f832029b60cd117b3872386c6476efb6194476f93199d645ff34de45e6ee61
 MISC metadata.xml 680 BLAKE2B 6785a153412860b02b1ca6daa7c6e62f5f178c0a01346bd42dac8da5254ec9ada1c4aaab96944072216b414e5bdc5d8999fbb16dbe6c5127f8988873b07817e7 SHA512 c75bc64503925b586e6aaee3a38fceb793e0d9b3f17bb487fd72a32615ac24eb509e4efb7243d9606572507f41f98ba6b5fe8ac12ea23a87f012d69d24e92d5e
diff --git a/media-libs/gegl/gegl-9999-r1.ebuild b/media-libs/gegl/gegl-9999.ebuild
index ec3928e17318..ec3928e17318 100644
--- a/media-libs/gegl/gegl-9999-r1.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index bfbb9941c6cd..66dc9cfbb0b0 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -1,6 +1,8 @@
 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-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 1449 BLAKE2B e059e7023637550c93bf22c2fa234c30945a95dac0617217cd2f8ff5e3db20ebb40d48bf8b991a1622c42fcdb4d0b43cb05a74784604a7f4f49e40c9d363a80f SHA512 95ba31e85a5f89faebe5d6fcf47e1abfbb41a3a14644db8e101bdc8bd4cc04f7adf5b71781ebdf2f07de0e66478d180c201a538ad39a0e5fc5ccf199fc8b6151
+EBUILD libgpod-0.8.3-r6.ebuild 1591 BLAKE2B 902ff0bef6b07d40ad0e7ff34b3401e266847a056eec0fedf06309331a4d46d3d22705b89d0a00a21011d7649574338589c4d8d9894dfdd3929ee74c8110fbad SHA512 836f1b36a48fdb9f442ae68dfeb9a9843ea650f62121be947952833ab4ec62a4c6bffca8460f23037a1a99019ee925bf1fb3f0d5e4f4795f5902c030462518b5
 MISC metadata.xml 484 BLAKE2B f3704943d01d8048940f1d359a12330aad167f6a7b3e67f37fd3c8b954aef0cde441b3e9b957414404e5a450a21acb899a8c07df838632063e45734cebea1b68 SHA512 40128d4bd5043e699ec2acdbc267eba5f2ca4cb54e7e05ca81d033fee88124e37824234ddfe2d51da7cbbb2757cb68801db4899c82c66895e5005bd85a211965
diff --git a/media-libs/libgpod/files/libgpod-0.8.3-implicit-int.patch b/media-libs/libgpod/files/libgpod-0.8.3-implicit-int.patch
new file mode 100644
index 000000000000..91219dd64a4f
--- /dev/null
+++ b/media-libs/libgpod/files/libgpod-0.8.3-implicit-int.patch
@@ -0,0 +1,19 @@
+Clang16 will not allow implicit integers by default.
+
+Bug: https://bugs.gentoo.org/885349
+Patch has been sent upstream here: https://sourceforge.net/p/gtkpod/patches/47/
+
+Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-11)
+
+--- a/tools/generic-callout.c
++++ b/tools/generic-callout.c
+@@ -663,8 +663,7 @@ static gboolean write_sysinfo_extended (const char *mountpoint,
+         return success;
+ }
+ 
+-
+-static char *get_info_from_usb (usb_bus_number, usb_device_number)
++static char *get_info_from_usb (guint usb_bus_number,guint usb_device_number)
+ {
+ #ifdef HAVE_LIBUSB
+         return read_sysinfo_extended_from_usb (usb_bus_number,
diff --git a/media-libs/libgpod/libgpod-0.8.3-r6.ebuild b/media-libs/libgpod/libgpod-0.8.3-r6.ebuild
new file mode 100644
index 000000000000..32255f4daaf5
--- /dev/null
+++ b/media-libs/libgpod/libgpod-0.8.3-r6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools udev
+
+DESCRIPTION="Shared library to access the contents of an iPod"
+HOMEPAGE="http://www.gtkpod.org/libgpod/"
+SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE="+gtk ios +udev"
+
+RDEPEND="
+	>=app-pda/libplist-1.0:=
+	>=dev-db/sqlite-3:3
+	>=dev-libs/glib-2.16:2
+	dev-libs/libxml2:2
+	sys-apps/sg3_utils:0=
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	ios? ( app-pda/libimobiledevice:= )
+	udev? ( virtual/udev )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/intltool
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS README{,.overview,.sqlite,.SysInfo} TROUBLESHOOTING )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-comment.patch # bug 537968
+	"${FILESDIR}"/${P}-segfault.patch # bug 565052
+	"${FILESDIR}"/${P}-pkgconfig_overlinking.patch
+	"${FILESDIR}"/${P}-implicit-int.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-pygobject
+		--disable-static
+		--without-hal
+		--without-mono
+		--without-python
+		--with-udev-dir="$(get_udevdir)"
+		$(use_enable gtk gdk-pixbuf)
+		$(use_with ios libimobiledevice)
+		$(use_enable udev)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/$(get_libdir)/pkgconfig/libgpod-sharp.pc || die
+	use udev && 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/libsdl/Manifest b/media-libs/libsdl/Manifest
index 8cea9c028340..159f7492ec94 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -4,6 +4,8 @@ AUX libsdl-1.2.15-slibtool.patch 2288 BLAKE2B 5018f714eb40320eb0d310de1553638d66
 AUX libsdl-1.2.15-strict-prototypes.patch 10377 BLAKE2B d0c029a3a4ecade9300d5ca4bb40a962fe0a89c1468ee9109e0552975153f8f9d8a5bf6c7a387af52513b75dc74cf53c6c727e1da372aedb85dd1ff69eb25249 SHA512 2c4c6b5aa8cdda8b49718457e25a7d86de3371be5589c061358a221d2c99fec1e8cb4b27e6850b4353f7ec36b1e226c4c553ed39927f30d8692481d5c21774e6
 DIST SDL-1.2.15_p20210224.tar.gz 3991106 BLAKE2B be0906950c80cddf15bc458f7734a3ebfa767b11e2f54bf9f771155f4420947900b95bbbebf01341d9dba4c1c7cfe9d54e43150e5f7781622b99668b3362adeb SHA512 3521fe996cf8a8ebb9beaa4802ac05cf5f3a2e7ed1c9b362a818d965b26ec8b3bbebfaac7c827feae44becf5bdd764378cb4282d129285f23a982b5c7474e006
 DIST SDL-1.2.15_p20221103.tar.gz 4002891 BLAKE2B 2329cec3579a2eb226ee7c8566f7f995b21b4f7fac3a0b40f237cf2d13576347a001dac96caf35d7da0fa95b4ee1684fbb9972a82e2691e4c83c1c0984b46029 SHA512 bd2cf4119dd9be99094d3379b15067817d4d40490d894e2338da9c365378d79edcfe2d7df03f57ac948f5fd1f949e5acb5b2233be484084a828c98af350f1830
+DIST SDL-1.2.15_p20221201.tar.gz 4002787 BLAKE2B 87b729cb16cfb36efa2b66166ef21d4c5c8bc99f8c8b4683885f04699122945a60512c5875d0c8425ddfe33b2eb901d11f27afbd9e3656cde3f30de5a5f1537c SHA512 5e70977cf5beaffebb28ae84f778e08d3cf56b2badda125ec1f08ac26c6b4e60a148d9ca9b2d7efee8a5fbc0b1a343d1d27a05be1c08e5d9251da67aea209659
 EBUILD libsdl-1.2.15_p20210224.ebuild 5059 BLAKE2B 1dc2cdebb3c5053b32b575abb49193c0feeaf1007c7446bb5e1c023b267785cf92c0503793572b840de822ead7936bc3387b890b80370eca5e8b20fc2a83398b SHA512 f676a7866500b2ee49e7da7b7b0d922b51dd9ae2477f847961590a88211655394537f0ddac7fab0b3cf4b52973e192bc15788841f92459d53407392369eb47b2
 EBUILD libsdl-1.2.15_p20221103.ebuild 4960 BLAKE2B 3464a6523798271f547da6a856910d75a123f5f200e36ffb04f4ca77b94d42c7739cd8c6e8e02be0b3a31c381ed485e43d250c2539a8e0ffeaa7dccecdccc5b4 SHA512 ed05b921ae942f7843bf970f9a7d082582eb742980cfdf25556847182ec7cd71bd006108b27e15d9575b4b66f9b04dae3252f76e153f21e221cb3297ee2f06a0
+EBUILD libsdl-1.2.15_p20221201.ebuild 4960 BLAKE2B e615d5e01dbb7018f406c0cd96b3bdb2f54431fc970ee26708d66f51089d9626222212afee18fb56ae0fb0345419abb1781a8403a83208c172174026543306e6 SHA512 b8482667853f2fe21d5365b796e7db929704f50bf6977fb14518137aacbcd9c97853d82c21dc8731a912e74d2a35bda7407d91ce65ca3ab1f4be25d941303659
 MISC metadata.xml 1499 BLAKE2B 8dd0fbe5e6f71338330483fa433316564c420e0cb9f52297fcb6c34a452bae23e25963effd2caa43c099e11759eca3c65dff64b5957460271d27b188688887cc SHA512 be99021a150b521998a455243f68d89c980bf5610bb67d1475746d7b64b009baa83294c1b2ddc101f3c164e22765ce073b9e27c07ca5bbbe9eaa4f75dc4fd305
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20221201.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20221201.ebuild
new file mode 100644
index 000000000000..3a3700ce6d5b
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.15_p20221201.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+MY_COMMIT="ca3acd25348edc9b6e984fc1712fd4d365931dc1"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="https://libsdl.org/"
+SRC_URI="https://github.com/libsdl-org/SDL-1.2/archive/${MY_COMMIT}.tar.gz -> SDL-${PV}.tar.gz"
+S="${WORKDIR}"/SDL-1.2-${MY_COMMIT}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+# WARNING:
+# If you turn on the custom-cflags use flag in USE and something breaks,
+# you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
+IUSE="aalib alsa custom-cflags dga fbcon +joystick libcaca nas opengl oss pulseaudio +sound static-libs tslib +video X xinerama xv"
+
+RDEPEND="
+	aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] )
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	)
+	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nas? ( x11-base/xorg-proto )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	pulseaudio? ( virtual/pkgconfig )
+	x86? (
+		|| (
+			>=dev-lang/yasm-0.6.0
+			>=dev-lang/nasm-0.98.39-r3
+		)
+	)"
+
+pkg_setup() {
+	if use custom-cflags ; then
+		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
+		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+		ewarn "libsdl without the custom-cflags use flag in USE."
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-sdl-config.patch
+	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-gamma.patch
+)
+
+DOCS=( BUGS CREDITS README-SDL.txt TODO WhatsNew )
+
+HTML_DOCS=( {docs,VisualC}.html docs/{html,images,index.html} )
+
+src_prepare() {
+	default
+
+	if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
+		# GCC at least has no idea what -fpascal-strings is
+		sed -i -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"/d' configure.ac || die
+		# We have trouble building against Frameworks with GCC for now (no Blocks support, etc)
+		# error: unknown type name ‘CGImageSourceAnimationBlock’
+		sed -i \
+			-e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_CARBON"/d' \
+			-e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX"/d' \
+			configure.ac || die
+	fi
+
+	AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=
+
+	if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
+		# We can't build against Cocoa because we lack Blocks + Objective C++ support in
+		# GCC (for now)
+		use video && myconf="${myconf} --disable-video-cocoa"
+		# CD support drags in audio
+		myconf="${myconf} --disable-cdrom"
+	else
+		myconf="${myconf} --enable-cdrom"
+	fi
+
+	if use !x86 && use !x86-linux ; then
+		myconf="${myconf} --disable-nasm"
+	else
+		myconf="${myconf} --enable-nasm"
+	fi
+	use custom-cflags || strip-flags
+	use sound || myconf="${myconf} --disable-audio"
+	use video \
+		&& myconf="${myconf} --enable-video-dummy" \
+		|| myconf="${myconf} --disable-video"
+	use joystick || myconf="${myconf} --disable-joystick"
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable prefix rpath) \
+		--disable-arts \
+		--disable-esd \
+		--enable-events \
+		--enable-threads \
+		--enable-timers \
+		--enable-file \
+		--enable-cpuinfo \
+		--disable-alsa-shared \
+		--disable-esd-shared \
+		--disable-sndio \
+		--disable-pulseaudio-shared \
+		--disable-arts-shared \
+		--disable-nas-shared \
+		--disable-osmesa-shared \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio) \
+		$(use_enable nas) \
+		$(use_enable X video-x11) \
+		$(use_enable dga) \
+		$(use_enable xv video-x11-xv) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable X video-x11-xrandr) \
+		$(use_enable dga video-dga) \
+		$(use_enable fbcon video-fbcon) \
+		--disable-video-ggi \
+		--disable-video-svga \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
+		--disable-video-ps3 \
+		$(use_enable tslib input-tslib) \
+		$(use_with X x) \
+		$(use_enable static-libs static) \
+		--disable-video-x11-xme \
+		--disable-video-directfb \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -type f -name "*.la" -delete || die
+	einstalldocs
+}
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 3996d4c71a4a..124dbed98dff 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,5 +1,3 @@
-DIST SDL_image-1.2.12_p20210314.tar.gz 10890897 BLAKE2B ddc3e0a49e4ce8fc3c46c5dabe277f9bd2db81f43880aadc8fbd3b6fa09254669fdac90ee4c3c7b92d5c7ec97747944c3953ea2dca065e646416391730cb22dd SHA512 f087472593cbaa9e65c5d643d7801e2ff5e49bee66502d8c094ea18bcd5f66e6da153d39bff7bc81ed20556c909fc4cce279275ff55ee00aebf07d39c27fd543
 DIST sdl-image-1.2.12_p20220527.tar.gz 10888198 BLAKE2B 413e130794ca3c59226e18f4380bc34fb497aadbe01da67ce2c9c76ebbaa5d3e47bad31043d823510ff62ef4bfaa4834d57799b7ea733f11ab66e58b37007583 SHA512 e0a091e1f1a646409c2f636b6e913b6532f31fa498a234fc669dd56b75dda34234818a22d7c3b5385cb50eb3af53316fa2f658a6739b40e4dd5d9513118143c6
-EBUILD sdl-image-1.2.12_p20210314-r1.ebuild 1846 BLAKE2B f33f73d5aefba0a6ac6c419fda7aa1d4e176afb31f86269024a9e214abfa4cbefaef3d5f3e83424cc6ec0ee084a25e990f0171a10b9a6110619f795ef6c61dd0 SHA512 ddc63c7001d990072dd4b06114863ac00314ab8e0041b7ea7dc23c7d4dd5f2d55ba8158f71b44cfd725f4941c3ddc581896d50fa4772db39fdc910e7e9ee73e4
 EBUILD sdl-image-1.2.12_p20220527-r1.ebuild 1880 BLAKE2B e64438e8700ed2fc25ea5a8b4ebafe9a815e7e934c9ced69e5151b413704462230a5fe14b4edeb89c4283c942605cf8f0269b7f71b5ac1f65cd879a5d97904ec SHA512 053898f2fd21bad529633fab8526cd08631f77a98e7db3c62a42e1f16146ff2d8a10e2088a79a8f7c22b9613a282f7da4bf9c70f8da23a0c6feb26b281c760fc
 MISC metadata.xml 365 BLAKE2B e7adf1771a0e52171d5ace8c77b8fb4b65019796c885f279e813b22f5a1abbefcee1fa9189a479788db4e5d1d2b96cf61f79e6881c816a19f0270fb69521e8d6 SHA512 80cc2d8d6af06bd4a43448c91747a2f04c477a59e19c9b46007b444c949e60664c26b8dc51755b67d7dfbd13a218b4126301f10fa3074d65740a8bfc7a0fe477
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20210314-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20210314-r1.ebuild
deleted file mode 100644
index 60e7a7dc94ea..000000000000
--- a/media-libs/sdl-image/sdl-image-1.2.12_p20210314-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We may want to grab backports from the SDL-1.2 branch upstream or
-# or take new snapshots every so often as no SDL 1 / 1.2.x releases
-# will be made anymore.
-
-inherit toolchain-funcs multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-MY_COMMIT="5d792dde2f764daf15dc48521774a3354330db69"
-DESCRIPTION="Image file loading library"
-HOMEPAGE="https://github.com/libsdl-org/SDL_image"
-SRC_URI="https://github.com/libsdl-org/SDL_image/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="gif jpeg png static-libs tiff webp"
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-	png? ( media-libs/libpng:0[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/SDL_image-${MY_COMMIT}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-jpg-shared \
-		--disable-png-shared \
-		--disable-tif-shared \
-		--disable-webp-shared \
-		$(use_enable static-libs static) \
-		$(use_enable gif) \
-		$(use_enable jpeg jpg) \
-		$(use_enable tiff tif) \
-		$(use_enable png) \
-		$(use_enable webp) \
-		--enable-bmp \
-		--enable-lbm \
-		--enable-pcx \
-		--enable-pnm \
-		--enable-tga \
-		--enable-xcf \
-		--enable-xpm \
-		--enable-xv
-}
-
-multilib_src_compile() {
-	emake OBJC="$(tc-getCC)"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	dobin .libs/showimage
-}
-
-multilib_src_install_all() {
-	dodoc CHANGES README
-	use static-libs || find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 4952c29081a3..03798947f0ca 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,13 +1,3 @@
-AUX sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch 553 BLAKE2B 9967bfa5cabffe68691fbb1002d01dafb14626596bc3fe0e15dcfd159dca4e542eb3998b08376b24870150beae7927fa3be7822cb9b68ad443544345a042cd6c SHA512 c411f372a817696838ef590db21579da96ca4f7f3170fdd6497ab204c3058138023d89ef379c810b8675091ae9e8c15bc3681085ca56a026cc1d3d22fdbef687
-AUX sdl-mixer-1.2.12-clang.patch 276 BLAKE2B 242e261861bab476d7f83148fc265daee990965cad8c3247dcf7e9e28e6b3aa9b2f491ac51c3517e3db4ab043ac8f8a118ca18c170f826f200df757de303e8db SHA512 2f318a73991783c75b32d05c9f81a42a7fd145a9d78e1cef00d1f2184f7c498e4c0a5a578bd2866315a940af76d4296de660ee94488530815694b7524d1d452e
-AUX sdl-mixer-1.2.12-incompatible-func-clang16.patch 3163 BLAKE2B 8bc065998cdf9d3b10c1fcf07c3eb95fb027dbdcf7a1444586a4d08ff407f9fd1b0dd459b3c028df4584690b7adbe6cd88efbfecf4b4eb2344bba2eb84834f4d SHA512 a14a616c2bcd1864afbe43c952ca013fdad0cc56421cc6893bcc89fa3d231ac98778dc1afe956cd2109a0f433fed54bf1a7d001f74bb86e621825de82bf64c14
-AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff4397cd3fd284f2f39102879f5cf4956603075ba79cf0753822a8cbdcf4d1196ac9839f59211e0128bf97c0a1f36f00e70cc7682 SHA512 64ad577331eceea0eb060d0c2b333b664d4edb62cb3336f97b53e5c88f6b4ecdc4004136fef0461cdf999b282064b5809e79308591239bfafbdc3df8360bf123
-AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
-AUX sdl-mixer-1.2.12-parallel-build-slibtool.patch 4288 BLAKE2B 3beaeddf4e3ff97dc2778dfc79f800b3749a0b0fa511872f353587a3e01ded1cdc9c57c3a89cb3e1a6a34d6848b19aaacba5a2a81c3129906f521c2afc71e2c0 SHA512 b6e42b2ee43b57a3a4f3e8b47b96aa5d94b37f0326cbecca7128eb8b34f0ac00dded506a4d5164156ca23cf1aeaca6aa92f40ec43991fa73a97274a2262fe679
-AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
-DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
 DIST sdl-mixer-1.2.12_p20221010.tar.gz 5861748 BLAKE2B 95b8e59bf796aa1a1593d8895aa153d62653fc9085e65c380cef3a0394201dd6c5c0deb323d6acecd4bca0e46d11f0ec94ebab8be872654e46d2d56231a1fd12 SHA512 5b15bf81b868968a09f82b160e371355e40a29c95a3e79c3cffa49ab5cc7c3212034d12301c21c8a44aef5c981a7a8fec3cb76e9dfe55619159a613b8dec6557
-EBUILD sdl-mixer-1.2.12-r5.ebuild 3601 BLAKE2B f51bbe3d0cc2c60b47ddf3626a07b45bbfcc5334adf4f1fef0d6fd681b9fac44d47e3e879397329355539288c6d983cc31a600f9e9c4403143688c221e1df881 SHA512 dd3969be4a66304acbf4366dfd387a00ae4558ad7d595f62c7e7790d6206be5fede4ae807abec8a5baaa9484c98b158e5431f4c663306bf6f120cd4b25aefcce
-EBUILD sdl-mixer-1.2.12-r7.ebuild 3660 BLAKE2B 8b140bae4093ad4cfb2d8f69890ec72735e20037033a17fbacb889e749e61d609bb3b252cfa58edb77dbf6d0f3413e6389d70ce5a1b50096606c7cba67274c30 SHA512 570cfd9dce65dfe49f1303d89a0eeb1e6ffb6c0582fd144b1900f274068bae76a9c7e52c04e2c5e80913f862df7deebde79f46696e966641389782c722b7bc3f
 EBUILD sdl-mixer-1.2.12_p20221010.ebuild 3121 BLAKE2B feb56a82e51f56fdb53cc4849f1a4813a1ae943697c62f7322e6d9cbebbc9d4effc68a93300ae8eab418b5a12dec038e3d284ca32fcb97dbfa4c183250aaea5e SHA512 8ea957de4bdd85ba2a8f9ca03177ace3d4e657b668f12ea7cd4ce6ffa45ee7741bbb41efcc49249aa5d704bdbd679e5353d86981ac4c17564b02b57276e326e8
 MISC metadata.xml 787 BLAKE2B 4a9a04b0b88ec853de52f1cc7f6ad63e6bd4e5a421906daa2e0935c32d756538ef9aee8631e5be96665dd37ec6c4e47d256e30b01f7cc6ca56f29baaaa5ef27d SHA512 46520c6a56e9d6ff2137e71bf728349ed167f7ec10417345528e6da051e482b3a27158e46ae973d1bd0f348cac9e3f65e8a02eef984b8e00fbb2aced256ad2bd
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch
deleted file mode 100644
index 369fe49558f0..000000000000
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: hasufell <hasufell@gentoo.org>
-Date: Fri, 8 Aug 2014 13:49:49 +0200
-Subject: [PATCH] Fix compiling against libmodplug-0.8.8.5
-
-pkg-config --cflags libmodplug no longer
-reports a subdir and thus we need to use
-#include "libmodplug/modplug.h" syntax.
----
- music_modplug.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/music_modplug.h
-+++ b/music_modplug.h
-@@ -1,6 +1,6 @@
- #ifdef MODPLUG_MUSIC
- 
--#include "modplug.h"
-+#include "libmodplug/modplug.h"
- #include "SDL_rwops.h"
- #include "SDL_audio.h"
- #include "SDL_mixer.h"
--- 
-2.0.4
-
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch
deleted file mode 100644
index 3c462bd97088..000000000000
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SDL_mixer-1.2.12.orig/music_mad.c
-+++ SDL_mixer-1.2.12/music_mad.c
-@@ -224,7 +224,7 @@
-   if ((mp3_mad->status & MS_playing) == 0) {
- 	/* We're not supposed to be playing, so send silence instead. */
- 	memset(stream, 0, len);
--	return;
-+	return 0;
-   }
- 
-   out = stream;
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch
deleted file mode 100644
index 747611880255..000000000000
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-https://github.com/libsdl-org/SDL_mixer/commit/03bd4ca6aa38c1a382c892cef86296cd621ecc1d
-https://github.com/libsdl-org/SDL_mixer/commit/9e6d7b67a00656a68ea0c2eace75c587871549b9
-https://github.com/libsdl-org/SDL_mixer/commit/d28cbc34d63dd20b256103c3fe506ecf3d34d379
-https://github.com/libsdl-org/SDL_mixer/commit/05b12a3c22c0746c29dc5478f5b7fbd8a51a1303
-
-From 03bd4ca6aa38c1a382c892cef86296cd621ecc1d Mon Sep 17 00:00:00 2001
-From: Ozkan Sezer <sezeroz@gmail.com>
-Date: Sun, 7 Oct 2018 10:15:50 +0300
-Subject: [PATCH] backported a warning fix. (from 2.0 branch commit
- 6fa075aa693e).
-
----
- dynamic_ogg.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dynamic_ogg.h b/dynamic_ogg.h
-index 822458d4..8eb91656 100644
---- a/dynamic_ogg.h
-+++ b/dynamic_ogg.h
-@@ -31,7 +31,7 @@ typedef struct {
- 	void *handle;
- 	int (*ov_clear)(OggVorbis_File *vf);
- 	vorbis_info *(*ov_info)(OggVorbis_File *vf,int link);
--	int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, char *initial, long ibytes, ov_callbacks callbacks);
-+	int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks);
- 	ogg_int64_t (*ov_pcm_total)(OggVorbis_File *vf,int i);
- #ifdef OGG_USE_TREMOR
- 	long (*ov_read)(OggVorbis_File *vf,char *buffer,int length, int *bitstream);
-
-From 9e6d7b67a00656a68ea0c2eace75c587871549b9 Mon Sep 17 00:00:00 2001
-From: Ozkan Sezer <sezeroz@gmail.com>
-Date: Sun, 7 Oct 2018 12:41:20 +0300
-Subject: [PATCH] fixed a warning after commit cb08fb0976e6
-
---- a/dynamic_ogg.c
-+++ b/dynamic_ogg.c
-@@ -52,7 +52,7 @@ int Mix_InitOgg()
- 			return -1;
- 		}
- 		vorbis.ov_open_callbacks =
--			(int (*)(void *, OggVorbis_File *, char *, long, ov_callbacks))
-+			(int (*)(void *, OggVorbis_File *, const char *, long, ov_callbacks))
- 			SDL_LoadFunction(vorbis.handle, "ov_open_callbacks");
- 		if ( vorbis.ov_open_callbacks == NULL ) {
- 			SDL_UnloadObject(vorbis.handle);
-
-From d28cbc34d63dd20b256103c3fe506ecf3d34d379 Mon Sep 17 00:00:00 2001
-From: Ozkan Sezer <sezeroz@gmail.com>
-Date: Mon, 25 Nov 2019 03:28:02 +0300
-Subject: [PATCH] dynamic_ogg.c: fixed ov_time_seek() signature for
- libvorbisidec.
-
-reported by Vitaly Novichkov.
---- a/dynamic_ogg.c
-+++ b/dynamic_ogg.c
-@@ -78,7 +78,7 @@ int Mix_InitOgg()
- 		}
- 		vorbis.ov_time_seek =
- #ifdef OGG_USE_TREMOR
--			(long (*)(OggVorbis_File *,ogg_int64_t))
-+			(int (*)(OggVorbis_File *,ogg_int64_t))
- #else
- 			(int (*)(OggVorbis_File *,double))
- #endif
-
-
-From 05b12a3c22c0746c29dc5478f5b7fbd8a51a1303 Mon Sep 17 00:00:00 2001
-From: Ozkan Sezer <sezeroz@gmail.com>
-Date: Wed, 23 Sep 2020 05:32:00 +0300
-Subject: [PATCH] mixer.c: add missing dynamic_fluidsynth.h include -- fixes
- bug #5296.
-
----
- mixer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mixer.c b/mixer.c
-index c653d6ed..431f6e69 100644
---- a/mixer.c
-+++ b/mixer.c
-@@ -34,6 +34,7 @@
- #include "load_voc.h"
- #include "load_ogg.h"
- #include "load_flac.h"
-+#include "dynamic_fluidsynth.h"
- #include "dynamic_flac.h"
- #include "dynamic_mod.h"
- #include "dynamic_mp3.h"
-@@ -1499,4 +1500,3 @@ int Mix_UnregisterAllEffects(int channel)
- }
- 
- /* end of mixer.c ... */
--
-
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch
deleted file mode 100644
index d99609f8ab25..000000000000
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-http://hg.libsdl.org/SDL_mixer/rev/56cad6484b04
-https://bugs.gentoo.org/445980
-
-# HG changeset patch
-# User Sam Lantinga <slouken@libsdl.org>
-# Date 1342998807 25200
-# Node ID 56cad6484b04f83c8d42428c755a046678506436
-# Parent  c92001a2c18f628698c58aa4e05a7335d10d0e9e
-Paul P Komkoff Jr fixed malloc/free mismatch in the MikMod driver
-
---- a/dynamic_mod.c
-+++ b/dynamic_mod.c
-@@ -93,6 +93,13 @@
- 			SDL_UnloadObject(mikmod.handle);
- 			return -1;
- 		}
-+		mikmod.MikMod_free =
-+			(void (*)(void*))
-+			SDL_LoadFunction(mikmod.handle, "MikMod_free");
-+		if ( mikmod.MikMod_free == NULL ) {
-+			SDL_UnloadObject(mikmod.handle);
-+			return -1;
-+		}
- 		mikmod.Player_Active =
- 			(BOOL (*)(void))
- 			SDL_LoadFunction(mikmod.handle, "Player_Active");
---- a/dynamic_mod.h
-+++ b/dynamic_mod.h
-@@ -35,6 +35,7 @@
- 	void (*MikMod_RegisterDriver)(struct MDRIVER*);
- 	int* MikMod_errno;
- 	char* (*MikMod_strerror)(int);
-+	void (*MikMod_free)(void*);
- 	BOOL (*Player_Active)(void);
- 	void (*Player_Free)(MODULE*);
- 	MODULE* (*Player_LoadGeneric)(MREADER*,int,BOOL);
---- a/music_mod.c
-+++ b/music_mod.c
-@@ -109,13 +109,13 @@
- 
- 	list = mikmod.MikMod_InfoDriver();
- 	if ( list )
--	  free(list);
-+	  mikmod.MikMod_free(list);
- 	else
- 	  mikmod.MikMod_RegisterDriver(mikmod.drv_nos);
- 
- 	list = mikmod.MikMod_InfoLoader();
- 	if ( list )
--	  free(list);
-+	  mikmod.MikMod_free(list);
- 	else
- 	  mikmod.MikMod_RegisterAllLoaders();
- 
-
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch
deleted file mode 100644
index d47a8d4534c8..000000000000
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://hg.libsdl.org/SDL_mixer/rev/2ebb0d016f27
-https://bugs.gentoo.org/445980
-
-# HG changeset patch
-# User Sam Lantinga <slouken@libsdl.org>
-# Date 1343000017 25200
-# Node ID 2ebb0d016f277f7f643d8a66ed0e1099e10d1fba
-# Parent  56cad6484b04f83c8d42428c755a046678506436
-Fixed normal linking with libmikmod and linking with earlier versions of libmikmod.
-
---- a/dynamic_mod.c
-+++ b/dynamic_mod.c
-@@ -97,8 +97,8 @@
- 			(void (*)(void*))
- 			SDL_LoadFunction(mikmod.handle, "MikMod_free");
- 		if ( mikmod.MikMod_free == NULL ) {
--			SDL_UnloadObject(mikmod.handle);
--			return -1;
-+			/* libmikmod 3.1 and earlier doesn't have it */
-+			mikmod.MikMod_free = free;
- 		}
- 		mikmod.Player_Active =
- 			(BOOL (*)(void))
-@@ -246,6 +246,11 @@
- 		mikmod.MikMod_RegisterDriver = MikMod_RegisterDriver;
- 		mikmod.MikMod_errno = &MikMod_errno;
- 		mikmod.MikMod_strerror = MikMod_strerror;
-+#if LIBMIKMOD_VERSION < ((3<<16)|(2<<8))
-+		mikmod.MikMod_free = free;
-+#else
-+		mikmod.MikMod_free = MikMod_free;
-+#endif
- 		mikmod.Player_Active = Player_Active;
- 		mikmod.Player_Free = Player_Free;
- 		mikmod.Player_LoadGeneric = Player_LoadGeneric;
-
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch
deleted file mode 100644
index a9996f9b10e7..000000000000
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-parallel-build-slibtool.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-https://github.com/libsdl-org/SDL_mixer/pull/311
-
-This is the SDL 1 variant of the SDL 2 patch also in Gentoo.
-See: 36d63464d341868f0ba533188238c805710f16e0 (Gentoo)
-Bug: https://bugs.gentoo.org/777420
-
-From 0b3b8a5f886648c95ce5ed0abb3d4e9e181d7ca6 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Tue, 6 Apr 2021 07:32:27 -0700
-Subject: [PATCH] build: Fix parallel make with slibtool.
-
----
-diff --git a/Makefile.in b/Makefile.in
-index 293608d..5d27df1 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -47,7 +47,7 @@ LT_RELEASE  = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
- LT_LDFLAGS  = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
--all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
-+all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
- 
- $(srcdir)/configure: $(srcdir)/configure.ac
- 	@echo "Warning, configure is out of date, please re-run autogen.sh"
-@@ -55,8 +55,9 @@ $(srcdir)/configure: $(srcdir)/configure.ac
- Makefile: $(srcdir)/Makefile.in
- 	$(SHELL) config.status $@
- 
--$(objects):
--	$(SHELL) $(auxdir)/mkinstalldirs $@
-+$(objects)/.created:
-+	$(SHELL) $(auxdir)/mkinstalldirs $(objects)
-+	touch $@
- 
- .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
- 
-@@ -78,7 +79,7 @@ install-hdrs:
- 	done
- 	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)/pkgconfig
- 	$(INSTALL) -m 644 SDL_mixer.pc $(libdir)/pkgconfig/
--install-lib: $(objects) $(objects)/$(TARGET)
-+install-lib: $(objects)/$(TARGET)
- 	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
- install-bin:
---- a/configure.in
-+++ b/configure.in
-@@ -626,14 +626,14 @@ OBJECTS=`echo $SOURCES`
- DEPENDS=`echo $SOURCES`
- OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- DEPENDS=`echo "$DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
--$(objects)/\2.lo: \1/\2.c\\
-+$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
- 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
- 
- OBJECTS_CXX=`echo $SOURCES_CXX`
- DEPENDS_CXX=`echo $SOURCES_CXX`
- OBJECTS_CXX=`echo "$OBJECTS_CXX" | sed 's,[[^ ]]*/\([[^ ]]*\)\.cpp,$(objects)/\1.lo,g'`
- DEPENDS_CXX=`echo "$DEPENDS_CXX" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.cpp,\\
--$(objects)/\2.lo: \1/\2.cpp\\
-+$(objects)/\2.lo: \1/\2.cpp \$(objects)/.created\\
- 	\$(LIBTOOL) --mode=compile \$(CXX) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
- OBJECTS="$OBJECTS $OBJECTS_CXX"
- DEPENDS="$DEPENDS $DEPENDS_CXX"
-@@ -643,7 +643,7 @@ VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
- VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.rc,\\
--$(objects)/\2.o: \1/\2.rc\\
-+$(objects)/\2.o: \1/\2.rc \$(objects)/.created\\
- 	\$(WINDRES) \$< \$@,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\\$,\\\\$,g'`
- 
-@@ -652,7 +652,7 @@ PLAYWAVE_OBJECTS=`echo $PLAYWAVE_SOURCES`
- PLAYWAVE_DEPENDS=`echo $PLAYWAVE_SOURCES`
- PLAYWAVE_OBJECTS=`echo "$PLAYWAVE_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
--$(objects)/\2.lo: \1/\2.c\\
-+$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
- 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
- PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\\$,\\\\$,g'`
- 
-@@ -661,7 +661,7 @@ PLAYMUS_OBJECTS=`echo $PLAYMUS_SOURCES`
- PLAYMUS_DEPENDS=`echo $PLAYMUS_SOURCES`
- PLAYMUS_OBJECTS=`echo "$PLAYMUS_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.c,\\
--$(objects)/\2.lo: \1/\2.c\\
-+$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
- 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
- PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\\$,\\\\$,g'`
- 
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch
deleted file mode 100644
index 38914fd77f15..000000000000
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=406739
-Nikos Chantziaras 2012-03-03 03:13:39 EST
-
-There's a bug in the current version of SDL_mixer where failing to load a WAV sample will result in freeing a resource twice, resulting in an application crash.  There is an upstream fix for this:
-
-http://hg.libsdl.org/SDL_mixer/rev/ea53a85853dd
-
-Upstream bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1418
-
---- a/mixer.c
-+++ b/mixer.c
-@@ -610,13 +610,15 @@
- 			break;
- 		default:
- 			SDL_SetError("Unrecognized sound file type");
--			return(0);			
-+			if ( freesrc ) {
-+				SDL_RWclose(src);
-+			}
-+			loaded = NULL;
-+			break;
- 	}
- 	if ( !loaded ) {
-+		/* The individual loaders have closed src if needed */
- 		SDL_free(chunk);
--		if ( freesrc ) {
--			SDL_RWclose(src);
--		}
- 		return(NULL);
- 	}
- 
-
-
-
-
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
deleted file mode 100644
index 45fe1cea8182..000000000000
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We may want to grab backports from the SDL-1.2 branch upstream or
-# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
-# will be made anymore.
-
-MY_P=${P/sdl-/SDL_}
-inherit autotools multilib-minimal
-
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
-
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-	mp3? ( || ( smpeg mad ) )
-	smpeg? ( mp3 )
-	mad? ( mp3 )
-	mod? ( || ( mikmod modplug ) )
-	mikmod? ( mod )
-	modplug? ( mod )
-"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
-	midi? (
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
-		timidity? ( media-sound/timidity++ )
-	)
-	mod? (
-		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
-		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	)
-	mp3? (
-		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
-		smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
-	)
-	vorbis? (
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-wav.patch
-	"${FILESDIR}"/${P}-clang.patch
-	"${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch
-	"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980
-	"${FILESDIR}"/${P}-parallel-build-slibtool.patch
-)
-
-src_prepare() {
-	default
-	sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die
-
-	# Hack to get eautoconf working
-	# eautoreconf dies with gettext mismatch errors for now
-	cat acinclude/* >aclocal.m4 || die
-	eautoconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-music-flac-shared
-		--disable-music-fluidsynth-shared
-		--disable-music-mod-shared
-		--disable-music-mp3-shared
-		--disable-music-ogg-shared
-		$(use_enable wav music-wave)
-		$(use_enable vorbis music-ogg)
-		$(use_enable mikmod music-mod)
-		$(use_enable modplug music-mod-modplug)
-		$(use_enable flac music-flac)
-		$(use_enable static-libs static)
-		$(use_enable smpeg music-mp3)
-		$(use_enable mad music-mp3-mad-gpl)
-		$(use_enable timidity music-timidity-midi)
-		$(use_enable fluidsynth music-fluidsynth-midi)
-		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
-	)
-	ECONF_SOURCE=${S} \
-		econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use playtools; then
-		emake DESTDIR="${D}" install-bin
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc CHANGES README
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# bug 412035
-	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi ; then
-		if use fluidsynth; then
-			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-			ewarn "environment variable to the location of a SoundFont file"
-			ewarn "unless the game or application happens to do this for you."
-
-			if use timidity; then
-				ewarn "Failing to do so will result in Timidity being used instead."
-			else
-				ewarn "Failing to do so will result in silence."
-			fi
-		fi
-	fi
-}
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r7.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r7.ebuild
deleted file mode 100644
index 04a69cf22ab4..000000000000
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r7.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We may want to grab backports from the SDL-1.2 branch upstream or
-# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
-# will be made anymore.
-
-MY_P=${P/sdl-/SDL_}
-inherit autotools multilib-minimal
-
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
-
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-	mp3? ( || ( smpeg mad ) )
-	smpeg? ( mp3 )
-	mad? ( mp3 )
-	mod? ( || ( mikmod modplug ) )
-	mikmod? ( mod )
-	modplug? ( mod )
-"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
-	midi? (
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
-		timidity? ( media-sound/timidity++ )
-	)
-	mod? (
-		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
-		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	)
-	mp3? (
-		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
-		smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
-	)
-	vorbis? (
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-wav.patch
-	"${FILESDIR}"/${P}-clang.patch
-	"${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch
-	"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980
-	"${FILESDIR}"/${P}-parallel-build-slibtool.patch
-	"${FILESDIR}"/${P}-incompatible-func-clang16.patch
-)
-
-src_prepare() {
-	default
-	sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die
-
-	# Hack to get eautoconf working
-	# eautoreconf dies with gettext mismatch errors for now
-	cat acinclude/* >aclocal.m4 || die
-	eautoconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-music-flac-shared
-		--disable-music-fluidsynth-shared
-		--disable-music-mod-shared
-		--disable-music-mp3-shared
-		--disable-music-ogg-shared
-		$(use_enable wav music-wave)
-		$(use_enable vorbis music-ogg)
-		$(use_enable mikmod music-mod)
-		$(use_enable modplug music-mod-modplug)
-		$(use_enable flac music-flac)
-		$(use_enable static-libs static)
-		$(use_enable smpeg music-mp3)
-		$(use_enable mad music-mp3-mad-gpl)
-		$(use_enable timidity music-timidity-midi)
-		$(use_enable fluidsynth music-fluidsynth-midi)
-		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
-	)
-	ECONF_SOURCE=${S} \
-		econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use playtools; then
-		emake DESTDIR="${D}" install-bin
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc CHANGES README
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# bug 412035
-	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi ; then
-		if use fluidsynth; then
-			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-			ewarn "environment variable to the location of a SoundFont file"
-			ewarn "unless the game or application happens to do this for you."
-
-			if use timidity; then
-				ewarn "Failing to do so will result in Timidity being used instead."
-			else
-				ewarn "Failing to do so will result in silence."
-			fi
-		fi
-	fi
-}
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index 52c3d8487905..2d2b09a6c74e 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,5 +1,3 @@
-DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
 DIST sdl-net-1.2.8_p20221010.tar.gz 373106 BLAKE2B 00f98a3326d5aba85acf839c4c4d02e8ac78d99bf5633ce8cdf0cf8bb281f2a730769a9ef769c834f847db74712c6715928b37520ed5c60aa06e4d828c8650e2 SHA512 643f0505252e32cca88456edcce7d41f0b37e1362bcdf26d714d2473be323ed70b43c825eb96522d9562be5f6830cb9062250de2e8b1244bbc8d31fa800d3342
-EBUILD sdl-net-1.2.8-r2.ebuild 895 BLAKE2B 751089b5fc5ae6abb7b25c07d045638110db282915bd51fd26e418ff28b0662720d9e4f6d265ad24ddb54a94b76c8fc09aa5975103e25dd72e6d204701a8aba1 SHA512 4dab254afeeff6b43e942062a85740f4b100a0ef16ed00288beaa7599e51f656032815139fda5e53b7ea67cece0c3c0bc52920d65c07448649175776858a08c6
 EBUILD sdl-net-1.2.8_p20221010.ebuild 895 BLAKE2B e1a9e20b3ffe2d715b2e2c4b449e994487abf3f53f5a3226f6b02d256161b285e12f7f78cfddb0e96a24c936426b17aec6714214d5c21db4a6a32483289ea54f SHA512 844b1d0a5b2696a004d309dedf63251ef6e7c13bd9b44ce0943cc640a46c0a840e97b9adbead4643d23da31370c2beb95ff09756f7f12b42fe00176b6ff76518
 MISC metadata.xml 337 BLAKE2B 48ae83a7d75050dc1fc90dcd86e5f56d347f356af4c7d7e6bf0e7bd58a3cb56cc9a1d20391a195066f2198651e41c0af832b427490aad18c15d21250cd598f88 SHA512 9cf8aeb4bb0d72403d3c13e45bac9dbb54f791d1e783f384c5b87c014fa8b25696c29679479aa40d9ea96a2c6c71263bf1f3e3094f2930bc28fb11c32e36254a
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
deleted file mode 100644
index 84df8fbab01b..000000000000
--- a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# We may want to grab backports from the SDL-1.2 branch upstream or
-# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
-# will be made anymore.
-
-inherit multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-
-DESCRIPTION="Simple Direct Media Layer Network Support Library"
-HOMEPAGE="https://github.com/libsdl-org/SDL_net"
-SRC_URI="https://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="media-libs/libsdl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --disable-gui
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index c88f30b853d1..1a7dc6388d13 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -1,9 +1,4 @@
-AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d497c0f895d883692508a3ce366a6742533bf4d29b8eff4f09df1753b77819b71dec119950e3ff8a2059e3fb960bb63848be1 SHA512 aba96ba3d3027604d6fcb2f184db37c7ffd2e6204236cf114393e9f5e26acf4040856eb7e4354981f650875d5f991b3cf59c42ff723d75cf7a7e1dd5649f0845
-AUX sdl-sound-1.0.3-physfs-3.0.1.patch 1574 BLAKE2B 9829f6429041322c0eaa41d547dbebfe03bf730e80d76b5b15afc66c123a87e0ab1fd9819372e37ed505c1a9e214c27583cb56e12920b3fe0c88a211177c79bc SHA512 ac228520e1c8e682b58919335ea117289087962b4b98fae23e743830709d8dca60a3d22c7171ee13bdbf84f528cfddcad70231edbba64a7cec88c7dd77295eca
-AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c
 AUX sdl-sound-1.0.3_p20220525-underlinking.patch 1476 BLAKE2B b9abb706fe79cb6c9a6a22a43bbd9a4f7f45babc37db6acd090901b74e766e54bb3a9ba602b4f3a1a1f5c59e598656c0d5f18c0865ea93898ceb8570eca30307 SHA512 6a6d3aff706a4b0aae3a3dd3e5a72a0e124f70f6c1a418c282ba49b454f9a210e74f223a4de0c34de3d5dfef1d1b4fbf72f642730b436f7bdffa4fcb0edb9126
-DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
 DIST sdl-sound-1.0.3_p20220525.tar.gz 1044804 BLAKE2B f82f7649bd411290d12ec6b6a4879e0f6a5a155b764b307b087ce2cad5b81dc0ac6fed674c666f470201e5aab5182d9e0c4b6f0d9fc94e9d4bc61d7dacd61cdd SHA512 0f4923e8234334c65697c1d9453a66b05aafd859b1586d9ed26005d93f4a27175b06a77616f09e450b586d0f21c7a1d76761de0fe5f1b144d444e6a2379055b5
-EBUILD sdl-sound-1.0.3-r3.ebuild 2134 BLAKE2B f1f5429dfb243da26936fa89ee47e50cd171defc1b470b75af1ad3666071ceba5ee1bf580d75c425370984d87a6e36507332bb8d6b6712ff72d8c8dbb506fa04 SHA512 05794ef14e799d102fc2354c4f3e02106b66c5ee8dee1c5a6a30f28a95a6294e7bc0b61b0e859d9c286b9f885a043dd361767fbbc8e532459d930c347b064d70
 EBUILD sdl-sound-1.0.3_p20220525.ebuild 2038 BLAKE2B 9e2cfad010b82d8229c0b6655775d457c079bbe3a56cc5c4ea6f053a3fcf1ba785628187a1cfe5626d9edf1b9e76685d685477f7405064bd08ffba4af70a845d SHA512 7fefd4ff0310701970a1ff02f261a8121314d0a3bd93e478d91cb95b368aee62eadf6bf6a2da31e78a3ce6856a4b38fb3b7b71a15059a994f26091235bbbd48a
-MISC metadata.xml 530 BLAKE2B 1927045e4dd57e0b2ac63cc6ef1165009aafe2a981c2d8bc0ff9ea3e3b9473fdca4945b8b7227a285a425bfd97fa4a65809e7ebe6477ac95bfa0952ea5a6190d SHA512 cc8d087914c0ab7689a7cc9ce230de1d531c4e424bed3b73c21a215a8b681314c9e0fad95039cbf4ec2e4e93911ac876821505ac7f0872c251240121d8e77b77
+MISC metadata.xml 414 BLAKE2B efdb3d95fb3bba31d475763e49261f18e944363a4a439652fbfa2ea5d35d242667e44216d4c7c61419aa71f71bdfd19b7ea30addc2dc0b24e63be358ec6983fc SHA512 34b6d84997c64c224b4d53939a78b97dda4b02a78fb0427d5562f299b3f5aa69b55363bb88af9c110f3e5a5ed7180617838e372a9b95b33d3be30b5df4892710
diff --git a/media-libs/sdl-sound/files/sdl-sound-1.0.3-automake-1.13.patch b/media-libs/sdl-sound/files/sdl-sound-1.0.3-automake-1.13.patch
deleted file mode 100644
index 0bd2aa272a78..000000000000
--- a/media-libs/sdl-sound/files/sdl-sound-1.0.3-automake-1.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- SDL_sound-1.0.3/configure.in
-+++ SDL_sound-1.0.3/configure.in
-@@ -43,7 +43,7 @@
- AC_CANONICAL_TARGET
- 
- dnl Setup for automake
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE(SDL_sound, $VERSION)
- 
- 
diff --git a/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch b/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch
deleted file mode 100644
index 1aa06d37f5cd..000000000000
--- a/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/playsound/physfsrwops.h.ini	2008-04-17 13:56:21.000000000 -0400
-+++ b/playsound/physfsrwops.h	2017-12-23 05:05:31.657371092 -0500
-@@ -39,7 +39,7 @@
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *           of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
-+SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
- 
- /**
-  * Open a platform-independent filename for writing, and make it accessible
-@@ -51,7 +51,7 @@
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *           of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
-+SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
- 
- /**
-  * Open a platform-independent filename for appending, and make it accessible
-@@ -63,7 +63,7 @@
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *           of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
-+SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
- 
- /**
-  * Make a SDL_RWops from an existing PhysicsFS file handle. You should
-@@ -75,7 +75,7 @@
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *           of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
-+SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
- 
- #ifdef __cplusplus
- }
diff --git a/media-libs/sdl-sound/files/sdl-sound-1.0.3-underlinking.patch b/media-libs/sdl-sound/files/sdl-sound-1.0.3-underlinking.patch
deleted file mode 100644
index 36eb24a3e2fb..000000000000
--- a/media-libs/sdl-sound/files/sdl-sound-1.0.3-underlinking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Aug 21 12:42:14 UTC 2012
-Subject: build system
-
-fix underlinking
-
---- SDL_sound-1.0.3/Makefile.am
-+++ SDL_sound-1.0.3/Makefile.am
-@@ -32,7 +32,8 @@
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- libSDL_sound_la_LIBADD =	\
- 	decoders/libdecoders.la	\
--	$(TIMIDITY_LIB) $(MPGLIB_LIB)
-+	$(TIMIDITY_LIB) $(MPGLIB_LIB) \
-+	-lm
- 
- EXTRA_DIST =	\
- 	CREDITS \
diff --git a/media-libs/sdl-sound/metadata.xml b/media-libs/sdl-sound/metadata.xml
index f155573d634e..3399f3f29004 100644
--- a/media-libs/sdl-sound/metadata.xml
+++ b/media-libs/sdl-sound/metadata.xml
@@ -5,9 +5,6 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="physfs">Enable support for various formats through <pkg>dev-games/physfs</pkg>.</flag>
-	</use>
 	<upstream>
 		<bugs-to>mailto:sdlsound@icculus.org</bugs-to>
 		<!-- stable-1.0 branch -->
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild
deleted file mode 100644
index 7380edd37f8e..000000000000
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# We may want to grab backports from the SDL-1.2 branch upstream or
-# even take snapshots from it in future, as no SDL 1 / 1.x releases
-# will be made anymore.
-
-inherit autotools multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-
-DESCRIPTION="A library for handling the decoding of various sound file formats"
-HOMEPAGE="https://icculus.org/SDL_sound/"
-SRC_URI="https://icculus.org/${MY_PN}/downloads/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
-	mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	mpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
-	physfs? ( >=dev-games/physfs-3.0.1[${MULTILIB_USEDEP}] )
-	speex? (
-		>=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}"-automake-1.13.patch
-	"${FILESDIR}"/"${P}"-physfs-3.0.1.patch
-	"${FILESDIR}"/"${P}"-underlinking.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-aiff
-		--enable-au
-		--enable-midi
-		--enable-raw
-		--enable-shn
-		--enable-voc
-		--enable-wav
-		$(use_enable flac)
-		$(use_enable mikmod)
-		$(use_enable modplug)
-		$(use_enable mp3 mpglib)
-		$(use_enable mpeg smpeg)
-		$(use_enable physfs)
-		$(use_enable speex)
-		$(use_enable static-libs static)
-		$(use_enable vorbis ogg)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index ba7321ac43b9..b31ea012d75b 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,7 +1,3 @@
-AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
-AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
-DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
 DIST sdl-ttf-2.0.11_p20220525.tar.gz 5421461 BLAKE2B 93422fdc912369a503ef0bc2f474a7afd749396176a295484b9ff8b1c0b5a06c2a5a21b93c91b616816f7c1c5f3ff35c611618251e8ae7f2b2d337109a3cab56 SHA512 a371488b59b8d1d2b067ee8bb67912d11875ac202912ffd31d5fee4630dac205e2e757505ab4dba3267e4d2700c043873c3b37aa6813ece8333f1b25fa096346
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1398 BLAKE2B ea98a92174df8aa8d932c6c3e296250bd83fac8796a94e7a1c992c939b35d577813a8508a1f5df2ce5d37c7dc04a5d2bd0b07c5377a1afb7a2461c545fe00e76 SHA512 e6e4f41689ccd531dd2766d0417e787ab28d48c784f2cf7554f6cf69c91dacc98ae07ad5aa10d8b134a2703146b7cd1a945f48c677d4778a45f62bdf61b5764b
 EBUILD sdl-ttf-2.0.11_p20220525.ebuild 1238 BLAKE2B d7e124ac68d06880704650902a02826297fa17ca6ed04fe9b691aae5a6d81740d50a041f5abbc6ef27bca59947e209fd748fd3c0a0453628dc4145fba2bdf0c7 SHA512 620e39192ae7001887d3730a0cb3f092a7ac82aa7344b234e846f0621f3ff2e26768aec5000118cc16da61cb1e8933dcd9b7df163d90b6e9325209ddda17c0ef
 MISC metadata.xml 604 BLAKE2B 28ad2d239df5d6096bbc586e3842b9b41739a76a740995955e08e7a324cca40566fed84a4050447cb9cb8edfbe14562f62bdfe7aa6b5b1c407104a0912dfc013 SHA512 07e5dc681f113e2657bb37307e4a28b1630e142d42685403f04af8505f9eb52dc6bae513710ca0b94170174d75455d0315dd75c784d99ae0cd1ac79fde3cf793
diff --git a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch
deleted file mode 100644
index 02b06356190e..000000000000
--- a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/654758
-
---- SDL_ttf-2.0.11/configure.in
-+++ SDL_ttf-2.0.11/configure.in
-@@ -64,6 +64,7 @@
- 	;;
- esac
- 
-+PKG_PROG_PKG_CONFIG
- 
- dnl Check for iconv (character conversion library; see iconv.m4)
- dnl This isn't available on many systems
-@@ -94,6 +95,17 @@
- dnl
- dnl Get the cflags and libraries from the freetype-config script
- dnl
-+PKG_CHECK_MODULES(
-+	FREETYPE2,
-+	freetype2,
-+	[
-+		ft_found=yes
-+		CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
-+		LIBS="$LIBS $FREETYPE2_LIBS"
-+	],
-+	ft_found=no
-+)
-+
- AC_ARG_WITH(freetype-prefix,[  --with-freetype-prefix=PFX   Prefix where FREETYPE is 
- installed (optional)],
-             freetype_prefix="$withval", freetype_prefix="")
-@@ -101,6 +113,7 @@
- where FREETYPE is installed (optional)],
-             freetype_exec_prefix="$withval", freetype_exec_prefix="")
- 
-+if test "x$ft_found" != "xyes" ; then
- if test x$freetype_exec_prefix != x ; then
-      freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
-      if test x${FREETYPE_CONFIG+set} != xset ; then
-@@ -123,6 +136,7 @@
-     CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
-     LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
- fi
-+fi
- 
- dnl Check for SDL
- SDL_VERSION=1.2.4
diff --git a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch
deleted file mode 100644
index 7bd3a3993bb1..000000000000
--- a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -33,6 +33,7 @@
- 	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- endif
-+libSDL_ttf_la_LIBADD = @MATHLIB@
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = SDL_ttf.pc
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
deleted file mode 100644
index 217cd490b4d7..000000000000
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# We may want to grab backports from the SDL-1.2 branch upstream or
-# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
-# will be made anymore.
-
-inherit autotools multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-DESCRIPTION="library that allows you to use TrueType fonts in SDL applications"
-HOMEPAGE="https://github.com/libsdl-org/SDL_ttf"
-SRC_URI="https://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="static-libs X"
-
-RDEPEND="
-	X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with X x)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc CHANGES README
-	if ! use static-libs ; then
-		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	fi
-}
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index d2a041e54364..070afab92854 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1,7 +1,3 @@
-DIST SDL2_ttf-2.0.15.tar.gz 4479718 BLAKE2B 8401ed4979dade5affa86be4463958d0c90f72d3b2874540cf868e460c5d6773a2b11eaf6d13792d23193085050970ebf877b707b0febaba9be29c4329be9d7c SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd
-DIST SDL2_ttf-2.0.18.tar.gz 14896353 BLAKE2B d1409353b06a1ca33e053ffabf1b05222705ba7df0cdf95b12724218649981a1d7b6f895c82b90d6da26bb34561760d6d37b62c0f64ea8672319cb6d7d0ce882 SHA512 9a211c07d4180fe3fb2f7614e907d1002ddf3bb77b57f62116f22dc29a6043f091deb6a8113656d26a44d2f06b9abcc372aa3e0761500fcf47b455406973a1c7
 DIST SDL2_ttf-2.20.0.tar.gz 13156472 BLAKE2B f31b1193beaaab0e2aaab6f56c82f4931db79ab81526398e20176c9fb121409d4f9f56109aa721d645496f6c228450cb95bda48c40037f1a3f904154e0e21fee SHA512 14c78cfa04b938f0bd141d841a9473a1678bb04d01a96391cfa37ae3e7e316c90f175aff7d052499f7d982f59b823813e4cfdd367631a44b08b85f9b60d09c8c
-EBUILD sdl2-ttf-2.0.15.ebuild 1012 BLAKE2B bf74f411dec169458fc2d3bbd4ef6767dd71dfdcb864a0ced60dafa9d66c1336ada53285218304c935389d1d8e76362bb0560a796302ea982a2030a96747f5d1 SHA512 7c4aea39529b338e10a3d005ea3563f49f8b38481fcfb47546112c7900ab59696f7b9c0591291b0528c3e24e4f0b4c7e7d3140a735688fb6021c267792e820ab
-EBUILD sdl2-ttf-2.0.18-r1.ebuild 1263 BLAKE2B d269da1117ec58cf58adaa977c1e169da57b8be96f24ff3f616adeb633e719fbd6f8315ed194d98d49fa07b395796724512b1e710e4efedada2fa5f717c33024 SHA512 ba3422de6719f35811bfd1fb510256b6747cdc1168bcf1bc968c7d68e956a0e6b6b7348f3c0f572a8a5c6a8617ac8b9f217d2fedeb1b6e0c7b513783ed9d1561
-EBUILD sdl2-ttf-2.20.0.ebuild 1079 BLAKE2B 7790dcdc1d4f6dfcf512b1bc1c3d296b321f5a4c9340a929bec67eae282bbf775b76a5ef56bf4a4a2303427ad7aeb73b783312d251bb40d9db961004131929e7 SHA512 ddce50a5e4d7bc6b3b1d0b8626db85d980a183c5a171671224abda3ceee19734d495cd57837e1e97079af2dcc5181668235bd3120763703ef6ab5d9d78631acb
+EBUILD sdl2-ttf-2.20.0.ebuild 1076 BLAKE2B fd14cb726b64f81a946be027cebe1c12916374ad6920cc6e423aa7b9f7156a24e890528530f467ccd78c0fc839e830138e3f7e37dbc3ec2db9848be6d151f2b3 SHA512 b9ca4431ebafc924c248f4b51ad460f6c36523e52190070fab956d520e8d74ace8393bbc32e2f699314bbfd3bfb8a070c505548a3917f09c5f98bb297e0fc265
 MISC metadata.xml 694 BLAKE2B def65e69533279b6f10d380901d78f004e3524413598d9ecd2661262eb2ae5f6331f1a0fa2729084b2b5fea05e0811057098686a4fa4f65d6a92a0cdb667310a SHA512 f5d6cb83fe8ff6db7f3c6c171a435e7682470299738cbe4a90a7132dc5bd0083f0abd052754c037e10b23a94dc57e57a938bf489334191ed9c144e4493d28232
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
deleted file mode 100644
index 06ad86a41cfd..000000000000
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal
-
-MY_P="SDL2_ttf-${PV}"
-DESCRIPTION="library that allows you to use TrueType fonts in SDL applications"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/"
-SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="static-libs X"
-
-RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with X x)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild
deleted file mode 100644
index 6094378764b6..000000000000
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal
-
-MY_P="SDL2_ttf-${PV}"
-DESCRIPTION="Library that allows you to use TrueType fonts in SDL applications"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_ttf/"
-SRC_URI="https://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+harfbuzz static-libs X"
-
-# On bumps, check external/ for versions of bundled freetype + harfbuzz
-# to crank up the dep bounds.
-RDEPEND=">=media-libs/libsdl2-2.0.12[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.10.4[harfbuzz?,${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	harfbuzz? ( >=media-libs/harfbuzz-2.8.0:=[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-freetype-builtin
-		--disable-harfbuzz-builtin
-
-		$(use_enable static-libs static)
-		$(use_with X x)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.20.0.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.20.0.ebuild
index a7e29e6862e1..108ec9c9870c 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.20.0.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.20.0.ebuild
@@ -7,7 +7,7 @@ inherit cmake-multilib
 
 MY_P="SDL2_ttf-${PV}"
 DESCRIPTION="Library that allows you to use TrueType fonts in SDL applications"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_ttf/"
+HOMEPAGE="https://github.com/libsdl-org/SDL_ttf"
 SRC_URI="https://github.com/libsdl-org/SDL_ttf/releases/download/release-${PV}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index a2ab62562b6a..cc973c16c557 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -9,5 +9,5 @@ DIST simage-1.8.0-src.tar.gz 797069 BLAKE2B 6f9e3512c9815974b1b2799306c6567f6b5a
 DIST simage-1.8.1.tar.gz 829490 BLAKE2B 05d3a3f7ff7c195b55d454a2bc6e086cd4439fd6e9fb694c1926a4c0be5142661bf2c7d6593f6b7ae0681234f28c7b92e325ed0928a0fb4df5e846b30fbf9156 SHA512 e6f211f453f67f601d157e36c6c4845af1e0601dd3d8d97fbb993c50dc54c8908c2e1e345ea1dd578b8fa2dca823d8e1bab7f29a0a0d73732ca597cc5c673cbe
 EBUILD simage-1.8.0-r3.ebuild 2251 BLAKE2B 2285ab82702265a1b411deca67020ca7a772d8976af70801b4a78f803b7e7f13e1bfd691058312a0efb9ce246227fb11b4d06849dbe9703f8cb164944ded0e05 SHA512 0bae7aa9021470ee69048c36296ca49057f181e5a6a50756fc4eade4741cba47f5c80b69ead041380c69bcdf3528f8c1ad8b25bf0c10d8ccb46de9287f9ac146
 EBUILD simage-1.8.1-r3.ebuild 2231 BLAKE2B 3b7ce33d708ac8a6ee891d3fe453aa34e8b470a178b6c5381d16df163a927c0b826dedb57906bf60d8e6a783ff23505c7469afc3b9e6adea46779eba502a782d SHA512 46c2e89b536b52ef8c31bbfce9adaa0a17770f767637ff4416a805af55a2c8ecba732fbc0d5462c3c9987d845dcd7713a244661ec0650a524f2301e45dcf75b4
-EBUILD simage-9999-r1.ebuild 2176 BLAKE2B fe901b146db9e227161a3e62b06bcaf0d7a3cedaa4a1905440313e5950c6a4ad4c8e7a44ddfc6e70ddd317360dcd97fe66740c082236a5cb486919a61b8981b9 SHA512 0e2f9fff14cdaf3f68702ce5e79789df310ac57f399227cb9cee17d3c92c87237bf256d35c32152354d30b009c85dd458150539a02ffda2f2e48ccb681b100a4
+EBUILD simage-9999.ebuild 2176 BLAKE2B fe901b146db9e227161a3e62b06bcaf0d7a3cedaa4a1905440313e5950c6a4ad4c8e7a44ddfc6e70ddd317360dcd97fe66740c082236a5cb486919a61b8981b9 SHA512 0e2f9fff14cdaf3f68702ce5e79789df310ac57f399227cb9cee17d3c92c87237bf256d35c32152354d30b009c85dd458150539a02ffda2f2e48ccb681b100a4
 MISC metadata.xml 298 BLAKE2B bbb65357f89a126895f808f22a14211302edac1ef368ceea547a0cb8b0a4d62e50e61572a47a2d9a123d22f33f384cd7fe6b0604d78ce83701608db0725a076d SHA512 70fe0d52216ae4902962671d07b6667c1aad035e9d6a737700a44d3f0ef08670e965cf692dcb3fe106a0dd62125b9fd433bd980cc46a3be4d34cfef7d79da06e
diff --git a/media-libs/simage/simage-9999-r1.ebuild b/media-libs/simage/simage-9999.ebuild
index ae5ce0a704a3..ae5ce0a704a3 100644
--- a/media-libs/simage/simage-9999-r1.ebuild
+++ b/media-libs/simage/simage-9999.ebuild
diff --git a/media-libs/tiff-compat/Manifest b/media-libs/tiff-compat/Manifest
new file mode 100644
index 000000000000..1e60cac6ec3c
--- /dev/null
+++ b/media-libs/tiff-compat/Manifest
@@ -0,0 +1,7 @@
+AUX tiff-4.4.0-hylafaxplus-regression.patch 1100 BLAKE2B 7d45e1b8c9ff6e2956b7190618dea150fa7868585bfe68259e637e5a98655b51b985fe3ee3b08b5ada3335ee2f887d683524a105653c16d48d90b2a23d850d69 SHA512 4232c057d472651d2532814c288399a8bdcb1c0397d860ecb994489d863c2ddf05ce8a2b014ce750b0619f50cc439979607baa2dcb2b9aa97f02c8352ec60170
+AUX tiff-4.4.0_rc1-skip-thumbnail-test.patch 1176 BLAKE2B aec14df94825b3709941b065bfa6eccfef5727ab237feb4022e614749964541b5528f9724763bd86ead8aa1584590cb7900f17123c58d3e4b45a470f240a4d68 SHA512 e58fc43a081205107175122dc6f05281e2c11ef961645e3f0ac4ee6b54c22d3898c978c8ea8984394fc74a92bd81c4fb4a37915d32689314fb97c7f3aeb5b6c1
+AUX tiff-4.5.0_rc1-skip-tools-tests-multilib.patch 1477 BLAKE2B d6daf36a65fcd2afbec2fd5e5f3b75fa4547f32079c0709e98a48b0ba28d993346dfc597ef46b37db5242f2e28c7dd87a1616fe9324ca2d9659a97040bcd23db SHA512 0c7b69ddd772d73fde800e610ed533804392d0ea4ddefa409f52abcf174cc77cd1f4160a03076043d654533e98812d642d5166030d97b273ec80f5288bf3eda3
+DIST tiff-4.4.0.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9
+DIST tiff-4.4.0.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c
+EBUILD tiff-compat-4.4.0.ebuild 2750 BLAKE2B 5245e3429faa316ce6ebf8703003d73b4be5e18e61f44ffed6823585495df58438966994ebe99cd26e9c22a2e011bf3227ff677a4500a0b6af0e82121a8b57f7 SHA512 495fb2208d1864214d8134b404fca4cab753e5e8ed6626049073e4241fd470097da5a2f8b8ad61a771f919e49c7b15ce50cb169b9d5df82d798c558a5a6d597f
+MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469
diff --git a/media-libs/tiff-compat/files/tiff-4.4.0-hylafaxplus-regression.patch b/media-libs/tiff-compat/files/tiff-4.4.0-hylafaxplus-regression.patch
new file mode 100644
index 000000000000..c640f6e1b1a7
--- /dev/null
+++ b/media-libs/tiff-compat/files/tiff-4.4.0-hylafaxplus-regression.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/883641
+https://gitlab.com/libtiff/libtiff/-/issues/489
+https://gitlab.com/libtiff/libtiff/-/commit/72de8fd00be8a583a6b16cc0b700105020d249ba
+
+From 72de8fd00be8a583a6b16cc0b700105020d249ba Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Tue, 29 Nov 2022 14:57:27 +0100
+Subject: [PATCH] TIFFWriteRawStrip(): restore capabilities to append data in
+ the current strip (fixes #489)
+
+This fixes a regression of libtiff 4.4.0
+--- a/libtiff/tif_write.c
++++ b/libtiff/tif_write.c
+@@ -341,10 +341,13 @@ TIFFWriteRawStrip(TIFF* tif, uint32_t strip, void* data, tmsize_t cc)
+ 			return ((tmsize_t) -1);
+ 	}
+ 
+-	tif->tif_curstrip = strip;
++    if (tif->tif_curstrip != strip)
++    {
++        tif->tif_curstrip = strip;
+ 
+-	/* this informs TIFFAppendToStrip() we have changed or reset strip */
+-	tif->tif_curoff = 0;
++        /* this informs TIFFAppendToStrip() we have changed or reset strip */
++        tif->tif_curoff = 0;
++    }
+ 
+         if (td->td_stripsperimage == 0) {
+                 TIFFErrorExtR(tif, module,"Zero strips per image");
+-- 
+GitLab
+
+
diff --git a/media-libs/tiff-compat/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch b/media-libs/tiff-compat/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch
new file mode 100644
index 000000000000..574a02dd3487
--- /dev/null
+++ b/media-libs/tiff-compat/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch
@@ -0,0 +1,32 @@
+https://gitlab.com/libtiff/libtiff/-/merge_requests/334
+
+From 62a49eeb3f0c986c5fcbfc53cd3d7ef2a3fab9b3 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 21 May 2022 01:01:35 +0100
+Subject: [PATCH] test/tiffcp-thumbnail.sh: skip test if tools aren't built
+
+In Gentoo, we avoid building the tools for multilib (32-bit, x86) builds on
+amd64/x86_64 because we only need the library to keep binary applications working.
+
+This causes a test failure in just tiffcp-thumbnail.sh as the 'thumbnail'
+binary isn't built. Skip it if unavailable as it's only a single test.
+
+Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421
+--- a/test/tiffcp-thumbnail.sh
++++ b/test/tiffcp-thumbnail.sh
+@@ -4,7 +4,12 @@
+ #
+ . ${srcdir:-.}/common.sh
+ 
++if [ ! -x "${TIFFCP}" ] || [ ! -x "${THUMBNAIL}" ] ; then
++	# https://gitlab.com/libtiff/libtiff/-/issues/421
++	exit 77
++fi
++
+ outfile1=o-tiffcp-thumbnail-in.tif
+ outfile2=o-tiffcp-thumbnail-out.tif
+ f_test_convert "${TIFFCP} -c g3:1d" "${IMG_MINISWHITE_1C_1B}" "${outfile1}"
+-f_test_convert "${THUMBNAIL}" "${outfile1}" "${outfile2}"
+\ No newline at end of file
++f_test_convert "${THUMBNAIL}" "${outfile1}" "${outfile2}"
+GitLab
diff --git a/media-libs/tiff-compat/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch b/media-libs/tiff-compat/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch
new file mode 100644
index 000000000000..831afd287226
--- /dev/null
+++ b/media-libs/tiff-compat/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch
@@ -0,0 +1,52 @@
+https://gitlab.com/libtiff/libtiff/-/merge_requests/334
+
+From e7605b93b12c2bf3c864910c23ac976045b5a05a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 21 May 2022 01:01:35 +0100
+Subject: [PATCH 1/2] test (autotools): skip script tests if tools aren't built
+
+In Gentoo, we avoid building the tools for multilib (32-bit, x86) builds on
+amd64/x86_64 because we only need the library to keep binary applications working.
+
+This causes a test failure in e.g. tiffcp-thumbnail.sh as the 'thumbnail'
+binary isn't built. Skip it if unavailable.
+
+Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -55,13 +55,14 @@ XFAIL_TESTS =
+ CLEANFILES = test_packbits.tif o-*
+ 
+ if HAVE_JPEG
++if TIFF_TOOLS
+ JPEG_DEPENDENT_CHECK_PROG=raw_decode
+ JPEG_DEPENDENT_TESTSCRIPTS=\
+ 	tiff2rgba-quad-tile.jpg.sh \
+ 	tiff2rgba-ojpeg_zackthecat_subsamp22_single_strip.sh \
+ 	tiff2rgba-ojpeg_chewey_subsamp21_multi_strip.sh \
+ 	tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh
+-
++endif
+ else
+ JPEG_DEPENDENT_CHECK_PROG=
+ JPEG_DEPENDENT_TESTSCRIPTS=
+@@ -76,6 +77,7 @@ check_PROGRAMS = \
+ endif
+ 
+ # Test scripts to execute
++if TIFF_TOOLS
+ TESTSCRIPTS = \
+ 	ppm2tiff_pbm.sh \
+ 	ppm2tiff_pgm.sh \
+@@ -156,6 +158,9 @@ TESTSCRIPTS = \
+ 	testfax4.sh \
+ 	testdeflatelaststripextradata.sh \
+ 	$(JPEG_DEPENDENT_TESTSCRIPTS)
++else
++TESTSCRIPTS=
++endif
+ 
+ # This list should contain the references files
+ # from the 'refs' subdirectory
+-- 
+GitLab
diff --git a/media-libs/tiff-compat/metadata.xml b/media-libs/tiff-compat/metadata.xml
new file mode 100644
index 000000000000..34a785d9586c
--- /dev/null
+++ b/media-libs/tiff-compat/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>codec@gentoo.org</email>
+		<name>Gentoo Codec Project</name>
+	</maintainer>
+	<longdescription>
+		TIFF image library and tools, mostly for scanner and fax
+		support, but also used by GIS and other imaging tools.
+	</longdescription>
+	<upstream>
+		<remote-id type="gitlab">libtiff/libtiff</remote-id>
+		<remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id>
+		<remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/tiff-compat/tiff-compat-4.4.0.ebuild b/media-libs/tiff-compat/tiff-compat-4.4.0.ebuild
new file mode 100644
index 000000000000..8efd709a9037
--- /dev/null
+++ b/media-libs/tiff-compat/tiff-compat-4.4.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION="$(ver_cut 1-3)"
+
+# Release signer can vary per version but not clear if others will be doing
+# them in future, so gone with Even Rouault for now as he does other geosci
+# stuff too like PROJ, GDAL. Previous release manager of TIFF was
+# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying
+# who made releases.
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc
+inherit multilib-minimal verify-sig libtool flag-o-matic
+
+MY_P="${P/_rc/rc}"
+DESCRIPTION="Tag Image File Format (TIFF) library (compat package for libtiff.so.4)"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="https://download.osgeo.org/libtiff/${MY_P/-compat}.tar.xz"
+SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P/-compat}.tar.xz.sig )"
+S="${WORKDIR}/${PN/-compat}-$(ver_cut 1-3)"
+
+LICENSE="libtiff"
+SLOT="4"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+cxx jbig jpeg lzma test webp zlib zstd"
+RESTRICT="!test? ( test )"
+
+# bug #483132
+REQUIRED_USE="test? ( jpeg )"
+
+RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )"
+
+# Easier to keep this even though we remove the headers to avoid
+# triggering multilib header check
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN/-compat}-4.4.0_rc1-skip-thumbnail-test.patch
+	"${FILESDIR}"/${P/-compat}-hylafaxplus-regression.patch
+)
+
+src_prepare() {
+	default
+
+	# Added to fix cross-compilation
+	elibtoolize
+}
+
+multilib_src_configure() {
+	append-lfs-flags
+
+	local myeconfargs=(
+		--without-x
+		$(use_enable cxx)
+		$(use_enable jbig)
+		$(use_enable jpeg)
+		$(use_enable lzma)
+		$(use_enable webp)
+		$(use_enable zlib)
+		$(use_enable zstd)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	sed -i \
+		-e 's/ tools//' \
+		-e 's/ contrib//' \
+		-e 's/ man//' \
+		-e 's/ html//' \
+		Makefile || die
+}
+
+multilib_src_install_all() {
+	rm -r "${ED}"/usr/include || die
+	rm -r "${ED}"/usr/share || die
+	rm -r "${ED}"/usr/lib*/pkgconfig || die
+	rm -r "${ED}"/usr/lib*/*.so || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 4a9540288597..d3da155e6907 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -8,5 +8,5 @@ AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
 EBUILD vigra-1.11.1-r8.ebuild 3738 BLAKE2B 0d22270015bb925a481a42822a2fab441279d5381c5435f9606d42eb2d425edf05f450c67efbfa96546ec746025cb089f11010d456a985ae7dcd3094caf64544 SHA512 0286cf74edad98297bb671e22cd8ede7461c0121d845d1cd4e6a58119d4698e52adaddba415af7b871afcdcdf24fee72e37bfdabca3d5a0fb0a6b9ff5dee8b59
-EBUILD vigra-9999-r1.ebuild 3518 BLAKE2B ea581e89ccc15545dc1b0d66cf20533b5bd4b141a2d9e36e2e418a812ea125ab3f1881791bc858940103cb1341508044b0a29b409ae5faf3bb82e7647846f071 SHA512 4e00480317d42490c7b27f37c53b0d7dbccf188a63a3f217f04528ba5e06ad9a739d55546a955e291eec2cded19d6f25a96ecb15128eadb7a4eca20c9f792d38
+EBUILD vigra-9999.ebuild 3518 BLAKE2B ea581e89ccc15545dc1b0d66cf20533b5bd4b141a2d9e36e2e418a812ea125ab3f1881791bc858940103cb1341508044b0a29b409ae5faf3bb82e7647846f071 SHA512 4e00480317d42490c7b27f37c53b0d7dbccf188a63a3f217f04528ba5e06ad9a739d55546a955e291eec2cded19d6f25a96ecb15128eadb7a4eca20c9f792d38
 MISC metadata.xml 414 BLAKE2B bcbbb527644261523508734e3c7b317cbb77ea247c72941e92cf9eaa711e74ad86ee75126d9c719814ee1f006a2778a92c6e393de24ab30844a78bc86f3ff525 SHA512 aab36cff2d1cec9819f81da7cd1580d9bcffb93ad90d0f499462913b7e85ebc953b5bccc036d329d8246102fd4a9663c48688246c7bcf7c8da18937721a3e821
diff --git a/media-libs/vigra/vigra-9999-r1.ebuild b/media-libs/vigra/vigra-9999.ebuild
index 352b006f77bb..352b006f77bb 100644
--- a/media-libs/vigra/vigra-9999-r1.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
author	V3n3RiX <venerix@koprulu.sector>	2022-12-16 09:35:57 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-16 09:35:57 +0000
commit	b982051e7c8e12c3810a0d21d30d687b406b3ae5 (patch)
tree	1f40c63a302b92f633c075f289851ab62633babe /media-libs
parent	b62381b18b4bf2e919cbfbae11ebcad391e38e77 (diff)