gentoo resync : 19.07.2019

35 files changed, 26 insertions, 738 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index fd78003555cd..11e103331103 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 4271b4137949..718d620dd1aa 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -4,5 +4,5 @@ DIST arping-2.19.tar.gz 177178 BLAKE2B ed8936b5526c02526d3cf0f208be0cbb91034fec8
 EBUILD arping-2.17.ebuild 706 BLAKE2B e7c8265c088471fb2a158db710986fe67c2603c3b5fc19bb0d355f024baff962c31722ad255e3e747b106151d19ac77c0c0b2b994652d9cab72a5581467b5384 SHA512 8537da18d1a79d669899c82dc6344f27467824257ed327a070168060e745d23996d85692034cedf85b3a1e0073fb06f91f1b7615a134832a5d8139be0b8b127d
 EBUILD arping-2.18.ebuild 715 BLAKE2B 57e6e6704f67e72bd1a3a6b8ce393fb2e7ead1e05d15a534756914bc43d5f1eb845e8abdf4c027d64689a7b474d94b849d60b5eb2c38d7d55d2da799c75a9bab SHA512 72eb38608ba78934fd605170084642724f5ca05c020ec4a8b95f88e2652969225a8376af4cceda3f7ec9a5b91c18b50a01c4badc1d92e9aea47e5024a8940472
 EBUILD arping-2.19.ebuild 715 BLAKE2B 57e6e6704f67e72bd1a3a6b8ce393fb2e7ead1e05d15a534756914bc43d5f1eb845e8abdf4c027d64689a7b474d94b849d60b5eb2c38d7d55d2da799c75a9bab SHA512 72eb38608ba78934fd605170084642724f5ca05c020ec4a8b95f88e2652969225a8376af4cceda3f7ec9a5b91c18b50a01c4badc1d92e9aea47e5024a8940472
-EBUILD arping-9999.ebuild 560 BLAKE2B a23e7bc6e90e2b85cd474ecf836eb7a1e689df1d88aad589e377ca9dc581fabb37cb2dc31cc23d55a6fddfbe63802cfdc775432401abce302931207d7ee1ad8d SHA512 15d957759b39e7a4322094c7e47afca64eb6793b8a54b75b2cc7540842a6e0716bf6cf6e90c371b616b21ebfab6a3cd320f44d45940177c90cfe2ecd46d0a9d6
+EBUILD arping-9999.ebuild 628 BLAKE2B 60e4bdaefd3472a9cbc10e15c79948d0d2dc77d0f3e3fc77c3c432753af6627ffcab4891af054eff2701ccb3519b9acc81a3746259838bfff228112a7019de2c SHA512 c478daa886e12ae738a7d8a134bd18f43bb272e31694c1166e5d59fcc8c4974c81d320a4553061eb4b3a516ed9a1bddf7dc0c9ebc775182088c3b775758d8170
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild
index 252fac54a2de..ee101c39dcdd 100644
--- a/net-analyzer/arping/arping-9999.ebuild
+++ b/net-analyzer/arping/arping-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools fcaps git-r3
 
-DESCRIPTION="ARP Ping"
+DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
 HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
 EGIT_REPO_URI="https://github.com/ThomasHabets/arping"
 
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index ffbc5c948da2..4dee5b570ce9 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -1,13 +1,6 @@
-AUX chaosreader-0.94-chunkcheck.patch 1049 BLAKE2B 5086517ad0787faf01c99e37b9c4a7158d6459048b4039af098995695eac6065295f6c561eb63d446e024e2f4df2a3b16028472e4f260bda6b62f3fd907200e2 SHA512 0adb728d87e9d0812d1f30c22d682d68040ee992b07c52a3452bbca8416fd8c6b4d51adf7b16441d5595f12066799029289bdd29e0cadd379980d187a0ff4f83
-AUX chaosreader-0.94-darwin.patch 416 BLAKE2B db4a0556b055857a88dae5294b6e993fb8f128de19d295f22d8717a2151e29cbc1a95b2592a97f3b0f0fe75a1d213f44c174e372819774e925c386b5c24697ba SHA512 8cd587715e6dc8b09ee93bea452d92b6570bcaca6601adb7f1e59842ed3ac42d3a6bb9621c29b0524b475a6953ac17be0082baadfbc1acfeb1e05c4175108a9f
-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
 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 724 BLAKE2B 33936dddbff112b78e99ffb0d2f4421d317c354434b870bb30b33a49ce1f7293ff349d6f11771956533eeda20d1b1bbef9b0f5f5954419c908c52e84e573daf0 SHA512 0ff77d9619e81f3fde969c781620c117ddcab6cf8cd2f892550bb7d835c64a20bb7a5f06876830737a3c6335db90e9c64d740bb7d342bab940eaa2ecd18fea95
 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
deleted file mode 100644
index 1b7d356fcb14..000000000000
--- a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data."
-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+"
-
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.8.0"
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/chaosreader-0.94-zombies.patch
-	epatch "${FILESDIR}"/chaosreader-0.94-chunkcheck.patch
-	epatch "${FILESDIR}"/chaosreader-0.94-darwin.patch
-	epatch "${FILESDIR}"/chaosreader-0.94-divisionbyzero.patch
-	epatch "${FILESDIR}"/chaosreader-0.94-oldmultiline.patch
-}
-
-src_install() {
-	newbin ${P} chaosreader
-}
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-chunkcheck.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-chunkcheck.patch
deleted file mode 100644
index 4d38eb17a2e6..000000000000
--- a/net-analyzer/chaosreader/files/chaosreader-0.94-chunkcheck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- chaosreader	2011-11-10 19:17:50.000000000 +0100
-+++ chaosreader-0.94	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.94-darwin.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-darwin.patch
deleted file mode 100644
index 2eaca80909ae..000000000000
--- a/net-analyzer/chaosreader/files/chaosreader-0.94-darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chaosreader 2011-11-10 19:17:50.000000000 +0100
-+++ chaosreader-0.94    2012-03-09 18:15:21.096105305 +0100
-@@ -6233,6 +6254,8 @@
- 		$command = "tcpdump -s9999 -w";
- 	} elsif ($^O eq "solaris") {
- 		$command = "snoop -o";
-+	} elsif ($^O eq "darwin") {
-+		$command = "tcpdump -i en1 -s9999 -w";
- 	} else {
- 		die "ERROR54: Can't find the sniffer command for \"$^O\".\n" .
- 		 "\t Please use log mode instead.\n";
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-divisionbyzero.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-divisionbyzero.patch
deleted file mode 100644
index db9d3c6fd158..000000000000
--- a/net-analyzer/chaosreader/files/chaosreader-0.94-divisionbyzero.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- chaosreader	2011-11-10 19:17:50.000000000 +0100
-+++ chaosreader-0.94	2012-03-09 18:15:21.096105305 +0100
-@@ -4028,7 +4024,14 @@
- 	   ### This causes the replay program to pause
- 	   print REPLAY "ms($timediff1);\n";
- 	}
--	$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.94-oldmultiline.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-oldmultiline.patch
deleted file mode 100644
index 1fada077058e..000000000000
--- a/net-analyzer/chaosreader/files/chaosreader-0.94-oldmultiline.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- chaosreader	2012-01-18 21:47:02.000000000 +0100
-+++ chaosreader-0.94	2012-03-13 12:10:44.740136742 +0100
-@@ -259,12 +259,6 @@
- $| = 1;					# flush output
- 
- #
--#  The following is needed for old perl5 multiline matching. New perl5 uses
--#  a "/s" on the RE (which is used in this program as well).
--#
--$* = 1;					# old perl5
--
--#
- #  These ports have been selected to be saved as coloured 2-way HTML files
- #
- @Save_As_HTML_TCP_Ports = (21,23,25,79,80,109,110,119,143,513,514,1080,
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-zombies.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-zombies.patch
deleted file mode 100644
index 8f7dd04e50ed..000000000000
--- a/net-analyzer/chaosreader/files/chaosreader-0.94-zombies.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chaosreader-orig	2006-12-24 15:12:23.000000000 +0100
-+++ chaosreader-0.94	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/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest
index b1c8c58f3e5e..c1378d984e23 100644
--- a/net-analyzer/dhcp_probe/Manifest
+++ b/net-analyzer/dhcp_probe/Manifest
@@ -10,5 +10,5 @@ AUX dhcp_probe.confd 221 BLAKE2B 0d54b9705fc70d1bacffd62b9017d484c6534f737e69ac5
 AUX dhcp_probe.initd 1189 BLAKE2B 8b6aa24418782d4efb551f7c6d7e1d78852681034829c1b323636467c4e0cd8c8d642b0dc976641d31bca8485134ac0beb0287b8ee61c25c6b149d140102ff7e SHA512 bca85a97c55625a7a72241edf738b61dc13b2c96b8ef53fef6d7594d744b0b65f0c0b0d3aad209b629906f13bb39591240a224bb0d59a2516a924ec921463742
 AUX dhcp_probe_mail 627 BLAKE2B 830dd02b1e309fc343692d91feb0380a13b8b3889ebf1fea5b29f085b15ad8a8bf4bcf75a9cb836229c503532fc48cfaab6b651b9d578b743a91f96bdfb68b0c SHA512 2a66c702d71835115a0a3b340d2c9e256ce2de6a983247dd4e2c3c0d908a5ac9f0cf7ffbbe45c1e441e906833c7091eb0c19b6c6034ca46edf1d635dfa15b0c0
 DIST dhcp_probe-1.3.0.tar.gz 211613 BLAKE2B cbcc43b292fe537216ef40de9e417c1f700be4ad5f34feacd9475eb31866b68957ce66c5abc47db3b7e5a0dc8751ca6e54200b79ab2f1f8c3f308f6c1c7aef4d SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854
-EBUILD dhcp_probe-1.3.0-r4.ebuild 1131 BLAKE2B 80a014a879be6496c7273cd8d1bd0d8fdb93372ea693c76c264d959c93ad41f7b95439f8890350189274485519679649d7f7c91cb1bbd2be1b48d683b9d44c7a SHA512 f46c8e89f6a699251a47d7685507dda2970d219bf2ad5f74db7c68fc08318e6f2ec5f0ddbd5a37dbe6ce95fa565af3c471d23dba369bee771733451d4d1b26b9
+EBUILD dhcp_probe-1.3.0-r4.ebuild 1128 BLAKE2B 3b5dcfd15dd977d8f95c5e2cdbc869ee37984c81a503950b3017b40545e86574b82928e785dd4b80599cc283c346abda5cc8031b619cbedf487dcfc47d516a3a SHA512 a43a0cfb7c3c3c784d12ab8b9aef02edc9230f773e8d0ccd07ff46f163d57fede4aae5d84c742ace7578a32053cd1784310cdca200924ad23fff4c0f8d0651e1
 MISC metadata.xml 521 BLAKE2B 07e75a2da58fd92619929b8c5b33edb63317a304999977c5a29bdb5fa96e35fde034a575b376a9fa312fb7158661439d647692b8728d41dabee50c5627add65e SHA512 c04b196d9e86da49576a5300f10039f9d82df0684e626c1d0517ba70b4eccd5306f681821ba6e2539d557b1cc1b33680ac2137879ab11f247db1fd62c1626c9f
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild
index c89a13c39739..3819fc35ca70 100644
--- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.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=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.net.princeton.edu/software/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/dhcpdump/Manifest b/net-analyzer/dhcpdump/Manifest
index a313ca0d3f69..4d27dd2afa41 100644
--- a/net-analyzer/dhcpdump/Manifest
+++ b/net-analyzer/dhcpdump/Manifest
@@ -2,5 +2,5 @@ AUX dhcpdump-1.8-Makefile.patch 483 BLAKE2B 3da53d6ad4d1e6808ddb4abd9af7aafa8a7c
 AUX dhcpdump-1.8-debian.patch 2850 BLAKE2B d7e381388af48a8e0f1ffb78dddf4fb3652907569a84072fbd4efacec18051cce20891f270ae6857a8cf07e698381bb10604821eadcf35b963cd413e24df7143 SHA512 ccc97bb8c8f6dfa09d22407c8a9dec249860118ff9fc09af9488f1d4c8679f94ef6850040535048ba0bdde273a2a8c7759f02742ece0e409a020277349bedbac
 AUX dhcpdump-1.8-endianness.patch 259 BLAKE2B 65b402fa9c0969887cd0e9802e7736bb6becfcef9a4a0577e865402b6413d92cdabaf8f869eee27d27749fadae42ee70485ac078f9b789596e034d9616c3f281 SHA512 7a04bb0933fe6d54f696f18d7d1cbc1090a6f2bb92061bca0e52311264e35ec3884a2ddbdef2b31de7f81a652189fa9617de754d02aaaf17c1212c92106f07d2
 DIST dhcpdump-1.8.tar.gz 10740 BLAKE2B f87f1db539b06cffd68395982476bd7bfcad4e41d86aea7f3be357a07d597cdb34e8888eaf90e6dc11db0252dce418a3b1ad8a00b0d3a7c7faab48f14c6aec85 SHA512 52cd63d581a3c530c2f5baa66808d5b0241853651c720bd513b769b8301b4dff9c87243787014aea98a5b3ebed86ec317b58d262bf5031015141a4da50fb76e6
-EBUILD dhcpdump-1.8.ebuild 688 BLAKE2B 7d7032296a9ac9a2f0b5cc3409fd15da5a1f1f0a0933c7fbfecf0580e4dd1ca8d3108d9a887919e92a3ac5a7429aa480433d4f346b0494148188c065acb2aab9 SHA512 47abe430087c29ca1a43f58f247cc6da395f52fe480776b9cbab681e3cf7c9971ad0c4a9888c1cbb5fee9a09e7b20730fcdf0731ebf2446173f0537e0a135418
+EBUILD dhcpdump-1.8.ebuild 688 BLAKE2B 9bc5e60611c8e1ce9ebb0f08df7b4ebc3d9824b4cfc8dbd976ad2b35d8d107cad2526dee9cd756a51cdcfdebd6ae3b61d9d7ac5bfc41a0b2894768ff8d767a34 SHA512 eab875777e17a46ba5908d6f08cc9e5dea6f406f4028b71c26a781d48327e81800c12d6f4f7beff5ebebf6df3b248fb7653ed702588f4686ca5eb42704956de4
 MISC metadata.xml 418 BLAKE2B 93c3d8a35aab2e549f4129e3b0ac1f23c479017c1fdc0ff7d92fc31a14567383d5859621e65fbc3e1975cbaf201470cf19e6d92a35a9ac35dfb47cedb6208157 SHA512 776319938dbf31831e5b8655726ee04d2c8cbd3d43163c2ba9d3d9126608de9ca6e49df2c0f9fedfffacdbd2149f792b592d5d5e1881c226f0cb2eaba00a1fa4
diff --git a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
index e30805c0b696..ef15429658e2 100644
--- a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
+++ b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.mavetju.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips x86 arm"
+KEYWORDS="amd64 arm ~mips x86"
 
 RDEPEND="net-libs/libpcap"
 DEPEND="
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 95225e216cf7..74c194e6a7e3 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,3 +1,3 @@
 DIST icinga-web-1.14.1.tar.gz 14524043 BLAKE2B 0a3bdf9afc77b508dd3967e38050f6babfe01240f8cf8196158abe42818079b09a962513541298d0b0ac2b1497640d292cf1ef4feac24e302c0622f6ef0fafd8 SHA512 1ddb1fe128c2ceff20e232d61d84abebbe9578f2ef9bf0c408523c399ab6125dedc7d4e82981fff113aba8959a1ac02712032b4a36e5aa951850c084792a47bb
-EBUILD icinga-web-1.14.1.ebuild 6360 BLAKE2B 5845a7721f786e19b202c0bb15f0e53cfdfedb11d1e8674fbe4e1c3a16fab2714be6a298a2e5ffd9f5fa134e4975ba63e11432af2c8cebe9703cc6037454ac7e SHA512 7ae63a1a3461fe43aed12d31729adbc82cee15319d259c1f78e308b262601b2b150f871bb4fb97f1e1a1632fc6442a6e79cbe0947ed34e26b2dc733baa0f0638
+EBUILD icinga-web-1.14.1.ebuild 6357 BLAKE2B 4df0dab1a4e534e62c28405d6ba77b42ec27321a95810e7249276cb20680ea5ad6dfd09d8b267e96679cb8963ab7a69d6f5e9d4d938986d30334686218a93a1d SHA512 21944355ba70371dcbaa60c1382191d2c55067a1a43c7b179aa41f2f774660fdb2f88cc4e455df9622185f91910b591e3fe95f36130516b17e18598542568b74
 MISC metadata.xml 565 BLAKE2B 8f3d66d10fc929779bccaed43db56800be1cd81ed044b0244e8db73b89d9587b9554a59915477dccf5fb0bd7d4f96d9b6330a9309c0e79d20bbd458d827bdfbe SHA512 534f181a73fff13650cd97081c748cf0d75424bab7826ac83eda2a09e6cd3737fd447db3ad9a0207b2cdb24cc84f0515ad5282de2024ec6eddae2a85be41a084
diff --git a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild b/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
index 23df79b6d767..39f00e240223 100644
--- a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.14.1.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"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.icinga.org/"
 SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="apache2 mysql pnp postgres"
 DEPEND="dev-php/phing
 		dev-db/libdbi-drivers[mysql?,postgres?]
diff --git a/net-analyzer/iplog/Manifest b/net-analyzer/iplog/Manifest
index d512082a9dce..becb9d59b2c9 100644
--- a/net-analyzer/iplog/Manifest
+++ b/net-analyzer/iplog/Manifest
@@ -1,5 +1,5 @@
 AUX 2.2.3-DLT_LINUX_SSL.patch 7265 BLAKE2B a20edebe47d65d066b1b3e214d8365b4a5811a7be4f600028edc11fc4c17e48f8396c34335a855299da17534a52dc89c916c890ae50a147620988b5f3c6ca8d9 SHA512 de93d97688e1079e480c138abc1a25572c47f2e045f70c98b7ba2c2098bcfffdb36997aab0a4272cbe908bead503b2531543368ac35624527cb8c0640594ad4b
 AUX iplog.rc6 776 BLAKE2B fba34208b2d16ba508cc9c3592e21eb7f0a479a89bf4617320bd9627047024f0cadde7fef55304baf25f7ccc56836e899b71801141b1802facc8b885b9b121ad SHA512 f0c3965810f7005e1ae183a2f3ed66ba06c054fcfd78da6277eaa364518ebffb9f44a0c99200b0d3042a63d4c57141d5b29823e8bc1d3f030e00d8e913021a34
 DIST iplog-2.2.3.tar.gz 133639 BLAKE2B f8108259f3f9b662297785988c40711d9d4ce6381377ed9a797f441c84fd1dcd9f0c3832e07ed9a660ddcc41bc52777136204274de873b72bce151327738ec2d SHA512 d7669e39b728af366b5199c58d396c6907496b4895ffb1ba0cba54fae0646f9792170f932de1eae9634b5ac356644a5d6d0ccaf7bc77a62641695992245c9aed
-EBUILD iplog-2.2.3-r2.ebuild 712 BLAKE2B 6cf1fe7594e9eb406dbcf3014a5c2e2410c98932b7f5975a0c28087e174d27480c85a625421697b5a824c198ca98989fc044e2e26ea55a44add61d3bdb879d0e SHA512 357a32105c24519e9d433f9f0768fa1977e8fc88ff10b0001a9657c238c81df083b629212bb3d22d02749b22fa5f44a6fedd0da5c9fe9d619e271c6c4c459315
+EBUILD iplog-2.2.3-r2.ebuild 709 BLAKE2B b2f78c39fa5ca485475a1b40dd9153bd048f89987b408cbcd99cb7d1a5e8fc5b004a380946991154643d614f0515ca1fafd6db2f09c09d0c42099d627dc4eeab SHA512 b2aa94771961b9c9e98c9616c1e929819dd9b5da08dd3b75cdb9a8035d30ff11002f6babcbc9604f2919dabfd687109aa8ada13012da22594ebae80c4fa274bb
 MISC metadata.xml 423 BLAKE2B f00b41a2638be0f6eeeae4f6471603053085b171569584bc999c903ad6413c43bdea2e27084c987d1246f17a82353c72b14b9f72f6b1c3d5d14b850e27c923c7 SHA512 e3bd873037dd3fbbdb8fa401e2da3c8c6bb35305b63c2bb4cbc0213d5089e714b48c67fa625037b9342c5f8d136363e558583acd864e99e0f5bc591a9bec639d
diff --git a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild
index 3aa9eb1e45fc..fc60e63e57a1 100644
--- a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild
+++ b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 FDL-1.1 )"
 SLOT="0"
-KEYWORDS="alpha ~mips ppc sparc x86 ~amd64"
+KEYWORDS="alpha ~amd64 ~mips ppc sparc x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 3b6df1a1cef1..415e437d61bf 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -20,6 +20,5 @@ DIST munin-2.0.49-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051
 DIST munin-2.0.49.tar.gz 2257501 BLAKE2B f2852357e3aa0c1ca3e217b66c3e2d1c0d9c70bf1f8487517ee913e2223ca1c5ae9b922c07f83754522c51fddd0f72f87f5ceea9b7e9642a44aab04ead44538f SHA512 e8bf652000ab76f16bc3b18a16c5231ffb5523fe9f78a90bec97ca31e46ff73566e1cbbf0a3616931d0b46ceb6f5a2b5d4fdc68c797539419a2217dccf643762
 EBUILD munin-2.0.38.ebuild 12317 BLAKE2B b6ff588ee1677a7c4224f7c9bc11701fd3b6c4c1384644254ca75a9e30a885222eaae96344415b773311d70e17443043e573ef7fa1f38fd16358acd452dee614 SHA512 a536fd709bf2bec938551eeba84054b9a8b7a12e82ec9c2abc75f81463871c8809e6d97cfe5dd0e265d2bcd3faf25c1dc438d6fb7ded527cd2ad4437733bc7eb
 EBUILD munin-2.0.47.ebuild 12243 BLAKE2B dea9c3a348864d433d2ea6eb9d855aa8304d4e37f0821e827bc02b6540119afc1984839500bae78e542830ad21fed41cb905cf4c1fff0ab8e2872d1774cf75f2 SHA512 9e2dc7f379d7d99d486fe7f298e36dd9b21129526afe63eee2c3fd148fce4fade486e056edea616decc5d4e38dd530ab6c72d2d495adc9df2083ddb75a3a1dc9
-EBUILD munin-2.0.49.ebuild 12278 BLAKE2B f0718f2ef584bd6ff3af292889cd054e6db60785b6fb25a20704fc8a48def5707db089c98dcb31e7a86bea28830452317b6401a5b0b4d3020d958937025b2780 SHA512 b153bcf01e52eff5312c8df9b457ba784d99d3861ca2c61f9044c9b942e9b0a4b1b3cf91093e354c97c50f54cf4f466f6767f7ebf5c13b52fd0709f336487842
-EBUILD munin-2.1.9999.ebuild 11520 BLAKE2B 7f55a4e139ddb37419299ff65fbda91e22a3e890c86c23bc7d83f902fdc81f36ad665d3f0c6d7bbfdb60684740e1ae86ec9ec9f34dbf15f49e5385c72156fa55 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5
-MISC metadata.xml 4116 BLAKE2B 652f8bb067b024f91b3f2fb9d885c93405ccd3e4fdfa141ae5e2996f9898e757d7be93d7e74d027a82403d2b9b472f7c6fec95815b18a0b2975e20e328fb7862 SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3
+EBUILD munin-2.0.49.ebuild 12275 BLAKE2B 01ec8f4ff21fdeae4a9479f3386b05cd6450acde550fee53830e032f7b6b0369b7814748185c4970b1ae417abd54624946df376694686aa75514433dd0f837f3 SHA512 762bc414c30ac62a73bce6f276c096120ba181d0085b8036fae5a8774bc8d977caab97c1e576f588c3229f085f4e5d4363eb909bfc64942beb1eeac487be7788
+MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index df14a4c78fe6..591d8ce60e47 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/metadata.xml
@@ -71,11 +71,6 @@
       web pages and graphs. This is only meaningful if the minimal USE
       flag is disabled.
     </flag>
-    <flag name="apache">
-      Set up the configuration of the CGI generation of HTML and
-      graphs to work with Apache. This also install an include-able
-      configuration file.
-    </flag>
     <flag name="ipv6">
       Add support for IPv6 in munin-node. IPv6 support for the master
       is always enabled, but the node requires a newer version of
diff --git a/net-analyzer/munin/munin-2.0.49.ebuild b/net-analyzer/munin/munin-2.0.49.ebuild
index caf8f3564d6e..42bf360e6029 100644
--- a/net-analyzer/munin/munin-2.0.49.ebuild
+++ b/net-analyzer/munin/munin-2.0.49.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
 REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
 
diff --git a/net-analyzer/munin/munin-2.1.9999.ebuild b/net-analyzer/munin/munin-2.1.9999.ebuild
deleted file mode 100644
index d041ec7f4195..000000000000
--- a/net-analyzer/munin/munin-2.1.9999.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user java-pkg-opt-2 git-2
-
-EGIT_REPO_URI="https://github.com/munin-monitoring/${PN}.git"
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="irc java memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache"
-REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="dev-lang/perl:=[berkdb]
-			sys-process/procps
-			doc? ( dev-python/sphinx )
-			irc? ( dev-perl/Net-IRC )
-			mysql? ( virtual/mysql
-					 dev-perl/Cache-Cache
-					 dev-perl/DBD-mysql )
-			ssl? ( dev-perl/Net-SSLeay )
-			postgres? ( dev-perl/DBD-Pg dev-db/postgresql )
-			memcached? ( dev-perl/Cache-Memcached )
-			cgi? ( dev-perl/FCGI )
-			apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-			syslog? ( virtual/perl-Sys-Syslog )
-			http? ( dev-perl/libwww-perl )
-			dhcpd? (
-				>=net-misc/dhcp-3[server]
-				dev-perl/Net-IP
-				dev-perl/HTTP-Date
-			)
-			dev-perl/DBI
-			dev-perl/Date-Manip
-			dev-perl/File-Copy-Recursive
-			dev-perl/List-MoreUtils
-			dev-perl/Log-Log4perl
-			dev-perl/Net-CIDR
-			dev-perl/Net-Netmask
-			dev-perl/Net-SNMP
-			dev-perl/Net-Server[ipv6(-)?]
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-MIME-Base64
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			virtual/perl-Time-HiRes
-			!minimal? (
-				dev-perl/HTML-Template
-				dev-perl/IO-Socket-INET6
-				dev-perl/URI
-				>=net-analyzer/rrdtool-1.3[graph,perl]
-				virtual/ssh
-			)"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat6 net-analyzer/netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )
-		!<sys-apps/openrc-0.11.8"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-	enewuser munin-async -1 /bin/sh /var/spool/munin-async
-	esethome munin-async /var/spool/munin-async
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache apache munin)
-
-	cat - >> "${S}"/Makefile.config <<EOF
-PREFIX=\$(DESTDIR)/usr
-CONFDIR=\$(DESTDIR)/etc/munin
-DOCDIR=${T}/useless/doc
-MANDIR=\$(PREFIX)/share/man
-LIBDIR=\$(PREFIX)/libexec/munin
-HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-CGIDIR=${cgidir}
-CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-CGIUSER=${cgiuser}
-DBDIR=\$(DESTDIR)/var/lib/munin
-DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-LOGDIR=\$(DESTDIR)/var/log/munin
-PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
-JCVALID=$(usex java yes no)
-STATEDIR=\$(DESTDIR)/run/munin
-EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	if use doc; then
-		emake -C doc html
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run
-
-	# remove the plugins for non-Gentoo package managers
-	rm "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.7 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	cat - >> "${T}"/munin.env <<EOF
-CONFIG_PROTECT=/var/spool/munin-async/.ssh
-EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README.rst ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html
-		dohtml -r *
-		cd "${S}"
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		dodir /usr/lib/tmpfiles.d
-		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
-d /run/munin 0700 munin munin - -
-EOF
-
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed -i -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat - >> "${D}"/var/lib/munin/.ssh/config <<EOF
-IdentityFile /var/lib/munin/.ssh/id_ecdsa
-IdentityFile /var/lib/munin/.ssh/id_rsa
-EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat - >> "${D}"/usr/share/${PN}/crontab <<EOF
-# Force the shell to bash
-SHELL=/bin/bash
-# Mail reports to root@, not munin@
-MAILTO=root
-
-# This runs the munin task every 5 minutes.
-*/5	* * * *		/usr/bin/munin-cron
-
-# Alternatively, this route works differently
-# Update once a minute (for busy sites)
-#*/1 * * * *		/usr/libexec/munin/munin-update
-## Check for limit excess every 2 minutes
-#*/2 * * * *		/usr/libexec/munin/munin-limits
-## Update graphs every 5 minutes
-#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-## Update HTML pages every 15 minutes
-#*/15 * * * *		nice /usr/libexec/munin/munin-html
-EOF
-
-		cat - >> "${D}"/usr/share/${PN}/fcrontab <<EOF
-# Mail reports to root@, not munin@, only execute one at a time
-!mailto(root),serial(true)
-
-# This runs the munin task every 5 minutes.
-@ 5		/usr/bin/munin-cron
-
-# Alternatively, this route works differently
-# Update once a minute (for busy sites)
-#@ 1	/usr/libexec/munin/munin-update
-## Check for limit excess every 2 minutes
-#@ 2	/usr/libexec/munin/munin-limits
-## Update graphs every 5 minutes
-#@ 5	nice /usr/libexec/munin/munin-graph
-## Update HTML pages every 15 minutes
-#@ 15	nice /usr/libexec/munin/munin-html
-EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa -f /var/lib/munin/.ssh/id_rsa -N '' -C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa -f /var/lib/munin/.ssh/id_ecdsa -N '' -C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin-cgi-{graph,html}.log
-
-		if use apache; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/nagios-check_dnssec/Manifest b/net-analyzer/nagios-check_dnssec/Manifest
index 14453a17f7b7..8d48ddf08759 100644
--- a/net-analyzer/nagios-check_dnssec/Manifest
+++ b/net-analyzer/nagios-check_dnssec/Manifest
@@ -1,3 +1,3 @@
 DIST check_dnssec-0.1_p28.tar.bz2 73458 BLAKE2B 0b3ae3e051734924b89160a67a84b3cbe3f5db0ee036780b4efcbd7857a18a6ac6b180dddab7475be079d5fe902b8eeed4c6acb021b31c70daef69632ff3ecaf SHA512 e99b155f38963858750443f3cf834e4505f871cb06bbfabf07ade1b333b18507b9364e7250118ed5ee4a2134e2a45ee68b6386a9f3b0cb30a0bb02a4a6e263fa
-EBUILD nagios-check_dnssec-0.1_p28.ebuild 655 BLAKE2B acf54233a135a4b05de8d49e420af580d3bf41e8e37469c9c5ad3acb51c1d4205f3712748f7019c6fe937d5ffa6ff38f30b805dc63f31ffc133edba7b1bf5d57 SHA512 a94c6a58a8c3c402faf752cd165cd96b2d260935ca09e82ff953a960f598f20f0bf97eae0aaad8f58bf614ad51be677f612f2a6319e8f80916a7254ed57b8fa4
+EBUILD nagios-check_dnssec-0.1_p28.ebuild 652 BLAKE2B e671f946a5dfb1d8adc7c6f4b0fe948145c3e5a4dc1b0e2209cbdae6d67f467fcd3158bee64c4a9634106dc86fe96323b98bb4b81c9260ce171410566814bf09 SHA512 8e528c18bec83c4405c89497212dc62e3f9a2b1ce606b9c6639b9cad5758beb7d491a521a0f67f7583b3fb298b019850abc6425e451633625e181c3d5ca218cd
 MISC metadata.xml 390 BLAKE2B 0a41ecc4603317f512197820ad62d033df4408824db37e5189ef51b8155badb0114aa0148188c8448fe69611c240232851845e518ce1f43c4730f80a3020f7b3 SHA512 0814c74c2ffd3728a8231a4d0240b23598719cfe06b57dad979092d8a6171a7564b905da4dad202313bfa2e237036b75f4f12dc57050469dd2f68f91820afda6
diff --git a/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild b/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
index 86cc18b48671..e83bff31808c 100644
--- a/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
+++ b/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index d865c2df60f8..aed13e3ee9e7 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,3 +1,3 @@
 DIST nikto-2.1.6_p20180122.tar.gz 511615 BLAKE2B 0937a5a52ae79e00da5bc53b089166cb2fc5cdf8311c4db55e421ddb44c22e31a9a964b02d75995c74b144d8fe05046895c4e54cfa7500aecd5d36787105a417 SHA512 4b9cae08146cefcfe4e929385631062f27cd13f5e516ec50fa9f9804a677a4a8846bc0f5de99bc1a25ec58ea8e2889bfa5953f8ca9cd7152e7b95b05861cac91
-EBUILD nikto-2.1.6_p20180122.ebuild 1219 BLAKE2B f8e7f956842f8025f3d778b1b1acb0a5e719a5bf8b835e987c50313eeb1d0701258607adfe0cfbf7dc6e843525094053026324c16387e3ad3f432fed29cb0fc2 SHA512 03a896addbd469b9d79a908b19d6f2ff7d51778b05f1b4940922accf0e1c36ee71d7c7ebda8d623844c3c2d8e4ebc3101d09f69337703b90ce493ffafe9d8d44
+EBUILD nikto-2.1.6_p20180122.ebuild 1216 BLAKE2B 8a555d434950fe60ed662533282af37d986312fecbb64bad5f9e923b6204fe5ca49877f07aa562726ef0f4cef145bdbfe79e6bc83ac4ba77bc0af1d3eb0774de SHA512 3a31b876498d16c30c0f03555ddb0ca0fcd31cdab147470114537ba5a6981c5c8c355f9d6280eb54a223a494d94de41252c1d8a0173e4f99c1b1f501fe1436c9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild
index 167752e379bc..b6f46c92bf2e 100644
--- a/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild
+++ b/net-analyzer/nikto/nikto-2.1.6_p20180122.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ssl"
 
 # nikto provie its own libwhisker, do no use net-libs/libwhisker[ssl]
diff --git a/net-analyzer/nipper/Manifest b/net-analyzer/nipper/Manifest
index f2cd2c6e5202..9adcb9b4a3c0 100644
--- a/net-analyzer/nipper/Manifest
+++ b/net-analyzer/nipper/Manifest
@@ -1,3 +1,3 @@
 DIST nipper-cli-0.12.0.tgz 34157 BLAKE2B b4945ef0d2a4ed7579b6f9ee7d80be1b8e57621797ed023a03fa05f94eca0ec781a5438d12b20dc61f16eb5e7776219788a4c1b76c3b6222df8a6fe755f573e4 SHA512 f65f1e954d9a054136f0a3ac5ea1c25b46a74fe640860fd45093206402c7bb9e566b33cc03ed144a0fd7951f94d94390100344c24ff5343473374676e807f742
-EBUILD nipper-0.12.0.ebuild 443 BLAKE2B bc86f52e7697de3855a9c6d8d64a53f4c571d85e08caab7891cbad8d34db737b2e8d2114558e0e97362f3ce6357b2dbf907eb348d34ba744a39410ed6db1945a SHA512 9d0249489aa0a3aee1100915a8cc8718969678e7aee4dfd563d1bb5ca3926dd11ea03e92750917b0a3e2ddd069e6df13f698e0434a9e653b2f9a5afd9ae7d05d
+EBUILD nipper-0.12.0.ebuild 440 BLAKE2B 340e0c9a516f9e0687735cbf14b63d7ae7c84de25e4427ad9ba6ea68fa97f4c5a6c6c03d69fd016121052143c9858529a4e380e2ccfa63ebfa99e901525ccf4e SHA512 5d2790a1e9c0af3c0b6d0916e3b386c0fe32c6b1eeb444b10f0074ceaeef1cb799cb081affef4c416fe9d7421ae8272702e1b97111a8b82eff9316b9c608e56c
 MISC metadata.xml 431 BLAKE2B 58817a0a59ac90f117ebaf2f774b53337234c6a73c99e87698e7a020441c87fb2362023a00c7a2630ade34ce7b01a2208b065c41d015976948ab884beeb87744 SHA512 54f8cdc431a7b1f3b5605c706561ebf02075bb4c7d0d81f1c4e05422ccec07c0e6224b4daea8f2e78a3ac87af1dc7e1a6ac22c1f8c2fe6e166b85672dcb0b069
diff --git a/net-analyzer/nipper/nipper-0.12.0.ebuild b/net-analyzer/nipper/nipper-0.12.0.ebuild
index 729fe5303f20..534146bbe3d1 100644
--- a/net-analyzer/nipper/nipper-0.12.0.ebuild
+++ b/net-analyzer/nipper/nipper-0.12.0.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/nipper/${MY_P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=net-libs/libnipper-0.12"
diff --git a/net-analyzer/sslsniff/Manifest b/net-analyzer/sslsniff/Manifest
deleted file mode 100644
index 5761079659ba..000000000000
--- a/net-analyzer/sslsniff/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX sslsniff-0.6-asneeded.patch 1358 BLAKE2B f74d1484d2e3ed665d4eb8b21a52ce7d43456c1c5a8c5c597e199449f32be3e3169bc286e4f89cdaac9a9eae0462058da00ae071742de87d91e08fa2605bd58c SHA512 2b692eee8154457b6b7a7c12042e017defb94157341885ceadb3970ba40c5a878bb1d1effc5f5b71e7a3161dfadfda27e9f5d5c47fd642007c11f47b1f243904
-AUX sslsniff-0.8-error-redefinition.patch 1718 BLAKE2B 8ef6a00b3cb3e378884eeb10ae787e31c1502ef277d75624a7094fc89d92a8a09034c7f5b8c785d93e75804a7afa739b20fbe3f5512275f48548c6d080c8c8a3 SHA512 ff9424f59844dc74ac2044dab3541186608bd4063e4b54a2fbb337cb4cf6beb76aa3e2e39d64a5d7817a4a14d4976f361f6e5472c41c7073dd106cf9cb74f9a0
-AUX sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch 2316 BLAKE2B 45f604bd82eeb954cd4d6aefc473ac47e1d37e3cfc39ea5d8027545a424224fbe821c1eef67f78a8043f8ad1e4c3ac50813425c98b2a62198f097b6332be0918 SHA512 7606d8c466063c9c903a2eadd0a584c1ae759abb62e5a289c0748d4a18329b90aa9a1d89ebcc5e7b145ee2d98c48f7af8f37641d7a32c67208ccabab9a9da876
-AUX sslsniff-0.8-underlinking.patch 1631 BLAKE2B 606e6cdfb4d5d0467d3fa30130c40abfd3dadcef5281f3965838f13e44760c8dfd2af9ed7069958f45dfeef2112131f5a538ebed5bafb7466d637c9f515c557e SHA512 8ffbb67f9fbec85179769c0ace64e62f8a3d27e403f33bdd761195339cdcffe37cb473621cb20a739b2b2ce26c6b2335a4d5ea7c6cb697c4328ac7f7047b5e01
-DIST sslsniff-0.8.tar.gz 207858 BLAKE2B bb53f5bee6528bd27e07a529ca3c908df4eb13c0b7164b34566faa1d6b36b55d118bbac2311fbfda9ae7a8d908a253ac7cfebc261b554ff56c930eb4a0cdf4a5 SHA512 4ac1bcff8f396d868b2381bc73bb0307022e9a7d5228c83722abde8d4d01e4c6273042763c1e003c8e60f606d60923a573122d33680f5d892b4ef7b62f02009f
-EBUILD sslsniff-0.8-r2.ebuild 1098 BLAKE2B c131524f896278a702e46268fd8f45efb297ca0f84643a0d306ef1735970c9a64038b2681de2b1d6cae291a10d661368c146f40c7045532dcc9e6c6e0cc10ce0 SHA512 b30839b74cdc741b6363aa5b8e360b9f86ca78466f91d5d0db45c7109a43330333feae7722a2b8e3b4d11ba6162b419752e4f2ef0c902fbcb78aa6c6f543c438
-MISC metadata.xml 406 BLAKE2B 827749fa0fb08eefd7613363c7c812d206605c9acd42e9060bab8a961f5297055e762f76d755e7de5449bfe38876ae50cdd9eee5084ad40750e7b60114b75dc9 SHA512 60f83f56f139edcdd6e6d74fd76faaa92e2e288ba1d19f5bcfb8dfcddcd9db54b4f23dad09c5e6cb18bbcc8620e0a7415f45ded24cffb2b02d42a6bffebd66f3
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch b/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch
deleted file mode 100644
index db629b3c4a25..000000000000
--- a/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- sslsniff-0.6.orig/Makefile.am	2009-08-04 03:48:58.000000000 +0200
-+++ sslsniff-0.6/Makefile.am	2009-12-06 20:39:02.066902985 +0100
-@@ -4,6 +4,6 @@
- 
- sslsniff_SOURCES = Bridge.hpp SSLConnectionManager.cpp FingerprintManager.hpp FirefoxAddonUpdater.hpp FirefoxUpdater.hpp HTTPSBridge.hpp Logger.hpp RawBridge.hpp SessionCache.hpp SSLBridge.hpp SSLConnectionManager.hpp sslsniff.hpp UpdateManager.hpp certificate/AuthorityCertificateManager.hpp certificate/Certificate.hpp certificate/CertificateManager.hpp certificate/TargetedCertificateManager.hpp http/HttpBridge.hpp http/HttpConnectionManager.hpp http/HttpHeaders.hpp http/OCSPDenier.hpp util/Destination.hpp util/Util.hpp FirefoxUpdater.cpp Logger.cpp SessionCache.cpp SSLBridge.cpp HTTPSBridge.cpp sslsniff.cpp FingerprintManager.cpp certificate/AuthorityCertificateManager.cpp certificate/TargetedCertificateManager.cpp certificate/CertificateManager.cpp http/HttpBridge.cpp http/HttpConnectionManager.cpp http/HttpHeaders.cpp UpdateManager.cpp http/OCSPDenier.cpp FirefoxAddonUpdater.cpp
- 
--sslsniff_LDFLAGS = -lssl -lboost_filesystem -lpthread -lboost_thread -llog4cpp
-+sslsniff_LDADD = -lssl -lboost_filesystem -lpthread -lboost_thread -llog4cpp
- 
- EXTRA_DIST = certs/wildcard IPSCACLASEA1.crt leafcert.pem updates/Darwin_Universal-gcc3.xml updates/Linux_x86-gcc3.xml updates/WINNT_x86-msvc.xml
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch
deleted file mode 100644
index f3c2fd08da0f..000000000000
--- a/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- SSLConnectionManager.cpp.orig	2014-09-01 23:09:35.916376510 +0200
-+++ SSLConnectionManager.cpp	2014-09-01 23:10:32.492515988 +0200
-@@ -95,13 +95,13 @@
-   } catch (SSLConnectionError &error) {
-     std::stringstream errorStream;
-     errorStream << "Got exception: " << error.what();
--    std::string error = errorStream.str();    
--    Logger::logError(error);
-+    std::string errorStr = errorStream.str();    
-+    Logger::logError(errorStr);
-   } catch (FirefoxUpdateException &error) {
-     std::stringstream errorStream;
-     errorStream << "Got exception: " << error.what();
--    std::string error = errorStream.str();    
--    Logger::logError(error);
-+    std::string errorStr = errorStream.str();    
-+    Logger::logError(errorStr);
-   }
- }
- 
-@@ -120,13 +120,13 @@
-   } catch (SSLConnectionError &error) {
-     std::stringstream errorStream;
-     errorStream << "Got exception: " << error.what();
--    std::string error = errorStream.str();    
--    Logger::logError(error);
-+    std::string errorStr = errorStream.str();    
-+    Logger::logError(errorStr);
-   } catch (FirefoxUpdateException &error) {
-     std::stringstream errorStream;
-     errorStream << "Got exception: " << error.what();
--    std::string error = errorStream.str();    
--    Logger::logError(error);
-+    std::string errorStr = errorStream.str();    
-+    Logger::logError(errorStr);
-   }
- }
- 
-@@ -151,9 +151,9 @@
-     } catch (SSLConnectionError &error) {
-       std::stringstream errorStream;
-       errorStream << "Got exception: " << error.what();
--      std::string error = errorStream.str();
-+      std::string errorStr = errorStream.str();
- 
--      Logger::logError(error);
-+      Logger::logError(errorStr);
-     }
-   }
- }
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch
deleted file mode 100644
index eb0a052c7988..000000000000
--- a/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: sslsniff/SSLConnectionManager.cpp
-===================================================================
---- sslsniff.orig/SSLConnectionManager.cpp	2011-12-31 09:25:04.000000000 +0100
-+++ sslsniff/SSLConnectionManager.cpp	2011-12-31 09:26:14.394534948 +0100
-@@ -44,7 +44,7 @@
- }
- 
- void SSLConnectionManager::acceptIncomingConnection() {
--  boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor.io_service()));
-+  boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor.get_io_service()));
- 
-   acceptor.async_accept(*socket, boost::bind(&SSLConnectionManager::handleClientConnection,
- 					     this, socket, placeholders::error));
-@@ -76,7 +76,7 @@
- 					     ip::tcp::endpoint &destination)
- 
- {
--  Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.io_service());
-+  Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.get_io_service());
-   bridge->shuttle();
- }
- 
-@@ -134,7 +134,7 @@
- 					ip::tcp::endpoint &destination,
- 					bool wildcardOK)
- {
--  ip::tcp::socket serverSocket(acceptor.io_service());
-+  ip::tcp::socket serverSocket(acceptor.get_io_service());
-   boost::system::error_code error;
-   serverSocket.connect(destination, error);
- 
-Index: sslsniff/http/HttpConnectionManager.cpp
-===================================================================
---- sslsniff.orig/http/HttpConnectionManager.cpp	2011-05-14 11:37:52.000000000 +0200
-+++ sslsniff/http/HttpConnectionManager.cpp	2011-12-31 09:26:28.442534999 +0100
-@@ -53,7 +53,7 @@
- }
- 
- void HttpConnectionManager::acceptIncomingConnection() {
--  boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor_.io_service()));
-+  boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor_.get_io_service()));
- 
-   acceptor_.async_accept(*socket, boost::bind(&HttpConnectionManager::handleClientConnection,
- 					      this, socket, placeholders::error));
-@@ -63,7 +63,7 @@
- void HttpConnectionManager::bridgeHttpRequest(boost::shared_ptr<ip::tcp::socket> socket,
- 					      ip::tcp::endpoint destination)
- {
--  Bridge::ptr bridge = HttpBridge::create(socket, acceptor_.io_service(), 
-+  Bridge::ptr bridge = HttpBridge::create(socket, acceptor_.get_io_service(), 
- 					  FingerprintManager::getInstance());
-   
-   bridge->getServerSocket().
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch
deleted file mode 100644
index 049ee5f293a0..000000000000
--- a/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,7 +16,7 @@
- AC_CHECK_HEADER([boost/thread.hpp],
- 	[],
- 	AC_MSG_ERROR([libboost-thread1.35-dev library is not installed.]))
--AC_CHECK_HEADER([openssl/ssl.h],
-+PKG_CHECK_MODULES(openssl,openssl,
- 	[],
- 	AC_MSG_ERROR([openssl (libssl-dev) library not installed.]))
- AC_OUTPUT(Makefile)
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,6 +4,6 @@
- 
- sslsniff_SOURCES = Bridge.hpp SSLConnectionManager.cpp FingerprintManager.hpp FirefoxAddonUpdater.hpp FirefoxUpdater.hpp HTTPSBridge.hpp Logger.hpp RawBridge.hpp SessionCache.hpp SSLBridge.hpp SSLConnectionManager.hpp sslsniff.hpp UpdateManager.hpp certificate/AuthorityCertificateManager.hpp certificate/Certificate.hpp certificate/CertificateManager.hpp certificate/TargetedCertificateManager.hpp http/HttpBridge.hpp http/HttpConnectionManager.hpp http/HttpHeaders.hpp http/OCSPDenier.hpp util/Destination.cpp util/Destination.hpp util/Util.hpp FirefoxUpdater.cpp Logger.cpp SessionCache.cpp SSLBridge.cpp HTTPSBridge.cpp sslsniff.cpp FingerprintManager.cpp certificate/AuthorityCertificateManager.cpp certificate/TargetedCertificateManager.cpp certificate/CertificateManager.cpp http/HttpBridge.cpp http/HttpConnectionManager.cpp http/HttpHeaders.cpp UpdateManager.cpp http/OCSPDenier.cpp FirefoxAddonUpdater.cpp
- 
--sslsniff_LDADD = -lssl -lboost_filesystem -lpthread -lboost_thread -llog4cpp
-+sslsniff_LDADD = $(openssl_LIBS) -lboost_system -lboost_filesystem -lpthread -lboost_thread -llog4cpp
- 
- EXTRA_DIST = certs/wildcard IPSCACLASEA1.crt leafcert.pem updates/Darwin_Universal-gcc3.xml updates/Linux_x86-gcc3.xml updates/WINNT_x86-msvc.xml
diff --git a/net-analyzer/sslsniff/metadata.xml b/net-analyzer/sslsniff/metadata.xml
deleted file mode 100644
index e3c364f20d17..000000000000
--- a/net-analyzer/sslsniff/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="person">
-  <email>prometheanfire@gentoo.org</email>
-</maintainer>
-<maintainer type="person">
-  <email>zerochaos@gentoo.org</email>
-  <name>Rick Farina</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
deleted file mode 100644
index c0f2ea35d7d7..000000000000
--- a/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="MITM all SSL connections on a LAN and dynamically generates certs"
-HOMEPAGE="http://thoughtcrime.org/software/sslsniff/"
-SRC_URI="http://thoughtcrime.org/software/sslsniff/${P}.tar.gz"
-
-LICENSE="GPL-3" # plus OpenSSL exception
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/boost:=
-	dev-libs/log4cpp:=
-	dev-libs/openssl:0"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS README )
-
-# last two patches are taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6-asneeded.patch
-	"${FILESDIR}"/${P}-error-redefinition.patch
-	"${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch
-	"${FILESDIR}"/${P}-underlinking.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/sslsniff
-	doins leafcert.pem IPSCACLASEA1.crt
-
-	insinto /usr/share/sslsniff/updates
-	doins updates/*xml
-
-	insinto /usr/share/sslsniff/certs
-	doins certs/*
-}