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 B2FAF1382C5 for ; Wed, 17 Mar 2021 01:44:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAD04E07FE; Wed, 17 Mar 2021 01:44:48 +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 B2325E07FE for ; Wed, 17 Mar 2021 01:44:48 +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 3A088340EEC for ; Wed, 17 Mar 2021 01:44:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 96DDC5B6 for ; Wed, 17 Mar 2021 01:44:45 +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: <1615945053.94fc26169ed3a8c4a67d250e144c639bf27e6bda.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netcat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/netcat/netcat-110-r9.ebuild X-VCS-Directories: net-analyzer/netcat/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 94fc26169ed3a8c4a67d250e144c639bf27e6bda X-VCS-Branch: master Date: Wed, 17 Mar 2021 01:44:45 +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: 62e43046-46c8-439f-b44f-b0e1d93ad97d X-Archives-Hash: a8b42322d9652f2074c1cb46b959a91b commit: 94fc26169ed3a8c4a67d250e144c639bf27e6bda Author: Sam James gentoo org> AuthorDate: Wed Mar 17 01:37:33 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 17 01:37:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94fc2616 net-analyzer/netcat: update EAPI 5 -> 7 Signed-off-by: Sam James gentoo.org> net-analyzer/netcat/netcat-110-r9.ebuild | 52 +++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild index 09793c6b70e..2653de68f20 100644 --- a/net-analyzer/netcat/netcat-110-r9.ebuild +++ b/net-analyzer/netcat/netcat-110-r9.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs flag-o-matic +inherit toolchain-funcs flag-o-matic PATCH_VER="1.0" MY_P=nc${PV} @@ -11,7 +11,9 @@ DESCRIPTION="The network swiss army knife" HOMEPAGE="https://nc110.sourceforge.io" SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2 +" +S="${WORKDIR}" LICENSE="netcat" SLOT="0" @@ -20,26 +22,46 @@ IUSE="crypt ipv6 static" LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -S=${WORKDIR} +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" src_prepare() { - epatch "${DISTDIR}"/nc-v6-20000918.patch.gz patch + default + + eapply "${WORKDIR}"/nc-v6-20000918.patch + sed -i 's:#define HAVE_BIND:#undef HAVE_BIND:' netcat.c - sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c #34250 - [[ ${CHOST} == *-solaris* ]] && \ - sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c + # bug 34250 + sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c + + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c || die + fi } src_compile() { export XLIBS="" export XFLAGS="-DLINUX -DTELNET -DGAPING_SECURITY_HOLE" - use ipv6 && XFLAGS="${XFLAGS} -DINET6" - use static && export STATIC="-static" - use crypt && XFLAGS="${XFLAGS} -DAESCRYPT" && XLIBS="${XLIBS} -lmix" - [[ ${CHOST} == *-solaris* ]] && XLIBS="${XLIBS} -lnsl -lsocket" + + if use ipv6 ; then + XFLAGS+=" -DINET6" + fi + + if use static ; then + export STATIC="-static" + fi + + if use crypt ; then + XFLAGS+=" -DAESCRYPT" + XLIBS+=" -lmix" + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + XLIBS+=" -lnsl -lsocket" + fi + emake -e CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" nc }