dont reset /bin/sh ... let users change it if they want

Package-Manager: portage-2.1.2.1-r1

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index a00c70c5db39dab3f8febe613934df8a4532acfc..f5d55217d98f667cc559957996fa9a9d70c25873 100644 (file)
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -281,30 +281,18 @@ EBUILD bash-3.0-r14.ebuild 4723 RMD160 7f902b61f233d10e027aa8813ae94f3cafebdb0a
 MD5 5a4a1e18219282dd87274ca769b2a3bb bash-3.0-r14.ebuild 4723
 RMD160 7f902b61f233d10e027aa8813ae94f3cafebdb0a bash-3.0-r14.ebuild 4723
 SHA256 e7fe0b6a230e3f583d66bd01b3d76c527c69a0948fece2e09b3f7f411d92eaeb bash-3.0-r14.ebuild 4723
-EBUILD bash-3.1_p16.ebuild 4556 RMD160 10b283f964ab19e3aede71923e39c661acfabfc5 SHA1 8d6a0035e57b865983c04310048ef4ab7a88463a SHA256 12d35631c70fb9c9f466d8ea2624699cea1793acc9d3fdc3f1e70d91d3515eb9
-MD5 bdd9109b5f7b2042d4f204acd3f17c07 bash-3.1_p16.ebuild 4556
-RMD160 10b283f964ab19e3aede71923e39c661acfabfc5 bash-3.1_p16.ebuild 4556
-SHA256 12d35631c70fb9c9f466d8ea2624699cea1793acc9d3fdc3f1e70d91d3515eb9 bash-3.1_p16.ebuild 4556
 EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e SHA1 c00fd85917ace93b4d1bdaf6db18224e08260834 SHA256 ff12913c0306b1b597fb7da13740af52c2ccd65125695914fcf84cac455681a8
 MD5 22830ce4e0c1e669719581d5e00cfb82 bash-3.1_p17.ebuild 4601
 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e bash-3.1_p17.ebuild 4601
 SHA256 ff12913c0306b1b597fb7da13740af52c2ccd65125695914fcf84cac455681a8 bash-3.1_p17.ebuild 4601
-EBUILD bash-3.2_p10.ebuild 4337 RMD160 1bc232b8302999df546732745a7bd019051f233d SHA1 4b31d320b78a777ebd305ea61e333984b6b2f2b3 SHA256 46c9809158d7c79e77978c15df176e309d855573606197867829be7b3a3534a5
-MD5 8c46c4e952b56b47feab0cfc9da1822d bash-3.2_p10.ebuild 4337
-RMD160 1bc232b8302999df546732745a7bd019051f233d bash-3.2_p10.ebuild 4337
-SHA256 46c9809158d7c79e77978c15df176e309d855573606197867829be7b3a3534a5 bash-3.2_p10.ebuild 4337
-EBUILD bash-3.2_p5.ebuild 4339 RMD160 02ec0ef84b8fe20bbac3abcbc613774aa3028e49 SHA1 ab7f2672fd156c2a635b9c1772c7d8a2aca7149e SHA256 394aa1006b1f8b4bc191a802b873d3aa1c4b64a33103499f3560b59af4907718
-MD5 b7b008ff1a1c8a000cc3327b5b309f43 bash-3.2_p5.ebuild 4339
-RMD160 02ec0ef84b8fe20bbac3abcbc613774aa3028e49 bash-3.2_p5.ebuild 4339
-SHA256 394aa1006b1f8b4bc191a802b873d3aa1c4b64a33103499f3560b59af4907718 bash-3.2_p5.ebuild 4339
+EBUILD bash-3.2_p10.ebuild 4378 RMD160 597105ec362899234ac0bcd3c291bf1ec04844b6 SHA1 836b3ecbb6767ee2258686ecf4afd3a8bbf8a72f SHA256 acf9fb75c14eb8e2599b98edceeb3acf8867be783699e80fec24cdb4af8ab736
+MD5 f1d75e5c3c6352556588d94d3aa3100e bash-3.2_p10.ebuild 4378
+RMD160 597105ec362899234ac0bcd3c291bf1ec04844b6 bash-3.2_p10.ebuild 4378
+SHA256 acf9fb75c14eb8e2599b98edceeb3acf8867be783699e80fec24cdb4af8ab736 bash-3.2_p10.ebuild 4378
 EBUILD bash-3.2_p9-r1.ebuild 4340 RMD160 d663e053149393248d9ae8a194c5b4bf6d04f794 SHA1 db7f1abd2839e01d542d44f795b934b57db86c2d SHA256 21e4785d3630607b051feed27c8f2c8fd0e8dc62305a66938bcee52979c370aa
 MD5 2ddfec75db6f094863e533d055719767 bash-3.2_p9-r1.ebuild 4340
 RMD160 d663e053149393248d9ae8a194c5b4bf6d04f794 bash-3.2_p9-r1.ebuild 4340
 SHA256 21e4785d3630607b051feed27c8f2c8fd0e8dc62305a66938bcee52979c370aa bash-3.2_p9-r1.ebuild 4340
-EBUILD bash-3.2_p9.ebuild 4339 RMD160 ae6a6e44101287d7caaa10c1b1adc8a7e93cf14c SHA1 713791dfcf74e4a07a4decd83d947d70879642c6 SHA256 5e6de6f27506aa9aacd51c7df0f2ce71a79bb426443dcea120b6aba434e11f49
-MD5 f1e0f54bb25c8f73877e2e6c19ba8ec8 bash-3.2_p9.ebuild 4339
-RMD160 ae6a6e44101287d7caaa10c1b1adc8a7e93cf14c bash-3.2_p9.ebuild 4339
-SHA256 5e6de6f27506aa9aacd51c7df0f2ce71a79bb426443dcea120b6aba434e11f49 bash-3.2_p9.ebuild 4339
 MISC ChangeLog 23852 RMD160 22372ef7dca74fba9d6e740f1e6abc9bd9a2a8b2 SHA1 0d82886dbc3bf5df5055f918275d7e05a629d597 SHA256 0d2ed1e41c867f92526cf60aaa28af958d316e3f2218b5a9ba665ec36e77728a
 MD5 8ea777b8b3c147269c5ca70e78a27f13 ChangeLog 23852
 RMD160 22372ef7dca74fba9d6e740f1e6abc9bd9a2a8b2 ChangeLog 23852
@@ -325,28 +313,19 @@ SHA256 c744a3871ecd201262595823e251ce8d342b8de376acc015dd2921b63e1a9a88 files/di
 MD5 cb97d431d4a544bf4dae4873d123595f files/digest-bash-3.0-r14 3509
 RMD160 ef230bf5d631a4cc31b90bb2641bf4c66dc93a22 files/digest-bash-3.0-r14 3509
 SHA256 c744a3871ecd201262595823e251ce8d342b8de376acc015dd2921b63e1a9a88 files/digest-bash-3.0-r14 3509
-MD5 bf563f8e698193be3be716076ba30dc5 files/digest-bash-3.1_p16 3726
-RMD160 29f6419c76863a78b875ac61fb957053d0b47956 files/digest-bash-3.1_p16 3726
-SHA256 1a25ed9d1fa648442a32e3bc60706b427718809325cf030c5acc5ea51aecc443 files/digest-bash-3.1_p16 3726
 MD5 341b816c5acf74ac16bf443d156e9719 files/digest-bash-3.1_p17 3931
 RMD160 607c556f7fd1528c64beb33828d95a31e22077ab files/digest-bash-3.1_p17 3931
 SHA256 04f2452aacb4b2e69a683d9ee5b2a9a04f3c9d0ef9b5bb0f28ec88b48db25bf6 files/digest-bash-3.1_p17 3931
 MD5 1402e96194a7b16e9143eabd20401c9f files/digest-bash-3.2_p10 2279
 RMD160 3f3b2dcde44a26df5efd3fc60c0a503f2322ec4e files/digest-bash-3.2_p10 2279
 SHA256 c981b0f8241affa0fad97552aba77360d3403325f0c6f3da9be4538cd58f83ed files/digest-bash-3.2_p10 2279
-MD5 493c870ad82179d2d0f813f2e9d69402 files/digest-bash-3.2_p5 1254
-RMD160 a31d67f09320143d81c3ecb8d2bbfa1bb300e923 files/digest-bash-3.2_p5 1254
-SHA256 6f411247ca686af7f7e849f1ba9a734f0402652352f00e9cab8167f207d6946b files/digest-bash-3.2_p5 1254
-MD5 ef1b3c02b997284cb562ba9e3eebf17c files/digest-bash-3.2_p9 2074
-RMD160 3232387aa160a9ea2ee764e929fa58618674d590 files/digest-bash-3.2_p9 2074
-SHA256 1fe387fc344fd77f445608d6e5d99d8547c8c2f0aba4150c6b54720ff7a0b7df files/digest-bash-3.2_p9 2074
 MD5 ef1b3c02b997284cb562ba9e3eebf17c files/digest-bash-3.2_p9-r1 2074
 RMD160 3232387aa160a9ea2ee764e929fa58618674d590 files/digest-bash-3.2_p9-r1 2074
 SHA256 1fe387fc344fd77f445608d6e5d99d8547c8c2f0aba4150c6b54720ff7a0b7df files/digest-bash-3.2_p9-r1 2074
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF7MSN8bi6rjpTunYRAjPGAJoDzcIFu/WHfcMjfFQ3u+meRzC0SQCfTZuT
-qKhwwOeThuTmwFAuBCuscG8=
-=7nPh
+iD8DBQFF8D/p8bi6rjpTunYRAj9nAKChr3esGddF0mKmQPgWKulj357HBgCgq2Gi
+cxsedQT/lVqM+q9oEVzegn0=
+=qbNY
 -----END PGP SIGNATURE-----

diff --git a/app-shells/bash/bash-3.2_p10.ebuild b/app-shells/bash/bash-3.2_p10.ebuild
index e2dec460f07cbd049171296f505ff3a39d33b954..7792f9f80a3e636a2bbba39a6bd195a389242a24 100644 (file)
--- a/app-shells/bash/bash-3.2_p10.ebuild
+++ b/app-shells/bash/bash-3.2_p10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p10.ebuild,v 1.1 2007/03/06 01:31:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p10.ebuild,v 1.2 2007/03/08 16:54:38 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -112,7 +112,6 @@ src_install() {
 
        dodir /bin
        mv "${D}"/usr/bin/bash "${D}"/bin/
-       [[ ${USERLAND} != "BSD" ]] && dosym bash /bin/sh
        dosym bash /bin/rbash
 
        insinto /etc/bash
@@ -142,3 +141,9 @@ pkg_preinst() {
                rm -f "${D}"/etc/bash/bash_logout
        fi
 }
+
+pkg_postinst() {
+       if [[ ! -e ${ROOT}/bin/sh ]] ; then
+               ln -s bash "${ROOT}"/bin/sh
+       fi
+}