sys-apps/systemd: make sure we have /bin/kill installed

Bug: https://bugs.gentoo.org/600432

Package-Manager: portage-2.3.2_p8

diff --git a/sys-apps/systemd/systemd-226-r2.ebuild b/sys-apps/systemd/systemd-226-r2.ebuild
index 80b0c0e14388ee9b97791b10e38d41917684610b..f7bc7715dbb0057b04d0c2d396875443e9ea04d8 100644 (file)
--- a/sys-apps/systemd/systemd-226-r2.ebuild
+++ b/sys-apps/systemd/systemd-226-r2.ebuild
@@ -65,6 +65,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=[${MULTILIB_USEDEP}]
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
        >=sys-apps/baselayout-2.2
+       || (
+               sys-apps/util-linux[kill(-)]
+               sys-process/procps[kill(+)]
+               sys-apps/coreutils[kill(-)]
+       )
        !sys-auth/nss-myhostname
        !sys-fs/eudev
        !sys-fs/udev"

diff --git a/sys-apps/systemd/systemd-228-r1.ebuild b/sys-apps/systemd/systemd-228-r1.ebuild
index 61af7c49b3d6a1b9be0da7c6138e74ba74fd0543..35d05b2f3e7801ca777c6a6d8eb3b23e8d408781 100644 (file)
--- a/sys-apps/systemd/systemd-228-r1.ebuild
+++ b/sys-apps/systemd/systemd-228-r1.ebuild
@@ -65,6 +65,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
        >=sys-apps/baselayout-2.2
+       || (
+               sys-apps/util-linux[kill(-)]
+               sys-process/procps[kill(+)]
+               sys-apps/coreutils[kill(-)]
+       )
        !sys-auth/nss-myhostname
        !sys-fs/eudev
        !sys-fs/udev"

diff --git a/sys-apps/systemd/systemd-229.ebuild b/sys-apps/systemd/systemd-229.ebuild
index 543f5729e68646886f43f6e21ae8ca5108b188f1..28dadb7cf4b1c02e933a03ca6b82a48197447b6b 100644 (file)
--- a/sys-apps/systemd/systemd-229.ebuild
+++ b/sys-apps/systemd/systemd-229.ebuild
@@ -68,6 +68,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
 RDEPEND="${COMMON_DEPEND}
        >=sys-apps/baselayout-2.2
        selinux? ( sec-policy/selinux-base-policy[systemd] )
+       || (
+               sys-apps/util-linux[kill(-)]
+               sys-process/procps[kill(+)]
+               sys-apps/coreutils[kill(-)]
+       )
        !sys-auth/nss-myhostname
        !sys-fs/eudev
        !sys-fs/udev

diff --git a/sys-apps/systemd/systemd-230-r2.ebuild b/sys-apps/systemd/systemd-230-r2.ebuild
index 01e5d25e3bf06065c3fe5733865fe062a0aa5fdb..91b4c0dbdaa369546cc278479fa2d252abcc4330 100644 (file)
--- a/sys-apps/systemd/systemd-230-r2.ebuild
+++ b/sys-apps/systemd/systemd-230-r2.ebuild
@@ -69,6 +69,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
 RDEPEND="${COMMON_DEPEND}
        >=sys-apps/baselayout-2.2
        selinux? ( sec-policy/selinux-base-policy[systemd] )
+       || (
+               sys-apps/util-linux[kill(-)]
+               sys-process/procps[kill(+)]
+               sys-apps/coreutils[kill(-)]
+       )
        !sys-auth/nss-myhostname
        !<sys-kernel/dracut-044
        !sys-fs/eudev

diff --git a/sys-apps/systemd/systemd-231.ebuild b/sys-apps/systemd/systemd-231.ebuild
index b5e9f249d0017794dc028aae1ba3f3823a8a08f4..6b536d58be89fe111e9579ccedecb11d8439fed1 100644 (file)
--- a/sys-apps/systemd/systemd-231.ebuild
+++ b/sys-apps/systemd/systemd-231.ebuild
@@ -68,6 +68,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
 RDEPEND="${COMMON_DEPEND}
        >=sys-apps/baselayout-2.2
        selinux? ( sec-policy/selinux-base-policy[systemd] )
+       || (
+               sys-apps/util-linux[kill(-)]
+               sys-process/procps[kill(+)]
+               sys-apps/coreutils[kill(-)]
+       )
        !sys-auth/nss-myhostname
        !<sys-kernel/dracut-044
        !sys-fs/eudev

diff --git a/sys-apps/systemd/systemd-232.ebuild b/sys-apps/systemd/systemd-232.ebuild
index 028d6865ad8156b5f732ee19552ef20ed02086f3..00545784786a7c5bed58848a841176141f5d490a 100644 (file)
--- a/sys-apps/systemd/systemd-232.ebuild
+++ b/sys-apps/systemd/systemd-232.ebuild
@@ -68,6 +68,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
 RDEPEND="${COMMON_DEPEND}
        >=sys-apps/baselayout-2.2
        selinux? ( sec-policy/selinux-base-policy[systemd] )
+       || (
+               sys-apps/util-linux[kill(-)]
+               sys-process/procps[kill(+)]
+               sys-apps/coreutils[kill(-)]
+       )
        !sys-auth/nss-myhostname
        !<sys-kernel/dracut-044
        !sys-fs/eudev

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 028d6865ad8156b5f732ee19552ef20ed02086f3..00545784786a7c5bed58848a841176141f5d490a 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -68,6 +68,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
 RDEPEND="${COMMON_DEPEND}
        >=sys-apps/baselayout-2.2
        selinux? ( sec-policy/selinux-base-policy[systemd] )
+       || (
+               sys-apps/util-linux[kill(-)]
+               sys-process/procps[kill(+)]
+               sys-apps/coreutils[kill(-)]
+       )
        !sys-auth/nss-myhostname
        !<sys-kernel/dracut-044
        !sys-fs/eudev