Fixed a stacktrace when /etc/env.d/20java doesn\'t exist, reported by Caster.

(Portage version: 2.1.1_pre5-r3)

4 files changed, 61 insertions, 1 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 09e112b0a5df..cb87ed108a99 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/java-config
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.102 2006/08/24 18:19:24 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.103 2006/08/25 00:35:18 nichoj Exp $
+
+*java-config-1.3.1-r1 (25 Aug 2006)
+
+  25 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/java-config-1.3.1-no20java.patch, -java-config-1.3.1.ebuild,
+  +java-config-1.3.1-r1.ebuild:
+  Fixed a stacktrace when /etc/env.d/20java doesn't exist, reported by Caster.
 
 *java-config-2.0.27 (24 Aug 2006)
 *java-config-1.3.1 (24 Aug 2006)
diff --git a/dev-java/java-config/files/digest-java-config-1.3.1-r1 b/dev-java/java-config/files/digest-java-config-1.3.1-r1
new file mode 100644
index 000000000000..feb8dba8370b
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-1.3.1-r1
@@ -0,0 +1,3 @@
+MD5 95d4a3851c34fc236ebc9ffcafe5ca8f java-config-1.3.1.tar.bz2 14732
+RMD160 5fd14ce884f6c6de83c899d25d73e779cf94e923 java-config-1.3.1.tar.bz2 14732
+SHA256 d23fe3f521e547eb319d8e04cd578a8803324c8fbff91b17567924a2c7f9f9ac java-config-1.3.1.tar.bz2 14732
diff --git a/dev-java/java-config/files/java-config-1.3.1-no20java.patch b/dev-java/java-config/files/java-config-1.3.1-no20java.patch
new file mode 100644
index 000000000000..a62c1fc5bbfd
--- /dev/null
+++ b/dev-java/java-config/files/java-config-1.3.1-no20java.patch
@@ -0,0 +1,11 @@
+diff -ru java-config-1.3.1-orig/java_config/jc_util.py java-config-1.3.1/java_config/jc_util.py
+--- java-config-1.3.1-orig/java_config/jc_util.py	2006-08-23 23:54:30.000000000 -0400
++++ java-config-1.3.1/java_config/jc_util.py	2006-08-24 20:26:25.000000000 -0400
+@@ -80,6 +80,7 @@
+ 		except:
+ 			continue
+ 		# Read VMHANDLE from /etc/env.d/20java
++		envVmHandle = ''
+ 		try:
+ 			fh = open('/etc/env.d/20java')
+ 			for line in fh.readlines():
diff --git a/dev-java/java-config/java-config-1.3.1-r1.ebuild b/dev-java/java-config/java-config-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..aa8b9ff36e5c
--- /dev/null
+++ b/dev-java/java-config/java-config-1.3.1-r1.ebuild
@@ -0,0 +1,39 @@
+# 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/java-config-1.3.1-r1.ebuild,v 1.1 2006/08/25 00:35:18 nichoj Exp $
+
+inherit base distutils eutils
+
+DESCRIPTION="Java environment configuration tool"
+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"
+IUSE=""
+
+RDEPEND="virtual/python
+	dev-java/java-config-wrapper"
+
+PATCHES="${FILESDIR}/${P}-no20java.patch"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${PATCHES}
+}
+src_install() {
+	distutils_src_install
+	newbin java-config java-config-1
+	doman java-config.1
+
+	doenvd 30java-finalclasspath
+}
+
+pkg_postinst() {
+	einfo "The way Java is handled on Gentoo has been recently updated."
+	einfo "If you have not done so already, you should follow the"
+	einfo "instructions available at:"
+	einfo "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
+}