gentoo auto-resync : 26:11:2024 - 02:00:48

32 files changed, 821 insertions, 70 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index fb322ce34236..11b00766152b 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 249a19e3a04c..939e232b68a4 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -3,5 +3,5 @@ AUX coin-4.0.3-find-qhelpgenerator.patch 842 BLAKE2B 225b06881b36f7adfd3d43fbe8b
 DIST coin-4.0.2-src.tar.gz 7160869 BLAKE2B a434ea2a550557024c665e392aa189e991296b5f8c9cd2c0dc5bb71d41a948ed9d9b34eac69dc9a651f70abf8ec1f188cb8df6534d6e31b6e4e1a6ec4acaffcd SHA512 31fcb69627e466c89bb640c5b2351db4e51772408a4ce56cae7d6f550ddf19adf9b121252479297d5c2a208032194d8f4e7bf97686b0611df1ac45231e09baad
 DIST coin-4.0.3-src.tar.gz 13099754 BLAKE2B c56f9e7b837bad76996a78ba3351c43b78b082c6250735e678ca9af79b3518d369e223a1625d74c8d007fff814f32e6bd6fe04c4dd5df9dd999f6afed767afeb SHA512 b661bf2124b0de1b46e76a6699b0975abb3aed4dc9019bf32531c535179dc84a90fe4e19def6f6cda7b175470636040d0e58812d532198cf207296d37c539915
 EBUILD coin-4.0.2.ebuild 2569 BLAKE2B e4e7a1da2bc14756efed8f1e601ff4e1db004078ae569a11ee8b75f6eeb9f52b2e2cba8a3dacac492ef3f30619488f67e29b66433f78f340985a41fbe9a41872 SHA512 88a059ffa555b701b6b13c3d38c0620fd903e55e4166241b69438b8db56045977aa94821049de7052fa518bd8aa8ad121fbd02456988705d0ff46369674523b3
-EBUILD coin-4.0.3.ebuild 2598 BLAKE2B bd19ee198572d18db8d604bb09542d6da0382353458bc27bc1f0b05be4b960384b2f21b686582425a2c68144331abe9b652290a71ed44b05d8804d5f9359c848 SHA512 76524d90f49082f922068253e7e439091bee67677e1396255d0d27cf97fa25d54bef6f85cc24101ed556611e44533383a06b07fa5832bee3f8098b1ebd491edd
+EBUILD coin-4.0.3.ebuild 2597 BLAKE2B 514925e8eb13d526a3ff7683e197ec95d8e7f33fa137f3d003b893648155c8cf0efe17e44e667b3b712c595ab521dfc31dbf3ab2a225640753f6f0be57cf3284 SHA512 f700130c4a46af2f26805a967ea7a1e7f700d3d11211a1738518e7508f9479c55f8265f475b64d7ad7ed097ac8800f53cd7c162b04d8e23e93a7db996e697889
 MISC metadata.xml 524 BLAKE2B 50c53572571e199de0c8dae522d8f12b427ddbc62839e7f95cf4f3778fba3c8e192990d21d85f84f9a9920d491431e259c97148e8be1469d0dd499c500350485 SHA512 1cdeea35e143f6a750663501c43a83575426859ac798fe9e7825661c452d23a62bab7c739d1b6417072f514a372b6ca5f0afdd65358dbe819d0b6a3d6492bcb0
diff --git a/media-libs/coin/coin-4.0.3.ebuild b/media-libs/coin/coin-4.0.3.ebuild
index b07935860866..6129b3b20078 100644
--- a/media-libs/coin/coin-4.0.3.ebuild
+++ b/media-libs/coin/coin-4.0.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="|| ( GPL-2 PEL )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc +exceptions openal qch test threads"
 
 REQUIRED_USE="qch? ( doc )"
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 85844c8bbe43..697eea6f55dd 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -9,6 +9,6 @@ DIST kvazaar-2.2.0.tar.gz 617414 BLAKE2B 6ddb88ddea315d80e0af87a13127f235c184ae8
 DIST kvazaar-2.3.0.tar.gz 593939 BLAKE2B a8cdc94699c6e64ef5e80336191342cb5aadfa83cc494400dd34a177836c081291e5cc176e29bf68ad8debdf3a83ca7d5c2ffd657ac96b901a0f5258e3894788 SHA512 b416e24a887a6e83b25530c6d47675fb176568c04295c944094041629b585b968133465605b9ee85e0ebebe1041774d5670cb90ee76271cb2f5c8059244297b5
 EBUILD kvazaar-2.1.0.ebuild 1772 BLAKE2B 434e3fad8f0f1ec51155b9f06cc28cd084a863f6064dea9fb35036842f81c7bbd7a5072aa64a201fc95d5cb2b82e597689262552646a9bb105bdf10226ef088d SHA512 8fcacd4b65f6fc1971cac797fbd536c6a0547cb1f7cad9d9998002c4ed9a75f8d3e6feeeadcc97a559ee1352cb6a23505b378575f05759788f1b841265d5ce4a
 EBUILD kvazaar-2.2.0.ebuild 1581 BLAKE2B 651449a433fd31f3dfa7c92ce5239a2fca8615ecd530380e354ac22a59a2342d1aae6438702ded228a8654d4b02dd012a0936a7dbf1cfd57dd2f43cb6eda2c4f SHA512 202fa4cada7dbf918d5c2ace6360bf7a7cd8c6500bff4ac2352540ba44ce8c85c7f68854939ebf9ea1876cea0a894da3a29727f6942d7334d262bbf2db8c672b
-EBUILD kvazaar-2.3.0-r1.ebuild 1690 BLAKE2B 02df65d36e72b601aa4a37a4cc7ab902d185508f8d9e1e3466da5933de0f55a14771b6eb86497167bda9bb5dca6c71256e54058873b229ba52282df69d3463d6 SHA512 2aeddfccbda34a4f0d6cffa87c190ac0ce9e16c3d3133b61f97f46ef91df8a90fcb2fefff835ac77b2b9f1c83ac94af3ee918a7ae826b68cb2db0e2e54be3d1a
+EBUILD kvazaar-2.3.0-r1.ebuild 1689 BLAKE2B 3c0c767313c7f7ca96abe51b75360b893ab859a1fda9a87b8972243cbf606dd8ea1ba4c889ea53360f4a628773d5c2dd439ffc3a1b2ce75bf97b4094aa06804e SHA512 dda62e88461a5c3bf9c6eae18ea00ea95c15ad96f742e3cfbf97f56338b2c93282b5c046988dfaf061984173b5c09f23dfa1348074ea882871d64b1c88ef48f2
 EBUILD kvazaar-9999.ebuild 1521 BLAKE2B ef9013cf781cb9c98e241a9f5ab9ae61bcd5fe7742e4dd6545f4c19b3956be21ab7a0b70b249203cc58327f9494a234d102f5ac04e5c3b03e09141b41f9a91ad SHA512 d5071fca54a4f59072e3d8de3d2485ac255be9756b928adb35855afcd1bf0b7b1b0c6cdddf68646cf426dec13b1ef0899da5607d3d7dad067bbe4b125c6bfd48
 MISC metadata.xml 307 BLAKE2B 712a78cc3cbe9bee1e770452448efd933eb76c6de75e8302e8f61b22aec35a2f43ceb7c3014bf88b81ecf4ff27da4b115ab24605a53fbbba18100896fff12ff8 SHA512 29403efb372cc2ddb9e428be05bb7bf57b0a51a3ab66a0b0bfbdfbcdf6db1b5d357ddafc1b3a77d00109840ea4c610a088e7c8f97a3c0b9cd330a6edd2651ae6
diff --git a/media-libs/kvazaar/kvazaar-2.3.0-r1.ebuild b/media-libs/kvazaar/kvazaar-2.3.0-r1.ebuild
index e4b201664f36..0cc28565bb31 100644
--- a/media-libs/kvazaar/kvazaar-2.3.0-r1.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.3.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 fi
 inherit autotools multilib-minimal
 
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index d074f8eab34c..3d242122f6fe 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -4,5 +4,5 @@ AUX lib3mf-2.2.0-0001-use-system-provided-act-binary.patch 5370 BLAKE2B c5d3cfe7
 AUX lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch 936 BLAKE2B ac89b89c223eaa81334da6ae84d1c785beccea2687b883954a93ede0d7fa49d11afc91ff5a6d41e195d7feb959d4317986cc97ac58047328ce372e40e787cefa SHA512 42c9ede93e79c7548b5ed9bed2f5ec0e275441ab5daa5cf9eb72f31610da512b7a3f118a075a8cfc21d1244c96ba42efadaee8c26c1b1837295e8a2ce4a93255
 AUX lib3mf-2.2.0-include-cstdint.patch 570 BLAKE2B d239701017d68d9dc1c9f8e97f49e74e6af13b93d4f89b97b64248b3b779fbda62a85d085abf66b41990e91085adde0c757089fd12740be8f3e200468dbc56ab SHA512 61be13edfa4c54ee11ff9c2dd11c3740fbaaaa3d07f5bad10bb48a2ce41eb0c090960c44834b0fb60109952dadfda3071c998e4e866d1acd13874106542e7a01
 DIST lib3mf-2.2.0.tar.gz 16439833 BLAKE2B c98f57ea99f90625f2bfbdbcde9df8dbd8aeccc655e1bd9be165c24b2d9fb74471e4b01c816d8f665e5793db77c7bcf52016f030ec1947f908d6647e9ad12745 SHA512 2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
-EBUILD lib3mf-2.2.0.ebuild 1577 BLAKE2B 964f0afb817138c98068e4eb4f7a2ce4b58eb473ced518c39a3ce4268574cc0425e1f566075c9040b2ae3becf041e3cfde032a47a45b4de6c0928086e691fcaf SHA512 2ed6cba029d9fecb8bdc8a4737947b9d34a70e905048ac9b3cd1037a70bd0c090fd4cd8380f503cbd1f7d5a8e4edec47947d9b00325410724199ae6d81e0bc30
+EBUILD lib3mf-2.2.0-r1.ebuild 1788 BLAKE2B 8cdb876ca0d240fea3bc0c7103b41e6c0c4abbda665e3bf98904673f0bc9ed7937b0a62a73fee5cee880284d95cf7ca84b2e5be641c5bf09fe0297d6bc80cf8d SHA512 d78f4b07eaa4b0adabc1371169eed867c6c8498031e46056b0aedde955c5bf248bc23b5cacef8fff34601e50475a6613d54461ad3b5709d0f771afc7625c332b
 MISC metadata.xml 937 BLAKE2B 5794675d2197f8da85354f0dc542ac3ae65ea5124a26030a9fdb19e9fa78bbfa8298a13d2c7a4509d2782012ac157f09827afff00b5615e01b0580a71c2aacef SHA512 c62d56ccf3727f5bfa1a04b031ff44506332138c97258f4b3078eb6570a9dc048b4da1fbf1c495175ea169e2b21d11128437c16234f38df5d70fc3994462c0f4
diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0-r1.ebuild
index d5d470010791..c980abe83fef 100644
--- a/media-libs/lib3mf/lib3mf-2.2.0.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.2.0-r1.ebuild
@@ -39,6 +39,14 @@ PATCHES=(
 	"${FILESDIR}"/${P}-include-cstdint.patch
 )
 
+src_prepare() {
+	cmake_src_prepare
+
+	rm -r Include/Libraries/{libzip,zlib} || die
+	ln -s "${EPREFIX}/usr/include" Include/Libraries/zlib || die
+	ln -s "${EPREFIX}/usr/include" Include/Libraries/libzip || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 30fea184e1c8..351890fc2a10 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,5 +1,5 @@
 DIST libass-0.17.1.tar.xz 403160 BLAKE2B b191e8910ddb3e41fb9df79b27517a127c0da2ad74c0a81920bc2cf8843ab18b02a60738024fa8d3594b91bd26ec6ea7f87e17ca5e07825a6017dd29d2b72b32 SHA512 437b4b60db2626e48f438b5138ab4dbf2c2ab4c8f0b587a6e554510c6719544ef2235c601ff1e482d020410f9bab95ad1a9b176d19a3bd54880499a576b41f23
 DIST libass-0.17.1.tar.xz.asc 228 BLAKE2B 0e70c104438be4409239f435d7872737fde1aba4485816ad0e35f0de743ee303662e66334425d0d511af4974e03443ba6d33ac44f941de9b0da17a56f204edea SHA512 a28c8271b4c5b5756620be9baf81b0262eb71c4f20d1aadb24238d1d0ccba44fdb3b25d788a3f7c9039945431a3d31842a7855660cc28a0a8acc36ff8f0c0298
-EBUILD libass-0.17.1-r2.ebuild 1573 BLAKE2B 0ad839257c9c951543d7941c9c656a3587646efcc528eb1b0ef8e0fd3a4a6c94736a541e78b41585511dd5a8dedbaa743d3a3e2c97553cc9139e8c1b2e03a65a SHA512 0fd0470f9bd99566ecebbe6348770176aab828d147ef8b8f05fbceccdf55041e3029d2afbdbf8ee012f313419bac73125253d216216b0e154af3c52e374b77cf
+EBUILD libass-0.17.1-r2.ebuild 1572 BLAKE2B dcda020d0c07a70940bdc3bdb7c2f16734a6c79145d931a697e1bae805d79718d43a25ea3b90e3b91258f0d5be2fee931f486e70b0da7394403a17b69a414b96 SHA512 4dc9211e245307199d7195bdfd1ee0a6454cf2d7d18f8ccc1ca8fa957378f64aec733adf18792fe85fb9ecbef09575079abeaa814024a947be513bd194bf540f
 EBUILD libass-0.17.1.ebuild 1472 BLAKE2B 6c50eb39b4bf41d818fd76463701f3672cd900420803457a936740d10b4ac9cfba6116b79171a4238622e47e7080942602aede0558ad8bc7d6923de0e869c2cb SHA512 c28d93e656d362284b43d3902f3d5bf5c2ae3ca014867d80bf99211d27bfd953f977670432d0283d76a9cbb92cd7d89d06da0d94691b1739d25d24dc7be6c41c
 MISC metadata.xml 435 BLAKE2B 28ce115edcd9e3cd8a50a75a83395b4d2d9c7b8c88a7a4f3fba3f6037c7754376fb2736c1a4b61161f7656647f6c1b518e7f31c0da07d7a03647da9908033ae8 SHA512 f7873c6c98fc5e39eec3e7709065b680e313a54ab3e1570499371ede7e1c80aa433e509b63dd68ddcaadd6dc9ef5d8e95be01e53fd92edb6665ba63f3a817cad
diff --git a/media-libs/libass/libass-0.17.1-r2.ebuild b/media-libs/libass/libass-0.17.1-r2.ebuild
index 90dff0cb5132..559fa48be108 100644
--- a/media-libs/libass/libass-0.17.1-r2.ebuild
+++ b/media-libs/libass/libass-0.17.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+fontconfig libunibreak test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 035d6ef74ecb..fa78650e49dd 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,4 +1,5 @@
 AUX libgphoto2-2.5.31-c99.patch 1231 BLAKE2B 161b4fceaca4f61a86f6957802c36d9566a67c554748b0d2fc6a77863bd3d420bcbbdaadc96ac54cc886ec80cb046d0e541dcd014bec99f55361914de96127d8 SHA512 f91f12e2809ef1ac6a5f01563d678f00d2dbb32880bcbf6ef7593887e8f41e7f8c4349c5f814ab56340a3e9df3825fae126716aa6ad06c80621558e7871371f1
+AUX libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch 1016 BLAKE2B 7ff9768e8620613159610df821e441d45356fed2f59c2224f707517b9e63edcda7859abf61bcfcbdc508d46ed4b6b187ab12e8679697d91e1b6d7ece14cf2886 SHA512 759b884c038ccd8f1dcf610406550a1ab3abb84ef075e150d5b3ab6b4a20c56eee2f03817093a82238ab2ebc6cf611ac55a020d4ec703e18ffda7e630838e1d8
 DIST libgphoto2-2.5.31.tar.xz 6322264 BLAKE2B 9003769bf7726b205f6466e2332d1b144e2e1f2ac190c23f93200ec761597d08a7925e0a16dc65f66c9ca47f0c7e7a563c1cd5ada5cdf528bc605538cf67d80e SHA512 1061a676488aff2cad12a5ee49742be6d18750221ef808d69116763c2b357d38c1372db62933dfa8fd8411758acb97b8e3a40a5d4f37b8c563e981fd4ae4bb1f
-EBUILD libgphoto2-2.5.31-r2.ebuild 6194 BLAKE2B 1b767cbd04e21b597b1544af5e96894cd1b0e0e806086d1f728e859b6914921e27bfa194451099ceb9a6f6cd8a245eaeee1665eb06a6944a5c4a76cf3a1e8535 SHA512 912fa1706faf8c289eafa276be58b4ecc2253409bc4f84629a11f0e65d06e147ee9cdefbaea6db6c9a14acf6bd082e61411cb37289a3eaf432917a36ec08d0d3
+EBUILD libgphoto2-2.5.31-r2.ebuild 6244 BLAKE2B f062cbf9f02d48bf0c28e72e4ebefaae6ffa1c54519545c9bb09cec91994edcb796c7a761dbd4259d842f1ad7894b01127574e0d42ae931080ebb403fcd37003 SHA512 566c63e2de581542a76f20483b2ac9b7fc84d281e2199b8314c8377e42259f94134f2ae58a16da0791c99b27bb551c4865826f59f3c4500776496becf832c3f0
 MISC metadata.xml 458 BLAKE2B 944547ab787583b1cd6678e3183a3f6cd76cf95461fb05758887ccfd41ceb8fc0bf7278fe786fd36fe2eee3664876fe4692d849a88bff58c3707e57f256b67b0 SHA512 a6c0af734aa579d486cb4f707f84b6b6beb26121092ced9976d05a6428a8096f79591b842d3ad906e5cb76ea1c8cd2bc2d21d587d6cb03041cc3ba72905f76be
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch
new file mode 100644
index 000000000000..d5f2068abff4
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch
@@ -0,0 +1,31 @@
+https://github.com/gphoto/libgphoto2/commit/8ddcae4ed2bd052318b0849617e22bf92a98dd17
+https://github.com/gphoto/libgphoto2/commit/3cf7a1d04dcffa52907026c4c2d35ee8273f3147
+From: Matt Jolly <kangie@gentoo.org>
+Date: Mon, 25 Nov 2024 15:50:22 +1000
+Subject: [PATCH] consolidate removal of `gpi_gphoto_port_type_map`
+
+This was several upstream commits
+
+--- a/libgphoto2_port/gphoto2/gphoto2-port-info-list.h
++++ b/libgphoto2_port/gphoto2/gphoto2-port-info-list.h
+@@ -62,7 +62,6 @@ extern "C" {
+ 
+ #ifdef _GPHOTO2_INTERNAL_CODE
+ #include <gphoto2/gphoto2-port-log.h>
+-extern const StringFlagItem gpi_gphoto_port_type_map[];
+ #endif
+ 
+ int gp_port_info_new (GPPortInfo *info);
+--- a/libgphoto2_port/libgphoto2_port/libgphoto2_port.ver
++++ b/libgphoto2_port/libgphoto2_port/libgphoto2_port.ver
+@@ -71,7 +71,6 @@ LIBGPHOTO2_5_0 {
+ 
+ # These are only supposed to be used by libgphoto2 internally.
+ LIBGPHOTO2_INTERNAL {
+-	gpi_gphoto_port_type_map;
+ 	gpi_enum_to_string;
+ 	gpi_string_to_enum;
+ 	gpi_string_to_flag;
+-- 
+2.47.0
+
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild
index afb3be44733a..cfaa872eaf3b 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild
@@ -77,7 +77,8 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.31-c99.patch
+	"${FILESDIR}"/${P}-c99.patch
+	"${FILESDIR}"/${P}-remove-gpi_gphoto_port_type_map.patch
 )
 
 src_prepare() {
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index dd14e962ecd7..6038e9f66439 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -7,5 +7,5 @@ AUX libgpod-0.8.3-segfault.patch 1171 BLAKE2B ae8f00ad8708f23ef83c9f03f5e9a7157c
 DIST libgpod-0.8.3.tar.bz2 801903 BLAKE2B e9bc54d23be7f54a17eea3f8a07d7bf6a28224d9c0b0f90fb9d44d97af6cf64c31096de5d9fa4b446e1a9463a6e8f3a59929d73bf52ad8d638732868c3c1b7d0 SHA512 e39f22054c2d2bdf5fc764aa1f692de17a1a06c7c7e9c60883d126b216dacca7840bf818e7e7e039218fe2a64c0920ba96d8cbbe310e11c1c4e68b82e7cbbd8e
 EBUILD libgpod-0.8.3-r6.ebuild 1602 BLAKE2B 63c26b15ce5d1c723c223226c8bc6c21deff5b62b246230413e41926029740a6c90e7051d0fc06896460143906c1e32bc1ea954b39e9d79fd9b31e6c7a48fc67 SHA512 9b7b743c983ab351077baf5dcdc53abc525a1e718e8d847e74cb9824f65688f923d65f6088a2754e1ca54dcd0898746cc40d3b35a0b5dab35f17710a6a334d99
 EBUILD libgpod-0.8.3-r7.ebuild 1648 BLAKE2B b42d9e5f4d0bdf7e8ccc3562fd1520ae1b2b661f09b670b6ca505b1c959ed3b04c0386d73ee2969fa66ce10e1b0bb2cd40349b5b2a324a7a782a70d5ca955948 SHA512 bfb93783b01001181b7d27121807852dd54d555d59e07876400f477a545cb50e8ae9eed074d5ef297b7688a25d2d0bae45ca0658b097d4d5377aa241325a1df9
-EBUILD libgpod-0.8.3-r8.ebuild 1684 BLAKE2B 27300890b1144e825e7e7f2b77fee01df2fceaeae5d0ff42934babb787eed3b46e10dd7c3f736f443951a8a50ed54ceafa3c1bbff6ebf013ba4774635cc4c31a SHA512 9a6c42f2e0fda7c422b5c7c48456fdc6c64a58e64a5ab63de03109120d6173d4de30122233b0d66fc27e9dd54f03902970ccd55731c489e33db2d974a67857cd
+EBUILD libgpod-0.8.3-r8.ebuild 1681 BLAKE2B 86ce8c147239816cf83bb6ebfb07a9e4b4c20f7f14e18de0bebf49f38d6f3c47f681ac80302acb121d8ab3e6cb3710b8e817bff17300f5437f197ad2d6de8f6c SHA512 1205e78a45dca7cc1e3c3002a79e28ccece9f081eea6b2ab627e2ac2e78a0bd2809924d96c44a84ecce966c2839d6ee71971e80c5b6de6feafad0d3245bb1507
 MISC metadata.xml 484 BLAKE2B f3704943d01d8048940f1d359a12330aad167f6a7b3e67f37fd3c8b954aef0cde441b3e9b957414404e5a450a21acb899a8c07df838632063e45734cebea1b68 SHA512 40128d4bd5043e699ec2acdbc267eba5f2ca4cb54e7e05ca81d033fee88124e37824234ddfe2d51da7cbbb2757cb68801db4899c82c66895e5005bd85a211965
diff --git a/media-libs/libgpod/libgpod-0.8.3-r8.ebuild b/media-libs/libgpod/libgpod-0.8.3-r8.ebuild
index 62bcd8c7c869..a2a97c747088 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r8.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/gtkpod/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="+gtk ios +udev"
 
 RDEPEND="
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 91b04cebdcce..d2fbf9ee4c64 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -10,5 +10,5 @@ AUX libquicktime-1.2.4-ffmpeg5.patch 11768 BLAKE2B e67d8b0ac52a37594c1499270b04a
 AUX libquicktime-1.2.4-implicit-func-decl.patch 235 BLAKE2B 275b71da56e9d499865e95b4c84e8a7b4e0b294daa8dc95bfeb1ad6588cace9822b17d7645561195e8d8c569ec7de94f7319e2f2ad8dfd13e6a18667b479e80f SHA512 e3ebd066dcdf393a7b08e7c592f664261b87ba7d2cfa5cad2d4bf364c25477b9290ffd30ea124dce7f09ce3b3c3139026d5685f2059b3d277f227c8eec4a9cc4
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
 EBUILD libquicktime-1.2.4-r4.ebuild 3783 BLAKE2B 8b5f752ce06d3bc76d6998190c5bae210fb8eeacf5d66c27e3b1bb3ae512f8c59219444fd273d239223746039098946b30631babe2a8ae6e1b930597e27d99b3 SHA512 22abbd1dea6aeb8d07450d1b2424745a73910d2289fbbcfae9e261f4d7e3fb589b4461cd9bb36118496c978dfd5c110507f098916596597f8437403225523c9e
-EBUILD libquicktime-1.2.4-r5.ebuild 3618 BLAKE2B 9a5fe9cfc1f9a1042d0cb810712d481bd316702f831c45a790217f54c4253658ebbf319e51996b820ef211a98f0db136dea5330bba609976753f33db7f621320 SHA512 34251009e4dfb5c0b61e1b9961c93ed4a8ab2d69c575d9c69191c0e90ba2c32caa2f8719be6aaaf4e0db7867b9facc46825f21c82d4fc09647d6d06b355d2671
+EBUILD libquicktime-1.2.4-r5.ebuild 3617 BLAKE2B 152ba3903fba4a49dd960d38e5c593a56f24dc1d5de2f9c2b38c9b413e0244991d9395713a26bbfd7e5785abd88ddf6898877c95cd9170a0169de64b4235e1c2 SHA512 d7495cd86d7cd440a64c23d71b5a5b05d64328815049e092b46f662284b28195274bdf240999e5e95f9e012cee3b2d82e26907222519e2efeeba3c1d39038498
 MISC metadata.xml 306 BLAKE2B 5dde92ce1f7506afb07de09c7c6148c2c4d2f82a2bcd5a7cb6397af0353b6b867d68a504e5eb0f9cce160c444f69b64708d3e737ec0f71309b8fad6510586d8a SHA512 83fe67ab5171754f4c61fd1546c39ffef692be44cd1a76ae00744a0587f8d03cdd37c02a952c8ee231adf32ee510fe362c6b36ff8bf235524d6f7510adb63686
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r5.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r5.ebuild
index f1befe241aae..3535c4c787b8 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r5.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png static-libs vorbis X x264"
 
 RDEPEND="
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index b71f1e024cc8..db049dc80c6c 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,7 +1,5 @@
-DIST libsidplayfp-2.10.0.tar.gz 811416 BLAKE2B 5d81c1c74eccb5b4e176a82e1232eed7a5687bd6dd5c22b0941d414be438db54f0d303bb0c26445404beb94f9d01cf78ec57983e8a11dd265ec6f94947a71b2b SHA512 ebffc99d04e4e5ef309636c08105b42150c5b707bcb6ecd196ee6956f301ae152efdfdd86b14276e31a0936d97cc534caec4e2281249df6ba7571926a1daffeb
 DIST libsidplayfp-2.10.1.tar.gz 812511 BLAKE2B 7c4a8c276a0adf75f96cebaf7931f314bdc097df8e682d2894b9903b574e2a6dd5d9b6619243aceb3458e70d29041c4549aaefe45fb37bb9312333d5d03322f8 SHA512 b8a15b34b0c834b037fc35ae9c968505322f9fb4971313ca59a0a8d22e31580354e18fda530246c0086079a9f9ff40e9c54f93279831817dc377fa9c9894bb20
 DIST libsidplayfp-2.11.0.tar.gz 813488 BLAKE2B 6bb8f37e5272c166ba5fe804395c676becb366fbf2adff0831236eaa46f889811f9173f99a7b0e67f986dfbc8e58b4957b27a39c7b7da2571a7014776bc92c1b SHA512 5f8c32d6964cdd651db0718b8f02d7fcbf829c58ed15bc8fa07f5cc0a452954ec93b041f54641744b597a8e67b6c723df6031b00685231e931f6388c294ea172
-EBUILD libsidplayfp-2.10.0.ebuild 685 BLAKE2B dae51274f54b5fd7a13c1ae93a7421f1c19e00c65f06e91df328db88ab33d39dc13d2eb9926e6c422827054d62db69f6be80d75e0c311f5b56ac6ece4d90f6ff SHA512 b993aa6da66d5f33c3bec51b6b1e5565bcea2b862e61cdb8021f6a1dce403fed5ae28945d260efdcbb86a81c4a84b58f3ef3b3f6601d43032241cae59a652794
 EBUILD libsidplayfp-2.10.1.ebuild 685 BLAKE2B dae51274f54b5fd7a13c1ae93a7421f1c19e00c65f06e91df328db88ab33d39dc13d2eb9926e6c422827054d62db69f6be80d75e0c311f5b56ac6ece4d90f6ff SHA512 b993aa6da66d5f33c3bec51b6b1e5565bcea2b862e61cdb8021f6a1dce403fed5ae28945d260efdcbb86a81c4a84b58f3ef3b3f6601d43032241cae59a652794
 EBUILD libsidplayfp-2.11.0.ebuild 687 BLAKE2B 89257d5934cd9327850f3719e4fa316f15b3d124c722a7b026689e099a12faa3eca8ecbd8bba245043ea15603ea223aea103986df2fa495982e09a11347c23bc SHA512 faa54ae1b2098e9f988edda7fa3dcaebfe9dd1af6d44e26dbcccf228e06bc980d14a387f4c1d361c6dea462c921f789fc214a9c86f00650c747f1f382d4b7538
 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.10.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.10.0.ebuild
deleted file mode 100644
index 4eefc5282af5..000000000000
--- a/media-libs/libsidplayfp/libsidplayfp-2.10.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Library for the sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="amd64 ~hppa ~riscv x86"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	# fix automagic. warning: modifying .ac triggers maintainer mode.
-	sed -i -e 's:doxygen:dIsAbLe&:' configure || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 94c40c1aee11..d908a51b4924 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -2,13 +2,15 @@ AUX make-tarball.sh 1895 BLAKE2B d6311e862d8b2fb10d88a90263f7187c04bde49ff0ecb78
 AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55cc6e990186f506c67496fce774fdfef1ba23843129fd493f8aa3e4ad5f74cfcf1d2388da95225ac2ef19f0c949f425 SHA512 459c54dac19067f2185a02ef812932e8fcb6a73d6267c32578bd3b7d3b12494052e929b24663407ad919e1e98aa2df58ed8e27be3f18eeb2fbe2402e4ff9e629
 AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5e5bf8fb1ae9aff1ff1d7859cf1bb0d5f74fa1143681b451d36323f93d5e7fa3876e485d6538958e30779cac081df5b8 SHA512 7135533660b15a113df5a38298725f895e8cbd6ac4695eb5f2d40bd214c43cb9d1c261063e0cea162a6ca6071cda5f4e0380d29eefa6af57e7d67ce319fe2216
 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de
+AUX netpbm-11.2.11-fix-C23.patch 8937 BLAKE2B 7cfa15d6df66cdd4b24ae4874721acccf455b2b23fb2cd27aa1184a28d73e4d08eabc4d06f81a41d6eccaec2abe6683d2a7b4e05a143634cc64d84b2f83810b4 SHA512 c39dac81014fe235185e1ae884db6c0571c1dec744e108b1701b685ef4ba58d3c373b7223ae6b8f79b79e44bd162caa8f55ad3119fc40f7027914c919ddab354
 AUX netpbm-11.2.7-fix-pnmcolormap2-test.patch 7051 BLAKE2B 741d4943b2e9eab1fb0061d6265271df8e25e458c1eb39f50aed8a392edf8369c9f0f3c43fc6ca0b940dd376166c9419c5039ddeaf10487859a7ea9bec4e6075 SHA512 4c7be95b582db27e3ce542b8f53bfdad2e6882b22ccc383aa7ca480cb5ba2a6aa000724dae3c5107efd1071bb87fac0648061dd46b0b75f1072ef05b7e128a68
 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.8.1-fix-C23.patch 254 BLAKE2B 09c5385c80634990452030bc78f826b11e02d33bc2aba30c4ea0d822e776d6cdec00086fe64a863f9e324c017b0f02d8fa95a34933e2d639ac7f0ebfd7b4945b SHA512 e511958a4cd7ef63f53ddde2e6414b143f767d1e2a36a70ef953693a35aea3f13cb9749800927ce7c34029814872690779b0d2d2cbed72bf543c01bbee2863bf
+AUX netpbm-11.8.2-fix-C23.patch 8158 BLAKE2B e8e170768b1237d45fec73323d45e550c78525d424223dbe8be301a93704d9356e34859bdb729ee472055255be2e55db45dc80794330c93d88a2608fad55fc44 SHA512 7f7b6971154f0fd7de439ee9fb4e634e43c091ab998f919248df601cfab4edcc5869aaef29997a3dabe0b7fabcfd2d3c366397bbd9d432e49915b18f3110437e
 DIST netpbm-11.2.11.tar.xz 3782252 BLAKE2B 422b9cefee2a54a9c222236935291f0c8d1f13f064f4ebd277d0f92974b9ce3d7e3d9ae6a0410d767553704a03c2de14ca8456996a53fca0f95d61f9ae72605f SHA512 3d94c0c8c25873a16c78af960c964f5756b3e7a29463f001345956acc3bf1378b0b0b4fc0c57d7388dced0979ba4e8cee0def2200092544dd96fc7d04304660b
-DIST netpbm-11.8.1.tar.xz 3804004 BLAKE2B ed107d258a85c720de178a3e6488ad1b435135ec50227bb1e4ce9f3665a882a382c3a3e858e49055f88ee9bba6026b390291ad211a82299d03f41addaf93e7f9 SHA512 e4b1e8d7468fcd0233e50861e890669c788f95924edb6b6256f93b53d2ab16b7fd2c2099ca238b409fba7c764e51d54a9fbdbb22bb3bb1acf8296afdb807bd4f
+DIST netpbm-11.8.2.tar.xz 3804800 BLAKE2B 9b5bb460c2fbe73495cbb304ea0e1a2a4406838cbb4d0769d2b8147f9ee6156d93852ad36a5ea57a7437b9a1a3cc9f102271163bc4d6bbd004c42c7f81be2318 SHA512 b048b242891cbe56851b3da342de1717e1ab435a327b4eeebb83023e2e7ae57ae66a232df344b4d2b0fb12bc6abcf13d9cec392f19ff06951023ee4c002f9f17
+EBUILD netpbm-11.2.11-r1.ebuild 7195 BLAKE2B 348cd2b6b2b314a6a148dff591373235e3418ba73079fcc221b54cb3c332c0eea3530bc779cdc40c502d20c46f1d73bf656162c4a1d13f5a3b9b8f71ea95ee94 SHA512 617b8cf4c0835a8a3ba5040c40ea5f67550185df54c214d26da687f651d9a3f1b61d409528282ef882010da5938bb2a6cec64897ffe2388711e0613daec86493
 EBUILD netpbm-11.2.11.ebuild 7143 BLAKE2B bd8f69323411bddb85369e36b71da318c608639fd5fd3c4fcb5b4955913f488ad3639419ace4ec4cb0e03ac37551ec24134873a2710c31462225e46a47c4d5fd SHA512 1f9bdf04b95e57811e48b31c827ef3fa3c2234c63efd47ef37415900f71e6891f43c230f05a7a62716614662a30765c38ca39c8e621ccd1bff04bd35f30b0f71
-EBUILD netpbm-11.8.1-r1.ebuild 6982 BLAKE2B 675a317ba642fa765bc72cedfc182ea2e762f1f16c9b09be872bfabf153c673f125a79fdbf1be73c3328b9a026270426c450964aa2b1767b4305d97bce212d77 SHA512 ee3cab4f276c6fac1c92fd916c4923a77c61b4274f9bbb5cf8e244ee86725fb24e9d8947dff7684c4a4de03d5c6e65328f302ed6747e9b2618013d3bb90d390a
+EBUILD netpbm-11.8.2.ebuild 6982 BLAKE2B d714317350614a99edcae927edc381a0b6b72e232b5ab9352348c9773790d86bb97196244f65bc5d82d3147dcd7a5b8cdbd4249dfae19aaccc4173ebc1acd7ac SHA512 c8863a65259b46bf5e379127ee2290259b79fa07da5d8b19a425e92543f9e718b8118f94de8ca7ac52c10bb0dfb8b4170a6fd76c7d8e355d3744e3cc2a788b8f
 EBUILD netpbm-9999.ebuild 6353 BLAKE2B 262f73572750cd90d0f8b7b631233c9b0dd9f7871b55b0284ade4c054cc43fd6390ea5fd7efdd7dab33598f21e221e7caa72b4f92ec46d343fb62948b1fd5e88 SHA512 2e7e4a3b03a85552e401cca78f5815a0bc80bf91e83346f6db29da4aec1a66d729174a28f43eec17c30f64a8ca7cdd117d8f0f831eddc47df9d70514f4d94402
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/files/netpbm-11.2.11-fix-C23.patch b/media-libs/netpbm/files/netpbm-11.2.11-fix-C23.patch
new file mode 100644
index 000000000000..8f4d82994564
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-11.2.11-fix-C23.patch
@@ -0,0 +1,245 @@
+https://sourceforge.net/p/netpbm/code/4969/
+https://bugs.gentoo.org/943971
+
+Backport files/netpbm-11.8.2-fix-C23.patch to 11.2.11
+
+--- a/buildtools/libopt.c
++++ b/buildtools/libopt.c
+@@ -85,18 +85,11 @@
+ #  define SHLIBPREFIXLIST "lib"
+ #endif
+ 
++#include <stdbool.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
+-typedef unsigned char bool;
+-#ifndef TRUE
+-#define TRUE (1)
+-#endif
+-#ifndef FALSE
+-#define FALSE (0)
+-#endif
+-
+ #ifdef DLLVERSTR
+ static const char * dllverstr = DLLVERSTR;
+ #else
+@@ -105,9 +98,9 @@ static const char * dllverstr = "";
+ 
+ bool const explicit = 
+ #ifdef EXPLICIT
+-TRUE
++true
+ #else
+-FALSE
++false
+ #endif
+ ;
+ 
+@@ -131,17 +124,17 @@ parse_prefixlist(const char * const prefixlist,
+    there is guaranteed always to be one null string at the end of the
+    array.
+ 
+-   In case of error, return *errorP == TRUE and don't allocate any
+-   storage.  Otherwise, return *errorP = FALSE.
++   In case of error, return *errorP == true and don't allocate any
++   storage.  Otherwise, return *errorP = false.
+ -----------------------------------------------------------------------------*/
+     char * prlist;
+ 
+     prlist = strdup(prefixlist);
+     if (prlist == NULL)
+-        *errorP = TRUE;
++        *errorP = true;
+     else {
+-        if (strlen(prlist) <= 0) 
+-            *errorP = TRUE;
++        if (strlen(prlist) <= 0)
++            *errorP = true;
+         else {
+             /* NOTE: Mac OS X, at least, does not have strtok_r().
+                2001.09.24
+@@ -155,18 +148,18 @@ parse_prefixlist(const char * const prefixlist,
+             }
+             num_tokens = 0;
+             token = strtok(prlist, " ");
+-            *errorP = FALSE;  /* initial value */
++            *errorP = false;  /* initial value */
+             while (token != NULL && num_tokens < MAX_PREFIXES && !*errorP) {
+                 parsed_prefixes[num_tokens] = strdup (token);
+-                if (parsed_prefixes[num_tokens] == NULL) 
+-                    *errorP = TRUE;
++                if (parsed_prefixes[num_tokens] == NULL)
++                    *errorP = true;
+                 num_tokens++;
+                 token = strtok(NULL, " ");
+             }
+             for (i = num_tokens; i < MAX_PREFIXES + 1 && !*errorP;  i++) {
+                 parsed_prefixes[i] = strdup("");
+-                if (parsed_prefixes[i] == NULL) 
+-                    *errorP = TRUE;
++                if (parsed_prefixes[i] == NULL)
++                    *errorP = true;
+             }
+         }
+         if (*errorP) {
+@@ -194,7 +187,7 @@ parse_prefix(const char * const filename,
+    (The prefix always starts at the beginning of the filename).
+ 
+    Iff we don't find a valid library name prefix, return *prefix_good_p
+-   == FALSE.  
++   == false.
+ 
+    The list of valid prefixes is compiled in as the blank-delimited
+    string which is the value of the SHLIBPREFIXLIST macro.
+@@ -231,7 +224,7 @@ parse_prefix(const char * const filename,
+         i = 0;  /* start with the first entry in shlibprefixlist[] */
+         prefix_length = 0;  /* initial value */
+         prefix = shlibprefixlist[i];
+-        prefix_good = FALSE;  /* initial value */
++        prefix_good = false;  /* initial value */
+         while ( (*prefix != '\0' ) && !prefix_good ) {
+             /* stop condition: shlibprefixlist has MAX_PREFIXES+1 entries.
+              * we only ever put tokens in the 0..MAX_PREFIXES-1 positions.
+@@ -242,7 +235,7 @@ parse_prefix(const char * const filename,
+              */
+             prefix_length = strlen(prefix);
+             if (strncmp(filename, prefix, prefix_length) == 0) {
+-                prefix_good = TRUE;
++                prefix_good = true;
+                 /* at this point, prefix is pointing to the correct
+                  * entry, and prefix_length has the correct value.
+                  * When we bail out of the while loop because of the
+@@ -279,16 +272,16 @@ parse_filename(const char *  const filename,
+    
+    E.g. for "libxyz.so", return "xyz".
+ 
+-   return *valid_library_p == TRUE iff 'filename' validly names a library
++   return *valid_library_p == true iff 'filename' validly names a library
+    that can be expressed in a -l linker option.
+ 
+-   return *static_p == TRUE iff 'filename' indicates a static library.
+-   (but undefined if *valid_library_p != TRUE).
++   return *static_p == true iff 'filename' indicates a static library.
++   (but undefined if *valid_library_p != true).
+ 
+-   return *error_p == TRUE iff some error such as out of memory prevents
++   return *error_p == true iff some error such as out of memory prevents
+    parsing.
+ 
+-   Do not allocate any memory if *error_p == TRUE or *valid_library_p == FALSE.
++   Do not allocate any memory if *error_p == true or *valid_library_p == false.
+ -----------------------------------------------------------------------------*/
+     char *lastdot;  
+     /* Pointer to last period in 'filename'.  Null if none */
+@@ -305,21 +298,21 @@ parse_filename(const char *  const filename,
+         /* This filename doesn't have any suffix, so we don't understand
+            it as a library filename.
+         */
+-        *valid_library_p = FALSE;
+-        *error_p = FALSE;
++        *valid_library_p = false;
++        *error_p = false;
+     } else {
+         unsigned int prefix_length;
+         bool prefix_good;
+ 
+         if (strcmp(lastdot + 1, "a") == 0)
+-            *static_p = TRUE;
++            *static_p = true;
+         else
+-            *static_p = FALSE;
++            *static_p = false;
+ 
+         parse_prefix(filename, &prefix_good, &prefix_length, error_p);
+         if (!*error_p) {
+             if (!prefix_good) {
+-                *valid_library_p = FALSE;
++                *valid_library_p = false;
+             } else {
+                 /* Extract everything between <prefix> and "." as 
+                    the library name root. 
+@@ -328,7 +321,7 @@ parse_filename(const char *  const filename,
+ 
+                 libname = strdup(filename + prefix_length);
+                 if (libname == NULL)
+-                    *error_p = TRUE;
++                    *error_p = true;
+                 else {
+                     libname[lastdot - filename - prefix_length] = '\0';
+                     if (strlen(dllverstr) > 0) {
+@@ -341,10 +334,10 @@ parse_filename(const char *  const filename,
+                         }
+                     }
+                     if (strlen(libname) == 0) {
+-                        *valid_library_p = FALSE;
++                        *valid_library_p = false;
+                         strfree(libname);
+                     } else
+-                        *valid_library_p = TRUE;
++                        *valid_library_p = true;
+                 }
+                 *libname_p = libname;
+             }
+@@ -377,14 +370,14 @@ parse_filepath(const char *  const filepath,
+         */
+         *filename_p = strdup(filepath);
+         if (*filename_p == NULL)
+-            *error_p = TRUE;
++            *error_p = true;
+         else {
+             directory = strdup("");
+             if (directory == NULL) {
+-                *error_p = TRUE;
++                *error_p = true;
+                 strfree(*filename_p);
+             } else
+-                *error_p = FALSE;
++                *error_p = false;
+         }
+     } else {
+         /* Split the string at the slash we just found, into filename and 
+@@ -392,14 +385,14 @@ parse_filepath(const char *  const filepath,
+            */
+         *filename_p = strdup(lastslash+1);
+         if (*filename_p == NULL)
+-            *error_p = TRUE;
++            *error_p = true;
+         else {
+             directory = strdup(filepath);
+             if (directory == NULL) {
+-                *error_p = TRUE;
++                *error_p = true;
+                 strfree(*filename_p);
+             } else {
+-                *error_p = FALSE;
++                *error_p = false;
+                 directory[lastslash - filepath] = '\0';
+             }
+         }
+@@ -503,12 +496,12 @@ main(int argc, char **argv) {
+     char outputLine[1024];
+ 
+     strcpy(outputLine, "");  /* initial value */
+-    runtime = FALSE;  /* initial value */
+-    error = FALSE;  /* no error yet */
++    runtime = false;  /* initial value */
++    error = false;  /* no error yet */
+ 
+     for (arg = 1; arg < argc && !error; arg++) {
+         if (strcmp(argv[arg], "-runtime") == 0)
+-            runtime = TRUE;
++            runtime = true;
+         else if (strcmp(argv[arg], "-quiet") == 0) {
+             /* Doesn't do anything today */
+         } else {
+@@ -518,7 +511,7 @@ main(int argc, char **argv) {
+             if (!error) {
+                 if (strlen(outputLine) + strlen(options) + 1 + 1 > 
+                     sizeof(outputLine))
+-                    error = TRUE;
++                    error = true;
+                 else {
+                     strcat(outputLine, " ");
+                     strcat(outputLine, options);
diff --git a/media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch b/media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch
deleted file mode 100644
index a749ec434d31..000000000000
--- a/media-libs/netpbm/files/netpbm-11.8.1-fix-C23.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/943971
-
---- a/buildtools/libopt.c
-+++ b/buildtools/libopt.c
-@@ -89,7 +89,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
-+#if __STDC_VERSION__ < 202311L
- typedef unsigned char bool;
-+#endif
- #ifndef TRUE
- #define TRUE (1)
- #endif
diff --git a/media-libs/netpbm/files/netpbm-11.8.2-fix-C23.patch b/media-libs/netpbm/files/netpbm-11.8.2-fix-C23.patch
new file mode 100644
index 000000000000..c6aaf0288261
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-11.8.2-fix-C23.patch
@@ -0,0 +1,241 @@
+https://sourceforge.net/p/netpbm/code/4969/
+https://bugs.gentoo.org/943971
+
+--- a/buildtools/libopt.c
++++ b/buildtools/libopt.c
+@@ -85,18 +85,11 @@
+ #  define SHLIBPREFIXLIST "lib"
+ #endif
+ 
++#include <stdbool.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
+-typedef unsigned char bool;
+-#ifndef TRUE
+-#define TRUE (1)
+-#endif
+-#ifndef FALSE
+-#define FALSE (0)
+-#endif
+-
+ #ifdef DLLVERSTR
+ static const char * dllverstr = DLLVERSTR;
+ #else
+@@ -105,9 +98,9 @@
+ 
+ bool const explicit =
+ #ifdef EXPLICIT
+-TRUE
++true
+ #else
+-FALSE
++false
+ #endif
+ ;
+ 
+@@ -132,17 +125,17 @@
+    there is guaranteed always to be one null string at the end of the
+    array.
+ 
+-   In case of error, return *errorP == TRUE and don't allocate any
+-   storage.  Otherwise, return *errorP = FALSE.
++   In case of error, return *errorP == true and don't allocate any
++   storage.  Otherwise, return *errorP = false.
+ -----------------------------------------------------------------------------*/
+     char * prlist;
+ 
+     prlist = strdup(prefixlist);
+     if (prlist == NULL)
+-        *errorP = TRUE;
++        *errorP = true;
+     else {
+         if (strlen(prlist) <= 0)
+-            *errorP = TRUE;
++            *errorP = true;
+         else {
+             /* NOTE: Mac OS X, at least, does not have strtok_r().
+                2001.09.24
+@@ -156,11 +149,11 @@
+             }
+             num_tokens = 0;
+             token = strtok(prlist, " ");
+-            *errorP = FALSE;  /* initial value */
++            *errorP = false;  /* initial value */
+             while (token != NULL && num_tokens < MAX_PREFIXES && !*errorP) {
+                 parsed_prefixes[num_tokens] = strdup (token);
+                 if (parsed_prefixes[num_tokens] == NULL)
+-                    *errorP = TRUE;
++                    *errorP = true;
+                 num_tokens++;
+                 token = strtok(NULL, " ");
+             }
+@@ -167,7 +160,7 @@
+             for (i = num_tokens; i < MAX_PREFIXES + 1 && !*errorP;  i++) {
+                 parsed_prefixes[i] = strdup("");
+                 if (parsed_prefixes[i] == NULL)
+-                    *errorP = TRUE;
++                    *errorP = true;
+             }
+         }
+         if (*errorP) {
+@@ -195,7 +188,7 @@
+    (The prefix always starts at the beginning of the filename).
+ 
+    Iff we don't find a valid library name prefix, return *prefix_good_p
+-   == FALSE.
++   == false.
+ 
+    The list of valid prefixes is compiled in as the blank-delimited
+    string which is the value of the SHLIBPREFIXLIST macro.
+@@ -232,7 +225,7 @@
+         i = 0;  /* start with the first entry in shlibprefixlist[] */
+         prefix_length = 0;  /* initial value */
+         prefix = shlibprefixlist[i];
+-        prefix_good = FALSE;  /* initial value */
++        prefix_good = false;  /* initial value */
+         while ( (*prefix != '\0' ) && !prefix_good ) {
+             /* stop condition: shlibprefixlist has MAX_PREFIXES+1 entries.
+              * we only ever put tokens in the 0..MAX_PREFIXES-1 positions.
+@@ -243,7 +236,7 @@
+              */
+             prefix_length = strlen(prefix);
+             if (strncmp(filename, prefix, prefix_length) == 0) {
+-                prefix_good = TRUE;
++                prefix_good = true;
+                 /* at this point, prefix is pointing to the correct
+                  * entry, and prefix_length has the correct value.
+                  * When we bail out of the while loop because of the
+@@ -280,16 +273,16 @@
+ 
+    E.g. for "libxyz.so", return "xyz".
+ 
+-   return *valid_library_p == TRUE iff 'filename' validly names a library
++   return *valid_library_p == true iff 'filename' validly names a library
+    that can be expressed in a -l linker option.
+ 
+-   return *static_p == TRUE iff 'filename' indicates a static library.
+-   (but undefined if *valid_library_p != TRUE).
++   return *static_p == true iff 'filename' indicates a static library.
++   (but undefined if *valid_library_p != true).
+ 
+-   return *error_p == TRUE iff some error such as out of memory prevents
++   return *error_p == true iff some error such as out of memory prevents
+    parsing.
+ 
+-   Do not allocate any memory if *error_p == TRUE or *valid_library_p == FALSE.
++   Do not allocate any memory if *error_p == true or *valid_library_p == false.
+ -----------------------------------------------------------------------------*/
+     char *lastdot;
+     /* Pointer to last period in 'filename'.  Null if none */
+@@ -306,21 +299,21 @@
+         /* This filename doesn't have any suffix, so we don't understand
+            it as a library filename.
+         */
+-        *valid_library_p = FALSE;
+-        *error_p = FALSE;
++        *valid_library_p = false;
++        *error_p = false;
+     } else {
+         unsigned int prefix_length;
+         bool prefix_good;
+ 
+         if (strcmp(lastdot + 1, "a") == 0)
+-            *static_p = TRUE;
++            *static_p = true;
+         else
+-            *static_p = FALSE;
++            *static_p = false;
+ 
+         parse_prefix(filename, &prefix_good, &prefix_length, error_p);
+         if (!*error_p) {
+             if (!prefix_good) {
+-                *valid_library_p = FALSE;
++                *valid_library_p = false;
+             } else {
+                 /* Extract everything between <prefix> and "." as
+                    the library name root.
+@@ -329,7 +322,7 @@
+ 
+                 libname = strdup(filename + prefix_length);
+                 if (libname == NULL)
+-                    *error_p = TRUE;
++                    *error_p = true;
+                 else {
+                     libname[lastdot - filename - prefix_length] = '\0';
+                     if (strlen(dllverstr) > 0) {
+@@ -342,10 +335,10 @@
+                         }
+                     }
+                     if (strlen(libname) == 0) {
+-                        *valid_library_p = FALSE;
++                        *valid_library_p = false;
+                         strfree(libname);
+                     } else
+-                        *valid_library_p = TRUE;
++                        *valid_library_p = true;
+                 }
+                 *libname_p = libname;
+             }
+@@ -378,14 +371,14 @@
+         */
+         *filename_p = strdup(filepath);
+         if (*filename_p == NULL)
+-            *error_p = TRUE;
++            *error_p = true;
+         else {
+             directory = strdup("");
+             if (directory == NULL) {
+-                *error_p = TRUE;
++                *error_p = true;
+                 strfree(*filename_p);
+             } else
+-                *error_p = FALSE;
++                *error_p = false;
+         }
+     } else {
+         /* Split the string at the slash we just found, into filename and
+@@ -393,14 +386,14 @@
+            */
+         *filename_p = strdup(lastslash+1);
+         if (*filename_p == NULL)
+-            *error_p = TRUE;
++            *error_p = true;
+         else {
+             directory = strdup(filepath);
+             if (directory == NULL) {
+-                *error_p = TRUE;
++                *error_p = true;
+                 strfree(*filename_p);
+             } else {
+-                *error_p = FALSE;
++                *error_p = false;
+                 directory[lastslash - filepath] = '\0';
+             }
+         }
+@@ -504,12 +497,12 @@
+     char outputLine[1024];
+ 
+     strcpy(outputLine, "");  /* initial value */
+-    runtime = FALSE;  /* initial value */
+-    error = FALSE;  /* no error yet */
++    runtime = false;  /* initial value */
++    error = false;  /* no error yet */
+ 
+     for (arg = 1; arg < argc && !error; arg++) {
+         if (strcmp(argv[arg], "-runtime") == 0)
+-            runtime = TRUE;
++            runtime = true;
+         else if (strcmp(argv[arg], "-quiet") == 0) {
+             /* Doesn't do anything today */
+         } else {
+@@ -519,7 +512,7 @@
+             if (!error) {
+                 if (strlen(outputLine) + strlen(options) + 1 + 1 >
+                     sizeof(outputLine))
+-                    error = TRUE;
++                    error = true;
+                 else {
+                     strcat(outputLine, " ");
+                     strcat(outputLine, options);
diff --git a/media-libs/netpbm/netpbm-11.2.11-r1.ebuild b/media-libs/netpbm/netpbm-11.2.11-r1.ebuild
new file mode 100644
index 000000000000..2dda088e9c41
--- /dev/null
+++ b/media-libs/netpbm/netpbm-11.2.11-r1.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2024 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.8.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
+}
diff --git a/media-libs/netpbm/netpbm-11.8.1-r1.ebuild b/media-libs/netpbm/netpbm-11.8.2.ebuild
index 3626f909bb88..98f2becc519a 100644
--- a/media-libs/netpbm/netpbm-11.8.1-r1.ebuild
+++ b/media-libs/netpbm/netpbm-11.8.2.ebuild
@@ -59,7 +59,7 @@ PATCHES=(
 	"${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
 	"${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
 	"${FILESDIR}"/netpbm-11.7.2-lto.patch
-	"${FILESDIR}"/netpbm-11.8.1-fix-C23.patch
+	"${FILESDIR}"/netpbm-11.8.2-fix-C23.patch
 )
 
 netpbm_libtype() {
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index d402abef99e1..405310f837f8 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,6 +1,6 @@
 AUX simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch 1175 BLAKE2B 6533dde5a029fef8bf3804855f11e703beb3e02c36f193343c3337590659e5562539fbe853914ad7287ca6cd840b432d0c71d2847da7c6884b714b5512af49c0 SHA512 1dc17b023ba8a9e07a9ae971d99d9200ce14374b106e648b4a6b62e06e0ebb34e01a635c9cacd6579b3606cf62448953e459c5b1ca45a21ede9e5c0c19b8812f
 DIST simage-1.8.3.tar.gz 829994 BLAKE2B 794ee3a1c71727af7e92839542470a4732584715b01cbfd5be7b34d8ea8295ca65f5634e10027e0e7e4eb36a024d31704ad31d9aa0a6ad6b66c08612879a1603 SHA512 193137bd00a322fe6c170d3ff318ac81e4cc685bdfa40a0415c5bb95802b6290174fea630eb79956f362b4e79fa0b60916976c63ef26d6a65a6a51d5d9f7de03
-EBUILD simage-1.8.3-r1.ebuild 2172 BLAKE2B 226f90bbb4ca12f9a623d1c53fb5f0fa7d44b26491c22921a727bf31c542920a186f3cc276e3c0bd33b3bb17b1f897d602305a18bb169fa902459d4bacda5f8e SHA512 35cb1c82335ea27b01ab218ef0bf2d7acaa933353a0a157098967446a91d9f7b2066cd5385892628366e98227179adc4068580a2b9067601a7efd48afaf37c44
+EBUILD simage-1.8.3-r1.ebuild 2171 BLAKE2B 800370f78da6f77b863c6404c5c74c612aa0ba0215ffda6a2973fdc4e2fc7b736cdb9a5b6a33d5f63cf73a49e931b94c1852c9a333d87603786c48e1ebd07359 SHA512 756c430c2ab1c8025b44146ed16696bc3dfcc2ac3a66dcf595ecf235ec15802565ca7b734cf0b751f17c186bc4ce08e38ce9045d302b298feda45d99a3312f28
 EBUILD simage-1.8.3.ebuild 2335 BLAKE2B d7c97ee33cf75a66034abbc477bd01e87a66d163250e3178a6946f1581104e400dbad04db35056df125b947012cecfbd9cc437cf468fafe2ecb905ebac41b5ff SHA512 1bf68cc9a4e303f08a43317c5ea3d3e00e2bf960dbdb19b52865f8cebf89cbf791553cfc2a46665f14cc6e96846feb5d79c078a858d434c0469f06c25ad12877
 EBUILD simage-9999.ebuild 2175 BLAKE2B e1ecf50ae26d882d1be0d70b2b8daa1d91d3675394a18f67ba6bf31fce759e40ba541a01bfc97114787923dcb473200d80367cfd8cfeea4723382a3fd4859503 SHA512 0ff7d96d095897f12ff23af0ac8ca356cb3554aa823528acdc28a0bdd3d2c258125535b6bfc701fcb476c90ed14acdeefd3857a8503ad9499f593bdb0a159cb8
 MISC metadata.xml 298 BLAKE2B bbb65357f89a126895f808f22a14211302edac1ef368ceea547a0cb8b0a4d62e50e61572a47a2d9a123d22f33f384cd7fe6b0604d78ce83701608db0725a076d SHA512 70fe0d52216ae4902962671d07b6667c1aad035e9d6a737700a44d3f0ef08670e965cf692dcb3fe106a0dd62125b9fd433bd980cc46a3be4d34cfef7d79da06e
diff --git a/media-libs/simage/simage-1.8.3-r1.ebuild b/media-libs/simage/simage-1.8.3-r1.ebuild
index d1787041d5b5..73298867eca3 100644
--- a/media-libs/simage/simage-1.8.3-r1.ebuild
+++ b/media-libs/simage/simage-1.8.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/coin3d/simage.git"
 else
 	SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 	S="${WORKDIR}/${PN}"
 fi
 
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index 9fc5cdef02fd..15068f7c550a 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -6,6 +6,6 @@ DIST svt-av1-1.1.0.tar.gz 9882945 BLAKE2B 2673fdbe17b36607e581cc540ca181672d16b3
 EBUILD svt-av1-1.1.0.ebuild 1224 BLAKE2B 08c4ceda99ef6c48af8f1d5f09eb6cc71d9aba706d5a999a38b8913a875df9ac4d38aaaaa478e38e24954602ccae0bf5d661611066b6c754e85511c09b9525a4 SHA512 2b0e497070c117aa57f14e7aad8750c2a9c660510e98a932f8b09aff51abd771d8bc8d87b0d1dda95ead618c84505b6addfd6de3f7df86fdbfb08076c0053abe
 EBUILD svt-av1-1.4.1.ebuild 1345 BLAKE2B f9c230214a901700aee52190b4710387192cda21fbe9829484d543ec64e0749db74c067b8e2cf4fa11ce262a8debaff5221e7bf4a9082d65ad9379cf88963015 SHA512 672ca82bd204f05db7574887dd191b2d5eb8cb9d1ff0addb2e1e187b0c78018e0924d3f57c98e37ac85bccdbe8776ccfb3890278d857c02b1bf4213c7cd89fad
 EBUILD svt-av1-1.5.0-r1.ebuild 1439 BLAKE2B f4b34b721a8cd7b09df83353343f1c303cae76b31ad7ed4f149b1df8eba79c1e607536cea43054ad633540152d97eeef3eb946fb5f05eb1d133d54c3a3530a1c SHA512 03fd0396d3a1532b34c23842feb15e9480ca5024bff21b40a2bf72932d96f31c2ff9ef93ed5ab7baf1bb773ced242206a09e07fd9699bd963928916a493a8a1c
-EBUILD svt-av1-2.1.2.ebuild 1453 BLAKE2B 480037e758130f76073e49e7feae113a7cb1916d06619ec583ebda1896fd1c9be76db7b6b9dfab2dd940fd14893bf0ab69932d9968b62e998f59814757265f13 SHA512 48c98da9c2ca11cb91adad1ec46994aabb06f8bfddce616d28303c1c2691c0674303294ef310452cc337682403097891e6efc49426429f2a6d4351858dada5dd
+EBUILD svt-av1-2.1.2.ebuild 1452 BLAKE2B 21d43a6f01c63e8120deb8bc1c78346ed106c31d93d79077bc8aee9400bf674cc6a689448b02c41cb5cabbcd5a587e960722c00a4a3e0845a99791f8495dea1d SHA512 7186382b14b52387cbb7c3050ad71149b1e753384f22dcb45357d63cea35bc34d7c246b4809c34870323cd40d6015397c0d4d97c369c848637f0eaa0a3d60003
 EBUILD svt-av1-9999.ebuild 1459 BLAKE2B c8ea8e447d706d9a4c33b4b5e3ad58052495a88321a431c0d857f8e1e8204e9e3e862a3fc1058210fe3ddc282dea445e95da6d1c6bf9f926fb1e579a7bb5e72e SHA512 0920c552d1c7a0c58d8e74ad1e9ade4697f46102891bd9645bcaa83865275348986c7c490f5223ba182c8e9c4daef36c25ef5592521785126772c96c4c14edec
 MISC metadata.xml 309 BLAKE2B a2ecbfce87a4b009eb73ed20aee779d72424bc55e47ad0584e81278ae60fde02cab3fff0d758d8d64c6c801ac2edfd482903677bfcdd8508d6317cde72a5928e SHA512 2aac0ede3b705ddb81342f85437aaf34cea0644a1c8a7cc06c9d4c1a7d47ee60993040418f774f395e27c818ca41b19a1bf1ef2143426e15c6ddf5fb588bf84f
diff --git a/media-libs/svt-av1/svt-av1-2.1.2.ebuild b/media-libs/svt-av1/svt-av1-2.1.2.ebuild
index 4e4d8d956d1e..6ba513e8db9a 100644
--- a/media-libs/svt-av1/svt-av1-2.1.2.ebuild
+++ b/media-libs/svt-av1/svt-av1-2.1.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/SVT-AV1-v${PV}"
 fi
 
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 6e243814869e..f1c5d1ef0783 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -4,6 +4,6 @@ DIST x264-0.0.20240513.tar.bz2 841594 BLAKE2B fe88195c52d90e635a0aedef7d18886160
 EBUILD x264-0.0.20220222.ebuild 2095 BLAKE2B cc898e0c9071a32b0b516e0518fd9d0a6505e4bcbddf616c4638c2949baf42ed7133db665ec29aed80974ca5ae32d651d0fa7627a182b71e8a2c53647d989cbc SHA512 5f7b5954bdee13b9738651cf6a7ae91c21768db0f983aa4474760fba6f2109245def57eb78c7333152c149ecb2d7016bd769b6e0be249bd7e11d16e83149c61b
 EBUILD x264-0.0.20231114-r1.ebuild 2104 BLAKE2B 5ad9c7cea1b07abda17129c4d48f09dd83a302a3c8dac31f926fe2289e3471d509b2ae63485144404e41d618bbe06de0f9e2592087ad23391e155aae46886138 SHA512 1a327105c10e858777e03a182997f896ae24bf5fa64bf8ef50a0dd14e15d7400073c9459b2a396a7bbf28fa159ee80e0b2072606873f9ab600664143b19c274f
 EBUILD x264-0.0.20231114.ebuild 2131 BLAKE2B c96a61896789c8f792ce3a9154e8bc0b2db72866a8c24e4bd4e6d5691fb18670a79d7059030406007bf876d1bdbf3fb227da92841bda34390f01b168266b67ba SHA512 cacdea3936f0eca5c8e1347b879d8192987bc7e5776bcf8277c3cf037e10e868ba8ae8d951ea7de6d275185bb1aa68f20d2bfb590a9d03676b7626cc5adad75c
-EBUILD x264-0.0.20240513.ebuild 2105 BLAKE2B 5a2cc31b1aef146efa2b2b68af21693630b0b6709e7c7e323cebecdafc741e5b5ef507fad442adf7ff41c9c45180aabaaaae19ead087f18c7602892f557e4382 SHA512 3e76edf641bc3560e937d30323eae56cc6d5246a7c41bac1d6210372c47ece95abf317c111be9c82cae86b049312298fb28bfbe5703addc27583524ecc592923
+EBUILD x264-0.0.20240513.ebuild 2104 BLAKE2B 4056d587b17f22c1ba4af43e9bac55dea88244e731f09ccbc85fcbaed9d50ec11cc3c0ed6c730b4f15fa7120d63c64d6b85dd5b4a63c7669d94d9ecf0de3fe3b SHA512 0516835cd4fb4897981cc126ed06efe477651ed1c4e5a3249c71ecf477a43568ae894552f649ff9cf80a4689e51add9ec382b664001f67360362cb05f8b13354
 EBUILD x264-9999.ebuild 2111 BLAKE2B a7bc182dac66e4353b97794a73297eb732cd67a8ff22fa04956960f5d28a26a3f907dcae012a36a987f53cb3c00b80960805593e70686f8df1f845be2f8a4111 SHA512 ae33f6279f8a6796c072dd8ff9366913ddc0b79da1d15b2c6bf1f9f119a363460c445b0496ea13581fb2ab8f238107681c3844986ecc30b93cb6e54ced77ab02
 MISC metadata.xml 436 BLAKE2B ae066438ad1ac844f1c212b463498e0d4ee3e0b38d24b7a85a36dca419cfffc83799c69fed3af8d7ae35e619a961ca7aa3b4cbb86ade79eff318e05da836ea68 SHA512 f019ace06237e2e0244efd5cee86fdadafb03dfd0f2dec16dfce3d39ffe5a80292840c14378eed2270b47bcc6f32d5b59d358461f93bc7fc25ff14f35be4b41c
diff --git a/media-libs/x264/x264-0.0.20240513.ebuild b/media-libs/x264/x264-0.0.20240513.ebuild
index 14b38ff6c75b..8a455357f951 100644
--- a/media-libs/x264/x264-0.0.20240513.ebuild
+++ b/media-libs/x264/x264-0.0.20240513.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
 	SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${PN}-${X264_COMMIT}"
 fi
 
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 0ff988cf2df8..0f7c4c7e3fcb 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -16,6 +16,6 @@ DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237
 EBUILD x265-3.5-r3.ebuild 6316 BLAKE2B 5b99f0ce346bb24e74e561ec7b135e10c32346121750bb27c3a93fa5e36dc182436fe44ec6c0838762690ebb4258876b0134db8788838872d21e1e7e9c2f8dee SHA512 898a05326c6b89dba113e55fa842e7dd830d13197dced98d7a0015a402132a9c1848106443cbc3e4b9ab26e5ad53e63dbb9ed4e4b199c963e9c1bdf7be134e1e
 EBUILD x265-3.5-r4.ebuild 6322 BLAKE2B c6adc976356fcf9cb3fdc62a6fbe59fe5685a105ea57f5a6267aee55d5ab5f06c43f7cdb29fdae7d2fefbe8b31407fbcb30c104a044473a11357a3a80ac3672e SHA512 8d443c96c79b9ca9737509f72839f2db02854f21f8391e9dd60a2c83eb967363bbe1953e2aa7ba4b9b675aa685c88abd2a84af0d99e461be7719c2e56a70f7b4
 EBUILD x265-3.5-r6.ebuild 5350 BLAKE2B 0b019e6c35b3e61990ee28bb19ea8a157b44531617d7e71e0f039a62a2dd24909bc3c640b554fb5e1433db3424e4b35eead1e2685ac606470a428bd460855541 SHA512 22816466595e1e5bbf4358ef62683cee064bbc4c6aa1f71c5d780f6e4b217a8b25c6a8c1b4732fdeba686c271272355a30746fc040404dfe896edc67840f190b
-EBUILD x265-3.6-r1.ebuild 5373 BLAKE2B d79bc23bd6e9380cb93f06de182ad79b1b05cefc5c2650f089dc35668ead141f5227cc92ccd6a6593958d67a0f35a35f927cf221910c7499f41ea93790771f78 SHA512 098b9a94787c39761524670e67506907b312812d26167fefaadcba125e710c4f17620a224f0774856d995d7fe8c432e790fbfbb7c0e9a34d9212ff3bb34f46f5
+EBUILD x265-3.6-r1.ebuild 5372 BLAKE2B c2331e50fe175f3c040cc45b2aa90afc4ee67877f771612d9d2a9b339fcc1405fa883ca94e8169b3770f1acd752353499cf2b8e238a2cc02de9114241461dc3e SHA512 b1976fbe14e2a6ba6f1811bfe67fc387a40918703164d845943f4fcafe28f88a8a5240d6604d49711a7e1fb876d1cb6a2448168ac8e09a0040ea825ffd54b620
 EBUILD x265-9999.ebuild 5374 BLAKE2B 7134b8f29ccab6ddbeb933de089caade90f02c8affbe8c2f1c703ac1fee116824b5406b0b1bce7da93a995df8ee661340f69002b41e8b772cbbb613d7e976958 SHA512 c49a0acb6893a2f54e89fec2f8af26f63d79b6302697f8f85ce222b7749af17a5075f7bfcd72852288a41846281fe18802ceefb7330f5b2c5aa15ad34e4cb696
 MISC metadata.xml 541 BLAKE2B 4509c092fe30d689d4f18d077d429bbd0c05f704fa2027dd400d3686a35f1d39631480abce2357cb7cec8f468b2eeed2a08156f8830938171016c6e77d3f2a73 SHA512 d80b09241e28cffdab81e21f40d81f4da4814574f3e56109684f654887767a671c111bdc9f44566b0e7ab7c8cca949a5718d8afb20f0a43e73c2e6b878bd28a7
diff --git a/media-libs/x265/x265-3.6-r1.ebuild b/media-libs/x265/x265-3.6-r1.ebuild
index d8f5a019b981..b77af05462a2 100644
--- a/media-libs/x265/x265-3.6-r1.ebuild
+++ b/media-libs/x265/x265-3.6-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
 	MY_P="${PN}-${PV}"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
 	MY_P="${PN}_${PV}"
 fi