public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
Date: Sun, 28 Nov 2021 02:09:18 +0000 (UTC)	[thread overview]
Message-ID: <1638065338.3ad19a84552b64107365fbcd64ac457b84800d80.ionen@gentoo> (raw)

commit:     3ad19a84552b64107365fbcd64ac457b84800d80
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Thu Nov 25 08:04:33 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Nov 28 02:08:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad19a84

media-libs/netpbm: drop v10.76.00

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23073
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-libs/netpbm/Manifest                         |   1 -
 .../netpbm/files/netpbm-10.76.00-build.patch       |  38 ----
 .../netpbm/files/netpbm-10.76.00-misc-deps.patch   |  68 ------
 .../files/netpbm-10.76.00-pbmtext-test.patch       |  22 --
 media-libs/netpbm/files/netpbm-10.76.00-test.patch | 248 ---------------------
 media-libs/netpbm/netpbm-10.76.00.ebuild           | 199 -----------------
 6 files changed, 576 deletions(-)

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 6f839ad5e36d..6ffd36b4ff2d 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,4 +1,3 @@
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
-DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
 DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
 DIST netpbm-10.86.26.tar.xz 3699572 BLAKE2B d0b3fccfecea20a7979a6b29dac670dc33616a6cdd6f985af76cbd0d8125b887ad2dfc193e5e59f47014f685887cadeebcdce0da8db0a219457bb88caf42ba62 SHA512 23ca6125827c61648e0a475880efade7b83f87cfc884361c1f706f0a69ac70b5a7a2ae4699c77e21eda1c73241768b1bd7e595d5d533eeb10b7f69a79c7ae69d

diff --git a/media-libs/netpbm/files/netpbm-10.76.00-build.patch b/media-libs/netpbm/files/netpbm-10.76.00-build.patch
deleted file mode 100644
index 231da5446719..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -249,7 +249,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- 	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
--	  $(PKGDIR)/link
-+	  $(PKGDIR)/lib
- 
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time 
-@@ -257,9 +257,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
--	cd $(PKGDIR)/link ; \
-+	cd $(PKGDIR)/lib ; \
-           rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
--          $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-             libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -87,6 +87,9 @@
- 
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-+
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
- 
- # Parallel make (make --jobs) is not smart enough to coordinate builds
- # between submakes, so a naive parallel make would cause certain

diff --git a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
deleted file mode 100644
index bd894bfb3159..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-do not autoprobe deps when we disabled them
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk
- 
- PROG_SUBDIRS = converter analyzer editor generator other
- PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
--SUPPORT_SUBDIRS = urt icon buildtools test
-+SUPPORT_SUBDIRS = icon buildtools test
-+ifeq ($(URTLIB),$(BUNDLED_URTLIB))
-+SUPPORT_SUBDIRS += urt
-+endif
- 
- SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
- 
---- a/converter/other/Makefile
-+++ b/converter/other/Makefile
-@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
- 
- include $(BUILDDIR)/config.mk
- 
-+ifneq ($(XML2_LIBS),NONE)
- TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
- 
- ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
-@@ -22,6 +23,7 @@ else
-     XML2_CFLAGS=$(shell xml2-config --cflags)
-   endif
- endif
-+endif
- 
- SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
- ifneq ($(BUILD_FIASCO), N)
-@@ -34,6 +36,7 @@ ifneq ($(TIFFLIB),NONE)
-   endif
- endif
- 
-+ifneq ($(PNGLIB),NONE)
- TEST_PKGCONFIG_LIBPNG = if pkg-config libpng$(PNGVER); then echo exists; fi
- 
- ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),)
-@@ -58,6 +61,7 @@ else
-     endif
-   endif
- endif
-+endif
- 
- ifneq ($(JPEGLIB),NONE)
-   ifneq ($(JPEGHDR_DIR)x,x)
---- a/other/pamx/Makefile
-+++ b/other/pamx/Makefile
-@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk
- 
- EXTERN_INCLUDE =
- 
-+ifneq ($(X11LIB),NONE)
- ifeq ($(shell pkg-config x11 --modversion --silence-errors),)
-   # Pkg-config has never heard of X11, or doesn't even exist
- 
-@@ -23,6 +24,7 @@ else
-   X11LIB = $(shell pkg-config x11 --libs)
-   EXTERN_INCLUDES += $(shell pkg-config x11 --cflags)
- endif
-+endif
- 
- ifeq ($(HAVE_X11LIB),Y)
-   PORTBINARIES += pamx

diff --git a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
deleted file mode 100644
index 717c86a72ac5..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-the tool tries to generate binary output, but the current locale might change
-what awk generates.  force it to C/ASCII to avoid that.
-
-https://bugs.gentoo.org/601012
-
---- a/test/pbmtext.test
-+++ b/test/pbmtext.test
-@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm}
- 
- # One long row
- # Should print 3233136020 4535
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i);
-              for (i=160;i<=255;++i) printf("%c",i); }' | \
-     pbmtext -builtin bdf | cksum
- 
- # One tall column
- # Should print 1216262214 5711
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i);
-              for (i=160;i<=255;++i) printf("%c\n",i); }' | \
-     pbmtext -nomargins -builtin bdf | cksum

diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
deleted file mode 100644
index 8bb1b17e15fa..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-automatically skip tests of disabled tools
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -455,6 +458,21 @@ deb:
- .PHONY: check-package
- .PHONY: check-install
- 
-+# Variables from the make env we pass down to the test scripts.
-+CHECK_VARS = \
-+	BUILDDIR=$(BUILDDIR) \
-+	RGBDEF=$(RGBDEF) \
-+	BUILD_FIASCO=$(BUILD_FIASCO) \
-+	JASPERLIB="$(JASPERLIB)" \
-+	JBIGLIB="$(JBIGLIB)" \
-+	JPEGLIB="$(JPEGLIB)" \
-+	PNGLIB="$(PNGLIB)" \
-+	TIFFLIB="$(TIFFLIB)" \
-+	URTLIB="$(URTLIB)" \
-+	X11LIB="$(X11LIB)" \
-+	XML2_LIBS="$(XML2_LIBS)" \
-+	ZLIB="$(ZLIB)"
-+
- # Test files in source tree.
- 
- check-tree : BUILDBINDIRS :=./analyzer \
-@@ -525,10 +543,10 @@ resultdir-backup: FORCE
- 
- check-tree: $(TESTRANDOM) resultdir-backup
- 	cd $(RESULTDIR); \
-+	  $(CHECK_VARS) \
- 	  CHECK_TYPE=tree \
--	  PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+	  PBM_TEST_PATH=$(PBM_TEST_PATH) \
- 	  LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
--	  RGBDEF=$(RGBDEF) \
- 	  $(SRCDIR)/test/Execute-Tests 2>&1
- 
- # Execute-Tests needs to know BUILDDIR in order to locate testrandom.
-@@ -545,19 +563,18 @@ check: check-package
- 
- check-package: $(TESTRANDOM) resultdir-backup
- 	cd $(RESULTDIR); \
-+	  $(CHECK_VARS) \
- 	  CHECK_TYPE=package \
--	  PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+	  PBM_TEST_PATH=$(PBM_TEST_PATH) \
- 	  LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
--	  RGBDEF=$(RGBDEF) \
- 	  $(SRCDIR)/test/Execute-Tests 2>&1
- 
- 
- # Check after install
- check-install: $(TESTRANDOM) resultdir-backup
- 	cd $(RESULTDIR); \
-+	  $(CHECK_VARS) \
- 	  CHECK_TYPE=install \
--	  BUILDDIR=$(BUILDDIR) \
--	  RGBDEF=$(RGBDEF) \
- 	  $(SRCDIR)/test/Execute-Tests 2>&1
- 
- 
---- a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -367,11 +367,62 @@ ordinary_testprogs="\
-   zeisstopnm \
- "
- 
-+enabled_testprog() {
-+    case $1 in
-+      fiascotopnm|\
-+      pnmtofiasco)
-+        [ "${BUILD_FIASCO}" = "N" ] && return 1 ;;
-+
-+      jpeg2ktopam|\
-+      pamtojpeg2k)
-+        [ "${JASPERLIB}" = "NONE" ] && return 1 ;;
-+
-+      jbigtopnm|\
-+      pnmtojbig)
-+        [ "${JBIGLIB}" = "NONE" ] && return 1 ;;
-+
-+      jpegtopnm|\
-+      pnmtojpeg|\
-+      ppmtojpeg)
-+        [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+      pamtopng|\
-+      pngtopam|\
-+      pnmtopng)
-+        [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+      svgtopam)
-+        [ "${PNGLIB}" = "NONE" ] && return 1
-+        [ "${XML2_LIBS}" = "NONE" ] && return 1
-+        ;;
-+
-+      pamtotiff|\
-+      pnmtotiffcmyk|\
-+      tifftopnm)
-+        [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+
-+      pnmtorle|\
-+      rletopnm)
-+        [ "${URTLIB}" = "NONE" ] && return 1 ;;
-+
-+      pamx)
-+        [ "${X11LIB}" = "NONE" ] && return 1 ;;
-+    esac
-+
-+    return 0
-+}
-+
- # The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm
- # has a slightly different version report format.
- 
- for i in $ordinary_testprogs
-   do
-+    # Stub out programs that aren't built.
-+    if ! enabled_testprog "$i"; then
-+      echo "$i: ok"
-+      continue
-+    fi
-+
-     $i --version  2>&1 | \
-     egrep -v -e fiascotopnm -e \
-     "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/fiasco-roundtrip.test
-+++ b/test/fiasco-roundtrip.test
-@@ -2,6 +2,10 @@
- # This script tests: pnmtofiasco fiascotopnm
- # Also requires: pnmpad
- 
-+if [ "${BUILD_FIASCO}" = "N" ]; then
-+  exit 80
-+fi
-+
- # Should print 215556145 102615
- 
- pnmpad --black --bottom 1 --left 1 testimg.ppm | \
---- a/test/jbig-roundtrip.test
-+++ b/test/jbig-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtojbig jbigtopnm
- # Also requires: pamchannel pamtopnm
- 
-+if [ "${JBIGLIB}" = "NONE" ]; then
-+  exit 80
-+fi
- 
- # Test 1.  Should print 2425386270 41
- pnmtojbig testgrid.pbm | jbigtopnm | cksum
---- a/test/legacy-names.test
-+++ b/test/legacy-names.test
-@@ -94,8 +94,30 @@ ordinary_testprogs="\
-   ppmtouil \
- "
- 
-+enabled_testprog() {
-+    case $1 in
-+      ppmtojpeg)
-+        [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+      pamrgbatopng|\
-+      pngtopnm)
-+        [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+      pnmtotiff)
-+        [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+    esac
-+
-+    return 0
-+}
-+
- for i in $ordinary_testprogs
-   do
-+    # Stub out programs that aren't built.
-+    if ! enabled_testprog "$i"; then
-+      echo "$i: ok"
-+      continue
-+    fi
-+
-     $i --version  2>&1 | \
-     egrep -v \
-     "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/png-roundtrip.test
-+++ b/test/png-roundtrip.test
-@@ -6,6 +6,10 @@
- ## If this test fails and pnm-roundtrip2.test succeeds, it indicates
- ## some problem with pnmtopng.
- 
-+if [ "${PNGLIB}" = "NONE" ]; then
-+  exit 80
-+fi
-+
- # Test 1.  Should print 1926073387 101484 18 times
- for flags in "" -interlace \
-   -gamma=.45 \
---- a/test/png-roundtrip2.test
-+++ b/test/png-roundtrip2.test
-@@ -9,6 +9,10 @@
- ## If both tests fail, the likely cause is a problem with pngtopam.
- ## It is also possible that there is some problem in libpng.
- 
-+if [ "${PNGLIB}" = "NONE" ]; then
-+  exit 80
-+fi
-+
- # Test 1.  Should print 1926073387 101484 twice
- for flags in "" -gamma=.45
-   do
---- a/test/ps-roundtrip.test
-+++ b/test/ps-roundtrip.test
-@@ -8,6 +8,10 @@
- ## (1) zlib was not linked.
- ## (2) ghostscript is not available.
- 
-+if [ "${ZLIB}" = "NONE" ]; then
-+  exit 80
-+fi
-+
- tmpdir=${tmpdir:-/tmp}
- 
- # pstopnm does not use libnetpbm functions for output.
---- a/test/tiff-roundtrip.test
-+++ b/test/tiff-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pamtotiff tifftopnm
- # Also requires:
- 
-+if [ "${TIFFLIB}" = "NONE" ]; then
-+  exit 80
-+fi
- 
- # Failure message
- ## Second test fails if Netpbm was built without the flate library
---- a/test/utahrle-roundtrip.test
-+++ b/test/utahrle-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtorle rletopnm
- # Also requires: pamchannel pamtopnm
- 
-+if [ "${URTLIB}" = "NONE" ]; then
-+  exit 80
-+fi
- 
- #Test 1.  Should produce 1571496937 33838, cksum of testimg.red
- pamchannel -infile=testimg.ppm -tupletype="GRAYSCALE" 0 | pamtopnm | \

diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
deleted file mode 100644
index b27af756a539..000000000000
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( >=media-libs/libpng-1.4:0 )
-	postscript? ( app-text/ghostscript-gpl )
-	rle? ( media-libs/urt )
-	svga? ( media-libs/svgalib )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	xml? ( dev-libs/libxml2 )
-	zlib? ( sys-libs/zlib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/netpbm-10.76.00-build.patch
-	"${FILESDIR}"/netpbm-10.76.00-test.patch #450530
-	"${FILESDIR}"/netpbm-10.76.00-misc-deps.patch
-	"${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012
-)
-
-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() {
-	if use $1 ; then
-		[[ $2 != "!" ]] && echo -l${2:-$1}
-	else
-		echo NONE
-	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
-
-	# 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 '/^$/d' test/all-in-place.ok || die
-		sed -i '2iexit 80' test/ps-{alt-,}roundtrip.test || die
-	fi
-
-	# avoid ugly depend.mk warnings
-	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
-	cat config.mk.in - >> config.mk <<-EOF
-	# Misc crap
-	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
-
-	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 tiff)
-	# Let tiff worry about its own dependencies #395753
-	TIFFLIB_NEEDS_JPEG = N
-	TIFFLIB_NEEDS_Z = N
-	JPEGLIB = $(netpbm_config jpeg)
-	PNGLIB = $(netpbm_config png)
-	ZLIB = $(netpbm_config zlib z)
-	LINUXSVGALIB = $(netpbm_config svga vga)
-	XML2_LIBS = $(netpbm_config xml xml2)
-	JBIGLIB = $(netpbm_config jbig)
-	JBIGHDR_DIR =
-	JASPERLIB = NONE
-	JASPERHDR_DIR =
-	URTLIB = $(netpbm_config rle)
-	URTHDR_DIR =
-	X11LIB = $(netpbm_config X X11)
-	X11HDR_DIR =
-	EOF
-	# cannot chain the die with the heredoc above as bash-3
-	# has a parser bug in that setup #282902
-	[[ $? -eq 0 ]] || die "writing config.mk failed"
-}
-
-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/bin/{doc.url,manweb} || die
-	rm -r "${ED}"/usr/man/web || die
-	rm -r "${ED}"/usr/link || die
-	rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
-
-	dodir /usr/share
-	mv "${ED}"/usr/man "${ED}"/usr/share/ || die
-	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 *.html
-
-	use doc && dodoc -r ../userguide/*.html
-}


             reply	other threads:[~2021-11-28  2:09 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-28  2:09 Ionen Wolkens [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-29  9:14 [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/ Viorel Munteanu
2024-04-12 10:04 Viorel Munteanu
2021-12-03  0:12 Sam James
2021-11-29 23:46 Sam James
2021-05-10  6:24 Joonas Niilola
2020-10-25 19:47 Sam James
2016-11-27  3:27 Mike Frysinger
2016-11-16  4:51 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1638065338.3ad19a84552b64107365fbcd64ac457b84800d80.ionen@gentoo \
    --to=ionen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox