gentoo auto-resync : 04:10:2022 - 07:16:51

10 files changed, 10 insertions, 285 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 082c3f3f5c43..23aab170ea26 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index aa38ee05d725..bd893786c9c3 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,6 @@
 DIST pkgcore-0.12.13.tar.gz 625121 BLAKE2B add4e54c9d92570f4a4e9dad1af45f7c10e4fa48a312f1dd07b24bede5bf796d523d0a8b8d069234e92db5cf64bfb2911c57e5161ebdb7325bfb336237066b73 SHA512 26267f8ac2c79408467a20decd5fa5b12c075269b3bec155f185349186d920b5273ad1666879ac59caf08af022c2395fe737e2d51f26f9674996767bfbfb9bc6
 DIST pkgcore-0.12.15.tar.gz 623988 BLAKE2B cea8187ec5f02990b5501c0d1d97a1d228de58c78e2be733074f312f1d3a1016722a0a7765b8c4284381082144164f39691c1118e6f5b509e76cf86fb9c410ff SHA512 cc70b9e0afda4958d7dd3889276f3cb3eb3873c3e866c862330ca4e935e022d742bb0e218b09a0ef584a411ef4924ae45da65db9d28147263a578157dae67c7f
-EBUILD pkgcore-0.12.13-r2.ebuild 1305 BLAKE2B aad8c83e48608b1f5ef0e27767a62f3a562a48041d4f5f8d4edc477192676365940b8eb77a243524d3781d1896fdeb911a58bc8431e9ba9682e8ff303b3fa1e0 SHA512 a1aed57b797b0a11df9893b0db356b15ec1f7f68484ab1ccfa487b3eac5d8b949630972f24bf39a31f5d32718814d32609187e45be0e9e76183ba5da3d26a40a
+EBUILD pkgcore-0.12.13-r3.ebuild 1305 BLAKE2B 3cb59ae1773dcea18d128bd288b6f19dd30e10f595fed069612cd7470eaa22349d448eed24317008f0afe42cf16202df57be94e22d62b9724d285ae8b05db5a4 SHA512 97195820209d332acf0b9dd4d3da37e74b9483f85d5c0e26e8024943b4e0cf8562bcb241bec8802d345f10266b78ee1ac107d426c03485dedf0c5df92054d5b3
 EBUILD pkgcore-0.12.15.ebuild 1314 BLAKE2B 02cf0f8b47ac98ec22a50dd3ab8739cfb888b41d548a6effbcb5af33fb0ee7127f5881df172c4be78247c7a8dabb6d9e2a30b7cfc42feda0b163867a29e3e822 SHA512 7ebfa8caf198daffb7e99571d61da4eeab8889d1ef0a949fb651a008d34227573dcd526e7825b2f5aad48136ea99878b60fabe107724315ef3deaeee9473e591
 EBUILD pkgcore-9999.ebuild 1314 BLAKE2B ed50837daa6a1bc4891c60b96509c00fa2997bff94b03ca7fc2278483381240b3a5c0ec5b3edb6fa47ad6a26a3264a7ee6340efa95ca7feda3283f1e32bf4078 SHA512 68e126e282abe0d5ff5a9cc4b20534691d8f1d115791060b62e84f1eee2f7acf087e2ba121db53241e901bdd36a156b6b503be4d1abe83375fa4454a2bfb6ea8
 MISC metadata.xml 484 BLAKE2B 9f4ccbb77a4ee434a2370f0b6567025f8f0a9047d3ff795b5b3306c6ca458ef991d096cf83c024a3f409984e1d1f336bfe23c3841ef89c0cda702d61693c73ae SHA512 afc2dfe76697093b6b303b8ab8f413c8bd514a02b1e44a45924cca6e99b435a98b0c9b1dfe662e4054f846f8ba1fde262d6fd1ed858d90e651761b51b6adccfe
diff --git a/sys-apps/pkgcore/pkgcore-0.12.13-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.12.13-r3.ebuild
index ae6de145bdd7..f78ff72a16ad 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.13-r2.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.13-r3.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" =dev-python/snakeoil-0.9.12[${PYTHON_USEDEP}]"
+	RDEPEND+=" ~dev-python/snakeoil-0.9.12[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	test? (
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1a404f79d3d0..0f32948194ca 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,13 +5,11 @@ AUX 3.0.30-revert-run-warn.patch 2228 BLAKE2B 9845ed36d9d0e8ca966a711e08bf24d9f3
 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.36.tar.bz2 1114026 BLAKE2B a8a535ae309c32955eae6a491cbc97f809fb67111688087aa98ac28df4bc97fcb3d9a4ce7c5dbdfbb7f21891a7524f671ff3e3ccbed425503c66bde591266957 SHA512 94b39718871e895c1170271ad072eaa72c995a7e7a06bda9ee76cde2e3949682da7a996780a83cc33c4647915f942fe9d4a7b9b6dfd9319143eb1453cee3b3de
 DIST portage-3.0.37.tar.bz2 1113712 BLAKE2B 531ff47c3a5cd45b4b33c83d96cedfd91750ad693755361d41632d2bb4352268a849accc5b452ad77106ff1ec625b3b4fea12da816f2c9675288148856b5ce09 SHA512 2eab8486d4a580ba0d91833b5306a4b8e11a1b120f44adbb81b8dc3a2aa1e6e5dd21e280471f3a74d5ac52ee00a3019c1d0b5621f5c9d523366ff29920400624
-DIST portage-3.0.38.tar.bz2 1116481 BLAKE2B c86995766e2c3b1e74a8baa45dc9f80f3e5a59cecc75b2ab88e44df06f5a48eafbfe758b4838c51bd91c25fd0d5d3f47693150baabc9ea860160c74499760758 SHA512 fe3fa352224de88a127c051229ac942d4b1b82000e2ff2f64726d2f373fb47b7026006cb2db4bd1985c6f22cfc88adafed60b079eadff4345d0885e2a0ac4861
+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.36.ebuild 8770 BLAKE2B 02ce919fad5997319398c57782e3a625f8c82ff89f9f8ab7af6ab1691870be6c4477c0d98b290a98b4ab1c49a2149ad05c84bbd4209ebca59e4ec26dfc0926c9 SHA512 9c0cb159a8ebec37d8f2afb4a425c857568f4542718d22f8d465157512c4442baa6072a0a737d3d676f56a3f0acefd25b443ca62e8655b371a57f8c72ad987c0
 EBUILD portage-3.0.37.ebuild 8770 BLAKE2B 02ce919fad5997319398c57782e3a625f8c82ff89f9f8ab7af6ab1691870be6c4477c0d98b290a98b4ab1c49a2149ad05c84bbd4209ebca59e4ec26dfc0926c9 SHA512 9c0cb159a8ebec37d8f2afb4a425c857568f4542718d22f8d465157512c4442baa6072a0a737d3d676f56a3f0acefd25b443ca62e8655b371a57f8c72ad987c0
-EBUILD portage-3.0.38.ebuild 8778 BLAKE2B 07684b3309556f0ba97088b588992fbf3e8804d090086865872d78cc6255517dfab543431964919cadeadf180e6cfe4856778ebe1e40c6149aa1857b02fee7e8 SHA512 5d5e64586a6f6569d840fc4d7baf94a85140c1b96c67f3ed1d04c5e08fdd4843989de81d1c4a429c2b629917fd292938350371be6d5ac76fd046949089f5a454
+EBUILD portage-3.0.38.1.ebuild 8778 BLAKE2B 07684b3309556f0ba97088b588992fbf3e8804d090086865872d78cc6255517dfab543431964919cadeadf180e6cfe4856778ebe1e40c6149aa1857b02fee7e8 SHA512 5d5e64586a6f6569d840fc4d7baf94a85140c1b96c67f3ed1d04c5e08fdd4843989de81d1c4a429c2b629917fd292938350371be6d5ac76fd046949089f5a454
 EBUILD portage-9999.ebuild 8018 BLAKE2B 697673972eb6bf97f1787e316dd5f47e24ac875a51c2f6397cb756cdd47e2d13517c497831a4aa106195ef6010ba6d55705727e3110cb4f696c7077b87d1cfde SHA512 e93838433d223a828c959ccc21411525794e611a21352d7e47c06cd17b337a8bd8b1af12324bcc5d5d2e03357d8a185b13458a627724b365f9005e163740ede8
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/portage-3.0.36.ebuild b/sys-apps/portage/portage-3.0.36.ebuild
deleted file mode 100644
index 63140095cfca..000000000000
--- a/sys-apps/portage/portage-3.0.36.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
-}
diff --git a/sys-apps/portage/portage-3.0.38.ebuild b/sys-apps/portage/portage-3.0.38.1.ebuild
index 26815216586a..26815216586a 100644
--- a/sys-apps/portage/portage-3.0.38.ebuild
+++ b/sys-apps/portage/portage-3.0.38.1.ebuild
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index eb8155eef186..e9eb8abf41fc 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -9,7 +9,7 @@ DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d3
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
 EBUILD systemd-251.3.ebuild 15507 BLAKE2B a5b9463fe2f440b01ab987b134fb147f88a811393e8122f2e404ca8163c7805cf42844292da3dbed72140e188958ccd67f11fc000c94b2e76aea0054a7a0606e SHA512 d1cd4e249b30fe9f975c4a70d7efd08b718dab197d84de621ab2e407299de764a1b47dc7d5df60028e3a2a5feedc9824b5d295a71c5583c369cc8283565de281
-EBUILD systemd-251.4.ebuild 15502 BLAKE2B 9c32b7812ce4660295199025e9da9d7aed979369f3d2275b4892bea90b356c520930675cadbaa98b1beccdc4f560c0720e854df76293a2c8acef02333e06ddb4 SHA512 b31f0361384923e6172b52232534c6f0a884d9fda7883794718292966863a95a990a159a43ac4513641f4967e318f2c6d7eac4631a452391db4396122d727b7e
-EBUILD systemd-251.5.ebuild 15510 BLAKE2B 6230fd24121c666d23af77e4eac37a1647c9271c4cfd7731acae7fd0c2392c048b6113b94a79e54066d77c6866e4700648ced41b54245068aca926705c8975cd SHA512 b2a54d4ed138e47dd41463c2e30f3c0b992cad176e2c46bebb98e115283863c242460e3de6049b7ac5817d7d0e62c25b46336686ad82b75cd759770f14c42d09
-EBUILD systemd-9999.ebuild 15374 BLAKE2B 932ea3a520d8e5371dc88d6bb474a0068141a9565332652589fc5d944a5e55cc81985ca5e05acb3d2c554da4355bcf3f80c6584469ac2bad41604c5dd8c9a099 SHA512 f26a179ce91729627b7c6c78ea8ca6515696bc330f1f012b2b02d15a5134028fe5066f03b0a4b78cfde77d37eafdda75731a5ff8dec82c694c49547f61c839bf
+EBUILD systemd-251.4.ebuild 15500 BLAKE2B c8ea106e1dbbf830fba008ed6f70486e36a62947cf390f436b2c45856a8f3fc74d819f67983dde5fa49b854cf91e3c76e4ccb7d99af9c9753cc7a0183d8bb0d3 SHA512 f97e89cbc1fad054b265878f0f55b7bbfccdecc1f907743d4373cb7a9783805ea1e5536ad5fe759da4e3b6954146c9b456ce4147fa86f41c61187b11333ee8ec
+EBUILD systemd-251.5.ebuild 15508 BLAKE2B dd89dde571cfd27fad856e2802c8b837d96b567f07fcae62af911f9dc6ebf6752ef7a287a7f1d695695a8f84cd43638a156101fcd53488fd25bdf43d65cb8560 SHA512 1c4b6a2dd35171dea0363d1331bfa67967fdb9bc8025cf4b3fea7b20af60748373473a3efed0710a8c86762ba53fb3bdcd0df62bb1e70a55a43a1ab722171ecd
+EBUILD systemd-9999.ebuild 15372 BLAKE2B f480ab02dd6910b271805ef126bfefd478b9c94487dd4d2134edebd5a15e780ecb9104ae16a0f50dd921f642cb78389ffb486cc9ea76ea3d4db863a0db12d63f SHA512 ee3c87a63e7295e02679364f7337985eaf073026e57672b6352bb65979224791e491222b4309ca66ecc4df6c1b312acb4b706419299800fa8c94e179c235f5c6
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/systemd-251.4.ebuild b/sys-apps/systemd/systemd-251.4.ebuild
index 487bf56cfcf6..04ba0014612b 100644
--- a/sys-apps/systemd/systemd-251.4.ebuild
+++ b/sys-apps/systemd/systemd-251.4.ebuild
@@ -389,7 +389,7 @@ multilib_src_install_all() {
 		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
 	fi
 
-	if ! use resolvconf && ! use sysv-utils && ! use split-usr; then
+	if ! use resolvconf && ! use sysv-utils && use split-usr; then
 		rmdir "${ED}${rootprefix}"/sbin || die
 	fi
 
diff --git a/sys-apps/systemd/systemd-251.5.ebuild b/sys-apps/systemd/systemd-251.5.ebuild
index df1093c4548c..41bd8eea2783 100644
--- a/sys-apps/systemd/systemd-251.5.ebuild
+++ b/sys-apps/systemd/systemd-251.5.ebuild
@@ -389,7 +389,7 @@ multilib_src_install_all() {
 		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
 	fi
 
-	if ! use resolvconf && ! use sysv-utils && ! use split-usr; then
+	if ! use resolvconf && ! use sysv-utils && use split-usr; then
 		rmdir "${ED}${rootprefix}"/sbin || die
 	fi
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 733ffd2c153a..d4f1b4c5d629 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -386,7 +386,7 @@ multilib_src_install_all() {
 		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
 	fi
 
-	if ! use resolvconf && ! use sysv-utils && ! use split-usr; then
+	if ! use resolvconf && ! use sysv-utils && use split-usr; then
 		rmdir "${ED}${rootprefix}"/sbin || die
 	fi