From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1524817-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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F167515806E for <garchives@archives.gentoo.org>; Fri, 2 Jun 2023 21:47:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89903E08B1; Fri, 2 Jun 2023 21:47:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7177EE08B1 for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jun 2023 21:47:14 +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 A733C341274 for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jun 2023 21:47:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE7AFA71 for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jun 2023 21:47:11 +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: <1685742390.3a5856cbd1379c26f1af82ebeea52252d194487a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/readline/readline-8.1_p2-r1.ebuild sys-libs/readline/readline-8.2_p1.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: 3a5856cbd1379c26f1af82ebeea52252d194487a X-VCS-Branch: master Date: Fri, 2 Jun 2023 21:47:11 +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: 108b3024-d7a3-46d2-be07-abd5e4f8245c X-Archives-Hash: c58f80c4da43be8a77cbadf19dd7f75a commit: 3a5856cbd1379c26f1af82ebeea52252d194487a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jun 2 21:19:59 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 2 21:46:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5856cb sys-libs/readline: sync SRC_URI generation with app-shells/bash It's an optimisation here too, but it's less impactful than it was for bash. Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/readline/readline-8.1_p2-r1.ebuild | 21 ++++++++++++++------- sys-libs/readline/readline-8.2_p1.ebuild | 21 ++++++++++++++------- sys-libs/readline/readline-9999.ebuild | 21 ++++++++++++++------- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/sys-libs/readline/readline-8.1_p2-r1.ebuild b/sys-libs/readline/readline-8.1_p2-r1.ebuild index 8ea92d520d24..8e926747c368 100644 --- a/sys-libs/readline/readline-8.1_p2-r1.ebuild +++ b/sys-libs/readline/readline-8.1_p2-r1.ebuild @@ -36,17 +36,24 @@ case ${PV} in patch_url= my_patch_index= + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do - patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index}) - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - done + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_pn patch_url my_patch_index + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base fi ;; esac diff --git a/sys-libs/readline/readline-8.2_p1.ebuild b/sys-libs/readline/readline-8.2_p1.ebuild index b9f1a3da0874..29aa8e80be60 100644 --- a/sys-libs/readline/readline-8.2_p1.ebuild +++ b/sys-libs/readline/readline-8.2_p1.ebuild @@ -49,17 +49,24 @@ elif is_release ; then patch_url= my_patch_index= + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do - patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index}) - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - done + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_pn patch_url my_patch_index + 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/bash/${MY_P}.tar.gz" diff --git a/sys-libs/readline/readline-9999.ebuild b/sys-libs/readline/readline-9999.ebuild index b9f1a3da0874..29aa8e80be60 100644 --- a/sys-libs/readline/readline-9999.ebuild +++ b/sys-libs/readline/readline-9999.ebuild @@ -49,17 +49,24 @@ elif is_release ; then patch_url= my_patch_index= + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do - patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index}) - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - done + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_pn patch_url my_patch_index + 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/bash/${MY_P}.tar.gz"