15 files changed, 425 insertions, 378 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e1e7910e6ac8..c06973e798fb 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 1f7bd5261a7d..d7814bc5ad10 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,14 +1,10 @@
+AUX harfbuzz-10.4.0-meson-freetype.patch 3656 BLAKE2B 47650ca4014737d2cfdfbb9b09b883780a5d1827f7eed7492d433b797c24f9bc03f41ea8502bfeb4d02384c93b10e8ceef30baf6dc441fff1328192a15ebf0cb SHA512 88c2f898a717b026a13cbbd46c9ff3fbdf295ee99fe45224c8916c20357a4fc5ffdd588d43fde3e6e2b1e78f1107284e05198049e9bf456965169c3b21bf9ba4
 DIST harfbuzz-10.1.0.tar.xz 17922136 BLAKE2B 7d78e31d045b984d8d1a8b1d1f8f282ff9b7dc748ffd65355266266e75064b14eb94ec6b1418e208ebb0fffb99ef174d1978ab14f0c318c1112c2d8005285979 SHA512 14b0e8fd417af9c78f36e532e3737c163902b85837be1028a8fd569508639b87afeb56f70a2313ba2f0f6d4b72bb6cee0bf50fb333dfc503c713e4d9cd86e9c3
-DIST harfbuzz-10.2.0.tar.xz 17957608 BLAKE2B 6711eed94c4cbc7b4d37ec17c3bd4512110f873d0f179bc213773ad89af99cd349f92ea8ce957ddeb5084ad3719e2436cb712a880b02668954c69e0b1c3ceb98 SHA512 522028a5de91a042832b1634fc4b7636b1b42c5ee258882d155bc33fca7b30de19ca714b4f9ea8dc3d3f537142ca2305fcf5af04bec4edbf608f557c12742e54
-DIST harfbuzz-10.3.0.tar.xz 18148276 BLAKE2B 0e941f08e499148c210af8f250b3d5304912956e66a203b901bbb1bb7244a9d1505df6ad63328c25a4abc60bdf99611b99c2464ad2cd8ea83d401599753fc1cb SHA512 ae476cd3409d7acd37a78146b05aa741c38e7bc8c54ff6c78b3c5f945e93523f9ce8f9e46776a25b3f92b7e613f96c34df6295f69dc479a4823a071adae78355
 DIST harfbuzz-10.4.0.tar.xz 18120656 BLAKE2B 21a2ed81ead5f06658c6153ad756631aacf5522bf58cdc5a54585cc03b0562c634ecabcd686fa76d2dda3497eb1a7d9e10c771e29da62c5946438d9ed8c46075 SHA512 73e202225aeef6174ebd3b8b226ad9d5afb48c40ecdc1bc26d1bc5f0cf1d832a8ffc2fe5b7ae3b7c8f848552dd57116d407f44120c6813b59dbe9faed0c346dc
-DIST harfbuzz-11.0.0.tar.xz 18152228 BLAKE2B 0775321ea24a257d6609f59e9f0fa7129416575938ff11e16f9df2a33bd9391e0dc20bf4be75131f1b8e15961dc04e3fef1d6ff88de71c556a9aab7889f0a185 SHA512 1184b9b56c4b9f28cac03a6746d699d522c4194818e2b3fe4c286400c249bad209260137dc5c2aacc640ddd0a44db8999006e137dcabf8493b890a9fcf359170
 DIST harfbuzz-11.0.1.tar.xz 18158636 BLAKE2B db36c39915a96e82ba1aefe48dd753e925ff32c05b5ac96a737da4c55e6416e18898c2cc9aa8aa8c24ea996a8fdf57838d4de274f0a583ad54c3a7ed04168cb6 SHA512 0eca477c9c2225fdfa2c571a302606aa5026ba809ca1b61b9edd7397b601c57fc1f7919068e9e193cc49b6ea643a8918934aa7cab1ac59947358e06fb1ad645d
 EBUILD harfbuzz-10.1.0.ebuild 2389 BLAKE2B 14dfefb842168446682edbd996827c0b32c163fd7997de89d7c43182bd90c0b80bf8ad799170ed0e948bea13ec301859d592712a66d8f97e1645b57507f782c0 SHA512 33ee38ac532f32abe13b45ce708137b09801fa16043e9e51ac64993df503de3e50a2e4f3f6e76295b09492a8f7ef41df3c9a8fec826bc9659d31a3a06fc8a9a0
-EBUILD harfbuzz-10.2.0.ebuild 2397 BLAKE2B 626bd3c11e350eb8fe8344dc1e940e9a67d02da902368e4b0ab97cf24c072391b06dd54d97ee8bfc4ba1a9f67a95cf5e37a3b48a694632dd9702215dec6f52d2 SHA512 95d951c443a4f323d27f8dcd210ab0afb4c9ec477ca0da39737429145f09c417722979c828c56d2f88da8ebf31f6df47bf009801effc615523f501f5025dcbe8
-EBUILD harfbuzz-10.3.0.ebuild 2397 BLAKE2B 626bd3c11e350eb8fe8344dc1e940e9a67d02da902368e4b0ab97cf24c072391b06dd54d97ee8bfc4ba1a9f67a95cf5e37a3b48a694632dd9702215dec6f52d2 SHA512 95d951c443a4f323d27f8dcd210ab0afb4c9ec477ca0da39737429145f09c417722979c828c56d2f88da8ebf31f6df47bf009801effc615523f501f5025dcbe8
+EBUILD harfbuzz-10.4.0-r1.ebuild 2454 BLAKE2B 5a2cd95d386111b42fe24be8d5f9b9269e404497f13af31af880bb3498cb4594de78b05baf1031febdc10e970abab232127023b82f35962603b15b0ab13387ed SHA512 48ce1b992e27ccfc9cb842ec4b6e3cd3fff8a1d3626be3754298ad611ae1d09b09c4b04a168a9fdb372dc5a8257791aa238849c738842076583cba86905c4b7d
 EBUILD harfbuzz-10.4.0.ebuild 2397 BLAKE2B 626bd3c11e350eb8fe8344dc1e940e9a67d02da902368e4b0ab97cf24c072391b06dd54d97ee8bfc4ba1a9f67a95cf5e37a3b48a694632dd9702215dec6f52d2 SHA512 95d951c443a4f323d27f8dcd210ab0afb4c9ec477ca0da39737429145f09c417722979c828c56d2f88da8ebf31f6df47bf009801effc615523f501f5025dcbe8
-EBUILD harfbuzz-11.0.0.ebuild 2421 BLAKE2B 4239c39bdd52feab71b1d2b40ff6c1eed8bba6e53b6f5b923ff9e7d5f31a3684f283dee5bb00e5b079d1fdd8fd4fe2132770bbbd46a579500ca56cd30253d61c SHA512 ec41f607e96ca85c98352bf87dd464ae085ac9c474eaf5fea125fd15605fdb06866b8a45f854bedbfd1358a5639f7c7d039387143592c349c565c2f3fca599ab
 EBUILD harfbuzz-11.0.1.ebuild 2440 BLAKE2B a2eea338047d73e4014e7e82b29505680ccd28823c76d1818858079514b95cdc90b8f66bd9b0435f35d0500566264ec84d0e21155f4952abe6af430a3973cd63 SHA512 a9f05daf401224ec7b6164f35693db2eb9e5dd8e9e327a8361ae756a69df934a73421e064ff1cf4b87262e6d96737936c662da825b8f0c0ed63c666e4cdbfd03
 EBUILD harfbuzz-9999.ebuild 2440 BLAKE2B a2eea338047d73e4014e7e82b29505680ccd28823c76d1818858079514b95cdc90b8f66bd9b0435f35d0500566264ec84d0e21155f4952abe6af430a3973cd63 SHA512 a9f05daf401224ec7b6164f35693db2eb9e5dd8e9e327a8361ae756a69df934a73421e064ff1cf4b87262e6d96737936c662da825b8f0c0ed63c666e4cdbfd03
 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70
diff --git a/media-libs/harfbuzz/files/harfbuzz-10.4.0-meson-freetype.patch b/media-libs/harfbuzz/files/harfbuzz-10.4.0-meson-freetype.patch
new file mode 100644
index 000000000000..fea5b1e99411
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-10.4.0-meson-freetype.patch
@@ -0,0 +1,87 @@
+From 5809f47dea83644ed78c2c7884bfea94932e4c94 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Tue, 25 Feb 2025 17:43:41 +0200
+Subject: [PATCH] meson: refactor freetype dependency logic
+
+Simplify and respect -Dfreetype=disabled again.
+
+Bug: https://bugs.gentoo.org/950274
+Fixes: 1ad48fddd08654052da4f8a93609e7f4380d5c42
+See-Also: 604fe807078ce41d0ac7742547e90b17c066709f
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+(cherry picked from commit 628b868f44acce749adc08ff61f2d9c19c9e2bbe)
+---
+ meson.build | 46 +++++++++++++++++++---------------------------
+ 1 file changed, 19 insertions(+), 27 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 1460c2a9d..ab46197f2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -102,44 +102,36 @@ check_funcs = [
+ 
+ m_dep = cpp.find_library('m', required: false)
+ 
+-if meson.version().version_compare('>=0.60.0')
++# Painful hack to handle multiple dependencies but also respect options
++if get_option('freetype').disabled()
++  freetype_dep = dependency('', required: false)
++else
+   # Sadly, FreeType's versioning schemes are different between pkg-config and CMake
+-  # pkg-config: freetype2, cmake: Freetype
++
++  # Try pkg-config name
+   freetype_dep = dependency('freetype2',
+                             version: freetype_min_version,
+                             method: 'pkg-config',
+                             required: false,
+                             allow_fallback: false)
+   if not freetype_dep.found()
+-    freetype_dep = dependency('FreeType',
++    # Try cmake name
++    freetype_dep = dependency('Freetype',
+                               version: freetype_min_version_actual,
+                               method: 'cmake',
+-                              required: get_option('freetype'),
+-                              default_options: ['harfbuzz=disabled'],
+-                              allow_fallback: true)
+-  endif
+-else
+-  # painful hack to handle multiple dependencies but also respect options
+-  freetype_opt = get_option('freetype')
+-  # we want to handle enabled manually after fallbacks, but also handle disabled normally
+-  if freetype_opt.enabled()
+-    freetype_opt = false
+-  endif
+-  # try pkg-config name
+-  freetype_dep = dependency('freetype2', version: freetype_min_version, method: 'pkg-config', required: freetype_opt)
+-  # when disabled, leave it not-found
+-  if not freetype_dep.found() and not get_option('freetype').disabled()
+-    # Try cmake name
+-    freetype_dep = dependency('Freetype', version: freetype_min_version_actual, method: 'cmake', required: false)
+-    # Subproject fallback, `allow_fallback: true` means the fallback will be
+-    # tried even if the freetype option is set to `auto`.
++                              required: false,
++                              allow_fallback: false)
++    # Subproject fallback
+     if not freetype_dep.found()
+-      freetype_dep = dependency('freetype2',
+-                                version: freetype_min_version,
+-                                method: 'pkg-config',
++      freetype_proj = subproject('freetype2',
++                                version: freetype_min_version_actual,
+                                 required: get_option('freetype'),
+-                                default_options: ['harfbuzz=disabled'],
+-                                allow_fallback: true)
++                                default_options: ['harfbuzz=disabled'])
++      if freetype_proj.found()
++        freetype_dep = freetype_proj.get_variable('freetype_dep')
++      else
++        freetype_dep = dependency('', required: false)
++      endif
+     endif
+   endif
+ endif
+-- 
+2.49.0
+
diff --git a/media-libs/harfbuzz/harfbuzz-10.3.0.ebuild b/media-libs/harfbuzz/harfbuzz-10.3.0.ebuild
deleted file mode 100644
index 05db84d3684c..000000000000
--- a/media-libs/harfbuzz/harfbuzz-10.3.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://harfbuzz.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-# 0.9.18 introduced the harfbuzz-icu split; bug #472416
-# 3.0.0 dropped some unstable APIs; bug #813705
-# 6.0.0 changed libharfbuzz-subset.so ABI
-SLOT="0/6.0.0"
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# bug #790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		-Dcoretext=disabled
-		-Dchafa=disabled
-		-Dwasm=disabled
-
-		$(meson_feature cairo)
-		$(meson_feature glib)
-		$(meson_feature graphite graphite2)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-		# Breaks building tests..
-		#$(meson_native_use_feature utilities)
-
-		$(meson_use experimental experimental_api)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	# harfbuzz:src / check-static-inits times out on hppa
-	meson_src_test --timeout-multiplier 5
-}
diff --git a/media-libs/harfbuzz/harfbuzz-10.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-10.4.0-r1.ebuild
index 05db84d3684c..e18eb39d44ae 100644
--- a/media-libs/harfbuzz/harfbuzz-10.2.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-10.4.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
@@ -44,6 +44,8 @@ BDEPEND="
 	introspection? ( dev-util/glib-utils )
 "
 
+FILES=( "${FILESDIR}/${P}-meson-harfbuzz.patch" ) # bug 950274
+
 src_prepare() {
 	default
 
diff --git a/media-libs/harfbuzz/harfbuzz-11.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-11.0.0.ebuild
deleted file mode 100644
index 0ef7b83c9387..000000000000
--- a/media-libs/harfbuzz/harfbuzz-11.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://harfbuzz.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-# 0.9.18 introduced the harfbuzz-icu split; bug #472416
-# 3.0.0 dropped some unstable APIs; bug #813705
-# 6.0.0 changed libharfbuzz-subset.so ABI
-SLOT="0/6.0.0"
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# bug #790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		-Dcoretext=disabled
-		-Dchafa=disabled
-		-Dfontations=disabled
-		-Dwasm=disabled
-
-		$(meson_feature cairo)
-		$(meson_feature glib)
-		$(meson_feature graphite graphite2)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-		# Breaks building tests..
-		#$(meson_native_use_feature utilities)
-
-		$(meson_use experimental experimental_api)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	# harfbuzz:src / check-static-inits times out on hppa
-	meson_src_test --timeout-multiplier 5
-}
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 0d4b8c80366e..95335a3aa51d 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,8 +4,10 @@ DIST SDL2-2.30.11.tar.gz 7585207 BLAKE2B e6038cbf79bec299fae9cfdc4b84ff3e28343ab
 DIST SDL2-2.30.7.tar.gz 7525092 BLAKE2B a494ca856f43009957f62ef4e5d401777c2d1f8518e4cc1a1b9fc9a2efedc5031b9cb5e2965aeb7347821310153cf3abc4c898dd493962fb268c5c55081ed7c3 SHA512 1a16c10f500dea97bd4e4ca5f560fe4ab8e746c975d30751b7cf567868743d105ce84055d480e4c18b290adac485e67d1bb14ae1719644d6e42223d96f299a16
 DIST SDL2-2.32.0.tar.gz 7625288 BLAKE2B 491796e2b222a49eaead76e60bb6e58bed881667cc61d0ba81ed0e083134b6b13089ca2c4658f6576b2924ddeaffcc9ff5c7532841e7b0797c6bd1769ad74a53 SHA512 a91b8105125f06118e8bfce2a5553fe053f7158dd02f06a36cfc535f09c401eb7da11072e576c6bf6e41fa2e02b08483b9cc4e11c658578b762e1b6c326a45bb
 DIST SDL2-2.32.2.tar.gz 7627192 BLAKE2B 5ea13fe60f2388e2ff61f60413ec71be84a429b6b2dbcb98bee8bf59e931396e164347288c68453e2932d9201fc8e53907cfe2fa0e456ae0383edaefa901df9b SHA512 9a608974a69b97fd5589bf8feed4742498f8f07731bcd5b99dd518089acda8b9b4216197b6adf7ca79ef1a9fe47c542033eefe94763e66229b1d9ba5207da5c5
+DIST sdl2-compat-2.32.54.tar.gz 2816984 BLAKE2B 71b28567f0039c1833f3b80f0bc9d025d08d3dc0bc9fe688e18e38064c2ee84149f6e7b66c04004c1d63fd18d141ca2d0a20280a72b12d48fa0f5976a9100cd5 SHA512 857aee92ab78692b9d9fb1734ee8d0bd59cff6d427a4aef8406e98858182299420d1f129676ad9a939e2b263fe7c78991a0a9ff955bae920f5530919a1f9a0ea
 EBUILD libsdl2-2.30.11.ebuild 5854 BLAKE2B 1f848aa68c23cf8baddf3475e6a6ecdb2ee808641e264f156d04f71d5b2929c9e888b83d256d18f39049888989e9d040be6a408e3e8ec94a1b1effe88a816767 SHA512 15091253a1955645fbf0722a09aa941e5e7f71f5e7210928c20ae9f533b6dd7efc2977e99018bfb021f7db603313515b6284d0c2064b07bb69fda8fabc1b5f51
 EBUILD libsdl2-2.30.7-r1.ebuild 5811 BLAKE2B 509a377438a52b19c86b9a5cba987346aad542f3acd13d14b8f95d36d267634161ce3410c4a4baadd55765bac43b2934f6cc7dd104cc0b09494d282ad23c7233 SHA512 9cecce56d7e7bfc0d052cc49c3e932b95334455d83a0b049dff2511cdcfb93885c428a4c59cdb3a7bec34e7bc66867bc911d99e55cb6ce45b3f90e9441473896
 EBUILD libsdl2-2.32.0.ebuild 5946 BLAKE2B 0bb589317bccec40a47fc435472008b182c2da572dd5e8376818a8ea61f61f0c61bccf9257eb5baba7be60c2b262873da041599f2de88138d0d1e7c31bb633e0 SHA512 f99e6332006c8390df88baf56c4d2bd6916c9698e12975655d2a9e369439040b4d86d1a87b9f9e0ffa7e2007bdf553c91964c27d08c4b31c4041f30ebd99f5f2
 EBUILD libsdl2-2.32.2.ebuild 6002 BLAKE2B befbffbb25f1ced33730d6b026a6ce26a2d74b077c23cd499a19f62ca13ec8702c12662eef2e449327b81e98a7681f53fde8222618295efdd01d66a20ebcc0a9 SHA512 1262b146379a41dbdca7236225c519884ac0852f8b580bcf10cb0888db7904ce69437b2d7aad637c35fe9837dbfa6a87f1c46b42492e8a872cde8942cb6c9029
-MISC metadata.xml 1942 BLAKE2B 89c75b0790ba1e8c489c4d4d9fca4451a863068a4f75e5b97b408d7aba35fd9ba6ec5a855465588f5c143f09380835b89b637b8fb1e09c6b2391a79ed69144b9 SHA512 9e37d24a408b748fef53884442fe5ac5db548657675e23571705680b157cadcb584a059d7f066765fb68e80bf2ba247b2a01cfa095a465aa9dbf03db0e1c4334
+EBUILD libsdl2-2.32.54.ebuild 1823 BLAKE2B 08c88dfe016f798ad7f3204c5b908ab934dfbab23af28ac72f03cdfc823cd465de39a0ce20fb7f30cfba8fbb9b6fd89b7438f4de4e50e6595578f5599ab80565 SHA512 92d64dc5741e2c248db268fd16f75c81cb2b1ae1d2f9ae271e16bc02a977fe2bc46e3bf4dd0821c0e6714ac1f8a0a968547ab3a7a2a43fa989f6e836424e535d
+MISC metadata.xml 2004 BLAKE2B 6606917fa4ba566a3d87bddecb1d7e4cdd8b4f885dbeed616661bb0a3e385540df0a82d7fe51c5858212a070ac3d74b196d794f3ed1d03ed71e941eeed1c233c SHA512 7c9f5bdeb524ae66684e89ea866ae81c47047971eecc811f476b582d129c72d9087b884e7032fb21875999d84879316a49d36be7151b1737ef2179b5b35d7037
diff --git a/media-libs/libsdl2/libsdl2-2.32.54.ebuild b/media-libs/libsdl2/libsdl2-2.32.54.ebuild
new file mode 100644
index 000000000000..e08083c44cb1
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.32.54.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+# TODO: switch to new description when non-compat is gone, this is so it is
+# not displayed on packages.gentoo.org which may be confusing for users
+DESCRIPTION="Simple Direct Media Layer"
+#DESCRIPTION="Simple Direct Media Layer 2 compatibility wrapper around SDL3"
+HOMEPAGE="https://www.libsdl.org/"
+SRC_URI="https://www.libsdl.org/release/sdl2-compat-${PV}.tar.gz"
+S=${WORKDIR}/sdl2-compat-${PV}
+
+LICENSE="ZLIB"
+SLOT="0"
+# unkeyworded for testing
+#KEYWORDS="~amd64"
+# this skips most non-compat libsdl2 former IUSE that are not used by revdeps,
+# albeit it is questionable that some depend on audio alsa/pipewire (note that
+# static-libs is left out because it is useless for static-only builds given
+# it will dlopen the shared libsdl3 anyway)
+#
+# TODO: either update revdeps to have (+) on no-op IUSE (haptic, joystick,
+# sound, and video) then cleanup, or don't for less overlay issues and instead
+# force in profiles to avoid unnecessary rebuilds -- not forced right now given
+# >=2.32.50 would force for a potential future non-compat 2.34.0 fwiw
+IUSE="
+	X alsa gles2 +haptic +joystick kms opengl pipewire pulseaudio
+	+sound test +video vulkan wayland
+"
+REQUIRED_USE="gles2? ( opengl )"
+RESTRICT="!test? ( test )"
+
+# libsdl3 is dlopen'ed and USE at build time should not matter, it enables
+# everything but will not work without libsdl3 support at runtime
+RDEPEND="
+	media-libs/libsdl3[X?,alsa?,opengl?,pipewire?,pulseaudio?,vulkan?,wayland?,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSDL2COMPAT_TESTS=$(usex test)
+	)
+
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	rm -r -- "${ED}"/usr/share/licenses || die
+}
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index 5388257b6225..b86b4085abc4 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -37,5 +37,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">libsdl-org/SDL</remote-id>
+		<remote-id type="github">libsdl-org/sdl2-compat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libsdl3/Manifest b/media-libs/libsdl3/Manifest
index 88a4ff039586..cc2b97c9d236 100644
--- a/media-libs/libsdl3/Manifest
+++ b/media-libs/libsdl3/Manifest
@@ -1,5 +1,3 @@
 DIST SDL3-3.2.10.tar.gz 15876292 BLAKE2B 32e33d4209582fd0889969b30700f793562c7cb0afa3fc05befe421d10e101f558f9c817c7cc7855d793d78339a4c5b01129f24a5981a5651271e14d2e5aeff8 SHA512 e919749ded768ed15c2014efcacfb8ee6614d47727ceb45bbfd4248b36c3790640b4dcbd66de46e4f6870182e13d0d4ceb35da4eb064f9feabdde30ca6eae30d
-DIST SDL3-3.2.8.tar.gz 15866007 BLAKE2B e89f240f9643305fb191049b9162f8adfe2f59b07464df28d08437130f8724b8ac8ab22075a6548cb6d8203ec289f3a8a917c08697047f3d39377af267d8187b SHA512 741550120f26fe983fa829d38d37ff4caeded31e899e4ded99ebb5b084eecebaa4081454b8e176e0103fa7faa6a230ad3f23f8c2453c6babfe59fab981cac6db
-EBUILD libsdl3-3.2.10.ebuild 4960 BLAKE2B 6e236eb6f39443a1f0a5e3c5967dada7f9afcbe022136bd9c173ccbcc132da9fbe2355745e0764204d1ab490bb791e123c96f8003b3f126782858ad9f3f108b3 SHA512 b23bd91118dd8a98a049e3ab2f5746625bed848978f73114025f46bff9ec78e4bcacaafa2044589295327ad50b6e42202668925e6768ab0bc7a10da32f15b54d
-EBUILD libsdl3-3.2.8.ebuild 4960 BLAKE2B 6e236eb6f39443a1f0a5e3c5967dada7f9afcbe022136bd9c173ccbcc132da9fbe2355745e0764204d1ab490bb791e123c96f8003b3f126782858ad9f3f108b3 SHA512 b23bd91118dd8a98a049e3ab2f5746625bed848978f73114025f46bff9ec78e4bcacaafa2044589295327ad50b6e42202668925e6768ab0bc7a10da32f15b54d
+EBUILD libsdl3-3.2.10.ebuild 4931 BLAKE2B bfaa0bf8c1646c4b6b6a9e3f20e79a01e78a90b10fd7244d5a9e5545732ec4e4e0e074a7ce4f00cb7b65fa9d83e6be53bf6327b764b20d79e957b4ff2af1241a SHA512 95f4253a9a228512e4ee2adbcd1a01c75e1c9b0b173aee58ec3a43ff56fffcd555ab7f9359a8bbce2f27f5acf3c06fe613b8c3c7ba68a6c7a0d5b7c4d17cb659
 MISC metadata.xml 662 BLAKE2B f9f126d856a7f2daf998c35f6dd43e0efc7e329dfaad1c1713b7afe1afa57c955f39f5c5f1e0b42ab23aa4cbd07ff14dcccde8887f694444c927817c39696b5e SHA512 caa6f3a3459396c6726feb1af317e982a3baff9ad7ae1ee4d9fa78dd3f197e43b9e9cd4808a28ee8481fc2ebe663549a289f8db829ab3f79f1dbab8fbe624287
diff --git a/media-libs/libsdl3/libsdl3-3.2.10.ebuild b/media-libs/libsdl3/libsdl3-3.2.10.ebuild
index 401240306f28..9418c4946834 100644
--- a/media-libs/libsdl3/libsdl3-3.2.10.ebuild
+++ b/media-libs/libsdl3/libsdl3-3.2.10.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 
 IUSE="
 	X alsa aqua dbus doc ibus io-uring jack kms opengl oss pipewire
-	pulseaudio sndio static-libs test udev usb vulkan wayland
+	pulseaudio sndio test udev usb vulkan wayland
 	cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2
 	cpu_flags_x86_avx512f cpu_flags_x86_mmx cpu_flags_x86_sse
 	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
@@ -95,7 +95,7 @@ src_configure() {
 		-DSDL_DEPS_SHARED=no # link rather than dlopen() where possible
 		-DSDL_LIBURING=$(usex io-uring)
 		-DSDL_RPATH=no
-		-DSDL_STATIC=$(usex static-libs)
+		-DSDL_STATIC=no
 		-DSDL_TESTS=$(usex test)
 
 		# audio
diff --git a/media-libs/libsdl3/libsdl3-3.2.8.ebuild b/media-libs/libsdl3/libsdl3-3.2.8.ebuild
deleted file mode 100644
index 401240306f28..000000000000
--- a/media-libs/libsdl3/libsdl3-3.2.8.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="https://www.libsdl.org/"
-SRC_URI="https://www.libsdl.org/release/SDL3-${PV}.tar.gz"
-S=${WORKDIR}/SDL3-${PV}
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="
-	X alsa aqua dbus doc ibus io-uring jack kms opengl oss pipewire
-	pulseaudio sndio static-libs test udev usb vulkan wayland
-	cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2
-	cpu_flags_x86_avx512f cpu_flags_x86_mmx cpu_flags_x86_sse
-	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
-	cpu_flags_x86_sse4_2
-"
-REQUIRED_USE="
-	ibus? ( dbus )
-	kms? ( opengl )
-	wayland? ( opengl )
-"
-RESTRICT="!test? ( test )"
-
-# dlopen/dbus-only: dbus, ibus, libudev, liburing, vulkan-loader
-RDEPEND="
-	virtual/libiconv[${MULTILIB_USEDEP}]
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	ibus? ( app-i18n/ibus )
-	io-uring? ( sys-libs/liburing:=[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	kms? (
-		media-libs/mesa[gbm(+),${MULTILIB_USEDEP}]
-		x11-libs/libdrm[${MULTILIB_USEDEP}]
-	)
-	opengl? ( media-libs/libglvnd[X?,${MULTILIB_USEDEP}] )
-	pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		gui-libs/libdecor[${MULTILIB_USEDEP}]
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	test? (
-		dev-util/vulkan-headers
-		media-libs/libglvnd
-	)
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# unbundle libglvnd and vulkan headers
-	rm -r src/video/khronos || die
-	ln -s -- "${ESYSROOT}"/usr/include src/video/khronos || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSDL_ASSERTIONS=disabled
-		-DSDL_DBUS=$(usex dbus)
-		-DSDL_DEPS_SHARED=no # link rather than dlopen() where possible
-		-DSDL_LIBURING=$(usex io-uring)
-		-DSDL_RPATH=no
-		-DSDL_STATIC=$(usex static-libs)
-		-DSDL_TESTS=$(usex test)
-
-		# audio
-		-DSDL_ALSA=$(usex alsa)
-		-DSDL_JACK=$(usex jack)
-		-DSDL_OSS=$(usex oss)
-		-DSDL_PIPEWIRE=$(usex pipewire)
-		-DSDL_PULSEAUDIO=$(usex pulseaudio)
-		-DSDL_SNDIO=$(usex sndio)
-
-		# input
-		-DSDL_HIDAPI_LIBUSB=$(usex usb)
-		-DSDL_IBUS=$(use ibus)
-		-DSDL_LIBUDEV=$(usex udev)
-
-		# video
-		-DSDL_COCOA=$(usex aqua)
-		-DSDL_DIRECTX=no
-		-DSDL_KMSDRM=$(usex kms)
-		-DSDL_OPENGL=$(usex opengl)
-		-DSDL_OPENGLES=$(usex opengl)
-		-DSDL_OPENVR=$(usex opengl) # only dependency is libglvnd
-		-DSDL_ROCKCHIP=no
-		-DSDL_RPI=no
-		-DSDL_VIVANTE=no
-		-DSDL_VULKAN=$(usex vulkan)
-		-DSDL_WAYLAND=$(usex wayland)
-		-DSDL_X11=$(usex X)
-		# SDL disallows this by default, allow it but warn in pkg_postinst
-		$(use !X && use !wayland && echo -DSDL_UNIX_CONSOLE_BUILD=yes)
-
-		# cpu instruction sets
-		-DSDL_ALTIVEC=$(usex cpu_flags_ppc_altivec)
-		-DSDL_AVX=$(usex cpu_flags_x86_avx)
-		-DSDL_AVX2=$(usex cpu_flags_x86_avx2)
-		-DSDL_AVX512F=$(usex cpu_flags_x86_avx512f)
-		-DSDL_MMX=$(usex cpu_flags_x86_mmx)
-		-DSDL_SSE=$(usex cpu_flags_x86_sse)
-		-DSDL_SSE2=$(usex cpu_flags_x86_sse2)
-		-DSDL_SSE3=$(usex cpu_flags_x86_sse3)
-		-DSDL_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DSDL_SSE4_2=$(usex cpu_flags_x86_sse4_2)
-	)
-
-	cmake-multilib_src_configure
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-
-	if use doc; then
-		cd docs && doxygen || die
-	fi
-}
-
-src_test() {
-	unset "${!SDL_@}" # ignore users' preferences for tests
-
-	cmake-multilib_src_test
-}
-
-src_install() {
-	local DOCS=( {BUGS,WhatsNew}.txt {CREDITS,README}.md docs/*.md )
-	cmake-multilib_src_install
-
-	rm -r -- "${ED}"/usr/share/licenses || die
-
-	use doc && dodoc -r docs/output/html/
-}
-
-pkg_postinst() {
-	# skipping audio/video can make sense given many packages only use SDL
-	# for input, but still warn given off-by-default and may be unexpected
-	if use !X && use !aqua && use !kms && use !wayland; then
-		ewarn
-		ewarn "All typical display drivers (e.g. USE=wayland) are disabled,"
-		ewarn "applications using SDL for display may not function properly."
-	fi
-
-	if use !alsa && use !jack && use !oss && use !pipewire &&
-		use !pulseaudio && use !sndio; then
-		ewarn
-		ewarn "All typical audio drivers (e.g. USE=pipewire) are disabled,"
-		ewarn "applications using SDL for audio may not function properly."
-	fi
-}
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 02e98afc38c1..e312192e5152 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -7,11 +7,13 @@ AUX netpbm-11.2.7-fix-pnmcolormap2-test.patch 7051 BLAKE2B 741d4943b2e9eab1fb006
 AUX netpbm-11.6.1-incompatible-pointer-types.patch 514 BLAKE2B 0ea8a3c50838776ee645e61accc13645a690dc7e75cde2c33afd1ac7f07abbcb85a97b7e113217af12617ec5ad314eca0324c7bfbe7beb445aee85de47649ffb SHA512 a3a46607904c8ff9757f0a136aa2336382033760bc69bcca5a5d7662ca824f9a7d4281fe3996efc57456c3b30ddf7319fb70a1cb950ef974507f82340a226abb
 AUX netpbm-11.7.2-lto.patch 2699 BLAKE2B 51da4abfa35da594597eb1091f8f3ade875491d428231215f91ff3d637826db6310f2c8f7bf59cb62d025cde170dc247fadedd90dedc5049f68f61d02adbfc0e SHA512 809d1b86d436534219936959037e5c4c17761b4c0e464eb968fdc961f68d5a3d2a60974f52e330fa49b8933aa1bfc486515e019b2bc0d15bbc525b9c4f852eb2
 AUX netpbm-11.9.0-build.patch 2457 BLAKE2B 8d7363e64568ba320f416470f5c1046cdf84b0d2ff6fe2c22c6d387ac54bf9af6e610a6dc73fcfb001388ded4686f382dd65e126574b7723bb6385222f36c0fc SHA512 6ba43263b9ffdca4868bf6c1548151a3fbc824fd9d7764e86402723bc5b0c672e4bcb44bcb3001e5fd99636b57d3edde7372c61288886f0d16f42d08ce3b084e
-DIST netpbm-11.10.0.tar.xz 3811704 BLAKE2B 49ca8ab366a9d181f9223440cbefba4f94e29c7c3a4133b451b0caf189edb2b68f15f79250bad7911b0f6f2ca02b91dd91efb3f8dbba52cbdc655f171a929167 SHA512 6d6cb4cd9ee1f1f952d97182c391ac67eb0e97361731b11c32570d5fd12e94dd4e71497f652ecbdb7ec7037aab1cf4ed303b51ea614d2070f83be90c5d99ae52
+DIST netpbm-11.10.1.tar.xz 3812112 BLAKE2B 4d9867dba7e4976a3c302069fef6827b89edf75032e49a20b6ce261bc11f5d2cbbe32e8d32722e63c38740fa284f670a702a9fa96f892a28cb03836f13db9af0 SHA512 c77b87ae471cc0c71e33d070cde039be1c0c3f3b1896a2bf3047020b1b18ebb8e53adb8712e24b021885480ada75403b5727f3884dfc2a632e4c6ba1a9b03fbb
 DIST netpbm-11.2.11.tar.xz 3782252 BLAKE2B 422b9cefee2a54a9c222236935291f0c8d1f13f064f4ebd277d0f92974b9ce3d7e3d9ae6a0410d767553704a03c2de14ca8456996a53fca0f95d61f9ae72605f SHA512 3d94c0c8c25873a16c78af960c964f5756b3e7a29463f001345956acc3bf1378b0b0b4fc0c57d7388dced0979ba4e8cee0def2200092544dd96fc7d04304660b
 DIST netpbm-11.2.13.tar.xz 3784752 BLAKE2B f96bd1867363402175208778619308bf5cd19967e36ff46103e88367d46c28a6aa1e8c8128af454c22de616ad414ddbc5d48ce857e64423724f2dd026c6e9639 SHA512 ffe3b63dccaeb8066fa80a202dae01b70a379359769540f7668f417b6da32361d878ef1ccbeccd8a24bcda83c5b1cfba5b8e00ce5fc5dbe4c28571e437051432
-EBUILD netpbm-11.10.0.ebuild 6958 BLAKE2B f778cb9ff9e04d5049bf22dfed0f33ccd9d06dd336d16e37aa2148c6fa852cf1240dfcaf2c642abb73eeabfbedfd0cf06925ebbf13d3abfec774e94ae7e85d25 SHA512 64c542691aa6bd4adecc978e3d91cf100425b4e5976462522432447960cea4aacbb73ef64906117db6958320673193f730cfb15c48ed25af8fcbc96fe799599e
+DIST netpbm-11.2.14.tar.xz 3785868 BLAKE2B 1a503270757c84a0dc0b54e9ce8dd04084253aa2bb8f68a129cbda371064e6fde0fd478bfd9489600d0e0c01e2f823e016404041eff6a35762b78165c10c7147 SHA512 01d0eb2a9ed13000e0e26d89c72f3f0e26b74a4c66435e3af4a443ccf0badb387f5afd9503de5b2f2c7f7a39aec4c435dc966c55c4e5a1d444ea6b552cf41e3c
+EBUILD netpbm-11.10.1.ebuild 6958 BLAKE2B f778cb9ff9e04d5049bf22dfed0f33ccd9d06dd336d16e37aa2148c6fa852cf1240dfcaf2c642abb73eeabfbedfd0cf06925ebbf13d3abfec774e94ae7e85d25 SHA512 64c542691aa6bd4adecc978e3d91cf100425b4e5976462522432447960cea4aacbb73ef64906117db6958320673193f730cfb15c48ed25af8fcbc96fe799599e
 EBUILD netpbm-11.2.11.ebuild 7143 BLAKE2B e218c46389b2593e3706eacd28209169359dfe0c7b311b31260aeb654c1c29443c017c643f91e105646a4b0dcab40d943288589c573589133b7398130e0a342d SHA512 1542e8d1c568ac5ac2085a699c380cd44f12194ae7583863e3d9828e70a5dffeacba578f9a298d94db9e6c620cedbf0610eb8b4f2ae104acd25441989b6871ee
 EBUILD netpbm-11.2.13.ebuild 7188 BLAKE2B c10342ddbb2c7cfb449e325d6be939e93e8359a934a91a98eaaf35927150e04a1309056912fb108c5154b5922a5b112f22ad90fe1d26fe84864a6dd28fcff4c4 SHA512 d194dd3ecaecc8c6805081d8f330e4871e96f4c263785b9e0ab5b18ec59c22970345b5aa82e8efcf7b6d7b84aa1ff5cd2f9e208959b139d718403200aedcbd22
+EBUILD netpbm-11.2.14.ebuild 7195 BLAKE2B 94f8f36d42faa7e4de493332ed7c4426acb2c4f06b089a295c9aa6103f1f60cd53ab522e95040d9353c1290cb6a90b9e4f38a2a707cc7eea761c48abcc36e969 SHA512 ae816218a1f53944142d938a5ed5141e014346d4aa25963fff7a8fdd089b34599b54d7cd21ef55e24109c1236e5a99b88bc6b589a1e4c346245a970b36ba96b1
 EBUILD netpbm-9999.ebuild 6351 BLAKE2B b9e5ef2a4d7149827500617999cbe80e7f050638e041aba09c56adc994057dceba2749c3461000edbe8b5fbf6fcf48bfc08b184e0cff26f3231486b83ec63557 SHA512 2461792a86dc4b7a97c2ceb9d2e00cdd07e37682c869ca30a48de6e074a9ddf08460e67f4f2dbee4281986dd01202bfda8c39ff15bd583c2043874defc306455
 MISC metadata.xml 619 BLAKE2B 1e9be5078065faa755545bc17012459cf91b5a39bd7e60abd6e3536e331b5b853f70b9310e17f5d6637c2a58c128665265556338a9e17663104762e2d4ab9177 SHA512 71cdcd5b73400a02361ccb93778130f332d73d8a415d324235b181fc14d5ca81b1437e8887eb9d47ba2878285358d43e2026b066d656d320b4ce6a01fd0e788a
diff --git a/media-libs/netpbm/netpbm-11.10.0.ebuild b/media-libs/netpbm/netpbm-11.10.1.ebuild
index dec8f670b637..dec8f670b637 100644
--- a/media-libs/netpbm/netpbm-11.10.0.ebuild
+++ b/media-libs/netpbm/netpbm-11.10.1.ebuild
diff --git a/media-libs/netpbm/netpbm-11.2.14.ebuild b/media-libs/netpbm/netpbm-11.2.14.ebuild
new file mode 100644
index 000000000000..a9b144720c1d
--- /dev/null
+++ b/media-libs/netpbm/netpbm-11.2.14.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs
+
+# Upstream has 3 flavors of netpbm: super stable, stable and advanced.
+# They only provide a tarball for super stable, but super stable is a bit lagging.
+# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable"
+# and the advanced branch of their svn (currently versions 11.9.yy) on SLOT "0/advanced".
+# The stable branch is stabilized according to usual Gentoo rules, while the
+# advanced branch will not be stabilized.
+# A detailed explanation is here https://netpbm.sourceforge.net/release.html
+
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="https://netpbm.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
+SLOT="0/stable"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
+
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+# some installed programs are perl scripts
+RDEPEND="
+	dev-lang/perl
+	jbig? ( media-libs/jbigkit:= )
+	jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] )
+	png? (
+		>=media-libs/libpng-1.4:0=
+		sys-libs/zlib
+	)
+	postscript? (
+		app-text/ghostscript-gpl
+		sys-libs/zlib
+	)
+	rle? ( media-libs/urt:= )
+	svga? ( media-libs/svgalib )
+	tiff? ( >=media-libs/tiff-3.5.5:= )
+	xml? ( dev-libs/libxml2 )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-arch/xz-utils
+	app-alternatives/lex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/netpbm-10.86.21-build.patch
+	"${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
+	"${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
+	"${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch
+	"${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
+	"${FILESDIR}"/netpbm-11.7.2-lto.patch
+	"${FILESDIR}"/netpbm-11.2.11-fix-C23.patch
+)
+
+netpbm_libtype() {
+	case ${CHOST} in
+		*-darwin*) echo dylib;;
+		*)         echo unixshared;;
+	esac
+}
+
+netpbm_libsuffix() {
+	local suffix=$(get_libname)
+	echo ${suffix//\.}
+}
+
+netpbm_ldshlib() {
+	case ${CHOST} in
+		*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
+		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
+	esac
+}
+
+netpbm_config_lib() {
+	usex ${1} -l${2:-$1} NONE
+}
+
+# for bug #828127
+netpbm_cflags_for_build() {
+	if is-flagq -fPIC; then
+		echo -fPIC
+	fi
+}
+
+src_prepare() {
+	default
+
+	# make sure we use system libs
+	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+	rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
+
+	# fix typo in a test
+	sed -i \
+		-e 's:^o#! /bin/sh:#! /bin/sh:' \
+		test/stdin-ppm3.test || die
+
+	# take care of the importinc stuff ourselves by only doing it once
+	# at the top level and having all subdirs use that one set #149843
+	sed -i \
+		-e '/^importinc:/s|^|importinc:\nmanual_|' \
+		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
+		common.mk || die
+	sed -i \
+		-e '/%.c/s: importinc$::' \
+		common.mk lib/Makefile lib/util/Makefile || die
+	sed -i \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
+		GNUmakefile converter/other/Makefile other/pamx/Makefile || die
+
+	# The postscript knob is currently bound up with a fork test.
+	if ! use postscript ; then
+		sed -i \
+			-e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
+			converter/other/Makefile generator/Makefile || die
+		sed -i -r \
+			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
+			test/all-in-place.{ok,test} || die
+		sed -i \
+			-e 's:lps-roundtrip.*::' \
+			-e 's:pbmtextps-dump.*::' \
+			-e 's:pbmtextps.*::' \
+			test/Test-Order || die
+		sed -i \
+			-e '/^$/d' \
+			test/all-in-place.ok || die
+		sed -i \
+			'2iexit 80' \
+			test/ps-{alt-,flate-,}roundtrip.test || die
+	fi
+
+	# the new postscript test needs +x
+	chmod +x test/lps-roundtrip.test || die
+
+	# Do not test png if not built
+	if ! use png ; then
+		sed -i -E \
+			-e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+			test/all-in-place.{ok,test} || die
+		sed -i \
+			-e '/^$/d' \
+			test/all-in-place.ok || die
+
+		sed -i -E \
+			-e 's:(pamrgbatopng|pngtopnm).*::' \
+			test/legacy-names.{ok,test} || die
+		sed -i \
+			-e '/^$/d' \
+			test/legacy-names.ok || die
+		sed -i \
+			-e 's:png-roundtrip.*::' \
+			-e 's:winicon-roundtrip.*::' \
+			test/Test-Order || die
+	fi
+
+	# pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-utf8 requires locale, not available on musl
+	# ppmpat-random is broken on musl
+	# bug #907295
+	if use elibc_musl; then
+		sed \
+			-e 's:pbmtext-iso88591.*::' \
+			-e 's:pbmtext-utf8.*::' \
+			-e 's:ppmpat-random.*::' \
+			-i test/Test-Order || die
+	fi
+}
+
+src_configure() {
+	cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed"
+		# Misc stuff
+		BUILD_FIASCO = N
+		SYMLINK = ln -sf
+
+		# These vars let src_test work by default
+		PKGDIR_DEFAULT = ${T}/netpbm
+		RESULTDIR_DEFAULT = ${T}/netpbm-test
+
+		# Toolchain options
+		CC = $(tc-getCC) -Wall
+		LD = \$(CC)
+		CC_FOR_BUILD = $(tc-getBUILD_CC)
+		LD_FOR_BUILD = \$(CC_FOR_BUILD)
+		AR = $(tc-getAR)
+		RANLIB = $(tc-getRANLIB)
+		PKG_CONFIG = $(tc-getPKG_CONFIG)
+
+		STRIPFLAG =
+		CFLAGS_SHLIB = -fPIC
+		CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build)
+
+		LDRELOC = \$(LD) -r
+		LDSHLIB = $(netpbm_ldshlib)
+		LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
+		LINKERISCOMPILER = Y
+		NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+		NETPBMLIBTYPE = $(netpbm_libtype)
+		STATICLIB_TOO = $(usex static-libs Y N)
+
+		# The var is called SSE, but the code is actually SSE2.
+		WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
+
+		# Gentoo build options
+		TIFFLIB = $(netpbm_config_lib tiff)
+		# Let tiff worry about its own dependencies #395753
+		TIFFLIB_NEEDS_JPEG = N
+		TIFFLIB_NEEDS_Z = N
+		JPEGLIB = $(netpbm_config_lib jpeg)
+		PNGLIB = $(netpbm_config_lib png)
+		ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
+		LINUXSVGALIB = $(netpbm_config_lib svga vga)
+		XML2_LIBS = $(netpbm_config_lib xml xml2)
+		JBIGLIB = $(netpbm_config_lib jbig)
+		JBIGHDR_DIR =
+		JASPERLIB = NONE
+		JASPERHDR_DIR =
+		URTLIB = $(netpbm_config_lib rle)
+		URTHDR_DIR =
+		X11LIB = $(netpbm_config_lib X X11)
+		X11HDR_DIR =
+	EOF
+}
+
+src_compile() {
+	emake -j1 pm_config.h version.h manual_importinc #149843
+	emake
+}
+
+src_test() {
+	# The code wants to install everything first and then test the result.
+	emake install.{bin,lib,data}
+	emake check
+}
+
+src_install() {
+	# Subdir make targets like to use `mkdir` all over the place
+	# without any actual dependencies, thus the -j1.
+	emake -j1 package pkgdir="${ED}"/usr
+
+	if [[ $(get_libdir) != "lib" ]] ; then
+		mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+	fi
+
+	# Remove cruft that we don't need, and move around stuff we want
+	rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
+
+	dodir /usr/share
+	mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
+
+	doman userguide/*.[0-9]
+	dodoc README
+
+	cd doc || die
+	dodoc HISTORY Netpbm.programming USERDOC
+	docinto html
+	dodoc -r ../userguide/*.html
+}