gentoo resync : 19.10.2017

13 files changed, 17 insertions, 308 deletions

diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 667a125a3d87..a4bebc0963d7 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST monitoring-plugins-2.1.2.tar.gz 2613060 SHA256 76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa SHA512 845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed WHIRLPOOL aea22e1a3d3c7622b4645118cf8b5d499882bd30b6af8bdd81287fb99fe42bff7f906b54fda411ac2c33ff6e42872a6ea6af4dcd7611bdc95d308c0fcd954e43
 DIST monitoring-plugins-2.2.tar.gz 2461548 SHA256 296a538f00a9cbef7f528ff2d43af357a44b384dc98a32389a675b62a6dd3665 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27 WHIRLPOOL 5ca16cbc63cbbe3472f82b87b2c4111df4877bc33b0a9bf638507aaf8020194adc6e8244c5a002ae636121ae58d7a112cb2c5cba6e384c136e5636bbfc4a6141
 EBUILD monitoring-plugins-2.1.2.ebuild 2858 SHA256 64a1c31aa98c89bce7e97adc9ebc4d1880caa4bf5ea4d4ba8718857ea71e3a05 SHA512 9426fdb164c60771cc3dddc6cff2e526ae7770400378b74dde706a2cfce7dba51aecddfb7c7a532e6bc07078d05cf28d64ddddc3e4eefeb4ec2bb70f44151f7a WHIRLPOOL 53739d5dc73981a520bae34597014c2bcd3fb916356ab11fdc57fa8618141ce34e2b9dfad64976f607b6a567729654f3c4d0897046e200643a0f6a65c1b2314e
-EBUILD monitoring-plugins-2.2.ebuild 2869 SHA256 d8a2524831c66cffdd28559621ac2bedfc825e7108fc54ff694fd761f15f6057 SHA512 d0e1dbe65190e568f4ad12e6b6fc2ec5bd7592da197236005e7412ac605c1864853e11e9c42f71e5817fb9b421d421f11d08da76229410b36af77131ff61367b WHIRLPOOL d0c4d04ed84b8c5cda9978290316090caf588c208ae3d3e3c9bd097c9229ad4abe5a592e8e5ad372a7b718f6641f9591fc87bce07a09699a79b0a4790670117d
+EBUILD monitoring-plugins-2.2.ebuild 2875 SHA256 74d2d84ae9d9620a65801f706f7fe3e0d6846cdad46e381ea773107c3f43737d SHA512 67a2e298d56b06cfa7ef0f718889c4e300cccd668e7335f6574e36b929dbf349473ce4c4541a083a703440e8d61abea0551e2e245bfec4dbf95cd174e72114d5 WHIRLPOOL 30bcf8f9576d35670441d005ba6f5089600d7625010db48f2de26180155c72221783099320c225700242057ff145d4c504ca4e753bb7c549789cec53b75f8287
 MISC ChangeLog 4406 SHA256 0763915a056d3bf9a24757a76b6a36ea9d7ad01e90363cd7129700006ff255cd SHA512 c66af4340242619c68762cd664eea7a81518bbd873747f0d22c5ff902be298e265ee468df03e58ebb7a0142fb2fee9306fc66906c38096845f11188e89ddc464 WHIRLPOOL 9731fa3642854f51a2ca6499a0bfb30e3fdb4574dd34677701a5cc0f2707a8b9836b23abb0d858f532373268c02921ab0cf422154a5571e19489a70d9e84f1a4
 MISC ChangeLog-2015 589 SHA256 f642f2d89f87baaddd8fbdbb798a9e9603a81c39da412d4832668a25ce505ee4 SHA512 dff7df956fa977e38f4b7094d2edd78ca1aaa34b3c8a78620c7d265d8935cb3bf69a1f8446c391b6abb78ee2a82250e47278cc7b5b466c6485c07b8c2b403416 WHIRLPOOL f026417f1ee1dace25a47d2ff59c4dac96abb01ba506c38f69dfae001755589e0ce67fb44e994ac645081e8c12ae12d4efe6bd0b04f2411ad844d87e1bff2bcb
 MISC metadata.xml 1551 SHA256 0cd297b91263b0ee3a6ef6c9810e9a9c26262c3b258f136f5281d4cbe23d3995 SHA512 5c41ed2615a101375171ddebccf5a746fbe7716a57b66c46b35c19755e524cf0bc0b03267bd3a6f4b0689d1db743f7489248d101e0bdda3e32ab0bd4e20fb75f WHIRLPOOL bcd43dd58ef627bd18b8083df38d77ce0eefa9738451c0af9f9041860abcd4b7d04cc079ef2ca64a7f1fc318d9904a24a4cc6e252f6702ababd0c4f11c9e60ec
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
index bcc6146dc812..940ae5f013e4 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nagios-check_ipmi_sensor/Manifest b/net-analyzer/nagios-check_ipmi_sensor/Manifest
index 62a56f5cc94d..e170b46e2c03 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/Manifest
+++ b/net-analyzer/nagios-check_ipmi_sensor/Manifest
@@ -1,9 +1,9 @@
 DIST check_ipmi_sensor_v3-14e6586.tgz 21836 SHA256 eaf7a8206953bd64b7d1d69d3ed42e342c1054f6fd7d524a1f2de6e17afe07a4 SHA512 ac0744348e4d68459326396ee7fcc98bb0c3d2115fcf9724c7391f6f8dc9c0e2bb89a832822424b415acc3062201fb67d7eaceb4b9f2f41526e5fe8823187a0e WHIRLPOOL 4584ecbf36a4f6ed1ca36099eddc4feb79f79fc9988558e1539cfda18baf1cf9de13101bf376c37066a9309c5e6853cb012580d0c22543d6bb68ebfce31f2654
 DIST check_ipmi_sensor_v3-8120430.tgz 20620 SHA256 ac97ad0fed89023117841bb3e60cdb4d86612671f9d50cbaa8e7d44884309061 SHA512 89b3fd7ae2d523e1510c528d44d03ad9af5bc174bb325393f50a4a95380c996867b4502b55f38712515f556fe0f2019e15f6800ca1db00a9bbbcef655f1fd845 WHIRLPOOL 0792e2ee262bc58820684c6dc050d9987ddbd1680cf99083b1598a3377cf7cd861265fe95faa53fc99c4d9e4bdba71ca771fb8d57205b630b5619a6b3433efa0
 DIST check_ipmi_sensor_v3.1.tar.gz 19135 SHA256 ca029bc2be34fbe56c49c681dc8bef7bae02a7a2b38644cb909912f7256e1151 SHA512 b6af98af23ebff361cf2f94ff6c4b083ff175532c1f65b785d6b928db896a6109437f64bb7a93688f20574f0b92485e40d3d0aa4785113703527574b9c28b079 WHIRLPOOL 55868ea709da81ef73854a99d51bc3258fd0dc4dae0cf360c3d65c9c9272a8ddfc086bca59258077b209788e2f34fbbcee917e3bbeffaf8e557dc63a586f1fbd
-EBUILD nagios-check_ipmi_sensor-3.1.ebuild 641 SHA256 b3d9fb70b8ae3a8a2877b7c4dd3a1e14f0f7ad84e69140c8855e1854bb6b90d8 SHA512 293f24c7db18152e93313d427d294567e8a85bc03e1e2e37f0b89c896761f0c23e36c8c08f5d9376f83fe3bd3d337ceb6cc229d26cc11dc33b18c2071a3be757 WHIRLPOOL 5a3f8a7ed30b3131a61eaac7a1d49e74372411d945e61be9fa461d09506ac69169393a224b1faf282d66c91600e0b6dde7be501164b92667ac5ca11eaed841cf
-EBUILD nagios-check_ipmi_sensor-3.2.ebuild 722 SHA256 b706240d1ad640d283527b501946c536c8955d808a0f9947b378bd910babdeaf SHA512 4077d57299356738e94f71e0c8b09c687d32696a21a4448d4f3192a2ebeb2f3edfd366b212ab3593b35dc427fc75b432a29f1bee99b68446a64df69701b23c21 WHIRLPOOL 2374cde71eb0335d42cf62cabc11ce3309d9ff64ea3a95d64883a14ab3f1368594e37bc1019c8f34354e6db29814fca9fbc936ea3fb4bc9681d3043ba3d63aff
-EBUILD nagios-check_ipmi_sensor-3.6.ebuild 724 SHA256 68124806688ab46de43cef3d1f5ef1643356c9abd5b9d1ea7f5bc77ce8806eda SHA512 b13e5fd1d9261b25f225bfff0b9f55b37f0b01cef50f19a5feb0c9db671906f423e6386f87ef8420183d5583c6e24ac815b6c7d93c5a17abad04f0077bd33326 WHIRLPOOL daf1b5319673b91fb318a9365731aee6739b380cd43081f120a51c9614ed48a6bae93d697b909ab91b64288522d98534bedf889ca39c787448fa5b85bb657039
+EBUILD nagios-check_ipmi_sensor-3.1.ebuild 646 SHA256 c57876da098862052d20173c23326b97472fcd8dcb2e6a24a3961f8ade86f202 SHA512 6dd41aab000f780cec4ade01d52318cf3e3e078e56a4f29ace889ee31d1e3c5c98a30935d3df77e03b7e08f5415ef8248d33deb2b1ea0685634835639f39d2d1 WHIRLPOOL 5c639f80ce48232251a670f8e764831725605f31fad6fc96caf4356514d6ff93b29512761893896b0f68f2f9cf8464cbd2607018dcc7241b510b853a1178a5c7
+EBUILD nagios-check_ipmi_sensor-3.2.ebuild 727 SHA256 9227b1475c7f13154238df017633fa9aedeb033073415704e1ce13227a6b4bb5 SHA512 30739d3b309269c94ab56b849924e987245eeec9f66e27173a8ccb667279e4c2bc6c4e3d0b5c9ff743d01d3839e0340dbbdfc7d245d434eb1eae53a2976c9b5d WHIRLPOOL 82464cd5de0868be2417062e637e602b856c25a0a87cc4bb9d2dd635d42ab7a7342b6cffc9e291961b8337900a6c7a2b2f2613efa1fc4dbf550eeeb2dbe0ae78
+EBUILD nagios-check_ipmi_sensor-3.6.ebuild 730 SHA256 7c7d6f3c6c184793a1157e5dd02b24eb7478010ba9540851acf1c45ee0a69ad0 SHA512 5df875927e39743c7f9de056aec8a6b45d18bd95651fdfeecf7169c5e9a43ce91b579996114ed62d24b6755e524a526190138def79091ee43cefee6803479f92 WHIRLPOOL 435815f1ba46efcb7343087c82c55834bef9c747f975f1e21cafb7a236e6767dfba6c6556837df5ed5c0a254a5bdbbe1e07da7d8fe896e916fca252e3e7c3c09
 MISC ChangeLog 2644 SHA256 edff24a78ba1db7a52c71c6d9babf5e1f057bd8ac4e6dd5c727ae00f8219cb84 SHA512 66abdf7cc5e4715d82f528143b46182008ef144157f72e658aeb346c123646d7bda71078d0e344893cd4088bf5d1a05d43c7bdb8c278a077003db81276ee96a0 WHIRLPOOL 8b2b70aae19e3e78a98a37f10e72f15daf04f61758dd3f9b27e5cbfb0702528f66a00748a07e1260f8806024ef5e8894a38a55badec33aa97953b1b8466ba8ab
 MISC ChangeLog-2015 1207 SHA256 64c27fdda0015956508789154b5c5afcaffb35cdabca17facf5c531ce76c6698 SHA512 d3587bdbbfbe7c5f3d71803bb0ad748b7b9d42120953f439e29afb794813c74263e0d8e3118cae4c78aefde3e07a1dd8c1fc6c9a561aff3c851d1966f90fc99c WHIRLPOOL 04247e5cc48a40fd68350389bb9edf5864a091dc79d9746137e7fdbd6f4af23b500ab72897997d18dd8465331e6e5954c2ffa16684fb3b9874df7f518cc3b500
 MISC metadata.xml 672 SHA256 2b55b078cc25c3bb788b82672eaa2382ea6019b03a83a65b871492e857575591 SHA512 ecb95b93ec10a2146b20b558e26009d5bc1ecbe06513811a1e38426466e1117cef75d5b8957957d1ddf594b37fd4d94d07cdf7c75217a0e26189294a0d07b208 WHIRLPOOL f62f364c65052e5f131b3da73e548992fae58b5dc4701062ff84fa832ca6c7d91e9733c7a28aeb755121f62111d030061a9f2d8a38283b20e8fb94be69aa3db9
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
index 0993cde08f51..ad6bee924da1 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://www.thomas-krenn.com/en/oss/ipmi-plugin/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 hppa ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
index ca84b3bf75e0..331c378057a1 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild
index 54faddb493b8..d549df34bd51 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index da318f6d16b3..deeda0a42353 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -1,8 +1,8 @@
 AUX nagios-check_rbl-1.3.7-perl526.patch 347 SHA256 d11ead366c83234812b058b319571f1ce400be6c50dc5ac40c32355058029a46 SHA512 704b4fbb92d3abf4964dfb2affecf9577df263745d869c213c4a645b85f52c5a9b969088143c46f58b5de0be3549de2c383e52b33a3746f9ae07da9563f8d266 WHIRLPOOL 6e1b9bfa5b5266db42b5da03d84a0a366c5c239c3506b98d66a1957c06640bd73c061703e8c707daaa8b5707394b7dd2f70a2c816c316f1162bfe80196c81d67
 DIST check_rbl-1.3.7-r1.tar.gz 38565 SHA256 dbe76bd24ab9404817f74fd895dfeb1c55d296fe9a8264a4c631c5139ea31247 SHA512 a918090b2c1e93095b155215de559b0d7f35c949e9c9d27c7b6dc91e21391b03d716154dd90ea1a68deeabce5afde3c9e5746190910f18bf1d3e08ff20d02431 WHIRLPOOL 31a13de7cfc650deea83d8c7cf148358046260502c34e3d643ad53c1e96854b0194da80fac3d95cf5fa06b01d9224fb9716ce3e281148ce174f89e75bb418023
 DIST check_rbl-1.4.1.tar.gz 47585 SHA256 6121e01be4b65f4ed34e8387366a616ceef79f74e44322f68ea8d384c193a177 SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb WHIRLPOOL 535cbfad9cb300e51526ea7127ed5c25a2274a0ade4aaa98e3755793fc82ac7adc91a34adba6af2a8d0708869317c33aeccfaaf5bf6c6b2f44974c0db9f99406
-EBUILD nagios-check_rbl-1.3.7-r1.ebuild 2092 SHA256 e09e647308a654d171daf9824a49d88894d29ee6f4d3896606b8b6bf9e6e2138 SHA512 64cc8c4a2dce5b65e7a05d62e9b3a82425bdbf55aa39aa50c82b158098f394daae61d457b77b1b2de5be38d42a74c1a7db9e383143d7149cc88e9c4dfa737b57 WHIRLPOOL dd1ce4321c110bcf52631cb0f3be8b2c3d2c3f8b1782ba14d3bce6006cf062ebf1797fdb484ed38198e439913c76763a7988d65cba0272638fdb709399303e8b
-EBUILD nagios-check_rbl-1.4.1.ebuild 1453 SHA256 3c9a9e495c960d55d5df57ec9d4e9b1e3d4d3b77280e03567ff113213ece7cc2 SHA512 c4da93075e88bff87e3e3babfc8b95908641cd6187a1139dbac97c2a5651b3d79a8eef8706c79c99af8ca2a6aa96673f000ddb1b23459732fa6f3a90d9b63131 WHIRLPOOL b1a7b0b3b7e17f0ecc48035cf59f9b029040e3c19f6124e9b0d40c9f32fab86c627e49e7d1cac6c7383634080f6680413aade9eb6065e513cd778ca7a5ce70bf
+EBUILD nagios-check_rbl-1.3.7-r1.ebuild 2098 SHA256 9b3c7728ed444ceec34261d289960ca1d244e26dca134638083fbf1c630d082a SHA512 f2920984e8e196c39a47b4701ca499813540b1d1bb8089125885dcf5fe206ba5c42dca0100d32a623a44626dccdfba2e0da0a705a41d7771eced4df9764d2514 WHIRLPOOL 92ad2da73dd9bd9e5fe803562afa41192efbb0535a98c39a24f3300113cce28a8627d73023cd4350f33654675e0ed965626adc6af1dff5433a9629230b7f63db
+EBUILD nagios-check_rbl-1.4.1.ebuild 1460 SHA256 8af520f9099c7d94e323d21f811cabd340cfa09939a2e83bd8a5ecca032a0eac SHA512 be9c74e7a01702579b1a04e39d58cd9928651b7d14b004ec407d655461e3ce0f22a4e7ef594bb2757b11dcabda8ace8caac8bfcded8e07f828626d5c1d5aba2e WHIRLPOOL de9cdf8127515c59e73a3eedbabf872a36fe4aa3c0266154fbe779aae51be0c829dba209872d4c14fbd93b3330c4a2797d21df340e87e8073bfcce83686633d8
 MISC ChangeLog 3776 SHA256 b0393d619fe95003b3418e3e4d884e47850a4ffe6105e98eaf00b17c0311de6b SHA512 3170c484e9c39f3edf4d1042e7b8611811dde432013af50a26ddfa403a8eeb8cbe0b87f9eff1b6d5f8c100c4b40bfdde6646c51ca1266c2af4663eeaa548cf26 WHIRLPOOL 17f8aca44c4d64505d3dddfd1698943949dbb5066a41a6cef894c8862df4d6bf5a17399511a9c9f11ab1641b08ee044f499dc2e05a37d64d78261d3b41c8fbbc
 MISC ChangeLog-2015 1356 SHA256 1f897895ad7e60695630e76403454849c7eeab387e0aa4ef96a11afeb3c1f62f SHA512 c27fb2eacd085c8725bb72eb236872bcb82fae407547f8a49a0b50b88275ac4fc1c0458892716e42ce5fa870968472b1705521793ff740684fbf476d79ac5b78 WHIRLPOOL f6d59d6d5a082869d0487302e2c990a52fb554882d6b48a8eff29590a124530baead1e3b9fc53415b6c3aa3570318d7c770183cf5ede06ebd3894671c627c6bc
 MISC metadata.xml 468 SHA256 a3d69541ec3415d47f9a111d580f2a492a98d9cf94a9abfce657ee3c6d99fa5d SHA512 e75e18c5bfb8b7b6cbc4729dc791e687403c00a16705622bb1f956e29dccec25a8ce8179a6908358189edd8c0d8c8e29beaa31039a4d0356d7a75cacfec64d05 WHIRLPOOL ca63f90fc1c86212308162df656eb28e5ee225f199bdafe274e2743058c9afb3ab10fa5b62f4b3ea88443cf6ae0915a04738ff9aaedf216da6447fe6ff101a20
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild
index ab79f03df135..af314b58ee8f 100644
--- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${MY_P}.tar.gz
 LICENSE="GPL-3"
 SLOT="0"
 
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 hppa sparc x86"
 IUSE=""
 
 # The package's INSTALL/Makefile.PL files specify its dependencies.
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
index 028ce81b4ac4..9ba9a19d26c8 100644
--- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE=""
 
 # No, this is not redundant -- see bug 627082.
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index ccc57d4a0e1b..8c1570bd4ecb 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,5 +1,5 @@
 EBUILD nagios-4.3.1.ebuild 392 SHA256 e340d184f1babbf01e594d9f5f0a4a91b62247a3a3faffc0c7304eb62e4ad38c SHA512 13cd73016da7a9675039b73f1f3b1cd4d2e0aedf617019278ce728653b3cb7fab7ed1ef572ff942a87cc651b1ee567f9701bfca7080bc90d17ddcbb5e16a7b58 WHIRLPOOL d04bee59b71c77dce8baf4569db4a311e5bcb367866d513667eaef74fe7619d147187d44e8951fd21776b103bdc46bb133a1e6ffea12f2184042698c7483d85a
-EBUILD nagios-4.3.3.ebuild 393 SHA256 29323069b5c57d3a89f8baad6eb38d1cf7f1d2bdcf285a7967bcda6c45d11723 SHA512 bb9ff8459e45457abb5faa993d1babf164e6f69816817b73af8cf9633768304530f418e1ba7e6dca5be9828668353bfb05caee4b2139818350194e8fe9f5db0f WHIRLPOOL 79784a3e59fc0b4229d9efac9aa2586a91d86c987bd76f235c7f42946b95014db9b36f383503efb4a7d7b11f39b40fb5097139143a4925f3b99af81689b45752
+EBUILD nagios-4.3.3.ebuild 392 SHA256 e340d184f1babbf01e594d9f5f0a4a91b62247a3a3faffc0c7304eb62e4ad38c SHA512 13cd73016da7a9675039b73f1f3b1cd4d2e0aedf617019278ce728653b3cb7fab7ed1ef572ff942a87cc651b1ee567f9701bfca7080bc90d17ddcbb5e16a7b58 WHIRLPOOL d04bee59b71c77dce8baf4569db4a311e5bcb367866d513667eaef74fe7619d147187d44e8951fd21776b103bdc46bb133a1e6ffea12f2184042698c7483d85a
 EBUILD nagios-4.3.4.ebuild 399 SHA256 827940978a650d133d3a87f6449ee29032d0fd12180e57416e82f7122899b24e SHA512 1efb7d777b2fd99310dfad42eeeec251347f065637fdf46e5faa8c5579a8f572654828e1e4084982c2f06d5c0e0a5a5fb2966621eac83bc973e3964bf40a471c WHIRLPOOL e722b805eb40ebcb64111259f17bf911442c54aa78423783673ae8a402561f69e9c21f93c7a119bc3afc9c20c251024425c1c1447efcd18d19f24abf47c47307
 MISC ChangeLog 5914 SHA256 561ff371187a99842494e95c18e3bdbc765e0afec38f0b01788c435d26a3617e SHA512 a72ec5f266fd9944977d286d51a56d6815484a2d6f72886b4734f6fbc7b88d54c65a69e85df9757bb29b7986d9e804632c6f6d81cb539efd351f93d0107f688b WHIRLPOOL 56eafed78046177a4406cbad3bf7073c7f33f4bdbe49a552245659b451ac7c60f9eb7af2694924a5c8958b612a85929132279d966a50f4e9d48187792e1e0d36
 MISC ChangeLog-2015 15996 SHA256 18fad7098e79526eccab8935fff43315b0b55387bcd7a3d3f47bdb62f1e6ada4 SHA512 7629c4a3878bf03acd177b1278f9833c3a1ca28cb34cb88078b8ec096663116f070a25216e9d4dd9d110906747f0f4fd14d6dc78e545507f560d1c3a8ab92cf5 WHIRLPOOL 9fe49e0312ef7ecf857cf92d4086193055443e353272eb8a24155ae7e5b9300eb0b8ae84a9f83e19a3f384c6e316772195a60e0c770fbde18b5b1019d03df365
diff --git a/net-analyzer/nagios/nagios-4.3.3.ebuild b/net-analyzer/nagios/nagios-4.3.3.ebuild
index 63748c40978e..e2be13acf415 100644
--- a/net-analyzer/nagios/nagios-4.3.3.ebuild
+++ b/net-analyzer/nagios/nagios-4.3.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.nagios.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="~net-analyzer/nagios-core-${PV}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 12cb6fb31571..e5dac527790e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,10 +3,8 @@ AUX wireshark-2.1.0-sse4_2-r1.patch 498 SHA256 db6bc1e9171147340bf57e374ce62fc2d
 AUX wireshark-2.4-androiddump.patch 1135 SHA256 d381eb84b6b4a1e6807de6f062c129ea9040f4efb95c4fcf924745bc3a951476 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b WHIRLPOOL 1f0fb1d65f24c39e8fe17c77ecdc7229348a0ce60ca7fe12da8d88864f5c80049431cc1651e02cc55a68ac26d25b11374abff95fe55ba3977923fc5def3e8d70
 AUX wireshark-99999999-androiddump.patch 198 SHA256 7607082abf45448fd4def4693522e219b448f92868a199c64ae7e2f9387a8494 SHA512 7fd971d2b7bbf0bc3685021e0bf55e412e9995cb5d95be85da92d3191227f4af4de94b13a99cfef4f71c74225aa3fd471e5ca23ac6586ab9372f563f3c18c967 WHIRLPOOL 497f50079df7d4aacc13e12ad1a4f09a37701f6cb8cbe5fe89bae905510eedcfb3f037504d4bd726686923d9883403a331dc3eed0150263f35c3998902fafe35
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
-DIST wireshark-2.4.1.tar.xz 28780384 SHA256 02ddbcf9b10f9dfa1e36eec00fe00cb5b5ce8e07203843baf056ac7909911fcd SHA512 66f3f9abecc00c4c153c61f42739522b091ba06cc68b6bd79fe45a1064192fbb88e38e96d4df6722255b06a3520f23d2db6c5fa5e4faf5e8641cf2f5dce10056 WHIRLPOOL 3cdf5b1a3fe95bfaf2416f1ea1310999dd6d34babd5c040797ae4b2ea5faee7b90797a6507fed9be77e6038e90acd052484982b2dc62d9da67ac1e2520ef94c2
 DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177
 EBUILD wireshark-2.2.7.ebuild 6489 SHA256 0978c03c370a2d1b8e2e910bd1c3a57f8cd6984fa2e25b15e152b3fbbd4b95b9 SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9 WHIRLPOOL a3715bb7c19f1007dac053ec1aaf1e49232b31605ec55761884bb6556e19fb1f0b53440657bf0f49330630d5beef435881f157cb6af3be02cc5cfd90134c156f
-EBUILD wireshark-2.4.1-r3.ebuild 7337 SHA256 794e6daf4d2bd724e87882d0d879d55c456e3e935cdab3b36bfb32725b2e6509 SHA512 54e39d028ba1cbd4fcf925eca2c14b6ccc0a8a058b30a0a9adab5a8712eca2781ef0b5f0795bb2115a1c4dcc77e7ba56ef78327f804ac999be3d5ee3aaf66157 WHIRLPOOL 041b4fb98160d4ac4a45a1a83a04318f7a292512bbf928016b5f84411d533f49e5bd806fabbbabbff155d23d97fec2a21bedf0962fc934bc9a6ebdf32b80a654
 EBUILD wireshark-2.4.2.ebuild 7335 SHA256 18a9b9157b36518f0e6cf805848c1060b7efb362e8c49669435624ba77a6f3ae SHA512 a178a9581aa6fbc6c7ab7b90f816a6c5282d3b6b616a6634e72696ff0b42d19c2b2fcc6ea188c5beba5069472bf141c2af452eab9e56e023f81beb5c8eb2ea13 WHIRLPOOL 99d0d17608ae45d5c1b31d9b1eb1f4825560b31c125f0cf82f82bde7db916c553b8009b1a472631f5c23f7a385188d6f8566d8d7dbe7bf1e42c668b39be0bd19
 EBUILD wireshark-99999999.ebuild 7244 SHA256 72ba7b56f2f65ede095d2694d246225ce9162512166962bcede6fe89d842cc52 SHA512 84107c356b10259f6b230931ff136c3dcd364e7aa928cc29609d253ec36e11193e7f723548965c9f085c49040a9ddcf9bfcfd476242178b25ae8213eb0617742 WHIRLPOOL e985f39f06d5dbda4a4a71290b8f024ef483c65ac3c5cf2fe9aac02c79f7ef685eeefeb5a0a5a75c75765342116d554983620aec0f24b893c86db9cdc19c9e61
 MISC ChangeLog 28152 SHA256 4d533b118cf6326befb9d60fef7212306a14528010f3c1864ea6657e20b00605 SHA512 1dbf03f303e0e05eb243d70595fd88e7ea4d14e397a3d717fe2ac9ba05e2407e1928f2cd78b7bc6fe205ce8d660e75b6f11608546b32a70ffc1ec24629567fd5 WHIRLPOOL fbb5a086aa52c90e28c392813dd7b8ade906f4376ec596741e2396b9160e2e64a45148a793b45530ae3ab6dd744dccf6c30261cdf354ada3a50c11a545afd811
diff --git a/net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild b/net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild
deleted file mode 100644
index 82628ef1cff3..000000000000
--- a/net-analyzer/wireshark/wireshark-2.4.1-r3.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="
-	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
-	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
-	+mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
-	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
-	tfshark +tshark +udpdump zlib
-"
-REQUIRED_USE="
-	ciscodump? ( libssh )
-	sshdump? ( libssh )
-"
-
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	dev-libs/libgcrypt:0
-	netlink? ( dev-libs/libnl:3 )
-	adns? ( >=net-dns/c-ares-1.5 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	kerberos? ( virtual/krb5 )
-	libssh? ( >=net-libs/libssh-0.6 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	nghttp2? ( net-libs/nghttp2 )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		media-libs/speex
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-# We need perl for `pod2html`.  The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( virtual/freedesktop-icon-theme )
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
-	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				myconf+=( "--with-ssl" )
-				;;
-		esac
-	fi
-
-	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	# Hack around inability to disable doxygen/fop doc generation
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
-	# dumpcap requires libcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
-		$(use_enable androiddump) \
-		$(use_enable capinfos) \
-		$(use_enable captype) \
-		$(use_enable ciscodump) \
-		$(use_enable dftest) \
-		$(use_enable dumpcap) \
-		$(use_enable editcap) \
-		$(use_enable mergecap) \
-		$(use_enable randpkt) \
-		$(use_enable randpktdump) \
-		$(use_enable reordercap) \
-		$(use_enable sharkd) \
-		$(use_enable sshdump) \
-		$(use_enable text2pcap) \
-		$(use_enable tfshark) \
-		$(use_enable tshark) \
-		$(use_enable udpdump) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with geoip) \
-		$(use_with gtk gtk 3) \
-		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
-		$(use_with libxml2) \
-		$(use_with lua) \
-		$(use_with nghttp2) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with snappy) \
-		$(use_with spandsp) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex qt5 --with-qt=5 '') \
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-		--disable-profile-build \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -j1 -C docbook
-		if use doc-pdf; then
-			addpredict "/root/.java"
-			emake -C docbook all-pdf
-		fi
-	fi
-}
-
-src_install() {
-	default
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	if use doc; then
-		docinto /usr/share/doc/${PF}/html
-		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			docinto /usr/share/doc/${PF}/pdf/
-			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# install headers
-	local wsheader
-	for wsheader in \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.h \
-		wiretap/*.h \
-		ws_diag_control.h \
-		ws_symbol_export.h \
-		wsutil/*.h
-	do
-		insinto /usr/include/wireshark/$( dirname ${wsheader} )
-		doins ${wsheader}
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use gtk || use qt5; then
-		local c d
-		for c in hi lo; do
-			for d in 16 32 48; do
-				insinto /usr/share/icons/${c}color/${d}x${d}/apps
-				newins image/${c}${d}-app-wireshark.png wireshark.png
-			done
-		done
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-
-	if 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
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}