9 files changed, 68 insertions, 368 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index cf1e435943f8..aff330b425c3 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 92324da0d698..b11a9c7f9b92 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,4 +1,6 @@
 AUX acl-2.3.1-musl-1.2.4-lfs64-fix.patch 1028 BLAKE2B 3ce13de7ee1f58b7fd1c39ca9b41132506f493e1c8b7e0b78ba312ced8f86b62146779e4cff4dcd53bbac613dd5311872cc38532f3ed30630ccbf3be44f45f88 SHA512 322a556e82be3e95dc9baf6964f2b80fd2f70f0d6f275221aa4ff9b8d8370b1a7b1517057a4c034ac5d9153c6bc83cd97f1a5fa3db1873537fbde78130eed1bf
 DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
+DIST acl-2.3.2.tar.xz 371680 BLAKE2B 9f2abfddcd403df2c716c05f02a1b52453613d10948dc58a65b9ef41b44e37db6de99fb22dcfc4f6f0fb5d0319c939da61bd4e0fba2cdb5643e8087ecd34eeac SHA512 c2d061dbfd28c00cecbc1ae614d67f3138202bf4d39b383f2df4c6a8b10b830f33acec620fb211f268478737dde4037d338a5823af445253cb088c48a135099b
 EBUILD acl-2.3.1-r2.ebuild 1951 BLAKE2B af49c5dff0ec7e53fdc1f8671eab74fe88184b3a22e62beef1e4a9db1ffe8268ccffca52f9e2f4981862d21da0553c4dece14422bd4201d2df8f37a4c0ab416a SHA512 fff12fef1da544137734a8c524b0f812cb7c353b94ce5e82f35bb266c65300923d5c7dd17f95c30606f673cd23500891246c5b2595ac7589e3fe76564315b456
+EBUILD acl-2.3.2.ebuild 1379 BLAKE2B 20a7fbc8b342726d0ff42fdebc93d18833470f65e998e9698a02b4c2a1ff6ffac27147f27422afbb914ff9fe4c2a5fd03d7d63121070f1ebb08d5740c5f469c8 SHA512 a86bf381a230f885b30a5832a00ac9ebe6803c8b4ddd09c1951e632d31c205f1c1c8b584c7963903f8931bc0538812924f2c5811ba3f525628a26e25306d6321
 MISC metadata.xml 345 BLAKE2B b168c40ceb66cfacdb1fbe9b5031705f5c3249afeb872163663564dac2ea85e6fa857804831a80b4c44323223b417a24a156d27f8231396d5b090e44a0dc9288 SHA512 e0cbeec10fb47ace3d0fd3c1ba8a5a0bba02345a3e0df30aa82777507fb6ab75f2705b06e7635a00406d2b0839bc41d0a9fafcd8926844e1d9877b8cf2ed6f78
diff --git a/sys-apps/acl/acl-2.3.2.ebuild b/sys-apps/acl/acl-2.3.2.ebuild
new file mode 100644
index 000000000000..1143bebd9578
--- /dev/null
+++ b/sys-apps/acl/acl-2.3.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib-minimal usr-ldscript
+
+DESCRIPTION="Access control list utilities, libraries, and headers"
+HOMEPAGE="https://savannah.nongnu.org/projects/acl"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="
+	>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# bug #580792
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Filter out -flto flags as they break getfacl/setfacl binaries (bug #667372)
+	filter-lto
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-largefile
+		$(use_enable static-libs static)
+		$(use_enable nls)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# Tests call native binaries with an LD_PRELOAD wrapper
+	# bug #772356
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	default
+
+	# Move shared libs to /
+	gen_usr_ldscript -a acl
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.la" -delete || die
+	fi
+}
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 7475def38d26..48e009549593 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -19,6 +19,5 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.36.1.tar.bz2 2525473 BLAKE2B e515825cb3ab1c520e16b9c2512e9fc72947366a72a0466bff59b507fdffbc78fc9d16b44a26116175fc7a429d849ad944b1bc379d36c6d3a0eb20969997336e SHA512 8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4
 EBUILD busybox-1.36.1-r1.ebuild 10852 BLAKE2B a5ec27673706bd84cb26f1db9f3f6d0bc04c1b2517d49effedf5c2175e7972feed8658d6e4c731e6342e04b05dffc0f28ddba1e16e4c5127e3c027fe55145623 SHA512 0f1c5434e1c0b5fe91a29c82f2e9fe4f40acb993bb9a1171f38d5687309aed994c624a23392b395e10fde55979bd4c87558b809d913d08c6375cbc59314cd810
-EBUILD busybox-1.36.1.ebuild 10488 BLAKE2B 5e9d61e5c9682786e2137be08ac54d948101e479c3231bd4035e17bc8df1ae8a97c576218e8991f3b5b544ef09d2bc16885bd149ecb33daff1f8374acbfe1169 SHA512 8eab6a264efac5287cfd24fea758c96928ea5cfeb8f6fbb06ed1d7ff5f3421d3582a9d801f637ca35e89fa568ad9a2ae36e0afee8b29c32a1bc65924ad748eb3
 EBUILD busybox-9999.ebuild 10860 BLAKE2B 3903f87f402225bdb9c90f91cf443ac23f2ae65187d507ccaf5d429bf694536377d0158bc56a631a3e1162a311b59764cb3c9c41d92e4a12f9c4540367630b5a SHA512 7bea77ed004f214032fe3e301833e381a94a848f6b8c4a45478b306831d1163ceb661f9ebcd76a18ffc88d97c4605c20c35782099bc83bf9c626ab8c24da0743
 MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.36.1.ebuild b/sys-apps/busybox/busybox-1.36.1.ebuild
deleted file mode 100644
index e252de9fe95c..000000000000
--- a/sys-apps/busybox/busybox-1.36.1.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI=8
-
-inherit flag-o-matic savedconfig toolchain-funcs
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P="${P}"
-	EGIT_REPO_URI="https://git.busybox.net/busybox"
-	inherit git-r3
-else
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-# TODO: Could make pkgconfig conditional on selinux? bug #782829
-RDEPEND="
-	!static? (
-		virtual/libc
-		virtual/libcrypt:=
-		selinux? ( sys-libs/libselinux )
-	)
-	pam? ( sys-libs/pam )
-"
-DEPEND="${RDEPEND}
-	static? (
-		virtual/libcrypt[static-libs]
-		selinux? ( sys-libs/libselinux[static-libs(+)] )
-	)
-	sys-kernel/linux-headers"
-BDEPEND="virtual/pkgconfig"
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	local expr
-	while [[ $# -gt 0 ]] ; do
-		case ${flag} in
-		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
-		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
-		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
-		esac
-		sed -i -e "${expr}" .config || die
-		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-# patches go here!
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26.2-bb.patch
-	"${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
-
-	"${FILESDIR}"/${PN}-1.36.0-fortify-source-3-fixdep.patch
-
-	# "${FILESDIR}"/${P}-*.patch
-)
-
-src_prepare() {
-	default
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-
-	# Print all link lines too
-	sed -i -e 's:debug=false:debug=true:' scripts/trylink || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setting SKIP_SELINUX skips searching for selinux at this stage. We don't
-	# need to search now in case we end up not needing it after all.
-	# setup the config file
-	emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_2_4_MODULES #607548
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-	# CONFIG_MODPROBE_SMALL=y disables depmod.c and uses a smaller one that
-	# does not support -b. Setting this to no creates slightly larger and
-	# slightly more useful modutils
-	busybox_config_option n MODPROBE_SMALL #472464
-	# triming the BSS size may be dangerous
-	busybox_config_option n FEATURE_USE_BSS_TAIL
-
-	# These cause trouble with musl.
-	if use elibc_musl; then
-		busybox_config_option n FEATURE_UTMP
-		busybox_config_option n EXTRA_COMPAT
-		busybox_config_option n FEATURE_VI_REGEX_SEARCH
-	fi
-
-	# Disable standalone shell mode when using make-symlinks, else Busybox calls its
-	# applets by default without looking up in PATH.
-	# This also enables users to disable a builtin by deleting the corresponding symlink.
-	if use make-symlinks; then
-		busybox_config_option n FEATURE_PREFER_APPLETS
-		busybox_config_option n FEATURE_SH_STANDALONE
-	fi
-
-	# If these are not set and we are using a busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option y SH_IS_ASH
-	busybox_config_option n HUSH
-	busybox_config_option n SH_IS_HUSH
-
-	busybox_config_option '"/run"' PID_FILE_PATH
-	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
-	busybox_config_option pam PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG_SANITIZE
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-	busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# glibc-2.26 and later does not ship RPC implientation
-	busybox_config_option n FEATURE_HAVE_RPC
-	busybox_config_option n FEATURE_INETD_RPC
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-
-	# bug #701512
-	emake V=1 doc
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf || die
-		if [[ ! "$(get_libdir)" == "lib" ]]; then
-			#831251 - replace lib with lib64 where appropriate
-			sed -i -e "s:/lib/:/$(get_libdir)/:g" "${ED}"/etc/mdev.conf || die
-		fi
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.initd mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd
-		newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}"/syslogd.confd busybox-syslogd
-		newinitd "${FILESDIR}"/syslogd.initd busybox-syslogd
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}"/klogd.confd busybox-klogd
-		newinitd "${FILESDIR}"/klogd.initd busybox-klogd
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog
-		newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog
-	fi
-	if busybox_config_enabled UDHCPC; then
-		sed -i 's:$((metric++)):$metric; metric=$((metric + 1)):' examples/udhcp/simple.script || die #801535
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-	if busybox_config_enabled ASH && ! use make-symlinks; then
-		dosym -r /bin/busybox /bin/ash
-	fi
-	if busybox_config_enabled CROND; then
-		newconfd "${FILESDIR}"/crond.confd busybox-crond
-		newinitd "${FILESDIR}"/crond.initd busybox-crond
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin || die
-	if [[ ! -e _install/usr/bin/env ]]; then
-		ln -s /bin/env _install/usr/bin/env || die
-	fi
-	rm _install/bin/busybox || die
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs || die
-	doman busybox.1
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	docinto html
-	dodoc *.html
-
-	cd ../examples || die
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-
-	cd ../networking || die
-	dodoc httpd_indexcgi.c httpd_post_upload.cgi
-}
-
-pkg_preinst() {
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		# 907432: cp -n returns error if it skips any file, but that is expected here
-		# TODO: check if a new coreutils release has a replacement option
-		cp -nvpPR _install/* "${ROOT}"/
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2a56b27d3a01..63815f61ad6a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,7 +10,7 @@ DIST portage-3.0.60.tar.bz2 1177524 BLAKE2B 1928e448e8f319e4f000e795587fa043155c
 DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B bad3140735b12a18a3108e91cc88146fc5c64ad3e3e056707eec7629927f718483a3e1ccf09f74de510ee7733b4d856c3c53692a6cc0f5fc1a7babf88fd7f06b SHA512 1401392a7bd2bf18e698e82af25a39db2aa9d8d9e8d9c07dea11ba5d5c866d2d3f8a3eccc8568b081aeaf6f668466921c61f58adbdd9dd5ffd9cf632bff2bdbd
 EBUILD portage-3.0.49-r2.ebuild 9527 BLAKE2B 6cad70f759ec4440c228193e2535d57d679eddee0c73d444c78880d38e9529588835f8de721e900495261c53ea9461e2bce1c1b63ed8d32f657f6e458119d18a SHA512 0a49e29242fb469a2d389b06a8e1fdf0187cb7d35c56e4ce3661722dc0668f1383ca52321417fa2110f2d02670b2e4cf43c319efa511e373ca4f2520e2ac2ba7
 EBUILD portage-3.0.57-r1.ebuild 6849 BLAKE2B e16ae2c17fd1230cdd01db645d2b02e322331a5dfff33b426ee5fe617f606618317bfeae5e2223b2290a85aca1bc4c50ce17e83c8eb74463e4e164e8fda86c90 SHA512 16f96af95144913bb7fb5bc200085a9a48abbbc21514f500f04d98487ffd0b63c8a520595b51d91fc83f844cc1d05c8283998da6ddcca64c13798ae2d780ea63
-EBUILD portage-3.0.59-r1.ebuild 6920 BLAKE2B 2dd5786898bb5b67597164de65828d52357b109261eafdd03fffe940d53907ed1e0266dd76b28846bc1e337e640d9834cf68f642edf4b43e8833f74d6c0d3bc0 SHA512 865cdf3f7076bf2afd174f5febe920f73abdcb30fcf98763296179f2242531710a90aa2327d1c674d1c862cb0998247ba6e5bf01d3fddd2e4a2eaa11049571da
+EBUILD portage-3.0.59-r1.ebuild 6919 BLAKE2B 42d9b40cd255004ae6e3e598940717296163e500434a8c2bdf08b280915aecf8dc9d5f3b6d9eb5dc09c8718f689b459ec6a1f5df03187935d17d447f8b2e0f25 SHA512 59cfb6566b72a82cf81503b40b3ad73bb1616c39a6957d14681c55b53a60b662eb5330b7021d6c860212c4e583c4ed67e64ff5a55738f2f8f1a22d5cf4442e03
 EBUILD portage-3.0.60-r1.ebuild 6927 BLAKE2B e6ea3a331b29c53e5dbc2240db2923a75f27ac77533c3dcf12eec266d2418deb5939887c112460fdb5e8c67681e6a134109065fdf32b2ec66573edf5bac74515 SHA512 5443ee6ba6d1c1b340f87908811becdc1821ec1410aa2e9eb860268400f66fa26d7d7cc8216c93afcb04a4d7b41360506a8e3c54412b95154576a988933cb89e
 EBUILD portage-3.0.61-r1.ebuild 6920 BLAKE2B 579514f95af7abd9e265d3f02b775ce8bf56a4c8faf42b70733010abb61458ae857d0a13ebada33efdf26a880015effdaecc7b27b3d0019e45cf3e3f4d8c982b SHA512 bc776c77a11247fbc027d7ea23fad92ad4493f95d16d955b6ed9b1e840e7c0688fffd57a560333094669da06b5799de78f48bdbd67943bcffcf99ecccb440779
 EBUILD portage-9999.ebuild 6927 BLAKE2B e6ea3a331b29c53e5dbc2240db2923a75f27ac77533c3dcf12eec266d2418deb5939887c112460fdb5e8c67681e6a134109065fdf32b2ec66573edf5bac74515 SHA512 5443ee6ba6d1c1b340f87908811becdc1821ec1410aa2e9eb860268400f66fa26d7d7cc8216c93afcb04a4d7b41360506a8e3c54412b95154576a988933cb89e
diff --git a/sys-apps/portage/portage-3.0.59-r1.ebuild b/sys-apps/portage/portage-3.0.59-r1.ebuild
index 4cf41d63b8e0..6eb73a76c985 100644
--- a/sys-apps/portage/portage-3.0.59-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.59-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index d35e3c50f3b7..d629d5f03c93 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -5,6 +5,6 @@ DIST pv-1.8.5.tar.gz 327072 BLAKE2B ef7fcf64430a72e04ca3a922115e7012c999109bb7e1
 DIST pv-1.8.5.tar.gz.asc 691 BLAKE2B ac5bd2b05e145d4ea5aedbb148b39a317d68329787f06f39f808be75951da0e0f460254b4a5049a8eafabad07edfbe936be00154f5dfa660628c8a3dfa3b7ffd SHA512 8414b2485347579a54233a2f241c080ab6461799c149567ab1063ce812b08ab2293f55bf8a24bcadabf94d12ce3dce36fe57277d822d115db9e53c957fe99c20
 EBUILD pv-1.7.24.ebuild 1364 BLAKE2B bcf84d8ce9ef43828b060ace27d330cf452ae996539181bccc1114c111523650966d83996c7625848bb01693125ef768155ae4d958ebe1abb5e5322c04972e50 SHA512 92251054a71196ce418360c14cbcfdd1d0beec36c1420655a9cfbfb5c9c37016725e1f55f49791f95ec291f01877d937ac9d49b1c8f0c01988cffbca4324d84e
 EBUILD pv-1.8.0.ebuild 1333 BLAKE2B f913392b4b9176036c59aae399e4b8f9587086742539fffb78bf47a43bea23a53b26d84ea096dbc60483dfb73baeb66617c648fa903fee90bb9538be37983e5d SHA512 cc2d70a3b549774e2f7f01feb4e9ba730e8a653384b2e7947afb251915b7e4956f54c6bf8e26f394478bedc0c26aa8540a33e9eef7ad76e20bbae984c1b0f230
-EBUILD pv-1.8.5.ebuild 1279 BLAKE2B 395a764d4d7c6d73e1ea7b7cd0f76a80f084bd4d3edb48154caf607b8061c9b23f06ffd0c3a154b47162ce4bfa10dd19e2e8103ec99fff2100d266a5cec787d3 SHA512 d33c8ed56f208339cc7a530ef65dcf69ecee6a1c47b4070a5cac031f083d8e1aaaa3cff6763b68d2aa543ff87cd3713e76df9388484d1c3bcada6ed6ac5031fb
+EBUILD pv-1.8.5.ebuild 1278 BLAKE2B 0705970b9d42634081269d25fac77f86e7a584484a6699c6a5392ac252cdc3abe4a49d35d498316992b87996fdd7ac1724d0c5bfa7c727fe009581a3b95b154a SHA512 ea240f0733beb2460fa6b5b6cc5c33637bda265e1be86830dfa622a2f9f00f82c8dd4bc602cbdca9986690c57640e001fa739938f0a260f5825405633580c88d
 EBUILD pv-9999.ebuild 1286 BLAKE2B d706213997fa9347003871e733498eb6cd7772506d3af209f6d6114827308fe27df92baccdf0285c740fb1d8a792b965d2368bafaf855aef5ee52e804a66b5fd SHA512 435a956dedf403f7fd6710383df5e7dfe8c249b24e795c259c58b5fead2d4dddcd459005badb6ad3fb7d79576ca5d5752152446a2c17b17f2009ce6439353ad3
 MISC metadata.xml 430 BLAKE2B 17529b045e8c935c239eb9f9570ed7766ccaf2dbc422ab426fa012d7771d9d1ac9f1a9f7bc6782d75a0d715995c7c20bdeae314fcf26784ce1216cf088436034 SHA512 8f735c70b4f624b9a8f0ba5266513ca5b940b0f93210418d0c4dfd7e0702a7011f2d8ea8530a030b36497cc3a1e642c5dafe1d60df41aa8665eb329f17614b86
diff --git a/sys-apps/pv/pv-1.8.5.ebuild b/sys-apps/pv/pv-1.8.5.ebuild
index 078f660c94c4..3a5e84a8c476 100644
--- a/sys-apps/pv/pv-1.8.5.ebuild
+++ b/sys-apps/pv/pv-1.8.5.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
 	"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-3+"