gentoo resync : 16.01.2021

author: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
commit: 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree: 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-lang
parent: c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)
37 files changed, 2180 insertions, 330 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9d7c68e73fec..466cfd9ca11a 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ammonite-repl-bin/Manifest b/dev-lang/ammonite-repl-bin/Manifest
index be3247e65c33..78819fcb32a6 100644
--- a/dev-lang/ammonite-repl-bin/Manifest
+++ b/dev-lang/ammonite-repl-bin/Manifest
@@ -1,5 +1,7 @@
 DIST ammonite-2.4.1 48567893 BLAKE2B d7096170c1072aabdc2b4374fdc89bee390a04fc01748c985eeb8be9cb2bc5d09334644c21b3bb4d2eab436b7df1ff8c915a26cde76d38a5765b29673d09ccf9 SHA512 7e65c7789c42e1ac23455dd27702baf80c3f7c554403f3a34bb939283328b719212af0a824152875e09a6120cc6c67405c1dce0e5da1d07e4e185002ae4672ca
 DIST ammonite-2.5.0 48405047 BLAKE2B 5d3506a89f59adde33447f22ed1a480161c6a635cd4710320f7ac66991e6171e5addc9e5ba62013f95b4e4f969899bce5b009853c36e0e966bff41c6afa69041 SHA512 8878a53b42db5edfe5a489c6abba16d985c94adc6b59ce8cac077a4e1eb7b9ad40be4bc1c27a28bbb277a47bab581a60b28ccded90081d216194d45086701550
+DIST ammonite-repl-bin-2.5.1 48408804 BLAKE2B 20d9738229c054e94393d50c86996a8a3fb8ecac1bfebe4b61d989edf0921c027bd5c1b48304bd69d9410c84debe9439aa315678fa9e4146bda845583c829fd9 SHA512 bb45d8790bf5ae853d22501b47e20e532b8a78f61dc63fbeb052b9a704befe1facb5572a3cdf9f7329f1dbca1637e9f191b10be761cb657e293506fb3fdc749c
 EBUILD ammonite-repl-bin-2.4.1.ebuild 491 BLAKE2B 356bd3ed23ec39aa264f37135e83282b994e838bcd92075b9e8273b5b26723a6681ab26b75402beaf29b3bb37fe98f1b64116bb2915d9b05a150ea01e2cd9436 SHA512 204bd1e3f16d432522da6af47e80ea18a9d8e667908b69ad83f39d79e8e0e55746c4803f1d2a82ce0633cb3261ef92676b0cad9ac8cf0e27b8696b3462513124
 EBUILD ammonite-repl-bin-2.5.0.ebuild 485 BLAKE2B 1075c80b4720bcf1114f75e7f0f19415232ff2d21c10f67a62a3c39eb1c31e2379010b6de3f2e5b1010b13b46d0a43245918d33d59ae4a9ec9730008afe8c51f SHA512 dafced49a27bc6b185145384832cd69a646b92cf58012990a3c559b6392d5fb635b91a6426af58e9852c1e67587606c20723b98b9068e4a3ccc1818a7fdda0a5
+EBUILD ammonite-repl-bin-2.5.1.ebuild 486 BLAKE2B 1d2fdd53a42227dbc2f0fb8f7e165582bbd1e92d32c8ab119319a54bdba9e74cff98bbda9d94ebda12e261c5b3fc764d4eacf23bdb65f61631883de1dc8e6550 SHA512 6e05bc776ac93864d5d31806efa1945a49ec7823ec30ea119bd9e932c1baf0363ab7a9624c27700fcbc17ff3c870a5abbd192103b631af71a3b92591ef0d01d1
 MISC metadata.xml 246 BLAKE2B efcbb4db7ac6eb97dc4625930f11c2d780be8fb04e89f2a6d7ef4a853f07b59b3058542d61769f3185b626f35bbe09bd6ee9e34323cef4239f1241dc3ff160ca SHA512 92d34b6d6b6116064cbdd8c79bba97e2f60f56a078c70efbbe87c9cd90cb96bf4522fcf437075bf30417e2ef20f696e6cd4e586203e85a00269aca13f1fb23be
diff --git a/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.1.ebuild b/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.1.ebuild
new file mode 100644
index 000000000000..7da31b8ae7c2
--- /dev/null
+++ b/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SCALA_VERSION="2.13"
+
+DESCRIPTION="Scala language-based scripting and REPL"
+HOMEPAGE="https://ammonite.io/"
+SRC_URI="https://github.com/lihaoyi/Ammonite/releases/download/${PV}/${SCALA_VERSION}-${PV} -> ${P}"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+S="${WORKDIR}"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	newbin "${DISTDIR}"/${P} amm
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 462bfac1b457..e56b985ff6a2 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,5 +1,7 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
 DIST go1.17.5.src.tar.gz 22186577 BLAKE2B fe6cbfce1a8e7556e7f690f34eb1cdf761f0f74b2ff3781bdc3c6ce2efa4fd00229268ee704d6c4a84f4b37b3deae7c65bd12628bf60ec32c2d8c32b13d99de1 SHA512 6c833455fe79476c29a0565ae3b5ede452abb75689d52cbaa524743549f6f12681b6b5035dc4048387bd738c15b7cd8bdc4c875d54232ca2343c7404a4326884
+DIST go1.17.6.src.tar.gz 22191372 BLAKE2B d6b52e23cea61709a682f06aa21db345980a7eb223b08d539721429227bb22d365bde5901e18f289eede0872e7bf9a5db4c2736d847202ded0f5f7351dcf035a SHA512 59e5471d33e72208a3ca1ddf6c13aeb2b95a3291c0491571597197a260fb8cb74241c7bb09b44129c1e39f857ce4279f416c139b3ab2d7aded10002beb222ee2
 EBUILD go-1.17.5.ebuild 4855 BLAKE2B dd3877fe5f7afa41fa91faabd2c0ddc4224a6bd4dca91ee64dc1447a87480a45e67975aa3c9fa1434aa209f55c85e1acec584f09025ea7ecef76e465da877563 SHA512 7568355bc063281f80f2e94b16f9a0b5b3eecf3744167b26154aaecb296bf7201ff07af9ba93c5ecdac66cb3277869c996da79e17ae54c642c9107012e516d34
+EBUILD go-1.17.6.ebuild 4860 BLAKE2B b42be3af896af9dcf861825afc1f2e21028097b0e02b8ad67f785cda6d3e20d15d0c9cff13dcb18c32831f0f0c2a0b44b8b2b0130a9f4d2d3ee178d8b2612ee3 SHA512 3dc73bafec02bae3ed4795f3a60fe36b20012022ea7a7bb1d65668e101ecaa2366a4de4cff7c580c0bd68a624dbcb97ec2bf2827bb2063d8a86b5e6961ced6a3
 EBUILD go-9999.ebuild 4860 BLAKE2B 15dabdb1ce54184d4542c9839303f780850fc003d4a3fd9e79e131aa91c7116ac0513196643a6f9ef86166f6204c3f4a1850c084caab13ed7b5cad7b878119ec SHA512 28fb38b58feacc7e79ae3228b56e654c4c134647c95f6ac165d4f7b328b0ec4c86440b3d11f28d4177bf3ecef3fa2d08768f2ef8c93a4d5d52b057e8354b84fc
 MISC metadata.xml 463 BLAKE2B 133822f9d8be6d5aeb0bf8b9e41ee17637cc3e6f78590a36c1811b77a77a74dd541bb98ad57cfeb6b71a9bcb106c4ac58effcfcfbbef6db4e05b155ef196fd0b SHA512 2837a80088ac2e07cccfb78497c121902a3a0e2f6677b42b1cd82dd3b4e2703099b6d4c95c6c08fefbc647b9b279692e3a46b1126acaad9298c1ecd3b6899fe5
diff --git a/dev-lang/go/go-1.17.6.ebuild b/dev-lang/go/go-1.17.6.ebuild
new file mode 100644
index 000000000000..cd2ef07a5897
--- /dev/null
+++ b/dev-lang/go/go-1.17.6.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="cpu_flags_x86_sse2"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# the *.syso files have writable/executable stacks
+QA_EXECSTACK='*.syso'
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# This package triggers "unrecognized elf file(s)" notices on riscv.
+# https://bugs.gentoo.org/794046
+QA_PREBUILT='.*'
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch() {
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		riscv) echo riscv64 ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm() {
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os() {
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple() {
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile() {
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="${PWD}"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	use arm && export GOARM=$(go_arm)
+	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	elog "due to the static linking nature of go."
+	elog "If this is not done, the packages compiled with the older"
+	elog "version of the compiler will not be updated until they are"
+	elog "updated individually, which could mean they will have"
+	elog "vulnerabilities."
+	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	elog "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index bc3ac9f7f144..c505b758d2c5 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,9 +1,4 @@
 AUX lazarus-0.9.26-fpcsrc.patch 407 BLAKE2B c3b006fd7bb58fb7037aae3d8d35ac146ab971fc6063652e3185b320e4cb05ccedb6c26c7d64b2f2998a901608ee251762b723f62bd9c239a51ab6a6d6f2b39d SHA512 823d9ba2041f97c39d8ea5f49cb02f68d8c98da95d0a479cc65a638365e2adafd1c5645fa6846720af18198834958f37b0cc0d92f38023ccdaf40ec8dc848f64
-DIST lazarus-1.8.4-python.tar.gz 1060859 BLAKE2B 4d6f7dc275aacd0f70d9f7c85aba99a7722b02165a5bf287bfeed46f28e3b36c5abeac19bd7c6555250102dce169f7c9c213b634ce1b634c24dadc84171aed10 SHA512 f244b4e86410fdb2ffe8ccba7fcb51c270286172b6102f757118827cac3b652210a625d65dd6c017c1992983527792ed64334291ab0e0b824f187316452c56b5
-DIST lazarus-1.8.4.tar.gz 63130653 BLAKE2B f9b2ba9971f1a9a9c3b8d2004bd3516c12db5384bb6243ef275c2fc0d458634fba0c1c23e7ecd5c160c1204d6cc2b4ebc340ce8bb5cfdd9c531f8c36ae59d1e2 SHA512 82cdc3c32dddf8e67c0bed9292a9a924227bab50f22ca479f5e98ecccbf60dd66c7f886ecb8e2979d9d8fccc3d25462ee8c55fcab085aa4194b4704660e0b95d
 DIST lazarus-2.0.12.tar.gz 69560778 BLAKE2B ff6c9414483b0d50dbbb30c8fbf626c81d9c71ef0329aa1d58b37aa4288a500e1ab55d06bad27f637e3f09b9d062af1896720b9cb7367b092fc872cf613f8a3d SHA512 dfd22b2b96fca9d0f672f03b9120c4294a7e640737a09b26c274d304025c61566a8504a5484638c108e42a322b21992229451d95e38d7e491a1c2f07a663483e
-DIST lazarus-2.0.6.tar.gz 65558951 BLAKE2B f5289562adcfeab86af074de9fc44d7faf5939655587ea9951559bbefc15ce1730e7b7dafb6ec1d0a11eb0f8f069309b8fa0a305051c5cc9ea0fcf9665e883bc SHA512 cdb4c5861e130c12bf0a4938a73c439f2766a73008678028d7e9c9bcabe7b277e70025a7c720a5c14c157cf0227e0ff629a44cf983537b3afbf341343e816d07
-EBUILD lazarus-1.8.4-r2.ebuild 3530 BLAKE2B 98ad3bf609155c9171b0911812c2cbf9bb7286ab3eee9c1d6c010dec5f0fd694409eb35f0a4d67d5e27f1abe8959129c87ef13f01e9491480d44a339c976db32 SHA512 767e7a9961425daefb834eb4cec25ce9ea537eb1ed50a44fefa11be4fd703fe3747c18158b81799f7cedad25d27e26b2bef3513a9f8f7fa6eba5b21f1bb01dc4
 EBUILD lazarus-2.0.12.ebuild 2667 BLAKE2B d6e1a545dd5a90f61b2f447205bdfb325f7a10e26f79891dd8fb229f76933f437277aba252253b123313ebc3189440d8b82bd1e794873e127c0f543ad514e1b8 SHA512 479430f9b6f5b15cb1fac203fe9d133706d2a01bc9020b23f35d1a5935dbf1bf116e2e9095b7e4175cad964f91def11cbfbb5f3daa21c0b3c47c834d4195643f
-EBUILD lazarus-2.0.6.ebuild 2471 BLAKE2B e9b45f75b6a7c397d09e123bd3ceb53365656271fe6ffbb150543da83d07f6b216977a1fdb405ff17fc22fd48d2a7162c6ad88ce8cf06aaa64e572e6ff151527 SHA512 ef7ad240944f7380302ef1189669df6d3b3815f428bec0a59758b17d64ae9ed2b29c9e3a8f006138536d8e41203518f7fe715238d4afad671b5ae555a02862fe
 MISC metadata.xml 395 BLAKE2B ddc65b4329ed615ee2692ee80ff2b74b1b72992742ee27e6338aaa1ea8b7e39114ce5f735c61bf64bd603dbac7a1828f8bdb4c29b78a339a878b61092556e7ac SHA512 161abe773c486138f13a426c0d056d7efaf62f4180fc4fdfa85aa688021a5a834af7fc972867b92c6f53d45ca40940ff70ba07d7c4f61c4cfc32c2880286ba60
diff --git a/dev-lang/lazarus/lazarus-1.8.4-r2.ebuild b/dev-lang/lazarus/lazarus-1.8.4-r2.ebuild
deleted file mode 100644
index c8b45900004c..000000000000
--- a/dev-lang/lazarus/lazarus-1.8.4-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-FPCVER="3.0.4"
-PYTHON_HASH="586eec1a5ea609ef9df2bf586be06825d9fbd50f"
-
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="
-	python? ( https://github.com/Alexey-T/Python-for-Lazarus/archive/${PYTHON_HASH}.tar.gz ->\
-		${P}-python.tar.gz )
-	https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-KEYWORDS="amd64 x86"
-IUSE="minimal python"
-
-DEPEND=">=dev-lang/fpc-${FPCVER}[source]
-	net-misc/rsync
-	x11-libs/gtk+:2
-	>=sys-devel/binutils-2.19.1-r1:="
-RDEPEND="${DEPEND}"
-
-RESTRICT="strip" #269221
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-	sed -i \
-		-e "s;SecondaryConfigPath:='/etc/lazarus';SecondaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');g" \
-		-e "s;PrimaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');PrimaryConfigPath:='/etc/lazarus';g" \
-		ide/include/unix/lazbaseconf.inc \
-		|| die
-}
-
-src_compile() {
-	LCL_PLATFORM=gtk2 emake \
-		$(usex minimal "" "bigide") \
-		-j1
-	if use python; then
-		addpredict ide/exttools.pas
-		./lazbuild -B --lazarusdir="." --pcp="../lazarus-package-config" --build-ide= \
-			--add-package ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus/python4lazarus_package.lpk \
-			|| die
-		sed -i -e "s:${WORKDIR}/Python-for-Lazarus-${PYTHON_HASH}:/etc/lazarus:g" \
-			../lazarus-package-config/packagefiles.xml \
-			../lazarus-package-config/idemake.cfg \
-			../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus/lib/x86_64-linux/python4lazarus_package.compiled \
-			|| die
-		sed -i -e "s:${WORKDIR}/lazarus-package-config:/etc/lazarus:g" \
-			../lazarus-package-config/idemake.cfg \
-			|| die
-	fi
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED%/}"/usr/share \
-		|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	if use python; then
-		diropts -m0755
-		dodir /etc/lazarus
-		cp -rf ../lazarus-package-config/* \
-			"${ED%/}"/etc/lazarus || die
-		cp -rf ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus \
-			"${ED%/}"/etc/lazarus || die
-	fi
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
-}
diff --git a/dev-lang/lazarus/lazarus-2.0.6.ebuild b/dev-lang/lazarus/lazarus-2.0.6.ebuild
deleted file mode 100644
index 8cfaf07f618b..000000000000
--- a/dev-lang/lazarus/lazarus-2.0.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop
-
-FPCVER="3.0.4"
-
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-DEPEND=">=dev-lang/fpc-${FPCVER}[source]
-	net-misc/rsync
-	x11-libs/gtk+:2
-	>=sys-devel/binutils-2.19.1-r1:="
-RDEPEND="${DEPEND}"
-
-RESTRICT="strip" #269221
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-	sed -i \
-		-e "s;SecondaryConfigPath:='/etc/lazarus';SecondaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');g" \
-		-e "s;PrimaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');PrimaryConfigPath:='/etc/lazarus';g" \
-		ide/include/unix/lazbaseconf.inc \
-		|| die
-}
-
-src_compile() {
-	LCL_PLATFORM=gtk2 emake \
-		$(usex minimal "" "bigide") \
-		-j1
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED}"/usr/share \
-		|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
-}
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index b5357b0e4f65..92af25471006 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,4 +1,5 @@
 AUX mono-5.12-try-catch.patch 1267 BLAKE2B e33836d53fd4c9a4e64614d3f309058b2009487a853aee48fae99cd0326095b6dc26e7fbdd178e25f9fc3901f74f937ce5e9d3bb4322ca50e139d13f66c209a5 SHA512 3a82d4bed31b212e23fe24647fc5b9c4788be5f4966377a3bef9f92a51d16181e77e19ca1ec4736792da6a18206986bbb54d967499e2ca7e224201cf811f91b5
+AUX mono-6.12.0.122-disable-automagic-ccache.patch 513 BLAKE2B ca0f3f1b2d9f3357f8e5197acdb18c3f02a9e09d90140fec133e20edaf960e74a4bd4949b453d79c656c3314fa720e94794b91a748469ca91abf78c8ca0bb8c6 SHA512 5e97c420272644f0636dcee2baf49cfc91d055c42990197c1c2724358e6847cf4866f22c247d4930ad7b780037c252970c3c3baae7641794ed8f50ff6456f23e
 DIST mono-6.12.0.122.tar.xz 292266176 BLAKE2B 07043c5fbca33edf64ebca0392b47af9b9ab502be772efb5afbe5ec9e8683b7f4e96a305ee906dff617842bdba2819c2abc130d7aff23b12779f403bbd88f3bd SHA512 0fbd4147498cc81e384933147eb6aa5c559d17a794a308af7ffa43dce51e0faefde24fc75e987ed804dcb161b52756944bc3611100fc0a4adcc260ca97ddaecd
-EBUILD mono-6.12.0.122.ebuild 3285 BLAKE2B 21b8c9a96de5bbb6a60567fef3560a68a582c91c7dad438cb58408e153ca9d1044e0249688defd15d98ef8997a0985f522386f11eab93060d97992c5a9d0753b SHA512 4a4ebb8c6ca91023ae9965cc55924ec682497a3ffb67af28864df5f77b6ecf0ce31afe900798db30e8417ef14bf9edebb390a44db4785e71d4332e12efb6946f
+EBUILD mono-6.12.0.122.ebuild 3348 BLAKE2B 10e4fa87a6cf16ca2a86110e8fece4b68ee6f96cc192ee270268d263c3af6383bdd19334765d84c3336e6532bcf4387946ede6b2a1570a0980aa52d462a4f42e SHA512 9f13d5e99228d52e8a366b3f781448a6f385f4fdbd7226b0944dfb3a6d10c27b1751814b0083e136ae996489e2d61d747efb986ce984a07bb9e89529186b1716
 MISC metadata.xml 582 BLAKE2B 498a6035f8da9da20ae51144d40ff5c599576bc3aa76471d655fb1eb127bc9fac7d5e3c6ef20d2c3d7befce109931f6a2ce6751183d1444eda6a39456068ceb7 SHA512 691d1cba0271329b683c9c81651343dafaeab891aab0b9396c7f620ff1897848d2c7171d3ad73e7feb6ac2f63e98262c9ee3ee6f679e4a08bf7d1b6973921b2d
diff --git a/dev-lang/mono/files/mono-6.12.0.122-disable-automagic-ccache.patch b/dev-lang/mono/files/mono-6.12.0.122-disable-automagic-ccache.patch
new file mode 100644
index 000000000000..b92592f6ea32
--- /dev/null
+++ b/dev-lang/mono/files/mono-6.12.0.122-disable-automagic-ccache.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/831079
+--- a/mono/btls/CMakeLists.txt
++++ b/mono/btls/CMakeLists.txt
+@@ -12,11 +12,6 @@ endif()
+ enable_language(C)
+ enable_language(CXX)
+ 
+-find_program(CCACHE_PROGRAM ccache)
+-if(CCACHE_PROGRAM)
+-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ if (MSVC OR CYGWIN)
+ 	set(BTLS_HOST_WIN32 1)
+ endif ()
+@@ -129,4 +124,4 @@ endif ()
+ 
+ if (CYGWIN)
+ 	target_link_libraries (mono-btls-shared wsock32 ws2_32)
+-endif ()
+\ No newline at end of file
++endif ()
diff --git a/dev-lang/mono/mono-6.12.0.122.ebuild b/dev-lang/mono/mono-6.12.0.122.ebuild
index 449d4aebe3b2..97ee904ee535 100644
--- a/dev-lang/mono/mono-6.12.0.122.ebuild
+++ b/dev-lang/mono/mono-6.12.0.122.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,6 +36,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.12-try-catch.patch
+	"${FILESDIR}"/${PN}-6.12.0.122-disable-automagic-ccache.patch
 )
 
 pkg_pretend() {
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 0a5472f8b8e2..d9700c889b39 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -6,35 +6,43 @@ DIST Python-3.10.0.tar.xz 18726176 BLAKE2B 77143edf733cadf7e52327a58782f0617b1dd
 DIST Python-3.10.0.tar.xz.asc 833 BLAKE2B 295df19932ea076bb1a50acb38782055ff34fb235df0380fa361727eedb3ca68aeca2a31419de5b05ce128c2e21ad04605c226e7a61d508a17607f615e46e570 SHA512 67236e02bc49da1423717cb54216b745f613ba2fc4b372a4aa15a36ab15fe69d9b9087070382957d480df7576d13056caedcd979fb56531799a1190b822f673d
 DIST Python-3.10.1.tar.xz 18775460 BLAKE2B d2dbf875ef5f9cee6dfd66e2d2489b884813c6a4eb3ef4da25713361efebb9ab271dc7050de25d4b07808bd3fd510700975c733ca8f283caa7426d16f273a93d SHA512 1c559e33f1252e51bafb941c380de16f142c0735858363c84cb8dbed6767843de3af126889c2826ffb94bd4777d7cdfc31040301c8c74de56af52b80b1aa9e76
 DIST Python-3.10.1.tar.xz.asc 833 BLAKE2B a5678c522b486a246993616ee36ddb3f74a093fb5729d8d2da3cfc4de5c3e1fcf3f4f55504b7bbf929050204d22a89ff3c7750b599034a3d5c941666f54fcad4 SHA512 645d5f40e6e80a590923a48763f20dea7da3f3eea5825bb79e08618d81d1b8eee0ddee2b57503321a584280536e0671e4913e5ad450568fbbb44509c01d3907d
-DIST Python-3.11.0a2.tar.xz 18714064 BLAKE2B 54680f117b639fdebbe1300df4d4fcc43099d30d146861577eee7ad5d9a7de43b54bec0f058db58d4d7067a8ab31cbe344a276c837dddcd3df9105d2a5aa615f SHA512 9a7c4d2be0cdf5801aaf6ec6337390a2f0e711badf0e0e35bcf0e5c98f652c68cf523afb991e87f4a1d1604eed3d19c56654d55922986ab27234e82675b20391
-DIST Python-3.11.0a2.tar.xz.asc 833 BLAKE2B f3714b71fc1e167e2d5a9989003159606a5eb5288f6d44c5332d7fe101be79e411f035ad1fcc3acd930f9e02377ed8c45f6b981827405dc501b8b074b5eb3dcf SHA512 617181a854c884c6d3a79368000ca82430bc391573ae3a1b25f69939bce3d2d365e8ca7166d941856a78f3598ab4e7720a144ecb6c3a9de1aff5928799c2988d
+DIST Python-3.10.2.tar.xz 18780936 BLAKE2B ce202f7b45858b88ffdefe8217422fa9dccccc58000c6f3d40c9791d28ab58f67fa033b5102cacaf0ccec5524510becec9870c9bf5238b78203a0a354e8f526c SHA512 215a7159face84788fe547c1e2689b8d0ae510275157cf01636bef2902d0ff465f844eb0328c9f39fd1cd03a1d1736d4cf258992f2788e492a801a372032c08b
+DIST Python-3.10.2.tar.xz.asc 833 BLAKE2B ff3b1f8c1c62e75a00ac70bbe3a2e87406f0f44fba8bfa1ea5c0d8b8175a8720af62c57664bf50fa5f7ec7caeeb2669c17917e457daf43755f1583e92eb410ba SHA512 086aeaa999d3005cc1f9057d90230c7a9e65d80f436febf16b0e8ba6f49645870ef21170ca1af50c8e2f51e6f46338cfad73a2d91320ad4a3315a2ae87eb70b4
 DIST Python-3.11.0a3.tar.xz 18775072 BLAKE2B 5d1650e2258d0f9fe4d5b3ab09b94e2269844a44a20f7b6425097755200fb022d3c1df8a59bf147dfd7759766769ca9c88d3c202667ff275c02a3a73eb79daa8 SHA512 69fe7a4c80ab4e7674685b072b9dea435dc7968306a1ce8b1356a1bb9b998ed6b9e35c17b5ecae3c490f5c71f524fa791bd996431d5dac550773cf5e8362a7ba
 DIST Python-3.11.0a3.tar.xz.asc 833 BLAKE2B ed366bd939f7168b0ef41ef991ee74c142f4e8d8118fcc67c149f7ac5e70488fe1e9822ad79eb47576749902f4c28edd4584ade1aa2796376335c54b323a64ef SHA512 890d9092d2a155d65588f3a8f34e93b6e3e549b0507af856ffae1fbb3a2f3f1446f6bc69684c23116bed4e3a547a331173e83c3d52a7bff8caa368f955fe293d
+DIST Python-3.11.0a4.tar.xz 18805548 BLAKE2B 3315ee4392c3a7312273c705779415f5456e3d19d5e7b4008a67b4ea68a9d8aac2ecb06524b856a3522723f628ff687b01f2a5a48a04c24b4883ba357c30d685 SHA512 721ed64f3fde360e9eae6d8f8a046091c7c08f14c860572ac868132dffa4ae0a46f3f57a3872fcc096551a66e4fa3b1c87f77baa52d8524da026bbdaa74837ec
+DIST Python-3.11.0a4.tar.xz.asc 833 BLAKE2B fd12a6381eb137ef99ed508f8a704b4794d554d8e62a3febd8f87f226ad86efb1f5e5607d088fdba33ee2215118bb05e2357bad5ceba5159a76821fc74b079db SHA512 21e56475186c3e6a029a51799cf8c86ac74d3810b5aa76e4b4bc063bacb2624b21b6ec3450dd9f91722162e57390617efb521351b11d262d6583655081277611
 DIST Python-3.6.15.tar.xz 17223796 BLAKE2B c139c6f93ea70ad898d5626dfa964280a14de9676f0d9d55668ad91618b1ba330874cbba8d6526a87e53b585ff34e3bf242613ca3fb17ee60f362a9676306c7d SHA512 f1894d704c91669d94ec83b5631288bf1e0c73ddcf33cea0977575f262eb672caebc8ac00e34e9b99c321c19cc9a71d6081fa957bb8e23cf5bfba50f345145ef
 DIST Python-3.6.15.tar.xz.asc 833 BLAKE2B c910f2367ed947ff6b33380bf8fee318c65d6e5fb0c4a847fd8f2761bbae81dec07b729b31eca060916264b6a0ccf5c52ca72181b3db79751df7697a426a8939 SHA512 cdc93e5d8fb2b5b48a1560a55bba4680adea10e35c8c38b4c51cfd2f6ba54ab2a5d4e5f71b78b889f98cf8ad9d598e0f4e019d50cc16f7db57f9d292a860fcfd
 DIST Python-3.7.12.tar.xz 17401916 BLAKE2B f01b5cc54cd0ffe2e8756767c624dda8d2fbf24e90f22a16b5a406dad995ef218613db10f0b3fb2da0ece50ccb02c8a8e007ceb0842ce9e93ee9df7348ef1528 SHA512 e1a5942908c1d1469c0ab129fb4287d4ba6eb2a030e88fd71c043fe187a1bc86c00878dab29147199617a361a0c60d9e720fe3bc58bc7bc4cc8ec4bb50c7ea2a
 DIST Python-3.7.12.tar.xz.asc 833 BLAKE2B 587fcf019f4b07b811834d7279b9861eb709731a431be9cbe8f5b868ac72b6d9a4de8b24e3fefd6b339813299514a0ac12b5f627acd04c185ff8dea22a044723 SHA512 a47003dd5c784eca4e3c34dc8705d1171043e060f3a97e4dd63ce4aec2bceac56d7e808924d63b2a38f9a020bf799cf29e5055fb444b9b2c3f03976d47122355
 DIST Python-3.8.12.tar.xz 18443568 BLAKE2B 73413aee7a31347ac4342718a54d23d4036220262c4cd41cd50b06c3b1698d52d11cf7ac2c781b919f2cdb0dcb6397d623c463dcdcd1edca99abbbce239a3c6e SHA512 2f93fe5ff83f470c7b6a1b7f29f499a2a010fabd649e9fe65ad3fbfa21b6e1966e77c9b7ac012d978159bc3fe63fec2d64bc6982fc2ee1714d3fa0e47631f279
 DIST Python-3.8.12.tar.xz.asc 833 BLAKE2B 33f59aa667555832ee510d2a7295079f34a3983dfa84beab20b33ec691ea3eecfcc4a62591fe233fc30622d0236ee69a3d41b8922ee2f4c632df3523d565c3ec SHA512 ef552b716a721f410abb14387594c8b0ddc65ce4b8a6ae6bf920c1db2ea9ddf6bbf547e93d3716495ae31848eb1049aae4257016e888393681bbfb6f6529bc12
+DIST Python-3.9.10.tar.xz 19154136 BLAKE2B 4acd2dc26506592c776f9ed9fac22e5a8741ab700ec11aca93566425ab2a957392e6284f0818198e20088463c047502a07d3f5dadc8ed8689c316f823fb2d444 SHA512 09cb942f84bf362df88999ffa6faf89b4ad12302e67cda4a11547828ebe410c7c93a3dc96cd66fd9c5c7d9a1abe5b8e259e7ec47c10273b42d212270aca5ecba
+DIST Python-3.9.10.tar.xz.asc 833 BLAKE2B ab6a514bc4ac5032f5209344d234491063bc3dc1ef9c3e4b66951deaff042e25bc830a301cff2a1b674ef4025526001f6e73c37b65d9d102da247660a419e2f7 SHA512 d9fed5b39100b81835085d712453516d309b0dddc1524d578cb63c95cd1e2392882702111dd3cb0ebf58c98b94ec04838c89c57f4a7a649c585f7ba5eef70e5e
 DIST Python-3.9.9.tar.xz 19144372 BLAKE2B 3a144ca5e4b11b2fd09d05a4a40ddf3f622c077338602c519b21ea827c96e0f14ab97563c0a9d306ae4a5c3f44753573a07474dc084fb364d24b2128bb378ddd SHA512 0ab29fb9a7ecb808bd08d84d28908d5a934e0f021853da0f7a9c94670eb30c8dbbc233d461afdb3995b0de59275ef7e1de43e82d7f848802cbd6e6e50b7b25a6
 DIST Python-3.9.9.tar.xz.asc 833 BLAKE2B 41d05ee1ec256f0cab4e9d3540877783745f0f30e3f1177d01096b352341a90893c5c9523926bed8176bd304cbb1fd6619be3b4e375103874eac5e5ebc113135 SHA512 84fb739c60216ab9a7a487a0ec4039a7e85c7684ef1f71d8b3bc415ff2ae284f79474103ae05385502bc2510401f8cfb33d84dccf5d0ea9a0dd62528519d935f
 DIST python-gentoo-patches-2.7.18_p13.tar.xz 33296 BLAKE2B 91b711458aff4f6337ee1b34aff58d7edda6725644a64c9320076a1e04c816729ed163d82333cfe4dfef379a9ad5ef50ba00abdbbfed4503b0f92c8f0b7ca683 SHA512 97f3657a4a95e8492aa710801b974a56e6dd4636e475aea45cbbe76e7ae32d00f07b05769887f05e49cb0df8584ac9499a7ce842bad77f837a7c869f9b769b07
 DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4
 DIST python-gentoo-patches-3.10.1.tar.xz 8580 BLAKE2B 58d165c6c21a6736787d77d5bbeb770adff7f3729a47f62d0b7c4f0982c15c6a50b326be33638f3fca5574936cbce35d26e9ce0868faa3b5a3412b30586b066a SHA512 f86adf4e5195b1eb13cedbf24c1956964ce56745f0524a62b1e7c6baf74c6f1802e05cf4c08519b147579945c0526ff0a0ffc01cfb4372c0ec4f403b25e81012
-DIST python-gentoo-patches-3.11.0a2.tar.xz 8472 BLAKE2B 440e31d70895a537bb89099cec440bd5de56cc3ddb65d71483f5f82eeb253fe4a99f87c41b8ad28ed039ffaa3eb48674de15b9e031572fd81aba4c1c79ad2ec0 SHA512 f87a7550fa20027c870500babcc8893c2c4dcaf68a25d8096e0edfa1f473fefbd0117bd847514f2784fe22cb0027b3b269c7bc7d7395c1f96932a56d02bfd404
+DIST python-gentoo-patches-3.10.2.tar.xz 8584 BLAKE2B 4328b21d7b8b0e39d0d6761c3a52cb5369aff7dfa890a1496fe5c01720bd9d8ef38d915188ad6079158104f8acf5847e220d58c092a9682615aa366dce9f20d2 SHA512 063c53022525cea988a9a27643bf0b2b5e674259de487826ee3b3cbca50c369857908d53cee9be59adf09db7ac0dcaed65639c40204ff4519b812b215de588a6
 DIST python-gentoo-patches-3.11.0a3.tar.xz 3656 BLAKE2B a80380a2a64822bb63ceeec80c58d5482c4d2719d50e8091fe2a6deb199de3f22a4d794a76cb95792cc5b49567176a6e2e8bfc213e593782ec7f4211d2e00837 SHA512 71247cedf34cd195237d1eaae9cd3a24159e9631b726bf2e4d22840d0f166b12557657eba0686df7b8a8d272c52a584827ea4b7b62e1ce3b56eda4d9a2e05927
+DIST python-gentoo-patches-3.11.0a4.tar.xz 3652 BLAKE2B 19beab7c85e93414f392f2fda89a5ec0fc0a8339bf3804cb88c349cbb57b2c2cd6338d59307a950abe387958cbe7d3b958a73004b5fc51788235660aed3dea6a SHA512 97745cc7dd9c0849f1e5cc577322878f831e7af0b45ef6d23e0cee1b02879386bbf22d84ff73b8a5f70f2b193788f3dff003ddc248bd8ea19779c371fe706bdc
 DIST python-gentoo-patches-3.6.15.tar.xz 15300 BLAKE2B f49fd96f6ad1a1c94fea6b83acd229a81754b86061e243044ead4b9a9d5122a2e43b270b68722c359c084c05a566a3ad70aa46588ab7a005ee560ee118b92b8b SHA512 cc33491a33f3f1d990cf494d53b91b74db761142e8aebe1bd4b128ef10a268ff945e5ba08daad39cee095612a8e52265d6988873ecf9c073377cbbc10735aa39
 DIST python-gentoo-patches-3.7.12_p1.tar.xz 19112 BLAKE2B e9964244af3db544dd6e96d85ca4bc24d7131b48eda85df5bafa3fb36474a024cecbbf4b27324e1f35f76ae6a1aed31dd7896e831b79b574b45a4371afcc7e5b SHA512 9ec996c2904f99bd6651ed1b700eabd91f2b82b1e9e0f3d9572243886a9c7139bf8ac2af04169485d3ca6339e1a87044cba203f6f0aee9609d2a1d53c812548d
 DIST python-gentoo-patches-3.8.12_p1.tar.xz 16632 BLAKE2B cce7a41d020af1ffc55a01ef67b20bcb16c68adbccc1e44ef166d1707e817ed6c3bae70f84c56553f27bca449015e273014c0be73bc2f9b4e25844ddce385486 SHA512 4621727c2e9cc1c5519e021210e16a97e7167ea831445dfdd07f5b0ed642b5919834244111708a971ce098b10b439797e1c76827eccab803f801052c671f1ae6
+DIST python-gentoo-patches-3.9.10.tar.xz 12844 BLAKE2B f342fbdd1a580787e2d699ded9dc5307f5b610303c6869aa8d0fa4d9e60acd997dc12ae96c6de07cdf9ce0a8bfb6e13291d611d4a6a193844049882b5d01d1e5 SHA512 50111552ff82019672d82e5a328e6e9d8ec2a61a957b63a7a49c5de1f1b77be296272f4273c78154667d5a88d82646360d9a411bb8cf451408837413b06d4b23
 DIST python-gentoo-patches-3.9.9.tar.xz 13200 BLAKE2B 672e3b79094cbc791988639a5dde4c9e5622e91bef4310d26838716c65763ca69a12c6afef2f19487f4389974af009896e452c19783b0a491072d13f893af7e9 SHA512 3cd4ddd070ab48d9978e1136d237fc24030fd3ce6704371ce99815702a45d839ee26c7e9552b004661827759edd30222434e4166f9ee16f873ad4783c83f723f
 EBUILD python-2.7.18_p13.ebuild 10025 BLAKE2B cc54d332d175b7b47c6cd016a2b97bbb4382c3a3ae23c2997a6a880b214479bde90fe64c532d206001d6ae4191d692f4dfcd00e417480f69e1f5beea3f8ba845 SHA512 992f7ea5c67d5f45773ffad8fde7fd9599d1c1a854804e1b2ad1ea85affc95ddd27af11e28f246aab46ef72629c94000960ee326db6df9bca63cea5f15cafbb5
-EBUILD python-3.10.0_p1.ebuild 10597 BLAKE2B 6cc74526955f33fc1005f999930650384b4ca46c3abde728fb93762f1be458e01d62fcf2c5352cc5f340fcb9afb749f870f0266e9bba848479a44681c608a704 SHA512 b9e7e51ac1d09dc6326bb1a717417c6ee67902192e727394a89e0b3538344d0810b4ce31d0c65d8516ed27c59dde71249ba603fbd397a70181fcdd0502c42082
-EBUILD python-3.10.1-r1.ebuild 11049 BLAKE2B f5db91edb7795462270e4cf8ead2a5b0f5b06aeaaec5cd46042394fe671c4f932066df29785a5e755937efc90e48d0a9dc26212925059f2daf6d15537c41bbe5 SHA512 3d07b3d2190c9fc1c0b61a6aa89c15f5c21245cbbef04b4a829cf916c4e72c751c8542b3b661575ef533825948d447b8c21ab917b3504577570ab1b60cf3129f
-EBUILD python-3.10.1.ebuild 10922 BLAKE2B 88c752e45468c925ae388377a97cad10d5b57c36ccc67005888b9054c7fba80592649626a2c324b77b8acdb6ecdea82699f0385fe63737e4ff8ac3a27d03fccb SHA512 9411c518ecdcc87ae1a8fe6442444ac3cdf0758b700a86f78021e8aa32f7a4b27bec6cb01fda922b691c9baea6730b3998ab25fd52594f692bd807ac735fd955
-EBUILD python-3.11.0_alpha2.ebuild 11160 BLAKE2B f69ccbf9e125b0f51720c8fc8a14ee8a85739bf52d2eecc03821631a769efdf690fa1bae1041bcd0b247a7343424f74ff6139ee1f8eefe1650ae6b2353fad53b SHA512 ead1cf529955567c8cc03ace677a49c559c83ea05226cd3bdc97de9bcdc00271ee10a587cc2471cfb48fa3d80cb3818acd850f81578e6cde10a2d1276595b654
-EBUILD python-3.11.0_alpha3.ebuild 10942 BLAKE2B 0d18b729ce09e49d5162b0e8afdbd4ef33cb74948368aff42e3b7c8d8db170d0861a85e02d62fc0cdb3afe687d2c257ff303d6357106e655ef32ec48bfee06fd SHA512 668f939bf2edba9851be6e978becda8acfbfec3047a0f54a00bc6d38e702fa31909aaa69eaad2b36ae336956466ed4f6b8271b5b6b75e6c7d1fcce2d5e948c7c
+EBUILD python-3.10.0_p1-r1.ebuild 10649 BLAKE2B f6c02daec9145c17967964b3c2c5f12fe3549eebd11b939509bb1ebef5e480c121839005ea018e9d06b524f029834e8feaffb6c1b2e5c78aff023bf0a7fa422e SHA512 ed8f377ff9cfe136817c4e71e22e63e290023d9318a1cc85aac4db8fe273a82863a4fb1dce9c954d03aa3314edbc8f44454a187976bb9ff0759fc0642f94c3de
+EBUILD python-3.10.1-r2.ebuild 10974 BLAKE2B 3db9c01d20b548d9463aafee2806f5d9aa6f923a6c2fcae6756a82398d640eb0b9efd48bf2840e836abf500fd6863f259dfeaf8eb6a5c0191de89f5925c5e183 SHA512 297f9fb8a03310bc50a31b384376fe4fd3e768fe8f573b8135e3eda44d88a5434a2f8b2ee7ac7dce6aebd031f080d3e2a29a01524ec52d8b660d597896992fab
+EBUILD python-3.10.1-r3.ebuild 11101 BLAKE2B 79eef63d0ae92af7002a860b4c7c1e95e3f6c3d07b15a37222895e8f2008b7d76b86200e4c69b2faa8d684d8dfa81f76880a1ad5c2932a0fadde8c69ebb3a6ce SHA512 647da8d99768c94c290cd7bb5f11505865cd7273c57804e6c90d8a2a1aa321b498966905655c171ecb8c64b975ccb8fa07e3d0926e83249baaa2c18a75708f92
+EBUILD python-3.10.2.ebuild 11144 BLAKE2B 849484ac56fc4b32e73b17f7343954a897d9d358b7c63362f105afc4497b086cb0d225a0d44cf0b05b71f4e07d471472c47353eb65aef82a06ce483aebf8d804 SHA512 a93edee8c6efd70a9d7057959311f5c8bec32f4aa169d66edbb42674f8ec6aa88accb682fc30968b7775a957326536a2b909fd24612cd2f507f88c7717f179dc
+EBUILD python-3.11.0_alpha3.ebuild 11041 BLAKE2B 37e83cdc77c2f9898eef69f39c9eecb5b47cd598f6ac007a59c2c6a7140591ec8fea37ec01ce4111dd27a24bbb7cfc22c4c51411a5a6bd00b01a7e858ed59f12 SHA512 f9b8a1d8155d7268ebd7e9dec37d3a060c527838ce13756ef3b9d59b7589b4474cbad50a7180301377630f3b334e241c2535043a85c74e15da14e96585909f34
+EBUILD python-3.11.0_alpha4.ebuild 11084 BLAKE2B 39fed128193d9a7cc8917bc93d3aa98efcfc117b37e131de3e196891173ba7b0bba546b04f31ff2825e8bdc03de9c773b422d66e64afec4c75d35a4d6134749d SHA512 1c04d5fc6795a72b334e392bbcbf34f177c3a9036c9278797fe405a067a864d03b12c4ddaa66bf41c05a224468f670aee51fc44855e8dc37a704502467019b11
 EBUILD python-3.6.15.ebuild 9714 BLAKE2B ca1cb4650ccf1e564686da9390ff985b92715a3cb3bd628d9fb53bc5a69985bf9d7dd506cef94fc7d4e36c8c9f8d98b8ceffec27c90b15c85bb886e1caf58078 SHA512 386be71366010a967f6ecc145ef3eb72672a5bace83a619a6e04e57f630816d12a151796a0e06ac397954af1e6ee99b546912b202070a9b032c53937a8e89bc6
 EBUILD python-3.7.12_p1.ebuild 9609 BLAKE2B d2598e603fe9c2401f96b1c5aaa37bf77ee8905a8c70b4ae7eade2d1bde9e119840cd87de27b9d80319b0a84a1aaafd3536adda705cdc2b6bc65c53697e91872 SHA512 e4592afe10027dee719a026d51b6d3ab9cf6ec21049313c4c43cccdc935affbf1931bd7fd72747b47d0a392b292142371ef7a4699d6f98657bec9318d052c190
-EBUILD python-3.8.12_p1.ebuild 9887 BLAKE2B 1f757ab013eb19a02f4ad1afcb1654678fbe6361989c55d5460085027b979eae41ada56eaf14818c95666d678ffcceb1d34803448331ef46a9b3dab33b1f3e53 SHA512 19856fa64dc085329303d7f8a0dc13b8ed05da6faab62c1bc9999950dcdd71c5de06ad1ea856652ab5890d7212824c6f85fff38d59ea822399fe34bafaced1c5
-EBUILD python-3.9.9.ebuild 10845 BLAKE2B cd01be64de7caf094c924428d53c894a908e74e2bb1d6c584ffe6b48c2d3c596e70978c980d2f0f7a3d698cc62fafcbda625d01e9fb08e92d8dc9a37e230252f SHA512 afdbb929d4987d5b3682ebf62cb02c3078b048f543df2cd54d6206bcd2f693bf83a11d1d53bd7de53b65adbc7722251f5abe6d3c0de2535cddc02cae619272e3
+EBUILD python-3.8.12_p1-r1.ebuild 9938 BLAKE2B af641dd352b65814ec8b54d3d205f89174ac4d1ca11d8c6138c2d00bb1918ef982bbb82a0e15dedbb9ba43a2f9f3b63d853cc49cd0cb399a469b5ca1a6825ec7 SHA512 5c6b45639b13d5cc5fd97aebad52f1ee5832d646857510dc5909e0f0afd7cd0dc848dbf78a7e12838d072c3b036ef93cfe11bee528d42bda43afddad0b1e03db
+EBUILD python-3.9.10.ebuild 10904 BLAKE2B 6bb39991fb2b61f960fcf762bbdf2cf2948976d30b9837bc9d5cd6b9c4a934bca144f18898b2e7975ceeed659da8158d4e2735ccc56479ec1bfeb4b783300a9b SHA512 012a4cfd6f6ca69008b89ed9fcdf91624bf34102fda4f4ef02c81dc82a5fbafc8e6d4ded7138223c61f1042c168afaf91fdd61a2bca0e9a55cf43c0cd3bb3738
+EBUILD python-3.9.9-r1.ebuild 10896 BLAKE2B fcbda5d3be808babce2fd7bc00e7fbad40c83afee571bcbccf3c2b51e5b5eea355228ad99f849647e76482a083150d22e00d968e9432fd10952f5b7324e9e917 SHA512 e4dbf2b45a93046369bb276d4033e3aad77257843990a567dee7a03e67e9cdbfc2b15a7ab6e9125623b62cd799eacc7722d7e3ee547bdb3c1a6c676e251ad8ad
 MISC metadata.xml 740 BLAKE2B 31abd8d03440517adf39f29f36e87f821dbf029602f40d4b252b1ec8e6a52955ad9325fe66a9a3bd2e9c4436e6c6865853f75c3169016c7a44327a06b07694df SHA512 b601a773d5fe4e29d43e9ce5d857bb525b706b95745056a74a2476a37f182075363cb44814f9d6f73b8be08a63d75ec322b608463796c6eef7aa8d636a2350b8
diff --git a/dev-lang/python/python-3.10.0_p1.ebuild b/dev-lang/python/python-3.10.0_p1-r1.ebuild
index 78b9824d8ede..01166a5e84f7 100644
--- a/dev-lang/python/python-3.10.0_p1.ebuild
+++ b/dev-lang/python/python-3.10.0_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -34,6 +34,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/bzip2:=
 	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_10(-)]
 	dev-libs/libffi:=
 	sys-apps/util-linux:=
 	>=sys-libs/zlib-1.1.3:=
diff --git a/dev-lang/python/python-3.10.1.ebuild b/dev-lang/python/python-3.10.1-r2.ebuild
index 35b7d94f0870..9731ebca9cc9 100644
--- a/dev-lang/python/python-3.10.1.ebuild
+++ b/dev-lang/python/python-3.10.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -34,6 +34,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/bzip2:=
 	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_10(-)]
 	dev-libs/libffi:=
 	sys-apps/util-linux:=
 	>=sys-libs/zlib-1.1.3:=
diff --git a/dev-lang/python/python-3.10.1-r1.ebuild b/dev-lang/python/python-3.10.1-r3.ebuild
index 8182158f8060..9ce0f3c3901a 100644
--- a/dev-lang/python/python-3.10.1-r1.ebuild
+++ b/dev-lang/python/python-3.10.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -34,6 +34,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/bzip2:=
 	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_10(-)]
 	dev-libs/libffi:=
 	sys-apps/util-linux:=
 	>=sys-libs/zlib-1.1.3:=
diff --git a/dev-lang/python/python-3.11.0_alpha2.ebuild b/dev-lang/python/python-3.10.2.ebuild
index 7659acd790cb..b5252e5268cc 100644
--- a/dev-lang/python/python-3.11.0_alpha2.ebuild
+++ b/dev-lang/python/python-3.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ WANT_LIBTOOL="none"
 inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
 	python-utils-r1 toolchain-funcs verify-sig
 
-MY_PV=${PV/_alpha/a}
+MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
 PATCHSET="python-gentoo-patches-${MY_PV}"
@@ -16,7 +16,6 @@ DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"
 SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PATCHSET}.tar.xz
 	verify-sig? (
 		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
 	)"
@@ -25,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="PSF-2"
 SLOT="${PYVER}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
@@ -35,6 +34,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/bzip2:=
 	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_10(-)]
 	dev-libs/libffi:=
 	sys-apps/util-linux:=
 	>=sys-libs/zlib-1.1.3:=
@@ -42,7 +42,10 @@ RDEPEND="app-arch/bzip2:=
 	virtual/libintl
 	gdbm? ( sys-libs/gdbm:=[berkdb] )
 	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
 	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
 	ssl? ( >=dev-libs/openssl-1.1.1:= )
 	tk? (
@@ -197,6 +200,7 @@ src_configure() {
 
 		$(use_with lto)
 		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
 	)
 
 	OPT="" econf "${myeconfargs[@]}"
@@ -221,7 +225,7 @@ src_compile() {
 		local -x COLUMNS=80
 		local -x PYTHONDONTWRITEBYTECODE=
 
-		addpredict /usr/lib/python3.11/site-packages
+		addpredict /usr/lib/python3.10/site-packages
 	fi
 
 	emake CPPFLAGS= CFLAGS= LDFLAGS=
@@ -248,13 +252,11 @@ src_test() {
 		mv "${S}"/Lib/test/test_${test}.py "${T}"
 	done
 
-	# Expects to find skipped tests and fails
-	mv "${S}"/Lib/test/test_tools/test_freeze.py "${T}" || die
-
 	# bug 660358
 	local -x COLUMNS=80
 	local -x PYTHONDONTWRITEBYTECODE=
-	addpredict /usr/lib/python3.11/site-packages
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.10/site-packages
 
 	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
 
@@ -266,8 +268,6 @@ src_test() {
 		mv "${T}/test_${test}.py" "${S}"/Lib/test
 	done
 
-	mv "${T}"/test_freeze.py "${S}"/Lib/test/test_tools/test_freeze.py || die
-
 	elog "The following tests have been skipped:"
 	for test in ${skipped_tests}; do
 		elog "test_${test}.py"
@@ -315,7 +315,7 @@ src_install() {
 		pax-mark m "${ED}/usr/bin/${abiver}"
 	fi
 
-	use sqlite || rm -r "${libdir}/"sqlite3 || die
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
 	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
 
 	dodoc Misc/{ACKS,HISTORY,NEWS}
diff --git a/dev-lang/python/python-3.11.0_alpha3.ebuild b/dev-lang/python/python-3.11.0_alpha3.ebuild
index 2c4c7c470f65..68bc01ac1c4f 100644
--- a/dev-lang/python/python-3.11.0_alpha3.ebuild
+++ b/dev-lang/python/python-3.11.0_alpha3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -67,6 +67,8 @@ BDEPEND="
 	verify-sig? ( sec-keys/openpgp-keys-python )
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
+[[ ${PV} != *_alpha* ]] &&
+	RDEPEND+=" dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
 
diff --git a/dev-lang/python/python-3.11.0_alpha4.ebuild b/dev-lang/python/python-3.11.0_alpha4.ebuild
new file mode 100644
index 000000000000..92c0168fc31a
--- /dev/null
+++ b/dev-lang/python/python-3.11.0_alpha4.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_alpha/a}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	!!<sys-apps/sandbox-2.21"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+[[ ${PV} != *_alpha* ]] &&
+	RDEPEND+=" dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+		export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb -u-network"
+
+		# All of these seem to occasionally hang for PGO inconsistently
+		# They'll even hang here but be fine in src_test sometimes.
+		# bug #828535 (and related: bug #788022)
+		PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			PROFILE_TASK+=" -x test_distutils"
+		fi
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-platlibdir=lib
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# force-disable modules we don't want built
+	local disable_modules=(
+		NIS
+	)
+	use gdbm || disable_modules+=( _GDBM _DBM )
+	use sqlite || disable_modules+=( _SQLITE3 )
+	use ssl || disable_modules+=( _HASHLIB _SSL )
+	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
+	use readline || disable_modules+=( READLINE )
+	use tk || disable_modules+=( _TKINTER )
+
+	local mod
+	for mod in "${disable_modules[@]}"; do
+		echo "MODULE_${mod}=disabled"
+	done >> Makefile || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.11/site-packages
+	fi
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# Expects to find skipped tests and fails
+	mv "${S}"/Lib/test/test_tools/test_freeze.py "${T}" || die
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.11/site-packages
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	mv "${T}"/test_freeze.py "${S}"/Lib/test/test_tools/test_freeze.py || die
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"sqlite3 || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.8.12_p1.ebuild b/dev-lang/python/python-3.8.12_p1-r1.ebuild
index 26fb6a4f96c0..5c31c44e4fe7 100644
--- a/dev-lang/python/python-3.8.12_p1.ebuild
+++ b/dev-lang/python/python-3.8.12_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -34,6 +34,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/bzip2:=
 	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_8(-)]
 	dev-libs/libffi:=
 	sys-apps/util-linux:=
 	>=sys-libs/zlib-1.1.3:=
diff --git a/dev-lang/python/python-3.9.10.ebuild b/dev-lang/python/python-3.9.10.ebuild
new file mode 100644
index 000000000000..c74158d24cf1
--- /dev/null
+++ b/dev-lang/python/python-3.9.10.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_9(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+BDEPEND="
+	virtual/awk
+	virtual/pkgconfig
+	sys-devel/autoconf-archive
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+		export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb -u-network"
+
+		# All of these seem to occasionally hang for PGO inconsistently
+		# They'll even hang here but be fine in src_test sometimes.
+		# bug #828535 (and related: bug #788022)
+		PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			PROFILE_TASK+=" -x test_distutils"
+		fi
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.9/site-packages
+	fi
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.9.9.ebuild b/dev-lang/python/python-3.9.9-r1.ebuild
index 0802a4fb109e..13b6a0333c71 100644
--- a/dev-lang/python/python-3.9.9.ebuild
+++ b/dev-lang/python/python-3.9.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -34,6 +34,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/bzip2:=
 	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_9(-)]
 	dev-libs/libffi:=
 	sys-apps/util-linux:=
 	>=sys-libs/zlib-1.1.3:=
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 3a18ea9cb7c1..5005192a795e 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -14,6 +14,6 @@ DIST ruby-2.6.9.tar.xz 11590064 BLAKE2B 8d14baf479053b7fab517f1e41191b009413d557
 DIST ruby-2.7.5.tar.xz 12072980 BLAKE2B 50bb822cb2c5e76fee8755c710b593ce3bcb0f4f14b96a4e9eef5e58b4614bcf5f91491586b1dd6411fce57c258a7ad80136cd3cfbddf28e4fd4b37f486d2bea SHA512 21c8a713e3ce115fc4c405113ac691ddcefc3419f528b93ca1ac59e7052c1b6e9e241da0e570e291e567f28f3d840824dbcc5967b216cbe7d6ca7a05580fa311
 DIST ruby-3.0.3.tar.xz 14991880 BLAKE2B d57b7f6e0d0121326b1a191e93a49c045d26dfd1ab8b0d283b99d09968e07277edde0baaeec072602d6d06e20dcd3893d6cb0b03f59dbc59ebf0e3ebd5646446 SHA512 bb9ea426278d5a7ac46595296f03b82d43df8b7db41045cdf85611e05e26c703c53f700494cd7cf5d4c27fa953bdc5c144317d7720812db0a6e3b6f4bc4d2e00
 EBUILD ruby-2.6.9.ebuild 7481 BLAKE2B c37e80c3f6debd1befd5d8b5cfff7ffa547557e94fecfb51c962a7a4ce6052fd047d9f5f143302d5d53887bac0463b65f2649b199625430fd5a49e32c565884a SHA512 b3be72cde078972a1e6dd9969dd7dd085d4fed10d2c7a87128773962955e788cd11868a93f44adb2887a23bffebca3a4155309bb9cb0af55fa2df851f48410c0
-EBUILD ruby-2.7.5.ebuild 7760 BLAKE2B ae2c46548b76f4612b8c1d635e4c8bbef21ba5332932c2769b5046e537c344e1e1b051443f55d6713ce40ad08b7044c9c76ff50a2986c1c02d03da5348fdef3e SHA512 32e4e1fa323db1b1c2c0124756679909e0fb8d38a56b5a121f455c8500800fe4e6bf4ea579cc1e4c1b1fcdae13b2210390f8a1644f95fb7476f26d21ed3b850d
+EBUILD ruby-2.7.5.ebuild 7914 BLAKE2B 732a87f171691b796d43e16cb9a3307fe9d037ee2a3d8019823fda74679c8d932bcbb6c35fc1dc34a7997a7b37ac857738462c1db04ab4b59d69c160bda53fcb SHA512 98fbb54a8de9a3e2c557eb1a6891a6a1cf6981be157af1c083f3d35fe0befb58fbdd7b762ac4bbf653355a4e21753dd616710a9452c88799b5e6040759929694
 EBUILD ruby-3.0.3.ebuild 7770 BLAKE2B f8e201766ccc5a667ca1dfc22ea0017a441bf621719c10da66cf7b5ece4441e48dc63225e04ec4b38c032318e4f0353f8b87e02a9cbfc6d2eb710c9ca83fda2a SHA512 6843ddd68c6cd45e0e4f5e9d72f7cc38fceeb2548498fd8e5de362e559db8597e8434e4ccc4f3db80f22e45db49bcaebddee27f9f50d5b65323332a6ceab1bae
 MISC metadata.xml 524 BLAKE2B 78b64ea8e53d1bcfa249561354ef45ca34cdbcf6c4147944e98e6a17d884f5b4b29c0ddb6047bf2883a57f9a53386626bb7a779ef80ddcb33301d0e3822ead6b SHA512 1b254526486eb7d1d132f1286056d55963cb569ab47ccc94d625a9789e4dd3c45b5639510535543d96d2d7a3ccae13535e2e35ba9d78873d75ecac3bedfae762
diff --git a/dev-lang/ruby/ruby-2.7.5.ebuild b/dev-lang/ruby/ruby-2.7.5.ebuild
index 78beb636d7bc..51384cae5e3b 100644
--- a/dev-lang/ruby/ruby-2.7.5.ebuild
+++ b/dev-lang/ruby/ruby-2.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -99,6 +99,11 @@ src_prepare() {
 			sed -i \
 				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
 				configure.ac || die
+
+			# disable using security framework (GCC barfs on those headers)
+			sed -i \
+				-e '/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \
+				random.c || die
 		fi
 	fi
 
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 7bed0484f882..acebc46de034 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -158,11 +158,45 @@ DIST rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz 151033748 BLAKE2B 61ecece6a8aa3
 DIST rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ea41b27fd25cc75efac73203688ee0882767fc76a2fe09b5e424c42467d3e332463c5560cc58f3b20f6e4b44289a25cfb0d36e38a7a9a7b3950ef875a59dc9ae SHA512 8b955bfce6c130e4b95054b98646f7f9b89e621256759ee1ff533df5f777312dd7adbb192ee0076c9b9baa6883a74a9def50ef598ba8c707762290d465c9a8b7
 DIST rust-1.57.0-x86_64-unknown-linux-musl.tar.xz 260333980 BLAKE2B 75342ae8637355e714d5217d78604cfa6a601d3f9bc0ed4667ff0ca57c6521567b19b9bdb10f79761e2e5fd21ca10e12f3fae0c65791118fdb0c35f8f88349f4 SHA512 204ed493528757b8e3e8df13d062c9ae74c75c3e3adc1a2efc0dfc33d2525629168a558dd32653f44a4365191bf203a4415a77152276288a8e122e6bd587394a
 DIST rust-1.57.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 506400c3ea70469cbda0e492e85d41b7f94fba790ec19d1c3491bf4a00d283f97c8fb37319ad6c4a43b22a2195c21d1b9e3c16a5b2a9a82833ff61ad49bdc793 SHA512 793369dc7a854c48a72d81446a0c8eb9d83a071af77758e0bcbb8e4d518fb87c5a23c085202b9b427a02bdd772ad9c82724b34295b851f26f384c3e801bf9a04
+DIST rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz 229969508 BLAKE2B e7ba73742c6fbf5cff8593434167ddc8e981f473b292960ddf25bd6cdf5980776ddc0234dc711d6a341474ac1da8f33a788bda0d6d83f8e353e4e35eab95f635 SHA512 6ab276db164b400953b540f2c0f5884e44a16cb847a157dec1103e09b22e379f77d8561bf360c05f0bf2d085d4b3670b51675ae80aac05732310621bb2d9b597
+DIST rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5ae37b9acce2bb0f1c8963e6581d09832290f4ffcbd26807f21ee5cee45a89ad279c22361f932feb72753a25092eb02431777dadbc8643d45905178c00504848 SHA512 ee6d99b1604b1e9efb470dfec00a9fc71f9603723ed292f20736d8c40de73660e23868d68b142e70d75216ed312534e364f2f5a092529e3276cdeee99c7d71af
+DIST rust-1.58.0-aarch64-unknown-linux-musl.tar.xz 226177016 BLAKE2B 0f4336d5df797515e4e82c716a3c2ec614b04f862c056992ced14f9263a977920e5544b5738d4588979b29e37de0a8348a6f28986bcbc8e41d301b1cd134172f SHA512 2a4d7225713516f1f6d4f1d32b998a73769636b39e74d791b2a2337a25069ba929b56b37c24b6f7c4287efdcbd56c993fd3a288fefb7d1e34bcfadafe53cc07a
+DIST rust-1.58.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B c26ad8bfb35539a26f8cd155755b5534bbb7eb5b92868195108ec9467242151aaa6e31db0f7e536836a20661a77e11955d21b2d61a4ff17c5db92d6e5305fd29 SHA512 fb85bcd3516cee414763b2a48e8021071cac113fb03cf980bbdc3520092b9c6cdaddf13ac30d75804e970a34a9a7ef697924a73a06df3a8b40d453b335ce15fe
+DIST rust-1.58.0-arm-unknown-linux-gnueabi.tar.xz 206375000 BLAKE2B 7d32aa903d631a2a27ff1982897a9235cdcad9cf02e98274c597986d7052f0fd6dbeab00a42bcc1fbe6a12c4461f5887a914e5ac9444541ded28450e50f48a49 SHA512 f4268ce45bb09ec26d67931278eae6b2eb5738aee6b8bffdda86a71d2cf23e3755ad3499d74184758581f7d5e2df6eac4f063ea77f988c59ba88b409360061a8
+DIST rust-1.58.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B ae562b09bf350d72977ce024044d84a3b328fa27f98b7bd12381b31b3964fd018da4d491cbe8cb558014e7ec8235d99cd45362de7f412cffc104b73ddcbcf271 SHA512 2ccfd4e669df977283421f46f162416d5de43cc29bf67e91b3b29c94876a24a82d6af1a35225c0cb74599fc11bc2a8180cbe600d8eef91fdcbafdbba6a2fb135
+DIST rust-1.58.0-arm-unknown-linux-gnueabihf.tar.xz 206325408 BLAKE2B ec1f3ab5c37ce06ee16c10f10071a8795ab601b9ee147dca98d6c94555a278b87cd04c93b7623fbc7c3b09f3847f41479eec02259c5fcff25a8f337d39ca02cc SHA512 b31c067c459aba84f8a34ca39298f42c09a0530a02d033562338f822e55e5b0e837f15983e233dd0401a9082a9f6b0def081dd9f870dd654607c654488986b24
+DIST rust-1.58.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 3f4d43a6dd2a45b44d48fc4d51a39ca2ace84f432c89f20703176c0b947c4b30bd7f3d7e17dd5ee8fbcffccedbe7f177150c68ee1c05164206478384152d09e8 SHA512 94fd5b0142016df3ad5cdaf40df3f1f68866cd68256da6127b36f70aa7d363466929227f1534972dfb6c458a9febbe8c7c8344aee0f26d48f1aa1a3f262750b4
+DIST rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz 212531868 BLAKE2B 2a57a5f31504795086d6a0ecf2f29513c513d1840227c25832ce80264efbf3ab3392f369aa4d93f5f95d46f20fb8e074acf5925c0f6d1b5465ca6a8efa5c82e2 SHA512 c676cc1518e38fc36e62519bb9d4d356be689f9fcdeb56d5722bd3437879dfe9a30340c053ec75bd5b709d83b98faa647c46720df36a00daef1fd7680f4c900f
+DIST rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B d62fe00537a4a75f8f561f66e585f25d13e6ccabc2ef4ea964616b733caef4b56aec62e873059fb84200a47f3530aec8e0e4c20b9eb32f533b8bcf019b73a078 SHA512 9cdb5fa100aced4e0d3b64821251031aba0f05ea1e27f8fcf53a3ea32010fe04bab306462af7b10f1d3bebaaa76747b5aa564af5bc3383bf62f4da7bd74d7033
+DIST rust-1.58.0-i686-unknown-linux-gnu.tar.xz 224691416 BLAKE2B 8d1cff8ad5289de0b5787d958814b5f7517a6d4a9667be014b4103b95ccaebc7976aa3f969955732c9755561967fbe9bac2702531ed15effe3461dd3d8f019ab SHA512 23dd0c0a7700acee233e93d779733bb94788edff4a64df62b8e4ac55b58bc640ed72b0cfd9e1b8cfa5190e429ced6b2a6b0a75676c51e72351edb96b44b00e59
+DIST rust-1.58.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B db0615a16099bcbedd5e4e218be66147e6d659656565e8cd26fd89fe620abb6a72aa74bb077b826792c1e82ee87ac750c85fd171148a5bae0296765113377364 SHA512 ff0c4089106a08437618392f7d02ae3140dab4fe045eac47eae5b5c1d98355326f62ae24b52ec2cb7c8e0085028dca797f70f8c14c48fdbae5505f4e45b6c058
+DIST rust-1.58.0-mips-unknown-linux-gnu.tar.xz 164753920 BLAKE2B 1562131b76d2fc7a7bde61b88e025079fb54448bcd8c793ae8887916c480a2813adad15630904a512d5a7341c727dc14af7aaec8c0b7b5264c39f2878c05bbad SHA512 76f91a43a673045a824509f0211c635869ae8ff7ae45253ef6d6dc15c36487ddd6638968a07697cd047296b51821f4df484500c135d5342121e32b6940f3fa21
+DIST rust-1.58.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e1614bbf7ef74a777dfa9dd7af473552b3356b984ad13ee0627c3ca691d21f4479ee5182751e54f01d0f084a83c10f55213f12417d64de158dcfde4251e497da SHA512 5db14bb832c854a8fe2802afe8154772e090adc9852d11c71a87b418d79dc27e942419b654bf69ce767a0a3ff474ef4e252832b2c3d6cb9458e7d574a7940dee
+DIST rust-1.58.0-mips64-unknown-linux-gnuabi64.tar.xz 169679760 BLAKE2B d3a474609b1eaabd7a6475810a41220899fef78b41e256c0c747397cc4fc5c5f75e02eba2b5db43b34f80de95033fee10882cfd2451e66f61158e04de2853aa3 SHA512 f078f5d0b444ab82ea369d4ade450168cde7ac0aad2936a9ec95ad02d7a0480bb31a4e691a68922a57d608301dec050100f71996360d4827795eea4cd951f323
+DIST rust-1.58.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B a6e8f4c24ebf7f71cfe783498e8cde70edcb5530a920b408d3c861cbcd2ee2df1aa0692ffcbf5ee3d6e2f7468ea3708c03eda67e514c98e4a9b5437373b408e9 SHA512 f97f2519860f588319b5b708adc6c2998e975692092185257d8f08f2356769b567e35d2e2d7098e81d6e2c936b054c025c42d0d1ac0837794c56c3211d1a7c7f
+DIST rust-1.58.0-mipsel-unknown-linux-gnu.tar.xz 168271536 BLAKE2B f3f6c5b4be89ad95a5e8a3a3eef80829558a2cd28f566e2c541f136b1dc49e14de66c8c4eaf02c54076ecc6d9ee78c0899481b9371683b705506212b2bc3bd4a SHA512 b166492159314c0a16362afc88f352ec556333f541dcaab42b342c9ccad77036894412d775687b8e2b5726a33339718872108b166bbc3acafbe158dddc0666f5
+DIST rust-1.58.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f3ca5c1c1950248bb5bc0cf5cf09eafd65acc7693b0d000f554b5a848455e6c9f396cf7fb7a8ed6e7f31d3bf6428766e84f883efa6f372b46663217ce25e1cb3 SHA512 9f62b47144068865009ec7665151653d2bbea0bab008eba3c0f693e425cb77c022189c7396287d03f9294afae4b76aa84deb7a1eb05a9ad4619e71c310fe2816
+DIST rust-1.58.0-powerpc-unknown-linux-gnu.tar.xz 183629256 BLAKE2B 7b24752fb58e79c87ed18d2bd7f79d869daeb186efa17985bb6f9e1eee998e9ef0fdf597597cbcfbf57b263d53bfb0f416fd14bd68da00b9252d8e43687e7669 SHA512 8b282efd6508ac52b603331c6c148388ffb843463a8e725407c676bc9e332ff99dbb16c869721dc0535787809dd9f03005b1833f0b8a7f17a4aef88aaa19b9a4
+DIST rust-1.58.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 331e8f732d1ff9243694f5baf10159ef674fa5ba57adfdb4b1f14f7e3f56443276c4405adee0383dd5b224bab7655ef503ac1a5c51c2d054ffe140ffc7ce1717 SHA512 a94407fa249441edf0aab56a76bcaa9ee8fb892e94c2255897200ee03594e6a887f488a93ccedcf1c2e90dadc9af17102b60e5b6dd8754509f82672efc6834d5
+DIST rust-1.58.0-powerpc64-unknown-linux-gnu.tar.xz 194135676 BLAKE2B 0c5e7e67a9a6df26c418ac94dac16401b126b367555a1d4e4306d803836dcd38538bc94f3fe170d8ad9339984a3af4a6beae9fdde47af82d7b57a1bd1441137d SHA512 ae195cc9c622a25ae23669e913bc73a1d31490bfcc3f69632a02cd050af22ac52cd46af6f8c1eb9514949a75ac2aa283b3dd52ddcfe506438eee23c75f995243
+DIST rust-1.58.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a5db4ca38e9468f863be3e7a29a54f34364a37ad88b5073d6911e15592ff12c5f3af2b5a4c2df8d83a407d866c3cfef83495fad3b6b8f8dd1ed8be72fe06ccc8 SHA512 d2ddda9c2ec1023e93194427554bb7282bf3b6908f6410afe05b8ee9beeba236080ef8521a26f4f3efc46f79965e581157f973ec7bef300057e6cfa0098bc80c
+DIST rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz 202604020 BLAKE2B db290d9c1c1a5d55b869b6c9ca6cbedf571da8b3289d5a2829bdf094788ee4fc028cd66ae9c287b3e680cbf35ebdee482f5c6576d5445d125cee2a090ae505ef SHA512 bd87ed72427102a1ce08e61d74ad8d34fcbde93e30b2597f9db29e49d53337c1d2e9794f2ce0209273b59c6c8be743870657a2da5eb1dc4d238adf2b548d0ce7
+DIST rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B fbc7d0aaf8e903edd42be16a561b0af79e064a2c5713a17b9d79eeeb33796a00321f1c1eac4ecbb8e48708db8f0a8eec57bb2d6d7304750d34b53d57003f6db6 SHA512 3d69abb8db74637327f18e4d54f8e175421a8348e6b0382793f0d4bc0a76cdfd60fa39b28a29bdada9ee29e7d5dd2d5b3a567d29d64b97722788f8264db4ae3f
+DIST rust-1.58.0-riscv64gc-unknown-linux-gnu.tar.xz 197456696 BLAKE2B 8f393de36ca9b8c8df43b1725cc0deafa1211917ac6c6aefed329daefc19f04563d8b886aac2c8917a047d918175fc04075a13cf3c197b30b2a7bec44fa4cd48 SHA512 f2739b42ad5fa444623f7c7818297361b2df4db4d12546f262feba246a8804da6f3d982eff1c558f15882d9b580ceaf39acfc54749924bd9eb8a383a5154893d
+DIST rust-1.58.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d23d62938b8a7832724c73d17253b3fd078bf1a6646a9d92298a297b8297ad93372be28e651b1001a273af9efb877c444e3af6b19217cbab4fffd4b437099a6b SHA512 73513a0323c2c5519a4311aacc98f400fc44c0c48223460939c485d4526736de26603da85dec341472dcab4c62a4e15927da8eeb89be04152969d97e542eef4a
+DIST rust-1.58.0-s390x-unknown-linux-gnu.tar.xz 198300224 BLAKE2B c31a5ac34d31e1080459aaf594a9ae373f6aed90096b6f6e7cf34cbc6672bde3d01f5d945d956010921c1b0db0bd32292dd71a8d2aa43a83a4e51ad7d6444919 SHA512 2bee2fed7d13d9fd5f10bb071ea8b91bff650d223b5e78fa8068fd841e3f757a4358befc26298c5477c2f9a4fe9e2e77c8f5911ed2630f8ff311491fb842fba3
+DIST rust-1.58.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c86889d2592e951dd68e244e1e813086f2a253adbb3a68fa4fbfaf054f599072d9ec2a527885febf9f07fe22c9f4377d5e9e4304d13e2b00a2d9ffc294abd011 SHA512 e19bafd80078f1cc669a8998544f0bfbe976acbd010c3c2a078511ff4cce79c784db4a2c293af5fae04efc5551a05a30770665414622fed1a493a069cfc2e73d
+DIST rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz 150248636 BLAKE2B 79dd4f08d65c1832e56629dadf8a0fab0105a2025d637053ba38a0f5a5b595866f97fdb67a728d036d4154a52e15b464d3d511b8f693ee2deebd10eedbd4bae0 SHA512 382a1b3ac5874a9e3f162ba06196074df703b0422dac70c9c38dd0770e86b7fbfbf0380ee1b520a6ef92d3f52c865e901d106f5beaf966fa036fba88f7912da9
+DIST rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 232a8e931fb5ba56cb4f5209650abf517748ce2112abb6d6b9c34437ae90813e5fa2e056cf7ae46795bda805a326416d4f7fee0bdeb7568b81b5d553ce795433 SHA512 4cdbef971b7afc1560ecc461c4da317ca831f2f3c04f806e5819ae38d2baa1815422ca569d724eb6ca5b8c1858a4e17e7791b1ca722e41f5ffafe105ce9da3c8
+DIST rust-1.58.0-x86_64-unknown-linux-musl.tar.xz 262715336 BLAKE2B 6a4d5202cae8ba404259f6c012faa801e3e6930a0d8851cc1fc6c35948dab5f74d196914c2b8b4344309a40c8c6324690a6920b61a2d545d945796f9149701ef SHA512 d97fd1b308c3f73ddbd8b10054062a37a05b445e2a2a91ad01844b9b7fd43d9e9dff00b8715fa2748ca1da9fb883eff14075b463bd808ee9a81b94fc85d9394f
+DIST rust-1.58.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 368cc50c5ffe74c790cdf18ea66694905b0fdde575854765279fe41cc529dd7efc60ca2493c1749dded7da2f1fe67d8a06ec0d4de4a75791352452c57ba78947 SHA512 7273afc1c371c70f0e44cc796f9dc7b25137d7afd5fa1323e98d512924353117ff0b3521aaf2a2af29336ca210fa891d4f2a8d9cd2f626b09912ba8eea36326f
 DIST rust-src-1.56.1.tar.xz 2456408 BLAKE2B 19cd9ac0c0c57d077e2a62e6ef202cf8f349582870d0acf28b105278da611e3e3884b1db59cb43c1a13c8f0ff546f83f8ac30783e46f99233a0a81df04dfd359 SHA512 6ebcb7e641031b269af244f0a14ef23c5a6c324d8c9f8f9ffe3b1802fb2aad522b10544f6c29789950dd2a9fe7cbbdb6587f793ec8f53881e707734bbaf3a3d6
 DIST rust-src-1.57.0.tar.xz 2536924 BLAKE2B bdc8bfcf6ee3fbd0be3b9bf1ea8faa34bb45247d35bad5a7c5684f74ce061de3399d05209cabd18d01c7f73703c5e11cc49765fd7a0230e95484922e96e187de SHA512 24d86a7e1f8cd63b9571003604374cc251c575ce351253cf5ce676f34fa8aff574bc9e305de0d62b42a0d699e792fc072867981908ceebcd75b2bd6aa71a0867
+DIST rust-src-1.58.0.tar.xz 2822920 BLAKE2B 8703fb119092473ce9bf822a35e3b6b2dc1644fad502140061d2787dca0bfd90878d8b2394e5b43522ba5b51a41d181f83e3025978633047460e80e5d6983de7 SHA512 9d2456d0c0f5649ab3bd4e3ae4540cf9f382ab43020306699657cf2dd0671c423f82ea17f66a07d8eb88845598e928106bc40de29a674625fa630f3be6ea47a1
 EBUILD rust-bin-1.53.0.ebuild 5663 BLAKE2B 7d8c925c990e172264fd491b937c29b2760fd83931e5078fe91a4d3f2cf71d958bd5c6032aef48d38e5d7cded9d82f8f7629ac561ffb967ed329c06440576da4 SHA512 8e97bfbbfad8aa0cf30e8aed0630135e246de7af9c2a2ae3eec581bfcf6bd51031e7c34916e8eb05c71f7526465529af357ec184c12df430e252b70c09152a31
 EBUILD rust-bin-1.54.0.ebuild 5668 BLAKE2B 50f3bb8ee1fdf8de437a23417d505fa70df8caefc344f0f5cebe65206a59e8d0ff9c5855a852d9fa37c68294888f8f6ec1f1ca2d302d605c74c059dca9feffdc SHA512 5f54a746eb812df5659115f23b82488f7797177afef6e8b8047527f4ebee6862a5f5e83fcd9b9eea04f953bb773025fe6028d170077a2fa6e4e5519959faefbf
 EBUILD rust-bin-1.55.0.ebuild 5668 BLAKE2B 50f3bb8ee1fdf8de437a23417d505fa70df8caefc344f0f5cebe65206a59e8d0ff9c5855a852d9fa37c68294888f8f6ec1f1ca2d302d605c74c059dca9feffdc SHA512 5f54a746eb812df5659115f23b82488f7797177afef6e8b8047527f4ebee6862a5f5e83fcd9b9eea04f953bb773025fe6028d170077a2fa6e4e5519959faefbf
 EBUILD rust-bin-1.56.1.ebuild 6409 BLAKE2B bdd041bb43b53a2d2f736c8286527d544239ba129f95723422511e11f807421a7d635c4baabf462252374ab683439196d4ac18b0e1586f87ece8a9be27c00002 SHA512 b29523f0cc6f8de14f7c673dd6f68b7145370452d8f0f67da192684100440e3e9a7eba9120ae483a561df5e8240caac5351607f581b172ca37f6599fc6a57c0f
 EBUILD rust-bin-1.57.0.ebuild 6414 BLAKE2B 2c95a0d1bba830639ae54a4ab39122c9f2494d25d1beec97fce75f319f1ed6c512c02631a92337eb3fbe384f91febd16b3238b5038173002ffe1b97cbf1c7878 SHA512 f066243ca6394fce096fe054a8579149de2ef4b33f6918519ae5cd476e48f45bca61efee343a69cf5d9e90e980d4ab864eb2502ddf24a53213251889c931a839
+EBUILD rust-bin-1.58.0.ebuild 6414 BLAKE2B 790769415bfcb8fe2ca3b90dd573a5833a3631df26264e8b6244d45f9ae710748e0d9adcb9cc19474028eae72a4797f076d64606a2b62e07fc70bee3a338f4c3 SHA512 f548b38b5ebdd49b2968b8c0b36d358e401d700618d472872f2dfe9e991a96d0175690aa7642513db1cf7ab06bf21bbdc03c1eb0d39190bf42f46e2f8599bc6a
 MISC metadata.xml 591 BLAKE2B 6f9d494e400400b8b957eaa3c242b5f096808cc8372360eac0d9ae4bffcd2aa75b35bad4acc7248543b08466d8616b0145ae8a9b1534db1ad5ee838f07f9dc51 SHA512 9f59ea60d8ec9b748eac0789fa6750f32e4867e1c2cbe106ce270acdb7306d40fe8754315f8c65a924af43d5b3e88f4f50dec6361299de80ef1a25665aa03182
diff --git a/dev-lang/rust-bin/rust-bin-1.58.0.ebuild b/dev-lang/rust-bin/rust-bin-1.58.0.ebuild
new file mode 100644
index 000000000000..9c28c049ad03
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.58.0.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+
+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%/}/2022-01-13/rust-src-${PV}.tar.xz"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})
+	rust-src? ( ${MY_SRC_URI} )
+"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt"
+
+DEPEND=""
+RDEPEND=">=app-eselect/eselect-rust-20190311"
+BDEPEND="
+	prefix? ( dev-util/patchelf )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+	opt/${P}/bin/.*
+	opt/${P}/lib/.*.so
+	opt/${P}/libexec/.*
+	opt/${P}/lib/rustlib/.*/bin/.*
+	opt/${P}/lib/rustlib/.*/lib/.*
+"
+
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/rust.asc"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	# sadly rust-src tarball does not have corresponding .asc file
+	# so do partial verification
+	if use verify-sig; then
+		for f in ${A}; do
+			if [[ -f ${DISTDIR}/${f}.asc ]]; then
+				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
+			fi
+		done
+	fi
+
+	default_src_unpack
+
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+patchelf_for_bin() {
+	local filetype=$(file -b ${1})
+	if [[ ${filetype} == *ELF*interpreter* ]]; then
+		einfo "${1}'s interpreter changed"
+		patchelf ${1} --set-interpreter ${2} || die
+	elif [[ ${filetype} == *script* ]]; then
+		hprefixify ${1}
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+
+	# start native abi install
+	pushd "${S}" >/dev/null || die
+	local analysis std
+	analysis="$(grep 'analysis' ./components)"
+	std="$(grep 'std' ./components)"
+	local components="rustc,cargo,${std}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rls && components="${components},rls-preview,${analysis}"
+	use rustfmt && components="${components},rustfmt-preview"
+	# Rust component 'rust-src' is extracted from separate archive
+	if use rust-src; then
+		einfo "Combining rust and rust-src installers"
+		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
+		echo rust-src >> ./components || die
+		components="${components},rust-src"
+	fi
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	if use prefix; then
+		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
+		find "${ED}/opt/${P}/bin" -type f -print0 | \
+			while IFS=  read -r -d '' filename; do
+				patchelf_for_bin ${filename} ${interpreter} \; || die
+			done
+		eend $?
+	fi
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+
+	einfo "installing eselect-rust symlinks and paths"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
+		local ver_i="${i}-bin-${PV}"
+		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}"
+		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
+	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
+	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
+	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"' '')
+	_EOF_
+	doenvd "${T}/50${P}"
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+	/usr/bin/cargo
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	/usr/lib/rustlib
+	/usr/lib/rust/lib
+	/usr/lib/rust/man
+	/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+	popd >/dev/null || die
+	#end native abi install
+
+	else
+		local rust_target
+		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
+		dodir "/opt/${P}/lib/rustlib"
+		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
+			"${ED}/opt/${P}/lib/rustlib" || die
+	fi
+
+	# BUG: installs x86_64 binary on other arches
+	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index e3378414e725..544a97b5e497 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -165,6 +165,38 @@ DIST rust-1.56.0-x86_64-unknown-linux-gnu.tar.xz 147894784 BLAKE2B 6cbdb8a82aba4
 DIST rust-1.56.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e0ed39db46b40631f69fa379a04ec37ba314587a4f081aa1f3251e01b7221ee8732b668cfcc4c24c1a3950f3f8dcfd542a1a73c603cea545b812d5d3a9527055 SHA512 3e9d0b159684a496e29c9e40af11f16f5ef5cadd8bc4852018a953310e77a4e29db6c14ffcc86198908aa4998550c83cfd3f2cc42e007122d56167d664776c44
 DIST rust-1.56.0-x86_64-unknown-linux-musl.tar.xz 255010720 BLAKE2B 286e91cbf001de6f888bd82139e6711b32f03d45c599f26b01f60222d98c3521a1933b3b9b7f8c46fa79d481780dc8dc47e5e24985b721a6998d620b446c38b4 SHA512 fb5a914a25ef3cb39393207a75c40f1313740167062feb4cda4084e738f4e93a51624a8a9591acc18553cfd6e2e232984c8c84acc3dfd77fbe38b17085850881
 DIST rust-1.56.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B bb7cfc775c1c44569276e687028e9a7ffac31577310052d9c354179a541ee13b0ca00a025e994e03ab17086d0abe6dda6845ed1cb10879425439c7651bdc9269 SHA512 cb23d98cfb1b59fcccaec575145b6f38846f3f49b16a3be199b06d6198b1db13720157ca65a01f6ef76abf742507bba39776d130f0fd03aa228acf5917457f7d
+DIST rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz 228665060 BLAKE2B 98fe268d060a7f19c284bf02fec148550807b6c75fad042b85f07b22c127f911e4e7e6d9738b4bef42b5a46cc888e5a0df79307cc84e39adf3ed9da3fd531188 SHA512 71d32e1ed3fc4a2eaf3594112b3b43ab82bd28b35e547542f6c1ed006175d7cf805be373a4da8b962762962dd32fe951c8ca7c0a424addad5d4e828441d5386c
+DIST rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B fc832ff510b498a5763a26b420a6cdcf6b2b5fa8ce655f01ab23190f527cfaac144ac68378c6af3d3048440330f94b5d213d049c65ad87f0701b0555ebfa2b6f SHA512 a225f1db92c6e57b977873a3e5dbd07fa1288d2f8d79a879cc72dfc0dff66e70ce56619198cf36376b2774272c85363b8e8abf14efe8404f4cc038410c648ad3
+DIST rust-1.57.0-aarch64-unknown-linux-musl.tar.xz 224700500 BLAKE2B 2eb3122af42c499bf92b93946b20b6414d51ba895a77a8e9c53dc437a20093605b2e9f22d8f88b4fc3ca7f7b75d425a2442b36fcea54b583692c32f728f23bfc SHA512 0850861d9d2c22d76b1550e7d6b64c746c3cc24b51a68949948528bdd93621f74e6c07d23428fcdb280e884e469f2e4f2d3f9a7f81ccfa61d41265e31af3a9cb
+DIST rust-1.57.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B f594a31b48af2ee7835f89660a13e336f3cb2a01d99a5d48d280c06698d69712de190b35ddc682a9ac7bb6bad1edac9c3bde7262fc5a9732ea471984e1bb99a7 SHA512 aee3fd35c8e7c6b9ce651d940f8fbb17a2bd2a58d8b85421ecfb4a72d5c56878a5d129166896ea717c5b3e5b9c7f61376801d766af1c9a4d1a090327424e93db
+DIST rust-1.57.0-arm-unknown-linux-gnueabi.tar.xz 206890752 BLAKE2B 5d314766d333708158df7ef01d740e0cf0e71044edbdeb180f491c78a39dbf9460b62a1eb70076787e33a3199821b18734da59f892c0c251effed8e68c0eb22a SHA512 c01a6a408bf334474b2060ef70ed7c6c53e5f3a7453de74e36e59013292584a129b50530259327ae410830852173601dd9bccd1cd801d9f916d1a3e93820e481
+DIST rust-1.57.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 494d4eec9795de0150da9a7f5ba6cfbabd8da99dc65e5e02360ed4961e42cc3761f147ca8f7155badf61ec85d2898ec866aa5dde53e555ab34ead6b4d32c737e SHA512 31e9f00de8252e905d4de279860ab7eb287237d7d5330122b989ef2199fa8d209ef7a0cc71b83db82b78ea632d4d3b9c00b8f49a272dafd6e1f78f62055fdf4c
+DIST rust-1.57.0-arm-unknown-linux-gnueabihf.tar.xz 206580040 BLAKE2B 3ff02d3308cc27e2422609055a82ed36dcfb3ed2180091653d7ec21ccbb07f3685c58dc5d20f4abf4e342ce18d1d98e47c0a82180b5dccd57d09d215984e6b3d SHA512 9351db6cbc029c1051da277292bd7c3728b6ef250da20a20ee619b45938ccdcd8da1ecfec143734cc692ca3a39690f2f8cd6c332e04d0fd048943a8203eb48fc
+DIST rust-1.57.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B e5495533d128a99505c7856b27eeae22f85b3f0783cc0c9d52e8e8e9fbcebee6b909fd3465a7b49d1e1da2477c1864fdd048f01f7ba684ed55133c925522aad2 SHA512 bf06cd5c1f6731b02351136c7682d05e6a7114702124768b5cde1935cae4dd1147352352ad9b8dded575b90a57a6cab7c09dbe179404da0e378e992e1a67f47f
+DIST rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz 211614620 BLAKE2B e8c1f68d4e0846ee9425bd1747a423e1ab6161216a3cd276fd5afc13229dad33e3993d31305e3e38b4d3f6b21bb01fcdc9612d2217778a7f91915c65f1aa91d9 SHA512 667d8f6fb56408782c7a9e0c5086013d0350d6161d52ca4cd948ea39a02ebdf657dd45cb0a135ade8bc1e856c0962040969416fa1762e3bb55a03574fff3b1d1
+DIST rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 6bcb5e7c700a53d8420baa8747c06b291988b806aca6da447c283979f7324f31087482df5606c49d287c355e31b2952d7ed9f40713bce819ab8c02d1863413ce SHA512 164ae760f53820dddf93ce7432553d1698bcfb1af53dd6054d408db87f42b6ac2d7c71da375f8486675b2c6104fef295faff481e5167288e0df782ef74cc3006
+DIST rust-1.57.0-i686-unknown-linux-gnu.tar.xz 223062024 BLAKE2B d0e1d3aef1764403dcaa2b1d2a5ee887562f0b59b05b2f984e848da60f772c58bdd8a6073692c6b71dc741ff3d25a784c04478260104962d308529516a56cae3 SHA512 9dc7d650bbe35d3967a883e91bfd2a3dcad633c41c00a41d9ca78bc336b1e3262bbb4100a76d42169700dc3b15d4066fa065e785aed1c0a46df4736dfd00d7c6
+DIST rust-1.57.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5d6f4d31e1418124cbd10a7cdb5ecbfe3334256d238e058e5524120438cebe85af68a8dfd604dc311d38e553a559b471dc71ef2870f89ed2cf05f6291e65ac0b SHA512 4957bef14da4bfc34f19d69cc64b2e06fd329566fc941e399105eea6fe4de0de90cd50c72baeaea6490f93bc4b0af14c9591584d97d84873d9c87fe7c177c6ea
+DIST rust-1.57.0-mips-unknown-linux-gnu.tar.xz 165094616 BLAKE2B ca5965c40ad81c24ee00f895e00e26cab1a2c0322e2517e4793872707facf03430a92934b79a3d59f349bfb7513be4d1914073fc3b20300d5fd5c332bcb08224 SHA512 1fbd2aeb8e24d236f97c81a4136917cc8c705724c72567be095323a878ee18ed646fc2f4bec446a9a505fc4c88a708efa901970fdb00a67179c34cf97906a3b4
+DIST rust-1.57.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 230ccb3a534515c9ecd1ca2a3fced2e3688547a3ce42967eb06d7a04b79695eca74f1cf13583631139801a7ad60a31c7f6a1b2821dd13aceabc95386122034a0 SHA512 91313f0ed942d23bb490dffbc4b7eb9a441a09ff5925323df68a38c15aa4e3f5c1bad15c2700ccba8625fb35588135a9ba5f09c7bc5ba7d4f8486fed268a8000
+DIST rust-1.57.0-mips64-unknown-linux-gnuabi64.tar.xz 170276060 BLAKE2B 0c6defb288bdb11a8c81ab082944196c767424b8bab6997a51279c7c6ef6c1163c9715493b274420bca9d3f5e7fe7422d403a24162effc3cd880633641d23995 SHA512 339d1dc24e1227195b1fa1a72ceddf592026b4edf234141567e8b8c33c80e07aea71dd73962182783b60271829db8544e1ca6172aaf5ed5ae1cade848355508c
+DIST rust-1.57.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B 3b6ebc9e8678946f57e30452a880be3bf5a5a949683e7230cbda776511fd68a7278ecfc741c823d2d1362f200af19cbc25db7d67ab4ade8561a3d9224fd0313e SHA512 0a161f676162684da557d010de4833a6ef229592b6cb9cf55938cb85d12685e28fb0e4e204688b9c9f203b34095831de06c25a4fea48a8ef17226b15a214af0f
+DIST rust-1.57.0-mipsel-unknown-linux-gnu.tar.xz 168175700 BLAKE2B d544173e64d81b5cf74f16810f0c00fab0e2b628f90a554a33596b1b3140ef5183db5123f956ff71269761915469a7d51bdb945c02217f47529ae45f1200edc5 SHA512 7963364478ca613ca8670cc71b72e8423febe3062269ea1e5e82358d54c6d5e5006f85c69ae5c746bec296bd3e97883358ab27a9aaf59703984fa4186c5e01c7
+DIST rust-1.57.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a4056c8006cc5f3d7a548b55ff85f42003d19a7323bd3829c79ba370837c1982a0ca6d15e5d2dac9a4c75251662b375c8243ba0d2682b684b6fe258b25c32fbb SHA512 3db703e462c5c2e974e039c986094ae2bcbdf5e4b2163bbca4d20062be2e54b39f04d72d3f5929886f65e79f19a041e01cb17ec73db4611c3208b51efa2b7e89
+DIST rust-1.57.0-powerpc-unknown-linux-gnu.tar.xz 183173668 BLAKE2B 8d897751ce518f0e7fac16fa67645b73337cf2aeca20ffc8ceeace6591043a1b69cae9ba8af6271ad2b7b4448a64e4b5063a2efcb2cebc72c1d0a95c576dc07a SHA512 10ca7a769b53453c503d8da2ebd5da49e016d31a92e898c4aea4129cf1225330b2e1b4ac1893860741efd9ddc9ce409ff9d9fc00536b960efc928562f2e169a3
+DIST rust-1.57.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b7cfe911745b76e8b2a7090db19a6cc973ff361b0fc23c1d3d104c08554d7818866a6832c89cd8e1dbb519de72618ab362c9e6b1971a2babd0af607c9db9b0e0 SHA512 385c022053f6e102aa9c96c49703bd441b466129bffc5fb3c233f432edf2f2adad5e9979e0b657016eec33cf4b6c7bf31131a0e831c990d071d7da758f5e03d8
+DIST rust-1.57.0-powerpc64-unknown-linux-gnu.tar.xz 193868872 BLAKE2B f60c9d320fa6ca0d3b52dc27b22efb50115a1338ce12ea1071499d3abbd60e17c4866a59495fbca725eafef3675b9ca9417c87cad0262541955d2e308eb79f2e SHA512 4b5b2d461cd093f176c1624b29d4174bf9558e8760f7be84b9f9e353e09b622d89548e5bdc91305cf76a072ed2b64f4692b1864b90c86ba7e1a7a9e5df205adb
+DIST rust-1.57.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 26ea554afaca2e453130d400d3315d0c857e4ab92d5c0cfd21035548160a3c00f801adcbc24387aa6f56bc2907e3aaa3712b4bf35abc10128e3e712b3a451043 SHA512 90ff52af04044b073855c2a91bfe2bdb8fb8397a2d59ca50e38e5e235bd3379d993917546d1dacf3c25db6ec386f967cb8c9c5c7a1b76b06fa60d50a5c066176
+DIST rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz 203489092 BLAKE2B 5174c149bd6565ed2b709356caf940f7c051a1933a35f9801a31331358277e80d5262a73ea47d484abb2c12ad26c52bbeea5d2ee30f4c8b45e163d5fc788d848 SHA512 7e0809b66086f1c9dde14df5bd9f08757e32bb58041b74150415f798d81cb4ca01a6d69d529efe8a93026f251aa8f1711520defa8d86de64f20d9055ee1568e5
+DIST rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 0ed205cf7d3712e3501c228ad7d116331eb3c831437040dc7d4cbfa86de80372db1b116bd2c88ef9c05c57279499dc7cb6a394c216e89a69a6b033d56e4108b0 SHA512 2a3fd37e32382c747227f35e144966bbd241d57b9e06acdb444ed0ac68cf174dd21c565448d9e7ec032d14dbf6de580ca37e6d10b66446dcbef35b0dd35a2c1d
+DIST rust-1.57.0-riscv64gc-unknown-linux-gnu.tar.xz 196918164 BLAKE2B b41e958b690a5f6f46744dd38a464a0de0b80d9b4974f1fea46bbce8b26c37b88ffeb3b42e9cd6a3006e8ad8b89a990945dcf1e814041399f6fa8831089c074f SHA512 43c11df8b6621c4e3ccbbb81c043cc3b2f8c897f5d80b03a39ec73d0d73f1a3fafa1a8a607fcf6e16204eb424ead7b9dee0ffd401c185440c4a7b80e84921f5a
+DIST rust-1.57.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c55cc1c7c3e80bdb0527fcfe9b3a0bcb7edf84bea85e842ea425b5498247aaa8ffe19f05f1a2d8c93801dbf1d5e308760e8222311914179deb01f910aae279fe SHA512 df0d218a78eda0d005bb88e18a314f326165776449f28d4cd1aa014efa0e6870bacd2580f5958250e9a00de75c7327b20b4586606a8b120a7d658641759be61e
+DIST rust-1.57.0-s390x-unknown-linux-gnu.tar.xz 198621068 BLAKE2B 92af932e06c529ef27e389d35532cb7eed482c36bcc196d6c6934a442cc180815862ad7ee92c4ed97f69963ef6cfd617cab2bc254a81ffd35d88de267fb5d084 SHA512 4cc63e93bbafcbba2122a862200bf1dd241fe84f526778e1877c14237984fdeccdd3d2b3dfe73428b1b97bd253c1ddf98f4302f40709abbdd52ec721d5ccdb6e
+DIST rust-1.57.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c088d5904ecaadcad09d21dcffcbe1856ea2165cb45fcdce31ebad6edddfeb292bb644548537219ec301c4f5e417091d879093a627ea5efb4409e1db36771431 SHA512 c1c2f43033ba1a2ed28e8c60a18cc0de1dfdc7f5361c101cb8318f0f2c3be911784e7d1cc3a61456f1b2c39a5b6df2915b9e56e20dbfdfeb959addf4dc93f01e
+DIST rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz 151033748 BLAKE2B 61ecece6a8aa31a2cdf8dcf22514c19a54fcfda3a1248797a6a98e9bc42cf4f4278be21369270a6418b7c416875394055fceb49b5b1d21625e2759b97b2447e8 SHA512 54016b58fe85208c0d98e61cb52f2549bbb9731d7d631b4964663c91c91b7ea0ff4c224c3d29a770de433e6a0bcd92d2fe757563bf68e224a20c1cec6d031a7e
+DIST rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ea41b27fd25cc75efac73203688ee0882767fc76a2fe09b5e424c42467d3e332463c5560cc58f3b20f6e4b44289a25cfb0d36e38a7a9a7b3950ef875a59dc9ae SHA512 8b955bfce6c130e4b95054b98646f7f9b89e621256759ee1ff533df5f777312dd7adbb192ee0076c9b9baa6883a74a9def50ef598ba8c707762290d465c9a8b7
+DIST rust-1.57.0-x86_64-unknown-linux-musl.tar.xz 260333980 BLAKE2B 75342ae8637355e714d5217d78604cfa6a601d3f9bc0ed4667ff0ca57c6521567b19b9bdb10f79761e2e5fd21ca10e12f3fae0c65791118fdb0c35f8f88349f4 SHA512 204ed493528757b8e3e8df13d062c9ae74c75c3e3adc1a2efc0dfc33d2525629168a558dd32653f44a4365191bf203a4415a77152276288a8e122e6bd587394a
+DIST rust-1.57.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 506400c3ea70469cbda0e492e85d41b7f94fba790ec19d1c3491bf4a00d283f97c8fb37319ad6c4a43b22a2195c21d1b9e3c16a5b2a9a82833ff61ad49bdc793 SHA512 793369dc7a854c48a72d81446a0c8eb9d83a071af77758e0bcbb8e4d518fb87c5a23c085202b9b427a02bdd772ad9c82724b34295b851f26f384c3e801bf9a04
 DIST rustc-1.53.0-src.tar.xz 115686332 BLAKE2B fa068f89d42f927fdc79ee31aad1386eaf2aa596a060e059c5a1a73fe48c48d008fc952cd6c7912b743e41d77a94b205639eed0f728b2539b62f18a772cabfe3 SHA512 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
 DIST rustc-1.53.0-src.tar.xz.asc 801 BLAKE2B 75d3aa4122968f10a119f7a04df897f496588c7a1a2ddf1ea2222099c9efb0e320f5677a26c3271f86e7f500120664485f54c6025ae3c6df30d2b0fe758f5826 SHA512 e337579b9ab4febca4594c2c5d42c279b51cfc745c383be9a430204188311a25319c04c73fde34fdb2bb98a88bfd8daaddc67765834330e6c279a6e5a5648247
 DIST rustc-1.54.0-src.tar.xz 116286856 BLAKE2B 5ac47822646a0b6205f09282168b4d4ddcace9f6bc8f242c890327ca4074626f129514f8bcae5c5556015745f718990cce490658076f5cd3526623439540416b SHA512 5162f85b43ca2c5af93fdbfb2597d75df8a838f7fcc025a5298499ce1043db50f1ea2fbba753e47ce5daad3d80d4b612acf6527ef902c34117763e687fdbbcfa
@@ -175,9 +207,12 @@ DIST rustc-1.56.1-src.tar.xz 121798264 BLAKE2B 09677b0332022f28a0d80949a6735929d
 DIST rustc-1.56.1-src.tar.xz.asc 801 BLAKE2B 70ed1c26971e864aa6cc9b05eb52c4a140d0d0cccb3ff66d4a13e1b1dbac958c5369f76524c4702311566ed26aff635f5e3d35d9da71d96e070f5f0e978dc2ba SHA512 f997e7962ef8b283c19c97d8b898f3642f1a58c89a9cc5470cf88682263a42e2054d670c12bf93c41e81edf8324a5b51453f402a74bccb7744c7f463cf689aa8
 DIST rustc-1.57.0-src.tar.xz 122681768 BLAKE2B 739fe2c34b01bb0c6beeb7717badeb2ba12f00b91831977bf0d8782d806071f8ed696e94bf51d53509ae6e5c5773544b2dcf4187e81682c2f765d0975c64ca7d SHA512 7903bcfc7c1db208da5d5991bd5b7f55dbe5917d4814274a8badf0d3b767211e81f8626c355ea93142f236abf116d5921c0b542ef309fbe84ece1ce84e5af30f
 DIST rustc-1.57.0-src.tar.xz.asc 801 BLAKE2B e5c2e91999d8d2bcb5be36ddc8559a59fc53445f639bd179239489f9fd2a2f00f2191cdbb2000b73866fbb332b51be090e95e348a3573676dc24e00cdbb071fa SHA512 fcf1393a1be3c585447e08078b804e7ffcddcb47d87877c13526592e317b889b15ad1786baef5d6adf020631a6773a9dd31c04779f475a528b28871920a4641f
+DIST rustc-1.58.0-src.tar.xz 124348768 BLAKE2B e5a0d919a1ca1202e218cec3da93fc69cba163069b1f2b4051778a49184715579c14cd6b03baa0225b10a8f1adf758aca427c910d95dfa2e647bbf8b7d133785 SHA512 70104f4d3b474dcb9935200ef0503f29cb15f10d38ba8630e1dadbb384924dd9137fced647794699efe83ac88083e4ae5f45712f0e1c8bc0a6f8c23eecdb0aeb
+DIST rustc-1.58.0-src.tar.xz.asc 801 BLAKE2B d8b3ae366d20e0a27b53973e0d215c0fd5f596116ede15ac0e729db4a92fff6c602fc3893674863040a97abaaab36b351413e87a2c6d77f823fcda5805d23daa SHA512 e4bffe84637b2708d00fae091e3eb868063a8f65da918a847ef7db3f1edd35f96068489cae77238decfc134f4456cf6e3122f993e61f1e4986d3ec7f029d7125
 EBUILD rust-1.53.0.ebuild 20785 BLAKE2B 9ea68bb024924e49be1cd88a8db199b1d41fde63d5542344d8838d5e69878e1b88c4e6db194d5e830db1f4a4ac814bab48bb2cc727d3418fdf3ddf86c869a68c SHA512 3d1759bfd92afc0f07d97bb49bd849d06ac2085d4d17d9f9ef4272ea83a7241535e7949ed7e813bf441171467bc5d35cb84c3797c9873393f0a50d91b3e368f0
 EBUILD rust-1.54.0.ebuild 20789 BLAKE2B 32726066b47f161b357fba0ba00b7c4c2f58f417d45c664f713fb0f058d1b4ae6292b8da405497b4a73ec880ed16a71a4cd5a634cc730b005332b900ba67cc9f SHA512 d25ed067a7ea7264e4f22e11816d163b9cac99b33e8a8a7a143909863bf8b63d41911d5fc16beaa34e0feaef8c47e9332db6d2c762314fe4ce4166fe841c627e
 EBUILD rust-1.55.0.ebuild 20696 BLAKE2B a91b9a4996d26593d5e21d6db34c6187cee9bb629fb7a50ba39440d94f2b2fc4fab7b5ce7d4b0320bd254df395fceba461137ea14ae1c4ea904088157235985b SHA512 a9b602a600d64a88e4f2975b4dc0195a72af887894274af18e696b89557c4bbc95fe8ce3103a120a4f2dfa12e3e7dfade185f599650afd374d6c9182bc263bf3
 EBUILD rust-1.56.1.ebuild 20676 BLAKE2B 3ea40ca6610607d1d046a0a76917076c20cbbfeae9f42b8ce4bce398cb98d95ecf849eb9f619cb73a58b87428d73f4da84cb42ca7c896634d191848514e349a6 SHA512 6adda6696aed06306d700683aee1d251b7c6535c84b1042f9d568fa0c15fb3a9a6c5f04132d78894481387724c04bca0e256a009f1badb970273850a0f10dd4e
 EBUILD rust-1.57.0.ebuild 20723 BLAKE2B c2c877fdbfe16223c6b93d050737c8137e3d90ee71c2de828ee200a97092687c775a58b3d4942241579b96a8b3c28da1db6b6a0cbf1dca026ac97c24541b05a2 SHA512 0778f871cd857f9b9324e25645bd84b47832ba2d97b054ce9c885e03c2a24b66cc5da31928f6d707909a970bc4bc082674e3ab8dd053bfbabead2cde9a501c03
+EBUILD rust-1.58.0.ebuild 20810 BLAKE2B 3b687fb394dc501bb93a505da5d12a960d26b3faf6e601925d5eece141e4fd4913e4df2f1cebb192b949047aeee5735fb76f4f04322ab663cfe49013af20c6a6 SHA512 98f5a9c8f396436e9e84d0a87550de2a0cc09540d6e99fef20299b939a27112d5adccf47fff7796601bec08f07f23c24ecf169d4657e5356790d8d393b1dcfe2
 MISC metadata.xml 1224 BLAKE2B 90bfe107b31b32d18f23514ff47013976e2b754860491f7e190d5023acfa93bc0eeee9456cd048bb4bdef4e40911d90cc14f831454c45cf550319c42c65b701d SHA512 6524001cbfb59c94e7fb7df5a995de327fc193d18353363c4a0126f6c78ef92866f995cf592923aabc7cb2caebc6728f95badcd5c8c777ad7bb60cbbe6b20f07
diff --git a/dev-lang/rust/rust-1.58.0.ebuild b/dev-lang/rust/rust-1.58.0.ebuild
new file mode 100644
index 000000000000..2b3cee83c811
--- /dev/null
+++ b/dev-lang/rust/rust-1.58.0.ebuild
@@ -0,0 +1,691 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \
+	multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
+else
+	ABI_VER="$(ver_cut 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="
+	https://static.rust-lang.org/dist/${SRC}
+	verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc )
+	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
+"
+
+# keep in sync with llvm ebuild of the same version as bundled one.
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling more than one slot
+# simultaneously.
+
+# How to use it:
+# List all the working slots in LLVM_VALID_SLOTS, newest first.
+LLVM_VALID_SLOTS=( 13 )
+LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}"
+
+# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
+# (-) usedep needed because we may build with older llvm without that target
+LLVM_DEPEND="|| ( "
+for _s in ${LLVM_VALID_SLOTS[@]}; do
+	LLVM_DEPEND+=" ( "
+	for _x in ${ALL_LLVM_TARGETS[@]}; do
+		LLVM_DEPEND+="
+			${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )"
+	done
+	LLVM_DEPEND+=" )"
+done
+unset _s _x
+LLVM_DEPEND+=" )
+	<sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):=
+	wasm? ( sys-devel/lld )
+"
+
+# to bootstrap we need at least exactly previous version, or same.
+# most of the time previous versions fail to bootstrap with newer
+# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
+# but it fails to bootstrap with 1.48.x
+# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.txt
+RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
+RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
+BOOTSTRAP_DEPEND="||
+	(
+		=dev-lang/rust-"${RUST_DEP_PREV}"
+		=dev-lang/rust-bin-"${RUST_DEP_PREV}"
+		=dev-lang/rust-"${RUST_DEP_CURR}"
+		=dev-lang/rust-bin-"${RUST_DEP_CURR}"
+	)
+"
+
+BDEPEND="${PYTHON_DEPS}
+	app-eselect/eselect-rust
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
+	!system-llvm? (
+		>=dev-util/cmake-3.13.4
+		dev-util/ninja
+	)
+	test? ( sys-devel/gdb )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+DEPEND="
+	>=app-arch/xz-utils-5.2
+	net-misc/curl:=[http2,ssl]
+	sys-libs/zlib:=
+	dev-libs/openssl:0=
+	elibc_musl? ( sys-libs/libunwind:= )
+	system-llvm? ( ${LLVM_DEPEND} )
+"
+
+# we need to block older versions due to layout changes.
+RDEPEND="${DEPEND}
+	app-eselect/eselect-rust
+	!<dev-lang/rust-1.47.0-r1
+	!<dev-lang/rust-bin-1.47.0-r1
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+	miri? ( nightly )
+	parallel-compiler? ( nightly )
+	rls? ( rust-src )
+	test? ( ${ALL_LLVM_TARGETS[*]} )
+	wasm? ( llvm_targets_WebAssembly )
+	x86? ( cpu_flags_x86_sse2 )
+"
+
+# we don't use cmake.eclass, but can get a warning
+CMAKE_WARN_UNUSED_CLI=no
+
+QA_FLAGS_IGNORED="
+	usr/lib/${PN}/${PV}/bin/.*
+	usr/lib/${PN}/${PV}/libexec/.*
+	usr/lib/${PN}/${PV}/lib/lib.*.so
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_SONAME="
+	usr/lib/${PN}/${PV}/lib/lib.*.so.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib/rust/${PV}/lib/rustlib/.*/bin/rust-llvm-dwp
+"
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+# causes double bootstrap
+RESTRICT="test"
+
+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.49.0-gentoo-musl-target-specs.patch
+)
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "${1}" true false
+}
+
+bootstrap_rust_version_check() {
+	# never call from pkg_pretend. eselect-rust may be not installed yet.
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
+	local rustc_toonew="$(ver_cut 1).$(($(ver_cut 2) + 1))"
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
+		eerror "Rust >=${rustc_wanted} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too old"
+	elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then
+		eerror "Rust <${rustc_toonew} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too new"
+	else
+		einfo "Using rust ${rustc_version} to build"
+	fi
+}
+
+pre_build_checks() {
+	local M=4096
+	# multiply requirements by 1.5 if we are doing x86-multilib
+	if use amd64; then
+		M=$(( $(usex abi_x86_32 15 10) * ${M} / 10 ))
+	fi
+	M=$(( $(usex clippy 128 0) + ${M} ))
+	M=$(( $(usex miri 128 0) + ${M} ))
+	M=$(( $(usex rls 512 0) + ${M} ))
+	M=$(( $(usex rustfmt 256 0) + ${M} ))
+	# add 2G if we compile llvm and 256M per llvm_target
+	if ! use system-llvm; then
+		M=$(( 2048 + ${M} ))
+		local ltarget
+		for ltarget in ${ALL_LLVM_TARGETS[@]}; do
+			M=$(( $(usex ${ltarget} 256 0) + ${M} ))
+		done
+	fi
+	M=$(( $(usex wasm 256 0) + ${M} ))
+	M=$(( $(usex debug 2 1) * ${M} ))
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		M=$(( 15 * ${M} / 10 ))
+	fi
+	eshopts_pop
+	M=$(( $(usex system-bootstrap 0 1024) + ${M} ))
+	M=$(( $(usex doc 256 0) + ${M} ))
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+llvm_check_deps() {
+	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+	python-any-r1_pkg_setup
+
+	export LIBGIT2_NO_PKG_CONFIG=1 #749381
+
+	use system-bootstrap && bootstrap_rust_version_check
+
+	if use system-llvm; then
+		llvm_pkg_setup
+
+		local llvm_config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+		export LLVM_LINK_SHARED=1
+		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+	fi
+}
+
+src_prepare() {
+	if ! use system-bootstrap; then
+		local rust_stage0_root="${WORKDIR}"/rust-stage0
+		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
+
+		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
+			--without=rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local rust_target="" rust_targets="" arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
+	done
+	if use wasm; then
+		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+		if use system-llvm; then
+			# un-hardcode rust-lld linker for this target
+			# https://bugs.gentoo.org/715348
+			sed -i '/linker:/ s/rust-lld/wasm-ld/' compiler/rustc_target/src/spec/wasm_base.rs || die
+		fi
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local tools="\"cargo\","
+	if use clippy; then
+		tools="\"clippy\",$tools"
+	fi
+	if use miri; then
+		tools="\"miri\",$tools"
+	fi
+	if use rls; then
+		tools="\"rls\",\"analysis\",$tools"
+	fi
+	if use rustfmt; then
+		tools="\"rustfmt\",$tools"
+	fi
+	if use rust-src; then
+		tools="\"src\",$tools"
+	fi
+
+	local rust_stage0_root
+	if use system-bootstrap; then
+		local printsysroot
+		printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
+		rust_stage0_root="${printsysroot}"
+	else
+		rust_stage0_root="${WORKDIR}"/rust-stage0
+	fi
+	# in case of prefix it will be already prefixed, as --print sysroot returns full path
+	[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
+
+	rust_target="$(rust_abi)"
+
+	cat <<- _EOF_ > "${S}"/config.toml
+		changelog-seen = 2
+		[llvm]
+		download-ci-llvm = false
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		ninja = true
+		targets = "${LLVM_TARGETS// /;}"
+		experimental-targets = ""
+		link-shared = $(toml_usex system-llvm)
+		[build]
+		build-stage = 2
+		test-stage = 2
+		doc-stage = 2
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		rustfmt = "${rust_stage0_root}/bin/rustfmt"
+		docs = $(toml_usex doc)
+		compiler-docs = false
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		tools = [${tools}]
+		verbose = 2
+		sanitizers = false
+		profiler = false
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debug-assertions-std = $(toml_usex debug)
+		debuginfo-level = $(usex debug 2 0)
+		debuginfo-level-rustc = $(usex debug 2 0)
+		debuginfo-level-std = $(usex debug 2 0)
+		debuginfo-level-tools = $(usex debug 2 0)
+		debuginfo-level-tests = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		parallel-compiler = $(toml_usex parallel-compiler)
+		channel = "$(usex nightly nightly stable)"
+		description = "gentoo"
+		rpath = false
+		verbose-tests = true
+		optimize-tests = $(toml_usex !debug)
+		codegen-tests = true
+		dist-src = false
+		remap-debuginfo = true
+		lld = $(usex system-llvm false $(toml_usex wasm))
+		# only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it
+		# https://github.com/rust-lang/rust/issues/74976
+		# https://github.com/rust-lang/rust/issues/76526
+		deny-warnings = $(usex wasm $(usex doc false true) true)
+		backtrace-on-ice = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+		compression-formats = ["gz"]
+	_EOF_
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		cat <<- _EOF_ >> "${S}"/config.env
+			CFLAGS_${rust_target}=${arch_cflags}
+		_EOF_
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${rust_target}]
+			ar = "$(tc-getAR)"
+			cc = "$(tc-getCC)"
+			cxx = "$(tc-getCXX)"
+			linker = "$(tc-getCC)"
+			ranlib = "$(tc-getRANLIB)"
+		_EOF_
+		# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+		if use elibc_musl; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				crt-static = false
+			_EOF_
+		fi
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+	done
+	if use wasm; then
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "$(usex system-llvm lld rust-lld)"
+		_EOF_
+	fi
+
+	if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then # whitespace intentionally shifted below
+	# experimental cross support
+	# discussion: https://bugs.gentoo.org/679878
+	# TODO: c*flags, clang, system-llvm, cargo.eclass target support
+	# it would be much better if we could split out stdlib
+	# complilation to separate ebuild and abuse CATEGORY to
+	# just install to /usr/lib/rustlib/<target>
+
+	# extra targets defined as a bash array
+	# spec format:  <LLVM target>:<rust-target>:<CTARGET>
+	# best place would be /etc/portage/env/dev-lang/rust
+	# Example:
+	# RUST_CROSS_TARGETS=(
+	#	"AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
+	# )
+	# no extra hand holding is done, no target transformations, all
+	# values are passed as-is with just basic checks, so it's up to user to supply correct values
+	# valid rust targets can be obtained with
+	# 	rustc --print target-list
+	# matching cross toolchain has to be installed
+	# matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
+	# only gcc toolchains installed with crossdev are checked for now.
+
+	# BUG: we can't pass host flags to cross compiler, so just filter for now
+	# BUG: this should be more fine-grained.
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+
+	local cross_target_spec
+	for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
+		# extracts first element form <LLVM target>:<rust-target>:<CTARGET>
+		local cross_llvm_target="${cross_target_spec%%:*}"
+		# extracts toolchain triples, <rust-target>:<CTARGET>
+		local cross_triples="${cross_target_spec#*:}"
+		# extracts first element after before : separator
+		local cross_rust_target="${cross_triples%%:*}"
+		# extracts last element after : separator
+		local cross_toolchain="${cross_triples##*:}"
+		use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
+		command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${cross_rust_target}]
+			ar = "${cross_toolchain}-ar"
+			cc = "${cross_toolchain}-gcc"
+			cxx = "${cross_toolchain}-g++"
+			linker = "${cross_toolchain}-gcc"
+			ranlib = "${cross_toolchain}-ranlib"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+		if [[ "${cross_toolchain}" == *-musl* ]]; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				musl-root = "$(${cross_toolchain}-gcc -print-sysroot)/usr"
+			_EOF_
+		fi
+
+		# append cross target to "normal" target list
+		# example 'target = ["powerpc64le-unknown-linux-gnu"]'
+		# becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
+
+		rust_targets="${rust_targets},\"${cross_rust_target}\""
+		sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" config.toml || die
+
+		ewarn
+		ewarn "Enabled ${cross_rust_target} rust target"
+		ewarn "Using ${cross_toolchain} cross toolchain"
+		ewarn
+		if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
+			ewarn "'sys-devel/binutils[multitarget]' is not installed"
+			ewarn "'strip' will be unable to strip cross libraries"
+			ewarn "cross targets will be installed with full debug information"
+			ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
+			ewarn
+			ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
+			ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
+			ewarn
+		fi
+	done
+	fi # I_KNOW_WHAT_I_AM_DOING_CROSS
+
+	einfo "Rust configured with the following flags:"
+	echo
+	echo RUSTFLAGS="${RUSTFLAGS:-}"
+	echo RUSTFLAGS_BOOTSTRAP="${RUSTFLAGS_BOOTSTRAP:-}"
+	echo RUSTFLAGS_NOT_BOOTSTRAP="${RUSTFLAGS_NOT_BOOTSTRAP:-}"
+	env | grep "CARGO_TARGET_.*_RUSTFLAGS="
+	cat "${S}"/config.env || die
+	echo
+	einfo "config.toml contents:"
+	cat "${S}"/config.toml || die
+	echo
+}
+
+src_compile() {
+	# we need \n IFS to have config.env with spaces loaded properly. #734018
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) RUST_BACKTRACE=1\
+		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+	)
+}
+
+src_test() {
+	# https://rustc-dev-guide.rust-lang.org/tests/intro.html
+
+	# those are basic and codegen tests.
+	local tests=(
+		codegen
+		codegen-units
+		compile-fail
+		incremental
+		mir-opt
+		pretty
+		run-make
+	)
+
+	# fails if llvm is not built with ALL targets.
+	# and known to fail with system llvm sometimes.
+	use system-llvm || tests+=( assembly )
+
+	# fragile/expensive/less important tests
+	# or tests that require extra builds
+	# TODO: instead of skipping, just make some nonfatal.
+	if [[ ${ERUST_RUN_EXTRA_TESTS:-no} != no ]]; then
+		tests+=(
+			rustdoc
+			rustdoc-js
+			rustdoc-js-std
+			rustdoc-ui
+			run-make-fulldeps
+			ui
+			ui-fulldeps
+		)
+	fi
+
+	local i failed=()
+	einfo "rust_src_test: enabled tests ${tests[@]/#/src/test/}"
+	for i in "${tests[@]}"; do
+		local t="src/test/${i}"
+		einfo "rust_src_test: running ${t}"
+		if ! (
+				IFS=$'\n'
+				env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \
+				"${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
+				-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
+			)
+		then
+				failed+=( "${t}" )
+				eerror "rust_src_test: ${t} failed"
+		fi
+	done
+
+	if [[ ${#failed[@]} -ne 0 ]]; then
+		eerror "rust_src_test: failure summary: ${failed[@]}"
+		die "aborting due to test failures"
+	fi
+}
+
+src_install() {
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) DESTDIR="${D}" \
+		"${EPYTHON}" ./x.py install	-vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+	)
+
+	# bug #689562, #689160
+	rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die
+	rmdir -v "${ED}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die
+	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use miri && symlinks+=( miri cargo-miri )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+
+	einfo "installing eselect-rust symlinks and paths: ${symlinks[@]}"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
+		# need to fix eselect-rust to remove this hack.
+		local ver_i="${i}-${PV}"
+		if [[ -f "${ED}/usr/lib/${PN}/${PV}/bin/${i}" ]]; then
+			einfo "Installing ${i} symlink"
+			ln -v "${ED}/usr/lib/${PN}/${PV}/bin/${i}" "${ED}/usr/lib/${PN}/${PV}/bin/${ver_i}" || die
+		else
+			ewarn "${i} symlink requested, but source file not found"
+			ewarn "please report this"
+		fi
+		dosym "../lib/${PN}/${PV}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "${PV}/lib" "/usr/lib/${PN}/lib-${PV}"
+	dosym "${PV}/libexec" "/usr/lib/${PN}/libexec-${PV}"
+	dosym "${PV}/share/man" "/usr/lib/${PN}/man-${PV}"
+	dosym "rust/${PV}/lib/rustlib" "/usr/lib/rustlib-${PV}"
+	dosym "../../lib/${PN}/${PV}/share/doc/rust" "/usr/share/doc/${P}"
+
+	newenvd - "50${P}" <<-_EOF_
+		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"' '')
+	_EOF_
+
+	rm -rf "${ED}/usr/lib/${PN}/${PV}"/*.old || die
+	rm -rf "${ED}/usr/lib/${PN}/${PV}/doc"/*.old || die
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+		/usr/bin/cargo
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-gdbgui
+		/usr/bin/rust-lldb
+		/usr/lib/rustlib
+		/usr/lib/rust/lib
+		/usr/lib/rust/libexec
+		/usr/lib/rust/man
+		/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use miri; then
+		echo /usr/bin/miri >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	if has_version sys-devel/gdb || has_version dev-util/lldb; then
+		elog "Rust installs a helper script for calling GDB and LLDB,"
+		elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+	fi
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 82fd263f570f..94c5418e21f1 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -6,12 +6,14 @@ DIST swipl-8.4.1.tar.gz 11386908 BLAKE2B bd53355abe63ffde348ed38b0e7fee4bcba4e74
 DIST swipl-8.5.1.tar.gz 11374102 BLAKE2B 7782c193f14450aff5ea08d739e1b2db1be9b305f9a6608c40e800a05f76682340acc3e406d4f13fdcd24428af375dbf67a590e7d4fbe1bf35b28bce7ce56552 SHA512 4cb76e7268b7ae9ee12f3c7220558f8dddc18c3e53ed8d145ebe43f20f5a35ce657ac2316693e00bf2d0b7dc84de558900e66d45140bd6ea1d3848c33feb2686
 DIST swipl-8.5.2.tar.gz 11403262 BLAKE2B 1f6e362a85f15d7b6dff6e1e7317f9d70d65bf754f32e48caae9f6ab72bdf640fb7adbe0f39e32b14de4217020176c6681e8e84ffef972cf51e48716659e68f1 SHA512 11f3cbbe22deadddb5ca6b49bc19ed4d7f173c42ce033bbf7e04d05bd18700e9d511a8a9a80a6970fa57f3fad2faed282a8edbd7f024c00395c8ecb5e1d2f473
 DIST swipl-8.5.3.tar.gz 11396211 BLAKE2B f4475b9e0a3fa48590998e90c0ee6873c329fc25bbd52b095e15da5cb2878230cfbec5492e3806adc0ff2826de1d930d25068dd02d048282d957d857ea7401d9 SHA512 26d29b608cc08cbd70389f7a79cbfc58f97cb2497e7a4b119f80f5ffa1bc5264e2a55b76b2e15516a9167a4097af68ebc83cb1145dc0829e2edb318462af6047
+DIST swipl-8.5.4.tar.gz 11406222 BLAKE2B ece161b1143897324e2204bbeed0c7784824481de8b5ada12d42b4fea14334ab9b2be68cc39f3e4aceffb049baf6ec6c6b239438c4d8654172980e6aecea8016 SHA512 c277248d8a3b7cbad622d06eb0a418cbb87540802152d9a49364c3b45905e0be0be28ae100c6abcb06084c6ca5e92d7d4b46553d59d47c8b987e01b0d420bdb6
 EBUILD swi-prolog-8.2.3-r2.ebuild 2661 BLAKE2B 34a523f318cf39453bb07e8f484958585180f77b5cec51ccbc5f1cc5f26016dfa01793e1cc98ddd26dea30e33bdfb8ee14380a7465080fcc4f2b9edefc9675e3 SHA512 554e2e2c587fd0b7de160f8789ecfa8459149c2fca221fb7c8df9bb789b91247ae22eade75fc52b614eba2548db2314a013676c4c0bc7883a2166db0e8028ca8
 EBUILD swi-prolog-8.2.4-r2.ebuild 2854 BLAKE2B 61ed52d692815431f8965aaccb426dab4af427794b7fcc8b9882d16c535386d834b3433a5e0694a9848d41f28f8e56dd27ba1b54da1341b32c141e008c479736 SHA512 a13d74f6e0e69f7a219fb03e18f7de143e52a7e9ed5fdbac8da6dc0e1058802b70491ecf6a81b335377421ac6ecee1cf6aa035579b659d12c5d4ce37e0ec8624
 EBUILD swi-prolog-8.2.4-r3.ebuild 3179 BLAKE2B 2122c73ba239423cc4e47ae9df3f6e39ad15795c9045384ee9857845a05906f48602c17262e1e68f04ad8dee192d8483c1f48e1af64e73546f2ee5d0d5b16318 SHA512 fa8a027c2fa744682b8a7da84fe95885837b7a1a5c960e7c42feeb5a3f626f3282b5ca7142763108e8111d9a3f1f97c8a5dc12805f6d4def91b655a8a6f51954
 EBUILD swi-prolog-8.4.0.ebuild 3180 BLAKE2B f25841b2f8e6841f6b8700ad76cf14e26c65861f705089b3662359f9eda22ad4181cbce9e3039f7f07315a3d47e45b365684f11eabae1d297bece34075cd440c SHA512 21b2e976eb58f9b25d7cd2241d9321a452803f231c4ddcfba92672fed9a4a1754e2084af9cc3562ae14a4c15376362d89cc0d0627f94007530b6a17367f77ea1
-EBUILD swi-prolog-8.4.1.ebuild 3180 BLAKE2B f25841b2f8e6841f6b8700ad76cf14e26c65861f705089b3662359f9eda22ad4181cbce9e3039f7f07315a3d47e45b365684f11eabae1d297bece34075cd440c SHA512 21b2e976eb58f9b25d7cd2241d9321a452803f231c4ddcfba92672fed9a4a1754e2084af9cc3562ae14a4c15376362d89cc0d0627f94007530b6a17367f77ea1
+EBUILD swi-prolog-8.4.1.ebuild 3178 BLAKE2B 35516e6433aacc21d0bb65531dbadabc63ec07333c3c1cf5b0a68ebe3875313073ab737c36ab28f6b4478c2a2853a32113dcee04feba869d2dac28be34e41e47 SHA512 a6a2f4ca2e9e6ff08418ec109a2d9164fb3f64c12aa7dccf8274d976b2c16f35dbeed1d6f6e95fa22d4ae1dc7247a1f8008a06ae2cf949a20a0e277fc68a6aee
 EBUILD swi-prolog-8.5.1.ebuild 3179 BLAKE2B 50bf0ff7f795f9fcecddc5a9ca50f19efd252e37f0ee0371306fe5cb3cf6a8fc59810bc689a070fa087b647a60bf655cc5299964190f4f6e03af4327525093ad SHA512 0c080a2d2722c169b6ad999f92b612f068a3d5176ac6c5b31e57703446a111ca47d9dcdfd0f4c63f125a2ec43c558a4dbef3fcf4c067e7c6a2c8fe63c0b1198d
 EBUILD swi-prolog-8.5.2.ebuild 3179 BLAKE2B 50bf0ff7f795f9fcecddc5a9ca50f19efd252e37f0ee0371306fe5cb3cf6a8fc59810bc689a070fa087b647a60bf655cc5299964190f4f6e03af4327525093ad SHA512 0c080a2d2722c169b6ad999f92b612f068a3d5176ac6c5b31e57703446a111ca47d9dcdfd0f4c63f125a2ec43c558a4dbef3fcf4c067e7c6a2c8fe63c0b1198d
 EBUILD swi-prolog-8.5.3.ebuild 3179 BLAKE2B 50bf0ff7f795f9fcecddc5a9ca50f19efd252e37f0ee0371306fe5cb3cf6a8fc59810bc689a070fa087b647a60bf655cc5299964190f4f6e03af4327525093ad SHA512 0c080a2d2722c169b6ad999f92b612f068a3d5176ac6c5b31e57703446a111ca47d9dcdfd0f4c63f125a2ec43c558a4dbef3fcf4c067e7c6a2c8fe63c0b1198d
+EBUILD swi-prolog-8.5.4.ebuild 3179 BLAKE2B 4b173dd107ec5141d8a3bbc4175363deae9bf4598bc21020b9c74879a87cd554e1221ffc778ec8b50ba746ecd3536b14110ea67d1d8f70471d3de86073568b4c SHA512 0d01e1af08c63925a9487ebcec31e207febf63a2caf83a6ce1385bf6948ae7d1f3fb0c14d22ed3e4032c5e11b09954a68bcecac2c03263f3cb243ed5ab8f93a1
 MISC metadata.xml 420 BLAKE2B 9818164553dd7e47db556eebaa71cabc54621317465c3ef09a0fae22259c9d20bede548a61ffa383e9df8eaf6efa6b5ac800d49b1ee5cae3691d0112ed4a2a30 SHA512 6ce90a29c77852e822d5c35c4a1b0b4a093cb90070656b06b09337c57f00fb6ff42ae3c8178a22bee17ffcec8f40ea4ed6c9d0cecf4afe74e01b3389479fa4ff
diff --git a/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild
index f00dfe509d7c..01ff1d2f2a04 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test +uuid X yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/swi-prolog/swi-prolog-8.5.4.ebuild b/dev-lang/swi-prolog/swi-prolog-8.5.4.ebuild
new file mode 100644
index 000000000000..f1f52dee9349
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.5.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils flag-o-matic toolchain-funcs
+
+PATCHSET_VER="0"
+
+DESCRIPTION="Versatile implementation of the Prolog programming language"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test +uuid X yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
+	berkdb? ( >=sys-libs/db-4:= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0= )
+	ssl? ( dev-libs/openssl:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	uuid? ( dev-libs/ossp-uuid )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	)
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXinerama
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )
+	yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+
+	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
+		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
+		-i CMakeLists.txt || die
+
+	local ncurses_lib_flags=$($(tc-getPKG_CONFIG) --libs ncurses)
+	sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die
+	sed -i "s:\${CURSES_LIBRARIES}:${ncurses_lib_flags}:" src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DO_DEBUG
+
+	local mycmakeargs=(
+		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+		-DUSE_GMP=$(usex gmp)
+		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DSWIPL_PACKAGES_SSL=$(usex ssl)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_X=$(usex X)
+		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	XDG_CONFIG_DIRS="${HOME}" \
+	XDG_DATA_DIRS="${HOME}" \
+		cmake_src_compile
+}
+
+src_test() {
+	USE_PUBLIC_NETWORK_TESTS=false \
+	USE_ODBC_TESTS=false \
+		cmake_src_test -V
+}
+
+src_install() {
+	cmake_src_install
+
+	if use qt5; then
+		doicon "${S}"/snap/gui/swipl.png
+		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
+	fi
+}
+
+pkg_postinst() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/dev-lang/typescript/Manifest b/dev-lang/typescript/Manifest
index 38b94649f91d..3ddba71e78b4 100644
--- a/dev-lang/typescript/Manifest
+++ b/dev-lang/typescript/Manifest
@@ -1,5 +1,3 @@
-DIST typescript-4.3.5.tgz 10627908 BLAKE2B 8fda1e3c2ee052273e5fa22245a0af26c3171b93a5bd6d57453e92828748bec83ca9cef075b005e5b73f7be7e18210d0fef24c08e7b8054fd3c1d30376357d44 SHA512 0ea4208a1690f5c52bb24268f642325bffa0d15c6c93c703b59e766b734687460d4dfa54480ad74a88725069ef6cf6b310f2eedfdf02d14c662923ab3ee994cc
 DIST typescript-4.5.4.tgz 11280056 BLAKE2B 0fce858e7b1ec2120de9e2cd0356cb6553a1730f7db58a001920928351c58186124e63b7189e37ce12ea6158744c1203ebed6e20234e1b32e47b07b3f48bcd24 SHA512 56062cd80d90211b86a61b73155eda40976e2768327d39639e02f38e97d6f45a18645eb1bb0d56d2f5bd82108a2df716ac21712bcd42486440bd2d699f87c852
-EBUILD typescript-4.3.5.ebuild 766 BLAKE2B eaa420ad739ed7a4afee41b0d9f4fd7d3283a0a1ca75f5514383470bd4276538147f28ef777954605359a249df6a913e91f04ee75dd3ad55537803f10b1f1259 SHA512 3a65ae24834c4bb449361653daabd973c3bfa2b0d141cdfc90cac3dbcb913f9f161212c3a2b36d155adb9d13bc72051b23f056e6fa55f61e39a57fc0930107c5
 EBUILD typescript-4.5.4.ebuild 766 BLAKE2B eaa420ad739ed7a4afee41b0d9f4fd7d3283a0a1ca75f5514383470bd4276538147f28ef777954605359a249df6a913e91f04ee75dd3ad55537803f10b1f1259 SHA512 3a65ae24834c4bb449361653daabd973c3bfa2b0d141cdfc90cac3dbcb913f9f161212c3a2b36d155adb9d13bc72051b23f056e6fa55f61e39a57fc0930107c5
 MISC metadata.xml 337 BLAKE2B ac8e737ab7726d464b009057fa44ce5d8fb9f23b0f36b547362df03caf57fbd1fb37357ac8fe0f0816793cfb0764508900874b4a3e50a5b1a624f2d55342e82a SHA512 39e9d9fb81ce9a925491894d4fa80aeeec95240307661857e7d6360b0d467e2e31ec8307762e0ad63ae4105674f6c8eaf1b37b4e2ebf96d6c8fcbbc67b1318f2
diff --git a/dev-lang/typescript/typescript-4.3.5.ebuild b/dev-lang/typescript/typescript-4.3.5.ebuild
deleted file mode 100644
index dcbc71b38d89..000000000000
--- a/dev-lang/typescript/typescript-4.3.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces"
-HOMEPAGE="https://www.typescriptlang.org"
-SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-DEPEND=""
-RDEPEND="net-libs/nodejs"
-BDEPEND=">=net-libs/nodejs-16[npm]"
-
-S="${WORKDIR}/package"
-
-src_compile() {
-	# nothing to compile here
-	:
-}
-
-src_install() {
-	npm \
-		--audit false \
-		--color false \
-		--foreground-scripts \
-		--global \
-		--offline \
-		--omit dev \
-		--prefix "${ED}"/usr \
-		--progress false \
-		--verbose \
-		install "${DISTDIR}/${P}".tgz || die "npm install failed"
-
-	einstalldocs
-}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 11246a54d805..64d1f67ff216 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,23 +1,21 @@
 DIST vala-0.46.13.tar.xz 3434196 BLAKE2B 49b7e0b776e185653c1b8c00747a150ceb42cf89006fd55d37e3efd0824dace379d2c72cdb45d481b0545d0b4b37299bc6161b2d083d3221d2d8d8ca7c10d6dc SHA512 6d8d1acebf4706346d5dc986f5c900cfda929ca59ca3f3907cff56892a496bf524b1f74032ac6c8587b236a473124e15c6f83f949636e28141a55c8abeddf004
 DIST vala-0.48.18.tar.xz 3519484 BLAKE2B 26581cd4b2ead9272fc032d085a4c49d47bc65d4f71c161b22f2efd6382d5a7b5204e6b7de8aac0a1d311b2c2fb7e3edd5894e7e14f34378bb69532c206832eb SHA512 fcafc44e62d6d8e724a8190a5c8bebf74c561eb355a2074ab6e29ff3abb73a6a553096991e8f3ad9c7656193b9ea9033d7cbe44fefaedfef4e2f70021155122d
-DIST vala-0.48.19.tar.xz 3524984 BLAKE2B aa688481b433b74e6b5d8b66dff073eb6669f1c10ff45b273769bfce3d8a5965894cbf026411f02076666bd4ae99e66d3d0dae019b17156ddff02992152ba654 SHA512 4dcd15ce55ad0328d3f99ff4fb2b5632f67b3d1e1fa585f30c0a76a2a2bb91c973bc8bfd66b69d5d6258e7fdb3037514de3d6004a3a559d9e73e90454847d711
 DIST vala-0.48.20.tar.xz 3539980 BLAKE2B 1983f98273cb4522d51166e3e83ece4f73a4c0bde17f6317a9f6a54130c435946f77665e69b480d084d9c36ed0d8fd708be58078dd743254a6bb6762f99e05d9 SHA512 54729ded38543a6bc9232f4f9001db3538311943a346ec190fb5e884ed2d03e7ba29e67ba1cc257be25b53f4b7b2c8346daf60d9118ad35302113a54260a6497
+DIST vala-0.48.22.tar.xz 3539404 BLAKE2B b9e5e845bbeefd240a9d332d64c2a77bdf581a3438586f8648a068fad15ac8e55e09416548537435f6b1d5925cd6220f603526ca96c290a0628284bc4463cae2 SHA512 c12536a3773cf299e545b33408c23ae3258859172afaaee82ce49699f5285081d6af8047605fb6edd089d16ab177871219cb8b632be827e615ccaff75f5543fe
 DIST vala-0.50.10.tar.xz 3547792 BLAKE2B 80e57b0fa5fdec2e3403878db1d5c83f4fd14551863131ce359070ab11ef99bcd3813808ab61d8fd8acbb45e9882e83a2ca00f51d584608a0afdd0b9908ee2f3 SHA512 09212c128bc7f7f16b72912644e06c3b91c3b102698a6c7d7af60a8adbcbf8b8ed80b005cbf72654e1d3139c79595baf88561fa41b393a53b1e3ecc1af6896cd
 DIST vala-0.50.9.tar.xz 3543420 BLAKE2B 57b8021746aa554fe78f7e033b7c134a0d840e46ad7666f9abc3f019326282958cf90ddbebffe36fa15f80dff407a46b3a2e1298bfdfee749838d3a730bad5a5 SHA512 f138629fa0840941942796b33fe8cf61391f14e186f2bd70519cafc19bcc453fd16bcfaf7a44713a00531fe181bb9b0c4aafb955fae0a29fd9eaa12b48ed169a
+DIST vala-0.52.10.tar.xz 3598676 BLAKE2B f1d54634ffb8a152e5672badc912338a2982a81f5ee998b05212de807197d3f5cdd5b08ec9b521a004933fa6585b24b1e45a9cbc1a375c9863460350d3d3749b SHA512 d7517c25228db9c69bc68e16ed3903ea5dda016d5e84183491fef0b65edbbaf34065e785b0e0dc48f3af2460dc9ac6c435436f460b01929b2403ef0b9a2ad2d8
 DIST vala-0.52.5.tar.xz 3583412 BLAKE2B ee81903be59267ce3499dfd7ef4e73708431641a16ca3c806a64d1660b85e8977f125cd67de0f2cfec610d37395c5a56028eb1c888a024bd9a1b159e2111e75b SHA512 88522ab5d12a8fbf538ed6ca56a1f402f3749bdfcfc9cdee2ad7ebcf98ebcd606e976fded83f2d853ac32cbaf326d96d1d888a5c56d018389753ac43456fa82f
-DIST vala-0.52.7.tar.xz 3591372 BLAKE2B 73ae3ffe9ecbcbbe385fc7ec16d45e968872705762de38cf2ef0bb6e33dfe6002adf750b2cd6bdf0d5ec17a6904dde07fbe55ea2f41079add4cb3164917cec1b SHA512 6876c898a601d056c12b59a421883256a480eedbf3098fb62082815775fb5037723c7e8820066e52dfd30053b79c63152822a1a11d70b7c4e372378605d966c9
 DIST vala-0.52.8.tar.xz 3599348 BLAKE2B fd21f1a08efc798df0d57a283b19bd2558786e86820c21f7a3fc08c092cf71297e7a3e24585a6a77119a8bfa5f44ca4c2922c31fb5b45a97db7413a4788ecc56 SHA512 648d17f431dd7ad1aab70532ae760d3622b911828001334e9dec98cc22db8be61a00080b1bf1ca14b9589b44a25ff5516d71d1b9f0acd98e1dc88e86f12cdfd3
-DIST vala-0.54.3.tar.xz 3892348 BLAKE2B ff3336ef52bfd95c27d7d720ae00ec3825c4cef785411dafe47a7a78b8398c16643803d957e8a34f5836a957ecf6ac617146a8602907a6595e4d6c9c20df7e6a SHA512 dbba5adcab21eb172ca8adc276864e65f87215a754a592bb294e347b85c159744eb02cfc65be6dc0392b875477cc2eecf3baa0d070902c903e602e2eeac2b6de
-DIST vala-0.54.4.tar.xz 3906944 BLAKE2B 50951b58b742880e3be98dfee7027bd52449e9c7b6cc2e537ced8e792395bcc5fe0d3f23bd5c35011c747781a1b40ab230c4120860065b19552c28dabda90838 SHA512 d676e4760040912d94a2d6e8a5f27bf05ceb72d01ed4d9adf0052ec792f4e1aba139d7f65694b2d80e475d8ffd69f1cfa55547a692d0847595e52f5d491c3cb3
+DIST vala-0.54.6.tar.xz 3908328 BLAKE2B 19930f2b130c194a4f70a191042c1c7f5243829297daff2e3d1c9210c15bfba3973ecdbe09b8ae7435a88f4785bf06515b166f7a5a770d550404d3132b1c811e SHA512 6943e11c5f351f9f76991b75fbe51c4d133eaf4858ea75e67d514b7216cfabd4f0d81f09c89af26ab22fdf26783938742ae75bb49b7de4f1c2696934e2d4d0ae
 EBUILD vala-0.46.13.ebuild 1305 BLAKE2B 4855220ceb0594546be128b16092270a4d21459d6243c3510e36e556e5e075ab1caffbf579b2a661bbe6470eb24480879928714529a5f82b9d83b0dcbdfd8df7 SHA512 af281ba4479a81ce7e825df237d55e7db552a2f341fe27e0d41de4a0796d0e3e153f9eb01f7ed0ae2b070b5a2ccee6bc7ab32d890ba0ab99d6cadbc3ee14b33e
 EBUILD vala-0.48.18.ebuild 1325 BLAKE2B 1bdbc672af44a4e80a8acd75c330367a7413fae318291fd8a01e5a14ff3508d95b941660077dff7800df60e2e4db6a3274788cbe7c8c3f61919ed95c2e395685 SHA512 3c0eaadf6769bfac06d0ef35d730023cd5094827798b20ff6ff34e64f3da238d6932ad541e39ee55d2cced7b39e70c6ebc6faa700231ee44eb6cae782c28d38d
-EBUILD vala-0.48.19.ebuild 1332 BLAKE2B 388f8e0e4b21412e563da489931e20cdb66e755ceb8a2eadcda25b1b9fc29dbca267f0ea3234d0a8dbe5e1a7e54073307c8f9f71ee1e3f541964a5b53e4090ab SHA512 f6b7450012cbd5ef961d486cdfbf35113fb36e2e162a79cb91ea01cc4c64e383664586ca3cfd7be4acb87f2c5ff9ce7e9ae21f95952b33390112d87eab921689
 EBUILD vala-0.48.20.ebuild 1332 BLAKE2B 388f8e0e4b21412e563da489931e20cdb66e755ceb8a2eadcda25b1b9fc29dbca267f0ea3234d0a8dbe5e1a7e54073307c8f9f71ee1e3f541964a5b53e4090ab SHA512 f6b7450012cbd5ef961d486cdfbf35113fb36e2e162a79cb91ea01cc4c64e383664586ca3cfd7be4acb87f2c5ff9ce7e9ae21f95952b33390112d87eab921689
+EBUILD vala-0.48.22.ebuild 1332 BLAKE2B 382fad3d5d7014c63393d447767c5ab5991b08daa50b9eab6170c7f9158604256baf9a29323c2bdd0c843e0b98a0a1c337ad056f9159eabab6db64dbba4046a8 SHA512 b020baf359375ae77c3fa90ff7f6d049a381a588335bf8148f46859ec911c54c57a50dd0f0823dca410457a4ad5423082fd34fe0f2ac6218b3075783f346e9a6
 EBUILD vala-0.50.10.ebuild 1332 BLAKE2B 9fe1b69692d19c75743658555224156857cc223d4a219585cc423706ffec5bb86e1b8ec9be850ce63042305c021fe3af4fdda862406f4fa51cbc5fe371a006f6 SHA512 b38b4d832cbcea5e4d44fc3b0f24c56b7617a79cde247ab155e3bcf3880b6d100b869be5e60d2f12eabc48c7b2c7c696b743557c3e8fc6d0bf19de10735d50fd
 EBUILD vala-0.50.9.ebuild 1325 BLAKE2B f9fa138ab579908f9ea225ee6095b8cdddc15ea9b4f318e9dab1aabd4f07ed52c0125e88bfec732f87d6579e322a7996b0d82919b56e7bd7ad0537ebf7a25dea SHA512 84fd73461f5948cc593e25f692146322a26a82405d2f21c87c809dd5890e56f70fb0035d0f00db0fc828c2f8baf71355c087d1728a69f0913bb5a66c4e18d76f
+EBUILD vala-0.52.10.ebuild 1332 BLAKE2B 70d57e81f45b80b157a71a546b3814b82c239daed9c348ac72db37a30fc9c45a4b63edadcfee7d9f01b4c590320ea0b7be6fd12706dbb2a6caa81ec43063c023 SHA512 e7cfe19e12f2cff41daa8ce2f77f764ad0e38e2cf42ba7a4d9d71463a8f3c0e9ea4a3d2c2d05fcaa3f23cb250d59ee96724c71c73c30140dfac2c3a1a51b827d
 EBUILD vala-0.52.5.ebuild 1325 BLAKE2B 3f22f959527acc36013a9c07978b90b087b2075bc8b8208cfc190eac508d8192c6a2d5fa17bcebd259a6e18faf25e8e804b82e8463c05f9dca66484f555b4e45 SHA512 635fd952a9f4ab98718e22e5cf4806da041bda0ab2b09bc3cc18351de85a1350e912590aded7ba827d7d9460d5091c86900fa4216aea57fefd596357fa0212be
-EBUILD vala-0.52.7.ebuild 1332 BLAKE2B 07ebd950465ef0d16801dadd56096d7fa90c218c4e6dd08a6fd9fa487207701c02511c418d210967be351c12c757c342f268cba6f14ca97bd66087cef7ca6ab7 SHA512 e48dd90cd3daa8c2c6eabb13a1f00fcb636efa72c2d7cc581044692a2e78fc39b8cadc47b9ba46fead9f5f258204f25c16358ca81b3f4fa33d210fa6da28e2b4
 EBUILD vala-0.52.8.ebuild 1332 BLAKE2B 07ebd950465ef0d16801dadd56096d7fa90c218c4e6dd08a6fd9fa487207701c02511c418d210967be351c12c757c342f268cba6f14ca97bd66087cef7ca6ab7 SHA512 e48dd90cd3daa8c2c6eabb13a1f00fcb636efa72c2d7cc581044692a2e78fc39b8cadc47b9ba46fead9f5f258204f25c16358ca81b3f4fa33d210fa6da28e2b4
-EBUILD vala-0.54.3.ebuild 1332 BLAKE2B 7e086eb4d5e5f4660d1ecc52b66251a88ff556afe6e00f6b59706e3b64119308e8d03e36149e8ac95ba5a89e01ea5d058883e9aca52f83d154c4e0e67f8ddd33 SHA512 570f35db8d09e404e8663edc3706fa24daefa9b74bcb60175f35b20deed7f330b853b71b5dc53de6dcf8b299f37d41989cc1a5c9956f6d177a698562f9861cdd
-EBUILD vala-0.54.4.ebuild 1332 BLAKE2B 7e086eb4d5e5f4660d1ecc52b66251a88ff556afe6e00f6b59706e3b64119308e8d03e36149e8ac95ba5a89e01ea5d058883e9aca52f83d154c4e0e67f8ddd33 SHA512 570f35db8d09e404e8663edc3706fa24daefa9b74bcb60175f35b20deed7f330b853b71b5dc53de6dcf8b299f37d41989cc1a5c9956f6d177a698562f9861cdd
+EBUILD vala-0.54.6.ebuild 1332 BLAKE2B 26fa5f5a6e81a64509e67f99906a311a3c7864a049016b22881faf170bc232b5a50efe6bb048edbfb47e3c4b26f6df0b65123c666c0165be7c8f9e3f36fca614 SHA512 3771444445b32d1840cca46d8d0cd4d93969ac48493379df0b418580608192262f7c97d6c23c6761cb07c413dbd50c993d3abd1c4998bd80d9f46b09760e734d
 MISC metadata.xml 346 BLAKE2B 277f10c368556c7d571d77958bde8a421a85f772ccdb5e9abebf2c7c86cc26c33a79a7e552aa76016c7cb8c32cd4435d8779befd42b1e9c8f904e28a0dac5be1 SHA512 a4092a8421609b743fbca75c329df84030f0debef4f6614a399af9a7b331c758a130a91e5eeb2815e56b9b3af6ba7509a3f39e8168bb4c482ef9158a58b69cb8
diff --git a/dev-lang/vala/vala-0.48.19.ebuild b/dev-lang/vala/vala-0.48.22.ebuild
index a58522c2d8ae..7cd60ad46652 100644
--- a/dev-lang/vala/vala-0.48.19.ebuild
+++ b/dev-lang/vala/vala-0.48.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-lang/vala/vala-0.52.7.ebuild b/dev-lang/vala/vala-0.52.10.ebuild
index fa44e86dd988..ce7c417a1e4d 100644
--- a/dev-lang/vala/vala-0.52.7.ebuild
+++ b/dev-lang/vala/vala-0.52.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-lang/vala/vala-0.54.3.ebuild b/dev-lang/vala/vala-0.54.3.ebuild
deleted file mode 100644
index 823e898473c0..000000000000
--- a/dev-lang/vala/vala-0.54.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.54"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="test valadoc"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.48.0:2
-	>=dev-libs/vala-common-${PV}
-	valadoc? ( >=media-gfx/graphviz-2.16 )
-	!<net-libs/libsoup-2.66.2[vala]
-" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
-# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
-# as the newer is not required with older vala when those are picked instead of 0.46.
-# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2
-		dev-libs/gobject-introspection
-	)
-"
-BDEPEND="
-	dev-libs/libxslt
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-"
-
-src_configure() {
-	# weasyprint enables generation of PDF from HTML
-	gnome2_src_configure \
-		--disable-unversioned \
-		$(use_enable valadoc) \
-		VALAC=: \
-		WEASYPRINT=:
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-lang/vala/vala-0.54.4.ebuild b/dev-lang/vala/vala-0.54.6.ebuild
index 823e898473c0..73d616e5874c 100644
--- a/dev-lang/vala/vala-0.54.4.ebuild
+++ b/dev-lang/vala/vala-0.54.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
author	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
commit	2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree	4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-lang
parent	c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)