From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 20 Oct 2021 10:22:14 +0100
Subject: gentoo resync : 20.10.2021

---
 net-firewall/Manifest.gz                          | Bin 4540 -> 4536 bytes
 net-firewall/fwbuilder/Manifest                   |   2 +-
 net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild |  23 +++++++++++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'net-firewall')

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index f5ef5fd3a52a..c9c8423ba99f 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 8c3fd8f9f31f..d6b9618c461a 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -5,5 +5,5 @@ AUX fwbuilder-6.0.0_rc1-fix_version.patch 516 BLAKE2B e544ceceda6890f55a33eae0a1
 DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
 DIST fwbuilder-6.0.0_rc1.tar.gz 7281841 BLAKE2B 4adfb2c1ba22d781e98de2e02cc7cca6a1c214d3b63e156b76a351d1a7e399afaf0227ced4c9fa228c637c37247dd1cb6e88a0cc4231a3827ba2e5bd0b8a4c5e SHA512 11126c23d8b9f68e7cdcf0a6d3de1678f1b0c879959cef5484b30c2d41ab0377c70dce432d014331cfd376a5fd20e384db7342745a066e8159c2ae275d5bdec4
 EBUILD fwbuilder-5.3.7.ebuild 1482 BLAKE2B bf0f2d7e38908e69777f00c75b7139be568dce47dd94c346194af67443ba87d0167eee826243f4ec44b72ef8f8e858bc2272ac093972aa2f753d7ed2e367feae SHA512 6e0ae543d68a35816123b304da2eba45c901bee18e08c54dd5bc5684f94ffaa827d3ab2ee2a23f5955c45396d0da57a533dd1c7cb54cfa8a53c4094e91128000
-EBUILD fwbuilder-6.0.0_rc1.ebuild 1014 BLAKE2B a1b7347e1e2923a015d70471d68377e9fc18bdbe96da23289483333e43153c77717def717e177471138424de7b6409a36024876d01fe9ba10282d2de1080bf5d SHA512 5289924e9a0efed9fe18600bcdbc414f23f5a7898b4c692d5088c55b81380d9e1a9c0b677b442dd1b64a64b3934be30c1bc131dafc81035b68bcc62fc4642ab6
+EBUILD fwbuilder-6.0.0_rc1.ebuild 1477 BLAKE2B 7f96cfb2fa4ed9a355f72e1df7134cb65c0bb642c48213fa1848d14b5d18076f05d7154c241bbb508794d547c1914bc09e8aed8de5dd226f735ae5734c2a06c9 SHA512 6e857373e92da2f021660441cfa1ab5ea2682d02947b16f650a515635e7dbc300300c1b407eb9bf2839b9049f1f77a2cdf0a6c44e4e3dacf26f5a9d52f964a9f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
index f7a064139185..7fc8236ca0fb 100644
--- a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake virtualx
 
 DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and more"
 HOMEPAGE="https://github.com/fwbuilder/fwbuilder"
@@ -12,9 +12,9 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test ) test"
 
 RDEPEND="
 	dev-libs/libxml2
@@ -34,6 +34,18 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix_version.patch
 )
 
+src_prepare() {
+	# Hangs
+	sed -i \
+		-e '/add_subdirectory(.*Dialog.*Test)/d' \
+		-e '/add_subdirectory(RuleSetViewTest)/d' \
+		-e '/add_subdirectory(ObjectManipulatorTest)/d' \
+		-e '/add_subdirectory(RuleSetViewContextMenuTest)/d' \
+		src/unit_tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
@@ -42,6 +54,11 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cp "${BUILD_DIR}"/src/libfwbuilder/etc/fwbuilder.dtd "${S}"/src/res || die
+	TEST_VERBOSE=1 FWB_RES_DIR="${S}/src/res" virtx cmake_src_test
+}
+
 src_install() {
 	cmake_src_install
 	docompress -x /usr/share/man
-- 
cgit v1.2.3