gentoo resync : 01.08.2021

51 files changed, 399 insertions, 88 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 0c7d67c9b672..cfe9557cd1bb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 3880beb1943a..bbefb09c8f51 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,5 +1,5 @@
 AUX fail2ban-0.11.2-fix-tests-for-2021.patch 1821 BLAKE2B 52fae8ace32d6205d290d7e3a57378e10398742a735e9bf734d1ba4c6ff73abeb7bff8d0f76924c815a1dcdd7e57bf1a584956e1c03ff0db93f20ce68f1c8176 SHA512 a3db4065b5e815d409318c7aeb0f2fac87b2f91f7b1923a4c1684cbc97eb086ccd0fab993270d8c84d6f9da911f467d391689f312d89cea7cc6d59c20cfd39b0
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
-EBUILD fail2ban-0.11.2.ebuild 3586 BLAKE2B ddef850abaa1cd6d483ad780844fd574f561d308a2468fdf33cbfd479f525bfb6d130ca273cdd403490fb47b33a348c4ae76db70ca6aa017e99bb1eec2856612 SHA512 704a93c15b8101b45add0e217e412aa245fe40e4db92b9a95cc140b6fd605553e2e55fcd61ec3dedcc4a1e94a88b48ff84e42e9b451b0fd2db63ebfce566a84f
-EBUILD fail2ban-9999.ebuild 3538 BLAKE2B 0751d5d88c53d7d8821b9cd8ed7f62bf20c01790ea8007739866999a36f880acc32527a70052136b1e3364e109c130d8a69eccb9b313b26587ab2136180d85c9 SHA512 7b7c7cd7beba19c4c1367d0a37627212346788f9cfe111b8938ff3dbf71e4703617fb951bbf98aac226494cd86fb368b303dfc00a8afa9fbbecadf15d1a45814
+EBUILD fail2ban-0.11.2.ebuild 3625 BLAKE2B f4b38ddd45e4cc6f9c5e39a56aae7e131c98d3867fece38c5e6936161b47b6885e6d5a294be2531a8b8a4c4d67f38b7bcb03156b8193f3bcb3279c3f0a40732c SHA512 ce4be968377b06d0e95735d487a7c1c9de1b19a659b12fe03d50a792fdf69fdc81633201417cd6a932220d9228c4e17e3d8e70e884eba7c5d2cc9d1b6624c216
+EBUILD fail2ban-9999.ebuild 3577 BLAKE2B d355a7e2dd272987146d9bf37de7ff205052837ad04324964e7bef2a18759c0db07ca3cbe494f989acf36663138a3ed5755930ef6c3de99ee50677c4afab2733 SHA512 9553bf8079c7b886c038a87aec8bca6862290568463fd5aaf585741853ac4b8582e0b033a5ff40d9174cce5d47b8617dc23d971eb17e398638021f30c93237bf
 MISC metadata.xml 356 BLAKE2B 28861bc6e3c62f2c21ea1480816f2645de929f009dccf7f6ecf9d8a10ed72214fa80acab6bd72ca314b6f3154096b0c0f0324b07fece238150c356aac17886e9 SHA512 5759cb73ed737bf25d4fc68dc12a722100e5d7aba222a082d49900e8cbc06cbd1bf5d7272fae9f6256d475fe29397f391fcbffda9eee4e73214ad941da27ce69
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
index caf428f0ca77..3096e694a197 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
@@ -95,6 +95,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
 	if [[ ${previous_less_than_0_7} = 0 ]] ; then
 		elog
 		elog "Configuration files are now in /etc/fail2ban/"
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index d0d4d4ef18f7..2ad8f462e23d 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -92,6 +92,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
 	if [[ ${previous_less_than_0_7} == 0 ]] ; then
 		elog
 		elog "Configuration files are now in /etc/fail2ban/"
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 58af597705d1..7e558fd8dc45 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,4 +1,4 @@
-AUX logrotate.d-munin.3 692 BLAKE2B 914766875ea00212043c3d23fc4bd7f36b8974f956210319a8d5565c15e78eaae73a9c8d8dee3cb68f21f59d7d568ef07db3b4f708dd5ce4145a9e2f1170aa24 SHA512 c67a173f77f94725e9aafb47470b816cd013d5363ca59b2d0453ff5d032b0b3ca7e5f60e96d430c2aec69bd8979157da09bf7d34969bd6b55183fca7a0381b03
+AUX logrotate.d-munin.3 678 BLAKE2B 56c5e73e775c51898290707f324a305aa024ac732994b7e8ac2213a29740f481012d6433a6e72879524fbb3f958420919441265b0b5943b022267d47ca847640 SHA512 77853b9f0465da10e1844e25225350b7351126b19ee4caaad168b7b27003bca65bf34176293c610d5a4cb790a4a5d380fab482844ab23d6063208b2ce0fe1349
 AUX munin-1.3.2-plugins.conf 1760 BLAKE2B 97d853698470c35dd4bc305a559be6b1160a6877e557f6146eeddaf7d91f72c7ade36e1f5571c5ad742560a2f5f400fc51b481ee7ce305db9546af6b211046ac SHA512 c3498c4364cedd27016562568f918995be92dd6b3c2735ddd008190de0a729f8ea59e61f8517f6f48beaad14edb349af7476a39f55d246ab06d6cbe91679565f
 AUX munin-async.service 201 BLAKE2B 2de35c4577d097525b75fb812042627702e846daf908b8deeaf9980c76b31135d5ea906b0932dfe3b4d589e3c635e37e8198cf2b6e9d60cdc305eb499815266f SHA512 55a99866cb9ff50723a223b8a45b418f13ed754b6ca919260af8312a323aad432aca047724a5e32f6aee2f8f541ae829bf6bfdf19d22e7543ef2e5a7b9cd9d6a
 AUX munin-asyncd.init.2 452 BLAKE2B 3f368195aa6896a726068b9db0ce0d1fc5750fee69a4ca5b60bfc2897486625cb83dab1ceec5cd6c1cf4d4aa0fc517eb0e41548004254abc8ad25657b0bfd422 SHA512 5d2ca928ea953e5fec8451dca218165f2c058c6d57519fea65e94148c0dff5ca0a06a2a22b09f416e375e825463d4d2a7c1a424c60051fdb4fa0d79af9463c26
@@ -15,7 +15,7 @@ DIST munin-2.0.66-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051
 DIST munin-2.0.66.tar.gz 2257034 BLAKE2B b0c5412f32a54857acbe4baa5cf1447c7cf7053cad79ac09216ddc1aa8696ced813c3ad373517a8a48c5a08fae76154a0dda069efc036b7773e0557f078f8ff2 SHA512 928f727c558db6699524f3f3c2822404638e10e95678f4f211ec445ad6fbbdb7685a3d28343dbce616f60ced3cabff3b44e21a0a0e84b1d05032d295b81afab0
 DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffda4204ae6bc3c303f7667154c2ce606ffa27226c5644f3e6f71655c939b749da925136f59be4762891af49e2b1 SHA512 a8381491dfa15572438d9acda7a09feb0c3918ebe49e7bcfce5c172b36b4a5a0472bd6d06f5fad41270af0510b3fe115509d146f372df7fa47ed4aa1ec5f95d4
-EBUILD munin-2.0.66-r1.ebuild 12267 BLAKE2B 05ee840753229d97e2b1d5914191950bece83b6575cffa2a7ee50de4dfc3a16f892d8f660288315faccc570166e58fd391795a90fa3aa24531a5fd13752636e1 SHA512 b5ad10e6752dce09b925e05d42db944b5a8f25820b9fbfbfd0272b053539f2b70655ffaf745395f920f5d601ab65d1c0efeb27a3dc353f60b3d8c617f5949b2b
-EBUILD munin-2.0.67-r2.ebuild 12270 BLAKE2B efd09dd6739e73d4fe3b76dea649cdbc6b89f7fb631e01032e64b61fc5a83d0cd74e74c8c991e50a85a30bf485d97b8462a8690244a3a6f07f8cd8aefc590d6a SHA512 0fdff012ebd0dcbba79ae4595210759f4fe1b88181cfea8f3321d78e6941a0752e366aeb7931628c6d33e81c6b217b8e3dbd3e882dde76c868aba94a6365294d
-EBUILD munin-2.0.67-r3.ebuild 12179 BLAKE2B 9c9bd8113ccb2378a46b426e03717a9d331e337053742e09a113890b86551686c555240a83fe9ff65ffd1db99d6ac0444e2f802cd2bb35e4d9e8b4ecbc417906 SHA512 04fdf2ced3ed7f85de597e6590f8bb08400e98898c9acb669cd811de8195bd8d30446739432cd3702ed5d493e21f6785d911e09221d790fa081b6509660b0131
+EBUILD munin-2.0.66-r3.ebuild 12294 BLAKE2B 38acab7fb05b587bde64f914c8b0260297bbda56101fbca4dde767b4f7c5c7a9218d7aa5201294c1ab993215fbd0d67241099fcc2b3210f1f2a296dc3724ee7b SHA512 95a026d0ad372c7e77fa05c236af93e4d6563a586dda018929fdee212023d24f137fcbb33ef46344905e4d3b6cee5a2cc19931bea259576794f6371434905aa0
+EBUILD munin-2.0.67-r6.ebuild 12297 BLAKE2B d06b44129fdf229231a8b528f87f5868d2a1a456c5c36d657d03e691aa0dc84dc42f7a776f64575e5c0c38d167d6c241b51b1ec361e534dff916fa534ac87f9e SHA512 d3db57073670e6f151d9052b4dc9a193a22c5e42468f8be99b4f1c3da379c880c631097e254ccbb32db810d7225aadc3c642cf1700eb3d3b3029a63d7867975e
+EBUILD munin-2.0.67-r7.ebuild 12206 BLAKE2B c5acf7bba358087ff1063db553b6583954339f610caf272cb4f5378c6be138ecc94b6cb6150c0ed600e86a5d898749b7a1b64d4f05ecc351c62bf6b3c90cf52b SHA512 156281bb0393c3316bb5a6cefd2354635caab1b028aa51e2569dda9ec475271a26bc22941b8ea396812535383dbad3965c3a49805d326a303ed3cd2d71fca8cd
 MISC metadata.xml 3932 BLAKE2B 3f5a88c85ae9be35c1ef8c9b4f6ac99d8ced0974e3306c691a4c5fed87139c8514732fb0418d4f34e6be26786252df5d3876aaf2a895fb03dea08787488ccb04 SHA512 c066c14c28804c4f5f11b15046f4fe43e7b34f0befc98fb03d4cd3e222664806e03509196054076433596dfb3bc2b1369f69047bf15a6c5c4981d354280033ef
diff --git a/net-analyzer/munin/files/logrotate.d-munin.3 b/net-analyzer/munin/files/logrotate.d-munin.3
index 2d3b6829762b..5133c47e8ba1 100644
--- a/net-analyzer/munin/files/logrotate.d-munin.3
+++ b/net-analyzer/munin/files/logrotate.d-munin.3
@@ -4,7 +4,6 @@
 	rotate 7
 	compress
 	delaycompress
-	copytruncate
 	notifempty
 	create 640 root root
 	postrotate
diff --git a/net-analyzer/munin/munin-2.0.66-r1.ebuild b/net-analyzer/munin/munin-2.0.66-r3.ebuild
index 7a5621b5deb7..4d6837047b53 100644
--- a/net-analyzer/munin/munin-2.0.66-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.66-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PATCHSET=1
 
-inherit java-pkg-opt-2 systemd
+inherit java-pkg-opt-2 systemd tmpfiles
 
 MY_P=${P/_/-}
 
@@ -131,7 +131,7 @@ src_configure() {
 
 	local cgiuser=$(usex apache2 apache munin)
 
-	cat >> "${S}"/Makefile.config <<- EOF
+	cat >> "${S}"/Makefile.config <<- EOF || die
 	PREFIX=\$(DESTDIR)/usr
 	CONFDIR=\$(DESTDIR)/etc/munin
 	DOCDIR=${T}/useless/doc
@@ -204,8 +204,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
 
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
 	d /run/munin 0700 munin munin - -
 	EOF
 
@@ -374,6 +373,8 @@ pkg_config() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
+
 	elog "Please follow the munin documentation to set up the plugins you"
 	elog "need, afterwards start munin-node."
 	elog ""
diff --git a/net-analyzer/munin/munin-2.0.67-r2.ebuild b/net-analyzer/munin/munin-2.0.67-r6.ebuild
index 9f666d4ad680..b4ad2481fd45 100644
--- a/net-analyzer/munin/munin-2.0.67-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.67-r6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PATCHSET=1
 
-inherit java-pkg-opt-2 systemd
+inherit java-pkg-opt-2 systemd tmpfiles
 
 MY_P=${P/_/-}
 
@@ -131,7 +131,7 @@ src_configure() {
 
 	local cgiuser=$(usex apache2 apache munin)
 
-	cat >> "${S}"/Makefile.config <<- EOF
+	cat >> "${S}"/Makefile.config <<- EOF || die
 	PREFIX=\$(DESTDIR)/usr
 	CONFDIR=\$(DESTDIR)/etc/munin
 	DOCDIR=${T}/useless/doc
@@ -204,8 +204,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
 
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
 	d /run/munin 0700 munin munin - -
 	EOF
 
@@ -374,6 +373,8 @@ pkg_config() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
+
 	elog "Please follow the munin documentation to set up the plugins you"
 	elog "need, afterwards start munin-node."
 	elog ""
diff --git a/net-analyzer/munin/munin-2.0.67-r3.ebuild b/net-analyzer/munin/munin-2.0.67-r7.ebuild
index a0ed5615dc54..00a940ba1b5f 100644
--- a/net-analyzer/munin/munin-2.0.67-r3.ebuild
+++ b/net-analyzer/munin/munin-2.0.67-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PATCHSET=1
 
-inherit java-pkg-opt-2 systemd
+inherit java-pkg-opt-2 systemd tmpfiles
 
 MY_P=${P/_/-}
 
@@ -131,7 +131,7 @@ src_configure() {
 
 	local cgiuser=$(usex apache2 apache munin)
 
-	cat >> "${S}"/Makefile.config <<- EOF
+	cat >> "${S}"/Makefile.config <<- EOF || die
 	PREFIX=\$(DESTDIR)/usr
 	CONFDIR=\$(DESTDIR)/etc/munin
 	DOCDIR=${T}/useless/doc
@@ -204,8 +204,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
 
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+	newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die
 	d /run/munin 0700 munin munin - -
 	EOF
 
@@ -372,6 +371,8 @@ pkg_config() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf
+
 	elog "Please follow the munin documentation to set up the plugins you"
 	elog "need, afterwards start munin-node."
 	elog ""
diff --git a/net-analyzer/nagios-check_multiple/Manifest b/net-analyzer/nagios-check_multiple/Manifest
index d6ef6504e1c4..0a596c7b1a98 100644
--- a/net-analyzer/nagios-check_multiple/Manifest
+++ b/net-analyzer/nagios-check_multiple/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-check_multiple-0.0.1.tar.gz 9376 BLAKE2B 2db464b7edd4aa704560a3f16a5d70e4cdef7cd35284e3c679f3e10e5ef6eaaba19dc361efbb10a77f87c14726439869e4b415fe7e393a1d7ac23233b3bfa66a SHA512 a75bcd821afc6daca612f42c552fb965a3068dc04a94df41ff41d36928c764d44bcf72e1bd6d776bf4b443c73fc3946c0a91443a562019fcd1b6e8687d0ebcd2
+EBUILD nagios-check_multiple-0.0.1-r1.ebuild 1363 BLAKE2B b694b57a674daa4d5f2d24818952b3073ddaa8b4a0e7c3817c5bc58ab0c61e2a5c48a362c34e61694638879283d5e4096aee199b7f90777db67911b6fe1210ec SHA512 0d5e0b7f3fc32ad9f592c5db2d2cf617a167a86ac5610db531570825d59bca2b67e76a8c3e310d8fa4eaf1cd30a7217a39d8125e7c15eb588d941b1766b84212
 EBUILD nagios-check_multiple-0.0.1.ebuild 1357 BLAKE2B bd94906a71835708c96c225886dae2212cb17b585a4b39c3df3efadc83fdf9f5319029a5ff4406c7adbe3ee50d00c2bf812e902743483c1953770aa6570b79fb SHA512 ac1e10889763e24662d02f640b3174635d2fed615a2e99dfce317dda93a3b847245aeab593bb999ae583228963d6a4df196699569c38a09838dcbee05d3cbc9b
 MISC metadata.xml 346 BLAKE2B 16270d3fccdcd1c5519beddf3e520377a2538ca793fc1d0c9e3f1e640db66b562971900d5595754104cc30390661c6ff714ac790868e6aeae719e68c72eb2d0d SHA512 7f773b9c98c57e43fb394a2db6bc357d49c4561f44419aff7867fdc07eece455a473309646e90ed065ab11c64576d4dd764d134403330bd83e9f71e680d5a932
diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
new file mode 100644
index 000000000000..474031b4927f
--- /dev/null
+++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+MY_PN="check_multiple"
+DESCRIPTION="A Nagios plugin to execute multiple checks in parallel"
+HOMEPAGE="https://github.com/clarkbox/check_multiple"
+SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	distutils-r1_src_install
+
+	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "${nagiosplugindir}"
+
+	# Create a symlink from the nagios plugin directory to the /usr/bin
+	# location. The "binary" in /usr/bin should also be a symlink, since
+	# the python machinery allows the user to switch out the
+	# interpreter. We don't want to mess with any of that, so we just
+	# point to whatever the system would use if the user executed
+	# ${MY_PN}.
+	#
+	# The relative symlink is preferred so that if the package is
+	# installed e.g. while in a chroot, the symlink will never point
+	# outside of that chroot.
+	#
+	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest -v lib/check_multiple/check_multiple.py \
+		|| die "test suite failed"
+}
diff --git a/net-analyzer/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index 386b3333cabc..f019798defef 100644
--- a/net-analyzer/nagios-icinga-openvpn/Manifest
+++ b/net-analyzer/nagios-icinga-openvpn/Manifest
@@ -1,3 +1,4 @@
 DIST nagios-icinga-openvpn-0.0.1.tar.gz 4637 BLAKE2B 365b6450cccd5f7f25348583eae45c0b15932ec1e858d375171911e4108dd2b7fc133559a35399ece8d2a349f05b2f51897cf9e271f498b6bbaa2c6bba3551a9 SHA512 0dae6c2df71a20e287720767aa4ba41d0568f3cd4bd2a6eb252f86d810d3de265ddc38397df15bb1b115ba35ac68aa6e18345dc4432d4d13b08b500483ffbb11
 EBUILD nagios-icinga-openvpn-0.0.1-r1.ebuild 1200 BLAKE2B 7ae3d149997a47dd3958d69346a54488d89212196a8aa8a3de61c83528ac7bcc4bb57696f256d11c6140f0aa195d3f29f5fb5603aee86e9be6b223326724d62b SHA512 32a0c553937548477cdf84e369dffcbea84f2748ad460030687cccd562ee91036b7d8658e37a1858b078405bf6575d9ba3e3c434f070b8d2d3174f01205673c1
+EBUILD nagios-icinga-openvpn-0.0.1-r2.ebuild 1212 BLAKE2B e323ee6bbf7e208dbfe0b32068f78ce36c7b39dec27e692a534ca57eac8cf8f6fb0320827fd2b4c12a6f4e270eeec6902c5049ef452552b7f5085c70d34f6004 SHA512 c15bfb212bcf5e8407e0ba729082e99165aa05fd39e19b6cd1ab8689a9055965223728623f02d1f2bc99562d6cd28bbad50bee241a6eac53b43c49cc8cc5b283
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
new file mode 100644
index 000000000000..6ff5f2740438
--- /dev/null
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_8 python3_9 python3_10 )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+MY_PN="check_openvpn"
+DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive"
+HOMEPAGE="https://github.com/liquidat/nagios-icinga-openvpn"
+SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_install() {
+	distutils-r1_src_install
+
+	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "${nagiosplugindir}"
+
+	# Create a symlink from the nagios plugin directory to the /usr/bin
+	# location. The "binary" in /usr/bin should also be a symlink, since
+	# the python machinery allows the user to switch out the
+	# interpreter. We don't want to mess with any of that, so we just
+	# point to whatever the system would use if the user executed
+	# ${MY_PN}.
+	#
+	# The relative symlink is preferred so that if the package is
+	# installed e.g. while in a chroot, the symlink will never point
+	# outside of that chroot.
+	#
+	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
+}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 758b9b4d14e6..b16099c16091 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -16,6 +16,6 @@ DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e462
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
 DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1 SHA512 376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96
 EBUILD nmap-7.80-r2.ebuild 3302 BLAKE2B 1067cf3f8cfc655936e8326cb74adbb27c86fa2a4b64a964a68442beb8c496adc968fcfdbd991f90d54e62f7004ac6876a85194c9a198b99fdb515f8b812f9d6 SHA512 5547b397864ba934196705250f714e6bcc7a10613745cef95dff817acde8386627ad494da7748f5e1d0a66e8e74727632f61840253e95d5a191ea2ab16df77ca
-EBUILD nmap-7.91-r2.ebuild 3227 BLAKE2B d0f0ccc51175f6d4962da5ce4752215fae3527fc8a6edfb8296ad33c3cbc8017f6c8ed420176f9a3d4554fc9cd82f2b66d7ffdae8f6057385a6ebcb358f84cf6 SHA512 4698d60d268cddfe09c35e3bd137c3dfb1e9bb95ce1535cf1beac0d1ebc4ccf5363dc81a6b03f80cb6ad87819ff739a738afaa6f5692349ebae122690c0ee8ff
-EBUILD nmap-9999.ebuild 3191 BLAKE2B b3a18f95682620393cfcbd4ebd5da0bf9d1544ba07664042d6bf8c1206d038495ae82bdb9160d27ca28a9abef5e0423518274b096c39d99c12dc7e7ab52972ab SHA512 24fa8dece88f808850305bcc053717c7610225c5920ae801e2bea2ce6c2ab5bab2dff619df55088f68d538e584a678b18c5f956cfbef89ad0a568cd98ad8497d
+EBUILD nmap-7.91-r2.ebuild 3235 BLAKE2B ee342955c8d38eb326b5de456c986eb7be3da4998333ee085a3600d497ab7f7dfdb630f750184de0f15989a276a7d7c2ec886f27b2c980af0d10d2fd54f56e0c SHA512 1b6124c5f6b1e58cea5834e3662d985343101a3f1bed150f4ca321cfbcd1290f6c91801ba2360552b480874c0193c0f93dc682dc490ce393602ed2af5bd3aa6f
+EBUILD nmap-9999.ebuild 3199 BLAKE2B f77fa1c163955c79703536ed201aae478bb1e165814764b5d994d04c66f8f5c18ea37d29227bb71362e10d6b5e5239ca97c081f4de60d1adfecce6b2982d18b0 SHA512 4d4fa28592a7e250d45bce010e94f6576fbdf3a995110b6e4ed19e28ed8c534635e9a2d1697577bfe4f5ddab04a3457592c71cfa219fcfddc70cc9951dac69e0
 MISC metadata.xml 979 BLAKE2B d77a475cc6bb5be93382dd712d5cee9b4a358a0cab70a0b13b40dd78cd6c5ccdc1802eaa58814ef3868281b2129c907cd22d480b4667ba9c162c0c0ac1ef2aa4 SHA512 c97db5c77b309a940b3307ef35edd202feb0cc5778d4d4ef9a624458012b473fb0a96c6d9460c3d42cc1fe3c5c9009c29aabff058c1dff818b6901d068f47e48
diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 2011c9655dae..d8498b958689 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]] ; then
 	# Just in case for now as future seems undecided.
 	LICENSE="NPSL"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 0143075841b4..0b17737335e2 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]] ; then
 	# Just in case for now as future seems undecided.
 	LICENSE="NPSL"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 0f4861cbcef5..e30ba73906b6 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -6,5 +6,5 @@ DIST nrpe-4.0.2.tar.gz 524146 BLAKE2B dc100579420eeccaaa2a913f56c76b86b6ebdce8d1
 DIST nrpe-4.0.3.tar.gz 524160 BLAKE2B d2c99cadf718e7049c911388b105fb4f5248307c733d94a73fd02ac69c49be230dad58be0a182af9c8d7e0d1f34e8dba6b8fc46a7c01eb15d845f2b3a54499ed SHA512 31d932c481c8a53bd0f8865fb3cfeeb1466b9b05fa89382aa056aa9343a09843b51fe5398fd0388e6bba99e9c3d8093f6033799fd83afd43012bfe8fdc5a33e3
 EBUILD nrpe-4.0.0.ebuild 2754 BLAKE2B 41c7ab9b52abb8dafef7936c7ffaea0bd8d3f3fd2b658254eebb119c2b8bcc4ebe293d31f6eaeafbea8a181aa1f402f5193d349254709edb6ac44b08444b633c SHA512 2e818678b118dab57bca1f4ddc094b57e225cf0aa9bed460e7f1143758cc7eba591dc32f08c6d1219c2d1e3c27bdcb396da9c46f02a27b3808abf83a2d7869bf
 EBUILD nrpe-4.0.2.ebuild 2810 BLAKE2B 4d947f53a170ba7d178581ea7fab97eb2faa45207e6b9103352905dd6b445676d76a91cf3287addce3e965c746d525146f52e5523d13d6599a6d215d880afd13 SHA512 04f3e6b17a8636f7eb3c2055cb0d8213047c80544e4f64aaae30b17396acdb0446421bd8bfa245b3c97c4ba6b40039d3c614a0b95e8de1dbf1a97d1341899f0a
-EBUILD nrpe-4.0.3.ebuild 2770 BLAKE2B 807189a2b10ce8efee80dd4131b115fddf0d538fc5cda633d738b2286cf64e6e1d7cdd121e84d05f059ba95bcc768eae82cf96394ac619627c8dc8399b1ed100 SHA512 3d8cb1bbc09241e6ff7480ce7d03181896dce8a8df8491ec041d71d9b66e33df5bd69bf7aa4c6abdfe2e79788d36cb729240586669333135064faa488b95a19e
+EBUILD nrpe-4.0.3.ebuild 2765 BLAKE2B abb5c457a7b68ddb5255b41f84beb1fd970a8057487ac513964889378f29f2b2845589683f28ba7430c67e102e95e2f2d74588ef2e640345830678e709ea3462 SHA512 f8d83f2580f0241232719f648d7f1f619d8998a20d1f33f2928ef60619d8aeb6ab7085eaa1327b9fa76e8f9d657e9345f75c2c7b902766f43b07391abbfbf30d
 MISC metadata.xml 770 BLAKE2B 93991f7ee4c1b6c26b67e873fae0cdb66170cd93ba6b79d6e798cb2605126888a996f633eccd038ece2a822d1b92498c2036746bb3a1add2e336c6026c2db86d SHA512 48693abab21581eff977b8deaa5fabc5d388960c9cd090b590a1f6d3c8d37b63fe33ec86d6f95d7435404314b84053f8c2ca84b0f33c6c7241ea7260f82a3a27
diff --git a/net-analyzer/nrpe/nrpe-4.0.3.ebuild b/net-analyzer/nrpe/nrpe-4.0.3.ebuild
index 5cbe3d9a63b6..585fd858b111 100644
--- a/net-analyzer/nrpe/nrpe-4.0.3.ebuild
+++ b/net-analyzer/nrpe/nrpe-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="command-args selinux ssl tcpd"
 
 DEPEND="acct-group/nagios
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index 918aaec8bd55..ff359a71cc34 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -3,5 +3,5 @@ AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c
 AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
 AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
 DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43
-EBUILD prelude-correlator-5.2.0.ebuild 911 BLAKE2B 89780f9562a124f3fd90ba39a8e7d82c8008acb819c4c064ab579acd397f4ae00b9d4da86a048d81f2d3f381dee17a9b004a02b4f76dee8dd7156b935bdcc358 SHA512 312739c7fd601f936d14f8ee920154e9d9814fd27c91cac4f64015501ecff05371859ba23322d996b591e1185eb3223cbd26883094ae553a791a73b198e00f12
+EBUILD prelude-correlator-5.2.0.ebuild 960 BLAKE2B 86f6e65e18e9c191cc7b113df6af2685851035681cc969bd9dc050c67a6635aaab54ff14b5f71528676528c81845082fe63ad5be816f2af9ca884596892d4fd8 SHA512 2cb32c632cfd85cb6e38b2f40b930b7b15e73f9b5b8940fc3c02e47eb08c0823fd1e0205d2287af0c753fc069eee250ac5e0baee4e94a736942d63b44ad6f059
 MISC metadata.xml 854 BLAKE2B e16af36fd906bd519bd60d82628e1d75c5f27e1da3a5d59c71c4385fcfbfdc5b288f3d56473ba009e151b718516ab195976a845645a840c8c9bbfc613f49b348 SHA512 d336ad2f22f859c19cdaf0cab481115cacd818b85b8c5fad469b388477bdd772d506f56b2214b0a4ac0bf2868c57d26fd9fadd7f32fd04279c04196fe2ab5d96
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
index 62f46b3c3ace..359b4c7a6bfd 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild
@@ -35,3 +35,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
index 7b2671ff6e64..9521658214ca 100644
--- a/net-analyzer/prelude-lml/Manifest
+++ b/net-analyzer/prelude-lml/Manifest
@@ -5,6 +5,6 @@ AUX prelude-lml.run 125 BLAKE2B 79cab33e4b7f2508d621cef7342d34042e5841a73c2e75aa
 AUX prelude-lml.service 297 BLAKE2B c1ecbb3f69c21ccd82f7c985598a3cfcf5313d9004d9bc1b9f7dc911b54a51ae1aa0870c5fe236ef1473254196aec34391b838d928bb3c0d1e7ee92f131abcd5 SHA512 0faa91b3736fe111b08fdd3f03829c35a81133cfc54e677ebc423d4d9a29113744253fbee12f9b531494f2f39b549df54eec4cc5c7363375443113277fead87a
 DIST prelude-lml-5.1.0.tar.gz 1585080 BLAKE2B 572a3bf2b013dc3f427f7e3a4cc650219945a0e481e10f9f8f8e6afac75c86db5319fd16f1bf9157ede55ae511ce5151a0fe63694d0b8cc2becbd6430521fba3 SHA512 248434352c340d9979051897190fc7fbe835c7b1f2411ec98a04cbf0bebb6f115e80ca854d35ab2b2f50722c052eea10e088e4557ca4218f0dfed21ae21109ae
 DIST prelude-lml-5.2.0.tar.gz 1584414 BLAKE2B c97a730e366cdf0663ad6393acc0125d01995bd1339f4538a1dd62c2aa85e46dd78e3e279067a2bac328db675b5de59cebb8474bdafbe00d745320d360124535 SHA512 45de2dea196941086a690b3081b98253a3d9685552a25f39cf3b92d3b223c5a9d98057f855da1f23fff7aa425fd832e6021050d2d7fe58322c4f3f48c34394b5
-EBUILD prelude-lml-5.1.0.ebuild 1075 BLAKE2B 784e15f5493576d8a1c7b432159be81aa0cda97e9be3e5a8f919cd6f7333e9ffdb1eb3d4ace32d6be587982df243aa5d7bc11dcc67cf209654af9c5cf70e6e1f SHA512 1de5bc8adea9fab6044c957433a73c5ba5315c800afa8cb4a06d6336d3a5c8cf6a84cdcf2a9d81a063e6f061fbd99d1a8de76a68aac99f96338d744a91d6869b
+EBUILD prelude-lml-5.1.0.ebuild 1124 BLAKE2B a8a7c9e876f50c83e9c5134f6b6a1f61a1f70c0b460edfa00561a9b606fd9a93768651dfc8c029826dae35934a8a81ff71377cf60e27f36dcaaa43896aaf5f78 SHA512 599c15735a6a1255620f86d546ffb1b0825c3c072484f1956e5eab6bd888f42fc5a41deacc2979f4d0d9ac1b0ede39c2a37301a772b290cb77992abe05654edd
 EBUILD prelude-lml-5.2.0.ebuild 1166 BLAKE2B 5efaa9bc573a8af072bb2727886c9e49fa10e222fd5b1793d4d884b4c51fa5629396c6e95fc2681a85e4c6a74ea09f61a9caeb19824be7e570af5781da5163e1 SHA512 be81fec712f3076160d5d584173f0f1edbe564b755523985e5236d2c04316ec1e6e6ab8a77d3f75346dec1a1f89809a07af5c9b4459af00b71e57ae4378c92f1
 MISC metadata.xml 765 BLAKE2B 9f85da7f3df6def91ca41f8bf45437bb8ea8d773c1a45140719d7112271294d87234752a8319be0e79b909c0d20b18cc91cc9aa67d2c5abe101e54a1a2574c7d SHA512 36bec921d2b2e315343c8597b1ee3408efbfac0ff660838f5aa4feec6f20b22dca9d07d679d4df9bf887552026ce3516732e28d1cc9efd50d07bce745d69b671
diff --git a/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild
index d397625a92db..26fe70882eec 100644
--- a/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild
+++ b/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild
@@ -57,3 +57,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 3f50ba420da4..925d5a850f27 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -3,5 +3,5 @@ AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731
 AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f
 AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344
 DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
-EBUILD smokeping-2.7.3-r1.ebuild 4020 BLAKE2B 4bd615ccfeb02ead87f489c2fed34973359bb0922337d7386f2c4053e5ee325e6949d220058ef1e84e94613c7f43bacbfa48e720ea278307bd1aee2a13b18d13 SHA512 951cdd387b25a9a918e01dc6d959b129ba4a9be9fe9dc3d487d3014720dd7acf2faac9a276e13b74d0813ab7dad5ca4e8e391c8ed16970b4ddf3995f0babd9a7
+EBUILD smokeping-2.7.3-r1.ebuild 4069 BLAKE2B e184cf1644685eec1f6dc077304cbe95902b60a35ee47c3542943837f72d24579297986195d8c4a1ff63923970d86c155cdbd24b353a8dd69825d1b6fb6b18fe SHA512 d67b8fe64ba07aeeb047cafdc1a3d54df0e581ad7bbce2ee8b8b31c7e85f7197ec4c872c4ce62a4642e3b0394f720423239cc4af6bbcdda91fd678299de2a8a1
 MISC metadata.xml 468 BLAKE2B d219af56f99fd891f8990b2298c9daa86d8fa3f8433b04eeabab1d47492a4ba186906a265612422517f9fb373217473fd047412dc08b7b1bf3f2aaccc92ec2d9 SHA512 0ca877d24981625a5d601cd19fc18fe37b48526c7266c248ee0ba955ecc873b31ea5f06d3feb692566d228a481193fab1f70c53aaa0be089aee490d80f80e815
diff --git a/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
index 497f430571fb..26e3c02ce8a7 100644
--- a/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
@@ -137,3 +137,7 @@ src_install() {
 
 	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
 }
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 38aa01ae2ddb..f340b73f8b4c 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -8,6 +8,6 @@ AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee35
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
 DIST suricata-5.0.7.tar.gz 29211384 BLAKE2B 939e672d9df61863c7adcc4bf52f5620e3760f0d6178362828474b1a72c4e3a69bf1ab52a3220c0069ae5a545c56307553c2796166af488a72a25dddd68782a8 SHA512 dce3929c796e04778eb9437bd4c7203aa9dae56be0baa4b7d986d3eedff3bfc71aa2886ecdeed9d87ec3d88cd3060ff8ef01540d15eb857698a2c4696da5899c
 DIST suricata-6.0.3.tar.gz 32421197 BLAKE2B c1b339823f2caab73aeb82f96fb703834cd3ca9f0f60662cf340cbc36734aea47106d49869bd70cf3acb419e954ca37bcd22ad1b2d789597bf36f8fe7ceebe11 SHA512 186b871959988ca7cbd0d69e725aed18af915f93363c7ecc0ffa20d8ad8f50a326be08452d085772b1df84ef25258ef0dd6b35d41b0988cb1c653e60aeb103a2
-EBUILD suricata-5.0.7.ebuild 6298 BLAKE2B 1a476c96d3148077c7e828b8d51b46a3101f40b1bbe7d0ff99d147a2dede4a545eed0a81216159cc28351adc77f9fffeae5ec79d68e2d24f296da6ebbfaf8785 SHA512 fc793b67f9d7f14c99e0d81d4b229a667cdaf0efd35a6c8879e19ca42e3ed6a1dfe8197e15108bdd492d05323c7703c593a5c76e2414ccdf4a90ad934780a6d7
-EBUILD suricata-6.0.3.ebuild 6574 BLAKE2B b738ad0c1151bbc68464443557d02b8d44395e94f51116f80cdd62cdc39acbac6e583d06e7da14be75670c87cff0acb1780b94622b0bca9e9bcaf554582f325c SHA512 858d9be588774b6ab7659b08ef33280de3d0eec8595ac75d8da7f24301c03fbd79a34c9e09252170f49ee3722b8bc369678389b29e5c7c66f3965e028b715d31
+EBUILD suricata-5.0.7.ebuild 6328 BLAKE2B 663b792d20371e5333293365db2070a253285a19e72b1accb12b88cbbf68bb7a143a1cf201820c4d328688ea4781ba9ab9a5d61a83eb6d59139d6ff99421c7dc SHA512 5a45c6fb2528cb9d130b95d76795b2daa89876f71dc8016bfce6c95e7d1cbb02e3c301050726d4ff1cb2bba04b04fde97573b0460a63574069e3cb369187581b
+EBUILD suricata-6.0.3.ebuild 6604 BLAKE2B 0095c03b426f8e0b0245446427e1620d2bc21c8c1629bbb28c9827e332b8627d36dec6b9a7b078181913202635f596bd562de92a3fb1a6c78d4e89498048b085 SHA512 fc3faef17001e3ccb9764248306fc7f9b81361c750168982ba13e46685bb0a898860b0dfeeb4141590fd93b3898ceb079a0e2f69f95bdce0dd035898aa470574
 MISC metadata.xml 958 BLAKE2B 944628811fffa8d4c801dfab169a83b31fbca9d5e6c52a7aaf7131b56118bd53e9360002fc5e335253f9bab7c434c2f4defe44f4f1bed00fabc9013454f24c14 SHA512 b077688adea6058d1249a025898c81289ce04f47f6fd2684d8a2aa8e4494f994d68d07393097b1181add90d8f87c62e07e6717e08e3d4a0ebf9c1109859ef551
diff --git a/net-analyzer/suricata/suricata-5.0.7.ebuild b/net-analyzer/suricata/suricata-5.0.7.ebuild
index 50b8ba84db3c..b2e2f7e436d8 100644
--- a/net-analyzer/suricata/suricata-5.0.7.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.7.ebuild
@@ -147,6 +147,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	elog
 	if use systemd; then
 		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
diff --git a/net-analyzer/suricata/suricata-6.0.3.ebuild b/net-analyzer/suricata/suricata-6.0.3.ebuild
index c6dfbc4f14b8..6b5b71ffe43b 100644
--- a/net-analyzer/suricata/suricata-6.0.3.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.3.ebuild
@@ -147,6 +147,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	elog
 	if use systemd; then
 		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 7bc0031d90e9..cd045b5371cd 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -6,7 +6,7 @@ DIST tcpdump-4.99.0-upstream.tar.gz.sig 442 BLAKE2B a6cafbccdc1ecfb236a643b72114
 DIST tcpdump-4.99.1-upstream.tar.gz 2014324 BLAKE2B 0a10fe68afdfe80d3e7e661352fcaf1c47702df27fbed959f52fb0ec81543a1d4ce6b0de16a8b081de48dd43e09a13f5e1f0fb11d7590f92cbff29dc511bea12 SHA512 53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7
 DIST tcpdump-4.99.1-upstream.tar.gz.sig 442 BLAKE2B 9a80b1796ef777bd06d0b8953fe1ff446431d0ff1dffcd58e29a0b771f6734f70f3f0da7c36a1eaa1b6e57719d79c601872a84b7734208a7e8951cad9aca86ee SHA512 b438643701efbbb5579d9d51ed48756a47dd644e0acb10b0edff6d04f3ae4cea6528b40820a656407b73f983b2a634e0165a6c8c0fca3b557394a14e2f2384ab
 EBUILD tcpdump-4.9.3-r4.ebuild 1700 BLAKE2B 807df788ac7f23cfe14a7c8116607bdb8bbdf346df552feeb8b72bd23f6f4867b8701e2b72ff585be5f5a658c12cb1dc955d205437bf9ec80e5e969c9aa7103b SHA512 4f1ea4403015d9b0e01c155f0df4695c4e71a997ac2e35334f3cb2f9cdff6f79dc23e29a963d9305c3d946b98dbd59ee45a22e91c0de13bdac502511bf1b65ef
-EBUILD tcpdump-4.99.0.ebuild 2299 BLAKE2B b12600c20ca80aed3aef1c0206be94cd61cfca8a4ecadb25f1de82b748d416daaa1772533c688a06a609edc4d8fc19f6b526041f6d57a6da8210974cb743cf1d SHA512 8eaed7d2f02b9e1fd3d517f09fce49a5e46c60e027f951a61c2ef7cf2bc51b3c8e2def33703a1104e48f12f02cdd633895f7d83bddb871b1c8ca082d9222c436
-EBUILD tcpdump-4.99.1.ebuild 2334 BLAKE2B 7ec3017043221b173eb62ad5d824bc3f2d520d8a48de773d5497ff9992b6ac93b5722ec7512ac4490db6720ad82ced3de68a8925bac4ba1e04ac6164f4df7bab SHA512 bccac4cde5f83a40fcc30b947db4b5605d96d3dc55d99f67ce52a0a030a02dc76f5f52e28caeb77a429e12df701c4b5975c784bc201f5098e1263911d38f463f
-EBUILD tcpdump-9999.ebuild 2144 BLAKE2B f1291e3a4d1f0244dbe4a7e80b40b9ce1f44b5d1f5e76a6888f4cbf77c704497bc316e25f8785faa75319e658e3f162dcde20ce86e2ba497481dfae0c7def580 SHA512 5a64ffdb86df8529d264554aa097cd824e5c26690a9b1a258f5b56238f6af5ee80920109cd1c9e3c128eeb0acfbceffb889ecf2a1310865615c73da1186a3c0c
+EBUILD tcpdump-4.99.0.ebuild 2307 BLAKE2B 229d12e8a50be64a4987639fea0483c6438e79b9319c34aff770c5ff3d7048248dc8d43503e32ba608954d6f3f9fc65d76968e1f12d19cc1f67d7fc64f09482e SHA512 6eaee5aae61523f951608def16cce4e8ff34d74be950e033c6054eb4d2b27a7bd44a95c25e93c70dd0339c5a53010a9c0462a48e983b34d8336b09343218011c
+EBUILD tcpdump-4.99.1.ebuild 2342 BLAKE2B 280d9abad4d57f130518fea29ccd9f94a7587070e476d04a0805c86751ac993d26e255e30694b35f1e61e8614d22bf1d0cfd572220e08da2764bc66d533f3bcd SHA512 98b8ab6b95fc1fec71d7f2af31ef231addd5146e090b0c64d4265b4a5967bbb75a8dbc66637a50e1139f405ed576c37d6cbfd81ae0b4a55b69a26629b4b63c96
+EBUILD tcpdump-9999.ebuild 2152 BLAKE2B 826b40b6b1993e92e19d3be108c8118789304a541b0d2bd969c88b08d32a177e87ef9d8c00f43208128dc44c1458700fa18474f889ad5f5174b6583c84e43209 SHA512 df08352120690b76ba132a5087d39605e7ae0502e20ab9e0e5ecd9fd6a2585622a6ffe6f542dfa279f54e37fcd564c32fc5b9941c83de0fbb0c57553db111444
 MISC metadata.xml 700 BLAKE2B 75eb9e5a825df6e9f4d4ef871e18eeaf6960ee25bbb42d5cb4bcd78775a7ead3ca45c76dd54ccee34c30e56d39303ee4d374a13bbaf449cbcf72242b7c9306f0 SHA512 c248231c288d69b2f71e86054095b599d72e971b9f8e67bacd851907b70b6a252fbf85a47f2b7f0cd3422ec7ef69410e2b3dbbe6de6b96320718dd5400900c74
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index 99b6d4b9e939..bfc246ebfee4 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
 	# Note: drop -upstream on bump, this is just because we switched to the official
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
index 722dbc5dde2e..80191305e0e5 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
 	# Note: drop -upstream on bump, this is just because we switched to the official
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 2fe0728499d4..748778bb057c 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
 	inherit verify-sig
 
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest
index 647acd59bdde..cf07fe1e1d3d 100644
--- a/net-analyzer/tracebox/Manifest
+++ b/net-analyzer/tracebox/Manifest
@@ -1,4 +1,5 @@
-AUX tracebox-0.4.4-deps.patch 5159 BLAKE2B cea5cfb75b407c7e9a88062abc931ae27b7f5022e586ee7f811129ac2b5c5a54a61b6a0ce71961ebf6102d1b53087e91260cfe4d8f6622d78e98e87408c2d64b SHA512 a87ff6ef0079f99241dd975d1fcb1bb3d1c2a0a623af1932d9a00b45b6d70b403e34f8dbc07551cda55707d5eea5e48a7bb7ac931474efe6186937942a769761
+AUX tracebox-0.4.4-autotools.patch 6324 BLAKE2B 26a9e8df24323a05b16d6a97e24d06c2d7aefb48533b2ac5ef5f4f15c5900c8870e0a28bbfe669223ea5b794dc91ae59f17304d31fd0fd4c1d119d7aeea4ad9e SHA512 cc4fd3acfed4f8914e7aea87a5a8be177bf13ebdd920c9ff468a2f33e154eaaa5e238e4dfc4d1cb222128a6c5c974de117633250daf6c071b6468e7f07ccd29a
+AUX tracebox-0.4.4-include-crafter.patch 995 BLAKE2B cbc16ee7f29d76b5dec03c4bb332b4155fa93a04a32a783ba4976c81262f481aa2a09b3df1e22e2b94e457016e3f16a927f41f7ec50749bc5ffc822370182c00 SHA512 6164cca291ff982556785051f0d4ed418221aea6701b3a66d32fc36d69c39c9e8c7e74ed06bed938628651e67ea9d24554e848582cdec19ebe9b03ba4104703e
 DIST tracebox-0.4.4.tar.gz 76828 BLAKE2B 0c3fbe9ea3fd5a967c85cf7b175900d899885f6c43ca8ffa32ba98256490b5bc23e8f80618208df6ec05f0484e5ce27599528aa5d84e331ac71eca960b6b1fd0 SHA512 2113d6ed4543b0c3a9b44bc92c4eb8ab2a860b4409a5eba374b9960ddb4ba299a33c0dea49595c94bc725eda36633d8bb698236d662ea9cc1027070b597c52f6
-EBUILD tracebox-0.4.4-r100.ebuild 1250 BLAKE2B bebc05ecba31e0b71f2e3548e490227a0552d9235c491ef5d2568aa83b2ef5eee88a0c969104d8202098c047f1e9db5f0386fe768c75edf8dd67b51f51cb6a84 SHA512 ec6c1125325177e9e1f15afaadfbf557072d54ddff5b9f01f0f8a0a658a24d46d76f120aa28b86fead73c54e66f1311f3d6139685a734a4e07f86e40faff677c
+EBUILD tracebox-0.4.4-r100.ebuild 1083 BLAKE2B fc5145dd9d37a579497f6fdee4720096f13210cb203a661b65be0cc09fdb9f34026ec5e37505d4dbea69b445f959706519b95f59be63159c7ee36aea3a053cb9 SHA512 d2fd07e88ceec0ddda22bb4de8c9847a00a0aaafd4f59e52194400e9fb98731d69fd0019960e1549e4db108a89ba73a1c8ad78c31be52890cf1647181e10cd5f
 MISC metadata.xml 575 BLAKE2B 513c1e0904b220151dc961251b8b93223017d423d67c194d4af8ac03c73d4d4d023b377b2b95b7a5a730c8bb6a722669ed4defb2cc822c5ffa69a39d7c380775 SHA512 3b56de905ff16d563e9d69b1306950dcfb5097ed04a1aab5bc69db6242804ad9e5172c4d19f610daaa109bae97871342ef29b037b8e8f8b96bc42b3f5f543856
diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch
index 43c0132a49a7..612132d157f4 100644
--- a/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch
+++ b/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch
@@ -1,3 +1,8 @@
+- do not link to bundled
+  * dev-libs/json-c
+  * net-libs/libcrafter
+- allow different lua versions
+
 --- a/configure.ac
 +++ b/configure.ac
 @@ -14,6 +14,8 @@
@@ -155,3 +160,55 @@
  
      ac_configure_args="$ac_configure_args_pre"
  ])
+@@ -271,7 +190,6 @@
+ 
+ AC_CONFIG_FILES([
+ 	Makefile
+-	noinst/Makefile
+ 	src/Makefile
+ 	src/tracebox/Makefile
+ 	tests/Makefile
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,8 +8,8 @@
+ MAYBE_DOC = doc
+ endif
+ 
+-SUBDIRS = noinst src $(MAYBE_OPT) $(MAYBE_DOC)
+-DIST_SUBDIRS = noinst src tests doc
++SUBDIRS =  src $(MAYBE_OPT) $(MAYBE_DOC)
++DIST_SUBDIRS =  src tests doc
+ 
+ debian-package:
+ 	dpkg-buildpackage -rfakeroot -tc -us -uc
+--- a/noinst/Makefile.am
++++ b/noinst/Makefile.am
+@@ -1,4 +1,3 @@
+-DIST_SUBDIRS = libcrafter/libcrafter
+ 
+ all-local:
+ 	cd libcrafter/libcrafter && $(MAKE) $(AM_MAKEFLAGS) all
+--- a/src/tracebox/Makefile.am
++++ b/src/tracebox/Makefile.am
+@@ -4,7 +4,6 @@
+ 
+ dist_man_MANS = tracebox.1
+ 
+-dist_bin_SCRIPTS = luatracebox
+ 
+ SUBDIRS = examples
+ 
+@@ -78,13 +77,11 @@
+ 
+ tracebox_LDADD = \
+ 	$(EXTRALIBS) \
+-	$(abs_top_builddir)/noinst/libcrafter/libcrafter/libcrafter.la \
+ 	$(LUA_LIB) \
+ 	$(PCAPLIB) \
+ 	$(JSON_LIB)
+ 
+ tracebox_CPPFLAGS = \
+-	-I$(top_srcdir)/noinst/libcrafter/libcrafter \
+ 	$(LUA_INCLUDE) \
+ 	$(PCAPINC) \
+ 	$(JSON_INCLUDE) \
diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch
new file mode 100644
index 000000000000..bedd0208303a
--- /dev/null
+++ b/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch
@@ -0,0 +1,44 @@
+--- a/src/tracebox/PacketModification.h
++++ b/src/tracebox/PacketModification.h
+@@ -8,7 +8,7 @@
+ #ifndef __PACKETMODIFICATION_H__
+ #define __PACKETMODIFICATION_H__
+ 
+-#include "crafter.h"
++#include <crafter.h>
+ #ifdef HAVE_LIBJSON
+ #include <json/json.h>
+ #endif
+--- a/src/tracebox/PartialHeader.h
++++ b/src/tracebox/PartialHeader.h
+@@ -8,7 +8,7 @@
+ #ifndef __PARTIALHEADER_H__
+ #define __PARTIALHEADER_H__
+ 
+-#include "crafter.h"
++#include <crafter.h>
+ 
+ /* ICMP message can contains partial header information */
+ 
+--- a/src/tracebox/script.h
++++ b/src/tracebox/script.h
+@@ -9,7 +9,7 @@
+ #ifndef __TRACEBOX_SCRIPT_H__
+ #define __TRACEBOX_SCRIPT_H__
+ 
+-#include "crafter.h"
++#include <crafter.h>
+ 
+ Crafter::Packet *script_packet(std::string& cmd);
+ int script_exec(const char*, int, char**);
+--- a/src/tracebox/tracebox.h
++++ b/src/tracebox/tracebox.h
+@@ -11,7 +11,7 @@
+ 
+ #include <memory>
+ 
+-#include "crafter.h"
++#include <crafter.h>
+ #include "config.h"
+ #include "PacketModification.h"
+ 
diff --git a/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
index 63a8ba122cbd..7278ad0ab731 100644
--- a/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
+++ b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit autotools lua-single
+inherit autotools flag-o-matic lua-single
 
 DESCRIPTION="A Middlebox Detection Tool"
 HOMEPAGE="http://www.tracebox.org/"
@@ -15,51 +15,37 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="curl sniffer"
-
 REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
 
 RDEPEND="${LUA_DEPS}
 	>=net-libs/libcrafter-0.3_p20171019
 	dev-libs/json-c
 	net-libs/libpcap
 	curl? ( net-misc/curl )
-	sniffer? ( net-libs/libnetfilter_queue )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-RESTRICT="test"
+	sniffer? ( net-libs/libnetfilter_queue )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.4-deps.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-include-crafter.patch
 )
 
 src_prepare() {
 	default
-
-	sed -i -e '/SUBDIRS/s|noinst||g' Makefile.am || die
-	sed -i -e '/DIST_SUBDIRS.*libcrafter/d' noinst/Makefile.am || die
-
-	sed -i \
-		-e '/[[:graph:]]*libcrafter[[:graph:]]*/d' \
-		-e '/dist_bin_SCRIPTS/d' \
-		src/${PN}/Makefile.am \
-		|| die
-
-	sed -i \
-		-e 's|"crafter.h"|<crafter.h>|g' \
-		src/${PN}/PacketModification.h \
-		src/${PN}/PartialHeader.h \
-		src/${PN}/script.h \
-		src/${PN}/${PN}.h \
-		|| die
-
+	# remove bundled
+	# - dev-libs/json-c
+	# - net-libs/libcrafter
+	rm -r noinst || die
 	eautoreconf
 }
 
 src_configure() {
+	# https://bugs.gentoo.org/786687
+	# std::byte clashes with crafter/Types.h typedef
+	append-cxxflags -std=c++14
+
 	econf \
 		$(use_enable curl) \
 		$(use_enable sniffer)
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 09d22b3bce9d..ab05d5d40c2a 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -15,8 +15,8 @@ DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b
 DIST vnstat-2.6.tar.gz.asc 833 BLAKE2B 5e79d1b622dd4d37603a209b78018a3e88f2c404c700e1f439e4b98e2c2dd5bdf26e8ecd3b1b1242e14a725d7839c5a8b3b5448dc27e1f917cbeaf6012546656 SHA512 c643152bec14b70317465f8adc2256b41b8686e106b35ce492ad5030c2d5b32162441ac5fb2f309071da855efdf444076288cf075d8073bad0c0907067366e7f
 DIST vnstat-2.7.tar.gz 287304 BLAKE2B f7b50cccfe4b62bce45751e6029650dc6d8ac7b7925cc4177fb1772c6d842b5201f6834d5e6374016b4c42374660b1c127d5b021adffe873de0a4c484171b6b3 SHA512 3d1674ddb5269d29d4d758551dc3e58fb1858a7dd790914c7d74047443b25d242c91f8ab20bdede9c1b061d6b682d73f3d6c1a8aa656a9676bc33c0ed9b1b2d4
 DIST vnstat-2.7.tar.gz.asc 833 BLAKE2B ae9bb28ccd9f10e7ac0c32e9895140cdd9d8498ef18d9b716ffbed3c6693ff08e5ddb08c377ec009df881f7fc1666f09da48cee75857566bdd4f1a2be30a97b9 SHA512 dd1ae2d94400aee9622c28385a103680ca87abfb66b5c92e8ce7240b97f28e81ac1a9cfc97fff7cd6d3934bfa639f46c835acbf855c7a4a29309946d7cbd80d4
-EBUILD vnstat-1.17-r1.ebuild 1705 BLAKE2B cc7ae0926a5cbd7eddbb7c086daf089923047e5e5e7f970d3f43b99f25a8c308a1a366082e0451976115b1f03b37e99db4a40e2a441f86af5cd204ca80988311 SHA512 ae1534aa8199948b44619b91aefa1bfd1d67b025bc3594ab14e3a963e9786dd5a27e98458bdc2fbe9c3d1ef7d6c302331f5c8e8568207ed7291f3209f7d007fe
-EBUILD vnstat-2.6-r1.ebuild 1815 BLAKE2B 214e211c905fb49fcb9e86e878e996d80f9430eb21eb36a91e32860b6e15ba86794a46fb8a79692715f66cdaf006119fae19f4dec1eb6666a5d9fc740534047a SHA512 2fde65ada54835efdd756ed5ffc2f90aabdd4d28036dd1a195bb6669b61c1e054bab8762aa7f076fc009056989d6ec9db45c542bc8f155c8a04a196af0e16995
-EBUILD vnstat-2.7.ebuild 1827 BLAKE2B b497d9314a79f620a69a73bb56a11b1c9e71b7008714f9a806bcb7a5d911485947e0b30ec21ceef6c2ecd697e1b4ece75489ac5836536d764b393438e9e672b8 SHA512 3c05d6de583a2478d8e82fb57a99f0e67d9061aba9b14c5e7b0419c265694eccda6f2f5a7beecd72be3064912516349357b24c5e2c34354d1748d4b3843b1b22
-EBUILD vnstat-9999.ebuild 1834 BLAKE2B 62d54236a163b5cbff07c2fa631286cd27675f985677ab73138a278eab96bc6780e5be09fc1d3b3a3d9aa3ad89736de1b6fbc462cfbb734c8c956103d3ac0c72 SHA512 ab2ba9bb3a63f1c9b825a82f3914e2debc23907427f232888d21b3d5f6996b51f007f16f4e40559546e302663f0f61b56027eb865cff3cddf1e8c5bd87490f9d
+EBUILD vnstat-1.17-r1.ebuild 1713 BLAKE2B e6a0509d32fc4e01da97664e5917ab3f52936ff64b2355eb3fb5001666ef3cda799b06d9c9371eeec6cc16bfa4f526ed0f16b05604f05dd9d18949175cc944c8 SHA512 3fdf87be74420b698cc5bb3ff61a15d32d2ee0175cb4eabe2b33389364d3a73a32e6e0a618e9ac7fee29af5fe6512b0606e477a37a1c19309d1cdf9bfd69da5a
+EBUILD vnstat-2.6-r1.ebuild 1874 BLAKE2B 13382c3dc9eabd86b0b3f1e078df103e53f623dc6cdd7d30f520b4eee20897a006ff2c19263da66afe5f220f02312f75bfda9c57344d65a28aa10ef19939bec9 SHA512 be34ffdc8d3a3adb5b9a9142563a2d60c8d372a7e0872f57b1a8dfa2663c338d2306a03312c853b2f95388059f83118b886afbcbe489862e7200be163909b9b9
+EBUILD vnstat-2.7.ebuild 1886 BLAKE2B 1bba15cdf65b93fdc053cd97dfc114a75492baa27961a07f12448dc6766e3c9dd20b43f34745bce4e289d59eafc4ad4eb422d7c68e511558007056fee81ecedc SHA512 441cddc095ff8e7e76f25fbb20bef44924cbb228fbb8188ad6b9b04ea66ad0dedd0f888a0e47f4ad6af9b966bbaff7721b4a4a67c19618af19db57db87b38455
+EBUILD vnstat-9999.ebuild 1893 BLAKE2B f53aa75d4ddc29eb5487ac9f82d0c3c3a8652945ce25acd4e1addf45d55821c9c8b32424ad6a4b9075e0dddc05599be803df642f2e6d89a2c5f7a0b3bee225ad SHA512 bdca1b74ac946f48d0c58ca4b65f9b3b782b24584ae99e47c4c451644f5dfea583ec123ef499571addbc52343aae0951b385a7001af254d4a72dc967f689c489
 MISC metadata.xml 835 BLAKE2B 4798aa86fd444665d135f7b2ede84889049113260c965b01999a2f9000c826fefa6877e8d3267a813421df97b2a0076f0718278ad3e0cf376bfc91babaaf87f3 SHA512 1c51f11ba3524329dec2101494c89d26859eab16e862e36e49df9240ee3fddf0380bfd929ec1719fc0e21808fc26f381b3be06f5fc89127f4c7e2fd188b3e886
diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
index 8aa25d8a3276..d66538eaedb0 100644
--- a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
 inherit flag-o-matic toolchain-funcs verify-sig
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
diff --git a/net-analyzer/vnstat/vnstat-2.6-r1.ebuild b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
index 3d37feff320b..828e302eae17 100644
--- a/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
 	inherit verify-sig
 
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
@@ -77,3 +77,7 @@ src_install() {
 	newdoc INSTALL README.setup
 	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
 }
+
+pkg_postinst() {
+	tmpfiles_process vnstatd.conf
+}
diff --git a/net-analyzer/vnstat/vnstat-2.7.ebuild b/net-analyzer/vnstat/vnstat-2.7.ebuild
index 3582e9086840..5798621a7601 100644
--- a/net-analyzer/vnstat/vnstat-2.7.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
 	inherit verify-sig
 
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
@@ -80,3 +80,7 @@ src_install() {
 	newdoc INSTALL README.setup
 	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
 }
+
+pkg_postinst() {
+	tmpfiles_process vnstatd.conf
+}
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 189549001483..02ba926a4b8b 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
 	inherit git-r3
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
 	inherit verify-sig
 
 	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
@@ -80,3 +80,7 @@ src_install() {
 	newdoc INSTALL README.setup
 	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
 }
+
+pkg_postinst() {
+	tmpfiles_process vnstatd.conf
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 837ed09592d8..0058d964a413 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,6 +4,6 @@ AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361f
 DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8 SHA512 eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d
 DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
 EBUILD wireshark-3.4.6.ebuild 7206 BLAKE2B 4808491b469daf8b3185292bcfbbe215a9f32abd4ab0d0f4f78163633524b7b2457b17dc109a653a2ff2aa3f296aa7d9284bbf90c379e593e4bb33e1a6e81675 SHA512 5308aaf15324c020d1fa5bb68ba366f1dc686e0f40b1ea203cd1950cbcaa6e678380c0bc8bf24ec644649a07e364d8318b131cc234db94be2add86046c4626c7
-EBUILD wireshark-3.4.7.ebuild 7207 BLAKE2B 3445aa9ca7457f02b265d1ca6216e27d0f16def6be35d7cd727d8d7bf9abc7b6e9e1bd85a8caf2a67b50b94a02b3150e8cd5b8a0f64f10ad40c863b6c06546c9 SHA512 e7c5fe35695e948dd9ef53a23693735d37e3a0e5b2f273d4b0a0894f3a3c63fd904861ca8ed8387c298d92188310f10cc9075af9de877a67807842b996dc52f9
+EBUILD wireshark-3.4.7.ebuild 7206 BLAKE2B 4808491b469daf8b3185292bcfbbe215a9f32abd4ab0d0f4f78163633524b7b2457b17dc109a653a2ff2aa3f296aa7d9284bbf90c379e593e4bb33e1a6e81675 SHA512 5308aaf15324c020d1fa5bb68ba366f1dc686e0f40b1ea203cd1950cbcaa6e678380c0bc8bf24ec644649a07e364d8318b131cc234db94be2add86046c4626c7
 EBUILD wireshark-9999.ebuild 7211 BLAKE2B 2b907655ef70a51ea09d2e597b84e625b9bf75ea3a23c44768176402dc17a6ed3732bcd6c5bec2dd53e4054920402b2412d2dc28aa0a9666dec990cce66624d3 SHA512 20443697c5a2ed143a16d4327bc1af599414beaac337aef6bd77bc6236a39a2d7f862aeeb42007df91a844a1a70d83403b0a82ae2678653bf4c65f4254c82948
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
index a10e188cd194..234f78724444 100644
--- a/net-analyzer/wireshark/wireshark-3.4.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 8ab7ee2d23bc..ba479f5a9088 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -273,12 +273,12 @@ DIST zabbix-5.0.14.tar.gz 21159722 BLAKE2B 627e64138335b2a3b679a69f21d778df1eb5b
 DIST zabbix-5.4.1.tar.gz 23830541 BLAKE2B 93d39c69798dd593a77f2cd0046818763bda6d07ea43295d0fd9cd6d21a974d46f3783649fa63878e85c70e6b7cc6284ea88df2503d5011365641cd58dba9cbb SHA512 d9533bc2fac816a6c5e18462c509fb6307409528979f56cdf03085801c01d6ff17251cbcae83cc2158f944dd9302d429746e39ca669483e442474c51d6caab33
 DIST zabbix-5.4.2.tar.gz 24085572 BLAKE2B 0a2f7d645906b7df4dfbd3846de483ad5a9f8e9328daa212cbceb139d71418bea3b7af3a4426a6e2b3a55bbb8d42817ffc79d948152a2eb06ec97ec264efa8bd SHA512 c5ceaecc77d641ba656b52ab335fab664eba093779cbb882dea7de6e2e70be3c5d50f8035f1c709a8e244729f7d2181204e1337ae96b078ec3f08c9adb10bb1b
 DIST zabbix-5.4.3.tar.gz 24190581 BLAKE2B c757739b4ed4b8ab233c41b1311a2b7055530b7b19ec3296265cbbd04ad298e24c46605e4f996758021c74526fbfbcf9a58c7aa00a746f50a2f35bf67130b9ed SHA512 8efa043237a9e7cab3c26c300ca177746241602bf156e01ee6fa31d15d71677d6b4efe9bf9cffadc419e98c44ff3a179370b851b55a78dce9b4b4ee4d8c287c1
-EBUILD zabbix-4.0.31-r1.ebuild 9437 BLAKE2B f57c675a872a6a0c176b91086ba7b816ca835a887d8592ffd914e36d8a91a59c16b8025f59895163ca0a5125c7208f8eeb1541abb1f6df75d004a5a09522bdf8 SHA512 6275f6e866202146f148d903b982acd326c52aa802833cc4fcc3da653cfd3ed4ab637ff65857cf73e08f91dfa9dde64fada3ad8ab5aec766078f6a9d1768d6a3
-EBUILD zabbix-4.0.32.ebuild 9439 BLAKE2B 5b8105ee5c68df610474eeec87401927952c673f6f0da783d45a7e75af1df7541ac0a51a2e5db29052f6e1355a0d359c4b7c955827703689c133986cd256958e SHA512 0ca31665694b83574eaa9cfaa267ccf20d0bd3dfe00e2805a480a53c67d2a4d0d98aca25ae673c0ebbece2fca5115ded640d41a70832e9661b919a129ed66564
-EBUILD zabbix-5.0.12-r1.ebuild 32434 BLAKE2B 39beaba2d48e9257397db5fe115e1619af9974c4eecebe8d718fb63c6a8368b6bc944d3d0c8b933e7dea0a3266266c5568fc3c223821a4cdc124b89c9dcd6bc0 SHA512 2adff1e020386cbea1faade1b04eb9bc124476919bfe8e17e5a303d3b3a31905ba1a02a86b062b1afeb61bd06d480cf355396668f30f4807735ca2e5d099641a
-EBUILD zabbix-5.0.13.ebuild 32436 BLAKE2B 08e39e15fe208ea8e6de362267d8d57b7e738ca2fc872e659b25dd5b7257ba6d116b6392795683346b6f0f5bd3e41fd9c6694d625446ad89adcd93f21ee157b1 SHA512 17ea5eba81bc67e5e4af7844f6dfb1e4363e86caf7c804dcad6c458600a29c8e65b91c81cfe43040ab9d9a2918c1bbcd8af70c07a63237b4f1d3e4f8f9d81724
-EBUILD zabbix-5.0.14.ebuild 32436 BLAKE2B 08e39e15fe208ea8e6de362267d8d57b7e738ca2fc872e659b25dd5b7257ba6d116b6392795683346b6f0f5bd3e41fd9c6694d625446ad89adcd93f21ee157b1 SHA512 17ea5eba81bc67e5e4af7844f6dfb1e4363e86caf7c804dcad6c458600a29c8e65b91c81cfe43040ab9d9a2918c1bbcd8af70c07a63237b4f1d3e4f8f9d81724
-EBUILD zabbix-5.4.1-r1.ebuild 34748 BLAKE2B 8b3124f4a161e0155d5c9822876fd18acd09dbd37395f76af3bbf454b9680f49001bab94f73fbfbea32ce90d7ea9bd3437f58df73c97f5dba7ee25253ce423ff SHA512 7f15082a553f0f510947872a111ba2ea8044d06728ee6054e0eb84cff098dd9a69d39a369130a34d467729843f0798493f3ba1b605468845c2e6dc66ba97a57e
-EBUILD zabbix-5.4.2.ebuild 34750 BLAKE2B a86da673bb948835cfb17d81bd5a41aeea87ca6526ba2f9319063aa73b910b080a47569e0f84e027a4979734c6560336ecc5d041e9427b561d8e52cbf18df5ba SHA512 59d22870078c289e08e4bc31729acba4c66b37901e98a76eccf803e1b51100b7cef3a2c460c73cf14916f41cd0fc5a77d2ae748b993cc8fb362538551644408a
-EBUILD zabbix-5.4.3.ebuild 34750 BLAKE2B a86da673bb948835cfb17d81bd5a41aeea87ca6526ba2f9319063aa73b910b080a47569e0f84e027a4979734c6560336ecc5d041e9427b561d8e52cbf18df5ba SHA512 59d22870078c289e08e4bc31729acba4c66b37901e98a76eccf803e1b51100b7cef3a2c460c73cf14916f41cd0fc5a77d2ae748b993cc8fb362538551644408a
+EBUILD zabbix-4.0.31-r1.ebuild 9601 BLAKE2B 0a8da8db8c417a2601d347a0e3fc2ab83c65f3869fc2bba8b31918f08240c42d6f559e6550ced11c6786ff7053efc9a9e49c8c13f35068a9298a4b22de5b7f63 SHA512 f957ef5d2f3d858265e11df99bc85169bccaa05d2be4352d05d132513cdd84315e56906b4a0230bc87b9eb03e68f73d69e0650e689783925dce64210c06de0e4
+EBUILD zabbix-4.0.32.ebuild 9603 BLAKE2B 710091e33a13efa1aa26faacf94f2ab8453a03e83039c7f8ab615f30df820a1ae0973e58c78623661d2e2d18c1d04b88ceefb0f085bf7d160385c816f07045f7 SHA512 f378e43a9a92a5bdb26fd20ad91246a640c879a413ffc77a3d6feba5c936574cd7dc66be20f0b5cc8683fab282e310a0b461bd5ef04ea289aa7273c1f2a733f3
+EBUILD zabbix-5.0.12-r1.ebuild 32662 BLAKE2B b9b6934216c4894f60ae9d848f48ddf22c41bd6f4742f0e2e19ac37d8fbb28efc873c9b9aa51b20633baccda6b9b8047b6f4b8659e35c006c62cc0e514317d80 SHA512 d795b77707adf9c1a58ea562ad8db6753fd68c80dea54c36ad3d74ed193db0e40946ffc59ce2eb01c2ce9d3598dca576b97ab601ec3749ee72aeeefd163c6982
+EBUILD zabbix-5.0.13.ebuild 32664 BLAKE2B 2c833ba3b4849654e61d9abb2a959090db2371c5fb246fd07689b7ab2821e1c138d0bfac0148bfe4df2cb020129aa102214507545bc2d5fc6bf628154abc92a3 SHA512 4bed7771ff6ccf4332136ee53112fb2bdc214de6c5f385acb765b6edc0fbb940e626250ba64f8b59b2a1565bcb8bd0b48a846bc9f1b7302dbcb911fa9e93b669
+EBUILD zabbix-5.0.14.ebuild 32664 BLAKE2B 2c833ba3b4849654e61d9abb2a959090db2371c5fb246fd07689b7ab2821e1c138d0bfac0148bfe4df2cb020129aa102214507545bc2d5fc6bf628154abc92a3 SHA512 4bed7771ff6ccf4332136ee53112fb2bdc214de6c5f385acb765b6edc0fbb940e626250ba64f8b59b2a1565bcb8bd0b48a846bc9f1b7302dbcb911fa9e93b669
+EBUILD zabbix-5.4.1-r1.ebuild 34976 BLAKE2B b18b3b11167a4a0ffcde23fc427aebdf6cb704c7fcbea2c1bc44a05c029c5813581870a106a8624917d7d7edd29bff6223688092770da6bda1b6828c7e7c3e4a SHA512 62789ac4e902fda5798576b8c3692353a560845370a1e25c95cfd5a49e9f318e7da3e059764170d73554c0bd5b6dfa118fefc9ef782b6411a3d9d08eecdb5fcf
+EBUILD zabbix-5.4.2.ebuild 34978 BLAKE2B 8c60c941f472c28e15d41daa8ab9ba67d7e03a8dcc14c8af56565e7b1d6eaeaffcb043d24f05fefc8b858a38bb9e89a9b08277a9094f90a8236aed3e21666f3e SHA512 1254dd41273ab03e56482cc3185ce459eef5848ca0d4d2a47bb5f637c373568d4abe52058b03eb99e2a597934a5788b44ceeb76c2ebd31abf5b6ed4cde9ae96a
+EBUILD zabbix-5.4.3.ebuild 34978 BLAKE2B 8c60c941f472c28e15d41daa8ab9ba67d7e03a8dcc14c8af56565e7b1d6eaeaffcb043d24f05fefc8b858a38bb9e89a9b08277a9094f90a8236aed3e21666f3e SHA512 1254dd41273ab03e56482cc3185ce459eef5848ca0d4d2a47bb5f637c373568d4abe52058b03eb99e2a597934a5788b44ceeb76c2ebd31abf5b6ed4cde9ae96a
 MISC metadata.xml 1519 BLAKE2B 3ee4cfb156b8bf0378378f73ac7584b16e3cf7b824a43350a77889bd17ceb470240206ee3b3412e826477417be9bb07920d0ef944a7c49d3a56fc2b0f2a9082f SHA512 6bd6020054a9be205b9805fd757f3f71bf3e6334a41c71c1c59d9e760638a51f6a12ae84274ae9be87ed23c0942abdeacb539343643cae33615ee87e20613464
diff --git a/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
index 9aad51163a13..f3cb8a820f0f 100644
--- a/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
@@ -313,6 +313,7 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -323,6 +324,14 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy ; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent ; then
+		tmpfiles_process zabbix-agent.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-4.0.32.ebuild b/net-analyzer/zabbix/zabbix-4.0.32.ebuild
index d1235337a343..b4467228139f 100644
--- a/net-analyzer/zabbix/zabbix-4.0.32.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.32.ebuild
@@ -313,6 +313,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -323,6 +325,14 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
index c94739cfae13..b8d35f5a7591 100644
--- a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
@@ -557,6 +557,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -567,6 +569,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.0.13.ebuild b/net-analyzer/zabbix/zabbix-5.0.13.ebuild
index b921c70a4e01..eba63f9a9e55 100644
--- a/net-analyzer/zabbix/zabbix-5.0.13.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.13.ebuild
@@ -557,6 +557,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -567,6 +569,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.0.14.ebuild b/net-analyzer/zabbix/zabbix-5.0.14.ebuild
index b921c70a4e01..eba63f9a9e55 100644
--- a/net-analyzer/zabbix/zabbix-5.0.14.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.14.ebuild
@@ -557,6 +557,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -567,6 +569,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
index cd6face9be93..73471980e5cb 100644
--- a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
@@ -581,6 +581,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -591,6 +593,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.4.2.ebuild b/net-analyzer/zabbix/zabbix-5.4.2.ebuild
index 8a3157cfa587..21c67e3c16ad 100644
--- a/net-analyzer/zabbix/zabbix-5.4.2.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.2.ebuild
@@ -581,6 +581,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -591,6 +593,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"
diff --git a/net-analyzer/zabbix/zabbix-5.4.3.ebuild b/net-analyzer/zabbix/zabbix-5.4.3.ebuild
index 8a3157cfa587..21c67e3c16ad 100644
--- a/net-analyzer/zabbix/zabbix-5.4.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.3.ebuild
@@ -581,6 +581,8 @@ pkg_postinst() {
 	fi
 
 	if use server; then
+		tmpfiles_process zabbix-server.conf
+
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -591,6 +593,18 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
 	elog "--"
 	elog
 	elog "You may need to add these lines to /etc/services:"