Fix parallel unpacking for cacao and jamvm. #453608

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)

5 files changed, 59 insertions, 5 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 179252cd260a..358fd2135a4f 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.87 2013/01/31 20:08:09 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.88 2013/02/01 09:12:46 sera Exp $
+
+  01 Feb 2013; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.12.0.ebuild,
+  +files/icedtea-6.1.12.0-parallel-unpack.patch, icedtea-7.2.3.4.ebuild,
+  +files/icedtea-7.2.3.4-parallel-unpack.patch:
+  Fix parallel unpacking for cacao and jamvm. #453608
 
 *icedtea-6.1.12.0 (31 Jan 2013)
 
diff --git a/dev-java/icedtea/files/icedtea-6.1.12.0-parallel-unpack.patch b/dev-java/icedtea/files/icedtea-6.1.12.0-parallel-unpack.patch
new file mode 100644
index 000000000000..53c63290dd04
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-6.1.12.0-parallel-unpack.patch
@@ -0,0 +1,26 @@
+Author: Ralph Sennhauser <sera@gentoo.org>
+
+Fix parallel unpacking #453608
+
+diff --git a/Makefile.am b/Makefile.am
+index 48029bc..34882a7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1099,7 +1099,7 @@ clean-extract-openjdk:
+ 	rm -f stamps/patch-fsg.stamp
+ 	rm -f stamps/patch.stamp
+ 
+-stamps/extract-cacao.stamp:
++stamps/extract-cacao.stamp: stamps/download-cacao.stamp
+ if BUILD_CACAO
+ if !USE_SYSTEM_CACAO
+ if USE_ALT_CACAO_SRC_DIR
+@@ -1124,7 +1124,7 @@ endif
+ 	mkdir -p stamps
+ 	touch $@
+ 
+-stamps/extract-jamvm.stamp:
++stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
+ if BUILD_JAMVM
+ 	set -e ; \
+ 	if ! test -d jamvm ; \
diff --git a/dev-java/icedtea/files/icedtea-7.2.3.4-parallel-unpack.patch b/dev-java/icedtea/files/icedtea-7.2.3.4-parallel-unpack.patch
new file mode 100644
index 000000000000..8819e3bf7c9d
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7.2.3.4-parallel-unpack.patch
@@ -0,0 +1,17 @@
+Author: Ralph Sennhauser <sera@gentoo.org>
+
+Fix parallel unpacking #453608
+
+diff --git a/Makefile.am b/Makefile.am
+index 3f96d92..714cefa 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1289,7 +1289,7 @@ endif
+ clean-extract-cacao: clean-cacao
+ 	rm -f stamps/extract-cacao.stamp
+ 
+-stamps/extract-jamvm.stamp:
++stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
+ if BUILD_JAMVM
+ 	set -e ; \
+ 	if ! test -d jamvm ; \
diff --git a/dev-java/icedtea/icedtea-6.1.12.0.ebuild b/dev-java/icedtea/icedtea-6.1.12.0.ebuild
index 4720c42a1226..63513ff3ce91 100644
--- a/dev-java/icedtea/icedtea-6.1.12.0.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.0.ebuild,v 1.1 2013/01/31 20:08:09 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.0.ebuild,v 1.2 2013/02/01 09:12:46 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,7 +9,7 @@
 
 EAPI="4"
 
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit autotools eutils java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
 
 ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
 OPENJDK_BUILD="27"
@@ -139,6 +139,9 @@ src_unpack() {
 java_prepare() {
 	# icedtea doesn't like some locales. #330433 #389717
 	export LANG="C" LC_ALL="C"
+
+	epatch "${FILESDIR}"/${P}-parallel-unpack.patch
+	eautoreconf
 }
 
 bootstrap_impossible() {
diff --git a/dev-java/icedtea/icedtea-7.2.3.4.ebuild b/dev-java/icedtea/icedtea-7.2.3.4.ebuild
index 3ae16455543b..0ab93b7f7061 100644
--- a/dev-java/icedtea/icedtea-7.2.3.4.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.4.ebuild,v 1.2 2013/01/23 17:15:27 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.4.ebuild,v 1.3 2013/02/01 09:12:46 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,7 +9,7 @@
 
 EAPI="4"
 
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
+inherit autotools eutils java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
 
 ICEDTEA_VER=$(get_version_component_range 2-)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
@@ -156,6 +156,9 @@ java_prepare() {
 
 	# icedtea doesn't like some locales. #330433 #389717
 	export LANG="C" LC_ALL="C"
+
+	epatch "${FILESDIR}"/${P}-parallel-unpack.patch
+	eautoreconf
 }
 
 bootstrap_impossible() {