From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A6D213835A for ; Sun, 29 Nov 2020 19:11:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1637E0829; Sun, 29 Nov 2020 19:11:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B254E0829 for ; Sun, 29 Nov 2020 19:11:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EDDA03413B4 for ; Sun, 29 Nov 2020 19:11:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37C4A472 for ; Sun, 29 Nov 2020 19:11:40 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1606677095.ba04c1e8c19c6e32fbb04705db227aeed983e8d9.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/bash/bash-2.05b_p13.ebuild app-shells/bash/bash-3.0_p22.ebuild app-shells/bash/bash-3.1_p23.ebuild app-shells/bash/bash-3.2_p57.ebuild app-shells/bash/bash-4.0_p44.ebuild app-shells/bash/bash-4.1_p17.ebuild app-shells/bash/bash-4.2_p53.ebuild app-shells/bash/bash-4.3_p48-r2.ebuild app-shells/bash/bash-4.4_p23-r2.ebuild app-shells/bash/bash-5.0_p18.ebuild X-VCS-Directories: app-shells/bash/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: ba04c1e8c19c6e32fbb04705db227aeed983e8d9 X-VCS-Branch: master Date: Sun, 29 Nov 2020 19:11:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c675ae08-e4a2-4421-9585-0b46c13ee645 X-Archives-Hash: fc990b723dc94f1a5b9b7b7b359f1049 commit: ba04c1e8c19c6e32fbb04705db227aeed983e8d9 Author: Lars Wendler gentoo org> AuthorDate: Sun Nov 29 19:03:55 2020 +0000 Commit: Lars Wendler gentoo 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 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.