commit: ba04c1e8c19c6e32fbb04705db227aeed983e8d9 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sun Nov 29 19:03:55 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sun Nov 29 19:11:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba04c1e8
app-shells/bash: Backport system-readline sed fixes Bug: https://bugs.gentoo.org/757519 Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-shells/bash/bash-2.05b_p13.ebuild | 2 +- app-shells/bash/bash-3.0_p22.ebuild | 2 +- app-shells/bash/bash-3.1_p23.ebuild | 2 +- app-shells/bash/bash-3.2_p57.ebuild | 2 +- app-shells/bash/bash-4.0_p44.ebuild | 2 +- app-shells/bash/bash-4.1_p17.ebuild | 2 +- app-shells/bash/bash-4.2_p53.ebuild | 2 +- app-shells/bash/bash-4.3_p48-r2.ebuild | 2 +- app-shells/bash/bash-4.4_p23-r2.ebuild | 2 +- app-shells/bash/bash-5.0_p18.ebuild | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild index 9c9eb79db32..9c9e3fec805 100644 --- a/app-shells/bash/bash-2.05b_p13.ebuild +++ b/app-shells/bash/bash-2.05b_p13.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Clean out local libs so we know we use system ones rm -rf lib/{readline,termcap}/* || die touch lib/{readline,termcap}/Makefile.in || die # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die default } diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild index 6437d45fb53..d6a10f4002e 100644 --- a/app-shells/bash/bash-3.0_p22.ebuild +++ b/app-shells/bash/bash-3.0_p22.ebuild @@ -79,7 +79,7 @@ src_prepare() { # Clean out local libs so we know we use system ones rm -rf lib/{readline,termcap}/* || die touch lib/{readline,termcap}/Makefile.in || die # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die default } diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild index ad1a7e46c42..cf6a8d6a93c 100644 --- a/app-shells/bash/bash-3.1_p23.ebuild +++ b/app-shells/bash/bash-3.1_p23.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Clean out local libs so we know we use system ones rm -rf lib/{readline,termcap}/* || die touch lib/{readline,termcap}/Makefile.in || die # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die default } diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild index f555e3f03de..2a5bfa279ff 100644 --- a/app-shells/bash/bash-3.2_p57.ebuild +++ b/app-shells/bash/bash-3.2_p57.ebuild @@ -78,7 +78,7 @@ src_prepare() { # Clean out local libs so we know we use system ones rm -rf lib/{readline,termcap}/* || die touch lib/{readline,termcap}/Makefile.in || die # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die default } diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild index 560929519b5..878f660af57 100644 --- a/app-shells/bash/bash-4.0_p44.ebuild +++ b/app-shells/bash/bash-4.0_p44.ebuild @@ -75,7 +75,7 @@ src_prepare() { # Clean out local libs so we know we use system ones rm -rf lib/{readline,termcap}/* || die touch lib/{readline,termcap}/Makefile.in || die # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die default diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild index 9c68ac62d28..198646cc65f 100644 --- a/app-shells/bash/bash-4.1_p17.ebuild +++ b/app-shells/bash/bash-4.1_p17.ebuild @@ -71,7 +71,7 @@ src_prepare() { # Clean out local libs so we know we use system ones rm -rf lib/{readline,termcap}/* || die touch lib/{readline,termcap}/Makefile.in || die # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die default diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild index 1e566e163ed..1ab928bd118 100644 --- a/app-shells/bash/bash-4.2_p53.ebuild +++ b/app-shells/bash/bash-4.2_p53.ebuild @@ -74,7 +74,7 @@ src_prepare() { # Clean out local libs so we know we use system ones rm -rf lib/{readline,termcap}/* || die touch lib/{readline,termcap}/Makefile.in || die # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die # Avoid regenerating docs after patches #407985 sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild index d535737ea7e..bb767f76384 100644 --- a/app-shells/bash/bash-4.3_p48-r2.ebuild +++ b/app-shells/bash/bash-4.3_p48-r2.ebuild @@ -81,7 +81,7 @@ src_prepare() { if [[ ${PV} != *_rc* ]] ; then rm -rf lib/{readline,termcap}/* || die touch lib/{readline,termcap}/Makefile.in || die # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die fi # Avoid regenerating docs after patches #407985 diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild index 518e64ef49f..7e210e06b83 100644 --- a/app-shells/bash/bash-4.4_p23-r2.ebuild +++ b/app-shells/bash/bash-4.4_p23-r2.ebuild @@ -89,7 +89,7 @@ src_prepare() { if is_release ; then rm -rf lib/{readline,termcap}/* || die touch lib/{readline,termcap}/Makefile.in || die # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die fi # Prefixify hardcoded path names. No-op for non-prefix. diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild index 37017ab2929..1b63b4bac05 100644 --- a/app-shells/bash/bash-5.0_p18.ebuild +++ b/app-shells/bash/bash-5.0_p18.ebuild @@ -92,7 +92,7 @@ src_prepare() { if is_release ; then rm -rf lib/{readline,termcap}/* || die touch lib/{readline,termcap}/Makefile.in || die # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die fi # Prefixify hardcoded path names. No-op for non-prefix.
