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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42AD9158003 for ; Tue, 19 Apr 2022 18:59:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CC99E095F; Tue, 19 Apr 2022 18:59:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DAB2AE095F for ; Tue, 19 Apr 2022 18:59:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A9ED341B96 for ; Tue, 19 Apr 2022 18:59:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C85B2105 for ; Tue, 19 Apr 2022 18:59:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650394733.c6541a10d387eeb502fc2c9a05c21db8b50c4e02.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/bash/bash-5.2_beta.ebuild app-shells/bash/bash-9999.ebuild X-VCS-Directories: app-shells/bash/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c6541a10d387eeb502fc2c9a05c21db8b50c4e02 X-VCS-Branch: master Date: Tue, 19 Apr 2022 18:59:17 +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: ed8ac79d-450d-4d7e-bbd7-02151402f3c5 X-Archives-Hash: 70fecf4d35b4d8c109da2f6f3b5b24be commit: c6541a10d387eeb502fc2c9a05c21db8b50c4e02 Author: Sam James gentoo org> AuthorDate: Tue Apr 19 18:48:29 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 19 18:58:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6541a10 app-shells/bash: add 9999 Signed-off-by: Sam James gentoo.org> app-shells/bash/bash-5.2_beta.ebuild | 21 ++++++++++------- .../{bash-5.2_beta.ebuild => bash-9999.ebuild} | 26 +++++++++++++--------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/app-shells/bash/bash-5.2_beta.ebuild b/app-shells/bash/bash-5.2_beta.ebuild index 9c0db54a6049..c5b8657f7f0d 100644 --- a/app-shells/bash/bash-5.2_beta.ebuild +++ b/app-shells/bash/bash-5.2_beta.ebuild @@ -20,7 +20,7 @@ MY_PV="${MY_PV/_/-}" MY_P="${PN}-${MY_PV}" is_release() { case ${PV} in - *_alpha*|*_beta*|*_rc*) return 1 ;; + 9999|*_alpha*|*_beta*|*_rc*) return 1 ;; *) return 0 ;; esac } @@ -46,7 +46,10 @@ READLINE_VER="8.2_beta" DESCRIPTION="The standard GNU Bourne again shell" HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html" -if is_release ; then +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git" + inherit git-r3 +elif is_release ; then SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )" else @@ -56,7 +59,7 @@ fi LICENSE="GPL-3" SLOT="0" -if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]] ; then +if is_release ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" @@ -95,9 +98,12 @@ pkg_setup() { } src_unpack() { - verify-sig_src_unpack - - unpack ${MY_P}.tar.gz + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + verify-sig_src_unpack + unpack ${MY_P}.tar.gz + fi } src_prepare() { @@ -167,8 +173,7 @@ src_configure() { # is at least what's in the DEPEND up above. export ac_cv_rl_version=${READLINE_VER%%_*} - # TODO: Clean this up before 5.2 release - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]] || is_release ; then + if is_release ; then # Use system readline only with released versions. myconf+=( --with-installed-readline=. ) fi diff --git a/app-shells/bash/bash-5.2_beta.ebuild b/app-shells/bash/bash-9999.ebuild similarity index 94% copy from app-shells/bash/bash-5.2_beta.ebuild copy to app-shells/bash/bash-9999.ebuild index 9c0db54a6049..c93d31e357b8 100644 --- a/app-shells/bash/bash-5.2_beta.ebuild +++ b/app-shells/bash/bash-9999.ebuild @@ -5,8 +5,6 @@ EAPI=7 # TODO on release: # - check READLINE_VER, obviously -# - remove autotools/eautoreconf from readline ebuild -# - tidy up is_release check in this ebuild for using system readline # (presumably there weren't always readline releases for bash RCs etc) VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc @@ -20,8 +18,8 @@ MY_PV="${MY_PV/_/-}" MY_P="${PN}-${MY_PV}" is_release() { case ${PV} in - *_alpha*|*_beta*|*_rc*) return 1 ;; - *) return 0 ;; + 9999|*_alpha*|*_beta*|*_rc*) return 1 ;; + *) return 0 ;; esac } [[ ${PV} != *_p* ]] && PLEVEL=0 @@ -46,7 +44,11 @@ READLINE_VER="8.2_beta" DESCRIPTION="The standard GNU Bourne again shell" HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html" -if is_release ; then +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git" + EGIT_BRANCH=devel + inherit git-r3 +elif is_release ; then SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )" else @@ -56,7 +58,7 @@ fi LICENSE="GPL-3" SLOT="0" -if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]] ; then +if is_release ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" @@ -95,9 +97,12 @@ pkg_setup() { } src_unpack() { - verify-sig_src_unpack - - unpack ${MY_P}.tar.gz + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + verify-sig_src_unpack + unpack ${MY_P}.tar.gz + fi } src_prepare() { @@ -167,8 +172,7 @@ src_configure() { # is at least what's in the DEPEND up above. export ac_cv_rl_version=${READLINE_VER%%_*} - # TODO: Clean this up before 5.2 release - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]] || is_release ; then + if is_release ; then # Use system readline only with released versions. myconf+=( --with-installed-readline=. ) fi