Fixed man page collision (bug #138352) and improved run-java-tool.

(Portage version: 2.1_rc2-r3)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 56 deletions

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 88ce4c31b05d..64bd3b9d5d5c 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -8,7 +8,7 @@ RMD160 4607b8762440279cc1caf989b1f8e03a66671d3b files/java-config-1.3.0-regexp.p
 SHA256 d5bacfb6a95f934ec4c0e19d6956c439801813dc8a6873c50bdb4d9d083299b8 files/java-config-1.3.0-regexp.patch 458
 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.24.tar.bz2 14724 RMD160 162b8cc49ba5372e557dad90f79cd04a6c8d77f0 SHA1 4bd0b261806312a79ff454865f49690b021afaa7 SHA256 35214935e6ccfa3091cb656762bbac45c7a3caca907a2b4fc50183090c0fc1d1
+DIST java-config-2.0.25.tar.bz2 14865 RMD160 8acdb348f64dce568d1aa0ba8d971e3ff7c6b8b0 SHA1 67a6c9f479c9fe63d86f10513d1ba69a80502cff SHA256 4ea757a7a35ef42a1fb201972e53c7dcc145d8da5ed63baf53a9ae2f39c5e383
 EBUILD java-config-1.2.11-r1.ebuild 825 RMD160 50d7f10d6e267a41245367167581001b55aebfd9 SHA1 520c86554da666f3117bd3f075f9449c4fe3f656 SHA256 9e9db58336905d531587e476ea6301add54394254b1df4aba3a29ce9b6d122ff
 MD5 5b5f359b7f144188ef6afc44374254bf java-config-1.2.11-r1.ebuild 825
 RMD160 50d7f10d6e267a41245367167581001b55aebfd9 java-config-1.2.11-r1.ebuild 825
@@ -17,14 +17,14 @@ EBUILD java-config-1.3.0-r2.ebuild 750 RMD160 725eef2575f7484769b13d4f1e137b5eca
 MD5 15b545e5f22124a0224633657c240ea5 java-config-1.3.0-r2.ebuild 750
 RMD160 725eef2575f7484769b13d4f1e137b5ecaa7e8e5 java-config-1.3.0-r2.ebuild 750
 SHA256 8025b7afeee765f75e92262020af32b4d2933a1c37de8cf528eff0c4c7c34c09 java-config-1.3.0-r2.ebuild 750
-EBUILD java-config-2.0.24.ebuild 1086 RMD160 82870f2ccb95978ae0852d94f09cf217d66c4955 SHA1 0eea23efd7d28780d6614e000d1417f48935b18f SHA256 b86d746fee444b1737dc3bfe63730527e6fc728c638ad08a34f787bfb26fa949
-MD5 e12eb299772ddab0de59523ba9ec78b2 java-config-2.0.24.ebuild 1086
-RMD160 82870f2ccb95978ae0852d94f09cf217d66c4955 java-config-2.0.24.ebuild 1086
-SHA256 b86d746fee444b1737dc3bfe63730527e6fc728c638ad08a34f787bfb26fa949 java-config-2.0.24.ebuild 1086
-MISC ChangeLog 14092 RMD160 ee8c272201240cbd173f11d48ef8c58f8d25e7e6 SHA1 fd481e8b9d1298eb533918b578975e1630c8da7b SHA256 1089f8ceec0080eeff687d84702dda9ee9b5075bfd4de0bd7159e5e001d6b23e
-MD5 4a6528e40849677df63a54868641d86c ChangeLog 14092
-RMD160 ee8c272201240cbd173f11d48ef8c58f8d25e7e6 ChangeLog 14092
-SHA256 1089f8ceec0080eeff687d84702dda9ee9b5075bfd4de0bd7159e5e001d6b23e ChangeLog 14092
+EBUILD java-config-2.0.25.ebuild 1086 RMD160 2a1e4fff27e2e0f8e1a538e79820dd20aa25ed92 SHA1 7aba0392dffa119c25c59d68c273d847a5c0e291 SHA256 af4af8b3f35a1e9489c5a48690ecb33ee9b2857e5127d5a549c7660a209569f4
+MD5 36b9fc9e6c839f7259da6ae24cc3ab68 java-config-2.0.25.ebuild 1086
+RMD160 2a1e4fff27e2e0f8e1a538e79820dd20aa25ed92 java-config-2.0.25.ebuild 1086
+SHA256 af4af8b3f35a1e9489c5a48690ecb33ee9b2857e5127d5a549c7660a209569f4 java-config-2.0.25.ebuild 1086
+MISC ChangeLog 14307 RMD160 c2064715c720a6d732189236dfefb65219856fc4 SHA1 ca660b55143d7c81659a56260f29766038064df9 SHA256 ddf674078f69559877dbf750b329e809bffcc1f0c74f5a49850f9fa6844a840d
+MD5 7357f92ebd08d47ae23b47d8f9bb6236 ChangeLog 14307
+RMD160 c2064715c720a6d732189236dfefb65219856fc4 ChangeLog 14307
+SHA256 ddf674078f69559877dbf750b329e809bffcc1f0c74f5a49850f9fa6844a840d ChangeLog 14307
 MISC metadata.xml 486 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 SHA1 1561f2727694d8312adbda18294f690116ab3c84 SHA256 5d3e4a1780efad67e6265b82a4397a2b4fe26c2c0785ee65a3390dd8218c82ce
 MD5 ff83dbd41edf207798f367c723ab813f metadata.xml 486
 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 metadata.xml 486
@@ -35,6 +35,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 decbfda812a909ac92c9d9be4cfbb6c9 files/digest-java-config-2.0.24 256
-RMD160 02407e75c06709a737f8023f0380562e5804ac01 files/digest-java-config-2.0.24 256
-SHA256 7c8968325f9cda07baac413fee2bbd21c314c401a562940f4c9713ecda06b1ac files/digest-java-config-2.0.24 256
+MD5 36b259be247d4d26f300a6dbebf85527 files/digest-java-config-2.0.25 256
+RMD160 cb17ab9fc00efc7279afa44e16dae7e77af98071 files/digest-java-config-2.0.25 256
+SHA256 58c4e08610b6f7e967845a845871f16e86b95cb7722ed4b273f07359044521a1 files/digest-java-config-2.0.25 256
diff --git a/dev-java/java-config/files/digest-java-config-2.0.24 b/dev-java/java-config/files/digest-java-config-2.0.24
deleted file mode 100644
index c0db1669d8d9..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.24
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7141652028f64ecbe5f64c54a5042849 java-config-2.0.24.tar.bz2 14724
-RMD160 162b8cc49ba5372e557dad90f79cd04a6c8d77f0 java-config-2.0.24.tar.bz2 14724
-SHA256 35214935e6ccfa3091cb656762bbac45c7a3caca907a2b4fc50183090c0fc1d1 java-config-2.0.24.tar.bz2 14724
diff --git a/dev-java/java-config/java-config-2.0.24.ebuild b/dev-java/java-config/java-config-2.0.24.ebuild
deleted file mode 100644
index a38ef23f091f..000000000000
--- a/dev-java/java-config/java-config-2.0.24.ebuild
+++ /dev/null
@@ -1,41 +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.24.ebuild,v 1.2 2006/06/26 23:28:14 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
-}