Version bump; add a workaround for tests failing with sandbox enabled.

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

3 files changed, 263 insertions, 6 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index c226d9bd4def..03b8e8b5af0c 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.82 2010/12/13 12:04:45 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.83 2011/01/06 14:34:36 flameeyes Exp $
+
+*libvirt-0.8.7 (06 Jan 2011)
+
+  06 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> +libvirt-0.8.7.ebuild:
+  Version bump; add a workaround for tests failing with sandbox enabled.
 
 *libvirt-0.8.6-r1 (13 Dec 2010)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index d12d90b27d29..32af42111af8 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -5,13 +5,15 @@ AUX libvirtd.confd-r1 1248 RMD160 ebd5f28c671f2d26e9ff5d4879f959c11d72d7e3 SHA1
 AUX libvirtd.init-r1 2558 RMD160 d87b527e9917ef926045fa07e809dc4527f04af7 SHA1 b483a176d650cbf80d64d8da2b5165f62fc23e7f SHA256 03020823683a3374f05a0a45e023037433b2b6fc4c7c8d52ed90f61f3d3f5b7b
 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
 EBUILD libvirt-0.8.6-r1.ebuild 7342 RMD160 e6c9f4aff859f697673085986599024143f04f65 SHA1 cfe39d726b37fb5737f7097e3e1ccd4c10ff3fe0 SHA256 255774bb9cd02269fb24898600d96920a86d206decab19b294271351b34e48f2
-MISC ChangeLog 18987 RMD160 ba3aabe6f018553295396fcefcd0414e3a476f45 SHA1 cfb0c08c8ef3396c9e01a64e7a976f2914090c0d SHA256 437fde67100e2019fd48c5038b42af21450e125856d316d11b8e770691fc8b14
+EBUILD libvirt-0.8.7.ebuild 7746 RMD160 126f2814d47baf63a556a907d6607a7e7ec48117 SHA1 32746ae9505867021fcb4cff79f2c48eb72bbd24 SHA256 7a02c81659f88ad4005531b296e55990a530a4324decd7bb4ffde48071f09d04
+MISC ChangeLog 19170 RMD160 6233dfba2233ca8330732ce07ccf5d3ae4dd641c SHA1 a3dee65e4969fef464e962d26c651cf720c5faa1 SHA256 836cecbb7d991e98557de5206248e8b1222d49477bc9037db6a957c7f0e31773
 MISC metadata.xml 2742 RMD160 82f7154f8af2898a702961d59ebeec81d9aa4fe2 SHA1 cc28fad9c602f6f73ab157d531b55d9876703a45 SHA256 4c3e2fb4fd6fcedb22d73992431f16dff0728ce9e608011b01c182e6654ccd46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0GC/0ACgkQAiZjviIA2XjyFACg1PZdH33Hk3ZCLPYBHfwF3aSu
-V4kAoNvn7SLgKZADfJbtgRQd3afg5PPr
-=yAmN
+iEYEARECAAYFAk0l0woACgkQAiZjviIA2XiM4ACfR6pgmb4wjW0AYn98keUUa8Nf
+2AUAnjadq807B89zT2bLYiPBfIz1nd2h
+=HObA
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.8.7.ebuild b/app-emulation/libvirt/libvirt-0.8.7.ebuild
new file mode 100644
index 000000000000..762233be2e0d
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.8.7.ebuild
@@ -0,0 +1,250 @@
+# 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.1 2011/01/06 14:34:36 flameeyes Exp $
+
+#BACKPORTS=1
+#AUTOTOOLIZE=yes
+
+EAPI="2"
+
+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/${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}"
+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 +json"
+# 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 )
+	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-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 )
+	json? ( dev-libs/yajl )"
+# 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
+
+	# 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
+}
+
+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-r1" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r1" 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'll need the"
+	elog "following packages":
+	elog
+	elog "	net-dns/dnsmasq"
+	elog "	>=net-firewall/iptables-1.4.9"
+	elog "	net-firewall/ebtables"
+	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
+}