Added jconsole, for bug #141145

Package-Manager: portage-2.1.1_pre3-r5

5 files changed, 87 insertions, 15 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 7d7142fce697..bed46d79a7f4 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,12 @@
 # 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.99 2006/07/21 00:21:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.100 2006/07/29 20:27:17 nichoj Exp $
+
+*java-config-2.0.26-r5 (29 Jul 2006)
+
+  29 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/java-config-2.0.26-jconsole.patch, +java-config-2.0.26-r5.ebuild:
+  Added jconsole, for bug #141145
 
   21 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   java-config-1.3.0-r2.ebuild, java-config-2.0.26-r4.ebuild:
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 4b2ec04e3c24..58050be669de 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX java-config-1.2.11-shebang.patch 229 RMD160 e201dafad76307123139861371ade56f03887342 SHA1 e91f77077bb0b5793bda7ffc58442019dc66db09 SHA256 4068a51515b7510260de57a5872d6e04b1a33d2f9728d77ed00fe7f41cced83a
 MD5 882665d94cc943f315ec729d990afadf files/java-config-1.2.11-shebang.patch 229
 RMD160 e201dafad76307123139861371ade56f03887342 files/java-config-1.2.11-shebang.patch 229
@@ -9,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-jconsole.patch 242 RMD160 4363dae12e44790b7e6870110c87d88bad8875dc SHA1 8fd7dae82be1f8065c2dd3d60d793150f8d266ce SHA256 7c7438696cece96832fb45363a0e14e0a7f58f350606ba767cc40e605cf3d3c1
+MD5 f2cf6aa341ff44f8ff2cd7c91635f8d1 files/java-config-2.0.26-jconsole.patch 242
+RMD160 4363dae12e44790b7e6870110c87d88bad8875dc files/java-config-2.0.26-jconsole.patch 242
+SHA256 7c7438696cece96832fb45363a0e14e0a7f58f350606ba767cc40e605cf3d3c1 files/java-config-2.0.26-jconsole.patch 242
 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
@@ -36,10 +37,14 @@ EBUILD java-config-2.0.26-r4.ebuild 1461 RMD160 3ecea43dae29ad96f262f6b2a6d39e9f
 MD5 e65d175ebfc52b16505026b90f6ceada java-config-2.0.26-r4.ebuild 1461
 RMD160 3ecea43dae29ad96f262f6b2a6d39e9ffcccf72e java-config-2.0.26-r4.ebuild 1461
 SHA256 9f4c11cb2823f6f04262b82f0108575b33f70c6d42798b17ce55d8c2804cce03 java-config-2.0.26-r4.ebuild 1461
-MISC ChangeLog 16223 RMD160 577087c78440618045cea2e176d8065ab70b3a18 SHA1 4d025191f2ebcf6cce2c7de845f3d2d0a37aad85 SHA256 3e424c3821ea5b6baabee2f96f3741c60d7d4651956fc308a3f8aab0bda8f6e6
-MD5 0d6b63adafb3cbc0ad9b67865f07cabc ChangeLog 16223
-RMD160 577087c78440618045cea2e176d8065ab70b3a18 ChangeLog 16223
-SHA256 3e424c3821ea5b6baabee2f96f3741c60d7d4651956fc308a3f8aab0bda8f6e6 ChangeLog 16223
+EBUILD java-config-2.0.26-r5.ebuild 1493 RMD160 d67fe71fa3016d70d554d4078dbd4a679dc954e1 SHA1 2f91d0357a06df36f5eb5f149358af299449aec9 SHA256 ad914afc548b39c94b5dbc88485414eaabd89d4b61e36c1a7560f383cad4abfc
+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
 MISC metadata.xml 486 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 SHA1 1561f2727694d8312adbda18294f690116ab3c84 SHA256 5d3e4a1780efad67e6265b82a4397a2b4fe26c2c0785ee65a3390dd8218c82ce
 MD5 ff83dbd41edf207798f367c723ab813f metadata.xml 486
 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 metadata.xml 486
@@ -53,10 +58,6 @@ SHA256 8e829d236fd6326f55c2679229926adcba694b4a8f19387bfbb731dc6be1da67 files/di
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwB39AiZjviIA2XgRAquQAKCc9pIQrTG/FSNtUzWNE9CnvwmyewCgxRdC
-4jv8A1f2HA0Fozwj6Y890fE=
-=WcG5
------END PGP SIGNATURE-----
+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
diff --git a/dev-java/java-config/files/digest-java-config-2.0.26-r5 b/dev-java/java-config/files/digest-java-config-2.0.26-r5
new file mode 100644
index 000000000000..56c0f4186bc9
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-2.0.26-r5
@@ -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-jconsole.patch b/dev-java/java-config/files/java-config-2.0.26-jconsole.patch
new file mode 100644
index 000000000000..ada57c7f13c5
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.0.26-jconsole.patch
@@ -0,0 +1,12 @@
+Index: config/symlink-tools
+===================================================================
+--- config/symlink-tools	(revision 2480)
++++ config/symlink-tools	(working copy)
+@@ -7,6 +7,7 @@
+ javah
+ javap
+ javaws
++jconsole
+ jdb
+ rmic
+ rmid
diff --git a/dev-java/java-config/java-config-2.0.26-r5.ebuild b/dev-java/java-config/java-config-2.0.26-r5.ebuild
new file mode 100644
index 000000000000..c421b8212eca
--- /dev/null
+++ b/dev-java/java-config/java-config-2.0.26-r5.ebuild
@@ -0,0 +1,50 @@
+# 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-r5.ebuild,v 1.1 2006/07/29 20:27:17 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
+}
+
+
+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"
+}