Version bump by Anton Bolshakov (bug #445348).

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

3 files changed, 120 insertions, 5 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 59521dd5a4b4..fb606135412e 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,11 @@
 # 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.260 2012/12/01 17:30:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.261 2012/12/01 18:06:08 jer Exp $
+
+*nmap-6.25 (01 Dec 2012)
+
+  01 Dec 2012; Jeroen Roovers <jer@gentoo.org> +nmap-6.25.ebuild:
+  Version bump by Anton Bolshakov (bug #445348).
 
   01 Dec 2012; Jeroen Roovers <jer@gentoo.org> -nmap-5.21-r1.ebuild,
   -nmap-5.35.ebuild, nmap-6.01.ebuild:
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 821e22bfb117..e9b913b82a0c 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -16,17 +16,19 @@ DIST nmap-5.51.6.tar.bz2 16876602 SHA256 09d1ef2609a1dfa48d55bc29db07ffca265519e
 DIST nmap-5.51.tar.bz2 16869068 SHA256 15b3e134a74fa9b54aba2c3a53d6701c7ad221dc4051657ef95465a5a5a8687e SHA512 93b34813e3906ec7f577ee14353bec286addeab3494297c6e7e540f6f59820666230752d76b45b8289bc83cb9be5a45e7e285b011d40566a0c41987afbfe8ad1 WHIRLPOOL 9bb9e440994cff062a6fbad997046877456bc2e65e908d4d7703b586fb2b26f4d63342a3bcf508a760bee598ff654784464bd63aa975e0756a10bb1066aef7ea
 DIST nmap-6.00.tar.bz2 21639906 SHA256 9037b49ffde13a228ce4ffadd3de8320580f84a0cd8ac14b2fd74757f1fb4b26 SHA512 2abdcd6a4d991f6cc69e9e6732e82271affb562d66e8ac144392b83634b3d7e3356506bb2f4725c9b1d6ed36679456b598163a8c1c67bff7792d5ec62a4c6346 WHIRLPOOL 3d94396102b149764a99a145824a374ae2b0d67df620747a0559a077c925f1994d6dc50f2a6293ff9e5750880748d97d40d2222ca6b4bd6659f2313ebe2b2e1c
 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-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 EBUILD nmap-5.51.6.ebuild 2511 SHA256 850b135e0e52d513380f4b5bad99fe2a1c1dc69ff4c048c4ae18883c696eca84 SHA512 b4d52d28ad6739512b693c527618f6ee0bc0ee6cbce2883ae2ce08239ceb09bb7cd6317dfc9a0c6a222f305c3de4e3b6ce15c611f3a39292515badbae3758a01 WHIRLPOOL 374dae1d0398415bd37cc1506b7a9a84a951f0ec10bf948427f494c7b0fdaeabbc23cc970633726a0a8ab3344d68066e04b101896dde3f4b8fdccc6024d9ce20
 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 2682 SHA256 49c3fc1a02fb458fb227db885b9270b3e1b637b2c62998973f3edc22bcabd0e0 SHA512 41e0eb1eb107acf687f4981f669a1362d3695aecbcaa2e848820ce38e74ac8c65146b079483f008acb25a74f90552e19a1256ce53adccc4c2507f8beaa9fc26c WHIRLPOOL 85bebeaec4d8bce8ab6d34c2c93b7f6067b72fb04b4c95d3a47ed455f5bb4d8b5d2a3823300143af0adfd4403005077090d5206f64558f9880ea1eb25a2016e4
-MISC ChangeLog 32074 SHA256 509cd225d336ed07f576dbcc1a1851923c4174f266615cd9ce34516a3bccbc44 SHA512 0938a746fe14a854e82b196c75874295b84e07f6e87738dcf995208c4c320ff9bb3d362fa525bbf3af6e7fd24e77de842345614d1c3b1c3a391311822aa2b8f0 WHIRLPOOL 2054fb434ca80d3b6cf7476e30ea2972b24c51d3ff16484ebcb188c094b5abec1a2bc85e88747997ad9e1bcdd72f469f8917c1831b353f1f17a06fd3573de0cf
+EBUILD nmap-6.25.ebuild 2631 SHA256 e65023aa085782925daeb42d78e362698d98995df894b1d9d4bccd7f90ccef9b SHA512 7fb049727d5b785625ee5332afad5c14b1e7e6cfcad047c7112dc36f3c4ab3064ae9864ff901bbcb11ea1f4bb971e758f4f8f545400b6bfd6dad53861c099a81 WHIRLPOOL 6a6612eea64808b0b821d5348c37b0916ff721154116d91f6cac17756dc1e1cafc117daa1a83d737804fe58568e9d55c30bd8a32db487e2c9e10226bd9e1be2f
+MISC ChangeLog 32216 SHA256 d1d1c3d052addf95206bf9b966f8f59b29bb72e49ae80774cbe9cba735a18bc2 SHA512 3f02ec09c0a89d10e1c9f223bef6f489b2886ff1ace2469c24b70bce287a2a52be28f91a8c32c7db11bd5f3ab9d1e9652623a3669d7059e0074d46b035ce1e4d WHIRLPOOL 2a3cd681c2c33bbccc6dd49670e3a53e21177f53e7dfbedace11ac744fc393ad46f8f2519d866ec7a39271bf62098a5c4915678be1f67255889ee3a4951294df
 MISC metadata.xml 527 SHA256 f6291faba996b899beb0f35b3d5feb0a0a5a7e71e684b10f8386f0707e73d982 SHA512 7a0f0afdf604a997d8722f8b62b4829b980344b86a80faf346848abaab337e3b687f83ec1f1e1bca861619238466b1ce775deca538786721cdcba41d2166a77f WHIRLPOOL abc3f8636b57e7260916d96866b2c360e336077f0dc613339002ca86c4b78e59590c6b23beccdc47f9f5e282ad23ec330e5f6ec46a1da72cf9c9bd2d6fbe5450
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC6PskACgkQVWmRsqeSphM2ogCfTZxhvlqBJs+VulabZ1soVljN
-Bv0Anjv4oKFPY/bkJWU9WPmmJnfQemeI
-=pIsN
+iEYEAREIAAYFAlC6RxEACgkQVWmRsqeSphM1LwCfW223hmdsKgTAxG/+7xR/hEOt
+eBkAnjSuhsu4WNuLWoQa68TtdozFwXRi
+=lPQB
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
new file mode 100644
index 000000000000..69ecc4bb6d34
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.25.ebuild
@@ -0,0 +1,108 @@
+# 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 $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit eutils flag-o-matic python
+
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="gtk lua ncat ndiff nmap-update nping ssl"
+
+NMAP_PYTHON_DEPEND="
+|| (
+	dev-lang/python:2.7[sqlite]
+	dev-lang/python:2.6[sqlite]
+	dev-lang/python:2.5[sqlite]
+	dev-python/pysqlite:2
+)
+"
+DEPEND="
+	dev-libs/apr
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6]
+	gtk? (
+		>=x11-libs/gtk+-2.6:2
+		>=dev-python/pygtk-2.6
+		${NMAP_PYTHON_DEPEND}
+	)
+	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
+	ndiff? ( ${NMAP_PYTHON_DEPEND} )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? ( dev-libs/openssl )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+}
+
+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
+	sed -i \
+		-e 's/-m 755 -s ncat/-m 755 ncat/' \
+		ncat/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
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_with gtk zenmap) \
+		$(use_with lua liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included
+}
+
+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 gtk && doicon "${DISTDIR}/nmap-logo-64.png"
+}