| 1 |
jer 12/12/01 16:47:11 |
| 2 |
|
| 3 |
Modified: ChangeLog nmap-6.01.ebuild |
| 4 |
Log: |
| 5 |
Fix python dependencies (bug #435462 by Alexander Zubkov). |
| 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.258 net-analyzer/nmap/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.258&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.258&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.257&r2=1.258 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v |
| 19 |
retrieving revision 1.257 |
| 20 |
retrieving revision 1.258 |
| 21 |
diff -u -r1.257 -r1.258 |
| 22 |
--- ChangeLog 25 Sep 2012 18:54:58 -0000 1.257 |
| 23 |
+++ ChangeLog 1 Dec 2012 16:47:11 -0000 1.258 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-analyzer/nmap |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.257 2012/09/25 18:54:58 pinkbyte Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.258 2012/12/01 16:47:11 jer Exp $ |
| 29 |
+ |
| 30 |
+ 01 Dec 2012; Jeroen Roovers <jer@g.o> nmap-6.01.ebuild: |
| 31 |
+ Fix python dependencies (bug #435462 by Alexander Zubkov). |
| 32 |
|
| 33 |
*nmap-5.51.6 (25 Sep 2012) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.4 net-analyzer/nmap/nmap-6.01.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?rev=1.4&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?rev=1.4&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild?r1=1.3&r2=1.4 |
| 43 |
|
| 44 |
Index: nmap-6.01.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v |
| 47 |
retrieving revision 1.3 |
| 48 |
retrieving revision 1.4 |
| 49 |
diff -u -r1.3 -r1.4 |
| 50 |
--- nmap-6.01.ebuild 23 Sep 2012 09:14:51 -0000 1.3 |
| 51 |
+++ nmap-6.01.ebuild 1 Dec 2012 16:47:11 -0000 1.4 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.3 2012/09/23 09:14:51 pinkbyte Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.4 2012/12/01 16:47:11 jer Exp $ |
| 57 |
|
| 58 |
EAPI="4" |
| 59 |
PYTHON_DEPEND="2" |
| 60 |
@@ -18,16 +18,28 @@ |
| 61 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
| 62 |
IUSE="gtk lua ncat ndiff nmap-update nping ssl" |
| 63 |
|
| 64 |
-DEPEND="dev-libs/libpcre |
| 65 |
- net-libs/libpcap[ipv6] |
| 66 |
+NMAP_PYTHON_DEPEND=" |
| 67 |
+|| ( |
| 68 |
+ dev-lang/python:2.7[sqlite] |
| 69 |
+ dev-lang/python:2.6[sqlite] |
| 70 |
+ dev-lang/python:2.5[sqlite] |
| 71 |
+ dev-python/pysqlite:2 |
| 72 |
+) |
| 73 |
+" |
| 74 |
+DEPEND=" |
| 75 |
dev-libs/apr |
| 76 |
- gtk? ( >=x11-libs/gtk+-2.6:2 |
| 77 |
- >=dev-python/pygtk-2.6 |
| 78 |
- || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) |
| 79 |
- ) |
| 80 |
+ dev-libs/libpcre |
| 81 |
+ net-libs/libpcap[ipv6] |
| 82 |
+ gtk? ( |
| 83 |
+ >=x11-libs/gtk+-2.6:2 |
| 84 |
+ >=dev-python/pygtk-2.6 |
| 85 |
+ ${NMAP_PYTHON_DEPEND} |
| 86 |
+ ) |
| 87 |
lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] ) |
| 88 |
+ ndiff? ( ${NMAP_PYTHON_DEPEND} ) |
| 89 |
nmap-update? ( dev-libs/apr dev-vcs/subversion ) |
| 90 |
- ssl? ( dev-libs/openssl )" |
| 91 |
+ ssl? ( dev-libs/openssl ) |
| 92 |
+" |
| 93 |
RDEPEND="${DEPEND}" |
| 94 |
|
| 95 |
S="${WORKDIR}/${MY_P}" |
Archives