fix bug #237150, compiling with USE='-lua'. Fix from Simon Zilliken <simon@zilliken.name>

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r8 x86_64

4 files changed, 24 insertions, 7 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 03bbce5f5608..01599191736d 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,11 @@
 # 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.183 2008/09/09 07:05:53 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.184 2008/09/10 18:39:27 cardoe Exp $
+
+  10 Sep 2008; Doug Goldstein <cardoe@gentoo.org>
+  +files/nmap-4.75-nolua.patch, nmap-4.75.ebuild:
+  fix bug #237150, compiling with USE='-lua'. Fix from Simon Zilliken
+  <simon@zilliken.name>
 
 *nmap-4.75 (09 Sep 2008)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 82378e6e527c..5fb01e206f71 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -6,6 +6,7 @@ AUX nmap-4.20-osscan.patch 728 RMD160 b8b78c31941a37d0ffce1a193c41beae4a90ea16 S
 AUX nmap-4.68-concurrent-make-fix.patch 454 RMD160 b892c1d6be072c6ba3922fb0f9fc9907a870e7a2 SHA1 903d63c562a9664e34fec02a224938f3b508a6c0 SHA256 3d04269e56225093994cfc584912e4300c87b662f6c23b965deea95b4a7c6a25
 AUX nmap-4.68-nolua.patch 2929 RMD160 be3cf17c4f3dffe9139189f860c8168c1a4a34ef SHA1 96e81abb565ae585302ba9c4bc22addfbf15e1e8 SHA256 32be40197422d56fd3c273fc59ec777e1cb25c3bbf89fe735f6ac1c16e5e5fb8
 AUX nmap-4.75-include.patch 476 RMD160 5ac50ccc48dbbc1c654558c97c0b6c5f777cc843 SHA1 10ec6eb55e60175417c37785f274d3872ccd22bf SHA256 ec9453954d1b84e77c1489c8a25d629ba300084c7020ed8b6045c0e839cdcdca
+AUX nmap-4.75-nolua.patch 364 RMD160 90ec068c5a267dd43737fb39828b3c9c372e19b1 SHA1 aab37cdb0a19891fd55038b05d1ab843d1fcf255 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
 AUX nmap-shtool-nls.patch 646 RMD160 308bf5925393716ccb01d914c6b06c63144bbdfd SHA1 ae013892b7c13974cf905bfc58d36ffaf9a345ee SHA256 639749d61339186fe16e8302e601b74f0aec1121140968e015ac9dd833855bb4
 DIST nmap-4.20.tar.bz2 2156077 RMD160 d4794618c72f46e3c9446ce9e0c705ccf32c7115 SHA1 641bf8ec28313f3fd110d7fa84c3a233cf79c36b SHA256 c923a6cfa6d3683dc7ee27a721c19d15fd66f264f8ca6dbc9cfac710591f32a8
@@ -21,13 +22,13 @@ EBUILD nmap-4.60.ebuild 1683 RMD160 c9576c1f9f7b1ecc1adb8856cdbc074749ac95ce SHA
 EBUILD nmap-4.62.ebuild 1684 RMD160 608d5171ffe6a1f129f2a3ffac91605618dce9c2 SHA1 fdba5b3a63d9fdb2718f4942a70240bc1201e26f SHA256 e68448b01871ed3c29efb9df0b7579727326c98c7f1a230299bb14b80fb7679b
 EBUILD nmap-4.65.ebuild 1686 RMD160 2c4ea5a3d490b8c070b835ac4db66e89e74319e6 SHA1 aa5f4cda221fa76ae3385099b1123cb304a7899b SHA256 76abd1a282192e608a308ea4a04f7e2c8c159b90fe18d3b29993299ed77d3741
 EBUILD nmap-4.68.ebuild 1862 RMD160 52d8d9d7040f829fc3703405328a097cff752263 SHA1 2ed6e0c744999ff093ce8eef3ca408688e61c038 SHA256 5b51fd7ee91a405797394f343b50c7527072b3364158b17adc163c3abd8fe275
-EBUILD nmap-4.75.ebuild 1774 RMD160 9f68775befd79e4bc00b1e5588020f47051b2f7f SHA1 664f20a7c1b35eb7c53443c17ea077014537c600 SHA256 1029ce22836486b32597ee723e31a45d0cbaf9cb51411ed1cc579c0d5b68966b
-MISC ChangeLog 22017 RMD160 b44e0a7952e28a40b3c020e5ca98978d02234b3d SHA1 dd3e8008a9269636d0a38497d152d1a36a88e333 SHA256 7b5531936e83c32f7e64202063ebf1b8ad19e00812fc57fba8396fd82826b1be
+EBUILD nmap-4.75.ebuild 1814 RMD160 092a31cc0012d07798b9def2995623104d0fc651 SHA1 773d7ccaeac654620c17d6ae986a8d46232568fb SHA256 9641d1f2cb05ee928f5d0c8f93e8014fb91a69892b669179d8dd4792fb94cdba
+MISC ChangeLog 22213 RMD160 96050d3284bb5324a28e2d4ff606093c1bac3509 SHA1 fc3105ead5f91c543d2298f84becc2fd5ccf600c SHA256 cf8f56a049be78a985e40735d1f4bdcd93f9a600c0bb2071da696d85b665089a
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjGIDcACgkQchej4aZK9/eLAQCghzFMF62MDmGrNIhmLmXeGhjK
-KiIAn3JWHCBAVrC7U1FbfGFyxNUX6tJ8
-=7MzI
+iEYEARECAAYFAkjIFQ0ACgkQoeSe8B0zEfzjzACfS6SqWlHFLsbHYAPhGve94MTO
+LSkAn1CfujlRlkK9jcGQOuBdC2eY07Om
+=Kk8g
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-4.75-nolua.patch b/net-analyzer/nmap/files/nmap-4.75-nolua.patch
new file mode 100644
index 000000000000..30bb1e0c8669
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-4.75-nolua.patch
@@ -0,0 +1,10 @@
+diff -Naur nmap-4.75-orig/Makefile.in nmap-4.75/Makefile.in
+--- nmap-4.75-orig/Makefile.in	2008-09-05 07:32:06.000000000 +0200
++++ nmap-4.75/Makefile.in	2008-09-09 16:34:38.000000000 +0200
+@@ -258,5 +258,5 @@
+ 	./config.status --recheck
+ 
+ makefile.dep:
+-	$(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
++	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@
+ include makefile.dep
diff --git a/net-analyzer/nmap/nmap-4.75.ebuild b/net-analyzer/nmap/nmap-4.75.ebuild
index 98c75ebd68b1..3172bb02cf0a 100644
--- a/net-analyzer/nmap/nmap-4.75.ebuild
+++ b/net-analyzer/nmap/nmap-4.75.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.75.ebuild,v 1.1 2008/09/09 07:05:53 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.75.ebuild,v 1.2 2008/09/10 18:39:27 cardoe Exp $
 
 inherit eutils flag-o-matic
 
@@ -36,6 +36,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-include.patch"
+	epatch "${FILESDIR}/${P}-nolua.patch"
 }
 
 src_compile() {