Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/openvas-scanner/
Date: Mon, 31 Dec 2018 23:43:42
Message-Id: 1546299786.6a66475292c5b70e8e308b6fba4024d1e9a79414.asturm@gentoo
commit:     6a66475292c5b70e8e308b6fba4024d1e9a79414
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 23:43:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 23:43:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a664752

net-analyzer/openvas-scanner: EAPI-7 bump

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../openvas-scanner-5.0.4-r1.ebuild                | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
index 4d550d82f4f..ac7d2ea314e 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvassd
+EAPI=7
 
 DL_ID=2129
+MY_PN=openvassd
+inherit cmake-utils systemd
 
 DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
 HOMEPAGE="http://www.openvas.org/"
@@ -15,18 +13,22 @@ SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.t
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	app-crypt/gpgme
 	>=dev-libs/glib-2.16:2
 	dev-libs/libgcrypt:0
 	>=net-analyzer/openvas-libraries-8.0.2
+"
+RDEPEND="${DEPEND}
 	!net-analyzer/openvas-plugins
-	!net-analyzer/openvas-server"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	!net-analyzer/openvas-server
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}"/${P/_beta/+beta}
 
@@ -34,13 +36,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
 	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
 	"${FILESDIR}"/${PN}-4.0.3-run.patch
-	)
+)
 
 src_prepare() {
+	cmake-utils_src_prepare
 	sed \
 		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
 		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
 }
 
 src_configure() {