Version bumps. java-config-1 has been patched to read VMHANDLE from environment instead of JAVA_HOME. java-config-2 now installs a profile.d entry that sets JAVA_HOME appropriate, ie it is no longer set to generation-1 system vm. This is work towards bug #139889

Package-Manager: portage-2.1.1_pre4

8 files changed, 188 insertions, 5 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index bed46d79a7f4..d8984abc4bc8 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,17 @@
 # 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.100 2006/07/29 20:27:17 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.101 2006/08/03 02:13:58 nichoj Exp $
+
+*java-config-2.0.26-r6 (03 Aug 2006)
+*java-config-1.3.0-r3 (03 Aug 2006)
+
+  03 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/java-config-1.3.0-JAVA_HOME.patch, +files/java-config-2.profiled,
+  +java-config-1.3.0-r3.ebuild, +java-config-2.0.26-r6.ebuild:
+  Version bumps. java-config-1 has been patched to read VMHANDLE from
+  environment instead of JAVA_HOME. java-config-2 now installs a profile.d
+  entry that sets JAVA_HOME appropriate, ie it is no longer set to
+  generation-1 system vm. This is work towards bug #139889
 
 *java-config-2.0.26-r5 (29 Jul 2006)
 
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 58050be669de..39c504e935f2 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -2,6 +2,10 @@ AUX java-config-1.2.11-shebang.patch 229 RMD160 e201dafad76307123139861371ade56f
 MD5 882665d94cc943f315ec729d990afadf files/java-config-1.2.11-shebang.patch 229
 RMD160 e201dafad76307123139861371ade56f03887342 files/java-config-1.2.11-shebang.patch 229
 SHA256 4068a51515b7510260de57a5872d6e04b1a33d2f9728d77ed00fe7f41cced83a files/java-config-1.2.11-shebang.patch 229
+AUX java-config-1.3.0-JAVA_HOME.patch 1277 RMD160 64f39d6ad1ef68675edf7e1a31fdc3e4e7a73b1f SHA1 5fb76fb6726a71efcf43a8311bc2dd563ac2bc46 SHA256 e7a63568e6ad2df96f5d3eefe350e147b9449ce14abd76581eb1f672bbb6755c
+MD5 dab2bb721abf71ce9be519eb18025aba files/java-config-1.3.0-JAVA_HOME.patch 1277
+RMD160 64f39d6ad1ef68675edf7e1a31fdc3e4e7a73b1f files/java-config-1.3.0-JAVA_HOME.patch 1277
+SHA256 e7a63568e6ad2df96f5d3eefe350e147b9449ce14abd76581eb1f672bbb6755c files/java-config-1.3.0-JAVA_HOME.patch 1277
 AUX java-config-1.3.0-regexp.patch 458 RMD160 4607b8762440279cc1caf989b1f8e03a66671d3b SHA1 92e4c6407eac0ed162cbe84ca47164e6b638299f SHA256 d5bacfb6a95f934ec4c0e19d6956c439801813dc8a6873c50bdb4d9d083299b8
 MD5 f315e41a6e740028b2a7b3f61f742507 files/java-config-1.3.0-regexp.patch 458
 RMD160 4607b8762440279cc1caf989b1f8e03a66671d3b files/java-config-1.3.0-regexp.patch 458
@@ -22,6 +26,10 @@ AUX java-config-2.0.26-set_number.patch 494 RMD160 cded53243b836673d7447dc1a6df9
 MD5 057b41e43da76870b233acfdc1e29fb9 files/java-config-2.0.26-set_number.patch 494
 RMD160 cded53243b836673d7447dc1a6df978e6c5124f9 files/java-config-2.0.26-set_number.patch 494
 SHA256 3f7b349243126a767f3234a2ec2ac770918b2300194a157609e3a84f7f73a642 files/java-config-2.0.26-set_number.patch 494
+AUX java-config-2.profiled 613 RMD160 7a2e65d2f5648d11b9fd8d1112505d87c591b0a2 SHA1 15765fa6d47884403f2ab3fe25e72b2a2f57ad15 SHA256 73b48e18fc6af920195a033f869e81202bfc09aa6f96be4a592148999a19eea5
+MD5 fad7e6d3b705f7212379a66620f4ba63 files/java-config-2.profiled 613
+RMD160 7a2e65d2f5648d11b9fd8d1112505d87c591b0a2 files/java-config-2.profiled 613
+SHA256 73b48e18fc6af920195a033f869e81202bfc09aa6f96be4a592148999a19eea5 files/java-config-2.profiled 613
 DIST java-config-1.2.11.tar.bz2 15743 RMD160 e1175474e87f234f9428d7db6827a3a4435e6aba SHA1 fd2ffdda515005ef7a9358b650f59674c13bc0b7 SHA256 f17bdce2b97dca14daf77dbefb6d6c0935fbc444b67e9a0d7cc68538575a6b83
 DIST java-config-1.3.0.tar.bz2 14287 RMD160 f46ef41b9bb8ee5014cc1c870818db16d2e407de SHA1 0fe44df00cc2f622e95b1b2f2e79b34f6ff662e4 SHA256 445aa68cbd34eb63122a9f339c275b97b06739d644c104a55371c2a16798b8a8
 DIST java-config-2.0.26.tar.bz2 15298 RMD160 9f6724af6c6d274c02171aab992e9165e5abc738 SHA1 96b8a824a235e201f60e6983b65ea995e3c13ac4 SHA256 03e828568b5f965a59a2db57597d1b45e14ba8e89acca65d3082fb7ee4ef578c
@@ -33,6 +41,10 @@ EBUILD java-config-1.3.0-r2.ebuild 1014 RMD160 b1b706b3d26cbe99359747e17ddb895a6
 MD5 6f38ed96b900b83b2cd5ffa3cb2c7c3c java-config-1.3.0-r2.ebuild 1014
 RMD160 b1b706b3d26cbe99359747e17ddb895a6fe84aff java-config-1.3.0-r2.ebuild 1014
 SHA256 f823a5d5ef5ee33b87c801531db0086fc938d2d3cb026f62c27b3855ce46c852 java-config-1.3.0-r2.ebuild 1014
+EBUILD java-config-1.3.0-r3.ebuild 1052 RMD160 45de1361b9daa7b874fe209c76b741780f42643d SHA1 5cccb9870fe40388ee5b9746713a739d660ff370 SHA256 13e8e03febfcf949f7c330d5c88d60d38a39af675370135d14f9e6cc9c86d7f6
+MD5 4f54d4c71dce0943a8c874eabeec5426 java-config-1.3.0-r3.ebuild 1052
+RMD160 45de1361b9daa7b874fe209c76b741780f42643d java-config-1.3.0-r3.ebuild 1052
+SHA256 13e8e03febfcf949f7c330d5c88d60d38a39af675370135d14f9e6cc9c86d7f6 java-config-1.3.0-r3.ebuild 1052
 EBUILD java-config-2.0.26-r4.ebuild 1461 RMD160 3ecea43dae29ad96f262f6b2a6d39e9ffcccf72e SHA1 f15cb600c0cdadac6e0067a61ec095b96d49f000 SHA256 9f4c11cb2823f6f04262b82f0108575b33f70c6d42798b17ce55d8c2804cce03
 MD5 e65d175ebfc52b16505026b90f6ceada java-config-2.0.26-r4.ebuild 1461
 RMD160 3ecea43dae29ad96f262f6b2a6d39e9ffcccf72e java-config-2.0.26-r4.ebuild 1461
@@ -41,10 +53,14 @@ EBUILD java-config-2.0.26-r5.ebuild 1493 RMD160 d67fe71fa3016d70d554d4078dbd4a67
 MD5 3113226a8cb8c648d4ef63015684330f java-config-2.0.26-r5.ebuild 1493
 RMD160 d67fe71fa3016d70d554d4078dbd4a679dc954e1 java-config-2.0.26-r5.ebuild 1493
 SHA256 ad914afc548b39c94b5dbc88485414eaabd89d4b61e36c1a7560f383cad4abfc java-config-2.0.26-r5.ebuild 1493
-MISC ChangeLog 16419 RMD160 15148d91660a24e6fa5b39d30f92f47f8f92c491 SHA1 13aff8f9e71f6dee858d01f66425d5b30ed95767 SHA256 b98fef823900090e440d4435fe93140c5290a9c95cb40137e001c2b35ea08899
-MD5 151f73f2e89b05b55262020406a0481c ChangeLog 16419
-RMD160 15148d91660a24e6fa5b39d30f92f47f8f92c491 ChangeLog 16419
-SHA256 b98fef823900090e440d4435fe93140c5290a9c95cb40137e001c2b35ea08899 ChangeLog 16419
+EBUILD java-config-2.0.26-r6.ebuild 1643 RMD160 4c68f3c0baebe017c27cfcdc02b1259dd3b22203 SHA1 fbcd3390d05d198fb2e1319fd55e70220805614e SHA256 8c868f592198eac2860189e8a9e9aac0b7e28f779b202e63f9180dcf059161a0
+MD5 0e85392a060528e992877600bc961c8e java-config-2.0.26-r6.ebuild 1643
+RMD160 4c68f3c0baebe017c27cfcdc02b1259dd3b22203 java-config-2.0.26-r6.ebuild 1643
+SHA256 8c868f592198eac2860189e8a9e9aac0b7e28f779b202e63f9180dcf059161a0 java-config-2.0.26-r6.ebuild 1643
+MISC ChangeLog 16953 RMD160 e2e71f09fc78aa972f20d369d013b98d95eb231a SHA1 9efd2e345f22ec0edd8a43c1f00dfb125bfe36ee SHA256 afb5e939cb50aaa40afc59770d3d4b8e9f4c65d3801da672f5f09a0039497fcf
+MD5 98b15007d63830ab7f78517b6f2aa87a ChangeLog 16953
+RMD160 e2e71f09fc78aa972f20d369d013b98d95eb231a ChangeLog 16953
+SHA256 afb5e939cb50aaa40afc59770d3d4b8e9f4c65d3801da672f5f09a0039497fcf ChangeLog 16953
 MISC metadata.xml 486 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 SHA1 1561f2727694d8312adbda18294f690116ab3c84 SHA256 5d3e4a1780efad67e6265b82a4397a2b4fe26c2c0785ee65a3390dd8218c82ce
 MD5 ff83dbd41edf207798f367c723ab813f metadata.xml 486
 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 metadata.xml 486
@@ -55,9 +71,15 @@ SHA256 da2af16dd2d187eb5301706d751663c290362f05f8a84eed14ecf5c21284c7da files/di
 MD5 43fb58eb5b3d48f906399c953fc29651 files/digest-java-config-1.3.0-r2 253
 RMD160 6ccd4638f2a01e9f60536a2d2d76be5a404a97fc files/digest-java-config-1.3.0-r2 253
 SHA256 8e829d236fd6326f55c2679229926adcba694b4a8f19387bfbb731dc6be1da67 files/digest-java-config-1.3.0-r2 253
+MD5 43fb58eb5b3d48f906399c953fc29651 files/digest-java-config-1.3.0-r3 253
+RMD160 6ccd4638f2a01e9f60536a2d2d76be5a404a97fc files/digest-java-config-1.3.0-r3 253
+SHA256 8e829d236fd6326f55c2679229926adcba694b4a8f19387bfbb731dc6be1da67 files/digest-java-config-1.3.0-r3 253
 MD5 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26-r4 256
 RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26-r4 256
 SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26-r4 256
 MD5 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26-r5 256
 RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26-r5 256
 SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26-r5 256
+MD5 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26-r6 256
+RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26-r6 256
+SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26-r6 256
diff --git a/dev-java/java-config/files/digest-java-config-1.3.0-r3 b/dev-java/java-config/files/digest-java-config-1.3.0-r3
new file mode 100644
index 000000000000..55c0dd946ff4
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-1.3.0-r3
@@ -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.26-r6 b/dev-java/java-config/files/digest-java-config-2.0.26-r6
new file mode 100644
index 000000000000..56c0f4186bc9
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-2.0.26-r6
@@ -0,0 +1,3 @@
+MD5 60221d65176ceb2e2ef4edf7c1724ad0 java-config-2.0.26.tar.bz2 15298
+RMD160 9f6724af6c6d274c02171aab992e9165e5abc738 java-config-2.0.26.tar.bz2 15298
+SHA256 03e828568b5f965a59a2db57597d1b45e14ba8e89acca65d3082fb7ee4ef578c java-config-2.0.26.tar.bz2 15298
diff --git a/dev-java/java-config/files/java-config-1.3.0-JAVA_HOME.patch b/dev-java/java-config/files/java-config-1.3.0-JAVA_HOME.patch
new file mode 100644
index 000000000000..fee8092c734b
--- /dev/null
+++ b/dev-java/java-config/files/java-config-1.3.0-JAVA_HOME.patch
@@ -0,0 +1,38 @@
+Files java-config-1.3.0.vanilla/java_config/jc_exceptions.pyc and java-config-1.3.0/java_config/jc_exceptions.pyc differ
+Files java-config-1.3.0.vanilla/java_config/jc_output.pyc and java-config-1.3.0/java_config/jc_output.pyc differ
+diff -Nru java-config-1.3.0.vanilla/java_config/jc_util.py java-config-1.3.0/java_config/jc_util.py
+--- java-config-1.3.0.vanilla/java_config/jc_util.py	2006-08-03 01:32:30.000000000 +0200
++++ java-config-1.3.0/java_config/jc_util.py	2006-08-03 01:50:33.000000000 +0200
+@@ -66,8 +66,31 @@
+ get_jvm_env_var.user_env_dir = os.path.join(env.get('HOME', 'THERE_IS_NO_HOME'), '.gentoo')
+ 
+ def get_java_home():
++	for f in os.listdir('/etc/env.d/java/'):
++		vmHandle = ''
++		try:
++			fh = open('/etc/env.d/java/' + f, 'r')
++			for line in fh.readlines():
++				line = line.strip()
++				if line[0:8] == 'VMHANDLE':
++					vmHandle = line[10:-1]
++					break
++			fh.close()
++		except:
++			continue
++		if vmHandle == os.environ['VMHANDLE']:
++			try:
++				fh = open('/etc/env.d/java/' + f, 'r')
++				for line in fh.readlines():
++					line = line.strip()
++					if line[0:9] == 'JAVA_HOME':
++						return line[10:]
++						break
++				fh.close()
++			except:
++				continue
+ 
+-	return get_jvm_env_var ('JAVA_HOME')
++	return None
+ 
+ 
+ JAVA_HOME = get_java_home()
diff --git a/dev-java/java-config/files/java-config-2.profiled b/dev-java/java-config/files/java-config-2.profiled
new file mode 100644
index 000000000000..130ff8504507
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.profiled
@@ -0,0 +1,12 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled,v 1.1 2006/08/03 02:13:58 nichoj Exp $
+
+# If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
+if [[ ${UID} != 0 && -L $HOME/.gentoo/java-config-2/current-user-vm ]]; then
+  export JAVA_HOME=$HOME/.gentoo/java-config-2/current-user-vm
+# Otherwise set to the current system vm
+elif [[ -L /etc/java-config-2/current-system-vm ]]; then
+  export JAVA_HOME=/etc/java-config-2/current-system-vm
+fi
+#
diff --git a/dev-java/java-config/java-config-1.3.0-r3.ebuild b/dev-java/java-config/java-config-1.3.0-r3.ebuild
new file mode 100644
index 000000000000..0017ff427cc6
--- /dev/null
+++ b/dev-java/java-config/java-config-1.3.0-r3.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.0-r3.ebuild,v 1.1 2006/08/03 02:13:58 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 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="virtual/python
+	dev-java/java-config-wrapper"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-regexp.patch
+	epatch ${FILESDIR}/${P}-JAVA_HOME.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 "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
+}
diff --git a/dev-java/java-config/java-config-2.0.26-r6.ebuild b/dev-java/java-config/java-config-2.0.26-r6.ebuild
new file mode 100644
index 000000000000..94da4420118d
--- /dev/null
+++ b/dev-java/java-config/java-config-2.0.26-r6.ebuild
@@ -0,0 +1,55 @@
+# 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-2.0.26-r6.ebuild,v 1.1 2006/08/03 02:13:58 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="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="virtual/python"
+RDEPEND="virtual/python
+	dev-java/java-config-wrapper"
+
+PATCHES="${FILESDIR}/${P}-nsplugin.patch ${FILESDIR}/${P}-set_number.patch \
+	${FILESDIR}/${P}-nsplugin_ls_stderr.patch \
+	${FILESDIR}/${P}-jconsole.patch"
+
+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
+
+	# Install profile.d for setting JAVA_HOME
+	dodir /etc/profile.d
+	exeinto /etc/profile.d
+	newexe ${FILESDIR}/${PN}-${SLOT}.profiled ${PN}-${SLOT}.sh
+}
+
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/java-config-2/pym/java_config
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/java-config-2/pym/java_config
+	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"
+}