Fixed a stacktrace that occurs when trying to set the system vm.

(Portage version: 2.1.1_rc1-r2)

4 files changed, 67 insertions, 1 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index d17b6cb6519c..cdcb3011a8a6 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.111 2006/09/06 03:15:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.112 2006/09/06 13:03:55 nichoj Exp $
+
+*java-config-1.3.5-r1 (06 Sep 2006)
+
+  06 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/java-config-1.3.5-javahomestacktrace.patch,
+  +java-config-1.3.5-r1.ebuild:
+  Fixed a stacktrace that occurs when trying to set the system vm.
 
 *java-config-1.3.5 (06 Sep 2006)
 
diff --git a/dev-java/java-config/files/digest-java-config-1.3.5-r1 b/dev-java/java-config/files/digest-java-config-1.3.5-r1
new file mode 100644
index 000000000000..98ac8fc1c42a
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-1.3.5-r1
@@ -0,0 +1,3 @@
+MD5 901b1246328c2a7dfabfa97dbbdd090e java-config-1.3.5.tar.bz2 14958
+RMD160 92cdcdd12ef5f4bee5d2a170e426f2c2353be3d9 java-config-1.3.5.tar.bz2 14958
+SHA256 2e9e3ecdd3049b8b3f8783af49856083da7e8588807bbfb8fa31cc76e73ec605 java-config-1.3.5.tar.bz2 14958
diff --git a/dev-java/java-config/files/java-config-1.3.5-javahomestacktrace.patch b/dev-java/java-config/files/java-config-1.3.5-javahomestacktrace.patch
new file mode 100644
index 000000000000..a4c9a3fc35d9
--- /dev/null
+++ b/dev-java/java-config/files/java-config-1.3.5-javahomestacktrace.patch
@@ -0,0 +1,16 @@
+diff -ru java-config-1.3.5-orig/java_config/jc_util.py java-config-1.3.5/java_config/jc_util.py
+--- java-config-1.3.5-orig/java_config/jc_util.py	2006-09-06 08:52:24.000000000 -0400
++++ java-config-1.3.5/java_config/jc_util.py	2006-09-06 08:56:53.000000000 -0400
+@@ -104,10 +104,10 @@
+ 	can't be found
+ 	"""
+ 
+-	jh = JAVA_HOME
+-
+ 	if java_home is not None:
+ 		jh = java_home
++	else:
++		jh = get_java_home()
+ 
+ 	exec_0 = jh+'/bin/'+exe
+ 	exec_1 = jh+'/jre/bin/'+exe
diff --git a/dev-java/java-config/java-config-1.3.5-r1.ebuild b/dev-java/java-config/java-config-1.3.5-r1.ebuild
new file mode 100644
index 000000000000..84aa701f1aed
--- /dev/null
+++ b/dev-java/java-config/java-config-1.3.5-r1.ebuild
@@ -0,0 +1,40 @@
+# 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.5-r1.ebuild,v 1.1 2006/09/06 13:03:55 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="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="virtual/python
+	dev-java/java-config-wrapper"
+
+PATCHES="${FILESDIR}/${P}-javahomestacktrace.patch"
+
+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 "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml"
+	echo
+	einfo "While we moving towards the new Java system, we only allow"
+	einfo "1.3 or 1.4 JDKs to be used with java-config-1 to ensure"
+	einfo "backwards compatibility with the old system."
+	einfo "For more details about this, please see:"
+	einfo "\thttps://overlays.gentoo.org/proj/java/wiki/Why_We_Need_Java14"
+}