app-emulation/libvirt: fix src_test, bug #576148

Package-Manager: portage-2.2.28

4 files changed, 24 insertions, 23 deletions

diff --git a/app-emulation/libvirt/libvirt-2.0.0-r2.ebuild b/app-emulation/libvirt/libvirt-2.0.0-r2.ebuild
index d24ed9fcaef8..9244e85d8b34 100644
--- a/app-emulation/libvirt/libvirt-2.0.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-2.0.0-r2.ebuild
@@ -31,10 +31,12 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
-IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
-	lxc +macvtap nfs nls numa openvz parted pcap phyp pm-utils policykit \
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
-	wireshark-plugins xen elibc_glibc"
+IUSE="
+	apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm
+	lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd
+	sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins
+	xen elibc_glibc
+"
 
 REQUIRED_USE="
 	firewalld? ( virt-network )
@@ -88,7 +90,6 @@ RDEPEND="
 		sys-fs/lvm2[-device-mapper-only(-)]
 	)
 	pcap? ( >=net-libs/libpcap-1.0.0 )
-	pm-utils? ( sys-power/pm-utils )
 	policykit? ( >=sys-auth/polkit-0.9 )
 	qemu? (
 		>=app-emulation/qemu-0.13.0
@@ -269,7 +270,6 @@ src_configure() {
 		$(use_with parted storage-disk)
 		$(use_with pcap libpcap)
 		$(use_with phyp)
-		$(use_with pm-utils pm-utils)
 		$(use_with policykit polkit)
 		$(use_with qemu)
 		$(use_with qemu yajl)
@@ -325,7 +325,8 @@ src_configure() {
 }
 
 src_test() {
-	# Explicitly allow parallel build of tests
+	cd "${BUILD_DIR}"
+
 	export VIR_TEST_DEBUG=1
 	HOME="${T}" emake check || die "tests failed"
 }
diff --git a/app-emulation/libvirt/libvirt-2.1.0-r1.ebuild b/app-emulation/libvirt/libvirt-2.1.0-r1.ebuild
index d24ed9fcaef8..9244e85d8b34 100644
--- a/app-emulation/libvirt/libvirt-2.1.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-2.1.0-r1.ebuild
@@ -31,10 +31,12 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
-IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
-	lxc +macvtap nfs nls numa openvz parted pcap phyp pm-utils policykit \
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
-	wireshark-plugins xen elibc_glibc"
+IUSE="
+	apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm
+	lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd
+	sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins
+	xen elibc_glibc
+"
 
 REQUIRED_USE="
 	firewalld? ( virt-network )
@@ -88,7 +90,6 @@ RDEPEND="
 		sys-fs/lvm2[-device-mapper-only(-)]
 	)
 	pcap? ( >=net-libs/libpcap-1.0.0 )
-	pm-utils? ( sys-power/pm-utils )
 	policykit? ( >=sys-auth/polkit-0.9 )
 	qemu? (
 		>=app-emulation/qemu-0.13.0
@@ -269,7 +270,6 @@ src_configure() {
 		$(use_with parted storage-disk)
 		$(use_with pcap libpcap)
 		$(use_with phyp)
-		$(use_with pm-utils pm-utils)
 		$(use_with policykit polkit)
 		$(use_with qemu)
 		$(use_with qemu yajl)
@@ -325,7 +325,8 @@ src_configure() {
 }
 
 src_test() {
-	# Explicitly allow parallel build of tests
+	cd "${BUILD_DIR}"
+
 	export VIR_TEST_DEBUG=1
 	HOME="${T}" emake check || die "tests failed"
 }
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index f1a8bae25409..690843d36c3a 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -31,10 +31,12 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
-IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
-	lxc +macvtap nfs nls numa openvz parted pcap phyp pm-utils policykit \
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
-	wireshark-plugins xen elibc_glibc"
+IUSE="
+	apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm
+	lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd
+	sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins
+	xen elibc_glibc
+"
 
 REQUIRED_USE="
 	firewalld? ( virt-network )
@@ -88,7 +90,6 @@ RDEPEND="
 		sys-fs/lvm2[-device-mapper-only(-)]
 	)
 	pcap? ( >=net-libs/libpcap-1.0.0 )
-	pm-utils? ( sys-power/pm-utils )
 	policykit? ( >=sys-auth/polkit-0.9 )
 	qemu? (
 		>=app-emulation/qemu-0.13.0
@@ -269,7 +270,6 @@ src_configure() {
 		$(use_with parted storage-disk)
 		$(use_with pcap libpcap)
 		$(use_with phyp)
-		$(use_with pm-utils pm-utils)
 		$(use_with policykit polkit)
 		$(use_with qemu)
 		$(use_with qemu yajl)
@@ -321,7 +321,8 @@ src_configure() {
 }
 
 src_test() {
-	# Explicitly allow parallel build of tests
+	cd "${BUILD_DIR}"
+
 	export VIR_TEST_DEBUG=1
 	HOME="${T}" emake check || die "tests failed"
 }
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 640311f62e3b..d36271c83f15 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -72,8 +72,6 @@
 		macvtap support requires very new kernels and is
 		currently evolving. Support for this is experimental at best.
 	</flag>
-	<flag name="pm-utils">Use sys-power/pm-utils for power management.
-	</flag>
 	<flag name="vepa">Virtual Ethernet Port Aggregator (VEPA) / 802.1Qbg
 		support. Relies on macvtap support.</flag>
 	<flag name="virt-network">