| 1 |
vapier 12/08/23 01:17:53 |
| 2 |
|
| 3 |
Modified: bash-4.2_p37.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Disable readline-specific options in bashrc when USE=-readline #432338 by Agostino Sarubbo. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 app-shells/bash/bash-4.2_p37.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: bash-4.2_p37.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- bash-4.2_p37.ebuild 20 Aug 2012 02:46:57 -0000 1.5 |
| 23 |
+++ bash-4.2_p37.ebuild 23 Aug 2012 01:17:53 -0000 1.6 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild,v 1.5 2012/08/20 02:46:57 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild,v 1.6 2012/08/23 01:17:53 vapier Exp $ |
| 29 |
|
| 30 |
EAPI="1" |
| 31 |
|
| 32 |
@@ -151,8 +151,20 @@ |
| 33 |
newins "${FILESDIR}"/dot-${f} .${f} |
| 34 |
done |
| 35 |
|
| 36 |
- sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc |
| 37 |
- sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc |
| 38 |
+ local sed_args=( |
| 39 |
+ -e "s:#${USERLAND}#@::" |
| 40 |
+ -e '/#@/d' |
| 41 |
+ ) |
| 42 |
+ if ! use readline ; then |
| 43 |
+ sed_args+=( #432338 |
| 44 |
+ -e '/^shopt -s histappend/s:^:#:' |
| 45 |
+ -e 's:use_color=true:use_color=false:' |
| 46 |
+ ) |
| 47 |
+ fi |
| 48 |
+ sed -i \ |
| 49 |
+ "${sed_args[@]}" \ |
| 50 |
+ "${D}"/etc/skel/.bashrc \ |
| 51 |
+ "${D}"/etc/bash/bashrc || die |
| 52 |
|
| 53 |
if use plugins ; then |
| 54 |
exeinto /usr/$(get_libdir)/bash |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.320 app-shells/bash/ChangeLog |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?rev=1.320&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?rev=1.320&content-type=text/plain |
| 62 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?r1=1.319&r2=1.320 |
| 63 |
|
| 64 |
Index: ChangeLog |
| 65 |
=================================================================== |
| 66 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v |
| 67 |
retrieving revision 1.319 |
| 68 |
retrieving revision 1.320 |
| 69 |
diff -u -r1.319 -r1.320 |
| 70 |
--- ChangeLog 20 Aug 2012 02:46:57 -0000 1.319 |
| 71 |
+++ ChangeLog 23 Aug 2012 01:17:53 -0000 1.320 |
| 72 |
@@ -1,6 +1,10 @@ |
| 73 |
# ChangeLog for app-shells/bash |
| 74 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 75 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.319 2012/08/20 02:46:57 jer Exp $ |
| 76 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.320 2012/08/23 01:17:53 vapier Exp $ |
| 77 |
+ |
| 78 |
+ 23 Aug 2012; Mike Frysinger <vapier@g.o> bash-4.2_p37.ebuild: |
| 79 |
+ Disable readline-specific options in bashrc when USE=-readline #432338 by |
| 80 |
+ Agostino Sarubbo. |
| 81 |
|
| 82 |
20 Aug 2012; Jeroen Roovers <jer@g.o> bash-4.2_p37.ebuild: |
| 83 |
Stable for HPPA (bug #431850). |
Archives