add missing USE flaG

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

5 files changed, 141 insertions, 7 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index d3df498fc1fe..58a9bdd7ef07 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
 # 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.21 2009/02/20 17:47:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.22 2009/04/17 15:01:16 cardoe Exp $
+
+*libvirt-0.6.2 (17 Apr 2009)
+
+  17 Apr 2009; Doug Goldstein <cardoe@gentoo.org>
+  +files/libvirt-0.6.2-storage-fix.patch, +libvirt-0.6.2.ebuild:
+  version bump. ebuild is masked for evaluation. fixes bugs #256904,
+  #253961, #254568, and #249029.
 
   20 Feb 2009; Doug Goldstein <cardoe@gentoo.org> libvirt-0.4.6-r1.ebuild,
   libvirt-0.5.1.ebuild:
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 5855001b40b6..fe1322ae565c 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -9,18 +9,21 @@ AUX libvirt-0.4.6-parallel-build-fix.patch 686 RMD160 4abcef21401ba55f37504cce67
 AUX libvirt-0.4.6-qemu-img-name.patch 811 RMD160 821ad55830f4724fc4d3314d58d7ea7971f0060c SHA1 1e154cf2a0522db05fd202ebddafb530e714c657 SHA256 fe0eb8a43a79c7c3d764387170addb3d490673d5e942ea1dd7b7633da4b11b7d
 AUX libvirt-0.5.1-add-missing-permission-checks.patch 5538 RMD160 e531b32e1add746a1d873f1005841349b4a62fa4 SHA1 573ca31d3c55509c076301b91fae9bed9f4abd68 SHA256 c5b5c323f4a97b8dee0324ca44c97fd3263e72b9ea58baff808c226ff9d04bd3
 AUX libvirt-0.5.1-libgnu-reposition.patch 478 RMD160 c8f567420dac122ec677a3a4d83e2b4adb0a9e94 SHA1 dd3aa57847cb2f61f0ebd5ae92b01094f22ad29e SHA256 4544c9608b775a3a1b1b4025aa411c8d4426cde3b4ecedff83d661cab685fdac
+AUX libvirt-0.6.2-storage-fix.patch 529 RMD160 201adef5a0df14d79cec60133e7dfa6b9e37dc4f SHA1 d8f7c9b79b230ad921bee68f51dcde3b67c5b227 SHA256 a9b90df0671cfda5ba550617549ee4ad918a6c746c6cd38fdf56bb7f450f5b07
 AUX libvirtd.confd 476 RMD160 63b92da0cf0d589c1c6e76551982deb6b5fc8f9a SHA1 5b76082bb28705606758880c19af922dde1ccb01 SHA256 ff2c94d2a64058152be669256d8d2e241cde4356a77bd653eac9fa3b084666f6
 AUX libvirtd.init 2045 RMD160 b544578c242c6f84e2cf07682a06ce261bf40b8a SHA1 81976137c43f6b507e27ac926a6d7947e1a329d3 SHA256 96cbdf8e68a171d170f91167a4217a366325ca668b9e2621ec6800fd35d42c5c
 DIST libvirt-0.4.6.tar.gz 5255397 RMD160 7a59cf7b678148c380e20e57f4d5d323f5aeb6b6 SHA1 dd6994e09789e19679cae4bdd65f2d7aea9cf8d0 SHA256 70049e309632718af75cd11116063ade45eb2879eb9e7ac7c6106559d344a37a
 DIST libvirt-0.5.1.tar.gz 6086100 RMD160 76044df25d2b17f8da237e127b5eed3e2518a041 SHA1 f229c17b91aa4580a328e8109659e8c1dff0da14 SHA256 951f4c4fac929bab1968680dfcd45fb1053df7d2e3a916e2df13f1d11fe53512
+DIST libvirt-0.6.2.tar.gz 6681651 RMD160 9f7c4f4154150df997f23e63500d743451b73945 SHA1 afcc2826f812ec68a78371c6ff8dd41d92e71a3c SHA256 46ec16388b84afad5f906db997f67ca3cbe4870364577028c272bc407e17d04b
 EBUILD libvirt-0.4.6-r1.ebuild 2426 RMD160 5bbf66a700ad57ea137b9ace65d6acc6b5efb64c SHA1 df87f8027d84059a199f98a87c4c7400f6ae91b0 SHA256 693c8facf12519b3423cbe197de1f35fa58a25bd8d6cce912ec1a01e363cab7b
 EBUILD libvirt-0.5.1.ebuild 2905 RMD160 6733abae4fbaf18cc20dd9bef5b40e752b9deefa SHA1 d22071db59b07bc0ce1f29cde6a6403ca5a5d68f SHA256 e4a746ae4aeb4f4590b38226acaee9df9ec84590b7b40eb17c3fc11d8bddc801
-MISC ChangeLog 4879 RMD160 075ccf418b497dac320bd48c822fa9b004fdce30 SHA1 f57641bef000b553b7b325366c33347c307acd29 SHA256 342c1400e59d25afb48fc0b6503df70b4798b1bf232989d51fbd6c110e673d9b
-MISC metadata.xml 1199 RMD160 0f72f82d46e251dea56ed0af04833b2baaa2bd95 SHA1 3235b0b252d8c48795aa7e3b14f2190bf1496696 SHA256 1444f29aaece979905e8c0837e939d1d0c1bfcb43884944f48d45874c5b9335d
+EBUILD libvirt-0.6.2.ebuild 2849 RMD160 8141f7fdb011bb429835d7cbc3a06edcb989168e SHA1 b35409b28d0ec4a083f0ce7eb8781c061ede7f45 SHA256 aa03f0f69c23602034a895c0ba485b36b67174c0c9ce9987a4775f832e7c54ba
+MISC ChangeLog 5127 RMD160 c4d3bb422e24b698b788c5062d5a249aee750cb2 SHA1 a5d78a5930d77efe6dbb2e14f770a2a848729485 SHA256 73ced1deaed54e91288de3f0246de7dd3db3c57e819592949a3d86960727d4ed
+MISC metadata.xml 1266 RMD160 e8c98e672f1a6a1e93865b1f845394cf9a914dd0 SHA1 af936d16dff48c69b837481f1c813e9a9b837828 SHA256 81bf0e5442c3d0d6a088d92c168cf7e38f13ccbb895b1c04d5f7583f642431fd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkme7O0ACgkQoeSe8B0zEfy8eACfVcUSk84ibaZj0YV2xC4wgy0x
-W1MAni8VdMx9wiRNOiuSJmExdsSdq4Ts
-=N0WR
+iEYEARECAAYFAknomiYACgkQoeSe8B0zEfx/9ACggyxaYq4dEw2S+JR8OFn+T32W
+GdkAnAvMpzElKavblNPCvR07TpSqgLHm
+=ZxGi
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/files/libvirt-0.6.2-storage-fix.patch b/app-emulation/libvirt/files/libvirt-0.6.2-storage-fix.patch
new file mode 100644
index 000000000000..e3eeda1fe2b8
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-0.6.2-storage-fix.patch
@@ -0,0 +1,11 @@
+--- src/storage_backend_fs.c.old	2009-04-03 14:57:21.000000000 -0500
++++ src/storage_backend_fs.c	2009-04-03 14:57:54.000000000 -0500
+@@ -1152,7 +1152,7 @@
+                                   vol->target.format);
+             return -1;
+         }
+-        if (vol->backingStore.path != NULL) {
++        if (vol->target.path != NULL) {
+             virStorageReportError(conn, VIR_ERR_NO_SUPPORT,
+                                   _("copy-on-write image not supported with "
+                                     "qcow-create"));
diff --git a/app-emulation/libvirt/libvirt-0.6.2.ebuild b/app-emulation/libvirt/libvirt-0.6.2.ebuild
new file mode 100644
index 000000000000..ee1a15697146
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.6.2.ebuild
@@ -0,0 +1,112 @@
+# 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.6.2.ebuild,v 1.1 2009/04/17 15:01:16 cardoe Exp $
+
+EAPI=1
+
+inherit eutils autotools
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+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 openvz parted qemu sasl selinux uml xen"
+# policykit is in package.mask
+# devicekit isn't in portage
+
+DEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=dev-libs/libxml2-2.5
+	>=net-libs/gnutls-1.0.25
+	dev-lang/python
+	sys-fs/sysfsutils
+	net-analyzer/netcat
+	dev-util/pkgconfig
+	avahi? ( >=net-dns/avahi-0.6 )
+	iscsi? ( sys-block/open-iscsi )
+	kvm? ( app-emulation/kvm )
+	lvm? ( sys-fs/lvm2 )
+	network? ( net-misc/bridge-utils net-dns/dnsmasq net-firewall/iptables )
+	openvz? ( sys-kernel/openvz-sources )
+	parted? ( >=sys-apps/parted-1.8 )
+	qemu? ( app-emulation/qemu )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( sys-libs/libselinux )
+	xen? ( app-emulation/xen-tools app-emulation/xen )
+	"
+	#policykit? ( >=sys-auth/policykit-0.6 )
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/"${PN}"-0.4.6-qemu-img-name.patch
+	epatch "${FILESDIR}"/"${P}"-storage-fix.patch
+	eautoreconf
+}
+
+pkg_setup() {
+	local hasbackend=0
+	local backends="lxc kvm openvz qemu uml xen"
+	local backend
+
+	for backend in $backends ; do
+		use $backend && hasbackend=1
+	done
+
+	if [ "$hasbackend" == 0 ]; then
+		local msg="You must enable one of these USE flags: $backends"
+		eerror "$msg"
+		die "$msg"
+	fi
+}
+
+src_compile() {
+	local my_conf=""
+	if use qemu || use kvm ; then
+		# fix path for kvm-img but use qemu-img if the useflag is set
+		my_conf="--with-qemu \
+			$(use_with !qemu qemu-img-name kvm-img)"
+	else
+		my_conf="--without-qemu"
+	fi
+
+	econf \
+		$(use_with avahi) \
+		$(use_with iscsi storage-iscsi) \
+		$(use_with lvm storage-lvm) \
+		$(use_with lxc) \
+		$(use_with hal) \
+		$(use_with openvz) \
+		$(use_with parted storage-disk) \
+		$(use_with sasl) \
+		$(use_with selinux) \
+		$(use_with uml) \
+		$(use_with xen) \
+		$(use_with network) \
+		${my_conf} \
+		--without-devkit \
+		--without-polkit \
+		--with-remote \
+		--disable-iptables-lokkit \
+		--localstatedir=/var \
+		--with-remote-pid-file=/var/run/libvirtd.pid \
+		|| die "econf failed"
+		#$(use_with policykit) \
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	mv "${D}"/usr/share/doc/{${PN}-python*,${P}/python}
+	newinitd "${FILESDIR}"/libvirtd.init libvirtd
+	newconfd "${FILESDIR}"/libvirtd.confd libvirtd
+}
+
+pkg_postinst() {
+	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"
+}
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index af2f2fe40bda..e516b1b3e8a2 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -28,5 +28,6 @@
 			virtual machines</flag>
 		<flag name='xen'>Add support for <pkg>app-emulation/xen</pkg> based
 			virtual machines</flag>
+		<flag name='network'>Enable networking support for guests</flag>
 	</use>
 </pkgmetadata>