Rev bump java-config to fix SyntaxError that occurs with python2.4

(Portage version: 2.1.3.12)

4 files changed, 76 insertions, 1 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 5d156ab6a423..b7dc0e68e453 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.174 2007/10/13 20:29:01 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.175 2007/10/14 07:45:00 ali_bush Exp $
+
+*java-config-2.1.2-r1 (14 Oct 2007)
+
+  14 Oct 2007; <alistair@gentoo.org> +files/java-config-2.1.2-r1.patch,
+  +java-config-2.1.2-r1.ebuild:
+  Fixed SyntaxError that occurs with python2.4 which is currently stable.
+  Issue doesn't appear in 2.5.
 
 *java-config-2.1.2 (13 Oct 2007)
 
diff --git a/dev-java/java-config/files/digest-java-config-2.1.2-r1 b/dev-java/java-config/files/digest-java-config-2.1.2-r1
new file mode 100644
index 000000000000..bb43880110eb
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-2.1.2-r1
@@ -0,0 +1,3 @@
+MD5 e7a1b8fc8173b52d77c2459c6243cd48 java-config-2.1.2.tar.bz2 21333
+RMD160 8e8f16e4ce2da5991853e15ca07f0c8bd4c3ee6d java-config-2.1.2.tar.bz2 21333
+SHA256 c639085040aab839abb9ef46da8713390173d7c021568b4a43c90530ae630b29 java-config-2.1.2.tar.bz2 21333
diff --git a/dev-java/java-config/files/java-config-2.1.2-r1.patch b/dev-java/java-config/files/java-config-2.1.2-r1.patch
new file mode 100644
index 000000000000..4c644c26d182
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.1.2-r1.patch
@@ -0,0 +1,12 @@
+--- tags/2.1.2/src/java_config_2/EnvironmentManager.py	2007-10-14 16:00:23.000000000 +1300
++++ src/java_config_2/EnvironmentManager.py	2007-10-14 20:22:03.000000000 +1300
+@@ -36,8 +36,7 @@
+             self.load_active_vm()
+         except InvalidVMError:
+             pass
+-        finally:
+-            pass
++        pass
+ 
+     def __call__(self):
+         return self
diff --git a/dev-java/java-config/java-config-2.1.2-r1.ebuild b/dev-java/java-config/java-config-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..4882e25cf9de
--- /dev/null
+++ b/dev-java/java-config/java-config-2.1.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.2-r1.ebuild,v 1.1 2007/10/14 07:45:00 ali_bush Exp $
+
+inherit 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="2"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+	>=dev-java/java-config-wrapper-0.13"
+
+PYTHON_MODNAME="java_config_2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PF}.patch"
+}
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/java-config-2/config/
+	newins config/jdk-defaults-${ARCH}.conf jdk-defaults.conf || die "arch config not found"
+}
+
+pkg_postrm() {
+	distutils_python_version
+	distutils_pkg_postrm
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog "The way Java is handled on Gentoo has been recently updated."
+	elog "If you have not done so already, you should follow the"
+	elog "instructions available at:"
+	elog "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml"
+	elog
+	elog "While we are moving towards the new Java system, we only allow"
+	elog "1.3 or 1.4 JDKs to be used with java-config-1 to ensure"
+	elog "backwards compatibility with the old system."
+	elog "For more details about this, please see:"
+	elog "\thttp://www.gentoo.org/proj/en/java/why-we-need-java-14.xml"
+}