Version bump to 0.8.8_rc2; unmasked since the code is frozen and looks quite fine as it is. Dropped tests workaround (fixed now).

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

3 files changed, 256 insertions, 12 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index ae6ac755514e..d6f0302f22bf 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
 # 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.92 2011/02/12 18:31:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.93 2011/02/14 13:18:31 flameeyes Exp $
+
+*libvirt-0.8.8_rc2 (14 Feb 2011)
+
+  14 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +libvirt-0.8.8_rc2.ebuild:
+  Version bump to 0.8.8_rc2; unmasked since the code is frozen and looks quite
+  fine as it is. Dropped tests workaround (fixed now).
 
   12 Feb 2011; Christian Faulhammer <fauli@gentoo.org> libvirt-0.8.7.ebuild:
   stable x86, bug 352277
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 32813f2c33b4..cb7f0cf669ed 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libvirtd.confd-r1 1248 RMD160 ebd5f28c671f2d26e9ff5d4879f959c11d72d7e3 SHA1 4789a80343f06b535d6bc27ef4206704c548c078 SHA256 851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1
 AUX libvirtd.confd-r2 1749 RMD160 30c662b9a14a3dc635674d0aee6452076da60102 SHA1 ae7a2b801ca0f9f610c015eb0fe06640596ac614 SHA256 93040599a7cb878b54b8b963ef4963e9450bc25e982e390cef3e5b7e8039757c
 AUX libvirtd.init-r1 2558 RMD160 d87b527e9917ef926045fa07e809dc4527f04af7 SHA1 b483a176d650cbf80d64d8da2b5165f62fc23e7f SHA256 03020823683a3374f05a0a45e023037433b2b6fc4c7c8d52ed90f61f3d3f5b7b
@@ -10,17 +7,12 @@ DIST libvirt-0.8.5.tar.gz 13054019 RMD160 76c16d6b96fce74ab805e1f5cd4f7568dec6f4
 DIST libvirt-0.8.6-backports-1.tar.bz2 2074 RMD160 b6c4fba2acb19d8e22b41a555858d0203d54c924 SHA1 22f7fcd2277abd216808c734f40e00d31ee191b6 SHA256 991f0e88e8470b6d4de9f53a034103d9cad72ef222b07b8a795947262d8e361b
 DIST libvirt-0.8.6.tar.gz 13296407 RMD160 a65add6ed9b00e2f065f9e791a02b61e851aa721 SHA1 087822d106c01c630a251461b56c81f08dc08639 SHA256 99d5f6f6890eaa78887832e218c01c79c410b6e76d8d526980906808e2487220
 DIST libvirt-0.8.7.tar.gz 13713267 RMD160 20a0651aee1bb35fbb69f3218ca96e92a2323446 SHA1 53b10513cb04c502a2c8aaf57039c71f0f79ea6f SHA256 da7b0e8bff7b2df2e19d732272674599bfb805787fb0d6f30289ba700ca77f31
+DIST libvirt-0.8.8-rc2.tar.gz 14096192 RMD160 b7d5a9c9c8c26cd19cb1a15666dc73652deb9eb2 SHA1 ba63f6815a18360ee4ad67244e6f2d07e5fc3c2f SHA256 eb498e77c5f33b3061a73b37ffd44ed5f04518397fc9e79ae75c753e41b69d99
 EBUILD libvirt-0.8.5-r2.ebuild 7268 RMD160 27f3307e8dcbdbd57fff5c21caab67b38fa8ff86 SHA1 76e5534c0f341f6e39a9080081a72c84c2a1152b SHA256 2f9d79266501279652972a5ad8467a6a3002ce70a645f2d4d8cb8770ad98138f
 EBUILD libvirt-0.8.6-r1.ebuild 7328 RMD160 73c6f7a20c7a28aac5d439f1af41b78dbc80a2df SHA1 b1ee9099051dd7230a46d1497bff6e92f0ef2b12 SHA256 786f6697345c70654924a3305526ccc285b5d384bab117590bc4996b276d5e43
 EBUILD libvirt-0.8.7-r1.ebuild 7768 RMD160 f22cb6e14eaf4d587aef3d07b3036762bbb0d7bf SHA1 ca4d014af5eab4f3d74972e6119052ba32037e2e SHA256 49c8d2c145d926025db7b80d606a4b87bfa879dcbf713dd30d43576fb33189df
 EBUILD libvirt-0.8.7.ebuild 7762 RMD160 f8d686d26aadf7bd47683c36ec70fda2b1cc3ff3 SHA1 7f5a6eaa91852c7e96da34a11a78e2f5093f670b SHA256 64cae882bdf9ace9d88ed5d94a9610aa555490c1f965e7eb605ffd3fdf912395
+EBUILD libvirt-0.8.8_rc2.ebuild 7454 RMD160 b1fab5248eabbf5cc26a3d021b2a03b784ab9534 SHA1 738b6823ac651930caac381a59af698180256d9c SHA256 c6b6e244cfc34e40cc96495c190da781dce25b63ea02b720f7165b24b01332f4
 EBUILD libvirt-9999.ebuild 7929 RMD160 f9d79b9d61fd9b95954a592990c45f5bdcc83160 SHA1 86d4d13baf0e03c19d0c6584668eac701ef93b81 SHA256 fffec29fe8fa311eb3abdc61cd40ed7d2304ebdcc36ecdb9a12b41a2eedcefe5
-MISC ChangeLog 20822 RMD160 79bd35fd7677b221ef12865f5c0ad8bfc55b38ce SHA1 9368cbb7af16cbf815698010f1d5e05d30681a52 SHA256 379736a25e0d7126caf292e033b0a89baba0df55a7982d14dc6083c987f58983
+MISC ChangeLog 21080 RMD160 803f5dd9a896b04ae9f74fda38aa715323188447 SHA1 e7eede020c6345d3eacaefdb9b5fc23fe6cd1be2 SHA256 ae05b086bf279b8330eb7f58885fd3b5776f60ca27999ba1e7d441801c81eb2a
 MISC metadata.xml 3026 RMD160 c45bdcd924b283330b1211abc505e106f2ceb2b1 SHA1 ca4308eec5a3e7c6419a24f9ca06fdea64ccec8e SHA256 7f7722b3a05787803ae3bda78ceccbc1c48a8d53d80f98a7a1327e988fe9ea41
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk1W0fQACgkQNQqtfCuFnePsLQCeLALIzWl1HDzq3kiqePCCbFBR
-V5wAnjTpGC47zV15oU+JWj5WIw0y7rRr
-=tvlM
------END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.8.8_rc2.ebuild b/app-emulation/libvirt/libvirt-0.8.8_rc2.ebuild
new file mode 100644
index 000000000000..aa739d08ffe1
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.8.8_rc2.ebuild
@@ -0,0 +1,245 @@
+# 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.8_rc2.ebuild,v 1.1 2011/02/14 13:18:31 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"
+
+inherit eutils python ${AUTOTOOLIZE+autotools}
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+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}/${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"
+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
+
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	>=dev-libs/libxml2-2.7.6
+	>=dev-libs/libnl-1.1
+	>=net-libs/gnutls-1.0.25
+	sys-fs/sysfsutils
+	sys-apps/util-linux
+	>=net-analyzer/netcat6-1.0-r2
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	iscsi? ( sys-block/open-iscsi )
+	json? ( dev-libs/yajl )
+	libvirtd? ( net-misc/bridge-utils )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	macvtap? ( >=dev-libs/libnl-1.1 )
+	nfs? ( net-fs/nfs-utils )
+	numa? ( sys-process/numactl )
+	openvz? ( sys-kernel/openvz-sources )
+	parted? ( >=sys-block/parted-1.8[device-mapper] )
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	phyp? ( net-libs/libssh2 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 app-emulation/qemu-kvm-spice ) )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virtualbox? ( || ( app-emulation/virtualbox >=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 )
+	virt-network? ( net-dns/dnsmasq
+		>=net-firewall/iptables-1.4.10
+		net-firewall/ebtables
+		sys-apps/iproute2 )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	myconf="${myconf} $(use_enable debug)"
+
+	## 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)"
+	myconf="${myconf} $(use_with openvz)"
+	myconf="${myconf} $(use_with lxc)"
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+	else
+		myconf="${myconf} $(use_with virtualbox vbox)"
+	fi
+	myconf="${myconf} $(use_with uml)"
+	myconf="${myconf} $(use_with qemu)"
+	# 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)"
+
+	# udev for device support details
+	myconf="${myconf} $(use_with udev)"
+
+	# linux capability support so we don't need privileged accounts
+	myconf="${myconf} $(use_with caps capng)"
+
+	## auth stuff
+	myconf="${myconf} $(use_with policykit polkit)"
+	myconf="${myconf} $(use_with sasl)"
+
+	# network biits
+	myconf="${myconf} $(use_with macvtap)"
+	myconf="${myconf} $(use_with pcap libpcap)"
+
+	## 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 --without-audit"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	# this is a nasty trick to work around the problem in bug
+	# #275073. The reason why we don't solve this properly is that
+	# it'll require us to rebuild autotools (and we don't really want
+	# to do that right now). The proper solution has been sent
+	# upstream and should hopefully land in 0.7.7, in the mean time,
+	# mime the same functionality with this.
+	case ${CHOST} in
+		*cygwin* | *mingw* )
+			;;
+		*)
+			ac_cv_prog_WINDRES=no
+			;;
+	esac
+
+	econf \
+		${myconf} \
+		--disable-static \
+		--docdir=/usr/share/doc/${PF} \
+		--with-remote \
+		--localstatedir=/var \
+		--with-remote-pid-file=/var/run/libvirtd.pid
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	emake check || die "tests failed"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		HTML_DIR=/usr/share/doc/${PF}/html \
+		DOCS_DIR=/usr/share/doc/${PF}/python \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newinitd "${FILESDIR}/libvirtd.init-r2" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r2" libvirtd || die
+
+	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
+
+	# We really don't want to use or support old PolicyKit cause it
+	# screws with the new polkit integration
+	if has_version sys-auth/policykit; then
+		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize $(python_get_sitedir)/libvirt.py
+
+	elog
+	if use policykit && has_version sys-auth/policykit; then
+		elog "You must have run the following at least once:"
+		elog
+		elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\""
+		elog
+		elog "to grant USERNAME access to libvirt when using USE=policykit"
+	else
+		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"
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	elog
+	elog "For the basic networking support (bridged and routed networks)"
+	elog "you don't need any extra software. For more complex network modes"
+	elog "including but not limited to NATed network, you can enable the"
+	elog "'virt-network' USE flag."
+	elog
+	if has_version net-dns/dnsmasq; then
+		ewarn "If you have a DNS server setup on your machine, you will have"
+		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
+		ewarn " bind-interfaces"
+		ewarn " interface or except-interface"
+		ewarn
+		ewarn "Otherwise you might have issues with your existing DNS server."
+	fi
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup $(python_get_sitedir)/libvirt.py
+}