Added /etc/profile.d/ file for c shells. Fixes bug #159736. Thanks to Troy Bowman...

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index f41110d953531616e3b7302454684028dd773ad2..7185f7ef770259d53aa63b2f330ef1269ef023ec 100644 (file)
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -17,10 +17,14 @@ 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 762 RMD160 07d9d403a9adb62ecb5bb10a91bee81e6be1ac4e SHA1 2b26f31322dea6b74ca7208b346194bdb13da9b4 SHA256 47a56170921e2f806efa0b3cc76f84db75f212cf687f019052cfb56de49c6e81
-MD5 93060fff650a2b3577256baebaf8ea64 files/java-config-2.profiled 762
-RMD160 07d9d403a9adb62ecb5bb10a91bee81e6be1ac4e files/java-config-2.profiled 762
-SHA256 47a56170921e2f806efa0b3cc76f84db75f212cf687f019052cfb56de49c6e81 files/java-config-2.profiled 762
+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.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
+SHA256 53f17d1a2ed09ff5aacbdc182ca83d7811fded39126cd4526dfde41fce520db3 files/java-config-2.profiled.sh 769
 AUX jdk-defaults-x86-fbsd.conf 61 RMD160 8bb737a332b445c375aa955f8961eaf587f3903a SHA1 73428cb74571048a86bd9d60fdf64c555a659c7d SHA256 e92e1111a26364f915a6588701f94527f7b3f25bb381edcd490a495393a9b598
 MD5 f4a4c2656a71a460f2515085cd37f55a files/jdk-defaults-x86-fbsd.conf 61
 RMD160 8bb737a332b445c375aa955f8961eaf587f3903a files/jdk-defaults-x86-fbsd.conf 61
@@ -41,14 +45,18 @@ EBUILD java-config-2.0.30.ebuild 1913 RMD160 1ea749951943b870b544e000b5fb60d70b4
 MD5 cb1818d428e3e71be1f8a02c486dd222 java-config-2.0.30.ebuild 1913
 RMD160 1ea749951943b870b544e000b5fb60d70b4ec8dc java-config-2.0.30.ebuild 1913
 SHA256 66fe9c5427382f6bd0edd563cc11c47eb55cd17ce08bdbd3958808e2471cb4c2 java-config-2.0.30.ebuild 1913
+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.ebuild 1809 RMD160 78e542b5323023a4c06893f35eff4c704f41e9c9 SHA1 f69cafc04e567148e92e0053af90d1955bcd4b6f SHA256 467d31433f5a1469e7bb6fb847833e9067d8a64d44da8c688a14cbbfdcef0a50
 MD5 f5e00039bbfd9e5de54569545db04246 java-config-2.0.31.ebuild 1809
 RMD160 78e542b5323023a4c06893f35eff4c704f41e9c9 java-config-2.0.31.ebuild 1809
 SHA256 467d31433f5a1469e7bb6fb847833e9067d8a64d44da8c688a14cbbfdcef0a50 java-config-2.0.31.ebuild 1809
-MISC ChangeLog 25267 RMD160 cff74c2357e5c8e6a8ad124e16b8036fe939d862 SHA1 0254fd53ecee042b8bcbfa27c2f4a1c839ca6531 SHA256 24ce890722810ba546abedef9dbdfb05672967a04ada58051b2d9550026aaf8d
-MD5 3e0a020a8bf17214f02c07ad698d73cc ChangeLog 25267
-RMD160 cff74c2357e5c8e6a8ad124e16b8036fe939d862 ChangeLog 25267
-SHA256 24ce890722810ba546abedef9dbdfb05672967a04ada58051b2d9550026aaf8d ChangeLog 25267
+MISC ChangeLog 25599 RMD160 c3884d5829caf2177397bfa2d61afc991d99282a SHA1 d2fb7b02b15b8f2bfd7b357a695c8dc7c4867cd5 SHA256 51021ca89829e8fafbc94f18b029536116af9b0d8d28cee99244cd2e48e11cd3
+MD5 86ff61775c6a2a388358be329aba68f6 ChangeLog 25599
+RMD160 c3884d5829caf2177397bfa2d61afc991d99282a ChangeLog 25599
+SHA256 51021ca89829e8fafbc94f18b029536116af9b0d8d28cee99244cd2e48e11cd3 ChangeLog 25599
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
 MD5 b4d3814b9ce4be88a25d99b3cfe2c076 metadata.xml 482
 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 metadata.xml 482
@@ -65,10 +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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFhX/scxLzpIGCsLQRAqyuAJ9ou6aCD6t2BAYyzsehOAMmeurlSQCgnE6L
-YllmpKSDaztBiKTubgP+iC8=
-=NEOv
+iD8DBQFFp8wdcxLzpIGCsLQRAl7uAKCPBAwV3gKFRbhIxDe1JWflcwWPMwCfQPYG
+Yuhytg+lUPuwZuieziaEbT8=
+=8TMd
 -----END PGP SIGNATURE-----

diff --git a/dev-java/java-config/files/java-config-2.profiled b/dev-java/java-config/files/java-config-2.profiled
deleted file mode 100644 (file)
index 1576def..0000000
--- a/dev-java/java-config/files/java-config-2.profiled
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled,v 1.3 2006/08/25 02:13:17 nichoj Exp $
-
-# If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
-gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
-gentoo_system_vm="/etc/java-config-2/current-system-vm"
-
-if [[ ${UID} != 0 && -L ${gentoo_user_vm} ]]; then
-       export JAVA_HOME=${gentoo_user_vm}
-# Otherwise set to the current system vm
-elif [[ -L /etc/java-config-2/current-system-vm ]]; then
-       export JAVA_HOME=${gentoo_system_vm}
-fi
-export JDK_HOME=${JAVA_HOME}
-export JAVAC=${JDK_HOME}/bin/javac
-unset gentoo_user_vm gentoo_system_vm