Patches from Caster for java-1.5-fixer. Primarily, it makes sure there aren't duplicate entries in the emerge list, and skips over packages for generation-2 that were specifically built for 1.5.

(Portage version: 2.1.1_pre3-r5)

4 files changed, 131 insertions, 1 deletions

diff --git a/dev-java/java-config-wrapper/ChangeLog b/dev-java/java-config-wrapper/ChangeLog
index 4405f346ce67..ca6f0bb3da50 100644
--- a/dev-java/java-config-wrapper/ChangeLog
+++ b/dev-java/java-config-wrapper/ChangeLog
@@ -1,6 +1,15 @@
 # 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.11 2006/07/21 00:19:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/ChangeLog,v 1.12 2006/07/28 15:31:07 nichoj Exp $
+
+*java-config-wrapper-0.10-r2 (28 Jul 2006)
+
+  28 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/java-config-wrapper-0.10-fixer.patch,
+  -java-config-wrapper-0.10-r1.ebuild, +java-config-wrapper-0.10-r2.ebuild:
+  Patches from Caster for java-1.5-fixer. Primarily, it makes sure there
+  aren't duplicate entries in the emerge list, and skips over packages for
+  generation-2 that were specifically built for 1.5.
 
   21 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   java-config-wrapper-0.10-r1.ebuild:
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
new file mode 100644
index 000000000000..1a39e8a2826e
--- /dev/null
+++ b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r2
@@ -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-fixer.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.10-fixer.patch
new file mode 100644
index 000000000000..551e36552a76
--- /dev/null
+++ b/dev-java/java-config-wrapper/files/java-config-wrapper-0.10-fixer.patch
@@ -0,0 +1,87 @@
+--- 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/java-config-wrapper-0.10-r2.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.10-r2.ebuild
new file mode 100644
index 000000000000..aa21c246af63
--- /dev/null
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.10-r2.ebuild
@@ -0,0 +1,31 @@
+# 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/*
+}