* [gentoo-commits] gentoo-x86 commit in net-analyzer/nmap: nmap-6.47.ebuild ChangeLog
@ 2014-11-11 21:56 Mike Gilbert (floppym)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert (floppym) @ 2014-11-11 21:56 UTC (permalink / raw
To: gentoo-commits
floppym 14/11/11 21:56:13
Modified: nmap-6.47.ebuild ChangeLog
Log:
Fix python deps.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.2 net-analyzer/nmap/nmap-6.47.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild?r1=1.1&r2=1.2
Index: nmap-6.47.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nmap-6.47.ebuild 28 Aug 2014 10:07:45 -0000 1.1
+++ nmap-6.47.ebuild 11 Nov 2014 21:56:13 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v 1.1 2014/08/28 10:07:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v 1.2 2014/11/11 21:56:13 floppym Exp $
EAPI=5
@@ -25,19 +25,21 @@
NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-NMAP_PYTHON_DEPEND="
- || ( ${PYTHON_DEPS} )
+REQUIRED_USE="
+ ndiff? ( ${PYTHON_REQUIRED_USE} )
+ zenmap ( ${PYTHON_REQUIRED_USE} )
"
+
RDEPEND="
dev-libs/liblinear
dev-libs/libpcre
net-libs/libpcap[ipv6?]
zenmap? (
dev-python/pygtk:2
- ${NMAP_PYTHON_DEPEND}
+ ${PYTHON_DEPS}
)
lua? ( >=dev-lang/lua-5.2[deprecated] )
- ndiff? ( ${NMAP_PYTHON_DEPEND} )
+ ndiff? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
nmap-update? ( dev-libs/apr dev-vcs/subversion )
ssl? ( dev-libs/openssl )
1.311 net-analyzer/nmap/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.311&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.311&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.310&r2=1.311
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- ChangeLog 28 Aug 2014 10:07:45 -0000 1.310
+++ ChangeLog 11 Nov 2014 21:56:13 -0000 1.311
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/nmap
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.310 2014/08/28 10:07:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.311 2014/11/11 21:56:13 floppym Exp $
+
+ 11 Nov 2014; Mike Gilbert <floppym@gentoo.org> nmap-6.47.ebuild:
+ Fix python deps.
*nmap-6.47 (28 Aug 2014)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/nmap: nmap-6.47.ebuild ChangeLog
@ 2014-11-11 21:58 Mike Gilbert (floppym)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert (floppym) @ 2014-11-11 21:58 UTC (permalink / raw
To: gentoo-commits
floppym 14/11/11 21:58:32
Modified: nmap-6.47.ebuild ChangeLog
Log:
Don't call python-single-r1_pkg_setup if python is not used.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.3 net-analyzer/nmap/nmap-6.47.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild?r1=1.2&r2=1.3
Index: nmap-6.47.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nmap-6.47.ebuild 11 Nov 2014 21:56:13 -0000 1.2
+++ nmap-6.47.ebuild 11 Nov 2014 21:58:32 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v 1.2 2014/11/11 21:56:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47.ebuild,v 1.3 2014/11/11 21:58:32 floppym Exp $
EAPI=5
@@ -51,6 +51,12 @@
S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+ if use ndiff || use zenmap; then
+ python-single-r1_pkg_setup
+ fi
+}
+
src_unpack() {
# prevent unpacking the logo
unpack ${MY_P}.tar.bz2
1.312 net-analyzer/nmap/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.312&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.312&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.311&r2=1.312
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- ChangeLog 11 Nov 2014 21:56:13 -0000 1.311
+++ ChangeLog 11 Nov 2014 21:58:32 -0000 1.312
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/nmap
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.311 2014/11/11 21:56:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.312 2014/11/11 21:58:32 floppym Exp $
+
+ 11 Nov 2014; Mike Gilbert <floppym@gentoo.org> nmap-6.47.ebuild:
+ Don't call python-single-r1_pkg_setup if python is not used.
11 Nov 2014; Mike Gilbert <floppym@gentoo.org> nmap-6.47.ebuild:
Fix python deps.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-11 21:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-11 21:56 [gentoo-commits] gentoo-x86 commit in net-analyzer/nmap: nmap-6.47.ebuild ChangeLog Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2014-11-11 21:58 Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox