gentoo auto-resync : 12:03:2024 - 00:45:59

3 files changed, 266 insertions, 2 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 27bc1ad96a72..c90948b5f403 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -5,7 +5,9 @@ AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37
 AUX netpbm-11.2.7-fix-pnmcolormap2-test.patch 7051 BLAKE2B 741d4943b2e9eab1fb0061d6265271df8e25e458c1eb39f50aed8a392edf8369c9f0f3c43fc6ca0b940dd376166c9419c5039ddeaf10487859a7ea9bec4e6075 SHA512 4c7be95b582db27e3ce542b8f53bfdad2e6882b22ccc383aa7ca480cb5ba2a6aa000724dae3c5107efd1071bb87fac0648061dd46b0b75f1072ef05b7e128a68
 AUX netpbm-11.5.2-fix-tests-musl.patch 4779 BLAKE2B 049b20cecdaf40e77c37ad01cfe4e17b8006c3788f47971319e553bfbab760e7e0bb3a970060e74860a7c3326945f5505680519efe7c2feee5fa6ee08ba45202 SHA512 260f4282dcfd6dd0922b62e4c3f217e33d159ab2df779ec0c1df27f16c8075fb77927ce2aadd34c20475d38b7482506758e38b7571df7c3d5a92de9c5cc496d6
 DIST netpbm-11.2.7.tar.xz 3780372 BLAKE2B 8a6a75bd0358acf21faa3defd2b3ca886aacd38a28a1f8b65280a9d6c1667102a47efb734fe2ff2dfae38a5d0995b5efaa4b3ec70138bac7ad07e3e6e79c6063 SHA512 3fb00524b958d97304066749d4117b11ce5e23b7c8e08e68bfb5109575cc40a52dbe0f44559e6c0832a4397298efbea50a8ed0b9d2b57e41a09275729574bace
-DIST netpbm-11.5.2.tar.xz 3781780 BLAKE2B 8d73e6424709f08687c784af88ccefca1f2f7dde256d69fa132005a56ecd30af13abccd5a3a73edf62ae7d302e52ac36201aa0d2490cd8ed759dd3071e1b052a SHA512 2da209e0dd4bb482cc48828fab0297810b152fde7245666a940b74eab713c082eef8e03aacd9c6cb5770e047d96386ad2dbc88f4bdb6d660e333f5eb4cabda4a
+DIST netpbm-11.2.8.tar.xz 3781396 BLAKE2B cb74b79b61a88d739071ab85e0ca96a0e51140e9398aba4bd1a8c918b26580acb81b4653863127676ee1d032251e8e9968500fe5fee72a4cf65c5e5064f55fb1 SHA512 8bfd0f08ae62515be18f0b6b8ef610dc72dda2dd063d2732096f540cbadb27314d2ea20b1a79ed5ea9442a9f8cee10f445f16caaef1227b486e16a4ebf8412f1
+DIST netpbm-11.5.3.tar.xz 3783400 BLAKE2B 45a0169865922dcdd2cba0d91e347aa753153e7a9496c8469ac40039628dc3bf13adbf67f30e6af929f4bb582c09769eac579f7086ee78fa206b564b736492c9 SHA512 f7e58fa086e6f549bb350ca9592ad5df2cdacd80c8cb0f508ab17b5f85c9358df56306d293e5b88bdcb3d2b350731bd7def0098437fdfea2711921b1caa95b95
 EBUILD netpbm-11.2.7.ebuild 6976 BLAKE2B 18225d4d04fe229802a170d569d297f9231b1c0d46c05239ec4221a10da0e4934b01c6ac294e8d972333e0ab90b8b71c5334ea5a4c85fac006c3fe87060f99f7 SHA512 4da684cb71c45de8b76bae5c7f79269bb25fb4b3fac9cc71cde5707923bdddb7e52e527c1e47755df7185e7fd18c1a19ebbbbc94f9e6a171583415735602de2c
-EBUILD netpbm-11.5.2.ebuild 6893 BLAKE2B 51e08ff2753647d36c2bf8bafbbc26ab256e94a3bfe83c4c1690f8ab79ef4eae7246b44fa267abba3393b7617f802598e63ca73a0de6158c668bda1440b8d3d7 SHA512 350e2ceb608be231931cfd4044b8b6f7b570e3c212a45cc27a2c91e6991a977ef3bbbb35b5971a793d260ca11dd28365ef1808dd52b0a6bcc3edf331dcf2f14d
+EBUILD netpbm-11.2.8.ebuild 6980 BLAKE2B 07938deedbf23fe5346246a90c07b8f76b68418d8655f318a5d91c2dc08cb81d5fc979c73a24db3fc16f8c05dc6b450139ca38b4f31b539c4ca7d744a47fa88a SHA512 3e8418800eae8e565c1dabcc4248ac0e946124de4b89c722c910c3f199e5557013ad0c4dc5ca9e01eb8f32688a8506d72c175a8edfacbc858e138f29901e5ac9
+EBUILD netpbm-11.5.3.ebuild 6893 BLAKE2B 51e08ff2753647d36c2bf8bafbbc26ab256e94a3bfe83c4c1690f8ab79ef4eae7246b44fa267abba3393b7617f802598e63ca73a0de6158c668bda1440b8d3d7 SHA512 350e2ceb608be231931cfd4044b8b6f7b570e3c212a45cc27a2c91e6991a977ef3bbbb35b5971a793d260ca11dd28365ef1808dd52b0a6bcc3edf331dcf2f14d
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.2.8.ebuild b/media-libs/netpbm/netpbm-11.2.8.ebuild
new file mode 100644
index 000000000000..f44fa7eb02c1
--- /dev/null
+++ b/media-libs/netpbm/netpbm-11.2.8.ebuild
@@ -0,0 +1,262 @@
+# 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"
+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.5.2.ebuild b/media-libs/netpbm/netpbm-11.5.3.ebuild
index 0a74a2fd9cea..0a74a2fd9cea 100644
--- a/media-libs/netpbm/netpbm-11.5.2.ebuild
+++ b/media-libs/netpbm/netpbm-11.5.3.ebuild