gentoo auto-resync : 05:09:2022 - 04:23:36

4 files changed, 32 insertions, 6 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c0eb5b4515ab..6fe39fa4478f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 762dd6ee261a..ee7e14c14d8e 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -14,6 +14,6 @@ DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9
 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 3369 BLAKE2B 0cb845bf418d6d93c42c59e480457cbc002dddb8721983d0ce18e22673a108a00db37f16fae5c0c138e461426191b50ce3e6b70e80c7d938b4d3f1343d436e80 SHA512 bc4f57e19ca735af6cde2459f163f7c99ea094ccca0b72c29f4bf4a6b14d4de96ff9e9bf070ef0f8e890d899e4f0c91e99b05115bdc0225ff7040621a0191d5d
-EBUILD nmap-7.93.ebuild 3392 BLAKE2B 6a6eed04c3385906809b451adda327ad366022cda7aea833b2e750965fae4b48430ced0bc23a5a56cef53ee933ebc3405abcd3261750a55fcaa67f5938ee2b8d SHA512 0a6f1c6bb18a83437b83e8383eed6211535cacc68e5acf8043186b0f0c704b079ddfe4855fb3665924d04b7e426a4227d6e49f228baf7eaa5958355ce82c025e
-EBUILD nmap-9999.ebuild 3392 BLAKE2B 6a6eed04c3385906809b451adda327ad366022cda7aea833b2e750965fae4b48430ced0bc23a5a56cef53ee933ebc3405abcd3261750a55fcaa67f5938ee2b8d SHA512 0a6f1c6bb18a83437b83e8383eed6211535cacc68e5acf8043186b0f0c704b079ddfe4855fb3665924d04b7e426a4227d6e49f228baf7eaa5958355ce82c025e
+EBUILD nmap-7.93.ebuild 3699 BLAKE2B 40cb8eeb232bd6e1b97600e6028389c20ee43d88b006cbde73bd313d8845f7e42dbcc912c27d23379158c2b0d309cb65be06df502234a7dd6d04e48571336ef5 SHA512 0dff843615da0b97a66de6746d8a256a4651b09ecabfaa45d6fa18f393af1b519bbc24457047219d943b4de3e7553c401003c7c083527b6e9a0190aa294197f9
+EBUILD nmap-9999.ebuild 3699 BLAKE2B 40cb8eeb232bd6e1b97600e6028389c20ee43d88b006cbde73bd313d8845f7e42dbcc912c27d23379158c2b0d309cb65be06df502234a7dd6d04e48571336ef5 SHA512 0dff843615da0b97a66de6746d8a256a4651b09ecabfaa45d6fa18f393af1b519bbc24457047219d943b4de3e7553c401003c7c083527b6e9a0190aa294197f9
 MISC metadata.xml 964 BLAKE2B be7a2b72cd346cdcf83df81cab6c28666067a17516e58bb0570572fcc4467258de1e913cb9448635080e0c3915c9efd0a4b2e19c6a480d70afda149574f725eb SHA512 fd3ef56d6a5513553a934348712ad0e9c5a6578f3eb8d9069cb5ea7076eafd58c207a1f5007371bedb60e9319c221280d37f129804eb3072b1fb4adb8e4da184
diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
index 9470b5ddbf08..c65faf378336 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools flag-o-matic lua-single python-any-r1 toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
@@ -51,7 +52,10 @@ RDEPEND="
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
 
 if [[ ${PV} != *9999* ]] ; then
 	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
@@ -71,6 +75,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+	python-any-r1_pkg_setup
+
 	use system-lua && lua-single_pkg_setup
 }
 
@@ -96,6 +102,13 @@ src_prepare() {
 }
 
 src_configure() {
+	export ac_cv_path_PYTHON="${PYTHON}"
+	export am_cv_pathless_PYTHON="${EPYTHON}"
+
+	# Workaround for https://github.com/nmap/nmap/issues/2516
+	# bug #868483
+	append-cppflags -DOPENSSL_API_COMPAT=10101
+
 	# The bundled libdnet is incompatible with the version available in the
 	# tree, so we cannot use the system library here.
 	econf \
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 9470b5ddbf08..c65faf378336 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools flag-o-matic lua-single python-any-r1 toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
@@ -51,7 +52,10 @@ RDEPEND="
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
 
 if [[ ${PV} != *9999* ]] ; then
 	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
@@ -71,6 +75,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+	python-any-r1_pkg_setup
+
 	use system-lua && lua-single_pkg_setup
 }
 
@@ -96,6 +102,13 @@ src_prepare() {
 }
 
 src_configure() {
+	export ac_cv_path_PYTHON="${PYTHON}"
+	export am_cv_pathless_PYTHON="${EPYTHON}"
+
+	# Workaround for https://github.com/nmap/nmap/issues/2516
+	# bug #868483
+	append-cppflags -DOPENSSL_API_COMPAT=10101
+
 	# The bundled libdnet is incompatible with the version available in the
 	# tree, so we cannot use the system library here.
 	econf \