From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1077886-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 455F0138334
	for <garchives@archives.gentoo.org>; Sun, 17 Mar 2019 07:28:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 41837E09CF;
	Sun, 17 Mar 2019 07:28:02 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 102E6E09CF
	for <gentoo-commits@lists.gentoo.org>; Sun, 17 Mar 2019 07:28:02 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id C7D58335CD5
	for <gentoo-commits@lists.gentoo.org>; Sun, 17 Mar 2019 07:27:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id BDE4C571
	for <gentoo-commits@lists.gentoo.org>; Sun, 17 Mar 2019 07:27:56 +0000 (UTC)
From: "Matthias Maier" <tamiko@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" <tamiko@gentoo.org>
Message-ID: <1552807643.94d0d46893665ac7df4fbd36e54e7ef4a682fca2.tamiko@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/libvirt/libvirt-5.0.0-r1.ebuild app-emulation/libvirt/libvirt-9999.ebuild
X-VCS-Directories: app-emulation/libvirt/
X-VCS-Committer: tamiko
X-VCS-Committer-Name: Matthias Maier
X-VCS-Revision: 94d0d46893665ac7df4fbd36e54e7ef4a682fca2
X-VCS-Branch: master
Date: Sun, 17 Mar 2019 07:27:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 58eef953-be79-4a45-908c-70fc34e8f8d8
X-Archives-Hash: 77fc8d8a47594e6591bb8415f2d927b5

commit:     94d0d46893665ac7df4fbd36e54e7ef4a682fca2
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 07:10:41 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 07:27:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d0d468

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 <AT> gentoo.org>

 app-emulation/libvirt/libvirt-5.0.0-r1.ebuild |  5 +++--
 app-emulation/libvirt/libvirt-9999.ebuild     | 10 +++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.0.0-r1.ebuild
index 5c5592c87a7..f5e5d7d5dde 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 d297b556e5b..7d5151b6d96 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