commit:     636ebd9472d94241da1961e631a2135d6d30ab23
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 05:52:08 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 05:52:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636ebd94

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 <AT> gentoo.org>

 app-emulation/libvirt/libvirt-5.2.0-r2.ebuild | 2 +-
 app-emulation/libvirt/libvirt-5.5.0-r1.ebuild | 2 +-
 app-emulation/libvirt/libvirt-5.6.0.ebuild    | 2 +-
 app-emulation/libvirt/libvirt-9999.ebuild     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
index 705b36815f3..0d00aa14bca 100644
--- 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 b9c98b2386d..db4043651cc 100644
--- 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 9128fe282b5..11ae2447b09 100644
--- 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 9128fe282b5..11ae2447b09 100644
--- 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

Reply via email to