Version bumps.

(Portage version: 2.1.1_pre1)

6 files changed, 96 insertions, 1 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 67301a411a23..e67fcef0b196 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,9 @@
 # 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.87 2006/06/03 18:31:42 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.88 2006/06/25 00:31:41 nichoj Exp $
+
+  25 Jun 2006; <nichoj@gentoo.org> +files/java-config-1.3.0-regexp.patch:
+  Version bumps.
 
   03 Jun 2006; Guy Martin <gmsoft@gentoo.org> java-config-1.2.11-r1.ebuild:
   Removing hppa KEYWORDS. HPPA will not support java anymore.
diff --git a/dev-java/java-config/files/digest-java-config-1.3.0-r2 b/dev-java/java-config/files/digest-java-config-1.3.0-r2
new file mode 100644
index 000000000000..55c0dd946ff4
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-1.3.0-r2
@@ -0,0 +1,3 @@
+MD5 9e9d61bf5b5b84be059e3efee6050bae java-config-1.3.0.tar.bz2 14287
+RMD160 f46ef41b9bb8ee5014cc1c870818db16d2e407de java-config-1.3.0.tar.bz2 14287
+SHA256 445aa68cbd34eb63122a9f339c275b97b06739d644c104a55371c2a16798b8a8 java-config-1.3.0.tar.bz2 14287
diff --git a/dev-java/java-config/files/digest-java-config-2.0.24 b/dev-java/java-config/files/digest-java-config-2.0.24
new file mode 100644
index 000000000000..c0db1669d8d9
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-2.0.24
@@ -0,0 +1,3 @@
+MD5 7141652028f64ecbe5f64c54a5042849 java-config-2.0.24.tar.bz2 14724
+RMD160 162b8cc49ba5372e557dad90f79cd04a6c8d77f0 java-config-2.0.24.tar.bz2 14724
+SHA256 35214935e6ccfa3091cb656762bbac45c7a3caca907a2b4fc50183090c0fc1d1 java-config-2.0.24.tar.bz2 14724
diff --git a/dev-java/java-config/files/java-config-1.3.0-regexp.patch b/dev-java/java-config/files/java-config-1.3.0-regexp.patch
new file mode 100644
index 000000000000..fc25c37d9fb4
--- /dev/null
+++ b/dev-java/java-config/files/java-config-1.3.0-regexp.patch
@@ -0,0 +1,14 @@
+diff -ru java-config-1.3.0-orig/java_config/jc_util.py java-config-1.3.0/java_config/jc_util.py
+--- java-config-1.3.0-orig/java_config/jc_util.py	2006-04-12 21:04:04.000000000 -0400
++++ java-config-1.3.0/java_config/jc_util.py	2006-04-12 21:04:53.000000000 -0400
+@@ -23,8 +23,9 @@
+ 
+ 	fp = open(fn)
+ 	rStr = _get_line_from_env_file(query, fp)
+-	rStr = re.sub("\"", "", rStr)
+ 	fp.close()
++	if rStr != None:
++		rStr = re.sub("\"", "", rStr)
+ 
+ 	return rStr
+ 
diff --git a/dev-java/java-config/java-config-1.3.0-r2.ebuild b/dev-java/java-config/java-config-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..dd9baaf20fda
--- /dev/null
+++ b/dev-java/java-config/java-config-1.3.0-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/java-config-1.3.0-r2.ebuild,v 1.1 2006/06/25 00:31:41 nichoj 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="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/python
+	~dev-java/java-config-wrapper"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-regexp.patch
+}
+
+src_install() {
+	distutils_src_install
+	newbin java-config java-config-1
+	doman java-config.1
+
+	doenvd 30java-finalclasspath
+}
diff --git a/dev-java/java-config/java-config-2.0.24.ebuild b/dev-java/java-config/java-config-2.0.24.ebuild
new file mode 100644
index 000000000000..bad2e9a3a7c8
--- /dev/null
+++ b/dev-java/java-config/java-config-2.0.24.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 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.0.24.ebuild,v 1.1 2006/06/25 00:31:41 nichoj 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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/python"
+RDEPEND="virtual/python
+	~dev-java/java-config-wrapper"
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/java-config-2/config/
+	for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86; do
+		if use ${i}; then
+			newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch	config not found"
+		fi
+	done
+
+	for tool in $(< config/symlink-tools); do
+		dosym /usr/bin/run-java-tool /usr/bin/${tool}
+	done
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/java-config-2/pym/java_config
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/java-config-2/pym/java_config
+}