gentoo resync : 23.03.2018

31 files changed, 151 insertions, 767 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d9d8ac74a778..2d7ef85c8683 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 506714fbc856..414273a4b963 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -5,5 +5,5 @@ AUX icinga-lighty.conf 465 BLAKE2B fe68f22ac43b2010c50fb47da1219e8e60d5f68ea57ee
 AUX ido2db-conf.d 35 BLAKE2B ca911fa8d9094fc5507849fdc4787156e0015676ee0e77006093af867120af9783d53f91b90493960acdc2878273fe10730bef36bdcc26c017a4a2d3400cf6cc SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f
 AUX ido2db-init.d 822 BLAKE2B 6affaf5af609a93ee1c12b9ff0b76e3cd4883ab26e58fedd6bff36978873b6347c005d0ba5018e3b0bb40771b1f8eebf259a6f387786154243a0b00b1c8e4b04 SHA512 8593a676389aae540a4fa3e4c7c6f558254da018b13b8dda7a932307645029775659b1258c68fa2178086978c59250be4820b0cc1a3d3c7ded276aa17a3b9b6e
 DIST icinga-1.14.2.tar.gz 20779284 BLAKE2B ffc5ab7195faa64b01ae2f37385590405a5525b5ba0cb357bbdc24eb61c1590d25f299d706debb1af1026215dd3800c5133a5fe81cbce8708e0f7ee761a584e2 SHA512 9e993d9653497a5942ad6c3d1ef50b5da4153ba2c7a747aa094c2628f36b687033588b629ca21f8955c84fc6a15f7a7d8169f8b8677f36939bab76cc5e398e41
-EBUILD icinga-1.14.2.ebuild 7422 BLAKE2B d7229dad9007eb6c95a6ce7151cc43fadc26c9c0e92c3051f78a24793b23888566fc4dacd2376fc53c44a471bcf9d26d005d51a4638220e27adcfb77a879f532 SHA512 b941c0a60848cbab59c2e0147d3cedf72539869fa468e26399bd060429de0241cd2654396e979d34d0f2ed298e1be2bfd75ec5268e5f506cb7ff4657205367cb
+EBUILD icinga-1.14.2.ebuild 7420 BLAKE2B db1ece37948ae70ebe0bedd2874c581848f4a5c8f8e267e74e33a9ee181cc1077bc3c337f937d402f2ae4dc30c5d59c1d9b2672220581fc8c73afb70bfe512b1 SHA512 8227e377b435a678adc2c7a1e04e9a40a6575f7d4a081408451400066961e3ce97f25ade413a2bec633c4fc7a9d2d638c32d2f5132c4f7553d338ef05eede6b2
 MISC metadata.xml 853 BLAKE2B 6825b192328f944e2389f221e4dbf5fffea45f1cb650866a8240e53c723ae9b40473e092d48003844fd99b65db4e6ddc7747eddbf7239e7cf4ecddfcca375eb8 SHA512 1aad02d84c0e90f4f0f5ed54e326d9a14e77f5146b3ba9293279e009f45900a69e1b2fcc9f54cb02111f05bb2aef0370cda1b4bc4fffa4fc4dd0c2a073e0a92b
diff --git a/net-analyzer/icinga/icinga-1.14.2.ebuild b/net-analyzer/icinga/icinga-1.14.2.ebuild
index d9d4e9fb3652..3bc81cee760c 100644
--- a/net-analyzer/icinga/icinga-1.14.2.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-core-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
 DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
 	perl? ( dev-lang/perl:= )
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 11c6a8f141ae..31791a0af1af 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,5 +1,5 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
-DIST icinga2-2.8.1.tar.gz 2501182 BLAKE2B a32e60f8888d43eacedaee3cb33b719e2e405a6123710f7806b6c82eccb80eeb0ab0318a34302a5f3b310b258702214148f34719f166b3a3807ef2c9d4b28fa0 SHA512 27dcd2de1a9fa81327fa9cf25f25171e471715b4506dfd312bcd6c10408520cef86d260762f4340a00aaa7824c8ab65baadf541b7e104bd378204667dc92f762
-EBUILD icinga2-2.8.1.ebuild 4606 BLAKE2B e8aa30d2b9dc78107d7b15b307bfe0ef0d96c54fe8210e163759030fc292f132ea55891d221cc60d2df9ae4ab7e21a0d2bb52ecc88ff9478436dcadf3d255568 SHA512 1dd83c2f3c72d3ea4631f2da5c7a5df7d67c46329817cba86d552dde38d081237f8692fb3ce383f3db5bc78e1f749e3d8ae68e8af0bbf89d8e0e0f8d59d63004
+DIST icinga2-2.8.2.tar.gz 2507304 BLAKE2B 0f2cc58fff6d9f648b302c3af07e24fcf20e0c10c140d4052991477e1dbf5c158157f0c64e8d3aa26a6fadc46db25eb26d7b5d5c791a8a7d91445be10f0cecea SHA512 55a9791fa14d0e3e559b3083ec83ad301b62a677a1b56ad30227b1a3591612e2fe536a34a25705fb935a6ca8e42f45ff006f9856b47103da054db15582455579
+EBUILD icinga2-2.8.2.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
 EBUILD icinga2-9999.ebuild 4608 BLAKE2B e3c3b8c7c93458ee579764b087395cc004855dee56cc463a22d2787c541661e5963cf8d7b9d70374c302d1a82e3453a750c16d51d55daed81496b998335d9cc8 SHA512 d6d1d15e9e3e7bfb461c9eee901448cd489bb2fd86575291790e463c16d133ec1ecf15f72f3a67e5a9ee3de4dba450ad51b6940c5b966ae688d8a9d51ba4d5fc
 MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/icinga2-2.8.1.ebuild b/net-analyzer/icinga2/icinga2-2.8.2.ebuild
index ce606b8bb30f..525aa185b124 100644
--- a/net-analyzer/icinga2/icinga2-2.8.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.2.ebuild
@@ -5,11 +5,12 @@ 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"
+	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"
@@ -45,9 +46,6 @@ RDEPEND="
 
 REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
 
-PATCHES=(
-)
-
 want_apache2
 
 pkg_setup() {
diff --git a/net-analyzer/nagios-plugins-flameeyes/Manifest b/net-analyzer/nagios-plugins-flameeyes/Manifest
index 8bd8b67745c9..bf36f52b6946 100644
--- a/net-analyzer/nagios-plugins-flameeyes/Manifest
+++ b/net-analyzer/nagios-plugins-flameeyes/Manifest
@@ -1,2 +1,2 @@
-EBUILD nagios-plugins-flameeyes-9999.ebuild 1106 BLAKE2B 5568e60adbb0d976230ee0692cee1ca249d689bc8c6f232aceb212321d3ed7f173e9151a2e04c2b13b9be816167fa81d6eb06259960896e52a0244bd8b44c9db SHA512 b26844e3264f0a4f77994419d151c978574c1cd5e765bc3bde2b19e202a0d4d68aa56b92911c12d4ccc1a5a4768a2742fb60f951aa0f2744b262c29eb6e40a35
+EBUILD nagios-plugins-flameeyes-9999.ebuild 1142 BLAKE2B ce738db02f64718d3e52676be08152d5d80e900b5c84943a3b5976e7b5f1adc0d3de811cddc8f46ff8acde8a85bf7c6617d58d1172bbfd3c131a2ef3ec586f1f SHA512 e389879d19fbf2002458d105f54cf1e66fe498f93d54361e57bdfccdef6a8ba6d04a0a65e8ae2a0891d2867007fc31aeb86c4fc082aa16e3e911159c9515c54b
 MISC metadata.xml 626 BLAKE2B 5656a8de553bc783b4bd81891421e89b60a5d1693ddab0a0f7cc0ff527fd5c908c872e4797688db87e89cf8e8be12c1f8e0e6e12edfca93f17fe62f8ee688e6b SHA512 f89139edf88000f6767eeb1424ead0fc9a87e9ededbdb4277e73db92a766804182540aa82a0de37b7b708d0f5094fc816be9be2485a8f1af9190cc690cd57176
diff --git a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
index dd0b836e946c..0136755dfa9a 100644
--- a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
+++ b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,10 @@ IUSE="smart samba"
 
 RDEPEND="
 	dev-perl/Monitoring-Plugin
-	sys-apps/portage
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)
 	dev-perl/Time-Duration
 	dev-perl/TimeDate
 	smart? (
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 2356b847a389..56d2f170a10c 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -13,7 +13,7 @@ DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c
 DIST net-snmp-5.7.3-perl524-2.patch.gz 523 BLAKE2B 6762795cd6bcdccd5b49899cf572d5a498f3ab7fd20af69fad5f3fe45880e40f2aecfb0e9443a2a10773e25323ed5d0f271446d8fc03102e70fa8efd79e0d118 SHA512 bede47234b809d67f33c46654f3d09d0b255d835fb97eea23bfa888922dfb80ad287c305596a6b041ed03ec91dc7c647ecd54c3c79e0b4ce08978332de3cc007
 DIST net-snmp-5.7.3-perl524.patch.gz 9072 BLAKE2B d870e195bccb8178827791c9bd495d5c13a8848d176ae72b1c6b54b38eabc3b5aa4842d1841f422e3a71d9e9129b2acf303e8961ce98f82f5d9310c3a65e671d SHA512 2d3184ac7c96f75af5bf8c8d23f33d5636c701e052a638e5403a8d5aa34985abc38f6a366ba09a1d8499a05fd71d939a7ed4d530661e56a726386603b6f6e6a4
 DIST net-snmp-5.7.3.tar.gz 6382428 BLAKE2B df036da09658fdb4c52a99696fb6374cd582bc8da765e212285478ffb16c8725ddecd37842aba7835bc90ea74437ce00491dff569b1ce2c7499acf46968b3935 SHA512 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb
-EBUILD net-snmp-5.7.3-r5.ebuild 5125 BLAKE2B 4596670c4a9874274e3ba073a44f920bf6c780881b14cfe035c7ee8eb3837cb3791b303b4ade1b9239ccdf8bd727aa0f2b0d3866f419699e7fdcf5974d315bc7 SHA512 8d2c5432a4741ddcc3d7932094f528426e5108ecbe08d6fa035909f063c4a13e164b8d8fe1d37aff0039b5c06bbe9092acbed7e51210501126246c1bc547d709
+EBUILD net-snmp-5.7.3-r5.ebuild 5124 BLAKE2B bc83af6d6a2ba7cb60f02794682896de64ed72a6211d8fb9c2b78611c92882142ed9d89997614f65f92c7341887d4d1094c8cb2eedba61caf608a667c95a5a34 SHA512 46bb9b542caa3a20c88286a9d637f6d87b165fed1f441c4849a4898290da48afad17ff2d50208b1935d3048f0a3fa95b35f509ddbf349f618a558ea3d4bce206
 EBUILD net-snmp-5.7.3-r6.ebuild 5156 BLAKE2B b2b067fb782e94d50da0297bd01f31bfbfdaf0bd405385d66630494b1a597c037940ff7d982328abe40eb34355e02a689f2726b6d5f71c75f7d8055947591d7e SHA512 57771f89b6871f90d6195e12145d76e3116fd40f3c0f1aa871bdd3138026d32967e7f0d9a5eebbc7098b940be5c2a0bb06635e6402701e789c1dc35b6a3d99b7
 EBUILD net-snmp-5.7.3_p3.ebuild 5221 BLAKE2B 810863641282b8a054e0f1fe587ead591a4a3ba7fa7d734b08e16856adae01e11de00e9ad06a0bfc19b17c3d0126b46ecb2a58ce5bc569c30cbe27be71160ead SHA512 f7e0564698e168a6d3365e4744d6776c70ca7a4def86740f19eef3d37f53b88fa231f6e53db004b95213ecd05098a60716b79d9f87ca7b90a44f26149d0357ac
 MISC metadata.xml 1142 BLAKE2B d026289018d327a888079b9c3cb7cf65dff58dd87735f7317d15d78698fe307d4dad2dfed10adab428eee0eb3abf357c82554b0861029a70fb60b82537601d84 SHA512 76efbc8444b344164960e671df273afaadbb4b64e73b136f559d4f039ee4b145f8ae989d271a8cc025edc917e4213828e0c77f6e5b0258b4c0eb9653c98c58c0
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
index 11979c188f94..6e71bd0135a8 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${P/_/.}
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
 
 COMMON_DEPEND="
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index a657047e868d..827a5872a50a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -8,11 +8,9 @@ AUX nmap-7.25-libpcre.patch 291 BLAKE2B f63a80d6e25309d4706f7f428cd70f5926df99f7
 AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8ca016f196bb59eaaa42ebe7ef31f473f9bf9db893c7b4330b1a2aa723b5268640b5edba4519b94ee094d63605600bffd9e6 SHA512 29b19e8cedc5e9edf66e728d89b71c4c0ada29fdbb9c167bec84b5aad2c9d52fe111a902c32b247106ace0154734f2a3b4eeae119887dc7203ad2271c8c240a3
 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8
 DIST nmap-7.40.tar.bz2 9043221 BLAKE2B ddbc2f9d8b96aa2ddd53bb250acb5b0829dd79caf04d599ed2257f89cc1e419a9dbf94101a5b1d5ad6815e1a94974b3c02ad81354897ba3bb032a5e3d616468d SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d
-DIST nmap-7.50.tar.bz2 9309616 BLAKE2B 79f257f4c19762729ddfe7bb950263253d98b0902d22f0bf87ff64b7400c5e0c8e8c1a6b5a8c75e3f835dedbf7087808b1bd8444126655138382ea2db1ccb748 SHA512 b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2
-DIST nmap-7.60.tar.bz2 10394925 BLAKE2B bb3a392292adeebe60dc9716ee61ee09a2f86703a1370ffd6a6c63969a75733660046279d122b1b529a3ea25083bde9334d5e13496ad6a9bd9d6562031b8ae09 SHA512 74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4
+DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
 EBUILD nmap-7.40.ebuild 4322 BLAKE2B fa5c7e0f84dc27f65047a3522244199a7a7024fb76177a36a77a224ca46b5e15d9e5b3f2201d19c8a7550ef637a3713d3fc493d419ad929af4b229fa8eb4899a SHA512 24f62b8cc52020de46f5274d870a65a4e87be189d07d08deaed7d5767e0be7f44e3841e5edfc19bdbec48f11b236ef564cf870ec7068672cebbefb05673e5295
-EBUILD nmap-7.50.ebuild 4323 BLAKE2B 315c5b796f862503099e3ae86048d7f2dff5dcbcade10cbcc9aa9c3ea513d042f5ef5f2f780478528009cc74d6130c34f138e6ba597ba927dbb0123e4bc72a34 SHA512 b6f783ca346ffb478d66f45bd5826905f0d9c90ed8934b80165bfb23356fd8dc9e3a35fbdf38a452c37e505c1a218ef3e5bf0254dad3a6756a604014494bf4fa
-EBUILD nmap-7.60.ebuild 4537 BLAKE2B 275c3f81635adf2dd291fb0691dcc8b20b1eacd3bc028622b484a17365f1f0f67e6e1ae7b236955d9adc1b1ce44e5901c017364c96e66fd9edb56c1bd8369230 SHA512 9a6b99b3d513c9af4e90c7a6e95cabd22ac866cc192cc1b21072997bf68df11ef6ff9a99756fab57b747ed9375969b4197252bccb9382500c062a02a4f0ea233
+EBUILD nmap-7.70.ebuild 4533 BLAKE2B c7a52e98063956c5a39ff4846d19a778e4a3cffb67cbd948c46e2c3d80ed2a4090d9413e7eaea77214efb1dd389d0ef5255edb7ab6f56502fcc559636883157d SHA512 2ae418925b4e96bfa62391e7c40ca3d78b8b4083f8355af16aace59cb77798bd21ad9eae21dcad627c9a8e2df7490c730ae313dddadf3a4f992ecf0514b5ca43
 EBUILD nmap-9999.ebuild 4315 BLAKE2B 7d83887400200359844f202b29e30cb358a6c35a35f23754c69455f1807fdb9e1e6739f856d5e575058a01b9f0a4686a83602e53f3d202d80fcd33e636264141 SHA512 c9b708642cf84cc3caa3555085779ae3f3d93a575f07b033f5e562ed2dd3bc4f94f17f27244a4baf5b15b98ebafa1432df292d11c991a357fed65d21af2def18
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/nmap-7.50.ebuild b/net-analyzer/nmap/nmap-7.50.ebuild
deleted file mode 100644
index e8d52c0afb32..000000000000
--- a/net-analyzer/nmap/nmap-7.50.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-)
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	rm -r libpcap/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	sed -i \
-		-e '/rm -f $@/d' \
-		$(find . -name Makefile.in) \
-		|| die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-	eautoreconf
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(use_with zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	Commented out because configure does weird things
-	#	--with-liblinear=/usr \
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}
diff --git a/net-analyzer/nmap/nmap-7.60.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 59a746de80ea..254429f19488 100644
--- a/net-analyzer/nmap/nmap-7.60.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index f729d9bbb9d9..02f8a24218ce 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -12,5 +12,5 @@ EBUILD pnp4nagios-0.6.25-r1.ebuild 2906 BLAKE2B 06c491fcc0b3396f8c118bfc136009d5
 EBUILD pnp4nagios-0.6.25-r2.ebuild 2995 BLAKE2B 23f45b9bc7dbd7d6093fe70d5e070921aa134b8b73c670e1efc70e7156f87d13e2f1e15a9f76221e48f666be8cb436f33b906fd6efb73a2cd9ea5a99f320a94c SHA512 142625f3438c605aab45689b2965bdce80d905680a23f3fb40ffc1bb0b0487842235d28493df0042616341a8e93ee3ee79b70361502f2cd5b85d594d5400f447
 EBUILD pnp4nagios-0.6.25-r3.ebuild 2868 BLAKE2B bd9740058486234cfc4ae2f3452df23469b67011cf97e68289822b4448189d2f09560c4cb54548789485fcacf7a87a395757c3fa675491103e0c0628dae83680 SHA512 45b01c76de8002a28e804895d55e2fbeb5f5dac61a0f6dd5314b60ac0113f76007f58d4c586b7d3fd19ab8a54e544d64f76b4d3f0c6837dd83544a0868521ff0
 EBUILD pnp4nagios-0.6.25.ebuild 2909 BLAKE2B 048c5c1bccd6e87586a292ce249ce3143e79b13d341c0a95aaa37e8731a8698826391c1df61dcfa5cda9656201dbeab78393e4ca05f66aa900b2c3f1bec077ae SHA512 79633a38ff8bb00563edcd3ab5b1cad51f104eb696de227599fd4a6dc51fd0d9e5a7fe8c610c72f49bdf4c223834efe47b9456a19f1ad6c5706fb3a905285ae3
-EBUILD pnp4nagios-0.6.26-r9.ebuild 3103 BLAKE2B fe561edd648b84d4133cd21ed2c723a11ba1dc05019ed38d9034ee65f267e9f4499b50fcd987c72d59c5b02318d6a94c24a8c600fc1e0b27fe9dd52441282c87 SHA512 258a875833691dc9e5434458b1c8d27bba95b0c7324f7d910f8188cb3994a14c4f7d2bcb2c90c2e920d51b1601c7f332d753fb7f502c51f3ada4a6320e0458ee
+EBUILD pnp4nagios-0.6.26-r9.ebuild 3101 BLAKE2B d4c6461563e1dd89223f8684f03c7d093b32846777238e15c8dd2aeff3ee5ab293f5f1ef968cfe229f11f25f2e9e6a3381244c05f0d343ab65499d191466bc2c SHA512 670fb5974ea643834f1a14e8b92b01daf2feafcfdf7af82b3aef11dc918c773693a791475a52eea0af87a4cc40acb048960657114a0e7bb7541cb1ef4418071a
 MISC metadata.xml 716 BLAKE2B 571931c0525f50709ef759d13290bb5606ad311954ce10a8fa60a521cd1fd5d1917316ddc32231c2d16c07b2c0d6fc17c38a81b317e1ed4927645f1663b315ba SHA512 ad8ef6398f119ad3a0d51613fb67546ff9ec43b57825f1f251d27ea3feaf3fe2cb0029f30c179db9dba79f984e14a15926268868930910266f97671c8bea2a55
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
index 784147a6a682..48d161daa230 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 
diff --git a/net-analyzer/prometheus-blackbox_exporter/Manifest b/net-analyzer/prometheus-blackbox_exporter/Manifest
index f45f40488179..e7d237b07b29 100644
--- a/net-analyzer/prometheus-blackbox_exporter/Manifest
+++ b/net-analyzer/prometheus-blackbox_exporter/Manifest
@@ -1,5 +1,5 @@
 AUX prometheus-blackbox_exporter.confd 110 BLAKE2B c3cb7ed7d314ea8b347b4db9839e7c987c91c78378a6085473d687a5f3460f06ca6825567fbe832c3114906156290d00d505e15e3c2461eb844acb4e56937af0 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed
-AUX prometheus-blackbox_exporter.initd 614 BLAKE2B bc2a5d5b3a0383a35cd223c94169b57045f2dd2506753541dbf61b3003b042a5d43bb08237ec367e1d48104f0b30b7a50713e96e9b03c2fbb6e079c9858936eb SHA512 4a25f59d0fb95ac35c07ab15623c2c905db04cb5a14cccd316bd522e2b4892a08d67a4edb15c6c02fbc2b84e92dc48b67f5d14c7617cfccfa09babf22e4d1beb
+AUX prometheus-blackbox_exporter.initd 615 BLAKE2B fce98f2c0740db2309d0395cf1e7e3f8b3b305c688cbafbf14a1787d952d49933ddebee1a688b844a66c95d02c38c38e943ff73e4dce68a1069c69c91540cc47 SHA512 f5ecc87e592fe85e4cfed759f06a1d88a4bbd05a474cb7955aae296ee29ae2ddf875a427bfcc7ff8369367eb8892c85bcc5051d273f8c2693395c8851b5f8669
 DIST prometheus-blackbox_exporter-0.12.0.tar.gz 2202465 BLAKE2B e3b082f8a491b531b0caf3331ecd391bf8734df0915ccbb7988ac1e67e57436bd45169aa403d5511fbb44eb176f89836ad8c04c491f5194f90f9f8a3b686a656 SHA512 2c98c0f4127bdd04ac54eb182c5468fd38121558f85aa8b4bec860f783f266b144df3153da0b028fdb84a4131a4e374a969bb09ce3a781ddf95f0a008c11bbb6
 EBUILD prometheus-blackbox_exporter-0.12.0.ebuild 1439 BLAKE2B 56670b1c92cd9ba5d7d287830f984d9d6aae91a1dde0ec5c40f4b8756614ca61fe0306306382fd74bc5c3f9215d682f8be13bc1e6103e559e90d5f8df0741278 SHA512 1a4d929048c828fdd5736427c8714bec7a9ead9315cd7d4fab8cab7ad71bcd203f3ab6b74e5f27613d2da41501313dc0c7720fe85357e3e89378d5c2dcf6f64a
 MISC metadata.xml 338 BLAKE2B 117f205ecdd4c05aba1ce92846f59dc7790c9fdae79db5cc1eb912d34a9e1d83eaaea26feb24245a0c5fc4394552705aa7b23171920d9023ca8e4333b3c09650 SHA512 e431b2ef89e797b9cbb290a70683a4392f07559851550dd22f5410f09c979730c8dd35c095f855565df8d72adb42c6e4b9d03882adf37240b0da28cc508ee2ad
diff --git a/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd b/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd
index 45da799723d1..ab001d41abe9 100644
--- a/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd
+++ b/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
+# Copyright 2016-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Prometheus blackbox exporter"
@@ -8,7 +8,7 @@ user=${user:-${RC_SVCNAME}}
 group=${group:-${RC_SVCNAME}}
 
 command="/usr/bin/blackbox_exporter"
-command_args="${command_args:--config.file=/etc/blackbox_exporter/blackbox.yml}"
+command_args="${command_args:---config.file=/etc/blackbox_exporter/blackbox.yml}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/blackbox_exporter/${RC_SVCNAME}.log \
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index df5a10eeb34a..6804a98a3150 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,21 +1,14 @@
 AUX rrdcached.confd 150 BLAKE2B 7e3e87c632bde99e2c460828157d281ace8a2f34f5310dc1ca5610625cde80170a8e2d973b1464ff5ee7447e28f4e26386140b80bd0d866acd8445733e1eb4e9 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0
 AUX rrdcached.init 331 BLAKE2B 835f60bd601591667556610f24002dc9cf7cba547d6cff7b5116c742577d97233a704f65dcc55bee26b8717da547a987a1f4b1511433ec559e86932fad9f52b0 SHA512 383cebcc9ad035660def2e465690f52104eac4ac621faeca3f31822f2f2bbd96f23c60fc5bc6382855e971563d7d545cc7abc31fe351c57a8ea716bcd7c95d88
-AUX rrdtool-1.4.7-configure.ac.patch 451 BLAKE2B 4d18f58dc689afca4acd2d38315dd51e78a650b6f8cf31be7dfa2d916e46b6195207970d232319356c6b4cdf6339f160c1dcaefe91c58f416dc1f3da23f01a78 SHA512 15dfd061a2eedb569264ae5e2014961fd29d63d92add282eb54a228e682b0b08fc0ac755256c98fae385796cda32bb497d07f675cff8ab037634cf1bd32df9f2
 AUX rrdtool-1.4.9-disable-rrd_graph-cgi.patch 1234 BLAKE2B e393f2af7a2d64c89341a8da1c6c2708e66158e2121340e6c2bb84a9e7eb8bccf6123ccbf13b627f887e8f9c686054291805e77c0bd776cc859b19ef978202b0 SHA512 4ff2a2489abab95f4d2468c7a0e00a069c29d1bd6f69365bb52363ed43179c3c1f7fdbd1684a66c8d5146181e174fe5234e2c6710517cc7cb56bf111e512ff66
 AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 BLAKE2B 80b309cf59260a0f137f6550bf867845df25e6be0ac5677517d062aef8240f34db6f721700331d41d73f7aefbbd17f2c13df7ee1f774ff6bf33b6c1790183153 SHA512 6eb8d8a8193ce5bc22a4645e909dc7eb0a911b1f89f6403afc9cffec705929cf64086f415e53b748254a384b83ff8352be82f735ad403795c17a9058bc3e386c
 AUX rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch 266 BLAKE2B 54724ef4f5557166b6a1b4e9cab3c6c0270c66347a4e2f1ada4dfcf8501420abfb4febed4645943bc65b6cbe3c6badf15334cb7509e0bff0f1d2c6f552582cfc SHA512 1f981baffdadf8eb11728fba69d2942ef766fd99016d792873acbca44e84950a384396391aa8fc89f1f6f3f3742ae2b25745051c4ae0895e2f6e988a3a5573aa
 AUX rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch 1174 BLAKE2B 050342f9f3d6918d6d1247242af531b9cae335410e937bf1af718ac86b1ff9439cd2bb8c7d0a75e20ef8b9e1bc1cda7137d496993d5237b1b92e7cda864c992e SHA512 54a1b35f07260a3b88b2bcb8220ca896b4a45f10a251c4ee492890389384e682c149ce9a31e9b00835dcd5d3e105b90a322c1820108363fc53e15ee0d77267ef
-AUX rrdtool-1.5.5-rpn1.output 68 BLAKE2B 89260e3beaefb137ea58a7f609be649a2c959bca8b53ea681f9a2c3a41e24b1ccb3c0a0d1781c11f5d6741b47f8384997e70f8d26d2f4ede1a3f2ffc32ef3c39 SHA512 3fa099963bf4c29f033e4f7453701959799aebf44027aaf0638a5799c5b237615cb8b6bea22e06b60b34eae5e66040233d61e811e1465612595908f673bb715e
 AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e9b77d5ef2173aed3b8f9cd8fba43ff9a553946ca4ee3092512b10dfce6de9a6436cac5aaa62a35c655f7c82520dc SHA512 fd3339862c51c8573dd93079ba70c9b538c4d73d031157fe845bcb59e7233cb5e9fa8cc451e760f8ae30014c975ec9ee04f66d42fc928c621a572b92e9348e4f
 AUX rrdtool-1.6.0-configure.ac.patch 537 BLAKE2B c90a5b9e2ef8fcba87947e6091c4de06568e69fb2c990bbf8573ee8902b9782720d9566189bdb3f69346ac5eaa1f0ce8b42c2b7ed57ddb629b2baca981017ab5 SHA512 2cec107823b47646d019182b0c52489d5d00dc287a97aae31844128bd5bf81b91168b56e386d8b59cfefa51f3de3d004ad0b626b8a773d419b9f717b2a723967
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
-DIST rrdtool-1.4.8.tar.gz 1379482 BLAKE2B 32a12ac87dda70a2d4cde97b435f99e4ac930699d8881076adf44ff64f197f1f14f9f7b1839c0894704bb9e518d5eab411a65eb41eda6a4d9e09b55fc6d288c7 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b
-DIST rrdtool-1.5.5.tar.gz 2187685 BLAKE2B eeb887f705ae1ea84e9f84a46243a66c5d1b8756c2996ca6f34ee954095a26dfa4992aa976be9336d62e22c3ba399d69c59f11eeea3c510ffa9d05e2d5b98b21 SHA512 07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
-EBUILD rrdtool-1.4.8-r1.ebuild 4038 BLAKE2B 3bf893dd39546b26280d36fc3474660ff53cad1b5538e104be1131623466a195b008073cfccd023236d3ab9c1bfee47235663b0991acc42e29d562f5fe24c20c SHA512 264d53646ed3854ce49618dfae1287bee512e8e59aefeb7a8118dbeeb4984a9e15d77fe60d07cf730e91beb5f7c356bfef3fbb4b3dbcb2efe607b709d6202b4f
-EBUILD rrdtool-1.5.5-r1.ebuild 4301 BLAKE2B 049b30a1c6eb88c9629ea98fc951fc66eeeacd14944cf44020236768210e07a29bd552c2707910b292a113b0b47bb1eae9fed0d36f6c0f914c0fd1d5814aa301 SHA512 57199dbdf7eb7a38341e5106191b0e4e0076269c125e1ce76e69c94cc2c2f0e03788d541212d4ae4b05a31b2bb87119003be626b9a585e08038e13f4c13d0fc7
-EBUILD rrdtool-1.5.5.ebuild 4027 BLAKE2B 1b281d9d92463ac5027750e45d673295e914dcc32ed512d19cd9558ddf1a433aba28c918f669dd9a42d61421b44b8d44b0cbdb2110c8e716e401f3b85e57b73b SHA512 6b0346093e6787f76d018c2e8fc52d60b0f8d0e108d17a8f6cc30f91856d69d082a75555861b4c71e1c62c466eb21d2acc38bf029993972bd8b90496debcf28c
 EBUILD rrdtool-1.6.0-r1.ebuild 4252 BLAKE2B 71ea024eda1113e8aa7c0b682fdc2bc565854e1ee97545ae7e1ab75795f58d623d47684fbb34aa771fc96e02d49885f72d12c119804ec1f8343d5385aa5064bc SHA512 8055b0432db0c7a728e0d5ddc699457d0203464192ffcc8a6fd1c1abe1206856f9f83feaff82995ec4f775d030bb0363a953cb56697a7604b412dbd1e1bb5298
 EBUILD rrdtool-1.7.0.ebuild 4310 BLAKE2B 3084372a08723bf67e31eafad1b38f74a650710a1e5abbbc3c06857d21a9535d5d3d0860d3751ab431e5f09a21917a08e875e383a0ae7613932cda6a23fde083 SHA512 e7813b76116883440c66108b1b15481f7a7a3a665b39f11c3ea719372563b5e983749a9b2b2f8d61cdc808ea37230cc08e250d67a301b4271bc3819bf5d79e7e
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch
deleted file mode 100644
index 668adeee13ee..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -148,7 +148,7 @@
- AC_PROG_CPP
- AC_PROG_CC
- AM_PROG_CC_C_O
--AC_PROG_LIBTOOL
-+LT_INIT
- 
- dnl Try to detect/use GNU features
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
-@@ -204,9 +204,6 @@
- AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos))
- 
- 
--dnl add pic flag in any case this makes sure all our code is relocatable
--eval `./libtool --config | grep pic_flag=` 
--CFLAGS="$CFLAGS $pic_flag"
- 
- 
- dnl Checks for library functions.
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rpn1.output b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rpn1.output
deleted file mode 100644
index 4a7696dbcf0b..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rpn1.output
+++ /dev/null
@@ -1,3 +0,0 @@
-print[0] = "30.769231"
-print[1] = "72.000000"
-print[2] = "0.000000"
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
deleted file mode 100644
index 0d34b417da74..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL="true"
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils distutils-r1 flag-o-matic multilib perl-module autotools
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 rrdcgi ruby static-libs tcl tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:*[deprecated] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( dev-ruby/rrdtool-bindings )
-"
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.7-configure.ac.patch
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}
-
-pkg_postinst() {
-	ewarn "Since version 1.3, rrdtool dump emits completely legal xml.  Basically this"
-	ewarn "means that it contains an xml header and a DOCTYPE definition.  Unfortunately"
-	ewarn "this causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
-	ewarn ">you've upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn ">lables visible, please, install some font, e.g.  media-fonts/dejavu."
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
deleted file mode 100644
index 7178baae6cdf..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~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} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:*[deprecated] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rados? ( sys-cluster/ceph )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	cp "${FILESDIR}"/${P}-rpn1.output tests/rpn1.output || die
-	cp "${FILESDIR}"/${P}-rrdrados.pod doc/rrdrados.pod || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.7-configure.ac.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
-		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
-		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	if ! use graph; then
-		sed -i \
-			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
-			tests/Makefile.am || die
-	fi
-
-	echo ${PV/_rc*/} >> VERSION || die
-
-	export rd_cv_gcc_flag__Werror=no
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	export LC_ALL=C
-	default
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
deleted file mode 100644
index bc62b58b7d6e..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~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} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:*[deprecated] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rados? ( sys-cluster/ceph )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	cp "${FILESDIR}"/${P}-rrdrados.pod doc/rrdrados.pod || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.7-configure.ac.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
-		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
-		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	echo ${PV/_rc*/} >> VERSION || die
-
-	export rd_cv_gcc_flag__Werror=no
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}
diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
new file mode 100644
index 000000000000..223537acd432
--- /dev/null
+++ b/net-analyzer/sslsplit/Manifest
@@ -0,0 +1,4 @@
+DIST sslsplit-0.5.2.tar.gz 1526606 BLAKE2B 2eb9e1525072626cfdfdfe344a61d92cf340a87dbbabfd06c5a7b46ce6dd0305b27949f91260fe192ecf97484676600e39f79a74995b45fb5b59138726cfbffe SHA512 5f0560dbf89355ad0ef443df2fb0358046efd8c35be6c45f27b04495fd6194c826ef1c7b261683e7f22eb14436293d00395329284d9e709e1188c3c885251935
+EBUILD sslsplit-0.5.2.ebuild 998 BLAKE2B 6a0b6bc591bb1d6d4617d0131bdeafdb3d7ede894450b5b14c97a557f5260fc9b359271e1274f295ef28f11fc5371e9d66cb711884315d72ef4ad1741483936d SHA512 665b62a25c318ad856c58230efaacdf5c8b573abe7f92bf5913442aaaf1d87e8664868d4264dee17e2f479ba21e0cc7f2a0f2385485376d6d39b4ded142ff56c
+EBUILD sslsplit-9999.ebuild 996 BLAKE2B e24d93c39045c932e455c7901b4b5733cd3b105e036bbdd4be67a3073bc3ef9401de2971dba314d3d7231c0f1a79f1cbc5ec4814a5750199d213d1dd9429f630 SHA512 6cec41649a79eafa9cc43d551c847416defdf232a6d864fdb986208f52ba0e69090ba733f56406e79f55a092b1aa1c89b7887337a9ee913b6ac298d34da584fb
+MISC metadata.xml 873 BLAKE2B 2025dba83d4a6c2c48f8297da057360bc42269093af9292a8baa3096a5ec5cb3644da47effd8977ee9829e318bea5c11680c5eccab0407d5f14ed29a12e615b3 SHA512 d6d408cf00e3201acd6de22a0f10a2322398a889c84480da8eebd005da099f9306ac8d88d13c4186fa369915c39b4ad04d7aff558ad263896591374c9a4c78a1
diff --git a/net-analyzer/sslsplit/metadata.xml b/net-analyzer/sslsplit/metadata.xml
new file mode 100644
index 000000000000..614c7c40e2e1
--- /dev/null
+++ b/net-analyzer/sslsplit/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		SSLsplit is a tool for man-in-the-middle attacks against SSL/TLS
+		encrypted network connections. It is intended to be useful for network
+		forensics, application security analysis and penetration testing.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>daniel@roe.ch</email>
+			<name>Daniel Roethlisberger</name>
+		</maintainer>
+		<bugs-to>https://github.com/droe/sslsplit/issues</bugs-to>
+		<remote-id type="github">droe/sslsplit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild
new file mode 100644
index 000000000000..0257c885324a
--- /dev/null
+++ b/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Transparent SSL/TLS interception"
+HOMEPAGE="http://www.roe.ch/SSLsplit"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_musl test"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/droe/${PN}"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	elibc_musl? ( sys-libs/fts-standalone )
+	dev-libs/libevent[ssl,threads]
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+src_prepare() {
+	default
+
+	use elibc_musl && append-libs "-lfts"
+
+	sed -i 's/-D_FORTIFY_SOURCE=2 //g' GNUmakefile || die
+	sed -i 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile version.c || die
+	sed -i '/opts_suite/d' main.t.c || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc AUTHORS.md NEWS.md README.md
+}
diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild
new file mode 100644
index 000000000000..c501c1e3acd3
--- /dev/null
+++ b/net-analyzer/sslsplit/sslsplit-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Transparent SSL/TLS interception"
+HOMEPAGE="http://www.roe.ch/SSLsplit"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_musl test"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/droe/${PN}"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	elibc_musl? ( sys-libs/fts-standalone )
+	dev-libs/libevent[ssl,threads]
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+src_prepare() {
+	default
+
+	use elibc_musl && append-libs "-lfts"
+
+	sed -i 's/-D_FORTIFY_SOURCE=2 //g' GNUmakefile || die
+	sed -i 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile build.c || die
+	sed -i '/opts_suite/d' main.t.c || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc AUTHORS.md NEWS.md README.md
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index e92621b26887..86eaeb7f23dc 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -12,8 +12,8 @@ DIST wireshark-2.5.1.tar.xz 28229472 BLAKE2B ac832e3d8727a20754153949d7dfba9cfbc
 EBUILD wireshark-2.2.7-r1.ebuild 6481 BLAKE2B 36529064a3216f6c9ae71ae23ec31049c6a0d7862be41c333f369bfdd0cb62ac5315883c465d2be517e2a4ddd780d110e59c413725f791f0cf9ac0380dbe36ce SHA512 cd90dd82e3418c000ff142a207a4f05db6bfdb5f8087b4c7b1f595bede0847277fba43a615972c2222e4261c647849ff3165fba64d67dcd55e4441b76324e3d0
 EBUILD wireshark-2.4.3-r1.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d
 EBUILD wireshark-2.4.4.ebuild 7383 BLAKE2B b3c2fb215055d0ba48c4edd8a2a846f77187ddb1add61477e03d20a817f0bcf5054876eea2180268afeab0e636325d3afc7de553da6a66fe4fbef98fbde94aaa SHA512 79432eeaa844a0984b35087019dd26c99f4f6b0b4195d3f6cb440a4d13017b42d894718d5d90a0c866502a8aef1a0e92684cca61909c13ae9d32f9809fb3b356
-EBUILD wireshark-2.4.5.ebuild 7381 BLAKE2B 910684b7eca92816c5414e752dd09ce20ee3308ce46bb6c8fbf17f877be650ee69eb4fe78f114d45bfcb100acc7ec16abf06cd73c77b8870b65b9d6f32a8c1bb SHA512 4ec91ba8bc3cd5d6d630b1968a28fe130e007905238bd058a7e34d7b7462dfdbd4fbaef4ce09a8210c5ca3196bea4b12f48c60d740172fe66b12e1305985f100
-EBUILD wireshark-2.5.0.ebuild 7114 BLAKE2B d252f4e884aec64a208b65153ba6464401e90514fd3f22db01fcad74e72fefc2fc924b5b250017fd33694a14906015ef895509913b6bf2aa20bb017ef7cd657c SHA512 bdab94fcd73685fa84892cc4c9e784a024a3ee462d040aa30b4ccc4bf67f3c9a577c9ea2a5b3bb031ea2aa0f1b893f8ea23d49e2762dad1e391680d2de7babc7
-EBUILD wireshark-2.5.1.ebuild 6630 BLAKE2B 200d42a90d72ffde32c1619dff27bd08c6dca406019f725d811ff80811e2f4643836a6da4ce042e27c69a48590d3c44b50b94769a675aa0a125402582665e030 SHA512 7e00d6f7bcdce34a4443f6198dd020e74de2ba4c66ada506adb9ee4ac5f103ab81249572966749317d060859f146a1362ed869818bcd7b0d84098d4b2401ac7e
-EBUILD wireshark-99999999.ebuild 7128 BLAKE2B 9e7037c3cb3635e0c2e39635f98061bc188dc575053bf54824c9fdfaa8b335b4e7c28dbdc1d11e7aebaac989902c675d8958db0b20829ea0e5bef6fdb6791296 SHA512 692cb84ef62ac6dacc77b7002abe5f15000507d16027fa4dd95146a633ac2ab143847ed97f882bc0bf68e6a67e8fc8f02e7ac336b85148df0764c011c85bde1c
+EBUILD wireshark-2.4.5.ebuild 7396 BLAKE2B a38f625603f0e9145dea4624222a8b340405140810a004e0e6947e3238a8253f2fd114d6099571f6e50293e0adbb6555cbaeffc16617cbe0743e28fe717b08db SHA512 38b4a32b44028d1ac95be8ae8b18711c39de84506c5fb188f2352af7033c4a9511481d39eb47f30364ffb43448f41022b60219be4a1820c74eaf0a754dd78960
+EBUILD wireshark-2.5.0.ebuild 7136 BLAKE2B 0d4694ca0f61af34f8b54ac29d43d146ffabe22ec905e78f4ca1f49667d9a09dd4e5bfbb01f42d6ca2003712e2daaf4c52d4c00c03afdf492b638cfae95016a3 SHA512 642a7f788b98b0f820880f14a3245122803ce5f96a4290b327144be3c22f4ea7c23eb9142bf47332defa9b63ed2e8e5a81f20a69137d1ce1d5af84d14377deea
+EBUILD wireshark-2.5.1.ebuild 6664 BLAKE2B a6385ce71f757f3ac7fa7a38b6cacff2b21cbb235af9aeba31088f1965bdad709a848a3f2365c8eb31dd648d5eafb981dd58017719222afda341632b1e9866ca SHA512 fb2d172976a00b24e1bb7507bc0f3f5707a57e515bcccfb6561749d6d0857530c3e7d705ddfb571bc07ef0d4541f9c5d8ec2b30ea966b3e73b165e16284c7af3
+EBUILD wireshark-99999999.ebuild 7143 BLAKE2B 1f37c8e34e6d65965ba0b54056198c7d1fd15f763c987a9a753cf8a6c6c8487ebf977c8ccd6171d1336e1074cad7fe28620721b8b4eae74f1dc7e84b6a0ab38d SHA512 ef42790fdbf27aed911a8922abc7e094e2ccf08ea2c34f04587f17a3b9b892238bc401a4a9a9b017a1025098ddc17a8c47970d5b84811dd6690a742969d276ba
 MISC metadata.xml 4866 BLAKE2B 924525b4564d387c926456f555360a61c531d6e235fd975aeb3bf947355423de87f00a5f3735db99fa89abd106d0929698fb7998660b8da5f9bfc3933e6925da SHA512 4a978831ac7845604c1cd680140cde27e1f202be9743e5559910fa97eb5b71f3c49199d6512a11599b4c1a9aa87fa5d4bb7cf69d88c50fdd8817f38f2e9d7223
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index f91e77ad25ff..730f9e0a9b89 100644
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
@@ -275,7 +275,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	enewgroup wireshark
 
-	if use pcap; then
+	if use dumpcap && use pcap; then
 		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
diff --git a/net-analyzer/wireshark/wireshark-2.5.0.ebuild b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
index 0a7fd52a45da..48af1f016059 100644
--- a/net-analyzer/wireshark/wireshark-2.5.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +caps +captype ciscodump
 	cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk
@@ -267,7 +267,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	enewgroup wireshark
 
-	if use pcap; then
+	if use dumpcap && use pcap; then
 		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
diff --git a/net-analyzer/wireshark/wireshark-2.5.1.ebuild b/net-analyzer/wireshark/wireshark-2.5.1.ebuild
index e8b30ed44ce1..dd2948907ca0 100644
--- a/net-analyzer/wireshark/wireshark-2.5.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +caps +captype ciscodump
 	cpu_flags_x86_sse4_2 +dftest doc +dumpcap +editcap gtk kerberos libssh
@@ -243,7 +243,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	enewgroup wireshark
 
-	if use pcap; then
+	if use dumpcap && use pcap; then
 		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index bb1724389ab4..59a4a67005b5 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -271,7 +271,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	enewgroup wireshark
 
-	if use pcap; then
+	if use dumpcap && use pcap; then
 		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap