Version bump.

(Portage version: 2.0.53)

4 files changed, 63 insertions, 5 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 4f4c8e765340..5e8fe40fab0a 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.95 2005/12/21 14:51:14 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.96 2005/12/24 04:22:17 vapier Exp $
+
+*netpbm-10.31 (24 Dec 2005)
+
+  24 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.31-build.patch, +netpbm-10.31.ebuild:
+  Version bump.
 
   21 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> netpbm-10.30-r1.ebuild:
   Stable on amd64.
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.20 b/media-libs/netpbm/files/digest-netpbm-10.31
index 2771ada897d7..f78109f5f80c 100644
--- a/media-libs/netpbm/files/digest-netpbm-10.26.20
+++ b/media-libs/netpbm/files/digest-netpbm-10.31
@@ -1,2 +1,2 @@
-MD5 986d5d4d3172af23449559cb109dd2e3 netpbm-10.26.20.tgz 2539433
 MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
+MD5 6ba2e0ee998eb23f4620ec9c175a90b6 netpbm-10.31.tgz 2383586
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch
new file mode 100644
index 000000000000..cd744743636c
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.31-build.patch
@@ -0,0 +1,50 @@
+- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
+- Try to fix parallel building
+- Make the libopt tool less 'helpful'
+
+--- lib/Makefile
++++ 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)
+--- GNUmakefile
++++ 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
+--- buildtools/libopt.c
++++ 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/netpbm-10.26.20.ebuild b/media-libs/netpbm/netpbm-10.31.ebuild
index 7eda61f512e8..9634fde3b526 100644
--- a/media-libs/netpbm/netpbm-10.26.20.ebuild
+++ b/media-libs/netpbm/netpbm-10.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.20.ebuild,v 1.1 2005/12/07 23:31:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.31.ebuild,v 1.1 2005/12/24 04:22:17 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="svga jpeg tiff png zlib"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
@@ -48,7 +48,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/netpbm-10.30-build.patch
+	epatch "${FILESDIR}"/netpbm-10.31-build.patch
+	epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch
 
 	rm -f configure
 	cp Makefile.config.in Makefile.config
@@ -80,6 +81,7 @@ src_unpack() {
 	URTLIB = -lrle
 	URTHDR_DIR =
 	EOF
+	append-flags -Wall
 
 	# Sparc support ...
 	replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"