[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/
commit: 3b128e02a3848b59805a2f132282c1bedd21c40a
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Thu Apr 18 18:09:51 2024 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Apr 18 19:31:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b128e02
media-libs/netpbm: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/netpbm-11.5.2-fix-tests-musl.patch | 157 -
1 file changed, 157 deletions(-)
diff --git a/media-libs/netpbm/files/netpbm-11.5.2-fix-tests-musl.patch
b/media-libs/netpbm/files/netpbm-11.5.2-fix-tests-musl.patch
deleted file mode 100644
index 4d8bd6c3b74d..
--- a/media-libs/netpbm/files/netpbm-11.5.2-fix-tests-musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Some tests are broken on musl.
-
-https://sourceforge.net/p/netpbm/code/4843/
-pnmindex, ppmtomitsu tests that don't use pnmcolormap
-
-So far, this only fixed ppmtomitsu.
-
-See also https://bugs.gentoo.org/907295
-
a/test/pnmindex.ok
-+++ b/test/pnmindex.ok
-@@ -7,12 +7,18 @@
- 3099638253 5290
- Test 4. Should print 1397700642 3160
- 1397700642 3160
--Test 5. Should print 2303488589 28514
--2303488589 28514
--Test 6. Should print 1706277976 100455
--1706277976 100455
--Test 7. Should print 801388440 100455
-+Test 5. Should print 243472565 28514
-+243472565 28514
-+Test 6. Should print 801388440 100455
- 801388440 100455
-+Test 7. Should print 256 twice
-+256
-+256
-+Test 8. Should print 100 twice
-+100
-+100
-+Test 9. Should print match
-+match
- Test Invalid
- Expected failure 1 (no output)
- Expected failure 2 (no output)
a/test/pnmindex.test
-+++ b/test/pnmindex.test
-@@ -3,6 +3,9 @@
- # Also requires: pamcat pamscale pbmtext pnmcolormap pnmindex
- # Also requires: pnminvert pnmquant pnmremap
-
-+tmpdir=${tmpdir:-/tmp}
-+pnmindex256_ppm=${tmpdir}/pnmindex256.ppm
-+
- echo "Test 1. Should print 3391481002 889"
- pnmindex maze.pbm | cksum
-
-@@ -17,18 +20,28 @@
- pnmindex -size 20 -across=3 testgrid.pbm testgrid.pbm testgrid.pbm \
- testgrid.pbm testgrid.pbm testgrid.pbm | cksum
-
--echo "Test 5. Should print 2303488589 28514"
--pnmindex testimg.ppm | cksum
-+echo "Test 5. Should print 243472565 28514"
-+pnmindex -noquant testimg.ppm | cksum
-
--echo "Test 6. Should print 1706277976 100455"
--pnmindex -size 50 -across=2 testimg.ppm testimg.ppm testimg.ppm \
-- testimg.ppm testimg.ppm testimg.ppm | cksum
--
--echo "Test 7. Should print 801388440 100455"
-+echo "Test 6. Should print 801388440 100455"
- pnmindex -size 50 -across=2 -noquant testimg.ppm testimg.ppm testimg.ppm \
-- testimg.ppm testimg.ppm testimg.ppm | cksum
-+ testimg.ppm testimg.ppm testimg.ppm | tee ${pnmindex256_ppm} | cksum
-
-+echo "Test 7. Should print 256 twice"
-+pnmindex testimg.ppm | ppmhist -nomap -noheader | wc -l
-+pnmindex -colors 256 testimg.ppm | ppmhist -nomap -noheader | wc -l
-
-+echo "Test 8. Should print 100 twice"
-+pnmindex -colors 100 testimg.ppm | ppmhist -nomap -noheader | wc -l
-+pnmindex -colors 100 testimg.ppm testimg.ppm | ppmhist -nomap -noheader | wc
-l
-+
-+
-+echo "Test 9. Should print match"
-+pnmindex -size 50 -across=2 -quant -colors=256 testimg.ppm testimg.ppm
testimg.ppm \
-+ testimg.ppm testimg.ppm testimg.ppm |\
-+pnmpsnr -rgb -target1=41.31 -target2=40.76 -target3=40.71
${pnmindex256_ppm} -
-+
-+
- echo "Test Invalid"
-
- . ${srcdir}/test-invalid.inc
a/test/ppmtomitsu.ok
-+++ b/test/ppmtomitsu.ok
-@@ -1,9 +1,9 @@
--Test 0. Should print 458455366 101484
--458455366 101484
-+Test 0. Should print 668243897 101532
-+668243897 101532
- Test 1. Should print 3110813682 101562
- 3110813682 101562
--Test 2. Should print 4168174994 34399
--4168174994 34399
-+Test 2. Should print 825518840 34209
-+825518840 34209
- Test 3. Should print 3201293405 310
- 3201293405 310
- Test 4. Should print 3354679572 752
-@@ -10,5 +10,5 @@
- 3354679572 752
- Test 5. Should print 3999654426 101549
- 3999654426 101549
--Test 6. Should print 4201246884 101549
--4201246884 101549
-+Test 6. Should print 3103038403 101549
-+3103038403 101549
a/test/ppmtomitsu.test
-+++ b/test/ppmtomitsu.test
-@@ -1,31 +1,31 @@
- #! /bin/sh
- # This script tests: ppmtomitsu
--# Also requires: pnmcolormap pnmremap
-+# Also requires: pamseq pamdepth
-
- tmpdir=${tmpdir:-/tmp}
--testimg100_ppm=${tmpdir}/testimg100.ppm
-+testimg216_ppm=${tmpdir}/testimg216.ppm
-
--echo "Test 0. Should print 458455366 101484"
--# equivalent to: Pnmquant 100 testimg.ppm
--pnmcolormap 100 testimg.ppm | pnmremap -nofloyd -mapfile=- testimg.ppm |\
-- tee ${testimg100_ppm} | cksum
-+echo "Test 0. Should print 668243897 101532"
-
-+pamseq 3 5 -tupletype=RGB | pamdepth 255 | pnmremap -nofloyd -mapfile=-
testimg.ppm |\
-+ tee ${testimg216_ppm} | cksum
-+
- echo "Test 1. Should print 3110813682 101562"
--ppmtomitsu testimg.ppm | cksum
-+ppmtomitsu testimg.ppm |
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
commit: 767b1858b6e42a550309b1daff116f1dda1ba4f4
Author: Viorel Munteanu gentoo org>
AuthorDate: Fri Apr 12 10:01:01 2024 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Fri Apr 12 10:04:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=767b1858
media-libs/netpbm: fix build with gcc-14
Closes: https://bugs.gentoo.org/929019
Signed-off-by: Viorel Munteanu gentoo.org>
.../files/netpbm-11.6.1-incompatible-pointer-types.patch| 13 +
.../{netpbm-11.2.9.ebuild => netpbm-11.2.9-r1.ebuild} | 1 +
.../{netpbm-11.6.1.ebuild => netpbm-11.6.1-r1.ebuild} | 1 +
3 files changed, 15 insertions(+)
diff --git
a/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch
b/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch
new file mode 100644
index ..785ca247719c
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/929019
+
+--- a/converter/other/pnmtorle.c
b/converter/other/pnmtorle.c
+@@ -374,7 +374,7 @@
+ if (cmdline.header) {
+ skipData(ifP, width, height, maxval, format);
+ } else {
+-rle_addhist(argv, NULL, );
++rle_addhist((char**)argv, NULL, );
+ writeRleHeader(cmdline.alpha, format, width, height, );
+ writeRleData(verbose, cmdline.alpha, ifP, ,
+ width, height, maxval, format);
diff --git a/media-libs/netpbm/netpbm-11.2.9.ebuild
b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
similarity index 99%
rename from media-libs/netpbm/netpbm-11.2.9.ebuild
rename to media-libs/netpbm/netpbm-11.2.9-r1.ebuild
index ed27be399d6c..042c3ac90c65 100644
--- a/media-libs/netpbm/netpbm-11.2.9.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
"${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
)
netpbm_libtype() {
diff --git a/media-libs/netpbm/netpbm-11.6.1.ebuild
b/media-libs/netpbm/netpbm-11.6.1-r1.ebuild
similarity index 99%
rename from media-libs/netpbm/netpbm-11.6.1.ebuild
rename to media-libs/netpbm/netpbm-11.6.1-r1.ebuild
index 56896f092bd3..b63b5a302d37 100644
--- a/media-libs/netpbm/netpbm-11.6.1.ebuild
+++ b/media-libs/netpbm/netpbm-11.6.1-r1.ebuild
@@ -57,6 +57,7 @@ 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.6.1-incompatible-pointer-types.patch
)
netpbm_libtype() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/
commit: 81ee4692ebbf5e0356813456ea64a4c6b53908bb Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Aug 13 13:38:45 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun Aug 13 16:05:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ee4692 media-libs/netpbm: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/32287 Signed-off-by: Viorel Munteanu gentoo.org> .../netpbm/files/netpbm-10.86.21-misc-deps.patch | 68 -- 1 file changed, 68 deletions(-) diff --git a/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch deleted file mode 100644 index 78c7670c9a8f.. --- a/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch +++ /dev/null @@ -1,68 +0,0 @@ -do not autoprobe deps when we disabled them - a/GNUmakefile -+++ b/GNUmakefile -@@ -75,7 +75,10 @@ - - 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 @@ - - 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 @@ - XML2_CFLAGS=$(shell xml2-config --cflags) - endif - endif -+endif - - SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg - ifneq ($(BUILD_FIASCO), N) -@@ -34,6 +36,7 @@ - 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 @@ - endif - endif - endif -+endif - - ifneq ($(JPEGLIB),NONE) - ifneq ($(JPEGHDR_DIR)x,x) a/other/pamx/Makefile -+++ b/other/pamx/Makefile -@@ -9,6 +9,7 @@ - - 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 @@ - X11LIB = $(shell $(PKG_CONFIG) x11 --libs) - EXTERN_INCLUDES += $(shell $(PKG_CONFIG) x11 --cflags) - endif -+endif - - ifeq ($(HAVE_X11LIB),Y) - PORTBINARIES += pamx
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
commit: f1c236fa0be5b0f37a749b03edba06a23d73690f
Author: Viorel Munteanu gmail com>
AuthorDate: Wed Dec 1 16:47:49 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 3 00:01:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c236fa
media-libs/netpbm: drop v10.70.00
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Viorel Munteanu gmail.com>
Signed-off-by: Sam James gentoo.org>
media-libs/netpbm/Manifest | 1 -
media-libs/netpbm/files/netpbm-10.31-build.patch | 50 -
media-libs/netpbm/files/netpbm-10.66-test.patch| 17 --
.../netpbm/files/netpbm-10.70-system-libs.patch| 40
media-libs/netpbm/netpbm-10.70.00.ebuild | 205 -
5 files changed, 313 deletions(-)
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index acb659885fd9..c1b2c7ff12b3 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,3 +1,2 @@
-DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B
2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77
SHA512
f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B
189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470
SHA512
50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B
cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8
SHA512
b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch
b/media-libs/netpbm/files/netpbm-10.31-build.patch
deleted file mode 100644
index 281f8ee928f7..
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-- Make the libopt tool less 'helpful'
-
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
-
- OMIT_CONFIG_RULE = 1
- include $(SRCDIR)/Makefile.common
a/buildtools/libopt.c
-+++ b/buildtools/libopt.c
-@@ -502,7 +502,7 @@
-
- strcpy(outputLine, ""); /* initial value */
- runtime = FALSE; /* initial value */
--quiet = FALSE; /* initial value */
-+quiet = TRUE; /* initial value */
- error = FALSE; /* no error yet */
- for (arg = 1; arg < argc && !error; arg++) {
- if (strcmp(argv[arg], "-runtime") == 0)
diff --git a/media-libs/netpbm/files/netpbm-10.66-test.patch
b/media-libs/netpbm/files/netpbm-10.66-test.patch
deleted file mode 100644
index 7c80648bafab..
--- a/media-libs/netpbm/files/netpbm-10.66-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/450530
-
-we disable fiascotopnm all the time, so delete the test too
-
a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -387,10 +387,6 @@ for i in $ordinary_testprogs
-
-
-
--# Test fiascotopnm, which has a unique -v flag.
--
--${PBM_TESTPREFIX}fiascotopnm -v 2> /dev/null
--testExitStatus fiascotopnm 2 $?
-
-
-
diff --git a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
deleted file mode 100644
index efe9fd8dd3c4..
--- a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-when we disable the bundled libs, make sure we don't try to run install in them
-
a/converter/other/jbig/Makefile
-+++ b/converter/other/jbig/Makefile
-@@ -5,7 +5,7 @@
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
commit: 6f29361e96643e51495cdf55ab0f42d2c34c97a0
Author: Viorel Munteanu gmail com>
AuthorDate: Sun Nov 28 14:59:01 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Nov 29 23:43:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f29361e
media-libs/netpbm: fix test failing on ppc64
Closes: https://bugs.gentoo.org/827338
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Viorel Munteanu gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23100
Signed-off-by: Sam James gentoo.org>
.../files/netpbm-10.86.24-fix-test-ppc64.patch | 22 ++
...m-10.86.26.ebuild => netpbm-10.86.24-r1.ebuild} | 5 +++--
...m-10.86.26.ebuild => netpbm-10.86.26-r1.ebuild} | 1 +
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
new file mode 100644
index ..e1b558d59117
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
@@ -0,0 +1,22 @@
+char is unsigned by default on ppc64
+
+--- a/converter/other/pnmtopalm/palmtopnm.c
b/converter/other/pnmtopalm/palmtopnm.c
+@@ -823,7 +823,7 @@
+ unsigned int j;
+
+ for (j = 0; j < bytesPerRow; ) {
+-char incount;
++signed char incount;
+ pm_readchar(ifP, );
+ if (incount < 0) {
+ /* How do we handle incount == -128 ? */
+@@ -865,7 +865,7 @@
+ unsigned int j;
+
+ for (j = 0; j < bytesPerRow; ) {
+-char incount;
++signed char incount;
+ pm_readchar(ifP, );
+ if (incount < 0) {
+ /* How do we handle incount == -128 ? */
diff --git a/media-libs/netpbm/netpbm-10.86.26.ebuild
b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
similarity index 96%
copy from media-libs/netpbm/netpbm-10.86.26.ebuild
copy to media-libs/netpbm/netpbm-10.86.24-r1.ebuild
index a4bc1a21670d..9a257b98e32a 100644
--- a/media-libs/netpbm/netpbm-10.86.26.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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"
# zlib USE flag is no longer used, enabled by default.
# cannot remove it yet because of #801445
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
+ "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
)
netpbm_libtype() {
@@ -166,7 +167,7 @@ src_configure() {
TIFFLIB_NEEDS_Z = N
JPEGLIB = $(netpbm_config jpeg)
PNGLIB = $(netpbm_config png)
- ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
+ ZLIB = -lz
LINUXSVGALIB = $(netpbm_config svga vga)
XML2_LIBS = $(netpbm_config xml xml2)
JBIGLIB = $(netpbm_config jbig)
diff --git a/media-libs/netpbm/netpbm-10.86.26.ebuild
b/media-libs/netpbm/netpbm-10.86.26-r1.ebuild
similarity index 98%
rename from media-libs/netpbm/netpbm-10.86.26.ebuild
rename to media-libs/netpbm/netpbm-10.86.26-r1.ebuild
index a4bc1a21670d..39873d62dbfd 100644
--- a/media-libs/netpbm/netpbm-10.86.26.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.26-r1.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
+ "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
)
netpbm_libtype() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
commit: 3ad19a84552b64107365fbcd64ac457b84800d80 Author: Viorel Munteanu gmail com> AuthorDate: Thu Nov 25 08:04:33 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Sun Nov 28 02:08:58 2021 + 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23073 Signed-off-by: Ionen Wolkens 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 234a5616a7631a8eb70817bb88ed509fce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3 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.. --- 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.. --- 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
commit: a9ca76213bf8ae926caac89806977e7b02523973 Author: Viorel Munteanu gmail com> AuthorDate: Fri Apr 16 18:24:15 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Mon May 10 06:23:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ca7621 media-libs/netpbm: new version 10.86.21 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Viorel Munteanu gmail.com> Signed-off-by: Joonas Niilola gentoo.org> media-libs/netpbm/Manifest | 1 + media-libs/netpbm/files/make-tarball.sh| 0 .../netpbm/files/netpbm-10.86.21-build.patch | 64 +++ .../netpbm/files/netpbm-10.86.21-misc-deps.patch | 68 +++ media-libs/netpbm/files/netpbm-10.86.21-test.patch | 10 + media-libs/netpbm/netpbm-10.86.21.ebuild | 207 + 6 files changed, 350 insertions(+) diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index 5519fbb6b9d..be3d0a3dff3 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,2 +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 234a5616a7631a8eb70817bb88ed509fce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3 +DIST netpbm-10.86.21.tar.xz 3768736 BLAKE2B 19d641f3519f55d737aa6cd22f60847b2b241f71134bc7f9fa558e681cbffb1bff53f16e4d89e7a85b20b86e0bf0f4d9c341dde656ca07a7bc20adc94e811e36 SHA512 caa6c18039be72c47419b3ef60b64e0a04123752beb27bab178adcbb48e5311da05b422205f52c784149bb0636be1e3155e6bbf7703ec5c5775cb9981de1008e diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh old mode 100755 new mode 100644 diff --git a/media-libs/netpbm/files/netpbm-10.86.21-build.patch b/media-libs/netpbm/files/netpbm-10.86.21-build.patch new file mode 100644 index 000..7995c6daaf4 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.86.21-build.patch @@ -0,0 +1,64 @@ +- Don't install libnetpbm.a and libnetpbm.so into a sep link dir +- Try to fix parallel building + +--- a/lib/Makefile b/lib/Makefile +@@ -221,7 +221,7 @@ + .PHONY: install.lib + ifeq ($(NETPBMLIBTYPE),unixshared) + # install a Unix-style shared library +-install.lib: $(PKGDIR)/lib $(PKGDIR)/sharedlink ++install.lib: $(PKGDIR)/lib + cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).* + $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \ + libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/ +@@ -263,29 +263,29 @@ + $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/ + + .PHONY: install.staticlib +-install.staticlib: $(PKGDIR)/staticlink ++install.staticlib: $(PKGDIR)/lib + $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ +-$(PKGDIR)/staticlink ++$(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 + .PHONY: install.sharedlibstub +-install.sharedlibstub: $(PKGDIR)/sharedlink ++install.sharedlibstub: $(PKGDIR)/lib + ifeq ($(NETPBMLIBTYPE),unixshared) + # install the link-time (.so) links to the runtime libraries +- cd $(PKGDIR)/sharedlink ; \ ++ cd $(PKGDIR)/lib ; \ + rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ +- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ ++ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ + libnetpbm.$(NETPBMLIBSUFFIX) + endif + ifeq ($(NETPBMLIBTYPE),dll) + $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a \ +-$(PKGDIR)/sharedlink ++$(PKGDIR)/lib + endif + ifeq ($(NETPBMLIBTYPE),dylib) +- cd $(PKGDIR)/sharedlink/ ; \ ++ cd $(PKGDIR)/lib/ ; \ + rm -f libnetpbm.dylib; \ +- $(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib ++ $(SYMLINK) libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib + endif + + distclean clean: localclean +--- a/GNUmakefile b/GNUmakefile +@@ -102,6 +102,9 @@ + .PHONY: nonmerge + nonmerge: $(PRODUCT_SUBDIRS:%=%/all) + ++$(PRODUCT_SUBDIRS:%=%/all): buildtools/all ++converter/all analyzer/all editor/all generator/all other/all: lib/all ++ + # Completely parallel make (make --jobs) does not work because there are + # multiple targets somewhere in the Netpbm build that depend upon pm_config.h + # and similar targets, and the threads building those multiple targets might diff --git a/media-libs/netpbm/files/netpbm-10.86.21-misc-deps.patch
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/
commit: 493f902d98593dae94a30e1bb1b62f5cbbd7
Author: Mike Frysinger gentoo org>
AuthorDate: Sun Apr 18 16:26:42 2021 +
Commit: Mike Frysinger gentoo org>
CommitDate: Sun Apr 18 16:29:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493f
media-libs/netpbm: refresh make-tarball.sh helper
Make it shellcheck clean too with a little bit of effort.
Closes: https://bugs.gentoo.org/504408
Signed-off-by: Mike Frysinger gentoo.org>
media-libs/netpbm/files/make-tarball.sh | 37 +++--
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/media-libs/netpbm/files/make-tarball.sh
b/media-libs/netpbm/files/make-tarball.sh
old mode 100644
new mode 100755
index 90a64ffb34d..29ad4b3d92e
--- a/media-libs/netpbm/files/make-tarball.sh
+++ b/media-libs/netpbm/files/make-tarball.sh
@@ -1,13 +1,23 @@
#!/bin/bash
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
-. /etc/init.d/functions.sh
+# Helper script for creating tarballs of netpbm releases since the netpbm
+# project refuses to do so themselves for "current" releases. Their process
+# is entirely contained in the svn repo.
+# http://netpbm.sourceforge.net/getting_netpbm.php
+# https://sourceforge.net/p/netpbm/code/HEAD/tree/
+
+. /lib/gentoo/functions.sh
PV=$1
SVN_ROOT=${2:-/usr/local/src}
+NETPBM="${SVN_ROOT}/netpbm"
+USERGUIDE="${NETPBM}/userguide"
if [[ $# -eq 0 ]] ; then
ebegin "Detecting latest version"
- cd "${SVN_ROOT}/netpbm/release_number"
+ cd "${NETPBM}/release_number" || die
svn up -q || die
PV=$(svn ls | sort -V | tail -1) || die
[[ -z ${PV} ]] && die
@@ -17,9 +27,14 @@ if [[ $# -eq 0 ]] ; then
if [[ ! -d ${PV} ]] ; then
ebegin "Checking out ${PV}"
- svn up -q ${PV}
+ svn up -q "${PV}"
eend || die
fi
+
+ ebegin "Updating userguide"
+ cd "${USERGUIDE}" || die
+ svn up -q || die
+ eend
fi
if [[ $# -gt 2 ]] ; then
@@ -32,28 +47,28 @@ P=${PN}-${PV}
T=/tmp
maint_pkg_create() {
- local base="/usr/local/src"
- local srcdir="${base}/netpbm/release_number"
- local htmldir="${base}/netpbm/userguide"
+ local base="${SVN_ROOT}"
+ local srcdir="${NETPBM}/release_number"
+ local htmldir="${USERGUIDE}"
if [[ -d ${srcdir} ]] ; then
cd "${T}" || die
- rm -rf ${P}
+ rm -rf "${P}"
ebegin "Exporting ${srcdir}/${PV} to ${P}"
- svn export -q "${srcdir}/${PV}" ${P}
+ svn export -q "${srcdir}/${PV}" "${P}"
eend $? || return 1
ebegin "Exporting ${htmldir} to ${P}/userguide"
- svn export -q "${htmldir}" ${P}/userguide
+ svn export -q "${htmldir}" "${P}"/userguide
eend $? || return 1
ebegin "Generating manpages from html"
- (cd "${P}/userguide" && ../buildtools/makeman *.html)
+ (cd "${P}/userguide" && ../buildtools/makeman ./*.html)
eend $? || return 1
ebegin "Creating ${P}.tar.xz"
- tar cf - ${P} | xz > ${P}.tar.xz
+ tar cf - "${P}" | xz > "${P}".tar.xz
eend $?
einfo "Tarball now ready at: ${T}/${P}.tar.xz"
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
commit: f6c3d4788f168af4ff06302bf3fc10503d5d328f
Author: Sam James gentoo org>
AuthorDate: Sun Oct 25 19:39:32 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 25 19:47:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c3d478
media-libs/netpbm: port to EAPI 7
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
media-libs/netpbm/files/make-tarball.sh| 0
media-libs/netpbm/files/netpbm-10.31-build.patch | 12 ++---
.../netpbm/files/netpbm-10.70-system-libs.patch| 8 +--
.../netpbm/files/netpbm-10.76.00-misc-deps.patch | 12 ++---
.../files/netpbm-10.76.00-pbmtext-test.patch | 4 +-
media-libs/netpbm/files/netpbm-10.76.00-test.patch | 40 +++
media-libs/netpbm/netpbm-10.70.00.ebuild | 59 ++
media-libs/netpbm/netpbm-10.76.00.ebuild | 48 +++---
8 files changed, 106 insertions(+), 77 deletions(-)
diff --git a/media-libs/netpbm/files/make-tarball.sh
b/media-libs/netpbm/files/make-tarball.sh
old mode 100755
new mode 100644
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch
b/media-libs/netpbm/files/netpbm-10.31-build.patch
index cd744743636..281f8ee928f 100644
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch
+++ b/media-libs/netpbm/files/netpbm-10.31-build.patch
@@ -2,8 +2,8 @@
- Try to fix parallel building
- Make the libopt tool less 'helpful'
lib/Makefile
-+++ lib/Makefile
+--- a/lib/Makefile
b/lib/Makefile
@@ -249,7 +249,7 @@
.PHONY: install.staticlib
install.staticlib: $(PKGDIR)/link
@@ -25,8 +25,8 @@
libnetpbm.$(NETPBMLIBSUFFIX)
endif
ifeq ($(NETPBMLIBTYPE),dll)
GNUmakefile
-+++ GNUmakefile
+--- a/GNUmakefile
b/GNUmakefile
@@ -87,6 +87,9 @@
.PHONY: nonmerge
@@ -37,8 +37,8 @@
OMIT_CONFIG_RULE = 1
include $(SRCDIR)/Makefile.common
buildtools/libopt.c
-+++ buildtools/libopt.c
+--- a/buildtools/libopt.c
b/buildtools/libopt.c
@@ -502,7 +502,7 @@
strcpy(outputLine, ""); /* initial value */
diff --git a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
index ef50ff2435d..efe9fd8dd3c 100644
--- a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
+++ b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch
@@ -1,7 +1,7 @@
when we disable the bundled libs, make sure we don't try to run install in them
converter/other/jbig/Makefile
-+++ converter/other/jbig/Makefile
+--- a/converter/other/jbig/Makefile
b/converter/other/jbig/Makefile
@@ -5,7 +5,7 @@ endif
SUBDIR = converter/other/jbig
VPATH=.:$(SRCDIR)/$(SUBDIR)
@@ -19,8 +19,8 @@ when we disable the bundled libs, make sure we don't try to
run install in them
else
# It's not our internal version; user's on his own to make sure it's built
endif
converter/other/jpeg2000/Makefile
-+++ converter/other/jpeg2000/Makefile
+--- a/converter/other/jpeg2000/Makefile
b/converter/other/jpeg2000/Makefile
@@ -5,7 +5,7 @@ endif
SUBDIR = converter/other/jpeg2000
VPATH=.:$(SRCDIR)/$(SUBDIR)
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
index 392eae0f40e..bd894bfb315 100644
--- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
+++ b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
@@ -1,7 +1,7 @@
do not autoprobe deps when we disabled them
GNUmakefile
-+++ GNUmakefile
+--- a/GNUmakefile
b/GNUmakefile
@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk
PROG_SUBDIRS = converter analyzer editor generator other
@@ -14,8 +14,8 @@ do not autoprobe deps when we disabled them
SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
converter/other/Makefile
-+++ converter/other/Makefile
+--- a/converter/other/Makefile
b/converter/other/Makefile
@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
include $(BUILDDIR)/config.mk
@@ -48,8 +48,8 @@ do not autoprobe deps when we disabled them
ifneq ($(JPEGLIB),NONE)
ifneq ($(JPEGHDR_DIR)x,x)
other/pamx/Makefile
-+++ other/pamx/Makefile
+--- a/other/pamx/Makefile
b/other/pamx/Makefile
@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk
EXTERN_INCLUDE =
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
index cdc075e5293..717c86a72ac 100644
--- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
+++ b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
@@ -3,8 +3,8 @@ what awk generates. force it to C/ASCII to avoid that.
https://bugs.gentoo.org/601012
test/pbmtext.test
-+++ test/pbmtext.test
+--- a/test/pbmtext.test
b/test/pbmtext.test
@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm}
# One long row
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/
commit: 588356653cb057c8057e5bed87656bc9f24ab891
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Sep 26 14:37:03 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Sep 27 00:14:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58835665
media-libs/netpbm: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/17682
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Conrad Kostecki gentoo.org>
.../netpbm/files/netpbm-10.66-failing-tests.patch | 28 --
.../netpbm/files/netpbm-10.66-jasper-hack.patch| 41
media-libs/netpbm/files/netpbm-10.66-jbig-2.patch | 19
.../netpbm/files/netpbm-10.66-jpeg-dirs.patch | 28 --
.../netpbm/files/netpbm-10.66-options-case.patch | 105 -
.../files/netpbm-10.66-wordaccess_be_aligned.patch | 23 -
6 files changed, 244 deletions(-)
diff --git a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch
b/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch
deleted file mode 100644
index 63260de2e49..000
--- a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-punt failing tests; already notified upstream
-
a/test/Test-Order
-+++ b/test/Test-Order
-@@ -50,7 +50,6 @@ pamditherbw.test
- pbmclean.test
- pamcut.test
- pnmcat.test
--pamflip.test
- pamenlarge.test
- pnminvert.test
- pamchannel.test
-@@ -70,7 +69,6 @@ ppmmix.test
-
- # Symmetry test
-
--symmetry.test
-
- # Format converter tests
-
-@@ -87,7 +85,6 @@ ppmdfont.test
- pnm-plain-roundtrip.test
- pnm-pam-roundtrip.test
- pnminvert-roundtrip.test
--pamflip-roundtrip.test
- pamdepth-roundtrip.test
- pad-crop-roundtrip.test
- cut-paste-roundtrip.test
diff --git a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch
b/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch
deleted file mode 100644
index 285475dab06..000
--- a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/513240
-
-the jasper headers are horribly broken and break things like stdbool.h.
-re-order the includes to work around this.
-
a/converter/other/jpeg2000/jpeg2ktopam.c
-+++ b/converter/other/jpeg2000/jpeg2ktopam.c
-@@ -13,13 +13,14 @@
- #define _XOPEN_SOURCE 600
- #include
-
-+#include
-+
- #include "pm_c_util.h"
- #include "pam.h"
- #include "shhopt.h"
- #include "nstring.h"
- #include "mallocvar.h"
-
--#include
- #include "libjasper_compat.h"
-
- enum compmode {COMPMODE_INTEGER, COMPMODE_REAL};
a/converter/other/jpeg2000/pamtojpeg2k.c
-+++ b/converter/other/jpeg2000/pamtojpeg2k.c
-@@ -13,13 +13,14 @@
- #define _XOPEN_SOURCE 600
- #include
-
-+#include
-+
- #include "pm_c_util.h"
- #include "pam.h"
- #include "shhopt.h"
- #include "nstring.h"
- #include "mallocvar.h"
-
--#include
- #include "libjasper_compat.h"
-
-
diff --git a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch
b/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch
deleted file mode 100644
index f7e8cf80d6c..000
--- a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-fix building w/jbig-2.x
-
a/converter/other/jbig/jbigtopnm.c
-+++ b/converter/other/jbig/jbigtopnm.c
-@@ -230,8 +230,12 @@ int main (int argc, char **argv)
- if (ferror(fin))
- pm_error("Problem while reading input file '%s", fnin);
- if (result != JBG_EOK && result != JBG_EOK_INTR)
--pm_error("Problem with input file '%s': %s\n",
-- fnin, jbg_strerror(result, JBG_EN));
-+pm_error("Problem with input file '%s': %s\n", fnin,
-+#ifdef JBG_EN
-+ jbg_strerror(result, JBG_EN));
-+#else
-+ jbg_strerror(result));
-+#endif
- if (plane >= 0 && jbg_dec_getplanes() <= plane)
- pm_error("Image has only %d planes!\n", jbg_dec_getplanes());
-
diff --git a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch
b/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch
deleted file mode 100644
index fcf98211ba0..000
--- a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-use same -I style as converter/other/Makefile so people can disable these
-
a/converter/other/jbig/Makefile
-+++ b/converter/other/jbig/Makefile
-@@ -11,7 +11,9 @@ LIBJBIG_OBJECTS = jbig.o jbig_tab.o
-
- EXTERN_INCLUDES =
- ifneq ($(JBIGHDR_DIR),NONE)
-- EXTERN_INCLUDES += -I$(JBIGHDR_DIR)
-+ ifneq ($(JBIGHDR_DIR)x,x)
-+EXTERN_INCLUDES += -I$(JBIGHDR_DIR)
-+ endif
- endif
-
- ifneq ($(JBIGHDR_DIR),NONE)
a/converter/other/jpeg2000/Makefile
-+++ b/converter/other/jpeg2000/Makefile
-@@ -11,7 +11,9 @@ include $(BUILDDIR)/config.mk
-
- EXTERN_INCLUDES =
- ifneq ($(JASPERHDR_DIR),NONE)
-- EXTERN_INCLUDES += -I$(JASPERHDR_DIR)
-+ ifneq ($(JASPERHDR_DIR)x,x)
-+EXTERN_INCLUDES += -I$(JASPERHDR_DIR)
-+ endif
- endif
-
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/
commit: 77ebab9ca4ea7e38c8be262de22800ff2d68d972
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Fri Dec 23 16:10:17 2016 +
Commit: David Seifert gentoo org>
CommitDate: Thu Dec 29 13:11:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ebab9c
media-libs/netpbm: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3224
.../files/netpbm-10.51.00-pnmconvol-nooffset.patch | 83 --
.../files/netpbm-10.51.00-ppmtompeg-free.patch | 35 -
.../files/netpbm-10.51.00-underlinking.patch | 16 -
3 files changed, 134 deletions(-)
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch
b/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch
deleted file mode 100644
index 1eb5506..
--- a/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-taken from upstream
-
-http://bugs.gentoo.org/338230
-
-Index: editor/pnmconvol.c
-===
editor/pnmconvol.c (revision 1297)
-+++ editor/pnmconvol.c (revision 1298)
-@@ -455,13 +455,13 @@ static void
- convKernelCreatePnm(struct pam * const cpamP,
- tuple * const * const ctuples,
- unsigned int const depth,
--bool const offsetPgm,
-+bool const offsetPnm,
- struct convKernel ** const convKernelPP) {
- /*
-- Compute the convolution matrix in normalized form from the PGM
-- form. Each element of the output matrix is the actual weight we give an
-- input pixel -- i.e. the thing by which we multiple a value from the
-- input image.
-+ Compute the convolution matrix in normalized form from the PGM form
-+ 'ctuples'/'cpamP'. Each element of the output matrix is the actual weight
-+ we give an input pixel -- i.e. the thing by which we multiple a value from
-+ the input image.
-
-'depth' is the required number of planes in the kernel. If 'ctuples' has
-fewer planes than that, we duplicate as necessary. E.g. if 'ctuples' is
-@@ -470,13 +470,13 @@ convKernelCreatePnm(struct pam *
-'ctuples' has more planes than specified, we ignore the higher numbered
-ones.
-
-- 'offsetPgm' means the PGM convolution matrix is defined in offset form so
-+ 'offsetPnm' means the PNM convolution matrix is defined in offset form so
-that it can represent negative values. E.g. with maxval 100, 50 means
-0, 100 means 50, and 0 means -50. If 'offsetPgm' is false, 0 means 0
-and there are no negative weights.
-
-*/
--double const scale = (offsetPgm ? 2.0 : 1.0) / cpamP->maxval;
--double const offset = offsetPgm ? - 1.0 : 0.0;
-+double const scale = (offsetPnm ? 2.0 : 1.0) / cpamP->maxval;
-+double const offset = offsetPnm ? - 1.0 : 0.0;
- unsigned int const planes = MIN(3, depth);
-
- struct convKernel * convKernelP;
-@@ -579,9 +579,19 @@ normalizeKernel(struct convKernel * cons
- static void
- getKernelPnm(const char * const fileName,
- unsigned int const depth,
-- bool const nooffset,
-+ bool const offset,
- struct convKernel ** const convKernelPP) {
-+/*
-+ Get the convolution kernel from the PNM file named 'fileName'.
-+ 'offset' means the PNM convolution matrix is defined in offset form so
-+ that it can represent negative values. E.g. with maxval 100, 50 means
-+ 0, 100 means 50, and 0 means -50. If 'offsetPgm' is false, 0 means 0
-+ and there are no negative weights.
-+
-+ Make the kernel suitable for convolving an image of depth 'depth'.
-
-+ Return the kernel as *convKernelPP.
-+-*/
- struct pam cpam;
- FILE * cifP;
- tuple ** ctuples;
-@@ -594,7 +604,7 @@ getKernelPnm(const char * const
-
- validateKernelDimensions(cpam.width, cpam.height);
-
--convKernelCreatePnm(, ctuples, depth, nooffset, convKernelPP);
-+convKernelCreatePnm(, ctuples, depth, offset, convKernelPP);
- }
-
-
-@@ -893,7 +903,7 @@ getKernel(struct cmdlineInfo const cmd
- struct convKernel * convKernelP;
-
- if (cmdline.pnmMatrixFileName)
--getKernelPnm(cmdline.pnmMatrixFileName, depth, cmdline.nooffset,
-+getKernelPnm(cmdline.pnmMatrixFileName, depth, !cmdline.nooffset,
- );
- else if (cmdline.matrixfile)
- convKernelCreateSimpleFile(cmdline.matrixfile, cmdline.normalize,
diff --git
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
commit: 40ba0e169581d2998fa43b3462a397e21bea6cec
Author: Mike Frysinger gentoo org>
AuthorDate: Sun Nov 27 03:26:00 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Sun Nov 27 03:26:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ba0e16
media-libs/netpbm: rework how we skip tests of disabled tools
media-libs/netpbm/files/netpbm-10.76.00-test.patch | 179 ++---
media-libs/netpbm/netpbm-10.76.00.ebuild | 23 ---
2 files changed, 158 insertions(+), 44 deletions(-)
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
index 65f30d5..868358c 100644
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
+++ b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
@@ -1,22 +1,159 @@
-https://bugs.gentoo.org/450530
+automatically skip tests of disabled tools
-we disable fiascotopnm all the time, so delete the test too
-
a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -53,7 +53,6 @@ ordinary_testprogs="\
- ddbugtopbm \
- escp2topbm \
- eyuvtoppm \
-- fiascotopnm \
- fitstopnm \
- fstopgm \
- g3topbm \
a/test/Test-Order
-+++ b/test/Test-Order
-@@ -153,5 +153,4 @@
-
- # Round-trip tests : lossy converters
-
--fiasco-roundtrip.test
- yuv-roundtrip.test
+--- GNUmakefile
GNUmakefile
+@@ -455,6 +455,17 @@ 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)" \
++ TIFFLIB="$(TIFFLIB)" \
++ URTLIB="$(URTLIB)"
++
+ # Test files in source tree.
+
+ check-tree : BUILDBINDIRS :=./analyzer \
+@@ -525,10 +536,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 +556,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
+
+
+--- test/all-in-place.test
test/all-in-place.test
+@@ -367,11 +367,49 @@ 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 ;;
++
++ pamtotiff|\
++ pnmtotiffcmyk|\
++ tifftopnm)
++[ "${TIFFLIB}" = "NONE" ] && return 1 ;;
++
++ pnmtorle|\
++ rletopnm)
++[ "${URTLIB}" = "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=)" \
+--- test/fiasco-roundtrip.test
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 | \
+--- test/jbig-roundtrip.test
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
+--- test/tiff-roundtrip.test
[gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
commit: fe032ce65d9dd8ad43e6fe6043ada0b8ca8920df
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Nov 16 04:50:54 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Nov 16 04:50:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe032ce6
media-libs/netpbm: version bump to 10.76.00
media-libs/netpbm/Manifest | 1 +
.../netpbm/files/netpbm-10.76.00-build.patch | 38 +
media-libs/netpbm/files/netpbm-10.76.00-test.patch | 22 +++
media-libs/netpbm/netpbm-10.76.00.ebuild | 187 +
4 files changed, 248 insertions(+)
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 1fda332..2e5f5b2 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,2 +1,3 @@
DIST netpbm-10.66.00.tar.xz 2575356 SHA256
7fe94f38e139be194e9e384e8d9c9747f2fe08c18295bba93c55a41c5bbf63fc SHA512
44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af
WHIRLPOOL
fa937fccd2da9068a268d6a5729c8093baacc3025ab2382902611dadab985247fdacf3433f6e15407b081478b93b772237c41363f37340ea6c93c169357dd0cf
DIST netpbm-10.70.00.tar.xz 2621612 SHA256
1268cb6801790619f6d057b964305355011dfe66247f2b71fe9978cdd7af7d93 SHA512
f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
WHIRLPOOL
8810a2e8d4ed6a834d6fbc2861079b4e2664f85ff2548d00f95a9c26f92d02dcebcb8d1b9c26226caba067accc41eabbe1211322607de77d61827b34a8b4c82a
+DIST netpbm-10.76.00.tar.xz 2657184 SHA256
b7fce2b1f43dcc821c3928ccc32dbee89e2d75cf22a76c38bc9c9ab4d91ea27a SHA512
234a5616a7631a8eb70817bb88ed509fce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
WHIRLPOOL
9082df9e257e247f3dd49119f925a11a0082905a78d3c57259328e13ba231608b81bfa2f1f1bcb9518ad94d8326aed82b7fff78a6b4f3befc00a34a2c2b0e70c
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-build.patch
b/media-libs/netpbm/files/netpbm-10.76.00-build.patch
new file mode 100644
index ..231da54
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.76.00-build.patch
@@ -0,0 +1,38 @@
+- 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-test.patch
b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
new file mode 100644
index ..65f30d5
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/450530
+
+we disable fiascotopnm all the time, so delete the test too
+
+--- a/test/all-in-place.test
b/test/all-in-place.test
+@@ -53,7 +53,6 @@ ordinary_testprogs="\
+ ddbugtopbm \
+ escp2topbm \
+ eyuvtoppm \
+- fiascotopnm \
+ fitstopnm \
+ fstopgm \
+ g3topbm \
+--- a/test/Test-Order
b/test/Test-Order
+@@ -153,5 +153,4 @@
+
+ # Round-trip tests : lossy converters
+
+-fiasco-roundtrip.test
+ yuv-roundtrip.test
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild
b/media-libs/netpbm/netpbm-10.76.00.ebuild
new file mode 100644
index ..c940abf
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs eutils multilib
+
+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 ~s390 ~sh
~sparc
