Added check for virtuals.

Package-Manager: portage-2.1.1_pre2-r4

4 files changed, 76 insertions, 1 deletions

diff --git a/dev-java/java-config-wrapper/ChangeLog b/dev-java/java-config-wrapper/ChangeLog
index 49324bb6acf6..61fdf04fcbcb 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.7 2006/06/29 20:10:24 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/ChangeLog,v 1.8 2006/07/16 22:52:48 nichoj Exp $
+
+*java-config-wrapper-0.10 (16 Jul 2006)
+
+  16 Jul 2006; Joshua Nichols <jnichols@gentoo.org>
+  +files/java-config-wrapper-0.9-virtual_check.patch,
+  -java-config-wrapper-0.9-r5.ebuild, +java-config-wrapper-0.10.ebuild:
+  Added check for virtuals.
 
 *java-config-wrapper-0.9-r5 (29 Jun 2006)
 
diff --git a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10 b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10
new file mode 100644
index 000000000000..1a39e8a2826e
--- /dev/null
+++ b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10
@@ -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.9-virtual_check.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-virtual_check.patch
new file mode 100644
index 000000000000..1cae2bb047e3
--- /dev/null
+++ b/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-virtual_check.patch
@@ -0,0 +1,46 @@
+Index: src/shell/java-check-environment
+===================================================================
+--- src/shell/java-check-environment	(revision 2457)
++++ src/shell/java-check-environment	(working copy)
+@@ -175,10 +175,23 @@
+ 	return ${this_result}
+ }
+ 
++check_virtual_provides() {
++    local this_result=0
++    local provides=$(find /var/db/pkg -name PROVIDE | xargs egrep -l 'virtual/jdk|virtual/jre')
++    if [[ -n ${provides} ]]; then
++        qeerror "Found PROVIDE files from old-style virtuals. Please remove them:"
++        qecho "# rm ${provides}"
++
++        this_result=1
++    fi
++	update_result ${this_result}
++	return ${this_result}
++}
++
+ qeinfo "=== Java Environment Checker ==="
+ qeinfo "The purpose of this script is to check the sanity of your Java Environment."
+ qeinfo "We have significantly changed and improved the way Java is handled in many respects."
+-qeinfo "Please refer to https://projects.gentooexperimental.org/expj/wiki/ for details"
++qeinfo "Please refer to http://www.gentoo.org/proj/en/java/java-upgrade.xml for details"
+ qecho
+ 
+ RESULT=0
+@@ -187,7 +200,7 @@
+ # Get the list of checks to perform from the command line
+ checks=$@
+ # or use our default
+-checks=${checks:="vm_environment_files user_settings generation_1_system_vm"}
++checks=${checks:="vm_environment_files user_settings generation_1_system_vm virtual_provides"}
+ 
+ for check in ${checks}; do
+ 	if [ "$(type -t check_${checks})" == "function" ]; then
+@@ -195,6 +208,7 @@
+ 		check_${check}
+ 		result=$?
+ 		qeend ${result}
++        qecho
+ 	else
+ 		eerror "Could not find function 'check_${check}'"
+ 		exit 1
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.10.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.10.ebuild
new file mode 100644
index 000000000000..3940159d0fd2
--- /dev/null
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.10.ebuild
@@ -0,0 +1,19 @@
+# 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.ebuild,v 1.1 2006/07/16 22:52:48 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"
+DEPEND="!<dev-java/java-config-1.3"
+
+IUSE=""
+
+src_install() {
+	dobin src/shell/*
+}