9 files changed, 254 insertions, 6 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d9c20afabbd9..84b75037d913 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a66ad84a05e0..7e649f378ac9 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,9 +7,11 @@ DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B a47f951a35828ba9c8fc88c2eab5222c98ed
 DIST portage-3.0.51.tar.bz2 1155503 BLAKE2B 1095ab616993951da8f4d43cef4cf815672c67cb48ea2fe5aeb6b7c629058bfab1557d2b9508f2e3e9f38676733b5d60ec6a3686bc57840065c428508769cb1c SHA512 bf237819173bed9df3b63ada067a2a99700618d88fd4b528146c56bdd592f2452003db6cc6da4a445b647eb4d8bb591260ea0d2a5627ad540526a2e802025836
 DIST portage-3.0.56.tar.bz2 1166588 BLAKE2B f6e8d8dbfb3b157f1e5577419ef78c8e63b6f754ffa94da22e6466f11b77738e11fc9ad4803341b6640a6c7f48bd73bb02a12643b8176d60147e88aa1fb48314 SHA512 6eac4edb286f3ef0074cbaaf3b216c8dd40fe474e1a9bd6f86d7185cceabe19edb76b324af76d9fa1005ba8809d624354c21ab84284aba0d92e467612bd9fe47
 DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 793a150c94c939672783d7556e5fce80f7ff8895a616726d7adf92d6f8da99768c55db8a685f2dd548ab0bb09c29fd7548ee6fc1dfc51b55c530119690b92265 SHA512 4c5348e0dfc966db5ca1c08cc3fafc72dd2b3b402972b99b411f61f7a288190ecd9e5ac597dc62ee96eacc378818a4cac65b0fd040c9ff557e7cbe057a934829
+DIST portage-3.0.58.tar.bz2 1174162 BLAKE2B 7e8edbdc20410116280d7d20bd7a97760970d34add34be84b66e7af5ea6e8f28d0123fdf6c43acc761a7d0ae75ac0badca96436b0d0272e4cfab36dfc67792e9 SHA512 58e9d93feeee1e8802202f7abe5b8085297c2e45fd160d0f6de0d10480defcb626fa4d55d273a950f796ed8a479dda9eedaa1175a8710f67880efb73c41687bd
 EBUILD portage-3.0.49-r2.ebuild 9527 BLAKE2B 6cad70f759ec4440c228193e2535d57d679eddee0c73d444c78880d38e9529588835f8de721e900495261c53ea9461e2bce1c1b63ed8d32f657f6e458119d18a SHA512 0a49e29242fb469a2d389b06a8e1fdf0187cb7d35c56e4ce3661722dc0668f1383ca52321417fa2110f2d02670b2e4cf43c319efa511e373ca4f2520e2ac2ba7
 EBUILD portage-3.0.51.ebuild 6683 BLAKE2B 3d304c8162f3c17f4b3dc41d75e3d7621a51e047d33edb8e71117742fc177828bfaba8dd8dde1220be135d8ff49c59706f403a3fa86cde0cf1fbdf094b2995b7 SHA512 6c434c44076430241a2b2799de655d2013c01d4a56d373bfe5654c21c7bb3e273095dc129d0fb03f6ed8b0ef960ec4a18967bc7c5fc6f72af60a046840881d78
 EBUILD portage-3.0.56-r1.ebuild 6765 BLAKE2B c0a62cc0bc972889706dc8df58f016375bcaaf6e140e377144212ac1864b1ded4f4490a4f7a2b90100e162af4e34df71a8a56c2c4dd89fd314b711f0d41c3ad6 SHA512 7841d06b60844b4bceaa29709048b741e896c8c702c180cb33fa51fee407fae78a1166bc79736e2a74895580d93a8dc5b383b0409073917a4c183fc62c3d832a
 EBUILD portage-3.0.57.ebuild 6773 BLAKE2B 09ee4a06e701b17e3e4e94a4d61fe8cbbfc9801c1f216ea533031aac6218b72632841b8b17a88ca826015accf959ae596381dd7819ef27496da768d3b62213fe SHA512 11169cb777a5a72c10b090ac805653d436f13f8ec553ceb2c8da40a6190d4a132297d3ab7379f8aefb9ada0f642dff46e28dde857fd70d43824fd90238c04a71
+EBUILD portage-3.0.58.ebuild 6924 BLAKE2B a8a4c8d980456a8fed82b49b1017037ff3f48f00e4a98f5ce7b023eb5af3c9dfcd6367121640ec8f092d080e62036db12de15709b483d7671c460c62c978a600 SHA512 a14d9925f026edc3d1aeaf7ccaf535f0ab999e41f44a592f97fb2a58c6926e049cd8a60bff6da6c3051a58689075a07ef0a7480fe9eca41fb79c6a12ab1c6f4e
 EBUILD portage-9999.ebuild 6924 BLAKE2B a8a4c8d980456a8fed82b49b1017037ff3f48f00e4a98f5ce7b023eb5af3c9dfcd6367121640ec8f092d080e62036db12de15709b483d7671c460c62c978a600 SHA512 a14d9925f026edc3d1aeaf7ccaf535f0ab999e41f44a592f97fb2a58c6926e049cd8a60bff6da6c3051a58689075a07ef0a7480fe9eca41fb79c6a12ab1c6f4e
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.58.ebuild b/sys-apps/portage/portage-3.0.58.ebuild
new file mode 100644
index 000000000000..0fa6790375b9
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.58.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit meson linux-info multiprocessing python-r1 tmpfiles
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/portage.git
+		https://github.com/gentoo/portage.git
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# setuptools is still needed as a workaround for Python 3.12+ for now.
+# https://github.com/mesonbuild/meson/issues/7702
+#
+# >=meson-1.2.1-r1 for bug #912051
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/meson-1.2.1-r1
+	|| (
+		>=dev-util/meson-1.3.0-r1
+		<dev-util/meson-1.3.0
+	)
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	' python3_12)
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+DEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5
+	sys-devel/patch
+	!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)
+	doc? (
+		~app-text/docbook-xml-dtd-4.4
+		app-text/xmlto
+	)
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+RDEPEND="
+	${PYTHON_DEPS}
+	acct-user/portage
+	>=app-arch/tar-1.27
+	app-arch/zstd
+	>=app-misc/pax-utils-0.1.17
+	dev-lang/python-exec:2
+	>=sys-apps/baselayout-2.9
+	>=sys-apps/findutils-4.9
+	!build? (
+		>=app-admin/eselect-1.2
+		app-portage/getuto
+		>=app-shells/bash-5.0:0
+		>=sec-keys/openpgp-keys-gentoo-release-20230329
+		>=sys-apps/sed-4.0.5
+		rsync-verify? (
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	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
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
+	)
+"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	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
+}
+
+src_configure() {
+	local code_only=false
+	python_foreach_impl my_src_configure
+}
+
+my_src_configure() {
+	local emesonargs=(
+		-Dcode-only=${code_only}
+		-Deprefix="${EPREFIX}"
+		-Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(meson_use doc)
+		$(meson_use apidoc)
+		$(meson_use gentoo-dev)
+		$(meson_use ipc)
+		$(meson_use xattr)
+	)
+
+	if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then
+		emesonargs+=( -Dnative-extensions=true )
+	else
+		emesonargs+=( -Dnative-extensions=false )
+	fi
+
+	if use build; then
+		emesonargs+=( -Drsync-verify=false )
+	else
+		emesonargs+=( $(meson_use rsync-verify) )
+	fi
+
+	meson_src_configure
+	code_only=true
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x PYTEST_ADDOPTS="-vv -ra -l -o console_output_style=count -n $(makeopts_jobs) --dist=worksteal"
+
+	python_foreach_impl meson_src_test --no-rebuild --verbose
+}
+
+src_install() {
+	python_foreach_impl my_src_install
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
+
+	local scripts
+	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die)
+	python_replicate_script "${scripts[@]}"
+}
+
+my_src_install() {
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+		"${ED}/usr/lib/portage/${EPYTHON}"
+	)
+
+	meson_src_install
+	python_optimize "${pydirs[@]}"
+	python_fix_shebang "${pydirs[@]}"
+}
+
+pkg_preinst() {
+	if ! use build && [[ -z ${ROOT} ]]; 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
+
+		env -u BINPKG_FORMAT \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_format || 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
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 11143e7a6a2d..397c96a237dc 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -3,5 +3,5 @@ AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9
 DIST rng-tools-6.15.tar.gz 60731 BLAKE2B 693056ca600448d07413661498ca33893e99648c6344e02f2f0babb014878b9452e024904f5b58efc6cfe72201e582a6b458664d11160bb1b0dbdc28ba6325c5 SHA512 44146d891c4f46675a031f2e5ff7755cfaf1abe3252f241c16e042d3bb5e988b77ff840382caca49d8cb9854af1e49369398a506de5e819167739ad33b58d180
 DIST rng-tools-6.16.tar.gz 67401 BLAKE2B ab1a84c9a298e71ea5cdc1e91004ac069199a0128ee9701b1b3e24b6c705c63a642ab3db260a2c6c910c185e8fc75d5775caa3b7c370f102c75fac496e9bca17 SHA512 f4155dca8a54f47227f49ccf5f8453ddd50bd91a37b3b1659b5ad02278ed119028cee42918dd48552c79e19f2e2477277a41afa8e422395b2778b17fab09484d
 EBUILD rng-tools-6.15.ebuild 1614 BLAKE2B 26f6366efd41e3cb6a00ea929aee7d339d5b7bd4c5903cbf7ddc18d190d8861747a5e85aa5757ba286eafaf779ac1d3fab250ba5700c82c8f54bb4ed011c960b SHA512 25ac8443c941f34d99978b0bbb86d3024a8f4aa9927bedb8afb50247e886ba7bdcf706b1df34022a7f9cd072bc6ed225a0700780bc7892ddbf64380dc7921202
-EBUILD rng-tools-6.16.ebuild 1901 BLAKE2B 9eecfbba4b6a512fb4f9e7161fffd6ad94d5106e28d695a2c5bd2dc2bf616bdc38977c932c35660d5816b642c643d271a0f2b5ef986706df6b13e5ad8d92d631 SHA512 7232a143345d10c6de6ca5be021d6ccda227c61b17080f4df54939b384e3646a41e5298b38745d5dfe3abb0d34bd55b1e8df5d91dd6bebc79f5d2f3a05f28216
+EBUILD rng-tools-6.16.ebuild 1905 BLAKE2B 8ebc40219a25372e50ed033488651a6b02f0d9a98b93579330b016d2646dd89a707c8d9426e51eb1ce6c0fab82cd9aee4b535a05fb2d206ff6bbe185d2cee146 SHA512 74f8846d45f63990bf6cc9deeaf3bc0c82753edd039d8d8ad04a487ce82939b89696bc0953b190287532975eaa12bcda157d5811184537a674e8bb295cae8966
 MISC metadata.xml 894 BLAKE2B 8a337d1832bc0c80ae7869fcd8b390594beb17514f792ddeee1e3544e76f99b70022ff63c6766befc79a1acc4f0f48651d7b52ac4a3995fd4bc4fc81916ecabd SHA512 c678013dd0a4882c1be0b7d4784910e52ec13118237f9f488fb53ce363e8d51c7a3ddbf50feca00f1c7b99a604754201687f512947b5aca64eefa331d3c2532f
diff --git a/sys-apps/rng-tools/rng-tools-6.16.ebuild b/sys-apps/rng-tools/rng-tools-6.16.ebuild
index 331786d8bfad..a512cc1bc866 100644
--- a/sys-apps/rng-tools/rng-tools-6.16.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="jitterentropy nistbeacon pkcs11 qrypt rtlsdr selinux test"
 REQUIRED_USE="test? ( jitterentropy )"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 156cb98f1e1b..9cced3d520f2 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -17,5 +17,5 @@ EBUILD systemd-utils-253.12-r1.ebuild 12616 BLAKE2B ba823f24fc2b19f5aa9ca1ff9df8
 EBUILD systemd-utils-253.13.ebuild 12616 BLAKE2B ba823f24fc2b19f5aa9ca1ff9df8521efe9847d5440cd3dfa35c912f5b8d32418cc13220e8e50422350f0dd1812f38a6c06c44d9e518aad3ebca9d17d4564029 SHA512 abb188db7c96f7a2afb022fb548106870f876fbeeac5cb415b2ef26fd34254ddad0568d6f74c1165dbb2549c5d144d7bfabef7aedf6ce120c1c1b339ccda4e16
 EBUILD systemd-utils-254.5-r2.ebuild 13076 BLAKE2B b3da8f4d0f6ce116618e6f7885b41bc0ef5724b1ec3d58b7fd080494a29bb101dddab4e0fc278a50ba340c1988055fe6a5ee352bc1aad33012226a1ee4d15dad SHA512 90b6f053e921aa6d80b19d484a5f5ac8f74325f1d4e2e08e379a1fb53456e7250b60e9969b6b3ca7e5ce26ac6215d419742e81f36decc6ebbb3d47b2f1f35e27
 EBUILD systemd-utils-254.6.ebuild 13084 BLAKE2B ee9dee6a8edce96691b88edf54fcb25a2e5e004eecf5c1cd27fa782464164ab670f11925f3f2ce9014975401571fd47f5cc3adf706c394fe61f1b8b24fd94749 SHA512 7fb74bb5532548bf41b0ce50dbb2936391c6adc140ed9ad6e3b56b30159e4e4c629a87c61602d4231fcc87c6abe288fdf305c13ff739a19e64e9bdd7347d4e6c
-EBUILD systemd-utils-254.7.ebuild 13084 BLAKE2B ee9dee6a8edce96691b88edf54fcb25a2e5e004eecf5c1cd27fa782464164ab670f11925f3f2ce9014975401571fd47f5cc3adf706c394fe61f1b8b24fd94749 SHA512 7fb74bb5532548bf41b0ce50dbb2936391c6adc140ed9ad6e3b56b30159e4e4c629a87c61602d4231fcc87c6abe288fdf305c13ff739a19e64e9bdd7347d4e6c
+EBUILD systemd-utils-254.7.ebuild 13083 BLAKE2B f47130908fc1a2285ea37b9a4f898dd9d9e84196aa6e9ec167abd374779e83c93f0afc4417dc0fbfc79781176345edc63c36d2a8440107cf07d2702f3a544487 SHA512 d64f48715b4d52be15450c72347f2f03935a67d9264727c0277af77ab02a1b973b244aad6c23df14fcc72659a820a9e85cd96d9c007b874d7bcb413a79961ffc
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
index a5364fa98930..1fbc435fac45 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.7.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
 REQUIRED_USE="
 	|| ( kernel-install tmpfiles sysusers udev )
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 6f016ddbd3e7..7ed2184aa527 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -12,5 +12,5 @@ DIST sysvinit-3.08.tar.xz 268296 BLAKE2B ec4a4ff3663ac7d67808b50b67631ff4fe1ab56
 DIST sysvinit-3.08.tar.xz.sig 833 BLAKE2B b1cbe8a95faa16a22e92e2a8841643aeaf7a5a31cc9fa9628a7ee2400aac1b3a184ae01f09c75d48d5d55a71f7e62feb25c16345644bfb4fcd19cbd061f86573 SHA512 1af105d84b98428766cc315d8dea068e6c5a7ad52008291ba7c1d5accbcaeead4999fd714fc152c1038e54953f9b469bd0f792a0830e68c3e2f43afcd36e0e2d
 EBUILD sysvinit-3.07-r2.ebuild 5893 BLAKE2B b387077b916948c4a5e1263203a1176a626f91ee36806ecbb22a514907db54e8e0077a151c0c7d148fc67c39cdcc56db30069d8a247816ff71d7de7983790d54 SHA512 9e9e1340b72a62cfaebc70efce5ab78ff7657e10db1f44544ac0b08f8b07a0d5a2b4b5c064d7dd36493fc430f3c41d1b8e28b464d97a94f305c76191f7a74648
 EBUILD sysvinit-3.07.ebuild 5518 BLAKE2B 6e0d544b965767ceb4133adaf7fbbdc428dc941000a3ee9f553ef34c5dfd958709845e4ed4eea312fbdcced98dfd9083be6310113e89f00c1cb4a2e11d739b99 SHA512 2db146adde6e4b60d9fa102f738f437c2fb250de451811ed5c457e2eddc2863c6b6fe2aa47be2e2282337fa3482a9534d1085da956a8e876be1792efa9205ebc
-EBUILD sysvinit-3.08.ebuild 5751 BLAKE2B bba88b30df7239f796bea5c074b23d938c22d1faec99f5311825f54c7465076579d463ddd078f2f0a865a2cf1a9c633b60ad71e3a86a41ed9963ff69ff6380b3 SHA512 a44682eed201a8c72e92bef8832c6877dbb571530ce48054081d08eacbde24405660c2e694b193963c6dfc58dee1e9599d2944fb5bad9191d3726e3169621efb
+EBUILD sysvinit-3.08.ebuild 5750 BLAKE2B 6c59076679b519c34ae410e74ae280103ed20351e376516dad54f8857114e1804b065070b58f1b1f8f56999c606413e6a97e64f4ea67a3e6273bec3bf83ddbc7 SHA512 3d870fdad63988947e9159af66eb3f097fb3d44d17eb48487e522f30e7e3b014d0e779719d374ca909bb9e92ce5250a9363248d36db50336ced19cf7353c3012
 MISC metadata.xml 506 BLAKE2B ea180981d7eafbe8356b6d187c7c1c12afc7ef91d94f7992489ad54f459c924b009bfe7c7888bf1934b356091489285dbda9eee39ab14f318528e0738da6474c SHA512 b5451236ce138c372e32c1f5e4bc25fca9acb05063720d6b452e81b19a7661058b791f6fc95a9f585244ba44ff307d07f6be49aadf1dbb461492575e2af80a89
diff --git a/sys-apps/sysvinit/sysvinit-3.08.ebuild b/sys-apps/sysvinit/sysvinit-3.08.ebuild
index e30f2702598b..e6079234966a 100644
--- a/sys-apps/sysvinit/sysvinit-3.08.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.08.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${P/_*}"
 LICENSE="GPL-2"
 SLOT="0"
 if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 fi
 IUSE="selinux ibm nls static"