gentoo auto-resync : 03:06:2023 - 03:30:15

4 files changed, 45 insertions, 24 deletions

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 7a6ab3df3b27..5855905e73f7 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -14,7 +14,7 @@ DIST readline81-002 1242 BLAKE2B 4ef0404561bd8fc5559e8e5f675ae3f12c467178a8954f5
 DIST readline81-002.sig 95 BLAKE2B f85d8a65a7326d6e18b32a603c8082952e4b81c53b6a1bd1668c7b0064ecce6ef04a41e2a042f100424dbf152e4db32c0e07ff166d528aa4ac4a9bd7daf4c7a9 SHA512 9ffb6cc697499f57df133f5ebaa5e43e24d33df5eb450d94a02144e94c833424218594c366f21101bc63331c1d532299c9327bd447d0a9849b0bbedce206a5b7
 DIST readline82-001 1198 BLAKE2B 2e8f3d2aa14c4c4c4f9621f80f4ffae9bbd6f46c3561e87aaf684c759ffd82e3c46843cf4c4224533b28a847d83f7b8b254813f8a306d438e9f7cb457516c4e0 SHA512 ea3800a62e992b3e594d78e77b6c4b662fb8c501b81010277e478656bb3b56db7747ba40c6c3d68c3ec5ab8e9e41be104788ec52268135d7e642ff40dea421a8
 DIST readline82-001.sig 94 BLAKE2B 542ac331a7da3702b47f4828b3264bc7bf996f473807d675044beeb9688c4ca3645bcba0898d3ea9447c1cde540eb8a6b1934008b0a11baef33235e43f44c6c7 SHA512 01ad9769fee42dc601b511c87bd39e15c74226e1747c4ae8914e303213706005780135add180dbfe538fe847533dc56cfe8f51a3ad9ec55d1fde2cb2e096bfb5
-EBUILD readline-8.1_p2-r1.ebuild 6441 BLAKE2B d5daabfc41465216e59691ec71300472c69adaf6ff136703b998091567d4754dcd773f47581bdf3c9f36480d480e7bb520788e0f88f10f25c77e133df54be216 SHA512 96ff328d800945e7abbb0a36cc0c828b281e232a3a48bd194af4f82d40516cfa52cb945d9ce64d275f5a359be8ed386468eaa30e9e55b2c0ba2a66b1d134db9a
-EBUILD readline-8.2_p1.ebuild 7096 BLAKE2B c0acd003ed83a2e6fddd7c9e50306ff7afea13d9a823adf3094d51a7ec3aff1336e16c2fc6355c7d958a02cd178b84ac7df82efb866b3cb35244425bc4571d6b SHA512 040e0104c911329c1cde1ed4de6336766d1f0df95cdf2945cfa81d6f6fa968c63091993a196a7bcf532b2acbea4cfc724eeb159be2ba41d71003ecabe9d7a0f1
-EBUILD readline-9999.ebuild 7096 BLAKE2B c0acd003ed83a2e6fddd7c9e50306ff7afea13d9a823adf3094d51a7ec3aff1336e16c2fc6355c7d958a02cd178b84ac7df82efb866b3cb35244425bc4571d6b SHA512 040e0104c911329c1cde1ed4de6336766d1f0df95cdf2945cfa81d6f6fa968c63091993a196a7bcf532b2acbea4cfc724eeb159be2ba41d71003ecabe9d7a0f1
+EBUILD readline-8.1_p2-r1.ebuild 6699 BLAKE2B f844a03f2fda6fab711b9a1d352689ddbbaf15f509c302c7aa44a496747dbf8b278df2e87c8ecbf9101ab259c86d977b54775a5187caa1b9109734d1db32b62e SHA512 5808e9c6dd311f57450b338243260cc9d24b74775fcd57ba5a9bfcd68bb6c95ffff047f198083ba25f54ffe4e7d429689aea7ed9961e54bf4a8203bacf20a880
+EBUILD readline-8.2_p1.ebuild 7350 BLAKE2B 0ec6855d6791452dc69801bf660f43154aeaa3919d978dd2a925a18edb05a211d08360c79e8df2bd00ccd910cdc040be0f7717266b675918fd5eca93cf25375f SHA512 4cfdb3edba75ef04194d888426111a4c49d66845cfffead9f77d54420e973395d9f7710faa41ef0b3119b5b42f1c05e462a751f152805f7138ee4a25eca161e0
+EBUILD readline-9999.ebuild 7350 BLAKE2B 0ec6855d6791452dc69801bf660f43154aeaa3919d978dd2a925a18edb05a211d08360c79e8df2bd00ccd910cdc040be0f7717266b675918fd5eca93cf25375f SHA512 4cfdb3edba75ef04194d888426111a4c49d66845cfffead9f77d54420e973395d9f7710faa41ef0b3119b5b42f1c05e462a751f152805f7138ee4a25eca161e0
 MISC metadata.xml 533 BLAKE2B 2324b38d79697509a98d761cb8f91e08934b419f71bfd65cf09149773e3f44e8ff153d173cb1af80ccc4c10c7c65103bba5ca797f3b18b96c13132ffd777049e SHA512 5d66a8a464db16ea8afebeca7102632629486ccd4d348821ef693abde571c8a70a6aa38e9b563ddcfe93950afc38f63d2cb4239c645d97e92138a0c1e5c67f00
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"