diff options
Diffstat (limited to 'app-emulation/libvirt/libvirt-5.8.0.ebuild')
-rw-r--r-- | app-emulation/libvirt/libvirt-5.8.0.ebuild | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild index 696f81fcdc79..5bec3ede6039 100644 --- a/app-emulation/libvirt/libvirt-5.8.0.ebuild +++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild @@ -60,7 +60,6 @@ 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= @@ -77,6 +76,7 @@ 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 @@ -325,7 +325,7 @@ src_test() { tests/Makefile export VIR_TEST_DEBUG=1 - HOME="${T}" emake check || die "tests failed" + HOME="${T}" emake check } src_install() { @@ -340,6 +340,9 @@ src_install() { rm -rf "${D}"/var rm -rf "${D}"/run + newbashcomp "${S}/tools/bash-completion/vsh" virsh + bashcomp_alias virsh virt-admin + use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! @@ -348,16 +351,13 @@ src_install() { systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true |