ppc stable wrt #329443. should have never been revbumped for buildtime fix.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 8 insertions, 65 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index b7df480a6b4b..7ea7256916c1 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.237 2010/08/29 18:11:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.238 2010/09/23 17:08:38 ssuominen Exp $
+
+  23 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> nmap-5.21-r1.ebuild:
+  ppc stable wrt #329443
 
   29 Aug 2010; Raúl Porcel <armin76@gentoo.org> nmap-5.21-r1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #330439
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index f60d8df988f3..fee2e1057cd6 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -9,8 +9,7 @@ AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c
 AUX su-to-zenmap.sh.diff 407 RMD160 60d66ce051777897d69b353eba08225a4fdb0892 SHA1 d4fcf25792851e1a1a3288588eedfcfec7af631c SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36
 DIST nmap-5.21.tar.bz2 10015121 RMD160 85e912c3c6a7ed03eb1b399c812836071e4dcf9f SHA1 ce5ff792161dae0037e41b31e0c2ef683ce94655 SHA256 9fcb24f86157541c2f17cc8a0cc1e5d15d909b51720d163fcad5faaa6201b0ba
 DIST nmap-5.35DC1.tar.bz2 11302092 RMD160 d0663a669824a38f05e89c14a2ad5fd9932eddcc SHA1 5fd786d4bbe6b4fbc0ae625fbb6893b19fbde627 SHA256 51a6cde0a6afee50799d59b1968f1a4011753bb535f070114fd60be62f59ad44
-EBUILD nmap-5.21-r1.ebuild 1781 RMD160 884fcc33c4fb7e136b5d60b43395a7ede7108262 SHA1 9f59befdeaeac3d03e5b14a0d7b6adda6a392cd9 SHA256 cc4f2f84a88f69016e3a36b47b2b087e0931ae9403f28236a49492f3bfd26286
-EBUILD nmap-5.21.ebuild 1726 RMD160 cb0695755809ad31020ba4a7eaad72d19964272d SHA1 20594b1e33f47f2f4a4d870eaddc896223b6f8fb SHA256 ae68ea5e1af2b33ad4eeab5ad9d41d8b977af634bcd54a5dd1ac6d79769b5e68
+EBUILD nmap-5.21-r1.ebuild 1782 RMD160 624db13ec1e65ab3e6849954067484e1dd246fc0 SHA1 e2e8bc947365a3b99a1693ffb62c01eb32e9f18a SHA256 41b7cbbaeb2387e5fb57cc3419397b19c2a75416833f35b28ba9a98b61149d7c
 EBUILD nmap-5.35.ebuild 1804 RMD160 021f17478d9082968559a2dd7e9afbda2e2346bf SHA1 28f13280f0bac5f92deaa4c2197bf8c6564743c0 SHA256 36ff2b5a66f5e05a50b794abe9862203f841bd98a66ed2f4ded35b1f4ac9582e
-MISC ChangeLog 29074 RMD160 823cc4261b5436b7b6844d20a2977b14f5b62342 SHA1 f11c2962c03f7339f78da7239a7b2df08fa4ca92 SHA256 5cb62a2c4a124bb22d02588187c08e8d8cf5c32216f4e8de5c2b103779e33ac8
+MISC ChangeLog 29177 RMD160 aba01b48365ac19bce3f646b21a91a9c516151f1 SHA1 c2354eb13483e5f1231b83fb289cc40eee131cb6 SHA256 6113e461bed9038e93bbf33902bb6589e32ead7131612e1057ec51f625bc031d
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
diff --git a/net-analyzer/nmap/nmap-5.21-r1.ebuild b/net-analyzer/nmap/nmap-5.21-r1.ebuild
index 75455becc181..dc9fb1096986 100644
--- a/net-analyzer/nmap/nmap-5.21-r1.ebuild
+++ b/net-analyzer/nmap/nmap-5.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.21-r1.ebuild,v 1.7 2010/08/29 18:11:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.21-r1.ebuild,v 1.8 2010/09/23 17:08:38 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="http://nmap.org/dist/${MY_P}.tar.bz2"
 
 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"
+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 ssl"
 
 DEPEND="dev-libs/libpcre
diff --git a/net-analyzer/nmap/nmap-5.21.ebuild b/net-analyzer/nmap/nmap-5.21.ebuild
deleted file mode 100644
index dfd97f0c5d54..000000000000
--- a/net-analyzer/nmap/nmap-5.21.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.21.ebuild,v 1.11 2010/05/26 16:41:20 abcd Exp $
-
-EAPI="3"
-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"
-
-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 ssl"
-
-DEPEND="dev-libs/libpcre
-	net-libs/libpcap
-	gtk? ( >=x11-libs/gtk+-2.6
-		   >=dev-python/pygtk-2.6
-		   || ( >=dev-lang/python-2.5[sqlite]
-				>=dev-python/pysqlite-2 )
-		 )
-	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
-	ssl? ( dev-libs/openssl )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-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"
-	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf --with-libdnet=included \
-		$(use_with gtk zenmap) \
-		$(use_with lua liblua) \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: nmapdatadir="${EPREFIX}"/usr/share/nmap install || die
-	dodoc CHANGELOG HACKING docs/README docs/*.txt || die
-
-	use gtk && doicon "${FILESDIR}/nmap-logo-64.png"
-}