Add /usr/bin/keytool wrapper for bug #174591.

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index cbcd0908fdfbe5fe7f48e1d1e8e48ab8bf9d5536..5fe90b91aa37043553fe35f07f5fd4d8d835beda 100644 (file)
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/java-config
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.155 2007/04/15 13:14:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.156 2007/04/15 20:31:41 betelgeuse Exp $
+
+*java-config-2.0.31-r7 (15 Apr 2007)
+
+  15 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +java-config-2.0.31-r7.ebuild:
+  Add /usr/bin/keytool wrapper for bug #174591.
 
   15 Apr 2007; nixnut <nixnut@gentoo.org> java-config-2.0.31-r5.ebuild:
   Stable on ppc wrt bug 174171

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 00402abc1f76c0b1dbca9e171f7cdb8fdd8dc3a6..0a3888b462d33e0da845799329d90040627eed97 100644 (file)
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 60-java 382 RMD160 0794d1592b0e5999effcfa630f6b002d2f172631 SHA1 beaaaa5297bc180a78730661a273fa8d109e03b2 SHA256 06e30c66084aa7fac580004b71c739c09d7ee147ff4a46b4b8a0ea43aaa9738d
 MD5 bff6d7769967e9d0387aa46ca3dda6d4 files/60-java 382
 RMD160 0794d1592b0e5999effcfa630f6b002d2f172631 files/60-java 382
@@ -57,14 +60,18 @@ EBUILD java-config-2.0.31-r6.ebuild 1983 RMD160 ae48a44024a6d344d467c0a4ee05c3a4
 MD5 8d72eb1c7c313451ea24351701bfeae3 java-config-2.0.31-r6.ebuild 1983
 RMD160 ae48a44024a6d344d467c0a4ee05c3a4a938fb6a java-config-2.0.31-r6.ebuild 1983
 SHA256 7aa9350806298f3a34728ac74dbd46ff34f9f72c321b409c20fba0d8a239d408 java-config-2.0.31-r6.ebuild 1983
+EBUILD java-config-2.0.31-r7.ebuild 2098 RMD160 c98f5fa9979dfd72087c46511427c2e790c4db9c SHA1 00213efb5a395325949cfa1968b9bcc05a205bec SHA256 2c4cae077b05c25634e58d36559c0a45e90bb16cf6f3681cfed2722697fceb14
+MD5 887bb768703dcde65a3e827fa27b38b7 java-config-2.0.31-r7.ebuild 2098
+RMD160 c98f5fa9979dfd72087c46511427c2e790c4db9c java-config-2.0.31-r7.ebuild 2098
+SHA256 2c4cae077b05c25634e58d36559c0a45e90bb16cf6f3681cfed2722697fceb14 java-config-2.0.31-r7.ebuild 2098
 EBUILD java-config-2.0.31.ebuild 1768 RMD160 90a7dddfe4a02798f9bbf184ec9da7035f3c04b7 SHA1 ab42bab866354e4ede0ffa47c3beefad46e7a35d SHA256 542b7c046c86437bdc294c40b5812be5a03e0fa1fa677a4828a919bc8e83c8e7
 MD5 3e7277b17ad060097322ffc056ddacc4 java-config-2.0.31.ebuild 1768
 RMD160 90a7dddfe4a02798f9bbf184ec9da7035f3c04b7 java-config-2.0.31.ebuild 1768
 SHA256 542b7c046c86437bdc294c40b5812be5a03e0fa1fa677a4828a919bc8e83c8e7 java-config-2.0.31.ebuild 1768
-MISC ChangeLog 29056 RMD160 b8d24cd8e9252a9e96155bf7ecfbd161bcdf1e2f SHA1 ee905cbc8a5fbecd51d23f1159367657fbde20e7 SHA256 67044852afb629036b18dcda0bb8034665c21873c41e1201db53fa7e9ad6040b
-MD5 650e9fa411f9b2c31bfa147a67cf85e1 ChangeLog 29056
-RMD160 b8d24cd8e9252a9e96155bf7ecfbd161bcdf1e2f ChangeLog 29056
-SHA256 67044852afb629036b18dcda0bb8034665c21873c41e1201db53fa7e9ad6040b ChangeLog 29056
+MISC ChangeLog 29233 RMD160 e99b8c591efbaaa7bbe5b637724d015144129d23 SHA1 6a9a4f60fad7c5030c6e21ed2c8588736e4c1730 SHA256 eac3a9f0cbe706dce06ce6eb584cd8fb631a6a77734c014cddb1599820b56a09
+MD5 8c44e032fa7e01fcb2da4a8832f080c4 ChangeLog 29233
+RMD160 e99b8c591efbaaa7bbe5b637724d015144129d23 ChangeLog 29233
+SHA256 eac3a9f0cbe706dce06ce6eb584cd8fb631a6a77734c014cddb1599820b56a09 ChangeLog 29233
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
 MD5 b4d3814b9ce4be88a25d99b3cfe2c076 metadata.xml 482
 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 metadata.xml 482
@@ -84,3 +91,13 @@ SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/di
 MD5 c38ff0fcf6539f0bf10d2750b97c1dae files/digest-java-config-2.0.31-r6 256
 RMD160 dcdc28e10c1f81f64e372c24f7fd50330fcf4b15 files/digest-java-config-2.0.31-r6 256
 SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/digest-java-config-2.0.31-r6 256
+MD5 c38ff0fcf6539f0bf10d2750b97c1dae files/digest-java-config-2.0.31-r7 256
+RMD160 dcdc28e10c1f81f64e372c24f7fd50330fcf4b15 files/digest-java-config-2.0.31-r7 256
+SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/digest-java-config-2.0.31-r7 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGIouxcxLzpIGCsLQRAss/AJ9d1BERiXDZ4uWHgK6ubAs6mmjVyACbBjfM
+pWQ3dp9rK/Sx5ik9UZjISY8=
+=LG0u
+-----END PGP SIGNATURE-----

diff --git a/dev-java/java-config/files/digest-java-config-2.0.31-r7 b/dev-java/java-config/files/digest-java-config-2.0.31-r7
new file mode 100644 (file)
index 0000000..393d9db
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-2.0.31-r7
@@ -0,0 +1,3 @@
+MD5 36b7893b20b9f4b6f0af6dd632703745 java-config-2.0.31.tar.bz2 17001
+RMD160 4b3d8362538b435a642312ee7289824d6662e309 java-config-2.0.31.tar.bz2 17001
+SHA256 314ec1783da8190d60e757aaef2af8eae7281c3c9754024e3e59643ce7a30752 java-config-2.0.31.tar.bz2 17001

diff --git a/dev-java/java-config/java-config-2.0.31-r7.ebuild b/dev-java/java-config/java-config-2.0.31-r7.ebuild
new file mode 100644 (file)
index 0000000..8be542f
--- /dev/null
+++ b/dev-java/java-config/java-config-2.0.31-r7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 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.31-r7.ebuild,v 1.1 2007/04/15 20:31:41 betelgeuse 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="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+       dev-java/java-config-wrapper"
+
+PATCHES="${FILESDIR}/jdk-defaults-ia64.conf.patch"
+
+src_install() {
+       distutils_src_install
+
+       insinto /usr/share/java-config-2/config/
+       for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86 x86-fbsd; 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
+       # Remove in the next release
+       dosym /usr/bin/run-java-tool /usr/bin/keytool
+
+       # Install profile.d for setting JAVA_HOME
+       dodir /etc/profile.d
+       exeinto /etc/profile.d
+       newexe ${FILESDIR}/${PN}-${SLOT}.profiled.sh-r1 ${PN}-${SLOT}.sh || die "newexe failed"
+       newexe ${FILESDIR}/${PN}-${SLOT}.profiled.csh ${PN}-${SLOT}.csh || die "newexe failed"
+
+       insinto /etc/revdep-rebuild/
+       doins "${FILESDIR}/60-java" || die
+}
+
+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
+
+       elog "The way Java is handled on Gentoo has been recently updated."
+       elog "If you have not done so already, you should follow the"
+       elog "instructions available at:"
+       elog "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml"
+       elog
+       elog "While we are moving towards the new Java system, we only allow"
+       elog "1.3 or 1.4 JDKs to be used with java-config-1 to ensure"
+       elog "backwards compatibility with the old system."
+       elog "For more details about this, please see:"
+       elog "\thttp://www.gentoo.org/proj/en/java/why-we-need-java-14.xml"
+}