Drop USE=network and consolidate it with USE=virt-network after discussing with upstream that the usage and depends are finally sorted out for this to work.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

4 files changed, 20 insertions, 13 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 24f76d26674d..15dfd20d82cf 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.110 2011/06/03 22:20:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.111 2011/06/03 22:21:55 cardoe Exp $
+
+  03 Jun 2011; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.2_rc2.ebuild,
+  libvirt-9999.ebuild, metadata.xml:
+  Drop USE=network and consolidate it with USE=virt-network after discussing
+  with upstream that the usage and depends are finally sorted out for this to
+  work.
 
   03 Jun 2011; Doug Goldstein <cardoe@gentoo.org> files/libvirtd.init-r4:
   Ensure sanlock is started before us as well
diff --git a/app-emulation/libvirt/libvirt-0.9.2_rc2.ebuild b/app-emulation/libvirt/libvirt-0.9.2_rc2.ebuild
index 9265026f08b9..fb526e6ff79c 100644
--- a/app-emulation/libvirt/libvirt-0.9.2_rc2.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.2_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.2_rc2.ebuild,v 1.1 2011/06/03 18:33:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.2_rc2.ebuild,v 1.2 2011/06/03 22:21:55 cardoe Exp $
 
 #BACKPORTS=1
 #AUTOTOOLIZE=yes
@@ -27,7 +27,7 @@ S="${WORKDIR}/${P%_rc*}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap +network nfs \
+IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap nfs \
 	nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev \
 	uml virtualbox virt-network xen"
 # IUSE=one : bug #293416 & bug #299011
@@ -120,7 +120,7 @@ src_configure() {
 	myconf="${myconf} --with-esx"
 
 	## additional host drivers
-	myconf="${myconf} $(use_with network)"
+	myconf="${myconf} $(use_with virt-network network)"
 	myconf="${myconf} --with-storage-fs"
 	myconf="${myconf} $(use_with lvm storage-lvm)"
 	myconf="${myconf} $(use_with iscsi storage-iscsi)"
@@ -139,7 +139,7 @@ src_configure() {
 	myconf="${myconf} $(use_with policykit polkit)"
 	myconf="${myconf} $(use_with sasl)"
 
-	# network biits
+	# network bits
 	myconf="${myconf} $(use_with macvtap)"
 	myconf="${myconf} $(use_with pcap libpcap)"
 
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 1130e9c09a84..91f327703ec3 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.4 2011/06/03 22:17:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.5 2011/06/03 22:21:55 cardoe Exp $
 
 #BACKPORTS=1
 
@@ -33,7 +33,7 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap +network nfs \
+IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap nfs \
 	nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev \
 	uml virtualbox virt-network xen"
 # IUSE=one : bug #293416 & bug #299011
@@ -134,7 +134,7 @@ src_configure() {
 	myconf="${myconf} --with-esx"
 
 	## additional host drivers
-	myconf="${myconf} $(use_with network)"
+	myconf="${myconf} $(use_with virt-network network)"
 	myconf="${myconf} --with-storage-fs"
 	myconf="${myconf} $(use_with lvm storage-lvm)"
 	myconf="${myconf} $(use_with iscsi storage-iscsi)"
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index f1410825ceac..58c046c0ca2f 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -50,7 +50,7 @@
 
     <!-- Miscellaneous flags -->
     <flag name='network'>
-      Enable networking support for guests
+      Enable virtual networking (NAT) support for guests
     </flag>
     <flag name='numa'>
       Use NUMA for memory segmenting via <pkg>sys-process/numactl</pkg>
@@ -71,10 +71,11 @@
       Support QEmu 0.13 JSON-based interface, using <pkg>dev-libs/yajl</pkg>.
     </flag>
 	<flag name='virt-network'>
-		To help people out, this flag includes the dependencies for NATed
-		network mode. Effectively any network setup that relies on libvirt
-		to setup and configure network interfaces on your host. This does not
-		include bridged or routed networks.
+		Enable virtual networking (NAT) support for guests. Includes all
+		the dependencies for NATed network mode. Effectively any network
+		setup that relies on libvirt to setup and configure network
+		interfaces on your host. This does not include bridged or
+		routed networks.
 	</flag>
   </use>
 </pkgmetadata>