summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-05-26 16:45:40 +0000
committerJeroen Roovers <jer@gentoo.org>2012-05-26 16:45:40 +0000
commitd7234de406c7a291b0ab27e7a70f6cab40689882 (patch)
treea9617759c82b0d8ae5c38be65305943c5c00c702 /net-analyzer/nmap
parentx86 stable wrt security bug #417321. Remove old. (diff)
downloadgentoo-2-d7234de406c7a291b0ab27e7a70f6cab40689882.tar.gz
gentoo-2-d7234de406c7a291b0ab27e7a70f6cab40689882.tar.bz2
gentoo-2-d7234de406c7a291b0ab27e7a70f6cab40689882.zip
Use the default src_compile() to fix parallel make by Markus Oehme (bug #416987).
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/nmap')
-rw-r--r--net-analyzer/nmap/ChangeLog6
-rw-r--r--net-analyzer/nmap/nmap-6.00.ebuild7
2 files changed, 6 insertions, 7 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 7b9df269c360..e9d4b142d783 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
# 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.251 2012/05/22 03:34:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.252 2012/05/26 16:45:40 jer Exp $
+
+ 26 May 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.00.ebuild:
+ Use the default src_compile() to fix parallel make by Markus Oehme (bug
+ #416987).
22 May 2012; Patrick Lauer <patrick@gentoo.org> nmap-6.00.ebuild:
Fix parallel build failure #416987
diff --git a/net-analyzer/nmap/nmap-6.00.ebuild b/net-analyzer/nmap/nmap-6.00.ebuild
index b2dc66d68863..51a61bc321f4 100644
--- a/net-analyzer/nmap/nmap-6.00.ebuild
+++ b/net-analyzer/nmap/nmap-6.00.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.00.ebuild,v 1.2 2012/05/22 03:34:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.00.ebuild,v 1.3 2012/05/26 16:45:40 jer Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -53,11 +53,6 @@ src_configure() {
$(use_with ssl openssl)
}
-src_compile() {
- emake -j1 makefile.dep
- emake -j1
-}
-
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