gentoo auto-resync : 15:09:2024 - 12:11:38

3 files changed, 15 insertions, 28 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a6aa24f2db64..9dbe8c3cfef6 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest
index 107f79e8a674..096698ab89ed 100644
--- a/net-analyzer/notus-scanner/Manifest
+++ b/net-analyzer/notus-scanner/Manifest
@@ -9,5 +9,5 @@ DIST notus-scanner-22.6.4.tar.gz 293607 BLAKE2B 75bdbd9d6247a2b9afaf7b049b8b80b2
 EBUILD notus-scanner-22.6.2.ebuild 2131 BLAKE2B d754be7534a460285cddf9387039523f998e5342c71ad0db5780a0766d06e89402f36eee19de6d0621f2b1d94ded87086f66b508741f7a8b0b1e3e25d4f96198 SHA512 6be8b83e4a6a8edeb0511b03b387420c171349921ac4a38d260b72e26f51f71e98e99d930d034ae5177f7e0a917a62afe9b67e5b001a649f67f5dd4f84095531
 EBUILD notus-scanner-22.6.3-r2.ebuild 2172 BLAKE2B 837baebcbefe7fae784369e17da4b1a769bef21af599d029e11075834e093cf3d9cf30fa39ae29cec3e176e14f7249b1f178ff6dc3836ac600278870f2cfd3e4 SHA512 d14c86e099a5e7c6d72489b705984d27a404ebb0a3b6df41a25a6b44017fa76ff7ed416dc5bd30d704a7b0c521f05ed59eefdd85a8635c1c74740a0970d9d2aa
 EBUILD notus-scanner-22.6.3-r3.ebuild 2427 BLAKE2B a011c779de18e74f16e436e667de15900183a53a79ec2e7a69b122600ffa9b1564733ea3152ae6191e79f7c8e76e81acd290aa62153906da2faea1d7226773c0 SHA512 1e88c7733583a16b2a1f6676a19480d27eab5371e4bd1970477ef6e5391866f443c3fa912135ccaa289ed8c2d1f510d8bed60c874105f0686084786a2cfa769c
-EBUILD notus-scanner-22.6.4.ebuild 2392 BLAKE2B d2084c50adc0ad3a35d4d241fa62b932b985a7d573040afcdecf82b6934832f53bd4a5c62510ddf86e3ab3b39d0a5aa0e02c562ed3d991cc73908ecd7781310a SHA512 e4525f98fa3fceedb10e606713cefde8f738bc8c4a568f83636c5424f8dfbe3ccded783f5a559a8fb308db1eb0dc443aeea842d08b83c9b52e2cf95ec899b107
+EBUILD notus-scanner-22.6.4-r1.ebuild 2132 BLAKE2B 631c0b941e151cb805b7b08b2c533b4772115122ee6af3112928c4bac485eca853c8a308dde6a772453cb02a79277e00076c80c013f8857869147e150e51c629 SHA512 385da17160bcfa28f2a6758bb1f071ab13ef3fccc97d4430d7b862760fbd15059989db2bf917842ad86e8ff84ab11f71b3eb174f3f2acfe7de501785a5788938
 MISC metadata.xml 735 BLAKE2B 78af413540fe6af7214b65b50b50aaf9cf59280037ada5228d38e529d90752b0516bf1d7514e7d9436edd93b50cd8a9dadc1e9fbf84a5c57a0ff0cb45b712cc8 SHA512 fdb4ce92c1eede58fe267ed2a4832dd1d4e7a1694591efb3d2ff372a621320275c4090317cb57c50724ceb7e386fa28965e45b724b311127ecd8665e2908cf92
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.4.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.4-r1.ebuild
index 43056ee11d51..cc3cdd16a286 100644
--- a/net-analyzer/notus-scanner/notus-scanner-22.6.4.ebuild
+++ b/net-analyzer/notus-scanner/notus-scanner-22.6.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 readme.gentoo-r1 systemd
+inherit distutils-r1 greadme systemd
 
 DESCRIPTION="Notus is a vulnerability scanner for creating results from local security checks"
 HOMEPAGE="https://github.com/greenbone/notus-scanner"
@@ -34,58 +34,45 @@ PATCHES=(
 	"${FILESDIR}"/notus-scanner-22.6.2-remove-tests.patch
 )
 
-DOC_CONTENTS="
-For validating the feed content, a GnuPG keychain with the Greenbone Community Feed integrity key needs to be created.
-Please, read here on how to create it:
-https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation
-https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner
-
-To enable feed validation, edit /etc/gvm/${PN}.toml
-and set
-disable-hashsum-verification = false"
-DISABLE_AUTOFORMATTING=true
+GREADME_DISABLE_AUTOFORMAT=1
 
 distutils_enable_tests unittest
 
-python_compile() {
-	distutils-r1_python_compile
-}
-
 python_install() {
 	distutils-r1_python_install
 
 	insinto /etc/gvm
-	use prefix || fowners -R gvm:gvm /etc/gvm
 	newins "${FILESDIR}/${PN}.toml" "${PN}.toml"
-	use prefix || fowners gvm:gvm "/etc/gvm/${PN}.toml"
 
 	# Set proper permissions on required files/directories
 	keepdir /var/lib/notus
 	keepdir /var/lib/notus/products
 	keepdir /var/lib/notus/advisories
+	keepdir /var/log/gvm
 	if ! use prefix; then
+		fowners -R gvm:gvm /etc/gvm
 		fowners -R gvm:gvm /var/lib/notus
+		fowners -R gvm:gvm /var/log/gvm
 	fi
 
 	# Adding notus-scanner.log to logrotate
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
 
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/log/gvm
-	fi
-
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 
 	systemd_dounit config/${PN}.service
 
 	systemd_install_serviced "${FILESDIR}/notus-scanner.service.conf" \
 			${PN}.service
-	readme.gentoo_create_doc
-}
 
-pkg_postinst() {
-	readme.gentoo_print_elog
+	greadme_stdin <<-EOF
+For validating the feed content, a GnuPG keychain with the Greenbone Community Feed
+integrity key needs to be created. Please, read here on how to create it:
+  - https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation
+  - https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner
+
+To enable feed validation, edit /etc/gvm/${PN}.toml and set
+  disable-hashsum-verification = false
+EOF
 }