diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-01-26 18:18:04 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-01-26 18:18:04 +0000 |
| commit | 8830f2ea9a359fb2c3e8e02e10c7f7af93cfe042 (patch) | |
| tree | 8e92f9b48755ec0cdfc0612f29f2349237b7ef9d /net-analyzer/nmap | |
| parent | Enable UCLIBC_SUPPORT_AI_ADDRCONFIG support #452448 by Richard Yao. Add dup3... (diff) | |
| download | gentoo-2-8830f2ea9a359fb2c3e8e02e10c7f7af93cfe042.tar.gz gentoo-2-8830f2ea9a359fb2c3e8e02e10c7f7af93cfe042.tar.bz2 gentoo-2-8830f2ea9a359fb2c3e8e02e10c7f7af93cfe042.zip | |
Run python_set_active_version conditionally.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/nmap')
| -rw-r--r-- | net-analyzer/nmap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-6.01.ebuild | 6 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-6.25.ebuild | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog index 3b56b55f3127..1558b12a9bab 100644 --- a/net-analyzer/nmap/ChangeLog +++ b/net-analyzer/nmap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/nmap # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.283 2013/01/26 17:19:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.284 2013/01/26 18:18:04 jer Exp $ + + 26 Jan 2013; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild, + nmap-6.25.ebuild: + Run python_set_active_version conditionally. 26 Jan 2013; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild, nmap-6.25.ebuild: diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild index 69446b701760..90d16e78940f 100644 --- a/net-analyzer/nmap/nmap-6.01.ebuild +++ b/net-analyzer/nmap/nmap-6.01.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.23 2013/01/26 17:19:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.24 2013/01/26 18:18:04 jer Exp $ EAPI="4" @@ -47,7 +47,9 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" pkg_setup() { - python_set_active_version 2 + if use gtk || use ndiff; then + python_set_active_version 2 + fi } src_unpack() { diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild index 8c91adb6acfb..90a04ae92e61 100644 --- a/net-analyzer/nmap/nmap-6.25.ebuild +++ b/net-analyzer/nmap/nmap-6.25.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.12 2013/01/26 17:19:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.13 2013/01/26 18:18:04 jer Exp $ EAPI="4" @@ -56,7 +56,9 @@ DEPEND=" S="${WORKDIR}/${MY_P}" pkg_setup() { - python_set_active_version 2 + if use gtk || use ndiff; then + python_set_active_version 2 + fi } src_unpack() { |