Patch from Caster to improve the checks for the generation-1 system vm

Package-Manager: portage-2.1.1_pre3-r5

5 files changed, 94 insertions, 5 deletions

diff --git a/dev-java/java-config-wrapper/ChangeLog b/dev-java/java-config-wrapper/ChangeLog
index ca6f0bb3da50..3f7ed1eb0228 100644
--- a/dev-java/java-config-wrapper/ChangeLog
+++ b/dev-java/java-config-wrapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/java-config-wrapper
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/ChangeLog,v 1.12 2006/07/28 15:31:07 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/ChangeLog,v 1.13 2006/08/01 22:56:07 nichoj Exp $
+
+*java-config-wrapper-0.10-r3 (01 Aug 2006)
+
+  01 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/java-config-wrapper-0.10-check.patch,
+  +java-config-wrapper-0.10-r3.ebuild:
+  Patch from Caster to improve the checks for the generation-1 system vm
 
 *java-config-wrapper-0.10-r2 (28 Jul 2006)
 
diff --git a/dev-java/java-config-wrapper/Manifest b/dev-java/java-config-wrapper/Manifest
index 30e44f8134a7..a953cd3ff338 100644
--- a/dev-java/java-config-wrapper/Manifest
+++ b/dev-java/java-config-wrapper/Manifest
@@ -1,3 +1,7 @@
+AUX java-config-wrapper-0.10-check.patch 1438 RMD160 62fee54cc7db434d811cbc75f6732375a5e2d5bc SHA1 f264e1c53f2b4f4a148b755f07048821b76d54c1 SHA256 9817dbc77210b47c11e4c2ccc77ad2b7f95c08075f37daec2ebf6e38a96928e8
+MD5 87bee5c42386dc78f74b14072e5bd302 files/java-config-wrapper-0.10-check.patch 1438
+RMD160 62fee54cc7db434d811cbc75f6732375a5e2d5bc files/java-config-wrapper-0.10-check.patch 1438
+SHA256 9817dbc77210b47c11e4c2ccc77ad2b7f95c08075f37daec2ebf6e38a96928e8 files/java-config-wrapper-0.10-check.patch 1438
 AUX java-config-wrapper-0.10-fixer.patch 2351 RMD160 95bd486ee7c1942f79ffaeab2e7f1b59c38322dd SHA1 20fb767be1edbad26e379299f8d39356a9482361 SHA256 3d44ca9f1577ef6537dea800adec494fb5379cdb87a2c7b9d1455952ec23f90a
 MD5 eceb5ac61c1df4b132e7b88c8a4822fc files/java-config-wrapper-0.10-fixer.patch 2351
 RMD160 95bd486ee7c1942f79ffaeab2e7f1b59c38322dd files/java-config-wrapper-0.10-fixer.patch 2351
@@ -31,10 +35,14 @@ EBUILD java-config-wrapper-0.10-r2.ebuild 832 RMD160 3aefb2404d3d584e3f82214ebf3
 MD5 19270f7a2dda1cf959867b6c58966e8a java-config-wrapper-0.10-r2.ebuild 832
 RMD160 3aefb2404d3d584e3f82214ebf30f14bb5bc23b4 java-config-wrapper-0.10-r2.ebuild 832
 SHA256 2503a1b0e5321bf2e35aa2983c80b346288c73254ad7ac6fb24f852352db4281 java-config-wrapper-0.10-r2.ebuild 832
-MISC ChangeLog 3021 RMD160 b4dbe66e333cbc5554b324884d0bfe67181f4e60 SHA1 7bb353f7a2958306615d0a18ed80190766c2be02 SHA256 eef7828507282279fde12268e6b24834877c3169ff04195cf64f0fefffbf06ea
-MD5 3f438d0b7f29b49a62459cf1c9e32be8 ChangeLog 3021
-RMD160 b4dbe66e333cbc5554b324884d0bfe67181f4e60 ChangeLog 3021
-SHA256 eef7828507282279fde12268e6b24834877c3169ff04195cf64f0fefffbf06ea ChangeLog 3021
+EBUILD java-config-wrapper-0.10-r3.ebuild 869 RMD160 742794b6e66e2d8c42472b6eed3b5c5aba021801 SHA1 4adddc0e619a99fb6f984c8674f2c6805c905caa SHA256 444035ac848203f05b4d0cf502f576355c04c652541a7ea7502b733113949fd1
+MD5 8831a40af0817cf6a99ba8aea181b534 java-config-wrapper-0.10-r3.ebuild 869
+RMD160 742794b6e66e2d8c42472b6eed3b5c5aba021801 java-config-wrapper-0.10-r3.ebuild 869
+SHA256 444035ac848203f05b4d0cf502f576355c04c652541a7ea7502b733113949fd1 java-config-wrapper-0.10-r3.ebuild 869
+MISC ChangeLog 3275 RMD160 c1cf62b428f8c7ea29e205d6f98cb830cbffc4a4 SHA1 32fe6287be46955edd8f01858028add68702180a SHA256 8f53fcd9bd2fca0e4febccdb5e7751ee638c69651fcd7f73e6795404b9e30153
+MD5 baf0fead1684da4e2c9eb265e577b668 ChangeLog 3275
+RMD160 c1cf62b428f8c7ea29e205d6f98cb830cbffc4a4 ChangeLog 3275
+SHA256 8f53fcd9bd2fca0e4febccdb5e7751ee638c69651fcd7f73e6795404b9e30153 ChangeLog 3275
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -42,3 +50,6 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 9c3a6c4135a8bda4f8bee326cac00ba3 files/digest-java-config-wrapper-0.10-r2 271
 RMD160 3ffb177712eec2358b03768ab8a8f3ad1ae11e6c files/digest-java-config-wrapper-0.10-r2 271
 SHA256 0b7b345df70a8eadbab3e0e264020f24554ea0c98aee219b09153849d7c9ed13 files/digest-java-config-wrapper-0.10-r2 271
+MD5 9c3a6c4135a8bda4f8bee326cac00ba3 files/digest-java-config-wrapper-0.10-r3 271
+RMD160 3ffb177712eec2358b03768ab8a8f3ad1ae11e6c files/digest-java-config-wrapper-0.10-r3 271
+SHA256 0b7b345df70a8eadbab3e0e264020f24554ea0c98aee219b09153849d7c9ed13 files/digest-java-config-wrapper-0.10-r3 271
diff --git a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r3 b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r3
new file mode 100644
index 000000000000..1a39e8a2826e
--- /dev/null
+++ b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r3
@@ -0,0 +1,3 @@
+MD5 4255cda560c9a09c0b71fdcc13d27daa java-config-wrapper-0.10.tar.bz2 5225
+RMD160 c970bea9d2a8463378bb1bf345c67fdee9e50ea8 java-config-wrapper-0.10.tar.bz2 5225
+SHA256 8272bce889841febf13ee18b548ae38733f6a67d1ed28a630c59d0ae198192bd java-config-wrapper-0.10.tar.bz2 5225
diff --git a/dev-java/java-config-wrapper/files/java-config-wrapper-0.10-check.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.10-check.patch
new file mode 100644
index 000000000000..5d28efd5b1b2
--- /dev/null
+++ b/dev-java/java-config-wrapper/files/java-config-wrapper-0.10-check.patch
@@ -0,0 +1,36 @@
+--- /usr/bin/java-check-environment	2006-07-29 00:56:52.000000000 +0200
++++ java-check-environment	2006-07-31 11:31:00.000000000 +0200
+@@ -167,8 +167,9 @@
+ # Checks that a system-vm for generation-1 is set
+ check_generation_1_system_vm() {
+ 	local this_result=0
++	local env="/etc/env.d/20java"
+ 	# Make sure a generation-1 VM is set
+-	if [[ ! -f /etc/env.d/20java ]]; then
++	if [[ ! -f "${env}" ]]; then
+ 		qeerror "No Generation-1 System VM is set!"
+ 		qeerror "Run 'java-config-1 -L' to see a list of available VMs"
+ 		qeerror "Then run 'java-config-1 -S <VM choice>'"
+@@ -178,8 +179,21 @@
+ 		qeerror "Run 'java-config-1 -L' to see a list of available VMs"
+ 		qeerror "Then run 'java-config-1 -S <VM choice>'"
+ 		this_result=1
++	# Make sure the generation-1 VM set is generation-2 compatible, not set long before migration
++	else
++	    # We need to unset GENERATION, because this ends up being in 
++	    # the environment.
++	    local OLD_GENERATION=${GENERATION}
++	    unset GENERATION
++	    local generation=$(source ${env}; echo $GENERATION)
++	    if [[ "${generation}z" != "2z" ]]; then
++		qeerror "Current Generation-1 System VM env isn't Generation-2 ready and needs to be set again"
++		qeerror "Run 'java-config-1 -L' to see a list of available VMs"
++		qeerror "Then run 'java-config-1 -S <VM choice>'"
++		this_result=1
++	    fi
++	    GENERATION=${OLD_GENERATION}
+ 	fi
+-	
+ 
+ 	update_result ${this_result}
+ 	return ${this_result}
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.10-r3.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.10-r3.ebuild
new file mode 100644
index 000000000000..c2daacebc799
--- /dev/null
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.10-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/java-config-wrapper-0.10-r3.ebuild,v 1.1 2006/08/01 22:56:07 nichoj Exp $
+
+inherit eutils
+DESCRIPTION="Wrapper for java-config"
+HOMEPAGE="http://www.gentoo.org/proj/en/java"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+DEPEND="!<dev-java/java-config-1.3"
+RDEPEND="app-portage/portage-utils"
+
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Remove unnecessary file
+	rm src/shell/java-check-environment.orig
+	# Fix regression bug #140752
+	epatch ${FILESDIR}/${PN}-0.9-qfile.patch
+	cd src/shell
+	epatch ${FILESDIR}/${P}-fixer.patch
+	epatch ${FILESDIR}/${P}-check.patch
+}
+
+src_install() {
+	dobin src/shell/*
+}