commit:     5110e41432e59630e00144b87cab96ba8296d9bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 16:44:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 16:44:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5110e414

sys-apps/portage: drop versions

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/portage/Manifest                 |  10 --
 sys-apps/portage/portage-3.0.18.ebuild    | 279 -----------------------------
 sys-apps/portage/portage-3.0.20-r6.ebuild | 286 ------------------------------
 sys-apps/portage/portage-3.0.28-r1.ebuild | 271 ----------------------------
 sys-apps/portage/portage-3.0.29.ebuild    | 267 ----------------------------
 sys-apps/portage/portage-3.0.30-r4.ebuild | 276 ----------------------------
 6 files changed, 1389 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index db1289459f6d..086ba3a49405 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,12 +1,2 @@
-DIST portage-3.0.18.tar.xz 971692 BLAKE2B 
0a8d2062fce1bf85a2f1025d17ddd3eafc987fd93c01f17bcc4487b23841e530451502417e24bbe58175b4fee871ceb528696775116a60f93b7b841d14ecf7a3
 SHA512 
d3f4b5258748fbef7b8ec000685b7e42804123a5c6b474bb6679666c2696a16e3bd202108df6e647770406539ff223bfd0deb1a3b4240e0a7ba1f2ec52aca2cd
-DIST portage-3.0.20-bug-777492-209be9a.patch 1758 BLAKE2B 
9ed7b18ef8b73c59a08e5a2c2fba9365b37bd8cace32d5a275a4003cbf3f40f6a0a5a4d168dae987169e2017222a3af291d9a860a4494c994ef51ca851620db1
 SHA512 
38f402d1ecf125af7c454afdcee12221fa715f4e043c1a59073422025a12508a06a4bb77503bb75f6ed9603ff507499558bc1032157f5fc0aee9573bb18a6e4b
-DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 
9023c7bd3d173b48e1bfcf6d48c87f6b01731d6ec154132797c820a4c24ffedcaaf2eabf380d08c43238b377cb33c1be090fe8d213f8aef39b813ba2fab25672
 SHA512 
5575015216534bc0ddc0aa79bd2c1a96180d40dd8b3df61bb95e49a2d86e60da10a5eb8d658bf616da3f3f15ff6f4377d82e72ceca770304d2d79f1f25a26a11
-DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 
4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33
 SHA512 
4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b
-DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B 
b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8
 SHA512 
7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768
-DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 
9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06
 SHA512 
f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
-DIST portage-3.0.20.tar.gz 1348818 BLAKE2B 
e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83
 SHA512 
69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9
-DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 
1601b8943be27fbebea8bfc5e927e9ba6c5e18b6b76a89f8b2b8525595f4693fe014d0bfd936b513a5d03524aba64797ef1bb1e85b0965426a6f36b6c9e9e07c
 SHA512 
bb06c3f705e4a3e6fcc170fe36aa522184c573ef6e05dea3678ff9158472722d1b68fc480b89f4656786e024be6c5f6f656c386aeda467744bf8e9acdb6ffef5
-DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 
8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313
 SHA512 
148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
-DIST portage-3.0.29.tar.bz2 1156653 BLAKE2B 
515b35ed8f3c318af63e2bec0accf4f346e5dc45cb3a38201822d550818ba64101d2d7f5c7837af6b3e7df247548c0630fde09b63916614ba3e8f8d596d156b1
 SHA512 
460ecda26fcfaa5d794889167853bd68ffde167d0423db1fdc3102d75ad06bad373749bd49654c5e3805eb237f1670cf91d0f180926d33a0993ba06a45786794
 DIST portage-3.0.30.tar.bz2 1157316 BLAKE2B 
56939618f4915f77dca6bb85d4a7cf98e50133b524f68a0b192c0a928ca209a0cb944c174dda78f1b5a071c02c190857ea8a7ecd514301c45e897b302542f52e
 SHA512 
accec770f63180b6d5d4cd08ef50f0cd01aa5701104156523f1a735d8ec3313a3b513629a33d8863285736515b6a3d56fc21498404da3a0f89b196655a98db7d
 DIST portage-3.0.31.tar.gz 1452362 BLAKE2B 
4e74270b23375daca044a34bb1344f0d403a7a7de9a6edb41aec02c95c86193d3f6f2a27c12629a25aed19e63567987e9018bd4df47798f1364fb1a914edd72a
 SHA512 
05891c474aebd38defb240efab29267b8125de8361fe01a25bb65532f8dd1c6bd19867db7db9df109bab2c04535dc85839a7c5512ce7f99ae1b77c3f2c6eec69

diff --git a/sys-apps/portage/portage-3.0.18.ebuild 
b/sys-apps/portage/portage-3.0.18.ebuild
deleted file mode 100644
index c1286a53a251..000000000000
--- a/sys-apps/portage/portage-3.0.18.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info tmpfiles prefix
-
-DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-
-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
-               dev-python/sphinx-epytext
-       )"
-# 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: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
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives";
-
-prefix_src_archives() {
-       local x y
-       for x in ${@}; do
-               for y in ${SRC_ARCHIVES}; do
-                       echo ${y}/${x}
-               done
-       done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.xz
-       $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.xz)"
-
-pkg_pretend() {
-       local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-       check_extra_config
-}
-
-python_prepare_all() {
-       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} strict-keepdir"' \
-                       >> cnf/make.globals || die
-       fi
-
-       if use native-extensions; 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() {
-       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
-
-       # 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.20-r6.ebuild 
b/sys-apps/portage/portage-3.0.20-r6.ebuild
deleted file mode 100644
index be754e155cd3..000000000000
--- a/sys-apps/portage/portage-3.0.20-r6.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info tmpfiles prefix
-
-DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-
-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
-               dev-python/sphinx-epytext
-       )"
-# 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
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-       
https://github.com/gentoo/portage/commit/a4d882964ee1931462f911d0c46a80e27e59fa48.patch
 -> portage-3.0.20-bug-777492-a4d8829.patch
-       
https://github.com/gentoo/portage/commit/209be9a8bee13384dd04a4762436b4c2a5e35bc6.patch
 -> portage-3.0.20-bug-777492-209be9a.patch
-       
https://github.com/gentoo/portage/compare/8e47286b7082aac21fe25402a1f9d03db968cd30...693f6bf5a54e2424e2ad49e1838b61f76bf78e40.patch
 -> portage-3.0.20-bug-796584-693f6bf.patch
-       
https://github.com/gentoo/portage/commit/2ce11f06e48290efb2d4b6743c8edf01c176b0fc.patch
 -> portage-3.0.20-bug-796812-2ce11f0.patch
-       
https://github.com/gentoo/portage/compare/2ce11f06e48290efb2d4b6743c8edf01c176b0fc...c3e4919fd004ce0f5c91c67ea377bbda83558ca9.patch
 -> portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch"
-
-pkg_pretend() {
-       local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-       check_extra_config
-}
-
-python_prepare_all() {
-       distutils-r1_python_prepare_all
-
-       # Revert due to regressions:
-       # https://bugs.gentoo.org/777492
-       # https://github.com/gentoo/portage/pull/728
-       eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-209be9a.patch"
-       eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829.patch"
-
-       # Apply regression fix for https://bugs.gentoo.org/796584.
-       eapply "${DISTDIR}/portage-3.0.20-bug-796584-693f6bf.patch"
-
-       # Apply EAPI 8 fix for https://bugs.gentoo.org/796812.
-       eapply "${DISTDIR}/portage-3.0.20-bug-796812-2ce11f0.patch"
-
-       # Apply EAPI 8 fix for https://bugs.gentoo.org/796959
-       eapply "${DISTDIR}/portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch"
-
-       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} strict-keepdir"' \
-                       >> cnf/make.globals || die
-       fi
-
-       if use native-extensions; 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() {
-       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
-
-       # 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.28-r1.ebuild 
b/sys-apps/portage/portage-3.0.28-r1.ebuild
deleted file mode 100644
index a9157003e9b4..000000000000
--- a/sys-apps/portage/portage-3.0.28-r1.ebuild
+++ /dev/null
@@ -1,271 +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 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
-       
https://gitweb.gentoo.org/proj/portage.git/patch/?id=c309328c4e1f6254251d31149ee47b4266d4d70f
-               -> ${P}-setuptools-install-depr.patch"
-
-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"
-
-       check_extra_config
-}
-
-python_prepare_all() {
-       local PATCHES=(
-               "${DISTDIR}"/${P}-setuptools-install-depr.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; 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() {
-       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
-
-       # 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.29.ebuild 
b/sys-apps/portage/portage-3.0.29.ebuild
deleted file mode 100644
index 9f12ad6b4cfa..000000000000
--- a/sys-apps/portage/portage-3.0.29.ebuild
+++ /dev/null
@@ -1,267 +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 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"
-
-       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; 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() {
-       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
-
-       # 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-r4.ebuild 
b/sys-apps/portage/portage-3.0.30-r4.ebuild
deleted file mode 100644
index 41d008c12f34..000000000000
--- a/sys-apps/portage/portage-3.0.30-r4.ebuild
+++ /dev/null
@@ -1,276 +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"
-               "${FILESDIR}/3.0.30-revert-run-warn.patch"
-               "${FILESDIR}/3.0.30-qa-checks.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
-}

Reply via email to