gentoo resync : 01.12.2017

21 files changed, 132 insertions, 173 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 02e22066e07d..04267b6df39e 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index 976bc0085d8e..b4cac7c43c74 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -3,4 +3,4 @@ AUX graphite-web-0.9.13-system-libs.patch 3379 BLAKE2B 28fbbd23365d67891b6b818a7
 DIST graphite-web-0.9.13-share.png 325 SHA256 cbd268fc44900f6f25a79000a799a9653eb170f6cb1450322a748edf1532680d SHA512 19dc9139e97a99bf06fded2958bc52bc856fa11d0dc50f57e6c54214373795534cb74883ab5da7a05e2ddb69a2870d3b02dcf2ab0628bdf289f1ffd925e044e2 WHIRLPOOL 93f49283e42b35464e2b51d765e2bab23884506734a48d4e4aec9744ceaf649c6d342f37b75aeba030b38e4f4ae4030bb7bfbdfc771928b69b70ea7aae9b5a81
 DIST graphite-web-0.9.13.tar.gz 2182781 SHA256 745ee8cd4c16735df1f7c0a7211dbfdd1234678262a1453aef14d04438260851 SHA512 5e2cc84ec57e1fa0ecff8c9671d8753655a8ce2c07ce2f446451ceaad7679b0cefe932de45315be360b8f13eb25cd25ef179814f340c2c42b0e7048a3d4f4a96 WHIRLPOOL d13f111aaaadb91c5da62a1fd62d36e623501822e5faf3cdea78a7b165a4c111717b2d8d007af29e9bd54e1f5f0b5b648d10908b4721360ae00229aca145623f
 EBUILD graphite-web-0.9.13-r3.ebuild 3418 BLAKE2B 7c884d1866210c4be2c884663dedea1ede3b9dc8fd3b0189e7cc07c063292420df118e6b578dbe7be97beb7812c45d5630c37c129ec6ac01df3a60708dfa5fb0 SHA512 6ec67b34b46994ab4e9761bcf72b58ec5f62609353ef1349a26ef2580a9bff16c1737423c9073add748a141002f235a019ee5f6f36d98f8e43f2b7eafa00675a
-MISC metadata.xml 460 BLAKE2B 0483eaa04fa8a32418151c84885d3e9492a2e70185f8530692f2429531eb08ce0cba82cf2156069f91c65563e602d6fcdc47e8d73db47012a717d732136cb6b2 SHA512 ef9a9d13235f8f393cba7eb33c2e86ff1ef965a13283c7ab46a5b0bd5ce23d4b6fc2dabe5ef36166eeb4076ef8f1e578b8cde2c223139306dfc562ab5016fc4a
+MISC metadata.xml 446 BLAKE2B a0d9086db1e991d5ec91bda9c99ba49f6068ffc3c04117dfe974a41ad0ba6d00e0ff15ce931996e3fce3519f873ae8c3ee1be403c0e4e38758e5cd2183ec6e03 SHA512 7a94e8f66bf14b0d74b4825908282db8bf8155d14c21fda79aa3815cc0b0aa70c2ebfbc69e3239d9fd1bec02f072b9423cc54cc4d0d605fa5febb39651b25f3d
diff --git a/net-analyzer/graphite-web/metadata.xml b/net-analyzer/graphite-web/metadata.xml
index 51189851a341..851f07a3b532 100644
--- a/net-analyzer/graphite-web/metadata.xml
+++ b/net-analyzer/graphite-web/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grobian@gentoo.org</email>
-    <name>Fabian Groffen</name>
-  </maintainer>
-  <use>
-    <flag name="memcached">Enable memcached support</flag>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<use>
+		<flag name="memcached">Enable memcached support</flag>
 		<flag name="carbon">Enable carbon support</flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">graphite-web</remote-id>
-  </upstream>
+	</use>
+	<upstream>
+		<remote-id type="pypi">graphite-web</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 1f30cc689689..9155c38804ee 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -5,9 +5,9 @@ AUX icinga-init.d 1353 BLAKE2B 4ecd29415170e3e5e8cec15dfda08db8ebc75da9b5c49fe31
 AUX icinga-lighty.conf 465 BLAKE2B fe68f22ac43b2010c50fb47da1219e8e60d5f68ea57eef47e53ce890ab6a441abcf4ee9adf2d9b90105366d42f6f711b129f7851d0ba6c2c3ccbce363d596892 SHA512 2a8783945330c54eaa331587f2e7291bdddb8c6717c659ac8dfec7c14ab762a01a870f5fb35d91bb54f36c867eb56c13dce11b5ab13d6e5b6fc9049ce5f57372
 AUX ido2db-conf.d 35 BLAKE2B ca911fa8d9094fc5507849fdc4787156e0015676ee0e77006093af867120af9783d53f91b90493960acdc2878273fe10730bef36bdcc26c017a4a2d3400cf6cc SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f
 AUX ido2db-init.d 822 BLAKE2B 6affaf5af609a93ee1c12b9ff0b76e3cd4883ab26e58fedd6bff36978873b6347c005d0ba5018e3b0bb40771b1f8eebf259a6f387786154243a0b00b1c8e4b04 SHA512 8593a676389aae540a4fa3e4c7c6f558254da018b13b8dda7a932307645029775659b1258c68fa2178086978c59250be4820b0cc1a3d3c7ded276aa17a3b9b6e
-DIST CVE-2015-8010_1.13.3.patch 177807 SHA256 8ccd8cdf221b8f2aa90ae1e4c76ccc61e7cf7519eadc9482c671502c2138c2a7 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a WHIRLPOOL 90f3eb3a6ad79337cf9d7fe63e201e313769fea6e3fdf2f2de0b2072b1b21e66d650b632794dcb39b458e7c17449f7fb2d45d678a3b628a467496284f238231d
+DIST CVE-2015-8010_1.13.3.patch 177807 BLAKE2B c3832442d2953f28793236cd29c537041fc68e976e593da4793cd55c240de784c5bb3996ff38464097b3af27bb276d21c7538c90d2470d5067a831b1800f2874 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a
 DIST icinga-1.13.4.tar.gz 18741576 SHA256 5690f6b3f3340d341a265fe61598ff3f64cb7d135a0059e791b51c77bcd4833b SHA512 245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6 WHIRLPOOL 92c444ae98139c570b420cef83182401ee7756328a4edd89b52187c1844526aea0e374839395df082fff4504e2ace14366488a2d1d0864998890add32cd08c40
-DIST icinga-1.14.0.tar.gz 20779347 SHA256 440d6b0596804cdfb21ed93b4f74592a144e7d9ee15cc88b3079276cb0370851 SHA512 f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a WHIRLPOOL 165c32d53d328de53822bae6cc0b68f4529c4a9ebb1aab5ccd97fa6e42256025f788dda6d09326578907c7b4a0ce2e72f50f95b923a378401fcc4dbd7f415522
+DIST icinga-1.14.0.tar.gz 20779347 BLAKE2B 65899e99fdc57563aa1dee6f19572c032c5ab6e2aa7093482bd6d6068b4d066d3630ce9bf1396efcb65592d4f25292149178dac81a2a0b775745f70b7409bcc0 SHA512 f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a
 EBUILD icinga-1.13.4.ebuild 7956 BLAKE2B 656e1db2b2d7ae0d1b7ccb2eb931565212732e2530542c1bb81cdc293f79bcc7909cc80964e475e29bd40a93abded0377dd3fcbb01640bbaa1dd846716053459 SHA512 ec0b90e102cc5f0b282731f923c15b259c4581f35eaed8eafd13678f9455754f808004b38c0f03eb723ff61fcffb51750f90163e6c4b2b5c887a286e029c429f
 EBUILD icinga-1.14.0.ebuild 7920 BLAKE2B d5fe3a133c5733b7116376e4ca7c64ca7c621a6dfea314c6464e40d11004151a647594ca9502dff679236d7783d85465fab5b48efdb833d8421243462065dc42 SHA512 ef73833c299d5dba38c489e77a8faf22356949bc7599f5e6da2d3540921015507410062227d7330a42155b32e3d84cca252b4366fc43e735d39f3c6a3d1111cd
 MISC metadata.xml 853 BLAKE2B 6825b192328f944e2389f221e4dbf5fffea45f1cb650866a8240e53c723ae9b40473e092d48003844fd99b65db4e6ddc7747eddbf7239e7cf4ecddfcca375eb8 SHA512 1aad02d84c0e90f4f0f5ed54e326d9a14e77f5146b3ba9293279e009f45900a69e1b2fcc9f54cb02111f05bb2aef0370cda1b4bc4fffa4fc4dd0c2a073e0a92b
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 744d6475f4ff..ba1b7f5e6e21 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -4,10 +4,10 @@ AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd12
 DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47
 DIST icinga2-2.7.1.tar.gz 2475348 SHA256 79f2cd2cba66b2d2a785d37cccd4a47611f7b0b7d52b9a625a22f0c7ff12f7f0 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd WHIRLPOOL be07801033b8e10d3a4aaa26e9cd6b75663aed4cf513f8d592b05ea13e0626ab3021d5a52ebeedfa754752057a1d3378fd54c1f8fd1ec5dc72338c891d6b9785
 DIST icinga2-2.7.2.tar.gz 2471098 SHA256 7e9691ad3389f04a53042d88c1ac8a37e2c9aaf8287856cad3fa48825adaee84 SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d WHIRLPOOL 55e55189b9a1f6646cb94748a7b22731cd5f0d576a858737530187bbab83f40c8973f1a9f508449b0dcb997af443e75a15c9b2ef775c8fe95d1740c72db214c9
-DIST icinga2-2.8.0.tar.gz 2497043 SHA256 bdb1434dc1f502f350c659371c0920d68eeb982add0c5e94b5c16068dbef8fd0 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6 WHIRLPOOL 3af07a98c9debf2bf846e5cbb619e86cdb8b0b91b5a3796b6046ddad96ab23b4526ee47c128ee2c85e82348f6b6a11ac4681604005ac23c9aeebdd7518ce4e3e
+DIST icinga2-2.8.0.tar.gz 2497043 BLAKE2B 06472b30ad1fa008796fb149ac067cf92062443d4c6ef62043b6e53b901e1c282c68d1949a3ac6eabc33456c3863bb5dfe45cd668b23ac22e705e3e346afbd59 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6
 EBUILD icinga2-2.7.0-r1.ebuild 4648 BLAKE2B 08a2478b8dae25efdfc9cd05c0221b6121c8c0a82a656c7cc6cbae9435fc0bb0a5e404b9363d89bfc5c2705550e8bf64905934175c38108eece05b2076bf43db SHA512 aa2c2ac86a697c75a4ef4c14a8ae1f57164d7614e06082aadbed2b43bcd8762938ac8afd9beb64c982bfb4e29dc5d08b530987248132e218247b8c930195837f
 EBUILD icinga2-2.7.1-r1.ebuild 4758 BLAKE2B e5699067582e9bfac6012fee8a84dfa7885b7987c8992eb1047f1c8a014120ad1b6d6f6501bfcbf3c841b0f0fcad9f2355a0f5ca06b07a2fc797f23f7861534f SHA512 62084a343b8362cbb2b6a2d25e10366e6739316a90152b57e8542b53026dde020196b96e67d20cd9dce199cf551d2d2a34685d6ea3b97878fe76524e5212a280
 EBUILD icinga2-2.7.2.ebuild 4760 BLAKE2B 2ee60166986809c528dd1c09c42a99dbd3a61f16e90540ca2fa6d3c6fbfba140679e663a333247c22ded647b6579bd2d392d4a3b5707cda167c9be95ad57f49d SHA512 87fa97f3731c5c5c4e6801fd40d2a235fd43039ecf2ab78f969cea26c8115a20dc42d4499a9bfe987335131ceb053e6f7994db806466d932a9fe54119e34c734
-EBUILD icinga2-2.8.0.ebuild 4664 BLAKE2B 17112f63042ef74b9233e9b6afa217ad4d687c99e9c4e1ccc4061fd75b5d327054c84f5cc56d66e1ffc3228c1a24bc1155e61baa730278df6150c3983ef173f9 SHA512 bf4c4c91f36ad8822f28c7016b24e175fec0491f67123d85b8012b98bd15d610253d2f27a90c484f973a13979389eeef23239375ffc275210ac2adbbf3c06fd9
+EBUILD icinga2-2.8.0.ebuild 4672 BLAKE2B c4d8ae24f14c6c3a24e7e379358bc908803499bb2e72ead217ccc1731a28d099f0841f711bc693a880edd63844c057bfae76aeed590abb9cbb3604ac3f80ca8b SHA512 ca43d0efe3bfa1b8612b90e46722b0be82fee8833a3d355733b656d8381c9f0424d0cdb4c11c290617815f6161745e02c2324613a6435ee0fa52c22268b6e232
 EBUILD icinga2-9999.ebuild 4640 BLAKE2B e5069da49c9bd8ad85acd1ce625830a4288286e6f4f35842befbf20dd86ebac444a7d1ed620d074e99687dba631b32e64e45b2566b151c4a4a158ca526e40ae2 SHA512 af60417cf3d755e82fdef7fbb3ce310e20e35ca4d68696d67e4d53340bd747e94058da89bb7f6ca1ae31317d76471291d276fcbd1cd51edfef615db1a31f1688
 MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/icinga2-2.8.0.ebuild b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
index 1f39bf4c1399..a65926a88a9a 100644
--- a/net-analyzer/icinga2/icinga2-2.8.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.0.ebuild
@@ -5,12 +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="~ppc ~ppc64"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"
diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest
index 0f093dd9b618..0469f797bc0b 100644
--- a/net-analyzer/masscan/Manifest
+++ b/net-analyzer/masscan/Manifest
@@ -4,4 +4,4 @@ DIST masscan-1.0.3.tar.gz 333393 SHA256 331edd529df1904bcbcfb43029ced7e2dafe1744
 DIST masscan-1.0.4.tar.gz 343513 SHA256 51de345f677f46595fc3bd747bfb61bc9ff130adcbec48f3401f8057c8702af9 SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b WHIRLPOOL e90bfe019e1c047b3f3c8e8c7e51ac2998c8b4eed817c9757dcf1d1fdffa9f1f298d4944e6cad67346159c8ba1ad886895f2b74184a8aa7818881e4a15c28a72
 EBUILD masscan-1.0.3-r2.ebuild 981 BLAKE2B b6632841e6585690de0478ce52cfa15588093adc7764b3f27294b459fe336f7bae8a12fa43e5830c6a06a5fe64bf6ea749cd18d1da59ccbd11a53802b0e5ca67 SHA512 73af493d6e0f90b62383c3a3931b761b90d185a650bcfedf1565c077996b238c9247ee6eee24d5b26f4cb5a674ce937b1ecafeea7e5e7b4221c838d79e7cdfb7
 EBUILD masscan-1.0.4.ebuild 802 BLAKE2B ca40492b8bd1cd457a6bff9cf36fa8d4dca1506159c2356901e076b2008c3a6beb9489a6deaf4d557a48bdb968db0c0b8a90d821a021131cf9851046b18dedf0 SHA512 009a6801721979fef9d79101bd9f3badd492c386d4abbef0b2b7a861de23685ceecb885feb0c1ba1cfc06ee9a53e86c293c893445164b72d600734f7c0a834d6
-MISC metadata.xml 982 BLAKE2B a4bc1f67f897582f19c0bfe52a7470e224fda333e67f40ef9e9e3c0873358cadd25f2e0ea960243548b8cdb6ec787a7de137bf83a5789a3dc467ea3cba580167 SHA512 02a138f9c887f08d6bea4707fcc717d1dc8feccd3ed9c2e030973768bc42fdb41e67a987485398f61f723cae75e3db7ff3144c5e8a0a572da8b52f96badd0480
+MISC metadata.xml 975 BLAKE2B 6867f941d5c26ae55542c5ae8e7c75b5d6ff4995dde7757d9666b50659028a8a86706fb2f551778603141ae8b063a7395ce27aaec035eba06adad1fe9a37fa3d SHA512 454748e7c1338b149c4273ac52361a671eece56eff745f07ab6b966689737fd6ffc1b901c3a5844f1fd584fdd78016c6bfd63e9957f9eb8b2463c352165df782
diff --git a/net-analyzer/masscan/metadata.xml b/net-analyzer/masscan/metadata.xml
index ab58c05fdec9..0009b85ef1f3 100644
--- a/net-analyzer/masscan/metadata.xml
+++ b/net-analyzer/masscan/metadata.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <longdescription lang="en">
- This is the fastest Internet port scanner. It can scan the
- entire Internet in under 6 minutes, transmitting 10 million
- packets per second.
- 
- It produces results similar to nmap, the most famous port
- scanner. Internally, it operates more like scanrand,
- unicornscan, and ZMap, using asynchronous transmission.
- The major difference is that it's faster than these other
- scanners. In addition, it's more flexible, allowing
- arbitrary address ranges and port ranges.
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is the fastest Internet port scanner. It can scan the
+		entire Internet in under 6 minutes, transmitting 10 million
+		packets per second.
+
+		It produces results similar to nmap, the most famous port
+		scanner. Internally, it operates more like scanrand,
+		unicornscan, and ZMap, using asynchronous transmission.
+		The major difference is that it's faster than these other
+		scanners. In addition, it's more flexible, allowing
+		arbitrary address ranges and port ranges.
 	</longdescription>
-  <upstream>
-    <remote-id type="github">robertdavidgraham/masscan</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="github">robertdavidgraham/masscan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest
index 7ec6429cb7d6..34db2d0c2e9e 100644
--- a/net-analyzer/nagios-plugin-check_raid/Manifest
+++ b/net-analyzer/nagios-plugin-check_raid/Manifest
@@ -1,9 +1,11 @@
-DIST nagios-plugin-check_raid-02b6425dac3db7e98d4c36bf0836357c6b36196c.tar.gz 49866 SHA256 959e269e58795cf89fab61b041511513d1b724855f1d38338f1f5e4e1083a8a7 SHA512 548241cd344c135dd6509e930329a9957184330a6f317f758a35c32fc680d421932e3daa12a8f7c0ec8071f96f9e63619de4dff2ea648652b6c2494e800d7ed4 WHIRLPOOL cd00353df2c133576e36f8fe204e11fb754fed081565d87b305905b0ee2a1e6c652f11a9bb99769e1467e838711583886dfe9ecfeb3c40c566069ce07af84cd0
-DIST nagios-plugin-check_raid-4.0.0.tar.gz 46308 SHA256 eb33c54b6c532076dafe72bc80905c17d1604fc306f5075b6fdc6cf41dcd8ac2 SHA512 0f80321615a29665c32bef8b5426fad5994c28b48446167d81504b8ae5720c28b9eaf449f48147e5fc7b24907560994d61b81bed68f9b8caa9a87b18eddd9ee9 WHIRLPOOL 8af62afd9eff172ab4e24bbde564c52826390ad40130ae091d62c10634e0313cb55f39e163988349015694389c152a6e4930c84ebd230ac3686a59e8b6ca56b9
-DIST nagios-plugin-check_raid-4.0.1.tar.gz 50173 SHA256 270fd6c8189269152255ceb19288736afe4b9398b1a9a94409e2c73f13fa43d3 SHA512 882d76d71231d675caaf75883962c3983acbec194ee437ee7447f75607b1767e3aed3e939bdafb90cfab5d131c40d3e0b1d77b90a4c19a4809f18c9e64c114fd WHIRLPOOL bb9b31925a9977de4393bb4f949ac6ec281144e8d6c25ee33e14002bac546b3f2b89cf3a9c84a208d7505d1e1378bd19805ebd018d639c595c1b6fd7a67f0750
-DIST nagios-plugin-check_raid-5da4400ff978189d6be889f2448099535baa01f4.tar.gz 46422 SHA256 423da601fa7471dda5db839a07a52ce21e33ec00e09ad859f4fac4705f6bad18 SHA512 4c4d372735576cf104886c62c071dc98512687ecc1b2f3d56f614c24b747566ff849119c3e0a71b011db5a32e67f50c9d772c0c68a895320e0a5b63322cf6446 WHIRLPOOL 791836ab95edc679cd2288ba9231c4eccddd1d7a09cca68ce446fde498503942a040d48862f4157ebe1b83f645d31b77f7a7a6785095d3e4a5a7a40f56dd56c4
+DIST nagios-plugin-check_raid-02b6425dac3db7e98d4c36bf0836357c6b36196c.tar.gz 49866 BLAKE2B 067097f4aae85615e85e5481c3c3a5e6f6f3ce61056c61f59e5c6febca3f84e697999dad87626aaae04f853ade9efbd07d17c61c933fafd9252ee8d372a4cfc7 SHA512 548241cd344c135dd6509e930329a9957184330a6f317f758a35c32fc680d421932e3daa12a8f7c0ec8071f96f9e63619de4dff2ea648652b6c2494e800d7ed4
+DIST nagios-plugin-check_raid-4.0.0.tar.gz 46308 BLAKE2B 025f983416ef5b1340fe2c3c1b4aa8784be23201ebdbf2ab9ed7c4e885c91b992d523ab26d7aed42cb9df44f7ab890034a968ee60e7d928311c99021ab10abb4 SHA512 0f80321615a29665c32bef8b5426fad5994c28b48446167d81504b8ae5720c28b9eaf449f48147e5fc7b24907560994d61b81bed68f9b8caa9a87b18eddd9ee9
+DIST nagios-plugin-check_raid-4.0.1.tar.gz 50173 BLAKE2B 35831f0511fc71b883919303f534bb9c4760160031ff62beff6d5eedea44f1f058bd80bfe770585e2f256b1ba8e53e2708808fdc420d3bb8ca95941f73c5ab40 SHA512 882d76d71231d675caaf75883962c3983acbec194ee437ee7447f75607b1767e3aed3e939bdafb90cfab5d131c40d3e0b1d77b90a4c19a4809f18c9e64c114fd
+DIST nagios-plugin-check_raid-4.0.2.tar.gz 50680 BLAKE2B f483876d3c7f7ec5d266d1cd22eddb50534505caa90d0715325148f6314e54aa83e4b42ad4ec8d7edcfed6c640af7e6f86f1f93314d92de39b02b67598f82339 SHA512 b02f32c91eb6bf54f4bd66cb57bf3d43b5f89320be095fcf31b224865f04f24c91245be2afee5ff8588757ff75462e62e1d89ef824e6fbe4d3f90d4a015e0ba3
+DIST nagios-plugin-check_raid-5da4400ff978189d6be889f2448099535baa01f4.tar.gz 46422 BLAKE2B a6049f58a4ff50bf86f85c6d8f35ffbc19a1a6ba6dccfb275bc59ea6e15635b8c8c001d5fbda6030f75adea78fb75dbb7e83628c73f9af76291c3547f64a1ee7 SHA512 4c4d372735576cf104886c62c071dc98512687ecc1b2f3d56f614c24b747566ff849119c3e0a71b011db5a32e67f50c9d772c0c68a895320e0a5b63322cf6446
 EBUILD nagios-plugin-check_raid-4.0.0-r1.ebuild 2093 BLAKE2B 9b022e8593beffbde0c442207226819c48d2f9e4b144e17280d23a0c539106ddeed9c53d7b0fd21e8d4b2c4e982928ed2424c6b1e739451f76e1c46961140d34 SHA512 41719dd9092b671b0660679aa9af8a29cdcfc1a7aee423f2af9fa66b2b444f8f0b33f114fb6b19358bc66830d6f78c73e99a71280fb8cb8c95f10e4a313cf482
 EBUILD nagios-plugin-check_raid-4.0.0_p20151215.ebuild 2125 BLAKE2B 1a0965bc5068cf3d2fd562a4e6504378e1adbe69f4db8bf1ba54e9d1ce8b2c098c4eea30153e21ac773400526400cd5f51e943533f91aa2a8bcf969bad31d32b SHA512 84ec5f6c48ecb436857b2600e46b6873651c909e8804574c5ee6468daf211a225de1cd9cad18d072aee4a410b006f51e273a7d6649993db080b58e5789e13e43
 EBUILD nagios-plugin-check_raid-4.0.0_p20160215.ebuild 2125 BLAKE2B 297c2311ce23b913cf953d64c4122f668355cbe69f8001410238ae1fa01d39f4d8d64ea5adb3186b78cbe1f9d0c167de192cd362a25c83a41b4f5637401f882f SHA512 1f9afc62ee8684d2151011b6c9c9a8a59224268436f2c637398e12448b3f15d11ffb443cca6456eab2800317cd201059c71992bf3b875f7940d916cb0813624e
 EBUILD nagios-plugin-check_raid-4.0.1.ebuild 2085 BLAKE2B ca2ec67f60be9a5908fe8bca3cfaf8702e9d8abace3d33e8a8d8ffc5d90d9ff0830ac0ff7af64b948676cf0d88132f795a76e4c5d16941305c38ca9d2b0c6f78 SHA512 c5f3ae89ce16bf5a49c954204eb24abe601e74f9b24813d31a1a8750ec76ba0e023f7f582dedced2df24937ecc91854d586a48bc143ab49b8f3da0a2cddfed1b
+EBUILD nagios-plugin-check_raid-4.0.2.ebuild 2085 BLAKE2B a44ba0c0ef0193d39f5d6dbbb5d9474f070adf11e4c9651eed3ad9b7bae30e4a3a14bfa9fcfc8d1eeda6e76a31e9b5c2870f495c8ea1366e6b8e76789bd943d1 SHA512 e3c52ce72719b6b1f9573154f0157e409d3d07c03d495de9a8998be3c6a4ae0124de5178537659e130c81c8f4064b92584ebee8c7176264e2b07b554bf24ca18
 MISC metadata.xml 1205 BLAKE2B c0db04d446c462e232e95278a362fae4ee0ece2b71a8ee2c5ec457bf22f4c9efe851d77ddf8a3e581fb03d035a5bb1ec14d2d412c335700a072825212927f4c8 SHA512 c91761d711709ae8edd20e716e7233242feecbc3156f86c1811add83b453ae8cfb71e2de66ee3902f56f182d87019bd11eb417ca5e1e99ef540f920088dce472
diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild
new file mode 100644
index 000000000000..45d59e9956e9
--- /dev/null
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status"
+HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid"
+#COMMIT=""
+MY_PV="${COMMIT:-$PV}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="${HOMEPAGE}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ware aacraid dmraid hpa hpsa i2o megaraid-sas megaraid-scsi mpt mpt-sas2"
+
+DEPEND="dev-perl/Monitoring-Plugin
+		dev-perl/Module-Pluggable"
+RDEPEND="${DEPEND}
+		sys-apps/smartmontools
+		sys-fs/lsscsi
+		3ware? ( sys-block/tw_cli )
+		aacraid? ( sys-block/arcconf )
+		dmraid? ( sys-fs/dmraid )
+		hpa? ( sys-block/hpacucli )
+		hpsa? ( sys-apps/cciss_vol_status )
+		i2o? ( sys-apps/raidutils )
+		megaraid-sas? ( sys-block/megacli )
+		megaraid-scsi? ( sys-block/megarc )
+		mpt-sas2? ( sys-block/sas2ircu )
+		mpt? ( sys-block/mpt-status )
+		"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Upstream has a custom Makefile that is meant to build bundles.
+	mv -f Makefile Makefile.upstream
+	sed -i '/CPANfile/d' Makefile.PL
+	default
+}
+
+src_install() {
+	default
+	plugindir="/usr/$(get_libdir)/nagios/plugins"
+	dodir "$plugindir"
+	mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}"
+	dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg
+}
+
+pkg_postinst() {
+	einfo "The following RAID controllers are supported without special tools:"
+	einfo "GDT (Intel/ICP) RAID Controller"
+	einfo "HP MSA (special configuration needed)"
+	einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:"
+	einfo "Intel: CmdTool2"
+	einfo "Areca: areca-cli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10"
+	einfo "Marvell RAID: mvcli"
+	einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92"
+	einfo "Adaptec ServeRAID: aaccli"
+	einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)"
+	einfo "Adaptec ServeRAID 7k: ipssend"
+}
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index 8ce1c53aa667..7f4f7425a87a 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -2,4 +2,4 @@ DIST nethogs-0.8.1.tar.gz 35986 SHA256 4c30ef43814549974a5b01fb1a94eb72ff08628c5
 DIST nethogs-0.8.5.tar.gz 112385 SHA256 6a9392726feca43228b3f0265379154946ef0544c2ca2cac59ec35a24f469dcc SHA512 a2be81fcebc9925dd8a0fd9f71c6e790206819e0cc5efeeeb0c741baa9fd25ec685a1784b6d331d938cf14381403f9c13d619509d0ffe713ce8786a83a380908 WHIRLPOOL 6316e96fa87afb13d62436395415bb9acd090d7a2de4c3eb7496c2b11419c3c9d35a8bdd3e4944f5023c038f7b72200917fa108721aa8b0add43deffc95f9eea
 EBUILD nethogs-0.8.1.ebuild 679 BLAKE2B 46d88f3418e4943c042b016882041268b68f35a13ba3c15ebc4b053ac0c301acd5053e167cd378342d3434033d4ee9da8ad8aa548f257ac183cb0efb28bc6ddf SHA512 76fa00e33e4055259e67843469bdee9433c3d0499e1301b3962e1a2c55417d671eac99c8c08c54671c468e4da58c5faabb8e2461f9b179dac7b20011dff03368
 EBUILD nethogs-0.8.5-r1.ebuild 689 BLAKE2B 3e21d63b3cce7042f03bb4312f92023354a013d81ec35f383c137ea1220bd8d009de0390b98fdaa8ba365f1479232d7b3daed29e6e1490cb73cc1654160a856d SHA512 da5cd91218bc70ba87be1998f7641221cb39f3d6bfea73d1d6e1deadead85b8c849c5751f8c747ec698b2a5c9ef1fdc343ae26dbcae1c267d722d527b83e33c7
-MISC metadata.xml 891 BLAKE2B a11f8c29ec7ae54933048902c2890c87ab9ec636edac103e89d92afae7013a8d74ee748645e8de33ab6caa8e78d55baec450c2107aebb794fb01a27b97a40f4f SHA512 a35aac4c7bdd3b013efc2553947c625a7f5d5ded3a4c8f7abce732ae3d59e148abacb929d28266abf3585cdf47e776a81fb25d388e477a011a1201d280d90620
+MISC metadata.xml 898 BLAKE2B 401dd16bdfff0b3ab7baa1c51a28938ac428b4ff646e46e65efd7a5f612541be58a35c4ef68f48cec0b3f63af1624377615f8b4bb14bd8e8d9f4c297708e3b3c SHA512 324d822a63e6a8e179d487c840ae2fe10c5cb16a6973c40d480666e5a3d95b596495c1989de8afe8809a6888a17fccef7b7ca4ebacd0d4d0543611253dfa73ed
diff --git a/net-analyzer/nethogs/metadata.xml b/net-analyzer/nethogs/metadata.xml
index 1b55544df345..03dae9d25e4b 100644
--- a/net-analyzer/nethogs/metadata.xml
+++ b/net-analyzer/nethogs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -6,12 +6,12 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<longdescription>
-NetHogs is a small 'net top' tool. Instead of breaking the traffic down
- per protocol or per subnet, like most tools do, it groups bandwidth by 
-process. NetHogs does not rely on a special kernel module to be loaded. 
-If there's suddenly a lot of network traffic, you can fire up NetHogs and 
-immediately see which PID is causing this. This makes it easy to indentify 
-programs that have gone wild and are suddenly taking up your bandwidth.
+		NetHogs is a small 'net top' tool. Instead of breaking the traffic down
+		per protocol or per subnet, like most tools do, it groups bandwidth by
+		process. NetHogs does not rely on a special kernel module to be loaded.
+		If there's suddenly a lot of network traffic, you can fire up NetHogs and
+		immediately see which PID is causing this. This makes it easy to indentify
+		programs that have gone wild and are suddenly taking up your bandwidth.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">nethogs</remote-id>
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 7a2a8a7ee096..4f9dd9cc0bae 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -6,11 +6,11 @@ AUX pnp4nagios-0.6.14-makefile.patch 1057 BLAKE2B 623115771d66839df357cf19ceb0ea
 AUX pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch 3578 BLAKE2B d452715960cbf2418d394d13a547177462cc97d30e19e7adfc9ba83e64d511efe6231a1020f2a4ed943ec10aa1e5cc97679a23d88c7ef0eae9a2fa5c5d71f800 SHA512 a0a5c57808b59b748c7d8cb3febe1b4f29fce1e37abe546ae65b4037da330f580b90f155f7c179f7ae8ddcc8d25d5e595d8e6d5699738531f22dfab40e5cfc84
 DIST pnp4nagios-0.6.24.tar.gz 2919182 SHA256 87412ef01257c6096aa5c84fdb47db950b851c596e1306180be8ba45401793cf SHA512 7e8c32e0ac69ab747a57e8ab6cc59fddfb63e16598fda9c1e6270d6309ff0885cd1bd0876d05aa1d30bffa76b281d41dc8fbe59e430778bf4d3bdddc4a7bee9f WHIRLPOOL 4f48b406a7d82a4370701ede2625ed2c247bb933a9197d3417c4eb18f18b879465aeb4775e9a0f0300ac1140159df6c6130466b5434c0b33bccb7fff04de86f8
 DIST pnp4nagios-0.6.25.tar.gz 2921068 SHA256 62d9cdcb132326753373b18fafebd716ec27dc5cbe1ef42204440fca21ca7a0c SHA512 e561fcac8243e6b1ab401312b4a05a6c752e2869da7366a22e4e48d54ae1e9c17c52cb2dffb1ca5748179f3bc856f779317196992643e9862eb09c4debf277c8 WHIRLPOOL 9267bbb04b3cdfdd4d12601508a6d602aa9513a096aac06adf4631fcb1218d2e24fef7a6be1defd8a3ac87106a9cdf6b689b50c432fe0f07ca45d7fbf665d810
-DIST pnp4nagios-0.6.26.tar.gz 3039265 SHA256 ab59a8a02d0f70de3cf89b12fe1e9216e4b1127bc29c04a036cd06dde72ee8fb SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427 WHIRLPOOL 9e4d3565f37ace45d509b86b5b603d37aebed0fde385f27d78b2a1c231ff9f2cba6973a7f29b216755e76b139dce087411e22ceaafcbe51e890691f49e2161d9
+DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427
 EBUILD pnp4nagios-0.6.24.ebuild 1970 BLAKE2B f186f42c32e1f5e767c8e9de01c94d9d1b3c320c89577b90a4901dad29800b67027f441329876d9d453fe88697322b060685054681fef9c6a181f99d3325bad3 SHA512 248b5f4ff3bbaa3d2dd71ae1efbb5a65e1926ca709034e2e3d4c62966608f9e83c6136ed0be63586c5dbd4b1d5e0f56705ccd68ccefaeb9d420d89f8bd26fd02
 EBUILD pnp4nagios-0.6.25-r1.ebuild 2906 BLAKE2B 06c491fcc0b3396f8c118bfc136009d5854f14bcd8bb14246f911036271071f2b1e5ca6c3b87a2a05c2d1b4b4b9c55080863eaf083f22c2a93a858f1a45f3656 SHA512 f1c56eba7c88eb6359f50f637f871cedd22f74134522ba0b2e0de355411c4322f013fe438503b366986962072ba168ac4d015145b10aa6893b3999b6776707c5
 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 3105 BLAKE2B ec7e3f558a669ddfcfcd94980b855f5bbb329a2e2b78fe53fbdf8d886e5f3005f99087840b4c23deb779893c894b157b6f7e1a0fb4db90ffdf768e3835d5f51c SHA512 4b614437ec0238f67d72c15e599d6efda10722db58d556137fdb5c1e6e73c3a2af49141d10323117e27212adf8322d9587d232ead307168767c43508c6f7478b
+EBUILD pnp4nagios-0.6.26-r9.ebuild 3103 BLAKE2B fe561edd648b84d4133cd21ed2c723a11ba1dc05019ed38d9034ee65f267e9f4499b50fcd987c72d59c5b02318d6a94c24a8c600fc1e0b27fe9dd52441282c87 SHA512 258a875833691dc9e5434458b1c8d27bba95b0c7324f7d910f8188cb3994a14c4f7d2bcb2c90c2e920d51b1601c7f332d753fb7f502c51f3ada4a6320e0458ee
 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 ffa296c13489..784147a6a682 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
@@ -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-alertmanager/Manifest b/net-analyzer/prometheus-alertmanager/Manifest
index c0411eb485a4..5ab55c80a3f9 100644
--- a/net-analyzer/prometheus-alertmanager/Manifest
+++ b/net-analyzer/prometheus-alertmanager/Manifest
@@ -1,7 +1,5 @@
 AUX prometheus-alertmanager.confd 56 BLAKE2B ef4e238231a5ecfcfb87e99cb86661b267df17352f36ca2de7074d755c7d722674d49615361ba6dd730b6b54bcb132b89d4d9c65c7c41ab0104d4fd39bf527a5 SHA512 3ec5894fa121a3449f2b1c3f82283abc3fc31f39b4397760101a5d3c7c41a35cad50b03387542e4c950ae61bcc456b3ff4a92b52c53a04d12755005d0287d57e
 AUX prometheus-alertmanager.initd 587 BLAKE2B 64b5409b07e04567a5ecfd7928866f0287f4b70cda725f7d464d4a9a59f08dc54ee32e0c07375108b7ab12ccc8cc150a6a1f6162b7c316041620266cc48863a2 SHA512 7e19c82d62d9b226d2bc5926ba6a988bdd283bbeb911cb9339e451885ded5a1e9a4a1f5635f5d5266b23f3fbe896a334586c940ccc505ffbb84ff9fb9ff7d75f
-DIST prometheus-alertmanager-0.11.0.tar.gz 3683030 SHA256 0d1a27f220101cf6691adfd504311a824c95cf2ed02bed900536616aa398aaf3 SHA512 33e6d5010979a7abab032019c1e50bc3e8f3630dd7e2453b1a1b37ce1035694bc78ae748ad1903afef95b6646aa167a3c0fa7f4e7b74bd3f1336106ca998b342 WHIRLPOOL 6b63bce13242054d2bbc5838c38d79bf3d793337435863887fa16bd0954efeca6579730cbbb30e0215bdfcf239612887d03a2d1e9cc3746f836a14319a2df989
-DIST prometheus-alertmanager-0.9.1.tar.gz 3671292 SHA256 067e00773efd0948918a30449d5e96b5cc9b0b9ecb1271d75bbd46ad3944a699 SHA512 423079c630466a6c3eeaab56d60bd9b7c77049955e9a67b703ef51665ccf7af0b319e8e3748c8e6d055dcf442173028cbe475181be08221d93a5ad3d20900c65 WHIRLPOOL 1fdf9803ffb99bda6ca49f250ff2895e29a6a77b17b1f38f47ca1f858262580f307f56bd95f0a6e97cd7a0a04e3b0df1fe28401cc6f66b71a72311df0971b970
+DIST prometheus-alertmanager-0.11.0.tar.gz 3683030 BLAKE2B b362c8d35762c13ae31597f9633378639061095e0ca1f9361a9c0376290bbb1534bd7ced2488c79d04b0c053d5a7930e39b12f309bd3a8e57660ead48264ef1d SHA512 33e6d5010979a7abab032019c1e50bc3e8f3630dd7e2453b1a1b37ce1035694bc78ae748ad1903afef95b6646aa167a3c0fa7f4e7b74bd3f1336106ca998b342
 EBUILD prometheus-alertmanager-0.11.0.ebuild 1340 BLAKE2B c7e3f5ca4737612aaf4496517bae2fa80db9488e4367c2dcf7e64f6782d13eb48e5c0be5626485b1b31ceef7fe4bed8a119167c25dc73e58013ec87f028c2264 SHA512 f16322bbd9bdf3709debaadbe39e8bc33d8f9422ead655554b43b791a52275901798dc3a1e02769c238f4255061cde4a03fe4fbec89c321b90262aca6d1ee6f0
-EBUILD prometheus-alertmanager-0.9.1.ebuild 1340 BLAKE2B 8a94e0c3a81bacb417fa043fecb6e57e1f7814afb1dc95b3f65837c60c96f9f494bd72e4830fdf20852f31867d0a43e7ee0b95e11b248fa41d082081edebe6af SHA512 e9a557f400e3dac49a33c5773b9c51ae7780781098aa11a2167ed352aceac02667584f31f03859e44776d47f66c98468aa9575765ab39014855f5eb45e0d0f6b
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.9.1.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.9.1.ebuild
deleted file mode 100644
index d04d5de449d7..000000000000
--- a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.9.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="9f5f4b2"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
-HOMEPAGE="https://github.com/prometheus/alertmanager"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix alertmanager || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin alertmanager/alertmanager
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	insinto /etc/alertmanager/
-	newins doc/examples/simple.yml config.yml.example
-	popd || die
-	keepdir /var/lib/alertmanager /var/log/alertmanager
-	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus-snmp_exporter/Manifest b/net-analyzer/prometheus-snmp_exporter/Manifest
index 15768cf4b5dd..ed4a9702e887 100644
--- a/net-analyzer/prometheus-snmp_exporter/Manifest
+++ b/net-analyzer/prometheus-snmp_exporter/Manifest
@@ -1,7 +1,5 @@
 AUX prometheus-snmp_exporter.confd 98 BLAKE2B e03f8ce27a768194caf0691b11bc11369d2da3da6f9dc3c659a5b179864a3d8812df63cc458ab969b024957e8bd0a9208b26331279fe328dea55cc08339ac1ab SHA512 027ff624a0e5faae571e36cf0fdf860e13956976878a7b3ca2afbf5e6387ecb02d391974cf7c44c33468d34a16cf00d10ee153f3b7507b9cc5a62126b70c5a39
 AUX prometheus-snmp_exporter.initd 591 BLAKE2B e5c58dd7b054cfb817deaaa084b49935711dcb3aefdd3d074ef759fc7f6ccb634faf4009c0bdce5090d3b780e3d498e75b0ceb610d676e1dded98518bc7d6c31 SHA512 0e53ef6790dc60091c0ed3b9cb7f47fabf526db80f9f09e212880efff59e9c0b3abb19235fe9b82da15cfb8aacb1eab326902f51d4908af80348023ae59bd474
-DIST prometheus-snmp_exporter-0.7.0.tar.gz 3250164 SHA256 da9d0c4baa21a317a88ebbb0e836a4665614d03421d2c4ecb7df7e5217920398 SHA512 b0564fcd38eb823d136b25c3aa4e8f1df495eb6f262f105e6686adab80a794cd2cc47f51f40606aa4b51d29e0ab6851216b147b37e406e450b4f9559caaee5d1 WHIRLPOOL a0c4a7e53cc24ea712f681440be5757c40f7585037fa8a7f1e71da7aee2fb1a4084d2648e3b0076c452f7740657b710d9eb986b1e97e8b5bf44b04617d2c3405
 DIST prometheus-snmp_exporter-0.8.0.tar.gz 3257344 SHA256 740ede001e6ae0a08cda52b0efcd43b24f81431010175ae2a0c687264732860a SHA512 0cae5fc107baedd8d498972aa7c6b3b48ff19f951c5366e5be5173009e956de8da06b84a46926d6f157287df0793e996686740c491f502da24172d5806b49339 WHIRLPOOL 09b785cb3e1331198c8657f60444d491ac5270fcc39136737af1076656e5939fa59225be8edc3e8e6a0985ddc19c24e9ba97d962eb412525537fdfa4642ce371
-EBUILD prometheus-snmp_exporter-0.7.0.ebuild 1283 BLAKE2B 513216f885836c99e144329578f38fb6df9ba442f5a591dada712aadac1b1bd5b83dc5acccdaa3f84888f3f2312bfb83d3ece485502512d777057088e7e44ced SHA512 f4ed186384e0521a3e3469c20a57b5282f51100c37c6033b519e46db8dcf1f2bcbefe2bddb140ff9f91728735ad108d1fd5a198aa3ee70c480826bb6fe2cf9c2
 EBUILD prometheus-snmp_exporter-0.8.0.ebuild 1283 BLAKE2B b3c24b51562921582f3966cd044a58cf5520f56ce510590da95eb8ae21e1b16e29e7f075621f3682ab1887670edffe67131c32c9486a7736874a5e606b36bb02 SHA512 1dbd6445b2e975578ff92cd2e3334d0ee7773c2ad58160ca3d6f5d2843f5668d46d715315481480705d5e0c55bee9dc1bf468bc009884b1c84ac0acb3715386b
 MISC metadata.xml 334 BLAKE2B a805d1d3f519c6ac1ef9c7f2cb5a0947740e6fe9a37fc77490e2011a27dae8ff981b3e482a55c117553eaa60f0e3c8d017d867c4fe082c8ebdc4e4bdac22f750 SHA512 7fd3e4314022bf2ff86bd01f335d5c4402676970b9810575225aff3d40bd5bdc9ffc27b438c880dc0a665cf3873502b969dfb30644b3c106278fd353820d6599
diff --git a/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.7.0.ebuild b/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.7.0.ebuild
deleted file mode 100644
index 15ca77ed1b70..000000000000
--- a/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/snmp_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-SNMP_EXPORTER_COMMIT="9147920"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for snmp metrics"
-HOMEPAGE="https://github.com/prometheus/snmp_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix snmp_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin snmp_exporter/snmp_exporter
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	insinto /etc/snmp_exporter
-	newins snmp.yml snmp.yml.example
-	popd || die
-	keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
-	fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ca9c11c611b8..c9088e7a6337 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,10 +1,10 @@
 AUX wireshark-1.99.8-qtchooser.patch 296 BLAKE2B 0a3f7a0aacf868e6af938bf4a67267c657838ff2bb09f51dca59d399fdbefdb0b86df6debdd6c244817586591d8e5dcb53136eb5be23eb96423fa61204276f75 SHA512 ecdbc5b3164cbef46d9f9e647deefc141ef2fa261fdab2e46df8a6235af544e8496b22a87ffefb60be34907a8432a6e6ec4d3a9fb3789404d946558cab7a0afc
 AUX wireshark-2.1.0-sse4_2-r1.patch 498 BLAKE2B 05af1325a8bb709676fc2e205b41790fd305555480d804c5c13915f1b46ddc1be8b4d967f1dd60fa70263a663d4f345386399dabc33c63c97a55ba8c43b565ac SHA512 1938754656a0654a3e40909c30c9416e65078b2d664b44d31ef9e75cd2d0dbb360982106c9300ffca60da81aeb27c8a37298c9aff762d0800d77d17e46b9a524
 AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde7e32aca4b3dd11928a50ddbfdec9b53386957eb473fa93fc21bf791c052a4808b03e00a775d4c1e9f61a1c007c03b6953 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b
-AUX wireshark-99999999-androiddump.patch 198 BLAKE2B f98e555f0a8e7ca64c665d49cd99266155e08f9daac081256d515736105e7721aab69dd6e95f68bd33b530ce2c221377329a4b2642aaadcdc9411590e8f44259 SHA512 7fd971d2b7bbf0bc3685021e0bf55e412e9995cb5d95be85da92d3191227f4af4de94b13a99cfef4f71c74225aa3fd471e5ca23ac6586ab9372f563f3c18c967
-DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
-DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177
+AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
+DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
+DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417
 EBUILD wireshark-2.2.7.ebuild 6489 BLAKE2B ef6b2cfc35890633c5936cf7513a4570b6006b92d6b5cfd504b3b097bb2f978c5c1b59253cd81b9704ba105a84f5adfdf9f9b0cc75a99f4f6a0b175fa3f1f9de SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9
 EBUILD wireshark-2.4.2.ebuild 7337 BLAKE2B 64d920110b5c8b15591d3b13f49b9580f737fec9d3e6debd40635b1fe318719a2a26f34f4a52537f12d4e3cf78126909187e66e263364410c84af74f3809037f SHA512 8e77633581947acc961ff073d9f117326497ff6cab113a26fccd3d8931b231ddcd62b6b8a704e175d2546b6af15d0fa831407c99fdf17d96de24afc470c35439
-EBUILD wireshark-99999999.ebuild 7244 BLAKE2B 7efda1e67a4ea4579f77f7052902133ee794435b35c3d0ead045f50f7e44bfdc03bed4a846a44387e6fa2363dc1d0d36645db61a3e8e54f3a6787fa910dd9b11 SHA512 84107c356b10259f6b230931ff136c3dcd364e7aa928cc29609d253ec36e11193e7f723548965c9f085c49040a9ddcf9bfcfd476242178b25ae8213eb0617742
+EBUILD wireshark-99999999.ebuild 7112 BLAKE2B 1523fd808c7c82714c3562e430960a3665bcc92f21ff801c8cf50f9240f7f59339007d32244a54e60842849b415d36e19a9cce816bd91c11882eddc44e8e25b6 SHA512 f7fbcbadcd41ef497b2d01af12c5a6299c89d5b6554778571fba05428e0df021c03750fe40ba6aae7cf926b92fbf7cf2fc556eae64e8698b6935a9502caf8dff
 MISC metadata.xml 4696 BLAKE2B 1492ecb0d92c063457da068e82af411ffeb77d6f50f89f16d380062dcbb51a90281c3a82e59830b9e67dc3e5aabbdca8e89febbd852286f9c4bb87711210fe66 SHA512 51ab08d5390ea4d2a4b4e2ce505e9d28932c9dc08d739107e4dada664603fb1a0a89e08f2431af4f84b5f6be303b0b2ad28e2a22fecd7186497809b708be7c51
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
index 124a9b8b00be..db1c560848ec 100644
--- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
@@ -1,10 +1,10 @@
 --- a/extcap/Makefile.am
 +++ b/extcap/Makefile.am
-@@ -49,6 +49,7 @@
- androiddump_LDADD = \
+@@ -32,6 +32,7 @@
+ 	../ui/libui.a			\
  	../wiretap/libwiretap.la	\
  	../wsutil/libwsutil.la		\
 +	@PCAP_LIBS@ \
  	@GLIB_LIBS@
  
- if ENABLE_STATIC
+ randpktdump_SOURCES = \
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 5d11c1bd60e1..f8b854c9dc0b 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -146,8 +146,6 @@ src_configure() {
 	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) \
@@ -173,7 +171,7 @@ src_configure() {
 		$(use_with geoip) \
 		$(use_with gtk gtk 3) \
 		$(use_with kerberos krb5) \
-		$(use_with libssh ssh) \
+		$(use_with libssh) \
 		$(use_with libxml2) \
 		$(use_with lua) \
 		$(use_with nghttp2) \
@@ -192,7 +190,6 @@ src_configure() {
 		$(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[@]}
@@ -236,7 +233,6 @@ src_install() {
 		epan/dissectors/*.h \
 		epan/ftypes/*.h \
 		epan/wmem/*.h \
-		register.h \
 		wiretap/*.h \
 		ws_diag_control.h \
 		ws_symbol_export.h \