Several fixes and cleanups provided by Caster. Pruned old versions.

(Portage version: 2.1.1_pre5-r3)
 (Unsigned Manifest commit)

13 files changed, 12 insertions, 388 deletions

diff --git a/dev-java/java-config-wrapper/Manifest b/dev-java/java-config-wrapper/Manifest
index a953cd3ff338..6649cb219183 100644
--- a/dev-java/java-config-wrapper/Manifest
+++ b/dev-java/java-config-wrapper/Manifest
@@ -1,55 +1,16 @@
-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
-SHA256 3d44ca9f1577ef6537dea800adec494fb5379cdb87a2c7b9d1455952ec23f90a files/java-config-wrapper-0.10-fixer.patch 2351
-AUX java-config-wrapper-0.9-check_env_files.patch 1312 RMD160 50c21638dc27a21ec0ba801f5fbc9d131f8c9bc2 SHA1 d4c4b3fab3a5a52554587406aa245453c8328922 SHA256 8f2859277d786c6ff5f0fc3acbc8b722b7fe73f86f0799c67573790d3d14fd91
-MD5 c2242a4fe3ca6abb0127a464cff5f09d files/java-config-wrapper-0.9-check_env_files.patch 1312
-RMD160 50c21638dc27a21ec0ba801f5fbc9d131f8c9bc2 files/java-config-wrapper-0.9-check_env_files.patch 1312
-SHA256 8f2859277d786c6ff5f0fc3acbc8b722b7fe73f86f0799c67573790d3d14fd91 files/java-config-wrapper-0.9-check_env_files.patch 1312
-AUX java-config-wrapper-0.9-ignore_nonexistant_envs.patch 982 RMD160 8493a06965135f77f70c1d66df868d56297da280 SHA1 47aa57eabb0938d2baa7acc2f0ce9e4d5265d74b SHA256 848e70e07a59f4045df9e08ee9e9bc17c45e7bd457f5ae09509068b54f10045c
-MD5 c0e2d8459b448a2dc647a2ab1a6307fc files/java-config-wrapper-0.9-ignore_nonexistant_envs.patch 982
-RMD160 8493a06965135f77f70c1d66df868d56297da280 files/java-config-wrapper-0.9-ignore_nonexistant_envs.patch 982
-SHA256 848e70e07a59f4045df9e08ee9e9bc17c45e7bd457f5ae09509068b54f10045c files/java-config-wrapper-0.9-ignore_nonexistant_envs.patch 982
-AUX java-config-wrapper-0.9-keyword_warning.patch 748 RMD160 bcfa60b616c2023fd85ad1397a93f526b95ee833 SHA1 ffe137e816c586043446799b7b93e95781fd92df SHA256 73e26ecb0435cd4805ece899409e0e105edc1d4b1ce0c5f9f440f290bb51081d
-MD5 58578e042a75d8dedda334519084fe2a files/java-config-wrapper-0.9-keyword_warning.patch 748
-RMD160 bcfa60b616c2023fd85ad1397a93f526b95ee833 files/java-config-wrapper-0.9-keyword_warning.patch 748
-SHA256 73e26ecb0435cd4805ece899409e0e105edc1d4b1ce0c5f9f440f290bb51081d files/java-config-wrapper-0.9-keyword_warning.patch 748
-AUX java-config-wrapper-0.9-qfile.patch 646 RMD160 24a342f8533afb7568ba9088624d1b9a7eb783c5 SHA1 40e9e9f456a7c25bcbc251968aabcaeb7ecaa40f SHA256 56d1f7e6de34ab8d01cc18173dd4002b04f9b6229161048c33b2a79f0756f27a
-MD5 b40de08891bfdeea20ab19776a90ccd6 files/java-config-wrapper-0.9-qfile.patch 646
-RMD160 24a342f8533afb7568ba9088624d1b9a7eb783c5 files/java-config-wrapper-0.9-qfile.patch 646
-SHA256 56d1f7e6de34ab8d01cc18173dd4002b04f9b6229161048c33b2a79f0756f27a files/java-config-wrapper-0.9-qfile.patch 646
-AUX java-config-wrapper-0.9-url.patch 769 RMD160 6e8156ebe80f5d0db3fd8525ef4fd5bfc23d28e2 SHA1 17d0162eda012757db66fe807c01a1cf01fae096 SHA256 e107ae47ee9531892f2cfba0e3f2051589375c9fcddd5445be3f0a2cb9aefd22
-MD5 2dc607d1478af53b05eef04db45ed844 files/java-config-wrapper-0.9-url.patch 769
-RMD160 6e8156ebe80f5d0db3fd8525ef4fd5bfc23d28e2 files/java-config-wrapper-0.9-url.patch 769
-SHA256 e107ae47ee9531892f2cfba0e3f2051589375c9fcddd5445be3f0a2cb9aefd22 files/java-config-wrapper-0.9-url.patch 769
-AUX java-config-wrapper-0.9-virtual_check.patch 1612 RMD160 54008d59ffce4a39292b933521e56f336ea85eaa SHA1 2c5a262e2d2b1379dbdc1b50b82a71264976ef79 SHA256 6e7f1e77ed663a7f3e540c232bdb90908060ca388f80f1b915993c05c0caa649
-MD5 a6259545ac3566beb0e5a33e2c01ef5c files/java-config-wrapper-0.9-virtual_check.patch 1612
-RMD160 54008d59ffce4a39292b933521e56f336ea85eaa files/java-config-wrapper-0.9-virtual_check.patch 1612
-SHA256 6e7f1e77ed663a7f3e540c232bdb90908060ca388f80f1b915993c05c0caa649 files/java-config-wrapper-0.9-virtual_check.patch 1612
-DIST java-config-wrapper-0.10.tar.bz2 5225 RMD160 c970bea9d2a8463378bb1bf345c67fdee9e50ea8 SHA1 1813cdafb3852451459472a6a7ca5e01d9b7e7fe SHA256 8272bce889841febf13ee18b548ae38733f6a67d1ed28a630c59d0ae198192bd
-EBUILD java-config-wrapper-0.10-r2.ebuild 832 RMD160 3aefb2404d3d584e3f82214ebf30f14bb5bc23b4 SHA1 d296477e2acbc413d5cf9ec6ed938464bbef80ac SHA256 2503a1b0e5321bf2e35aa2983c80b346288c73254ad7ac6fb24f852352db4281
-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
-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
+DIST java-config-wrapper-0.11.tar.bz2 5613 RMD160 96e5261d598a36821903b1f418d7451f5abbf9bd SHA1 d131cd646d4982110f665e1d0376490e41a026ec SHA256 1bbb34e02348012fe46f502fa975d2fa1b406e4d837b3393d80ef42de7a457cb
+EBUILD java-config-wrapper-0.11.ebuild 597 RMD160 32cd4dbf11ca38ddc5235bd48e9a4afedc5a04fd SHA1 1fb1e7a5c900dd410d38019ecc41a909d5b6e58b SHA256 f085617e23a76c1c96c8a908e4fde82c32d3fe4fc5773bcaae4c0dc4f6e337ec
+MD5 5287ba48b0ab429979665050ed040db6 java-config-wrapper-0.11.ebuild 597
+RMD160 32cd4dbf11ca38ddc5235bd48e9a4afedc5a04fd java-config-wrapper-0.11.ebuild 597
+SHA256 f085617e23a76c1c96c8a908e4fde82c32d3fe4fc5773bcaae4c0dc4f6e337ec java-config-wrapper-0.11.ebuild 597
+MISC ChangeLog 3963 RMD160 9936e43d5ff5ef00fb643d956511881ef44ca61b SHA1 f4ce9d934800d94d12c3c3c1c9741fb3a00fe8f1 SHA256 a204969ec6a6d9c233b66b24f472eeb24143e51c0ce5a489e4296dd3376c1ae4
+MD5 48081965037db1ee716e019ee3885c3d ChangeLog 3963
+RMD160 9936e43d5ff5ef00fb643d956511881ef44ca61b ChangeLog 3963
+SHA256 a204969ec6a6d9c233b66b24f472eeb24143e51c0ce5a489e4296dd3376c1ae4 ChangeLog 3963
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
-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
+MD5 8f593ccc34a3ba9276a0751b5a422337 files/digest-java-config-wrapper-0.11 271
+RMD160 9babe1a83bdc97a9e90b0089b9ea803d01d8104a files/digest-java-config-wrapper-0.11 271
+SHA256 647144fdebd4bd4aff8b4605e07510e51ff6641b749b97a83b93b85a10367a9a files/digest-java-config-wrapper-0.11 271
diff --git a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r2 b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r2
deleted file mode 100644
index 1a39e8a2826e..000000000000
--- a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-java-config-wrapper-0.10-r3 b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r3
deleted file mode 100644
index 1a39e8a2826e..000000000000
--- a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 5d28efd5b1b2..000000000000
--- a/dev-java/java-config-wrapper/files/java-config-wrapper-0.10-check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- /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/files/java-config-wrapper-0.10-fixer.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.10-fixer.patch
deleted file mode 100644
index 551e36552a76..000000000000
--- a/dev-java/java-config-wrapper/files/java-config-wrapper-0.10-fixer.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- java-1.5-fixer	2006-07-18 12:43:03.000000000 +0200
-+++ java-1.5-fixer	2006-07-28 15:52:22.000000000 +0200
-@@ -60,29 +60,68 @@
- 	fi
- }
- 
-+# $1 - package.env file
-+# $2 - name of VAR=foo variable
-+get_value_from_package_env() {
-+	# get the VAR line from package.env
-+	local line="$(grep ${2} ${1})"
-+	
-+	# strip VAR=
-+	local value="${line#${2}=}"
-+	
-+	# strip quotes
-+	value="${value//\"/}"
-+	
-+	echo ${value}
-+}
-+
- get_jars_from_package_env() {
- 	local package_env=${1}
- 
- 	# keep track of the original classpath
- 	local save_classpath=${CLASSPATH}
- 
--	local classpath_line=$(grep CLASSPATH ${package_env})
--	# strip CLASSPATH=
--	local package_classpath=${classpath_line#CLASSPATH=}
--	# strip quotes
--	package_classpath=${package_classpath//\"/}
--	#local package_classpath=$(source ${package_env} >/dev/null 2>&1; echo ${CLASSPATH})
-+	# get classpath from package.env
-+	package_classpath=$(get_value_from_package_env ${package_env} CLASSPATH)
- 
- 	echo ${package_classpath//:/ }
- }
- 
-+check_package_env_valid_gen2_target_15() {
-+	local generation=$(get_value_from_package_env ${1} GENERATION)
-+	
-+	debug_print "${1} generation: ${generation}"
-+	
-+	# packages with generation 1 or without generation won't have TARGET and shouldn't be 1.5
-+	if [[ "${generation}" != "2" ]]; then
-+	    return 1
-+	fi
-+	
-+	local target=$(get_value_from_package_env ${1} TARGET)
-+	
-+	debug_print "${1} target: $target"
-+	
-+	# packages with target 1.5 or 1.6 are valid to have 1.5+ bytecode, skip them
-+	if [[ "${target}" = "1.5" || "${target}" = "1.6" ]]; then
-+	    return 0
-+	fi
-+	
-+	# bytecode should be under 1.5, check it
-+	return 1
-+}
-+
- get_jars() {
- 	local package_envs=$@
- 	local package_env
- 	local all_jars
- 	# for each package.env file
- 	for package_env in ${package_envs}; do
--        if [[ -f ${package_env} ]]; then
-+	if [[ -f ${package_env} ]]; then
-+		#check if package is valid gen2 with 1.5+ target
-+		if $(check_package_env_valid_gen2_target_15 ${package_env}); then
-+		    debug_print "skipping ${package_env}"
-+		    continue
-+		fi
-     		debug_print "parsing ${package_env}"
-     		# figure out what jars are in it
-     		local jars=$(get_jars_from_package_env ${package_env})
-@@ -116,7 +155,7 @@
- 		fi
- 	done
- 
--	sed -e 's/ /\n/' <<< ${broken_packages} | sort | uniq
-+	sed -e 'y/ /\n/' <<< ${broken_packages} | sort | uniq
- }
- 
- fix_packages() {
diff --git a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-check_env_files.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-check_env_files.patch
deleted file mode 100644
index 9b3b61ad4abe..000000000000
--- a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-check_env_files.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru java-config-wrapper-0.9-orig/src/shell/java-check-environment java-config-wrapper-0.9/src/shell/java-check-environment
---- java-config-wrapper-0.9-orig/src/shell/java-check-environment	2006-06-26 16:47:58.000000000 -0400
-+++ java-config-wrapper-0.9/src/shell/java-check-environment	2006-06-26 21:56:02.000000000 -0400
-@@ -66,7 +66,13 @@
- 		handle=${env#*20}
- 	
- 		if [[ "${generation}z" != "2z" ]]; then
--			local ATOM="=${handle}*"
-+            local ATOM
-+            if [[ ${handle} =~ "^kaffe" ]]; then
-+                ATOM="kaffe"
-+            elif [[ ${handle} =~ "^(\w+-)+[0-9]+\.[0-9]+" ]]; then 
-+
-+			    ATOM="=${BASH_REMATCH}*"
-+            fi
- 			packages_to_merge="${packages_to_merge} ${ATOM}"
- 			old_configs="${old_configs} ${env}"
- 			this_result=1
-@@ -175,6 +181,11 @@
- 	return ${this_result}
- }
- 
-+#if [[ ${UID} != 0 ]]; then
-+#    eerror "Must be root to run"
-+#    exit 1
-+#fi
-+
- 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."
-@@ -208,6 +219,7 @@
- 
- if [[ ${RESULT} == 0 ]]; then
- 	qeinfo "Java environment is sane. Congratulations!"
-+    #touch "/etc/java-config-2/environment-ok"
- fi
- 
- exit ${RESULT}
diff --git a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-ignore_nonexistant_envs.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-ignore_nonexistant_envs.patch
deleted file mode 100644
index d56e9495b4f9..000000000000
--- a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-ignore_nonexistant_envs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Only in java-config-wrapper-0.9/src/shell: .java-1.5-fixer.swp
-diff -ru java-config-wrapper-0.9-orig/src/shell/java-1.5-fixer java-config-wrapper-0.9/src/shell/java-1.5-fixer
---- java-config-wrapper-0.9-orig/src/shell/java-1.5-fixer	2006-06-26 16:47:58.000000000 -0400
-+++ java-config-wrapper-0.9/src/shell/java-1.5-fixer	2006-06-26 17:03:15.000000000 -0400
-@@ -82,10 +82,14 @@
- 	local all_jars
- 	# for each package.env file
- 	for package_env in ${package_envs}; do
--		debug_print "parsing ${package_env}"
--		# figure out what jars are in it
--		local jars=$(get_jars_from_package_env ${package_env})
--		all_jars="${all_jars} ${jars}"
-+        if [[ -f ${package_env} ]]; then
-+    		debug_print "parsing ${package_env}"
-+    		# figure out what jars are in it
-+    		local jars=$(get_jars_from_package_env ${package_env})
-+    		all_jars="${all_jars} ${jars}"
-+        else
-+            debug_print "${package_env} doesn't exist... skipping"
-+        fi
- 	done
- 
- 	echo ${all_jars}
diff --git a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-keyword_warning.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-keyword_warning.patch
deleted file mode 100644
index 94d02f59647f..000000000000
--- a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-keyword_warning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru java-config-wrapper-0.9-orig/src/shell/java-check-environment java-config-wrapper-0.9/src/shell/java-check-environment
---- java-config-wrapper-0.9-orig/src/shell/java-check-environment	2006-06-26 16:47:58.000000000 -0400
-+++ java-config-wrapper-0.9/src/shell/java-check-environment	2006-06-29 15:15:42.000000000 -0400
-@@ -83,6 +83,10 @@
- 		qeerror "You must then update your VMs to Generation-2 by running:"
- 		qecho "# emerge -atv ${packages_to_merge}"
- 		qecho
-+        qeerror "If you've done this already, but java-check-environment"
-+        qeerror "still prompts you to emerge the same things, be sure that"
-+        qeerror "you have the latest version of each package unmasked and"
-+        qeerror "keyworded properly."
- 
- 	fi
- 
diff --git a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-qfile.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-qfile.patch
deleted file mode 100644
index 40ec3987df0a..000000000000
--- a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-qfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru java-config-wrapper-0.8-orig/src/shell/java-1.5-fixer java-config-wrapper-0.8/src/shell/java-1.5-fixer
---- java-config-wrapper-0.8-orig/src/shell/java-1.5-fixer	2006-04-21 13:42:49.000000000 -0400
-+++ java-config-wrapper-0.8/src/shell/java-1.5-fixer	2006-04-21 13:43:11.000000000 -0400
-@@ -105,7 +105,7 @@
- 		if has_bad_bytecode ${jar}; then
- 			debug_print "${jar} has bad bytecode!"
- 			# determine what package it belongs to
--			package="$(QFILE -C -q -v ${jar})"
-+			package="$(${QFILE} -C -q -v ${jar})"
- 			# add it to the list of packages, with an =,
- 			# so we can emerge it
- 			broken_packages="${broken_packages} =${package}"
diff --git a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-url.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-url.patch
deleted file mode 100644
index e435979626a1..000000000000
--- a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-url.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru java-config-wrapper-0.9-orig/src/shell/java-check-environment java-config-wrapper-0.9/src/shell/java-check-environment
---- java-config-wrapper-0.9-orig/src/shell/java-check-environment	2006-06-26 16:47:58.000000000 -0400
-+++ java-config-wrapper-0.9/src/shell/java-check-environment	2006-06-27 10:54:00.000000000 -0400
-@@ -178,7 +178,7 @@
- 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
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
deleted file mode 100644
index 1cae2bb047e3..000000000000
--- a/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-virtual_check.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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-r2.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.10-r2.ebuild
deleted file mode 100644
index aa21c246af63..000000000000
--- a/dev-java/java-config-wrapper/java-config-wrapper-0.10-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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-r2.ebuild,v 1.1 2006/07/28 15:31: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
-}
-
-src_install() {
-	dobin src/shell/*
-}
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
deleted file mode 100644
index c2daacebc799..000000000000
--- a/dev-java/java-config-wrapper/java-config-wrapper-0.10-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/*
-}