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

(Portage version: 2.1.1_pre2-r4)

4 files changed, 73 insertions, 1 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/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"
+}