gentoo auto-resync : 02:02:2024 - 11:45:20

9 files changed, 6 insertions, 266 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e1511e5ed49d..c1a85bcff3f1 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 68a7fa33a655..2d13f5808d48 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -6,6 +6,6 @@ DIST Image-ExifTool-12.72.tar.gz 5310864 BLAKE2B 3ad4b03ba234e45d1eaf8b8b4724d21
 EBUILD exiftool-12.50.ebuild 717 BLAKE2B 76991bf0377bea98b0a5275909becd0e8642e35c42336505850f6ccde0f71333cd283baa7cab45971a0aab273d5108a3944418981f8322e0292f91b04710f211 SHA512 cadea77ec19090e51ceb3aaeac992824127c55e231c544e7e3175cf898cbea8eb2e4543e99335e2303968dc980c179d6c459e3b90d5bacec41f3913fe9e2e37a
 EBUILD exiftool-12.60.ebuild 722 BLAKE2B ba10b759ee4ebd70b75fdf6088299e05892595a1e105fd555bcb4723e2227d6277a1e016d9e49187846e17c91b961a4c6f87207c90b0dd5efebf6672c6248784 SHA512 6ab655af269d29f118827c77023ff5c80a8da0d8471f4fab17dc2e07ec2d4b23e24b53a2f058828a910edebad14fa58712f5e325458657bdd44e38cf6f348f06
 EBUILD exiftool-12.64.ebuild 717 BLAKE2B 76991bf0377bea98b0a5275909becd0e8642e35c42336505850f6ccde0f71333cd283baa7cab45971a0aab273d5108a3944418981f8322e0292f91b04710f211 SHA512 cadea77ec19090e51ceb3aaeac992824127c55e231c544e7e3175cf898cbea8eb2e4543e99335e2303968dc980c179d6c459e3b90d5bacec41f3913fe9e2e37a
-EBUILD exiftool-12.68.ebuild 721 BLAKE2B 5be01eb725c0d3b6c2994f7da8b52ddb28c722f11169f841a8d1887475090495ffc819b603a15f5f669e5e0250be16919c088543405f99f51eec53e07aef3b2b SHA512 7963bf2f4b23fb8f9b9a7daf01688ab07de51f70b20a22cf1ef355c843d01662ada57c591f1fc8f993238eef32f86b4fec5d0301f59e54dd38e47ab1b7d6e05e
+EBUILD exiftool-12.68.ebuild 720 BLAKE2B a023bd4b479818df146bceb09983eb6ac17d159d1e9b01cba57a4df203a76f8347fccdd7b304a2019c126234624b921d982c40b162d2a0c34897019ef433dab9 SHA512 0a2131c87230fb3811ced1fb827e66eddd6db872710334a82a78870a78eb3fa8fe90b222e7c6061c674ee8f3d111e82984644d3cbb058dd8c55a711c1e9903a7
 EBUILD exiftool-12.72.ebuild 722 BLAKE2B ba10b759ee4ebd70b75fdf6088299e05892595a1e105fd555bcb4723e2227d6277a1e016d9e49187846e17c91b961a4c6f87207c90b0dd5efebf6672c6248784 SHA512 6ab655af269d29f118827c77023ff5c80a8da0d8471f4fab17dc2e07ec2d4b23e24b53a2f058828a910edebad14fa58712f5e325458657bdd44e38cf6f348f06
 MISC metadata.xml 10040 BLAKE2B 8bcecde1df2dd3e79c3bcfbd38dcd9d3db9564a7abd5a684e0204779bcb685946f2eeb83a62efaa03efc841f0414b82f1087a3da3c6bd5f43e85561e43d7fb3e SHA512 af79302b57833d1368eff738b2326dd9cd47de47baf42426bfb00f61c1c6f52fcdc41d74bf95d8f65b2b0b00578ce07c3471b8cf4923e2f47c2c0b9d58dea35f
diff --git a/media-libs/exiftool/exiftool-12.68.ebuild b/media-libs/exiftool/exiftool-12.68.ebuild
index 918d2d47ae9b..080cbdac25a2 100644
--- a/media-libs/exiftool/exiftool-12.68.ebuild
+++ b/media-libs/exiftool/exiftool-12.68.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://exiftool.org/ https://exiftool.sourceforge.net"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ppc ppc64 ~x86 ~x64-macos"
 IUSE="doc"
 
 src_install() {
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 4925004929ed..9117618dcbed 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -7,5 +7,5 @@ DIST libsdl-1.2.68.tar.gz 460180 BLAKE2B c821772d5c43a9406e06f89d7f0248e051b2cfb
 EBUILD libsdl-1.2.15_p20221201.ebuild 4953 BLAKE2B 54575a80085622fdc111be48175dfe19ee9c95a7bc82291dafaef72bef8333eb8ce6a70338572a73390c6cff74973c27b92fb645236e9fbebe02fcbf4683329b SHA512 dfa19a7c9ff3a75ef79249a8cd15a51127e8b1b735338346746f59854907e56cd67030545a5e94834fb67620987e83edadfbd778d6a0ba8604f6843a8820a35b
 EBUILD libsdl-1.2.64.ebuild 1058 BLAKE2B 63a5bf4f7f75d9b19dc97798c71e97ff448fc5071393b59ea45236450b9ced6ea31c362e77a355d2ead891b7503421fe82f15dbf05cb973e6a358994969edb5b SHA512 9bac83a887e26419f4c79b762ec0b3d589a4a6291ca6506adff4c832300ec3bd6b2f1ba97acd7310d5c69a2482ef7c50eb0384f650181f7a211dad0615b7adf5
 EBUILD libsdl-1.2.64_p20230726.ebuild 1298 BLAKE2B ad8532cac1987e00a6c8c9057b423a1eb8b84345da2b1db3ed9b5f32a8e8e9c675e6b8740938fae83881adc84e11bd713ea0ed884ab461d615319e96207b4965 SHA512 0664eb0dbc5920eb8747c858b0d36a89dcf827fd50d69c1ae8e0a7ac7e740d0f61919bce44d0674c14be95587c86059a728edfa75d8f188442dbd629cdbdbb16
-EBUILD libsdl-1.2.68.ebuild 1328 BLAKE2B dc10cbce3fd6911779db25bb46052d14f18169edace31a4b98dc7a58a2a20b7a5f011f30f69f0d873780dade957d18f6533bd99114f9888d44c28e164f1617b7 SHA512 05f336de16484af5fd3fac0484fbd7d56cb812737130095649d327056ea3a65cce3bc04173e5fbe2ddf91fe7384ffa73f1fc1ea04c8cf49cbb86ec2433bb25d4
+EBUILD libsdl-1.2.68.ebuild 1326 BLAKE2B 27edce42b22c0fba351437db20db342b5cc148aa49d4cc78cb3584007429f239004447d7f010560d4b724f47ed975602ff2834c6bf851663dfb3ffdc071ef716 SHA512 e9db16212112157630f01390be6216b9e40276f48254296aa19609d8c8c46bc7c3ce345c97409ec63e86d1fe290e40ce6ac76e444895726c9dc6fe065d3bb479
 MISC metadata.xml 1562 BLAKE2B 317e152b5b838542417fe66589a2f161f7ebb4c9e0dc166deffb13b62227e8e1b957deb41daf5599e6a5ee77155d140048e97708594f308c44f8eef7df3046db SHA512 1144a2155c5fc3ee3dee968bb86c78c7fb3931e1794ad351b5951b19642d414ee02076177a01cb33c3dad8122825fdf9d1934ee02382f6b4a5bbd22fd6e23094
diff --git a/media-libs/libsdl/libsdl-1.2.68.ebuild b/media-libs/libsdl/libsdl-1.2.68.ebuild
index 52f284782657..bfeae74d2cc2 100644
--- a/media-libs/libsdl/libsdl-1.2.68.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.68.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc ~x86"
 
 # IUSE dropped from real SDL1: aalib custom-cflags dga fbcon libcaca nas oss pulseaudio static-libs tslib xinerama xv
 IUSE="alsa +joystick opengl +sound test +video X"
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index a8469c8e2378..add069d38dc4 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -6,5 +6,5 @@ DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec2166
 EBUILD libsdl2-2.28.1.ebuild 6445 BLAKE2B 6652314ff4c8d8d50fd0cb1db99b91f1df4a22ee9dcc16224902132a2e150f7a6a750451ed0e4df96dbaf1294a41b8b986e79d0e285b53a9241936eba06ce304 SHA512 f99bbdbde13745818af665bee635997d97491f29a056bac3ad69ed534b47a381cbc7cc7ec5c85998eb6a872d5af1824d924ef28fcba1b31e9ba73aa5ee19f624
 EBUILD libsdl2-2.28.3.ebuild 6444 BLAKE2B f84a1d6d5562d86a782bcf3c418fb1030312929bd18703473d28eb791c9447a4cacfbafc0b0fc84ce5c9fbc109f4abca97d46a0023211cca727507908d58169d SHA512 b22720936efbc140f2f867fce7fd257b8ffff011e679b79b25868e0947df246dfa4f9f5309bf64ac8f7b38e85f24b540558c6a8afc8335b7ca5a361083367fbb
 EBUILD libsdl2-2.28.4-r1.ebuild 6505 BLAKE2B 410574b56df4bc8c42c1b9c0e60a790a0d6c03e8d728c5714e40d10321410d4b10375935eb83d919fc71c819d66ea34009aceafee475b0910b2ef20be76ae4ce SHA512 4b03d2d64ef142b08e5e5f3584194ec9ba588e80a5dd4829f800842d858a6dc1a0f6c96a7d88c908253b8fb80e35f5355da9328da4b1fbd9ca36716cddb95f82
-EBUILD libsdl2-2.28.5.ebuild 7362 BLAKE2B a391e24f1fa8223853880b96027d6bf4e2df068c3c6e4d216c03b9918facc85058f56b7cd5418c6c08b10ec07d550d9b6a5b59a851918582f458949423bb1198 SHA512 aae6c0e237cd830770984a87951aca5e8a5e000d5cb08a3c3a385dc4bb3412928490b9637319938bb4359d6b96d87ff90c274dd3aa8c5ccaf250a9e6e375c66d
+EBUILD libsdl2-2.28.5.ebuild 7361 BLAKE2B de4a6f7c9b5cd43ef77c7b886e70775b4b5732ffa09a3a3f49612dd0cf74950e9f1cba3dcad9f28158e7f1f5d41e4a6c6100c9f3f7a79c04888527264a334fef SHA512 bce9edeab38c4025255d2b5d8298f6cb17fc64794c66632a91e100a1a5345c629e37d550094732a0958307c080b050e484dfe5607a71034ab8479d88a058d9ab
 MISC metadata.xml 1945 BLAKE2B 0f4c4a1526296bfbef001169c45626f0393cfcb6f5003d3d644c1ff1ef0197fdd38ddc2f16f1c1590ef895448bd6aa85ea3619a31487609d9ea2569077decd64 SHA512 d25c6e3b2cf3055f2faf71d926d5ad01c5b528f1349284dc3097607015ed93c70116223db0078d8ae764b598bc13a99f1b82cebe1e65206ea737508bdede12df
diff --git a/media-libs/libsdl2/libsdl2-2.28.5.ebuild b/media-libs/libsdl2/libsdl2-2.28.5.ebuild
index 5939c97d6828..81d4376ed964 100644
--- a/media-libs/libsdl2/libsdl2-2.28.5.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.28.5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 3ca88bf88a84..25a0e138ea0d 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -2,10 +2,8 @@ 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
-DIST netpbm-11.2.5.tar.xz 3791980 BLAKE2B 147297cd35a114f278410bfc4837d632bd2d8815a461b4288d87808bc4cba4480d4ab41c7365d9845f0bb2c94f295907a0fbcbb0b8cfef64f6581e435efd5842 SHA512 de23a62b74c6a0020e0a178d14f64e87c79f94c56c132e3f3e4c895d2d4d27580fa6ed2310b31bd476b9922672dcf9833cde5fb5b5b0ea094b01c520fcd24059
 DIST netpbm-11.2.7.tar.xz 3780372 BLAKE2B 8a6a75bd0358acf21faa3defd2b3ca886aacd38a28a1f8b65280a9d6c1667102a47efb734fe2ff2dfae38a5d0995b5efaa4b3ec70138bac7ad07e3e6e79c6063 SHA512 3fb00524b958d97304066749d4117b11ce5e23b7c8e08e68bfb5109575cc40a52dbe0f44559e6c0832a4397298efbea50a8ed0b9d2b57e41a09275729574bace
 DIST netpbm-11.5.2.tar.xz 3781780 BLAKE2B 8d73e6424709f08687c784af88ccefca1f2f7dde256d69fa132005a56ecd30af13abccd5a3a73edf62ae7d302e52ac36201aa0d2490cd8ed759dd3071e1b052a SHA512 2da209e0dd4bb482cc48828fab0297810b152fde7245666a940b74eab713c082eef8e03aacd9c6cb5770e047d96386ad2dbc88f4bdb6d660e333f5eb4cabda4a
-EBUILD netpbm-11.2.5.ebuild 6836 BLAKE2B ee8ce8774917ae49808eb5ee8b70f46289f7feac05e9ef304ffe492474d26bb35b0a5d7413293eb25da15c91645b2b49b2aa2c6a90cc164dc6956e0262bf2f11 SHA512 e405ebd3d0a44c96de0b25f8a99f355a49044740159d977d0734946b4ed9f47a660c4977bfd00b996b37f983f4616ce94d19486a0881cb495c714f128d8ea0e3
 EBUILD netpbm-11.2.7.ebuild 6836 BLAKE2B ee8ce8774917ae49808eb5ee8b70f46289f7feac05e9ef304ffe492474d26bb35b0a5d7413293eb25da15c91645b2b49b2aa2c6a90cc164dc6956e0262bf2f11 SHA512 e405ebd3d0a44c96de0b25f8a99f355a49044740159d977d0734946b4ed9f47a660c4977bfd00b996b37f983f4616ce94d19486a0881cb495c714f128d8ea0e3
 EBUILD netpbm-11.5.2.ebuild 6724 BLAKE2B a1fe436c072b05af84091d2964e321372f363d158c639fd345f497b24e3a993b77c63fcbdd0c07a8960f971d17c1e56f80dd082d4a56deefa185ae6c4e95f374 SHA512 9cd9826b92945ed3d6a67e4a9dceeb35f49acac3d4f7e3a1f9052bce3887bcf6dd475fe78037501d320b3d1ff5ade49c034e31b65c9eab6dc76ab9b358acfa1a
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.2.5.ebuild b/media-libs/netpbm/netpbm-11.2.5.ebuild
deleted file mode 100644
index 3afe4523512a..000000000000
--- a/media-libs/netpbm/netpbm-11.2.5.ebuild
+++ /dev/null
@@ -1,258 +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
-)
-
-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
-	if use elibc_musl; then
-		sed -i \
-			-e 's:pbmtext-iso88591.*::' \
-			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
-}