Add dev-libs/liblinear dependency (bug #253269).

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

5 files changed, 14 insertions, 33 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 6b3f767c50fe..2308acb52ada 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.307 2014/04/28 14:34:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.308 2014/06/06 00:19:48 jer Exp $
+
+  06 Jun 2014; Jeroen Roovers <jer@gentoo.org> nmap-6.46.ebuild,
+  -files/nmap-4.75-include.patch, -files/su-to-zenmap.sh.diff:
+  Add dev-libs/liblinear dependency (bug #253269).
 
 *nmap-6.46 (28 Apr 2014)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 8da35be9a1f1..d1c2fe6d7bf8 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,7 +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.10_beta1-string.patch 252 SHA256 6012685deb53985c73fa038d27b2f1472344fd6641c40103143fa15676454506 SHA512 d1c6a446400fa86700c5ce690c3498894a9796b17bb70a29b933797eb2abb38285ebc21a236d8f1f4fa837c45a1abc49555aee13266a31089b219f9b4ef07be2 WHIRLPOOL 3e7ba87ef26d7462b82e3986c37f7a2f1074dc2db7ba6a357ade3869089657a5200afacac6490a60ff43700b6e7812c1c95ac18efac381037590d851513dbf9e
 AUX nmap-5.21-python.patch 1219 SHA256 2d133db8f31d048de810fa3a3b8234f856bdfa9b830c6346d71cdc2357a16b74 SHA512 d670b382d183a55d0a744d4055aafffdaf64b071ae169e94e7d627ca8b74df38d02ef7858b0976b7079828c14705d0f1998a9640445f3cd4f5f4d4c5b2ce0bf3 WHIRLPOOL 1d84ccf26fb0affff5a05f6fd00ea5aff1bbb3a9d3320e7a90a9feeba68aa7fa38e8be527eea93824616003a61321f21fa8fb5ce662e4b43ef8581679f40bd3a
@@ -11,7 +10,6 @@ AUX nmap-6.25-liblua-ar.patch 328 SHA256 3bce55abe4cf17d7c7bb56731151c4d4f1c5aef
 AUX nmap-6.25-lua.patch 1607 SHA256 eeb125bdc22dc6cf7402ead711236701440b2276af0ecd7f99711bb68424214c SHA512 837e8f95ea1dfa1176abd576894e71123e867181378812f783faf408b27746e20d69b60f049ef7d37e07a2764d696ea1b169c29867e62d34378d11ce9b9e25e1 WHIRLPOOL fc821d90705c03fdbc56a3618ee96e69ef9662f81dc013eeaa1ebd8d03a1f1936a957de5d62c3402cfebc0ed34fb5c84229e7c6048d6438ecab0481d7d465d17
 AUX nmap-6.40-uninstaller.patch 629 SHA256 5a440d5b04441a18dfe2f577e73d8f063a4e6289874c361cee53c3c9d33d6bcf SHA512 291c98a9d51ef1cd43617645417f3a7a602f70be1d511f5f6ed1ecc7104a66524eb87290867a896c92012e9bc4eb51ae43ae2d83542d7df5c688499ee62d132d WHIRLPOOL 5ffd985cdc3dcb91ee456ed1fbd4e8804fac4efa01728b2759f9d5df3c43992feeaafa791301acd4be4b89d9b1b6cc1bbeff49306d73f3a8948de9ea6275a4b2
 AUX nmap-6.46-uninstaller.patch 619 SHA256 e5f649e95a7a87a9c2a5ab89657a56468036726146441cee34bad6184aeb8349 SHA512 da89808d23ed14b0f748a57d3238667adf65eb5278bcbe5a599d06fd4bc5ad2c3492d824639f97d50be9a973fd53bb395fccd855a712bd11d3e963dc4bb11833 WHIRLPOOL 223f448f3edd34945b5a4f79c9740159df40d65bdda1cadada241a0b00ae8893ea84874ad4c000629d305c221ad687b521fd9fb2d1d6786b8489d94746d9eb08
-AUX su-to-zenmap.sh.diff 407 SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36 SHA512 bbab3e83d7c8365915ec948bb18b897afabbe574ed5c42ffecc528392cde5af7bc1f0a63b0b56af3616c6631e6402eda3526785221d43a02df22bfe15e63c73a WHIRLPOOL 2148ac5dd7e63ed218d2ab2d93d53da8ee605861029e83b66860ac18a39d1b5f5c1365d16c7d5533b1a6a5839e0d74bde07ba2d907bff413314714383d0ee92f
 DIST nmap-6.01.tar.bz2 21640157 SHA256 77f6635b677d28b546cbef97e4ead6c2d4a5aebcaa108fe3a3c135db6448617a SHA512 0b44542a0e33629d077c64129bac7e00b05b4e65a83b181b84fb5460a7da083bb29be00777a8d92c6f6b6fb0c009cebc330c02c7259166e8cea4109cdae50fc9 WHIRLPOOL 24b125997c8ae5b7a514a6bcc5780b9a8aec8516e19616b0890fd34c8b7b182d04142e012c981a0e125468a4ee49ea7b13416f79031ede346846e59b08919dfd
 DIST nmap-6.25.tar.bz2 7668639 SHA256 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5 SHA512 6ec4d8f50621c86a3d0b6a22cf179a1874bf109736c5a79d6b29faec6859e165f7c0e6c3f8c284de8f384a8a607f071e2176c900b22df3ba0f158d36b081870d WHIRLPOOL b6cd57988827549762020e73ff263f5014d6c748291225d8c9792705da39188436004400b05a07414b4cc4b9ea56c75ebf7c753bbe11a5456b008041e72ebbc4
 DIST nmap-6.40.tar.bz2 7871636 SHA256 491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401 SHA512 b0ccb7634838e814dc0e36a0dbfc8c74853ef9dc6a119b73ffc90caab8875cbae893e0d24371ea568f9fff969440ed2a2e89953a6dbb6eb26313a4ea25b02b3b WHIRLPOOL 18424b67a8ace959c129e00e4b0d8a8e893aa08cfabb1b47b4fe9fc4316c29f713a2f83b789db28b4158c18bf80aea0bee071751187c0eb7e1a4b6693c3f4f98
@@ -21,13 +19,13 @@ EBUILD nmap-6.01.ebuild 2702 SHA256 b514a45c86b72fb3ec7da0ea74ca92d65d6e2a9b1e4a
 EBUILD nmap-6.25.ebuild 3543 SHA256 b676a480b66ffbaa4ae9bb61cca143feff24332b92a2adba3d0c1d8198e0d0b0 SHA512 83b354956bae89dd8c09be59db2538becc6eaa6f114cefcb5099e6145e62d345a3e51e35f6c80964f7e7a807dfe5ae3b018fc5e5642df22767bc022c61005959 WHIRLPOOL 355040167f304809bae924ea65bfd35e870ee189b83333a8edb9640f61b4faa516dc64c6b952d579423da85d31d8070c187732e4a17e6fb2ae976513a622c156
 EBUILD nmap-6.40-r1.ebuild 3437 SHA256 1d74c91be06591c737403f14175aa7cd4f8db697c367680a19c4c3a003bccb06 SHA512 f1d5a6307a38cc970c176151ead12a162970f6472d56a8d1c6f50141263639f8bdcf93d76785bc76859a5b930c0c78ed35b99b0eefda052d8cf2c2150ded2fae WHIRLPOOL 6ba9b18135e4e5d627356aee0a7c5b6dda88d7da50b2ee67e4f5453906fc20ec026445a05544c9d50dd1d97861d4d98926982716da60f884006599f71e71cd75
 EBUILD nmap-6.40.ebuild 3577 SHA256 caaca6da05f8fa45744c618b70064e074fe843c703714c8f0b88f1b653c5060c SHA512 3fd4119f6fbb94fa3d4b1dce2d5475d0db5959aebe29b55cffa1159aa6d5e7a388ecf752353ba39e31a04f96e9b21444c7c162580a2fa0dfb15cdceb404795dd WHIRLPOOL d3c82963c948b75ebfa068fac8a8ed2277b4fd443d1c063f1dd34e18133e0c5539c94ab53a6d053d860ccf0e2171c1a49acd31d699a6d6de378d4a1547148d56
-EBUILD nmap-6.46.ebuild 3434 SHA256 e041ad9a65e08fa1b8bdd2c5655ded36fdd8fe754df664947833786aba3fcf3b SHA512 3b1d0a80e46e5024f1842b8e33547c3a4d4f6f47d57f17a74b48af19984079a7f9fea522bb993d2bee52dc9dc8d838246c03dd237ac8c8d8e246849fa8d36911 WHIRLPOOL 4b3a658951dad43a2d79c924deede40aff018e964531d51ea80a0eda46a437f087cd9abeae60373b8f5da31959fa5852f808620fadf5b4f71a328620a144732f
-MISC ChangeLog 38031 SHA256 c22c726477a7a9df31ccbfb1036d1e218c3fe402b7d77739726e07356c2b4101 SHA512 1da1a93e7165475d7ab4b8a52cf43bd314a4188d191cd57b1a36be409dd6e63d9d2f98035485788e343b6b1f6e09769b10f698ee4e59c0c49ffb0dc8efebdbcb WHIRLPOOL 76aac4c36c1d53cfabad6b832c0858464909223cc88f6b9c42dd3e14c81a73cc765136ec14fd1016e27574e15288f4f96632975fd3ed5583d083a6544dd32f73
+EBUILD nmap-6.46.ebuild 3557 SHA256 979d8b8430a739c96d9322f5c4e3399b49239d5c4c88f244d8b3771e3421d252 SHA512 931fb170f17789c36e26311b8ce3a2dd7405ae2fa5ffa824f555a95da5a4ac89fd445b90aa3609188597a732df08ef0b9ea65dacfac75195262d7ce6c481b6f3 WHIRLPOOL 5e485404a1b170e95295ebf240bf5f86b13165a52b68c4b03a4728df3be31900b7df49c237d130506461eb297557e8f0670d87ffaf19feaa17dafa5f5cde7720
+MISC ChangeLog 38211 SHA256 82029dec9a94c76099683c6ba7a346e8b1769cba7e5484612a1c0c48dc75d794 SHA512 9ce5d65494ebce9a4a9f506251fa43d3c83f7ee8d54430a4f5303b2a26c305fb33ba6f5bf64fc3b14eb6e86559d3cc2ce6f81b8ba582130d84019f0d942519d1 WHIRLPOOL 18868c05f3f9ada6181296ed2a8e5f76ee30adf2c2cab6dbe2be324d007bf5f571edb17bc1013cfe5a6ad22931b88090b69b612db37f9aed5c5d039031ebce4d
 MISC metadata.xml 639 SHA256 5bb4193809c829dc5c8f9101355e6f4626bf616df5f6a477e1651a53c25ca9ce SHA512 d20ddd6bdb400bf0cffde6e5530e457ff49631ffc9413a4262ac197441338b19d0a9168b8d73c79a01cfc6244e34bceb3139c8c6e45bebbfec0a192b88fc21f2 WHIRLPOOL 036edb4b7dc0f24d84d214917ab18026dc4cd5da85e3da803ed8510634cf8c5b46c06dadebbb900442d4fe2eb877ec491b337a7a26f33256847b91d4b513f2cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNeZvUACgkQVWmRsqeSphMY/wCfaHJrTuWDovx9AMPhwfi2Qfiz
-c9AAn22Bh6HD9FzrPevoQHNqLNN1Fk/Z
-=UEPu
+iEYEAREIAAYFAlORCSUACgkQVWmRsqeSphONYACdE2i/JJI1204n1kaCawO37lRI
+yAkAn3y66UloFq/IXH0zAUdi4l6nAYux
+=YHk0
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-4.75-include.patch b/net-analyzer/nmap/files/nmap-4.75-include.patch
deleted file mode 100644
index d8105ce78bb4..000000000000
--- a/net-analyzer/nmap/files/nmap-4.75-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naurp nmap-4.75-orig/nmap_dns.h nmap-4.75/nmap_dns.h
---- nmap-4.75-orig/nmap_dns.h	2008-09-09 08:51:59.000000000 +0200
-+++ nmap-4.75/nmap_dns.h	2008-09-09 08:52:19.000000000 +0200
-@@ -95,6 +95,9 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <list>
-+#include <string>
-+
- class Target;
- 
- void nmap_mass_rdns(Target ** targets, int num_targets);
diff --git a/net-analyzer/nmap/files/su-to-zenmap.sh.diff b/net-analyzer/nmap/files/su-to-zenmap.sh.diff
deleted file mode 100644
index 484f165d488c..000000000000
--- a/net-analyzer/nmap/files/su-to-zenmap.sh.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- nmap-4.76/zenmap/install_scripts/unix/su-to-zenmap.sh.orig
-+++ nmap-4.76/zenmap/install_scripts/unix/su-to-zenmap.sh
-@@ -45,7 +45,7 @@
-       ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
-   # As a last resort, open a new xterm use sudo/su
-       sdterm) xterm -e "sudo -u $PRIV $COMMAND";;
--      sterm) xterm -e "su -l $PRIV -C $COMMAND";;
-+      sterm) xterm -e "su -l $PRIV -c $COMMAND";;
-     esac;
- fi
- 
diff --git a/net-analyzer/nmap/nmap-6.46.ebuild b/net-analyzer/nmap/nmap-6.46.ebuild
index e9c804d9202a..89082ecd40af 100644
--- a/net-analyzer/nmap/nmap-6.46.ebuild
+++ b/net-analyzer/nmap/nmap-6.46.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild,v 1.1 2014/04/28 14:34:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.46.ebuild,v 1.2 2014/06/06 00:19:47 jer Exp $
 
 EAPI=5
 
@@ -29,6 +29,7 @@ NMAP_PYTHON_DEPEND="
 	|| ( ${PYTHON_DEPS} )
 "
 RDEPEND="
+	dev-libs/liblinear
 	dev-libs/libpcre
 	net-libs/libpcap[ipv6?]
 	zenmap? (
@@ -111,6 +112,8 @@ src_configure() {
 		$(use_with ssl openssl) \
 		--with-libdnet=included \
 		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
 }
 
 src_compile() {