Remove old version; bump to 0.9.0_rc1; add the new 9999 ebuild.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 45 insertions, 30 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index a2185af179ff..baa213fe8aaf 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.98 2011/03/17 23:25:09 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.99 2011/03/28 07:57:02 flameeyes Exp $
+
+*libvirt-0.9.0_rc1 (28 Mar 2011)
+
+  28 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org> -libvirt-0.8.7.ebuild,
+  +libvirt-0.9.0_rc1.ebuild, libvirt-9999.ebuild:
+  Remove old version; bump to 0.9.0_rc1; add the new 9999 ebuild.
 
   17 Mar 2011; Thomas Kahle <tomka@gentoo.org> libvirt-0.8.8-r1.ebuild:
   x86 stable per bug 358877
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 9e984503d1af..4520ac13cdb0 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -7,19 +7,19 @@ AUX libvirtd.init-r1 2558 RMD160 d87b527e9917ef926045fa07e809dc4527f04af7 SHA1 b
 AUX libvirtd.init-r2 3407 RMD160 9a5cf8a0d3bc4097871d8cf1581fc5a858e22abd SHA1 79e3d9848f03f66fc3bd5c438231a84b1bf3588e SHA256 8fb9a912cdf4974cfa7d23762468f67b5b2ef74620ce0c7270c72b4a8a691eef
 DIST libvirt-0.8.5-backports-2.tar.bz2 4213 RMD160 9d146f0f5e40d8e7d56d76561c67b40f30181b3c SHA1 aaeb6c97df52393d419ece2b1eec609cb3c7e9bf SHA256 4ad5b0aa099c31e6c653509ce361f405c13c6a2e3da23b47b12b6ba81ba30cf2
 DIST libvirt-0.8.5.tar.gz 13054019 RMD160 76c16d6b96fce74ab805e1f5cd4f7568dec6f48b SHA1 357da4d90d7730e6e529f086271d425a406c9c46 SHA256 0d4e6aa61ecbfccd3f3289a9821742d599db546eb3f37fe05036a616b3a9df8d
-DIST libvirt-0.8.7.tar.gz 13713267 RMD160 20a0651aee1bb35fbb69f3218ca96e92a2323446 SHA1 53b10513cb04c502a2c8aaf57039c71f0f79ea6f SHA256 da7b0e8bff7b2df2e19d732272674599bfb805787fb0d6f30289ba700ca77f31
 DIST libvirt-0.8.8-backports-1.tar.bz2 1321 RMD160 e10e1062abe8c03fb3d872bd0ce5700ec8e6dc08 SHA1 383181c7e2df7f5111ef26e93b48c2d7da13820b SHA256 15135a4f5170fc04dbc0a26a8c17783e343a3a48768dfbfa21108c621e82b8b3
 DIST libvirt-0.8.8.tar.gz 14150587 RMD160 2009761fa7cb01300d7c8c566ea8613f23289900 SHA1 b80374768d7bc3234735c1221aa554c75fe79ab8 SHA256 030aea3728917053555bec98d93d2855e8a603b758c0b2a5d57ac48b4f39e113
+DIST libvirt-0.9.0-rc1.tar.gz 14386650 RMD160 2e91aad0599d9bce554ca88be5127b222987e7ba SHA1 e561acff780197317dcc8da5d86c4de9af50951a SHA256 40d148e82944c3fc00a9a7fa73ddffdb858065b635d537d40b3c2dc86f90e3f7
 EBUILD libvirt-0.8.5-r2.ebuild 7268 RMD160 27f3307e8dcbdbd57fff5c21caab67b38fa8ff86 SHA1 76e5534c0f341f6e39a9080081a72c84c2a1152b SHA256 2f9d79266501279652972a5ad8467a6a3002ce70a645f2d4d8cb8770ad98138f
-EBUILD libvirt-0.8.7.ebuild 7762 RMD160 f8d686d26aadf7bd47683c36ec70fda2b1cc3ff3 SHA1 7f5a6eaa91852c7e96da34a11a78e2f5093f670b SHA256 64cae882bdf9ace9d88ed5d94a9610aa555490c1f965e7eb605ffd3fdf912395
 EBUILD libvirt-0.8.8-r1.ebuild 7548 RMD160 d34bbb2e76df333473088c4b12c8013da3fa5967 SHA1 fca2bd636d90ff41831cc72ef0dda5d6efd48abb SHA256 c90192d013ef4d8335c6c372e29ab615706e65cd799d2c67e2dc2b8bd778ff26
-EBUILD libvirt-9999.ebuild 7929 RMD160 f9d79b9d61fd9b95954a592990c45f5bdcc83160 SHA1 86d4d13baf0e03c19d0c6584668eac701ef93b81 SHA256 fffec29fe8fa311eb3abdc61cd40ed7d2304ebdcc36ecdb9a12b41a2eedcefe5
-MISC ChangeLog 21857 RMD160 4d2f182968880329248090fe582af7694b4457e7 SHA1 57a3d152434b3f2aa0be28060344e3ad70228515 SHA256 2ee3e6a013f894ba195fe63e840d9b61c1e87e28a340b2cf75a7391cb906fbca
+EBUILD libvirt-0.9.0_rc1.ebuild 7678 RMD160 53791544f584c4e1c6691712af4ac5559d8bb556 SHA1 51dd2aaff45d296fc59e61a4e641c5ae47aa7740 SHA256 f22d6f82ed42c210fb62fa22636aba1551ac1d7bd05ab964638c3ff9693c1161
+EBUILD libvirt-9999.ebuild 8054 RMD160 50f8c88a144ae2045d2e82b6825029230242f132 SHA1 5237c1aaa51cdd6af86c483ebff824860425e068 SHA256 c99762c8e13609ca0965b3584a0d26a356d76ecfb508f056992c9b3b71c84e8c
+MISC ChangeLog 22091 RMD160 068f75e2a850c5c2d6fd9c46119986d9045257e5 SHA1 1d9079dee0b098c7d10cb6b9177dd5e5ded9e19d SHA256 921ac6763ad9e48c2d547f428fd210e5638677348ae76930f0a33e4beb399c8f
 MISC metadata.xml 3026 RMD160 c45bdcd924b283330b1211abc505e106f2ceb2b1 SHA1 ca4308eec5a3e7c6419a24f9ca06fdea64ccec8e SHA256 7f7722b3a05787803ae3bda78ceccbc1c48a8d53d80f98a7a1327e988fe9ea41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2CmLAACgkQnZsgo/h8kNbMdACeNAYUEBdBpWbmjtjWGKU5Z6hf
-iMwAoI9b9U/wTMbK6+hD6KyNCaKl8uzO
-=y12C
+iEYEARECAAYFAk2QP1sACgkQAiZjviIA2XhFkwCg1cUlB90Yb4OiIO1cWqbZElks
+zzQAn0U/5f+S5Jz3BQzQXKfpiwsl/kT6
+=tjjn
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.8.7.ebuild b/app-emulation/libvirt/libvirt-0.9.0_rc1.ebuild
index c803467a48bb..cd444664d970 100644
--- a/app-emulation/libvirt/libvirt-0.8.7.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.0_rc1.ebuild
@@ -1,12 +1,14 @@
 # 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.7 2011/02/12 18:31:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.0_rc1.ebuild,v 1.1 2011/03/28 07:57:02 flameeyes Exp $
 
 #BACKPORTS=1
 #AUTOTOOLIZE=yes
 
 EAPI="2"
 
+MY_P="${P/_rc/-rc}"
+
 PYTHON_DEPEND="python? 2:2.4"
 #RESTRICT_PYTHON_ABIS="3.*"
 #SUPPORT_PYTHON_ABIS="1"
@@ -15,18 +17,23 @@ inherit eutils python ${AUTOTOOLIZE+autotools}
 
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${P}.tar.gz
+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}/${P}-backports-${BACKPORTS}.tar.bz2
-		http://dev.gentoo.org/~cardoe/${PN}/${P}-backports-${BACKPORTS}.tar.bz2}"
+		http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2
+		http://dev.gentoo.org/~cardoe/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
+S="${WORKDIR}/${P%_rc*}"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 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
 
+# 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
@@ -35,6 +42,7 @@ RDEPEND="sys-libs/readline
 	>=net-libs/gnutls-1.0.25
 	sys-fs/sysfsutils
 	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 )
@@ -46,7 +54,10 @@ RDEPEND="sys-libs/readline
 	nfs? ( net-fs/nfs-utils )
 	numa? ( sys-process/numactl )
 	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-block/parted-1.8[device-mapper] )
+	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 )
@@ -62,8 +73,7 @@ RDEPEND="sys-libs/readline
 		sys-apps/iproute2 )"
 # one? ( dev-libs/xmlrpc-c )
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
+	dev-util/pkgconfig"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -74,16 +84,6 @@ src_prepare() {
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
 
-	# This is required to be able to run the tests when using the sandbox
-	if [[ ${LD_PRELOAD} == libsandbox.so ]]; then
-		sed -i -e '/LOGNAME/iENV:LD_PRELOAD=libsandbox.so' \
-			"${S}"/tests/commanddata/*.log || die
-		sed -i -e '/DISPLAY/aENV:LD_PRELOAD=libsandbox.so' \
-			"${S}"/tests/commanddata/test6.log || die
-		sed -i -e '/LANG/aENV:LD_PRELOAD=libsandbox.so' \
-			"${S}"/tests/commanddata/test8.log || die
-	fi
-
 	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
 }
 
@@ -100,6 +100,9 @@ src_configure() {
 
 	## 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
@@ -192,8 +195,8 @@ src_install() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
-	newinitd "${FILESDIR}/libvirtd.init-r1" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r1" libvirtd || die
+	newinitd "${FILESDIR}/libvirtd.init-r2" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r2" libvirtd || die
 
 	keepdir /var/lib/libvirt/images
 }
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 8a9fcc9123de..0ecc58287efa 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.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-9999.ebuild,v 1.1 2011/02/12 04:57:45 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.2 2011/03/28 07:57:02 flameeyes Exp $
 
 #BACKPORTS=1
 
@@ -57,7 +57,10 @@ RDEPEND="sys-libs/readline
 	nfs? ( net-fs/nfs-utils )
 	numa? ( sys-process/numactl )
 	openvz? ( sys-kernel/openvz-sources )
-	parted? ( >=sys-block/parted-1.8[device-mapper] )
+	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 )
@@ -111,6 +114,9 @@ src_configure() {
 
 	## 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