1 |
commit: 14d64497f2380e6bad8037e37fe2b546ee028a47 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 27 02:37:25 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 27 02:48:14 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d64497 |
7 |
|
8 |
net-firewall/fwbuilder: add 6.0.0_rc1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/806460 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
net-firewall/fwbuilder/Manifest | 1 + |
14 |
.../fwbuilder-6.0.0_rc1-automagic-ccache.patch | 28 +++++++++++++ |
15 |
.../files/fwbuilder-6.0.0_rc1-fix_version.patch | 11 +++++ |
16 |
net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild | 48 ++++++++++++++++++++++ |
17 |
4 files changed, 88 insertions(+) |
18 |
|
19 |
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest |
20 |
index 27e2dd6e2e8..974b8135433 100644 |
21 |
--- a/net-firewall/fwbuilder/Manifest |
22 |
+++ b/net-firewall/fwbuilder/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b |
25 |
DIST fwbuilder-6.0.0_pre20200502.tar.gz 7278610 BLAKE2B 9eabf34445f5dad4af4bf88ec717ad60d6010233d501151ae1e115adcba88c19d883eceb60ae9c9850f200e42eec5eca083be9330dc54b0b681c86e90f3ca581 SHA512 7fcc957ebc6dc3a198fdb857e11b3d29e25018c3107f2edffbfea3794fdd5fad2ba56d7a74209c6d7b30e4287dbb13ab3bf973c8aa3213cfd4a7317e43e713bb |
26 |
+DIST fwbuilder-6.0.0_rc1.tar.gz 7281841 BLAKE2B 4adfb2c1ba22d781e98de2e02cc7cca6a1c214d3b63e156b76a351d1a7e399afaf0227ced4c9fa228c637c37247dd1cb6e88a0cc4231a3827ba2e5bd0b8a4c5e SHA512 11126c23d8b9f68e7cdcf0a6d3de1678f1b0c879959cef5484b30c2d41ab0377c70dce432d014331cfd376a5fd20e384db7342745a066e8159c2ae275d5bdec4 |
27 |
|
28 |
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 |
29 |
new file mode 100644 |
30 |
index 00000000000..d7f2cfb7e11 |
31 |
--- /dev/null |
32 |
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-automagic-ccache.patch |
33 |
@@ -0,0 +1,28 @@ |
34 |
+From 6021c352a009121870107ed37f07ee520110d4c2 Mon Sep 17 00:00:00 2001 |
35 |
+From: Sam James <sam@g.o> |
36 |
+Date: Fri, 27 Aug 2021 03:24:26 +0100 |
37 |
+Subject: [PATCH] Drop automagic ccache usage |
38 |
+ |
39 |
+--- |
40 |
+ CMakeLists.txt | 5 ----- |
41 |
+ 1 file changed, 5 deletions(-) |
42 |
+ |
43 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
44 |
+index 97477b0..cd17c6a 100644 |
45 |
+--- a/CMakeLists.txt |
46 |
++++ b/CMakeLists.txt |
47 |
+@@ -5,11 +5,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" |
48 |
+ CACHE STRING "Minimum macOS deployment version" |
49 |
+ ) |
50 |
+ |
51 |
+-find_program(CCACHE_PROGRAM ccache) |
52 |
+-if(CCACHE_PROGRAM) |
53 |
+- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") |
54 |
+-endif() |
55 |
+- |
56 |
+ project(firewallbuilder LANGUAGES CXX C) |
57 |
+ |
58 |
+ ### Version variables and include file |
59 |
+-- |
60 |
+2.33.0 |
61 |
+ |
62 |
|
63 |
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 |
64 |
new file mode 100644 |
65 |
index 00000000000..cce544a58a0 |
66 |
--- /dev/null |
67 |
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1-fix_version.patch |
68 |
@@ -0,0 +1,11 @@ |
69 |
+--- a/cmake/VERSION.cmake |
70 |
++++ b/cmake/VERSION.cmake |
71 |
+@@ -3,7 +3,7 @@ |
72 |
+ set(PROJECT_VERSION_MAJOR "6") |
73 |
+ set(PROJECT_VERSION_MINOR "0") |
74 |
+ set(PROJECT_VERSION_PATCH "0") |
75 |
+-set(PROJECT_VERSION_EXTRA "-rc1") |
76 |
++set(PROJECT_VERSION_EXTRA "_rc1") |
77 |
+ set(PROJECT_GENERATION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") |
78 |
+ set(PROJECT_GENERATION_SHORT "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}") |
79 |
+ set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_EXTRA}") |
80 |
|
81 |
diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild |
82 |
new file mode 100644 |
83 |
index 00000000000..f7a06413918 |
84 |
--- /dev/null |
85 |
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild |
86 |
@@ -0,0 +1,48 @@ |
87 |
+# Copyright 1999-2021 Gentoo Authors |
88 |
+# Distributed under the terms of the GNU General Public License v2 |
89 |
+ |
90 |
+EAPI=7 |
91 |
+ |
92 |
+inherit cmake |
93 |
+ |
94 |
+DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and more" |
95 |
+HOMEPAGE="https://github.com/fwbuilder/fwbuilder" |
96 |
+SRC_URI="https://github.com/fwbuilder/fwbuilder/archive/refs/tags/v${PV/_/-}.tar.gz -> ${P}.tar.gz" |
97 |
+S="${WORKDIR}/${P/_/-}" |
98 |
+ |
99 |
+LICENSE="GPL-2+" |
100 |
+SLOT="0" |
101 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
102 |
+IUSE="test" |
103 |
+RESTRICT="!test? ( test )" |
104 |
+ |
105 |
+RDEPEND=" |
106 |
+ dev-libs/libxml2 |
107 |
+ dev-libs/libxslt |
108 |
+ dev-libs/openssl |
109 |
+ dev-qt/qtnetwork:5 |
110 |
+ dev-qt/qtprintsupport:5 |
111 |
+ dev-qt/qtwidgets:5 |
112 |
+ net-analyzer/net-snmp |
113 |
+" |
114 |
+DEPEND="${RDEPEND} |
115 |
+ test? ( dev-qt/qttest:5 )" |
116 |
+ |
117 |
+PATCHES=( |
118 |
+ "${FILESDIR}"/${PN}-6.0.0_pre20200502-drop-Werror.patch |
119 |
+ "${FILESDIR}"/${PN}-6.0.0_rc1-automagic-ccache.patch |
120 |
+ "${FILESDIR}"/${P}-fix_version.patch |
121 |
+) |
122 |
+ |
123 |
+src_configure() { |
124 |
+ local mycmakeargs=( |
125 |
+ -DBUILD_TESTING=$(usex test) |
126 |
+ ) |
127 |
+ |
128 |
+ cmake_src_configure |
129 |
+} |
130 |
+ |
131 |
+src_install() { |
132 |
+ cmake_src_install |
133 |
+ docompress -x /usr/share/man |
134 |
+} |