Fix a parallel make issue where ncat is being built when liblua has not yet been built.

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

5 files changed, 30 insertions, 11 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 90a7c6b39adf..9607f6b624ff 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.343 2015/05/14 08:45:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.344 2015/05/14 09:43:06 jer Exp $
+
+  14 May 2015; Jeroen Roovers <jer@gentoo.org> nmap-6.47-r3.ebuild,
+  nmap-9999.ebuild, +files/nmap-6.47-ncat-lua.patch:
+  Fix a parallel make issue where ncat is being built when liblua has not yet
+  been built.
 
   14 May 2015; Jeroen Roovers <jer@gentoo.org> nmap-6.47-r3.ebuild,
   nmap-9999.ebuild:
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 8188cefa22e2..402ec6adcd76 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -7,6 +7,7 @@ AUX nmap-5.21-python.patch 1219 SHA256 2d133db8f31d048de810fa3a3b8234f856bdfa9b8
 AUX nmap-6.01-make.patch 571 SHA256 d315795797c60712b00dbdc0e1fe5df6851575e0dbc11abb772a51c739ab60cb SHA512 47752ac65a07aef68eb075b72a0e9062612a2df08135d3f4284805f8fdc394a1fa3b937c1df018f7cce58f4c96db57af17e720250b6f67ce80f8cbb35eb82deb WHIRLPOOL b9ec86290bb1a681ee16aeaeb336ca7def8689d0ae311bc223591eefbade0db6b5f58ebf86d52406b24d8c656f51e06d049a4c3893a730aafe5448a7f5765e42
 AUX nmap-6.25-liblua-ar.patch 328 SHA256 3bce55abe4cf17d7c7bb56731151c4d4f1c5aef04e8294bf79a9712fa015fce2 SHA512 6bb15078e79ef281b026e25199fc76bcd1b7242da0d6513ac9b078f130e521e6db506c1c36d33ef72a2198c3054111d95d6ac0654f7d6bb7549d6308ce864291 WHIRLPOOL d6f29209ee4a92e2f5b564d5aeaa8814355df2a9142665ba1ce980693c830214a1d89dc66c3f0573237273d0fc502c7ff8b39be53f6afcca29dd94fe6f081b7b
 AUX nmap-6.46-uninstaller.patch 619 SHA256 e5f649e95a7a87a9c2a5ab89657a56468036726146441cee34bad6184aeb8349 SHA512 da89808d23ed14b0f748a57d3238667adf65eb5278bcbe5a599d06fd4bc5ad2c3492d824639f97d50be9a973fd53bb395fccd855a712bd11d3e963dc4bb11833 WHIRLPOOL 223f448f3edd34945b5a4f79c9740159df40d65bdda1cadada241a0b00ae8893ea84874ad4c000629d305c221ad687b521fd9fb2d1d6786b8489d94746d9eb08
+AUX nmap-6.47-ncat-lua.patch 366 SHA256 9706268519d8cecb6841372ecd06ce502a97bf9b845621e36c422c06d1561f6d SHA512 1dbd37766bb81fa0fb956ce779c3b53f7bd8b606be93f8041905df5f50f3bfb1cde791627513ca0e8f9fc897503e6704ae3e168fa30b20f884a9164bd3c1f039 WHIRLPOOL 67b37530493e2848c25fa9b5ffeac1a5456f40ce07770152990de73275db0d8939f3e6ee1a1c6e8710b2742b4e005cd8fa8c43a8b675c3e1ba4e90e46b7b052c
 AUX nmap-6.47-no-FORTIFY_SOURCE.patch 2388 SHA256 a639ee69b7aa01f36ffe5ad251bf3fc21b990b825459fb4932d83ebf7728c3d8 SHA512 a18ffd2c46393e069a8d892cde3fce542aebb4663c4d902a7443f206c0393dd7c3f33a5753ba3eeacb989cd95a4adb9ba4217e8efec313a7bb9f43a34678aff8 WHIRLPOOL a9479b56f37753758030146e99b09bb05e18ea1c2c9adeb72ca6052e44a2e03815135f74d258b12d3a9115864434127d68cd727ee7e50ddce77cd87f4dc5a71a
 AUX nmap-6.47-no-libnl.patch 1903 SHA256 5f9fa774374ee1c410123b0349d501d0aa265feffd3aeebd6f51aa6276d334fc SHA512 5e101915a4259502c88a2e8588e9d7b77464ce5129f78c5458265e0ce0dd13adc514f4df853ade6c8502c906c96a47954e1a432e1177a5d8acbbb444574e4083 WHIRLPOOL c74013ec6878c57fd726f6a8668d92abdc502521e27140ab37fa22fd3debd17138149c246798ac600fb01ebd4d4a3fd3834f2c806f15e4318c933c81a85bc8ba
 AUX nmap-no-FORTIFY_SOURCE.patch 2395 SHA256 d79c3e7d55240531414e735f15e0b9eb017abb08b320abcb97d5644ea5fdb80c SHA512 3b9ad5df3091652fc600b4bf9dcf989c47f0d756f61d158228112544ace95c5448103414ab8f485d8b7dfecd03a1be9ed0695f9e0eda7e034830063fe8ea37e5 WHIRLPOOL d7ebe8638457ace6446df3669fe147721d7eed92670e9ecd4088d9e76e109aee325f49e94f8c9b235daade85a80657a5701afa979b718d5133b41c10074bdcdd
@@ -14,14 +15,14 @@ DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 EBUILD nmap-6.47-r1.ebuild 3809 SHA256 a9a78190eebae3828e9cc31ceb4b0196faffa0d0cbc7e04efc15bc72543f057c SHA512 8778111789f3f9e4b40006537b53e95fd7079f71322c2b316f63dddcbec817cf98f8b9f898424670727851c65ee1391c9bb10ae6b457d45e7b335c4ba22cdbb4 WHIRLPOOL c4d7ad5511c57a964961f4f1593ccf27700e2a0dca52c75dd6284a16cf9f08efdff1cc0335fd1676f3f69c37369dba6e4bda762782131ac0f25286b1141ca278
 EBUILD nmap-6.47-r2.ebuild 3819 SHA256 f2b33a52f7c779d5023a0a75861b28614c49dd8af80a1b2cf2ab99dc2c1728f5 SHA512 3f0c3ce15c246365ddb277273fc0d6ad13222381eb60211ebc47e7d451dc521c91134ed3b55788310f952029534ffa2ef3258746c5cad4a9b012b621c86a95f5 WHIRLPOOL 7f04a76c6852e649b84cecf5825ffd3b2df2c7ff78974475af235a325b3fa9d10d6c42d73c13f0d4a30aa15af3b9b3f8f4baba7b35a8ccb03c222452e97fcfad
-EBUILD nmap-6.47-r3.ebuild 3819 SHA256 d24b5b3f2de38661b268a0ba5512eab4d0abd36433feef01503d800f6791a897 SHA512 0ec43423525a8e586f69cfe6343b1d73542e7a9cdaea53b1d74bbef9a4d8905d9eebc4acb74d945e003bdf995c3597590150bde46a00cf2270446f46acaff2b6 WHIRLPOOL 2925179343c0476f18f3592eff59f18e02f1b7dfc79f56a798314a98d0fe32f511782a264af91c16ab49854e81b780112e09ddd3a662881df9d8c9af601d41eb
-EBUILD nmap-9999.ebuild 3967 SHA256 101dad37a683fcffaa2333ec74cac677b64aef8e59be147b585f3312227349b8 SHA512 7537ae5d42d1a5eab82b3ef5cc7113e8b2cafdf89bcfbba11dcd9ace804b85a909795a18b7a4a48c84f4b8f64210be5ff8546fb20359f1fc3e6d3d93f7950a2c WHIRLPOOL 60afa3a211ed2abc88feac561b1115b26bff074436005ca53f5e02e3a5149e1c0d2494f3194d30a47c3bec7751bb660a25ce70631bde52ca7634d69e34861179
-MISC ChangeLog 43143 SHA256 8c693f48ff6b5c36f06fe6668ec763ac944da73a9fabfb1dbd50e293f489076c SHA512 827e68acff088e058df7e39a2c1e52a81f4710e5efdcb24650013979c464c43cd86ba96d6f23db14bc0addef0f65dfbf37084858b609c5a0935a1f8003978c65 WHIRLPOOL cc94f61eee1e965c95898b7ebe677181eb48eb87404e66ae53e6f9d60db1d4658537638fd0411d7ecff5c164ed0c5c15937079b692d36449d288f83d864905ee
+EBUILD nmap-6.47-r3.ebuild 3863 SHA256 21c4da76ad475c960bf6562368a7c8a7b0433c260d64dffedc6095cb9073ac71 SHA512 a46419b019625530cca3c3a44c5bb16c48631815381ee305c0b44c1129a322beb5444925067aa6349e17f1930d38a78c515d31b4afe943adf871d2bd6e7df14b WHIRLPOOL 5cd61fd28bd038d419296a16126581816cde4da13b7a41e37af9bd6e27ee8018a44a8146ee9a1371b9f779fa2a3f6d6b31d89529be1fbfda733f824ebe760ee1
+EBUILD nmap-9999.ebuild 4011 SHA256 b680d668cd1fcfd342dfaf1eb5146d41e23e8087a030fe8cd76219493258c40c SHA512 e3ca26ede48ec189de983467a83440c7faa084f73fc502198e9d70e1ddb7dc56f8a841c7e86d43a3446859ac64ace903b364db7773cd225c00c948ac2cecd2db WHIRLPOOL 90ce1feb80faa0a2f5808bb084d0557aac4659c678ae5f45fbf9ffadcaea6135bd9cb4638a4fc35cd5aac672c746458ff241329b2e214725cdb17513e21c2490
+MISC ChangeLog 43357 SHA256 9709bbeadd12a4b577574dd6e9b81f46b3538b2d050f838041cdfd4f24e0f584 SHA512 f1481e04225721946974a7e01c1325547e0f06d522f6b94bf0205d91863bc5c99c711db183194803e6979fa30bf681b3613665c58b2d2a1d85da1173abf7b1b0 WHIRLPOOL 283323879fa7656a5c60940ce0f763b962ab3a6ffc0959213cdc1cb5fcfaabcd2314b34ed848927698f99dae2698e140d6d80dc6e4594a36e8c16f6e755a9625
 MISC metadata.xml 774 SHA256 761bbc48753242190632a8a9b0cb8cee34f3969d00f29f36a4a02154d63bfcec SHA512 6c4f041b3a22abd05e75280b762dbdb04ad47505495443fbd4594e176bd68c375e727f9326c761964cc2a41da3a7d54c1213893b529892d972ef83bbe962fa0f WHIRLPOOL f730883a5efb88e96fd7839d434a60ce6f4f5fb7ef2a6376bb65324d004682c1f4ea145eaa156efa36bcf402a2780a30372157a349966eafa82039509798535e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVUYJAACgkQVWmRsqeSphNyjACbBTmorSC7L0X0iOJTjc89tq08
-TOQAn2CAEd8qWwl5Nc2GygrtmIN4dOAF
-=X+i5
+iEYEAREIAAYFAlVUbiwACgkQVWmRsqeSphOuFgCeIl03nehWyKC+1EHfnoauncvA
+ApYAn1rWTFJbJl+V5hx0AKhAcfs0QTJo
+=Y5ca
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-6.47-ncat-lua.patch b/net-analyzer/nmap/files/nmap-6.47-ncat-lua.patch
new file mode 100644
index 000000000000..27df06b9b710
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-6.47-ncat-lua.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -145,7 +145,7 @@
+ 	@echo Compiling libnetutil;
+ 	cd libnetutil && $(MAKE)
+ 
+-ncat_build: $(NCATDIR)/Makefile nbase_build nsock_build $(NCATDIR)/ncat.h @PCAP_BUILD@
++ncat_build: $(NCATDIR)/Makefile nbase_build nsock_build @LUA_BUILD@ $(NCATDIR)/ncat.h @PCAP_BUILD@
+ 	cd $(NCATDIR) && $(MAKE)
+ 
+ lua_build: $(LIBLUADIR)/Makefile
diff --git a/net-analyzer/nmap/nmap-6.47-r3.ebuild b/net-analyzer/nmap/nmap-6.47-r3.ebuild
index 29150b695cbc..05707fd36718 100644
--- a/net-analyzer/nmap/nmap-6.47-r3.ebuild
+++ b/net-analyzer/nmap/nmap-6.47-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r3.ebuild,v 1.3 2015/05/14 08:45:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r3.ebuild,v 1.4 2015/05/14 09:43:06 jer Exp $
 
 EAPI=5
 
@@ -72,7 +72,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
 		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
 		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch
+		"${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-6.47-ncat-lua.patch
 
 	if use nls; then
 		local lingua=''
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index b13f129112a4..3c0fae22c0bc 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.11 2015/05/14 08:45:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.12 2015/05/14 09:43:06 jer Exp $
 
 EAPI=5
 
@@ -76,7 +76,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
 		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
 		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch
+		"${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-6.47-ncat-lua.patch
 
 	if use nls; then
 		local lingua=''