The csh profile.d had a bug preventing it from working for root. Teaches you not...

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 1a5b8524953596aa3e638a3b3b6e7e4678249d50..6248071ac1105909779653f3dbc60b38b86dbc5d 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 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
@@ -14,10 +17,10 @@ AUX java-config-1.3.6-jh.patch 1258 RMD160 25a826996f7ee790b1cc74f30eae48c1c6433
 MD5 5c7a18568d0b9b96b11571d2d6fe897b files/java-config-1.3.6-jh.patch 1258
 RMD160 25a826996f7ee790b1cc74f30eae48c1c6433635 files/java-config-1.3.6-jh.patch 1258
 SHA256 7976d6f6a32e5a291049aacab1540a710415f3f8a629c2a0d3a8ffd7237c8bd9 files/java-config-1.3.6-jh.patch 1258
-AUX java-config-2.profiled.csh 761 RMD160 50502950d12e2b70f6583ea2837e7d3d3a0e3135 SHA1 b7cb5a77be82f7dbb56373c3a05b7104b1dd5dec SHA256 5d6dcb4fc55d1c0d35b1d4f942852effd9a79776967e0bfe0075d000bf2acabf
-MD5 e28377091ba9eacd3b765feaa708d278 files/java-config-2.profiled.csh 761
-RMD160 50502950d12e2b70f6583ea2837e7d3d3a0e3135 files/java-config-2.profiled.csh 761
-SHA256 5d6dcb4fc55d1c0d35b1d4f942852effd9a79776967e0bfe0075d000bf2acabf files/java-config-2.profiled.csh 761
+AUX java-config-2.profiled.csh 761 RMD160 43951118f9c26ba2b1dfa2f52b04852e458b6c20 SHA1 e31754583b34dfc396b743ce7c577398204abf4c SHA256 8718fc82328320bf6ab1e820ed506141d4b7b73453ff221efcf66ca041d9fe8e
+MD5 4dcdea36007c5de106111a6cc932b496 files/java-config-2.profiled.csh 761
+RMD160 43951118f9c26ba2b1dfa2f52b04852e458b6c20 files/java-config-2.profiled.csh 761
+SHA256 8718fc82328320bf6ab1e820ed506141d4b7b73453ff221efcf66ca041d9fe8e files/java-config-2.profiled.csh 761
 AUX java-config-2.profiled.sh 769 RMD160 c99c573ff61a4a0ba10cfdee97e51ac6f090d091 SHA1 5f394074154697ac97a04cc7d080a92ba65444b7 SHA256 53f17d1a2ed09ff5aacbdc182ca83d7811fded39126cd4526dfde41fce520db3
 MD5 ce571e951b8d2d1f9f3be5c179f4e9b8 files/java-config-2.profiled.sh 769
 RMD160 c99c573ff61a4a0ba10cfdee97e51ac6f090d091 files/java-config-2.profiled.sh 769
@@ -42,18 +45,18 @@ EBUILD java-config-2.0.30.ebuild 1917 RMD160 bbd8d12b373e4636988817cf95fdcf5e612
 MD5 6428f81e8f97fbb92a4b44108a2e72e6 java-config-2.0.30.ebuild 1917
 RMD160 bbd8d12b373e4636988817cf95fdcf5e6120c55c java-config-2.0.30.ebuild 1917
 SHA256 471d3cb34d9c047d524bae78abfe535bb180a3a3a97f865b84b20456fcf8f483 java-config-2.0.30.ebuild 1917
-EBUILD java-config-2.0.31-r1.ebuild 1903 RMD160 963452ae968ff80d0702fcd5476ba78fbd5080a6 SHA1 c154d6e547c4858818bae3f8764800d5dcd4c808 SHA256 3e9ec4f1d97cb6e97c2e30d1d4e156ca4953d6992e6e2a56fc447c32e9d0f73b
-MD5 bfa51aba76748ae03a304bcf3ce2cf53 java-config-2.0.31-r1.ebuild 1903
-RMD160 963452ae968ff80d0702fcd5476ba78fbd5080a6 java-config-2.0.31-r1.ebuild 1903
-SHA256 3e9ec4f1d97cb6e97c2e30d1d4e156ca4953d6992e6e2a56fc447c32e9d0f73b java-config-2.0.31-r1.ebuild 1903
+EBUILD java-config-2.0.31-r2.ebuild 1903 RMD160 a2f683091ecc8b5b8b65820e8f545070bab58b58 SHA1 3e82f450cb4c281827ce0bd77689195424cd01cb SHA256 735c80017266730dfcd5e8d398a2708fe6c8a0668dc335bd596afdf401774a62
+MD5 7333aa0e84d15125877add59bbdd9c00 java-config-2.0.31-r2.ebuild 1903
+RMD160 a2f683091ecc8b5b8b65820e8f545070bab58b58 java-config-2.0.31-r2.ebuild 1903
+SHA256 735c80017266730dfcd5e8d398a2708fe6c8a0668dc335bd596afdf401774a62 java-config-2.0.31-r2.ebuild 1903
 EBUILD java-config-2.0.31.ebuild 1812 RMD160 c0028b1cb61a52caec211a90b0e666b292adf11e SHA1 b319925df326449475ba59ccaa4e92b7096b1518 SHA256 f77cfd7b398afaf710f953d7c753d1b4814de592a11a1e6a509a3aaeb2423ab1
 MD5 295985013ed1af491fec971d7d7cf052 java-config-2.0.31.ebuild 1812
 RMD160 c0028b1cb61a52caec211a90b0e666b292adf11e java-config-2.0.31.ebuild 1812
 SHA256 f77cfd7b398afaf710f953d7c753d1b4814de592a11a1e6a509a3aaeb2423ab1 java-config-2.0.31.ebuild 1812
-MISC ChangeLog 25877 RMD160 57326b36f57b9111beb0ad99515b4d9958960935 SHA1 fadbb69f3943894c297662d3a54ba6033a5950d3 SHA256 b3fbab9ad95fe8e27cc162da13a11b245f301656647ea43d2733d7fd3d94fbe2
-MD5 da8e2f8b2f8815e04d18762fcc5d085c ChangeLog 25877
-RMD160 57326b36f57b9111beb0ad99515b4d9958960935 ChangeLog 25877
-SHA256 b3fbab9ad95fe8e27cc162da13a11b245f301656647ea43d2733d7fd3d94fbe2 ChangeLog 25877
+MISC ChangeLog 26199 RMD160 13ccadaf1610b3dfb662cdec0b0dae71f0ec1def SHA1 da04bb2da480bbfdc96ffbb6825237d75b952406 SHA256 cf9091c6759521b308c9c70afe3af466ec024176631f85151394ec9bb2ff15db
+MD5 8ad13dc09db79692dbe1f5d21e8347f4 ChangeLog 26199
+RMD160 13ccadaf1610b3dfb662cdec0b0dae71f0ec1def ChangeLog 26199
+SHA256 cf9091c6759521b308c9c70afe3af466ec024176631f85151394ec9bb2ff15db ChangeLog 26199
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
 MD5 b4d3814b9ce4be88a25d99b3cfe2c076 metadata.xml 482
 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 metadata.xml 482
@@ -70,6 +73,13 @@ SHA256 c538263f8965d72090e73bce94903981faa6196d12b56959f4f5abc2e2c5daac files/di
 MD5 c38ff0fcf6539f0bf10d2750b97c1dae files/digest-java-config-2.0.31 256
 RMD160 dcdc28e10c1f81f64e372c24f7fd50330fcf4b15 files/digest-java-config-2.0.31 256
 SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/digest-java-config-2.0.31 256
-MD5 c38ff0fcf6539f0bf10d2750b97c1dae files/digest-java-config-2.0.31-r1 256
-RMD160 dcdc28e10c1f81f64e372c24f7fd50330fcf4b15 files/digest-java-config-2.0.31-r1 256
-SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/digest-java-config-2.0.31-r1 256
+MD5 c38ff0fcf6539f0bf10d2750b97c1dae files/digest-java-config-2.0.31-r2 256
+RMD160 dcdc28e10c1f81f64e372c24f7fd50330fcf4b15 files/digest-java-config-2.0.31-r2 256
+SHA256 fb9fdda52fe83303015b76545968d59324e286959171bb5dc01dd094e11cd8e0 files/digest-java-config-2.0.31-r2 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFqQqvcxLzpIGCsLQRAkC6AJwM0dbAMt3EbiVNYJpteDTgtePMAACfUQDG
+w0+lvvIQL7nLDuDvbo57iwM=
+=Z3Nu
+-----END PGP SIGNATURE-----

diff --git a/dev-java/java-config/files/digest-java-config-2.0.31-r1 b/dev-java/java-config/files/digest-java-config-2.0.31-r1
deleted file mode 100644 (file)
index 393d9db..0000000
--- a/dev-java/java-config/files/digest-java-config-2.0.31-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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-r1.ebuild b/dev-java/java-config/java-config-2.0.31-r1.ebuild
deleted file mode 100644 (file)
index 5802cbb..0000000
--- a/dev-java/java-config/java-config-2.0.31-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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-r1.ebuild,v 1.1 2007/01/12 17:57:48 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"
-
-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
-
-       # Install profile.d for setting JAVA_HOME
-       dodir /etc/profile.d
-       exeinto /etc/profile.d
-       newexe ${FILESDIR}/${PN}-${SLOT}.profiled.sh ${PN}-${SLOT}.sh || die "newexe failed"
-       newexe ${FILESDIR}/${PN}-${SLOT}.profiled.csh ${PN}-${SLOT}.csh || die "newexe failed"
-}
-
-
-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 "\thttps://overlays.gentoo.org/proj/java/wiki/Why_We_Need_Java14"
-}