Add a USE flag called 'virt-network' that pulls in the depends for NATed networks. This should make it easier for people to install and setup libvirt.

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

4 files changed, 26 insertions, 16 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 1dcee9836089..9e805bd82593 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.86 2011/01/20 20:42:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.87 2011/01/21 16:27:15 cardoe Exp $
+
+  21 Jan 2011; Doug Goldstein <cardoe@gentoo.org> libvirt-0.8.7.ebuild,
+  metadata.xml:
+  Add a USE flag called 'virt-network' that pulls in the depends for NATed
+  networks. This should make it easier for people to install and setup libvirt.
 
   20 Jan 2011; Doug Goldstein <cardoe@gentoo.org> libvirt-0.8.7.ebuild:
   Update elog message about optional depends for bug #351374
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 8e4b0174a610..23c98a3c0e8f 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -7,6 +7,6 @@ DIST libvirt-0.8.6.tar.gz 13296407 RMD160 a65add6ed9b00e2f065f9e791a02b61e851aa7
 DIST libvirt-0.8.7.tar.gz 13713267 RMD160 20a0651aee1bb35fbb69f3218ca96e92a2323446 SHA1 53b10513cb04c502a2c8aaf57039c71f0f79ea6f SHA256 da7b0e8bff7b2df2e19d732272674599bfb805787fb0d6f30289ba700ca77f31
 EBUILD libvirt-0.8.5-r2.ebuild 7273 RMD160 9a2fc6602e26f991e943a91410415f25f241e1ca SHA1 aa1ffcf3af784b74bee792e79bc6c239e7513e16 SHA256 9914b606f025bd17198b68f6fda0481752afd4bff1351cd662c981e67a290c1e
 EBUILD libvirt-0.8.6-r1.ebuild 7333 RMD160 460ade61ea19b8f3cdeec00d6706c1bba77ae5a9 SHA1 785f4e457f2db9578236baef7ef4f0b7523fdba6 SHA256 c7f08ccf9f8398a8e29b88bf0bbb65a171aa827afb5eb96041cc64a8fb495eec
-EBUILD libvirt-0.8.7.ebuild 7759 RMD160 246f49fe74470c205e54d8c815548c74ec3880a4 SHA1 de213f65c7b92a29c885537c9a6fb1b1d1aa8edb SHA256 acfb6a640ea901ae311e0c842d80eec250eee6ea7d09f2ee7138eb902d307786
-MISC ChangeLog 19648 RMD160 75382cfd9e65cfd270c42bb33ff21279bfcf0c86 SHA1 efb88d292a6654a5d27f27b7e53086c3845cccac SHA256 001abba02fdec813676192399551a358dc7a18fb5eb5ce9214dedbe3b047be29
-MISC metadata.xml 2742 RMD160 82f7154f8af2898a702961d59ebeec81d9aa4fe2 SHA1 cc28fad9c602f6f73ab157d531b55d9876703a45 SHA256 4c3e2fb4fd6fcedb22d73992431f16dff0728ce9e608011b01c182e6654ccd46
+EBUILD libvirt-0.8.7.ebuild 7764 RMD160 76b683f66e7c4b515428f5c8b15c1e7b396dbe9d SHA1 7d0ffe8fca3d197f1bbd699671a77bb155bf28bb SHA256 c42e68ed36afcd411886f54e07310546b9bce318d3d1f88db5f1f1a45f9a870e
+MISC ChangeLog 19892 RMD160 eb00589ca3d2775400400aae520d019448d8e6ec SHA1 0ed4b77d758ce06e7033edf3e2f98001ad2e2237 SHA256 f64429ad1f81a0230076eb604e3c956e54585ee2f6d50f8a3f3fc2557be2c8d8
+MISC metadata.xml 3026 RMD160 c45bdcd924b283330b1211abc505e106f2ceb2b1 SHA1 ca4308eec5a3e7c6419a24f9ca06fdea64ccec8e SHA256 7f7722b3a05787803ae3bda78ceccbc1c48a8d53d80f98a7a1327e988fe9ea41
diff --git a/app-emulation/libvirt/libvirt-0.8.7.ebuild b/app-emulation/libvirt/libvirt-0.8.7.ebuild
index 35fa6c3b597b..267baf0037f0 100644
--- a/app-emulation/libvirt/libvirt-0.8.7.ebuild
+++ b/app-emulation/libvirt/libvirt-0.8.7.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.8.7.ebuild,v 1.3 2011/01/20 20:42:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.7.ebuild,v 1.4 2011/01/21 16:27:15 cardoe Exp $
 
 #BACKPORTS=1
 #AUTOTOOLIZE=yes
@@ -22,9 +22,9 @@ SRC_URI="http://libvirt.org/sources/${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="avahi caps debug iscsi +libvirtd lvm +lxc macvtap +network nfs nls \
-	numa openvz parted pcap phyp policykit python qemu sasl selinux
-	uml virtualbox xen udev +json"
+IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap +network nfs \
+	nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev \
+	uml virtualbox virt-network xen"
 # IUSE=one : bug #293416 & bug #299011
 
 RDEPEND="sys-libs/readline
@@ -39,6 +39,7 @@ RDEPEND="sys-libs/readline
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	caps? ( sys-libs/libcap-ng )
 	iscsi? ( sys-block/open-iscsi )
+	json? ( dev-libs/yajl )
 	libvirtd? ( net-misc/bridge-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
 	macvtap? ( >=dev-libs/libnl-1.1 )
@@ -55,7 +56,10 @@ RDEPEND="sys-libs/readline
 	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
 	xen? ( app-emulation/xen-tools app-emulation/xen )
 	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )
-	json? ( dev-libs/yajl )"
+	virt-network? ( net-dns/dnsmasq
+		>=net-firewall/iptables-1.4.9
+		net-firewall/ebtables
+		sys-apps/iproute2 )"
 # one? ( dev-libs/xmlrpc-c )
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -228,13 +232,8 @@ pkg_postinst() {
 	elog
 	elog "For the basic networking support (bridged and routed networks)"
 	elog "you don't need any extra software. For more complex network modes"
-	elog "including but not limited to NATed network, you'll need the"
-	elog "following packages":
-	elog
-	elog "	net-dns/dnsmasq"
-	elog "	>=net-firewall/iptables-1.4.9"
-	elog "	net-firewall/ebtables"
-	elog "  sys-apps/iproute2"
+	elog "including but not limited to NATed network, you can enable the"
+	elog "'virt-network' USE flag."
 	elog
 	if has_version net-dns/dnsmasq; then
 		ewarn "If you have a DNS server setup on your machine, you will have"
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index e692aeeddb74..f1410825ceac 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -70,5 +70,11 @@
     <flag name='json'>
       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.
+	</flag>
   </use>
 </pkgmetadata>