summaryrefslogtreecommitdiff
path: root/app-emulation/libvirt
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/libvirt')
-rw-r--r--app-emulation/libvirt/Manifest12
-rw-r--r--app-emulation/libvirt/libvirt-5.2.0-r2.ebuild20
-rw-r--r--app-emulation/libvirt/libvirt-5.5.0-r1.ebuild20
-rw-r--r--app-emulation/libvirt/libvirt-5.6.0.ebuild20
-rw-r--r--app-emulation/libvirt/libvirt-5.8.0.ebuild22
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild35
-rw-r--r--app-emulation/libvirt/metadata.xml4
7 files changed, 65 insertions, 68 deletions
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index dbde2dcee8bd..ff8c2482e8e4 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -19,9 +19,9 @@ DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2f
DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 4add0b727e4754bd1b2b4e9020942b17872533737e496ddf7976bf86a0fd3bcfbebd83387a8f3bab8dcc9afb05755b245e55682ed17d6094085d3dc96d94eefe SHA512 47923aaca605fb43a53238ac535abc1f88f73435336b8f3e88cb01df277ed205d99c586991e523aa32b50c832a0a7c949ab5f84dc78eb8d18a4951cfc791448d
DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B dbfc997123f43fcf9d635b59fffa00d96826e673c4037105151bde2c4a0fb3015a0e458e8e67969b5513a4ddbf41d062feb91e6a86054ddcc1d661f0554fd1f7 SHA512 95fe931394fb31288faf73349bb298f08f63cf062f851b9935303145f8166f69128be9360757f0e1845256c14f4d7672843dba0dc6c086b1c3c8bfc035cc8986
DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
-EBUILD libvirt-5.2.0-r2.ebuild 9748 BLAKE2B a193479eb74f656a41a96eb134e05e32e464c85e421b720627318ba78ab0dbe95649941b5ffb03821b52f95010f26977d30cc0154de30f6e7b21fb653e4437ff SHA512 87b84568d861cecdfe106a7b6f31570890c77f6fb58484faf586dad7827f6ef8bb52b0f25f8dd92556cd811aadada99700612d1afaf603d32545d5a41eaa916f
-EBUILD libvirt-5.5.0-r1.ebuild 9481 BLAKE2B ccf8b08a0073e88ef5718cbe48b5bbf256cc25520f55d486c3a79da2f6b0ff5380c4e6cc680eba125a738655d2ecb7d8f24756ad51743990becb5f313aa64bc4 SHA512 84ecf64c0fcdde9cd7a40f745ea8cd69a6c5476acdf4804eb63048d2f31b9b0cd535ea4fb7ed062cd16844c2c8053786e652b9febfa091a93827459b6989ecb3
-EBUILD libvirt-5.6.0.ebuild 9474 BLAKE2B 0ef7d9e54a1005739b18a7a383b91a2067ce0d40450be9c1786f509be0034b019192edf56a31b6f00864f88d5dae944707450f781ebb3991b763ee628934981b SHA512 a70deffb64868dae879ee3282d3426114798a46f4e9c6c64f932a7544d4bc5093638fab914e9b6dd2b867b29a82fa9d2c7724ec5a8052d8477c4bb131d61e32d
-EBUILD libvirt-5.8.0.ebuild 9606 BLAKE2B 226fb93c598b9afa0d6b60a03cbe7bf414ff0f818b98f03d5e371e51e6453becb0a8a775f037bf7abab5c3edf09486b894a712e2969d89672edd2cbd9abd0760 SHA512 c04a324286074b91876f7a544235068c4322359f1712c33ca24afcf831777a0be6db6d4fc54b8729b97407c39c4fad710e1948007973e8891c2b9e45c0d48b90
-EBUILD libvirt-9999.ebuild 9498 BLAKE2B 90016d6cb9d864dd8522de41a4b1c83775a465762d7ee5d3af8102d3eec1e1c8e79accb96a10c1d3119f12ded8668145f272d702cbd91a10de25270fd7edfe2d SHA512 dcbcb4d2719b3377ffda32121efd7caf758e43b540949319916c495c81c88fbc488c3bff2ecbe54b503c8f3feb61fdd240efdf1235d39c8a02ac6e163b622ff9
-MISC metadata.xml 3947 BLAKE2B a848dbc3ec81fd6d97a4067b3a0b508b2cbb6154b42af9f29830b801c801bf2db4706be9ab5bbb256ceff34f47a4b5d04215f5990a3b864e2070c7479632d753 SHA512 5c2a17a277bf942c6a28013659c3fd7c9b9dffa7c9209cb370852e018dd572a1a7080e56909bf2245ea29cc889f61c47e466e8eb5cf2f701f4a3b2d2fbdcaef8
+EBUILD libvirt-5.2.0-r2.ebuild 9684 BLAKE2B b924aa51971a05e5880ce341f4ea0ebcef0039f179e1a98ac80af697e11056213374260d6f35490688d71fada7c3e60a1ea3f386abaece50dbad5ce5b944375c SHA512 e24179ffd4ca9636c9619c238791586272933b00337fe3a3d312bbfe8f17e49ef39e33f962e742090e2309256fe80d82df4b114eeba9079eb117eb7f22601c5d
+EBUILD libvirt-5.5.0-r1.ebuild 9417 BLAKE2B f80fa9dd2242d74622d18a3d0c535b83e2fdfc205ba5f7097c059d2b530657d19f969583e5f8f9cfd98a0ff5dcc744b79386a142b3ca40088bcf055d24294a82 SHA512 a37aa512494368ea4b52548ae75b795f13a2eb494ac5854b09d4ad85771b5ab481603f8af57ce52916b3278b2bd77569f820a5298e4bb2929e0b6bd82fdb3a52
+EBUILD libvirt-5.6.0.ebuild 9410 BLAKE2B 56af18c238368dea87e19860189ad1bb0eba13450ebd7e053500ac97393752b38e72d60f861946b8d3aad1516ec8ae7950f98b16839797a9420d12881b58315a SHA512 154670e242f160374ea73828a0cf43187ae9c22724e39d0547944bc535d9efbd76cc855e255fe1fe308effce150f0f6b1291e9ffd692854536763aadefe9d245
+EBUILD libvirt-5.8.0.ebuild 9551 BLAKE2B 00c47f20cb087616821f999c7dfa01ff639d009b30fe6bcddeb515b0e2fa8213ce16d26c7be4cd41a5381013003686eae6b00fc89a82be4d59c3523231bb0c0b SHA512 311a04e646b9c025a7d5247f62af35b5f4ded2c596c52d4a48eac915b5584c3a796555bd02c6297ff8a4fa6d557fe3dfb6a19e5ba8f272cc55e3f6adb93bfdd2
+EBUILD libvirt-9999.ebuild 9482 BLAKE2B 3566eb4fcbc43322ec314c50057c99c9765c1700411575579f415fb19ea43f0075c22042ffd7434f4f154cf7b8defe97c3bec96bfe8e489b99f28f89858bde04 SHA512 482f5b2eff2cb16271774dac3f1bf02fd99e753dcefa34fa2b281d43913208fff78c91d045ff51ff9d36a86f542981e1e6d4cd3f26c385826a0bbb73e1a13715
+MISC metadata.xml 3791 BLAKE2B 1371e5d5c24af397dbfc9df32bd9b11cd32e49a72e3aba48e586660570bfe98f0b8f9d71d2c8e624b0e4ac470c275fbf87a2e49635b85560009aaedb25780933 SHA512 2ed3df24aecc0c419b6d6c512025b80c5efb9743843664ebd54fae15113f6625333b00c9e9b1e0aab7a5f1918ae194b71e8d59be6fa3e26964a0c677b1fcafd2
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
index 0d00aa14bca9..90133363bafa 100644
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
@@ -327,7 +327,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -341,6 +341,9 @@ src_install() {
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
@@ -349,16 +352,13 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r3" 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-r3" 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
diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
index db4043651ccd..5fd272b35627 100644
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
@@ -322,7 +322,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -336,6 +336,9 @@ src_install() {
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
@@ -344,16 +347,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
diff --git a/app-emulation/libvirt/libvirt-5.6.0.ebuild b/app-emulation/libvirt/libvirt-5.6.0.ebuild
index 11ae2447b09c..5fd58c94d1c2 100644
--- a/app-emulation/libvirt/libvirt-5.6.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.6.0.ebuild
@@ -322,7 +322,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -336,6 +336,9 @@ src_install() {
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
@@ -344,16 +347,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
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
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 63900def37dc..4761c3ff2cfc 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{5,6,7} )
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
+inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
if [[ ${PV} = *9999* ]]; then
inherit git-r3
@@ -61,7 +61,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=
@@ -78,6 +77,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
@@ -239,7 +239,7 @@ src_prepare() {
eautoreconf
}
-src_configure() {
+my_src_configure() {
local myeconfargs=(
$(use_with apparmor)
$(use_with apparmor apparmor-profiles)
@@ -295,6 +295,7 @@ src_configure() {
--disable-werror
--localstatedir=/var
+ --enable-dependency-tracking
)
if use virtualbox && has_version app-emulation/virtualbox-ose; then
@@ -308,13 +309,11 @@ src_configure() {
if [[ ${PV} = *9999* ]]; then
# Restore gnulib's config.sub and config.guess
# bug #377279
- (cd .gnulib && git reset --hard > /dev/null)
+ (cd ${S}/.gnulib && git reset --hard > /dev/null)
fi
}
-src_test() {
- cd "${BUILD_DIR}"
-
+my_src_test() {
# remove problematic tests, bug #591416, bug #591418
sed -i -e 's#commandtest$(EXEEXT) # #' \
-e 's#virfirewalltest$(EXEEXT) # #' \
@@ -323,10 +322,10 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
-src_install() {
+my_src_install() {
emake DESTDIR="${D}" \
SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
@@ -337,6 +336,9 @@ src_install() {
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
@@ -345,16 +347,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
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 3b887d5ce0c5..16c0b4752e5c 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -76,9 +76,7 @@
</flag>
<flag name="macvtap">
Support for MAC-based TAP (macvlan/macvtap). For networking instead
- of the normal TUN/TAP. It has its advantages and disadvantages.
- macvtap support requires very new kernels and is
- currently evolving. Support for this is experimental at best.
+ of the normal TUN/TAP.
</flag>
<flag name="vepa">Virtual Ethernet Port Aggregator (VEPA) / 802.1Qbg
support. Relies on macvtap support.</flag>