Add support for the rados block device

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

4 files changed, 16 insertions, 8 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 10804878ddb3..d82990b8f6d7 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.194 2012/07/04 16:54:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.195 2012/07/08 04:12:16 cardoe Exp $
+
+  07 Jul 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.13.ebuild,
+  metadata.xml:
+  Add support for the rados block device
 
   04 Jul 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.13.ebuild:
   Fix the libnl depend to match how 0.9.13 and newer behave. bug #424701
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 797836a6dc24..f8979999ef32 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -14,8 +14,8 @@ EBUILD libvirt-0.9.11.3.ebuild 8690 SHA256 27f8be21525191a791e783d80a7f59ee212f9
 EBUILD libvirt-0.9.11.4.ebuild 8719 SHA256 b71026df5ca4ee90e5abbc4d6f94ab99d9b044bdc0f478233830b72233f3501c SHA512 d9cabfcc4465ea342daf8b8a49b378de7c5cced1c35c5c3f0afc6aa2df9498d5d7e148da90be0c46a71a1dbf07d13f0cda803542e4b95be857485efe8b4cdfa7 WHIRLPOOL 76d3d82aee5b8ec02d9ae25aa7892240e811eda30a37783c575e8f7b8b1be9e2c52ebfaf71eef4e4d5917e72cb30925c62c8079d27506ddbae17596f355586b3
 EBUILD libvirt-0.9.12-r1.ebuild 10353 SHA256 2083781e89483e8dca012ddc71f526380f704cac3acf19dafa2f17d22d35c544 SHA512 45c6de7858d5ec022515f35efd6532fa79db6da1085557457a6c649cec71ed499bf1b692b1af6fd65cb04d12b80ba5e3255331544b49152e82bec8761d80b736 WHIRLPOOL 8f6ceed8eb27dcb905d298caf44a0f78398c36e21576ef6db69a6c499f90330928d4b21e1d065b2a11b9ef782dc694c4995d403f5624fa4e85984481721a9372
 EBUILD libvirt-0.9.12.ebuild 10224 SHA256 bdc672b8cb37d4cc51a19588d399852f1717089610240a11e71fcd4930e3835f SHA512 35d63ce710b905ab38882f045aa4b33db838d0c643042d476f0279910435549683952eeb3b84f638e0d2c605c48ca08225aa38a8f019090558ddb14df95f19d4 WHIRLPOOL e3a52096c334ef1209b7f6a32ec397f3261031b52431d83f6b84c2ac698bf1ccc08fe4cd582e4e02683943250271867d26bb619fa16a500e306569fa963d7965
-EBUILD libvirt-0.9.13.ebuild 10457 SHA256 f37160171a39a794d4375c1baeb31500561e71a8b9ebe885b43f204f3a9c1c77 SHA512 378f39062e6457d6f03354604b5171909ce8c84db726db315841f794c2ebbb99dc099b26170874683f13df591215c16f668cd34d1f5fa74812ed0c10aa0a5e47 WHIRLPOOL a0b855df257447c802775dc0dc8fd74440522c5a8bf101e22940d063eb2cb70586f6d95474093beab7d32e71d974d39ee5fdeb8ce24272690781bde5f8caf46f
+EBUILD libvirt-0.9.13.ebuild 10494 SHA256 09826263562e883f669324fcb8b92f5a8c1e3a7de55281af12ec5197f9d243e0 SHA512 051c209e813f1ab03e853d5525bb5f36b1ae502d5393cd03454e0338adec72d224ebe068069f5af5ae0c7ef723479b2128002fa93c8b56d0c4e3f03226238b3c WHIRLPOOL b70ced4fc454cd1ea11615c0c55ba8c950cd0ca45885f8b2677a10aa325298a4eac79d5db793efe0b4a04a8aed9e57982c36a38bd1ae77cc48171c1ca1811b7a
 EBUILD libvirt-0.9.8.ebuild 8137 SHA256 2892e8b77eab033b317847974b67212bede163a77449b2be5097abd9ae9dfd44 SHA512 de4716161495c5b142598daf6994b4ffc8faf169976f222aa809c3b953f97f4a8e8bb66fcf510a9c11c45b4037e4df48efc48e8dd60089aab2fec276abd66251 WHIRLPOOL 557497a58cb87c3b2a5031a428197c2cdfafc7161369a5716c58c88cac24320b781540334fbe938288626486bfac68c11607e6143c9cfe530bed7487337364e0
 EBUILD libvirt-9999.ebuild 10349 SHA256 62ae9e1daff84437904c87954dd7c5d2dc34a8119e9dffd770fa1515bc757f99 SHA512 06c1e295c455c800e89c6a58a097925cb0912a8e83b0dbdf81351289d3585e23921eb5466ee10511fa13478e7cb1eeb0286521b6d1b7288c48509fa1e0b35228 WHIRLPOOL d94e0f4b7ddd7b1bbbd39f17852e8a9af45cce3b53639e4732bdb3fc193655025cd842d3b613327f26a6da76af5046648744ebaf7ac8f610a4d424c342639e43
-MISC ChangeLog 38588 SHA256 e2dfd8600aba7e9c23a54b20415123bc54cf34ce69b963e8bbe8788599d3ec26 SHA512 f0f62bc4c0b0ac45b7dc8ff174150109f508350e10267670fc87b836e481cd76c10e881db6d0a31407d5b7b038fd3d0c9ff39921d5a1476cb2cdcf2473c07648 WHIRLPOOL 05b65e43c4dc415047730f9e3637cc7ebb129f886ac32ec71fe561e9045572d7faaf4b0749a1b71e81255159aea60e6f28fddc5ca73113658ef156a5a7e058ec
-MISC metadata.xml 3323 SHA256 809029f5e12280cd848b28f080617aa1310f793a552611df15d3d53386251684 SHA512 b00a14a4b80853cf6b35a67bced998db36aa51c59621937bdd90d4ee3b8a9ee90eb2566dcd377c093ab19340a1675759267d0b44ffa748070fd3c0f058efdf22 WHIRLPOOL d9b4509c3d7a268bc58e9f60edb241bed5a1311ed2725a61eb1a20a85f341a52187d379c5d98c18ce30c961a195936fade54104c0f65286ca21ce37dc28c343e
+MISC ChangeLog 38719 SHA256 49ba2b7d99e9183af9d7dcc14c274eb760dc0f2bf8e070af4b3d1cc5da033d7e SHA512 a4dcc0110117125bdd7150c8a5111737a9b2aa19f8f0245ef01dc923927c818e5168d9873a8213c7baa8d7ec38836b1e48f8ced8038ed239824fda5f084f7dd3 WHIRLPOOL e53bea8f7ee5c429b64411b5c1a86305ddd2d77faf1e0e5e241b064e49dd70dccd2162b7898e09fbb6ee9faa5bd8e82638a0738b3b09524c253750675e63d029
+MISC metadata.xml 3420 SHA256 0916b94209d91c7a809069e61f788a9f6115ce9081758a90330f29a3249c9be5 SHA512 8acd907b424ef3500112d5834fba026146636948675381a3a07c1837968f2ebb146b0afa2a9d56225d9af008ade51d46022ba1c03d5e02de0e6e7f3678be4091 WHIRLPOOL c0e4dea1775586184c261a406556eed83f3f26782bfb770e055df8531b0643c62e0f8a6ac3f1243c8cdd1e931f17020d72704178a33e8b5eb4f23f24cf4f7354
diff --git a/app-emulation/libvirt/libvirt-0.9.13.ebuild b/app-emulation/libvirt/libvirt-0.9.13.ebuild
index b95bb1e03550..b7b9e9b824a5 100644
--- a/app-emulation/libvirt/libvirt-0.9.13.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.13.ebuild,v 1.2 2012/07/04 16:54:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.13.ebuild,v 1.3 2012/07/08 04:12:16 cardoe Exp $
 
 EAPI=4
 
@@ -35,8 +35,8 @@ HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="audit avahi +caps debug iscsi +libvirtd lvm +lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev \
-	uml +vepa virtualbox virt-network xen elibc_glibc"
+	nls numa openvz parted pcap phyp policykit python qemu rbd sasl \
+	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc"
 REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
 	lxc? ( caps libvirtd )
 	openvz? ( libvirtd )
@@ -87,6 +87,7 @@ RDEPEND="sys-libs/readline
 		dev-libs/yajl
 		sys-power/pm-utils
 	)
+	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( >=sys-libs/libselinux-2.0.85 )
 	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
@@ -213,7 +214,7 @@ src_configure() {
 	myconf="${myconf} $(use_with iscsi storage-iscsi)"
 	myconf="${myconf} $(use_with parted storage-disk)"
 	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} --without-storage-rbd"
+	myconf="${myconf} $(use_with rbd storage-rbd)"
 	myconf="${myconf} $(use_with numa numactl)"
 	myconf="${myconf} $(use_with numa numad)"
 	myconf="${myconf} $(use_with selinux)"
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index fc1390e909c8..d7387dad8e8c 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -22,6 +22,9 @@
       Allow using real disk partitions as pool for disk image storage, using
       <pkg>sys-block/parted</pkg> to create, resize and delete them.
     </flag>
+	<flag name='rbd'>
+	  Enable rados block device support via <pkg>sys-cluster/ceph</pkg>
+	</flag>
 
     <!-- Virtualisation backends -->
     <flag name='lxc'>