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

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

10 files changed, 0 insertions, 274 deletions

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