app-emulation/libvirt: Always require cgroupv1 hierarchy

It turns out that we need the cgroupv1 hierarchy also for non lxc
related stuff. Fix dependency accordingly

Bug: https://bugs.gentoo.org/691310
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
index 705b36815f3a0f49f58b79ee7faaee5c06c1eab8..0d00aa14bca98a02a231293fab12f51cd2058828 100644 (file)
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
@@ -60,6 +60,7 @@ RDEPEND="
        net-libs/rpcsvc-proto
        >=net-misc/curl-7.18.0
        sys-apps/dmidecode
+       !sys-apps/systemd[-cgroup-hybrid(+)]
        >=sys-apps/util-linux-2.17
        sys-devel/gettext
        sys-libs/ncurses:0=
@@ -75,7 +76,6 @@ RDEPEND="
        iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
        libssh? ( net-libs/libssh )
        lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
        nfs? ( net-fs/nfs-utils )
        numa? (
                >sys-process/numactl-2.0.2

diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
index b9c98b2386d0ff0d5f0d82b8da63799d4b076a80..db4043651ccdd684aa4b6e84e0d193af04f73c2e 100644 (file)
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
@@ -60,6 +60,7 @@ RDEPEND="
        net-libs/rpcsvc-proto
        >=net-misc/curl-7.18.0
        sys-apps/dmidecode
+       !sys-apps/systemd[-cgroup-hybrid(+)]
        >=sys-apps/util-linux-2.17
        sys-devel/gettext
        sys-libs/ncurses:0=
@@ -76,7 +77,6 @@ RDEPEND="
        iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
        libssh? ( net-libs/libssh )
        lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
        nfs? ( net-fs/nfs-utils )
        numa? (
                >sys-process/numactl-2.0.2

diff --git a/app-emulation/libvirt/libvirt-5.6.0.ebuild b/app-emulation/libvirt/libvirt-5.6.0.ebuild
index 9128fe282b5c8d674ef000288793b46bd1255db8..11ae2447b09c23104d95216846c4c799bd765872 100644 (file)
--- a/app-emulation/libvirt/libvirt-5.6.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.6.0.ebuild
@@ -60,6 +60,7 @@ RDEPEND="
        net-libs/rpcsvc-proto
        >=net-misc/curl-7.18.0
        sys-apps/dmidecode
+       !sys-apps/systemd[-cgroup-hybrid(+)]
        >=sys-apps/util-linux-2.17
        sys-devel/gettext
        sys-libs/ncurses:0=
@@ -76,7 +77,6 @@ RDEPEND="
        iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
        libssh? ( net-libs/libssh )
        lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
        nfs? ( net-fs/nfs-utils )
        numa? (
                >sys-process/numactl-2.0.2

diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 9128fe282b5c8d674ef000288793b46bd1255db8..11ae2447b09c23104d95216846c4c799bd765872 100644 (file)
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -60,6 +60,7 @@ RDEPEND="
        net-libs/rpcsvc-proto
        >=net-misc/curl-7.18.0
        sys-apps/dmidecode
+       !sys-apps/systemd[-cgroup-hybrid(+)]
        >=sys-apps/util-linux-2.17
        sys-devel/gettext
        sys-libs/ncurses:0=
@@ -76,7 +77,6 @@ RDEPEND="
        iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
        libssh? ( net-libs/libssh )
        lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
        nfs? ( net-fs/nfs-utils )
        numa? (
                >sys-process/numactl-2.0.2