gentoo resync : 27.03.2021

4 files changed, 133 insertions, 5 deletions

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 1dcb5350c083..e4cd18d7b8da 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -3,10 +3,13 @@ AUX greenbone-nvt-sync.conf 62 BLAKE2B cac8a82e44394f509aa325d940db0e67ab6cedeb0
 AUX greenbone-scapdata-sync.conf 64 BLAKE2B 8bfa8fde583762aeb76d90d16694bc6344e23bbc0c607ff493a8e03ff02ee6534c5464fae5d6595a23e6014287b9dc66de7e5164358780ac68a7c1cd83a04309 SHA512 37dbbd3f92f8baee8e89c274d820e03cba5ed5469a826f118897035c2f7719a915a71a6069eb6bf7f9a72e798b7837af9a6f25709215683d9d264292b5ccad66
 AUX gvmd-9.0.1-glibc_siglist.patch 3599 BLAKE2B 91844507e01a3a7faa017ae98ae066b856993bfeaef7404fa884add53ccb8954eb7c3eebb74a1de1a01a6ec61960347595ba9418e9a2b814598288d488a92a03 SHA512 c3fb56954c55181cbfc52828a0d87703e237b945e5c5239b3dd429910d8a65ceef41b2ee7a7df522c8e9da9e86cd07fc383fb62fdccd73ab9380ae139fea2a7f
 AUX gvmd-daemon.conf 813 BLAKE2B b4d73d6a5cc17325f56b250bf1e63fab808bf7e36a0b357641de87d54a3238fd68cf34cba08ce606827e3441e042c514cfc4ce73ff88b70cd4dea080dd68eb97 SHA512 1fcce48ed1d53489f4509138b3570790574003931289e65ab0f767a51da1e5d6c8d33c44da8d967f6c0442f0bee500bf46554a49b113fe0bc933dffd3fb121eb
-AUX gvmd-startpre.sh 223 BLAKE2B 2b12ff7077464d089591e53c631c3b38f4d9351d98326ef65f50ef0501f165bc8393af86c21a3e9663464526dcd2b435eb1a89ba3a05946cb862f959d3efe5d7 SHA512 d532037beb7b05037c136c5b7d7bcea65d166d11c4eb3c580fdabd4a99b110d230b67f633a9661674d3186c09baaf50089b222c7c17e57b4c0a234a4470af531
+AUX gvmd-startpre.sh 295 BLAKE2B 324f84dbf577a81e86d9be1061637691bbe55dd04db47139ca0addaf11d397e1d16195b97c65ccddfaf82810b28f1a3f67d8d0a78f68cbda45f30218c4352164 SHA512 9796c0f6aa972e4f6af6fef506df2c072bba89de3856f9a66c9eb27ec0e407712d7c1afabd2a0e96d539aa3815a73fa5d4cd55d6128f17d5db83d1ef5a4a8900
 AUX gvmd.init 614 BLAKE2B e5c4bd192941b98f6e42dd1644a61b6d1fa6651c8932a7f85d3680f07272b2acabca91d0723c6b9057734fb41916ec52021161b9ff9a1512fbed04299a2d9941 SHA512 8eb0daf424fa9346674757f1d3f94a4708df9748d5e6c5a1b1ab8233651462bf1a93eda7899963484a7cdf2396eba30603ddb079bc4ae2855bc49097ea88f82d
 AUX gvmd.logrotate 325 BLAKE2B 4df59e6d9484b9e60d54cb3633ffc9888ad8550bb1d1f23123da21b1269125cd7354426b97ce42e06bf547d23788cefaac5ef51f7aa83d6cc34076bce4ab7339 SHA512 e1eeef173bfab7c750efcc7faa42cf7a1cfb9e6b137716063f273bc709c1346f11262dadbdb0c49822d885dc00177d8ccb91c0491ddc33cfee0a3827f11908f6
 AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c56657ac61c0c55f81f8bf809c5d6508945972dcaf31b4e75729c7686409a2ebaea4b7a132d8d557d9 SHA512 ea9132367ee28814ed6e36c0b1fb1ce4700e5735d77e0889947618aba511c3adbc968167b4968d1fa28bd41959575a49b8b2ddb9b116957c729f51ece33dfd98
+DIST gvm-report-formats-0.1.tar.gz 58962 BLAKE2B 45cb5a7b81b68524254947503921f871577b86c2d7696758b365205b5ed8e4516840f704d3bcb8da6925a536db8e01fb9f0d922a3a2233dd4d4fa21e4308dc1b SHA512 8ae128ca087b7d1ecd2b84cb43e67b8f920001699268b9ce70d1f703f1dac68d8905354f5a8203808982291fdeb80fb11569a0bb559df0263296c603c691b422
+DIST gvmd-20.8.1.tar.gz 1024660 BLAKE2B c2981d73efe4bb32008c82ba9a017f58ade18efe00d85c1876a872ae9c6260e801697ef7c7bc9c0862e92043167ecd58d082b97c746308d983ffac7991146d83 SHA512 e946be6c67970fdb0e4e6fbb2ac9445576c280c3ac7503ff42aac2c079e817ee587a37477956917b576bafab3e7caa281da5befa6502b044562051ae976889b2
 DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
-EBUILD gvmd-9.0.1.ebuild 2836 BLAKE2B c4273957354ac5cc8b51a6e0b47a00439d866b0fae51ed5f866db2fff0003aaa891fdfe768005ef35f25f554eb750af742308ff37f7f8b0da0a8985119aa25e4 SHA512 28ac31a09bd31c2bebe92baf3f671d9431040cc7037081ac9993f5383085eef074a43ddeebc15920aadf903ef4ccf223fd26df3e116d46a83396d1f44c375d5e
+EBUILD gvmd-20.8.1.ebuild 2961 BLAKE2B bc840350137799e9a354281894af488e7d8813cd58ae7ac59eab3dfbea44a7a0b80d2dfcebb5e2b692aab0724c4345ab06f711027a35579bf564fb9b96bd641c SHA512 b87173563562809b6c9e9619876799e1dc9e71a16fa819a5d77d8dd4062993ed800659bc1fced54fe8c83f6fcf2a58b87877bd000da5d5a555559b9f750d7e67
+EBUILD gvmd-9.0.1.ebuild 2741 BLAKE2B 92c859474ada5794afa51de3c7f99fb4ff22644e92eb1c95c6315d10fa0769c84a88f6a86250eee1fdfda9850600a4e63e8a5f3c405ea3e434fb5499c2ca8a10 SHA512 cfbf7baa4098723dacadba15f57edeb67209bd3256840d9feac0791f62eafbbc592ceab993da75ca8866c972476a9746ced13a6b17ba7f33a839d24a7478ab43
 MISC metadata.xml 1073 BLAKE2B 7f2ab5c71762e48fa92cdd15a009961d5302d44a3b39f5e936b1b2eb190141d3136b617c451c2ccaf028813a85db0aa21470546de44e37709f0e21b6cbd28361 SHA512 3b980f843d6e8ea1472b951334a6bf528eb077e718d9a75ed7a07d6857754686611f088f001a77d6b7e5bed3e28fd670dc50f47d3b6c62baa477a80ba6777b67
diff --git a/net-analyzer/gvmd/files/gvmd-startpre.sh b/net-analyzer/gvmd/files/gvmd-startpre.sh
index d04daa09b0a2..5ba4b5c273c9 100644
--- a/net-analyzer/gvmd/files/gvmd-startpre.sh
+++ b/net-analyzer/gvmd/files/gvmd-startpre.sh
@@ -3,3 +3,5 @@
 # Greenbone Vulnerability Manager Systemd ExecStartPre
 touch /var/run/gvm-{checking,create-functions,helping,migrating,serving}
 chown -R gvm:gvm /var/run/gvm-{checking,create-functions,helping,migrating,serving}
+touch /var/run/feed-update.lock
+chown gvm:gvm /var/run/feed-update.lock
diff --git a/net-analyzer/gvmd/gvmd-20.8.1.ebuild b/net-analyzer/gvmd/gvmd-20.8.1.ebuild
new file mode 100644
index 000000000000..545dc420d400
--- /dev/null
+++ b/net-analyzer/gvmd/gvmd-20.8.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
+HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/gvmd/"
+SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/j-licht/gvmd_report_formats/archive/v0.1.tar.gz -> gvm-report-formats-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-group/gvm
+	acct-user/gvm
+	dev-db/postgresql:*[uuid]
+	dev-libs/libgcrypt:0=
+	dev-libs/libical
+	>=net-analyzer/gvm-libs-20.8.0
+	net-libs/gnutls:=[tools]
+	extras?   (
+		app-text/xmlstarlet
+		dev-texlive/texlive-latexextra )"
+
+RDEPEND="
+	${DEPEND}
+	net-analyzer/ospd-openvas"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	extras? (
+		app-doc/doxygen[dot]
+		app-doc/xmltoman
+		app-text/htmldoc
+		dev-libs/libxslt
+	)
+	test? ( dev-libs/cgreen )"
+
+src_prepare() {
+	cmake_src_prepare
+	# QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
+	sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" doc/CMakeLists.txt || die
+	sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" CMakeLists.txt || die
+	# QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
+	if use extras; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		"-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
+		"-DSBINDIR=${EPREFIX}/usr/bin"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use extras; then
+		cmake_build -C "${BUILD_DIR}" doc
+		cmake_build doc-full -C "${BUILD_DIR}" doc
+	fi
+	if use test; then
+		cmake_build tests
+	fi
+	cmake_build rebuild_cache
+}
+
+src_install() {
+	if use extras; then
+		local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+	fi
+	cmake_src_install
+
+	#QA-Fix
+	rm -r "${D}/usr/etc" || die
+
+	insinto /etc/gvm
+	doins -r "${FILESDIR}"/*sync*
+
+	insinto /etc/gvm/sysconfig
+	doins "${FILESDIR}/${PN}-daemon.conf"
+
+	exeinto /etc/gvm
+	doexe "${FILESDIR}"/gvmd-startpre.sh
+
+	fowners -R gvm:gvm /etc/gvm
+
+	newinitd "${FILESDIR}/${PN}.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/gvm/gvmd
+	fowners -R gvm:gvm /var/lib/gvm
+
+	#add report formats from old version for migration
+	insinto /usr/share/gvm/gvmd/
+	doins -r "${WORKDIR}/gvmd_report_formats-0.1/report_formats/"
+}
diff --git a/net-analyzer/gvmd/gvmd-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
index d22d159745dd..6ea48c70cccb 100644
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
@@ -13,9 +13,7 @@ SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
-IUSE="extras +postgres sqlite test"
-# keep deprecated USE Flags for revdep of gvm
-REQUIRED_USE="postgres !sqlite"
+IUSE="extras test"
 RESTRICT="!test? ( test )"
 
 DEPEND="