Update dependencies as suggested in bug #202424 and restore the hppa keyword.

Package-Manager: portage-2.1.4_rc10

3 files changed, 37 insertions, 12 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/Manifest b/net-analyzer/nmap/Manifest
index e3d091dbc3cf..e36300ce296e 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nmap-4.01-nostrip.patch 1776 RMD160 643efbf516bf48af90c82c6e9c4c8bf587673053 SHA1 6e8e6bca94ce7bfcf83175ab58ab2c5bbfa56a31 SHA256 8ad526d6766d93ff5b76410982b18fd4f47fe504afe8e7e087cab072331b3de0
 MD5 6b3a7e3c4c595baed7770f09ee8b4c33 files/nmap-4.01-nostrip.patch 1776
 RMD160 643efbf516bf48af90c82c6e9c4c8bf587673053 files/nmap-4.01-nostrip.patch 1776
@@ -20,14 +23,14 @@ EBUILD nmap-4.20.ebuild 1282 RMD160 bef3e576d5aa71143c88f894361748cc104d4da2 SHA
 MD5 e0f9526ba3499e6428a657d88ff302bd nmap-4.20.ebuild 1282
 RMD160 bef3e576d5aa71143c88f894361748cc104d4da2 nmap-4.20.ebuild 1282
 SHA256 475c62a27541ee8695574b3979b65bb7e09a0b5525594ed579eebab2abce5c99 nmap-4.20.ebuild 1282
-EBUILD nmap-4.50.ebuild 1082 RMD160 989c841693096ad4437af420404029c1ecdc846e SHA1 d575223a8ed22e47d63a1048e2f6e6df0877f526 SHA256 a71140c8e1c3f57ca7564094da4ec6517e128c3cdd6772425934949d178571c2
-MD5 860183996e4cf5cbc42ec1c3a80e8de5 nmap-4.50.ebuild 1082
-RMD160 989c841693096ad4437af420404029c1ecdc846e nmap-4.50.ebuild 1082
-SHA256 a71140c8e1c3f57ca7564094da4ec6517e128c3cdd6772425934949d178571c2 nmap-4.50.ebuild 1082
-MISC ChangeLog 18052 RMD160 0e4c0abd4ca44ac2ac311fbbf3f38b5c1e81026d SHA1 d2733b532b9af9301c53ac3cb795e70c320346fb SHA256 ee9c2debc70538329523838b2896ef9553b321af64df189553fecf9cf491bfaa
-MD5 809ad70ba61d90fa1a6532ff0e684e3c ChangeLog 18052
-RMD160 0e4c0abd4ca44ac2ac311fbbf3f38b5c1e81026d ChangeLog 18052
-SHA256 ee9c2debc70538329523838b2896ef9553b321af64df189553fecf9cf491bfaa ChangeLog 18052
+EBUILD nmap-4.50.ebuild 1486 RMD160 94fb173e335dc42d6b776d31125acfbf0892f1be SHA1 a6f548cad0e99191b83572ec956a7284a405c162 SHA256 538375a0101613f4ff86692c56819afd7d5634f29cfcf72a2849cc3547145b03
+MD5 a02ac468ccd1dd89b4ea665002a7e098 nmap-4.50.ebuild 1486
+RMD160 94fb173e335dc42d6b776d31125acfbf0892f1be nmap-4.50.ebuild 1486
+SHA256 538375a0101613f4ff86692c56819afd7d5634f29cfcf72a2849cc3547145b03 nmap-4.50.ebuild 1486
+MISC ChangeLog 18207 RMD160 8a17e2cbdb1665390257a174a43bfcd1f34c9fcc SHA1 8903cd694a743ac6c0a47eb7ebd22058c6c54d0d SHA256 4438a7b1a1a21b28953148949bb6d6cab6517c39055c303541af06acb4e9900c
+MD5 1ee7be1f1f2750b504cedf761b9a4ae9 ChangeLog 18207
+RMD160 8a17e2cbdb1665390257a174a43bfcd1f34c9fcc ChangeLog 18207
+SHA256 4438a7b1a1a21b28953148949bb6d6cab6517c39055c303541af06acb4e9900c ChangeLog 18207
 MISC metadata.xml 221 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 SHA1 f35d1b1858e1223f4dc7b2c03fdf17e50091f1ca SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 metadata.xml 221
@@ -38,3 +41,10 @@ SHA256 5950d5ffd3b4b0d49dc577eeba1ef2aa2cb11ce1270e01d13bd350ed0eb4bf7e files/di
 MD5 7b5accc93cb232827ee8090e1ada6ee6 files/digest-nmap-4.50 235
 RMD160 bf90e5455e9ccad4b1a01b29d5ba3207097cc7b7 files/digest-nmap-4.50 235
 SHA256 9c7d2ac604d828d070accda7ee9c65aee1291bd43a5b96d80da50228f58a589f files/digest-nmap-4.50 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHZPc0chej4aZK9/cRAtLsAJ44je6ySCvzj92J1z4yW0aaM6D7AQCfceoV
+uUcBZhzGG7e4T+ANeSIdiuY=
+=lGrE
+-----END PGP SIGNATURE-----
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 \