[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     86a62d35647397b546ec9340da8e454f204aad83
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 14:08:42 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 14:08:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a62d35

net-analyzer/nmap: apply workaround not to destroy a fix for Darwin, bug #604432

Package-Manager: portage-2.2.28-prefix

 net-analyzer/nmap/nmap-7.40.ebuild | 7 ++++++-
 net-analyzer/nmap/nmap-9999.ebuild | 7 ++++++-
 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 1fe61b5..28b7751 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 7ed59bd..b7315c6 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() {