Fixed a bug where files were being grepped that didn't exist.

(Portage version: 2.1_rc2-r3)

4 files changed, 60 insertions, 1 deletions

diff --git a/dev-java/java-config-wrapper/ChangeLog b/dev-java/java-config-wrapper/ChangeLog
index 8187d1e21234..45ad88f0a279 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.3 2006/06/26 20:29:13 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/ChangeLog,v 1.4 2006/06/26 21:37:44 nichoj Exp $
+
+*java-config-wrapper-0.9-r2 (26 Jun 2006)
+
+  26 Jun 2006; Joshua Nichols <jnichols@gentoo.org>
+  +files/java-config-wrapper-0.9-ignore_nonexistant_envs.patch,
+  -java-config-wrapper-0.9-r1.ebuild, +java-config-wrapper-0.9-r2.ebuild:
+  Fixed a bug where files were being grepped that didn't exist.
 
 *java-config-wrapper-0.9-r1 (26 Jun 2006)
 
diff --git a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.9-r2 b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.9-r2
new file mode 100644
index 000000000000..ceb54fd6ad14
--- /dev/null
+++ b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.9-r2
@@ -0,0 +1,3 @@
+MD5 4c1b8347f421f9e68ff588a26208b99f java-config-wrapper-0.9.tar.bz2 4202
+RMD160 933377e6af0a9b533f707a7189e2ca32916e2f21 java-config-wrapper-0.9.tar.bz2 4202
+SHA256 c62693cd08e59e6272aba4fc08ff356e99ee2b5376d5877ff5eda278028d9f4d java-config-wrapper-0.9.tar.bz2 4202
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
new file mode 100644
index 000000000000..d56e9495b4f9
--- /dev/null
+++ b/dev-java/java-config-wrapper/files/java-config-wrapper-0.9-ignore_nonexistant_envs.patch
@@ -0,0 +1,23 @@
+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/java-config-wrapper-0.9-r2.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.9-r2.ebuild
new file mode 100644
index 000000000000..2a99c0283f0d
--- /dev/null
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.9-r2.ebuild
@@ -0,0 +1,26 @@
+# 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.9-r2.ebuild,v 1.1 2006/06/26 21:37:44 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_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-qfile.patch
+	epatch ${FILESDIR}/${P}-ignore_nonexistant_envs.patch
+}
+
+src_install() {
+	dobin src/shell/*
+}