[gentoo-commits] repo/gentoo:master commit in: sys-process/runit/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     cb893880b4741d78a58b005a005985bbf7dc0dd8
Author:     Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Mon Sep  9 08:55:05 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 15:31:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb893880

sys-process/runit: fix path issue

1. install binary to /usr (remove 'into /')
2. handle symlink of /sbin/runsvdir-start by USE split-usr

Closes: https://bugs.gentoo.org/904989
Closes: https://bugs.gentoo.org/935656
Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38531
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../runit/{runit-2.1.2-r5.ebuild => runit-2.1.2-r6.ebuild}    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys-process/runit/runit-2.1.2-r5.ebuild b/sys-process/runit/runit-2.1.2-r6.ebuild
similarity index 94%
rename from sys-process/runit/runit-2.1.2-r5.ebuild
rename to sys-process/runit/runit-2.1.2-r6.ebuild
index 7d747bcca298..018348aa5796 100644
--- a/sys-process/runit/runit-2.1.2-r5.ebuild
+++ b/sys-process/runit/runit-2.1.2-r6.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/admin/${P}/src
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static"
+IUSE="split-usr static"
 
 RDEPEND="sys-apps/openrc"
 
@@ -50,11 +50,14 @@ src_configure() {
 }
 
 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
+	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 )