Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
Date: Tue, 24 Nov 2015 06:05:36
Message-Id: 1448345102.8575c40181428db65b36f15e717154e52271ddb4.jer@gentoo
1 commit: 8575c40181428db65b36f15e717154e52271ddb4
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 24 06:05:02 2015 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 24 06:05:02 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8575c401
7
8 net-analyzer/nmap: Old.
9
10 Package-Manager: portage-2.2.25
11
12 net-analyzer/nmap/Manifest | 2 -
13 net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild | 157 ----------------------------
14 net-analyzer/nmap/nmap-6.49_beta6.ebuild | 155 ---------------------------
15 3 files changed, 314 deletions(-)
16
17 diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
18 index c86a189..a096848 100644
19 --- a/net-analyzer/nmap/Manifest
20 +++ b/net-analyzer/nmap/Manifest
21 @@ -1,5 +1,3 @@
22 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
23 -DIST nmap-6.49BETA2.tar.bz2 8810504 SHA256 e2f2aaa872fec288b927ceb59500edba198d8767adbe3a83a939e7921b224b79 SHA512 f21f0e6677c5936d49aab0a7de083b1309c49a91289691636d5ad1dfa052426d657b0a1df30519fcda712007abee0a4cd1bf89963b2e6758b11d2c18d96d637e WHIRLPOOL 1fd1b57f6b95526fabfd30cdee3064b6626735b51fcd23b8b3e91609e1b7fc126f0fd97fc2f2d478f8035ae148830afb5ab5c6bc454ac518a3023b566e1c100d
24 -DIST nmap-6.49BETA6.tar.bz2 8904750 SHA256 9c548ee0e3f0db73c4b5f8434c0bc7c99188333562c4bc4e04fb721533ff1637 SHA512 ca8bfc2dfa7f9e892e8014eefaf8aa97cefcf6f05946177e07b4dcf8e82cb1c1c2db2cf3bacd2fef1e5c4c93d7b73607e1367880e01a26f3a32c77fed09ead28 WHIRLPOOL 82e6c89b71405372b443600ab9da49fde2c2af63ab9d1990b5c6011ac52426ed28206175ae715c8e31f3d4c2acbe0536be535b878a0837578e41aff5c2c90a2c
25 DIST nmap-7.00.tar.bz2 8918906 SHA256 9f442301c615c608a385831c3505cdfed9b0795cd100f1a258b04509802802ae SHA512 f8b4368de5956698e76a2a102102feb4bd00338cf983bfbf7bcd8c941288bb4a02c45469724e8a1daed87f41536a3f16a68fc604171fe23093575ac631637351 WHIRLPOOL f769a28b32c24874eb3d4fc3100ae1e7f271bc54837f992505754f31104de18a12116350b3fbf3402719d7e84110054e8f4fb7ea18ffa3b45f17fab8554998eb
26 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
27
28 diff --git a/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
29 deleted file mode 100644
30 index a3d9dc0..0000000
31 --- a/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
32 +++ /dev/null
33 @@ -1,157 +0,0 @@
34 -# Copyright 1999-2015 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=5
39 -
40 -PYTHON_COMPAT=( python2_7 )
41 -PYTHON_REQ_USE="sqlite,xml"
42 -inherit eutils flag-o-matic python-single-r1 toolchain-funcs
43 -
44 -MY_P=${P/_beta/BETA}
45 -
46 -DESCRIPTION="A utility for network discovery and security auditing"
47 -HOMEPAGE="http://nmap.org/"
48 -SRC_URI="
49 - http://nmap.org/dist/${MY_P}.tar.bz2
50 - https://dev.gentoo.org/~jer/nmap-logo-64.png
51 -"
52 -
53 -LICENSE="GPL-2"
54 -SLOT="0"
55 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
56 -
57 -IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
58 -NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
59 -IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
60 -
61 -REQUIRED_USE="
62 - system-lua? ( nse )
63 - ndiff? ( ${PYTHON_REQUIRED_USE} )
64 - zenmap? ( ${PYTHON_REQUIRED_USE} )
65 -"
66 -
67 -RDEPEND="
68 - dev-libs/liblinear:=
69 - dev-libs/libpcre
70 - net-libs/libpcap[ipv6?]
71 - zenmap? (
72 - dev-python/pygtk:2[${PYTHON_USEDEP}]
73 - ${PYTHON_DEPS}
74 - )
75 - system-lua? ( >=dev-lang/lua-5.2[deprecated] )
76 - ndiff? ( ${PYTHON_DEPS} )
77 - nls? ( virtual/libintl )
78 - nmap-update? ( dev-libs/apr dev-vcs/subversion )
79 - ssl? (
80 - !libressl? ( dev-libs/openssl:0= )
81 - libressl? ( dev-libs/libressl:= )
82 - )
83 -"
84 -DEPEND="
85 - ${RDEPEND}
86 - nls? ( sys-devel/gettext )
87 -"
88 -
89 -S="${WORKDIR}/${MY_P}"
90 -
91 -pkg_setup() {
92 - if use ndiff || use zenmap; then
93 - python-single-r1_pkg_setup
94 - fi
95 -}
96 -
97 -src_unpack() {
98 - # prevent unpacking the logo
99 - unpack ${MY_P}.tar.bz2
100 -}
101 -
102 -src_prepare() {
103 - epatch \
104 - "${FILESDIR}"/${PN}-4.75-nolua.patch \
105 - "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
106 - "${FILESDIR}"/${PN}-5.21-python.patch \
107 - "${FILESDIR}"/${PN}-6.01-make.patch \
108 - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
109 - "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
110 - "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
111 - "${FILESDIR}"/${PN}-6.47-ncat-lua.patch \
112 - "${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
113 -
114 - if use nls; then
115 - local lingua=''
116 - for lingua in ${NMAP_LINGUAS[@]}; do
117 - if ! use linguas_${lingua}; then
118 - rm -r zenmap/share/zenmap/locale/${lingua} || die
119 - rm zenmap/share/zenmap/locale/${lingua}.po || die
120 - fi
121 - done
122 - else
123 - # configure/make ignores --disable-nls
124 - for lingua in ${NMAP_LINGUAS[@]}; do
125 - rm -r zenmap/share/zenmap/locale/${lingua} || die
126 - rm zenmap/share/zenmap/locale/${lingua}.po || die
127 - done
128 - fi
129 -
130 - sed -i \
131 - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
132 - Makefile.in || die
133 -
134 - # Fix desktop files wrt bug #432714
135 - sed -i \
136 - -e '/^Encoding/d' \
137 - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
138 - zenmap/install_scripts/unix/zenmap-root.desktop \
139 - zenmap/install_scripts/unix/zenmap.desktop || die
140 -
141 - epatch_user
142 -}
143 -
144 -src_configure() {
145 - # The bundled libdnet is incompatible with the version available in the
146 - # tree, so we cannot use the system library here.
147 - econf \
148 - $(use_enable ipv6) \
149 - $(use_enable nls) \
150 - $(use_with zenmap) \
151 - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
152 - $(use_with ncat) \
153 - $(use_with ndiff) \
154 - $(use_with nmap-update) \
155 - $(use_with nping) \
156 - $(use_with ssl openssl) \
157 - --with-libdnet=included \
158 - --with-pcre=/usr
159 - # --with-liblinear=/usr \
160 - # Commented because configure does weird things, while autodetection works
161 -}
162 -
163 -src_compile() {
164 - emake \
165 - AR=$(tc-getAR) \
166 - RANLIB=$(tc-getRANLIB )
167 -}
168 -
169 -src_install() {
170 - LC_ALL=C emake -j1 \
171 - DESTDIR="${D}" \
172 - STRIP=: \
173 - nmapdatadir="${EPREFIX}"/usr/share/nmap \
174 - install
175 - if use nmap-update;then
176 - LC_ALL=C emake -j1 \
177 - -C nmap-update \
178 - DESTDIR="${D}" \
179 - STRIP=: \
180 - nmapdatadir="${EPREFIX}"/usr/share/nmap \
181 - install
182 - fi
183 -
184 - dodoc CHANGELOG HACKING docs/README docs/*.txt
185 -
186 - if use zenmap; then
187 - doicon "${DISTDIR}/nmap-logo-64.png"
188 - python_optimize
189 - fi
190 -}
191
192 diff --git a/net-analyzer/nmap/nmap-6.49_beta6.ebuild b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
193 deleted file mode 100644
194 index 07bc0c8..0000000
195 --- a/net-analyzer/nmap/nmap-6.49_beta6.ebuild
196 +++ /dev/null
197 @@ -1,155 +0,0 @@
198 -# Copyright 1999-2015 Gentoo Foundation
199 -# Distributed under the terms of the GNU General Public License v2
200 -# $Id$
201 -
202 -EAPI=5
203 -
204 -PYTHON_COMPAT=( python2_7 )
205 -PYTHON_REQ_USE="sqlite,xml"
206 -inherit eutils flag-o-matic python-single-r1 toolchain-funcs
207 -
208 -MY_P=${P/_beta/BETA}
209 -
210 -DESCRIPTION="A utility for network discovery and security auditing"
211 -HOMEPAGE="http://nmap.org/"
212 -SRC_URI="
213 - http://nmap.org/dist/${MY_P}.tar.bz2
214 - https://dev.gentoo.org/~jer/nmap-logo-64.png
215 -"
216 -
217 -LICENSE="GPL-2"
218 -SLOT="0"
219 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
220 -
221 -IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
222 -NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
223 -IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
224 -
225 -REQUIRED_USE="
226 - system-lua? ( nse )
227 - ndiff? ( ${PYTHON_REQUIRED_USE} )
228 - zenmap? ( ${PYTHON_REQUIRED_USE} )
229 -"
230 -
231 -RDEPEND="
232 - dev-libs/liblinear:=
233 - dev-libs/libpcre
234 - net-libs/libpcap[ipv6?]
235 - zenmap? (
236 - dev-python/pygtk:2[${PYTHON_USEDEP}]
237 - ${PYTHON_DEPS}
238 - )
239 - system-lua? ( >=dev-lang/lua-5.2[deprecated] )
240 - ndiff? ( ${PYTHON_DEPS} )
241 - nls? ( virtual/libintl )
242 - nmap-update? ( dev-libs/apr dev-vcs/subversion )
243 - ssl? (
244 - !libressl? ( dev-libs/openssl:0= )
245 - libressl? ( dev-libs/libressl:= )
246 - )
247 -"
248 -DEPEND="
249 - ${RDEPEND}
250 - nls? ( sys-devel/gettext )
251 -"
252 -
253 -S="${WORKDIR}/${MY_P}"
254 -
255 -pkg_setup() {
256 - if use ndiff || use zenmap; then
257 - python-single-r1_pkg_setup
258 - fi
259 -}
260 -
261 -src_unpack() {
262 - # prevent unpacking the logo
263 - unpack ${MY_P}.tar.bz2
264 -}
265 -
266 -src_prepare() {
267 - epatch \
268 - "${FILESDIR}"/${PN}-4.75-nolua.patch \
269 - "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
270 - "${FILESDIR}"/${PN}-5.21-python.patch \
271 - "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
272 - "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
273 - "${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
274 - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
275 -
276 - if use nls; then
277 - local lingua=''
278 - for lingua in ${NMAP_LINGUAS[@]}; do
279 - if ! use linguas_${lingua}; then
280 - rm -r zenmap/share/zenmap/locale/${lingua} || die
281 - rm zenmap/share/zenmap/locale/${lingua}.po || die
282 - fi
283 - done
284 - else
285 - # configure/make ignores --disable-nls
286 - for lingua in ${NMAP_LINGUAS[@]}; do
287 - rm -r zenmap/share/zenmap/locale/${lingua} || die
288 - rm zenmap/share/zenmap/locale/${lingua}.po || die
289 - done
290 - fi
291 -
292 - sed -i \
293 - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
294 - Makefile.in || die
295 -
296 - # Fix desktop files wrt bug #432714
297 - sed -i \
298 - -e '/^Encoding/d' \
299 - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
300 - zenmap/install_scripts/unix/zenmap-root.desktop \
301 - zenmap/install_scripts/unix/zenmap.desktop || die
302 -
303 - epatch_user
304 -}
305 -
306 -src_configure() {
307 - # The bundled libdnet is incompatible with the version available in the
308 - # tree, so we cannot use the system library here.
309 - econf \
310 - $(use_enable ipv6) \
311 - $(use_enable nls) \
312 - $(use_with zenmap) \
313 - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
314 - $(use_with ncat) \
315 - $(use_with ndiff) \
316 - $(use_with nmap-update) \
317 - $(use_with nping) \
318 - $(use_with ssl openssl) \
319 - --with-libdnet=included \
320 - --with-pcre=/usr
321 - # --with-liblinear=/usr \
322 - # Commented because configure does weird things, while autodetection works
323 -}
324 -
325 -src_compile() {
326 - emake \
327 - AR=$(tc-getAR) \
328 - RANLIB=$(tc-getRANLIB)
329 -}
330 -
331 -src_install() {
332 - LC_ALL=C emake -j1 \
333 - DESTDIR="${D}" \
334 - STRIP=: \
335 - nmapdatadir="${EPREFIX}"/usr/share/nmap \
336 - install
337 - if use nmap-update;then
338 - LC_ALL=C emake -j1 \
339 - -C nmap-update \
340 - DESTDIR="${D}" \
341 - STRIP=: \
342 - nmapdatadir="${EPREFIX}"/usr/share/nmap \
343 - install
344 - fi
345 -
346 - dodoc CHANGELOG HACKING docs/README docs/*.txt
347 -
348 - if use zenmap; then
349 - doicon "${DISTDIR}/nmap-logo-64.png"
350 - python_optimize
351 - fi
352 -}