| 1 |
commit: d908013eafa6bc6963020e09a1a1ff97ac1cd705 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 29 04:19:26 2018 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 29 04:19:26 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d908013e |
| 7 |
|
| 8 |
app-emulation/libvirt: update live ebuild |
| 9 |
|
| 10 |
Thanks to Michal Privoznik for the updated patch. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/659206 |
| 13 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 14 |
|
| 15 |
...sconf.patch => libvirt-4.5.0-do_not_use_sysconf.patch} | 0 |
| 16 |
app-emulation/libvirt/libvirt-9999.ebuild | 15 +++------------ |
| 17 |
2 files changed, 3 insertions(+), 12 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/libvirt/files/libvirt-4.4.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch |
| 20 |
similarity index 100% |
| 21 |
rename from app-emulation/libvirt/files/libvirt-4.4.0-do_not_use_sysconf.patch |
| 22 |
rename to app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch |
| 23 |
|
| 24 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
| 25 |
index 21cd6af1aa3..ba94138cba8 100644 |
| 26 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
| 27 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
| 28 |
@@ -122,7 +122,7 @@ DEPEND="${RDEPEND} |
| 29 |
virtual/pkgconfig" |
| 30 |
|
| 31 |
PATCHES=( |
| 32 |
- "${FILESDIR}"/${PN}-4.2.0-do_not_use_sysconf.patch |
| 33 |
+ "${FILESDIR}"/${PN}-4.5.0-do_not_use_sysconf.patch |
| 34 |
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch |
| 35 |
"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch |
| 36 |
) |
| 37 |
@@ -237,12 +237,6 @@ src_prepare() { |
| 38 |
} |
| 39 |
|
| 40 |
src_configure() { |
| 41 |
- # |
| 42 |
- # With 4.1.0 we should always enable networking support - otherwise not |
| 43 |
- # even minimal networking is available. Yes, this degrades |
| 44 |
- # USE=virt-network to a mere runtime-dep USE flag. But let's keep it |
| 45 |
- # for compatibility and convenience. |
| 46 |
- # |
| 47 |
local myeconfargs=( |
| 48 |
$(use_with apparmor) |
| 49 |
$(use_with apparmor apparmor-profiles) |
| 50 |
@@ -276,6 +270,7 @@ src_configure() { |
| 51 |
$(use_with udev) |
| 52 |
$(use_with uml) |
| 53 |
$(use_with vepa virtualport) |
| 54 |
+ $(use_with virt-network network) |
| 55 |
$(use_with wireshark-plugins wireshark-dissector) |
| 56 |
$(use_with xen) |
| 57 |
$(use_with xen xen-inotify) |
| 58 |
@@ -283,8 +278,6 @@ src_configure() { |
| 59 |
$(use_with zeroconf avahi) |
| 60 |
$(use_with zfs storage-zfs) |
| 61 |
|
| 62 |
- --with-network |
| 63 |
- |
| 64 |
--without-hal |
| 65 |
--without-netcf |
| 66 |
--without-sanlock |
| 67 |
@@ -343,9 +336,7 @@ src_install() { |
| 68 |
# Remove bogus, empty directories. They are either not used, or |
| 69 |
# libvirtd is able to create them on demand |
| 70 |
rm -rf "${D}"/etc/sysconfig |
| 71 |
- rm -rf "${D}"/var/cache |
| 72 |
- rm -rf "${D}"/var/run |
| 73 |
- rm -rf "${D}"/var/log |
| 74 |
+ rm -rf "${D}"/var |
| 75 |
|
| 76 |
use libvirtd || return 0 |
| 77 |
# From here, only libvirtd-related instructions, be warned! |
Archives