From 8ed43f3b77d28bf20172338ba6269566a8187513 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 4 Aug 2021 21:10:50 +0100
Subject: net-firewall/fwbuilder: modernise ebuild, drop -Werror

Closes: https://bugs.gentoo.org/787671
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../fwbuilder-6.0.0_p20200502-drop-Werror.patch    | 25 ++++++++++++++++++++++
 .../fwbuilder/fwbuilder-6.0.0_p20200502.ebuild     | 24 +++++++++------------
 2 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-drop-Werror.patch

(limited to 'net-firewall/fwbuilder')

diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-drop-Werror.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-drop-Werror.patch
new file mode 100644
index 000000000000..36722122e5cb
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-drop-Werror.patch
@@ -0,0 +1,25 @@
+From e4c76883d8de814050893bec4d196d5d5f48c9c2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 4 Aug 2021 20:46:56 +0100
+Subject: [PATCH] Drop -Werror
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ddabd38..97477b0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,7 +45,7 @@ endif()
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ set(CXX_DEFAULT_FLAGS # clang/GCC warnings
+-	$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Wall;-Wextra;-Werror;-Wno-overloaded-virtual>
++	$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Wall;-Wextra;-Wno-overloaded-virtual>
+                          # MSVC warnings
+     $<$<CXX_COMPILER_ID:MSVC>:/WX;/W4>)
+ 
+-- 
+2.32.0
+
diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_p20200502.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_p20200502.ebuild
index d21a58276878..dfeafb3af235 100644
--- a/net-firewall/fwbuilder/fwbuilder-6.0.0_p20200502.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_p20200502.ebuild
@@ -1,27 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
-
-if [[ ${PV} == *9999 ]]
-then
-	EGIT_REPO_URI="https://github.com/fwbuilder/fwbuilder"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	commit=a5e14a966447c63bcf7b52a0202149e76bd5ed4a
-	SRC_URI="https://github.com/fwbuilder/fwbuilder/archive/${commit}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-PATCHES=( "${FILESDIR}/${P}-fix_version.patch" )
+inherit cmake vcs-snapshot
 
+MY_COMMIT=a5e14a966447c63bcf7b52a0202149e76bd5ed4a
 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/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-libs/libxml2
@@ -34,6 +25,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_version.patch
+	"${FILESDIR}"/${PN}-6.0.0_p20200502-drop-Werror.patch
+)
+
 src_install() {
 	cmake_src_install
 	docompress -x /usr/share/man
-- 
cgit v1.2.3-65-gdbad