Fix building with USE=-lua by Anton Bolshakov (bug #445552).

Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 98 insertions, 9 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 832d0335ba6c..7da3753914b0 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.262 2012/12/01 21:30:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.263 2012/12/02 15:57:07 jer Exp $
+
+  02 Dec 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.25.ebuild,
+  +files/nmap-6.25-lua.patch:
+  Fix building with USE=-lua by Anton Bolshakov (bug #445552).
 
   01 Dec 2012; <ago@gentoo.org> nmap-6.01.ebuild:
   Stable for amd64, wrt bug #445500
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d89292030d28..0f239e61e4a7 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nmap-4.75-include.patch 476 SHA256 ec9453954d1b84e77c1489c8a25d629ba300084c7020ed8b6045c0e839cdcdca SHA512 0805756e9aa3843d2a9e0ae41d202101bacfd60ec2c0f5accde617eb17759701d16d3c0b91f613e7a42d994212334f136e17d3664926df145638fd0ac578bfdd WHIRLPOOL ab3ffa461cb15227707424c4213bb4152c990766f1e78146ec4389431602e26142cb15f01138cb8b67c5e9f9c58b24fac6c3e1ab6b72f5749511da353d3010cc
 AUX nmap-4.75-nolua.patch 364 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619 SHA512 df83711db7250d8debbb70867da3e066ba13edf9b304cc5c61824a5a0f968bff3057c0a29efffbfdd9a68871f0cca0e93f2f6051c907b8ae4242a07eada832fc WHIRLPOOL 40a56b9ebf2c99578d4fab7b20ba0379e8ef55c3c782f8c29f33e9dc302b669434dd21fa40e1e82ce0b1249080abcaa3ce95c2dc23db010f7bd87f3f1cf99f10
 AUX nmap-5.00-python.patch 1205 SHA256 0fe36a2e95a2f6c01967191fe68aac87b7f66f9185846f79de15728608d09f8e SHA512 ebd7ed7fc25682c4a2c5dd6f4736b1e8c0dde48bc47ab09240b8413892d65a5309d75821a221c0bbc831054a2caa5b78e97e62f41b75096be3d822ebf6da2fef WHIRLPOOL 842ae3b99b1d3d2ee81aa0c7746fa5e64cb59f3aba8a4fa9f81214d49fb8c0152e281127f81692c682f0ad52741ab73e657fa675c1962f597d4b57d12b1b128c
@@ -7,6 +10,7 @@ AUX nmap-5.21-openssl-1.patch 920 SHA256 1e0167303acdeb01a90d61afd2cc8ca521d8e95
 AUX nmap-5.21-python.patch 1219 SHA256 2d133db8f31d048de810fa3a3b8234f856bdfa9b830c6346d71cdc2357a16b74 SHA512 d670b382d183a55d0a744d4055aafffdaf64b071ae169e94e7d627ca8b74df38d02ef7858b0976b7079828c14705d0f1998a9640445f3cd4f5f4d4c5b2ce0bf3 WHIRLPOOL 1d84ccf26fb0affff5a05f6fd00ea5aff1bbb3a9d3320e7a90a9feeba68aa7fa38e8be527eea93824616003a61321f21fa8fb5ce662e4b43ef8581679f40bd3a
 AUX nmap-5.51-su-to-zenmap-fix.patch 785 SHA256 f57d70bd98b0b395661dc2b85df15ae79b71fe339133967f7af4eee98feee8da SHA512 44482306e7346fa7896a4c900d06431ebadf0e32ca5b9abd3e3f32e06f20e11809c0bdaa62fa3807431b4dfab7c6ddf422dc05a5a96e9e3f9217f2c64285bce4 WHIRLPOOL 516bf0d76e8633605c106ff6982f089df1e4c9d696e11bb589000fed8355b5a504694c286a03bd9845508aa833c11d3fa1ae61c961e72b87a0329d6aabd37126
 AUX nmap-6.01-make.patch 571 SHA256 d315795797c60712b00dbdc0e1fe5df6851575e0dbc11abb772a51c739ab60cb SHA512 47752ac65a07aef68eb075b72a0e9062612a2df08135d3f4284805f8fdc394a1fa3b937c1df018f7cce58f4c96db57af17e720250b6f67ce80f8cbb35eb82deb WHIRLPOOL b9ec86290bb1a681ee16aeaeb336ca7def8689d0ae311bc223591eefbade0db6b5f58ebf86d52406b24d8c656f51e06d049a4c3893a730aafe5448a7f5765e42
+AUX nmap-6.25-lua.patch 1607 SHA256 eeb125bdc22dc6cf7402ead711236701440b2276af0ecd7f99711bb68424214c SHA512 837e8f95ea1dfa1176abd576894e71123e867181378812f783faf408b27746e20d69b60f049ef7d37e07a2764d696ea1b169c29867e62d34378d11ce9b9e25e1 WHIRLPOOL fc821d90705c03fdbc56a3618ee96e69ef9662f81dc013eeaa1ebd8d03a1f1936a957de5d62c3402cfebc0ed34fb5c84229e7c6048d6438ecab0481d7d465d17
 AUX nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 AUX su-to-zenmap.sh.diff 407 SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36 SHA512 bbab3e83d7c8365915ec948bb18b897afabbe574ed5c42ffecc528392cde5af7bc1f0a63b0b56af3616c6631e6402eda3526785221d43a02df22bfe15e63c73a WHIRLPOOL 2148ac5dd7e63ed218d2ab2d93d53da8ee605861029e83b66860ac18a39d1b5f5c1365d16c7d5533b1a6a5839e0d74bde07ba2d907bff413314714383d0ee92f
 DIST nmap-5.51.6.tar.bz2 16876602 SHA256 09d1ef2609a1dfa48d55bc29db07ffca265519e5b78daf7617fe350d10d5082b SHA512 4e20c22b0e9a72eab1cc0897b310a48977b9d16974f8ac23495e5624b6671d5c894bc2ee7846a71b198955588357d991d94df657e1cf66bd0bd0a7014b307457 WHIRLPOOL b5162ced36b47846e48e53a043a9dd913c76a5752dd89d28f27e5b597dde57861fac3c5f40b705df438d24bb841dca15286f72c9963588497e78597da1ec0c32
@@ -19,6 +23,13 @@ EBUILD nmap-5.51.6.ebuild 2511 SHA256 850b135e0e52d513380f4b5bad99fe2a1c1dc69ff4
 EBUILD nmap-5.51.ebuild 2312 SHA256 8ed9723767076f6e5cc5a8290fdcb3d4ffe68361ddbf9b3c60dd94b4d2df204b SHA512 286c6f5367e34107d5273a8aa0bbad62666a43e97ff3a76a8227b539df8fe0ed9f6ac8de2b8422ce9f2291ec31c242bb0d7927dde462070464be02a7eedc794f WHIRLPOOL 2eedff89970dbe4ff9da4b8ec04be84b4a2961e246ac87bba22669977f3226755d5cd77a0961219a11ffd1bbba94819295c3a6d9b012458cc44b09f9831a794f
 EBUILD nmap-6.00.ebuild 1926 SHA256 67de5181a2d6f2176c0072c5ff8c35b2848555d69ee81438c1fd730978269b43 SHA512 751ad3017869c1425e7d5e85ac2ceaff81ff62fd88f5b0ca1c907b839181ffed640645e4418e6c5a5cac0ae811961a73de2989c04f2e0eb7e6a386190f6c471c WHIRLPOOL 64712da501a31edfa826aba60afc1b6336153b1ff3756c053e837f48d2ec7b4536f29d49ef12fa0668dea94f7d5e9097fdbc023375200f7082f2b163cb81bd20
 EBUILD nmap-6.01.ebuild 2681 SHA256 d8203f37181fcc4263ff760cde04e13a6ea3322b97b2df6007289a725acfdac2 SHA512 37db89c205dcf2a16fdf9b0b7f74d70cec96193a6b592426e75d575c9ae9fe5e715eb832e514aab6471da2e8e897d1daaf82efd12f09476eb32ec4c72edb6d25 WHIRLPOOL 531f322dc83f93f8a74e1b108af4a6907034713a374106bed775e147619c9bdd12238aea6398f3520f9dbd39ab9d449f4c51bb6b085c840702e0f8ef7232b6d6
-EBUILD nmap-6.25.ebuild 2631 SHA256 e65023aa085782925daeb42d78e362698d98995df894b1d9d4bccd7f90ccef9b SHA512 7fb049727d5b785625ee5332afad5c14b1e7e6cfcad047c7112dc36f3c4ab3064ae9864ff901bbcb11ea1f4bb971e758f4f8f545400b6bfd6dad53861c099a81 WHIRLPOOL 6a6612eea64808b0b821d5348c37b0916ff721154116d91f6cac17756dc1e1cafc117daa1a83d737804fe58568e9d55c30bd8a32db487e2c9e10226bd9e1be2f
-MISC ChangeLog 32303 SHA256 12b6993a78c4e7ed4d3e482a72397598c681b2bf371da346a0fd5a04a9ae18ac SHA512 9da5686ba9d85caf7aa6091339e311ce73680a547e06fbfc64b9759858ff1607316a5411450fc3ee24dbcb7e52631953706bf9a7e943f62fe3d18b1074953b0d WHIRLPOOL 8d2a5ae9dd536d80773e82e77d68a5c615326c3531caa819da46ad406a248e69667a6d9d7c06cece0511805ab4d9815cb7b5cf313e669c08a0f9a6901ff0b4dc
+EBUILD nmap-6.25.ebuild 2658 SHA256 7d91e3e152d0bb25096d7732564dd13370b58935872691fbaee83f708aac4c03 SHA512 864a5f88f041504ed8c9af7fbdf1db48ebe769cedfa2ddee468542ea84e11d35abb72385ec4bf51b98669fe9f8ceb8e45d705aff88f26b9399511c9cd26bab1b WHIRLPOOL 315f69a459c10169dcd8b18b930c835da035e4c9833b9dcc48489b33132e34bd00abb63357f221ddca71518d5dcbe15190c893846bfc21d521a315d0bce76ebb
+MISC ChangeLog 32462 SHA256 bad4e03049a9f29903151ac8aedd2d9893ece29f362ea747f98eec03f9d9c3cb SHA512 96f6acce8beca52f53928b9799eeb2cd6f2ae29d873e88bd7a776c62ffeaac7770f5b4c9322253ae25a1c229891209f883b730440257f26a597e69e0d260505b WHIRLPOOL 2cde2aba05f73e788add99e89d8ca97babbb3d3f14d90546b2e4db20d4968c2f77b6876ad773310b7dac3de2ff030fa31820d8e4113419c8a1772ac2c9d3ec03
 MISC metadata.xml 527 SHA256 f6291faba996b899beb0f35b3d5feb0a0a5a7e71e684b10f8386f0707e73d982 SHA512 7a0f0afdf604a997d8722f8b62b4829b980344b86a80faf346848abaab337e3b687f83ec1f1e1bca861619238466b1ce775deca538786721cdcba41d2166a77f WHIRLPOOL abc3f8636b57e7260916d96866b2c360e336077f0dc613339002ca86c4b78e59590c6b23beccdc47f9f5e282ad23ec330e5f6ec46a1da72cf9c9bd2d6fbe5450
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlC7elUACgkQVWmRsqeSphMtLACcD0ztpZ4TGpzmbeR16gQ+GkTL
+l2AAn3xKVK3NldBaQ/j1QjuveqK+Yj8U
+=sjJf
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-6.25-lua.patch b/net-analyzer/nmap/files/nmap-6.25-lua.patch
new file mode 100644
index 000000000000..4f7786c37b68
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-6.25-lua.patch
@@ -0,0 +1,72 @@
+--- a/output.h
++++ b/output.h
+@@ -226,6 +226,10 @@
+ void printscriptresults(ScriptResults *scriptResults, stype scantype);
+ 
+ void printhostscriptresults(Target *currenths);
++
++/*This is a helper function to determine the ordering of the script results
++  based on their id */
++bool comparescriptids(ScriptResult first, ScriptResult second);
+ #endif
+ 
+ /* Print a table with traceroute hops. */
+@@ -253,8 +257,4 @@
+    were found. */
+ void printdatafilepaths();
+ 
+-/*This is a helper function to determine the ordering of the script results
+-  based on their id */
+-bool comparescriptids(ScriptResult first, ScriptResult second);
+-
+ #endif /* OUTPUT_H */
+--- a/output.cc
++++ b/output.cc
+@@ -2613,6 +2613,7 @@
+   }
+ }
+ 
++#ifndef NOLUA
+ /*This is a helper function to determine the ordering of the script results
+   based on their id */
+ bool comparescriptids(ScriptResult first, ScriptResult second){
+@@ -2625,5 +2626,6 @@
+     else
+         return false;
+ }
++#endif
+ 
+ 
+--- a/portlist.cc
++++ b/portlist.cc
+@@ -144,6 +144,7 @@
+   }
+ }
+ 
++#ifndef NOLUA
+ void Port::freeScriptResults(void)
+ {
+     while (!scriptResults.empty()) {
+@@ -151,6 +152,7 @@
+         scriptResults.pop_front();
+     }
+ }
++#endif
+ 
+ /* Fills in namebuf (as long as there is space in buflen) with the
+    Name nmap normal output will use to describe the port.  This takes
+--- a/Target.cc
++++ b/Target.cc
+@@ -162,10 +162,12 @@
+ 
+ Target::~Target() {
+   FreeInternal();
++#ifndef NOLUA
+   while (!scriptResults.empty()) {
+     scriptResults.front().clear();
+     scriptResults.pop_front();
+   }
++#endif
+ }
+ 
+ void Target::FreeInternal() {
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
index 69ecc4bb6d34..78dbeba83384 100644
--- a/net-analyzer/nmap/nmap-6.25.ebuild
+++ b/net-analyzer/nmap/nmap-6.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1 2012/12/01 18:06:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.2 2012/12/02 15:57:07 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -56,11 +56,13 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.75-include.patch
-	epatch "${FILESDIR}"/${PN}-4.75-nolua.patch
-	epatch "${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	epatch "${FILESDIR}"/${PN}-5.21-python.patch
-	epatch "${FILESDIR}"/${PN}-6.01-make.patch
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-include.patch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.01-make.patch \
+		"${FILESDIR}"/${PN}-6.25-lua.patch
 	sed -i \
 		-e 's/-m 755 -s ncat/-m 755 ncat/' \
 		ncat/Makefile.in || die