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 BCB2B138334 for ; Sun, 11 Aug 2019 10:06:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED243E0858; Sun, 11 Aug 2019 10:06:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0D89E083E for ; Sun, 11 Aug 2019 10:06:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 166A53498C9 for ; Sun, 11 Aug 2019 10:06:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E43F8751 for ; Sun, 11 Aug 2019 10:06:13 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1565517969.99e1f61d11b69b9917932542a65fe3948b4a4e25.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/, net-analyzer/nmap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch net-analyzer/nmap/nmap-7.80.ebuild net-analyzer/nmap/nmap-9999.ebuild X-VCS-Directories: net-analyzer/nmap/ net-analyzer/nmap/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 99e1f61d11b69b9917932542a65fe3948b4a4e25 X-VCS-Branch: master Date: Sun, 11 Aug 2019 10:06:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 55238d8d-393c-4762-a83b-d42d6d1949cf X-Archives-Hash: 05d2f6531f8774317272c04060d20d0b commit: 99e1f61d11b69b9917932542a65fe3948b4a4e25 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Aug 11 10:00:52 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Aug 11 10:06:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e1f61d net-analyzer/nmap: SUBDIRS: Use a patch instead of a sed script Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Jeroen Roovers gentoo.org> .../nmap/files/nmap-7.80-ac-config-subdirs.patch | 26 ++++++++++++++++++++++ net-analyzer/nmap/nmap-7.80.ebuild | 6 +---- net-analyzer/nmap/nmap-9999.ebuild | 6 +---- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch b/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch new file mode 100644 index 00000000000..583f7f1d1aa --- /dev/null +++ b/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch @@ -0,0 +1,26 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -468,7 +468,6 @@ + fi + + if test $have_libpcap != yes; then +- AC_CONFIG_SUBDIRS(libpcap) + if test "${LIBPCAP_INC+set}" = "set"; then + CPPFLAGS="$CPPFLAGS -I$LIBPCAP_INC" + else +@@ -611,7 +610,6 @@ + fi + + if test $have_libz != yes; then +- AC_CONFIG_SUBDIRS(libz) + # TODO: This doesn't work because libssh2's configure script is looking for + # already-built libs. Giving up for now: build libz first or install + # headers/libs on your own if you want compression support for SSH. +@@ -697,7 +695,6 @@ + # If we still don't have it, we use our own + if test $have_libssh2 != yes; then + have_libssh2=yes +- AC_CONFIG_SUBDIRS(libssh2) + CPPFLAGS="-I\$(top_srcdir)/$LIBSSH2DIR/include $CPPFLAGS" + LIBSSH2_LIBS="$LIBSSH2DIR/lib/libssh2.a" + LIBSSH2_BUILD="build-libssh2" diff --git a/net-analyzer/nmap/nmap-7.80.ebuild b/net-analyzer/nmap/nmap-7.80.ebuild index cf94423c0af..b3ddc62aa35 100644 --- a/net-analyzer/nmap/nmap-7.80.ebuild +++ b/net-analyzer/nmap/nmap-7.80.ebuild @@ -67,6 +67,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch "${FILESDIR}"/${PN}-7.25-libpcre.patch "${FILESDIR}"/${PN}-7.31-libnl.patch + "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch ) S="${WORKDIR}/${MY_P}" @@ -108,11 +109,6 @@ src_prepare() { zenmap/install_scripts/unix/zenmap-root.desktop \ zenmap/install_scripts/unix/zenmap.desktop || die - sed -i \ - -e '/AC_CONFIG_SUBDIRS(libz)/d' \ - -e '/AC_CONFIG_SUBDIRS(libssh2)/d' \ - configure.ac - cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die eautoreconf diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 6b625c9459b..4c5cd498f49 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -65,6 +65,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch "${FILESDIR}"/${PN}-7.25-libpcre.patch "${FILESDIR}"/${PN}-7.31-libnl.patch + "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch ) S="${WORKDIR}/${MY_P}" @@ -106,11 +107,6 @@ src_prepare() { zenmap/install_scripts/unix/zenmap-root.desktop \ zenmap/install_scripts/unix/zenmap.desktop || die - sed -i \ - -e '/AC_CONFIG_SUBDIRS(libz)/d' \ - -e '/AC_CONFIG_SUBDIRS(libssh2)/d' \ - configure.ac - cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die eautoreconf