gentoo auto-resync : 05:06:2024 - 00:07:52

10 files changed, 76 insertions, 271 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c361ac56ce67..7bbb75e9e618 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index bc8a015d64d2..1ca50df44a2f 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -3,6 +3,7 @@ AUX libaom-3.7.0-allow-fortify-source.patch 467 BLAKE2B 405f87a6467daae59823eedc
 AUX libaom-3.7.0-big-endian-tests.patch 1611 BLAKE2B 9c0ab0a6a5788fdbc87f30ef5f2a6524521dcf1ec1911544827acb912551c08fcf370c369abfde1567d691a8b814ec897d90819431d7ad091dc247dc7e7396e0 SHA512 299f511b45ba9f1511ab508159f7341ff6ca433118feefd66e96266131588203fc651b4b88be79487b1cbb688c7946dddeeba1b07d88c471da95465e6782fb87
 AUX libaom-3.7.0-big-endian.patch 4168 BLAKE2B 6c9a9ac0933b29b3ee8111d8068dfff144385ae68ebf693a335672c3138cc31ef346486af44b0b0fff9bad58ad72d2335962b78bc82e40b1a7f4a4c9b5d3ca28 SHA512 aebd3f9d16f0cc6a6a0b7a240d5d8cb55d28fc8fe4a00444b26c4b54fed0536ff3577aab5aa624cd9900858770dfdad50f9429d91ee0638058d4be34873e8be6
 AUX libaom-3.8.1-tests-parallel.patch 907 BLAKE2B 3c969182fed047b6075ebd0d19f50dfe19028658da42eefc991eaf4ed15736ac95219f5562dc8c04e34849c615fe74a5c940701e274ed7485387092d8d46fb50 SHA512 293924e8732640977c706dcf7fe811f76f093402faa3db8e61d35e32552df889dc63073f004dce4bc4230ceb647f78d0085c9a0099b597b148b9a29fc38f2544
+AUX libaom-3.9.0-guard-ssse3.patch 1570 BLAKE2B 69b5b73ba6ff68b1e5badfcd7cfdf9cc6afeca2838363273852c7757efba448881d042e52be9632c7593cd0992daea439c05da3423a7d31c2abac64fe86723f0 SHA512 5222e5af8a41da106074ed312fb1c35ce7337b43cc6d0ec3e9fbf11fecef2e5f756d64dafa3d5cb6a0d4d31afa9e155b795dfe0db37b891f54ad2d1b409b74a4
 DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
 DIST libaom-3.7.0-testdata.tar.xz 374076136 BLAKE2B 17036f37fbb04d59b50e13e5e2258215e99cab4b6f64ac558213009477bc22f43267b60bcbb30ec10325de2aed48b22237b12cd6220f4330e300b62bafedac0b SHA512 c08ef4c9c45f1a27e6c31b8cc9799d8e65d895663a79d7be51da1733be6d8013adaad3a8f1d7491f555a2eea58aead44b9ce935c3e9bb957cb8bbb93f6f4fd98
 DIST libaom-3.7.0.tar.gz 5347924 BLAKE2B 2693d60f5afa810e00ab6aadcf8ca763e328bc64e47b3678eeba9993db89b25cfa0380beeff5a5938f19da74410ce83068c318cff2aea30e5fe39680ac67e937 SHA512 b763a877db26dcaddea5513825900917e55bc131bf78a83f941f1e74b534a514cb599fb64c3ac18a8202ac0a72c511dfef6eeff21dfbe59ed9816887ca3ec5f3
@@ -13,6 +14,6 @@ DIST libaom-3.9.0.tar.gz 5518815 BLAKE2B 4c68b58f6a8e347ee912e309a030804c4a3cc99
 EBUILD libaom-3.5.0.ebuild 3315 BLAKE2B afdd6a434aef5df50c5994bbb9354e41f695a3f91b2a7d68ee37e567d9bd0bea178f1612ff40917b6d56b3446a0e69dbec07b2ba4c2fbe80d62b0d2e859ff65f SHA512 1d3ac1927aace364c0d2e68ac060cf1ecc7af3c9544ac00e8910d940f38221548ec831ff3596498e0c40308a49d24104861603bb204fd8c7db2546466627e9f7
 EBUILD libaom-3.7.0-r2.ebuild 4406 BLAKE2B af21096b90e2d22986715e2399ed37879ea36fe0b7e8bc082a27da285745a8baa6b6485e780cd4062c255268d5c3885dbcc43c7231c2aa446478872ebf390b14 SHA512 e4cf9710930b9979dd5672a776189ce6f7e2f11913621cde8e5a919bb2eaa62f2cca227bf90fd6c1e4e1af65cd4ad3b89e3a63bb69ce2abcb2467406472eb151
 EBUILD libaom-3.8.1.ebuild 5040 BLAKE2B d05cd1c1f036ab0797d2fd09089995ba8e8851cfdc3195015192c45ed7597aea81d9f6011feac3bf130be9ff842f37fd42b10527315a42f6bf2d7da4a9b01498 SHA512 e260ef1652c507566089a8322ee475b8a62f9d20c2fdf9125912e345c3d28d4c891f9aaf33329fda626fe7951d0b066e7c09bb7a9aa1e5f520652b255151e129
-EBUILD libaom-3.9.0.ebuild 4518 BLAKE2B 01894d2ed2606176078854f4743042c375d5b4ee3a40c245f533aaa29036c521b30fc30d20d725a58070671f0238a4b499efb08ce8ef8fd4ce2aec47505455e8 SHA512 9114b102912b94eaf078d111457c980e58941a9393e702d1de84ff92afdf194be3c4a4d49cd828ce03954d925e9717f74816f382114a16043586f12d0804c678
+EBUILD libaom-3.9.0.ebuild 4564 BLAKE2B e36f00df8f38cfe2a668ff81e814e803aeab849f4d858e651de24478c42e130e0b056c560f9e72601c6c80ddca5ce515506cc82a2f1b9dd56b0d6ee090693a55 SHA512 fb1bd16daab7bc345b12ccd28902bce293002ef78f1735bee6d134b51840b867478b5522f48d9f60e3a45bb6055d1c74383d55e06b8080e4cf3dc1037c37a410
 EBUILD libaom-9999.ebuild 4538 BLAKE2B c90cda9d85a07000c0ba9ebdf8296f30d3300297c0904810b340f1e0c27e6a709a8ee9d4bcd8f4e151a89cb9c73a8cb82ae7d41f1751b791c4fde3c08a51fd98 SHA512 d091fc389f7a9ecaa25ff0547f4eb493989243d5ce4594d0f47616ea091535a86fa42d6035e25741521cc0075eca312e5e5b907d5bb09de657f52e3f68df0918
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/files/libaom-3.9.0-guard-ssse3.patch b/media-libs/libaom/files/libaom-3.9.0-guard-ssse3.patch
new file mode 100644
index 000000000000..40cb17f0a354
--- /dev/null
+++ b/media-libs/libaom/files/libaom-3.9.0-guard-ssse3.patch
@@ -0,0 +1,67 @@
+https://bugs.chromium.org/p/aomedia/issues/detail?id=3578#c6
+https://bugs.gentoo.org/933429
+
+From 8670445106036383c1f55c08b1a3283bd0accf7a Mon Sep 17 00:00:00 2001
+From: Wan-Teh Chang <wtc@google.com>
+Date: Mon, 3 Jun 2024 11:13:53 -0700
+Subject: [PATCH] Guard DECLS(ssse3), FNS(ssse3) with #if HAVE_SSSE3
+
+The aom_dsp/x86/variance_sse2.c file is compiled if the ENABLE_SSE2
+cmake option is enabled. The file also contains some SSSE3 code. That
+code should only be compiled if the ENABLE_SSSE3 cmake option is
+enabled.
+
+Bug: aomedia:3578
+Change-Id: I86685862e7da9506bd551b76228cdc9920c68ab1
+(cherry picked from commit afb5237d908bd04ce6ea15eae85db4a54cba289c)
+---
+ aom_dsp/x86/variance_sse2.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/aom_dsp/x86/variance_sse2.c b/aom_dsp/x86/variance_sse2.c
+index 81b30072a5..e71244f1c7 100644
+--- a/aom_dsp/x86/variance_sse2.c
++++ b/aom_dsp/x86/variance_sse2.c
+@@ -415,7 +415,9 @@ unsigned int aom_mse16x16_sse2(const uint8_t *src, int src_stride,
+   DECL(8, opt);    \
+   DECL(16, opt)
+ 
++#if HAVE_SSSE3
+ DECLS(ssse3);
++#endif
+ #undef DECLS
+ #undef DECL
+ 
+@@ -491,7 +493,9 @@ DECLS(ssse3);
+   FN(4, 4, 4, 2, 2, opt, (int32_t), (int32_t))
+ #endif
+ 
++#if HAVE_SSSE3
+ FNS(ssse3)
++#endif
+ 
+ #undef FNS
+ #undef FN
+@@ -508,7 +512,9 @@ FNS(ssse3)
+   DECL(8, opt);    \
+   DECL(16, opt)
+ 
++#if HAVE_SSSE3
+ DECLS(ssse3);
++#endif
+ #undef DECL
+ #undef DECLS
+ 
+@@ -588,7 +594,9 @@ DECLS(ssse3);
+   FN(4, 4, 4, 2, 2, opt, (uint32_t), (int32_t))
+ #endif
+ 
++#if HAVE_SSSE3
+ FNS(ssse3)
++#endif
+ 
+ #undef FNS
+ #undef FN
+-- 
+2.45.2
+
diff --git a/media-libs/libaom/libaom-3.9.0.ebuild b/media-libs/libaom/libaom-3.9.0.ebuild
index 8062dc97f9b4..d9cbbf1ee16a 100644
--- a/media-libs/libaom/libaom-3.9.0.ebuild
+++ b/media-libs/libaom/libaom-3.9.0.ebuild
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
 	"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
 	"${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch
+	"${FILESDIR}"/libaom-3.9.0-guard-ssse3.patch
 )
 
 multilib_src_configure() {
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 61b0ffa73729..03e5be4a8049 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -10,7 +10,7 @@ DIST unicode-ident-1.0.12.tar.gz 50118 BLAKE2B 04e2651e14251d68f4e7e70e1e7a6d5ed
 EBUILD mesa-24.0.7.ebuild 11623 BLAKE2B c4a62576ed60ec76eb4c8e8ec9088caf83e2e122dd858c0dce64aca4d00b099b02d6106da02420889e9852843451a65aea8d66542dcf933cf46d33ac5cc3a2ea SHA512 5b41a2eee65e406369d358a16a2356bb4a6d56cccc57aec2aec3046dbc5e51946cd3d26686715f0c4fec7752294a5fa1d380e7aecf3500939ab36ce3257d9623
 EBUILD mesa-24.0.8-r1.ebuild 11797 BLAKE2B b71065c8f66ae5e8f838029022f958d077429cad7238183082856009096c58796949faee327cae6d4b4bd797ff4485a100d980193b0667f66e6f7208cd9625cd SHA512 df8e99dfb89387e2ddac792f8c57fc1ef1498207617b8a88268a1fb2dc2ff6e2b7113d0e9fa68783d4e5d56eb549fd0e69a1fd9e3f976e5fb5994d9fee97cc29
 EBUILD mesa-24.0.8.ebuild 11630 BLAKE2B 4c0b8bee298f59954db6759e92464530c0fd7684425ebbbd4985e0d7f87e004f1c0990ec5468266ee9773833fc00f6287ef162d9abaca1ebeb553fe0d26bc19f SHA512 0854e76a64cc3bb2bcd873805a1c92a46bb82cbba2a107cfd43af676da0eab5b755646155164182dedd8a3dc26a6b73a11e8c366ba8067e142b49ac6d48ec4f4
-EBUILD mesa-24.1.0-r1.ebuild 13686 BLAKE2B 7ba76bc28418c2c5f235e2d36c483b238c383ec09f6e77e4db39ddd1f0b4851ad2482bfefdafb516a81fdfa5b58342c7c50a1b6696c74e7553bcf9d3f427f305 SHA512 223001c3d747cf3ff816f8fce347b71c5fcbe594bf0270041717244c8aaef79c902d39bdcb7a6a3b3d31a8979b54646bc0a9028127c34b87d9b52c214e2b9e17
+EBUILD mesa-24.1.0-r1.ebuild 13686 BLAKE2B d3ee390ca6773f5a99a683b703c524df54922743849e3690655c9cd0938e1678c0909aa368dacd2fcdeb4a82f2bf1be145402ea2c0678793c6a52163307930d1 SHA512 a0f7d546432438340d3f7d74ffd3d168addcdf81ba7c68315e9960d6922fd11fcf75ea1190ef8341035429b54158481c8b16df5085625d3cf6cdf13a6712ab14
 EBUILD mesa-24.1.0.ebuild 13477 BLAKE2B 8ba955abf455044183db4601302c7473228c47b79318b837bfdf51aec8671f901744cc9bef54782bccee230d72a2a4c4e94c53279e8991292a9875fba98af444 SHA512 ecfd3177d7edd5d1ae5c56f7d19c7ceb2e42aa0d88df67a90db14609c7959f54c37244dab369c8c35d1e5e72e846957229f92250591fbd3e6c033005018506ee
-EBUILD mesa-9999.ebuild 13686 BLAKE2B 7ba76bc28418c2c5f235e2d36c483b238c383ec09f6e77e4db39ddd1f0b4851ad2482bfefdafb516a81fdfa5b58342c7c50a1b6696c74e7553bcf9d3f427f305 SHA512 223001c3d747cf3ff816f8fce347b71c5fcbe594bf0270041717244c8aaef79c902d39bdcb7a6a3b3d31a8979b54646bc0a9028127c34b87d9b52c214e2b9e17
+EBUILD mesa-9999.ebuild 13686 BLAKE2B d3ee390ca6773f5a99a683b703c524df54922743849e3690655c9cd0938e1678c0909aa368dacd2fcdeb4a82f2bf1be145402ea2c0678793c6a52163307930d1 SHA512 a0f7d546432438340d3f7d74ffd3d168addcdf81ba7c68315e9960d6922fd11fcf75ea1190ef8341035429b54158481c8b16df5085625d3cf6cdf13a6712ab14
 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
diff --git a/media-libs/mesa/mesa-24.1.0-r1.ebuild b/media-libs/mesa/mesa-24.1.0-r1.ebuild
index dee69ac8033e..9979d5a20b5d 100644
--- a/media-libs/mesa/mesa-24.1.0-r1.ebuild
+++ b/media-libs/mesa/mesa-24.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_COMPAT=( {15..17} )
+LLVM_COMPAT=( {15..18} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..12} )
 
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index dee69ac8033e..9979d5a20b5d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_COMPAT=( {15..17} )
+LLVM_COMPAT=( {15..18} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..12} )
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 5f64d4a3208d..81d6262ef5af 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -4,10 +4,8 @@ AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5
 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de
 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
-DIST netpbm-11.2.7.tar.xz 3780372 BLAKE2B 8a6a75bd0358acf21faa3defd2b3ca886aacd38a28a1f8b65280a9d6c1667102a47efb734fe2ff2dfae38a5d0995b5efaa4b3ec70138bac7ad07e3e6e79c6063 SHA512 3fb00524b958d97304066749d4117b11ce5e23b7c8e08e68bfb5109575cc40a52dbe0f44559e6c0832a4397298efbea50a8ed0b9d2b57e41a09275729574bace
 DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1
 DIST netpbm-11.6.1.tar.xz 3792940 BLAKE2B e48ec658708baac53708c96feb7aac94c32debae675d8f9114393aaccabc1f59309bf577bff98d252fecab37fb0faa1cc29955269636f736563a859edbdd947d SHA512 844256dc61d29c4f1ba164d5c1ec0b7c6cb8e97c4c6c04cf7b92cd7c118b99994cf7dda4a256f35ef575cb718a7a7f253468b60ba567733a613da8102d23bebf
-EBUILD netpbm-11.2.7.ebuild 6976 BLAKE2B 18225d4d04fe229802a170d569d297f9231b1c0d46c05239ec4221a10da0e4934b01c6ac294e8d972333e0ab90b8b71c5334ea5a4c85fac006c3fe87060f99f7 SHA512 4da684cb71c45de8b76bae5c7f79269bb25fb4b3fac9cc71cde5707923bdddb7e52e527c1e47755df7185e7fd18c1a19ebbbbc94f9e6a171583415735602de2c
-EBUILD netpbm-11.2.9-r1.ebuild 7111 BLAKE2B c8eee1507da7db6bb697fb45b035c9e13373492284531f36e550c8eb59c3dd888fef900de07236635724f5a84d560bfd632d75e60a1b1e2c411ccf96b9eede70 SHA512 cbdb30b8ff9a1cb4af2ab1e392f3d4cb8b57a00bfab6075a510783016fd859a2ee31398d331b5ae5e9c387beaaa59fba1102457ca0c48440cd42ede7d09d272d
+EBUILD netpbm-11.2.9-r1.ebuild 7110 BLAKE2B f1286bc6c56a4665bb6eee95c22eb4280a502b6cde45d3eae15a3c61782fd8d8edc09e232e8dc112347bdf107bb1db0ad2c8812a68e0661a98566c9a454569e2 SHA512 b676b61d9b8b8a28a5e3fcf8be1dcb3d115fe31de714fbeba6c2187929e974ddeb789ef401abef83c28a58209020a333d903ed39807e0ce7639f367ddb308e7f
 EBUILD netpbm-11.6.1-r1.ebuild 6984 BLAKE2B ee29cdaf8e397781efdca52bf3b55f9912158381328b8b05fdab124fee06fa2e988a5a7d32d3d0245662716f85cdb924b151fb966e5b75450f368502e1da7a9a SHA512 4e40c3d736311711de6c1bd21b041086215499b9bdc9e3a7ca0e248f196d6a50431128faba4fa572909b5dba75d4b5156e87592e75e552716710a3def25cb03f
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.2.7.ebuild b/media-libs/netpbm/netpbm-11.2.7.ebuild
deleted file mode 100644
index df9c2909f438..000000000000
--- a/media-libs/netpbm/netpbm-11.2.7.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# 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[.rev]"
-# and the advanced branch of their svn (currently versions 11.3.yy) on SLOT "0/advanced[.rev]".
-# 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.102"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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
-)
-
-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
-
-	# this test requires LC_ALL=en_US.iso88591, not available on musl
-	# ppmpat-random is broken on musl
-	# bug #907295
-	if use elibc_musl; then
-		sed -i \
-			-e 's:pbmtext-iso88591.*::' \
-			-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.2.9-r1.ebuild b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
index 5c3f0e8bda46..2a5355bd22f7 100644
--- a/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
@@ -19,7 +19,7 @@ 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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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