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

5 files changed, 60 insertions, 34 deletions

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 42524e5a516e..aa7a07f26d04 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -422,8 +422,8 @@ EBUILD bash-4.2_p53.ebuild 4867 BLAKE2B 33051fdd9ab2704b6b8bba9789c7106f26b2a95f
 EBUILD bash-4.3_p48-r2.ebuild 6068 BLAKE2B 39dd57b3192bea544347f3624c7ae1a4ce992c4efb1e06948a6e662f49ea6ee362ab54496284e5ec321e07082ce6555de7b19b92861e541f2c50eaabbbc0d3a1 SHA512 462abbf2c214c70014f1f42363fa9bc0cd7add25c079252f5cb8db642cf85cb0aebdb0829c3f7767fd39ebf2bc0aae2aeb241ba9a4269963b2389705c7bb0f30
 EBUILD bash-4.4_p23-r2.ebuild 6066 BLAKE2B f4f61f465531a935ef7b3404b4e23d8dfbf515cf3f7e45398c8b35a4ad2073522d008b543fc62c97a13321c9ca68e7d13bb7e64447b6ab14cd423a634e857b28 SHA512 072f3e413de126d8f72f5934ba580d7a88e81a57a657f2cb20cc2f31acacd46a20da3172f67c654c4dbf2212c65621f631de98b603df9c130f4eade941175fa8
 EBUILD bash-5.0_p18-r1.ebuild 7391 BLAKE2B 8c2e3a112960f32d370f0171e298962b65d3b1bcab35ce252c0349e68bbceed999d2e42fe3858bdc531038c499d82a1063389e0b999e9336fce460f781e0351d SHA512 03be815eb4110b47090787ec374d192b40f671ec3a4076a4d2b339701fbb74b80b95b1ca5aeae61fac30a6981198ec45380f55c91469e76e8f7d3c313fab969c
-EBUILD bash-5.1_p16-r4.ebuild 8318 BLAKE2B b4f65a7acac6611afaa4e3c805cbad75c58bb24f2c20bb1afa5dffcfb0429db8cab5e1a2dde7ccf185e56d69adbe75a99c8cb24c1675014851f09ef86f32b5bb SHA512 641ef76d4a04cfe0e4c5965a4c6541ff04c62a8910de2450ec5749e452b8189d152bcabaa3ece4b0d6e3eb5c421203317e03212e080806e1c6cc6f6aaf11bf26
-EBUILD bash-5.1_p16-r5.ebuild 8380 BLAKE2B 5d124344f62e736df5233bce4d75249630ed1ccf744c7e975d921378cbac16afa0258818941fead9e56118213d7b17e6318313be75d38516b2edb42983304c15 SHA512 667f60c87578f835c1b29f9c59cc76a5614f207c209478c9d9db8dab69d6a2616ebab07fdc851d1bb6d36b5994334b0c716d434a36015d278840b83e3f38b0ce
-EBUILD bash-5.2_p15-r3.ebuild 9726 BLAKE2B 82cd3495a384d38987e3ccf525cfaa431e1368056dff15e9fcc717c63df234648908d4824933c335dae8b149d02bcc195b6b2fd64fc10d3be73e570f78ee8263 SHA512 97ae6e9df2ffec87bb3bc0f1006dcc7a344d3576f6c295f863e6a5f216d1cf225c17faf582bb74dfae510435625e9fa1dd9a3944fb466f9ab88a1926839d10c2
-EBUILD bash-9999.ebuild 9628 BLAKE2B b8d5b19b9e161d1f8a2bb82e4e9984f452ae79634f5e2526ba60ad217b14113b1e9618b885c07da4f41a5f6e9ed0d4252cda1214616264fa81656dd328b4bc90 SHA512 893361e314fb3777de7be1fd063885919486dbf49ed8647f610ac9f11891acb020bf1aeeb1c802e6f4188625beaa02375e6e8ba3b90c3a3c334e6cfa0b3fb33a
+EBUILD bash-5.1_p16-r4.ebuild 8564 BLAKE2B f5807d27d376c9670dec3e55724a763ae9b1105c99030404a5fd173f7b96c794300b8997efcf0a9fe7fa4b7494512f9c67941e99d1b79c74d37c4321130545ae SHA512 b38445c59c4ef7799bd0918c975c3478dbfb0423d1e7cc7523bf25c196373336295f55d3dfa5f315dc2435a62c86c8312c06f1f2dbc8d6ab67b47d8e0bbe10a2
+EBUILD bash-5.1_p16-r5.ebuild 8626 BLAKE2B db850a4f749c5f1b73694dbda7e623f5567725e9e0edc878937a16e18f1728cd8f1c76f22eab3a83d16e59d932b356faf708cb96e12bff28f6b75835cc3026b0 SHA512 421c40ebc61d028f5f8163a9b0f5b5b08de7a900b1bcc4c0ed29b82d1e9eb2cfc5b63ffbb5a6e9ac3e192806978037eb4765fafd04949db89b6549c5adf6b783
+EBUILD bash-5.2_p15-r3.ebuild 9980 BLAKE2B 02b5b562686fcf90f693f450379683892b7e2b1cf3123fa5e60703784b85908513140082ff12b61415b6148d0f05c37486cf92c0bdcd2c22d058c14392da3576 SHA512 96e34d2fc46452821e13770339a69d12ef49d919fbbc2ea6f5894bec3dc87f5742d07cd3f60a2e4e52e26a68503199d637e4ccc0985d3af5454ecebdae6180f9
+EBUILD bash-9999.ebuild 9882 BLAKE2B ab016c080e4e5646089a38b49efed341721db7863a1091896809fbb29fc1cd31db6b40b5e816e95382927e713265202e7dcb6fa30cfef64139c5d15f4e1c64e7 SHA512 af430fa8d0ef2f519786a70aecd99e8e855dffa50c44cb1743f5ed8492556f7b64a34a2cb5760fe726135a935f117f8a4d2b51025e3c6df9815e86ce14c2dc86
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.1_p16-r4.ebuild b/app-shells/bash/bash-5.1_p16-r4.ebuild
index b87757b3ca9e..25028ea0a987 100644
--- a/app-shells/bash/bash-5.1_p16-r4.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r4.ebuild
@@ -45,21 +45,27 @@ if is_release ; then
 		# bash-5.1 -> bash51
 		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
 
-	        patch_url=
+		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 )"
+			printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index}
+			patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
 
-			done
+			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="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
diff --git a/app-shells/bash/bash-5.1_p16-r5.ebuild b/app-shells/bash/bash-5.1_p16-r5.ebuild
index c617e503f113..230aaaf033a5 100644
--- a/app-shells/bash/bash-5.1_p16-r5.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r5.ebuild
@@ -45,21 +45,27 @@ if is_release ; then
 		# bash-5.1 -> bash51
 		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
 
-	        patch_url=
+		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 )"
+			printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index}
+			patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
 
-			done
+			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="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
diff --git a/app-shells/bash/bash-5.2_p15-r3.ebuild b/app-shells/bash/bash-5.2_p15-r3.ebuild
index 7df4466ab275..4d0dbeb3877d 100644
--- a/app-shells/bash/bash-5.2_p15-r3.ebuild
+++ b/app-shells/bash/bash-5.2_p15-r3.ebuild
@@ -53,17 +53,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/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 82dfe5fb1c66..af8066bbfd29 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -53,17 +53,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"