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.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

5 files changed, 24 insertions, 17 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/Manifest b/app-emulation/libvirt/Manifest
index 936a0dc16148..b432ab1cfef7 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -15,7 +15,7 @@ EBUILD libvirt-0.8.5-r2.ebuild 7275 RMD160 c2566e468d932ea0d0cca5d863c310b6b50a2
 EBUILD libvirt-0.8.8-r1.ebuild 7556 RMD160 b9069b101450bb1467c2b26db7e0ad32ec976f96 SHA1 a841c56d986ea16d4c305f1ffcf8f2d074dc8f01 SHA256 7cb3ee82f9ff77e1b90f4638356a7d64d584930d36bad68979af14f9fe543b23
 EBUILD libvirt-0.9.0-r1.ebuild 7681 RMD160 b0df411901f90f1a5e8835b32f4d4a30ea36049d SHA1 5c060c288de13fd3b59f44e7dd718ab4f1b68375 SHA256 0f27aada9c593aa1b427fe3631807d4eafc560b4c31e7a0be5057a39bd9af8b7
 EBUILD libvirt-0.9.1.ebuild 7678 RMD160 e1e4b1da74c1b831f3cabb5d2f7fa60fd3d879bc SHA1 40c43cb9e3415bf865dc8c5bf87613fe9fe2bf53 SHA256 c674aa642a429a14b27fb8f922d886618073773a5502e187e59206009eaa897d
-EBUILD libvirt-0.9.2_rc2.ebuild 7679 RMD160 88acff8b6d555ad2a5640259f269cfcf0f8a6adb SHA1 f8019b339f9e6d4c35890618e784fd8275740415 SHA256 164e5db0fccf1cfe7386ffac2a317147adeee92e25e6753ee943eaf56b61cd52
-EBUILD libvirt-9999.ebuild 8065 RMD160 bcd36346c7319eb0f668e47c19d72599d2d00f50 SHA1 79178c750d193eb9d29e624e2163be5daf498356 SHA256 801d7fa81f6b0cc32648e0db7b24d25b7c6ffdeb5e884de619fb344123b9433d
-MISC ChangeLog 24131 RMD160 027cfaba0c2a48592772f80461d4518cc84d322b SHA1 380f1e376355c3724de9926c89afb568d9701855 SHA256 a58b7c0f2918946a1bdc1bb1be0901b05fa20002cd137e3b62a78370f0410f8a
-MISC metadata.xml 3026 RMD160 c45bdcd924b283330b1211abc505e106f2ceb2b1 SHA1 ca4308eec5a3e7c6419a24f9ca06fdea64ccec8e SHA256 7f7722b3a05787803ae3bda78ceccbc1c48a8d53d80f98a7a1327e988fe9ea41
+EBUILD libvirt-0.9.2_rc2.ebuild 7682 RMD160 49f5cf18051d2de4eecae6b3de71d256306fc6fd SHA1 72113ebca262c92ac1a6b07b540ead1870611547 SHA256 fb5066f8aa4b9b21323dedfd3fb8c0753ccd2801471022d2d7b5a9122393846f
+EBUILD libvirt-9999.ebuild 8069 RMD160 4ad1a1ccd9b691ada12cb4fac01bd61c57dc8b45 SHA1 c1026a3b052b7aa7124931464953c11f919e400e SHA256 1920ba928fd70ba8d86fb6e9179f079af7b4e89846903db396e6606a3a5df353
+MISC ChangeLog 24408 RMD160 f14b358d9cad23b939e9dbae1bf264e12a55ad31 SHA1 bf8685b2264dbe01c31a957a6684911a26c14ae9 SHA256 fd7a3628592fc5520ed1d6a37cdb9f7a336424a0f8a724528aa4fead905b104f
+MISC metadata.xml 3068 RMD160 9a801cf744b0168424ff86f38a812c7025279f5b SHA1 98c14395869b353a11b605942a66aa8cb980a974 SHA256 0304a7cfd9c8e8a8ce5b2a9f25027570d4a4e6f334afbeb15822d249827e2aed
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>