gentoo resync : 03.11.2019

4 files changed, 53 insertions, 7 deletions

diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest
index ffffd788aeb8..e162b3c70b04 100644
--- a/net-analyzer/gvm-tools/Manifest
+++ b/net-analyzer/gvm-tools/Manifest
@@ -1,3 +1,5 @@
 DIST gvm-tools-1.4.1.tar.gz 52020 BLAKE2B 0648c7e26dc0aed02eeeafdc8db45ae88afd8725196457a6a8cdcb888ed7e07c9998fc83c03fd9dd4f7aca1e238b46052653216b7373f98b150f6a181ba1538c SHA512 cd1049311241ad7b4a2d9648b54224ca1636f9620ffd238282bbf1089ab0c3b4e8b8f722c93c6809695bc71b0c7cb2bc3e65561b05269c7737abdc6ddca69aea
-EBUILD gvm-tools-1.4.1.ebuild 1029 BLAKE2B 7a30aab02c17185218883c7cb01351be00924142d95a05103ac700f350aea3e9128a760d09808a45578abbf0f842c11dc63aa80f7aecb09365184153a3e08b4f SHA512 28cd81faa8202640870c9e7c3bbd7a6bec9e97bab4b392e2bee05c208e329bcc11285e5481dd6442e7c1e3016abdf8ce80b906dfb311a332a96f3a7bffc66769
-MISC metadata.xml 373 BLAKE2B 475b09852e48dea8abbad16dfe918d7cef776bbabe51814dcc4bb82d074480cd3cfd463fd23057c403464bdae86b6f411e1fad098888e29621eaf0da72f0d246 SHA512 68d62e37a26c89ab68afd24c6832553150b21ef6a2abe911f5de8169c52daf10e6e5ffd201e0124b4a5069b123aad0dbc7669420b8d1823423d98553c1a36e4d
+DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504be910266d6dac113caff1da096bc6072649ddc456b3348e1aba79c9b7e147ba019a70e4163267c474850019a076e SHA512 0adf7e06b1208c91fbc02dab42593280c95f6572e27d96d6f8777d710747a9e427c79678d9aef785b7ecd6d4fd30e79a1c063fe4256025ac0616c1d242f45025
+EBUILD gvm-tools-1.4.1.ebuild 988 BLAKE2B 1916eb91f678818b18c5add2ad1a2b4ffd17b3a78590973f81491bdf35311db3b58b2ace82e1b2684bf465a0853aa4639c477656dacfc3d8bce3315aa3f95061 SHA512 8b4b39754d89a9168b604eeb920648cdb42df5be595a941cc1a18ff9801ecaef61a217d865455ed7a5c4713da9a7bb5f34b1331b2c0451f04a4ea93b4d85303d
+EBUILD gvm-tools-2.0.0.ebuild 1017 BLAKE2B 7e6ba6f64a33ce10ae5dd33c0e0439ace14201602232f82f51f46467ec1201ceb31865fbebb3d2aa189b44f1e59829540fdd18730015400dfb6ff61564b90ed4 SHA512 8499e2acda6aed44fa811fccdd4df5a575e2f190d1d56f3007c7a19071791857dbd07458aa62570c7002b0a2e154698d5476f12308ee6fdb328290da5dffedbc
+MISC metadata.xml 879 BLAKE2B 3fbe5d9d66b98ce42e4ba158d42cd2018b41b0b505932cd4d17e6ef0555e4622bd1c12020af18ff79f155009127ebe2681b1a6eb5b062fb0d65dcefc0b24c0f1 SHA512 38beadc54c27ab14b71eff900e70242dba92d5971dbddecec45d85c844b225d6abb50584a08f825c7b70092dcb489b7fc17eeaad0f9db7ab607fc1c078ef622e
diff --git a/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild b/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild
index 98d3f4eb3995..7de92b28c91c 100644
--- a/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild
+++ b/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
-HOMEPAGE="http://www.openvas.org/"
+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/v1.4.1.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
@@ -21,12 +21,10 @@ RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/pythondialog:0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=net-analyzer/openvas-manager-7.0.3
 	!net-analyzer/openvas-cli"
 
 DEPEND="
-	${RDEPEND}
-	>=net-analyzer/openvas-libraries-9.0.3"
+	${RDEPEND}"
 
 src_prepare() {
 	distutils-r1_python_prepare_all
diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
new file mode 100644
index 000000000000..8800b1ff58ba
--- /dev/null
+++ b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+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
+}
diff --git a/net-analyzer/gvm-tools/metadata.xml b/net-analyzer/gvm-tools/metadata.xml
index 1b94d6737400..f85b386b890f 100644
--- a/net-analyzer/gvm-tools/metadata.xml
+++ b/net-analyzer/gvm-tools/metadata.xml
@@ -9,4 +9,15 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<longdescription lang="en">
+	The Greenbone Vulnerability Management Tools or gvm-tools 
+	in short are a collection of tools that help with remote controlling 
+	a Greenbone Security Manager (GSM) appliance and its 
+	underlying Greenbone Vulnerability Manager (GVM).
+	The tools essentially aid accessing the communication protocols 
+	GMP (Greenbone Management Protocol) and OSP (Open Scanner Protocol).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">greenbone/gvm-tools</remote-id>
+	</upstream>
 </pkgmetadata>