4 files changed, 19 insertions, 265 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index f55f0961fafa..0153d743b350 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.129 2011/08/04 20:25:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.130 2011/08/04 23:32:52 cardoe Exp $
+
+  04 Aug 2011; Doug Goldstein <cardoe@gentoo.org> -libvirt-0.9.4-r1.ebuild,
+  metadata.xml:
+  Ignore this last change. The types of bridges it removes are 'virtual'
+  bridges, which are the same as normal bridges but they're managed by libvirt
+  so this can actually stay disabled. USE=virt-network will now always been in
+  libvirt can manage any part of your network or if you must pre-configure your
+  network prior to using libvirt.
 
 *libvirt-0.9.4-r1 (04 Aug 2011)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 411f15174b0b..bf60d354809a 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -10,8 +10,7 @@ DIST libvirt-0.9.3.tar.gz 15958983 RMD160 a01dbe29e23225706afcff74146aa3b224ba04
 DIST libvirt-0.9.4.tar.gz 16643543 RMD160 a9edfdac715caac650520e5e12dd499f46e9957b SHA1 29e81c972ca7c3e73f4cecf84e77f68739ef00a2 SHA256 e76c026646ae4885b162bf711b854f36195f93538d6fcbee48479c2354a342af
 EBUILD libvirt-0.9.1.ebuild 7673 RMD160 085ef6c06e2801b4d635306d2b9b94b0cc0a7621 SHA1 970c2e174fedc47523f34fc0907d4471e33d72d0 SHA256 afb17eb6d2cbdff273bd0acd87ce6c7e4a3853657f559f17bdb656ed75e577ed
 EBUILD libvirt-0.9.3-r1.ebuild 7770 RMD160 2389d6557d23cffd594c12b39d0e4d7bc5ca6b27 SHA1 e34684a0e9a8b008d2d10a847b61b9634c68d04f SHA256 eefa414886c770f1f5ff1e8b942f33837e750bb44968d6b9f8b4f2814f391879
-EBUILD libvirt-0.9.4-r1.ebuild 7735 RMD160 03de14518063a9ee99db207830e9b331245efc39 SHA1 69f95c6925c9fe5422e917948e91b58a208d0f17 SHA256 f8c9be01692789eee3257cff16469b7c77d532889019177407078e8c8ab92388
 EBUILD libvirt-0.9.4.ebuild 7750 RMD160 d1b5ba471b2caf95298ffb1247650496d794c034 SHA1 b31ecb2f5314511d82d9e169b8229ec03306e0b8 SHA256 a4cdc6f94ecdbf66805534c10e855d3fdf9c42213b86961f7c3da6be3f44e85a
 EBUILD libvirt-9999.ebuild 8170 RMD160 80ddd6b7b5e19f01319939d8a478d70c33986eb4 SHA1 6a999994da0bc7ebe830c1275e93cc366784b9b9 SHA256 b4f8704cd23c8ca76b169a49d658e718b32f77a6503282b854bf8fe57c1bdda1
-MISC ChangeLog 27306 RMD160 f1bd4a19d9f5d7bf2baedf065d5a48590911c7a1 SHA1 1e996ff091998ef518d4489f3077998bcc46150a SHA256 1469ef3208a0d87bf71e01fb1144a69304b3ed563c247be997aec817536689e9
-MISC metadata.xml 3068 RMD160 9a801cf744b0168424ff86f38a812c7025279f5b SHA1 98c14395869b353a11b605942a66aa8cb980a974 SHA256 0304a7cfd9c8e8a8ce5b2a9f25027570d4a4e6f334afbeb15822d249827e2aed
+MISC ChangeLog 27744 RMD160 5c1dfcfeeb44ac73262e8ca9af7c457cd2f28342 SHA1 c036f7977c1e8e1f2c0494e412d2ea21a06b88fc SHA256 3d26335cc74b7a36691887a9392ac4f77d62dd2b0d2664515cc8216c64d83338
+MISC metadata.xml 3227 RMD160 412848b840af8dc3dcc514c6d05329d59e1f6aef SHA1 a41dd119044c5beefa76e1c3a8cf5c6894774c1a SHA256 6c5f83b38a0884a1bffda428e2701bbf75e765dd4824d9e26dfde7f0e6f9d4d8
diff --git a/app-emulation/libvirt/libvirt-0.9.4-r1.ebuild b/app-emulation/libvirt/libvirt-0.9.4-r1.ebuild
deleted file mode 100644
index a137394071e0..000000000000
--- a/app-emulation/libvirt/libvirt-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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.4-r1.ebuild,v 1.1 2011/08/04 20:25:37 cardoe Exp $
-
-#BACKPORTS=2
-#AUTOTOOLIZE=yes
-
-EAPI="3"
-
-MY_P="${P/_rc/-rc}"
-
-PYTHON_DEPEND="python? 2:2.4"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python ${AUTOTOOLIZE+autotools}
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-	ftp://libvirt.org/libvirt/${MY_P}.tar.gz
-	${BACKPORTS:+
-		http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2
-		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
-S="${WORKDIR}/${P%_rc*}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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 elibc_glibc"
-# IUSE=one : bug #293416 & bug #299011
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	>=dev-libs/libxml2-2.7.6
-	>=dev-libs/libnl-1.1
-	>=net-libs/gnutls-1.0.25
-	sys-apps/util-linux
-	sys-devel/gettext
-	>=net-analyzer/netcat6-1.0-r2
-	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 )
-	nfs? ( net-fs/nfs-utils )
-	numa? ( >sys-process/numactl-2.0.2 )
-	openvz? ( sys-kernel/openvz-sources )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	phyp? ( net-libs/libssh2 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	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 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-firewall/ebtables
-		sys-apps/iproute2 )
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	myconf="${myconf} $(use_enable debug)"
-
-	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
-
-	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
-
-	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	 # leave it automagic as it depends on the version of xen used.
-	use xen || myconf+=" --without-libxl"
-
-	myconf="${myconf} $(use_with openvz)"
-	myconf="${myconf} $(use_with lxc)"
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
-	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
-	fi
-	myconf="${myconf} $(use_with uml)"
-	myconf="${myconf} $(use_with qemu)"
-	# doesn't belong with hypervisors but links to libvirtd for some reason
-	#myconf="${myconf} $(use_with one)"
-
-	## hypervisor protocols
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-
-	## additional host drivers
-	myconf="${myconf} --with-network"
-	myconf="${myconf} --with-storage-fs"
-	myconf="${myconf} $(use_with lvm storage-lvm)"
-	myconf="${myconf} $(use_with iscsi storage-iscsi)"
-	myconf="${myconf} $(use_with parted storage-disk)"
-	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} $(use_with numa numactl)"
-	myconf="${myconf} $(use_with selinux)"
-
-	# udev for device support details
-	myconf="${myconf} $(use_with udev)"
-
-	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
-
-	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
-
-	# network bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-	myconf="${myconf} $(use_with json yajl)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf --without-audit"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# locking support
-	myconf="${myconf} --without-sanlock"
-
-	# this is a nasty trick to work around the problem in bug
-	# #275073. The reason why we don't solve this properly is that
-	# it'll require us to rebuild autotools (and we don't really want
-	# to do that right now). The proper solution has been sent
-	# upstream and should hopefully land in 0.7.7, in the mean time,
-	# mime the same functionality with this.
-	case ${CHOST} in
-		*cygwin* | *mingw* )
-			;;
-		*)
-			ac_cv_prog_WINDRES=no
-			;;
-	esac
-
-	econf \
-		${myconf} \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		--with-remote \
-		--localstatedir=/var \
-		--with-remote-pid-file=/var/run/libvirtd.pid
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		HTML_DIR=/usr/share/doc/${PF}/html \
-		DOCS_DIR=/usr/share/doc/${PF}/python \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${FILESDIR}/libvirtd.init-r4" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r2" libvirtd || die
-
-	keepdir /var/lib/libvirt/images
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# We really don't want to use or support old PolicyKit cause it
-	# screws with the new polkit integration
-	if has_version sys-auth/policykit; then
-		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
-	fi
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize libvirt.py
-
-	elog
-	if use policykit && has_version sys-auth/policykit; then
-		elog "You must have run the following at least once:"
-		elog
-		elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\""
-		elog
-		elog "to grant USERNAME access to libvirt when using USE=policykit"
-	else
-		elog "To allow normal users to connect to libvirtd you must change the"
-		elog " unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	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 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"
-		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
-		ewarn " bind-interfaces"
-		ewarn " interface or except-interface"
-		ewarn
-		ewarn "Otherwise you might have issues with your existing DNS server."
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup libvirt.py
-}
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 58c046c0ca2f..698e41726bf5 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -63,9 +63,10 @@
       Support auto learning IP addreses for routing
     </flag>
     <flag name='macvtap'>
-      Support for MAC-based TAP (macvlan/macvtap). For networking instead of the normal TUN/TAP. It
-      has its advantages and disadvantages. macvtap support requires very new kernels and is
-      currently evolving. Support for this is experimental at best
+		Support for MAC-based TAP (macvlan/macvtap). For networking instead
+		of the normal TUN/TAP. It has its advantages and disadvantages.
+		macvtap support requires very new kernels and is
+		currently evolving. Support for this is experimental at best.
     </flag>
     <flag name='json'>
       Support QEmu 0.13 JSON-based interface, using <pkg>dev-libs/yajl</pkg>.
@@ -74,8 +75,10 @@
 		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.
+		interfaces on your host. This can include bridged and routed
+		networks ONLY if you are allowing libvirt to create and manage
+		the underlying devices for you. In some cases this requires
+		enabling the 'netcf' USE flag (currently unavailable).
 	</flag>
   </use>
 </pkgmetadata>