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

(Portage version: 2.2_rc86/cvs/Linux x86_64)

3 files changed, 6 insertions, 62 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/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"
-}