gentoo resync : 18.11.2017

3 files changed, 21 insertions, 6 deletions

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 59b1dda63cee..f0cfab76860f 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -7,6 +7,7 @@ AUX nmap-7.25-CXXFLAGS.patch 302 SHA256 33132cef48902d5bc241eb61f918b966e7b8171b
 AUX nmap-7.25-libpcre.patch 291 SHA256 78ea0907c6a7f1e93b80539baa211e53e86fc8b36396aae4353f5086e5ed8efe SHA512 75963ed6eb156475a8e928f6fd6ad18cdc61ed658a3e0a82a7719bbc4998b186981fa93c2b39b8bc92e10cc0ad19f5097224a9a68bc4b35e1b771d4a27532b1d WHIRLPOOL 6145155ee667764da67ef46e760ac0135cb0e1c19900c70bdb5d08dcff2f30c6c294543b3cb7cf6860ac6a4999ff708e4c1332d0924c07bf031c5f945932c542
 AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 SHA256 33c0c0591791ecee3ef0e7a1b69f01fac6ffe5999bd62b67435735640d981210 SHA512 29b19e8cedc5e9edf66e728d89b71c4c0ada29fdbb9c167bec84b5aad2c9d52fe111a902c32b247106ace0154734f2a3b4eeae119887dc7203ad2271c8c240a3 WHIRLPOOL 664aee863b7b20ef27b0e8c43e2985b03bd0c2a1460683c2bda9bdbc028917533927b38a721990379a810351012070a2676e27983050d85c992a5115e768e7ef
 AUX nmap-7.31-libnl.patch 498 SHA256 5c5e740eb64b0a06d1bef9754f73b72fa3ddea38c3aabee35f5d7763cfe4a05f SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8 WHIRLPOOL 92f6d423d1fc2ee3ce99031c0179b93c61251f1c69561b9640398f647ec2fbaf7106c8b0c63485384cfe951ad9e5839406c037ffb423cf01f288bc9ef291e296
+AUX nmap-9999-zlib.patch 226 SHA256 f841d70a1ceae13bd5a66c68b6f417cc78ea3ac627e74f02bca7e18e49b9746e SHA512 ea36e9e16660b960bad457ec29c1654f1b940088e56011deb58b6e4d9f1ac81e7b0434f6847e0c5a857527132b3fbefe2fdd68ff4cd3d0da100a4d23f56b9345 WHIRLPOOL 93d5fd8cd4264dccef8e46c115cecdd3f554ac7424fc181d7250f94b8f3163647de40c4898ac101d843103ac576b8e89ba28a36ea11196aeaf9ff39d4007b810
 DIST nmap-7.40.tar.bz2 9043221 SHA256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d WHIRLPOOL 735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
 DIST nmap-7.50.tar.bz2 9309616 SHA256 e9a96a8e02bfc9e80c617932acc61112c23089521ee7d6b1502ecf8e3b1674b2 SHA512 b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2 WHIRLPOOL 9fd0a9fb8de6e4e169cf7a9ce8b06b3e245f66aa3643cb6be4b1933d824091d4211d3207893f5bff5621c7746434db92a5745c3500e3ce8de1bb0c6e2820d365
 DIST nmap-7.60.tar.bz2 10394925 SHA256 a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21 SHA512 74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4 WHIRLPOOL ca5a10ca5a685c53fa37a72857c009333287c6559409fb1dfcc5edc5e48034b3d280f76e555e159156b5befc0167b9198673e07ccd2e6a0a80c2d3dc2395fff0
@@ -14,7 +15,7 @@ DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b
 EBUILD nmap-7.40.ebuild 4352 SHA256 ca57620e3f11cc066f64d9ab9368b691a12535dd5ce11e2666ec68144f02e93d SHA512 e7f602c98215e2583a88360493e24c4ade72994154bd24b524426edb64aa5a3c688aa5e841fb1bfedf73566f8e494108636c2d7f29201e7fe179a7aa13117f90 WHIRLPOOL fcea595f8eadf6f3da399af6f7a2fcf5023e62e9f93247f3f912f85b0931187a8d81f8d5532f278839b2b5665e7958178b669fa94b96461f86fead12d2591a13
 EBUILD nmap-7.50.ebuild 4353 SHA256 d4575223ddf8a3a7b315c3b3bd312d3bf5b08f05e31738f0d62eeb28068590c3 SHA512 f061ce79bc7c48fc30be3105c70e24621fcf0d0cfbfbe8416e67d10b497998117e4a782e073e14a52490d668916a180e2dab266ccdc2524733caff03d4aff482 WHIRLPOOL f2cdcf5218631273b69767d176f83b175d28a8ffb43607e140a6f5da29bffb75d77ca4ed76e3710dcd3a7af8aa3675514d95cae1650d5a3054bacc0ba6532057
 EBUILD nmap-7.60.ebuild 4567 SHA256 94d8a52179d43e8d93b3f139ba3efafd87b8f150f165baf4d7ff72279cc71afb SHA512 8648fbb304949199b84d4e74faf281dd2893fcd3eca75ed07d3424ef4c97b00f8bfac795d08bd3fa72620122f71eb8c4054366c029ba82b4f76bc2d1d44f50b1 WHIRLPOOL c190449eea7a1d5a3d75645d38df6e05845210a79bfaf322df90370569a10d7306d117692a89b8fb96b769fbbd1e4bc1b4a6383a34f37fb836892ac6e2eebbc5
-EBUILD nmap-9999.ebuild 4242 SHA256 802b6b00877bbc3bbd685c41b86eae12aeaedc1e2b52054ab1683c8a34794c33 SHA512 d8418a66dfff647f9a560981f63918370839a5e624c6435ebc73e4867117a0414c9b45978e14ba9bebb2539bd9f356339c328de4a2a75e03e0a88c6674bf2a8d WHIRLPOOL dc0b890eb00b1887dd72fe2c5efc47297457e728f2807974d82c5f71d965584a70f82fb9643525a97af027f6723352fd042a23b99a59c0da1c2bd967eaf9a73a
+EBUILD nmap-9999.ebuild 4382 SHA256 a793be94c089a9d88a9c5dbed97d890f6f8e5b66596c803e3b3ae90db3b9d7d3 SHA512 cf7694cb46891ce0e8fcd231085eb2adbced0e2ad9ad88e4fee5df72b4c34c81ff07fe55a0ef9fe661d98a1c4062e66f2963b33e23eb3728c2a8943da240d45b WHIRLPOOL 00ff01c970c4a0ff8f7f0cc84e79c3b7cce252a19a6052a82a82b07480e72e29f8ba00973300b27a5455dc7fab4896596be399e384656d14e74877ff0335d55f
 MISC ChangeLog 10254 SHA256 3365bab3624dfa11a549abeb9f5e39b56c5852688426950f8a1249699584c92c SHA512 e7eeb7818966a07001d0bef7585e0e23f6e206ea3546d731b26bd9ccbde3d16bc8718c6e2671f0e8569378225f86d48881655fba63cda15cf99ecc08d1bdb9eb WHIRLPOOL 49caea6a3ee438e0891c3a9144ab21b7b08343e806953924437a8160febfc8fe429634c616e4175d6bcb985356efe902c1a815f8de75ebfb12a0b44ad1117a60
 MISC ChangeLog-2015 43855 SHA256 2d0433ddb0eecf16df05f1cc0e283681a88020690caaf3fd4d6bd03d9e39fcc4 SHA512 16cfb6bc28cccd58800f7b66fb3465378abb4df2459595180a7956deef8e7e6761c80dd98f38c73883cffac72edd8ee7684f031c73e28cf13c2e6b039d2431a4 WHIRLPOOL 10ba3498a09130fa31e1a230254ec7c20fd6b3ff88a2840120a7e784a641037b5b430649b809f02dd4172b0f01848ed70d4203c4c4f0984dfa90d88742a0849f
 MISC metadata.xml 920 SHA256 a367e189b1a012a1b489b55664114d2d2c3fcef020f5c87a71be239adef02046 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185 WHIRLPOOL a391aceab50e0f218616dcf891f701efdf4884ae7ff29c6a6a0deefbf0264847db7694bd7641d3ec238ac59be205d664aa16c491330a3ce04752528ca5bd5979
diff --git a/net-analyzer/nmap/files/nmap-9999-zlib.patch b/net-analyzer/nmap/files/nmap-9999-zlib.patch
new file mode 100644
index 000000000000..3f260ae48f41
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-zlib.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -105,7 +105,7 @@
+ NSE_HDRS+=nse_libssh2.h
+ NSE_OBJS+=nse_libssh2.o
+ endif
+-ifneq (@LIBZLIB_LIBS@,)
++ifneq (@ZLIB_LIBS@,)
+ NSE_SRC+=nse_zlib.cc
+ NSE_HDRS+=nse_zlib.h
+ NSE_OBJS+=nse_zlib.o
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index d78311ad1c1b..f92eba2649f1 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
 inherit autotools flag-o-matic git-r3 python-single-r1 toolchain-funcs user
@@ -24,24 +23,26 @@ IUSE="
 "
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
 REQUIRED_USE="
 	system-lua? ( nse )
 	ndiff? ( ${PYTHON_REQUIRED_USE} )
 	zenmap? ( ${PYTHON_REQUIRED_USE} )
 "
-
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
 	net-libs/libpcap
-	libssh2? ( net-libs/libssh2[zlib] )
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? (
 		dev-libs/apr
 		dev-vcs/subversion
 	)
+	nse? ( sys-libs/zlib )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
@@ -65,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-9999-zlib.patch
 )
 S="${WORKDIR}/${MY_P}"
 
@@ -75,7 +77,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	rm -r libpcap/ || die
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
 	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
 
@@ -135,6 +137,7 @@ src_configure() {
 		$(use_with ssl openssl) \
 		$(use_with zenmap) \
 		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-zlib) \
 		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \