commit: b89474541cd2e036b92ea4406b257f41c0c6a20f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jun 2 19:05:35 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 2 19:08:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8947454
sys-libs/readline: drop ftp from SRC_URI It shouldn't be needed these days, as e.g. alphas and such appear on the GNU mirrors too. Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/readline/readline-8.1_p2-r2.ebuild | 13 ++++--------- sys-libs/readline/readline-8.2_p13-r1.ebuild | 11 +++-------- sys-libs/readline/readline-8.2_p13.ebuild | 13 ++++--------- sys-libs/readline/readline-8.3_rc1.ebuild | 7 +------ sys-libs/readline/readline-8.3_rc1_p20250530.ebuild | 7 +------ sys-libs/readline/readline-9999.ebuild | 9 ++------- 6 files changed, 15 insertions(+), 45 deletions(-) diff --git a/sys-libs/readline/readline-8.1_p2-r2.ebuild b/sys-libs/readline/readline-8.1_p2-r2.ebuild index 256df55531d9..9be426ec82e5 100644 --- a/sys-libs/readline/readline-8.1_p2-r2.ebuild +++ b/sys-libs/readline/readline-8.1_p2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,8 +21,8 @@ HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"; case ${PV} in *_alpha*|*_beta*|*_rc*) - SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"; - SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )" + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )" ;; *) @@ -38,7 +38,6 @@ case ${PV} in 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 printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} @@ -47,14 +46,10 @@ case ${PV} in 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}}.sig )" - MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_p patch_url my_patch_index upstream_url_base mirror_url_base + unset my_p patch_url my_patch_index upstream_url_base fi ;; esac diff --git a/sys-libs/readline/readline-8.2_p13-r1.ebuild b/sys-libs/readline/readline-8.2_p13-r1.ebuild index 6c35907aba4a..a835109c5ed0 100644 --- a/sys-libs/readline/readline-8.2_p13-r1.ebuild +++ b/sys-libs/readline/readline-8.2_p13-r1.ebuild @@ -51,7 +51,6 @@ elif is_release ; then my_patch_index= upstream_url_base="mirror://gnu/readline" - mirror_url_base="ftp://ftp.cwru.edu/pub/readline"; for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} @@ -60,18 +59,14 @@ elif is_release ; then 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}}.sig )" - MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_p patch_url my_patch_index upstream_url_base mirror_url_base + unset my_p patch_url my_patch_index upstream_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 )" + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )" fi S="${WORKDIR}/${MY_P}" diff --git a/sys-libs/readline/readline-8.2_p13.ebuild b/sys-libs/readline/readline-8.2_p13.ebuild index 1872970ab552..b100209d9609 100644 --- a/sys-libs/readline/readline-8.2_p13.ebuild +++ b/sys-libs/readline/readline-8.2_p13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -51,7 +51,6 @@ elif is_release ; then my_patch_index= upstream_url_base="mirror://gnu/readline" - mirror_url_base="ftp://ftp.cwru.edu/pub/readline"; for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} @@ -60,18 +59,14 @@ elif is_release ; then 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}}.sig )" - MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_p patch_url my_patch_index upstream_url_base mirror_url_base + unset my_p patch_url my_patch_index upstream_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 )" + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )" fi S="${WORKDIR}/${MY_P}" diff --git a/sys-libs/readline/readline-8.3_rc1.ebuild b/sys-libs/readline/readline-8.3_rc1.ebuild index 974757631917..808d9c506ae3 100644 --- a/sys-libs/readline/readline-8.3_rc1.ebuild +++ b/sys-libs/readline/readline-8.3_rc1.ebuild @@ -60,7 +60,6 @@ else my_patch_index= upstream_url_base="mirror://gnu/readline" - mirror_url_base="ftp://ftp.cwru.edu/pub/readline"; for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} @@ -69,14 +68,10 @@ else 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}}.sig )" - MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_p patch_url my_patch_index upstream_url_base mirror_url_base + unset my_p patch_url my_patch_index upstream_url_base fi fi diff --git a/sys-libs/readline/readline-8.3_rc1_p20250530.ebuild b/sys-libs/readline/readline-8.3_rc1_p20250530.ebuild index 9e75fb4b3420..5d268da2a823 100644 --- a/sys-libs/readline/readline-8.3_rc1_p20250530.ebuild +++ b/sys-libs/readline/readline-8.3_rc1_p20250530.ebuild @@ -60,7 +60,6 @@ else my_patch_index= upstream_url_base="mirror://gnu/readline" - mirror_url_base="ftp://ftp.cwru.edu/pub/readline"; for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} @@ -69,14 +68,10 @@ else 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}}.sig )" - MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_p patch_url my_patch_index upstream_url_base mirror_url_base + unset my_p patch_url my_patch_index upstream_url_base fi fi diff --git a/sys-libs/readline/readline-9999.ebuild b/sys-libs/readline/readline-9999.ebuild index a5ecc024b54d..0ee65275495f 100644 --- a/sys-libs/readline/readline-9999.ebuild +++ b/sys-libs/readline/readline-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -60,7 +60,6 @@ else my_patch_index= upstream_url_base="mirror://gnu/readline" - mirror_url_base="ftp://ftp.cwru.edu/pub/readline"; for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} @@ -69,14 +68,10 @@ else 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}}.sig )" - MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_p patch_url my_patch_index upstream_url_base mirror_url_base + unset my_p patch_url my_patch_index upstream_url_base fi fi
