gentoo resync : 30.05.2020

4 files changed, 18 insertions, 116 deletions

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 18a71234b6b7..e8aff2e9ee4e 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -12,6 +12,6 @@ AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c
 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
-EBUILD nmap-7.80-r1.ebuild 4431 BLAKE2B 4da9c633efc45bcd6f1fa6f17cc90775ccea9cf2baf7d3631c8c1384c103f658986d4298bc1077575913cb365add4ec366cfdd1c4dd4720ea6853d0ed6d5d145 SHA512 583d88de31f8ce56e751f8fbd79690f8eb0780f9b33de3551e1756f6fe291fd46e87766bf3eaac58d6827749136932158fa259214532a199b0c4fef0fbabb73d
-EBUILD nmap-9999.ebuild 4352 BLAKE2B 5301a8be69c471a295c719e41cc684c9f02d98264bdef33ac6b489b0c62fdbb6cd1b81a5ac2b0f415642550061bb3f60aad4a5d15c606a487b3d2cc5e9e3b4cd SHA512 26e536654f45be06d30a41b2f9ed858dec1ac3794d732bd1cf32cd693d683598929486fa6d38e3131f41521b84dfc067afd311073b724d7b277ecac0c7ce1e9e
-MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
+EBUILD nmap-7.80-r1.ebuild 3384 BLAKE2B d0e17e01112a98cf486230dd0d2c62c6a58195a6381aaf533e813d233a5d7f61d3ad467fa99f5d8d655c5c4e214ed01d43d21cafe4de95dc533e8f80a59b758b SHA512 615b65941058fa30416d010cd789093b4bd96969d609a02d02e9e2f1ee1d5ecf694d867c0c53e901e8c3a4cd911d0fe0c7bfcfa87adc1486f3d5149157c85c03
+EBUILD nmap-9999.ebuild 3305 BLAKE2B 35038ffdeb64d14e6e7c3a6f94ceeb6503f064473edf2e10dd745d26b4bfdc19a50efc2f181833be132e58f1a85f92c70a934c9fbfbe83ce06d9f00e08818550 SHA512 0e0ca7fd58930fe4ec17a7c63e9e861b123b79a82878ab18f23f9ee3bf30361f4546358c6e69b5b8c8435634ea79cf1e34d6a538be8141fd924c421f2b4a8bec
+MISC metadata.xml 797 BLAKE2B 083b63af1e130f047a474d71e62b42ca4250b85d58c129695fe80a845cf57f5f223273850d249c57617b29a144ef1c4e94ccb47b9caac47b1c71b546259051b7 SHA512 ac11d3d3c8bccb2aa875dc5e5df2dc07517abda3fdace75a939be90cf83d772d5a535e4e3188a2873ce8f06785b9013faeee2841140d4a7ac3e2e52121faa097
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 37088b5933c3..717311a09670 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -8,11 +8,9 @@
 	<use>
 		<flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag>
 		<flag name="ncat">Install the ncat utility</flag>
-		<flag name="ndiff">Install the ndiff utility</flag>
 		<flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>
 		<flag name="nping">Install the nping utility</flag>
 		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
 		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
-		<flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index e974f482eb28..c31710c9585a 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -2,11 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs user
 
 MY_P=${P/_beta/BETA}
+inherit autotools desktop flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A utility for network discovery and security auditing"
 HOMEPAGE="https://nmap.org/"
@@ -14,21 +12,13 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="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 ~x86-macos"
+IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
+REQUIRED_USE="system-lua? ( nse )"
 
-IUSE="
-	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
-	zenmap
-"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
@@ -37,8 +27,6 @@ RDEPEND="
 		net-libs/libssh2[zlib]
 		sys-libs/zlib
 	)
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
 	nmap-update? (
 		dev-libs/apr
 		dev-vcs/subversion
@@ -49,17 +37,9 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:= )
 	)
 	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	zenmap? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
 "
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	"${FILESDIR}"/${PN}-5.21-python.patch
@@ -73,12 +53,6 @@ PATCHES=(
 )
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
@@ -86,22 +60,6 @@ src_prepare() {
 
 	default
 
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
 	sed -i \
 		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
 		Makefile.in || die
@@ -126,14 +84,13 @@ src_configure() {
 	# tree, so we cannot use the system library here.
 	econf \
 		$(use_enable ipv6) \
-		$(use_enable nls) \
 		$(use_with libssh2) \
 		$(use_with ncat) \
-		$(use_with ndiff) \
+		--without-ndiff \
 		$(use_with nmap-update) \
 		$(use_with nping) \
 		$(use_with ssl openssl) \
-		$(use_with zenmap) \
+		--without-zenmap \
 		$(usex libssh2 --with-zlib) \
 		$(usex nse --with-zlib) \
 		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
@@ -175,9 +132,4 @@ src_install() {
 	fi
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
 }
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 7f9ceb695c1b..f45ed83d38ad 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -2,11 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs user
 
 MY_P=${P/_beta/BETA}
+inherit autotools desktop flag-o-matic git-r3 toolchain-funcs user
 
 DESCRIPTION="A utility for network discovery and security auditing"
 HOMEPAGE="https://nmap.org/"
@@ -16,17 +14,9 @@ SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
+REQUIRED_USE="system-lua? ( nse )"
 
-IUSE="
-	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
-	zenmap
-"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
@@ -35,8 +25,6 @@ RDEPEND="
 		net-libs/libssh2[zlib]
 		sys-libs/zlib
 	)
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
 	nmap-update? (
 		dev-libs/apr
 		dev-vcs/subversion
@@ -47,17 +35,9 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:= )
 	)
 	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	zenmap? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
 "
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	"${FILESDIR}"/${PN}-5.21-python.patch
@@ -72,12 +52,6 @@ PATCHES=(
 )
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
@@ -85,22 +59,6 @@ src_prepare() {
 
 	default
 
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
 	sed -i \
 		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
 		Makefile.in || die
@@ -125,14 +83,13 @@ src_configure() {
 	# tree, so we cannot use the system library here.
 	econf \
 		$(use_enable ipv6) \
-		$(use_enable nls) \
 		$(use_with libssh2) \
 		$(use_with ncat) \
-		$(use_with ndiff) \
+		--without-ndiff \
 		$(use_with nmap-update) \
 		$(use_with nping) \
 		$(use_with ssl openssl) \
-		$(use_with zenmap) \
+		--without-zenmap \
 		$(usex libssh2 --with-zlib) \
 		$(usex nse --with-zlib) \
 		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
@@ -174,9 +131,4 @@ src_install() {
 	fi
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
 }