sys-apps/systemd: depend on sysvinit when sysv-utils is disabled

Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35

diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
index de147be79bd2822775a4e695874efd769b2498ab..697bda043aac15e261ca7edf2333a9921909aeee 100644 (file)
--- a/sys-apps/systemd/systemd-233-r6.ebuild
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -57,9 +57,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
        selinux? ( sys-libs/libselinux:0= )
-       sysv-utils? (
-               !sys-apps/systemd-sysv-utils
-               !sys-apps/sysvinit )
+       sysv-utils? ( !sys-apps/sysvinit )
+       !sysv-utils? ( sys-apps/sysvinit )
        xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"

diff --git a/sys-apps/systemd/systemd-235-r1.ebuild b/sys-apps/systemd/systemd-235-r1.ebuild
index a83897f709fecd8f74c768a79ca4047c766931f7..1175508fe8db14e7b9bad5ab2fa95de0bc67b8fa 100644 (file)
--- a/sys-apps/systemd/systemd-235-r1.ebuild
+++ b/sys-apps/systemd/systemd-235-r1.ebuild
@@ -59,9 +59,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
        selinux? ( sys-libs/libselinux:0= )
-       sysv-utils? (
-               !sys-apps/systemd-sysv-utils
-               !sys-apps/sysvinit )
+       sysv-utils? ( !sys-apps/sysvinit )
+       !sysv-utils? ( sys-apps/sysvinit )
        xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"

diff --git a/sys-apps/systemd/systemd-236-r1.ebuild b/sys-apps/systemd/systemd-236-r1.ebuild
index e70e61f3fc5f45d4b3e125c8b17dbbeb36a2247f..3c2ce0b338c5bd7c429f1342dfc7e81f5a45ad1d 100644 (file)
--- a/sys-apps/systemd/systemd-236-r1.ebuild
+++ b/sys-apps/systemd/systemd-236-r1.ebuild
@@ -57,9 +57,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
        selinux? ( sys-libs/libselinux:0= )
-       sysv-utils? (
-               !sys-apps/systemd-sysv-utils
-               !sys-apps/sysvinit )
+       sysv-utils? ( !sys-apps/sysvinit )
+       !sysv-utils? ( sys-apps/sysvinit )
        xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 8142a96390baaf6a60b01adca5adf4ffcf4ccb62..d13cbd6439487050d81f0db212b758fb2ee3d93d 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -57,9 +57,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
        selinux? ( sys-libs/libselinux:0= )
-       sysv-utils? (
-               !sys-apps/systemd-sysv-utils
-               !sys-apps/sysvinit )
+       sysv-utils? ( !sys-apps/sysvinit )
+       !sysv-utils? ( sys-apps/sysvinit )
        xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"