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 1B8191382C5 for ; Mon, 15 Mar 2021 20:21:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 711E0E0828; Mon, 15 Mar 2021 20:21:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5AF05E0828 for ; Mon, 15 Mar 2021 20:21:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E8174335D95 for ; Mon, 15 Mar 2021 20:21:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22223478 for ; Mon, 15 Mar 2021 20:20:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615839221.5a2d0ee5d2468a1894098de973c8159d0f8bd59c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/amap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/amap/amap-5.4-r1.ebuild X-VCS-Directories: net-analyzer/amap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5a2d0ee5d2468a1894098de973c8159d0f8bd59c X-VCS-Branch: master Date: Mon, 15 Mar 2021 20:20:59 +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: 9ab880e0-28e0-47fb-8262-b97830697b91 X-Archives-Hash: 5dae9edcc7935fcf9ab8cdae6c919d9a commit: 5a2d0ee5d2468a1894098de973c8159d0f8bd59c Author: Sam James gentoo org> AuthorDate: Mon Mar 15 20:13:41 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 15 20:13:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2d0ee5 net-analyzer/amap: port to EAPI 7 Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> net-analyzer/amap/amap-5.4-r1.ebuild | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild index 9848a4c18f2..71868935cdb 100644 --- a/net-analyzer/amap/amap-5.4-r1.ebuild +++ b/net-analyzer/amap/amap-5.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A network scanning tool for pentesters" HOMEPAGE="https://www.thc.org/thc-amap/" @@ -26,23 +26,31 @@ RDEPEND=" !sci-biology/amap " +PATCHES=( + "${FILESDIR}"/4.8-system-pcre.patch +) + src_prepare() { rm -r pcre-3.9 || die + sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die + # Above change requires below change. See sources... sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die sed -i 's:/usr/local:/usr:' amap.h || die + # Files to be updated are at different location, bug 207839. sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die - epatch "${FILESDIR}"/4.8-system-pcre.patch + default } src_configure() { # non-autotools configure script ./configure || die + sed -i \ -e '/^XDEFINES=/s:=.*:=:' \ -e '/^XLIBS=/s:=.*:=:' \ @@ -50,12 +58,14 @@ src_configure() { -e '/^XIPATHS=/s:=.*:=:' \ -e "/^CC=/d" \ Makefile || die + if use ssl ; then sed -i \ -e '/^XDEFINES=/s:=:=-DOPENSSL:' \ -e '/^XLIBS=/s:=:=-lcrypto -lssl:' \ Makefile || die fi + sed -i Makefile \ -e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \ || die