gentoo auto-resync : 20:10:2022 - 20:01:06

9 files changed, 0 insertions, 1219 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a97bc03d6814..82876d191ce7 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1c8b29bc83ba..2b6a0b1b991c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,15 +1,6 @@
-AUX 3.0.30-loong-abis.patch 4292 BLAKE2B 64fa54755f321168b88ab484f028fd4947330501d32dd08f15e76906dc074d9a8cec81d218a045cd0628c6febb166b9a7b6d9d1ba679553801c9ab98c69438a5 SHA512 7ad08a8b12b945e764eea49424a65297789f21bdec318fc09b959e11384f2205aafdfc1856c1dc7376b32e4ac81223cf133eb6e47798126c5a62023f3ffabb49
-AUX 3.0.30-qa-checks.patch 4865 BLAKE2B c708406feb7c67ebdf2b2c08add80eeaefccf27f106c3fd2336c1c42b2547cf32a609b0b81d501a515e24540c49ca83531ff6b64fc0a5e289de0c9003ac209d7 SHA512 06eda997946d285e4b84a955efb4e88a4cc5e4516cde46d222ece97e92d87f2f52dc186a29115793cbc3f40c6e15a8d0e2fe672928f96ad95cf8bb109cd61b65
-AUX 3.0.30-revert-default-enable-soname-dependencies.patch 2342 BLAKE2B 3852da2110ef498700e113495daf568bbd06d700a43d8719f4179179a9a96e7a809da15281cd2485b6608fa22e2bb8d43cb36140d91242ed281d7034a790c1bf SHA512 fc0cf492b9ca9f8937dc5ac432954245ffb6e1225c51d350efe6546535e42efd5a551028cfdc0c1cf0a1561aa5bb02d6b238ab485a8c8ba1500cbf7064c683ea
-AUX 3.0.30-revert-run-warn.patch 2228 BLAKE2B 9845ed36d9d0e8ca966a711e08bf24d9f308646abd1e1bb5efa8bd2c4545ae1b452349f7b83e57749f41566ef9ef440f2b9111667a44b7898f1a15324f3558d0 SHA512 29834935a3f8e103738e898316a073befb4539aa5bb8d1a913c90e85286b5928ba9d82db1a2293a7f1f776b9ca7aa4ba873909a346f4f705a1285cdd2c420a43
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-DIST portage-3.0.30.tar.bz2 1157316 BLAKE2B 56939618f4915f77dca6bb85d4a7cf98e50133b524f68a0b192c0a928ca209a0cb944c174dda78f1b5a071c02c190857ea8a7ecd514301c45e897b302542f52e SHA512 accec770f63180b6d5d4cd08ef50f0cd01aa5701104156523f1a735d8ec3313a3b513629a33d8863285736515b6a3d56fc21498404da3a0f89b196655a98db7d
-DIST portage-3.0.37.tar.bz2 1113712 BLAKE2B 531ff47c3a5cd45b4b33c83d96cedfd91750ad693755361d41632d2bb4352268a849accc5b452ad77106ff1ec625b3b4fea12da816f2c9675288148856b5ce09 SHA512 2eab8486d4a580ba0d91833b5306a4b8e11a1b120f44adbb81b8dc3a2aa1e6e5dd21e280471f3a74d5ac52ee00a3019c1d0b5621f5c9d523366ff29920400624
 DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af977dd28ca659695d3e4014e4aa83b054acba82a160e7c0a8d3d4fbc3514bea619c3d720e450cb4890818e4b1bc1e43a SHA512 1375565e936276fd6cfd2a4f6f782b91e234e973d6a998f2276a076dd165272bcf12067fd01e77b238f194eac69edf967bbe3ac62edc3701fe9375c693622ab9
-EBUILD portage-3.0.30-r3.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43
-EBUILD portage-3.0.30-r5.ebuild 8973 BLAKE2B 0b3396401ef95f21383bc0c9792db80c491d9ea50ffa65985b34289171a20d738b4972fb599d5e1939fef4c60c14a3fec134161381b40ef105f99ba67f7afe7c SHA512 cfa11f597b58d814b8ed6efef30dd2b19935785d61595a2dfbb1220fa5c2417cb724af08cf390bc3896ccf2c68d2834e92cf9ec98e8e7fa3c2ee0a43c8cfad05
-EBUILD portage-3.0.37.ebuild 8770 BLAKE2B 02ce919fad5997319398c57782e3a625f8c82ff89f9f8ab7af6ab1691870be6c4477c0d98b290a98b4ab1c49a2149ad05c84bbd4209ebca59e4ec26dfc0926c9 SHA512 9c0cb159a8ebec37d8f2afb4a425c857568f4542718d22f8d465157512c4442baa6072a0a737d3d676f56a3f0acefd25b443ca62e8655b371a57f8c72ad987c0
 EBUILD portage-3.0.38.1.ebuild 8770 BLAKE2B 02ce919fad5997319398c57782e3a625f8c82ff89f9f8ab7af6ab1691870be6c4477c0d98b290a98b4ab1c49a2149ad05c84bbd4209ebca59e4ec26dfc0926c9 SHA512 9c0cb159a8ebec37d8f2afb4a425c857568f4542718d22f8d465157512c4442baa6072a0a737d3d676f56a3f0acefd25b443ca62e8655b371a57f8c72ad987c0
 EBUILD portage-9999.ebuild 8018 BLAKE2B 697673972eb6bf97f1787e316dd5f47e24ac875a51c2f6397cb756cdd47e2d13517c497831a4aa106195ef6010ba6d55705727e3110cb4f696c7077b87d1cfde SHA512 e93838433d223a828c959ccc21411525794e611a21352d7e47c06cd17b337a8bd8b1af12324bcc5d5d2e03357d8a185b13458a627724b365f9005e163740ede8
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/files/3.0.30-loong-abis.patch b/sys-apps/portage/files/3.0.30-loong-abis.patch
deleted file mode 100644
index 7558107570cd..000000000000
--- a/sys-apps/portage/files/3.0.30-loong-abis.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From f6cdba7689ea423245a232cc13103dd988363845 Mon Sep 17 00:00:00 2001
-From: WANG Xuerui <git@xen0n.name>
-Date: Mon, 9 Aug 2021 15:31:25 +0800
-Subject: [PATCH] multilib_category.py: recognize LoongArch ABIs
-
-Add its ELF machine number constant as well. The Gentoo ARCH is "loong";
-all six ABIs defined in the LoongArch ELF psABI spec [1] are supported.
-The upstream binutils port currently implements an earlier version of the
-spec [2]; the ILP32 ABIs are never fully implemented so far, and the
-value for LP64D is coincidentally the same, so the code here stays
-compatible.
-
-This is preparatory work towards a port to the LoongArch architecture,
-which is the new RISC architecture from Loongson Corporation after
-switching away from MIPS.
-
-[1]: https://github.com/loongson/LoongArch-Documentation/blob/23d53fe146a4/docs/LoongArch-ELF-ABI-EN.adoc
-[2]: https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=include/elf/loongarch.h;h=b4d801ae9bd5a6c4562ca6b1cbae6e6d45d6c704;hb=HEAD
-
-Signed-off-by: WANG Xuerui <git@xen0n.name>
-Closes: https://github.com/gentoo/portage/pull/740
-Signed-off-by: Sam James <sam@gentoo.org>
----
- lib/portage/dep/soname/multilib_category.py | 26 +++++++++++++++++++++
- lib/portage/util/elf/constants.py           |  9 +++++++
- 2 files changed, 35 insertions(+)
-
-diff --git a/lib/portage/dep/soname/multilib_category.py b/lib/portage/dep/soname/multilib_category.py
-index ab855d339..567b1d32e 100644
---- a/lib/portage/dep/soname/multilib_category.py
-+++ b/lib/portage/dep/soname/multilib_category.py
-@@ -11,6 +11,7 @@
- # 	arm_{32,64}
- # 	hppa_{32,64}
- # 	ia_{32,64}
-+# 	loong_{ilp32s,ilp32f,ilp32d,lp64s,lp64f,lp64d}
- # 	m68k_{32,64}
- # 	mips_{eabi32,eabi64,n32,n64,o32,o64}
- # 	ppc_{32,64}
-@@ -37,6 +38,13 @@ from portage.util.elf.constants import (
-     EF_MIPS_ABI2,
-     EF_RISCV_FLOAT_ABI_DOUBLE,
-     EF_RISCV_RVC,
-+    EF_LOONGARCH_ABI_LP64_SOFT_FLOAT,
-+    EF_LOONGARCH_ABI_LP64_SINGLE_FLOAT,
-+    EF_LOONGARCH_ABI_LP64_DOUBLE_FLOAT,
-+    EF_LOONGARCH_ABI_ILP32_SOFT_FLOAT,
-+    EF_LOONGARCH_ABI_ILP32_SINGLE_FLOAT,
-+    EF_LOONGARCH_ABI_ILP32_DOUBLE_FLOAT,
-+    EF_LOONGARCH_ABI_MASK,
-     ELFCLASS32,
-     ELFCLASS64,
-     EM_386,
-@@ -46,6 +54,7 @@ from portage.util.elf.constants import (
-     EM_ARM,
-     EM_ALTERA_NIOS2,
-     EM_IA_64,
-+    EM_LOONGARCH,
-     EM_MIPS,
-     EM_PARISC,
-     EM_PPC,
-@@ -71,6 +80,7 @@ _machine_prefix_map = {
-     EM_ALTERA_NIOS2: "nios2",
-     EM_ARM: "arm",
-     EM_IA_64: "ia64",
-+    EM_LOONGARCH: "loong",
-     EM_MIPS: "mips",
-     EM_PARISC: "hppa",
-     EM_PPC: "ppc",
-@@ -84,6 +94,15 @@ _machine_prefix_map = {
-     EM_X86_64: "x86",
- }
- 
-+_loong_abi_map = {
-+    EF_LOONGARCH_ABI_LP64_SOFT_FLOAT: "lp64s",
-+    EF_LOONGARCH_ABI_LP64_SINGLE_FLOAT: "lp64f",
-+    EF_LOONGARCH_ABI_LP64_DOUBLE_FLOAT: "lp64d",
-+    EF_LOONGARCH_ABI_ILP32_SOFT_FLOAT: "ilp32s",
-+    EF_LOONGARCH_ABI_ILP32_SINGLE_FLOAT: "ilp32f",
-+    EF_LOONGARCH_ABI_ILP32_DOUBLE_FLOAT: "ilp32d",
-+}
-+
- _mips_abi_map = {
-     E_MIPS_ABI_EABI32: "eabi32",
-     E_MIPS_ABI_EABI64: "eabi64",
-@@ -92,6 +111,12 @@ _mips_abi_map = {
- }
- 
- 
-+def _compute_suffix_loong(elf_header):
-+
-+    loong_abi = elf_header.e_flags & EF_LOONGARCH_ABI_MASK
-+    return _loong_abi_map.get(loong_abi)
-+
-+
- def _compute_suffix_mips(elf_header):
- 
-     name = None
-@@ -136,6 +161,7 @@ def _compute_suffix_riscv(elf_header):
- 
- 
- _specialized_funcs = {
-+    "loong": _compute_suffix_loong,
-     "mips": _compute_suffix_mips,
-     "riscv": _compute_suffix_riscv,
- }
-diff --git a/lib/portage/util/elf/constants.py b/lib/portage/util/elf/constants.py
-index d86b39483..19b72cfa1 100644
---- a/lib/portage/util/elf/constants.py
-+++ b/lib/portage/util/elf/constants.py
-@@ -36,6 +36,7 @@ EM_X86_64 = 62
- EM_ALTERA_NIOS2 = 113
- EM_AARCH64 = 183
- EM_RISCV = 243
-+EM_LOONGARCH = 258
- EM_ALPHA = 0x9026
- 
- E_ENTRY = 24
-@@ -52,3 +53,11 @@ EF_RISCV_FLOAT_ABI_SOFT = 0x0000
- EF_RISCV_FLOAT_ABI_SINGLE = 0x0002
- EF_RISCV_FLOAT_ABI_DOUBLE = 0x0004
- EF_RISCV_FLOAT_ABI_QUAD = 0x0006
-+
-+EF_LOONGARCH_ABI_LP64_SOFT_FLOAT = 0b001
-+EF_LOONGARCH_ABI_LP64_SINGLE_FLOAT = 0b010
-+EF_LOONGARCH_ABI_LP64_DOUBLE_FLOAT = 0b011
-+EF_LOONGARCH_ABI_ILP32_SOFT_FLOAT = 0b101
-+EF_LOONGARCH_ABI_ILP32_SINGLE_FLOAT = 0b110
-+EF_LOONGARCH_ABI_ILP32_DOUBLE_FLOAT = 0b111
-+EF_LOONGARCH_ABI_MASK = 0x07
--- 
-2.35.1
-
diff --git a/sys-apps/portage/files/3.0.30-qa-checks.patch b/sys-apps/portage/files/3.0.30-qa-checks.patch
deleted file mode 100644
index 19290d352f49..000000000000
--- a/sys-apps/portage/files/3.0.30-qa-checks.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Backport a bunch of QA notice changes so tinderboxes etc can pick them up,
-given portage.git is currently undergoing a fair bit of refactoring.
-
-https://github.com/gentoo/portage/commit/7b44116b4a669a49e51e5a495ab62a25229e18e4
-https://github.com/gentoo/portage/commit/8ded447a1d194ad0190a174f7bb330417685d861
-https://github.com/gentoo/portage/commit/23c4a45827fccebb969d5130ccc234ed3d1a9b35
-https://github.com/gentoo/portage/commit/3994939f982f22afbc7aaf3b8eca6680ad85c617
-
-From: Sam James <sam@gentoo.org>
-Date: Sat, 2 Apr 2022 05:10:31 +0100
-Subject: [PATCH] bin/install-qa-check.d/95empty-dirs: update message for EAPI
- 8
-
-Portage changed the default for >= EAPI 8 ("newer EAPIs" at the time, not
-actually specific to 8) in bfda0d2bd4ba03a4e77f488ec3fd4f9c6c351662 to
-enable FEATURES="strict-keepdir".
-
-Signed-off-by: Sam James <sam@gentoo.org>
-Closes: https://github.com/gentoo/portage/pull/802
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/install-qa-check.d/95empty-dirs
-+++ b/bin/install-qa-check.d/95empty-dirs
-@@ -33,7 +33,7 @@ find_empty_dirs() {
- 		done
- 		eqawarn
- 		eqawarn "If those directories need to be preserved, please make sure to create"
--		eqawarn "or mark them for keeping using 'keepdir'. Future versions of Portage"
-+		eqawarn "or mark them for keeping using 'keepdir'. Portage for >= EAPI 8 ebuilds"
- 		eqawarn "will strip empty directories from installation image."
- 	fi
- }
-
-
-
-From: Sam James <sam@gentoo.org>
-Date: Sun, 10 Apr 2022 17:51:02 +0100
-Subject: [PATCH] install-qa-check.d/20runtime-directories: warn on /var/tmp
- too
-
-Bug: https://bugs.gentoo.org/493154
-Bug: https://bugs.gentoo.org/837536
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/install-qa-check.d/20runtime-directories
-+++ b/bin/install-qa-check.d/20runtime-directories
-@@ -1,10 +1,10 @@
- # Check for directories that need to be created at runtime
- 
- runtime_dir_check() {
--	# It's ok create these directories, but not to install into them. #493154
-+	# It's ok to create these directories, but not to install into them. #493154
- 	# TODO: We should add var/lib to this list.
- 	local x f=
--	for x in var/cache var/lock var/run run ; do
-+	for x in var/cache var/lock var/run var/tmp run ; do
- 		if [[ ! -L ${ED}/${x} && -d ${ED}/${x} ]] ; then
- 			if [[ -z $(find "${ED}/${x}" -prune -empty) ]] ; then
- 				f+=$(cd "${ED}"; find "${x}" -printf '  %p\n')
-
-From: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
-Date: Mon, 11 Apr 2022 15:46:06 +0200
-Subject: [PATCH] eend: Output QA warning if ebegin has not been called
-
-The assumption here is that ebegin-eend aren't nested.
-
-Closes: https://bugs.gentoo.org/835824
-Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
-Closes: https://github.com/gentoo/portage/pull/807
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/isolated-functions.sh
-+++ b/bin/isolated-functions.sh
-@@ -339,6 +339,7 @@ ebegin() {
- 	[[ ${RC_ENDCOL} == "yes" ]] && echo >&2
- 	LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} ))
- 	LAST_E_CMD="ebegin"
-+	EBEGIN_EEND=1
- 	return 0
- }
- 
-@@ -367,6 +368,11 @@ __eend() {
- 
- eend() {
- 	[[ -n $1 ]] || eqawarn "QA Notice: eend called without first argument"
-+	if [[ -v EBEGIN_EEND ]] ; then
-+		unset EBEGIN_EEND
-+	else
-+		eqawarn "QA Notice: eend called without preceding ebegin (phase: ${EBUILD_PHASE})"
-+	fi
- 	local retval=${1:-0}
- 	shift
- 
-
-From: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
-Date: Tue, 12 Apr 2022 10:59:11 +0200
-Subject: [PATCH] ebegin: Output QA warning if call to eend is missing
-
-The idea here is to check if EBEGIN_EEND is set after the phase has been
-executed. If so, then a call to eend is probably missing. This is under
-the assumption that ebegin-eend invocations should be properly paired
-within the same phase.
-
-In ebegin, the EBEGIN_EEND variable is also checked, and, if set,
-indicates that ebegin has been called and is missing the closing call to
-eend.
-
-I doubt that this check is perfect, but it seems to work in what little
-testing I've done.
-
-Closes: https://bugs.gentoo.org/835823
-Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
-Closes: https://github.com/gentoo/portage/pull/811
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/isolated-functions.sh
-+++ b/bin/isolated-functions.sh
-@@ -339,6 +339,9 @@ ebegin() {
- 	[[ ${RC_ENDCOL} == "yes" ]] && echo >&2
- 	LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} ))
- 	LAST_E_CMD="ebegin"
-+	if [[ -v EBEGIN_EEND ]] ; then
-+		eqawarn "QA Notice: ebegin called, but missing call to eend (phase: ${EBUILD_PHASE})"
-+	fi
- 	EBEGIN_EEND=1
- 	return 0
- }
---- a/bin/phase-functions.sh
-+++ b/bin/phase-functions.sh
-@@ -1088,6 +1088,10 @@ __ebuild_main() {
- 		;;
- 	esac
- 
-+	if [[ -v EBEGIN_EEND ]] ; then
-+		eqawarn "QA Notice: ebegin called, but missing call to eend (phase: ${1})"
-+	fi
-+
- 	# Save the env only for relevant phases.
- 	if ! has "${1}" clean help info nofetch ; then
- 		umask 002
-
diff --git a/sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch b/sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch
deleted file mode 100644
index bcb2e427db9e..000000000000
--- a/sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 2c025e87bb6253f869f9e84e6eb0d98eecfd49c4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 20 Dec 2021 11:16:30 -0500
-Subject: [PATCH] Revert "emerge: Default enable soname dependencies (bug
- 687956)"
-To: gentoo-portage-dev@lists.gentoo.org
-
-This change seems to cause problems with emerge --depclean.
-
-Reverts: 6091fcd861034b9b20677098827eff7b7a148853
-Bug: https://bugs.gentoo.org/687956
-Bug: https://bugs.gentoo.org/829623
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- lib/_emerge/create_depgraph_params.py | 2 +-
- man/emerge.1                          | 7 +++----
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/lib/_emerge/create_depgraph_params.py b/lib/_emerge/create_depgraph_params.py
-index 95c4c2035..11c3e3736 100644
---- a/lib/_emerge/create_depgraph_params.py
-+++ b/lib/_emerge/create_depgraph_params.py
-@@ -104,7 +104,7 @@ def create_depgraph_params(myopts, myaction):
-     if ignore_built_slot_operator_deps is not None:
-         myparams["ignore_built_slot_operator_deps"] = ignore_built_slot_operator_deps
- 
--    myparams["ignore_soname_deps"] = myopts.get("--ignore-soname-deps", "n")
-+    myparams["ignore_soname_deps"] = myopts.get("--ignore-soname-deps", "y")
- 
-     dynamic_deps = myopts.get("--dynamic-deps", "y") != "n" and "--nodeps" not in myopts
-     if dynamic_deps:
-diff --git a/man/emerge.1 b/man/emerge.1
-index ff565b46f..8f6d12925 100644
---- a/man/emerge.1
-+++ b/man/emerge.1
-@@ -639,10 +639,9 @@ supported beginning with \fBEAPI 5\fR.
- .TP
- .BR "\-\-ignore\-soname\-deps < y | n >"
- Ignore the soname dependencies of binary and installed packages. This
--option may be useful when working with binary or installed packages
--that lack appropriate soname dependency metadata because they were built
--with a package manager that does not support soname dependencies (perhaps
--an older version of portage). Soname
-+option is enabled by default, since soname dependencies are relatively
-+new, and the required metadata is not guaranteed to exist for binary and
-+installed packages built with older versions of portage. Also, soname
- dependencies will be automatically ignored for dependency calculations
- that can pull unbuilt ebuilds into the dependency graph, since unbuilt
- ebuilds do not have any soname dependency metadata, making it impossible
--- 
-2.34.1
-
diff --git a/sys-apps/portage/files/3.0.30-revert-run-warn.patch b/sys-apps/portage/files/3.0.30-revert-run-warn.patch
deleted file mode 100644
index d5f20421695e..000000000000
--- a/sys-apps/portage/files/3.0.30-revert-run-warn.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://github.com/gentoo/portage/commit/1327fa9f829e8670c65ff35b9b0bda446991f7ed
-
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 14 Feb 2022 15:30:18 -0500
-Subject: [PATCH] Revert "lib/_emerge/actions.py: warn on missing /run"
-
-Portage itself does not need /run to be mounted.
-build-docbook-catalog was adjusted to create locks in /etc/xml instead.
-
-Bug: https://bugs.gentoo.org/832853
-Reverts: 0e9e12aadb889766d61c0561b9723e71542d43e6
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-Closes: https://github.com/gentoo/portage/pull/788
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/lib/_emerge/actions.py
-+++ b/lib/_emerge/actions.py
-@@ -3020,25 +3020,17 @@ def validate_ebuild_environment(trees):
-     check_locale()
- 
- 
--def check_mounted_fs():
--    """We need /proc for finding CPU counts and finding other system information.
--    We need /run for e.g. lock files in ebuilds."""
--    paths = {"/proc": False, "/run": False}
--
--    for path in paths.keys():
--        if platform.system() not in ("Linux",) or os.path.ismount(path):
--            paths[path] = True
--            continue
--
--        msg = "It seems %s is not mounted. Process management may malfunction." % path
--        writemsg_level(
--            "".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70)),
--            level=logging.ERROR,
--            noiselevel=-1,
--        )
--
--    # Were all of the mounts we were looking for available?
--    return all(paths.values())
-+def check_procfs():
-+    procfs_path = "/proc"
-+    if platform.system() not in ("Linux",) or os.path.ismount(procfs_path):
-+        return os.EX_OK
-+    msg = "It seems that %s is not mounted. You have been warned." % procfs_path
-+    writemsg_level(
-+        "".join("!!! %s\n" % l for l in textwrap.wrap(msg, 70)),
-+        level=logging.ERROR,
-+        noiselevel=-1,
-+    )
-+    return 1
- 
- 
- def config_protect_check(trees):
-@@ -3516,8 +3508,7 @@ def run_action(emerge_config):
-         repo_name_check(emerge_config.trees)
-         repo_name_duplicate_check(emerge_config.trees)
-         config_protect_check(emerge_config.trees)
--
--    check_mounted_fs()
-+    check_procfs()
- 
-     for mytrees in emerge_config.trees.values():
-         mydb = mytrees["porttree"].dbapi
-
diff --git a/sys-apps/portage/portage-3.0.30-r3.ebuild b/sys-apps/portage/portage-3.0.30-r3.ebuild
deleted file mode 100644
index 142f3b42ff89..000000000000
--- a/sys-apps/portage/portage-3.0.30-r3.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils
-	test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		>=app-shells/bash-5.0:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/3.0.30-revert-default-enable-soname-dependencies.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions && ! tc-is-cross-compiler; then
-		printf "[build_ext]\nportage_ext_modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	if ! use build; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.30-r5.ebuild b/sys-apps/portage/portage-3.0.30-r5.ebuild
deleted file mode 100644
index 8634c1a2e2ad..000000000000
--- a/sys-apps/portage/portage-3.0.30-r5.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils
-	test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		>=app-shells/bash-5.0:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/3.0.30-revert-default-enable-soname-dependencies.patch"
-		"${FILESDIR}/3.0.30-revert-run-warn.patch"
-		"${FILESDIR}/3.0.30-qa-checks.patch"
-		"${FILESDIR}/3.0.30-loong-abis.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions && ! tc-is-cross-compiler; then
-		printf "[build_ext]\nportage_ext_modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	if ! use build; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.37.ebuild b/sys-apps/portage/portage-3.0.37.ebuild
deleted file mode 100644
index 63140095cfca..000000000000
--- a/sys-apps/portage/portage-3.0.37.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils
-	test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		>=app-shells/bash-5.0:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions && ! tc-is-cross-compiler; then
-		printf "[build_ext]\nportage_ext_modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	if ! use build; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}