gentoo resync : 20.03.2021

3 files changed, 16 insertions, 79 deletions

diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 1bc805f57c4b..ae51e75f62db 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,5 +1,4 @@
 AUX 4.8-system-pcre.patch 1232 BLAKE2B b659a49c80f5902718160f41f70a595607e70b80ad5c332952365bca9d09e5fd63bd7b6f4f737c5803cd49189e0030aef835cfc5cc7c2615a2705ca286443cff SHA512 d22cb148748ec58920c0a66f67adb4df23dd081ab9c4e2e05881ce7029679e2ccf14e3cf6d199c63e5c0974ee6528fa8b0e85044cfdbba32833457e88a856934
 DIST amap-5.4.tar.gz 263331 BLAKE2B 683bcdd1ebb22dcd74c2ac20147ec5e5fe2bafb2452abda22a9a95c4d8fe1955394067b9a3765344674b48979cd56a99251d6359cd0247ac623da756a017a220 SHA512 e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d
-EBUILD amap-5.4-r1.ebuild 1630 BLAKE2B 5449df4394abc60542a06ad5d7b010befb0599eeba37565f9886c50111cb3b66e58c1412423e7984310c04acb2cf6bf6f011d98aef18665cebf8202f79185dab SHA512 e60ffc4d76af9219c5efd2b1da76d0487b48c45a0504d13be3a5fbf543325b0e1be9f92025fe5f3ead83f4d02f81c1ee21971a9508ff7c25a8b0f986bef46dff
-EBUILD amap-5.4.ebuild 1568 BLAKE2B 8f2e5d3fbc3dd8cf87539984198212a56ff8a68549bee6ce9f659b85b026f9d4c8803dd026d001d46513c07e239c68313cec366b17606051cb5fa7c1314d8ebf SHA512 d4a516be2e3826a6b8aba3ee0a13cd5ee3ae61b16fb4b33c1d2457fb1c5b4417802b24fd26463c9ee6020b3a8681145bdb6aa1c45cad021bbdb3af185ab1d54d
+EBUILD amap-5.4-r1.ebuild 1637 BLAKE2B acf1f1646c7c5425252787e6dfc6a6dcb17534ac8ee3c10f2b6bd39e231a428a5902a0ba41f6c343fbf7795d57cf8478a6ea24e52621f38c9f4e594be0a1a867 SHA512 198b03eb65648f3d2e0b43161768c9dc02bad82a4252264e81b956c41cc16331b4a0b46c293167208f1c04d505ba5da98a5fba9193c0edcba5d06a77221177cd
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index 9848a4c18f2d..2703bd6e4bd7 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/"
@@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="libressl ssl"
 
 DEPEND="
@@ -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
diff --git a/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild
deleted file mode 100644
index ef97cd2aec15..000000000000
--- a/net-analyzer/amap/amap-5.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A network scanning tool for pentesters"
-HOMEPAGE="https://www.thc.org/thc-amap/"
-SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ssl"
-
-DEPEND="
-	dev-libs/libpcre
-	ssl? ( >=dev-libs/openssl-0.9.6j )
-"
-RDEPEND="
-	${DEPEND}
-	!sci-biology/amap
-"
-
-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
-}
-
-src_configure() {
-	# non-autotools configure script
-	./configure || die
-	sed -i \
-		-e '/^XDEFINES=/s:=.*:=:' \
-		-e '/^XLIBS=/s:=.*:=:' \
-		-e '/^XLIBPATHS/s:=.*:=:' \
-		-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
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) OPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin amap amapcrap
-	insinto /usr/share/amap
-	doins appdefs.*
-
-	doman ${PN}.1
-	dodoc README TODO CHANGES
-}