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 16BAD1382C5 for ; Sat, 10 Mar 2018 10:54:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F31DEE0822; Sat, 10 Mar 2018 10:54:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 CDBF0E0822 for ; Sat, 10 Mar 2018 10:54:22 +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 70C96335C0C for ; Sat, 10 Mar 2018 10:54:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5190F21D for ; Sat, 10 Mar 2018 10:54:19 +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: <1520679257.5d173a42fcd0eded6d7b71ab89b3f690a741cf6e.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-9999-zlib.patch net-analyzer/nmap/nmap-9999.ebuild X-VCS-Directories: net-analyzer/nmap/files/ net-analyzer/nmap/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 5d173a42fcd0eded6d7b71ab89b3f690a741cf6e X-VCS-Branch: master Date: Sat, 10 Mar 2018 10:54:19 +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: eaa25959-5704-412b-9510-858931bce484 X-Archives-Hash: e39afbf7ed95a8d465cdaecc714e6edd commit: 5d173a42fcd0eded6d7b71ab89b3f690a741cf6e Author: Jeroen Roovers gentoo org> AuthorDate: Sat Mar 10 10:54:00 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Mar 10 10:54:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d173a42 net-analyzer/nmap: Drop zlib patch (bug #637514). Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-analyzer/nmap/files/nmap-9999-zlib.patch | 11 ----------- net-analyzer/nmap/nmap-9999.ebuild | 1 - 2 files changed, 12 deletions(-) diff --git a/net-analyzer/nmap/files/nmap-9999-zlib.patch b/net-analyzer/nmap/files/nmap-9999-zlib.patch deleted file mode 100644 index 3f260ae48f4..00000000000 --- a/net-analyzer/nmap/files/nmap-9999-zlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -105,7 +105,7 @@ - NSE_HDRS+=nse_libssh2.h - NSE_OBJS+=nse_libssh2.o - endif --ifneq (@LIBZLIB_LIBS@,) -+ifneq (@ZLIB_LIBS@,) - NSE_SRC+=nse_zlib.cc - NSE_HDRS+=nse_zlib.h - NSE_OBJS+=nse_zlib.o diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index ad91a6386b5..a54dd5819b1 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -65,7 +65,6 @@ PATCHES=( "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch "${FILESDIR}"/${PN}-7.25-libpcre.patch "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-9999-zlib.patch ) S="${WORKDIR}/${MY_P}"