gentoo auto-resync : 24:12:2022 - 20:03:07

11 files changed, 1 insertions, 913 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 025208912142..3c1414c8bb69 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index f10a715b2eda..a38a53ef166e 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -2,7 +2,6 @@ AUX gvm-feed-sync-20.8.1.sh 1071 BLAKE2B e80f8e4bd72d3dd92b1bb15bdfcf1b90b3f4f7b
 AUX gvm-feed-sync.cron 98 BLAKE2B d0af35e85c0c84e6d848de26fbf3f03e8a7473cea9d46c513fbb0d46f1664a516c334221773309d4f9682187a0f46a447320772d52c9826cc8525df26d0b2c38 SHA512 06526d33017c83c7342d9c356fb80e22f7a145bf8cae9bd49a7c74ae5854f7248b2b3609bc0f423b7a3babaad59a4b92ba14873f7f4e20e4cd5af7eb9c01c5d0
 AUX gvm-feed-sync.sh 1037 BLAKE2B 6ef8a375a06c0ce5a6181ee26eccdfaba09a5d935c56b98bed4435fdaee6b068f8cf87889789d4108361c6c2e83fa1979d533519c47f0d621f63423c43aa96a9 SHA512 a2abb96e268c8d7f74f61cc509730e4949894fe4225b22cb0f9d4fe2b215da70cc96c79405f59f3b05e290a45de2eeeb5d5ecf632cb23da80dd2102d4900b78a
 AUX openvas-scanner-20.8.1-rpath-qa-fix.patch 350 BLAKE2B f4179757f30a43da6fbff329f776a8173c95848f749052429804a4680d26740c6727f918b23517b2dea68a08a55294c9455bbc437f4bb44d0f06dcd056dd82bd SHA512 f873bed2df048fb60dc21665817f99cea6fa1e377f0a7d5c5163831dddbebd2b0ca4e5c94f1ca22ab54f3079ebd230882fc8a269ead21550780aea81b9c01476
-AUX openvas-scanner-6.0.1-sbin.patch 716 BLAKE2B 41883486bfa0cb27c4a05ae7290b69227b166c9179546434aece15d1aa2b380f6f9da9afdbfb684ffc68a93f4dd63093b7ce2308d67ca8f806d2cd8e12433819 SHA512 66e2a99f6c7a6d0053bbb4fa797818681983a07ad66814ae0c577b27b37d41054f6241ddd3c017a0928eddef3f2d342480b4a668402c68d28bbf48c357e65b05
 AUX openvas-scanner-7.0.1-disable-automagic-dep.patch 1100 BLAKE2B e5fe847c43636b883af91b34386a7d94bb1b088cddc3c95d8314c03dec25c1d071ed7562019abb5d31a75bb2c4fded63644552b411091889612ef6c5c1a837f4 SHA512 b6d678413ca2a4771dcd6833e19d754745f3a7530f227befdad745d30bf23862120cb18359c1088552db18fb13bf491ed4a47523f7326e628101c5ade4156c58
 AUX openvas-scanner-7.0.1-fix-linking-with-lld.patch 1074 BLAKE2B de151d837cf188e398ff2c193e8df056377c2fbd2597b0a98991f38fc48802e323d6f617ceacaa82845ab385335a722416a30723878bfc700a45b44de779cc62 SHA512 7ed1bf3560a5c5cca0acc22845fdc370d677c773477f5006a3223225b63c2cf41709dcb883c38e152d97419733e62731598560a6b4aed2e4ab12a6cdb51446b7
 AUX openvas.conf 29 BLAKE2B 0cb02f4b349d996b07ca19a531b64a35692ce5afb0d1fd4b58b6c80ccce3caf82055b396b23fa14f561eb9b732afba0fdfccade4c33c5e300fa1aca41b3995b7 SHA512 7ae3c5eff9a63a5eaadee5886c80baa46ff123695a55e92f21178421bd69322b4c1c06615fd81ea461b61da12ff0e03f523ea3110105a58e709900a0e2d4eebc
@@ -12,12 +11,6 @@ AUX openvassd.init 480 BLAKE2B 28dfdabe7935ce55615fb36e6ddae3c36c84793ba01f6d3c9
 AUX openvassd.logrotate 330 BLAKE2B faf900a6882bb23c29859080d0c140c9dde8dcab42f31c31bfd43342beedab0bfe711f4e918aba5c7f8e5bb91430e251e270d0bc2e6f49e84ce98cdbbfe6d023 SHA512 397c9fd0d63ab66b463f65b6d235ec3e4e6ca52a3c811ddd4efcaeffc05fed8f9cd97605f439a628c144ecc1cfcfd31290d2a9dc6e57e8197d063b4aee63d73b
 AUX openvassd.service 472 BLAKE2B 528c25dbc32cd742753eb6b155a9221f0adde0e792b1e7af376b714831bcc210a228f5a87089f449f6f0e808f46f45d40fd68d9caed44530d57d99c37dbb8b0d SHA512 3497382e6540ddc341cf17e63f1c8d2250249bb51f8dbe379d48c1f90e81d00fdf03349a4dd08c6c6c2dc7336b385fa892b316ff2315a623952d8a2db33681bd
 AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64
-DIST openvas-scanner-20.8.1.tar.gz 431985 BLAKE2B 60b328dc261bf48f37aa2727f4b63904c898467f989abef8f05e29329a24d0d98c13690005c5c7a8c93f899db709771ea60832927f169f6779707a1fac602368 SHA512 6114f37a91a3dd42c3693f10548a7727fb88fbe535ce511b164a440d5ace1c736d4c8a45db9a7e83b9abbd376c4d6b13afd3d23a995a5d089329a2bb8bd71cec
 DIST openvas-scanner-21.4.4.tar.gz 460601 BLAKE2B 66d627e76912735539399aed637fdc07a7d13c9e4eb142498dcf181b8ea952dd93107bcc1f2ef577126178ff3dad1e5f6e50d67840692cd49f7352e3a726ce8f SHA512 f2fe1f802b14fc41ee0d7657d031d318b651c3ec9ef554b33379a7459d40c17b44525c8f666ccb9670868576c101766936dd0c700778e46683bf43f0683834b6
-DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147
-DIST openvas-scanner-7.0.1.tar.gz 429012 BLAKE2B 13fd0fef2ce88f6789da9f00e8f35329e915ebc74a29b3bd52af93c6b70292d055fa1159aec4041d79a785971a583eb514e8700d1d38a76775446e40af9b2fac SHA512 201ea02b25bf247320437ae5c82bdc95db981cc6bd99fdece9403573434db122cdc8db7b82a08cba34b6d67d5794b2364f798847c79b421495666adc95a02571
-EBUILD openvas-scanner-20.8.1.ebuild 3027 BLAKE2B 4391f902889c2935c2cf6e140da2e7f686d590905c2cb3c41954dc7483ef65406004a49d8cf6b660449163ede80289895dbdc17c4303817f9a33f3c80e68c4e3 SHA512 60f6e4ca3d5c9f2bc4e61f3a439828748ab4b9a82820ca03d4d01cc1d242a4483d57d1a52f3ddad7fd1b7feee0222fe52e0537e1aeec7835ee175727c9dd71f4
 EBUILD openvas-scanner-21.4.4-r2.ebuild 2780 BLAKE2B ad007b59d5f9337adadfadff50648d67b741fcd35d14dcd731ab6b7301c7ac7141487081103c1f7a54d89a2d077eca2c94a391d4b95bae855d35c5975ec00164 SHA512 2f59c429409fd5eec2163c8eef9d0e97f8a5f555ae764fb51b3591e4630fa9462d6a393f28605453eea3b7c54736da01351f1ce67565787fabbbae74e136e251
-EBUILD openvas-scanner-6.0.1.ebuild 3160 BLAKE2B 046fcf9a74b706e162c8cf2c739c62a2dd59ea7a410985d5db19217a7d83eafb124e88b84d827dc8cbf1332faec92318cab14ca3fee5ddbe3fb23b52954d3b33 SHA512 a303d13721c6af6bd0cb3b56ffe1b60aff72571fd8f74169e0a84667a579b9967d30207fdd6801217e5858297ec9168e29a533b248a8385a72857e99d765f3c3
-EBUILD openvas-scanner-7.0.1.ebuild 2789 BLAKE2B 55558fd817c1a799ae32c5a39b49c37a7f5ee76988a202ab16c04821873a9a67a89598b80d69612ea81b7e52ff330b323e17168dee4edfff33159aec80fedbce SHA512 16173c4b363fa0fef2fa7fba99f81ddc2736e39fac742840e8faa5dace797c2d63ffdbf14ff066d715ca80938f22c64fdcf4e4f2df0fc05accc197d565c4a009
-MISC metadata.xml 1076 BLAKE2B 29556818e1d1214233621d8af53769656ebcba5e19d14c7354049909643da89f9641d3aeb72f88bb8405cc7c2c5b8e261e8fa6beb4caff3f5ee7c93d3844e6c8 SHA512 a40d00821067c72b536b44b0b238ffe9ab3bc807433f75fcce35698be1fb2093ee61321ec1314ca0f653b33052cd5335fd4fc6495648c4b682e2a20bd1fbd45c
+MISC metadata.xml 955 BLAKE2B 89bbb8f84989c99ac00776d06921e3430e7865f1276139dbc87676a28133e157bca29f5c7bc077fc17ad6b8408d8aa2b967bf1a78569a516c83ff670698fccae SHA512 98c8d4c18d138b8bde6787394fe42fa4107205f8e6a262997c37e80364d7c0fea6caaeb331d3c918ac1a38f750273cf060360a5f7dd4a342cb834fc53d24d51f
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch
deleted file mode 100644
index d5b8a2a6b62f..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/CMakeLists.txt	2019-07-21 23:16:18.608251465 +0300
-+++ b/src/CMakeLists.txt	2019-07-21 23:17:08.434210058 +0300
-@@ -175,7 +175,7 @@
- ## Install
- 
- install (TARGETS openvassd
--         RUNTIME DESTINATION ${SBINDIR}
-+         RUNTIME DESTINATION ${BINDIR}
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-          GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 
-@@ -183,7 +183,7 @@
-          DESTINATION ${OPENVAS_SYSCONF_DIR})
- 
- install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-nvt-sync
--         DESTINATION ${SBINDIR}
-+         DESTINATION ${BINDIR}
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 
-
diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml
index d89ae96ec8ec..20db261053a1 100644
--- a/net-analyzer/openvas-scanner/metadata.xml
+++ b/net-analyzer/openvas-scanner/metadata.xml
@@ -10,8 +10,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="cron">Install a cron job to update GVM's feed daily.</flag>
-		<flag name="extras">Html docs support</flag>
 		<flag name="snmp">Build againts <pkg>net-analyzer/net-snmp</pkg> for "improved SNMP support"</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild
deleted file mode 100644
index 9dbdf06bee94..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake toolchain-funcs
-
-MY_PN="openvas"
-MY_DN="openvassd"
-
-DESCRIPTION="Open Vulnerability Assessment Scanner"
-HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/openvas-scanner/"
-SRC_URI="https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron extras snmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-group/gvm
-	acct-user/gvm
-	app-crypt/gpgme:=
-	dev-db/redis
-	dev-libs/glib
-	dev-libs/libgcrypt:=
-	dev-libs/libksba
-	>=net-analyzer/gvm-libs-20.8.0
-	snmp? ( net-analyzer/net-snmp:= )
-	net-libs/gnutls:=
-	net-libs/libpcap
-	net-libs/libssh:="
-
-RDEPEND="
-	${DEPEND}"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	extras? (
-		app-doc/doxygen[dot]
-		app-doc/xmltoman
-		app-text/htmldoc
-		dev-perl/CGI
-		dev-perl/SQL-Translator
-	)
-	test? ( dev-libs/cgreen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch
-	"${FILESDIR}"/${PN}-7.0.1-fix-linking-with-lld.patch
-	#qa fix for rpath
-	"${FILESDIR}"/${P}-rpath-qa-fix.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0
-	sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "${S}"/src/CMakeLists.txt || die
-	# QA-Fix | Remove !CLANG doxygen warnings for 7.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
-
-	#Remove tests that doesn't work in the network sandbox
-	if use test; then
-		sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		"-DSBINDIR=${EPREFIX}/usr/bin"
-		"-DBUILD_WITH_SNMP=$(usex snmp)"
-	)
-	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
-	cmake_build rebuild_cache
-	if use test; then
-		cmake_build tests
-	fi
-}
-
-src_install() {
-	if use extras; then
-		local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-	cmake_src_install
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/gvm
-		newexe "${FILESDIR}/gvm-feed-sync-${PV}.sh" gvm-feed-sync.sh
-		fowners gvm:gvm /etc/gvm/gvm-feed-sync.sh
-
-		insinto /etc/cron.d
-		newins "${FILESDIR}"/gvm-feed-sync.cron gvm
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	fowners gvm:gvm /var/log/gvm
-	keepdir /var/lib/openvas/{gnupg,plugins}
-	fowners -R gvm:gvm /var/lib/openvas
-
-	insinto /etc/openvas
-	doins "${FILESDIR}/openvas.conf"
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
deleted file mode 100644
index cabd334cd52f..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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
-
-MY_PN="openvas"
-MY_DN="openvassd"
-
-DESCRIPTION="Open Vulnerability Assessment Scanner"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron extras"
-
-DEPEND="
-	app-crypt/gpgme:=
-	dev-db/redis
-	dev-libs/libgcrypt:=
-	dev-libs/libksba
-	>=net-analyzer/gvm-libs-10.0.1
-	net-analyzer/net-snmp
-	net-libs/gnutls:=
-	net-libs/libpcap
-	net-libs/libssh:=
-"
-
-RDEPEND="
-	${DEPEND}"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	extras? ( app-doc/doxygen[dot]
-		  app-doc/xmltoman
-		  app-text/htmldoc
-		  dev-perl/CGI
-		  dev-perl/SQL-Translator
-	)"
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	# Install exec. to /usr/bin instead of /usr/sbin
-	"${FILESDIR}/${P}-sbin.patch"
-)
-
-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
-	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"
-	)
-	# 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_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
-		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-	cmake_build rebuild_cache
-}
-
-src_install() {
-	cmake_src_install
-
-	dodir /etc/openvas
-	insinto /etc/openvas
-	newins "${FILESDIR}/${MY_DN}.gvm.conf" openvassd.conf
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/redis.conf.example
-
-	dodir /etc/openvas/sysconfig
-	insinto /etc/openvas/sysconfig
-	doins "${FILESDIR}/${MY_DN}-daemon.conf"
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/gvm
-		doexe "${FILESDIR}/gvm-feed-sync.sh"
-		fowners gvm:gvm /etc/gvm/gvm-feed-sync.sh
-
-		insinto /etc/cron.d
-		newins "${FILESDIR}"/gvm-feed-sync.cron gvm
-	fi
-
-	fowners -R gvm:gvm /etc/openvas
-
-	newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}"
-	newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}"
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
-	systemd_dounit "${FILESDIR}/${MY_DN}.service"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	fowners gvm:gvm /var/log/gvm
-	keepdir /var/lib/openvas/{gnupg,plugins}
-	fowners -R gvm:gvm /var/lib/openvas
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
deleted file mode 100644
index 6aae6a5c5fe1..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake toolchain-funcs
-
-MY_PN="openvas"
-MY_DN="openvassd"
-
-DESCRIPTION="Open Vulnerability Assessment Scanner"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron extras snmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/gvm
-	app-crypt/gpgme:=
-	dev-db/redis
-	dev-libs/glib
-	dev-libs/libgcrypt:=
-	dev-libs/libksba
-	>=net-analyzer/gvm-libs-11.0.1
-	snmp? ( net-analyzer/net-snmp:= )
-	net-libs/gnutls:=
-	net-libs/libpcap
-	net-libs/libssh:="
-
-RDEPEND="
-	${DEPEND}"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	extras? (
-		app-doc/doxygen[dot]
-		app-doc/xmltoman
-		app-text/htmldoc
-		dev-perl/CGI
-		dev-perl/SQL-Translator
-	)
-	test? ( dev-libs/cgreen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-disable-automagic-dep.patch
-	"${FILESDIR}"/${P}-fix-linking-with-lld.patch
-)
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0
-	sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "${S}"/src/CMakeLists.txt || die
-	# QA-Fix | Remove !CLANG doxygen warnings for 7.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"
-		"-DSBINDIR=${EPREFIX}/usr/bin"
-		"-DBUILD_WITH_SNMP=$(usex snmp)"
-	)
-	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
-	cmake_build rebuild_cache
-	if use test; then
-		cmake_build tests
-	fi
-}
-
-src_install() {
-	if use extras; then
-		local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-	cmake_src_install
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/gvm
-		doexe "${FILESDIR}/gvm-feed-sync.sh"
-		fowners gvm:gvm /etc/gvm/gvm-feed-sync.sh
-
-		insinto /etc/cron.d
-		newins "${FILESDIR}"/gvm-feed-sync.cron gvm
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	fowners gvm:gvm /var/log/gvm
-	keepdir /var/lib/openvas/{gnupg,plugins}
-	fowners -R gvm:gvm /var/lib/openvas
-
-	insinto /etc/openvas
-	doins "${FILESDIR}/openvas.conf"
-}
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 9e708a7a89c3..1f098abcaba0 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,12 +1,8 @@
 AUX 98_pnp4nagios-2.4.conf 725 BLAKE2B ca04f13ad57a90d339980566008d7176aed8be5def8ddb1d4e55ed9ef846900f690ca9bcf37893d73c559c8dea625a027966407f9b87c9ea474447dad9d61314 SHA512 9698529decd9587b4c48dfd5a92069645d4a8fb0796f05fea104459bc4a58aab081f10fc110d75e97331ec960e5fef71a85745c3ea58c6b9f6c37bcec4143000
 AUX npcd.initd 364 BLAKE2B b985e4951f95807f4d1d887cfe4f65780150ec827cbe6995e24a955290ce040c263c5848773f24c4ab8e05f5d78ab34693a3636bc8837aae8ef718e64f5c4e3c SHA512 efbf969865ce8f61a733ea0f0e3846854231b55d148dbf0121b4cf6022fedd94cb1ea8f717920f38aedddd6a8f33edf473f139599dc01cc2da14eedb80f7f4f2
 AUX pnp4nagios-0.6.14-makefile.patch 1057 BLAKE2B 623115771d66839df357cf19ceb0eac9600cac220cb77b77638c76ac1a5a419b7dd83145192779cfeb845a122729728bccd7cc069de1a4da51180aabbff1b91c SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602
-AUX pnp4nagios-0.6.26-magic-quotes.patch 987 BLAKE2B 02bc9b3f3c8d3289593147530d8f7f41927e301e9af854c0c57840ea769b3db2fef1222ede7c125f22e1d0ea7e1c62e14bedc387b6e9f185d0bafcf6b1f2532b SHA512 80fdb4013740dabfc31cf990f4c1a517c0002b94aec7f48d408230045ca696147763fedb04cff5da4954962305fe026bf4bcbc575f04cb16e7d96f49536b0715
-AUX pnp4nagios-0.6.26-sizeof.patch 15528 BLAKE2B f6db44720ef2a68dc5d617427fd9d0813ce34e5fe922bd25153df482420a5b2d718ccd90a09a6073e803345a48e6545e39430522d45b6fea4f4924617ff4583e SHA512 02e671a31371662a1e0958dd704b7918360d20bd2fc4171d2d8c7d0332bc37356b24929834ae910858072812f7fa6d61ba4097ff1f93848e0d02b55aee515290
 AUX pnp4nagios-0.6.26_p20221106_compat.patch 2331 BLAKE2B 87cb67ef587cb7b0a67a6112977a90cfab6847ed670f7343eb35badada53dcf928400ff99fb16778337afea4ed936502cbcec7d42eb4f76937691ca30b18471a SHA512 105128eb5d127f4f7b6127771054602f55547fc7fa04bdf1135239499b58c9cbaa9222e822ff5eb4e2a319e2f0d06c3d9c3f6de04bc577f5ba1ed66eb3362b45
 AUX pnp4nagios-0.6.26_p20221106_php80.patch 1576 BLAKE2B c11698d80086c3abd2b0cc96ed9af68267ce63c38b35ec87cb2f8f52cbe2d02af8a24dcbbf3d12779af0ae1fed2521b4f784fc0a8fbb0f2a15c51e6efaff4ea8 SHA512 f92a9b384767b7bddea0da504a01486f5145f726cf6eb6dd5f8ac6bff5450e785c78a900d6fd97173043f08dca30336f2ea28069f7a67ee0c982b3d4a2564c45
-DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427
 DIST pnp4nagios-0.6.26_p20221106.tar.gz 3029704 BLAKE2B 5866f4dbfef9b1028255eb3e47ac57fa260c1e2caca50fcb1c5ff93a3dc9bee9f14152e3a269ecf12daab59e50e1f4dfcd6513f9ce3dc5da35de50b944c38260 SHA512 cd0c3ad3d4983c43f7e1a100e8a2e6a530b573ca6bed60125c87b22ab33c2486c5ce99c6f52d641cdc7468984925a22a6ee7e1ac330ea2278ec2439acb910d04
-EBUILD pnp4nagios-0.6.26-r11.ebuild 3164 BLAKE2B 0fdda74a183a616f92e666784740f41d985f6c81e5a31ac26f3b31d79f9b98760ed466f6e5285e1c41b6ee051c9a94c03a20090b131402ab5ac05797ad93b83e SHA512 f3d58aec6064bec044f21992b1f652ef74e3d43a3966ed288fff922fa361ff5746edcbaccc6e4bd897747e25760d888726d4f10929f508dab8514b16be55d8ac
 EBUILD pnp4nagios-0.6.26_p20221106.ebuild 3356 BLAKE2B 1c5b5d1f4378e1aa042fc1141e5fb1293ada5329786c63cbd6b2dad968b17d305d1df33bd33b3968d00c383d6b5a29228a94b6d41c5e61fdb9ec34a41a9e2fd9 SHA512 dec85299801c2cdc73a3382921eed6d25e39ce837aeb3bc9e7473d2871178437edf30bbb22b16ba779d87b176c4da8df44c876f6e82fa6dadb7bb2e175460b65
 MISC metadata.xml 677 BLAKE2B f58a0350bbf34f21834181d537d1e4906c91b9eea8187b10965578fa6fa82abd3de727754b2f62987f078aad6db146ec00a0437c48edd4411b23b1ef780abb0f SHA512 9843fd05d441d4324ceab6f99f67c7eba266b9f6cad7a28616c7ef094bd8345ef573ac4b5f83ee8f049f3dbf3067df1c1005fff803db9560f10f8b05f11fceda
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-magic-quotes.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-magic-quotes.patch
deleted file mode 100644
index 7f1d8ae0cf51..000000000000
--- a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-magic-quotes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# https://github.com/lingej/pnp4nagios/commit/08ce9e26171b888c8e3b036b6693fd8f751970a8
-diff --git a/lib/kohana/system/libraries/Input.php b/lib/kohana/system/libraries/Input.php
-index 0e23c80..b0b24f8 100644
---- a/lib/kohana/system/libraries/Input.php
-+++ b/lib/kohana/system/libraries/Input.php
-@@ -54,14 +54,14 @@ public function __construct()
- 		if (Input::$instance === NULL)
- 		{
- 			// magic_quotes_runtime is enabled
--			if (get_magic_quotes_runtime())
-+			if (function_exists('get_magic_quotes_runtime'))
- 			{
--				set_magic_quotes_runtime(0);
-+				ini_set('magic_quotes_runtime', 0);
- 				Kohana::log('debug', 'Disable magic_quotes_runtime! It is evil and deprecated: http://php.net/magic_quotes');
- 			}
- 
- 			// magic_quotes_gpc is enabled
--			if (get_magic_quotes_gpc())
-+			if (function_exists('get_magic_quotes_gpc'))
- 			{
- 				$this->magic_quotes_gpc = TRUE;
- 				Kohana::log('debug', 'Disable magic_quotes_gpc! It is evil and deprecated: http://php.net/magic_quotes');
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-sizeof.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-sizeof.patch
deleted file mode 100644
index 360b4be4f76e..000000000000
--- a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-sizeof.patch
+++ /dev/null
@@ -1,357 +0,0 @@
-# https://github.com/lingej/pnp4nagios/commit/d5e04540d52238dfcb877d7116316ba1be8c1963
-diff --git a/share/pnp/application/controllers/ajax.php b/share/pnp/application/controllers/ajax.php
-index 9e0428d..c5f89e2 100644
---- a/share/pnp/application/controllers/ajax.php
-+++ b/share/pnp/application/controllers/ajax.php
-@@ -59,7 +59,7 @@ public function basket($action=FALSE){
- 
-         if($action == "list"){
-             $basket = $this->session->get("basket");
--            if(is_array($basket) && sizeof($basket) > 0){
-+            if(is_array($basket) && (!empty($basket))){
-                 foreach($basket as $item){
-                 printf("<li class=\"ui-state-default %s\" id=\"%s\"><a title=\"%s\" id=\"%s\"><img width=12px height=12px src=\"%smedia/images/remove.png\"></a>%s</li>\n",
-                         "basket_action_remove",
-@@ -135,7 +135,7 @@ public function basket($action=FALSE){
-             echo "Action $action not known";
-         }
-         $basket = $this->session->get("basket");
--        if(is_array($basket) && sizeof($basket) == 0){
-+        if(is_array($basket) && empty($basket)){
-             echo Kohana::lang('common.basket-empty');
-         }else{
-             echo "<div align=\"center\" class=\"p2\">\n";
-diff --git a/share/pnp/application/controllers/image.php b/share/pnp/application/controllers/image.php
-index b41ca83..869435c 100644
---- a/share/pnp/application/controllers/image.php
-+++ b/share/pnp/application/controllers/image.php
-@@ -47,7 +47,7 @@ public function index()
-                 $this->rrdtool->streamImage("ERROR: NOT_AUTHORIZED"); 
- 
-             #print Kohana::debug($this->data->STRUCT);
--            if(sizeof($this->data->STRUCT) > 0){
-+            if(!empty($this->data->STRUCT)){
-                 $image = $this->rrdtool->doImage($this->data->STRUCT[0]['RRD_CALL']);
-             }else{
-                 $image = FALSE;
-diff --git a/share/pnp/application/controllers/page.php b/share/pnp/application/controllers/page.php
-index 7bd877e..fcfffe8 100644
---- a/share/pnp/application/controllers/page.php
-+++ b/share/pnp/application/controllers/page.php
-@@ -58,7 +58,7 @@ public function index(){
- 
-     public function basket(){
-         $basket = $this->session->get("basket");
--        if(is_array($basket) && sizeof($basket) > 0){
-+        if(is_array($basket) && (!empty($basket))){
-             $this->data->buildBasketStruct($basket,$this->view);
-             $this->template->page->basket_box         = $this->add_view('basket_box');
-             $this->template->page->header->title      = Kohana::lang('common.page-basket');
-diff --git a/share/pnp/application/controllers/pdf.php b/share/pnp/application/controllers/pdf.php
-index 15f2ab4..d590859 100644
---- a/share/pnp/application/controllers/pdf.php
-+++ b/share/pnp/application/controllers/pdf.php
-@@ -202,7 +202,7 @@ public function basket(){
-         }
-         $this->data->getTimeRange($this->start,$this->end,$this->view);
-         $basket = $this->session->get("basket");
--        if(is_array($basket) && sizeof($basket) > 0){
-+        if(is_array($basket) && (!empty($basket))){
-              $this->data->buildBasketStruct($basket,$this->view);
-         }
-         //echo Kohana::debug($this->data->STRUCT);
-diff --git a/share/pnp/application/helpers/rrd.php b/share/pnp/application/helpers/rrd.php
-index 81bb257..ea9f99b 100644
---- a/share/pnp/application/helpers/rrd.php
-+++ b/share/pnp/application/helpers/rrd.php
-@@ -207,7 +207,7 @@ public static function gprint($vname=FALSE, $cf="AVERAGE", $text="%6.2lf %s"){
-         if(is_array($cf)){
-             foreach($cf as $key => $val){
-                 $line .= sprintf("GPRINT:%s:%s:",$vname,$val);
--                if($key == sizeof($cf)-1){
-+                if($key == count($cf)-1){
-                     $line .= '"'.$text.' '.ucfirst(strtolower($val)).'\\l" ';
-                 }else{
-                     $line .= '"'.$text.' '.ucfirst(strtolower($val)).'" ';
-@@ -234,7 +234,7 @@ public static function gprinta($vname=FALSE, $cf="AVERAGE", $text="%6.2lf %s", $
-         if(is_array($cf)){
-             foreach($cf as $key => $val){
-                 $line .= sprintf("GPRINT:%s:%s:",$vname,$val);
--                if(($key == sizeof($cf)-1)and($align != "")){
-+                if(($key == count($cf)-1)and($align != "")){
-                     $line .= '"'.$text.' '.ucfirst(strtolower($val)).$align.'" ';
-                 }else{
-                     $line .= '"'.$text.' '.ucfirst(strtolower($val)).'" ';
-diff --git a/share/pnp/application/lib/json.php b/share/pnp/application/lib/json.php
-index 0cddbdd..d0e3171 100644
---- a/share/pnp/application/lib/json.php
-+++ b/share/pnp/application/lib/json.php
-@@ -375,7 +375,7 @@ function encode($var)
-                 */
- 
-                 // treat as a JSON object
--                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-+                if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
-                     $properties = array_map(array($this, 'name_value'),
-                                             array_keys($var),
-                                             array_values($var));
-diff --git a/share/pnp/application/models/auth.php b/share/pnp/application/models/auth.php
-index 77f28d2..11d785a 100644
---- a/share/pnp/application/models/auth.php
-+++ b/share/pnp/application/models/auth.php
-@@ -116,11 +116,7 @@ public function is_authorized($host = FALSE, $service = NULL){
-             $result = $this->queryLivestatus($query);
-         }
- 
--        if(sizeof($result) > 0){
--            return TRUE;
--        }else{
--            return FALSE;
--        }
-+        return (!empty($result));
-     }
- 
- 
-diff --git a/share/pnp/application/models/config.php b/share/pnp/application/models/config.php
-index 44e3d12..7a6b8e0 100644
---- a/share/pnp/application/models/config.php
-+++ b/share/pnp/application/models/config.php
-@@ -68,7 +68,7 @@ public function read_config(){
-                 $views = array();
-                 include ($config_file);
-                 $array_b = $views;
--                if(sizeof($views) == 0 ){
-+                if(empty($views)){
-                     $views = $array_a;
-                 }
-             }
-diff --git a/share/pnp/application/models/data.php b/share/pnp/application/models/data.php
-index 63b0e24..74e8821 100644
---- a/share/pnp/application/models/data.php
-+++ b/share/pnp/application/models/data.php
-@@ -45,11 +45,11 @@ public function getSpecialTemplates(){
-                 }
-             }
-         }
--        if(sizeof($templates) > 0){
-+        if(empty($templates)){
-+            return FALSE;
-+        }else{
-             sort($templates);
-             return $templates;
--        }else{
--            return FALSE;
-         }
-     }
- 
-@@ -97,7 +97,9 @@ public function getHosts() {
-                     throw new Kohana_User_Exception('Perfdata Dir', "Can not open $path");
-                }
-            }
--        if(sizeof($hosts)>0){
-+        if(empty($hosts)){
-+            throw new Kohana_Exception('error.perfdata-dir-empty', $conf['rrdbase'] );
-+        }else{
-             # Obtain a list of columns
-             foreach ($hosts as $key => $row) {
-                 $sort[$key]  = $row['sort'];
-@@ -105,8 +107,6 @@ public function getHosts() {
-             # Sort the data with volume descending, edition ascending
-             # Add $data as the last parameter, to sort by the common key
-             array_multisort($sort, SORT_ASC, $hosts);
--        }else{
--            throw new Kohana_Exception('error.perfdata-dir-empty', $conf['rrdbase'] );
-         }
-         return $hosts;
-     }
-@@ -147,7 +147,7 @@ function getRawServices($hostname) {
-         }else{
-             throw new Kohana_Exception('error.perfdata-dir-for-host', $path, $hostname );
-         }
--        if( is_array($services) && sizeof($services) > 0){
-+        if( is_array($services) && (!empty($services))){
-             # Obtain a list of columns
-             foreach ($services as $key => $row) {
-                 $sort[$key]  = $row['name'];
-@@ -205,7 +205,7 @@ function getServices($hostname) {
-             $i++;
-         }
-         #print Kohana::debug($services);
--        if( is_array($services) && sizeof($services) > 0){
-+        if( is_array($services) && (!empty($services))){
-             # Obtain a list of columns
-             foreach ($services as $key => $row) {
-                 $sort[$key]  = $row['sort'];
-@@ -214,7 +214,7 @@ function getServices($hostname) {
-             # Add $data as the last parameter, to sort by the common key
-             array_multisort($sort, SORT_STRING, $services);
-         }        
--        if(is_array($host) && sizeof($host) > 0 ){
-+        if(is_array($host) && (!empty($host))){
-             array_unshift($services, $host[0]);
-         }
-         return $services;
-@@ -232,7 +232,7 @@ public function getFirstService($hostname) {
-                 break;
-             }
-         }
--        if(sizeof($srv) == 0){
-+        if(empty($srv)){
-             throw new Kohana_Exception('error.get-first-service', $hostname );
-         }
-         return $srv['name'];
-@@ -250,7 +250,7 @@ public function getFirstHost() {
-                 break;
-             }
-         }
--        if(sizeof($host) == 0){
-+        if(empty($host)){
-             throw new Kohana_Exception('error.get-first-host');
-         }
-         return $host['name'];
-@@ -693,7 +693,7 @@ public function getTimeRange($start=FALSE ,$end=FALSE ,$view="") {
-         }
-         
-            $view=intval( pnp::clean($view) );
--           if($view >= sizeof($this->config->views)){
-+           if($view >= count($this->config->views)){
-                $view = 1;
-            }
- 
-@@ -735,7 +735,7 @@ public function getTimeRange($start=FALSE ,$end=FALSE ,$view="") {
-            $timerange['f_end']   = date($this->config->conf['date_fmt'],$end);
-            $timerange['cmd']     = " --start $start --end $end ";
-            $timerange['type']    = "views";
--           for ($i = 0; $i < sizeof($this->config->views); $i++) {
-+           for ($i = 0; $i < count($this->config->views); $i++) {
-                $timerange[$i]['title']   = $this->config->views[$i]['title'];
-                $timerange[$i]['start']   = $end - $this->config->views[$i]['start'];
-                $timerange[$i]['f_start'] = date($this->config->conf['date_fmt'],$end - $this->config->views[$i]['start']);
-@@ -747,7 +747,7 @@ public function getTimeRange($start=FALSE ,$end=FALSE ,$view="") {
-     }
- 
-     public function buildBasketStruct($basket,$view = NULL){
--        if(is_array($basket) && sizeof($basket) > 0){
-+        if(is_array($basket) && (!empty($basket))){
- 	    if($view == ""){
-                  $views = array_keys($this->config->views);
-             }else{
-@@ -757,9 +757,9 @@ public function buildBasketStruct($basket,$view = NULL){
-                 foreach($basket as $item){
-                     # explode host::service::source
-                     $slices = explode("::",$item);
--                    if(sizeof($slices) == 2)
-+                    if(count($slices) == 2)
-                         $this->buildDataStruct($slices[0], $slices[1], $view);
--                    if(sizeof($slices) == 3)
-+                    if(count($slices) == 3)
-                         $this->buildDataStruct($slices[0], $slices[1], $view, $slices[2]);
-                 }
-                 # break on custom time ranges
-@@ -806,12 +806,12 @@ public function buildPageStruct($page,$view){
-             }
-         }
-         #print Kohana::debug($servicelist);
--        if(sizeof($servicelist) > 0 ){
-+        if(empty($servicelist)){
-+            $this->ERROR = "ERROR: ". Kohana::lang('error.no-data-for-page', $page.".cfg" );
-+        }else{
-             foreach($servicelist as $s){
-                 $this->buildDataStruct($s['host'],$s['service'],$view,$s['source']);
-             }
--        }else{
--            $this->ERROR = "ERROR: ". Kohana::lang('error.no-data-for-page', $page.".cfg" );
-         }
-     }
- 
-@@ -962,11 +962,11 @@ public function getPages() {
-                 die("Cannot open directory:  $path");
-             }
-         }
--        if(sizeof($pages)>0){
-+        if(empty($pages)){
-+            return FALSE; 
-+        }else{
-             
-             natsort($pages);
--        }else{
--            return FALSE; 
-         }
-         return $pages;
-     }
-@@ -976,10 +976,10 @@ public function getPages() {
-     */
-     public function getFirstPage(){
-         $pages = $this->getPages();
--        if(sizeof($pages) > 0 ){
--            return urldecode($pages[0]);
--        }else{
-+        if(empty($pages)){
-             return FALSE;
-+        }else{
-+            return urldecode($pages[0]);
-         }
-     }
- 
-@@ -1093,7 +1093,7 @@ public function tplGetServices ($hostregex=FALSE, $serviceregex = ''){
-             }
-         }
- 
--        if(sizeof($new_hosts) == 0){
-+        if(empty($new_hosts)){
-             throw new Kohana_Exception('error.tpl-no-hosts-found', $hostregex);
-         }
- 
-@@ -1101,7 +1101,7 @@ public function tplGetServices ($hostregex=FALSE, $serviceregex = ''){
-         $new_services = array();
-         foreach($new_hosts as $host){
-             $services = $this->getRawServices($host);
--            if(sizeof($services) == 0){
-+            if(empty($services)){
-                 throw new Kohana_Exception('error.tpl-no-services-found', $serviceregex);
-             }
-             foreach($services as $service){
-@@ -1115,7 +1115,7 @@ public function tplGetServices ($hostregex=FALSE, $serviceregex = ''){
-             }
-         }
- 
--        if(sizeof($new_services) == 0){
-+        if(empty($new_services)){
-             throw new Kohana_Exception('error.tpl-no-services-found', $serviceregex);
-         }
- 
-diff --git a/share/pnp/application/views/basket_box.php b/share/pnp/application/views/basket_box.php
-index ea8a72c..2a4e0e6 100644
---- a/share/pnp/application/views/basket_box.php
-+++ b/share/pnp/application/views/basket_box.php
-@@ -6,7 +6,7 @@
- echo Kohana::lang('common.basket-box-header')."</div>\n";
- echo "<div class=\"p4 ui-widget-content ui-corner-bottom\">\n";
- echo "<div id=\"basket_items\">\n";
--if(is_array($basket) && sizeof($basket) > 0 ){
-+if(is_array($basket) && !empty($basket)){
- 	foreach($basket as $key=>$item){
- 		echo "<li class=\"ui-state-default basket_action_remove\" id=\"".
-                      $item."\"><a title=\"".Kohana::lang('common.basket-remove', $item)."\"".
-@@ -16,7 +16,7 @@
-                      pnp::shorten($item)."</li>\n";
- 	}
- }
--if(is_array($basket) && sizeof($basket) > 0 ){
-+if(is_array($basket) && !empty($basket)){
-     echo "<div align=\"center\" class=\"p2\">\n";
-     echo "<button id=\"basket-show\">".Kohana::lang('common.basket-show')."</button>\n";
-     echo "<button id=\"basket-clear\">".Kohana::lang('common.basket-clear')."</button>\n";
-diff --git a/share/pnp/templates.dist/pnp-runtime.php b/share/pnp/templates.dist/pnp-runtime.php
-index 21c4ae3..a668fdc 100644
---- a/share/pnp/templates.dist/pnp-runtime.php
-+++ b/share/pnp/templates.dist/pnp-runtime.php
-@@ -34,7 +34,7 @@
- #
- $ds_name[2] = "Errors and updates";
- $def[2] = '';
--for($i=2; $i <= sizeof($DS); $i++) {
-+for($i=2; $i <= count($DS); $i++) {
- $def[2] .=  rrd::def("var$i", $RRDFILE[$i], $DS[$i] , "AVERAGE") ;
- $def[2] .= rrd::line1("var$i", rrd::color($i), rrd::cut(ucfirst($LABEL[$i]),12) );
- $def[2] .= rrd::gprint("var$i", array('LAST', 'MAX', 'AVERAGE'), "%4.0lf$UNIT[$i]");
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
deleted file mode 100644
index 043414bfa907..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org/"
-SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 icinga +nagios"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
-
-REQUIRED_USE="^^ ( icinga nagios )"
-
-# Some things (sync mode, for one) are broken with nagios-4.x, but since
-# nagios-3.x has been end-of-life'd, we don't have much choice here but
-# to accept it.
-DEPEND="
-	dev-lang/php:*[filter,gd,json(+),simplexml,xml,zlib]
-	net-analyzer/rrdtool[graph,perl]
-	icinga? ( net-analyzer/icinga2 )
-	nagios? ( net-analyzer/nagios-core )"
-
-# A list of modules used in our Apache config file.
-APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
-APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
-APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
-
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	media-fonts/dejavu
-	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.14-makefile.patch"
-	"${FILESDIR}/${PN}-0.6.26-magic-quotes.patch"
-	"${FILESDIR}/${PN}-0.6.26-sizeof.patch"
-)
-
-src_configure() {
-	local user_group=nagios
-	use icinga && user_group=icinga
-
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/pnp \
-		--datarootdir="${EPREFIX}"/usr/share/pnp \
-		--localstatedir="${EPREFIX}"/var/lib/pnp \
-		--with-nagios-user="${user_group}" \
-		--with-nagios-group="${user_group}" \
-		--with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log
-}
-
-src_compile() {
-	# The default target just shows a help
-	emake all
-}
-
-src_install() {
-	# Don't use INSTALL_OPTS because they set insecure permissions on
-	# all of /etc/pnp (https://github.com/lingej/pnp4nagios/issues/140).
-	emake INSTALL_OPTS="" DESTDIR="${D}" install install-config
-	einstalldocs
-	newinitd "${FILESDIR}"/npcd.initd npcd
-	rm "${ED%/}/usr/share/pnp/install.php" || \
-		die "unable to remove ${ED%/}/usr/share/pnp/install.php"
-
-	# Fix CVE-2012-3457 (Gentoo bug 430358)
-	fperms o-rwx /etc/pnp/process_perfdata.cfg
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
-	fi
-
-	# The nagios or icinga user needs to write performance data to the
-	# perfdata-dir...
-	local user_group=nagios
-	use icinga && user_group=icinga
-	fowners ":${user_group}" /var/lib/pnp/{,perfdata,spool}
-	fperms g+rwx /var/lib/pnp/{,perfdata,spool}
-
-	# and likewise for its logs...
-	dodir /var/log/pnp
-	fowners ":${user_group}" /var/log/pnp
-	fperms g+rwx /var/log/pnp
-
-	# and its statistics. This one is arguably the responsibility of the
-	# build system, since process_perfdata.cfg refers to this location.
-	dodir /var/lib/pnp/stats
-	fowners ":${user_group}" /var/lib/pnp/stats
-	fperms g+rwx /var/lib/pnp/stats
-}
-
-pkg_postinst() {
-	elog "To enable the pnp4nagios web front-end, please visit"
-	elog "${EROOT%/}/etc/conf.d/apache2 and add \"-D PNP -D PHP\""
-	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
-	elog
-	elog "  http://localhost/pnp4nagios"
-	elog
-}