Remove binary from FILESDIR, step 1, by Matt Turner (bug #370907). Put -j1 on the emake line.

(Portage version: 2.2.0_alpha143/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 18 insertions, 129 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 58814391a720..59521dd5a4b4 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.259 2012/12/01 17:15:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.260 2012/12/01 17:30:48 jer Exp $
+
+  01 Dec 2012; Jeroen Roovers <jer@gentoo.org> -nmap-5.21-r1.ebuild,
+  -nmap-5.35.ebuild, nmap-6.01.ebuild:
+  Remove binary from FILESDIR, step 1, by Matt Turner (bug #370907). Put -j1 on
+  the emake line.
 
   01 Dec 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild:
   Break up long lines. Clean up.
diff --git a/net-analyzer/nmap/nmap-5.21-r1.ebuild b/net-analyzer/nmap/nmap-5.21-r1.ebuild
deleted file mode 100644
index a92f7cb3c771..000000000000
--- a/net-analyzer/nmap/nmap-5.21-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 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.10 2011/03/28 21:02:05 radhermit 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:2
-		   >=dev-python/pygtk-2.6
-		   || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 )
-		 )
-	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-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
-	epatch "${FILESDIR}"/${PN}-5.21-openssl-1.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"
-}
diff --git a/net-analyzer/nmap/nmap-5.35.ebuild b/net-analyzer/nmap/nmap-5.35.ebuild
deleted file mode 100644
index d68d6ed2929b..000000000000
--- a/net-analyzer/nmap/nmap-5.35.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.35.ebuild,v 1.3 2011/03/28 21:02:05 radhermit Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit eutils flag-o-matic python
-
-MY_P=${P/_beta/BETA}
-MY_P="${MY_P}DC1"
-
-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:2
-		   >=dev-python/pygtk-2.6
-		   || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 )
-		 )
-	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-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
-	epatch "${FILESDIR}"/${PN}-5.21-openssl-1.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"
-}
diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild
index a40432f4abd6..11a3c986e096 100644
--- a/net-analyzer/nmap/nmap-6.01.ebuild
+++ b/net-analyzer/nmap/nmap-6.01.ebuild
@@ -1,6 +1,6 @@
 # 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.01.ebuild,v 1.5 2012/12/01 17:15:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.6 2012/12/01 17:30:48 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -11,7 +11,10 @@ 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"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~jer/nmap-logo-64.png
+"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -48,6 +51,10 @@ 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
@@ -82,16 +89,14 @@ src_configure() {
 }
 
 src_install() {
-	LC_ALL=C emake \
-		-j1 \
+	LC_ALL=C emake -j1 \
 		DESTDIR="${D}" \
 		STRIP=: \
 		nmapdatadir="${EPREFIX}"/usr/share/nmap \
 		install
 	if use nmap-update;then
-		LC_ALL=C emake \
+		LC_ALL=C emake -j1 \
 			-C nmap-update \
-			-j1 \
 			DESTDIR="${D}" \
 			STRIP=: \
 			nmapdatadir="${EPREFIX}"/usr/share/nmap \
@@ -100,5 +105,5 @@ src_install() {
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
 
-	use gtk && doicon "${FILESDIR}/nmap-logo-64.png"
+	use gtk && doicon "${DISTDIR}/nmap-logo-64.png"
 }