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

(Portage version: 2.1.1_pre3-r5)

4 files changed, 79 insertions, 1 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/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/*
+}