gentoo auto-resync : 03:07:2023 - 04:04:58

9 files changed, 17 insertions, 835 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 2593bd615809..88c76f84ad5c 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index b9243fc67f28..a84cc423e119 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -9,9 +9,8 @@ DIST perl-5.34.1.tar.xz 12760168 BLAKE2B 3768e55f66551c83295153e91d25d568b7b8638
 DIST perl-5.36.0-patches-1.tar.xz 20352 BLAKE2B f5413c75c5bbced230ad7fa692998caef8e4041f3394ae5212dc2aaee465de619b56cf07551be1bb36f2e06b9ed7d0ddda31ad4a7ec81d5c0c64b698ddd80379 SHA512 ab24577b6d71a13d9ccf272efa0881b29933b6a39532ca0d71d4c9a134f451bbe5f3d87c6c851f26114702ac3f92af5c5a72129a458ebee31e372106955eb157
 DIST perl-5.36.0.tar.xz 13051500 BLAKE2B e4864a4c21e5242df4164c73db8af10f7b9c36b075e0c05777abec79716db7778ccbf2c0c9e7e749518ad310019d2a6b32bd8b5ab2af5a8b16b5d920f83d034f SHA512 6dd6ac2a77566c173c5ab9c238cf555f2c3e592e89abb5600bc23ce1cbd0c349e0233f6417cbbf1f6d0aefc6a734ba491285af0d3dc68a605b658b65c89f1dab
 DIST perl-5.36.1.tar.xz 13053604 BLAKE2B baab610d16e444338ad7d529bad6a88e12010786bd25f2ab117ab4dd636859ff862cb925700095434f05a802bea5b89a9d41769f26bdbae439443020950882bd SHA512 8d1ec654c59d078bfc477f11c9526233199a85e4d4f6f5a55bf9eb7802cd355189c669cc6785d2d5e741c1de4d740b7a0cfd3c0198122586a07ac7f527fb14af
-DIST perl-5.38.0-RC1.tar.xz 13570400 BLAKE2B a08f5ab6d1d8cf4572929b6e47834cf3e17dec33e8e41916f5a9f3524281493f369b75054ef7232b777b9b162635e4ee7864d8fd4f97de542b3d9704ba526af2 SHA512 1bd17db43e5b25fdcd8f0addd53820371f78173fe2bf6ca12de06589ecb296314e996cfa37357f656a694cf56504b85e7d7aef4f8cd367edb64653951b7a2efd
-DIST perl-5.38.0-RC2.tar.xz 13557644 BLAKE2B 729b22329e39a23cbb80124e72fc9127ab800f03a9e53cbc868c6834e3e66577a36d53c0bec4fc2dae4e03caff1ad8dcc63a14d3dd038fc7cd75dcdc3ec875c5 SHA512 5273520c2d01b7f069e24fd3d7b05446bf0e44fe349e28dc08fc3c3e7043dc13c315f4ba41cd1a28973af98ea5bb280680e092fd63b005d0a83f64f4073a2dd3
 DIST perl-5.38.0-patches-1.tar.gz 26047 BLAKE2B 809dd5242f9868e54525ae8056598d3252c889afc72ed6f122174f828947223399a5ba4dbc16dd43501f7138205991f8c102cbe0ed94175ae3353040c53a0162 SHA512 c66160e20095555aa21d3be70050dce934d62e55e01dcf0f716129b2faa390923958a48bc448b4fab6f55e5b097eb378f7a6409a92c024fe68c8b34fddcfc5e4
+DIST perl-5.38.0.tar.xz 13565448 BLAKE2B 22fd334d911e8ebe16ad2a96522110ad2c14d09dcd04d5e64391c7ffffbb8ec92dd80d3a0f8eb105fb45aef8a2f78457174133503f7aeac4d90f762a44631478 SHA512 71beff7f6daa22a967972f5805daf2d4ff837a17e5ab808780f815d5914a67acf4f2e92acac0f2d8b24bdde4ceec0c2f7cb3029b5eadeeb30191f757e1bf0f9d
 DIST perl-cross-1.3.7.tar.gz 118291 BLAKE2B dc9c060857d6905c817e91c3f5b1f546b76e02c6de02dc260185e0de8628a5ead3a557501da75549e2585cd30879190558740e697b1c78a69fa08ccb5649efcd SHA512 1111274f34f8b46e9f418883e9b1652ba4a5a9b4a5880a9a5b38bc8aeb5d75a9f4943233870f5ebf5fbcdc0c30b2983ace11ad051b55d3283327d8f2c15e172c
 DIST perl-cross-1.4.1.tar.gz 117688 BLAKE2B e01103fb92764213dafb1ab92954fdc4bdcf1bd71a0064279ee75fed55a1c71850eaabdf667d6ab1c15eadccf7497668e5bb5ab13de33fef707fba14bfd52912 SHA512 5f403d3a52f724383d25c23b08e8001954300fa8f07a5b49df440ef4d06ef756404a6e448093c4f4d4f9a470b1c3f2b1b8b27d3d227ac1823552f6a377edd06a
 DIST perl-cross-1.4.tar.gz 113861 BLAKE2B 7c7783afccc6a04ab122a7c60b1cff7f0a2725655b2b63325ca25d7b8acb0cf993b496e2a590db943054336337ad215550b6b2a565f1d91a5aa9cfe3a4c36db4 SHA512 bde73cac13c0b42c4c6783d7e30dea491d70b65131e1c8434ef75db1f39a8e15ef5857568b706e8456faa3822402676dd247a1f20f4bed983597fdd5a6b4faad
@@ -20,6 +19,5 @@ EBUILD perl-5.36.0-r1.ebuild 25221 BLAKE2B 51fb8edf49a01e75dd0e1ab91f04040104e18
 EBUILD perl-5.36.0-r2.ebuild 25435 BLAKE2B 8e90a3853ab8f51ceb540c9a60a51bd7ab028f2bd4fed3436a1085d5960de6021fd632e4ea159972a2423693edac164836c6d8dccfe1a4c29dc865c3d70c00ac SHA512 c11f81400be981556e21588deb3faac16c4f982ebbda36069b655aec5e9d459ec5a845e2b6d50a103e4b855532032cbef2f7c4ac011a627b1d308c9abcc9a638
 EBUILD perl-5.36.1-r2.ebuild 25440 BLAKE2B 81c39786a43b3de874d03ce22ce3a90da92f6a4474a067bddad517e7047e46e1adc587e5982cda21893766c64d14eb44dd50da930b94fbef9da4934ffdff3425 SHA512 9b05e9cb6c36a4be47fec7bde85b8e33d4b65eec12dd5c53ed278a4368f5e4db9123a143c50f194ec76041bd271f6598c2897e8536953a267139f47c01a542a0
 EBUILD perl-5.36.1.ebuild 25230 BLAKE2B 41ff64d401e34783ba980e9aee159c66732c4cb6119660b10563217c3ea1a17776bcc67e1dc5f19f0e15cd0b7511b582b6092c913e608ffceeba9a88df18411d SHA512 d4673415a6871fd18f41b1b93f7193aa403942225ab58b905dfaaa80e702f63aca1b0e2ef3d00fc8ad9488549281d6561512d5489b9e14d9d2ee5000b946adab
-EBUILD perl-5.38.0_rc1.ebuild 25413 BLAKE2B 14a37f17cff5376d7ae9ffa6755f982c96d3c165456048a3acb638dd2368e2c027489187ffeb258bb94f8ae7515e40ef76200db4f6c550f3fcebc38d4388479a SHA512 56475ff50e93cfa4469ce8348f2ff56ffca4bc9835ab524ff3a7cc3b29573f806b160439760528665ec46245b9e615115fcb187af86ffc12d546a8f5f61fb621
-EBUILD perl-5.38.0_rc2-r2.ebuild 25413 BLAKE2B fd903ba35b66dcc1f0737b36497f0776114cce257d6e51eadf857411e6c75a8f076f0c56ab77ef93f79b4e0189bc616e3d9fbfd74b8140c432c0b0607613ec0c SHA512 05529f81f5a1cd985549652d5ace400aad8681ea2aaf164475ec4daf899aaecc3e31e16b2a268e925391bcf7be996d0dfa73a072ff742c5cebe6bfee7f487ee9
+EBUILD perl-5.38.0.ebuild 25413 BLAKE2B fd903ba35b66dcc1f0737b36497f0776114cce257d6e51eadf857411e6c75a8f076f0c56ab77ef93f79b4e0189bc616e3d9fbfd74b8140c432c0b0607613ec0c SHA512 05529f81f5a1cd985549652d5ace400aad8681ea2aaf164475ec4daf899aaecc3e31e16b2a268e925391bcf7be996d0dfa73a072ff742c5cebe6bfee7f487ee9
 MISC metadata.xml 621 BLAKE2B 8a14a3efd31858bd5be39476ff86bb9facf3984bbb1110c5b30c3af7aacfe0148357cf7c838ad94799c090a42ed036cc5a51205c3fcfd0d010833e0dad0e4820 SHA512 656902acadb21bf951bf08ca7775c095a5ec76f881215a2b7d3a42eb344a2b9e337cb9260ab87ff5a1730b5a0ef4efe852affdf2e418df9c7c39f18a0a7b89d4
diff --git a/dev-lang/perl/perl-5.38.0_rc2-r2.ebuild b/dev-lang/perl/perl-5.38.0.ebuild
index 1f2dc498827c..1f2dc498827c 100644
--- a/dev-lang/perl/perl-5.38.0_rc2-r2.ebuild
+++ b/dev-lang/perl/perl-5.38.0.ebuild
diff --git a/dev-lang/perl/perl-5.38.0_rc1.ebuild b/dev-lang/perl/perl-5.38.0_rc1.ebuild
deleted file mode 100644
index e528b2fa7e5e..000000000000
--- a/dev-lang/perl/perl-5.38.0_rc1.ebuild
+++ /dev/null
@@ -1,817 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.4.1
-PATCH_BASE="perl-5.38.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=RJBS
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/archive/refs/tags/${PATCH_BASE}.tar.gz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.gz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal quadmath"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	>=sys-libs/zlib-1.2.12
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-CPAN-2.290.0
-		>=virtual/perl-Encode-3.120.0
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.400.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.360.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.40.0        shasum
-	src_remove_dual      perl-core/Encode             3.190.0       enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.700.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.510.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.204.0       zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.160.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.305.200 corelist
-	src_remove_dual      perl-core/Pod-Checker        1.750.0       podchecker
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Pod-Usage          2.30.0       pod2usage
-	src_remove_dual      perl-core/Test-Harness       3.440.0       prove
-	src_remove_dual      perl-core/podlators          5.10.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          5.10.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif
-		 (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use quadmath && ! has_version dev-lang/perl[quadmath] ) || \
-		 ( ! use quadmath &&   has_version dev-lang/perl[quadmath] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads, quadmath, or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use quadmath ; then
-		myarch+="-quadmath"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-
-	PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
-	ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	SITE_LIB="${SITE_BASE}/${SUBSLOT}"
-	SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
-	VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 794463, needs further analysis what is exactly wrong here
-	eapply "${FILESDIR}/perl-5.34.0-crossfit.patch"
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-# Copy a patch into the patch series
-# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
-# - description is optional, but recommended
-# - all arguments after descriptions are bug URLs
-add_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local src_name dest_name desc
-	src_name="$1"
-	dest_name="$2"
-	desc="$3"
-	shift; shift; shift;
-	einfo "Adding ${dest_name} to patch bundle"
-	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
-	if [[ -n "${desc}" ]]; then
-		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
-	fi
-	if [[ $# -gt 0 ]]; then
-		# Note: when $@ is more than one element, this emits a
-		# line for each element
-		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
-	fi
-}
-
-# Remove a patch using a glob expr
-# eg:
-#	 rm_patch *-darwin-Use-CC*
-#
-rm_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local expr="$1"
-	local patch="$( cd "${patchdir}"; echo $expr )"
-	einfo "Removing $patch ($expr) from patch bundle"
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
-	else
-		ewarn "No ${expr} found in ${patchdir} to remove"
-	fi
-}
-
-# Yes, this is a reasonable amount of code for something seemingly simple
-# but this is far easier to debug when things go wrong, and things went wrong
-# multiple times while I was getting the exact number of slashes right, which
-# requires circumnavigating both bash and sed escape mechanisms.
-c_escape_string() {
-	local slash dquote
-	slash='\'
-	dquote='"'
-	re_slash="${slash}${slash}"
-	re_dquote="${slash}${dquote}"
-
-	# Convert \ to \\,
-	#         " to \"
-	echo "$1" |\
-		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
-		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
-}
-c_escape_file() {
-	c_escape_string "$(cat "$1")"
-}
-
-apply_patchdir() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local patchoutput="patchlevel-gentoo.h"
-
-	# Inject Patch-Level info into description for patchlevel.h patch
-	# to show in -V
-	local patch_expr="*List-packaged-patches*"
-	local patch="$( cd "${patchdir}"; echo $patch_expr )";
-	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
-
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
-			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
-	else
-		eerror "No $patch_expr found in ${patchdir}"
-	fi
-
-	# Compute patch list to apply
-	# different name other than PATCHES to stop default
-	# reapplying it
-	# Single depth is currently only supported, as artifacts can reside
-	# from the old layout being multiple-directories, as well as it grossly
-	# simplifying the patchlevel_gentoo.h generation.
-	local PERL_PATCHES=($(
-		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
-			grep -E '[.](diff|patch)$' |\
-			sort -n
-	))
-
-	for patch in "${PERL_PATCHES[@]}"; do
-		eapply "${WORKDIR}"/patches/${patch}
-	done
-
-	einfo "Generating $patchoutput"
-
-	# This code creates a header file, each iteration
-	# creates one-or-more-lines for each entry found in PERL_PATCHES
-	# and STDOUT is redirected to the .h file
-	for patch in "${PERL_PATCHES[@]}"; do
-		local desc_f="${infodir}/${patch}.desc"
-		local bugs_f="${infodir}/${patch}.bugs"
-
-		printf ',"%s"\n' "${patch}"
-		if [[ ! -e "${desc_f}" ]]; then
-			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
-		else
-			local desc="$(c_escape_file "${desc_f}")"
-			printf ',"- %s"\n' "${desc}"
-		fi
-		if [[ -e "${bugs_f}" ]]; then
-			while read -d $'\n' -r line; do
-				local esc_line="$(c_escape_string "${line}")"
-				printf ',"- Bug: %s"\n' "${esc_line}"
-			done <"${bugs_f}"
-		fi
-	done > "${S}/${patchoutput}"
-	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
-
-}
-
-src_prepare() {
-
-	local patchdir="${WORKDIR}/patches"
-
-	mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patches" "${WORKDIR}/patches" || die
-	mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patch-info" "${WORKDIR}/patch-info" || die
-
-	# Prepare Patch dir with additional patches / remove unwanted patches
-	# Inject bug/desc entries for perl -V
-	# Old example:
-	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
-	#		"Fix broken miniperl on hppa"\
-	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		rm_patch "*-nsl-and-cl*"
-	fi
-
-	apply_patchdir
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-
-		# fix environ linkage absence (only a real issue on Darwin9)
-		if [[ ${CHOST##*-darwin} -le 9 ]] ; then
-			sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \
-				Makefile.SH || die
-		fi
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-# Outputs a list of versions which have been seen in any of the
-# primary perl @INC prefix paths, such as:
-#  /usr/lib64/perl5/<NUMBER>
-#  /usr/local/lib64/perl5/<NUMBER>
-#  /usr/lib64/perl5/vendor_perl/<NUMBER>
-#
-# All values of NUMBER must be like "5.x.y" or like "5.x"
-#
-find_candidate_inc_versions() {
-	local regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
-	local dirs=(
-		"${EROOT}${PRIV_BASE}"
-		"${EROOT}${SITE_BASE}"
-		"${EROOT}${VENDOR_BASE}"
-	)
-	for dir in "${dirs[@]}"; do
-		if [[ ! -e "${dir}" ]]; then
-			continue
-		fi
-		# Without access to readdir() on these dirs, find will not be able
-		# to reveal any @INC directories inside them, and will subsequently prune
-		# them from the built perl's @INC support, breaking our compatiblity options
-		# entirely.
-		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
-			eerror "Bad permissions on ${dir}, this will probably break things"
-			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
-			eerror "Recommended permission is +rx for all"
-			eerror "> chmod o+rx ${dir}"
-		fi
-	done
-	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
-	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
-}
-
-# Sort versions passed versiony-ly, remove self-version if present
-# dedup. Takes each version as an argument
-sanitize_inc_versions() {
-	local vexclude="${SUBSLOT}"
-	einfo "Normalizing/Sorting candidate list: $*"
-	einfo " to remove '${vexclude}'"
-	# Note, general numeric sort has to be used
-	# for the last component, or unique will convert
-	#  5.30.0 + 5.30 into just 5.30
-	printf "%s\n" "$@" |\
-		grep -vxF "${vexclude}" |\
-		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
-}
-
-versions_to_inclist() {
-	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-
-	for v;	do
-			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
-			echo -n "${v}/ ";
-	done
-}
-
-versions_to_gentoolibdirs() {
-	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	local root
-	local v
-	for v;	do
-		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-			local fullpath="${EROOT}${root}/${v}"
-			if [[ -e "${fullpath}" ]]; then
-				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
-				printf "%s:" "${fullpath}"
-			fi
-		done
-	done
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	use quadmath && myconf -Dusequadmath
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# modifying 'optimize' prevents cross configure script from appending required flags
-	if tc-is-cross-compiler; then
-		append-cflags "-fwrapv"
-	fi
-
-	# bug #877659, bug #821577
-	append-cflags -fno-strict-aliasing
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
-	fi
-
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		# myconf -Dinc_version_list="${inclist}"
-		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH, in addition, we override
-	# cflags, so we loose PERL_DARWIN which enables compat code that
-	# apparently on more recent macOS releases is no longer necessary
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__ -DPERL_DARWIN
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Accflags="${CFLAGS} -DNO_PERL_RAND_SEED" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ -z "${ROOT}" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index ebf45dc628fe..9854d2e18acb 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -92,7 +92,7 @@ DIST rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz 199552128 BLAKE2B acfeb341ff
 DIST rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 246adaf9b5980413ac32af57d2e089e765336e085bb45799aaeb80311a7a5d73545779c8b2e810b763520d9d5a5d475f764675191c12a2d4b2b313c11230d311 SHA512 bf447737b414839b126fe258bb5dd6d34bb9d47d57fdb68a4cd0b9296fda2c47aa267cc9722f7821bab365b95ee4a2c93631786f89c7cb5197c283897c413016
 DIST rust-1.67.1-s390x-unknown-linux-gnu.tar.xz 235970856 BLAKE2B efbe49525e880b07de613be0d22bb87065e0d64f7006ae07c9deb020b65bcbb6dd20cdc250e740763480426baf9c64adfd06e005b616543f2ef9451e99b7d411 SHA512 308aa7bc5e32c50a0b5c2fdb5e9bae60d8c8ea32fcab72205aea9832f24df35d9331c63503e092ecfee18c1eedcb5a50138837e29bb50d74f526aafbad9e71aa
 DIST rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 875b4168bf1458376ba31aa8b27d7bb331cb3bcfaf2645e65d0a2167cf55e6a6a2a0bf5f66438e7cca7c73f1cc02fddeea3be570e37ca80f5cc14fc5e0349423 SHA512 97a0e05fabc4755ffaf23ada6d77dde78b410ef530437a8700673ee986c1fc5015665948fb4c63f2e0716bc022ef7d6f061fee0a1516995a6a4d7ea100d234d2
-DIST rust-1.67.1-sparc64-unknown-linux-gnu.tar.xz 64593768 BLAKE2B 17de4478cac7be3e30b2e6d5e9a5b9803d063186d9425a886832f6116883578bea300001d4f85c925edf9be8e8bab829106b15696e1eba7d6b9993c4f38f5eba SHA512 2d6a89ed15a96b5a8bc8f83bf84708fa37b627aaa0834f90f5442c807135c7e37a0680bebdb253f41efa45fb20b49b4304ddd9fea742fa4547da226a1b9ff9e1
+DIST rust-1.67.1-sparc64-unknown-linux-gnu.sam.tar.xz 64782980 BLAKE2B 61bb8a434262d009f6ccd7f0df809fb01bc82ec04f8ab25993b644e27186969c096692122310d9523926e1607518a32e5db8f9a2025f77c7937bb41bf12940f0 SHA512 9ace8cc54245be47896a8a566b04f3bbd19d837d21b1a6a489b1396521c86b100b36b2034642dfe17e1f810a2f74e0035637b06c39fb6fe63540582e524376cd
 DIST rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz 186714164 BLAKE2B 648efbb30233335e31c9a90aed4958325258365cd4aef5e01312005606f23ea42cb6788eb82a11e61fb5111c4d32e052ed815e455c32ed3f6fcb18d963589669 SHA512 1a65ce569fb3262dfb805d0fa2c5c9f987c2c69e547fce366d9d371c8b19a90de279099a942919690aa6d58e2462cfd7bf54240f7ef51dc22ce12e292c46038d
 DIST rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 669b7c4b0d5382a7d1d0fe49405f2798f67a9e745711dc2c8e7548ea6fdc8f0fefdab37d0594aec14b2745ce45e7c469e79c0cb1d86077ad9c7b6aafc2656827 SHA512 067681cb4140a29adfa5f4b141e2f3450dad34b95a1e549a6bc8d759e57da5d2ae69cc165efcdef9d83e2eee06edb6acd587d38c9b2f3d000d7a3f79daccc671
 DIST rust-1.67.1-x86_64-unknown-linux-musl.tar.xz 269831452 BLAKE2B a36498528454f1bf0e1812eba005f27e3e281e4e2c117477785f5e48468c3fe316947b7e4360f573f0f4cd6f117e4102db8aeaa616be5bef09fb7518fd230b23 SHA512 9a3eb67239a88b875fe55846a2fffbbb1f2a4cc8eed18b5558f0f989d544a8ddfe0861d5b2b860a779833a1660ee622b30320ec9ef83e841724f7a32f08fda06
@@ -125,7 +125,7 @@ DIST rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz 207916672 BLAKE2B 81c09e028d
 DIST rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 31bb980aa2a6b45e7a51cba0f14ed86674617f2cf8ee0583765d01502bf754f59a0cd960ad50a1e21ea8f6898e83e307d39be1eecc2b3344f5681c1908cfb436 SHA512 66c8a3efd1c579784321f24edcb4113c184516912ad490c9088d2141ac527af85acc64b6c67454661d1a991a710758cbebbfaaac7ae086b463fbdae7d1c89bb0
 DIST rust-1.68.2-s390x-unknown-linux-gnu.tar.xz 234071260 BLAKE2B dbcd38a0503d3e131a7786e11874cf0e3dbca13c5ae7c9b605caec529aae5c498722d2685557be43387e2d2b855892720b6e84021765bebdfeea4a2dbe7502f1 SHA512 00614d53a4d34b4714febfc7c4eb2f92446ba928e8bfde0de537de51474704525456b628b60634f0220278c5d403da55c793a30d744362b181cacb1a9d8fac1b
 DIST rust-1.68.2-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9eb99100e0e61ffa6f031b9f04fbcedccfbecd897e3232c8e192e52b3d5c103f8558de5e23e7eb19487eec890c0fef2c9be952edfdcd2f1a05b5b09d3a0fa82e SHA512 4d36bab880a386e6e70d23682435e1a960be3c88387ffcd955a55ce451acd3d49085b0db05230f874519aef12192eebbbbc26627807a6fa7021c89ff5d82f814
-DIST rust-1.68.2-sparc64-unknown-linux-gnu.tar.xz 65355904 BLAKE2B e0318420255e1342f256988ccf9ba463424be3bdb4c35aa497292f02f9e9c3c7d2d2124ba8924341b05c455dd094255a9a51bf0d7e6f2bee2e067d9ba18f29fb SHA512 da54b8aa143dfbc3ff9c030a7ca7f08047bcf09904f245ed0d594e63bc052ad9d9ce3cc22e7184520b06dc4635bedf8b3e7ece3cc9d6cc27d97a9cf7cc182733
+DIST rust-1.68.2-sparc64-unknown-linux-gnu.sam.tar.xz 65439252 BLAKE2B 4631588d586cfdc8da60d1d239cf0e716289568b65a3a24e1a7c76028848bb838c3525933ffa00bf29d55ef07d4da98fbe7ffc9056a803857328a5c2725f7bcd SHA512 8bedad64e968307f6d5ddf953f0f1a1463c93dc8d73c794d0ef7f784487f33d646cbde7c51b5ba81b231ee715dfee688e301ebfdce5fcd2bf91f431ff1fca392
 DIST rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz 185953856 BLAKE2B 11fc1f284c77261d69b2ba582843cbd15f3bde832cfa038764e68711de73c9a86f9e36f69a81606b4d5dcb0f9c0f413c88cb400e17511b980671a246ff63aa2a SHA512 7f3344591be014b86e55c21fab27587b00756aa46a366cde2149fafa36b5dfae29e126f70511b40bfad131a1d4d27c8cf82add3474b69e2c498c7380961a23e5
 DIST rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 06f3d90126dfe5dcfb8147c8529f333bf635c5c669cc0b5d45156fed85e87aaaa67d8d9c4b250f77e1f0998e77e5635d3f3056447a032eac07bf847fc532a383 SHA512 1d826f0f8ed896d54139b4ae78205aee5cee3ce6f5449d94b8edb8fc19ab589bde6720eb1644502fc45fe0bd452e2e5209de83c99f7c4285a896cfaacbfdad36
 DIST rust-1.68.2-x86_64-unknown-linux-musl.tar.xz 270073164 BLAKE2B 7d69a578e1d4a8fa75cfea6e630265f1c73cca08ed86ddc7858e7770755431dbf13ddaadcf8035fc2b7d2d7b7144a08b3e3a9fa20afcb5cfed7a31d82098fe5e SHA512 b0294141f1e51176664ae841ea55991826ccd15d0d36b03471831baa202ecb97434bf96479e167772bd62f05b80b49878f89a065a91e00026f0aabe7c02fe552
@@ -158,6 +158,7 @@ DIST rust-1.69.0-riscv64gc-unknown-linux-gnu.tar.xz 162502700 BLAKE2B 1487885550
 DIST rust-1.69.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e02800b42cdee6d7e78fc5ace9f4b8d7f50b6c02aa1107ef1e025bbd1bf91a2dbc200b7f5198e8fffe3b1f81192acd3b8e8eb8af60c0603f03d449ec17c4d4d9 SHA512 79fb21ef8e1049cbdab2f148b8b5ad5f81f93ed338dd76a69ff457200c32acfaef1ddc76bb462e3317aea55aeefe1593073c637c26ced417767f86ffb311e6e1
 DIST rust-1.69.0-s390x-unknown-linux-gnu.tar.xz 192163756 BLAKE2B 9191b2276af1fd2872ae77f0a366b71a56efb4a7507d6a5c3fe301ed2a8165b417abf8a5c85f08b7e8a171318f9f27abb31a777e347f24e59272df95e1448959 SHA512 36fb7ea2b6bd61d0a05cf5dadbbfc4d623271baa3819ee3f6c91389e39da6c22c4a568eb78c4a3ab5e270bba163afd742d0d585f0d381c758709405c3292c5e9
 DIST rust-1.69.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5191016cf56b106230791dafa2baaaa9ee9c40009b304831eb81ba5f536588eca43840c66e927f80f677780c15ac19278f710b12a5753e063af6257cc2c1fb6b SHA512 10625fa96fcdc2f19abace688a7c5f6aa8078959d52e7f1a635bb5624d32eb71ba055fa14d89f8724813385d52f7e55f307a9b1b76236c999c2b36634acc14cc
+DIST rust-1.69.0-sparc64-unknown-linux-gnu.sam.tar.xz 63207472 BLAKE2B 2c3266dbeb66d6f0ed75bff6aa3b6877482ff5a7839aa456f3ad54e1a86923cd70a8c73591f0d907fc9e2637a527808f3ff8f291d7a7bbb3175a13bcaea5c676 SHA512 376ee7a4e7a4b1df2acfec88ff221e3592c33063eda3ac971efe9ae1f84634357b3970c9917d87ba470cf103d49cf0102e7af8925e8c8ebcb92f5e7ade98f065
 DIST rust-1.69.0-x86_64-unknown-linux-gnu.tar.xz 152594196 BLAKE2B f46e89bb76033bddaf8dd96d6abc5ad45965c4235bd97bef9d827d528bb385348c11a8916e9443d888dea6d6637a7460d2d0b61d3b1d642e5d908d0551ee64c6 SHA512 6031403e7009d758074e76a0aa9d4d90c236799439832e0b6fe1e481afb20a330952d92a3627efa28029958ee36f2b93e123a0f4e1e446bca2f1ede2e4bfc621
 DIST rust-1.69.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b12e73829cef5aed2f1fef7c51122d4f4db11622d53860013e3a396ea7a1bf945ce2142aed3d4720c89f0bda223d5fd8f1665da11be185faff949f45a4d65206 SHA512 79d5315ee87e2a02425671376d1a5ed0d947e85fd5bd5a09c6634ac4bc9baa31f1ae57380e3ed00f597f8594c67a319a86ed4f9bd34aafcca43aba388cd0ec39
 DIST rust-1.69.0-x86_64-unknown-linux-musl.tar.xz 227932404 BLAKE2B d28f150fe1adc4ca4dc6d7fe74396d24bff699fd010cd05f4bdbc2c0061e3b10b0b1c6ca1a87bba9de8f8e45c5af20a339f01e96982f3aa77f90f879a54b482c SHA512 8879f9031a98169880433c18f71ec08ea1770e59e27279b0d96dcf8aafa67594b2c50f322a5d9b5eb766d6b4da00c969111142e9d4ddd000daf4b3b2ac0b848a
@@ -190,7 +191,7 @@ DIST rust-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz 167304092 BLAKE2B 977fdd1fd3
 DIST rust-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 26af74d00f9f7c53a15f9c39acef5364a1cbc7df2380ebf43cab3b02240b8fe446c200ef4652ea8684f0470035d8352accf5e0ab5b34dd9632b471458aad2516 SHA512 93ffd6214db7e04e2692f4e05bccb7140c81378da039317f2e04587f1403935abd57b8b9bd5e12b1befc5dec10898c06a508b1ebf83b845564b9b8a42d7041ac
 DIST rust-1.70.0-s390x-unknown-linux-gnu.tar.xz 197741656 BLAKE2B 7d31b09ad69eba9ad1a2b7196679a439907ee80fa3ddee9014f0c78505ee9e1c93514e7f44f83b0ac5ad442c6e7f05568b0ea928a89c5a69601a1a935d2d253b SHA512 3fa31674a3ba33d41c7db2b33e176edac1bd67713b7b52dc51eca73d4ed1821a2a4ecfd2545734fecb57271828ae0bcc7e1c4d0883821b650bff99544484db07
 DIST rust-1.70.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9dac941acb317914f4eac12df601b442e9d9c74f13048dd8120d23c3297e7f5bc77618fa8eb29d4401b141acd59d20e87e1b198f9997041d4113de9ad39b59cf SHA512 64b8658b275a53b52986aa967535ade73009e833fdc89c4e225f3139262fedbeef902702e8e71b18380a0826afbe7dfb1afdd5800bd5f810e66f2193c4de6501
-DIST rust-1.70.0-sparc64-unknown-linux-gnu.tar.xz 58763440 BLAKE2B 2a8a04c723c26a86bf0717ccb01d4b51a2bf4d1ff0bb5b1fb6c8f037ce22647e526a0ffb1c982eea796192d0bd9e86ca23ddc64b59678425790343d579a9e293 SHA512 8d0bc5ff671ee1ef390c0e72179b9b0a69cd410f47174cda23df4230510edb68e65dec6347332fb0a5d853c6535e192e36b902b4c0aca2a86621a981133daa3b
+DIST rust-1.70.0-sparc64-unknown-linux-gnu.sam.tar.xz 58806556 BLAKE2B 100bdce58de6098a74563b99e042a558afe272cf7a06f6133a14d906584271a459e8ce36b7a515c23559d7526a251feeda2c66798a35d9063ca065566547d881 SHA512 39962b47a180806491cc9078262989bb18518ad05cef31dbc5a5707ecac2199878c8107e706e2d4c99c0b00f277f928f71d5489b363012b5991a258eb3f8be1b
 DIST rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz 163456784 BLAKE2B 49a8397a7129aa70f5ab3876613c9c3f25abe2a48fcdfaeec0bf030529f558dd6ee221bef18ab135b95b2e8bdd61349e3357674a794bd08e4539c0fbbf51bb3e SHA512 8950c85f03f2e7af23c18e9be0ca1cdf7074b9be8d8c7b26102277c150c598bb7d5f1f74400bd70efcd42b38f68c96c7701239719f320311e8b131191ee77512
 DIST rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e5fae8b3c87f54b39d922fe0c7694e0ba115ae34a668cc873390fc9e4638baaff5b6d1b4c67228c6bfc57b4da9bf77d6a452ca12bf6653d5610895b8ba19d64d SHA512 352749df741287107b966fd603113c51e82a426a7151e224e3a8d1cc7bd4658ef86147f6fce62caccd7b5779d9961be72cbb618db79a2850e8a8c4b0bc229ad3
 DIST rust-1.70.0-x86_64-unknown-linux-musl.tar.xz 233692884 BLAKE2B 295e815bbee6dc135ad17dd78801999afa7880a7a8f5ad4932a7580f1b03d50b850bcc3eb68e9d679e0a2d68392d446423ea752e47bb22d64823bf3222e0b377 SHA512 5e42224e109d525a321c107005660059ddcb0414392abc660b80fb09a55c936c79215989646be0aff6b0427b2f5d82a2a19ec3bd3235883a2037575808aeb69b
@@ -203,8 +204,8 @@ DIST rust-src-1.69.0.tar.xz 2405440 BLAKE2B 685ae443aab2a1ccf3c4024be9a96f476ba5
 DIST rust-src-1.70.0.tar.xz 2422004 BLAKE2B 2f6b22d767ca93ed5d02d432deb743e10d73fa3f767facaf958b43281cdf6786d399f83a00a7154e3935e4ec65137c15162009d20b0b97a00f9c14ff90cae007 SHA512 0ec5ecacbf46f503aa6492d518fb747496cb09f37ae377e12849c2c9f8e5c3fb5a09385a2e5912f492f4fe4b76d7e74872ca9ced18ad46d8e11671721ec03b5d
 EBUILD rust-bin-1.65.0-r1.ebuild 6793 BLAKE2B d0a58b6ef31ddb223cccdc65998038e9ff0cb4455614619de7adecc0907cca47fe4fb7d7db9d315fec00b0779530a60ad03935fca88df7c840b409c0c37e480b SHA512 7e6908661f31c2a1ea77ad3f1cc1fd729a9ebf4093296e69f39184ed95b3ee4b715de00899736d409f0aa7362b9c5b904d150e47e255cf32244fdfea28e69edf
 EBUILD rust-bin-1.66.1-r1.ebuild 6798 BLAKE2B 6c814eb21abe2a4f3e3511d609e7ccc9196f49dd2d3ac060e3c8727c84258206f80173cbe6ca544f27b4fd1a32346cf6c9ba308f4d3e2abaabbdefe3051169e7 SHA512 71c77d41dd56c309b7e9103a0cd87ff54b5a9fb7ec51ea62d871041a0cb18bcc44cd98d431507339d03bcedcadc1804bb2c86637e4e5c6ba707f95b0d3b98a35
-EBUILD rust-bin-1.67.1-r2.ebuild 6827 BLAKE2B 015f8ad560c32b0ab76c01d46ae53fb4212797ebc60767f5f99e890daa2d505e68c091d43796eb7be7b46da44b9c6b7809101042dd508f51cbd4225d1a1e4339 SHA512 049643f3b2f950663c289d820da8eb18c04a0dc5cdad0bb34ae73c7a47fac7fbf77ae92cd93a54b53ff42684b17efa3a450dca79efeaa5bc6081183826abe74b
-EBUILD rust-bin-1.68.2-r1.ebuild 6782 BLAKE2B 08d3bb6c7f6d19bd98789c9a9ac6a8fca57c8719a52b543f34cff7d9b47a89162d74f6cef31328e7577df704671e582e438781d187eb8441b58bec6f52d02694 SHA512 694a8262d709800337777fc7a60066724394910217b897746821f4541aa7aeb45f0756d24aeac883d2ba304714b9140d7ecb44bf3732996d181190393e2c1ae4
-EBUILD rust-bin-1.69.0.ebuild 6765 BLAKE2B c14b16db80f636d064a54bf256df9a4d8fe308e9821422dc9b46ce5e272200f32d463a4f6fa36b7a80b0c12972d00ff5c155183db4f788858cce6760d6b5a785 SHA512 c345e3f23dad76998bf86f893e75212b10a9c5621fd551546eaf3580cc418985255d3cc7e53f67855a42902d1d3116d3b78708fecc5073cfa71ec43c05ab1679
-EBUILD rust-bin-1.70.0-r2.ebuild 6901 BLAKE2B cc0864fb78d228ef5110cee68b5c76d8db3a1c05b1ce7ccc2aa4602efb1514fc7155aa8209a77d6d44b6ab82003f5b3cb38b0cfba614f31564866769506dccbc SHA512 3a03e677f274663c5abd51c3a5a91ebaf23ed03ae4a4ae2f4c9b88a533d705d11bb9d16e62bd027737060e39919a450a4c5f5ee659df91cbbc61aec3a0905087
+EBUILD rust-bin-1.67.1-r3.ebuild 6869 BLAKE2B 02ce8e51ae4dd4037a9a579d00efdd42637a5597b790c0692d72ad14f9d20f4dbf72ef136f5e32a472fcfd714a7bcac81b06429611799133d82beb744c850fd8 SHA512 70d43727e10bb20a73df58d408aee980f9f72e35da281f97ea0d7bf955c11a09bb5610459762c741a506ffe3e33f2826d0fea42707d7ddd1359d64da352bbd34
+EBUILD rust-bin-1.68.2-r2.ebuild 6824 BLAKE2B 2a1d3414f66c405c030ab61d05dc50ae0bc70cca60db5a188ce0d0f149aba91f73f2f9c67454b13ebafa1f4a84d9d4a76470dd66ba467b6fa2fe280a8866c5a9 SHA512 4d12db32e23b75c68bc29eb5a0ab34ad4816bb90ff8fcc4ba412682bfcc1ded120088548fa0a2a17d056a2f9fecf3d0a60b4f1c2af4563cab27ebd6ccae4d784
+EBUILD rust-bin-1.69.0-r1.ebuild 6812 BLAKE2B c1c2ae804b4cc22cd12d442e65398a7d256aa6fd32e583ad4af166ea8a0de8ef847f64ec16559e67306b7b1b86b83f8dfce7d56c01c1534f6ee8ece579f562bb SHA512 481225cf0ae7ad0991029e9fc54ad4f3c92526a53739b7f50dd9716c4749f65cf78f21b218714f2fa0512db508e26900b3df723f4d36145c03c0a0e05b030caa
+EBUILD rust-bin-1.70.0-r3.ebuild 6943 BLAKE2B 7008da0fb437a5cde4b46de8eb9ee51c6ab598ed41b0f70870e15f0122f01d6a4111737860640191c310001e070b7b5dbd5dc236b911c77fd297b0a63e283d82 SHA512 10817f03e23bc450338c9d08181a5f34cc02a747a61988f1ecd691b42cb169fd4cb9fac332aeb3f6ad9b7e86909339c7d6da45d1db2e7444ed8dfb04ea68fbec
 MISC metadata.xml 602 BLAKE2B 8e74f441d22eeb8b276d77ed0a9c5bde01540a3f34d6053185b2be77dd9188b80c01c536f8bb18c4c60214bd0bf366a504c1f3627110a213332120b533f7ddd2 SHA512 5f120deec600c7453d503b6acb9460d1c765a567954c79749654365721b1b6fa2dd48d60d5f3fc86191e79d5f7f78d7aa1e9634e6127f333f81e546f9b0f74ac
diff --git a/dev-lang/rust-bin/rust-bin-1.67.1-r2.ebuild b/dev-lang/rust-bin/rust-bin-1.67.1-r3.ebuild
index 8cba54455119..610fa6b3862b 100644
--- a/dev-lang/rust-bin/rust-bin-1.67.1-r2.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.67.1-r3.ebuild
@@ -8,7 +8,7 @@ inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minim
 MY_P="rust-${PV}"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
 MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2023-02-09/rust-src-${PV}.tar.xz"
-GENTOO_BIN_BASEURI="https://dev.gentoo.org/~gyakovlev/distfiles/${CATEGORY}/${PN}" # omit leading slash
+GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
@@ -16,7 +16,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 	rust-src? ( ${MY_SRC_URI} )
 "
 # Keep this separate to allow easy commenting out if not yet built
-SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz -> ${MY_P}-sparc64-unknown-linux-gnu.sam.tar.xz ) "
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
diff --git a/dev-lang/rust-bin/rust-bin-1.68.2-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.68.2-r2.ebuild
index bbf4146808a7..452944a8954a 100644
--- a/dev-lang/rust-bin/rust-bin-1.68.2-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.68.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minim
 MY_P="rust-${PV}"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
 MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2023-03-28/rust-src-${PV}.tar.xz"
-GENTOO_BIN_BASEURI="https://dev.gentoo.org/~gyakovlev/distfiles/${CATEGORY}/${PN}" # omit leading slash
+GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
@@ -16,7 +16,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 	rust-src? ( ${MY_SRC_URI} )
 "
 # Keep this separate to allow easy commenting out if not yet built
-SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz -> ${MY_P}-sparc64-unknown-linux-gnu.sam.tar.xz ) "
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
diff --git a/dev-lang/rust-bin/rust-bin-1.69.0.ebuild b/dev-lang/rust-bin/rust-bin-1.69.0-r1.ebuild
index d292fcd53d58..12c4f3640532 100644
--- a/dev-lang/rust-bin/rust-bin-1.69.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.69.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 	rust-src? ( ${MY_SRC_URI} )
 "
 # Keep this separate to allow easy commenting out if not yet built
-#SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz -> ${MY_P}-sparc64-unknown-linux-gnu.sam.tar.xz ) "
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
diff --git a/dev-lang/rust-bin/rust-bin-1.70.0-r2.ebuild b/dev-lang/rust-bin/rust-bin-1.70.0-r3.ebuild
index a9fa5df45f82..327b4fbea0e8 100644
--- a/dev-lang/rust-bin/rust-bin-1.70.0-r2.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.70.0-r3.ebuild
@@ -8,7 +8,7 @@ inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minim
 MY_P="rust-${PV}"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
 MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2023-06-01/rust-src-${PV}.tar.xz"
-GENTOO_BIN_BASEURI="https://dev.gentoo.org/~gyakovlev/distfiles/${CATEGORY}/${PN}" # omit leading slash
+GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
@@ -16,7 +16,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 	rust-src? ( ${MY_SRC_URI} )
 "
 # Keep this separate to allow easy commenting out if not yet built
-SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz -> ${MY_P}-sparc64-unknown-linux-gnu.sam.tar.xz ) "
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"