gentoo resync : 12.03.2021

3 files changed, 54 insertions, 5 deletions

diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index ff6303e2eb59..f0de26d7c1d2 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,4 +1,6 @@
 DIST wapiti3-3.0.3.tar.gz 553259 BLAKE2B c31a1ce3e367c7b85141b0a83c9617a901f01753ebcc56142092d475bf3d540fac6d4e529fc87f5919c962303451787db9e1f8872a5e70a646ff48c1b076139e SHA512 ed135a97ee0c2431fa15d87888eca424db389e9e54b1426e0efe7a83299ee110cb9895916c5f5f3690a99f81034e8ad0d97e3e432b2d478b89a3ba14534ddb96
+DIST wapiti3-3.0.4.tar.gz 534781 BLAKE2B ba23099dc0d1616763fd143fc87195682cb82b6b4a0d2b438abf50e23271e747ed34b0291d30b7250eb517cbf00d7429205d421eb22b38ce34287603a85cf6e7 SHA512 377bf0ca38eb219bb480f7456197e83042cb71f1e05f1cb51e81def6bb2128c3ccb2eba30f4ec856530b00ec1a0e4bc231068811669abca572dcaf4b229fcc75
 EBUILD wapiti-3.0.3.ebuild 946 BLAKE2B e1bb2d1cd7ce52359075ce69aca257829fd6cee504c5767de9ab0246616331dc0c9a79938a3917d0f49b3cc352886ad8600f65ac740050b93db6c42fe0f5c5bb SHA512 b4a884e716a0b050b8f448471beac7bef440adce05c62593a025c6e893fa8b359cccaa4da1c8fcb174f99f9072ed2a37fb1ced54d4582ebcad1fffc5cba1ce7e
-EBUILD wapiti-9999.ebuild 1006 BLAKE2B 9ca5b38c2b8586bc13b06a561762b6c6d5c8876045f60da896f9a5e869ad0c6a52339d74f598c3bdcb773aed5ab343f5f4213b7e20903334b58c84d3762ce0b4 SHA512 e0dce191e7bb241e3e7f2b0a4121669fb61c090d12277f2246a89f87ea5ac8959f622d18a92d2a8d6318904c70a9f40a41a6094ca0984b9bc2a86d593ae8b4e8
+EBUILD wapiti-3.0.4.ebuild 1176 BLAKE2B fb0532aa391782cb70875d77d5eacca4ca327a89ee57c05383d14473c9b9d9ae26f11da95dff8f2f6f64afa0d314af12aedab50b5286d2c8b82db62b41017fb4 SHA512 af4597cfe72e7b3425d1873b4042a0fd19416564796977b57ac8da10b9ef72814e192c37e466e13fe2ac4f79edcf2ee426995049a0f0620e62010f54fdd7f8f6
+EBUILD wapiti-9999.ebuild 1144 BLAKE2B a4b45abcb5d257b1c5903049c1ae646c0775f1ba31e128773f08d02943756801396c26c7b5bd3debdeac171a9e84c5e2507d7b870bfa85710a767a639f4d87a6 SHA512 968db61ffe6775dcd414b0c8a0f0f46e040b335e6131a053fe3c9b30a643dc8587d064a04f2a8db502ba34ad07eb5680960de803aaad320b28a113ab2ac7136c
 MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25
diff --git a/net-analyzer/wapiti/wapiti-3.0.4.ebuild b/net-analyzer/wapiti/wapiti-3.0.4.ebuild
new file mode 100644
index 000000000000..4363743763ef
--- /dev/null
+++ b/net-analyzer/wapiti/wapiti-3.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..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/beautifulsoup:4[${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*'])/" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 1f375f8034b2..53d40bbaa97b 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1 git-r3
@@ -27,10 +27,14 @@ RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] )
 	ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )"
 
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
 BDEPEND+=" test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+# Many tests require execution of local test php server
+RESTRICT="test"
 
 python_prepare_all() {
-	sed -e 's/"pytest-runner"//' -i setup.py || die
+	sed -e 's/"pytest-runner"//' \
+		-e "/find_packages/s/()/(exclude=['tests*'])/" \
+		-i setup.py || die
 	distutils-r1_python_prepare_all
 }