Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/nmap: nmap-6.01.ebuild ChangeLog
Date: Sat, 01 Dec 2012 17:16:05
Message-Id: 20121201171554.D8729216CC@flycatcher.gentoo.org
1 jer 12/12/01 17:15:54
2
3 Modified: nmap-6.01.ebuild ChangeLog
4 Log:
5 Break up long lines. Clean up.
6
7 (Portage version: 2.2.0_alpha143/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.5 net-analyzer/nmap/nmap-6.01.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?r1=1.4&r2=1.5
15
16 Index: nmap-6.01.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- nmap-6.01.ebuild 1 Dec 2012 16:47:11 -0000 1.4
23 +++ nmap-6.01.ebuild 1 Dec 2012 17:15:54 -0000 1.5
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.4 2012/12/01 16:47:11 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.5 2012/12/01 17:15:54 jer Exp $
29
30 EAPI="4"
31 PYTHON_DEPEND="2"
32 @@ -60,31 +60,44 @@
33 epatch "${FILESDIR}"/${P}-make.patch
34
35 # Fix desktop files wrt bug #432714
36 - sed -i -e '/^Encoding/d' zenmap/install_scripts/unix/zenmap.desktop
37 - sed -i -e '/^Encoding/d' zenmap/install_scripts/unix/zenmap-root.desktop
38 - sed -i -e 's/Categories=Application;Network;Security/Categories=Network;System;Security/' zenmap/install_scripts/unix/zenmap.desktop
39 - sed -i -e 's/Categories=Application;Network;Security/Categories=Network;System;Security/' zenmap/install_scripts/unix/zenmap-root.desktop
40 + sed -i \
41 + -e '/^Encoding/d' \
42 + -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
43 + zenmap/install_scripts/unix/zenmap-root.desktop \
44 + zenmap/install_scripts/unix/zenmap.desktop || die
45 }
46
47 src_configure() {
48 # The bundled libdnet is incompatible with the version available in the
49 # tree, so we cannot use the system library here.
50 - econf --with-libdnet=included \
51 + econf \
52 $(use_with gtk zenmap) \
53 $(use_with lua liblua) \
54 $(use_with ncat) \
55 $(use_with ndiff) \
56 $(use_with nmap-update) \
57 $(use_with nping) \
58 - $(use_with ssl openssl)
59 + $(use_with ssl openssl) \
60 + --with-libdnet=included
61 }
62
63 src_install() {
64 - LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: nmapdatadir="${EPREFIX}"/usr/share/nmap install
65 + LC_ALL=C emake \
66 + -j1 \
67 + DESTDIR="${D}" \
68 + STRIP=: \
69 + nmapdatadir="${EPREFIX}"/usr/share/nmap \
70 + install
71 if use nmap-update;then
72 - LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: \
73 - nmapdatadir="${EPREFIX}"/usr/share/nmap -C nmap-update install
74 + LC_ALL=C emake \
75 + -C nmap-update \
76 + -j1 \
77 + DESTDIR="${D}" \
78 + STRIP=: \
79 + nmapdatadir="${EPREFIX}"/usr/share/nmap \
80 + install
81 fi
82 +
83 dodoc CHANGELOG HACKING docs/README docs/*.txt
84
85 use gtk && doicon "${FILESDIR}/nmap-logo-64.png"
86
87
88
89 1.259 net-analyzer/nmap/ChangeLog
90
91 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.259&view=markup
92 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.259&content-type=text/plain
93 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.258&r2=1.259
94
95 Index: ChangeLog
96 ===================================================================
97 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v
98 retrieving revision 1.258
99 retrieving revision 1.259
100 diff -u -r1.258 -r1.259
101 --- ChangeLog 1 Dec 2012 16:47:11 -0000 1.258
102 +++ ChangeLog 1 Dec 2012 17:15:54 -0000 1.259
103 @@ -1,6 +1,9 @@
104 # ChangeLog for net-analyzer/nmap
105 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
106 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.258 2012/12/01 16:47:11 jer Exp $
107 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.259 2012/12/01 17:15:54 jer Exp $
108 +
109 + 01 Dec 2012; Jeroen Roovers <jer@g.o> nmap-6.01.ebuild:
110 + Break up long lines. Clean up.
111
112 01 Dec 2012; Jeroen Roovers <jer@g.o> nmap-6.01.ebuild:
113 Fix python dependencies (bug #435462 by Alexander Zubkov).