[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Mike Gilbert]

commit:     81f20ebb0c4714af59f9dcc1a4b2c36926e43d60
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 21 16:08:50 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Sep 21 16:09:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f20ebb

sys-apps/systemd: fix install with USE="-split-usr -sysv-utils"

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/systemd-251.4.ebuild | 7 ++++---
 sys-apps/systemd/systemd-9999.ebuild  | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys-apps/systemd/systemd-251.4.ebuild 
b/sys-apps/systemd/systemd-251.4.ebuild
index 4a104481e51e..77e48349d5ef 100644
--- a/sys-apps/systemd/systemd-251.4.ebuild
+++ b/sys-apps/systemd/systemd-251.4.ebuild
@@ -368,6 +368,7 @@ multilib_src_test() {
 
 multilib_src_install_all() {
        local rootprefix=$(usex split-usr '' /usr)
+       local sbin=$(usex split-usr sbin bin)
 
        # meson doesn't know about docdir
        mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
@@ -376,19 +377,19 @@ multilib_src_install_all() {
        dodoc "${FILESDIR}"/nsswitch.conf
 
        if ! use resolvconf; then
-               rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+               rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
        fi
 
        rm "${ED}"/etc/init.d/README || die
        rm 
"${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
 
        if ! use sysv-utils; then
-               rm 
"${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} 
|| die
+               rm 
"${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
 || die
                rm "${ED}"/usr/share/man/man1/init.1 || die
                rm 
"${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 
|| die
        fi
 
-       if ! use resolvconf && ! use sysv-utils; then
+       if ! use resolvconf && ! use sysv-utils && ! use split-usr; then
                rmdir "${ED}${rootprefix}"/sbin || die
        fi
 

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index d317887a899f..733ffd2c153a 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -365,6 +365,7 @@ multilib_src_test() {
 
 multilib_src_install_all() {
        local rootprefix=$(usex split-usr '' /usr)
+       local sbin=$(usex split-usr sbin bin)
 
        # meson doesn't know about docdir
        mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
@@ -373,19 +374,19 @@ multilib_src_install_all() {
        dodoc "${FILESDIR}"/nsswitch.conf
 
        if ! use resolvconf; then
-               rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+               rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
        fi
 
        rm "${ED}"/etc/init.d/README || die
        rm 
"${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
 
        if ! use sysv-utils; then
-               rm 
"${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} 
|| die
+               rm 
"${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
 || die
                rm "${ED}"/usr/share/man/man1/init.1 || die
                rm 
"${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 
|| die
        fi
 
-       if ! use resolvconf && ! use sysv-utils; then
+       if ! use resolvconf && ! use sysv-utils && ! use split-usr; then
                rmdir "${ED}${rootprefix}"/sbin || die
        fi