gentoo resync : 28.04.2021

5 files changed, 49 insertions, 131 deletions

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index fc12a1e376e5..187da688a745 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -14,8 +14,8 @@ AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39
 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
-EBUILD nmap-7.80-r2.ebuild 3386 BLAKE2B fd3b88003aaab420a29745a407f07ec1a295eb47def0843a16acd3e6202068a4b3d32cb6129ee4c969c4c5c0791213e8b220e8f21332efab6425c68ae2a35e2e SHA512 df22d7061dec12102a3e3b42aac686144dc43d1a5208e5712af03e247b50d91a71c24caffe951d6ab8ff8d309443dd3f2a143d3007ecab3155a352df494a011b
-EBUILD nmap-7.91-r1.ebuild 2800 BLAKE2B 593cdae269404efedf60ba475a0e9ad5d66bfd9310345daefad33bb7ac426bcab47528bcd514a5c2fce2c3aa2bc993d261dcbbb70f12d5d7106d1468722d9ee2 SHA512 74ad16d193833aa98abea4e236b8a684aabf5ad79945b0c3c9770f573531186d544a499582f2a12774a17f0e46850a711e7a1ce6e04887fc8b6a0233d31e32ae
-EBUILD nmap-7.91-r2.ebuild 2888 BLAKE2B f4f835da004889bcb8de59411cb8eadd04f495ff7140fe3b6c11fbb243684139bf8a30c1aa12629c47e8a77938d11d5886b60cabc066d7779184bf2bbed517be SHA512 ebf3a616faf1e43d8b9494d2e74dd87223a0b66b9adde04e5c1b4b6ff448f15ccbd9dacd706f4155f3373a952869bc7a6ce66aaafac39204b66b74fcb2676cbf
-EBUILD nmap-9999.ebuild 2716 BLAKE2B 6be7210726dc27a44345a78cd182fdd9ac6ead652bc0e0f0408d52ee267c1698588fac9e987da1c1d1a4965d0d41dd3ce03dcc2912c53e1d19ee4687df7fcff4 SHA512 807f71d9fe04ab3a535eea8d7f9e160ba4cae2d580ffad680fb36ba0f1e82697da76aaaf228813de610ce0fcf294f1caa9793ea88ce9142529e08deb660ac824
+DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1 SHA512 376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96
+EBUILD nmap-7.80-r2.ebuild 3365 BLAKE2B fb4cc9da0de282010524e41e12c52b75a50f39beda01e89a03208dc6e8f66125f2aa2fd8def3b12e39cadca8de13b76bd3a3c9c6d0d9614b598540b61997a7d6 SHA512 e6633ae059aec1bf20f54a867c0862f1f2c1bff3e780f5d0eb45751fbce06d5db1eb6fa1b9c65a8453bcc58354b7d1a33396926106ac5885b2f30302cf8856ff
+EBUILD nmap-7.91-r2.ebuild 3290 BLAKE2B 7b67a0803b4a30c5376d81eee86ab93e24dba1ebd947c083a05606a46ed2330607d5ebdae43d9d09d0d6124a6467b436b11182bbb46d56d31fb19ce17d05bd94 SHA512 f7da86d6f8e1c50214ab1e6bcff21f1dbe08a54ee9b9003a438243421db01d2f6f72417eabcb42993c43c6227de4da920e35c2f716b21807edec4529ecb4c543
+EBUILD nmap-9999.ebuild 3254 BLAKE2B 398739112039043145f8e4588e5ff722ad4858580bb0a309bc91f8f68748cf0be2060d3f5b0c3e6d1adbb62706ca45fb7115b944008625f76b70586ad5fdb154 SHA512 fc5d4573415551330e597c56a5b5264490d6931f9bb78d78815574346043eb1647266370383fe21be8c46e06f59174ae47a395a252e5c4276cb12b1d409c64cb
 MISC metadata.xml 979 BLAKE2B d77a475cc6bb5be93382dd712d5cee9b4a358a0cab70a0b13b40dd78cd6c5ccdc1802eaa58814ef3868281b2129c907cd22d480b4667ba9c162c0c0ac1ef2aa4 SHA512 c97db5c77b309a940b3307ef35edd202feb0cc5778d4d4ef9a624458012b473fb0a96c6d9460c3d42cc1fe3c5c9009c29aabff058c1dff818b6901d068f47e48
diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 5f48909bca01..4ce4485f5c7f 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
 
-inherit autotools desktop flag-o-matic lua-single toolchain-funcs
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
deleted file mode 100644
index 8b08d910d677..000000000000
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-LUA_REQ_USE="deprecated"
-
-inherit autotools flag-o-matic lua-single toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-
-LICENSE="|| ( NPSL GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? (
-		net-libs/libssh2[zlib]
-		sys-libs/zlib
-	)
-	nse? ( sys-libs/zlib )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-)
-
-pkg_setup() {
-	use system-lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_with libssh2) \
-		$(use_with ncat) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
-		$(usex nse --with-zlib) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr \
-		--without-ndiff \
-		--without-zenmap
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-}
diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 09c622523f36..492355ccf044 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -5,16 +5,29 @@ EAPI=7
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-
-inherit autotools flag-o-matic lua-single toolchain-funcs
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nmap/nmap"
+
+	# Just in case for now as future seems undecided.
+	LICENSE="NPSL"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+	inherit verify-sig
+
+	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
+
+	LICENSE="|| ( NPSL GPL-2 )"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
 
-LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
@@ -35,6 +48,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+fi
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	"${FILESDIR}"/${PN}-5.21-python.patch
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 782f91bf13e1..fa6114906f22 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,19 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-
-inherit autotools flag-o-matic git-r3 lua-single toolchain-funcs
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nmap/nmap"
+
+	# Just in case for now as future seems undecided.
+	LICENSE="NPSL"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+	inherit verify-sig
 
-EGIT_REPO_URI="https://github.com/nmap/nmap"
+	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
+
+	LICENSE="|| ( NPSL GPL-2 )"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
 
-LICENSE="NPSL"
 SLOT="0"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
@@ -35,6 +48,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
+fi
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	"${FILESDIR}"/${PN}-5.21-python.patch