8 files changed, 63 insertions, 143 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index a00b5acbb3a6..19c56a1b8b4c 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/iotop-c/Manifest b/sys-process/iotop-c/Manifest
index 90ec09a6b699..c275ad506f91 100644
--- a/sys-process/iotop-c/Manifest
+++ b/sys-process/iotop-c/Manifest
@@ -1,3 +1,3 @@
 DIST iotop-c-1.26.tar.gz 139536 BLAKE2B 90bb3db7dd3b05604fa5368a881434eac06509921447fd53bda7e7291e2c823f82f9015f0c16c516dcfa7c8ee6198466b8634eaf1b111b4f911645b97fc2634f SHA512 47246bc025c396bcd7569bd19d52079701e3b86ab239ac3db1d1386f358f6e95a63d7bad8c1d0552fb61315a9db282967c65e110703863ae71fa6260b775942b
-EBUILD iotop-c-1.26.ebuild 904 BLAKE2B bb1d7e80a0b22f5cf0a5122f47dba0f99f6be2424d3e4e4c6547f9187917aaec87ad59ad3beb59e5f0d13b3cbedb13da31ac5dc5eaa8eafbe1d5b3b15449cbf9 SHA512 93a83ed02270adf2bbdffdac72ff4d084b714b06b4fb42268d8a49cc1d4caa0f36bef83ab37eef11b5411734ab4d40249110f59500bb8159c5ad7a9577a8310b
+EBUILD iotop-c-1.26.ebuild 903 BLAKE2B c200bdcc7f9a50ec030edc4a4a7d822b191d837539587b58799545d9c0755ef25cc8c1fa2d98c13bbebef6005f49bf6123c615b620283895330d6f7d2915da11 SHA512 5975ffe94ba459dcaff179e6923f986a5dee122ffdde3444afc9c65c96a852cc5edc683eccebd5913036a54a20796b03ff067512365b9ce88022cb9626e5c959
 MISC metadata.xml 1377 BLAKE2B 1b0e762f6677fd063044d1ad811fda5c95f64b36a51310dd3d9d0e652d9d671fe255a9cfa312d299369b19d4206723aa5010994ff6e20bf1b67be92432cb4350 SHA512 c5eee7ec3b5711666029d57eb84319e3f89373d7f73d067d1b990ecfcc6d98625966fb781ea3a47894ea078cfca40fc5f03a8d70dd83f7c93b8a77a6e14d2de0
diff --git a/sys-process/iotop-c/iotop-c-1.26.ebuild b/sys-process/iotop-c/iotop-c-1.26.ebuild
index 25d144e06767..ed39dbad1674 100644
--- a/sys-process/iotop-c/iotop-c-1.26.ebuild
+++ b/sys-process/iotop-c/iotop-c-1.26.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/iotop-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	sys-libs/ncurses:=
diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest
index 313892619605..d2ee26538162 100644
--- a/sys-process/nmon/Manifest
+++ b/sys-process/nmon/Manifest
@@ -1,4 +1,6 @@
 AUX nmon-16n-musl.patch 853 BLAKE2B b6f1dc26a08e74be03659c75186c9785214de662520509dbdc0ce13ecd3c6637ae0863009cedbe5a4ebf8cfbfebcb05ce7c08f605ce624278a8bb18250bfcc02 SHA512 cb45b34d8dcf27e8e160ee0b7632a393ad61b95c24f787671ff72b0f2e7aa00d3783497f426e3e6970cd43f2315af6e735c176141b3dca2e0edfebfa7048f4ab
 DIST lmon16n.c 268772 BLAKE2B a85aa30029cff39859058689f013801d864a9ecc0f1115d59aac4b86284108b43c1f4230fdc617c1b7718ed503634ba14dfca2f9a6fb4cb8592e9f6bc327739f SHA512 7b801e3d8a1d60794993af6572b8db04aa0bc707cebd16404c6ad9056f4c37216d57e894241540405192bf76a7e0a49f2e31b55b1721c7eb9da437808ff5abda
+DIST lmon16q.c 271117 BLAKE2B cd1238b0f7c00dc719635231dc38dd091d33608b124d619a0ca5cd2d1b58826d14024c01b4683ca53ecdfbb0efef8185e71cc800cbde7c0a5d43548b26730832 SHA512 06386a4c4b77d029b7cbbbc7f4f8b22028787d286e725257b5daef6d77551c5d3d2c26d303adfab8a953455e51ae308ffb5b1170856ff7b391e696f677bafeef
 EBUILD nmon-16n.ebuild 1051 BLAKE2B 4308829804e39c54ae26a0c992b944bb708c77cd46e6e3d8693169aa59fbed057c8a1dbce6339f4e417bc1ae68d8449d6f25ff642d7ccb2208e9ff9c5f91185e SHA512 b064ed2981332f6a7d40563b0570c610ea7039129c24d49006959c352c424b8dcd4ed7d0ee805fbbe3172af099ceffe9ad3434ebeb2c508d74f3f56de36c91cd
+EBUILD nmon-16q.ebuild 1053 BLAKE2B 358dd11702c585a963048788f21368bce22db6667ca576570411e0db3c46ddcdc1698f431e6429b6c2cd08290499d38969e2aa9d13f24a6c8da900c439996231 SHA512 50679194e23c331b1db101fc04426090d7ce3c4ae2d7a29343fd33fe5f5e5c4ea99d44791f0293f78ae42e788c19eb216612092187b16254abe01cc95c49fc91
 MISC metadata.xml 242 BLAKE2B 1dd26f07fdb13f53ab2af6aaff6c6f4ad675e9424088170eecaaceefd70d5f8e52b5849b97cb705c79cdeab723675bdc2a612b12ac5b1cec450dca47d170f344 SHA512 f910e0e91bee857d0b614384727e19b98e5743b1c55ae7fcd404a261670572429ee632dd91eb8156b656596f2d2b98f3a6fcf3f30c3db5666c8b14d36198b65c
diff --git a/sys-process/nmon/nmon-16q.ebuild b/sys-process/nmon/nmon-16q.ebuild
new file mode 100644
index 000000000000..3f39fe737fa2
--- /dev/null
+++ b/sys-process/nmon/nmon-16q.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="lmon${PV}"
+DESCRIPTION="Nigel's performance MONitor for CPU, memory, network, disks, etc"
+HOMEPAGE="http://nmon.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.c"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-16n-musl.patch
+)
+
+src_unpack() {
+	cp "${DISTDIR}"/${MY_P}.c "${S}"/${PN}.c || die
+}
+
+src_configure() {
+	local cflags=(
+		# Recommended by upstream to be always on
+		-DGETUSER
+		-DJFS
+		-DLARGEMEM
+		-DKERNEL_2_6_18
+
+		# Arches
+		$(usex amd64 -DX86 '')
+		$(usex x86 -DX86 '')
+		$(usex arm -DARM '')
+		$(usex ppc64 -DPOWER '')
+	)
+
+	append-cflags "${cflags[@]}"
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses) -lm"
+}
+
+src_compile() {
+	tc-export CC
+
+	emake ${PN} LDLIBS="${LIBS}"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 7c7a875fb36e..5b44d3813766 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -6,6 +6,5 @@ AUX finish.getty 30 BLAKE2B 97dec53a513713c68febd68177227e165ed3bdee28d3db4f57b6
 AUX run.getty-2.1.2 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa0a19e1bdeaa28cf6fe61fcdd46406c0f1f4a05113b8b2cdb652bcac3d6560e0af0f5d521c SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea
 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf
 DIST runit_2.1.2-59ubuntu1.debian.tar.xz 66756 BLAKE2B d071dae4a92f292837f55210cda62d8d0471efa623aeb43b56fb6381050b64fa5d3def7d0738756621e1c4d05b36d0cdaedb7d056d24d796f834ace932bd55b9 SHA512 de6289d9909a8df5c5657762f8214858f9301ac0d55cac9c605f70f92e663ed8067fe018a8585616099ac369b7078a95415040c27e82626261f2adf925d0bad2
-EBUILD runit-2.1.2-r1.ebuild 3535 BLAKE2B 82105cb3ebdb2897e293c0c36450f31b804b980a2801ac22eeb97ae8ff902ecaf53e6804a3214bb754d41098407be07257f322d272380dbf9129d88c27386bbc SHA512 2d9808af0300e6bfe62cf47f19d5aaafb771054ce373948bcef9a7bbf7c114219ef7927e628148e847ccfde5671dad047a502632053ac1aafa1f74dfb33d07f8
-EBUILD runit-2.1.2-r2.ebuild 3888 BLAKE2B 6d7b01fb497be6b3cb325ce0e4c265fcc9f5d1dcf24a0dff2a6487a269424aaa62df60bb95eeeeb069ff99b02175812dc6fb8d7c8943f51b1b60702cbf03dd10 SHA512 68a419d370ed3573c1101a243f0280b737f0832013d358e8653cb9452f93e87ddd9b30e84c5730303eb75b69c39c8034591887d93f72a82bdca7f647689aa5ad
+EBUILD runit-2.1.2-r2.ebuild 3881 BLAKE2B a9b06f6f41235f137817a3c4951eeb6575b0f9fd26109eabae879c7790d6e20a74a4e772e47a912caca1fc8ad77206ecbe25c2c3d1ee9cb5a08503e5518faed8 SHA512 c360647c8c6f06f27fb8f14ab53e8c2d22210f2db3088d1549130a90d121df808a2f15869f53090a0a0b1b8b58024c3bc320c6b16970523b369f4c478f8ea95f
 MISC metadata.xml 331 BLAKE2B bdd00a86fff3c8a1d5d1bbe0c02c3b8ff3744cbaa2418005f2874a8996993a9adb114827bbd2f508f7df43ce8746c4528366d12e02c429cd5515c3b27de07972 SHA512 31b1e624cd18692713a25780237cb492a9541b61f18fae9522c39c5e0e6f292acf4534ce63135c20ea4f8bf9f29e15533ff5692e012732c1ab9d839277677b94
diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
deleted file mode 100644
index 2250a85f21de..000000000000
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A UNIX init scheme with service supervision"
-HOMEPAGE="http://smarden.org/runit/"
-SRC_URI="http://smarden.org/runit/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static"
-
-RDEPEND="sys-apps/openrc"
-
-S=${WORKDIR}/admin/${P}/src
-
-src_prepare() {
-	default
-
-	# we either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile
-
-	# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726008
-	[[ ${COMPILER} == "diet" ]] &&
-		use ppc &&
-		filter-flags "-mpowerpc-gpopt"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-}
-
-src_install() {
-	into /
-	dobin $(<../package/commands)
-	dodir /sbin
-	mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
-	dosym ../etc/runit/2 /sbin/runsvdir-start
-
-	DOCS=( ../package/{CHANGES,README,THANKS,TODO} )
-	HTML_DOCS=( ../doc/*.html )
-	einstalldocs
-	doman ../man/*.[18]
-
-	dodir /etc/runit
-	exeinto /etc/runit
-	doexe "${FILESDIR}"/ctrlaltdel
-	newexe "${FILESDIR}"/1-${PV} 1
-	newexe "${FILESDIR}"/2-${PV} 2
-	newexe "${FILESDIR}"/3-${PV} 3
-
-	dodir /etc/sv
-	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
-		exeinto /etc/sv/getty-$tty/
-		newexe "${FILESDIR}"/finish.getty finish
-		newexe "${FILESDIR}"/run.getty-${PV} run
-		for script in finish run; do
-			sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/sv/getty-$tty/$script
-		done
-	done
-
-	# make sv command work
-	newenvd - 20runit <<- EOF
-		#/etc/env.d/20runit
-		SVDIR="/etc/service/"
-	EOF
-}
-
-default_config() {
-	local sv="${EROOT}"etc/sv
-	local service="${EROOT}"etc/service
-	mkdir -p "${service}" || die
-	for x in tty1 tty2 tty3 tty4 tty5 tty6; do
-	ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die
-	done
-	einfo "The links to services runit will supervise are installed"
-	einfo "in $service."
-	einfo "If you need multiple runlevels, please see the documentation"
-	einfo "for how to set them up."
-	einfo
-}
-
-migrate_from_211() {
-	# Create /etc/service and /var/service if requested
-	if [ -e "${T}"/make_var_service ]; then
-		ln -sf "${EROOT}"etc/runit/runsvdir/current "${EROOT}"etc/service || die
-		ln -sf "${EROOT}"etc/runit/runsvdir/current "${EROOT}"var/service || die
-	fi
-	if [ -d "${T}"/runsvdir ]; then
-		cp -a "${T}"/runsvdir "${EROOT}"etc/runit || die
-	fi
-	return 0
-}
-
-pkg_preinst() {
-	if  has_version '<sys-process/runit-2.1.2'; then
-		pre_212=yes
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z $REPLACING_VERSIONS ]]; then
-		default_config
-	elif [[ -n $pre_212 ]]; then
-		migrate_from_211
-	fi
-
-	ewarn "To make sure sv works correctly in your currently open"
-	ewarn "shells, please run the following command:"
-	ewarn
-	ewarn "source /etc/profile"
-	ewarn
-
-	if [ -L "${EROOT}"var/service ]; then
-		ewarn "Once this version of runit is active, please remove the"
-		ewarn "compatibility symbolic link at ${EROOT}var/service"
-		ewarn "The correct path now is ${EROOT}etc/service"
-		ewarn
-	fi
-
-	if [ -L "${EROOT}"etc/runit/runsvdir/all ]; then
-		ewarn "${EROOT}etc/runit/runsvdir/all has moved to"
-		iewarn "${EROOT}etc/sv."
-		ewarn "Any symbolic links under ${EROOT}etc/runit/runsvdir"
-		ewarn "which point to services through ../all should be updated to"
-		ewarn "point to them through ${EROOT}etc/sv."
-		ewarn "Once that is done, ${EROOT}etc/runit/runsvdir/all should be"
-		ewarn "removed."
-		ewarn
-	fi
-}
diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r2.ebuild
index 0d475b7e66d4..5f135925f8bc 100644
--- a/sys-process/runit/runit-2.1.2-r2.ebuild
+++ b/sys-process/runit/runit-2.1.2-r2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static"
 
 src_prepare() {