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

3 files changed, 2 insertions, 266 deletions

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