Adding metadata

9 files changed, 72 insertions, 440 deletions

diff --git a/sys-process/daemontools/daemontools-0.76-r10.ebuild b/sys-process/daemontools/daemontools-0.76-r10.ebuild
deleted file mode 100644
index 6b5417ad8141..000000000000
--- a/sys-process/daemontools/daemontools-0.76-r10.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Collection of tools for managing UNIX services"
-HOMEPAGE="https://cr.yp.to/daemontools.html"
-SRC_URI="
-	https://cr.yp.to/daemontools/${P}.tar.gz
-	http://smarden.org/pape/djb/manpages/${P}-man-20020131.tar.gz"
-S="${WORKDIR}/admin/${P}/src"
-
-LICENSE="public-domain GPL-2"	# GPL-2 for init script
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="selinux static"
-
-RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-errno.patch
-	"${FILESDIR}"/${PV}-C99-decls.patch
-	"${FILESDIR}"/${PV}-makefile.patch
-)
-
-src_configure() {
-	tc-export AR CC
-	use static && append-ldflags -static
-
-	touch home || die
-}
-
-src_install() {
-	keepdir /service
-
-	dobin $(<../package/commands)
-	dodoc CHANGES ../package/README TODO
-	doman "${WORKDIR}"/${PN}-man/*.8
-
-	newinitd "${FILESDIR}"/svscan.init-0.76-r7 svscan
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You can run daemontools using the svscan init.d script,"
-	einfo "or you could run it through inittab."
-	einfo "To use inittab, emerge supervise-scripts and run:"
-	einfo "svscan-add-to-inittab"
-	einfo "Then you can hup init with the command telinit q"
-	einfo
-}
diff --git a/sys-process/daemontools/daemontools-0.76-r11.ebuild b/sys-process/daemontools/daemontools-0.76-r11.ebuild
deleted file mode 100644
index 2a5677bde5c1..000000000000
--- a/sys-process/daemontools/daemontools-0.76-r11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Collection of tools for managing UNIX services"
-HOMEPAGE="https://cr.yp.to/daemontools.html"
-SRC_URI="
-	https://cr.yp.to/daemontools/${P}.tar.gz
-	http://smarden.org/pape/djb/manpages/${P}-man-20020131.tar.gz"
-S="${WORKDIR}/admin/${P}/src"
-
-LICENSE="public-domain GPL-2"	# GPL-2 for init script
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="selinux static"
-
-RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-errno.patch
-	"${FILESDIR}"/${PV}-C99-decls.patch
-	"${FILESDIR}"/${PV}-makefile.patch
-	"${FILESDIR}"/${PV}-implicit-func-decl-clang16.patch
-)
-
-src_configure() {
-	tc-export AR CC
-	use static && append-ldflags -static
-
-	touch home || die
-}
-
-src_install() {
-	keepdir /service
-
-	dobin $(<../package/commands)
-	dodoc CHANGES ../package/README TODO
-	doman "${WORKDIR}"/${PN}-man/*.8
-
-	newinitd "${FILESDIR}"/svscan.init-0.76-r7 svscan
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You can run daemontools using the svscan init.d script,"
-	einfo "or you could run it through inittab."
-	einfo "To use inittab, emerge supervise-scripts and run:"
-	einfo "svscan-add-to-inittab"
-	einfo "Then you can hup init with the command telinit q"
-	einfo
-}
diff --git a/sys-process/nvtop/Manifest b/sys-process/nvtop/Manifest
index 3293794e85b0..91eaf652afb1 100644
--- a/sys-process/nvtop/Manifest
+++ b/sys-process/nvtop/Manifest
@@ -1,2 +1,3 @@
 DIST nvtop-3.1.0.tar.gz 269897 BLAKE2B 8d8e8b8014ea4d9dba241d620eaf9b4c37e99b593a8dddc31cc40d084eb1d5aaf3dff712d86567f46fb3b360b77392ac1836c9487e6b9f9a2514b27f2ebd1e94 SHA512 a22806920d85954930cf9a24450de2603418326b59bc7acedf8ff59ddb0f40e119de496a63f42706b4b6961c83ba664a8a33a3e4106a1c3ef6cd3da758aa5a55
 DIST nvtop-3.2.0.tar.gz 299547 BLAKE2B ea4c154adcfe8cd9187031b62413c981c558dd8ffcc86c01be05711184dcc0f0cf3df35ffc994bc26952e97704faa56519012c64e324ea874e5fe1cc4b370a68 SHA512 582b849c6d157321439344922c26ce8d74b9d44254f952e0c4737ea24893c16f1b61610426c4fcd2dfdcd03c81f857e2847c24d7b32f38562210f7ac3d50a7b0
+DIST nvtop-3.3.2.tar.gz 316591 BLAKE2B ea85c8f278e164ff0dfc2c29c51053521154b51319254a5f4f223a945b816b3d876a21ce179559b0e255e0e8f61755db9ad99e66a7e0d1c2c7c18a6080dcd068 SHA512 a88f7d6a09712462f1448ec8e3b86285c423e20767b07ac2ead20bfbb219e78c04da6ac08781b213c41bde6997ad56a6dc08be45de465986633781464a5a1a58
diff --git a/sys-process/nvtop/nvtop-3.3.2.ebuild b/sys-process/nvtop/nvtop-3.3.2.ebuild
new file mode 100644
index 000000000000..8f1314b4bb18
--- /dev/null
+++ b/sys-process/nvtop/nvtop-3.3.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="(h)top like task monitor for AMD, NVIDIA, Intel and other GPUs"
+HOMEPAGE="https://github.com/Syllo/nvtop"
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Syllo/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Syllo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+IUSE="
+	unicode
+	video_cards_amdgpu
+	video_cards_freedreno
+	video_cards_intel
+	video_cards_nvidia
+	video_cards_panfrost
+	video_cards_panthor
+"
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu] )
+	video_cards_freedreno? ( x11-libs/libdrm[video_cards_freedreno] )
+	video_cards_intel?  ( virtual/udev )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers )
+	video_cards_panfrost? ( x11-libs/libdrm )
+	video_cards_panthor? ( x11-libs/libdrm )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCURSES_NEED_WIDE=$(usex unicode)
+
+		-DAMDGPU_SUPPORT=$(usex video_cards_amdgpu)
+		-DINTEL_SUPPORT=$(usex video_cards_intel)
+		-DMSM_SUPPORT=$(usex video_cards_freedreno)
+		-DNVIDIA_SUPPORT=$(usex video_cards_nvidia)
+		-DPANFROST_SUPPORT=$(usex video_cards_panfrost)
+		-DPANTHOR_SUPPORT=$(usex video_cards_panthor)
+	)
+
+	cmake_src_configure
+}
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index be29c1097692..ed6757e1d6ef 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -1,4 +1,2 @@
-DIST runit-2.1.2-patches-20240905.tar.xz 20104 BLAKE2B ebdc123ea722f223eec3ad5d63a4c3e7c4ef771592796f2d5624f4308c1d08eede7d4fa0c2a9fdd23dbf74be6135c69bae495d89cf582678b9308b1d146ef883 SHA512 15c5acd865ecc7f6c3b9b1fc94dc00bc44ceefd1c0ca6b53963d94338712cd716ad961826cccd065029ee67464dc288428952004ffcec3a1a97a058696f4f233
-DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf
 DIST runit-2.2.0-patches-20250506.tar.xz 12528 BLAKE2B 02349bc5b0566f4acd44768e1ed0139e53fdb62a0fa6c3e083462f1e212890afa3eb33af60b7eb787801c0a9780416b8e2ce807ec191455881759c2924bf06a0 SHA512 959c539d2ef265baab4e334f35b386d0cb0a2896faea3aba9239f090ac7fdb5a714e2d4408d63d826ecf8977ce4eaf8dacabba849e9383560182a4163045acaf
 DIST runit-2.2.0.tar.gz 111395 BLAKE2B 46a4b91cf180694a69ade3cabaddb35a89db516ef75e9fc69b8091a5c3570079796b8a4cf227edc74938e182833edcce7af40f01d5cb1b4032993fb094459ede SHA512 cedfe6d3505aca754ff11d791055f023a7be42e2fbdd2e4964b3460692474371a72363cf181ae2dfae5c02df45ebf568cdab72a5000d1b48e26e12217d4e9a3d
diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
index 98f5fef32194..16e752e07fa7 100644
--- a/sys-process/runit/metadata.xml
+++ b/sys-process/runit/metadata.xml
@@ -12,6 +12,7 @@
  
  <use>
   <flag name="scripts">Install boot scripts into /etc/runit/.</flag>
+  <flag name="system-init">Installed as a provider of virtual/service-manager.</flag>
  </use>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/sys-process/runit/runit-2.1.2-r6.ebuild b/sys-process/runit/runit-2.1.2-r6.ebuild
deleted file mode 100644
index a3681cbfdfda..000000000000
--- a/sys-process/runit/runit-2.1.2-r6.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A UNIX init scheme with service supervision"
-HOMEPAGE="https://smarden.org/runit/"
-PATCH_VER=20240905
-SRC_URI="
-	https://smarden.org/runit/${P}.tar.gz
-	https://github.com/clan/runit/releases/download/${PV}-r5/${P}-patches-${PATCH_VER}.tar.xz
-"
-S=${WORKDIR}/admin/${P}/src
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="split-usr static"
-
-RDEPEND="sys-apps/openrc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	unpack ${P}-patches-${PATCH_VER}.tar.xz
-}
-
-src_prepare() {
-	default
-
-	cd "${S}"/.. || die
-	eapply -p3 "${WORKDIR}"/patches
-	cd "${S}" || die
-
-	# We either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile || die
-
-	# 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
-
-	append-flags -std=gnu17  # XXX https://bugs.gentoo.org/946137, workaround for gcc15
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-	sed -i -e "s:ar cr:$(tc-getAR) cr:" print-ar.sh || die
-	sed -i -e "s:ranlib :$(tc-getRANLIB) :" print-ar.sh || die
-}
-
-src_install() {
-	dobin $(<../package/commands)
-	dodir /sbin
-	mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
-	if use split-usr ; then
-		dosym ../etc/runit/2 /sbin/runsvdir-start
-	else
-		dosym ../../etc/runit/2 /sbin/runsvdir-start
-	fi
-
-	DOCS=( ../package/{CHANGES,README,THANKS,TODO} )
-	HTML_DOCS=( ../doc/*.html )
-	einstalldocs
-	doman ../man/*.[18]
-
-	exeinto /etc/runit
-	doexe "${FILESDIR}"/ctrlaltdel
-	newexe "${FILESDIR}"/1-r1 1
-	newexe "${FILESDIR}"/2-r1 2
-	newexe "${FILESDIR}"/3-r1 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 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"
-		ewarn "${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-r7.ebuild b/sys-process/runit/runit-2.1.2-r7.ebuild
deleted file mode 100644
index 7d0d55e5a47e..000000000000
--- a/sys-process/runit/runit-2.1.2-r7.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A UNIX init scheme with service supervision"
-HOMEPAGE="https://smarden.org/runit/"
-PATCH_VER=20240905
-SRC_URI="
-	https://smarden.org/runit/${P}.tar.gz
-	https://github.com/clan/runit/releases/download/${PV}-r5/${P}-patches-${PATCH_VER}.tar.xz
-"
-S=${WORKDIR}/admin/${P}/src
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="+scripts split-usr static"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	unpack ${P}-patches-${PATCH_VER}.tar.xz
-}
-
-src_prepare() {
-	default
-
-	cd "${S}"/.. || die
-	eapply -p3 "${WORKDIR}"/patches
-	cd "${S}" || die
-
-	# We either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile || die
-
-	# 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
-
-	append-flags -std=gnu17  # XXX https://bugs.gentoo.org/946137, workaround for gcc15
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-	sed -i -e "s:ar cr:$(tc-getAR) cr:" print-ar.sh || die
-	sed -i -e "s:ranlib :$(tc-getRANLIB) :" print-ar.sh || die
-}
-
-src_install() {
-	dobin $(<../package/commands)
-	dodir /sbin
-	mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
-	if use split-usr ; then
-		dosym ../etc/runit/2 /sbin/runsvdir-start
-	else
-		dosym ../../etc/runit/2 /sbin/runsvdir-start
-	fi
-
-	DOCS=( ../package/{CHANGES,README,THANKS,TODO} )
-	HTML_DOCS=( ../doc/*.html )
-	einstalldocs
-	doman ../man/*.[18]
-
-	if use scripts ; then
-		exeinto /etc/runit
-		doexe "${FILESDIR}"/ctrlaltdel
-		newexe "${FILESDIR}"/1-r2 1
-		newexe "${FILESDIR}"/2-r1 2
-		newexe "${FILESDIR}"/3-r2 3
-		doexe "${FILESDIR}"/rc.sh
-		insinto /etc/runit/rc
-		doins "${FILESDIR}"/1.openrc.example
-		doins "${FILESDIR}"/3.openrc.example
-	fi
-
-	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 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 use scripts; then
-		ewarn "Currently, no task(s) will run in stage 1 & 3, you're on your own"
-		ewarn "to put script(s) into /etc/runit/rc/, please see /etc/runit/rc.sh"
-		ewarn "for name in different stages."
-		ewarn
-	else
-		ewarn "This build with USE=\"-scripts\" doesn\'t include any boot scripts"
-		ewarn "into /etc/runit, you are on your own to put the scripts."
-		ewarn "Also, /sbin/runsvdir-start is a broken symlink to /etc/runit/2, you will"
-		ewarn "need to create script /etc/runit/2 before use it."
-		ewarn
-	fi
-
-	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"
-		ewarn "${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.2.0-r1.ebuild b/sys-process/runit/runit-2.2.0-r3.ebuild
index ec0813f5ec4a..f0b98785fc7c 100644
--- a/sys-process/runit/runit-2.2.0-r1.ebuild
+++ b/sys-process/runit/runit-2.2.0-r3.ebuild
@@ -7,22 +7,30 @@ inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A UNIX init scheme with service supervision"
 HOMEPAGE="https://smarden.org/runit/"
-PATCH_VER=20240905
+PATCH_VER=20250506
 SRC_URI="
 	https://smarden.org/runit/${P}.tar.gz
+	https://github.com/clan/runit/releases/download/${PF}/${P}-patches-${PATCH_VER}.tar.xz
 "
 S=${WORKDIR}/admin/${P}/src
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="+scripts split-usr static"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+scripts split-usr system-init static"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	unpack ${P}-patches-${PATCH_VER}.tar.xz
+}
 
 src_prepare() {
 	default
 
 	cd "${S}" || die
 
+	eapply -p2 "${WORKDIR}"/patches
+
 	# We either build everything or nothing static
 	sed -i -e 's:-static: :' Makefile || die
 
@@ -35,7 +43,6 @@ src_prepare() {
 src_configure() {
 	use static && append-ldflags -static
 
-	append-flags -std=gnu17  # XXX https://bugs.gentoo.org/946137, workaround for gcc15
 	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
 	sed -i -e "s:ar cr:$(tc-getAR) cr:" print-ar.sh || die