gentoo resync : 20.06.2021

31 files changed, 973 insertions, 217 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3f7d1a14ed69..a23bc1f4a515 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 4a23ef8ae685..ffe75b5e2597 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -4,5 +4,5 @@ AUX arpwatch.initd-r2 828 BLAKE2B fc9836855074520ab6e8e4d7412f9094677fe25dba61bb
 AUX arpwatch.service 362 BLAKE2B 45e527e7b5261a8009acdca0665077422235d5b21ebbb6818d878e21e4869fdf69317306bc4ef02617b8989a38f50a9467d69d904ada80fde1be61f77b806e2c SHA512 06424dea166eac23d4686fb96b1f14bdd46965bf400028f870ea2260e7d54a54663987c62e34e93730e6dea42e0e662578268252b31f29c26c0975bb4cb6873f
 DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
-EBUILD arpwatch-3.1-r2.ebuild 2104 BLAKE2B 33e535e8c9bb9aa9a1920bafeca58707f49e8bd7466324b98afe3ef6bec9eb47897ef1f37a994271871df39e0e412140933a2141fbd74d3b57062f2723e6bfa4 SHA512 599b71098108eb7d1ac0069b73dc0c49429a344041fb3872d70f55f162186674f3ffa6b1f2662837db4071238109efa33451194e0258871ee34796249874d7df
+EBUILD arpwatch-3.1-r3.ebuild 2104 BLAKE2B 18cd2eaf7aa8294e6dc9076af175c40cbcff034faf9f68ddbd54c027098114fa4bb2ece01577f4d6d1284f3ed048ff1ee65fd09aea525483174eebac6ce4e68e SHA512 3f1e239705dce0adc0f7c6c453fcf0785f7718513ea1601816a5406f374a8550a97e0ba649486deef145f7146df15692c789c36685ca379c8d36faf7193f5aa8
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r3.ebuild
index 6dde8e28cecd..708a82a43c69 100644
--- a/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-3.1-r3.ebuild
@@ -21,7 +21,7 @@ IUSE="selinux"
 
 DEPEND="
 	net-libs/libpcap
-	sys-libs/ncurses:*
+	sys-libs/ncurses:=
 "
 RDEPEND="
 	${DEPEND}
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index a91e6782f897..58af597705d1 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -17,4 +17,5 @@ DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051
 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
-MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
+EBUILD munin-2.0.67-r3.ebuild 12179 BLAKE2B 9c9bd8113ccb2378a46b426e03717a9d331e337053742e09a113890b86551686c555240a83fe9ff65ffd1db99d6ac0444e2f802cd2bb35e4d9e8b4ecbc417906 SHA512 04fdf2ced3ed7f85de597e6590f8bb08400e98898c9acb669cd811de8195bd8d30446739432cd3702ed5d493e21f6785d911e09221d790fa081b6509660b0131
+MISC metadata.xml 3932 BLAKE2B 3f5a88c85ae9be35c1ef8c9b4f6ac99d8ced0974e3306c691a4c5fed87139c8514732fb0418d4f34e6be26786252df5d3876aaf2a895fb03dea08787488ccb04 SHA512 c066c14c28804c4f5f11b15046f4fe43e7b34f0befc98fb03d4cd3e222664806e03509196054076433596dfb3bc2b1369f69047bf15a6c5c4981d354280033ef
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index 591d8ce60e47..86356198e1c6 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/metadata.xml
@@ -90,6 +90,6 @@
     </flag>
   </use>
   <upstream>
-    <remote-id type="sourceforge">munin</remote-id>
+    <remote-id type="github">munin-monitoring/munin</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/munin/munin-2.0.67-r3.ebuild b/net-analyzer/munin/munin-2.0.67-r3.ebuild
new file mode 100644
index 000000000000..a0ed5615dc54
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.67-r3.ebuild
@@ -0,0 +1,414 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="https://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	acct-user/munin
+	acct-user/munin-async
+	acct-group/munin
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/Date-Manip
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.8 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.8:*
+			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	echo ${PV} > RELEASE || die
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	dodir /usr/lib/tmpfiles.d
+	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 477218678d64..acd6b8723cc1 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -1,13 +1,12 @@
-AUX openbsd-netcat-1.105-darwin.patch 1570 BLAKE2B 543d1ed6cfb7c899423586647afbe1e87ff36d96531101458c90de43631fbd456f23125991558df395170369b624fb168162beb0851213530fb85874d62ba310 SHA512 dab238783cd2b67c42670c470bd02016049b73f447c19626f1df42739577296cad273cc20f6162e23d9e9ab0be3d09865356ec22323922275283b223497b6522
-AUX openbsd-netcat-1.190-darwin.patch 2806 BLAKE2B dcd54e828f78f038f00b8626c964e454bab3707f642450dc1118dd21e25cb79c993e6897b534f123a6d9eeda7f724e27c992f94c23ae8843eeb7457f687914aa SHA512 2d13d6541151adc045624c383ca8def21d067da28587fc7f55969205e18d9039b01e0c1b9c31cba3eaede4fe42fad95aa6c75445faa831379849b7b74910d663
-DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 BLAKE2B 115eb2d0c0f35055eb26608746806ba97d15b9320954b5d531a73f3f76ed22238395797e90bc3e60dd9cf5b31e696eec59843f37001093013ed0ef82ae590126 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6
-DIST netcat-openbsd_1.105.orig.tar.gz 14891 BLAKE2B 65119a4e2cb3d9cd7b2d7d346b827ff1c175cc3255f40d70bbd45213b438635d6b063b3cf210d27595e38b0d67339788221ae5c3737e6096782245fb573bca3a SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703
+AUX openbsd-netcat-1.105-musl-b64_ntop.patch 12296 BLAKE2B 6c67948bc99aebe60e43dc960f123e245f46ffb14afdc2ff81f45e6786ab1044152d37997b5d3a18872a230e68073de343d3210ea4a584e378ee733bdee02d10 SHA512 65f00cbcef90d55967a2af70a963d8851292bf13affe4c69f02a508c1e9189591dd9b4d115b73337a46089c81b8503d5cf3281b113160c161b06a38b03421ce3
+AUX openbsd-netcat-1.190-darwin.patch 2045 BLAKE2B d2e0633b38eeb19d6e8dd3dfc6c11fc5b9e47898a5bd1a7793a29a19eff32eb2aa389d8056eb41749a2a75f9254c1bc39b19d29798eea0b9eb85a6a0cf828284 SHA512 527ec082c617e81aaa48e648d07437eddfb65f7dd8ba6e69042c53e00921ddeec53298e85421e847046bcfd7a93425deca5fccf6a9ff2d31b1bcddce3012ce40
+AUX openbsd-netcat-1.190-darwin13.patch 1055 BLAKE2B 9aa8cd60a0d36f58a2c10476e6a754c5961375bc3747dceb7ad7a000fa423f9d139be8f9e78986b15a72fbe20c0f48409e461719cff1a27f4fa1867466cf8941 SHA512 ccdafb9dc20e7f03dd54967d1abf9b0840a5c9dfe54bb33342eb8f70c41dea588a00d6a4b423663a83e26e87c685bc32c711587a53b76a53ec4eb45c361a4071
+AUX openbsd-netcat-1.195-darwin.patch 2312 BLAKE2B 3f3f463b7e438772522e6e8e64dda8be6feeb674b424326e2b3d4eac1031d455544d7c047336c4a64a9ab4c5982eae8d6269d0d8901f7f10df326cbe324847ba SHA512 31f3dd9713daad1844a96f3bb5691d6dfaaf69e81a8c6a67b985e65868365e3e4b8b7b67798d8a82e64f3c1f53a21c7cd7b4df6d94062bcf90022c741b1dad66
 DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a
 DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe
 DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
-EBUILD openbsd-netcat-1.105-r1.ebuild 1413 BLAKE2B da35a8c6a4dc193a967b8a4d506a160fbe3719fa60025478c5f3b6cb1de1a71ba542ada14d35b246c7df46f351b961cd565b297083403ca54930672a14bd03ec SHA512 14f79edc17ffeecf6533e30d9e8577e9d615b6b1903bbae241f75239cc0d115597448c35b90c05995a95010a10ce9a79e2b26d7402db2cda00367bb576d0bf90
-EBUILD openbsd-netcat-1.105.ebuild 1134 BLAKE2B c425b0d279ad20feb27a802264128cea191d8863a177f1844b467438110b6741611da891aae0ac6696f9bcbb187589176aac46c4539871462ab27fa7df7a4d30 SHA512 e589f9d09d36eed49ef88cffa0363f8244a0ade60710a043eed891d6c31c008e597b2df5ece4cd87e8ddc4d5078222aa8cff608d51c5ae02be0dccefca1b3a9b
 EBUILD openbsd-netcat-1.190.ebuild 1536 BLAKE2B 37424499cff6a5e1dc811f96e1677f4efdb996be069f4474726387dd33bff2305c1cac3127a3330621bbd1cf111f181c4b0a7f47f4a7773d78ff4448f57f4c6e SHA512 b0f937130dacca550c89314f599c32bc6b36747bc90e884a58b4cfbda2a1f28fb2fd1fc66e5507b3412b26ce7c9039fa562cf53d123f92fb5cabe48fa7f24573
+EBUILD openbsd-netcat-1.195-r1.ebuild 1731 BLAKE2B 80f578352862419ba0adf7dda2dd6d4b1538460be152a354b0e8ee987fc9319a5668e5dcc53e747d9e583d0ab280627ad5d51328e4fc3411c27fc84aa44a62e6 SHA512 d535c9ed6fc4d7ff319ac723fa8f4ab5d4a69ffd2319b4285bb5c2b0e39a6aca60497c2838372b27715d5df538a36254025e91849e477a0c8c25c6b4f215188e
 EBUILD openbsd-netcat-1.195.ebuild 1542 BLAKE2B 97c48f8f148eed200429efa52e13ef924d92be828bcbd0045e5ecde9664e0c71951254b0bef38bd9f738be2f59e49893218635c92e752ac45d9ab13f54a5fcff SHA512 a5696d2915e8dc5d11d9756917717420ac08fbb319aedee66171299290c13f4ac3e55775d9072cc24b31e15df01d7f9374b98cc2a9c22b6ffc7cd5d83b6a57d2
 MISC metadata.xml 244 BLAKE2B 469b378b5a64e098c2f091fba31658d2193fbb4272f21d40e404757623bbe614474336eb8ef7d7820be4299cfdb6eb41d30fab05327993bafaaf52f9965dfafe SHA512 a8f913706b597ddb605f7e9ad505417dc7422a64037ba11e3a1826e60b882b9b5fac56ce9afd0a6c84380f2984e4079803d10ddc13e686025f65d7228063b59c
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch
deleted file mode 100644
index a6f805af1a66..000000000000
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/netcat.c
-+++ b/netcat.c
-@@ -43,11 +43,13 @@
- #include <arpa/telnet.h>
- #include <arpa/inet.h>
- 
-+#ifndef IPTOS_LOWCOST
-+# define IPTOS_LOWCOST 0x02
-+#endif
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
- # define IPTOS_THROUGHPUT 0x08
- # define IPTOS_RELIABILITY 0x04
--# define IPTOS_LOWCOST 0x02
- # define IPTOS_MINCOST IPTOS_LOWCOST
- #endif /* IPTOS_LOWDELAY */
- 
-@@ -96,8 +98,9 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <limits.h>
--#include <bsd/stdlib.h>
--#include <bsd/string.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <ctype.h>
- #include "atomicio.h"
- 
- #ifndef SUN_LEN
-@@ -169,6 +172,43 @@
-         socklen_t salen, int ctimeout);
- static void quit();
- 
-+static char* strtonumerrs[] = {
-+	"too large",
-+	"too small",
-+	"invalid"
-+};
-+
-+static long long
-+strtonum(
-+		const char *nptr,
-+		long long minval,
-+		long long maxval,
-+		const char **errstr)
-+{
-+	long long val;
-+	
-+	while (*nptr != '\0' && isspace(*nptr))
-+		nptr++;
-+	if (*nptr == '\0') {
-+		if (errstr != NULL)
-+			*errstr = strtonumerrs[2];
-+		return 0;
-+	}
-+	val = atoll(nptr);
-+	if (val < minval) {
-+		if (errstr != NULL)
-+			*errstr = strtonumerrs[1];
-+		return 0;
-+	}
-+	if (val > maxval) {
-+		if (errstr != NULL)
-+			*errstr = strtonumerrs[0];
-+		return 0;
-+	}
-+	*errstr = NULL;
-+	return val;
-+}
-+
- int
- main(int argc, char *argv[])
- {
---- a/socks.c
-+++ b/socks.c
-@@ -38,7 +38,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <resolv.h>
--#include <bsd/readpassphrase.h>
-+#include <readpassphrase.h>
- #include "atomicio.h"
- 
- #define SOCKS_PORT	"1080"
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch
new file mode 100644
index 000000000000..a9603b38bc03
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch
@@ -0,0 +1,349 @@
+diff -Naur netcat-openbsd-1.105.orig/Makefile netcat-openbsd-1.105/Makefile
+--- netcat-openbsd-1.105.orig/Makefile	2017-06-18 09:01:44.293852659 -0700
++++ netcat-openbsd-1.105/Makefile	2017-06-18 09:04:35.566687655 -0700
+@@ -1,7 +1,7 @@
+ #       $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
+ 
+ PROG=	nc
+-SRCS=	netcat.c atomicio.c socks.c
++SRCS=	netcat.c atomicio.c socks.c compat/base64.c
+ 
+ LIBS=  `pkg-config --libs libbsd` -lresolv
+ OBJS=  $(SRCS:.c=.o)
+diff -Naur netcat-openbsd-1.105.orig/compat/base64.c netcat-openbsd-1.105/compat/base64.c
+--- netcat-openbsd-1.105.orig/compat/base64.c	1969-12-31 16:00:00.000000000 -0800
++++ netcat-openbsd-1.105/compat/base64.c	2017-06-18 09:01:31.288700637 -0700
+@@ -0,0 +1,315 @@
++/*	$OpenBSD: base64.c,v 1.8 2015/01/16 16:48:51 deraadt Exp $	*/
++
++/*
++ * Copyright (c) 1996 by Internet Software Consortium.
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ */
++
++/*
++ * Portions Copyright (c) 1995 by International Business Machines, Inc.
++ *
++ * International Business Machines, Inc. (hereinafter called IBM) grants
++ * permission under its copyrights to use, copy, modify, and distribute this
++ * Software with or without fee, provided that the above copyright notice and
++ * all paragraphs of this notice appear in all copies, and that the name of IBM
++ * not be used in connection with the marketing of any product incorporating
++ * the Software or modifications thereof, without specific, written prior
++ * permission.
++ *
++ * To the extent it has a right to do so, IBM grants an immunity from suit
++ * under its patents, if any, for the use, sale or manufacture of products to
++ * the extent that such products are used for performing Domain Name System
++ * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
++ * granted for any product per se or for any other function of any product.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
++ * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
++ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
++ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
++ */
++
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <arpa/nameser.h>
++
++#include <ctype.h>
++#include <resolv.h>
++#include <stdio.h>
++
++#include <stdlib.h>
++#include <string.h>
++
++static const char Base64[] =
++	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
++static const char Pad64 = '=';
++
++/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
++   The following encoding technique is taken from RFC 1521 by Borenstein
++   and Freed.  It is reproduced here in a slightly edited form for
++   convenience.
++
++   A 65-character subset of US-ASCII is used, enabling 6 bits to be
++   represented per printable character. (The extra 65th character, "=",
++   is used to signify a special processing function.)
++
++   The encoding process represents 24-bit groups of input bits as output
++   strings of 4 encoded characters. Proceeding from left to right, a
++   24-bit input group is formed by concatenating 3 8-bit input groups.
++   These 24 bits are then treated as 4 concatenated 6-bit groups, each
++   of which is translated into a single digit in the base64 alphabet.
++
++   Each 6-bit group is used as an index into an array of 64 printable
++   characters. The character referenced by the index is placed in the
++   output string.
++
++                         Table 1: The Base64 Alphabet
++
++      Value Encoding  Value Encoding  Value Encoding  Value Encoding
++          0 A            17 R            34 i            51 z
++          1 B            18 S            35 j            52 0
++          2 C            19 T            36 k            53 1
++          3 D            20 U            37 l            54 2
++          4 E            21 V            38 m            55 3
++          5 F            22 W            39 n            56 4
++          6 G            23 X            40 o            57 5
++          7 H            24 Y            41 p            58 6
++          8 I            25 Z            42 q            59 7
++          9 J            26 a            43 r            60 8
++         10 K            27 b            44 s            61 9
++         11 L            28 c            45 t            62 +
++         12 M            29 d            46 u            63 /
++         13 N            30 e            47 v
++         14 O            31 f            48 w         (pad) =
++         15 P            32 g            49 x
++         16 Q            33 h            50 y
++
++   Special processing is performed if fewer than 24 bits are available
++   at the end of the data being encoded.  A full encoding quantum is
++   always completed at the end of a quantity.  When fewer than 24 input
++   bits are available in an input group, zero bits are added (on the
++   right) to form an integral number of 6-bit groups.  Padding at the
++   end of the data is performed using the '=' character.
++
++   Since all base64 input is an integral number of octets, only the
++         -------------------------------------------------                       
++   following cases can arise:
++   
++       (1) the final quantum of encoding input is an integral
++           multiple of 24 bits; here, the final unit of encoded
++	   output will be an integral multiple of 4 characters
++	   with no "=" padding,
++       (2) the final quantum of encoding input is exactly 8 bits;
++           here, the final unit of encoded output will be two
++	   characters followed by two "=" padding characters, or
++       (3) the final quantum of encoding input is exactly 16 bits;
++           here, the final unit of encoded output will be three
++	   characters followed by one "=" padding character.
++   */
++
++int
++b64_ntop(src, srclength, target, targsize)
++	u_char const *src;
++	size_t srclength;
++	char *target;
++	size_t targsize;
++{
++	size_t datalength = 0;
++	u_char input[3];
++	u_char output[4];
++	int i;
++
++	while (2 < srclength) {
++		input[0] = *src++;
++		input[1] = *src++;
++		input[2] = *src++;
++		srclength -= 3;
++
++		output[0] = input[0] >> 2;
++		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
++		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
++		output[3] = input[2] & 0x3f;
++
++		if (datalength + 4 > targsize)
++			return (-1);
++		target[datalength++] = Base64[output[0]];
++		target[datalength++] = Base64[output[1]];
++		target[datalength++] = Base64[output[2]];
++		target[datalength++] = Base64[output[3]];
++	}
++    
++	/* Now we worry about padding. */
++	if (0 != srclength) {
++		/* Get what's left. */
++		input[0] = input[1] = input[2] = '\0';
++		for (i = 0; i < srclength; i++)
++			input[i] = *src++;
++	
++		output[0] = input[0] >> 2;
++		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
++		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
++
++		if (datalength + 4 > targsize)
++			return (-1);
++		target[datalength++] = Base64[output[0]];
++		target[datalength++] = Base64[output[1]];
++		if (srclength == 1)
++			target[datalength++] = Pad64;
++		else
++			target[datalength++] = Base64[output[2]];
++		target[datalength++] = Pad64;
++	}
++	if (datalength >= targsize)
++		return (-1);
++	target[datalength] = '\0';	/* Returned value doesn't count \0. */
++	return (datalength);
++}
++
++/* skips all whitespace anywhere.
++   converts characters, four at a time, starting at (or after)
++   src from base - 64 numbers into three 8 bit bytes in the target area.
++   it returns the number of data bytes stored at the target, or -1 on error.
++ */
++
++int
++b64_pton(src, target, targsize)
++	char const *src;
++	u_char *target;
++	size_t targsize;
++{
++	int tarindex, state, ch;
++	u_char nextbyte;
++	char *pos;
++
++	state = 0;
++	tarindex = 0;
++
++	while ((ch = (unsigned char)*src++) != '\0') {
++		if (isspace(ch))	/* Skip whitespace anywhere. */
++			continue;
++
++		if (ch == Pad64)
++			break;
++
++		pos = strchr(Base64, ch);
++		if (pos == 0) 		/* A non-base64 character. */
++			return (-1);
++
++		switch (state) {
++		case 0:
++			if (target) {
++				if (tarindex >= targsize)
++					return (-1);
++				target[tarindex] = (pos - Base64) << 2;
++			}
++			state = 1;
++			break;
++		case 1:
++			if (target) {
++				if (tarindex >= targsize)
++					return (-1);
++				target[tarindex]   |=  (pos - Base64) >> 4;
++				nextbyte = ((pos - Base64) & 0x0f) << 4;
++				if (tarindex + 1 < targsize)
++					target[tarindex+1] = nextbyte;
++				else if (nextbyte)
++					return (-1);
++			}
++			tarindex++;
++			state = 2;
++			break;
++		case 2:
++			if (target) {
++				if (tarindex >= targsize)
++					return (-1);
++				target[tarindex]   |=  (pos - Base64) >> 2;
++				nextbyte = ((pos - Base64) & 0x03) << 6;
++				if (tarindex + 1 < targsize)
++					target[tarindex+1] = nextbyte;
++				else if (nextbyte)
++					return (-1);
++			}
++			tarindex++;
++			state = 3;
++			break;
++		case 3:
++			if (target) {
++				if (tarindex >= targsize)
++					return (-1);
++				target[tarindex] |= (pos - Base64);
++			}
++			tarindex++;
++			state = 0;
++			break;
++		}
++	}
++
++	/*
++	 * We are done decoding Base-64 chars.  Let's see if we ended
++	 * on a byte boundary, and/or with erroneous trailing characters.
++	 */
++
++	if (ch == Pad64) {			/* We got a pad char. */
++		ch = (unsigned char)*src++;	/* Skip it, get next. */
++		switch (state) {
++		case 0:		/* Invalid = in first position */
++		case 1:		/* Invalid = in second position */
++			return (-1);
++
++		case 2:		/* Valid, means one byte of info */
++			/* Skip any number of spaces. */
++			for (; ch != '\0'; ch = (unsigned char)*src++)
++				if (!isspace(ch))
++					break;
++			/* Make sure there is another trailing = sign. */
++			if (ch != Pad64)
++				return (-1);
++			ch = (unsigned char)*src++;		/* Skip the = */
++			/* Fall through to "single trailing =" case. */
++			/* FALLTHROUGH */
++
++		case 3:		/* Valid, means two bytes of info */
++			/*
++			 * We know this char is an =.  Is there anything but
++			 * whitespace after it?
++			 */
++			for (; ch != '\0'; ch = (unsigned char)*src++)
++				if (!isspace(ch))
++					return (-1);
++
++			/*
++			 * Now make sure for cases 2 and 3 that the "extra"
++			 * bits that slopped past the last full byte were
++			 * zeros.  If we don't check them, they become a
++			 * subliminal channel.
++			 */
++			if (target && tarindex < targsize &&
++			    target[tarindex] != 0)
++				return (-1);
++		}
++	} else {
++		/*
++		 * We ended by seeing the end of the string.  Make sure we
++		 * have no partial bytes lying around.
++		 */
++		if (state != 0)
++			return (-1);
++	}
++
++	return (tarindex);
++}
+diff -Naur netcat-openbsd-1.105.orig/compat/base64.h netcat-openbsd-1.105/compat/base64.h
+--- netcat-openbsd-1.105.orig/compat/base64.h	1969-12-31 16:00:00.000000000 -0800
++++ netcat-openbsd-1.105/compat/base64.h	2017-06-18 09:09:02.057554167 -0700
+@@ -0,0 +1,3 @@
++#include <sys/types.h>
++int b64_ntop(u_char const* src, size_t srclength, char *target, size_t targsize);
++int b64_pton(char const* src, u_char *target, size_t targsize);
+diff -Naur netcat-openbsd-1.105.orig/socks.c netcat-openbsd-1.105/socks.c
+--- netcat-openbsd-1.105.orig/socks.c	2017-06-18 09:01:44.293852659 -0700
++++ netcat-openbsd-1.105/socks.c	2017-06-18 09:09:21.105757665 -0700
+@@ -40,6 +40,7 @@
+ #include <resolv.h>
+ #include <bsd/readpassphrase.h>
+ #include "atomicio.h"
++#include "compat/base64.h"
+ 
+ #define SOCKS_PORT	"1080"
+ #define HTTP_PROXY_PORT	"3128"
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
index a8453c09067c..72a3fe8ed9f5 100644
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
+++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
@@ -34,50 +34,6 @@ index a0fb51b..bbb5dd1 100644
  
  #include "atomicio.h"
  
-@@ -240,6 +243,43 @@ static int connect_with_timeout(int fd, const struct sockaddr *sa,
- 
- static void quit();
- 
-+static char* strtonumerrs[] = {
-+	"too large",
-+	"too small",
-+	"invalid"
-+};
-+
-+static long long
-+strtonum(
-+		const char *nptr,
-+		long long minval,
-+		long long maxval,
-+		const char **errstr)
-+{
-+	long long val;
-+
-+	while (*nptr != '\0' && isspace(*nptr))
-+		nptr++;
-+	if (*nptr == '\0') {
-+		if (errstr != NULL)
-+			*errstr = strtonumerrs[2];
-+		return 0;
-+	}
-+	val = atoll(nptr);
-+	if (val < minval) {
-+		if (errstr != NULL)
-+			*errstr = strtonumerrs[1];
-+		return 0;
-+	}
-+	if (val > maxval) {
-+		if (errstr != NULL)
-+			*errstr = strtonumerrs[0];
-+		return 0;
-+	}
-+	*errstr = NULL;
-+	return val;
-+}
-+
- int
- main(int argc, char *argv[])
- {
 @@ -814,9 +814,8 @@
  # endif
  			} else {
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch
new file mode 100644
index 000000000000..216b8c207922
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch
@@ -0,0 +1,54 @@
+strtonum isn't available on <Darwin-11
+
+however, it is in the header files on systems like 10.15 with an
+availability clause, so don't define strtonum static such that it
+matches the prototype from stdlib.h
+
+diff --git a/netcat.c b/netcat.c
+index a0fb51b..bbb5dd1 100644
+--- a/netcat.c
++++ b/netcat.c
+@@ -240,6 +243,43 @@ static int connect_with_timeout(int fd, const struct sockaddr *sa,
+ 
+ static void quit();
+ 
++static char* strtonumerrs[] = {
++	"too large",
++	"too small",
++	"invalid"
++};
++
++long long
++strtonum(
++		const char *nptr,
++		long long minval,
++		long long maxval,
++		const char **errstr)
++{
++	long long val;
++
++	while (*nptr != '\0' && isspace(*nptr))
++		nptr++;
++	if (*nptr == '\0') {
++		if (errstr != NULL)
++			*errstr = strtonumerrs[2];
++		return 0;
++	}
++	val = atoll(nptr);
++	if (val < minval) {
++		if (errstr != NULL)
++			*errstr = strtonumerrs[1];
++		return 0;
++	}
++	if (val > maxval) {
++		if (errstr != NULL)
++			*errstr = strtonumerrs[0];
++		return 0;
++	}
++	*errstr = NULL;
++	return val;
++}
++
+ int
+ main(int argc, char *argv[])
+ {
diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-darwin.patch
new file mode 100644
index 000000000000..489eceedf6c0
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-darwin.patch
@@ -0,0 +1,96 @@
+Allow compilation on Darwin
+
+diff --git a/netcat.c b/netcat.c
+index a0fb51b..bbb5dd1 100644
+--- a/netcat.c
++++ b/netcat.c
+@@ -51,11 +51,16 @@
+ # include <bsd/readpassphrase.h>
+ #endif
+ 
++#ifndef IPTOS_LOWCOST
++# define IPTOS_LOWCOST 0x02
++#endif
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+ # define IPTOS_THROUGHPUT 0x08
+ # define IPTOS_RELIABILITY 0x04
+-# define IPTOS_LOWCOST 0x02
+ # define IPTOS_MINCOST IPTOS_LOWCOST
+ #endif /* IPTOS_LOWDELAY */
++#ifndef SOCK_CLOEXEC
++# define SOCK_CLOEXEC 0
++#endif
+ 
+@@ -108,8 +110,9 @@
+ # include <tls.h>
+ #endif
+ #include <unistd.h>
+-#include <bsd/stdlib.h>
+-#include <bsd/string.h>
++#include <stdlib.h>
++#include <string.h>
++#include <ctype.h>
+ 
+ #include "atomicio.h"
+ 
+@@ -814,9 +814,8 @@
+ # endif
+ 			} else {
+ 				len = sizeof(cliaddr);
+-				connfd = accept4(s, (struct sockaddr *)&cliaddr,
+-				    &len, SOCK_NONBLOCK);
+-				if (connfd == -1) {
++				connfd = accept(s, (struct sockaddr *)&cliaddr, &len);
++				if (connfd == -1 || fcntl(connfd, F_SETFL, O_NONBLOCK) == -1) {
+ 					/* For now, all errnos are fatal */
+ 					err(1, "accept");
+ 				}
+@@ -1100,6 +1099,8 @@
+ 			return -1;
+ 		}
+ 	}
++	if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1)
++		return -1;
+ 
+ 	memset(&s_un, 0, sizeof(struct sockaddr_un));
+ 	s_un.sun_family = AF_UNIX;
+@@ -1174,9 +1175,13 @@
+ 		    port, gai_strerror(error));
+ 
+ 	for (res = res0; res; res = res->ai_next) {
+-		if ((s = socket(res->ai_family, res->ai_socktype |
+-		    SOCK_NONBLOCK, res->ai_protocol)) < 0)
++		if ((s = socket(res->ai_family, res->ai_socktype,
++		    res->ai_protocol)) < 0)
++			continue;
++		if (fcntl(s, F_SETFL, O_NONBLOCK) == -1) {
++			close(s);
+ 			continue;
++		}
+ 
+ 		/* Bind to a local port or source address if specified. */
+ 		if (sflag || pflag) {
+diff --git a/socks.c b/socks.c
+index 9068f39..68b68e3 100644
+--- a/socks.c
++++ b/socks.c
+@@ -38,7 +38,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <resolv.h>
+-#include <bsd/readpassphrase.h>
++#include <readpassphrase.h>
+ #include "atomicio.h"
+ 
+ #define SOCKS_PORT	"1080"
+--- a/socks.c
++++ b/socks.c
+@@ -53,5 +53,7 @@
+ #define SOCKS_DOMAIN	3
+ #define SOCKS_IPV6	4
+ 
++#define explicit_bzero(S,L) bzero(S,L)
++ 
+ int	remote_connect(const char *, const char *, struct addrinfo);
+ int	socks_connect(const char *, const char *, struct addrinfo,
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild
deleted file mode 100644
index 34432cdfd0dd..000000000000
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="the OpenBSD network swiss army knife"
-HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"
-SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
-	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos"
-
-DEPEND="virtual/pkgconfig"
-RDEPEND="dev-libs/libbsd"
-
-S=${WORKDIR}/netcat-openbsd-${PV}
-
-PATCHES=( "${WORKDIR}/debian/patches" )
-
-src_install() {
-	# avoid name conflict against net-analyzer/netcat
-	newbin nc nc.openbsd
-	newman nc.1 nc.openbsd.1
-	cd "${WORKDIR}/debian"
-	newdoc netcat-openbsd.README.Debian README
-	dodoc -r examples
-}
-
-pkg_postinst() {
-	if [[ ${KERNEL} = "linux" ]]; then
-		ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
-		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
-		ewarn "to the running kernel will do. See bug #490246 for details."
-	fi
-}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
index 9b84922f8b78..b7288f531c86 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="The OpenBSD network swiss army knife"
-HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"
+HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/
+	https://salsa.debian.org/debian/netcat-openbsd"
 SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
-	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz"
+	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 IUSE="elibc_Darwin"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 
-DEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
 	!net-analyzer/netcat
 	!net-analyzer/netcat6
@@ -23,14 +24,21 @@ RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
 
 S=${WORKDIR}/netcat-openbsd-${PV}
 
-PATCHES=( "${WORKDIR}/debian/patches" )
-
 src_prepare() {
-	default
+	for i_patch in $(<"${WORKDIR}"/debian/patches/series); do
+		eapply "${WORKDIR}"/debian/patches/"${i_patch}"
+	done
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# this undoes some of the Debian/Linux changes
-		eapply "${FILESDIR}"/${P}-darwin.patch
+		eapply "${FILESDIR}"/${PN}-1.195-darwin.patch
+		if [[ ${CHOST##*-darwin} -lt 20 ]] ; then
+			eapply "${FILESDIR}"/${PN}-1.190-darwin13.patch
+		fi
 	fi
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch
+	fi
+	default
 }
 
 src_compile() {
@@ -40,14 +48,14 @@ src_compile() {
 src_install() {
 	dobin nc
 	doman nc.1
-	cd "${WORKDIR}/debian"
+	cd "${WORKDIR}"/debian || die
 	newdoc netcat-openbsd.README.Debian README
 	dodoc -r examples
 }
 
 pkg_postinst() {
 	if [[ ${KERNEL} = "linux" ]]; then
-		ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
+		ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
 		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
 		ewarn "to the running kernel will do. See bug #490246 for details."
 	fi
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index dbd3d7f3c1de..2d3e7c1e57d8 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -2,5 +2,5 @@ AUX 98_pnp4nagios-2.4.conf 725 BLAKE2B ca04f13ad57a90d339980566008d7176aed8be5de
 AUX npcd.initd 364 BLAKE2B b985e4951f95807f4d1d887cfe4f65780150ec827cbe6995e24a955290ce040c263c5848773f24c4ab8e05f5d78ab34693a3636bc8837aae8ef718e64f5c4e3c SHA512 efbf969865ce8f61a733ea0f0e3846854231b55d148dbf0121b4cf6022fedd94cb1ea8f717920f38aedddd6a8f33edf473f139599dc01cc2da14eedb80f7f4f2
 AUX pnp4nagios-0.6.14-makefile.patch 1057 BLAKE2B 623115771d66839df357cf19ceb0eac9600cac220cb77b77638c76ac1a5a419b7dd83145192779cfeb845a122729728bccd7cc069de1a4da51180aabbff1b91c SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602
 DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427
-EBUILD pnp4nagios-0.6.26-r9.ebuild 3071 BLAKE2B ed4e1c5b1b8355ae1f146eedf5af02c9a4ebac830b4df49f1b826488b0528b60918430fc9969e09ebb3f40bb7a44aa59d1a68538f3f2bcca0a4669780d7121dc SHA512 9fe5e0722484dadefa047c8fe0bff0f5faae933589d33ee6a3905de0f55e51e4bf1b00a48fb1e0547fad09415fd03393b857bb1bf8a7e57f02b0a8885e6dd143
+EBUILD pnp4nagios-0.6.26-r10.ebuild 3074 BLAKE2B 4ba7815161da54bf4e9e66e0509d1c2cd1acc070d2c66ec619a560b13a496c72505a8f28183054c2b3d3efb354c608d866c86cc1ff177c868da18fddca04f912 SHA512 726614c8530d171320acc7909b1b3e735759983ed77e10361b6d9e3c61d8b51744d668110a887c723935e6351497518d4401d73c887d2978bb6e72b71f3cf4b9
 MISC metadata.xml 676 BLAKE2B 39cbab00f63f5b7e6cdd10826ef65eeb9ec85616c48c8c94939216e75615c1d0903285be99b53a99aaf0ed56a79845c63f42111b3fde6b1d6b1af9fb736d8596 SHA512 6efd39f07514cbdf85f95fdb0e7bb9f69bf7ba7ab78c1345bdde1eea645cd89415db5044fe2f1b458211c7b002c895e2e9e225c00172be416f1b30f47765f78e
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
index 6a09ab87188b..21b8ec9aacf3 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ REQUIRED_USE="^^ ( icinga nagios )"
 # 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]
+	dev-lang/php:*[filter,gd,json(+),simplexml,xml,zlib]
 	net-analyzer/rrdtool[graph,perl]
 	icinga? ( net-analyzer/icinga2 )
 	nagios? ( net-analyzer/nagios-core )"
diff --git a/net-analyzer/prettyping/Manifest b/net-analyzer/prettyping/Manifest
index 7d766c7f6ccf..08ece77bbec7 100644
--- a/net-analyzer/prettyping/Manifest
+++ b/net-analyzer/prettyping/Manifest
@@ -1,3 +1,3 @@
 DIST prettyping-1.0.1.tar.gz 10104 BLAKE2B 41158972fa41fcfaf078fd8fa4b9af10e2d3e65d547f81f0a6daf826f0a1c725de97e14dc597624d2c9281492d94c4b5cf7e6f40e9743aea0792ece0f84211fc SHA512 967626f11cd58fd9a0ce91a320caf6b6a296681ed809e04188f0cfe00d03c80a3620bf4d3ec86e855be363810763ff3ccd8bb0a959d03e62b31edba2cfae7f79
 EBUILD prettyping-1.0.1.ebuild 478 BLAKE2B 862811bca0cdb0a40d55b8719379ab0b533f598615890c698a7d9e280d255caa0c95eb2c7283e11acb79d42435d5674fb389fb0ead8a53e00dc51b866fc7e0b7 SHA512 4be1f0f7b70bd5f6f68d15367f3e114aae0cfda3203df97b99353a4e94ff77bc203c826a23c136c94c211b5b6e3ed460b17c2540507f544b4925f36e68a7c68c
-MISC metadata.xml 659 BLAKE2B 3a717a849df8dd2a7a2efad7a0c29c0c8381788dcaa75938e59504f959b94c1a14a41edefdaaf2faf9a3239c6973b838396f47929677db2e72877f623383ec57 SHA512 52397ffbc330456d834bbe38afdb3558e74ba3a9fd1f4012f8a3aaafb7cf483ab312b37086415b7d06e706b7e0edbd7b348db413873d59926c8a41c1ff6b71e5
+MISC metadata.xml 658 BLAKE2B acba97542744f96dcb0664ec68f7c079ce699c3f23afed91001d69e39196fc59bc6c3f7df4dcb2d760da6fd376249a8a5ec12285f1bf089bfbc0965f82ad37aa SHA512 fbf393b87d3edf6bb7e9856d426434e2a3b167306fc0868eff020363f73346d352eb7fabecf1bd61e415b22b3f1bb43707ba198cc26bc208173d98f6c52ac8df
diff --git a/net-analyzer/prettyping/metadata.xml b/net-analyzer/prettyping/metadata.xml
index b3fcfa01442c..298df248fb08 100644
--- a/net-analyzer/prettyping/metadata.xml
+++ b/net-analyzer/prettyping/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>telans@posteo.de</email>
-		<name>Theo Anderson</name>
+		<name>James Beddek</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 6d4014a51bf5..f1e41878b459 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -275,14 +275,14 @@ DIST zabbix-5.2.4.tar.gz 19916307 BLAKE2B 17d0f5dc1d4a8b79d2a5e741a0fa18ecf584dd
 DIST zabbix-5.2.6.tar.gz 20602665 BLAKE2B 656645ece453564f2f2c58b50e9bfb3df86aeb74fdfef88cc4b597268ebaf9a9db41e1acdcd1253871dbd9a0032f973bbb1b25139ee1a083bef779a1b66ac2fc SHA512 be48fd46bf151ad2618f5136559c7027e64e178001921adefc66a0597b24b6929e52d4b0f575e8bddec1e9db01276dd5993d4500f4df4a1716a1a008e09b41f1
 DIST zabbix-5.4.0.tar.gz 23105171 BLAKE2B 19420887afdeba3d1b68c27fef94264230924aa1800de39ecb05ed9a379ba0c408cc1360f0b0e9d4f5c42b18395518791fba2a6cf843eb7bfd12e5c4dcfe7de8 SHA512 12cc78935ed5046b0f7d97e0248b50e0a0bce110ba85c6c3dade7eb348a4018995ef1d51bcb917061accff334195501793b2c00ce864d0c18245cf5a497df525
 DIST zabbix-5.4.1.tar.gz 23830541 BLAKE2B 93d39c69798dd593a77f2cd0046818763bda6d07ea43295d0fd9cd6d21a974d46f3783649fa63878e85c70e6b7cc6284ea88df2503d5011365641cd58dba9cbb SHA512 d9533bc2fac816a6c5e18462c509fb6307409528979f56cdf03085801c01d6ff17251cbcae83cc2158f944dd9302d429746e39ca669483e442474c51d6caab33
-EBUILD zabbix-4.0.30.ebuild 9253 BLAKE2B b38ca124e4e98123eb1209a538419b2e17088d0598cc37602deb2b2c54ff4e3b81eb56c4edb1bb442925464bff25d4e345d6481743d782609d23bd15cdfe038e SHA512 4eef6ecc8eab1658afb52b34d47a3fb3baca88256aa68fb6d64775d29e97ad060156c8a2ba390510bce99cec0e28192e3e7c327312f1551af5615101eaa534c3
-EBUILD zabbix-4.0.31.ebuild 9255 BLAKE2B 93b837855adf373866feb50737dcacf53e9741001aa1ee4a6bbcf9f7b76c4e90011a8c820988a7caf64e5a828e15bfbf6400bb075a4c37c4ad72b6c8b0987448 SHA512 02b9d1ead7ef9c08da6340d4a45d235710fc489e3d393c62fbbece3b70c0792899c926ba1d307dffa02621f2655daef75dad41b385fe42927bde6495c4fd32c5
-EBUILD zabbix-5.0.10.ebuild 32541 BLAKE2B d63196438eff036e12d3dc2b84dec5efdff1331d04f214f06e62419466b6deab7f6d70a7a61ad2e0dc3e34651a4878e6db967f36666750e3f9d2d2dbeb744bc6 SHA512 3d7052f96b63a645f51d2614a11adf294569c3942f74f7e018ccd0fa8e52cca6dec50a8609299d76d606421db6acba30a31fd4fd46420670c29e20ec2f191a99
-EBUILD zabbix-5.0.11.ebuild 32541 BLAKE2B d63196438eff036e12d3dc2b84dec5efdff1331d04f214f06e62419466b6deab7f6d70a7a61ad2e0dc3e34651a4878e6db967f36666750e3f9d2d2dbeb744bc6 SHA512 3d7052f96b63a645f51d2614a11adf294569c3942f74f7e018ccd0fa8e52cca6dec50a8609299d76d606421db6acba30a31fd4fd46420670c29e20ec2f191a99
-EBUILD zabbix-5.0.12.ebuild 32304 BLAKE2B 45efcda241383ee9f38e39bfa47c7683c7b3a9e6ff45bea1ddb153b8285f29c5e34dcb3fd73c598ba2b5c7c44fb2f7a33c9c905a30ae545c3e02c6b9fa64eb88 SHA512 18ed352042d3dd470fd70fd88af4174fc622059547ca732729a9b0a0cf915b5f53b1698bc42f6727f753680d081c05cb9423e4e3f36f9feba5a0aebc99527e9d
-EBUILD zabbix-5.0.8.ebuild 9123 BLAKE2B fc3c6ad9c543ddb0eb2d15df7ba7bd732fd6001b70d9e520e989b7d42669d67f438e2c4adf242e8cc914ec2777fead7e83a6b7de1f7fd978b1e96766945a5e04 SHA512 eaea26c03a539316d08528713d5499c5ee97973a19b9fcbeecc54d8bd34d62def246010d6d99b0e05613b196ea84861c090c6b88c4c9b4b9e5147936642caa9c
-EBUILD zabbix-5.2.4.ebuild 9123 BLAKE2B fc3c6ad9c543ddb0eb2d15df7ba7bd732fd6001b70d9e520e989b7d42669d67f438e2c4adf242e8cc914ec2777fead7e83a6b7de1f7fd978b1e96766945a5e04 SHA512 eaea26c03a539316d08528713d5499c5ee97973a19b9fcbeecc54d8bd34d62def246010d6d99b0e05613b196ea84861c090c6b88c4c9b4b9e5147936642caa9c
-EBUILD zabbix-5.2.6.ebuild 33154 BLAKE2B d98021e9b88ab3a4dd66ff88b6d42dc3a72673619a3d98a38582c7c9c3fa855be7b3766debe28f4472ca967b4a7cd7af4d359aaa4211be6feda9619a53ca984d SHA512 dd866d7a9d833123eb9469339577edd8ab42cce492e520e1fc54629b676ff00fc6057c38c6f0d0e7bbe7a019990dd93c660d3d93a18f7fd28b72a1e7c7038aed
-EBUILD zabbix-5.4.0.ebuild 34616 BLAKE2B 992d3bfaca0216d00336e8f610d73488ee0d17bd374511fe8496bc19452c04e247ada6b786599ac0af040acafdbe15dd9b9d6a1e48507927bf99b8150cbbbb1d SHA512 f12329de57f0cbe69ce1fb48edd51facacb5b35ac9f86746c239dbadc39ffffeb557e0385d60084b3463fee54c9c9d89c338faee5d1c19da3c7b2a66238cb856
-EBUILD zabbix-5.4.1.ebuild 34616 BLAKE2B 992d3bfaca0216d00336e8f610d73488ee0d17bd374511fe8496bc19452c04e247ada6b786599ac0af040acafdbe15dd9b9d6a1e48507927bf99b8150cbbbb1d SHA512 f12329de57f0cbe69ce1fb48edd51facacb5b35ac9f86746c239dbadc39ffffeb557e0385d60084b3463fee54c9c9d89c338faee5d1c19da3c7b2a66238cb856
+EBUILD zabbix-4.0.30-r1.ebuild 9256 BLAKE2B b488688e0c285e19b516b3df428e7c58c5d3ec056011b86f7ec4e2a3998663c73c762dd975cd7b99e600b027540fcbffd5aa33b76f026991ab13bf0148464c2a SHA512 6e35f17523841f2f3654bb23e8f574fe1d7a3a4d008b31526c06855defa671e16841ec948a68cb438c05e3bbed7ae202dbd2acef3844000ab3a8e95db0caba4d
+EBUILD zabbix-4.0.31-r1.ebuild 9258 BLAKE2B 694695f1ea325fc639ad808f10278cb4f258cf59a8d5ac67369597301e314916add9d574d38c529e7b348e388acf3f967b1d8191cd20447a222633bd8f614899 SHA512 e0acb577f5a9a534066465b74f3b4004a41c645d981ac3641213dc590111b6819ee8e5e6ce2f71e12a7cfded54c3792c1b9656b642c5925c74bb1a680ef56b0d
+EBUILD zabbix-5.0.10-r1.ebuild 32544 BLAKE2B f735b714d0148a4c3a736615ca8f503b84c00c5dfa754ed98b8f1900022598a8b3bd2be8f64fd6d86b9882873394d941c3d5ce4e0ae87ebc710ebf4d9cf99c79 SHA512 b2e1ec34fa6440697f817c36a4d0ae707d1dc4d8c85fcc809d5b154197f2da69bb32f312a05470e17e8f2b1f90f0e2bd804462a0ef7086b4ff38d69964543520
+EBUILD zabbix-5.0.11-r1.ebuild 32544 BLAKE2B f735b714d0148a4c3a736615ca8f503b84c00c5dfa754ed98b8f1900022598a8b3bd2be8f64fd6d86b9882873394d941c3d5ce4e0ae87ebc710ebf4d9cf99c79 SHA512 b2e1ec34fa6440697f817c36a4d0ae707d1dc4d8c85fcc809d5b154197f2da69bb32f312a05470e17e8f2b1f90f0e2bd804462a0ef7086b4ff38d69964543520
+EBUILD zabbix-5.0.12-r1.ebuild 32307 BLAKE2B c923751c75ebc0ab380f3d6fb3f7fb39f8069ec40753d86d0776806ccf779715801ea54b6649ff3a0d32f7853bbf90840d01963ae3e8b8059961aa32ee86708c SHA512 2dc1cec77eab7b0ef1935eec5be85e609051679c97ea9a72b6d079b4c4113c05629b3040177f2b35f2d9a5761c1270f2408d12bf3e0424a9d0415af5e1acc202
+EBUILD zabbix-5.0.8-r1.ebuild 9126 BLAKE2B 03e3eeed565cc3f7b9e68ce7c29f26361b0f5daa4458643a0a984187b002d2ea25fcb99d780b69c479ac8bc70dc539d96042eff29dec829986d9d6747f32736a SHA512 ae9dc18eb4abb1f020992ef1077959554f2ee8442eae34453c96efa2c314e37a5e122e726e166fe271e64ae273ac657d42c86f36ceb4c25150b02c43b4e93d2e
+EBUILD zabbix-5.2.4-r1.ebuild 9126 BLAKE2B 03e3eeed565cc3f7b9e68ce7c29f26361b0f5daa4458643a0a984187b002d2ea25fcb99d780b69c479ac8bc70dc539d96042eff29dec829986d9d6747f32736a SHA512 ae9dc18eb4abb1f020992ef1077959554f2ee8442eae34453c96efa2c314e37a5e122e726e166fe271e64ae273ac657d42c86f36ceb4c25150b02c43b4e93d2e
+EBUILD zabbix-5.2.6-r1.ebuild 33157 BLAKE2B 0e59ceae6df77d44128c53c58561792c48681033048d703456f1706076fb7a7309b095ab99e2e31c91932d84763b6bbb49ea19b0315b2f0e6acd5ee5d7d38876 SHA512 d8a87a7379d78812ccf72c15d8feb3f534d9b01e4f9dd7935af2f2f5a1b45db82e3cdbe85471f7595393a62504f127d27119a013d4ee6e193ef23e66a8f97b85
+EBUILD zabbix-5.4.0-r1.ebuild 34619 BLAKE2B c4c36b15051f16d04bde822a86db98df94db2f4c09f2371307c378a31ccd89a1e16a9436fc754c2be39b8fabfa6ad3954e4ab6d485b1198857c5c2512d40e4df SHA512 53e8fe670f74eb0228b1ef16616ed3b87aac5d45485ee665ab1cbd6b64bd627369b78ada4f7c14605a901e8ad1e3cbba353eec1d552fe63179d363cf63383714
+EBUILD zabbix-5.4.1-r1.ebuild 34619 BLAKE2B c4c36b15051f16d04bde822a86db98df94db2f4c09f2371307c378a31ccd89a1e16a9436fc754c2be39b8fabfa6ad3954e4ab6d485b1198857c5c2512d40e4df SHA512 53e8fe670f74eb0228b1ef16616ed3b87aac5d45485ee665ab1cbd6b64bd627369b78ada4f7c14605a901e8ad1e3cbba353eec1d552fe63179d363cf63383714
 MISC metadata.xml 1383 BLAKE2B ad7cd9b955c6e1381faf7a93414a2016d157a7ac5fac48c21d1a3bf036bf5f07d71bcc60d7df3883c76206354462cb4d45217ed0af6aeaac2287c7a396355bfb SHA512 09acd88a3aec56f9be171641cf2d8594b831d1c7b5513d535f9a12eabb2cf5a8fda0a9850efc828e9c1e067531fb84b21442076e1aac324dd941685e73445104
diff --git a/net-analyzer/zabbix/zabbix-4.0.30.ebuild b/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild
index 0f18f2302630..3cfb30a0ed8d 100644
--- a/net-analyzer/zabbix/zabbix-4.0.30.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
+	ssl? ( dev-libs/openssl:=[-bindist(-)] )
 	xmpp? ( dev-libs/iksemel )
 "
 
diff --git a/net-analyzer/zabbix/zabbix-4.0.31.ebuild b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
index e77e263d0bd1..321e1e6f6d8f 100644
--- a/net-analyzer/zabbix/zabbix-4.0.31.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
+	ssl? ( dev-libs/openssl:=[-bindist(-)] )
 	xmpp? ( dev-libs/iksemel )
 "
 
diff --git a/net-analyzer/zabbix/zabbix-5.0.10.ebuild b/net-analyzer/zabbix/zabbix-5.0.10-r1.ebuild
index 78fb7f873441..87d5506841fe 100644
--- a/net-analyzer/zabbix/zabbix-5.0.10.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.10-r1.ebuild
@@ -277,7 +277,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
+	ssl? ( dev-libs/openssl:=[-bindist(-)] )
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zabbix/zabbix-5.0.11.ebuild b/net-analyzer/zabbix/zabbix-5.0.11-r1.ebuild
index 78fb7f873441..87d5506841fe 100644
--- a/net-analyzer/zabbix/zabbix-5.0.11.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.11-r1.ebuild
@@ -277,7 +277,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
+	ssl? ( dev-libs/openssl:=[-bindist(-)] )
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zabbix/zabbix-5.0.12.ebuild b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
index c6baac6323d8..40d10b23dee7 100644
--- a/net-analyzer/zabbix/zabbix-5.0.12.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
@@ -275,7 +275,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
+	ssl? ( dev-libs/openssl:=[-bindist(-)] )
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zabbix/zabbix-5.0.8.ebuild b/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild
index d7fadf1afa37..fc80e61bdea4 100644
--- a/net-analyzer/zabbix/zabbix-5.0.8.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
+	ssl? ( dev-libs/openssl:=[-bindist(-)] )
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zabbix/zabbix-5.2.4.ebuild b/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild
index d7fadf1afa37..fc80e61bdea4 100644
--- a/net-analyzer/zabbix/zabbix-5.2.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
+	ssl? ( dev-libs/openssl:=[-bindist(-)] )
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zabbix/zabbix-5.2.6.ebuild b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
index 0770128c545e..7b7445ca6d86 100644
--- a/net-analyzer/zabbix/zabbix-5.2.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
@@ -284,7 +284,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
+	ssl? ( dev-libs/openssl:=[-bindist(-)] )
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zabbix/zabbix-5.4.1.ebuild b/net-analyzer/zabbix/zabbix-5.4.0-r1.ebuild
index 256ae704de08..71c7af9479ba 100644
--- a/net-analyzer/zabbix/zabbix-5.4.1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.0-r1.ebuild
@@ -300,7 +300,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
+	ssl? ( dev-libs/openssl:=[-bindist(-)] )
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zabbix/zabbix-5.4.0.ebuild b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
index 256ae704de08..71c7af9479ba 100644
--- a/net-analyzer/zabbix/zabbix-5.4.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
@@ -300,7 +300,7 @@ COMMON_DEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	sqlite? ( dev-db/sqlite )
 	ssh? ( net-libs/libssh2 )
-	ssl? ( dev-libs/openssl:=[-bindist] )
+	ssl? ( dev-libs/openssl:=[-bindist(-)] )
 "
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/net-analyzer/zniper/Manifest b/net-analyzer/zniper/Manifest
index c1c9f3b7dc24..9a54299dd363 100644
--- a/net-analyzer/zniper/Manifest
+++ b/net-analyzer/zniper/Manifest
@@ -1,3 +1,3 @@
 DIST zniper-1.0.tgz 20324 BLAKE2B ac13d55e6b59128a0336a27b73b356800d7cc4f1aea82997aee967f26b33e05f62e740ae034bea54ffb15109e3841fe503591d631be843f123466e941461037b SHA512 052683628c8094c402fd042b6329ca799bab594debf35c4e8b4f422e58b67f1acba8b40b335e519f1d2f1baca6c716be40718fd1089020a86c97c011da7003d1
-EBUILD zniper-1.0-r1.ebuild 795 BLAKE2B e6b583918a1cc45721b5b64317c45c62cd9847d5949f7647a088900dd210717de435832593e167d493d5c35731d0665240376f8f7e44603c1f5f70897cf97c0d SHA512 1afa6da4b8f699f0426f90891a0b772f6c2d952681bd89478683dc1c965cf5d936fb2f9007aaaceb3f9002686b265b9c92f63e921254f1aa825a57a417bdc7d5
+EBUILD zniper-1.0-r2.ebuild 795 BLAKE2B c5459301bba31d31208298a02d0654470d38377b18d204b8f92c8590f803231cfedd7d0b50e4ccccbe184fd8936b39ce71b9bc3c2feee8247b6eae19d6b8da8e SHA512 5459bd929d95c60ae95b01f813e7e3971facb5b953f124d247edf08bb34d96dc7374d1f3a13a73ba53b7f41c4096c74655d479d82b09b43e55be3471b1f72f94
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/zniper/zniper-1.0-r1.ebuild b/net-analyzer/zniper/zniper-1.0-r2.ebuild
index dae03274def1..86991e258434 100644
--- a/net-analyzer/zniper/zniper-1.0-r1.ebuild
+++ b/net-analyzer/zniper/zniper-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,12 +12,12 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="
+RDEPEND="
 	net-libs/libpcap
-	sys-libs/ncurses
+	sys-libs/ncurses:=
 "
-RDEPEND="
-	${DEPEND}
+DEPEND="
+	${RDEPEND}
 	virtual/pkgconfig
 "