Fix bug #212159.

Package-Manager: portage-2.1.4.4

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index bcdba1623d5054f1d6e17ae9af644c12f4920394..a0f9b6983eed42864b90ce9c18aaf017d2061b07 100644 (file)
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.159 2008/02/21 12:38:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.160 2008/03/04 16:43:41 spock Exp $
+
+  04 Mar 2008; Michał Januszewski <spock@gentoo.org> nmap-4.53.ebuild:
+  Fix bug #212159.
 
   21 Feb 2008; Raúl Porcel <armin76@gentoo.org> nmap-4.53.ebuild:
   alpha/ia64/sparc/x86 stable

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 1936a02126000ab2b89f8c83f090dcec1526df5a..4dd4feff35c8b64dddf456ca652d637d6e0a9e29 100644 (file)
--- 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
 AUX nmap-4.20-osscan.patch 728 RMD160 b8b78c31941a37d0ffce1a193c41beae4a90ea16 SHA1 563c11bd67f3810b61b275be0f7da04f9dabd6f6 SHA256 3d525248f414504712f8cb25ea4bed1e6330882c1e69fb176629cb731d811101
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
@@ -9,6 +12,13 @@ DIST nmap-4.53.tar.bz2 3145948 RMD160 c5164ddd0b7708ac4f047eaf7eedd318741bb2f1 S
 EBUILD nmap-4.20.ebuild 1231 RMD160 7b430d95f7f9356325ec44675e4e074060561b87 SHA1 6134129fa628b69d84471243c5be13e8f0b1a366 SHA256 38c77aba49ead2682921f00074963e31b99e15fae42b228272896f4d034299c6
 EBUILD nmap-4.50.ebuild 1429 RMD160 87f80c5716f673a92d4f6096f5ce18d264765d71 SHA1 70898f18fb561b0b1e6f4d2328dd51b8e3a18d57 SHA256 caa84a5082d0150c3934950f4be9aa257dfb57d127121c1d69c4b1d4c1831280
 EBUILD nmap-4.52.ebuild 1431 RMD160 49d434662e6f0e3b15f2166deaab2cdb81bde093 SHA1 8b5d8e230afd04c9cd2e95153bbde852c5fd8505 SHA256 11b4435d250a91276ea7273de71a6a6aeb3a563ccff2e37c4c87af862c169e2b
-EBUILD nmap-4.53.ebuild 1462 RMD160 c8be3f1bee295644e38d0d97b1676503a5de478a SHA1 e866596c7d255d180b96ebd4d61bcce34022b990 SHA256 d3950e8ca32c5759b418dc773bb6135ea11f0035437a67226fa49b85ddd7c6e8
-MISC ChangeLog 19183 RMD160 86826414d5df29f2fe9357b620b7eb63d86887c9 SHA1 cb607cff3cf7fec4b306bba3241fb515298cf172 SHA256 c67e2ff07abfee61dc8110ba02a96966fd4f12a15c5b00183510a8fec1ab31ab
+EBUILD nmap-4.53.ebuild 1643 RMD160 3a5381329b014cc253d999885ad80347a9a76152 SHA1 4ff4708a931757e84d0746db0c61aa33082e760a SHA256 0ed736e7bd211086454b4075212a2dd83fc34eb1b21cdf4ac982326168bd5730
+MISC ChangeLog 19273 RMD160 606606dcacdefae5316daed7ff7d003026d84736 SHA1 f1f5cd5230c70007cd2b694703ccd910ee0d88d9 SHA256 f2066667d6a0a78811c380ecfac757aa9f42fdc71a216595d5957eb552e0aeba
 MISC metadata.xml 221 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 SHA1 f35d1b1858e1223f4dc7b2c03fdf17e50091f1ca SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHzXw8chej4aZK9/cRAhx3AJ0U35QLMMxbtHnROafHnUQNHjauVwCdE7DM
+jGM8loAOmCiiik5ePQafKUk=
+=SqpI
+-----END PGP SIGNATURE-----

diff --git a/net-analyzer/nmap/nmap-4.53.ebuild b/net-analyzer/nmap/nmap-4.53.ebuild
index f436ee647014d3e15583d1865c168d92f1f1e709..7cd0894a9bcabcaf870e524c99b35d2285e58603 100644 (file)
--- a/net-analyzer/nmap/nmap-4.53.ebuild
+++ b/net-analyzer/nmap/nmap-4.53.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.53.ebuild,v 1.3 2008/02/21 12:38:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.53.ebuild,v 1.4 2008/03/04 16:43:41 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -33,10 +33,20 @@ pkg_setup() {
 }
 
 src_compile() {
+       local myconf=""
+
+       if use lua ; then
+               if has_version dev-lang/lua && built_with_use dev-lang/lua deprecated ; then
+                       myconf="--with-liblua"
+               else
+                       myconf="--with-liblua=included"
+               fi
+       fi
+
        econf \
                --with-libdnet=included \
+               "${myconf}" \
                $(use_with gtk zenmap) \
-               $(use_with lua liblua) \
                $(use_with ssl openssl) || die
        emake -j1 || die
 }