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
commit9ce7284f154444bb758069d50b442ececd75c74f (patch)
tree4e071cd62477f22a854c708a064fbf0d291c8108
parentVersion bumped. Thanks to Kai Sommer <gentoo@sokai.name>, closing bug #114045. (diff)
downloadhistorical-9ce7284f154444bb758069d50b442ececd75c74f.tar.gz
historical-9ce7284f154444bb758069d50b442ececd75c74f.tar.bz2
historical-9ce7284f154444bb758069d50b442ececd75c74f.zip
Fixed compile problems in parallel, bug #116665
Package-Manager: portage-2.1_pre3-r1
-rw-r--r--media-libs/netpbm/ChangeLog6
-rw-r--r--media-libs/netpbm/Manifest13
-rw-r--r--media-libs/netpbm/files/netpbm-10.31-parallel.patch12
-rw-r--r--media-libs/netpbm/netpbm-10.31-r1.ebuild3
4 files changed, 26 insertions, 8 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/Manifest b/media-libs/netpbm/Manifest
index a408d9c7d0ec..65b67e8653e0 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 c623c95c049ffe89644a6cc8a33cc84a ChangeLog 14390
+MD5 49155316f9a0b5fcd9723d34c3e4412b ChangeLog 14560
MD5 e348f459a46ba5a94ec7095398a7e523 files/digest-netpbm-10.26.22 139
MD5 6cecfd127f62bc8737d354d267a67d81 files/digest-netpbm-10.26.23 139
MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
@@ -18,6 +18,7 @@ MD5 f877055480e9ba8f7c11ff8386782621 files/netpbm-10.30-jpeg-prototypes.patch 20
MD5 2dd6e3d7a2601a35259474344f7feb20 files/netpbm-10.30-pngtopnm.patch 417
MD5 87a9972b59b90f26620b09ad990a8546 files/netpbm-10.30-tifftopnm.patch 373
MD5 dc7c33e66fdb4bc51604243af2ea9b76 files/netpbm-10.31-build.patch 1629
+MD5 f8d68fb9f31bd12167d33be5ff09d9d6 files/netpbm-10.31-parallel.patch 459
MD5 0d32ba4e0bc01d32022c6f91040015af files/netpbm-10.31-pnmtopng-modtime-segfault.patch 989
MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
@@ -25,11 +26,11 @@ MD5 71bc4b3be909385bf3a008edb6b35409 netpbm-10.26.22.ebuild 2803
MD5 0a5a5050c0cba7ea8639eb452320cfc5 netpbm-10.26.23.ebuild 2803
MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
MD5 22b543823e2a6dc4928d307e87ff6e62 netpbm-10.30-r1.ebuild 3047
-MD5 60981a7a99081eaa52f43e89565f5d39 netpbm-10.31-r1.ebuild 3023
+MD5 915f7b6ab793f27ff2d2ce09bd0f50e4 netpbm-10.31-r1.ebuild 3066
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFDy2H+2+ySkm8kpY0RAuY3AKCTMyjAwP7/KY/YAW91s2EbUOxnOwCcCh3X
-tHcG75nRd9i93tS/9OhRHHk=
-=OjrE
+iD8DBQFD0AyEub4+zaPCR/oRAgs/AJ9ffrbYDW6cQTX256KkopLZXMlj4QCZAX/E
+tvXnkPLXYkdAbh4YJdzLumA=
+=Xl40
-----END PGP SIGNATURE-----
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