commit: 13ee7a9df5bf0c260bacd64cc4d5145d30163ae7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jun 8 11:02:23 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 8 11:08:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ee7a9d
net-analyzer/nmap: rebase patches for live, prep for 7.97 * Rebase patches (thanks to jospezial for starting this) * Skip ndiff tests as they rely on 'imp', removed from py3.13 * Wire up ndiff via PEP517 too Bug: https://bugs.gentoo.org/933471 Bug: https://bugs.gentoo.org/954011 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/nmap/Manifest | 1 + net-analyzer/nmap/nmap-9999.ebuild | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 110ce5fadf78..32fb686ab57c 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -1,3 +1,4 @@ DIST nmap-7.95-patches-2.tar.xz 5740 BLAKE2B 860e7702e2ae1211c4eeeb8f869730de2279a305389f54317f883d2094bfbb1efb9031a761af93bfa8ab56e06bea774dea5807d134dd64f94c2191340a21113b SHA512 e4fb7350ea7e7f2e62f089129c0962652e556fb3bdf272d78c834db299f7f92c3238344c8bd50fea7d1360460ca4768ddad7367ecfcaefdb51125c66cd6981dd DIST nmap-7.95.tar.bz2 11717069 BLAKE2B 4ab4912468f6c1cf7517090bc94b1bb34e665fe1b3db973e1c7bb2d05cb885545cdf3ca5c7fb548ff0012b800f5dd60ed2f2010fc9fb62ba7d6a28537287193c SHA512 fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e DIST nmap-7.95.tar.bz2.asc 181 BLAKE2B 31db32cb5ad42be25d4b87d8619e0865d7089618839311ada9a2c1e0c9bc89f82ca6253e8151930f152c3fac7ad820ca747ed8427d008f9b04ad2b9e0a0e2b71 SHA512 ce56893796def1b7e8ae96cce90dda073ad84d657cd15d980ee14562a07f7522d438a40ac58422b6f6de7201a9f2678413018633529cb8dcc4e580cfe678c092 +DIST nmap-7.97-patches-1.tar.xz 6236 BLAKE2B aface99574e5316191bb43a2434bc158fef5ed3b6999b671d44f6820547e1b9e1769ecee6303da2326e5980975d77acf812ee722e4bfa6c667e3eeea0d7d4d81 SHA512 e989f015deb22365b058fd111b22e63ecb0056718381cf03b298303e1f46fb0eda98eb0647898356224e6fc36544c84a2ad5c261346d3b23ba2fa6947461fd61 diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index b211bbcc9a4c..5fb98e8dded9 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ LUA_REQ_USE="deprecated" DISTUTILS_OPTIONAL=1 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" PLOCALE_BACKUP="en" inherit autotools distutils-r1 lua-single plocale toolchain-funcs @@ -30,7 +30,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"; +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.97-patches-2.tar.xz"; # https://github.com/nmap/nmap/issues/2199 LICENSE="NPSL-0.95" @@ -84,7 +84,7 @@ if [[ ${PV} != *9999* ]] ; then fi PATCHES=( - "${WORKDIR}"/${PN}-7.95-patches-2 + "${WORKDIR}"/${PN}-7.97-patches-1 ) pkg_setup() { @@ -171,12 +171,23 @@ src_compile() { AR="$(tc-getAR)" \ RANLIB="$(tc-getRANLIB)" - if use zenmap ; then - cd zenmap || die + if use ndiff || use zenmap ; then distutils-r1_src_compile fi } +python_compile() { + if use ndiff ; then + cd "${S}"/ndiff || die + distutils-r1_python_compile + fi + + if use zenmap ; then + cd "${S}"/zenmap || die + distutils-r1_python_compile + fi +} + src_test() { local -x PATH="${S}:${PATH}" @@ -196,11 +207,8 @@ src_install() { use symlink && dosym /usr/bin/ncat /usr/bin/nc - if use ndiff ; then - python_optimize - fi - - if use zenmap ; then + if use ndiff || use zenmap ; then distutils-r1_src_install + python_optimize fi }
