summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Wojtaszek <sekretarz@gentoo.org>2006-01-19 21:01:14 +0000
committerKarol Wojtaszek <sekretarz@gentoo.org>2006-01-19 21:01:14 +0000
commit79aaeb5764eba484e28eef6ea796fb68bafe0a93 (patch)
treee712901f8b5a9ccc7d84145aab87d6463d36bc67 /media-libs/netpbm
parentVersion bumped. Thanks to Kai Sommer <gentoo@sokai.name>, closing bug #114045. (diff)
downloadgentoo-2-79aaeb5764eba484e28eef6ea796fb68bafe0a93.tar.gz
gentoo-2-79aaeb5764eba484e28eef6ea796fb68bafe0a93.tar.bz2
gentoo-2-79aaeb5764eba484e28eef6ea796fb68bafe0a93.zip
Fixed compile problems in parallel, bug #116665
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'media-libs/netpbm')
-rw-r--r--media-libs/netpbm/ChangeLog6
-rw-r--r--media-libs/netpbm/files/netpbm-10.31-parallel.patch12
-rw-r--r--media-libs/netpbm/netpbm-10.31-r1.ebuild3
3 files changed, 19 insertions, 2 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 6f302ca89263..713b98622c7b 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/netpbm
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.101 2006/01/16 09:04:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.102 2006/01/19 21:01:14 sekretarz Exp $
+
+ 19 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org>
+ +files/netpbm-10.31-parallel.patch, netpbm-10.31-r1.ebuild:
+ Fixed compile problems in parallel, bug #116665
*netpbm-10.26.23 (16 Jan 2006)
diff --git a/media-libs/netpbm/files/netpbm-10.31-parallel.patch b/media-libs/netpbm/files/netpbm-10.31-parallel.patch
new file mode 100644
index 000000000000..5d989e43dc40
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.31-parallel.patch
@@ -0,0 +1,12 @@
+diff -Naur netpbm-10.31.orig/GNUmakefile netpbm-10.31/GNUmakefile
+--- netpbm-10.31.orig/GNUmakefile 2006-01-19 20:19:35.000000000 +0100
++++ netpbm-10.31/GNUmakefile 2006-01-19 20:23:45.000000000 +0100
+@@ -62,7 +62,7 @@
+ PRODUCT_SUBDIRS = lib converter analyzer editor generator other
+ SUPPORT_SUBDIRS = urt buildtools
+
+-SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
++SUBDIRS = . $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
+
+ SCRIPTS = manweb
+ MANUALS1 = netpbm
diff --git a/media-libs/netpbm/netpbm-10.31-r1.ebuild b/media-libs/netpbm/netpbm-10.31-r1.ebuild
index 14c8fab5f911..5d996f61a759 100644
--- a/media-libs/netpbm/netpbm-10.31-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.31-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.31-r1.ebuild,v 1.2 2006/01/07 10:04:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.31-r1.ebuild,v 1.3 2006/01/19 21:01:14 sekretarz Exp $
inherit flag-o-matic toolchain-funcs eutils multilib
@@ -52,6 +52,7 @@ src_unpack() {
epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch
epatch "${FILESDIR}"/netpbm-10.31-pnmtopng-modtime-segfault.patch #117180
epatch "${FILESDIR}"/netpbm-10.19-message.patch #Fedora
+ epatch ${FILESDIR}/${P}-parallel.patch
rm -f configure
cp Makefile.config.in Makefile.config