From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 13 Jun 2020 10:39:22 +0100
Subject: gentoo resync : 13.06.2020

---
 net-analyzer/gvm-tools/Manifest                  |  2 +-
 net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild | 40 ++++++++++++++++++++++++
 net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild    | 36 ---------------------
 3 files changed, 41 insertions(+), 37 deletions(-)
 create mode 100644 net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild
 delete mode 100644 net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild

(limited to 'net-analyzer/gvm-tools')

diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest
index fc69fd42384d..93d41e847dc6 100644
--- a/net-analyzer/gvm-tools/Manifest
+++ b/net-analyzer/gvm-tools/Manifest
@@ -1,3 +1,3 @@
 DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504be910266d6dac113caff1da096bc6072649ddc456b3348e1aba79c9b7e147ba019a70e4163267c474850019a076e SHA512 0adf7e06b1208c91fbc02dab42593280c95f6572e27d96d6f8777d710747a9e427c79678d9aef785b7ecd6d4fd30e79a1c063fe4256025ac0616c1d242f45025
-EBUILD gvm-tools-2.0.0.ebuild 1046 BLAKE2B 0d4a4ebca110f60f6d9e7bbb0da7f85d0ca6cfdc19d2c285bf011079154f8171d549252b44779a1149c5cb47b3a3965df8fdc74c89e2c292d7e2767dba63e416 SHA512 a51843b3b89d9caa0c5ef91286a7ed73a3d197a6ea31b7ffb87d45b4a70a72a3b57f706cac679ff6d616306cdeafaca3e11c757f6da9b83cdf5d5d85662525e1
+EBUILD gvm-tools-2.0.0-r1.ebuild 1205 BLAKE2B 4716e02e956dea577f1071ce9c41ea0eced59168f7f3e9db4592f9c03b6789029280ad83eae2d0f4af04da6374d18bea496f027a06e30e5dec8452da298d9d53 SHA512 38c0ffe0852d339fdf8ac0f3140341610e434c43b76490a8356569dedb6ca0d4cc5e937d10b32e5ebb83dce4259195b3092145c033a0d9c210ea317900c778a5
 MISC metadata.xml 871 BLAKE2B 65fdc24c170ca52b75a45f89d0f56447f83ce23f8860af2c87d3bf02178fe637e49fc94005f4383a576728514d78f59f6a62fc9a893b18dfe3bf9ef696738ade SHA512 66e5e2b493223a23276ed57c7685f8a151b4fdd4dfb4854d283c0f82a5b923bcbc2688bb1b9701e7934658a6ecdd0d9e036993f4f18aa5d160b330aec2bb72a5
diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..d7688b807664
--- /dev/null
+++ b/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	net-analyzer/python-gvm[${PYTHON_USEDEP}]
+	!net-analyzer/openvas-cli
+	!net-analyzer/openvas-tools"
+
+DEPEND="
+	${RDEPEND}"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# Exlude tests & correct FHS/Gentoo policy paths
+	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
+}
diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
deleted file mode 100644
index ba3a4b6f72fd..000000000000
--- a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-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/openvas-cli
-	!net-analyzer/openvas-tools"
-
-DEPEND="
-	${RDEPEND}"
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-	# 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
-}
-- 
cgit v1.2.3