diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-08-23 01:17:53 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-08-23 01:17:53 +0000 |
| commit | 4bece474fb12f937a1a048f4be598e6f6d2f23e8 (patch) | |
| tree | bea6362e2e34f8c9ed3cfc61886e868a65ee96fb /app-shells | |
| parent | Version bump, remove old. (diff) | |
| download | historical-4bece474fb12f937a1a048f4be598e6f6d2f23e8.tar.gz historical-4bece474fb12f937a1a048f4be598e6f6d2f23e8.tar.bz2 historical-4bece474fb12f937a1a048f4be598e6f6d2f23e8.zip | |
Disable readline-specific options in bashrc when USE=-readline #432338 by Agostino Sarubbo.
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash/ChangeLog | 6 | ||||
| -rw-r--r-- | app-shells/bash/Manifest | 20 | ||||
| -rw-r--r-- | app-shells/bash/bash-4.2_p37.ebuild | 18 |
3 files changed, 35 insertions, 9 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 6300ce2830c7..b43aeb56cc15 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-shells/bash # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.319 2012/08/20 02:46:57 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.320 2012/08/23 01:17:53 vapier Exp $ + + 23 Aug 2012; Mike Frysinger <vapier@gentoo.org> bash-4.2_p37.ebuild: + Disable readline-specific options in bashrc when USE=-readline #432338 by + Agostino Sarubbo. 20 Aug 2012; Jeroen Roovers <jer@gentoo.org> bash-4.2_p37.ebuild: Stable for HPPA (bug #431850). diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 199247dda977..4cbad5f4a7a9 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -210,14 +210,24 @@ EBUILD bash-4.2_p24.ebuild 6155 SHA256 02d1f7d7e6e78219dba763c661a50b90c731b7e8f EBUILD bash-4.2_p28.ebuild 6167 SHA256 9ce516ae7fbe2315e35b071c91e9a72ab43f5c1a50d90697aa673b306bcf9598 SHA512 eb83366dc44db6b2b1f4f71ffa7a600d364375b962e778915717233b0fd8f519a352646e8da58e672a66cdd037dd7a6e5a3d405980cfb0cac008d8e8e647cb4f WHIRLPOOL 86ba65db80f305eae6a7858fc9f3141606f96973d8c017d12afd91a609ebdac475b8d52e5618e900fffe176a7fe9d10aa7620c93e6cc6e3b04053dc28824938f EBUILD bash-4.2_p29.ebuild 6166 SHA256 57928687bafac92b8aeb0f3598a026242c04aa24e733883b738e3a65d080f1bc SHA512 4ddd3ba367df595d7b7481806c72d37d408a5484fba890eab0c3c8e912676f99f81aa5a9a71a0afe11db1d389186e15c6c0ddb2e59a37d0150a9194c23c510f0 WHIRLPOOL 9c544145c2bffcbdc5ab9b5e1d8a974f693a2f79e3ef392207c5a8a1df81bc1bfced419dbac408cbd518a6976aad748eae472edb8945255313be004443c14541 EBUILD bash-4.2_p36.ebuild 6166 SHA256 ba80733c8fc50b4958820b5fe779cc4df4dfe6ce5b65b7b5bb3a332e46914715 SHA512 109a3231f9d13412286910547d34eb272ec64502c797428f5e9ede23a0edaa0865366250e216bbf69fd5bc67a651978b5a7fbae22e11a10d872cefd3e2c414a9 WHIRLPOOL b22ecca12116d0fe430ab1331a2e507e7d48a322c72acfc3586edaa0e939c51d834c921f083071f9430a4c60ae362f33fb055abdffdc91990eb2e6d1c69044cc -EBUILD bash-4.2_p37.ebuild 6174 SHA256 7ed8eab7862fe076928bb14d8c0e6760f4abf3c8c63737f1e06f64bfdc46ca62 SHA512 65e5ca3331d5b615cd4f321f23ad2b3aa3eea6148305aeb06b18f98e00672589152edda0a861e36ad42d6a81c31d916b0ef18c9e0270beb0a41c5916a1a4e831 WHIRLPOOL a582ef2514ce33ee55d4bffa11ed29eb29ab86c6ec1ca2f9801592559674a9722fdce74b49502683137895ee1c7045eee253b29074adfc0853bf9e18060368f8 +EBUILD bash-4.2_p37.ebuild 6318 SHA256 6b3ebbf8919fd49a05c8d0e54bd9d5322ae6f8885f5dded3ce65c1570dfaf1cd SHA512 e9a958aa5ac7cb4450bb6a570d77be83073d358b97ad106bd37deabe347c1d4d3b163e7e3f453f7554d7e0ac788d916c404f7091aa8b6c74716e7800734d5a73 WHIRLPOOL 9b3abd55d6424ba9f7f1cd6a7e44136f7ab57b71d87b75ae55b50e483033edc06961453b994b05a1366a243c6af05936039d921a61096b1d99ec7ca6a80c7e7a EBUILD bash-4.2_p8-r1.ebuild 5549 SHA256 4ca7fc7ee535d0a034468acbe321ec37435a7790c0757b69f4a8e34fbdc0f178 SHA512 8e2c73a5e11fefc54696b4d66d0a362ded3ce5b21787b4f5fca158b36ee8d90a8344dbd44bcff66a204184b34d332b8d30bc2bf8729c4331fdd864f1c0308bcc WHIRLPOOL 97e01220b6fe2e6ccd79b1b1bada4ae554b6418b916570ea17d2b4b751c1739a7b1aba3cc2b767ac9f4e75728c569d5e51dc8dfd387e7181de430e3422da51ad -MISC ChangeLog 49187 SHA256 d2d48f5652f38b56957c820d640708369d4578d5c926ad7cd66378d7977066c3 SHA512 9935dc8fe3393028f8c1cb2175bcb9860878826a39d5f52221e80fb375a625a08a35e66abca353eb9c5210f00fa386e43d8985f762db8ca31c3345fa449f3c5f WHIRLPOOL d43b9fed11595eca3155c9d46bdc6ae5351b52504add0f03045e38ce21e42ae32a9d03e3ff1113d8743cc96b67ef46ecb373ec9328879ec9ab442833782448b8 +MISC ChangeLog 49358 SHA256 94155b238202a0246509bdf9997b7d28d6884dec41096619795ebdb48b6abf8d SHA512 a4a8e83cf51dc123356f3433eaf1494987f7eee9cc497c9712a505aa6a2d051f3f02c600568835a9aa7641a446d5924fad5652d940bbfb4751e628714952b8cd WHIRLPOOL 52e596bf50c4a0b186f9a8eaf613707d77d42ed4fbeedae54188e89bfde8076570435b61904b140f5e6a8b8ac9a9178f063e38da9dbffa4b804a9e5f8f5db2a4 MISC metadata.xml 568 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562 SHA512 e50fd93498123511ac7460795687e694d368aaa2e7001ad752aae7bb6b67ed4746c8e171e4d5ff42e6aade0fd29d001330afdb593b8446046a98b27b113b7c5e WHIRLPOOL 83ad81f6ec56c7deaaa1d6cd18ee73621f02bedb62201d59ac44676120251e040f73c9ef238d91abf0c8c7d115a8b4b8df6ea22b533102c8daadfad755de51d6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlAxpUIACgkQVWmRsqeSphMxTACfe1PUYa/KfhCsBAiLkqc1TtFq -rxsAn2fQVwn7MJ9LJwfjY8nIRlQOaPkT -=piwJ +iQIcBAEBCAAGBQJQNYTKAAoJELEHsLL7fEFWfNoP/1DHCLa4ctau1oBQJiqLgG77 +wUP4ioixIjmdDbrgFy8igCJSXAP9Fw2MLHZq9czD2WjQovaBDJpeu6R0NcNE/Ef8 +gJu4TEpjsYKvcE3dxua2zxHf+QH3O/TLz2uHN9DYk9KpFBD8f5VgXyTZ8XSMj4Ad +RJuJ9cmfynsyIMBpAyIcClWY9SEE500/+c3iuWArsK4FhCra/lTNBE0I1tEr22cA +peRi+kSlRV8RzBurvyi8zZNacvVchc76c+a3SqComAvpx4rnJJZYC/oqBylt0nD0 +2R5AA4bTltVg3lNxcrBX/Q22tH7tXXcZszttwYjuw9H3lbTKjkSJW9coqvcAhl8P +cmvI/KHd1pKgwgR7DXQMVc8RAkOoCuMhEbcU1S5Z9FgMnF49+65uvBpCkFdTFXj8 +9FNLrWTua+KiKwrg4U4Pbaq1fP9m4fYnBmkoIhTCTnUWSuh2V6ZWZn6blM73RNJb +i2MGDl3ZjC2dh6iOprlRwKAJSHgwVmSP0eGjF4lefY1b7wy4hbk52ZQgdi6Vj08y +O06jS8Uy319nUW2JEaksKg8hP9eU4stoZZ4eyi5e8HyIx+eCKPxOzesZDG2jrtj/ +TZYRVkyIdzwsSw4TC4fGJoejzRAwZUbGaoUwrS7ICT3BkfV/8zbe2+rHpQYKB4OL +wJLTpaBlcC8CEE4Nwh2P +=c093 -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-4.2_p37.ebuild b/app-shells/bash/bash-4.2_p37.ebuild index e54eff9c3af1..94e418d432a1 100644 --- a/app-shells/bash/bash-4.2_p37.ebuild +++ b/app-shells/bash/bash-4.2_p37.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild,v 1.5 2012/08/20 02:46:57 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild,v 1.6 2012/08/23 01:17:53 vapier Exp $ EAPI="1" @@ -151,8 +151,20 @@ src_install() { newins "${FILESDIR}"/dot-${f} .${f} done - sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc - sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc + local sed_args=( + -e "s:#${USERLAND}#@::" + -e '/#@/d' + ) + if ! use readline ; then + sed_args+=( #432338 + -e '/^shopt -s histappend/s:^:#:' + -e 's:use_color=true:use_color=false:' + ) + fi + sed -i \ + "${sed_args[@]}" \ + "${D}"/etc/skel/.bashrc \ + "${D}"/etc/bash/bashrc || die if use plugins ; then exeinto /usr/$(get_libdir)/bash |