6 files changed, 13 insertions, 55 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e80778ff6a50..c19d79fd7077 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index f0cbde08de7d..7f1b965d202f 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,8 +1,6 @@
-DIST wapiti3-3.0.5.tar.gz 573630 BLAKE2B 4f6425c54542e3fcf12f50a7ebe4aeeb38083bd04e6a9415466a24ca907e787149b6462972cb6c9d29f4c89bf1f941ae2566b126746bee3697172f342befd7fb SHA512 c1bfdcd4114ec508b4b16e7a4389b23b25326816c7daf0e7fb634ce08b59b983dec92f92287a18cbe7ecde9a06a04da98cfd744f818efc57c606be143fe7db4d
-DIST wapiti3-3.1.2.tar.gz 654586 BLAKE2B 6abbb35060ef554e8b803a82744527a361fe3803871b39dc078938c4af70a3f6e1a2adeec95c0ff487aff650d92a3638cb655439d342c2b516a5279ee02af472 SHA512 cd16d5b265a49441ad45341630ea6a2df150172b774d3282ee229b5a73274eed293ad35c6fc5e26443dc96f1437dcd28b77240210840c65cb3f1f7b6e9234c2d
 DIST wapiti3-3.1.3.tar.gz 651457 BLAKE2B 7b0a0837012a25c4a0d4288730bb16dd056910d79e8d26712d7e508a9a51d7e23eb5fc29f0a619b534e2fe5e87262d91d4c29db50a02b500eb516c68f0850fc3 SHA512 321e068ddb117faa42c3f8cb01957ec7313a700bcb5b312b832d717a3957d3f6226bcf67c4348cc0b91cb13ec713828d0b03b662ea2f170d32f88d0721dd93bf
-EBUILD wapiti-3.0.5.ebuild 1176 BLAKE2B a9bb69fda90c709bc5860e283b7747ba5ad443ebaf74064272477cd77a44867464d7f4114540ec984c82de8221c968c149be5adfd61ab2e30cb9e76f0597c17d SHA512 e8ad47e3d59c28ffd5ad5576bff1368aa5bd0bed289a8b1a57b69a72102740368a29e8cddacf6208f9c10969b1846c5c7d2d5bd23c99508ed7ed258e4667c039
-EBUILD wapiti-3.1.2.ebuild 1393 BLAKE2B 4020f098880dd1d5ce675e396d4fd4490bafe0b810466d7456c5782b0ccc9b58fb4035a8c58567ad75f6bbf8f5ed759b8545a181541b86d938325c53e5c8fc53 SHA512 e0c1a88e0228e367aab22dc7dce6f76192ecce8e69c583536e11c5994085b107f03a4967abfd8ecefa0c10e2d5931d9b8724a4df0a5ff630eae3eb265d6cc813
+DIST wapiti3-3.1.6.tar.gz 538064 BLAKE2B fca98e05af7e4979ce5cc1360c565748b720f84e640accc9abd6d60017696827fb119228fec37bcf905e6e9f29c07ad5b9041a16fb49a6204777df07dd642bbd SHA512 8017d88c35a232f20f97297f5955154bead777a1b3d3937d29e6a39d2eeb5167764aa81286bfca5b9d200a29c25a6173052ddd8cbfebc1cb18aa84c0e2bb0e22
 EBUILD wapiti-3.1.3.ebuild 1393 BLAKE2B 4020f098880dd1d5ce675e396d4fd4490bafe0b810466d7456c5782b0ccc9b58fb4035a8c58567ad75f6bbf8f5ed759b8545a181541b86d938325c53e5c8fc53 SHA512 e0c1a88e0228e367aab22dc7dce6f76192ecce8e69c583536e11c5994085b107f03a4967abfd8ecefa0c10e2d5931d9b8724a4df0a5ff630eae3eb265d6cc813
-EBUILD wapiti-9999.ebuild 1361 BLAKE2B 02e9aaeb1a68aa6ba75a49bf72e586162c8de8c20c50e5b922837f8a8681e2d5c710dbddf7b1c3e7e8b2151efdfdf9efd48e406ad71fe80ebff6c445d7e8dfe8 SHA512 970b851c771418a6972275fa044a7503a756e9c03d2a83779deb1517e263a8a1913206008715f90c13d9dd619e030208ada7ef897312652d1ed5b4f480c20287
-MISC metadata.xml 865 BLAKE2B e8781a338561470a25c292df4d1daf6e44321f78c9209b5606bc2fc1746853750b591b670ebd2567423926c4b65d85580e0d752c3dfd0b833b8010f4f4cb5f48 SHA512 f67382517b25273f45510a2d84128c139b9ac989584290c1ff84e22c16ba79d5a950071434ab54818a09c127db6c0ab1f3c15bb1e1171c9618b7f8c3744e9876
+EBUILD wapiti-3.1.6.ebuild 1427 BLAKE2B 85e132377a78f1815534b8854a567407ec7b8654c3536b86e3f095ab65dd9322d3e943b5d7fc3180acc2df313de74354ac7829f94069d8c76274d225c2fea360 SHA512 b50f5103bb4931bead7d6e890c19e5df5c2759a1a6ef700ddae138b8057953ccdbb938fbbb97ce741bccd76e77b7688aa67caf80c9bf69e8921ec9b3b0fd978c
+EBUILD wapiti-9999.ebuild 1395 BLAKE2B b333888db19dc17781afdc1b8616d7395446ed06737e0205a9f4b56e9fb89242314edbef23bb3c37f981a4ab6e562b89556067ef0f8330ac3bf4aec5bbad6e12 SHA512 938b82ec4a8103eb42986a1972e773c2ddb1f4d77d1323461bc9b144f651a984bb314a62727239041b9de55f6920d7a84ff2ca8e321430decb2a5ee11a62b33f
+MISC metadata.xml 826 BLAKE2B a208e446822ec67d274724c24f59681afb7d1d66378828ca94103355b134acc951a699b71c584f539a8dc344e7782c6ae7fef637c35e567b783babc22eff00a1 SHA512 601effee73d6c7a39ba4e90fb62b4e8b6fc7d795a5925202cfc30dcc57ecdf479e970e4c8a225a49996f366671f0b9c9b3aa6b954e012af1ec9fbc61bb6f8dd7
diff --git a/net-analyzer/wapiti/metadata.xml b/net-analyzer/wapiti/metadata.xml
index cbfe6085afed..4de9c0e68a4e 100644
--- a/net-analyzer/wapiti/metadata.xml
+++ b/net-analyzer/wapiti/metadata.xml
@@ -14,7 +14,6 @@ Once it gets this list, Wapiti acts like a fuzzer, injecting payloads to see if
 		<remote-id type="sourceforge">wapiti</remote-id>
 	</upstream>
 	<use>
-		<flag name="kerberos">Support Kerberos authentication</flag>
-		<flag name="ntlm">Support NTLM authentication</flag>
+		<!-- Need extra dep <flag name="ntlm">Support NTLM authentication</flag> -->
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/wapiti/wapiti-3.0.5.ebuild b/net-analyzer/wapiti/wapiti-3.0.5.ebuild
deleted file mode 100644
index f181098a26f1..000000000000
--- a/net-analyzer/wapiti/wapiti-3.0.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-PYTHON_REQ_USE='xml(+)'
-
-inherit distutils-r1
-
-MY_P=${PN}3-${PV}
-DESCRIPTION="Web-application vulnerability scanner"
-HOMEPAGE="http://wapiti.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos ntlm"
-
-RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
-	dev-python/tld[${PYTHON_USEDEP}]
-	dev-python/yaswfp[${PYTHON_USEDEP}]
-	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
-	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests --install pytest
-BDEPEND+=" test? ( dev-python/responses[${PYTHON_USEDEP}] )"
-# Many tests require execution of local test php server
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	sed -e 's/"pytest-runner"//' \
-		-e "/find_packages/s/()/(exclude=['tests*'])/" \
-		-e "/DOC_DIR =/s/wapiti/${PF}/" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/net-analyzer/wapiti/wapiti-3.1.2.ebuild b/net-analyzer/wapiti/wapiti-3.1.6.ebuild
index 0c3c245a76d7..3ab9a88d574c 100644
--- a/net-analyzer/wapiti/wapiti-3.1.2.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.1.6.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
@@ -18,6 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # Requires httpx-ntlm (to package)
 #IUSE="ntlm"
+IUSE="test"
 
 # httpx requires brotli and socks, so depending on
 # dev-python/socksio and dev-python/brotlicffi
@@ -31,7 +33,7 @@ RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/tld[${PYTHON_USEDEP}]
 	dev-python/yaswfp[${PYTHON_USEDEP}]"
 
-distutils_enable_tests --install pytest
+distutils_enable_tests pytest
 # Tests also require unpackaged respx
 BDEPEND+=" test? (
 				dev-python/pytest-asyncio[${PYTHON_USEDEP}]
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 979d31139bd6..462342ee254f 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1 git-r3
@@ -17,6 +18,7 @@ SLOT="0"
 KEYWORDS=""
 # Requires httpx-ntlm (to package)
 #IUSE="ntlm"
+IUSE="test"
 
 # httpx requires brotli and socks, so depending on
 # dev-python/socksio and dev-python/brotlicffi
@@ -30,7 +32,7 @@ RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/tld[${PYTHON_USEDEP}]
 	dev-python/yaswfp[${PYTHON_USEDEP}]"
 
-distutils_enable_tests --install pytest
+distutils_enable_tests pytest
 # Tests also require unpackaged respx
 BDEPEND+=" test? (
 				dev-python/pytest-asyncio[${PYTHON_USEDEP}]