* [gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/, net-firewall/fwbuilder/files/
@ 2017-12-04 21:52 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-12-04 21:52 UTC (permalink / raw
To: gentoo-commits
commit: 529109a67c151e91a497aea21dd5def9473cea3f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 21:07:50 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 21:52:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=529109a6
net-firewall/fwbuilder: Fix src_configure, qtbindir
Closes: https://bugs.gentoo.org/634900
Package-Manager: Portage-2.3.16, Repoman-2.3.6
net-firewall/fwbuilder/Manifest | 2 +-
.../fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch | 57 ++++++++++++++++++++++
net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild | 7 +--
3 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index dd1bf7ab216..1951ebafc4c 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,3 +1,3 @@
DIST fwbuilder-5.0.1.3592.tar.gz 6733502 SHA256 22120de712844b5d89a3f2924964c16cc86f96f2156ace7c3f551bd0d713c94b SHA512 aac34c97963819f0dca4a6bfa63987df45cdd6905164b49ae6f6a423f044fc52aeb09b15b2fc294e1aa3da97d3d31e75bdf9a690e383f579a2fb40ef656f4885 WHIRLPOOL 436e5f8c802e6b25c588f3296ac0cbce89aa818c53871296615980aee6b71b84a64a44808f7d2390ee73b11e83b2acc88d94c7b236df5caf83788d735276211f
DIST fwbuilder-5.3.6.tar.gz 7325429 SHA256 672c2870c3a2ce1eb504a97d17ea9a8eb6dd61ec314cf79b9488b48a356cdfa6 SHA512 70f6888d09c89a624ea35f119c1e00d5a7e57d993d8658fd164e35bce073503bf66f3c9e05ffa1b49ab9371cf219825d22a41c31604c63de5290dd64845e06af WHIRLPOOL a559061861447bff1657857c5a9f551e4eb0315fdea99199025d9cdaae3b1163cb69f97c36517bbe39998b0a9a97026d9737485b5a01144cd8296c502830e9b6
-DIST fwbuilder-5.3.7.tar.gz 7332419 SHA256 aba1ed8f690e9e4659c0e981120ea68da7ee327d6cf81260d51329351addf91e SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b WHIRLPOOL 0191f0f812b494bae9d4c00cc4a26315f32c378e5395270f56cd4e3d7d0c189d67ec154c28d9aaeecee0b0304c1bb5cf61db2a738b32b189ee53f306849fdfa9
+DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch b/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch
new file mode 100644
index 00000000000..3ae4be71f24
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch
@@ -0,0 +1,57 @@
+--- a/configure.in 2017-12-04 21:30:44.000000000 +0100
++++ b/configure.in 2017-12-04 21:56:00.277286322 +0100
+@@ -45,44 +45,18 @@
+ #define GENERATION "$GENERATION"
+ EOF
+
+-dnl try to find QT
+-dnl
+-AC_ARG_WITH(qtdir,[ --with-qtdir=DIR Specify directory path for QT ])
+-
+-if test -n "$with_qtdir"; then
+- AC_MSG_CHECKING(Using QT in )
+- QTDIR="$with_qtdir";
+- export QTDIR
+- AC_MSG_RESULT($QTDIR)
+-fi
+-
+-# TODO: do we need to add $QTDIR/bin to PATH to find qmake?
+-EXTENDED_PATH="/usr/local/bin:$QTDIR/bin/:$PATH"
++EXTENDED_PATH="/usr/local/bin:$PATH"
++PKG_PROG_PKG_CONFIG
+
+-AC_ARG_WITH(qmake, [ --with-qmake=qmake Specify the qmake to be used (debian qmake-qt4) ])
+-if test -n "$with_qmake"; then
+- AC_PATH_PROG(QMAKE, $with_qmake, ,[$EXTENDED_PATH])
+- if test -z "$QMAKE"; then
+- AC_MSG_ERROR("Could not find qmake")
+- fi
+-else
+- AC_PATH_PROG(QMAKE, qmake, ,[$EXTENDED_PATH])
+- if test -z "$QMAKE"; then
+- AC_PATH_PROG(QMAKE, qmake-qt4, ,[$EXTENDED_PATH])
+- if test -z "$QMAKE"; then
+- AC_MSG_ERROR("Could not find qmake")
+- fi
+- fi
+-fi
+-
+-AC_MSG_CHECKING(checking version of QT this qmake is part of)
+-qmake_version=`$QMAKE -v 2>&1 | awk '/Using Qt version/ { print $4;}'`
+-case $qmake_version in
+- 4.*) AC_MSG_RESULT( $qmake_version ) ;;
+- 5.*) AC_MSG_RESULT( $qmake_version ) ;;
+- *) AC_MSG_ERROR( "$qmake_version -- v4.x or v5.x is required") ;;
+-esac
++dnl try to find Qt5
++dnl
+
++PKG_CHECK_MODULES([QT5], [Qt5Core >= 5.1.0], [
++ QT_PATH="$( eval $PKG_CONFIG --variable=host_bins Qt5Core )"
++ AC_PATH_PROGS([QMAKE], [qmake-qt5 qmake], [qmake], [$QT_PATH])
++], [
++ AC_MSG_ERROR([Qt5 not found])
++])
+
+
+ AC_ARG_WITH(templatedir, [ --with-templatedir=DIR Specify directory path for fwbuilder template files ])
diff --git a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
index a3fb5b1aeb9..5b66d22b1b8 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
@@ -26,8 +26,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
+
src_prepare() {
- eapply_user
+ default
# bug 398743
sed -i -e '/dnl.*AM_INIT_AUTOMAKE/d' configure.in || die
@@ -47,9 +49,8 @@ src_prepare() {
src_configure() {
econf \
- --without-{ccache,distcc} # portage handles ccache/distcc itself
+ --without-{ccache,distcc} \
--with-docdir="/usr/share/doc/${PF}"
- --with-qmake="$(qt5_get_bindir)/qmake" # use fully-qualified qmake, bug #599466
# yes, we really do need to run both econf and eqmake5...
eqmake5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/, net-firewall/fwbuilder/files/
@ 2021-08-04 20:11 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-08-04 20:11 UTC (permalink / raw
To: gentoo-commits
commit: 38db66784a1ecaa879aa836805f77cdea845d138
Author: Hannes Schweizer <nilathak <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Oct 4 19:45:31 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 4 20:11:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38db6678
net-firewall/fwbuilder: version bump
Signed-off-by: Hannes Schweizer <hschweizer <AT> gmx.net>
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Closes: https://github.com/gentoo/gentoo/pull/17771
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-firewall/fwbuilder/Manifest | 1 +
.../fwbuilder-6.0.0_p20200502-fix_version.patch | 11 ++++++
.../fwbuilder/fwbuilder-6.0.0_p20200502.ebuild | 40 ++++++++++++++++++++++
3 files changed, 52 insertions(+)
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index fe13e3b15d1..688dc22fbc4 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1 +1,2 @@
DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
+DIST fwbuilder-6.0.0_p20200502.tar.gz 7278610 BLAKE2B 9eabf34445f5dad4af4bf88ec717ad60d6010233d501151ae1e115adcba88c19d883eceb60ae9c9850f200e42eec5eca083be9330dc54b0b681c86e90f3ca581 SHA512 7fcc957ebc6dc3a198fdb857e11b3d29e25018c3107f2edffbfea3794fdd5fad2ba56d7a74209c6d7b30e4287dbb13ab3bf973c8aa3213cfd4a7317e43e713bb
diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-fix_version.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-fix_version.patch
new file mode 100644
index 00000000000..d71de42d26c
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-fix_version.patch
@@ -0,0 +1,11 @@
+--- a/cmake/VERSION.cmake 2020-09-05 14:54:43.767374594 +0200
++++ b/cmake/VERSION.cmake 2020-09-05 16:13:20.274809080 +0200
+@@ -3,7 +3,7 @@
+ set(PROJECT_VERSION_MAJOR "6")
+ set(PROJECT_VERSION_MINOR "0")
+ set(PROJECT_VERSION_PATCH "0")
+-set(PROJECT_VERSION_EXTRA "-beta")
++set(PROJECT_VERSION_EXTRA "_p20200502")
+ 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_p20200502.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_p20200502.ebuild
new file mode 100644
index 00000000000..d21a5827687
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_p20200502.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 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" )
+
+DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and more"
+HOMEPAGE="https://github.com/fwbuilder/fwbuilder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+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}"
+
+src_install() {
+ cmake_src_install
+ docompress -x /usr/share/man
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/, net-firewall/fwbuilder/files/
@ 2021-08-04 20:11 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-08-04 20:11 UTC (permalink / raw
To: gentoo-commits
commit: 8ed43f3b77d28bf20172338ba6269566a8187513
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 4 20:10:50 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 4 20:11:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed43f3b
net-firewall/fwbuilder: modernise ebuild, drop -Werror
Closes: https://bugs.gentoo.org/787671
Signed-off-by: Sam James <sam <AT> 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(-)
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 00000000000..36722122e5c
--- /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 d21a5827687..dfeafb3af23 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/, net-firewall/fwbuilder/files/
@ 2021-08-04 20:21 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-08-04 20:21 UTC (permalink / raw
To: gentoo-commits
commit: 308fc6c03729914e9d1c37d95070803546d6f7f8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 4 20:21:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 4 20:21:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308fc6c0
net-firewall/fwbuilder: add 6.0.0_pre20200502, drop 6.0.0_p20200502
Bug: https://bugs.gentoo.org/787671
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-firewall/fwbuilder/Manifest | 2 +-
...-drop-Werror.patch => fwbuilder-6.0.0_pre20200502-drop-Werror.patch} | 0
...-fix_version.patch => fwbuilder-6.0.0_pre20200502-fix_version.patch} | 0
...uilder-6.0.0_p20200502.ebuild => fwbuilder-6.0.0_pre20200502.ebuild} | 2 +-
4 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 688dc22fbc4..27e2dd6e2e8 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,2 +1,2 @@
DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
-DIST fwbuilder-6.0.0_p20200502.tar.gz 7278610 BLAKE2B 9eabf34445f5dad4af4bf88ec717ad60d6010233d501151ae1e115adcba88c19d883eceb60ae9c9850f200e42eec5eca083be9330dc54b0b681c86e90f3ca581 SHA512 7fcc957ebc6dc3a198fdb857e11b3d29e25018c3107f2edffbfea3794fdd5fad2ba56d7a74209c6d7b30e4287dbb13ab3bf973c8aa3213cfd4a7317e43e713bb
+DIST fwbuilder-6.0.0_pre20200502.tar.gz 7278610 BLAKE2B 9eabf34445f5dad4af4bf88ec717ad60d6010233d501151ae1e115adcba88c19d883eceb60ae9c9850f200e42eec5eca083be9330dc54b0b681c86e90f3ca581 SHA512 7fcc957ebc6dc3a198fdb857e11b3d29e25018c3107f2edffbfea3794fdd5fad2ba56d7a74209c6d7b30e4287dbb13ab3bf973c8aa3213cfd4a7317e43e713bb
diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-drop-Werror.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-drop-Werror.patch
similarity index 100%
rename from net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-drop-Werror.patch
rename to net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-drop-Werror.patch
diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-fix_version.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch
similarity index 100%
rename from net-firewall/fwbuilder/files/fwbuilder-6.0.0_p20200502-fix_version.patch
rename to net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch
diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_p20200502.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild
similarity index 93%
rename from net-firewall/fwbuilder/fwbuilder-6.0.0_p20200502.ebuild
rename to net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild
index dfeafb3af23..e2c2d972c0f 100644
--- a/net-firewall/fwbuilder/fwbuilder-6.0.0_p20200502.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-fix_version.patch
- "${FILESDIR}"/${PN}-6.0.0_p20200502-drop-Werror.patch
+ "${FILESDIR}"/${PN}-6.0.0_pre20200502-drop-Werror.patch
)
src_install() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/, net-firewall/fwbuilder/files/
@ 2021-08-27 2:48 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-08-27 2:48 UTC (permalink / raw
To: gentoo-commits
commit: cfc80c03e0b48703f44dcadab9600c4613f0c16e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 27 02:39:20 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 02:48:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc80c03
net-firewall/fwbuilder: drop 6.0.0_pre20200502
Bug: https://bugs.gentoo.org/806460
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-firewall/fwbuilder/Manifest | 1 -
.../fwbuilder-6.0.0_pre20200502-fix_version.patch | 11 -------
.../fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild | 36 ----------------------
3 files changed, 48 deletions(-)
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 974b8135433..46c6d21729d 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,3 +1,2 @@
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_pre20200502-fix_version.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch
deleted file mode 100644
index d71de42d26c..00000000000
--- a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/VERSION.cmake 2020-09-05 14:54:43.767374594 +0200
-+++ b/cmake/VERSION.cmake 2020-09-05 16:13:20.274809080 +0200
-@@ -3,7 +3,7 @@
- set(PROJECT_VERSION_MAJOR "6")
- set(PROJECT_VERSION_MINOR "0")
- set(PROJECT_VERSION_PATCH "0")
--set(PROJECT_VERSION_EXTRA "-beta")
-+set(PROJECT_VERSION_EXTRA "_p20200502")
- 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_pre20200502.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild
deleted file mode 100644
index e2c2d972c0f..00000000000
--- a/net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
- dev-libs/libxslt
- dev-libs/openssl
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- net-analyzer/net-snmp
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix_version.patch
- "${FILESDIR}"/${PN}-6.0.0_pre20200502-drop-Werror.patch
-)
-
-src_install() {
- cmake_src_install
- docompress -x /usr/share/man
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-27 2:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-27 2:48 [gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/, net-firewall/fwbuilder/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-08-04 20:21 Sam James
2021-08-04 20:11 Sam James
2021-08-04 20:11 Sam James
2017-12-04 21:52 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox