Fix for java-nsplugin when there aren't any plugins installed.

Package-Manager: portage-2.1.1_pre2-r4

5 files changed, 88 insertions, 5 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 5cc912daaf30..f6e9fb51a726 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.96 2006/07/06 16:01:24 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.97 2006/07/16 19:14:37 nichoj Exp $
+
+*java-config-2.0.26-r4 (16 Jul 2006)
+
+  16 Jul 2006; Joshua Nichols <jnichols@gentoo.org>
+  +files/java-config-2.0.26-nsplugin_ls_stderr.patch,
+  +java-config-2.0.26-r4.ebuild:
+  Fix for java-nsplugin when there aren't any plugins installed.
 
 *java-config-2.0.26-r3 (06 Jul 2006)
 
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 9cbe1ba21639..50c387e83dd9 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -10,6 +10,10 @@ AUX java-config-2.0.26-nsplugin.patch 434 RMD160 0d996bc12aa193024195f0b80c9253e
 MD5 ba3724c8365d6c27b7018a5b8a179c09 files/java-config-2.0.26-nsplugin.patch 434
 RMD160 0d996bc12aa193024195f0b80c9253e15d1e093a files/java-config-2.0.26-nsplugin.patch 434
 SHA256 441fa41fc9601585c4e4e9b951414992fb72e97e19ed14b7da97d6cc6233a709 files/java-config-2.0.26-nsplugin.patch 434
+AUX java-config-2.0.26-nsplugin_ls_stderr.patch 429 RMD160 1588dbe44c87474875c7981d0504bf47e5241f6d SHA1 e3848ec57266aa14b5086af16c3e2ba124f5d118 SHA256 0efd77205613ed0303e12ef4adb6926df28f9bc53b716c3bd36a37ccdeb2fc42
+MD5 b5f10ef2a3daf81386e2299b2889b0b7 files/java-config-2.0.26-nsplugin_ls_stderr.patch 429
+RMD160 1588dbe44c87474875c7981d0504bf47e5241f6d files/java-config-2.0.26-nsplugin_ls_stderr.patch 429
+SHA256 0efd77205613ed0303e12ef4adb6926df28f9bc53b716c3bd36a37ccdeb2fc42 files/java-config-2.0.26-nsplugin_ls_stderr.patch 429
 AUX java-config-2.0.26-set_number.patch 494 RMD160 cded53243b836673d7447dc1a6df978e6c5124f9 SHA1 eb7cccad59e4005b9d95c008225b9418b68e1b60 SHA256 3f7b349243126a767f3234a2ec2ac770918b2300194a157609e3a84f7f73a642
 MD5 057b41e43da76870b233acfdc1e29fb9 files/java-config-2.0.26-set_number.patch 494
 RMD160 cded53243b836673d7447dc1a6df978e6c5124f9 files/java-config-2.0.26-set_number.patch 494
@@ -29,10 +33,14 @@ EBUILD java-config-2.0.26-r3.ebuild 1403 RMD160 5541bdd42fe0af594d093ad31835c67b
 MD5 76688dcb188814050aacdc9d8d49c189 java-config-2.0.26-r3.ebuild 1403
 RMD160 5541bdd42fe0af594d093ad31835c67bba1d8771 java-config-2.0.26-r3.ebuild 1403
 SHA256 4b69a007cad0ac10b4d5ef4cc5232940ce8d37b68ebfd2b8d04f94c20532df90 java-config-2.0.26-r3.ebuild 1403
-MISC ChangeLog 15678 RMD160 f316bea168bbb93198d21515204d07adaa86e187 SHA1 7f16eeec084d735f2a7ed7019702579ccbb1f053 SHA256 091a745d10490667fb953b7ebde4641a40eb06a2dd75216871ad04473af2aa49
-MD5 b4443baff11e9cbf35a0d648e4c38794 ChangeLog 15678
-RMD160 f316bea168bbb93198d21515204d07adaa86e187 ChangeLog 15678
-SHA256 091a745d10490667fb953b7ebde4641a40eb06a2dd75216871ad04473af2aa49 ChangeLog 15678
+EBUILD java-config-2.0.26-r4.ebuild 1448 RMD160 432c0cf281cb5d1f7a2df5a4bf6cf6a7913858a7 SHA1 6ebd987cf13f977689ae96217bc1e791294b94c8 SHA256 e18b65ab5688941105041eee86e0847755ae942217fc41daa62b78c63b835de5
+MD5 1dd47d1d8ba94d93c1fcd09b57bfc4f6 java-config-2.0.26-r4.ebuild 1448
+RMD160 432c0cf281cb5d1f7a2df5a4bf6cf6a7913858a7 java-config-2.0.26-r4.ebuild 1448
+SHA256 e18b65ab5688941105041eee86e0847755ae942217fc41daa62b78c63b835de5 java-config-2.0.26-r4.ebuild 1448
+MISC ChangeLog 15921 RMD160 0b0049d55df668b45de0870b7f68cd3ad6f7779d SHA1 06d729a5cb22283bf735e7a6680f3821c1a54e47 SHA256 eefd8b0662ba9ecb3716bb0409db3d2d4183b9c31b1f3d63fe4697e09e47030e
+MD5 b947cdc08eddbc3763f9d974068aeec7 ChangeLog 15921
+RMD160 0b0049d55df668b45de0870b7f68cd3ad6f7779d ChangeLog 15921
+SHA256 eefd8b0662ba9ecb3716bb0409db3d2d4183b9c31b1f3d63fe4697e09e47030e ChangeLog 15921
 MISC metadata.xml 486 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 SHA1 1561f2727694d8312adbda18294f690116ab3c84 SHA256 5d3e4a1780efad67e6265b82a4397a2b4fe26c2c0785ee65a3390dd8218c82ce
 MD5 ff83dbd41edf207798f367c723ab813f metadata.xml 486
 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 metadata.xml 486
@@ -46,3 +54,6 @@ SHA256 8e829d236fd6326f55c2679229926adcba694b4a8f19387bfbb731dc6be1da67 files/di
 MD5 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26-r3 256
 RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26-r3 256
 SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26-r3 256
+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
diff --git a/dev-java/java-config/files/digest-java-config-2.0.26-r4 b/dev-java/java-config/files/digest-java-config-2.0.26-r4
new file mode 100644
index 000000000000..56c0f4186bc9
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-2.0.26-r4
@@ -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-2.0.26-nsplugin_ls_stderr.patch b/dev-java/java-config/files/java-config-2.0.26-nsplugin_ls_stderr.patch
new file mode 100644
index 000000000000..97b8f629b891
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.0.26-nsplugin_ls_stderr.patch
@@ -0,0 +1,13 @@
+Index: src/eselect/java-nsplugin.eselect
+===================================================================
+--- src/eselect/java-nsplugin.eselect	(revision 2466)
++++ src/eselect/java-nsplugin.eselect	(working copy)
+@@ -96,7 +96,7 @@
+ ## }}}
+ 
+ get_targets() {
+-	for plugin in $(ls ${PLUGINS_HOME}/*-javaplugin.so);
++	for plugin in $(ls ${PLUGINS_HOME}/*-javaplugin.so 2>/dev/null);
+ 	do
+ 		echo $(plugin_to_vm ${plugin})
+ 	done
diff --git a/dev-java/java-config/java-config-2.0.26-r4.ebuild b/dev-java/java-config/java-config-2.0.26-r4.ebuild
new file mode 100644
index 000000000000..47b4a0a7e778
--- /dev/null
+++ b/dev-java/java-config/java-config-2.0.26-r4.ebuild
@@ -0,0 +1,49 @@
+# 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-r4.ebuild,v 1.1 2006/07/16 19:14:37 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"
+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"
+
+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_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"
+}