4 files changed, 28 insertions, 0 deletions
diff --git a/app-emulation/libvirt/libvirt-2.0.0-r3.ebuild b/app-emulation/libvirt/libvirt-2.0.0-r3.ebuild
index 44b904eb890d..363d808e0d67 100644
--- a/app-emulation/libvirt/libvirt-2.0.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-2.0.0-r3.ebuild
@@ -327,6 +327,13 @@ src_configure() {
 src_test() {
 	cd "${BUILD_DIR}"
 
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
 	export VIR_TEST_DEBUG=1
 	HOME="${T}" emake check || die "tests failed"
 }
diff --git a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
index 44b904eb890d..363d808e0d67 100644
--- a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
@@ -327,6 +327,13 @@ src_configure() {
 src_test() {
 	cd "${BUILD_DIR}"
 
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
 	export VIR_TEST_DEBUG=1
 	HOME="${T}" emake check || die "tests failed"
 }
diff --git a/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild b/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild
index 44b904eb890d..363d808e0d67 100644
--- a/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild
@@ -327,6 +327,13 @@ src_configure() {
 src_test() {
 	cd "${BUILD_DIR}"
 
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
 	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 055e8660d7b0..d8eecf69c7c8 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -323,6 +323,13 @@ src_configure() {
 src_test() {
 	cd "${BUILD_DIR}"
 
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
 	export VIR_TEST_DEBUG=1
 	HOME="${T}" emake check || die "tests failed"
 }