gentoo resync : 20.03.2021

3 files changed, 52 insertions, 26 deletions

diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index d2ddbbecadcf..3e7d33c4b90e 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -2,6 +2,6 @@ DIST nc-v6-20000918.patch.gz 8740 BLAKE2B 56274ee32a77f335c31b5593ae92afdb1758ee
 DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c5721829a19c46f1ec91a792d9d6309930b3bba5df1180989025f7a04ec8c85cf4832ac6f4199d13f15764f000420 SHA512 4413849c07c6ec5aae07c6e2baa1ba9a99721fa6ac08cf9e7d15379937a207246eb4f4299dd8c049445a72eac9cfe0a3633a87e4e01e21036db1217ea7a1e330
 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
-EBUILD netcat-110-r9.ebuild 1612 BLAKE2B 8cdcf8bd576edd3587c959ddb1278be99b6925abc4fa23e3de527dd8ffd6b46aa4b709e89fcea9957704557e13824d6414054ac1bf50a150f55c86a373948f4d SHA512 777acc5d9a681eccf49e2d6c109df9b5d63d03436abf834dfc0d6072a2a51b716bc5db0dacebde1976b6da9900f5452cbf0b11941495df10f03cd07be125606e
-EBUILD netcat-110.20180111.ebuild 1261 BLAKE2B 71eb1b57311795dec1a37e7d3804587534860f7da5408507cd88296cc2b3488dd9543a7693421734d6f5aafc0e18722d245528fcc1ace0d5e6176ae7f3c57912 SHA512 92f7ade32cc5111109acd0374a80dea4ddee1aa65112c7ed6fe340f97e3dba23b91e8f241db62c546683ac4afdb9c8a63dea9b798ad0217551c03014537b22cd
+EBUILD netcat-110-r9.ebuild 1660 BLAKE2B c586d3452b9198abf0b9bac20c57043c24f8d4f047413a299d05a78a64774ec547b602fe361913c523bfbf4ad1c774adb8e53d6a5aeb4691649b15873e0c3b60 SHA512 30d2b453a73abcca44b89af888be7ce20f3e9de604d8a397863fdc86944b19506dba652100c6d8d70918b0f5bdca2afdf1a7ddf7a4eb882c96454293cb51df6a
+EBUILD netcat-110.20180111-r1.ebuild 1305 BLAKE2B f5ec48c7a74e96aa8bfa573c36ef8005f24e372bee6d99a4ffbca1bee1cb5015537de4f0684aee3da455c27213e94221926d0b5bf6e27b29dea71faacda6205c SHA512 c4cc71297385a9ce34fac4f4529570a49fa16cd30150e282c26ce3920de9a3a4e85b63afcd78124f44566ed7af4386124febd47344a6283a4a7ec7150f58b441
 MISC metadata.xml 520 BLAKE2B 554d3e1e5b791ebc008ad728157d01fd711b4e57d96ef0294c55e43bb21d6b0bd6a606aa9e5b5cfd6b768d362f260dea119f662bd31b24594a55652a1c5ddd22 SHA512 1b5f4d4aa398bbe08e2bb73c609624e6ed320d39e96531a328fb0547e6a0dda5bbf72aaee358948e2f06c60d578f91a51965fc268601b044c16cc62a2829a3e9
diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
index 78f65ab4a9e0..2653de68f200 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -1,17 +1,19 @@
 # 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}
-DESCRIPTION="the network swiss army knife"
-HOMEPAGE="http://nc110.sourceforge.net/"
+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
 }
 
diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
index fe1f70df7679..5127d1c620fd 100644
--- a/net-analyzer/netcat/netcat-110.20180111.ebuild
+++ b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit toolchain-funcs flag-o-matic
 
 MY_P="nc${PV}"
-DESCRIPTION="the network swiss army knife"
-HOMEPAGE="http://nc110.sourceforge.net/"
+DESCRIPTION="The network swiss army knife"
+HOMEPAGE="https://nc110.sourceforge.io"
 SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz"
 
 LICENSE="netcat"
@@ -15,19 +15,23 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ipv6 static"
 
-S=${WORKDIR}/nc110
+S="${WORKDIR}/nc110"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/#define HAVE_BIND/s:#define:#undef:' \
 		-e '/#define FD_SETSIZE 16/s:16:1024: #34250' \
 		netcat.c || die
-	[[ ${CHOST} == *-solaris* ]] && \
-		sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c
+	if [[ ${CHOST} == *-solaris* ]]; then
+		sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c || die
+	fi
 }
 
 src_configure() {
-	use ipv6 || sed -i '/#define INET6/d' generic.h
+	if ! use ipv6; then
+		sed -i '/#define INET6/d' generic.h || die
+	fi
 	append-cppflags -DTELNET -DGAPING_SECURITY_HOLE
 }