Cleanup old version; add new revbump that disables the xen-proxy in all cases, since upstream deprecated it and won't be in the next version anyway.

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

3 files changed, 25 insertions, 17 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 401956776bc3..170d79fa1554 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.79 2010/10/30 17:54:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.80 2010/11/09 13:25:58 flameeyes Exp $
+
+*libvirt-0.8.5-r2 (09 Nov 2010)
+
+  09 Nov 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -libvirt-0.8.4.ebuild, +libvirt-0.8.5-r2.ebuild:
+  Cleanup old version; add new revbump that disables the xen-proxy in all
+  cases, since upstream deprecated it and won't be in the next version
+  anyway.
 
 *libvirt-0.8.5-r1 (30 Oct 2010)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index f44417b2882c..a9aa05d06649 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -3,17 +3,16 @@ Hash: SHA1
 
 AUX libvirtd.confd-r1 1248 RMD160 ebd5f28c671f2d26e9ff5d4879f959c11d72d7e3 SHA1 4789a80343f06b535d6bc27ef4206704c548c078 SHA256 851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1
 AUX libvirtd.init-r1 2558 RMD160 d87b527e9917ef926045fa07e809dc4527f04af7 SHA1 b483a176d650cbf80d64d8da2b5165f62fc23e7f SHA256 03020823683a3374f05a0a45e023037433b2b6fc4c7c8d52ed90f61f3d3f5b7b
-DIST libvirt-0.8.4.tar.gz 12726557 RMD160 c4fe8756aa952a6fa3ff276e5bcccb99020294a4 SHA1 dd960237bc54daa3260632763fea21bbb4774c04 SHA256 9c683b910a0b1d22c64065efa79668c954fa378a1699e06ea7393f4822f7ae29
 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
-EBUILD libvirt-0.8.4.ebuild 7158 RMD160 cf61d91f1c3ce1a4bf2044ec5d62be3bdf5f61ba SHA1 5a8d6a2a66d49fa5225e0eca244a17d8bc96ce43 SHA256 2b0937ac50c59f7f578342db9626b719bd68e2b7be10df7ac8d0133530425685
 EBUILD libvirt-0.8.5-r1.ebuild 7352 RMD160 6417ee0bbbccb91a99bcbb209e8a305335595ff3 SHA1 6bdf8df7fcebd776f6ed6f577179172b5d95389c SHA256 5f5e5c699678df5b705d4cd0c5f470304ad02ed0fe629727ddb7a010298be1cb
-MISC ChangeLog 18217 RMD160 c9802d136a252f4fc0a396b918cda78c907c2796 SHA1 31a560fe1afec3364150d15fcbc2958b5190f2a2 SHA256 658924a73fa6224b122d9d8c72b05283c0b1d534221e10c8f4029539d882785f
+EBUILD libvirt-0.8.5-r2.ebuild 7293 RMD160 dbd9b2c09fdbfdaf2a84713aca1f350977978eb3 SHA1 d03211c3b5fdc75568f9819c82e2f807ec78bc6a SHA256 13d79e025fa94f4d633825f0e255e32395efa2949ee30345b0b8ad8febd12346
+MISC ChangeLog 18513 RMD160 646f3c4a39219ee4f07e292e5e1666df92b585a0 SHA1 dcc858d4c8b0117f07deeed6f8728a18bd7b514e SHA256 d7d8f88a2d83be32a4a2b209c1f3d55e4b8e1e81070bb09725ff3d7baec387e8
 MISC metadata.xml 2742 RMD160 82f7154f8af2898a702961d59ebeec81d9aa4fe2 SHA1 cc28fad9c602f6f73ab157d531b55d9876703a45 SHA256 4c3e2fb4fd6fcedb22d73992431f16dff0728ce9e608011b01c182e6654ccd46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzMW9UACgkQAiZjviIA2Xj+XgCg5fQhpXdSt+iXpImKMON36NQP
-6nwAoOAIAyoRVHyMpQ7OVa5hQHHBZV9q
-=ijAa
+iEYEARECAAYFAkzZTAQACgkQAiZjviIA2XilFgCg8YwCUpT09RZnTL2yIkItunZ1
+Kx4AoKyQazm/poCJHLlVcpRE8XPomzuc
+=9a6I
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.8.4.ebuild b/app-emulation/libvirt/libvirt-0.8.5-r2.ebuild
index 151b99a7b2a6..3b3c81bf69cf 100644
--- a/app-emulation/libvirt/libvirt-0.8.4.ebuild
+++ b/app-emulation/libvirt/libvirt-0.8.5-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.4.ebuild,v 1.1 2010/09/17 17:58:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.5-r2.ebuild,v 1.1 2010/11/09 13:25:58 flameeyes Exp $
 
-#BACKPORTS=3
+BACKPORTS=2
 
 EAPI="2"
 
@@ -15,13 +15,15 @@ inherit eutils python autotools
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 SRC_URI="http://libvirt.org/sources/${P}.tar.gz
-	${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
+	${BACKPORTS:+
+		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
+		http://dev.gentoo.org/~cardoe/${PN}/${P}-backports-${BACKPORTS}.tar.bz2}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="avahi caps debug iscsi +libvirtd lvm +lxc macvtap +network nfs nls \
 	numa openvz parted pcap phyp policykit python qemu sasl selinux
-	uml virtualbox xen udev"
+	uml virtualbox xen udev +json"
 # IUSE=one : bug #293416 & bug #299011
 
 RDEPEND="sys-libs/readline
@@ -51,7 +53,8 @@ RDEPEND="sys-libs/readline
 	selinux? ( >=sys-libs/libselinux-2.0.85 )
 	virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=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 )"
+	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )
+	json? ( dev-libs/yajl )"
 # one? ( dev-libs/xmlrpc-c )
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -81,10 +84,7 @@ src_configure() {
 	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 xen) $(use_with xen xen-inotify) --without-xen-proxy"
 	myconf="${myconf} $(use_with openvz)"
 	myconf="${myconf} $(use_with lxc)"
 	if use virtualbox && has_version app-emulation/virtualbox-ose; then
@@ -128,9 +128,10 @@ src_configure() {
 	## 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"
+	myconf="${myconf} --without-netcf --without-audit"
 
 	# we use udev over hal
 	myconf="${myconf} --without-hal"