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

[Mike Gilbert]

commit:     f8313536f2eea2a8857c5d5a750e11a4cf707817
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 17:32:32 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 17:35:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8313536

sys-apps/systemd: enable sysv compat code

This enables some useful functionality for people when swapping init
providers. Remove sysv-generator since it doesn't process OpenRC
scripts properly.

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

 sys-apps/systemd/{systemd-245-r3.ebuild => systemd-245-r4.ebuild} | 5 +++--
 sys-apps/systemd/systemd-9999.ebuild                              | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sys-apps/systemd/systemd-245-r3.ebuild 
b/sys-apps/systemd/systemd-245-r4.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-245-r3.ebuild
rename to sys-apps/systemd/systemd-245-r4.ebuild
index 0fd4ff855ec..b686b0a738b 100644
--- a/sys-apps/systemd/systemd-245-r3.ebuild
+++ b/sys-apps/systemd/systemd-245-r4.ebuild
@@ -256,8 +256,6 @@ multilib_src_configure() {
                -Dsplit-bin=true
                -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
                -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               -Dsysvinit-path=
-               -Dsysvrcnd-path=
                # Avoid infinite exec recursion, bug 642724
                -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
                # no deps
@@ -356,6 +354,9 @@ multilib_src_install_all() {
                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}"/usr/share/man/man1/init.1 || die

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index dcf64e48a2a..c692b2d9f5d 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -255,8 +255,6 @@ multilib_src_configure() {
                -Dsplit-bin=true
                -Drootprefix="$(usex split-usr "${EPREFIX:-/}" 
"${EPREFIX}/usr")"
                -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-               -Dsysvinit-path=
-               -Dsysvrcnd-path=
                # Avoid infinite exec recursion, bug 642724
                -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
                # no deps
@@ -355,6 +353,9 @@ multilib_src_install_all() {
                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}"/usr/share/man/man1/init.1 || die