Fix to java-nsplugin.eselect, so that it shows the right plugin as being current

(Portage version: 2.1.1_pre1)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 62 deletions

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index f226c37f18cd..5a336416a370 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -6,6 +6,10 @@ AUX java-config-1.3.0-regexp.patch 458 RMD160 4607b8762440279cc1caf989b1f8e03a66
 MD5 f315e41a6e740028b2a7b3f61f742507 files/java-config-1.3.0-regexp.patch 458
 RMD160 4607b8762440279cc1caf989b1f8e03a66671d3b files/java-config-1.3.0-regexp.patch 458
 SHA256 d5bacfb6a95f934ec4c0e19d6956c439801813dc8a6873c50bdb4d9d083299b8 files/java-config-1.3.0-regexp.patch 458
+AUX java-config-2.0.26-nsplugin.patch 434 RMD160 0d996bc12aa193024195f0b80c9253e15d1e093a SHA1 330d7685840b11c78d80da12da5e3810932de419 SHA256 441fa41fc9601585c4e4e9b951414992fb72e97e19ed14b7da97d6cc6233a709
+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
 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
@@ -17,14 +21,14 @@ EBUILD java-config-1.3.0-r2.ebuild 1001 RMD160 7ca9ab07253a977c15065e91ed21aaf11
 MD5 018240958b15bc966672fec3a0056828 java-config-1.3.0-r2.ebuild 1001
 RMD160 7ca9ab07253a977c15065e91ed21aaf11ae9057c java-config-1.3.0-r2.ebuild 1001
 SHA256 f55317c135b328f0b17f19186fccf2d25e71461900298dca2f04f761fb681b62 java-config-1.3.0-r2.ebuild 1001
-EBUILD java-config-2.0.26.ebuild 1337 RMD160 93dbd92483cee6fc7a510e99459d5ca5e057e53a SHA1 282e488c27eecb5ed3e2178625e3caed13cc39c9 SHA256 d708a336fb39b39f5fed60177cda818d308ec530ac7eeb11a6e46b1fc4207fa4
-MD5 d04c197ff74f32bf01100169cdfed0b5 java-config-2.0.26.ebuild 1337
-RMD160 93dbd92483cee6fc7a510e99459d5ca5e057e53a java-config-2.0.26.ebuild 1337
-SHA256 d708a336fb39b39f5fed60177cda818d308ec530ac7eeb11a6e46b1fc4207fa4 java-config-2.0.26.ebuild 1337
-MISC ChangeLog 14944 RMD160 046e837cd6114f1ace9b725a18beca8e94e2b2a7 SHA1 fb595553d25e74e09001afcf0996a1882f955453 SHA256 6fe2e1a6f2da33196a49fbfa48c809771ebf09498857fa055b65c3e30cd2af94
-MD5 0f61feb751619770bbb7fa58a691cd01 ChangeLog 14944
-RMD160 046e837cd6114f1ace9b725a18beca8e94e2b2a7 ChangeLog 14944
-SHA256 6fe2e1a6f2da33196a49fbfa48c809771ebf09498857fa055b65c3e30cd2af94 ChangeLog 14944
+EBUILD java-config-2.0.26-r1.ebuild 1388 RMD160 0f2d48f0018071ba6d3409dc8644cd91dff01c65 SHA1 3f19242871eee59257f0f5600ed84681156f2704 SHA256 2b8070f6560f27b4519a52cfd3342a87e9286df132291a5d9460296179cf3a6f
+MD5 fd6693c1a6e63049769d85a8b3a771fa java-config-2.0.26-r1.ebuild 1388
+RMD160 0f2d48f0018071ba6d3409dc8644cd91dff01c65 java-config-2.0.26-r1.ebuild 1388
+SHA256 2b8070f6560f27b4519a52cfd3342a87e9286df132291a5d9460296179cf3a6f java-config-2.0.26-r1.ebuild 1388
+MISC ChangeLog 15223 RMD160 f2faa5940b37efd1c0e986e9cb38ed9b2f62a348 SHA1 81ea3bf2a2c95b17be294a682f62604d5ebf01e3 SHA256 6b84be14245a4279f05d476e9297ee72bbf730e998f285443e7630e9b14f71e2
+MD5 4c75fc1037b0db41ec0416533946fcbd ChangeLog 15223
+RMD160 f2faa5940b37efd1c0e986e9cb38ed9b2f62a348 ChangeLog 15223
+SHA256 6b84be14245a4279f05d476e9297ee72bbf730e998f285443e7630e9b14f71e2 ChangeLog 15223
 MISC metadata.xml 486 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 SHA1 1561f2727694d8312adbda18294f690116ab3c84 SHA256 5d3e4a1780efad67e6265b82a4397a2b4fe26c2c0785ee65a3390dd8218c82ce
 MD5 ff83dbd41edf207798f367c723ab813f metadata.xml 486
 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 metadata.xml 486
@@ -35,6 +39,6 @@ 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 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26 256
-RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26 256
-SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26 256
+MD5 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26-r1 256
+RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26-r1 256
+SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26-r1 256
diff --git a/dev-java/java-config/files/digest-java-config-2.0.26 b/dev-java/java-config/files/digest-java-config-2.0.26
deleted file mode 100644
index 56c0f4186bc9..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.26
+++ /dev/null
@@ -1,3 +0,0 @@
-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/java-config-2.0.26.ebuild b/dev-java/java-config/java-config-2.0.26.ebuild
deleted file mode 100644
index 9c87851886a7..000000000000
--- a/dev-java/java-config/java-config-2.0.26.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.ebuild,v 1.2 2006/07/01 19:11:13 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
-}
-
-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"
-}