summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2017-01-03 15:08:42 +0100
committerFabian Groffen <grobian@gentoo.org>2017-01-03 15:08:59 +0100
commit86a62d35647397b546ec9340da8e454f204aad83 (patch)
tree1186f2eeaeb6abb019ad9b7632d88df6640a8b3f /net-analyzer/nmap
parentapp-emulation/lxd: remove old versions (diff)
downloadgentoo-86a62d35647397b546ec9340da8e454f204aad83.tar.gz
gentoo-86a62d35647397b546ec9340da8e454f204aad83.tar.bz2
gentoo-86a62d35647397b546ec9340da8e454f204aad83.zip
net-analyzer/nmap: apply workaround not to destroy a fix for Darwin, bug #604432
Package-Manager: portage-2.2.28-prefix
Diffstat (limited to 'net-analyzer/nmap')
-rw-r--r--net-analyzer/nmap/nmap-7.40.ebuild7
-rw-r--r--net-analyzer/nmap/nmap-9999.ebuild7
2 files changed, 12 insertions, 2 deletions
diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 1fe61b52a276..28b7751640f0 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -111,7 +111,12 @@ src_prepare() {
epatch_user
+ cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
eautoreconf
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # we need the original for a Darwin-specific fix, bug #604432
+ mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+ fi
}
src_configure() {
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 7ed59bdaa4ec..b7315c680410 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -99,7 +99,12 @@ src_prepare() {
epatch_user
+ cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
eautoreconf
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # we need the original for a Darwin-specific fix, bug #604432
+ mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+ fi
}
src_configure() {