From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1679536-garchives=archives.gentoo.org@lists.gentoo.org> 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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51A62158046 for <garchives@archives.gentoo.org>; Sat, 12 Oct 2024 23:45:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71713E088B; Sat, 12 Oct 2024 23:45:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 50028E0887 for <gentoo-commits@lists.gentoo.org>; Sat, 12 Oct 2024 23:45:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 466E1342F9D for <gentoo-commits@lists.gentoo.org>; Sat, 12 Oct 2024 23:45:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE0BAAE7 for <gentoo-commits@lists.gentoo.org>; Sat, 12 Oct 2024 23:45:39 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1728776691.d1e4923bab5add3714f0b72cbbbe0e0914cd9be5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/readline/Manifest sys-libs/readline/readline-8.3_alpha_p20241011.ebuild sys-libs/readline/readline-9999.ebuild X-VCS-Directories: sys-libs/readline/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d1e4923bab5add3714f0b72cbbbe0e0914cd9be5 X-VCS-Branch: master Date: Sat, 12 Oct 2024 23:45:39 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7072891d-6ab6-4f32-9a70-10bd414c02c5 X-Archives-Hash: 8d161911811fb3076e8465b9f875c3b1 commit: d1e4923bab5add3714f0b72cbbbe0e0914cd9be5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Oct 12 23:44:00 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 12 23:44:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e4923b sys-libs/readline: add 8.3_alpha_p20241011 Same rationale as 7d0650b0cb4ad082a59e49dba5a81e143470c907. This mostly syncs sys-libs/readline with app-shells/bash ebuild-wise again too. Note that we use bundled readline in bash for non-releases anyway so this is just for the benefit of testing other applications. Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/readline/Manifest | 1 + ....ebuild => readline-8.3_alpha_p20241011.ebuild} | 59 ++++++++++++---------- sys-libs/readline/readline-9999.ebuild | 59 ++++++++++++---------- 3 files changed, 63 insertions(+), 56 deletions(-) diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest index ec662f09bde5..a00867779d07 100644 --- a/sys-libs/readline/Manifest +++ b/sys-libs/readline/Manifest @@ -5,6 +5,7 @@ DIST readline-8.2.tar.gz 3043952 BLAKE2B 7974322b9c092a756a79e537df08e8532f8e0fc DIST readline-8.2.tar.gz.sig 95 BLAKE2B dc510459c0c47782ca87364a6677b4d8f0b68a984143122c08bd15aef08a71bff59ac92d3c3ada518dad09f189c144748e840175041eb619f679e2d8b95dc2aa SHA512 0effd273689e5f7fe7e049c8f2c5f3c97149f198a90d053231ee4de34901560a465ab0d4fd71fd07c7d7e233caed7f42e5b668bffaf1e23a7eb373c8f9e150fe DIST readline-8.3-alpha.tar.gz 3091427 BLAKE2B f40e1db1ea39bbf4183901688733df0c67666eb58a33333f9b57ea7ba5399956f5523748ecce9bc5b6dc1954647c0bceb6ebbb4fe93b0085a595047650ad7c7e SHA512 d3aacd82826f1d1adc7ea846d8b8e70726da925e74a8bb1d141a9093e0d5e375236d1c745f0609f8ba3aff9f5266b1cf3da31d76e414a284b6ed798d92a1a1f6 DIST readline-8.3-alpha.tar.gz.sig 95 BLAKE2B c11d1b4dd8f453bc5f7d19dd25901bfa4796825efa4f07f2043aa94d556a39bc1c928aed7fdc09ed6325c6ef017f72df18bbdd461a52a7122ccdf9b58a345c17 SHA512 fb070ae3dbafa042f591d8a5c24f48b40a672843e41e78f5d6a5ded5228046fe75893be6b10a9634d8852617bfa8b675e68a4c808f06ee95f07a40536fc63769 +DIST readline-8.3_alpha_p20241011-4d34c34b3aa955f65e79bfbf7b7426344a3c2840.tar.gz 3179300 BLAKE2B ea4bab2b8e4da4590caedef5f3b7fccd4a9aef0fff4d150ef15c4185ee2609c29aab43777084e270226d8641c91cbab92da55e77c27c42dcfc360a6abf7df9bb SHA512 93617234b7ab080ed1f8c52cfc79fd6e54ac818ed29a3016915b51ccc6c8f5ece5e0ee0ba9668e6ed2ba64bacc82c164d19846bcc2bb78933b2927b4f2a2d968 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54 DIST readline81-001.sig 95 BLAKE2B 7d523d0fc21772cb03aa4b5d66ea58c1a99a6c0e4a8625e89cad015cbff63cd68e08207ca5150819225300ac864806032888104bbbea64ca38ebf89e28c24b7e SHA512 7fa3747e388aecb26f2d4f8346b89b367710ea99a14618c625066b820901dc467bd156ec37340fde1f86f0fe0d6b33044c1ed5768cf8ed1a25386d32dc6419a6 DIST readline81-002 1242 BLAKE2B 4ef0404561bd8fc5559e8e5f675ae3f12c467178a8954f54f3204c2d09b88ccec960e807c7af0ec3514b489b676e3be51f98351e377fb18e3d7a14d33d4da69d SHA512 e47c029b82cf3a4d44e85c4348f7e059c56726694c190d84186822e1c893e1c006e7ec75f33c36791112f81abd792a2e2fdae9a65cd128f3c89ff4ffd9a9a1ff diff --git a/sys-libs/readline/readline-9999.ebuild b/sys-libs/readline/readline-8.3_alpha_p20241011.ebuild similarity index 86% copy from sys-libs/readline/readline-9999.ebuild copy to sys-libs/readline/readline-8.3_alpha_p20241011.ebuild index 050abf97ed41..a5ecc024b54d 100644 --- a/sys-libs/readline/readline-9999.ebuild +++ b/sys-libs/readline/readline-8.3_alpha_p20241011.ebuild @@ -18,18 +18,18 @@ MY_PV="${MY_PV/_/-}" MY_P="${PN}-${MY_PV}" MY_PATCHES=() -is_release() { - case ${PV} in - 9999|*_alpha*|*_beta*|*_rc*) - return 1 - ;; - *) - return 0 - ;; - esac -} - -[[ ${PV} != *_p* ]] && PLEVEL=0 +# Determine the patchlevel. +case ${PV} in + 9999|*_alpha*|*_beta*|*_rc*) + # Set a negative patchlevel to indicate that it's a pre-release. + PLEVEL=-1 + ;; + *_p*) + PLEVEL=${PV##*_p} + ;; + *) + PLEVEL=0 +esac DESCRIPTION="Another cute console display library" HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git" @@ -38,9 +38,19 @@ 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 +elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then + # It can be useful to have snapshots in the pre-release period once + # the first alpha is out, as various bugs get reported and fixed from + # the alpha, and the next pre-release is usually quite far away. + # + # i.e. if it's worth packaging the alpha, it's worth packaging a followup. + READLINE_COMMIT="4d34c34b3aa955f65e79bfbf7b7426344a3c2840" + SRC_URI="https://git.savannah.gnu.org/cgit/readline.git/snapshot/readline-${READLINE_COMMIT}.tar.gz -> ${P}-${READLINE_COMMIT}.tar.gz" + S=${WORKDIR}/${PN}-${READLINE_COMMIT} +else SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )" + S="${WORKDIR}/${MY_P}" if [[ ${PLEVEL} -gt 0 ]] ; then # bash-5.1 -> bash51 @@ -68,20 +78,11 @@ elif is_release ; then unset my_p patch_url my_patch_index upstream_url_base mirror_url_base fi -else - SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz" - SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz.sig )" -fi - -S="${WORKDIR}/${MY_P}" - -if ! is_release ; then - inherit autotools fi LICENSE="GPL-3+" SLOT="0/8" # subslot matches SONAME major -if is_release ; then +if (( PLEVEL >= 0 )); then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="static-libs +unicode utils" @@ -107,6 +108,8 @@ src_unpack() { if [[ ${PV} == 9999 ]]; then git-r3_src_unpack + elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then + default else if use verify-sig; then verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig} @@ -118,18 +121,18 @@ src_unpack() { unpack "${MY_P}.tar.gz" - #if [[ ${GENTOO_PATCH_VER} ]]; then - # unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" - #fi + if [[ ${GENTOO_PATCH_VER} ]]; then + unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" + fi fi } src_prepare() { - [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}" + (( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}" default - is_release || eautoreconf + #(( PLEVEL < 0 )) && 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-9999.ebuild b/sys-libs/readline/readline-9999.ebuild index 050abf97ed41..a5ecc024b54d 100644 --- a/sys-libs/readline/readline-9999.ebuild +++ b/sys-libs/readline/readline-9999.ebuild @@ -18,18 +18,18 @@ MY_PV="${MY_PV/_/-}" MY_P="${PN}-${MY_PV}" MY_PATCHES=() -is_release() { - case ${PV} in - 9999|*_alpha*|*_beta*|*_rc*) - return 1 - ;; - *) - return 0 - ;; - esac -} - -[[ ${PV} != *_p* ]] && PLEVEL=0 +# Determine the patchlevel. +case ${PV} in + 9999|*_alpha*|*_beta*|*_rc*) + # Set a negative patchlevel to indicate that it's a pre-release. + PLEVEL=-1 + ;; + *_p*) + PLEVEL=${PV##*_p} + ;; + *) + PLEVEL=0 +esac DESCRIPTION="Another cute console display library" HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git" @@ -38,9 +38,19 @@ 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 +elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then + # It can be useful to have snapshots in the pre-release period once + # the first alpha is out, as various bugs get reported and fixed from + # the alpha, and the next pre-release is usually quite far away. + # + # i.e. if it's worth packaging the alpha, it's worth packaging a followup. + READLINE_COMMIT="4d34c34b3aa955f65e79bfbf7b7426344a3c2840" + SRC_URI="https://git.savannah.gnu.org/cgit/readline.git/snapshot/readline-${READLINE_COMMIT}.tar.gz -> ${P}-${READLINE_COMMIT}.tar.gz" + S=${WORKDIR}/${PN}-${READLINE_COMMIT} +else SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )" + S="${WORKDIR}/${MY_P}" if [[ ${PLEVEL} -gt 0 ]] ; then # bash-5.1 -> bash51 @@ -68,20 +78,11 @@ elif is_release ; then unset my_p patch_url my_patch_index upstream_url_base mirror_url_base fi -else - SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz" - SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz.sig )" -fi - -S="${WORKDIR}/${MY_P}" - -if ! is_release ; then - inherit autotools fi LICENSE="GPL-3+" SLOT="0/8" # subslot matches SONAME major -if is_release ; then +if (( PLEVEL >= 0 )); then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="static-libs +unicode utils" @@ -107,6 +108,8 @@ src_unpack() { if [[ ${PV} == 9999 ]]; then git-r3_src_unpack + elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then + default else if use verify-sig; then verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig} @@ -118,18 +121,18 @@ src_unpack() { unpack "${MY_P}.tar.gz" - #if [[ ${GENTOO_PATCH_VER} ]]; then - # unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" - #fi + if [[ ${GENTOO_PATCH_VER} ]]; then + unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" + fi fi } src_prepare() { - [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}" + (( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}" default - is_release || eautoreconf + #(( PLEVEL < 0 )) && eautoreconf if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then # If we're bootstrapping, make a guess. We don't have pkg-config