From 5c459c83b550984629c1fefc7191a6987e189d83 Mon Sep 17 00:00:00 2001
From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Mon, 20 Apr 2020 00:59:34 +0200
Subject: net-analyzer/wapiti: add python 3.8 and fix tests

Releases do not have tests included, dropped them in 3.0.3 and fixed
call/dependencies in live ebuild

Closes: https://bugs.gentoo.org/714688
Closes: https://bugs.gentoo.org/718428
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
---
 net-analyzer/wapiti/wapiti-3.0.3.ebuild | 10 ++--------
 net-analyzer/wapiti/wapiti-9999.ebuild  | 12 +++++-------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/net-analyzer/wapiti/wapiti-3.0.3.ebuild b/net-analyzer/wapiti/wapiti-3.0.3.ebuild
index c9bf7dc9b105..b0eb5e96506a 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}]
@@ -35,6 +30,5 @@ RDEPEND="dev-python/beautifulsoup:4[${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-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
-- 
cgit v1.2.3-65-gdbad