From: Matthias Maier <tamiko@gentoo.org>
Date: Sun, 17 Mar 2019 07:10:41 +0000 (-0500)
Subject: app-emulation/libvirt: synchronize 5.0.0-r1 and 9999 ebuilds
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=94d0d46893665ac7df4fbd36e54e7ef4a682fca2;p=gentoo.git

app-emulation/libvirt: synchronize 5.0.0-r1 and 9999 ebuilds

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
---

diff --git a/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild
index 5c5592c87a7e..f5e5d7d5ddef 100644
--- a/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild
@@ -230,8 +230,9 @@ src_prepare() {
 		# bug #377279
 		./bootstrap || die "bootstrap failed"
 		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
+		    git submodule status .gnulib | awk '{ print $1 }'
+		    git hash-object bootstrap.conf
+		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
 		) >.git-module-status
 	fi
 
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index d297b556e5b8..7d5151b6d96b 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{4,5,6,7} )
 
@@ -56,7 +56,11 @@ RDEPEND="
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
 	>=dev-libs/libxml2-2.7.6
-	|| ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
+	|| (
+		>=net-analyzer/gnu-netcat-0.7.1-r3
+		>=net-analyzer/netcat-110-r9
+		>=net-analyzer/openbsd-netcat-1.105-r1
+	)
 	>=net-libs/gnutls-1.0.25:0=
 	net-libs/libssh2
 	net-libs/libtirpc