summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2007-12-16 10:00:11 +0000
committerMichael Januszewski <spock@gentoo.org>2007-12-16 10:00:11 +0000
commitffee788f2dc913fe2971f56624fdb207d3291d35 (patch)
treeb1095f1e373aa65c487bff833ea96d4a39045229 /net-analyzer/nmap
parentamd64 stable wrt #202240 (diff)
downloadgentoo-2-ffee788f2dc913fe2971f56624fdb207d3291d35.tar.gz
gentoo-2-ffee788f2dc913fe2971f56624fdb207d3291d35.tar.bz2
gentoo-2-ffee788f2dc913fe2971f56624fdb207d3291d35.zip
Update dependencies as suggested in bug #202424 and restore the hppa keyword.
(Portage version: 2.1.4_rc10)
Diffstat (limited to 'net-analyzer/nmap')
-rw-r--r--net-analyzer/nmap/ChangeLog5
-rw-r--r--net-analyzer/nmap/nmap-4.50.ebuild18
2 files changed, 19 insertions, 4 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index cc6f8b420b1b..086f4bb4a1da 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/nmap
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.149 2007/12/15 18:19:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.150 2007/12/16 10:00:11 spock Exp $
+
+ 16 Dec 2007; Michał Januszewski <spock@gentoo.org> nmap-4.50.ebuild:
+ Update dependencies as suggested in bug #202424 and restore the hppa keyword.
15 Dec 2007; Jeroen Roovers <jer@gentoo.org> nmap-4.50.ebuild:
Dropping hppa keyword because of missing dep.
diff --git a/net-analyzer/nmap/nmap-4.50.ebuild b/net-analyzer/nmap/nmap-4.50.ebuild
index fff7827296af..b3ad10d11053 100644
--- a/net-analyzer/nmap/nmap-4.50.ebuild
+++ b/net-analyzer/nmap/nmap-4.50.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.50.ebuild,v 1.2 2007/12/15 18:19:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.50.ebuild,v 1.3 2007/12/16 10:00:11 spock Exp $
inherit eutils flag-o-matic
@@ -10,16 +10,28 @@ SRC_URI="http://download.insecure.org/nmap/dist/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="gtk ssl"
DEPEND="dev-libs/libpcre
net-libs/libpcap
gtk? ( >=x11-libs/gtk+-2.6
>=dev-python/pygtk-2.6
- >=dev-python/pysqlite-2 )
+ || ( >=dev-lang/python-2.5
+ >=dev-python/pysqlite-2 )
+ )
ssl? ( dev-libs/openssl )"
+pkg_setup() {
+ if use gtk && has_version ">=dev-lang/python-2.5" &&
+ ! has_version ">=dev-python/pysqlite-2" &&
+ ! built_with_use dev-lang/python sqlite ; then
+ eerror "In order to use the nmap GUI you have to either emerge dev-lang/python"
+ eerror "with the 'sqlite' USE flag, or install dev-python/pysqlite-2*."
+ die "sqlite support missing"
+ fi
+}
+
src_compile() {
use ppc-macos && filter-flags -fstrict-aliasing -O2
econf \