[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/, app-emulation/libvirt/files/

["Matthias Maier" <tamiko@gentoo.org>]

commit:     d908013eafa6bc6963020e09a1a1ff97ac1cd705
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 29 04:19:26 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 04:19:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d908013e

app-emulation/libvirt: update live ebuild

Thanks to Michal Privoznik for the updated patch.

Closes: https://bugs.gentoo.org/659206
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 ...sconf.patch => libvirt-4.5.0-do_not_use_sysconf.patch} |  0
 app-emulation/libvirt/libvirt-9999.ebuild                 | 15 +++------------
 2 files changed, 3 insertions(+), 12 deletions(-)

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
similarity index 100%
rename from app-emulation/libvirt/files/libvirt-4.4.0-do_not_use_sysconf.patch
rename to app-emulation/libvirt/files/libvirt-4.5.0-do_not_use_sysconf.patch

diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 21cd6af1aa3..ba94138cba8 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -122,7 +122,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.0-do_not_use_sysconf.patch
+	"${FILESDIR}"/${PN}-4.5.0-do_not_use_sysconf.patch
 	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
 )
@@ -237,12 +237,6 @@ src_prepare() {
 }
 
 src_configure() {
-	#
-	# With 4.1.0 we should always enable networking support - otherwise not
-	# even minimal networking is available. Yes, this degrades
-	# USE=virt-network to a mere runtime-dep USE flag. But let's keep it
-	# for compatibility and convenience.
-	#
 	local myeconfargs=(
 		$(use_with apparmor)
 		$(use_with apparmor apparmor-profiles)
@@ -276,6 +270,7 @@ src_configure() {
 		$(use_with udev)
 		$(use_with uml)
 		$(use_with vepa virtualport)
+		$(use_with virt-network network)
 		$(use_with wireshark-plugins wireshark-dissector)
 		$(use_with xen)
 		$(use_with xen xen-inotify)
@@ -283,8 +278,6 @@ src_configure() {
 		$(use_with zeroconf avahi)
 		$(use_with zfs storage-zfs)
 
-		--with-network
-
 		--without-hal
 		--without-netcf
 		--without-sanlock
@@ -343,9 +336,7 @@ src_install() {
 	# Remove bogus, empty directories. They are either not used, or
 	# libvirtd is able to create them on demand
 	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var/cache
-	rm -rf "${D}"/var/run
-	rm -rf "${D}"/var/log
+	rm -rf "${D}"/var
 
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!