From 8bf02d8edf7e8947a205e2dca77bee4c4e31739b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 6 Sep 2024 12:28:43 +0100
Subject: gentoo auto-resync : 06:09:2024 - 12:28:42

---
 sys-process/Manifest.gz                 | Bin 10140 -> 10138 bytes
 sys-process/runit/Manifest              |   5 +-
 sys-process/runit/metadata.xml          |  12 ++-
 sys-process/runit/runit-2.1.2-r4.ebuild | 136 -----------------------------
 sys-process/runit/runit-2.1.2-r5.ebuild | 149 ++++++++++++++++++++++++++++++++
 5 files changed, 163 insertions(+), 139 deletions(-)
 delete mode 100644 sys-process/runit/runit-2.1.2-r4.ebuild
 create mode 100644 sys-process/runit/runit-2.1.2-r5.ebuild

(limited to 'sys-process')

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index faccbf2df019..5c28e61f686e 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 21d4db3bc145..0d2605e5c900 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -4,6 +4,7 @@ AUX 3-2.1.2 388 BLAKE2B ee8d2db23ea43694a614f918d02af34db4bbe6a207eadead0cc668bf
 AUX ctrlaltdel 189 BLAKE2B 07b6936a7ae54a69227f794068cf41dfc2e54ba6ba032a7c1a58c5bcbf6567221e2e21afc5b8768742e63ce9e131841d8336c2cd081991c9e9d91f5d86f274c6 SHA512 a0980e1dbcd2c591997e62e3e1b8ab660c36f007d12f6dd3eb6607d286c0056eb96c40b997b2c9569a7e3a6bf9a2a39d8050c31aa09a9c0ba6eb931183049b1b
 AUX finish.getty 30 BLAKE2B 97dec53a513713c68febd68177227e165ed3bdee28d3db4f57b671e93dbf3e9cf233e92dd2c0a47fe4e0bec0fd13d994893f95914f19cb5f9dfa78b915857bc4 SHA512 122a4ab21dbd5e6b77e0225bda48f813ec680c85767fdc917933bd1a88d854b6714809ebd63d0fa6b81c25c5e0a9de224aa920565e8d197556e7d99c5836681d
 AUX run.getty-2.1.2 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa0a19e1bdeaa28cf6fe61fcdd46406c0f1f4a05113b8b2cdb652bcac3d6560e0af0f5d521c SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea
+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
-EBUILD runit-2.1.2-r4.ebuild 3567 BLAKE2B 5fcc63ee09bd6ca41a66e5bae28754e31c957d64ddb2b79c6bce6f29af472b8d653320032007f2e9d64fca60ef2f20169ee45b95edd8a7784f67b691a945f468 SHA512 93de0993bca8c8d0da6672bfe39f51e26ae8a3c618d239a0aefaed58541e107840e827e7f421fd6d421bfee5af114fe743da1d75e1e06dce2d4aa5573b952a1f
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD runit-2.1.2-r5.ebuild 3832 BLAKE2B bb9859d3d8550d17f6deb32ab63438817289f6ef2a569577e32dd6c249fa0d9dbafbcff4071b2ce6383f873ab6d2c64d07b6ac936e795feeb53ebb8034743161 SHA512 aefbfd66d4d81417ebb0cfa902b275d1f01e7aeea52e310074a3bdbd541f911743064b28573b7ec8e3f4cf365f0fbc34490b3462fe538bd3d94b1989b74e3abc
+MISC metadata.xml 480 BLAKE2B 03c67b9377e4dae4a777b363e128fc758cbd92d0ed6060d1036a6209184d518d59d6a98bfc731e0fa95151c0925195a1c512c2cfe46ddba1c964b66510f3bbba SHA512 71d359e43329f0b0561f01b132067c359e70af27868cc586beb96d5b9a0a1661eb122e0afcf90c5fb4f713b1e25d5e8072e4618143702bc1be063f2e194b211a
diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
index 115e9d64a669..73e765e89483 100644
--- a/sys-process/runit/metadata.xml
+++ b/sys-process/runit/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="person" proxied="yes">
+    <email>zhixu.liu@gmail.com</email>
+    <name>Z. Liu</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">clan/runit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-process/runit/runit-2.1.2-r4.ebuild b/sys-process/runit/runit-2.1.2-r4.ebuild
deleted file mode 100644
index 2254657370c9..000000000000
--- a/sys-process/runit/runit-2.1.2-r4.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 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/"
-SRC_URI="https://smarden.org/runit/${P}.tar.gz"
-S=${WORKDIR}/admin/${P}/src
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static"
-
-RDEPEND="sys-apps/openrc"
-
-src_prepare() {
-	default
-
-	# 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
-
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-}
-
-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]
-
-	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"
-		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-r5.ebuild b/sys-process/runit/runit-2.1.2-r5.ebuild
new file mode 100644
index 000000000000..8d6056f4ffba
--- /dev/null
+++ b/sys-process/runit/runit-2.1.2-r5.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 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 ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="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
+
+	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+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]
+
+	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"
+		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
+}
-- 
cgit v1.2.3