Update patch to fix parallel build issues (bug #296749, thanks to Martin von Gagern and Torsten Kurbad).

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

3 files changed, 23 insertions, 18 deletions

diff --git a/dev-libs/xalan-c/ChangeLog b/dev-libs/xalan-c/ChangeLog
index ae5d355a9b2d..004340545c35 100644
--- a/dev-libs/xalan-c/ChangeLog
+++ b/dev-libs/xalan-c/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xalan-c
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.25 2010/09/12 20:17:04 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.26 2011/02/25 17:14:30 dev-zero Exp $
+
+  25 Feb 2011; Tiziano Müller <dev-zero@gentoo.org>
+  files/1.11.0_pre797991-parallel-build.patch:
+  Update patch to fix parallel build issues (bug #296749, thanks to Martin von
+  Gagern and Torsten Kurbad).
 
   12 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
   xalan-c-1.11.0_pre797991.ebuild:
diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index a45a7ebc523b..276d38386d01 100644
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.10.0-as-needed.patch 4022 RMD160 298171f6d3e6b624dc220ad3d8b2f0d00bfb43b4 SHA1 86d2926aa3dcc382b7491bb3e4c7dad707581f25 SHA256 34e4ccbfcbf11748e60dfb98c6ca2e1b47597031cfcea14cb2df3a43289a8e5a
 AUX 1.11.0_pre797991-as-needed.patch 5376 RMD160 1e9f1f5d99110b89152ca0dfb0b05d5aef0aabc4 SHA1 eb0caccb944bb92c4e9d452f8b324f423034d56c SHA256 5fe1a1ef8320f341118ce27467ecab7d19c23db43f66aa8d3d0c2f178d8ed078
 AUX 1.11.0_pre797991-bugfixes.patch 1652 RMD160 3a6c81b2664984a8cfaf821023c9f11a60113ed1 SHA1 7b6325c95e480448ffd54e567c21036c8763164a SHA256 8b5571fea02b1477b2755fc98bd65aca87096de4ca559b2f53409fbeba2a105a
-AUX 1.11.0_pre797991-parallel-build.patch 2481 RMD160 bfdfc9e1a825cb3fb679bace1c8baf86aeace7a7 SHA1 ec56dac03f53890c97a6b02e348c91f6b7060e55 SHA256 8fdad8eecf83d08bf1b66328464473975112eb844163bd755a9edf711848e6ed
+AUX 1.11.0_pre797991-parallel-build.patch 2714 RMD160 f1e3b6095a20260c07a974eb4d0e9cd6ef3b130b SHA1 329f061a80e7ed882f04ae0d79d7e36d51dd0a9c SHA256 0dc930aee99bafd42b610747f8d0fbe3cf7737ee8f1135ed5156fe5fd272fa30
 AUX xalan-c-1.10.0+gcc-4.3.patch 1359 RMD160 746ad62dd8090ad950f24e03cc1c20a36ca8753a SHA1 b2072937c4433cb4e59b85de264ee87f67e986a6 SHA256 f560a9ca0d6a7b716174492450160df58fa3e8d261d629ebe07e5f632442b344
 DIST Xalan-C_1_10_0-src.tar.gz 1554940 RMD160 537ba0be6a14e47eb4453c2d813b31ec416835ab SHA1 3fc63045048176e0ab00ce8aa0d15b2c1e5d646b SHA256 40797957fb22797894d33a2fa0e01e3b6cc509fb89bb772c0e835ae840714cfd
 DIST Xalan-C_r705082-src.tar.gz 1579340 RMD160 e3f4178e794ad63b6d4ccc1369ed100c8938d447 SHA1 176c46d4926b4c21849b6a0422bfba5c8e2d5046 SHA256 8e7d821a1f09fe69258ff436740e755426179150acedb696b3b431682cc8c3f3
@@ -12,12 +9,5 @@ DIST Xalan-C_r797991-src.tar.gz 1569254 RMD160 791776b7d77a8356abba30b145a6e67d5
 EBUILD xalan-c-1.10.0.ebuild 1954 RMD160 052ee4805ef2b89565cfa6dea05e773df691e4d7 SHA1 2509d043390854035ab786359c9998b638a17519 SHA256 6ba8ab64eba70c90e5da587b063c1a88499d2ed4ea3f1917a261352e1a4d49ed
 EBUILD xalan-c-1.11.0_pre705082.ebuild 1610 RMD160 cc81d3ed3c407517455ae26d28b5e9a39b46e504 SHA1 aafdcf8cc580ded8a20befdfbc4472ac0ac618f4 SHA256 1e57e4f809f7add66b490e0a1a98d5b9a0e93243f47dce1d558e400fea502056
 EBUILD xalan-c-1.11.0_pre797991.ebuild 2596 RMD160 4260984297c85310131a92fd520a76f8961339a2 SHA1 32adc5e0b3a2defff789bcf4ea71a01f23ba9608 SHA256 6b5d86f4a918e81268bb3e31a22f5c8579fb58e21628227c7d42426d5ec4defc
-MISC ChangeLog 4114 RMD160 06adf3dc3180c632bcde0fc9539e69452c92df50 SHA1 a5641298052aff3cde6c589f61baec8799f4bb19 SHA256 032b7eb6f1a93e0148c0ae79e67bb32edfa591f39e7cda6ad7c9c8f369f9abe7
+MISC ChangeLog 4324 RMD160 4723a2849bd8900283cf47cc522b427d5f655694 SHA1 715f908b280684f655a35cda352cf64aaa1ec90a SHA256 13a06417c34e74d7a5f417daa2e06f76c6439b80224e4285d41adfa2670e1aac
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyNNTgACgkQ9/cejkQaxBAcIACdGx7pA6RL7o6or7FG/DSQzNZg
-1NMAnAja1La97LfNwlMwzAZggIzzanGl
-=coqp
------END PGP SIGNATURE-----
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
index a75b9758b09b..46d9659b0f0a 100644
--- a/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
@@ -1,6 +1,6 @@
-diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
---- xml-xalan.orig/c/src/xalanc/Makefile.in	2009-07-27 00:47:45.704317114 +0200
-+++ xml-xalan/c/src/xalanc/Makefile.in	2009-07-27 01:18:22.914130631 +0200
+diff -urN xml-xalan.orig//c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
+--- xml-xalan.orig//c/src/xalanc/Makefile.in	2010-02-23 10:51:30.058353490 +0100
++++ xml-xalan/c/src/xalanc/Makefile.in	2010-02-23 10:52:53.251679288 +0100
 @@ -84,6 +84,10 @@
  SAMPLES_DIR = ${XALANCROOT}/samples
  TESTS_DIR = ${XALANCROOT}/Tests
@@ -12,7 +12,17 @@ diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefi
  ALL_VPATH_CPP = \
  $(XALANDOM_DIR):$(PLATFORMSUPPORT_DIR):$(DOMSUPPORT_DIR):$(XMLSUPPORT_DIR): \
  $(XPATH_DIR):$(XERCESPARSERLIAISON_DIR):$(DEPRECATED_XERCESPARSERLIAISON_DIR):$(XALANSOURCETREE_DIR):$(XPATHCAPI_DIR): \
-@@ -188,28 +192,28 @@
+@@ -169,6 +173,9 @@
+ 
+ compile:	 $(ALL_OBJECTS) 
+ 
++$(ALL_OBJECTS) $(TESTXSLT_OBJS) $(XALANEXE_OBJS) $(TESTXPATH_OBJS): locale
++locale: prepare
++
+ ifeq (${OS390BATCH},1)
+ XalanExe: lib  "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'"
+ 
+@@ -188,28 +195,28 @@
  
  else # Not OS390BATCH