[gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvm-tools/

[Joonas Niilola]

commit:     073053b178cc8c52c09fa0a3128642b276cee423
Author:     Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Mon Apr 20 07:43:26 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 12:28:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073053b1

net-analyzer/gvm-tools: add python3.7 and 3.8

correct dependencies and tests

Closes: https://bugs.gentoo.org/718420
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Closes: https://github.com/gentoo/gentoo/pull/15439
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
index ba3a4b6f72f..d7688b80766 100644
--- a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
+++ b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -17,20 +17,24 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pythondialog:0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	net-analyzer/python-gvm[${PYTHON_USEDEP}]
 	!net-analyzer/openvas-cli
 	!net-analyzer/openvas-tools"
 
 DEPEND="
 	${RDEPEND}"
 
+distutils_enable_tests unittest
+
 src_prepare() {
-	distutils-r1_python_prepare_all
+	distutils-r1_src_prepare
 	# Exlude tests & correct FHS/Gentoo policy paths
-	sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" "$S"/setup.py || die
-	sed -i -e "s*''*'/usr/share/doc/${P}'*g" "$S"/setup.py || die
+	sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" setup.py || die
+	sed -i -e "s*''*'/usr/share/doc/${P}'*g" setup.py || die
+
+	# Fixing tests
+	# Use correct socket path
+	sed -i "s/\/usr\/local\/var\/run\/gvmd.sock/\/var\/run\/gvmd.sock/g" tests/test_parser.py || die
+	# ignore help formating
+	sed -i "s/class HelpFormatting/@unittest.skip('ignoring help formatting')\nclass HelpFormatting/g" tests/test_parser.py || die
 }