gentoo auto-resync : 18:04:2025 - 08:46:04next

3 files changed, 2 insertions, 270 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 920415fd64d2..94c120defd0d 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -8,12 +8,10 @@ AUX netpbm-11.6.1-incompatible-pointer-types.patch 514 BLAKE2B 0ea8a3c50838776ee
 AUX netpbm-11.7.2-lto.patch 2699 BLAKE2B 51da4abfa35da594597eb1091f8f3ade875491d428231215f91ff3d637826db6310f2c8f7bf59cb62d025cde170dc247fadedd90dedc5049f68f61d02adbfc0e SHA512 809d1b86d436534219936959037e5c4c17761b4c0e464eb968fdc961f68d5a3d2a60974f52e330fa49b8933aa1bfc486515e019b2bc0d15bbc525b9c4f852eb2
 AUX netpbm-11.9.0-build.patch 2457 BLAKE2B 8d7363e64568ba320f416470f5c1046cdf84b0d2ff6fe2c22c6d387ac54bf9af6e610a6dc73fcfb001388ded4686f382dd65e126574b7723bb6385222f36c0fc SHA512 6ba43263b9ffdca4868bf6c1548151a3fbc824fd9d7764e86402723bc5b0c672e4bcb44bcb3001e5fd99636b57d3edde7372c61288886f0d16f42d08ce3b084e
 DIST netpbm-11.10.2.tar.xz 3812076 BLAKE2B 6ee1188d9dd299357d8c53cba6858842cb161d409279ae30ee8ded263e489a6e247231686502560107b9dbd231a05510dbedf6eaecc3ac48171264c85ba88027 SHA512 2bc3fdbe5301315278876e303e9909859e9a613a5e58095efa5908d129e97ad8a04706b7644ba77e3c29408dc0c95c74836688ebdf1319f0556c089558290e16
-DIST netpbm-11.2.11.tar.xz 3782252 BLAKE2B 422b9cefee2a54a9c222236935291f0c8d1f13f064f4ebd277d0f92974b9ce3d7e3d9ae6a0410d767553704a03c2de14ca8456996a53fca0f95d61f9ae72605f SHA512 3d94c0c8c25873a16c78af960c964f5756b3e7a29463f001345956acc3bf1378b0b0b4fc0c57d7388dced0979ba4e8cee0def2200092544dd96fc7d04304660b
 DIST netpbm-11.2.13.tar.xz 3784752 BLAKE2B f96bd1867363402175208778619308bf5cd19967e36ff46103e88367d46c28a6aa1e8c8128af454c22de616ad414ddbc5d48ce857e64423724f2dd026c6e9639 SHA512 ffe3b63dccaeb8066fa80a202dae01b70a379359769540f7668f417b6da32361d878ef1ccbeccd8a24bcda83c5b1cfba5b8e00ce5fc5dbe4c28571e437051432
-DIST netpbm-11.2.14.tar.xz 3785868 BLAKE2B 1a503270757c84a0dc0b54e9ce8dd04084253aa2bb8f68a129cbda371064e6fde0fd478bfd9489600d0e0c01e2f823e016404041eff6a35762b78165c10c7147 SHA512 01d0eb2a9ed13000e0e26d89c72f3f0e26b74a4c66435e3af4a443ccf0badb387f5afd9503de5b2f2c7f7a39aec4c435dc966c55c4e5a1d444ea6b552cf41e3c
+DIST netpbm-11.2.15.tar.xz 3785836 BLAKE2B 376c42c136e978e4f9cd9165745dfcece2761043c674a1b8eae1a485d0bef1124d2f44ccd1798ce565dbd2e98d221d5c1112dd91442831b52d555f2a251b26dd SHA512 d7717225ec606e1c8a6a3bcd2c3b11b61ed85baf5f5d7bcceae81ceef4cee20f14c623cf8a424e60e076b5d877a2d40bccdc9c3479ac64c3f8a9f6842c34783e
 EBUILD netpbm-11.10.2.ebuild 6958 BLAKE2B f778cb9ff9e04d5049bf22dfed0f33ccd9d06dd336d16e37aa2148c6fa852cf1240dfcaf2c642abb73eeabfbedfd0cf06925ebbf13d3abfec774e94ae7e85d25 SHA512 64c542691aa6bd4adecc978e3d91cf100425b4e5976462522432447960cea4aacbb73ef64906117db6958320673193f730cfb15c48ed25af8fcbc96fe799599e
-EBUILD netpbm-11.2.11.ebuild 7143 BLAKE2B e218c46389b2593e3706eacd28209169359dfe0c7b311b31260aeb654c1c29443c017c643f91e105646a4b0dcab40d943288589c573589133b7398130e0a342d SHA512 1542e8d1c568ac5ac2085a699c380cd44f12194ae7583863e3d9828e70a5dffeacba578f9a298d94db9e6c620cedbf0610eb8b4f2ae104acd25441989b6871ee
 EBUILD netpbm-11.2.13.ebuild 7187 BLAKE2B d07470693c516de00bf372197e1eb7c542dcd4952cfccc92cdd93bf970346eba2a1c82eb1e5eb39c1904a8e366901d063c9c686a7c4a6413370a9d58281f93cb SHA512 05cc20214213d3c9578891a5d41dacf0c3bb7c94d1f1880c003679d088fe8966cc2e4d0455ba12f2b41019292a260a74ec48af25cd629b962c8820ee3aa3ac0a
-EBUILD netpbm-11.2.14.ebuild 7195 BLAKE2B 94f8f36d42faa7e4de493332ed7c4426acb2c4f06b089a295c9aa6103f1f60cd53ab522e95040d9353c1290cb6a90b9e4f38a2a707cc7eea761c48abcc36e969 SHA512 ae816218a1f53944142d938a5ed5141e014346d4aa25963fff7a8fdd089b34599b54d7cd21ef55e24109c1236e5a99b88bc6b589a1e4c346245a970b36ba96b1
+EBUILD netpbm-11.2.15.ebuild 7195 BLAKE2B 94f8f36d42faa7e4de493332ed7c4426acb2c4f06b089a295c9aa6103f1f60cd53ab522e95040d9353c1290cb6a90b9e4f38a2a707cc7eea761c48abcc36e969 SHA512 ae816218a1f53944142d938a5ed5141e014346d4aa25963fff7a8fdd089b34599b54d7cd21ef55e24109c1236e5a99b88bc6b589a1e4c346245a970b36ba96b1
 EBUILD netpbm-9999.ebuild 6351 BLAKE2B b9e5ef2a4d7149827500617999cbe80e7f050638e041aba09c56adc994057dceba2749c3461000edbe8b5fbf6fcf48bfc08b184e0cff26f3231486b83ec63557 SHA512 2461792a86dc4b7a97c2ceb9d2e00cdd07e37682c869ca30a48de6e074a9ddf08460e67f4f2dbee4281986dd01202bfda8c39ff15bd583c2043874defc306455
 MISC metadata.xml 619 BLAKE2B 1e9be5078065faa755545bc17012459cf91b5a39bd7e60abd6e3536e331b5b853f70b9310e17f5d6637c2a58c128665265556338a9e17663104762e2d4ab9177 SHA512 71cdcd5b73400a02361ccb93778130f332d73d8a415d324235b181fc14d5ca81b1437e8887eb9d47ba2878285358d43e2026b066d656d320b4ce6a01fd0e788a
diff --git a/media-libs/netpbm/netpbm-11.2.11.ebuild b/media-libs/netpbm/netpbm-11.2.11.ebuild
deleted file mode 100644
index d274c0726dd9..000000000000
--- a/media-libs/netpbm/netpbm-11.2.11.ebuild
+++ /dev/null
@@ -1,266 +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"
-# and the advanced branch of their svn (currently versions 11.9.yy) on SLOT "0/advanced".
-# The stable branch is stabilized according to usual Gentoo rules, while the
-# advanced branch will not be stabilized.
-# A detailed explanation is here https://netpbm.sourceforge.net/release.html
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="https://netpbm.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
-
-LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
-SLOT="0/stable"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
-
-# app-text/ghostscript-gpl is really needed for postscript
-# some utilities execute /usr/bin/gs
-# some installed programs are perl scripts
-RDEPEND="
-	dev-lang/perl
-	jbig? ( media-libs/jbigkit:= )
-	jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] )
-	png? (
-		>=media-libs/libpng-1.4:0=
-		sys-libs/zlib
-	)
-	postscript? (
-		app-text/ghostscript-gpl
-		sys-libs/zlib
-	)
-	rle? ( media-libs/urt:= )
-	svga? ( media-libs/svgalib )
-	tiff? ( >=media-libs/tiff-3.5.5:= )
-	xml? ( dev-libs/libxml2 )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-arch/xz-utils
-	app-alternatives/lex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/netpbm-10.86.21-build.patch
-	"${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
-	"${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
-	"${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch
-	"${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
-	"${FILESDIR}"/netpbm-11.7.2-lto.patch
-)
-
-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.2.14.ebuild b/media-libs/netpbm/netpbm-11.2.15.ebuild
index a9b144720c1d..a9b144720c1d 100644
--- a/media-libs/netpbm/netpbm-11.2.14.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.15.ebuild