[gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/files/, net-firewall/fwbuilder/

["Sam James" <sam@gentoo.org>]

commit:     14d64497f2380e6bad8037e37fe2b546ee028a47
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 27 02:37:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 02:48:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d64497

net-firewall/fwbuilder: add 6.0.0_rc1

Closes: https://bugs.gentoo.org/806460
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-firewall/fwbuilder/Manifest                    |  1 +
 .../fwbuilder-6.0.0_rc1-automagic-ccache.patch     | 28 +++++++++++++
 .../files/fwbuilder-6.0.0_rc1-fix_version.patch    | 11 +++++
 net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild  | 48 ++++++++++++++++++++++
 4 files changed, 88 insertions(+)

diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 27e2dd6e2e8..974b8135433 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,2 +1,3 @@
 DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
 DIST fwbuilder-6.0.0_pre20200502.tar.gz 7278610 BLAKE2B 9eabf34445f5dad4af4bf88ec717ad60d6010233d501151ae1e115adcba88c19d883eceb60ae9c9850f200e42eec5eca083be9330dc54b0b681c86e90f3ca581 SHA512 7fcc957ebc6dc3a198fdb857e11b3d29e25018c3107f2edffbfea3794fdd5fad2ba56d7a74209c6d7b30e4287dbb13ab3bf973c8aa3213cfd4a7317e43e713bb
+DIST fwbuilder-6.0.0_rc1.tar.gz 7281841 BLAKE2B 4adfb2c1ba22d781e98de2e02cc7cca6a1c214d3b63e156b76a351d1a7e399afaf0227ced4c9fa228c637c37247dd1cb6e88a0cc4231a3827ba2e5bd0b8a4c5e SHA512 11126c23d8b9f68e7cdcf0a6d3de1678f1b0c879959cef5484b30c2d41ab0377c70dce432d014331cfd376a5fd20e384db7342745a066e8159c2ae275d5bdec4

diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch
new file mode 100644
index 00000000000..d7f2cfb7e11
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch
@@ -0,0 +1,28 @@
+From 6021c352a009121870107ed37f07ee520110d4c2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 27 Aug 2021 03:24:26 +0100
+Subject: [PATCH] Drop automagic ccache usage
+
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 97477b0..cd17c6a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,11 +5,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9"
+     CACHE STRING "Minimum macOS deployment version"
+ )
+ 
+-find_program(CCACHE_PROGRAM ccache)
+-if(CCACHE_PROGRAM)
+-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ project(firewallbuilder LANGUAGES CXX C)
+ 
+ ### Version variables and include file
+-- 
+2.33.0
+

diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch
new file mode 100644
index 00000000000..cce544a58a0
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch
@@ -0,0 +1,11 @@
+--- a/cmake/VERSION.cmake
++++ b/cmake/VERSION.cmake
+@@ -3,7 +3,7 @@
+ set(PROJECT_VERSION_MAJOR "6")
+ set(PROJECT_VERSION_MINOR "0")
+ set(PROJECT_VERSION_PATCH "0")
+-set(PROJECT_VERSION_EXTRA "-rc1")
++set(PROJECT_VERSION_EXTRA "_rc1")
+ set(PROJECT_GENERATION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(PROJECT_GENERATION_SHORT "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}")
+ set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_EXTRA}")

diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
new file mode 100644
index 00000000000..f7a06413918
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and more"
+HOMEPAGE="https://github.com/fwbuilder/fwbuilder"
+SRC_URI="https://github.com/fwbuilder/fwbuilder/archive/refs/tags/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/openssl
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	net-analyzer/net-snmp
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.0_pre20200502-drop-Werror.patch
+	"${FILESDIR}"/${PN}-6.0.0_rc1-automagic-ccache.patch
+	"${FILESDIR}"/${P}-fix_version.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	docompress -x /usr/share/man
+}