1 |
commit: dc24c0d40f3fe073368ea22fa0c68849c6e34ece |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 2 18:25:38 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 2 18:35:28 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc24c0d4 |
7 |
|
8 |
net-analyzer/zmap: Always require json-c |
9 |
|
10 |
Drop old |
11 |
|
12 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=585104 |
13 |
|
14 |
Package-Manager: portage-2.3.0 |
15 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
16 |
|
17 |
net-analyzer/zmap/Manifest | 3 --- |
18 |
net-analyzer/zmap/zmap-1.1.1.ebuild | 43 ------------------------------------- |
19 |
net-analyzer/zmap/zmap-1.1.2.ebuild | 43 ------------------------------------- |
20 |
net-analyzer/zmap/zmap-1.2.0.ebuild | 38 -------------------------------- |
21 |
net-analyzer/zmap/zmap-2.1.1.ebuild | 7 +++--- |
22 |
net-analyzer/zmap/zmap-9999.ebuild | 11 +++++----- |
23 |
6 files changed, 9 insertions(+), 136 deletions(-) |
24 |
|
25 |
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest |
26 |
index 9adecce..1cbc023 100644 |
27 |
--- a/net-analyzer/zmap/Manifest |
28 |
+++ b/net-analyzer/zmap/Manifest |
29 |
@@ -1,5 +1,2 @@ |
30 |
-DIST zmap-1.1.1.tar.gz 84325 SHA256 e3a740a97f217840b6afa81e2c84e11d44f91346cb9f2b21d0f5eda11fca5128 SHA512 daffd541b04d1c1e3e8cccbd3d08d881d2460b177524b5cafced388ebf7ea29343602f2540ba0430249cc0167ad370f1287f21f952c9254d98ce6213ba2288dd WHIRLPOOL a5882df618b1990be8bda2872175e33209cf9cedf003c2e619c4e136b4596e443f7b9a9d31b8abc2e520f8f502d9ba6b728b9fd9a320557b94e62aec09fb1a8a |
31 |
-DIST zmap-1.1.2.tar.gz 84364 SHA256 3766b1cee8287184e4f475761b78633639e130fd004ae067ce4abf79b3a2da0d SHA512 b0f3834f30b97166576fb64814791f4aec1fa9326dfe965d65c66e7375cdeae48b6a25156c65a5af6a74e739df3964538d4c29b2d6e1c3d71b9ed3c756bb7821 WHIRLPOOL b6d0629f0aee3d6321c2179395fad97a2d5f0bb5e9cdf7a08606baf2d9bfe6f3bfe19e403147fd568a164a8d75c3e1db5f996e5d4ecdf9df366a3f1395681b3f |
32 |
-DIST zmap-1.2.0.tar.gz 100594 SHA256 7658aef8338c592bebef82336f58598b2fa305d56779f6c81bffeef8c90472b0 SHA512 68fa49647444f18adfc86b4ee85ed3e93945611ca75687eedc259504e0d66edcded267b4fba9a975299984551c88193feacb850f46432d3f3f22f1430ed7c9bd WHIRLPOOL e4a50f86dfcae802d6b432e51c0f78ca37d56a3540326f076fcc002fbb23aeb85dbb57ad4a84b4b10d863f0f41b8d06510fdec1b9264d77c80cf0ffa69e5e01a |
33 |
DIST zmap-1.2.1.tar.gz 99840 SHA256 ff01f2b139e98a7e64ed2872ae332929c500dd6120888d57900fac82dccfeea8 SHA512 1b3d7fa41bb75c859463f3ec8bcde31778f5d91a6f561aa9638ba93be97dacdba89493574581ce52aebcf093a86b042dcce41cffe6cb0849bb76a6005b714be2 WHIRLPOOL 842ad32286883b554440dcb5ccfd8655997321612fd9ec49f591a6151819b6b605bc518281100c55ca8a9113819960710f870a745ebcb9994a6224b47d9a49ee |
34 |
DIST zmap-2.1.1.tar.gz 131689 SHA256 29627520c81101de01b0213434adb218a9f1210bfd3f2dcfdfc1f975dbce6399 SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857 WHIRLPOOL 09d7fb4e522b207b0b7f1d1ea9efcd9be49f7296d6c5e96858d795de61bf4a9d10ece07f7fa3bd56338dd3e410b5e474b51ed2c917a4b093fdc1689deec43d62 |
35 |
|
36 |
diff --git a/net-analyzer/zmap/zmap-1.1.1.ebuild b/net-analyzer/zmap/zmap-1.1.1.ebuild |
37 |
deleted file mode 100644 |
38 |
index 99fac3e..0000000 |
39 |
--- a/net-analyzer/zmap/zmap-1.1.1.ebuild |
40 |
+++ /dev/null |
41 |
@@ -1,43 +0,0 @@ |
42 |
-# Copyright 1999-2016 Gentoo Foundation |
43 |
-# Distributed under the terms of the GNU General Public License v2 |
44 |
-# $Id$ |
45 |
- |
46 |
-EAPI=5 |
47 |
- |
48 |
-inherit cmake-utils fcaps |
49 |
- |
50 |
-DESCRIPTION="Fast network scanner designed for Internet-wide network surveys" |
51 |
-HOMEPAGE="https://zmap.io/" |
52 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
53 |
- |
54 |
-SLOT="0" |
55 |
-LICENSE="Apache-2.0" |
56 |
-KEYWORDS=" ~amd64 ~x86" |
57 |
-IUSE="json redis" |
58 |
- |
59 |
-RDEPEND=" |
60 |
- dev-libs/gmp:0 |
61 |
- net-libs/libpcap |
62 |
- json? ( dev-libs/json-c ) |
63 |
- redis? ( dev-libs/hiredis )" |
64 |
-DEPEND="${RDEPEND} |
65 |
- dev-util/gengetopt |
66 |
- sys-devel/flex |
67 |
- dev-util/byacc" |
68 |
- |
69 |
-PATCHES=( |
70 |
- "${FILESDIR}"/${P}-out-of-src.patch |
71 |
- "${FILESDIR}"/${P}-json-c.patch |
72 |
-) |
73 |
- |
74 |
-src_configure() { |
75 |
- local mycmakeargs=( |
76 |
- -DENABLE_DEVELOPMENT=OFF |
77 |
- -DENABLE_HARDENING=OFF |
78 |
- $(cmake-utils_use_with json) |
79 |
- $(cmake-utils_use_with redis) |
80 |
- ) |
81 |
- cmake-utils_src_configure |
82 |
-} |
83 |
- |
84 |
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) |
85 |
|
86 |
diff --git a/net-analyzer/zmap/zmap-1.1.2.ebuild b/net-analyzer/zmap/zmap-1.1.2.ebuild |
87 |
deleted file mode 100644 |
88 |
index 2d594f6..0000000 |
89 |
--- a/net-analyzer/zmap/zmap-1.1.2.ebuild |
90 |
+++ /dev/null |
91 |
@@ -1,43 +0,0 @@ |
92 |
-# Copyright 1999-2016 Gentoo Foundation |
93 |
-# Distributed under the terms of the GNU General Public License v2 |
94 |
-# $Id$ |
95 |
- |
96 |
-EAPI=5 |
97 |
- |
98 |
-inherit cmake-utils fcaps |
99 |
- |
100 |
-DESCRIPTION="Fast network scanner designed for Internet-wide network surveys" |
101 |
-HOMEPAGE="https://zmap.io/" |
102 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
103 |
- |
104 |
-SLOT="0" |
105 |
-LICENSE="Apache-2.0" |
106 |
-KEYWORDS=" ~amd64 ~x86" |
107 |
-IUSE="json redis" |
108 |
- |
109 |
-RDEPEND=" |
110 |
- dev-libs/gmp:0 |
111 |
- net-libs/libpcap |
112 |
- json? ( dev-libs/json-c ) |
113 |
- redis? ( dev-libs/hiredis )" |
114 |
-DEPEND="${RDEPEND} |
115 |
- dev-util/gengetopt |
116 |
- sys-devel/flex |
117 |
- dev-util/byacc" |
118 |
- |
119 |
-PATCHES=( |
120 |
- "${FILESDIR}"/${PN}-1.1.1-out-of-src.patch |
121 |
- "${FILESDIR}"/${PN}-1.1.1-json-c.patch |
122 |
-) |
123 |
- |
124 |
-src_configure() { |
125 |
- local mycmakeargs=( |
126 |
- -DENABLE_DEVELOPMENT=OFF |
127 |
- -DENABLE_HARDENING=OFF |
128 |
- $(cmake-utils_use_with json) |
129 |
- $(cmake-utils_use_with redis) |
130 |
- ) |
131 |
- cmake-utils_src_configure |
132 |
-} |
133 |
- |
134 |
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) |
135 |
|
136 |
diff --git a/net-analyzer/zmap/zmap-1.2.0.ebuild b/net-analyzer/zmap/zmap-1.2.0.ebuild |
137 |
deleted file mode 100644 |
138 |
index 6b00599..0000000 |
139 |
--- a/net-analyzer/zmap/zmap-1.2.0.ebuild |
140 |
+++ /dev/null |
141 |
@@ -1,38 +0,0 @@ |
142 |
-# Copyright 1999-2016 Gentoo Foundation |
143 |
-# Distributed under the terms of the GNU General Public License v2 |
144 |
-# $Id$ |
145 |
- |
146 |
-EAPI=5 |
147 |
- |
148 |
-inherit cmake-utils fcaps |
149 |
- |
150 |
-DESCRIPTION="Fast network scanner designed for Internet-wide network surveys" |
151 |
-HOMEPAGE="https://zmap.io/" |
152 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
153 |
- |
154 |
-SLOT="0" |
155 |
-LICENSE="Apache-2.0" |
156 |
-KEYWORDS=" ~amd64 ~x86" |
157 |
-IUSE="json redis" |
158 |
- |
159 |
-RDEPEND=" |
160 |
- dev-libs/gmp:0 |
161 |
- net-libs/libpcap |
162 |
- json? ( dev-libs/json-c ) |
163 |
- redis? ( dev-libs/hiredis )" |
164 |
-DEPEND="${RDEPEND} |
165 |
- dev-util/gengetopt |
166 |
- sys-devel/flex |
167 |
- dev-util/byacc" |
168 |
- |
169 |
-src_configure() { |
170 |
- local mycmakeargs=( |
171 |
- -DENABLE_DEVELOPMENT=OFF |
172 |
- -DENABLE_HARDENING=OFF |
173 |
- $(cmake-utils_use_with json) |
174 |
- $(cmake-utils_use_with redis) |
175 |
- ) |
176 |
- cmake-utils_src_configure |
177 |
-} |
178 |
- |
179 |
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) |
180 |
|
181 |
diff --git a/net-analyzer/zmap/zmap-2.1.1.ebuild b/net-analyzer/zmap/zmap-2.1.1.ebuild |
182 |
index 30d206f..f1ac518 100644 |
183 |
--- a/net-analyzer/zmap/zmap-2.1.1.ebuild |
184 |
+++ b/net-analyzer/zmap/zmap-2.1.1.ebuild |
185 |
@@ -18,7 +18,7 @@ IUSE="json mongo redis" |
186 |
RDEPEND=" |
187 |
dev-libs/gmp:0 |
188 |
net-libs/libpcap |
189 |
- json? ( dev-libs/json-c ) |
190 |
+ dev-libs/json-c |
191 |
mongo? ( dev-db/mongodb ) |
192 |
redis? ( dev-libs/hiredis )" |
193 |
DEPEND="${RDEPEND} |
194 |
@@ -38,9 +38,8 @@ src_configure() { |
195 |
-DENABLE_DEVELOPMENT=OFF |
196 |
-DENABLE_HARDENING=OFF |
197 |
-DWITH_WERROR=OFF |
198 |
- -DWITH_json="$(usex json)" |
199 |
- -DWITH_json="$(usex mongo)" |
200 |
- -DWITH_json="$(usex redis)" |
201 |
+ -DWITH_mongo="$(usex mongo)" |
202 |
+ -DWITH_redis="$(usex redis)" |
203 |
) |
204 |
cmake-utils_src_configure |
205 |
} |
206 |
|
207 |
diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild |
208 |
index 05f9c807..c20be04 100644 |
209 |
--- a/net-analyzer/zmap/zmap-9999.ebuild |
210 |
+++ b/net-analyzer/zmap/zmap-9999.ebuild |
211 |
@@ -2,7 +2,7 @@ |
212 |
# Distributed under the terms of the GNU General Public License v2 |
213 |
# $Id$ |
214 |
|
215 |
-EAPI=5 |
216 |
+EAPI=6 |
217 |
|
218 |
inherit cmake-utils fcaps git-r3 |
219 |
|
220 |
@@ -14,12 +14,13 @@ EGIT_REPO_URI="git://github.com/zmap/zmap.git" |
221 |
SLOT="0" |
222 |
LICENSE="Apache-2.0" |
223 |
KEYWORDS="" |
224 |
-IUSE="json redis" |
225 |
+IUSE="mongo redis" |
226 |
|
227 |
RDEPEND=" |
228 |
dev-libs/gmp:0 |
229 |
net-libs/libpcap |
230 |
- json? ( dev-libs/json-c ) |
231 |
+ dev-libs/json-c |
232 |
+ mongo? ( dev-db/mongo ) |
233 |
redis? ( dev-libs/hiredis )" |
234 |
DEPEND="${RDEPEND} |
235 |
dev-util/gengetopt |
236 |
@@ -32,8 +33,8 @@ src_configure() { |
237 |
-DENABLE_DEVELOPMENT=OFF |
238 |
-DENABLE_HARDENING=OFF |
239 |
-DWITH_WERROR=OFF |
240 |
- $(cmake-utils_use_with json) |
241 |
- $(cmake-utils_use_with redis) |
242 |
+ -DWITH_mongo="$(usex mongo)" |
243 |
+ -DWITH_redis="$(usex redis)" |
244 |
) |
245 |
cmake-utils_src_configure |
246 |
} |