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

[Matthias Maier]

commit:     fb16688c4cc31556dfd229169195990027ced0d1
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 16:48:17 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 16:48:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb16688c

app-emulation/libvirt: Update live ebuild, ebuild maintenance

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-emulation/libvirt/libvirt-4.0.0.ebuild |  2 +-
 app-emulation/libvirt/libvirt-4.1.0.ebuild |  2 +-
 app-emulation/libvirt/libvirt-9999.ebuild  | 11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app-emulation/libvirt/libvirt-4.0.0.ebuild 
b/app-emulation/libvirt/libvirt-4.0.0.ebuild
index bed41a07b0a..954c95e4157 100644
--- a/app-emulation/libvirt/libvirt-4.0.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="git://libvirt.org/libvirt.git"
        SRC_URI=""
-       KEYWORDS="amd64 x86"
+       KEYWORDS=""
        SLOT="0"
 else
        # Versions with 4 numbers are stable updates:

diff --git a/app-emulation/libvirt/libvirt-4.1.0.ebuild 
b/app-emulation/libvirt/libvirt-4.1.0.ebuild
index 24e65968e4f..deed4ffd7db 100644
--- a/app-emulation/libvirt/libvirt-4.1.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.1.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="git://libvirt.org/libvirt.git"
        SRC_URI=""
-       KEYWORDS="amd64 x86"
+       KEYWORDS=""
        SLOT="0"
 else
        # Versions with 4 numbers are stable updates:

diff --git a/app-emulation/libvirt/libvirt-9999.ebuild 
b/app-emulation/libvirt/libvirt-9999.ebuild
index 0b482d5c102..7aff7685c70 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -58,6 +58,8 @@ RDEPEND="
        || ( >=net-analyzer/netcat6-1.0-r2 
>=net-analyzer/openbsd-netcat-1.105-r1 )
        >=net-libs/gnutls-1.0.25:0=
        net-libs/libssh2
+       net-libs/libtirpc
+       net-libs/rpcsvc-proto
        >=net-misc/curl-7.18.0
        sys-apps/dmidecode
        >=sys-apps/util-linux-2.17
@@ -235,6 +237,12 @@ 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)
@@ -268,7 +276,6 @@ 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)
@@ -276,6 +283,8 @@ src_configure() {
                $(use_with zeroconf avahi)
                $(use_with zfs storage-zfs)
 
+               --with-network
+
                --without-hal
                --without-netcf
                --without-sanlock