Version bump.

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

4 files changed, 175 insertions, 17 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index d821323c3e0c..6b3f767c50fe 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nmap
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.306 2013/12/01 20:36:20 zerochaos Exp $
+# 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 $
+
+*nmap-6.46 (28 Apr 2014)
+
+  28 Apr 2014; Jeroen Roovers <jer@gentoo.org> +nmap-6.46.ebuild,
+  +files/nmap-6.46-uninstaller.patch:
+  Version bump.
 
   01 Dec 2013; Rick Farina <zerochaos@gentoo.org> nmap-6.25.ebuild,
   nmap-6.40-r1.ebuild, nmap-6.40.ebuild:
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 39cc3d51b455..8da35be9a1f1 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -10,31 +10,24 @@ AUX nmap-6.01-make.patch 571 SHA256 d315795797c60712b00dbdc0e1fe5df6851575e0dbc1
 AUX nmap-6.25-liblua-ar.patch 328 SHA256 3bce55abe4cf17d7c7bb56731151c4d4f1c5aef04e8294bf79a9712fa015fce2 SHA512 6bb15078e79ef281b026e25199fc76bcd1b7242da0d6513ac9b078f130e521e6db506c1c36d33ef72a2198c3054111d95d6ac0654f7d6bb7549d6308ce864291 WHIRLPOOL d6f29209ee4a92e2f5b564d5aeaa8814355df2a9142665ba1ce980693c830214a1d89dc66c3f0573237273d0fc502c7ff8b39be53f6afcca29dd94fe6f081b7b
 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
+DIST nmap-6.46.tar.bz2 7911353 SHA256 3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4883137 SHA512 eec55267009d1e539df06187ed1522b86e3fa36282159fc872ed5537d93d361201d2d944bcde6af86f22816c0038db7832b011d4ece204ea7c470b716a2dc4c7 WHIRLPOOL 172eb6da55cea1cb559ddd979458e4a7b8f179675b4d1261153f85eb010ba9e64aec61f6c5566a874319e06aa5e4df21881384dc699cac98be09e59b0dafe086
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 EBUILD nmap-6.01.ebuild 2702 SHA256 b514a45c86b72fb3ec7da0ea74ca92d65d6e2a9b1e4ac4e6003fd7f120fd58e4 SHA512 34ff2c6e56ea2b577944fd577498bae6a361e84183ff851ff02ac5d5612c60c813d9f6175542ae4feb4c0c9c3e9f50206832ef8d0db77ea3fb6124ba5b07adb2 WHIRLPOOL 04e3feceec75a4256eb0cae060c507e87fe490fa74c994a1d82925b4ae1afa68e2e41ede28360e9ada8fc4b55001b57412641f32a1c9b7e7bfdb0c26a77043b3
 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
-MISC ChangeLog 37890 SHA256 a807b61125346407ddb21a4af1090e7f873c4129411ad9daf632dec42328903c SHA512 9f7f5a91d43fee22722869a9a84ececed16c44aa4ee79227ea1a01fce06e3032226907f670ab50e7c5280af9e3a53b10838ba4a9841d1cd359ce98ae8abe566e WHIRLPOOL 39682d8f097150c1c44b79e873eabdfdee384415c471ae6c6d1549be53c41fadf2d119363359ab5cf3293e1f09717f51f25bff3e5a1fa3f84b8674d106dd8c54
+EBUILD nmap-6.46.ebuild 3434 SHA256 e041ad9a65e08fa1b8bdd2c5655ded36fdd8fe754df664947833786aba3fcf3b SHA512 3b1d0a80e46e5024f1842b8e33547c3a4d4f6f47d57f17a74b48af19984079a7f9fea522bb993d2bee52dc9dc8d838246c03dd237ac8c8d8e246849fa8d36911 WHIRLPOOL 4b3a658951dad43a2d79c924deede40aff018e964531d51ea80a0eda46a437f087cd9abeae60373b8f5da31959fa5852f808620fadf5b4f71a328620a144732f
+MISC ChangeLog 38031 SHA256 c22c726477a7a9df31ccbfb1036d1e218c3fe402b7d77739726e07356c2b4101 SHA512 1da1a93e7165475d7ab4b8a52cf43bd314a4188d191cd57b1a36be409dd6e63d9d2f98035485788e343b6b1f6e09769b10f698ee4e59c0c49ffb0dc8efebdbcb WHIRLPOOL 76aac4c36c1d53cfabad6b832c0858464909223cc88f6b9c42dd3e14c81a73cc765136ec14fd1016e27574e15288f4f96632975fd3ed5583d083a6544dd32f73
 MISC metadata.xml 639 SHA256 5bb4193809c829dc5c8f9101355e6f4626bf616df5f6a477e1651a53c25ca9ce SHA512 d20ddd6bdb400bf0cffde6e5530e457ff49631ffc9413a4262ac197441338b19d0a9168b8d73c79a01cfc6244e34bceb3139c8c6e45bebbfec0a192b88fc21f2 WHIRLPOOL 036edb4b7dc0f24d84d214917ab18026dc4cd5da85e3da803ed8510634cf8c5b46c06dadebbb900442d4fe2eb877ec491b337a7a26f33256847b91d4b513f2cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSm54YAAoJEKXdFCfdEflKvjEP/1qLK7XQU8yfbmylyMd2U8Sg
-uCcKqioFshZXSnvYLJzRK38/95/EH8eF2bae8lZU/jRkA/SbcfCKuP8Lo02yKPWX
-i+qF2bhm1d4TB5xhgUdaA8q/bQ4OhE5wkbEBaaqTyzgJrfOpPsTjFrfPtc5DGiht
-wiBNTDIGDmaRbloXr/O3KUhbhtOWxzZ+2nAk43preWCUr6fG/myWym6cDyTOSCcB
-CyIadcOVD0W31B2n9UZbDAE1TRBFR6SmSOO05lx8X4/rbmlgrlLULEPo4L2oPYz4
-aQaNh9i7OTIMlZrfFfd+mGYayIXamRv/PD4u9IanssHOpZu5XBVAo4gw4SaBOcYE
-1CrBEeUJRQ51kcRQHOgzbmtDvu3B8CCVWOPG6DNWpGEnoaY6BjWtb2hPRdvxvfxg
-XFS5BHk9OQ21CtFB6OWphtDU81tV+oIWFzTOy3Tbn7UH4F+rsjhIQZx/XRB2hpdK
-awzA79Cx+OPO5uJlPkyBegky7+OFRxaYlDyJepJPcls/7BpAwN3EMPT336R5YLam
-qf7K5l0yjHLLP4hbm6K2uio2B9Ups6v7Q5iPnN9giw/ENDf80s1T43aXwwXoBMUO
-Fbswa6ajK9jNFz82T2dRDzffqN6VRKKuKpWNKJ29ial930EXSZqnvlKVXjGERHwM
-Jd0Ppk5Na+/BFByzmyUc
-=3C4x
+iEYEAREIAAYFAlNeZvUACgkQVWmRsqeSphMY/wCfaHJrTuWDovx9AMPhwfi2Qfiz
+c9AAn22Bh6HD9FzrPevoQHNqLNN1Fk/Z
+=UEPu
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch b/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch
new file mode 100644
index 000000000000..6b43f8f5a069
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch
@@ -0,0 +1,19 @@
+--- a/zenmap/setup.py
++++ b/zenmap/setup.py
+@@ -245,7 +245,6 @@
+         self.set_perms()
+         self.set_modules_path()
+         self.fix_paths()
+-        self.create_uninstaller()
+         self.write_installed_files()
+ 
+     def get_installed_files(self):
+@@ -263,8 +262,6 @@
+                 os.path.join(self.install_data, data_dir)):
+             for dir in dirs:
+                 installed_files.append(os.path.join(dirpath, dir))
+-        installed_files.append(
+-                os.path.join(self.install_scripts, "uninstall_" + APP_NAME))
+         return installed_files
+ 
+     def create_uninstaller(self):
diff --git a/net-analyzer/nmap/nmap-6.46.ebuild b/net-analyzer/nmap/nmap-6.46.ebuild
new file mode 100644
index 000000000000..e9c804d9202a
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.46.ebuild
@@ -0,0 +1,140 @@
+# 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 $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="sqlite"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network exploration or security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+NMAP_PYTHON_DEPEND="
+	|| ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2
+		${NMAP_PYTHON_DEPEND}
+	)
+	lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${NMAP_PYTHON_DEPEND} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${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-liblua-ar.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+
+	sed -i \
+		-e 's/-m 755 -s ncat/-m 755 ncat/' \
+		ncat/Makefile.in || die
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS}; do
+			if ! use linguas_${lingua}; then
+				rm -rf zenmap/share/zenmap/locale/${lingua}
+				rm -f zenmap/share/zenmap/locale/${lingua}.po
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS}; do
+			rm -rf zenmap/share/zenmap/locale/${lingua}
+			rm -f zenmap/share/zenmap/locale/${lingua}.po
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with zenmap) \
+		$(usex lua --with-liblua=/usr --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+}
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB )
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	use zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
+}