Fix parallel install; closes bug #194981. Also call epatch on patch directory.

Package-Manager: portage-2.1.3.12

4 files changed, 25 insertions, 38 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 8ed8836f65d4..7db0f1df0d19 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.117 2007/10/06 23:57:33 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.118 2007/10/08 07:20:46 keri Exp $
+
+  08 Oct 2007; keri <keri@gentoo.org> swi-prolog-5.6.43.ebuild:
+  Fix parallel install; closes bug #194981 reported by Jan Kundrát. Also call
+  epatch on patch directory; suggested by Donnie Berkholz.
 
 *swi-prolog-5.6.43 (06 Oct 2007)
 
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index a8505d10e685..166f66a10988 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -9,7 +9,7 @@ DIST swi-prolog-5.6.38-gentoo-patchset-3.tar.gz 9730 RMD160 b7ab6fe1ab4768f5b0d3
 DIST swi-prolog-5.6.39-gentoo-patchset-1.tar.gz 9330 RMD160 8a9a2ed838a6ff185016f8d9ad60237cebba6258 SHA1 b575ccbd5502f476116acd2288a05d714c88a9e4 SHA256 cc2c15b18ea2757d1e2b0a452447c349c0ca4dccb7c3d5692b7d8da3bfbef23f
 DIST swi-prolog-5.6.40-gentoo-patchset-1.tar.gz 9261 RMD160 e16b86ed03cb400d5841f5d3d73bf0186d403815 SHA1 8d1e3f79931ceac14a5ece862681c318621add7c SHA256 c0c7969dbcc7de6043f0934a8f74b94b51d935656b9adcb0921862a065eb76ed
 DIST swi-prolog-5.6.41-gentoo-patchset-1.tar.gz 10532 RMD160 7ae2f587678b81cb940d099f365c36c112c9a9c1 SHA1 66f12a0b9f336ce28184a7567cfb6d5243933f55 SHA256 bcae9a6d25e4943382e40871646e1abbb98ea9cc7b403094d41e2ba555514036
-DIST swi-prolog-5.6.43-gentoo-patchset-0.tar.gz 10638 RMD160 ea649812fd8ab5c99b33841d91e0aa48eab20de5 SHA1 aabdb2b00d006fc4a3996e195b14d87dc2bd07f7 SHA256 6f61711e3b20db77362ad87a46119b92931436f7f7c4246f443cd0f58beb147d
+DIST swi-prolog-5.6.43-gentoo-patchset-1.tar.gz 10830 RMD160 28223bd28ec4fc5ac097fc1313fcbe3ac29fa3db SHA1 61b75b178a2802440f5a4a9eed19c4757174c11b SHA256 c27653eb169d205149cb3f461d46274070cfe01f8a86d4fce2b2765dba877ddc
 EBUILD swi-prolog-5.6.37.ebuild 4247 RMD160 3e0feeae8a18c66d501ef4e1cec0c05f92322ae6 SHA1 a76749be8aa40496bdab5819cb6fa85a1fafb345 SHA256 af2a723506a370828b987c8d88aa85d2dff7928cc230a0cd1eab7576bd5bb97f
 MD5 20aa33c5a481f49538d5fb7f88eabdda swi-prolog-5.6.37.ebuild 4247
 RMD160 3e0feeae8a18c66d501ef4e1cec0c05f92322ae6 swi-prolog-5.6.37.ebuild 4247
@@ -30,14 +30,14 @@ EBUILD swi-prolog-5.6.41.ebuild 4096 RMD160 07074737d03f3ee1861130b18e2d3beff6f5
 MD5 64cc8f25d7c8ccdff736c8bd9b329b31 swi-prolog-5.6.41.ebuild 4096
 RMD160 07074737d03f3ee1861130b18e2d3beff6f58f7f swi-prolog-5.6.41.ebuild 4096
 SHA256 6bf81fa30ab43567ab9f839eab6c662570c3e766bd42b714c4b6c0927171d079 swi-prolog-5.6.41.ebuild 4096
-EBUILD swi-prolog-5.6.43.ebuild 4042 RMD160 bd2fbb8e71acdc633279938da2db8adef90160fe SHA1 1e3c4354afbc09a5eeec15ef91e9465a66a372e1 SHA256 3f21a34862910eb45ee76de0aacd76382b498792781ca82c78f36c0ddbe207c4
-MD5 404ddca62133103a33c95388615286a9 swi-prolog-5.6.43.ebuild 4042
-RMD160 bd2fbb8e71acdc633279938da2db8adef90160fe swi-prolog-5.6.43.ebuild 4042
-SHA256 3f21a34862910eb45ee76de0aacd76382b498792781ca82c78f36c0ddbe207c4 swi-prolog-5.6.43.ebuild 4042
-MISC ChangeLog 21434 RMD160 bab2eaaa318c9e2ceb4171cb9124f9d9902267c2 SHA1 530098826145c0e861a11e2e4d07c281222461dc SHA256 fa14755be3f91893fdc247ef7f399ca733ba5b7ad97379cf301ddfd4ea2a7b01
-MD5 8807dc242b86eb47b20decbeb39a9b79 ChangeLog 21434
-RMD160 bab2eaaa318c9e2ceb4171cb9124f9d9902267c2 ChangeLog 21434
-SHA256 fa14755be3f91893fdc247ef7f399ca733ba5b7ad97379cf301ddfd4ea2a7b01 ChangeLog 21434
+EBUILD swi-prolog-5.6.43.ebuild 3118 RMD160 9f47b4d07e6183f00e265864118bf284fa6f98ec SHA1 f5fbd23545617ac8df805153fb7be022bd4f8ad4 SHA256 93d4c72a130e249eed4c8d6d903eca7425c37edc8db136f5e098a2307dcb7204
+MD5 41d5b534ce516d44294ba0dfa5657e87 swi-prolog-5.6.43.ebuild 3118
+RMD160 9f47b4d07e6183f00e265864118bf284fa6f98ec swi-prolog-5.6.43.ebuild 3118
+SHA256 93d4c72a130e249eed4c8d6d903eca7425c37edc8db136f5e098a2307dcb7204 swi-prolog-5.6.43.ebuild 3118
+MISC ChangeLog 21637 RMD160 1be7babb4dd5a945dde8f975d75bd25b70709301 SHA1 dce9f5d567d15c39d7d73d25049ebc1724c69ffc SHA256 871ffe8db98418933b7854f7367ba5758d8292967a75f34b6cb02125915a97bf
+MD5 210d56c14cd0943a8a5468c55f950b1f ChangeLog 21637
+RMD160 1be7babb4dd5a945dde8f975d75bd25b70709301 ChangeLog 21637
+SHA256 871ffe8db98418933b7854f7367ba5758d8292967a75f34b6cb02125915a97bf ChangeLog 21637
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
@@ -57,6 +57,6 @@ SHA256 0dc21d20558ea4b570e2edae78c35f22b5b29c8edd2e86350b9e76eaeb9155c0 files/di
 MD5 a8261a4439f19bef176066e8f800e124 files/digest-swi-prolog-5.6.41 539
 RMD160 ce2a1cc1c46cc69d1e8279969c2936d693cd33e1 files/digest-swi-prolog-5.6.41 539
 SHA256 7bbffe3a16d94573a582824b0f2948c173568cec534558abf853e24b14c116f4 files/digest-swi-prolog-5.6.41 539
-MD5 2f5660c14d6e9fe54c674c9b5d9c4bbb files/digest-swi-prolog-5.6.43 539
-RMD160 1fd7dd8505e43ff8e6ef8cf7881b35eb5b8be868 files/digest-swi-prolog-5.6.43 539
-SHA256 38a0aac382a3336259a270a8e0b67c0d9fae704c93aea839bac3f4fcc1c9028e files/digest-swi-prolog-5.6.43 539
+MD5 0081272282cd9f3cdba9d62b982a3699 files/digest-swi-prolog-5.6.43 539
+RMD160 ec575ea620af09800f61b93aa76a73a0d13413b1 files/digest-swi-prolog-5.6.43 539
+SHA256 62922ac0d5eb9d16d16daa77288aac410460090c5afabc7526506512074c2512 files/digest-swi-prolog-5.6.43 539
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.43 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.43
index 61fc30ad617a..dd6220a07af4 100644
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.43
+++ b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.43
@@ -1,6 +1,6 @@
 MD5 eb6f54380b35d1bb5b034027e535e77b pl-5.6.43.tar.gz 11989950
 RMD160 e47f16fa529b9597bd2a5309671ec911cb3cf9f5 pl-5.6.43.tar.gz 11989950
 SHA256 bbaaed3b9b7c59a5a48fc34400a34e4600785d2b6964d7c988356ceac1479776 pl-5.6.43.tar.gz 11989950
-MD5 b490939fc545c1746c4229d38c9d9251 swi-prolog-5.6.43-gentoo-patchset-0.tar.gz 10638
-RMD160 ea649812fd8ab5c99b33841d91e0aa48eab20de5 swi-prolog-5.6.43-gentoo-patchset-0.tar.gz 10638
-SHA256 6f61711e3b20db77362ad87a46119b92931436f7f7c4246f443cd0f58beb147d swi-prolog-5.6.43-gentoo-patchset-0.tar.gz 10638
+MD5 62ec0f0cb81d07cb2b282f38692f70b5 swi-prolog-5.6.43-gentoo-patchset-1.tar.gz 10830
+RMD160 28223bd28ec4fc5ac097fc1313fcbe3ac29fa3db swi-prolog-5.6.43-gentoo-patchset-1.tar.gz 10830
+SHA256 c27653eb169d205149cb3f461d46274070cfe01f8a86d4fce2b2765dba877ddc swi-prolog-5.6.43-gentoo-patchset-1.tar.gz 10830
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.43.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.43.ebuild
index 0d014e82758e..c2f18ff34ca9 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.43.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.43.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.43.ebuild,v 1.1 2007/10/06 23:57:33 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.43.ebuild,v 1.2 2007/10/08 07:20:46 keri Exp $
 
 inherit eutils flag-o-matic java-pkg-opt-2
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
@@ -42,26 +42,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${WORKDIR}"/${PV}/1000-cflags.patch
-	epatch "${WORKDIR}"/${PV}/1001-multilib.patch
-	epatch "${WORKDIR}"/${PV}/1002-parallel-make.patch
-	epatch "${WORKDIR}"/${PV}/2100-thread-sandbox.patch
-	epatch "${WORKDIR}"/${PV}/2105-pl-profile-va-debug.patch
-	epatch "${WORKDIR}"/${PV}/2800-mandir.patch
-	epatch "${WORKDIR}"/${PV}/2900-thread-library.patch
-	epatch "${WORKDIR}"/${PV}/3029-clib-test.patch
-	epatch "${WORKDIR}"/${PV}/3059-ssl-test.patch
-	epatch "${WORKDIR}"/${PV}/3069-semweb-test.patch
-	epatch "${WORKDIR}"/${PV}/3150-jpl-env.patch
-	epatch "${WORKDIR}"/${PV}/3151-jpl-ppc-arch.patch
-	epatch "${WORKDIR}"/${PV}/3152-jpl-junit.patch
-	epatch "${WORKDIR}"/${PV}/3159-jpl-test.patch
-	epatch "${WORKDIR}"/${PV}/3160-xpce-parallel-build.patch
-	epatch "${WORKDIR}"/${PV}/3139-sgml-test.patch
-	epatch "${WORKDIR}"/${PV}/3149-sgml-RDF-test.patch
-	epatch "${WORKDIR}"/${PV}/3169-xpce-test.patch
-	epatch "${WORKDIR}"/${PV}/3199-ltx2htm.patch
-	epatch "${WORKDIR}"/${PV}/3229-zlib-test.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 }
 
 src_compile() {