gentoo auto-resync : 23:09:2022 - 11:29:49

8 files changed, 7 insertions, 362 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index bdac475b2c99..4424c34b18cc 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index dd8c6049e076..9f39592d9ada 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -8,8 +8,6 @@ AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f
 AUX erlang-24.0.2-serial-configure.patch 586 BLAKE2B 3ad4fcbf35310dc11e8aaddca95a467414c60390a7e170c83d0775230a5a815212c6ddce55e98721b02e03511f80e67cfbd60e4b06bc86c615bb3a51d5015ec5 SHA512 abc81ef2a0b23fbe82542efefb1cbb12b1143e9282f7114ea929c18a5c02f2053caabb05ef9838d40b40f3ca59b06955528b122092438ee3d4ef6a8b567fc335
 DIST erlang-24.3.3.tar.gz 59296830 BLAKE2B 1792274c77001b6f49e84f1584620a247cf3acdf075a8d581403f31a2b4cfe32e7b8104d325f3c1a999595d94484cb74b7996a35599e9ef8935931a133a554f6 SHA512 5e8ce0ebd50c1c67ca29ce9405fc18f5461793b20a1732418bc8fac404078044deb72526682aab92ee3e737bc9dc9e94e6be162a088e2cb7cc68c14b1d76454e
 DIST erlang-24.3.4.2.tar.gz 59532491 BLAKE2B 28c48f1a3197a151010a775286cf0b775567301411b8480b32cfb39c68978de5586b63c245fe58bff8034ebc04fcc3b002dee7c953127ecf581ed6d716587ae4 SHA512 78bc2dc67fe60d3ea6049c361a017c054e12b0adeeae890b0a1ee5301744505593bd19f3731acebff8312b323a3bd21a1359507d122fc34f0eb85eefb3aac88c
-DIST erlang-25.0.2.tar.gz 59800286 BLAKE2B 4344ff5a21a6c0139842067d10d82435f504a5bd3b4112137f92ad06d7bff21352244c80eadad4a9efbc29692ac2be2a81b87ddde9b29433d1461a1148a733c7 SHA512 717406816b4428fb8bd808a9d25575b7e33a05e6aed5428295682ba8576d53f1433bd1b1593236943e592e673ed2168047873127cfd293b5522636c514328f43
-DIST erlang-25.0.3.tar.gz 59811038 BLAKE2B 81176f415e814b57f298782d2ae77ebf68c1493753b747b29409d95f811dc501ec5301975e90ec464ef611c3f06cf066d36b34f21e92bae10e5f02fe3f87c8b7 SHA512 d6c83722bd86e20568b879cb770e95e37b6227b932e4e74e50bbb9dc426b1f7f5286600a182011baa2b83ff7f006717ee62812959f133868765d819ddf57399f
 DIST erlang-25.0.4.tar.gz 59812650 BLAKE2B cebba32e859ec4ff0868de506771449a6d5d053d50d8f4a2cf84f9bc90da1e14ae320420b3c33f6febd5977fd1ccff98b55d3ee1a0c4b90e674e912883cb0f29 SHA512 8d9d12496d55181c0d866bbd97576551d1d78232fe34b845e8efbfbd4e95ce8426e73221d8126d12453959cd8adc5e07f121aaa93f3a5696074b43c69291d363
 DIST erlang_doc_html_24.3.tar.gz 36645792 BLAKE2B ef90b7d05ed43656ab1ffdbbd0833c9da08a867ad7a99ec0f7f1eb59697c1f9cd5ccd150b2e564af80b2098f063da0c76121d4444b5444e603581442ad1c7bc8 SHA512 b8d3832ffdbdede656b362d719474f7b9ff04a32ea7235e77d63755629cf9305c203cd6cd9ae089171b2cee694f9641d6ed5d0197e2acf893a31d25696096f1e
 DIST erlang_doc_html_25.0.tar.gz 37051192 BLAKE2B 2d79ccb3b850b199de0a7da83c6358b9f3cf63826aeddb54307640129c1f96689200895c3c3ec52f503362945e7c6083a7317cd4ea57dc7d6772844801843c74 SHA512 6ce8423705f86fb2cd403e9c51089d7b2569ba93498f9143b5dbac85eb10b403c4bc948f8a68e55c40116cdd9a93f050bb037f94fc3c8651175d9065d2c598be
@@ -17,7 +15,5 @@ DIST erlang_doc_man_24.3.tar.gz 1680242 BLAKE2B 3311eb6ed6dcaa2d611adf7a08269f67
 DIST erlang_doc_man_25.0.tar.gz 1711510 BLAKE2B 743efa8edbeeb99e37e227c1e5e3be1825a391007e1c220ba22163c528edda8941b1dca0951cc02aff016dda0d52f3a6ff4fdbbbe279ce067c7a1993997ce6b4 SHA512 c6b6490961228893253e11d5bb88cbd30ba2cb1c13819a85db6699b437f0327fb55962accb6b602a4ec5ffc423882205d05873b064fb3e4c52950a423706fb09
 EBUILD erlang-24.3.3-r1.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
 EBUILD erlang-24.3.4.2.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125
-EBUILD erlang-25.0.2.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
-EBUILD erlang-25.0.3.ebuild 4970 BLAKE2B a956aa549e09eed55901972ff211d542f6a6f51d330e42925fee1d028ccd2f97d4754d8bdcb6439df282c458e8854f87d8cc7122fc4d811c161c7c08f1ffacc2 SHA512 63b75adc44342017727236021034fc0ca198f6466627f85047794102937e1c598b6361c3ce59db2184b279b33aee173103a1c85148b25741907d9e769d946526
 EBUILD erlang-25.0.4.ebuild 4965 BLAKE2B 5a582c538bccaa9a70b1f379b67a7cd07ddf61c4014fa9a19c6ede4234cf0e4cfd9045693e2d39c2cd5e409f95646575177da8cd59a906d3f6969bd5a42e6d5e SHA512 213f5f374b01277b65ebe650f12ed1fae09eb7064f1729da228c0e47a92127000338b655651bcfca4d5e05bd9d8b9298096ea39456c83dc44e2fa63998f8ed74
 MISC metadata.xml 674 BLAKE2B a5ba4a16a6fc7cc3300471f3415c87b5563aca5af2392194401092a6c8a7888ee024526f25cd5ca20c754ced631444e49d51cad001dc4e985ef95a6aacac7164 SHA512 a830c15318fc227627aac8537d42a5ecccebd7e3cf1837d4d13cd10367a0f48d99d08480aff3e1491919dcbb42c29b38aa28b44435d50f1397e6b6aaf6fb053b
diff --git a/dev-lang/erlang/erlang-25.0.2.ebuild b/dev-lang/erlang/erlang-25.0.2.ebuild
deleted file mode 100644
index 1d539c7aa9b4..000000000000
--- a/dev-lang/erlang/erlang-25.0.2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-# We use this subslot because Compiled HiPE Code can be loaded on the exact
-# same build of ERTS that was used when compiling the code.  See
-# http://erlang.org/doc/system_principles/misc.html for more information.
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	acct-group/epmd
-	acct-user/epmd
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-23.1:* )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? ( >=dev-libs/openssl-0.9.7d:0= )
-	systemd? ( sys-apps/systemd )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	tc-export AR CPP CXX LD
-
-	# bug #797886: erlang's VM does unsafe casts for ints
-	# to pointers and back. This breaks on gcc-11 -flto.
-	append-flags -fno-strict-aliasing
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-
-		# don't search for static zlib
-		--with-ssl-zlib=no
-
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_enable sctp)
-		$(use_with ssl ssl)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		# Note: we explicitly install docs into:
-		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
-		# To maintain that layout we gather everything in 'html-docs'.
-		# See bug #684376.
-		mkdir html-docs || die
-		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
-	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-25.0.3.ebuild b/dev-lang/erlang/erlang-25.0.3.ebuild
deleted file mode 100644
index e5b9526aba8a..000000000000
--- a/dev-lang/erlang/erlang-25.0.3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-# We use this subslot because Compiled HiPE Code can be loaded on the exact
-# same build of ERTS that was used when compiling the code.  See
-# http://erlang.org/doc/system_principles/misc.html for more information.
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	acct-group/epmd
-	acct-user/epmd
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-23.1:* )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? ( >=dev-libs/openssl-0.9.7d:0= )
-	systemd? ( sys-apps/systemd )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	tc-export AR CPP CXX LD
-
-	# bug #797886: erlang's VM does unsafe casts for ints
-	# to pointers and back. This breaks on gcc-11 -flto.
-	append-flags -fno-strict-aliasing
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-
-		# don't search for static zlib
-		--with-ssl-zlib=no
-
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_enable sctp)
-		$(use_with ssl ssl)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		# Note: we explicitly install docs into:
-		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
-		# To maintain that layout we gather everything in 'html-docs'.
-		# See bug #684376.
-		mkdir html-docs || die
-		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
-	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
-}
-
-src_test() {
-	# Only run a subset of tests to test that everything was built
-	# successfully, otherwise we will be here for a long time.
-	emake kernel_test ARGS="-suite os_SUITE"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 7012250f3ca7..577c475a74ad 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -239,5 +239,5 @@ EBUILD rust-bin-1.61.0.ebuild 6636 BLAKE2B ec6cb60a496aa25093e64e1bbf8987dde7397
 EBUILD rust-bin-1.62.0.ebuild 6633 BLAKE2B 81c2d3ba738cd054efdf4362f61905726a99a3521a2188918694987999fb32bc129538b03734826bfa33f9545c118844d49a1ce2404bc77c9a54a774f321026d SHA512 15d5ef538ae16bb10b6fa323e6b8ad334c5cd67d00e5f2cde5ae7f9e7a2a268facbf609fca9b544f3fde38b68df7b1fc15eeeab4178433cb016ee0ec68d03282
 EBUILD rust-bin-1.62.1.ebuild 6620 BLAKE2B d8b27d5e314f42b0af2aa17e24567d1b51250b8b42415f8f6649a2dfcfd64606fa32ce8c66a4e5cbce5de5919af45f2b39950902c50d8ac12e368bc74faa1ee8 SHA512 7eaa162b689e437f5abb541c2be57c9d69cab493071b05f30dfb7072c5287be0f3b6cb86ace1e7ce44707ad20cdac59251388ffcd6f01bdadb86df8cce56d58c
 EBUILD rust-bin-1.63.0.ebuild 6712 BLAKE2B abee1ad7328135967f41aff0f980268644c361635532fb72b69cc570a8225f007f71fdbabc95f95b24c0419d86fb8eaff0458053e36e9d36f9c0e6d6deb023d6 SHA512 12e29788c178768949bb1a1eb30b1c0f232af105c446619c97bfe434d0715f71fbe130bec63398fecca4d94fe959db405432a366c77720ffbc91e32c04a0aa61
-EBUILD rust-bin-1.64.0.ebuild 6851 BLAKE2B 9a095538815c536bcab08d73e730c273783e03489f673d4095414487cc0022266e1b414d2d78867f6ab137a42a5675932d70d54dc95e5a6011ef33a5eaae4095 SHA512 143d101a4e487a96731146ae91238f6884ee4ea57a633a0331d7be0ba10468a053eb11a8ef1b4d0b63665bc028f510bd12384b98c093d48a406cc017fbeb25a6
+EBUILD rust-bin-1.64.0.ebuild 6799 BLAKE2B 97837a7ed34a2a11d875f5a44175db51d9bcf7a5fb284a67a26c4eaa5c3c5d88a9f54202d4b764daeac099822e012fac43d9e2aa2ae111a6edbc2c0f63d4a9ca SHA512 0e0b5bf646fc4d337e2df72b755c7b235c226952be5f289159db280ae48adef494e2f3738c34d769fabf8287d99967d55b889fbf0f73782f3b4172b6ed1cae95
 MISC metadata.xml 696 BLAKE2B d6c2665e1859a18e6b1bf7c04a0de5adda80e34b759994e158a137219e314ed0e4890a8a7f680e1b7bfb940c04e3c0b49eb3518f2fc08dcc9e19cd5fb867d02e SHA512 b93c2ab79c454d8897948e810150cb2512ca606083a2aa2135425a69ac7b7077f64e3d86f8f8b13734640a05e668a870d70003d6dc9fd3d151ca7ffcf2fb3c44
diff --git a/dev-lang/rust-bin/rust-bin-1.64.0.ebuild b/dev-lang/rust-bin/rust-bin-1.64.0.ebuild
index 9e2846e0a8ac..9e7e4048e675 100644
--- a/dev-lang/rust-bin/rust-bin-1.64.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.64.0.ebuild
@@ -152,12 +152,14 @@ multilib_src_install() {
 	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
 	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
 
-	# musl logic can be improved a bit, but fine as is for now
+	# make all capital underscored variable
+	local CARGO_TRIPLET="$(rust_abi)"
+	CARGO_TRIPLET="${CARGO_TRIPLET//-/_}"
+	CARGO_TRIPLET="${CARGO_TRIPLET^^}"
 	cat <<-_EOF_ > "${T}/50${P}"
 	LDPATH="${EPREFIX}/usr/lib/rust/lib"
 	MANPATH="${EPREFIX}/usr/lib/rust/man"
-	$(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
-	$(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	$(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"")
 	_EOF_
 	doenvd "${T}/50${P}"
 
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 1ad5ae2d0b2b..17fe6e8a2bea 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -219,5 +219,5 @@ EBUILD rust-1.61.0-r2.ebuild 22375 BLAKE2B 6662f32074219bff329268ce638d622bb982f
 EBUILD rust-1.62.0.ebuild 22245 BLAKE2B 569dfa03db6a73f66162ced3171af6a49a36c56fbf3100fd1c42825a565275c69fba473f831daf293061bf9b7a10723d4f94e2b8a5800ff683154e37e221faa3 SHA512 7d9e9847594e8da16cac61a6129782c37e6362ecb0ee7886728ddb33318ce6afb32575fdd3c0ef201d90c577d46ed2ba3dd5ce1003cd20ff744e33a05167b826
 EBUILD rust-1.62.1.ebuild 22239 BLAKE2B 71e56ea01ad7f97bb5121f3509e94fe02cea33f7d04cbe23d30efa21ce05d646409533e1f69f33b2c9867358a258155e646a01dd7b295d8c59767e8b51c2be67 SHA512 79eca27ca6013e128635a242c77a02ad5c8aa1664e6993dfee1857e56e384251a651a8254f04056e7e007987113112738c799c9052e81ca0a8906563cfd39fa9
 EBUILD rust-1.63.0-r1.ebuild 23725 BLAKE2B 9823bb99dd59ed98a406fdd234db54fa06370fc29a0171e638ad3da53489e6a0f6495308979de3c3989359ed870f77a3f1c735953b266731024c927ea3e0150b SHA512 9fcfd5e445cf9244e283ffb4ef280e4cac23972ed035909a186507feaaaf1f6a0c44b92e0a2386811f564b46c0c594066f4d98a8b60eabe0097e72ed7e3374de
-EBUILD rust-1.64.0.ebuild 24233 BLAKE2B 42bb6df105d313f57f4a1c328f52cdb938cfc8e0805cc52ad2df680e2f661f31f75cb46e0a446bf3980d02afbba7c6c70c41f34ddf38502436dead0f9d0166c1 SHA512 3b51dee7d7609ddfc8f6435a835c79c9b10e29a02062a11347a4b9c099d19282587e319ffc59e4e3a9bad2ae2ad7804959dc9330b9f8a5bb932a826be3345158
+EBUILD rust-1.64.0.ebuild 23274 BLAKE2B 3c8167740f2be30fd3f308c2037ca27fca36b6944ebd49aedb60451d8ad0e68195fc530d0f1febafecd271ec9916a09b3398c3e5a0e380abec294f3fbfe9d892 SHA512 5653200cc65be6d7e4f309db7b9fd0b0cee66e1894a936b43669edd7501942e688e2a71b861ef8e3e9847f9dc9464b3d4d8a820f64b8f4044f4ee89047f8c16c
 MISC metadata.xml 1770 BLAKE2B d5881dc5ea39a5bfff7c74fa883dc1a6370db572568e10fce81467c2f2a17018de48123dfa7993d6d9644305bfc5ef5b0f445ef40362065fce943efb4af2e761 SHA512 c914e1a0cee95fa5cb332240f3eb6fbee73e5d8baabfa6bdcdc3e852c9480fea0686e435b969e14f45d8c791655edc6e6a7df2259ac99b6a6e63af65b09fa57e
diff --git a/dev-lang/rust/rust-1.64.0.ebuild b/dev-lang/rust/rust-1.64.0.ebuild
index 1ff74e470d00..69b586f8f355 100644
--- a/dev-lang/rust/rust-1.64.0.ebuild
+++ b/dev-lang/rust/rust-1.64.0.ebuild
@@ -163,7 +163,6 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
 PATCHES=(
 	"${FILESDIR}"/1.55.0-ignore-broken-and-non-applicable-tests.patch
 	"${FILESDIR}"/1.62.1-musl-dynamic-linking.patch
-	"${FILESDIR}"/1.61.0-gentoo-musl-target-specs.patch
 )
 
 S="${WORKDIR}/${MY_P}-src"
@@ -293,11 +292,6 @@ src_configure() {
 	for v in $(multilib_get_enabled_abi_pairs); do
 		rust_targets+=",\"$(rust_abi ${chost_target})\""
 	done
-	if use elibc_musl; then
-		# we also want to build our -gentoo- target on musl, in addition to
-		# -unknown- one provided by upstream
-		rust_targets+="${rust_targets//-unknown-/-gentoo-}"
-	fi
 	if use wasm; then
 		rust_targets+=",\"wasm32-unknown-unknown\""
 		if use system-llvm; then
@@ -459,27 +453,10 @@ src_configure() {
 		fi
 		# by default librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
 		# but we patch it and set to false here as well
-		# also we enable extra -gentoo- vendor triplet target with same settings as above
-		# musl-sysroot needs to be defined because rust treats it like an extra cross target
-		# so HOST still stays -unknown-, but --tagrget xx-gentoo-linux-musl will have stdlib.
 		if use elibc_musl; then
 			cat <<- _EOF_ >> "${S}"/config.toml
 				crt-static = false
-				[target.${rust_target//-unknown-/-gentoo-}]
-				musl-root = "${ESYSROOT}/usr"
-				ar = "$(tc-getAR)"
-				cc = "$(tc-getCC)"
-				cxx = "$(tc-getCXX)"
-				linker = "$(tc-getCC)"
-				ranlib = "$(tc-getRANLIB)"
-				llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)"
 			_EOF_
-			if use system-llvm; then
-				cat <<- _EOF_ >> "${S}"/config.toml
-					llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-				_EOF_
-			fi
-
 		fi
 	done
 	if use wasm; then