[gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/

["Sam James" <sam@gentoo.org>]

commit:     93e08a1e53e8afdfb3af12e4c5e805e66c8504b9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 18:57:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 18:58:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e08a1e

sys-libs/readline: add 9999

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/readline/readline-8.2_beta.ebuild         | 49 +++++++++++++---------
 ...adline-8.2_beta.ebuild => readline-9999.ebuild} | 49 +++++++++++++---------
 2 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/sys-libs/readline/readline-8.2_beta.ebuild b/sys-libs/readline/readline-8.2_beta.ebuild
index 82ba899affea..90c2837bb864 100644
--- a/sys-libs/readline/readline-8.2_beta.ebuild
+++ b/sys-libs/readline/readline-8.2_beta.ebuild
@@ -12,6 +12,12 @@ PLEVEL="${PV##*_p}"
 MY_PV="${PV/_p*}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
+is_release() {
+	case ${PV} in
+		9999|*_alpha*|*_beta*|*_rc*) return 1 ;;
+		*) return 0 ;;
+	esac
+}
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
 	[[ ${PLEVEL} -eq 0 ]] && return 1
@@ -32,23 +38,25 @@ patches() {
 DESCRIPTION="Another cute console display library"
 HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
 
-case ${PV} in
-	*_alpha*|*_beta*|*_rc*)
-		# TODO: check if needed on next alpha/beta
-		inherit autotools
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/readline.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif is_release ; then
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
+else
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
 
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-		SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-	;;
-	*)
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-		SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
-	;;
-esac
+if ! is_release ; then
+	inherit autotools
+fi
 
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
-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="static-libs +unicode utils"
@@ -70,19 +78,22 @@ PATCHES=(
 	#"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
 )
 
-# Needed because we don't want the patches being unpacked
-# (which emits annoying and useless error messages)
 src_unpack() {
-	verify-sig_src_unpack
-
-	unpack ${MY_P}.tar.gz
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		# Needed because we don't want the patches being unpacked
+		# (which emits annoying and useless error messages)
+		verify-sig_src_unpack
+		unpack ${MY_P}.tar.gz
+	fi
 }
 
 src_prepare() {
 	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 	default
 
-	[[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]] && eautoreconf
+	is_release || eautoreconf
 
 	if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
 		# If we're bootstrapping, make a guess. We don't have pkg-config

diff --git a/sys-libs/readline/readline-8.2_beta.ebuild b/sys-libs/readline/readline-9999.ebuild
similarity index 86%
copy from sys-libs/readline/readline-8.2_beta.ebuild
copy to sys-libs/readline/readline-9999.ebuild
index 82ba899affea..90c2837bb864 100644
--- a/sys-libs/readline/readline-8.2_beta.ebuild
+++ b/sys-libs/readline/readline-9999.ebuild
@@ -12,6 +12,12 @@ PLEVEL="${PV##*_p}"
 MY_PV="${PV/_p*}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
+is_release() {
+	case ${PV} in
+		9999|*_alpha*|*_beta*|*_rc*) return 1 ;;
+		*) return 0 ;;
+	esac
+}
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
 	[[ ${PLEVEL} -eq 0 ]] && return 1
@@ -32,23 +38,25 @@ patches() {
 DESCRIPTION="Another cute console display library"
 HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
 
-case ${PV} in
-	*_alpha*|*_beta*|*_rc*)
-		# TODO: check if needed on next alpha/beta
-		inherit autotools
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/readline.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif is_release ; then
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
+else
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
 
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-		SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-	;;
-	*)
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-		SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
-	;;
-esac
+if ! is_release ; then
+	inherit autotools
+fi
 
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
-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="static-libs +unicode utils"
@@ -70,19 +78,22 @@ PATCHES=(
 	#"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
 )
 
-# Needed because we don't want the patches being unpacked
-# (which emits annoying and useless error messages)
 src_unpack() {
-	verify-sig_src_unpack
-
-	unpack ${MY_P}.tar.gz
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		# Needed because we don't want the patches being unpacked
+		# (which emits annoying and useless error messages)
+		verify-sig_src_unpack
+		unpack ${MY_P}.tar.gz
+	fi
 }
 
 src_prepare() {
 	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 	default
 
-	[[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]] && eautoreconf
+	is_release || eautoreconf
 
 	if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
 		# If we're bootstrapping, make a guess. We don't have pkg-config