Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/fwbuilder/files/, net-firewall/fwbuilder/
Date: Sun, 07 Jan 2018 19:28:43
Message-Id: 1515353309.f8619a05e4bb1290ccbb2233b1af4332ec2970c7.zlogene@gentoo
1 commit: f8619a05e4bb1290ccbb2233b1af4332ec2970c7
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 7 19:28:29 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 7 19:28:29 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8619a05
7
8 net-firewall/fwbuilder: Drop old
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.3
11
12 net-firewall/fwbuilder/Manifest | 1 -
13 .../files/fwbuilder-5.0.0.3568-ldflags.patch | 11 -----
14 .../files/fwbuilder-5.0.1.3592-gcc47.patch | 11 -----
15 .../fwbuilder-5.0.1.3592-stdc-format-macros.patch | 51 ----------------------
16 .../fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild | 50 ---------------------
17 5 files changed, 124 deletions(-)
18
19 diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
20 index e35680942c2..fe13e3b15d1 100644
21 --- a/net-firewall/fwbuilder/Manifest
22 +++ b/net-firewall/fwbuilder/Manifest
23 @@ -1,2 +1 @@
24 -DIST fwbuilder-5.0.1.3592.tar.gz 6733502 BLAKE2B eb234f0b3609c33527321c9589a1f229df7a7aaabaab8b254af4e560b19ed8f798c1b4e51590d8ef6c86b5f57c69ac0ba654adb0c09fb0fbb3085962470588b4 SHA512 aac34c97963819f0dca4a6bfa63987df45cdd6905164b49ae6f6a423f044fc52aeb09b15b2fc294e1aa3da97d3d31e75bdf9a690e383f579a2fb40ef656f4885
25 DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
26
27 diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
28 deleted file mode 100644
29 index d9df8429d39..00000000000
30 --- a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
31 +++ /dev/null
32 @@ -1,11 +0,0 @@
33 -diff -Naurp fwbuilder-5.0.0.3568.orig//qmake.inc.in fwbuilder-5.0.0.3568//qmake.inc.in
34 ---- fwbuilder-5.0.0.3568.orig//qmake.inc.in 2011-07-25 19:27:44.000000000 -0400
35 -+++ fwbuilder-5.0.0.3568//qmake.inc.in 2011-08-19 17:00:41.259985388 -0400
36 -@@ -39,6 +39,7 @@ unix {
37 - QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
38 - QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
39 - QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
40 -+ QMAKE_LFLAGS = @LDFLAGS@
41 -
42 - !macx {
43 -
44
45 diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
46 deleted file mode 100644
47 index 7849e2b6da9..00000000000
48 --- a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
49 +++ /dev/null
50 @@ -1,11 +0,0 @@
51 ---- a/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-06-04 15:02:55.909203733 -0400
52 -+++ b/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-06-04 15:04:54.079198998 -0400
53 -@@ -31,7 +31,7 @@
54 -
55 - #include <time.h> //for time_t definition
56 - #include <pthread.h>
57 --
58 -+#include <unistd.h>
59 - #include <string>
60 - #include <queue>
61 -
62
63 diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
64 deleted file mode 100644
65 index 3658c10a3ee..00000000000
66 --- a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
67 +++ /dev/null
68 @@ -1,51 +0,0 @@
69 -From: Vadim Kurland <vadim@×××××××××××××××××.org>
70 -Date: Tue, 14 Feb 2012 04:59:26 +0000 (-0800)
71 -Subject: fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
72 -X-Git-Url: http://fwbuilder.git.sourceforge.net/git/gitweb.cgi?p=fwbuilder%2Ffwbuilder;a=commitdiff_plain;h=f97a1b50ba51be5fa31cc54dba829a9e77609160;hp=15565ade5dc843e5fefe83568a023c37256c3c3c
73 -
74 -fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
75 -needs to be tested on all build machines.
76 ----
77 -
78 -diff --git a/qmake.inc.in b/qmake.inc.in
79 -index 6bf27e0..3e31fd6 100644
80 ---- a/qmake.inc.in
81 -+++ b/qmake.inc.in
82 -@@ -67,6 +67,9 @@ unix {
83 -
84 - CONFIG += warn_on
85 -
86 -+ QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
87 -+ QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
88 -+
89 - }
90 - }
91 -
92 -diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in
93 -index b4f15bb..a8114cf 100644
94 ---- a/src/libfwbuilder/qmake.inc.in
95 -+++ b/src/libfwbuilder/qmake.inc.in
96 -@@ -34,6 +34,9 @@ unix {
97 - QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
98 - QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
99 -
100 -+ QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
101 -+ QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
102 -+
103 - exec_prefix = @EXEC_PREFIX@
104 - DESTDIR =
105 -
106 -diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h
107 -index 0a2e7a4..b00ab47 100644
108 ---- a/src/libfwbuilder/src/fwbuilder/uint128.h
109 -+++ b/src/libfwbuilder/src/fwbuilder/uint128.h
110 -@@ -36,7 +36,7 @@
111 -
112 - #include <stdio.h>
113 -
114 --#define __STDC_FORMAT_MACROS
115 -+// #define __STDC_FORMAT_MACROS
116 - #include <inttypes.h> // for sprintf formats for "long long"
117 -
118 - // convinience macro
119 -
120
121 diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
122 deleted file mode 100644
123 index a43be83fccb..00000000000
124 --- a/net-firewall/fwbuilder/fwbuilder-5.0.1.3592-r1.ebuild
125 +++ /dev/null
126 @@ -1,50 +0,0 @@
127 -# Copyright 1999-2017 Gentoo Foundation
128 -# Distributed under the terms of the GNU General Public License v2
129 -
130 -EAPI="4"
131 -
132 -inherit eutils base qt4-r2 multilib autotools
133 -
134 -DESCRIPTION="A firewall GUI"
135 -HOMEPAGE="http://www.fwbuilder.org/"
136 -SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
137 -LICENSE="GPL-2"
138 -SLOT="0"
139 -KEYWORDS="amd64 ppc ppc64 x86"
140 -IUSE=""
141 -
142 -DEPEND=">=dev-qt/qtgui-4.3:4
143 - dev-libs/openssl
144 - dev-libs/elfutils"
145 -RDEPEND="${DEPEND}"
146 -
147 -PATCHES=(
148 - "${FILESDIR}/${PN}-5.0.0.3568-ldflags.patch"
149 - "${FILESDIR}/${PN}-5.0.1.3592-gcc47.patch"
150 -)
151 -
152 -src_prepare() {
153 - # Fix a compile bug that affects some x86_64 platforms.
154 - # Addressed in the upcoming 5.0.2.3596 release.
155 - # Closes #395151.
156 - epatch "${FILESDIR}/${P}-stdc-format-macros.patch"
157 -
158 - qt4-r2_src_prepare
159 - sed -i -e '/dnl.*AM_INIT_AUTOMAKE/d' configure.in || die #398743
160 - eautoreconf
161 -}
162 -
163 -src_configure() {
164 - eqmake4
165 - # portage handles ccache/distcc itself
166 - econf --without-{ccache,distcc}
167 -}
168 -
169 -src_install() {
170 - emake INSTALL_ROOT="${D}" install
171 -}
172 -
173 -pkg_postinst() {
174 - elog "You need to emerge sys-apps/iproute2 on the machine"
175 - elog "that will run the firewall script."
176 -}