gentoo auto-resync : 02:06:2023 - 21:29:38

2 files changed, 25 insertions, 29 deletions

diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest
index 17ceb4446a8b..bf5472af93cc 100644
--- a/sys-libs/ncurses-compat/Manifest
+++ b/sys-libs/ncurses-compat/Manifest
@@ -27,5 +27,5 @@ DIST ncurses-6.4.tar.gz 3612591 BLAKE2B 47fd9c2d27f44fa9942552881a471e5067465dba
 DIST ncurses-6.4.tar.gz.sig 438 BLAKE2B e6a78b8d0cbce1577205b49b0260394094632cefd95294813c7e4e51a2908e8599a9f24b3b648e42ba16c015fb9424b2a82236f58aac3bf96f5400a50482e44e SHA512 f2a7859725b4d5d62f68006338d56598ac6b38a1448983108906e192f0ec922be287cc89bcc79c1ae49ebc80c967af3dd077427f35ae579b00d445c882414fed
 DIST ncurses-6.4_p20230408-patches.tar.xz 80472 BLAKE2B 0ba8156ebd4f1691fec7bc1b800ef39ce6a4210573c027dd437919cdcd7c995830116da06c69f31c65923845a4d5c88e974673fac38acce5813f7d6cdc646e3e SHA512 32960e2cc4cd9dc60c38b49f46c5ce2c02179479abb66ca29f63cd06475ae8e26299a78b5f06762d114aefbbca3ba6fbebe7093a58106eeaa40cf500d21633a4
 EBUILD ncurses-compat-6.2.ebuild 6291 BLAKE2B 5a79ed596ecbbd4f400486446744ee415a2a68906dd820ce5873c4fcfbf854da0dabfd996da3b4dba1c72660da938e13e18f9f8bf406b38cb424836b62f23815 SHA512 6e10a88b54f9217b0fce9e5de2a2963938392b437466f48bfb213d3999f7c4c3c6c6e4840bdb387362f5eabc5f9f3c54fe19fde3fd9fb114a3e2d13b293daad6
-EBUILD ncurses-compat-6.4_p20230401.ebuild 9638 BLAKE2B 30be4a4f82e6ebb49ee0ec64ad7c4685d2bf24db7cd34000f3010fecd1a788b43a4126e144e238e86a45a6bb50fba93222a977cca45a21be93b19b9d883c2a90 SHA512 384aecf71156c7796a33168e7a79f470902e8d72fbf4e25cb16b0898371e80ada7c7f1c154e31a3dd145c008bfffdd78679f8a567a6346e02dab6e4a935551a4
+EBUILD ncurses-compat-6.4_p20230401.ebuild 9918 BLAKE2B f85eca54419973198cf13ca501cdf8b436ae9e343c72021ff4f13b1d8bec0c32cb375986b916270be9293ef9e24d69071559e5054488421b563507a44428ab81 SHA512 15e41f60ce475dcf49886902eb8eba74ea0034fa3b104818670102543a4e2e2dee7ecd6ad6d3f2c08b2beeca14860e1eefe5c1e75e53ea5192f56a3266c0983f
 MISC metadata.xml 949 BLAKE2B 02d84363ace3523a818cf986afab5b7ddc3034d8fd1e365c054f802e944601ea4b4d579a27d06ddef9045730f05d5b901eb688bd7a53e341363feb7065318420 SHA512 3489cb9d8f931f74e898bed2d7bf6ca29934b9a5ebf3f58b8d3f1b68c87fc3cb7804cfefce2b1369ec0b6bf2e7ec22dc43e07920d99d4fc9edec0a970bf7be87
diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.4_p20230401.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.4_p20230401.ebuild
index 9732adbcdda4..b4d792b322ad 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-6.4_p20230401.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.4_p20230401.ebuild
@@ -62,36 +62,32 @@ if [[ ${PV} == *_p* ]] ; then
 	)
 
 	if [[ -z ${PATCH_DATES[@]} ]] ; then
-		SRC_URI+=" https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz"
-		SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz.asc"
+		SRC_URI+=" https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P/_p/-}.patch.sh.gz"
+		SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P/_p/-}.patch.sh.gz.asc"
 
 		# If we have a rollup patch, use that instead of the individual ones.
-		UPSTREAM_PATCHES+=( "${WORKDIR}"/${P/_p/-}-patch.sh )
+		UPSTREAM_PATCHES+=( patch.sh )
 	else
-		patch_url=
-		my_patch_index=
-
-		# We keep a bunch of mirrors here as we've had reports of invisible*.net
-		# being 403 forbidden for some users.
-		urls=(
-			"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s"
-			"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s"
-			"https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${MY_P}-%s"
-		)
-
-		for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}"; my_patch_index++)); do
-			for url in "${urls[@]}" ; do
-				patch_url="$(printf ${urls} ${PATCH_DATES[${my_patch_index}]}.patch.gz)"
-				SRC_URI+=" ${patch_url}"
-				SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
-			done
-
-			UPSTREAM_PATCHES+=( "${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
-		done
-
-		unset patch_url
-		unset my_patch_index
-		unset urls
+		# We use a mirror as well because we've had reports of 403 forbidden for some users.
+		upstream_url_base="https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-"
+		upstream_m_url_base="https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-"
+
+		# Prefix each date with the upstream location (https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P})
+		mangled_patches=( "${PATCH_DATES[@]/#/${upstream_url_base}}" )
+		# Suffix each with .patch.gz
+		mangled_patches=( "${mangled_patches[@]/%/.patch.gz}" )
+		mangled_patches_sig=( "${mangled_patches[@]/%/.asc}" )
+		# Repeat for .patch.gz.asc for verify-sig
+		SRC_URI+=" ${mangled_patches[@]}"
+		SRC_URI+=" verify-sig? ( ${mangled_patches_sig[@]} )"
+
+		# For all of the URLs, chuck in invisible-island.net too:
+		SRC_URI+=" ${mangled_patches[@]/${upstream_url_base}/${upstream_m_url_base}}"
+		SRC_URI+=" verify-sig? ( ${mangled_patches_sig[@]/${upstream_url_base}/${upstream_m_url_base}} )"
+
+		UPSTREAM_PATCHES=( "${PATCH_DATES[@]/%/.patch}" )
+
+		unset upstream_url_base upstream_m_url_base mangled_patches mangled_patches_sig
 	fi
 fi
 
@@ -115,7 +111,7 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${UPSTREAM_PATCHES[@]}"
+	"${UPSTREAM_PATCHES[@]/#/${WORKDIR}/${MY_P}-}"
 
 	# When rebasing Gentoo's patchset, please use git from a clean
 	# src_prepare with upstream patches already applied. git am --reject