gentoo resync : 03.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
commit: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree: 3cb05783d73b2c33589ba305144a31c718e123cd /net-analyzer
parent: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
40 files changed, 673 insertions, 684 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1b635d573393..f884aec447cb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index d268f1fd00a7..b80615f9f857 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -3,6 +3,5 @@ AUX barnyard.confd 663 BLAKE2B 23d63eb8f96f17b74179aa10e51aa7a92a8f10f548043fc67
 AUX barnyard.rc6 620 BLAKE2B 7b59c2919d04b236e817fbe43baded639a5b918718585e07b73b01f96627370e7db44214a74c8bd535c6461585d2076c6640ca701abf7ebba1c82302fbe86ae3 SHA512 8dacb73e749b49fe3dbef061a8d5dea5d3f3861a290c846a892264eb2ebf75034121efaff91a352b6ab4639fab76ff11eeb39ce31f407a4d617c9c114e1862f5
 DIST barnyard-0.2.0-patches.tar.bz2 12911 BLAKE2B 06215ec8cc8c2fb7ff8e57cfd2f02456180263778722001442faf8f32445fc7fa7fc0da5d00644dbf239949d5e02dd76025428c14c6c1bae8b6565ddf6edf08a SHA512 e8e5243d49b71dd76e3274e27116f99ea6c674983cb18499889c9d27a83740a6b17aa6d30c8a9acdb46103da8314679f4eba8bf1cd252d7fb6b8a34afac46b21
 DIST barnyard-0.2.0.tar.gz 161543 BLAKE2B 07f5fa6b2e01e1b421ea772b8ea0c72b6c8f66569caf176a57d3f4fce438c2dd4b2a8a61dddc4faf27c85b15d002205f1cc3627fe88d523fd25d716cc78747e7 SHA512 73424acf2e0c620b2f8f2f407d74812f7740234ce523e37557273998108c131311fffb16cfc2cea0f652d6b21072431081bad35b045f5654e2245786d27568e6
-EBUILD barnyard-0.2.0-r3.ebuild 2276 BLAKE2B 13709a28f6664cd2468cdc56f0a88db1799c4f94fdd94c49fd4111e58070e352ab18b4e90bc20649a9df2ce64eeaf25fcb603795ffd3f4f2268b26a561684e7b SHA512 1067a1255a39adec1c37a5a0067b527ac281b939b5577def41e0a558002b46279562d104e5c807719ce10adc91a8fc194f950548bf99c08f43670527886c6cfe
 EBUILD barnyard-0.2.0-r5.ebuild 2171 BLAKE2B 90208ec91836b57f7d597754642db285c497dcbab56c036b3083b889758559c0fe04938cadc63ae7d730f007ff504afc81407479f16c866f83ef6e5f0ea084b4 SHA512 0874cebfb8d2cce7226744e97dcf8f6c2329b2eaf58c2b71e7d65e407dc20b8b1bddd462ce20c9dcbc29acc0816be34cd9260b20725f4204a16b2cb782e8ec3a
 MISC metadata.xml 541 BLAKE2B ddc79b316fd21ac343ddffc0d8d38970583f9cf99d36504a7a55379dadcd32a1e9d3033de894a5a9a26e4d3c4fb42cc69f387c7e55931f4c5c7e0c1d262b0124 SHA512 7a936ec510957c8fb449857a12ff6c54b7498657af33244fcd0759c0786adc9523fda42e6a5e46b0a36c57144f9a2dc2d4179624b1fa700fac53fe83d0d73b1a
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
deleted file mode 100644
index 52e010ccc6b7..000000000000
--- a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils autotools
-
-DESCRIPTION="Fast output system for Snort"
-HOMEPAGE="https://sourceforge.net/projects/barnyard"
-SRC_URI="
-	mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz
-	mirror://gentoo/${P}-patches.tar.bz2"
-
-SLOT="0"
-LICENSE="QPL GPL-2"
-KEYWORDS="~amd64 -sparc ~x86"
-IUSE="mysql postgres sguil"
-
-DEPEND="
-	net-libs/libpcap
-	postgres? ( dev-db/postgresql[server] )
-	mysql? ( virtual/mysql )
-	sguil? ( dev-lang/tcl:0 )"
-RDEPEND="${DEPEND}
-	net-analyzer/snort"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	epatch "${FILESDIR}/barnyard.64bit.diff"
-	if use sguil ; then
-		epatch "${WORKDIR}/${PV}-sguil_files.patch"
-		epatch "${WORKDIR}/${PV}-configure-in.patch"
-		cd "${S}/src/output-plugins"
-		epatch "${WORKDIR}/${PV}-op_plugbase.c.patch"
-		cd "${S}"
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use sguil ; then
-		myconf="--enable-tcl"
-	fi
-
-	econf \
-		${myconf} \
-		--sysconfdir=/etc/snort \
-		$(use_enable postgres) \
-		$(use_enable mysql)
-}
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-
-	make DESTDIR="${D}" install || die
-
-	dodoc docs/*
-	dodoc AUTHORS README
-
-	keepdir /var/log/snort
-	keepdir /var/log/snort/archive
-
-	insinto /etc/snort
-	newins etc/barnyard.conf barnyard.conf
-	if use sguil ; then
-		sed -i -e "/config hostname:/s%snorthost%$(hostname)%" \
-		-e "/config interface/s:fxp0:eth0:" \
-		-e "s:output alert_fast:#output alert_fast:" \
-		-e "s:output log_dump:#output log_dump:" \
-			"${D}/etc/snort/barnyard.conf" || die "sed failed"
-	fi
-
-	newconfd "${FILESDIR}"/barnyard.confd barnyard
-	if use sguil ; then
-		sed -i -e s:/var/log/snort:/var/lib/sguil/$(hostname): \
-		-e s:/var/run/barnyard.pid:/var/run/sguil/barnyard.pid: \
-			"${D}/etc/conf.d/barnyard" || die "sed failed"
-	fi
-
-	newinitd "${FILESDIR}"/barnyard.rc6 barnyard
-	if use sguil ; then
-		sed -i -e "/start-stop-daemon --start/s:--exec:-c sguil --exec:" \
-			"${D}/etc/init.d/barnyard" || die "sed failed"
-	fi
-}
-
-pkg_postinst() {
-	if use sguil ; then
-		elog
-		elog "Make sure to edit /etc/snort/barnyard.conf and uncomment the"
-		elog "sguil section along with supplying the appropriate database"
-		elog "information."
-		elog
-	fi
-}
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index a8a09265687d..84473bb0e02b 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -3,6 +3,11 @@ AUX chaosreader-0.94-darwin.patch 416 BLAKE2B db4a0556b055857a88dae5294b6e993fb8
 AUX chaosreader-0.94-divisionbyzero.patch 640 BLAKE2B 50d8d24212d1150128f22d74d07ce18bafb60a137235fd548784dc95b3ca325dfe1d5a26ad852ae4eaff5151c36518e546077be79aeef74ce66cefac002b6c2c SHA512 04afa8959847fc52ba8bc546b7f2f134efcc8283b5b99c2af24af27bae73922ea4df4ff5f55308f075e1c77a29718c63345bceca3da3014611cf8b1f06e48ed8
 AUX chaosreader-0.94-oldmultiline.patch 487 BLAKE2B 596eac7253649813d6f3486522a998c8c647d2cde8830964480a394b91486f3b710c2fb7a54862be6ef8f60c8db40052cf8d4e6c8e638efc648194462354e244 SHA512 dcb98d8e5000fd0d130217e582ae21a519fd6e1554cd1e4902db632e7760c1708c9754f97f28f90d3371ccf76bb7b499b023d0985c27e799c27205f410515941
 AUX chaosreader-0.94-zombies.patch 349 BLAKE2B 607cd4f48c77613ab794f8d2fe00f5653854fe3d5a669412190e520015724cc9ad1c246e308a0c43c1ec0b4e29ec261c6eb77910dccbc0f8ddfdc730ff9f8cac SHA512 d3348cd6f29d01b1e94e4aa7f89b7f76fa9a4c8a557c437d0495ae32c6a6399019fe3affed5f1611a77a6b70fd1f30d011c87e00b614640c155f3afd8470a0f3
+AUX chaosreader-0.96-chunkcheck.patch 1048 BLAKE2B 81aa846daac3aa098d6699c6542c4e510198e3b1cc873f693d93fca24b98ed8a2de87a5dba0fa50fe4eb62faaba2fbd7733b754dabfdbc78b4f1d31911eb3090 SHA512 3721f42751698a99918ef92c08e7244fae27fb4baab6ee311dfc7c069a8ae5e44e33886dbe3ade63b92a3d56de84c6ac8b5c77cdb8bd4ab283b291747718f310
+AUX chaosreader-0.96-divisionbyzero.patch 661 BLAKE2B 529dce5b432e6636aee92526ce1e9edfaf900d64b7d4daed1163570d5d30d649987b453350bfba49bdb839256910e3849558fd7283e5a23d563f521304be35df SHA512 77fbb6e7b75055320e1cdd5e88fdadf10cc619e0ec3315640c579c6dd490be07dd504e8204ad7f35e260dbd42d82f596458cece701173aac0a5023274d56f380
+AUX chaosreader-0.96-zombies.patch 343 BLAKE2B 85dd641d9c20a5f90a0f102fbae1abee3042974c40b166a1c8f6fc8e78f2f3a6eafa8ac2ffd1de66baf751bc05b581bdf6742df68cac5254b0a363a6d99ba9a8 SHA512 7aa70a9e5dc543cc583ee825b0bee00aaecc7dbb12c0888376354cbdc403e194af37685b10e339f7fb59e031ff92b6b0f24634311572a5ba43e89706d700ec9c
 DIST chaosreader-0.94.bz2 41039 BLAKE2B 664ac7de3ea15dcc2942f7d9ffa4a7ffd2066a521345877127594ece197cab8d49d2f3441335c012dc09041543cda31c723d021ae86a512b4d578f958acc3afc SHA512 f2c2b31e6f7fc27c5cb59a43ce9cdea67de520c79f6354c9a0f627c098d73f4666461fb4f3c393a0a9ac36105979fe36b08035c4404371db2f573dd534e1adad
-EBUILD chaosreader-0.94-r1.ebuild 797 BLAKE2B ba97daaaa2377c2fd3b21ab297c5e7c3613896d57a6406b9b602437fe980a483f2cd0cd60eb97050588fd6c5f2ba07f6685baa76bcd62a838ff936c72636c327 SHA512 517498a840b8143362be0d9c97a9fa5b7b03f91eea3acb09f067cc8e4ae7e1dd23316592e7de0571484a5c31a33e45006e3299ac15b7329b337ce03046f1991e
-MISC metadata.xml 247 BLAKE2B 46dfce417653ec2bfa8e15a6e45e95eda5fe76d2867baba64738dc625b20b4170461fc30cf34f3607ba5b0a39c932ef3722f388802c18c21501c75742344a95a SHA512 6776ae1219f92689a0543d71a91ba750986de47dd363a376fae8c926ee6e09767cb98a6d7b8cea2d9e5d1002ceee26cf62c4d72a9d38b08b793d0fa3deb25125
+DIST chaosreader-0.96.tar.gz 99124 BLAKE2B 04e9dd45543033bb3d15264fcc9168b7e2cec6f304f10142df36c363e841afc91659d7956bbb60b05cc6ab4e8fd519adaf9a2e69be2efc129fd2f38ca0d99f1f SHA512 46ba4a66152403e150e652bf6fa08af98cd3d709ea2cb834a32411ca5dde5f94a7e972404626787e604c1449c29ab5f335673b305ab83856c0dfff7cbf2f4de4
+EBUILD chaosreader-0.94-r1.ebuild 840 BLAKE2B 8060c14564abfe0a5994fe7ca8263ac281fcedf33cc590adc0a10927281ced71a8f6dd4e8659fc36597835086501bef436db99d383b7deb9426a1ae5e8102484 SHA512 365f6740dce7ad5b9938fa5e15a2564cadc35f49b04a2b7e7dac9efbb8071be872a8bdf8e58c7b44eb3386ed392b60d73f4b483a49002743dedf7a598f5c7a70
+EBUILD chaosreader-0.96.ebuild 726 BLAKE2B bbc041d07cf075465a04a9b594c52b13d919dcea78d61a88213b5454ae23222ba40d10c9e63494dd05dd4fe915acfd59a2736c6f1c592988ea5bf3c2ccf1c856 SHA512 5064abb43c24fd06d8862144d6d4c02302a746af2bde3759cc2734ecaf035404086256b36404f3734282c9ef4a5ad797b5af6a1f10b69441493f47dfc39ce966
+MISC metadata.xml 519 BLAKE2B bb962789720f669f73a42bb2b4b0cf80f39d8efc8c7ef191048ed554813dd2ca3e3e8b0fecdbd46513fe7bf815d0129fc9d11be45ef240ba280d931a751377b6 SHA512 1c1018ea975b13592ac38a1d5207ad599f8a6f36f58718232a27870e23d5d5b2c7b3977b31975bf24c42176e0d8043259a130e4020a05942fe6d7aca073444a4
diff --git a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
index 33c7a6f55825..1b7d356fcb14 100644
--- a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,12 +6,13 @@ EAPI=4
 inherit eutils
 
 DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data."
-HOMEPAGE="http://chaosreader.sourceforge.net"
+HOMEPAGE="http://chaosreader.sourceforge.net
+	https://github.com/brendangregg/Chaosreader"
 SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
 SLOT="0"
 
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 
 IUSE=""
 
diff --git a/net-analyzer/chaosreader/chaosreader-0.96.ebuild b/net-analyzer/chaosreader/chaosreader-0.96.ebuild
new file mode 100644
index 000000000000..ab29f713b3df
--- /dev/null
+++ b/net-analyzer/chaosreader/chaosreader-0.96.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data."
+HOMEPAGE="http://chaosreader.sourceforge.net
+	https://github.com/brendangregg/Chaosreader"
+SRC_URI="https://github.com/brendangregg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+LICENSE="GPL-2+"
+
+DEPEND=">=dev-lang/perl-5.8.0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/Chaosreader-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/chaosreader-0.96-zombies.patch
+	"${FILESDIR}"/chaosreader-0.96-chunkcheck.patch
+	"${FILESDIR}"/chaosreader-0.96-divisionbyzero.patch
+)
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch
new file mode 100644
index 000000000000..6a394d4b308e
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch
@@ -0,0 +1,27 @@
+--- a/chaosreader	2011-11-10 19:17:50.000000000 +0100
++++ b/chaosreader	2012-03-09 18:15:21.096105305 +0100
+@@ -5350,6 +5353,24 @@
+ 		next if length($http_data) < 8;
+ 		$partnum++;
+ 		$parttext = sprintf("%02d",$partnum);
++		
++		## from https://sourceforge.net/tracker/?func=detail&aid=2019799&group_id=107384&atid=647491 
++		### Chunk Check
++		if ( $http_header =~ /Transfer-Encoding: chunked/ ) {
++                  my $new_http_data="";
++                  my $chunksize=-1;
++                  my $pos=0;
++                  until ($chunksize==0) {
++                    my $eolpos=index($http_data,"\r\n",$pos);
++                    $chunksize=hex(substr($http_data,$pos,$eolpos - $pos));
++                    $pos=($eolpos+2);
++                    if ($chunksize > 0) {
++                      $new_http_data.=substr($http_data,$pos,$chunksize);
++                    }
++                    $pos+=($chunksize+2);
++                  }
++                  $http_data=$new_http_data;
++		}
+ 
+ 		### Part - Checks
+ 		$http_type = &File_Type($http_data);
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch
new file mode 100644
index 000000000000..584918513062
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch
@@ -0,0 +1,18 @@
+--- a/chaosreader	2014-06-15 21:30:11.000000000 +0200
++++ b/chaosreader	2019-02-21 18:26:00.671756895 +0100
+@@ -4275,7 +4275,14 @@
+ 	   print REPLAY "ms($timediff1);\n";
+ 	}
+ 	$duration = 0.01 if $duration == 0;     # avoid divide by 0,
+-	$speed = sprintf("%.2f",$bytes / (1024 * $duration));
++	+       # avoid division by zero
++	# from https://sourceforge.net/tracker/?func=detail&aid=2210488&group_id=107384&atid=647489
++	if ( $duration > 0 ) {
++		$speed = sprintf("%.2f",$bytes / (1024 * $duration));
++	}
++	else {
++		$speed = "unknown";
++	}
+ 	print REPLAY "print \"\n\n" .
+ 	 "Summary: $duration2 seconds, $bytes bytes, $speed Kb/sec\\n\";";
+ 	close REPLAY;
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch
new file mode 100644
index 000000000000..40fa6063adf3
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch
@@ -0,0 +1,11 @@
+--- a/chaosreader	2006-12-24 15:12:23.000000000 +0100
++++ b/chaosreader	2006-12-24 15:11:56.000000000 +0100
+@@ -396,6 +395,8 @@ if ($Arg{normal}) {
+ 
+ elsif ($Arg{standalone}) {
+ 
++   $SIG{CHLD} = "IGNORE";
++
+    ############################################################
+    # --- STANDALONE - Create Packet Logs and Process them ---
+    #
diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml
index 8a3b2249bc8f..4cd76b15bbeb 100644
--- a/net-analyzer/chaosreader/metadata.xml
+++ b/net-analyzer/chaosreader/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>bu9zilla@gmail.com</email>
+		<name>Michael Mair-Keimberger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">chaosreader</remote-id>
+		<remote-id type="github">brendangregg/chaosreader</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index c8e04a89d3fa..73915edc4704 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,9 +2,11 @@ AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd12
 AUX icinga2.initd-2 2682 BLAKE2B 613fdb4fdcef7c95bba710c5fcb6ee84dcb3cd739bf0caa42130e2d1a4faf7341d82447bbac6070567581b90beba261302e8d03c148876db157c68054f64e233 SHA512 1ca1001e6095b17d57cd7ff70a2cc302f6dfa466cbe0a71154dd188caabd31e4b69821a3d8383ed855dcb2d2c396b2141a70de298a6f3c40ab79993c292fa6cb
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.10.2.tar.gz 4408535 BLAKE2B f650826feee13695c42d7e6ced45e3009ac607d6af0bcb16c3f93f8099017a74de40e33deefaffb230a519f9dabf410c03745309d203ede71a4d7076ba8c9121 SHA512 2fb30673fbeef395a43eb7947c0c0217d7c0fc9c149bb244d16dae461dd5728a2540e88bcb351bac2ec5d58d6896f8a4789ced5647cdac8cecf0623fff12054b
+DIST icinga2-2.10.3.tar.gz 4421984 BLAKE2B 130279f3fbe90e9cc311d98ca8ff879c3dca34b61e8e8b3f7db30b7cb116361decf2e8fcc44c34bab863ef654a345f7cafc14c0179ec83dc3a2fe84ef103575e SHA512 c3b4b6e66889e30ed5c73b3adf55bec9c547f4f3a81a5511b981d8e6d4b1e370bc71263b3249b625769cea1d13de5aa62f3c039ac5315013c13bc02009e70967
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd22220c396efeb68759acc97938e3ee596e0820e3f6c8f73bc SHA512 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 EBUILD icinga2-2.10.2.ebuild 4737 BLAKE2B e4df75153cd908b76f323f10eb6413615aad342ddb19c84303b47ce43d9b188b897a49e1c27580039b59627879071a462f5473aefebcc82f2f9d3f39a8683ce0 SHA512 85cfcb9e2fd81289ff39b48e36db648fec4b9a766323ad6aa75daec753b49249a47f635e4f3ad8ebc6528a0c5908afddcde6beea4e47fc7e2e11a29afd1a05ff
+EBUILD icinga2-2.10.3.ebuild 4739 BLAKE2B 98edc856ce987b5e3b6ce3b7c13626392f1cd8c30f445aee583d20b35b07c86425eb12020461266f04ce009840f94c4636716c8ceb57ca7dac70ceae0c0cccfc SHA512 36f667896c130b61d2f76f29ec014207b60fc3dc9743a6723e51983e89be3bb4727d0243b516dd695b3f88265365ff2205e852546889911da2e530bef7cf7b93
 EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
 EBUILD icinga2-2.9.1-r2.ebuild 4742 BLAKE2B e16c72fda3de6b45a4f6f3682d683f8e037a3a2f3dbbea136f7c9c2a013892938586d2094cce045a81564046a80a9ba7bfa0f5925b92c3266695a24054235295 SHA512 2201d7a9f01dab71ed53245e9447044d928eb444da952f71aaa366bf27f5e9965e742ea70efd59064ffbc765940445f4b35b7cf5767524379e43a130da0b89fd
 EBUILD icinga2-2.9.1.ebuild 4416 BLAKE2B 0e9e5c307089b8e9feab2ab66468db68e83fd8c7ca54cb4f72dd4405f5ab2879a0a1bb671ddc6abc5638fb2a49cb7f07fc600579889bea1a6fa6540265f7372c SHA512 81ccd2334931c16fed9a5544ace4f8310519c5634437765c7fc9b4ff769def9a7cb717fefb39fc838f7d19f56c5a282f81aad73e8ec5aaa707907266f8d73343
diff --git a/net-analyzer/icinga2/icinga2-2.10.3.ebuild b/net-analyzer/icinga2/icinga2-2.10.3.ebuild
new file mode 100644
index 000000000000..8a9695a5e27b
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.3.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.58-r1
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DUSE_SYSTEMD=$(usex systemd ON OFF)
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use mariadb ; then  # same as mysql
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 99724afa9310..885540130bcc 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -2,4 +2,5 @@ AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad2
 DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
 EBUILD monitoring-plugins-2.2-r2.ebuild 3011 BLAKE2B 3e2fdb8a93f5adad5de4172a7fc4cb5d6afa5ec63dc4221160493b8068361d971650462838dece42d282511c458dc7ef0b4f60b541aa9c422019be5e48a00ec8 SHA512 bdd095ae665410133fd2125ba7b015e75aa57b8a0c35742a172ddb34cf3e71cb7389956aa278f92a3366b3aeb055ba6a579473878975fa7288d9e79f029b78a7
 EBUILD monitoring-plugins-2.2-r3.ebuild 3021 BLAKE2B ea60af62f811f8d15b982cdc9ec80994b6321a530f99081f26d60fad1636b9ac62b2258c4c5aab9aa4dcb5787bc29d22761f2fbef55edcd78a27fa916916367d SHA512 747e16b184b92b5fe3e00e8937c09d07a6eafc584d1234b453bfcf2c0c40e1158647b348e3209db6bf536bfe50ad7913fe2258f300d901573b77135a5afa2dbb
+EBUILD monitoring-plugins-2.2-r4.ebuild 3029 BLAKE2B ec56c0c0fa7b861873a9f07ef27eb0cdb4282f19f0a75e676a94c785ebe601df2e0b3f11163af6835c917f4cbccdf7ee01788c17fe70a654dfaf8d8040d3bf12 SHA512 f9607e6a9b3e359a09d09929760a16e7be7fcd02487386ef3a9222c7c2a462fe350ffa501d1b4e9b761e11a09e060f749a1c52fcd205d99df58cda5cea2bc3b0
 MISC metadata.xml 1404 BLAKE2B 68d3a914681db790872872cee7114b053aaa118b9eacbf33b02db932d3b970a80b0fc1d79d9e3f836f7d0f8870066bdf78b6b688864cac753d5ddf42a7ad9f9c SHA512 766657a0c9a0d16fa9fc0c052342b65c1f5b32dbbc0eb4e8fb014274b92dd0370dc19a6821ceed3979a1def5f429e1e3f23ccbf2ca443f787a50e00b503acf42
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
new file mode 100644
index 000000000000..ae1073c7cae9
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib user
+
+DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
+HOMEPAGE="https://www.monitoring-plugins.org/"
+SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+		gnutls? ( net-libs/gnutls )
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+DEPEND="${REAL_DEPEND}
+	dns? ( net-dns/bind-tools )
+	game? ( games-util/qstat )
+	fping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with !gnutls openssl /usr)
+				  $(use_with gnutls gnutls /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 922e6bf316b6..3288286ed036 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -7,5 +7,5 @@ DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea
 DIST mtr-0.92.tar.gz 296430 BLAKE2B 0f7dfcbd77d6f9cd0a9ba4c7e6829ce8f3fa0e1de4009632d10c3a1c2acc280db5830296695c27d89317d38d507af8f7e9bdd12b1c0e0d198872dc39f13032e7 SHA512 d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f
 EBUILD mtr-0.87.ebuild 1160 BLAKE2B b2387d41479707319b51be3877f58aa6cf13e832780a75ebf4a9f0ffd013f83cb5e129e0c254f2fba7d7aa7a3d7a0bc73aaffd0769adfaaa5421d99ef2b347e2 SHA512 93f02f5f2f477f5aeef30fcdf9d589870af55b7076989be6cfd00513796acef1657a0f92558d97807fdfc70764da7b61a8c8f3dd67cdf73e7f9d417ee5fe5e82
 EBUILD mtr-0.92-r1.ebuild 1428 BLAKE2B 6adaa9e1d16e8b8969d5f3fcefb078cc3aa9ec6cd26e476ee3b3f3d13f6d1426f00d51c026fa44af03bb2713d0e60544b3a5b269e79bed03450108f2cbc02caa SHA512 b7dd855dfe63c4d069150cc2c78faad630dfc11e02afa5f9d1262df8ad35cc9d43602f7ca3721ce421285fb40ca362df35a196560726d0f1ca78262388b16ea4
-EBUILD mtr-9999.ebuild 1585 BLAKE2B 9d5a60a779fdca57d88533b07885eb0e16d6088c97a5315530c18d44120290743e06f8b3d80e13693a082e8dd3b6ac6106d40b7c3ed23cc6095eb90e196ccc02 SHA512 798aadffb0af237a0b94b8b7993b42584dbe416edead6df07c23fdf06a98ba67ddf24e08d0443d8bd73340ae13a60daeb821d397ada4531220cfda3758370009
+EBUILD mtr-9999.ebuild 1585 BLAKE2B 93a9fcfa7e0d5f2c0b6a89d779fe253623158867e8ba7456e1d5bf28f7fafc470d44467bde32f19f46c18926bc7d758ed13c1874b7836311b42031f6701729c8 SHA512 87c0fa6f69d98219c9916b595f1e9868bcc886168448da8f4ce55599dd6fc566c2841e631c152393dadb7c4c72a9405b32b78c521f0a2e7cc620d7800eb9225c
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 3a1ec3b3a684..06c55d456ae3 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ DEPEND="
 	virtual/pkgconfig
 "
 
-DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
+DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
 FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.88-tinfo.patch
diff --git a/net-analyzer/nagios-check_mysql_health/Manifest b/net-analyzer/nagios-check_mysql_health/Manifest
index f0b9fb3d0348..0ad164b56437 100644
--- a/net-analyzer/nagios-check_mysql_health/Manifest
+++ b/net-analyzer/nagios-check_mysql_health/Manifest
@@ -1,5 +1,3 @@
-DIST check_mysql_health-2.1.9.2.tar.gz 139293 BLAKE2B bcb561b268b654e957d33d1ecd763b259139f54c700fe7ac3c1afeb85b9cd6721f5468d1a04c6ea86a59451134a27a8a989f79b3276359c6ee7e3d1a46079a24 SHA512 4a68f5f9c53d9c612e7b7185c1d593f896d4122887088f2c2dd824efa936da42c28ae720e5fbe513654721e8313530bfa3b3b973fe19009d6c7fc561402e66f7
 DIST check_mysql_health-2.2.2.tar.gz 140250 BLAKE2B 7bdbf5398ed2219ec9a254906c2e0b38160fe8914c218388a4c9f06c401636e500290dea42b420da7881e6dd35116e0f5b54bb448b304c84714bdee610c74d92 SHA512 027e47747aba524d8c7d168f6c440271434db2e152e59821eff06449d98919ab343a7840ecf73a1fcbc864799d6d3094088bb06f6b36b16989a5184676ae2628
-EBUILD nagios-check_mysql_health-2.1.9.2.ebuild 1158 BLAKE2B c8f25d15813eac842057ca603b177debdd4238a5afd5282c50f3b8d9c4a022d06cef9e9acb9b8ef442f1d2b29b8ca25b272183ce8475b482650a0c8245684c9c SHA512 fc946ded7de791366e95b21ebaa38f41ee9cf7ab29374066104c3bcd8147971117b17f1c8515599a7ca9ff3a161087f25230ad4db4fd0eddd0f61d1b68482a0f
-EBUILD nagios-check_mysql_health-2.2.2.ebuild 1142 BLAKE2B 0188cdcd88e888781f5af97c8956b42195e163a2ea6d545aece358b743831f827f75920742ef863fbad612698edbe92f466d1a204429c093f3f1c2bd974c1785 SHA512 4701d50c8ea95ebcc36dbee8d6d9584506f94911ac867d407199f826188557f552b53f31545991b09731e110ac8b572edf5c780fc4ecf652f9fdbabd0ac4860a
+EBUILD nagios-check_mysql_health-2.2.2.ebuild 1137 BLAKE2B e34369c0b08ad6cb83b2ee77593fc56be7d47ca8af359c092b4bd4dee790420d3e111810f2b94bfabaf5fb8f2c2847548efb79b22e866b3211666c5b117d932e SHA512 ab5a5482464904588c9eb57c056c36aeca02dd05088728f644bc46dc292fb4219bc3436846e94f5c0d2197b017506231749c52370b92661e01840548408331fd
 MISC metadata.xml 256 BLAKE2B 0a1246bd85dce1cf03b4bbd67a011b248c44282442dd65e9c7f24aa4f4c146708fb0894054418a5e42588a0ceebc455eba9518903cf764c1c5f3563666e44e35 SHA512 2c63ddb5d1254a9c4c14b6a41b12a2152d2230fe5c79fe7e7e2351dd23037c7422dcff80e1731259c6a233020bbd5d438ec1c2ad0fba114ec33ea97a4dc5826e
diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild
deleted file mode 100644
index 0048f8658de8..000000000000
--- a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-MY_PN="${PN#nagios-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A nagios plugin for checking MySQL server health"
-HOMEPAGE="https://labs.consol.de/nagios/${MY_PN}/"
-SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Found by grepping for "use " in the built
-# plugins-scripts/check_mysql_health.
-RDEPEND="dev-perl/DBD-mysql
-	dev-perl/DBI
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-Net-Ping
-	virtual/perl-Time-HiRes"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure(){
-	# Should match net-analyzer/{monitoring,nagios}-plugins.
-	econf --libexecdir="/usr/$(get_libdir)/nagios/plugins"
-}
-
-# Here we should have a pkg_preinst() that creates the nagios user/group
-# (using the same command from e.g. net-analyzer/nagios-plugins). But
-# right now, the build system for check_mysql_health has a bug: it
-# doesn't use the configured user (INSTALL_OPTIONS aren't passed to
-# /usr/bin/install), so it's pointless. Don't forget to inherit
-# user.eclass!
diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
index eed773ec2099..1cdf11b0c497 100644
--- a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
+++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Found by grepping for "use " in the built
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 3c1451e5122d..5e7633532eae 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,12 +1,8 @@
 AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
-AUX nagios-4.4.2-pre.patch 7936 BLAKE2B 143d1d80ae6d940165f5bff8e27deaee216f2a06b465968060b5a29da79ef2ec5277f3484c9b0774ad62284740b8513571e4df574c82acd03db341b6d5984d80 SHA512 0aa946192ab5f24b22f5c0737d8e2f5764317ee5e1ceab9d9c97b43eb2a4f3a8856c370d3a26d91ea9727b4e17f77876e790e399bf67a01eef3221c116a4558c
-AUX nagios-4.4.3-pre.patch 1479 BLAKE2B cc3f4b1e04f82ec97c5b15e7cb15defb7d700d776ee4faf0123d74afac998b8897796f77924e30e3dd1999d48f15b112481dd4bac4a6d5f5f01774881aad3b3c SHA512 fea7837f745efb85e64450b6cf3795cb011d3d5cf4d70e1e51b5037474f09943d94e2216839d9290fa8507176b14794c1028fd26d2c84f3259e728a3dcbca994
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
-DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b SHA512 a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
 DIST nagios-4.4.3.tar.gz 11302228 BLAKE2B d22ab64268832897dfa67d805a5d74656f7aa96ce1427c7326b632060d8c1ea0fbd07564f3c7a978bb5e2c0cba0c06290e7b0d579017fe73b900eb290c7853ae SHA512 07c91a796d634ffda73305edb54e01e46cb4fc9dc996c937e657c18f8067d7e2d31421b058a04b7395ef739962445ea149c486caaac94b7d422b4032bdaa07d4
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411
-EBUILD nagios-core-4.4.2.ebuild 6692 BLAKE2B cef816faef6561bb8ee0dae09266fb0fce684ac0d6e2c65227e0e6aa2080bf20ff4612e189d269f66c946de516dd7620820f9acc76d6cbb89380dbda1d552a0d SHA512 26524450d6a3c207d5d05562767f635f04828f19e7d065ab2e0a826b5c82c444811d344cc3380bee814d2369451a82423aab4047feadae84077e97c1b1130963
 EBUILD nagios-core-4.4.3-r1.ebuild 6606 BLAKE2B 158f1629920032d07ccef39a5f6c8b596f894a957fae83b4efee89a42560f20eb4c2c248c0634ceac84b7315e1e0825a7608f1053a5485ab58d83b3b4dc33a44 SHA512 79985b40a69782d73780b5c0d85d758c96e57e87f24725d2bb338c8e761cadca4ac17e82d22a3662657408bb8cc1b03cc1e1eea2220424d75314f81fdccc6e75
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch b/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch
deleted file mode 100644
index 6483b9df9f29..000000000000
--- a/net-analyzer/nagios-core/files/nagios-4.4.2-pre.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-diff --git a/Changelog b/Changelog
-index 1e1bd9e2..8dd26fec 100644
---- a/Changelog
-+++ b/Changelog
-@@ -2,6 +2,18 @@
- Nagios Core 4 Change Log
- ########################
- 
-+4.4.2 - ??????????
-+------------------
-+FIXES
-+* Fix comment data being duplicated after a `service nagios reload` or similar (Bryan Heden)
-+* Fix check_interval and retry_interval not changing at the appropriate times (Scott Wilkerson)
-+* Fixed passive checks sending recovery email when host was previously UP (Scott Wilkerson)
-+* Fixed flapping comments duplication on nagios reload (Christian Jung)
-+* Fix for CVE-2018-13441, CVE-2018-13458, CVE-2018-13457 null pointer dereference (Trevor McDonald)
-+* Fixed syntax error in file: default-init.in (#558) (Christian Zettel)
-+* Reset current notification number and state flags when the host recovers, reset all service variables when they recover fixes (#557) (Scott Wilkerson)
-+* Fixed wrong counting of service status totals when showing servicegroup details (#548) (Christian Zettel, Bryan Heden)
-+
- 4.4.1 - 2018-06-25
- ------------------
- FIXES
-diff --git a/base/checks.c b/base/checks.c
-index 725dec9d..d45b6ac4 100644
---- a/base/checks.c
-+++ b/base/checks.c
-@@ -911,6 +911,11 @@ static inline void service_state_or_hard_state_type_change(service * svc, int st
- 
- 	if (state_or_type_change) {
- 
-+		/* check if service should go into downtime from flexible downtime */
-+		if (svc->pending_flex_downtime > 0) {
-+			check_pending_flex_service_downtime(svc);
-+		}
-+
- 		/* reset notification times and suppression option */
- 		svc->last_notification = (time_t)0;
- 		svc->next_notification = (time_t)0;
-@@ -941,7 +946,10 @@ static inline void host_state_or_hard_state_type_change(host * hst, int state_ch
- 
- 		log_debug_info(DEBUGL_CHECKS, 2, "Check type passive and passive host checks aren't false\n");
- 		
--		hst->current_attempt = 1;
-+		if (state_change == TRUE) {
-+            hst->current_attempt = 1;
-+        }
-+        
- 		hard_state_change = TRUE;
- 	}
- 
-@@ -989,6 +997,9 @@ static inline void host_state_or_hard_state_type_change(host * hst, int state_ch
- 
- 	if (state_or_type_change) {
- 
-+		/* check if host should go into downtime from flexible downtime */
-+		check_pending_flex_host_downtime(hst);
-+
- 		/* reset notification times and suppression option */
- 		hst->last_notification = (time_t)0;
- 		hst->next_notification = (time_t)0;
-@@ -1228,7 +1239,7 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 	next_check = (time_t)(svc->last_check + (svc->check_interval * interval_length));
- 
- 	/***********************************************/
--	/********** SCHEDULE HOST CHECK LOGIC **********/
-+	/********** SCHEDULE SERVICE CHECK LOGIC **********/
- 	/***********************************************/
- 	if (svc->current_state == STATE_OK) {
- 
-@@ -1269,6 +1280,7 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 
- 			svc->host_problem_at_last_check = TRUE;
- 		}
-+        
- 	}
- 	else {
- 
-@@ -1368,6 +1380,9 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 		else {
- 
- 			log_debug_info(DEBUGL_CHECKS, 1, "Service is a non-OK state (%s)!", service_state_name(svc->current_state));
-+            
-+            svc->state_type = SOFT_STATE;
-+			svc->current_attempt = 1;
- 
- 			handle_event = TRUE;
- 		}
-@@ -1395,6 +1410,21 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 
- 				log_debug_info(DEBUGL_CHECKS, 1, "Service experienced a SOFT recovery.\n");				
- 			}
-+            
-+            
-+            /* reset all service variables because its okay now... */
-+            svc->host_problem_at_last_check = FALSE;
-+            svc->current_attempt = 1;
-+            svc->state_type = HARD_STATE;
-+            svc->last_hard_state = STATE_OK;
-+            svc->last_notification = (time_t)0;
-+            svc->next_notification = (time_t)0;
-+            svc->current_notification_number = 0;
-+            svc->problem_has_been_acknowledged = FALSE;
-+            svc->acknowledgement_type = ACKNOWLEDGEMENT_NONE;
-+            svc->notified_on = 0;
-+            
-+            hard_state_change = TRUE;
- 		}
- 
- 		/***** SERVICE IS STILL IN PROBLEM STATE *****/
-@@ -1418,6 +1448,14 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 			}
- 		}
- 	}
-+    
-+    /* soft states should be using retry_interval */
-+    if (svc->state_type == SOFT_STATE) {
-+        
-+            log_debug_info(DEBUGL_CHECKS, 2, "Service state type is soft, using retry_interval\n");
-+            
-+            next_check = (unsigned long) (current_time + svc->retry_interval * interval_length);
-+    }
- 
- 	/* check for a state change */
- 	if (svc->current_state != svc->last_state || (svc->current_state == STATE_OK && svc->state_type == SOFT_STATE)) {
-@@ -1454,6 +1492,8 @@ int handle_async_service_check_result(service *svc, check_result *cr)
- 	if (svc->current_attempt >= svc->max_attempts && svc->current_state != svc->last_hard_state) {
- 
- 		log_debug_info(DEBUGL_CHECKS, 2, "Service had a HARD STATE CHANGE!!\n");
-+        
-+        next_check = (unsigned long)(current_time + (svc->check_interval * interval_length));
- 
- 		hard_state_change = TRUE;
- 
-@@ -2197,6 +2237,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 		else {
- 
- 			log_debug_info(DEBUGL_CHECKS, 1, "Host is no longer UP (%s)!\n", host_state_name(hst->current_state));
-+            
-+            hst->state_type = SOFT_STATE;
-+            hst->current_attempt = 1;
- 
- 			/* propagate checks to immediate parents if they are UP */
- 			host_propagate_checks_to_immediate_parents(hst, FALSE, current_time);
-@@ -2276,7 +2319,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 	if (hst->current_state != HOST_UP && (hst->check_type == CHECK_TYPE_ACTIVE || translate_passive_host_checks == TRUE)) {
- 
- 		hst->current_state = determine_host_reachability(hst);
--		next_check = (unsigned long)(current_time + (hst->retry_interval * interval_length));
-+		if (hst->state_type == SOFT_STATE)
-+            next_check = (unsigned long)(current_time + (hst->retry_interval * interval_length));
-+        
- 	}
- 
- 	/* check for state change */
-@@ -2310,7 +2355,9 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 
- 		log_debug_info(DEBUGL_CHECKS, 2, "Host had a HARD STATE CHANGE!!\n");
- 
--		hard_state_change = TRUE;
-+		next_check = (unsigned long)(current_time + (hst->check_interval * interval_length));
-+        
-+        hard_state_change = TRUE;
- 		send_notification = TRUE;
- 	}
- 
-@@ -2372,6 +2419,12 @@ int handle_async_host_check_result(host *hst, check_result *cr)
- 		}
- 	}
- 
-+    /* the host recovered, so reset the current notification number and state flags (after the recovery notification has gone out) */
-+    if(hst->current_state == HOST_UP && hst->state_type == HARD_STATE && hard_state_change == TRUE) {
-+        hst->current_notification_number = 0;
-+        hst->notified_on = 0;
-+        }
-+        
- 	if (obsess_over_hosts == TRUE) {
- 		obsessive_compulsive_host_check_processor(hst);
- 	}
-diff --git a/base/nagios.c b/base/nagios.c
-index 520ba71e..24719647 100644
---- a/base/nagios.c
-+++ b/base/nagios.c
-@@ -878,6 +878,9 @@ int main(int argc, char **argv) {
- 			/* clean up the scheduled downtime data */
- 			cleanup_downtime_data();
- 
-+			/* clean up comment data */
-+			free_comment_data();
-+
- 			/* clean up the status data if we are not restarting */
- 			if(sigrestart == FALSE) {
- 				cleanup_status_data(TRUE);
-diff --git a/cgi/status.c b/cgi/status.c
-index 20c4ed48..8b1c8b31 100644
---- a/cgi/status.c
-+++ b/cgi/status.c
-@@ -873,6 +873,11 @@ void show_service_status_totals(void) {
- 				count_service = 1;
- 			}
- 		else if(display_type == DISPLAY_SERVICEGROUPS) {
-+
-+			if (is_service_member_of_servicegroup(find_servicegroup(servicegroup_name), temp_service) == FALSE) {
-+				continue;
-+			}
-+
- 			if(show_all_servicegroups == TRUE) {
- 				count_service = 1;
- 				}
diff --git a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch b/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
deleted file mode 100644
index 3c5eb030547c..000000000000
--- a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Changelog b/Changelog
-index c695bd54..4c348894 100644
---- a/Changelog
-+++ b/Changelog
-@@ -2,6 +2,11 @@
- Nagios Core 4 Change Log
- ########################
- 
-+4.4.3 - 2018-XX-XX
-+------------------
-+FIXES
-+* Fixed services sending recovery emails when they recover if host in down state (#572) (Scott Wilkerson)
-+
- 4.4.2 - 2018-08-16
- ------------------
- FIXES
-diff --git a/base/notifications.c b/base/notifications.c
-index d4574c41..58ad140f 100644
---- a/base/notifications.c
-+++ b/base/notifications.c
-@@ -591,10 +591,6 @@ int check_service_notification_viability(service *svc, int type, int options) {
- 		return ERROR;
- 		}
- 
--	/***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
--	if(svc->current_state == STATE_OK)
--		return OK;
--
- 	/* don't notify contacts about this service problem again if the notification interval is set to 0 */
- 	if(svc->no_more_notifications == TRUE) {
- 		log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this service problem.\n");
-@@ -1501,10 +1497,6 @@ int check_host_notification_viability(host *hst, int type, int options) {
- 		return ERROR;
- 		}
- 
--	/***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
--	if(hst->current_state == HOST_UP)
--		return OK;
--
- 	/* check if we shouldn't renotify contacts about the host problem */
- 	if(hst->no_more_notifications == TRUE) {
- 		log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this host problem.\n");
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
deleted file mode 100644
index bfd8898d4883..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-# sys-devel/libtool dependency is bug #401237.
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="sys-devel/libtool
-	virtual/mailx
-	perl? ( dev-lang/perl:= )
-	web? (
-		app-arch/unzip
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd[php] )
-		apache2? (
-			|| (
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-			|| (
-				dev-lang/php:*[apache2]
-				dev-lang/php:*[cgi]
-				dev-lang/php:*[fpm] )
-		)
-	)"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-PATCHES=(
-	"${FILESDIR}/nagios-4.4.3-pre.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-	local myconf
-
-	if use perl; then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
-		--datadir=/usr/share/nagios/htdocs \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) nagios
-
-	if use web; then
-		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
-	fi
-}
-
-src_install() {
-	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
-
-	# There is no way to install the CGIs unstripped from the top-level
-	# makefile, so descend into base/ here. The empty INSTALL_OPTS
-	# ensures that root:root: owns the nagios executables.
-	cd "${S}/base" || die
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-	cd "${S}" || die
-
-	# Otherwise this gets installed as 770 and you get "access denied"
-	# for some reason or other when starting nagios. The permissions
-	# on nagiostats are just for consistency (these should both get
-	# fixed upstream).
-	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
-
-	# INSTALL_OPTS are needed for most of install-basic, but we don't
-	# want them on the LIBEXECDIR, argh.
-	emake DESTDIR="${D}" install-basic
-	fowners root:root /usr/$(get_libdir)/nagios/plugins
-
-	# Don't make the configuration owned by the nagios user, because
-	# then he can edit nagios.cfg and trick nagios into running as root
-	# and doing his bidding.
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
-
-	# No INSTALL_OPTS used in install-commandmode, thankfully.
-	emake DESTDIR="${D}" install-commandmode
-
-	if use web; then
-		# There is no way to install the CGIs unstripped from the
-		# top-level makefile, so descend into cgi/ here. The empty
-		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
-		cd "${S}/cgi" || die
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-		cd "${S}" || die
-
-		# install-html installs the new exfoliation theme
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
-
-		if use classicui; then
-			# This overwrites the already-installed exfoliation theme
-			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
-		fi
-
-		# Install cute Gentoo icons (bug #388323), setting their
-		# owner, group, and mode to match those of the rest of Nagios's
-		# images.
-		insinto /usr/share/nagios/htdocs/images/logos
-		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
-	fi
-
-	newinitd startup/openrc-init nagios
-
-	if use web ; then
-		if use apache2 ; then
-			# Install the Nagios configuration file for Apache.
-			insinto "/etc/apache2/modules.d"
-			doins "${FILESDIR}"/99_nagios4.conf
-		elif use lighttpd ; then
-			# Install the Nagios configuration file for Lighttpd.
-			insinto /etc/lighttpd
-			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
-			ewarn "out of the box. Since you are not using one of them, you"
-			ewarn "will have to configure your webserver yourself."
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	if use web; then
-		if use apache2 || use lighttpd ; then
-			if use apache2; then
-				elog "To enable the Nagios web front-end, please edit"
-				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
-				elog "to APACHE2_OPTS. Then Nagios will be available at,"
-				elog
-			elif use lighttpd; then
-				elog "To enable the Nagios web front-end, please add"
-				elog "'include \"nagios.conf\"' to the lighttpd configuration"
-				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
-				elog "will be available at,"
-				elog
-			fi
-
-			elog "  http://localhost/nagios/"
-		fi
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index bf6ac57decfe..ed210743750e 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,4 +1,3 @@
 EBUILD nagios-4.3.4.ebuild 391 BLAKE2B 31a1586c68f74b862b0ee308ae8818c574a1e33f94a2b3daaa6d3a7d52622a61bcda61a5c968dcd911ad55ac03797dd0b54f85d4d98ebc79630fb0ed655c671e SHA512 80f20980638b39862e3026ff34e1a4827161366ad1c8079a32b8bd2736a67a3d4da2d042e9da54b6c0eef6dd2b3d196c7cdcb2949ac796d614e92fa9817cd85b
-EBUILD nagios-4.4.2.ebuild 400 BLAKE2B fbd1d3c6d07c27bae1f9ebe45385f5c02797e85c557b1ea2276de7a211cb0afe4edb7589e6b492d466daa66906cf14ce4cb73fccdd3915ce99a4f861a1d24e01 SHA512 e766f3e115adb6e8c1ad8e490b107d8dfc1d8125e7290ce854332198f49d9d2cf0ee7adc5c9091250b8ca2357dc1f48e875fe31e7f0b811b4e631e79cc1efb93
 EBUILD nagios-4.4.3.ebuild 397 BLAKE2B 244121a98f46b570281d36276ca17413b51a015a46835b1bd1f568328d0b12a90bd5f001199a3bd11f4121287bb78762e36007f9e206e75dcfad5af792ce10e0 SHA512 c260ebfa1f7578fd20bb76ba8ae0dfe9dcd495b185c8c5272b09657918b08d194b539428642f4e9e20afa9ba6cdb73a73806f47e9e4e80a321021e04c3f5b405
 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1
diff --git a/net-analyzer/nagios/nagios-4.4.2.ebuild b/net-analyzer/nagios/nagios-4.4.2.ebuild
deleted file mode 100644
index a29da55bee71..000000000000
--- a/net-analyzer/nagios/nagios-4.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Nagios metapackage"
-HOMEPAGE="https://www.nagios.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="~net-analyzer/nagios-core-${PV}
-	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 309328aaa404..e7328f3e67cc 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -2,9 +2,13 @@ DIST netdata-1.10.0.tar.gz 2611773 BLAKE2B ffc4bfa593e4a36785c7e09709f1063598bd3
 DIST netdata-1.11.0.tar.gz 2845399 BLAKE2B e80faa3eb584ec4d617d223463a65f680e199125329c0c5db25c5320421b2c0e769f9334a49824e3974398055238e3bb27f741668850fa6191ffd810da08dc89 SHA512 c3b4045276e4a5af63ccc5403f34d37f2de6dcd95a653aa15ad33dba26c46f2d4cba06b17b1d5289bd1b8697777a41a79a159296f6843a910841523c418149ff
 DIST netdata-1.11.1.tar.gz 3050309 BLAKE2B 9fc5498362f30ff34744c3d5ecd882abbd234240b718524aae2a61224f2facdf448017cb6e6db57acd2b008021ddf020ce47efb97409f6b9580d9d2cfbdff531 SHA512 92c0b848ada9edbb3d0c2d432a2f9cfb8b47c496827fc80496c18de8b53698bb5fe8bdcb1909d0931cb9cb2b313ca1e4dec7538f03a4bc0da634cb4d495abf88
 DIST netdata-1.12.0.tar.gz 3062129 BLAKE2B 3e4f555ba26b355edea234ea5a6a9a5cd387631b4be839e86a598bc21ea83ce9ad608e8987944dfb32fcc82026f12481bdd8ab00ec4a633c9430bbe9e573ac0d SHA512 b3ab65fced2e97167112e537e0753263480d121b7f8bfcc2138dcc7ea6aef64a3060c047d15d5acae5f465894307bbe42d744ca00889f9762fc509fb18eaf2da
+DIST netdata-1.12.1.tar.gz 3076284 BLAKE2B 0bb8bd5f71d90b157f7ab46398f2b8106c908948b5ce8ce95b7f9ddb4f774c4c163353ec2644a578472a0245abe735603c4faa73de52d893e71f3ab9dd3169ec SHA512 0cef2ac2648390c2ab2a92befac628cc68bbc98c5c3b28c48cbeac668283128b37156f898bc379ccf7b66e5b036ed917bd6678aaeeb37e4e72cfe6ae84506ab4
+DIST netdata-1.12.2.tar.gz 3085210 BLAKE2B ce4edbdb1edc2346daed0813b8705b385a877eaa73b34fecf229d1ed618ec58d66e96654af3d568cddcbbbf2e6bb11169afd28789bdfd3e5bc1bb00d63865b26 SHA512 d7105712689d9e5813f7fd10180ede894a8a0374280411ba5e571e332744a82081b4cf0f36f16e48a9527afea781e8bd279dda5cc552fbbee647392695fd08e4
 EBUILD netdata-1.10.0-r1.ebuild 2541 BLAKE2B 70123767be2cbdf1d90dcb05a44a7c34cee223ce00a2b9aa803d5e8c242a638f05be593c4ad382ecc93fb5cc7db443984ae1777adf032da40ca336b4ae4d07ca SHA512 531ceafb0dc2b8988a5af2c1c3c42298bb009d5ae022619cee1940c67fa7b117f5b5fb495ac02adfad61e93729db5908e1b869c114130835d5027fe519faddba
 EBUILD netdata-1.11.0.ebuild 2572 BLAKE2B ce0ff1be7d3290ab66561060bbe9a78e67a93f63d926f46a83c53e9d29ad899268e4b99190effda3976b37c79815936416a788c8ae3cdbb7728eb4916ea4a731 SHA512 57aecf1d2a8e2139dbb002838c6320ea3c2da0935a588a237ab1190dfbfa8761d393c117a519d23885044e8448dbb5e0fe767892c25b2a3e2c7e6c9cb8e97bf4
 EBUILD netdata-1.11.1.ebuild 2637 BLAKE2B 350cefa34f5963df9969c8ee78fb7bdcfa807827c37f6cc716dbdda1e55d59c2d1dcb4614ed10552afa363932cb4ec786891dd971f8cb596173dd9f675856b22 SHA512 ee2fe5a9c9cddfcb2cc74fad245e6778cfcedeaf16088b2c3c78377fbd2d6124930436443aa35efcc8e2881669939a9bfdd20b701cc6bb4066b1a030d4b62470
 EBUILD netdata-1.12.0.ebuild 2637 BLAKE2B f814ddaba621e8e5dd931b3abc9072b6ed169f683bbc303152b814229f3224d6200b9b4e639203cda6864a1c44b02b76407f143e1ebffc3de19fd77218a0f3ad SHA512 1c6b51024ceca7cd73f79bdeb3db1781f8055820cff8c2f3b2a5896dbd06abb396ae409c2266d7076e93c3b9bd711021f0e47ade2793e4093383fe1056136198
+EBUILD netdata-1.12.1.ebuild 2637 BLAKE2B f814ddaba621e8e5dd931b3abc9072b6ed169f683bbc303152b814229f3224d6200b9b4e639203cda6864a1c44b02b76407f143e1ebffc3de19fd77218a0f3ad SHA512 1c6b51024ceca7cd73f79bdeb3db1781f8055820cff8c2f3b2a5896dbd06abb396ae409c2266d7076e93c3b9bd711021f0e47ade2793e4093383fe1056136198
+EBUILD netdata-1.12.2.ebuild 2637 BLAKE2B f814ddaba621e8e5dd931b3abc9072b6ed169f683bbc303152b814229f3224d6200b9b4e639203cda6864a1c44b02b76407f143e1ebffc3de19fd77218a0f3ad SHA512 1c6b51024ceca7cd73f79bdeb3db1781f8055820cff8c2f3b2a5896dbd06abb396ae409c2266d7076e93c3b9bd711021f0e47ade2793e4093383fe1056136198
 EBUILD netdata-9999.ebuild 2637 BLAKE2B 350cefa34f5963df9969c8ee78fb7bdcfa807827c37f6cc716dbdda1e55d59c2d1dcb4614ed10552afa363932cb4ec786891dd971f8cb596173dd9f675856b22 SHA512 ee2fe5a9c9cddfcb2cc74fad245e6778cfcedeaf16088b2c3c78377fbd2d6124930436443aa35efcc8e2881669939a9bfdd20b701cc6bb4066b1a030d4b62470
 MISC metadata.xml 864 BLAKE2B 2c56df62c37c672fe6343a740efa82d16c44dc6f3f38a9afb51cb9c6e93aabd6344ddad599c1504d670e9c1447374b3c6f74125da83577721bcf88a4f68a2dc2 SHA512 cf053acf66105fdd9dfdcff3f6d130f11a2ea0bbf4c553ae704fd86fdd7787efddd55b1bb5f7f8d2ba7e6e2e1a8b800bd80bf907c9b0beba8f12c15e1277694b
diff --git a/net-analyzer/netdata/netdata-1.12.1.ebuild b/net-analyzer/netdata/netdata-1.12.1.ebuild
new file mode 100644
index 000000000000..aed65af73963
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.12.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat6
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-1.12.2.ebuild b/net-analyzer/netdata/netdata-1.12.2.ebuild
new file mode 100644
index 000000000000..aed65af73963
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.12.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat6
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index b9b0fa115832..06ecf2dc39c9 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -12,7 +12,7 @@ AUX rrdtool-1.7.1-rrdcached.socket.patch 733 BLAKE2B a9ca7691e1589061e65ed4acd3d
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
-EBUILD rrdtool-1.6.0-r1.ebuild 4246 BLAKE2B 02403955767076ad3b3cd33532bce9b929ddeaef9f4e864f9166058a04b2c66b6e95f6ab14ddbe75b04b3035719883017e075d01342b8d5d19376b96b1683665 SHA512 58357968c80b0894410e4857dd65c7c92ff14a1cd1b6b3293f98935464b3c0e1e2a37291977c18947c083d1f203069b20184b6bb2f140ba241ab8051473b114c
+EBUILD rrdtool-1.6.0-r1.ebuild 4242 BLAKE2B d2ea90e0403a983d4ac042d1c4c604ddbad700cfea668ea67c005b32d3a47c5ec32d0b91fb70cb91cd9b6dad6dc666779b481220a41b8156cf47d8ccfe6c4467 SHA512 9375bfbfd4b9430c03247e4631345fa30330af54ed14429320342f943faec8452be8bcc7acb02d588bd1cf9ac7d4b582d5feb75aabc6ec32a19bc03087a71e41
 EBUILD rrdtool-1.7.0.ebuild 4308 BLAKE2B 3ff52745ab04139e19136e930e8eb6ba0d2796693fb35bd1aa1ac88dc2181d395cc9c987590933310bf643166ad523786e2f20a9d1dbc3a9fe5393f0fde044c0 SHA512 a3ed4704b13c7081b7f00ab20ed8d5961325fee67bdfba281ce795f53c6cf9e6a648fabff472b8d778c5ee0196ca13841cfd5b29ef971afb66fc57c80876db81
 EBUILD rrdtool-1.7.1.ebuild 4296 BLAKE2B e10b677e38f2f492361577a65c3299fe9c178bdd3bd940db37f990f3116e02fb84e2b498f2572ad4a1c5e6f236d4d1810ce329202121117ac48bbe0b4b533982 SHA512 84e6de423a2db656d8b772c96f6e5711f26b6b3763fa0763a25412b531b846db37ea0b5482130b16e468fe22d50aa03cfbe32cbd8d8b425c02ca8f16bd27e75c
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index b6a50b536199..6ca31577b340 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index f9f02136ad5d..78dfff9db1ab 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -6,5 +6,5 @@ AUX ssldump-0.9-libpcap-header.patch 178 BLAKE2B c879ae913ee4e5e36ca2fdb559bf693
 AUX ssldump-0.9-openssl-0.9.8.compile-fix.patch 449 BLAKE2B 35a7860d59c63d9749e1a7ca56c87453868726aeaca1562bce8f662ebac8cd9f348e08aab9057707343cc4525f71aa39689a47adc8eada09837d70214e3ef31d SHA512 37b6ab0f9ae44751570c8eb1eaf4cb1f04a3b812dc18611c6dbca003ac84dd260582351749011e7a56eac2858f817376fc92cdd5a0aae2a2c11ce98e96b3aeb9
 AUX ssldump-0.9-prefix-fix.patch 554 BLAKE2B 797544d1bd63e476379f2c6a9df8e6377cb839a179e3eaee47b00d35c967249e050a5a235efcf4c8606f5c7ec3e354b6a869c372bb0ddd215f1b21ecedaf2383 SHA512 55a11a1ec6e76039b474dabb2a9b5e647c66231d0ab12620dc5513335da3057bcedb36df1a5e19480be7f4a7004aaecc4d21abd8420149a79fb48abc981d1ff8
 DIST ssldump-0.9b3.tar.gz 137435 BLAKE2B e42eeac4daa99a62537ac7ee5152428664fed40256ec10f7c61621f9bbd06476d280af1a6c517eaff253058e3720a282e88604b2f1de0c7ad1b5328597879449 SHA512 ea81558a243950ab43354c9f33c0a4feae0ae859bc2bd6e6b58838a01f4a1e7a6447f2a9ab1fa40bbe8dbd6c3630c489c17fc9c066cacfddfb64269b0cd5090a
-EBUILD ssldump-0.9_beta3.ebuild 1431 BLAKE2B 220220afd623e4aaf30ae0ad3eb660c70b10e8ddba1ae20d041ef88f40ee0b98a9289c4a464964ec76d984b4b36d1b69f9ef4c1b8befa790a0bf2a2d40836095 SHA512 6e4233e3440b5cbc3ada6c588403c258a5fc24f6f4fb3d13f8a99610caa76033ca9138613cd24d0a11be9e5477eb5d0c7323d8e33f2b5c77f81382692caa8e72
+EBUILD ssldump-0.9_beta3.ebuild 1431 BLAKE2B 4451fa21e460c7554d7cfaa05f1ad7b0cff8af134a619e8262a7f1cb8159218974f5e3034da807818228ce7b93554b616a607a56f924becb12bfe14c60a1e5d4 SHA512 ce3c6eb328a86b04693bdb308ff3debd9486ed3304e0cff38f48d7a076ce4b8ef5394e066887ac69d658fbd29cfa54881a57f5a2b72aed9fe68f19cd80de9480
 MISC metadata.xml 359 BLAKE2B f35ef1086c0c3c4aa4f9131d63ce2f014ed376a841502dc0de02f6261b8358f6aa1e01ff55c87f39fb5ad71478c70e98497f1bc3b25034d374ba58064393b495 SHA512 c80158a4a7334b16b28fe0462cc82e70c03674bde862f6858ab6f67645cb3d856fb41bfe5480690fa25c85b0a5205bc2f6cf2febb45fd355a949da92024fc1ee
diff --git a/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild b/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild
index 08f96fcfee51..0f7107da7d0b 100644
--- a/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild
+++ b/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ IUSE="ssl"
 
 RDEPEND="
 	net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-1 )
+	ssl? ( >=dev-libs/openssl-1:0= )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest
index fc19e1755a43..4467b3cf8e94 100644
--- a/net-analyzer/thc-ipv6/Manifest
+++ b/net-analyzer/thc-ipv6/Manifest
@@ -1,4 +1,3 @@
-AUX thc-ipv6-3.0-Makefile.patch 465 BLAKE2B 42194c35ace6760ed17c454bbf4ae01a70618297efed865d93ec645514ef34734668fde6df1139727ca317769bc2e221af88b8084811529c3372aab6db908c0b SHA512 2a0a0d21ad3147a772df5a52ea425edbf2681256240e3570976268b5d9cf19f315a014b304932161219813c65dff95a2644070383121595ec3f2adabbb116093
 AUX thc-ipv6-3.2-stdint.patch 208 BLAKE2B 639a1ceec32ab48b886d721b7ea197dd39efe4ab5f62f8f1fffe04e68560336269e9b3b021c90ef635948bfbbbc0c60e0cb2c56e60e7bca3dfdc7c0d823dfdd9 SHA512 635438ba4a64eb63d51130643afd73e87e83313532f351e1f124cd0f34d719a67d77e592595707e65c8fd5b69a00cf04942688668e5a9c921807934ca602fd8e
 DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e7a8c585c7c494f03e229fccbcd65677e382a65f0e650d79278f5ede89173db1cdf313ade7c48dff1566856afa SHA512 648db4618ebb83572e2e318cdbb284fe96a86adf335f7dd9b26fd010c76d12e9137ed7367207c66c93c1961c868d3917d706db9f597289ac47ea3f9b83c03441
 EBUILD thc-ipv6-3.2.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
diff --git a/net-analyzer/thc-ipv6/files/thc-ipv6-3.0-Makefile.patch b/net-analyzer/thc-ipv6/files/thc-ipv6-3.0-Makefile.patch
deleted file mode 100644
index 43b72eeb9069..000000000000
--- a/net-analyzer/thc-ipv6/files/thc-ipv6-3.0-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar thc-ipv6-3.0.orig/Makefile thc-ipv6-3.0/Makefile
---- thc-ipv6-3.0.orig/Makefile	2015-10-13 20:17:34.000000000 -0700
-+++ thc-ipv6-3.0/Makefile	2016-11-18 15:57:57.577946828 -0800
-@@ -19,5 +19,5 @@
- dnssecwalk:	dnssecwalk.c
--	$(CC) $(CFLAGS) $(STATIC) -o $@ $^
-+	$(CC) $(CFLAGS) $(STATIC) -o $@ $^ $(LDFLAGS)
- 
- dnsdict6:	dnsdict6.c
--	$(CC) $(CFLAGS) $(STATIC) -o $@ $^ -lpthread -lresolv
-+	$(CC) $(CFLAGS) $(STATIC) -o $@ $^ $(LDFLAGS) -lpthread -lresolv
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6f762ab778a5..c5eb0f7cc2f9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -14,13 +14,13 @@ AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
-DIST wireshark-2.6.4.tar.xz 28218232 BLAKE2B d54d7661801667f78f0c3248f4099c77ef016222ae942dc7a5776af2c5c18f7b00305556ac84df6afd19cf3d2bd59e78365067dd9402f978ae0a7db76c1730ca SHA512 bc740548901b30f2e44c2b0933717288615fa38edc5e092607a8b12c60ecfacaa5aa7c59d7644cf29238d0d636fbe03d85559a0f2de81a3bf8ceac55fcf9ff07
 DIST wireshark-2.6.6.tar.xz 28407404 BLAKE2B 5135789d345b675814a6394d5ba1469585b9eab917885730125b8a007aecd9cb48a510fc9e7479148cadf625807bac9017b854797e4bb2e562d7dc7f76140826 SHA512 b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56
-DIST wireshark-3.0.0rc1.tar.xz 30933416 BLAKE2B b9b421ecbcff8766d45f370a8ba6e0c03b02caaca09f5af90a5df0cd9a1a9093fab0b931c0cc001df31e0da86b53e022e70353a617a6b66d9defe79a44e0c8a3 SHA512 8cc34ee107f73cd19ca4bcfb05e0bfd237a53c7e0dcd07780200e423096566215cb55996e12cedbfdeaf31fc458c2a32b6d8038264060cdf677756148c404308
+DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677
+DIST wireshark-3.0.0.tar.xz 30953760 BLAKE2B ee866966000cf902da6f330eb8a4b281d34a3ca88e9d92a7de1069172c8aeb86f9222e1467c5d3722ee055baf88d8ba0eb6fe27084d0b35f9639bdb9741d25e1 SHA512 917708b5edc25609536c7bd7cf4ae32a901fd99118302138dc0bf6f1ad092a8e5069a917cc8cf6cb77190f54e50623a4eba1ee10ffc225ee3051b50cf02a0963
 EBUILD wireshark-2.4.5.ebuild 7324 BLAKE2B 37579953238776d82c3887994830e72d6df6b928471f6d5ae955c53a58b0b70887c139c0962d5a27119da15ec6af0e416793d41ea3aa4ee18374f441abec0876 SHA512 f8fa063eff8b7c3e76fe2861b287a8c65368710b2cdbec670453a54e5d629a060dc368d05a6c6efb2ad8031174613026c79a3d8eea9fe9e43caa3953e5a72d74
 EBUILD wireshark-2.6.3.ebuild 6603 BLAKE2B b9406cf5e104ab342ff8b9eaedd2b0a01b79b6f0bd6a79657c2860d53fcb648cb5868b97ec559b9cce5cdd9ed0ef5cb985edcfd093e60da16dbb42035cabec23 SHA512 95f5f555a393ce995c55a8dee07189fac90fc3032642dcecbf0f50e777d3bc919321d048c68e9bda3553ded1c92383235804cd47f6e0c9aa3303d116684e60d3
-EBUILD wireshark-2.6.4-r1.ebuild 6514 BLAKE2B 0203f94f5919cf7ee0d9434cdaea93383cc816568886fe050da346cd6bf285967214c3d75d579b76c130b9d41bcfaae81b02fb1b5865a46a3dccac81818371be SHA512 57b01b0093b4cb9cf083df51451c198fe740e34bc08e3709ae546df696681813c1dd89d582e68af72a41ca7318adec1ebe4d027ddb464ced5cab13622b239400
-EBUILD wireshark-2.6.6.ebuild 6517 BLAKE2B b902d514a145b9f2e055df3b08470c31e7ac9b13ac436ace41396620b0bc63b8642b4059e03aa0080b8025ca0e94f939829fc5dcce8acceaa20db6628c530859 SHA512 dcc4b50c637af3a6020b2f3e3a17b586e37cb50f0028f95b5003f624e52f2191476ac6f606ee7a59fcf820d602231d5869675b22d3015f39fb38137428caa4e2
-EBUILD wireshark-3.0.0_rc1.ebuild 6517 BLAKE2B 4b1bb1aa88d747792dbd3e582ce6b2f47849e6a70692417cd209c7c77a91d8129259b415af2559ba229278dfe19f06d8fe967ecff748df2c0ed977a8dd9940b1 SHA512 e07f03f06770c4971aa344b65b838a7b220e6bb4edc67852ddaec1f46e3b5f4ae76ff091de05a52ed5c6fc4258f34febdeebfb4ef89fa5139820de2db8aa12a1
-EBUILD wireshark-99999999.ebuild 6370 BLAKE2B 0eb32ecf1f3fa6645af1c66f552e9971d4ef9b9b1697823551ab9158cd54c18f8b5b8d65ee379d0cfd7034d72c7afa0a6e8d1d474673ed13461eff9780b4a9d0 SHA512 3685a02a533e54bbe2117621c324d17c681286c9e33ac5e48eab502224494e1b9bfb181c372433cb19c4d7aa5b5e79d79b5004702d325356fe8cdfba3c345d8f
-MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
+EBUILD wireshark-2.6.6.ebuild 6514 BLAKE2B 4637d5994b21d421d278f47aa97ad79417b47399ea4d62728db7c7a1736f2628d6eb1d8112ebfd85ed87696c680e5722b5c884488062303a388f6a373827fde6 SHA512 b497778ade8d24b252c2c672a115bcd261d3ad7d81495cf9f0cdc59431873f7f1e9107c792453f8e09106ce54751e199625a76c5cbd752a89390a949169bd698
+EBUILD wireshark-2.6.7.ebuild 6517 BLAKE2B b902d514a145b9f2e055df3b08470c31e7ac9b13ac436ace41396620b0bc63b8642b4059e03aa0080b8025ca0e94f939829fc5dcce8acceaa20db6628c530859 SHA512 dcc4b50c637af3a6020b2f3e3a17b586e37cb50f0028f95b5003f624e52f2191476ac6f606ee7a59fcf820d602231d5869675b22d3015f39fb38137428caa4e2
+EBUILD wireshark-3.0.0.ebuild 6732 BLAKE2B b4597a645972f3e9012a65997adbe4462a28751213d7064f50313a4242a8508ac5fd26dbc2cd624ce4c5b2da057401b3287a5d94b234b10d2ee9bf82ddbc6362 SHA512 92773df6cddfcba3bf7b9a351a2f45ea0ca0a83ccb65df68f1c9c1713a2febeddc64417b715af6fe2dafb89995ecc916846f69882a2864ffe75096b5f5a9aa05
+EBUILD wireshark-99999999.ebuild 6585 BLAKE2B 41e0ed51a2976483a87b0de2b60bf4ea8e6a341366323f77bc39cd475839766038445e2099427c4f34257dd123f7d44c58eee2dd70ddb20b8830114e66e0c85d SHA512 ec5ad63c8fe0bacaf7861b8aab8ff85c84d49a9b7785c02ab0bd611c223e4160bd1586d10d8def3a656eaa056aac11913cc394a0f9ae8230aaed777a69d62800
+MISC metadata.xml 5039 BLAKE2B 884c729d69c43e422e918318aa8b1726a05161d39ba3b7f8ce31c7e4d0c510eeacd5627808a65907f88a929f7e06738419ebd4b887b5a3120884c3a35f73b784 SHA512 e3ba08f883d438c6383f9a72aea23881cddfc847789517b03db5ec929fa4bb295a331db9de1a80fa5d9f3100d48f9939f448522e15214b4f4d69996d935efba2
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index d78579251147..3aea5c6b5d54 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -35,6 +35,7 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
 <flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag>
 <flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
+<flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag>
 <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
 <flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
 <flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag>
@@ -49,6 +50,7 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
 <flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
 <flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
+<flag name="sdjournal">Install sdjournal, an extcap that captures systemd journal entries</flag>
 <flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag>
 <flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
 <flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag>
diff --git a/net-analyzer/wireshark/wireshark-2.6.6.ebuild b/net-analyzer/wireshark/wireshark-2.6.6.ebuild
index 852878b84a7c..96bfee5f3d80 100644
--- a/net-analyzer/wireshark/wireshark-2.6.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
 	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
diff --git a/net-analyzer/wireshark/wireshark-2.6.4-r1.ebuild b/net-analyzer/wireshark/wireshark-2.6.7.ebuild
index 9dafeca71f94..852878b84a7c 100644
--- a/net-analyzer/wireshark/wireshark-2.6.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
 	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
@@ -86,9 +86,9 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
+	"${FILESDIR}"/${PN}-2.6.6-androiddump-wsutil.patch
 	"${FILESDIR}"/${PN}-99999999-androiddump.patch
 )
 
diff --git a/net-analyzer/wireshark/wireshark-3.0.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-3.0.0.ebuild
index e7f6b3df2dba..7824e565a937 100644
--- a/net-analyzer/wireshark/wireshark-3.0.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.0.ebuild
@@ -13,10 +13,11 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
-	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap
-	+editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2
-	+pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy
-	spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
+	+udpdump zlib
 "
 
 S=${WORKDIR}/${P/_/}
@@ -45,6 +46,7 @@ CDEPEND="
 		x11-misc/xdg-utils
 	)
 	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
 	smi? ( net-libs/libsmi )
 	snappy? ( app-arch/snappy )
 	spandsp? ( media-libs/spandsp )
@@ -76,7 +78,9 @@ RDEPEND="
 	qt5? ( virtual/freedesktop-icon-theme )
 	selinux? ( sec-policy/selinux-wireshark )
 "
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -124,6 +128,7 @@ src_configure() {
 		-DBUILD_captype=$(usex captype)
 		-DBUILD_ciscodump=$(usex ciscodump)
 		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
 		-DBUILD_dumpcap=$(usex dumpcap)
 		-DBUILD_editcap=$(usex editcap)
 		-DBUILD_mergecap=$(usex mergecap)
@@ -131,6 +136,7 @@ src_configure() {
 		-DBUILD_randpkt=$(usex randpkt)
 		-DBUILD_randpktdump=$(usex randpktdump)
 		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
 		-DBUILD_sharkd=$(usex sharkd)
 		-DBUILD_sshdump=$(usex sshdump)
 		-DBUILD_text2pcap=$(usex text2pcap)
@@ -160,6 +166,11 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_test() {
+	emake -C "${BUILD_DIR}" test-programs
+	emake -C "${BUILD_DIR}" test
+}
+
 src_install() {
 	cmake-utils_src_install
 
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 1971febe690d..e9927cc3b151 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,11 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap
-	+editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2
-	+pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy
-	spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
+	+udpdump zlib
 "
 
 S=${WORKDIR}/${P/_/}
@@ -45,6 +46,7 @@ CDEPEND="
 		x11-misc/xdg-utils
 	)
 	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
 	smi? ( net-libs/libsmi )
 	snappy? ( app-arch/snappy )
 	spandsp? ( media-libs/spandsp )
@@ -76,7 +78,9 @@ RDEPEND="
 	qt5? ( virtual/freedesktop-icon-theme )
 	selinux? ( sec-policy/selinux-wireshark )
 "
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -124,6 +128,7 @@ src_configure() {
 		-DBUILD_captype=$(usex captype)
 		-DBUILD_ciscodump=$(usex ciscodump)
 		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
 		-DBUILD_dumpcap=$(usex dumpcap)
 		-DBUILD_editcap=$(usex editcap)
 		-DBUILD_mergecap=$(usex mergecap)
@@ -131,6 +136,7 @@ src_configure() {
 		-DBUILD_randpkt=$(usex randpkt)
 		-DBUILD_randpktdump=$(usex randpktdump)
 		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
 		-DBUILD_sharkd=$(usex sharkd)
 		-DBUILD_sshdump=$(usex sshdump)
 		-DBUILD_text2pcap=$(usex text2pcap)
@@ -160,6 +166,11 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_test() {
+	emake -C "${BUILD_DIR}" test-programs
+	emake -C "${BUILD_DIR}" test
+}
+
 src_install() {
 	cmake-utils_src_install
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
commit	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree	3cb05783d73b2c33589ba305144a31c718e123cd /net-analyzer
parent	16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)