completely revamp the ebuild to be updated with new features present in 0.7.2. Needs testing

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

4 files changed, 91 insertions, 37 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index b96595e90bd6..a62ad909af2d 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.34 2009/10/21 16:04:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.35 2009/10/23 23:19:06 cardoe Exp $
+
+  23 Oct 2009; Doug Goldstein <cardoe@gentoo.org> libvirt-0.7.2.ebuild:
+  completely revamp the ebuild to be updated with new features present in
+  0.7.2. Needs testing
 
 *libvirt-0.7.2 (21 Oct 2009)
 *libvirt-0.7.1 (21 Oct 2009)
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 640ed019aa86..d09beb41417c 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -22,6 +22,6 @@ EBUILD libvirt-0.6.5-r1.ebuild 2977 RMD160 c0f9bec162aabdc38daa6683625f3e04acf45
 EBUILD libvirt-0.6.5.ebuild 2963 RMD160 00cbfdd68b6902258f4443c6851d3d8dc60b6dd3 SHA1 98d35c062d694827416ce734cb8b2ed8ea505157 SHA256 ad9e852497c220b41438c91b391db71a6d34a7496b8e090d238b97fe20d3020a
 EBUILD libvirt-0.7.0.ebuild 2973 RMD160 242f39a08b9e2c25b8d03a68b8a986bf0318c1af SHA1 5a111ba7e0220206c50a41e15200b82eff8f22ad SHA256 3207bdf3fa636cdea92a0d19849858e995509cefec111be3720dbf108c6b4d3b
 EBUILD libvirt-0.7.1.ebuild 2973 RMD160 583da57585ba6dccf3ed1fd1c1ad0553ad7576a1 SHA1 070fee5900d18f4eb134e56e53ecb3421f7b8d1a SHA256 79b1ebca3fac3adf3c5af8f8321cd48e84dbdde77f5ccf0cae24f0de9199f1b9
-EBUILD libvirt-0.7.2.ebuild 2973 RMD160 e2c06cd3eaa7a86a893cb43ccbec8113d27bbbdf SHA1 c27acdc68facaf9c79b645b4409988f905b7d23e SHA256 f99954b19a50c98cae07adc5350d1d100fff746211664d29ab23b88b8a270b2d
-MISC ChangeLog 8524 RMD160 9a87848f6a7615f6ef8c53c7cfd417d11bd24ef1 SHA1 20b8c4d1ee6736225ecf847a70a979c53f1a3ed7 SHA256 72adcd9f238c3f3d45d93a61aa5dd1a3e0994e6ca6671fed817c3dfaafdc539f
-MISC metadata.xml 1449 RMD160 0336423f85fef23bc6c85866649eeb089ad5010d SHA1 159a4f62926dcdfdc09d646d7854741d3dc7bb24 SHA256 f3a5571f781eb774cd57d873b24c8058704ab4fb2c63ce25ae7caee87ed9db12
+EBUILD libvirt-0.7.2.ebuild 4439 RMD160 e7fe141efe1f0deb4fbff0457215f7d099128d6b SHA1 d6bff5c3a346ee4ab1597dbf51bba80837d135fc SHA256 e15b41fae664d2c6bf09d806a6708f117772e4f57e2dfb9372628af5f4bbc198
+MISC ChangeLog 8694 RMD160 60cf10b8dd5620e1ce70dea3627c17a9ad387f02 SHA1 66b222742fbca25cbadf8c3eed465589369adca0 SHA256 d782c6cded9ff40d3d30af1d68aaa6f6f02418bae6e5c479ab0d72f7d993fea7
+MISC metadata.xml 1790 RMD160 9b667996c397eafaf5707326ba920e97c35e45be SHA1 838b56b9c7d7e0a3da95591b52841b2fb02e3fd5 SHA256 a80e56d15f51680415015d32b29c7e2844d696dcbd817c94980751d6e948a44b
diff --git a/app-emulation/libvirt/libvirt-0.7.2.ebuild b/app-emulation/libvirt/libvirt-0.7.2.ebuild
index 11c54c9794d2..8594f53fe1d7 100644
--- a/app-emulation/libvirt/libvirt-0.7.2.ebuild
+++ b/app-emulation/libvirt/libvirt-0.7.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.2.ebuild,v 1.1 2009/10/21 16:04:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.2.ebuild,v 1.2 2009/10/23 23:19:06 cardoe Exp $
 
 EAPI="2"
 
-inherit eutils autotools confutils
+inherit eutils python
 
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
@@ -12,8 +12,8 @@ SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="avahi iscsi hal kvm lvm +lxc +network nls numa openvz policykit \
-	parted qemu sasl selinux uml virtualbox xen"
+IUSE="avahi caps hal iscsi kvm +libvirtd lvm +lxc +network nfs one nls numa
+	openvz parted phyp policykit python qemu sasl selinux uml virtualbox xen"
 # devicekit isn't in portage
 
 RDEPEND="sys-libs/readline
@@ -22,16 +22,22 @@ RDEPEND="sys-libs/readline
 	>=net-libs/gnutls-1.0.25
 	dev-lang/python
 	sys-fs/sysfsutils
+	sys-apps/util-linux
 	>=net-analyzer/netcat6-1.0-r2
 	avahi? ( >=net-dns/avahi-0.6 )
+	caps? ( sys-libs/libcap-ng )
 	hal? ( >=sys-apps/hal-0.5.9 )
 	iscsi? ( sys-block/open-iscsi )
 	kvm? ( app-emulation/kvm )
+	libvirtd? ( net-misc/bridge-utils )
 	lvm? ( sys-fs/lvm2 )
-	network? ( net-misc/bridge-utils net-dns/dnsmasq net-firewall/iptables )
+	network? ( net-dns/dnsmasq net-firewall/iptables )
+	nfs? ( net-fs/nfs-utils )
 	numa? ( sys-process/numactl )
+	one? ( dev-libs/xmlrpc-c )
 	openvz? ( sys-kernel/openvz-sources )
 	parted? ( >=sys-apps/parted-1.8 )
+	phyp? ( net-libs/libssh2 )
 	policykit? ( >=sys-auth/policykit-0.6 )
 	qemu? ( >=app-emulation/qemu-0.10.0 )
 	sasl? ( dev-libs/cyrus-sasl )
@@ -39,40 +45,65 @@ RDEPEND="sys-libs/readline
 	virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=app-emulation/virtualbox-bin-2.2.0 ) )
 	xen? ( app-emulation/xen-tools app-emulation/xen )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	confutils_require_any lxc kvm openvz qemu uml virtualbox xen
-}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
 
 src_configure() {
-	local my_conf=""
+	local myconf=""
+
+	## 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)"
+	if ! use policykit && use xen; then
+		myconf="${myconf} --with-xen-proxy"
+	fi
+	myconf="${myconf} $(use_with openvz)"
+	myconf="${myconf} $(use_with lxc)"
+	myconf="${myconf} $(use_with virtualbox vbox)"
+	myconf="${myconf} $(use_with uml)"
 	if use qemu || use kvm ; then
-		my_conf="--with-qemu"
+		myconf="${myconf} --with-qemu"
 	else
-		my_conf="--without-qemu"
+		myconf="${myconf} --without-qemu"
 	fi
+	# 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} $(use_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)"
+	myconf="${myconf} $(use_with hal)"
+
+	## auth stuff
+	myconf="${myconf} $(use_with policykit polkit)"
+	myconf="${myconf} $(use_with sasl)"
+
+	## other
+	myconf="${myconf} $(use_enable nls)"
+	myconf="${myconf} $(use_with python)"
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-devkit"
+	myconf="${myconf} --without-capng"
+	myconf="${myconf} --without-netcf"
 
 	econf \
-		$(use_with iscsi storage-iscsi) \
-		$(use_with lvm storage-lvm) \
-		$(use_with parted storage-disk) \
-		$(use_with lxc) \
-		$(use_with openvz) \
-		$(use_with uml) \
-		$(use_with virtualbox vbox) \
-		$(use_with xen) \
-		$(use_with xen xen-inotify) \
-		$(use_with avahi) \
-		$(use_with hal) \
-		$(use_with sasl) \
-		$(use_with network) \
-		$(use_with policykit polkit) \
-		$(use_with selinux) \
-		$(use_enable nls) \
-		$(use_with numa numactl) \
-		${my_conf} \
-		--without-devkit \
+		${myconf} \
 		--with-remote \
 		--disable-iptables-lokkit \
 		--localstatedir=/var \
@@ -80,7 +111,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake instal lfailed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
 
 	newinitd "${FILESDIR}/libvirtd.init" libvirtd
@@ -89,7 +120,16 @@ src_install() {
 	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
+}
+
 pkg_postinst() {
+	use python && python_mod_optimize $(python_get_sitedir)/libvirt.py
+
 	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"
 	elog
@@ -100,3 +140,7 @@ pkg_postinst() {
 	elog
 	ewarn "Otherwise you might have issues with your existing DNS server."
 }
+
+pkg_postrm() {
+	use python && python_mod_cleanup
+}
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index e065e2a19c4a..aff04e5ef40d 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -33,5 +33,11 @@
 			machines</flag>
 		<flag name='numa'>Use NUMA for memory segmenting via
 			<pkg>sys-process/numactl</pkg></flag>
+		<flag name='nfs'>Allow the libvirtd daemon store VM images on NFS
+			mounts</flag>
+		<flag name='libvirtd'>Builds the libvirtd daemon as well as the client
+			utilities instead of just the client utilities</flag>
+		<flag name='phyp'>Support the PHYP hypervisor protocol</flag>
+		<flag name='one'>Support the ONE hypervisor protocol</flag>
 	</use>
 </pkgmetadata>