gentoo auto-resync : 03:04:2023 - 05:19:36

5 files changed, 29 insertions, 23 deletions

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d1afc239c886..e975e106f48a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -14,7 +14,7 @@ DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
 DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9
-EBUILD nmap-7.92-r2.ebuild 3316 BLAKE2B 12da03bd72fe53a0063de4995ee87d394d4f7a5ef68efa44b974d05f4d0971ab4f160ee413870525c0099c6bf595e5a6d5098c780da1a488ea5b06a43f77cad7 SHA512 3a7977e65568b7ad7f42c5cb0853cefbdd0bc0cb842ed6df307cadea4e1eddad6ed78cb946e8956387f1bb23cd596a6a18a35ad54e1f5161561f762f9e6185c3
-EBUILD nmap-7.93-r2.ebuild 3650 BLAKE2B 428bf50d31630f04a765f91a9b378d5b862fdcafde588ecfb48bbfc39e9af625bff876a2b5cec7596b49ce13534d954bc963cbe76851120c4001c5e22ea48022 SHA512 d3eb9dbd4e934071f8ff04ce95b896e983f7b205ad28f0f0e3395f1f37f4af6a1bf717347cb26b094aba148a54190e254baf2c5b15fb9f65cd5a1fe997ecb1d1
-EBUILD nmap-9999.ebuild 4351 BLAKE2B 43670eb22b986333b9145ad6dd09ca08adbd59f0c51e7d2b0344acefa9d35bee50f1e609e453b425b0eb0fe97240cfc340f14b422f0574d08a6fa9276f3a58ee SHA512 4c68c8487bf41bc37f3654289a392865c792e89e32753aaf5bf60561f1a6861c90de66cd19db72750f673b113d9bf1c788d317cafceb54831bfe13027f644683
-MISC metadata.xml 979 BLAKE2B 03e2593e85b39b5c718f97ebca7bd9301b55d6e379588ecb212b1321b800e86a46c3983ec7b029547684209d58e3166468fc78e67fa235126f0dd470c20eadbf SHA512 3c5914ec5f7aae6da8bcf31630a3068f85243b0ec7699f6e789473bab02d1f9c91b41c655f154039e681e592e48dcee584a663ccf9dd5e9f00a19f1313736715
+EBUILD nmap-7.92-r3.ebuild 3216 BLAKE2B 3867fc082afe912064d2768ea370296caa27dc653a8bfea2d669db4ff5f02ccae24049f3e2af8e97b027c8290eba525d7558690fbe848ea92a4403f5665d1ca5 SHA512 98229d1f5f80299ef4b6aa778b86244b997c87a0b7c3a412d84a56e435825d01cc781632d67215131482f8c2328cc0dcdc8ea6e401eb6c2e6c8cbe7b3f234902
+EBUILD nmap-7.93-r3.ebuild 3550 BLAKE2B f4cbd689bc3bd6fcfad89e1a0ff3a581c0894d5bd1037f795009d91dc4f32c7648385ad9a62557e955159064349755f5e314c0b466360a2405ca47873f7b262e SHA512 97da0620154f0ea441a44463ebf4f5c8c08d4a819585b1a718e9a2291f5a6e1a0dafdbfb9f408b4d462af3535e8f1788021d9c15538ed1437a7cd790312bac7d
+EBUILD nmap-9999.ebuild 4308 BLAKE2B 03558eab8ab82a987d48b1f43a5a5b30bf43e61ba9543594fe747ec47ebed3ea62b0699c2bd5e4e8bbf38a7777bb9534d603895a862233ecebe2a27f76e54f5b SHA512 ba399a601521ea6dfaec1ecaf886edc6c71f514721863a303db54df8853f06fe93e50c3a9c72532dda78772c8a1a7029e629e1c4faaa9194351560d41181f9a2
+MISC metadata.xml 888 BLAKE2B 0fa642ab34c24d35347876c96e2ab28de71d153202b14ef551c8222a808218c34fa990857cbc7273ac2551e5fe2d6afc27124a47de979872f46e30b0451d9c56 SHA512 214887e52ca334207125fb3fa534ec8f4ae4d9985c93695e798cf21625b7d3113852a2e835bbcccf833ae01c1e89e8be0ffb31d409db7ebdbc4920c3e3416a6c
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index e31f57e3f592..c93c9fdc4493 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="nping">Install the nping utility</flag>
 		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
 		<flag name="symlink">Install symlink to nc</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>
 	<upstream>
diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r3.ebuild
index 2c418afbe2a5..62e1a494d022 100644
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r3.ebuild
@@ -26,9 +26,9 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink"
 REQUIRED_USE="
-	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	nse? ( ${LUA_REQUIRED_USE} )
 	symlink? ( ncat )
 "
 
@@ -40,13 +40,15 @@ RDEPEND="
 		net-libs/libssh2[zlib]
 		sys-libs/zlib
 	)
-	nse? ( sys-libs/zlib )
+	nse? (
+		${LUA_DEPS}
+		sys-libs/zlib
+	)
 	ssl? ( dev-libs/openssl:0= )
 	symlink? (
 		!net-analyzer/netcat
 		!net-analyzer/openbsd-netcat
 	)
-	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
 
@@ -67,7 +69,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	use system-lua && lua-single_pkg_setup
+	use nse && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -99,9 +101,9 @@ src_configure() {
 		$(use_with libssh2) \
 		$(use_with ncat) \
 		$(use_with nping) \
+		$(use_with nse liblua) \
 		$(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 \
diff --git a/net-analyzer/nmap/nmap-7.93-r2.ebuild b/net-analyzer/nmap/nmap-7.93-r3.ebuild
index 0b02e213c5e4..d2a477897b76 100644
--- a/net-analyzer/nmap/nmap-7.93-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.93-r3.ebuild
@@ -28,9 +28,9 @@ fi
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="|| ( NPSL-0.94 NPSL-0.95 )"
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink"
 REQUIRED_USE="
-	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	nse? ( ${LUA_REQUIRED_USE} )
 	symlink? ( ncat )
 "
 
@@ -42,7 +42,10 @@ RDEPEND="
 		net-libs/libssh2[zlib]
 		sys-libs/zlib
 	)
-	nse? ( sys-libs/zlib )
+	nse? (
+		${LUA_DEPS}
+		sys-libs/zlib
+	)
 	ssl? ( dev-libs/openssl:0= )
 	symlink? (
 		ncat? (
@@ -50,7 +53,6 @@ RDEPEND="
 			!net-analyzer/openbsd-netcat
 		)
 	)
-	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -79,7 +81,7 @@ PATCHES=(
 pkg_setup() {
 	python-any-r1_pkg_setup
 
-	use system-lua && lua-single_pkg_setup
+	use nse && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -114,9 +116,9 @@ src_configure() {
 		$(use_with libssh2) \
 		$(use_with ncat) \
 		$(use_with nping) \
+		$(use_with nse liblua) \
 		$(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 \
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 8617f57210bf..f18840ef8839 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -30,10 +30,10 @@ fi
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
 SLOT="0"
-IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap"
+IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	nse? ( ${LUA_REQUIRED_USE} )
 	symlink? ( ncat )
 "
 
@@ -47,7 +47,10 @@ RDEPEND="
 		sys-libs/zlib
 	)
 	nls? ( virtual/libintl )
-	nse? ( sys-libs/zlib )
+	nse? (
+		${LUA_DEPS}
+		sys-libs/zlib
+	)
 	ssl? ( dev-libs/openssl:= )
 	symlink? (
 		ncat? (
@@ -55,7 +58,6 @@ RDEPEND="
 			!net-analyzer/openbsd-netcat
 		)
 	)
-	system-lua? ( ${LUA_DEPS} )
 	zenmap? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -64,6 +66,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
+# Python is always needed at build time for some scripts
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
@@ -90,7 +93,7 @@ PATCHES=(
 pkg_setup() {
 	python-single-r1_pkg_setup
 
-	use system-lua && lua-single_pkg_setup
+	use nse && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -134,10 +137,10 @@ src_configure() {
 		$(use_with ncat)
 		$(use_with ndiff)
 		$(use_with nping)
+		$(use_with nse liblua)
 		$(use_with ssl openssl)
 		$(use_with zenmap)
 		$(usex libssh2 --with-zlib)
-		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua)
 		$(usex nse --with-zlib)
 		--cache-file="${S}"/config.cache
 		# The bundled libdnet is incompatible with the version available in the