gentoo resync : 25.04.2020

4 files changed, 9 insertions, 58 deletions

diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index 3e6ee0180b9d..fcfe7b6f3c0e 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,6 +1,4 @@
-DIST wapiti3-3.0.2.tar.gz 561658 BLAKE2B f013b7d3c23cc3b655503de9f14d53b24d281604344c558791561c900fbe8b1a591c6b56970b41c961b38f65680799bf254887f4613d8e2bc96ddbc0a6aa7c24 SHA512 02f0e2510ce428b6dd89251ec63b5806b34e8e02302c7fa8fb1d9460a4e8c073b4650c066183ef20dc554440721f0b659a6ea30ad38f05865fb0fccc1cca758f
 DIST wapiti3-3.0.3.tar.gz 553259 BLAKE2B c31a1ce3e367c7b85141b0a83c9617a901f01753ebcc56142092d475bf3d540fac6d4e529fc87f5919c962303451787db9e1f8872a5e70a646ff48c1b076139e SHA512 ed135a97ee0c2431fa15d87888eca424db389e9e54b1426e0efe7a83299ee110cb9895916c5f5f3690a99f81034e8ad0d97e3e432b2d478b89a3ba14534ddb96
-EBUILD wapiti-3.0.2.ebuild 999 BLAKE2B 6912380533828b179d8fe9850d74c35190d55e0c59a3059603ddeaa58b1c7219381de5f5455bdbcbcccdf01a080d5d7218af54f75b273825824cccb79c3b5858 SHA512 cf51b5c03661e20e1783fa7133c782e9643d43c8af7f28f226449c1a143e0b10f993218f2018e19a93fd3405247a3148a9eac64c32c4c28a6a93ee4c938b8b17
-EBUILD wapiti-3.0.3.ebuild 1003 BLAKE2B 33b785e3609818c3771c171ac01c2dee64844540d5e79c4346c7ae27f3da3912026a67dd7931ca5aba47538be440d0d3e0a757080303f38e8616ae36ad337a59 SHA512 1d6c4bb8408d61a1fa813ddc85a42f2df83784ff08a2138622d0573198d785c89b1c8706a5c5741c226551e756708b1fbce852c427bec72867284657d68c268b
-EBUILD wapiti-9999.ebuild 967 BLAKE2B 2c93219385a04edbdbd3723a0a8f12000908f4430f4810d071bccdae1ccc92dcd9ee39be6a4c1df33108f1a86a8ca1679f2b2470063069b930f23fe832da3b40 SHA512 32a81fe623e896493be2ef09e6224ebe13037ea2e168ede4e341ab9701106d8cf4e84c0b815d56ab178ad1aebd68c43891a97b46a8251c9269ee7e8ed738acfe
+EBUILD wapiti-3.0.3.ebuild 915 BLAKE2B 50dd4b4345d588be5a1c6f0472069722632eafb140977befa693b1d2a575ab1189c0a107529921d850102ae3c42fc2c8621f79643403b475293e338fb069fd04 SHA512 0c5d834ad8167d1e9163e5b76e25f67e46789d59b6879f9d77a46841628b435c80692d217c3a5e2359ef96da218ccc43bf6790233c23d14b1b9f0a3af649e63f
+EBUILD wapiti-9999.ebuild 975 BLAKE2B edef62f884693d1209a77d1cafe370d83976c57a914072cf9743dc4fbcca91d15b27a60c633088d848099e8f9b7ea4b33ad689b1b70b6abe3a06f3309bf35ed8 SHA512 aa9cd40e26339742caf593e4ef8fb48233f56646684bfd27f015231c2d5add6ef1311e61b1bfbb6b8953baca37375c3cf3c81f534244c26fca9474c6db021f7a
 MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25
diff --git a/net-analyzer/wapiti/wapiti-3.0.2.ebuild b/net-analyzer/wapiti/wapiti-3.0.2.ebuild
deleted file mode 100644
index 58cddc1b33e8..000000000000
--- a/net-analyzer/wapiti/wapiti-3.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-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 test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-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}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	sed -e 's/"pytest-runner"//' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/net-analyzer/wapiti/wapiti-3.0.3.ebuild b/net-analyzer/wapiti/wapiti-3.0.3.ebuild
index c9bf7dc9b105..b74bc61781ce 100644
--- a/net-analyzer/wapiti/wapiti-3.0.3.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1
@@ -16,13 +16,8 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="kerberos ntlm test"
+IUSE="kerberos ntlm"
 
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-python/pytest[${PYTHON_USEDEP}]
-	)"
 RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 8a61f85b7acf..ef1480dd21ea 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1 git-r3
@@ -15,13 +15,8 @@ EGIT_REPO_URI="https://git.code.sf.net/p/wapiti/git wapiti-git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="kerberos ntlm test"
+IUSE="kerberos ntlm"
 
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-python/pytest[${PYTHON_USEDEP}]
-	)"
 RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
@@ -31,6 +26,9 @@ 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
+BDEPEND+=" test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+
 python_prepare_all() {
 	sed -e 's/"pytest-runner"//' -i setup.py || die
 	distutils-r1_python_prepare_all