From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94C16139085 for ; Tue, 3 Jan 2017 14:09:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34B8EE0CD7; Tue, 3 Jan 2017 14:09:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0FD90E0CD7 for ; Tue, 3 Jan 2017 14:09:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18060341398 for ; Tue, 3 Jan 2017 14:09:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B9A224EC for ; Tue, 3 Jan 2017 14:09:03 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1483452539.86a62d35647397b546ec9340da8e454f204aad83.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nmap/nmap-7.40.ebuild net-analyzer/nmap/nmap-9999.ebuild X-VCS-Directories: net-analyzer/nmap/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 86a62d35647397b546ec9340da8e454f204aad83 X-VCS-Branch: master Date: Tue, 3 Jan 2017 14:09:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fe19690e-20e8-470a-bca8-84e790944e04 X-Archives-Hash: 7502eae1cb47965db8d69d4707f5e7cc commit: 86a62d35647397b546ec9340da8e454f204aad83 Author: Fabian Groffen gentoo org> AuthorDate: Tue Jan 3 14:08:42 2017 +0000 Commit: Fabian Groffen gentoo 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() {