From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 15 Jan 2020 15:51:32 +0000
Subject: gentoo resync : 15.01.2020

---
 .../openvas-scanner/openvas-scanner-6.0.1.ebuild   | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild')

diff --git a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
index 1700d9421816..aeedaa6e04f9 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils flag-o-matic systemd toolchain-funcs
+inherit cmake flag-o-matic systemd toolchain-funcs
 
 MY_PN="openvas"
 MY_DN="openvassd"
@@ -31,9 +31,7 @@ DEPEND="
 "
 
 RDEPEND="
-	${DEPEND}
-	!~net-analyzer/openvas-scanner-5.1.3
-	!net-analyzer/openvas-tools"
+	${DEPEND}"
 
 BDEPEND="
 	sys-devel/bison
@@ -55,7 +53,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# QA-Fix | Correct FHS/Gentoo policy paths for 6.0.1
 	sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die
 	# QA-Fix | Remove !CLANG doxygen warnings for 6.0.1
@@ -82,21 +80,21 @@ src_configure() {
 	# Add release hardening flags for 6.0.1
 	append-cflags -Wno-format-truncation -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
 	append-ldflags -Wl,-z,relro -Wl,-z,now
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use extras; then
-		cmake-utils_src_make -C "${BUILD_DIR}" doc
-		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		cmake_build -C "${BUILD_DIR}" doc
+		cmake_build doc-full -C "${BUILD_DIR}" doc
 		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
 	fi
-	cmake-utils_src_make rebuild_cache
+	cmake_build rebuild_cache
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	dodir /etc/openvas
 	insinto /etc/openvas
-- 
cgit v1.2.3