gentoo resync : 10.11.2017

32 files changed, 548 insertions, 200 deletions

diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index b0ceda310a6f..8facfbc04a4e 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -5,11 +5,13 @@ DIST goaccess-0.6.1.tar.gz 150264 SHA256 f414664769c884cdda33c92e6df1069fb8a1750
 DIST goaccess-0.8.5.tar.gz 189006 SHA256 a4c6b6b98875059409b2a7528d5e7662536591b1949461cb03d88ea1360c3a88 SHA512 736ae69d0c3bbbaf1d06b287c2d600aae1a72255361c9bb40d1c74986932a771c2b401126e75f22ad4be72f6dc053efd262c40ad40cd62efc57c4461d5481c63 WHIRLPOOL fc2328e558135ca277f8ab52a922a726b3994c47f41fdff2a3110197c4430cb2fd928928d2fba124825a8a127b03ac8551799b0d16b9b2d655ec8a324af56216
 DIST goaccess-0.9.tar.gz 213119 SHA256 49d8ec4ca2b2ff2e848f278c6eed4a541082cfbf781540140ca16d58735f27fa SHA512 c25703fa31dd673bdb3463e3c5055ba3452f1fdb452c63114663d9dfb28b95ddb4cd89b03fd4a9fdbabd0efebc2e3ab35238fd15bc46727f794d04ba77fc072c WHIRLPOOL 58b95d5b8a60b49afb423b85040acb2a163452cd21c65a7f44f2c35e53017b28461089fea7edf5f45dc8169f4d92b21bc62d958d9b66d518d2739a5f7d867855
 DIST goaccess-1.1.1.tar.gz 412635 SHA256 4c73147037b350081d66e912a07fb2f0a60484fad1090a76fb6fc24ee086b6d3 SHA512 5ceb21754721603fa6422436fcac158bf3ea0ec54680851ceb6616a3385a2ad1ce38670b3cea62e14178e71c32999260fefbc29a82b115b1a1a30010879184d2 WHIRLPOOL 8b2d7177ae242bd4cc19d9672d819b6e60316ba0932164254bf21a2c297f7bfb77669d9c289d47d9bd3d854dd440391877bbab956aecd271e5fc8e83cfcd3a27
+DIST goaccess-1.2.tar.gz 423103 SHA256 6ba9f66540ea58fc2c17f175265f9ed76d74a8432eeac1182b74ebf4f2cd3414 SHA512 bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889 WHIRLPOOL bced8eb90cfda573fc872e392486f86c75eeb5667b7a012d995321dbc730d2ca425f6a310bc5ac987c1eea05c459f4056e32243c3d46586db7db190b960ae44b
 EBUILD goaccess-0.5-r1.ebuild 993 SHA256 6242807d76d4f3fd4e9602d8b4b6b20436ce7024922f1a99094080124c49c5d7 SHA512 86244e84b7fe24fd199499ec9fcff2daae13d9d440e507dd1f5e554a63fc1fe747ee38dee5aa8993fad8d31c25ddbecb4050a364bfbcdc7b8591ce4a056211d1 WHIRLPOOL 74a92794bde82b26539fa21a38cc83763fb36f3bc6d9c809e697f6bc38526b1a8524d0bfd632205af18d7bcf24c176ba11893008a559b7204b8bc7c2b3c1aa8f
 EBUILD goaccess-0.6.1.ebuild 929 SHA256 ca4c02589345877bc092d8ba292047d17e419bc315ff74fc1a2199baa51f400e SHA512 96a818290e67fc1a3c1f6833ed2a8f6abaf57cd9c2738fce5931d40e09c02fdcabbf128240921f9873491ec9c0b33bfb307a80645341f1e9931c7ea96a666829 WHIRLPOOL ddb2d931aa49494fe05551f6890e9056586862b3c436ba9e4bbdc3c6989708c27c77d9a776383ea74eec73082146b126eafd399b3c0d2a8a65d4e0292449dfa3
 EBUILD goaccess-0.8.5.ebuild 1079 SHA256 9de337c985cdcdd60aac7b93b9fd917054478b93c8372cc01d52d0398771bb4b SHA512 8d82dca54efa9b5759a095d4106f4e93db633238b653ee65f665e2002c009e9111b37762a15a9f3f6eaa9439a9e1aa76b175a61bfc3c90d7cab936108450e801 WHIRLPOOL a6717f552240a33148aef3b9fd6f224923ce30fcd12dba2049d7bf49829dcc7fd98ec7d78a052fae25688a3d9a4db554bb11b140869526221dcfd6c6484dc712
 EBUILD goaccess-0.9.ebuild 1088 SHA256 21cd6a4eafb8bf18e37a25ad62e76aa26ae4d208e460a6c411bc576dc34fe3e7 SHA512 0b0c77a68152711e06e30b3a34492a3d095648213c84586c885a5fd69f4c61600ea47c3dfc9ce3ede7fd6f43a929d1de69b68fd60c9d0d32fa8ae0fb12f65ab5 WHIRLPOOL af8603399ecdb9874dbd3f77fa05a55fb20f88302d26e475c85e4bed86720b93910631d643e7ac668994d65425988739926114e3c855b69fd7de9632f8db36ca
 EBUILD goaccess-1.1.1.ebuild 1280 SHA256 58bbfa239bbc303ef0876b2d561ba2a3767b82d454b59f8cf12a366c5814266f SHA512 2b0784d5f6138c0582f502d37fa82a88c730d3a9589041189ffb54ee1172534c00f8ecf71ffc221e117e583f0b23318fcbd611ab768c65f3d3ded465d06fe012 WHIRLPOOL 7e43972da5803c6af6368e61f899d87ddbd6d3430baf35fa1678b3b619f40c0b39b40924b19d52bfb5fcd4ded52a2217c8fa87d426b160ce098a2b70c53b3d18
+EBUILD goaccess-1.2.ebuild 1398 SHA256 8eded6a05bddae06923f4f6f8427aaec7ec45735c9a3835fd42f8b8497549fff SHA512 b08146d7354977cc33070b01807a5a0ce86a529bfe6002e2a900a4e263d562566477de61ca24ffcfaba9974deae93a525d2d930b0bf2725583440ab39fdc0d3e WHIRLPOOL 17925183a55c713968df85abdb42b862bacf5311b8d43013c65fd813950d7875fabd838abc566181142986a74b1d0959c96842513f5a9861a6b44004bdcf76a8
 MISC ChangeLog 3215 SHA256 680b2130239c52031fd26a40fae69a41ee8c995c14d7f889b30f6ffe6d27abcc SHA512 3c3b227dbd37aa883ba31f59bcd1f303db5b0a0d6b1a0312c021a84d7319d625ca14c78300f2300ce80df26b215c1957b511ed7edcfa72c1812f7adb739ba42b WHIRLPOOL 68b69ed472aeaab5574487e66bb75308b97f93a27c9ca248a7e071914b12c31a64717b8ae8666b77a312a13f0ecca0e0f06c6eb2c64df5a536447cd79b190125
 MISC ChangeLog-2015 1856 SHA256 0ab8b3aa3beead809bfdb11f8961715576d82a6cc3afa8afab69afad37dc6337 SHA512 9d6fd1bae575336c647b43e9fb9d7ba0579247e3a8330eefb44877d4904ce3c278954230024fd6303d4e9c75a34a1f30c642830f4f1f5cc11cc6d9b948fa4eb7 WHIRLPOOL 17d267a62a328522d6bfb2edce5c2517e710ffb6d4b2bf5494fa3db5ad54962c227e8672478852b703af51f90069453153d0e6cf332df8c11dd1f51e51939a30
-MISC metadata.xml 1241 SHA256 40382963ad58d31a776c65c30b9bea6764eb2009bb2e6280240fa496a621e366 SHA512 57c94633b42e29c362a29aa665207db35adcb9017c9f30eefdea4b31fba2698b37230e00b08682fc718f548c45ee3ab9e244d2f8a4226e45a1d4df83f4533263 WHIRLPOOL 6dde172071f5586a1b87f1013ee1c5ffb30b32a53eb32130327122e43fe782aae87ed96368f18229c1716893a13d1d0a49b436d2d31ab827f737784af530d5f0
+MISC metadata.xml 1285 SHA256 28ba90ec96dcb213fde33b474842a428a27f3e62df4084ba4d990421bd0e0dba SHA512 78f3ef78c2b82a194eff376d6403eb4efea871bf43081310e59f3dcc03910cb9c8dab180c6adddd3356c7e5d6f6e13e3bfe062ed90421923de1793a4106e81e6 WHIRLPOOL 7bb095143cede14d78773c6a7038432b49bfac84fe26c56360e73d8cd1e855c0e29073a7a315d9db7555b1c3d59930915e16317c248720e94ba233c13a5dc16c
diff --git a/net-analyzer/goaccess/goaccess-1.2.ebuild b/net-analyzer/goaccess/goaccess-1.2.ebuild
new file mode 100644
index 000000000000..fc4075601073
--- /dev/null
+++ b/net-analyzer/goaccess/goaccess-1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal"
+HOMEPAGE="https://goaccess.io"
+SRC_URI="https://tar.goaccess.io/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl unicode zlib"
+
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+	geoip? (
+		!geoipv2? ( dev-libs/geoip )
+		geoipv2? ( dev-libs/libmaxminddb:0= )
+	)
+	!tokyocabinet? ( dev-libs/glib:2 )
+	tokyocabinet? (
+		dev-db/tokyocabinet[bzip2?,zlib?]
+		btree? (
+			bzip2? ( app-arch/bzip2 )
+			zlib? ( sys-libs/zlib )
+		)
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) zlib? ( btree )"
+
+src_configure() {
+	econf \
+		$(use_enable bzip2 bzip) \
+		$(use_enable zlib) \
+		$(use_enable debug) \
+		$(use_enable geoip geoip $(usex geoipv2 mmdb legacy)) \
+		$(use_enable tokyocabinet tcb $(usex btree btree memhash)) \
+		$(use_enable unicode utf8) \
+		$(use_with getline) \
+		$(use_with ssl openssl)
+}
+
+pkg_preinst() {
+	# Change path to GeoIP bases in config
+	sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess.conf || die "sed failed for goaccess.conf"
+}
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index d71ec4559820..f0fb091e2b59 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/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="person">
@@ -17,6 +17,7 @@
 	</longdescription>
 	<use>
 		<flag name="btree">Enable Tokyo Cabinet's on-disk B+ Tree database backend</flag>
+		<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
 		<flag name="getline">Use GNU getline() to parse full line requests</flag>
 		<flag name="memhash">Enable Tokyo Cabinet's on-memory hash database backend</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet's on-memory hash database backend</flag>
@@ -25,6 +26,5 @@
 		<doc>http://goaccess.io/faq</doc>
 		<bugs-to>mailto:goaccess@prosoftcorp.com</bugs-to>
 		<remote-id type="github">allinurl/goaccess</remote-id>
-		<remote-id type="sourceforge">goaccess</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index 3b86c8a2c2a4..54fdeb80c321 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -8,7 +8,7 @@ AUX hping-3_pre20051105-tclsh-proper-escaping.patch 550 SHA256 fae6070e347621569
 AUX hping-3_pre20051105.patch 1036 SHA256 1ed8dc0b7b3b3c5336457dfce557f6b82b66b4d49df018f3d934b379fa1ef7e7 SHA512 ab1a6f85d8ba6e91097260b2044502f69033dd7466869cac19d50a1830a9eeea105617ec62e14cebe953b49992a3548c08f243638171de3524cb0058cf6d713e WHIRLPOOL 9ddaea90840c221d272fadffbc1b3d349dd426093f73f37927612e612eff911a148df19316e8f98e590764ba4d9f4a09e9a3e205113fea2c21923b6433c36a3e
 DIST hping3-20051105.tar.gz 584001 SHA256 f5a671a62a11dc8114fa98eade19542ed1c3aa3c832b0e572ca0eb1a5a4faee8 SHA512 3b3faa836e70054c8f9f004d876b7eb5f668b64826a6aaf8ca3685619111d9df4eb494a7d38b83cea6cb5f0bd164956461039bf4f73f7c7e90d80cede639b2b3 WHIRLPOOL 2043ac3d71d795a34abe0fc58f525b54e25ca0b8fadb7b2e88d8a6f5d6f4744bda4471f74c96212a78f58510572c1079683ca57650428924eb6223ee110ea6c1
 EBUILD hping-3_pre20051105-r3.ebuild 1613 SHA256 846b4748feedf300d822edb30b2e9965f6ec488fb9ecd2d655af6c927d402177 SHA512 8046381313f3f33d05a7d47fb37141f9a8b396915825994c4c05ee7a07834b68b4a3633218d0dbbc92d0ed18db6eafa60c45c18de92709c5dd644fb87b5a5ee2 WHIRLPOOL 41fe02813f4a8122ff0382582d6db7ee23404a5b9a6c57bbb6c3cbb17cb7b37f9b49a051ca2edbcc1069069a6ef58d9b2d1251c28f119c38dccf4a41590194e1
-EBUILD hping-3_pre20051105-r6.ebuild 1598 SHA256 2f410a7bba090670dbeb03d2722da2277082a61453bc8f74ace6ab02850c3cfe SHA512 2e8027bd262664ae3fd8e0c4efb67ea52b7606f8b38635ed83205ba631e41c5ef31234108db146db208e764360c3aa370b91e30c1d3dbe8e407810e357fece90 WHIRLPOOL f84607efbf318e9e63fbd7b2ff0e9df109bbfe861bc0e1efa6648172554c95740889e35da7c151bbffbd7a15927318ee7f2545b0138fabc64e84de28e1e241aa
+EBUILD hping-3_pre20051105-r6.ebuild 1597 SHA256 687655e4fcec0e31307222b47070fec55f86d5315d006ca89a12c3efc3ff6103 SHA512 22f7aa3764f5d91779ab281bd0a173fc8dffad1f61a8886b82d7b0716fe7b36d1d01eb5ae59452859807f3d6dd50cc7d496893140a60dff9b9be09f60d940617 WHIRLPOOL b5ee000b0cb51cb34285d7291452158163723b6c2ae6b063c1bbb4d18521a0cfe268d50411e7507d1a99912e5c40c92a0e0cf174f3fb5c9dac2fca711461978a
 MISC ChangeLog 3205 SHA256 c6d8fe8b1c9b98c97f4756718f326856f45d4340f1fd771510c7c8d7ac785b31 SHA512 0344a0c44f9204c9accd9bb9ce5528533a89631b78097e4d05de8e98d1e17ee1f28a981fd5184ba9350dc31e4811234ccd807ed8691fc08b3971b8a1ca3339d0 WHIRLPOOL 9dedae73bc4fdf287e144547918794d3c7801049f6a0568b3a61b63f2ae3e2e92438450db105ceaf82c1bc9c7bbae79507b137581bafce45115656c157bcab45
 MISC ChangeLog-2015 9905 SHA256 43fe0c3f7c4fdfb62a5af70bc46a08b3ec91b2f678b921a3d8f634eb797f168e SHA512 35d3d0255c98c547ee63bf2e0145247ed0480271a4d3ba21e11ed26ba39241422ab6793d43c65f5f5ccdce3bdb32f28ad0c25d7ffe2dda8c2f670ff19b988878 WHIRLPOOL 4b22508c121909b9c905930ed0e5525830f3f8772507d7a5777294a6049cff012d5b50a66673274b8b11a67786fd33225fe732fe96524077505653e1d94aecfc
 MISC metadata.xml 276 SHA256 d15d6b6bd9ffc8a642c7469d01788ba9158efb4ca27fcf3324d9e52d1b70ec93 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 WHIRLPOOL 26b9e81575f613b751f76234013c30a8da84a1c0dd75c12b8df32706ee753691bbc889a2dec5001cc8c4b05c47aca49ed9fabbb5a6fefed74aaa86d6c3f56cee
diff --git a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
index f0e2878019ef..bf8d34d47be1 100644
--- a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
+++ b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86"
 IUSE="tcl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index c687b06d8c92..79c00da4564d 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -6,7 +6,7 @@ AUX iftop-1.0_pre4-tinfo.patch 1560 SHA256 1040d38d427c1be3c92683d22d4eab025b553
 AUX iftop-1.0_pre4-tsent-set-but-not-used.patch 229 SHA256 d59b0674109223781758f47a28aca6d3c7a8b22c51da0adef40fd8925a12a015 SHA512 06d26d9497c6afc6b7eb5db508def08c8945408e89127f3938667973f8a8b7884dc0e7b005c115a7acd66d62107de5d47d49a869b89f25f24dd999161b0fb0bf WHIRLPOOL 708e4d01e378e6928abfff6c506229e9a220e3f89f9526ec57bd4405f8654abdaf092a40d417cd04644371ed385d59d09b3a435538565415f02625a2849aa4e7
 AUX iftoprc 1391 SHA256 f21c0324774c4b6635359e4de76d13ad6bafdebdcbb29df9f986cc47d3569fa2 SHA512 01373add0177399e7cf4ae0ecba893fdd9c73bad5243478b4ac9ac5e936647738a22906ee1e8b22b51d541cc4150d0e0619f134666a1e3d0cb78a59a5c04b95b WHIRLPOOL 6dfc9099bf5d906844fce63b8aac8326535e0684cf5c26f13a39b9a7df8120dbd1f3bd246e81990f11cc4af2a3e0434958b072f4a63db66f6ae22fff65003eea
 DIST iftop-1.0pre4.tar.gz 204665 SHA256 f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22 WHIRLPOOL 5c02d8d23fe3d73ced4c0e8626226323f2266ef16ef00dc2b00059f4a213066c22c366f9458fe516da05a59830acd581ee23f17dc92e097ca720b220e88103cb
-EBUILD iftop-1.0_pre4-r2.ebuild 943 SHA256 789638117cce265ff59a951f8aafd1bdc87e7f93bd5053e327c85b8505f78571 SHA512 1893bee7314377599cb210dbda81fae8b81b6e0518833926b78cdf2045c88ef1c5b1bccb8d189d8281b71497c64c1b8f225850b68607cd9df88e4e6f497a0989 WHIRLPOOL c1378bf6f522c0dbef654315c47ebfe50b36821967cc6c220f93f75bf030622e99a3b603ca13f3f4a665f018d047f25eac6f509f2b7e7408757f28a950f61228
+EBUILD iftop-1.0_pre4-r2.ebuild 942 SHA256 174576c938243fda06ace4aeb8d06a76806a6eff3a90b47be270878e8d80a60f SHA512 99a36fad0f615711d836ee6e8aa8c4c370c609944cd8fd0d66e40cb3b0b4f8bd0605a5c193a33f1a557ec13a74d63288c4e93a76669f45398183f02bbdfe7898 WHIRLPOOL fca5c69e4028a4b1203bea0935a9f10aa4869049c9c3c25b89344aec032938d4f605dd2225292e020657f6c524d4e98d6f5fdedd7d619d22c72469321f1aa8e9
 EBUILD iftop-1.0_pre4.ebuild 878 SHA256 58378d5f109cbedeebea803d5e85ed5c8de658e6a863c70b35e1c88e7bee5f84 SHA512 343e55b2ce782d9c7e15d9c0e12620c16ae222a5666258215eac083f6a87721fa64ecadfaa83b39bf691b65925ed11f82c6044421f751da5fc2bf7a3bff8705c WHIRLPOOL 34475732003a44e2c1a484990281dbd26875c2dc13ae7bc43951919e8b611ec0b2a60440511639399821be75fea9c406c7c3f4709d93934b3ccb84fcb974bbd7
 MISC ChangeLog 3258 SHA256 04ccb32842470adcac63bcba948137df2f0b782639e542f161ccc2b5dd404652 SHA512 e53e5f2566604a979b4edfe5cc41e22940bfdfe172545e6096b0129e272702b0b4bb8ba704ecb2798c5256c393ffde9a6412c1106fb0fdae8f9b2c44f371c0d4 WHIRLPOOL 54609ee797acd3a7b807d46866b43c374c949e5edb08f6d8359cc507c1fd9726df7838ea88f54ab450dfd95a74774cdc09514c9c723e90e912fe549b4f2f7343
 MISC ChangeLog-2015 10127 SHA256 9fe81554c18a310b194c6e780f805903545e811adeb88287ded62680a0d9070f SHA512 c29bd935ec5a2ae353af752cf9309109e5b5375e5bac18013eb7f975b9524218534c434073f1f8f89c96e271b4c4fa1649a4a90d25f9f0dbc47e8161fe018e9b WHIRLPOOL 2bc88b3bfb9ea190e323e5a12712b29a7f7a8cca367b95f674e393f79b83ebc232d9488f4a921d6660fe61c7edd1003a618389e6957106a2bd5ed093fd6bfdec
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
index bcbf844fda31..3162199d22bf 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index deeda0a42353..de4500abe0b6 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -2,7 +2,7 @@ AUX nagios-check_rbl-1.3.7-perl526.patch 347 SHA256 d11ead366c83234812b058b31957
 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 2098 SHA256 9b3c7728ed444ceec34261d289960ca1d244e26dca134638083fbf1c630d082a SHA512 f2920984e8e196c39a47b4701ca499813540b1d1bb8089125885dcf5fe206ba5c42dca0100d32a623a44626dccdfba2e0da0a705a41d7771eced4df9764d2514 WHIRLPOOL 92ad2da73dd9bd9e5fe803562afa41192efbb0535a98c39a24f3300113cce28a8627d73023cd4350f33654675e0ed965626adc6af1dff5433a9629230b7f63db
-EBUILD nagios-check_rbl-1.4.1.ebuild 1460 SHA256 8af520f9099c7d94e323d21f811cabd340cfa09939a2e83bd8a5ecca032a0eac SHA512 be9c74e7a01702579b1a04e39d58cd9928651b7d14b004ec407d655461e3ce0f22a4e7ef594bb2757b11dcabda8ace8caac8bfcded8e07f828626d5c1d5aba2e WHIRLPOOL de9cdf8127515c59e73a3eedbabf872a36fe4aa3c0266154fbe779aae51be0c829dba209872d4c14fbd93b3330c4a2797d21df340e87e8073bfcce83686633d8
+EBUILD nagios-check_rbl-1.4.1.ebuild 1457 SHA256 b3f1b05a5b3eab9edfa25976b4c465488a62e32482c3563eebef9aae195dc6ce SHA512 d8e3b2411eb5ea6888de3cf8c6f57a125aaa6a61f98ba392167a5abc10fdb02474d518ad383e7e85cd2ffb15c6a81d906657b5701fdc44ac470d5d952b1f66e5 WHIRLPOOL 4968d995d77e7d856b06611e25737f9c05d31ad376a26fdbffe4a5f60b733b0e256938e6642796e2a685be36e8fdca09ae51020a11a62efd426eb4b8dcbd6a65
 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.4.1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
index 9ba9a19d26c8..c307c420402b 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 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa sparc x86"
 IUSE=""
 
 # No, this is not redundant -- see bug 627082.
diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index 9f8404f7279c..d24d14253d9e 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -1,8 +1,9 @@
-AUX ndo2db.init-nagios3 482 SHA256 7d5050da70fb61b7ee29f1ac52b7967db2b5b46e784029616607de658f7def40 SHA512 2679ecf2959c07e6b993e32789b592a3bb8a6443412c8f297303c08255d7761f5f9e47e0f68f92dc3487cbe4795403fae9d98c00f83cbf85cb095739162978a3 WHIRLPOOL 95baf3ee178a60c90784c7d1ad9984f20c1edccf1e1224b6a1b610908b57ad273041f44fed5e0a93379e651d3cf3a0f4cbb65b602dab4796f4cecd2512d85e18
-AUX ndoutils-2.0.0-asprintf.patch 172 SHA256 c7db1469e5be1aeeffb03541dcc851094a8c212d6ad2caae3a37776bdb62ee6b SHA512 f70586d71727cb3017bb1b5c10dacf33f4a4c3ece405d544d182258d96a3540a8b95220d181a65c22a0023cf1c4294c8d2061fd1ab7328c371b0254464119a9c WHIRLPOOL 0100d63a892308766ab7922a5bf92ea4e7c4238b383c0ab50eb52f176207df6e4e934b60929f9ca00367c833eebc74d1b1c84162223e78c4f35debabcb39aab5
-AUX ndoutils-2.0.0-sleep.patch 284 SHA256 b89fdf0f7ff20068e04ccec1411e24c76f7ae85350fd11ee7485bd426e4d9702 SHA512 12ecbe803edc7e4b2c80da34849a7a8e6c64453f98afa51865042282b6420f9a511f08c2f7921ff06455d81a68a35115db942ec1ee6c946969c902dff65346f7 WHIRLPOOL c2f09b6ec089fe25eb78a90dd33a2f467dc3d5c33a7a3848d50c547f2c4c47479b0262d55535d4b5cffebe564ebe4aa5291089f2719a576628dd2940c61f1486
-DIST ndoutils-2.0.0.tar.gz 2207263 SHA256 b95047c812fb61465e66a9e1a6d4a42bf00620f334f08a6faf5afe20bdd43ba1 SHA512 c899c9f9d0a14995ae7e3fc9f8566891acef9186cc53f05e4f509e9dd01a19a17d32c746a4a1c125342ebffad65946c7a3ea11da68ce0ff240bd37e85334545c WHIRLPOOL d3e41eb5e2a3ea9a5ca0d24fc8319beaa914d2bcb16c187ab6c5f5a3f133c27756ecdc2b6302a75c015294a1b2c3cc48d3c87a540ae1b9b07a21eb427b45d181
-EBUILD ndoutils-2.0.0.ebuild 1235 SHA256 d24ca70bfb5c12cf735ca050324a7866d6dc9cea87a0cd97d3ff100502f1279e SHA512 88f28cce914ddc96070c9e5fa9bd3bea6cefdccc7ee97efec302d1df9affaafdf85210e7316acf6f6ab88442d5cfa0768f895b42290ae4306f2bb5f1069d3d74 WHIRLPOOL 1e3dfdf33d0044bf63cc4b906907446695ea4323e8df9bbc3a810e7e3c1013927a5006f1ad7f2c417bcda81956fd075c34612972cd2230226cf77aaa31e4cff7
+AUX format-security.patch 3858 SHA256 055f7dec14c3ea33aa10ae4089d2d93607229c0b78b08ce5c908c7e1b88e399e SHA512 e8a5c867e310b76d7431d783faab1be802f6d04908958c07d278e5cb38462fd88f485759eeda1084caf87ce48f2e439de2d97d0efba701d21ed2a9870c74ed32 WHIRLPOOL a7dc6b498bf1dd658dcbe413f568e798c59691d67a2b3c20541d6a293d37a480f41a6832c13e3952a796b34418019101c27b1292bd68c5ede5b93f1bf30acd59
+AUX ndoutils-2.0.0-asprintf.patch 438 SHA256 17e2a503fc013a51bd217bdb6edef7a855f537d20fcca45d2123d17f8424762c SHA512 78fe5b2004bba81b3956a96ad569b6e05e2eb20e203020d2c07e780dfc78f5f68450fb20a62388ec7ccdc37544cd896f29238dd9590cd474db1f73e101dcb9e6 WHIRLPOOL 78124e9f045b8010adfeb4695430dea3a2bef7b750ead554e5ba084a24b7dc41d6bb6935b559b9441093253d23f81695f9d9514bf3245c0819f2603662261f10
+AUX openrc-init.patch 3296 SHA256 1994ab991ed0a53fa2f1ac88ad59d0aa8a02bb521ef75df4c46b19c7184caebb SHA512 4beb0e72712909554deaa93aa3fe959e80bed3465f4f0a2153f8b4e994538e6d508e303451cc14425ecb5210845308e9a113f491900a977526327a2701b00eb7 WHIRLPOOL 65367fd56295481a7587d157dd000e68896a01c016369d93e01a9e2cd44bfd613ce0bca1f335a80f3b8ff84fe2e75df6afae40e10abc1697f5d99c3eff07cd91
+AUX sample-config-piddir.patch 1098 SHA256 3fcd1e5f1e3c60da10c2e0368c745201e63db2c2d6d6f43658502f6de1071136 SHA512 bae06d6571aa55c5b9f0103d9af861f50b31668f06dc9b9a29cdf961741455384d8c762338dbfb3c75e10bacba360ac5a706b6251a6ef5cec8fa0def4c679344 WHIRLPOOL 94132809459ad6455bdfe81b0eca0b838bfcdf5440d659d389bd51460b629c0377c6b81c012841b1c65c18d3fd2babe21f507c894070904c58661847d660077d
+DIST ndoutils-2.1.3.tar.gz 2182999 SHA256 2517ee737359f16d7f24b13ef2a9a41775bf7e8396a3ecaa7c45758d3ca9ce0a SHA512 727f2051876ff32cafaf9993a69b721ae4ea81031fade12262dbb4c5399c601f3c1af362d9d550e1d6d56fac8fe044d515dc10fc43e7d4d3e981bc9a89db88de WHIRLPOOL 9fb7cf6438da9baad6036b91bac62b8df1a494f0be00d3926e6603fe3783bd8722107ee63280c25f377d942f4a720d9aed04991ff24e2817b045161d142d34a7
+EBUILD ndoutils-2.1.3.ebuild 2430 SHA256 57cad9f5c0f3f15016dbb426a37895a440461d5cf1957b7bdbb8e224cadd1c05 SHA512 e89a8ce44cca00eabf5e4c7234f39531c95543f13051db9e7108deed694af912567cb0a885a287d1fa33975943e5410c2ac0c1ea9014c855ea3e8cc54411f621 WHIRLPOOL 21a5c27b2ce4b49649a22f67046dac861518efba2341e2f5e96cf590fd8879a4faa811ef6059e630fabb9f1cf830a8030d704982464d60b6a3753040f279e6aa
 MISC ChangeLog 4049 SHA256 e74a1694207f5c20fcc90a88e460fd64d21f961793689c204e16ef2ae1c8942f SHA512 ae3812b8b2d539d7366941fa7ac83fb297247fad97a7f1e85c1f2b6be04d1000fca18d4f6807b7094c1ffb4f80bf14dfc8075fb321c509a60c39e1476548440b WHIRLPOOL 360a188ecc18cf69b3d60779f2e9675d296f1ba6c50370807bea4a410757102c4faabc3407d977751f7711efb2bd3189f36cb6000adbba910d891619c611d990
 MISC ChangeLog-2015 2775 SHA256 0043133f70c0b9dca601b54e3e277eff0bb3c948bd8eae5168c0f3eff36d8960 SHA512 3df4c0854d1db10287bea3dec354f53ee16a5be21a82cafddcc5d5abc63fe00524ceb318329f73b3d57b34eba9947e1167ffd0a5f2fe2edcd21f2661f27b2c48 WHIRLPOOL 5cfa45ed6d3d56802997821e8539f9dd4ceecc773e24bc274beaeb3e334f3481dbb4da93ebb6b3a7d91f0cbaa4a13a74b926396b5bbb8ed82c891721acf7fe5e
-MISC metadata.xml 356 SHA256 e1e604c15342d0f5a3406a55e888f8795a3d1eed2f03a2114748cba9fb42b1b2 SHA512 a74005ec3d18121f5379cfd15757c97f94d6e60864406989f3e60dc065dec57fccd2f06534a94e25235f3bb8bffd26e7adbd66a3216d037b1c7f42005f50512a WHIRLPOOL 9a3b5648fbce4441e3332add12489281576682b6b0ba439bb69f1d42688b1af57ebae973da5836476973b0f079b3537b800cbdfc613575575b7b9f8c8f40deec
+MISC metadata.xml 446 SHA256 f6eea1a35ad8bcd2b7d2ce6fc6d7a8bbad9afbf41ada23dba229841970c25fb8 SHA512 744e2dc2da0449a47d7acc67820a5627058f7e962f9b78beabc766936abb8a5a8c55d4bd01f239af9d63b418e36d875e30f591bf6ab694fc171c7387eb1c1c77 WHIRLPOOL bb14279665128a78da94db7735366ab92c1d9261f56d9c68e984dabfb70e3b2d84acdb012255f25be611d8387bc05a018a4def51fca2c1d1257d32a58969435b
diff --git a/net-analyzer/ndoutils/files/format-security.patch b/net-analyzer/ndoutils/files/format-security.patch
new file mode 100644
index 000000000000..75be7dc32103
--- /dev/null
+++ b/net-analyzer/ndoutils/files/format-security.patch
@@ -0,0 +1,115 @@
+From 07891e8fcf692552c57e64429fd52da9e682f6d2 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 22 Jul 2017 16:38:03 -0400
+Subject: [PATCH 1/1] src/queue.c: fix format-security warnings with explicit
+ "%s" format string.
+
+The syslog() function takes as its second argument a format string (a
+la printf), but if the third parameter is a string, then the format
+string can be omitted. This has led to security vulnerabilities in the
+past, and compilers can now warn about it. In particular, GCC has the
+-Wformat-security option, which can be made an error with
+-Werror=format-security.
+
+A few such two-argument calls were present in src/queue.c, where
+constant strings were being logged to syslog. This commit adds the
+second format string parameter (simply "%s" in this case) to avoid the
+compiler warnings.
+
+More information about format-security can be found in Fedora's FAQ:
+
+  https://fedoraproject.org/wiki/Format-Security-FAQ
+---
+ src/queue.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/queue.c b/src/queue.c
+index 8cb7445..50bb519 100644
+--- a/src/queue.c
++++ b/src/queue.c
+@@ -50,7 +50,7 @@ void del_queue() {
+ 	struct msqid_ds buf;
+ 
+ 	if (msgctl(queue_id,IPC_RMID,&buf) < 0) {
+-		syslog(LOG_ERR,"Error: queue remove error.\n");
++		syslog(LOG_ERR, "%s", "Error: queue remove error.\n");
+ 	}
+ }
+ 
+@@ -58,7 +58,7 @@ int get_queue_id(int id) {
+ 	key_t key = ftok(NDO_QUEUE_PATH, NDO_QUEUE_ID+id);
+ 
+ 	if ((queue_id = msgget(key, IPC_CREAT | 0600)) < 0) {
+-		syslog(LOG_ERR,"Error: queue init error.\n");
++		syslog(LOG_ERR, "%s", "Error: queue init error.\n");
+ 	}
+ }
+ 
+@@ -99,7 +99,7 @@ void log_retry( void) {
+ 		if(msgctl(queue_id, IPC_STAT, &queue_stats)) {
+ 			sprintf(curstats, "Unable to determine current message queue usage: error reading IPC_STAT: %d", errno);
+ 			sprintf(logmsg, logfmt, curstats);
+-			syslog(LOG_ERR, logmsg);
++			syslog(LOG_ERR, "%s", logmsg);
+ 			}
+ 		else {
+ #if defined( __linux__)
+@@ -108,24 +108,24 @@ void log_retry( void) {
+ 			if( msgmni < 0) {
+ 				sprintf(curstats, "Unable to determine current message queue usage: error reading IPC_INFO: %d", errno);
+ 				sprintf(logmsg, logfmt, curstats);
+-				syslog(LOG_ERR, logmsg);
++				syslog(LOG_ERR, "%s", logmsg);
+ 				}
+ 			else {
+ 				sprintf(curstats, statsfmt, queue_stats.msg_qnum,
+ 						(unsigned long)msgmni, queue_stats.__msg_cbytes,
+ 						queue_stats.msg_qbytes);
+ 				sprintf(logmsg, logfmt, curstats);
+-				syslog(LOG_ERR, logmsg);
++				syslog(LOG_ERR, "%s", logmsg);
+ 				}
+ #else
+ 			sprintf(logmsg, logfmt, "");
+-			syslog(LOG_ERR, logmsg);
++			syslog(LOG_ERR, "%s", logmsg);
+ #endif
+ 			}
+ 		last_retry_log_time = now;
+ 		}
+ 	else {
+-		syslog(LOG_ERR,"Warning: queue send error, retrying...\n");
++		syslog(LOG_ERR, "%s", "Warning: queue send error, retrying...\n");
+ 		}
+ }
+ 
+@@ -155,14 +155,14 @@ void push_into_queue (char* buf) {
+ 					#endif
+ 				}
+ 				if (retrynum < MAX_RETRIES) {
+-					syslog(LOG_ERR,"Message sent to queue.\n");
++					syslog(LOG_ERR, "%s", "Message sent to queue.\n");
+ 					}
+ 				else {
+-					syslog(LOG_ERR,"Error: max retries exceeded sending message to queue. Kernel queue parameters may need to be tuned. See README.\n");
++					syslog(LOG_ERR, "%s", "Error: max retries exceeded sending message to queue. Kernel queue parameters may need to be tuned. See README.\n");
+ 				}
+ 			}
+ 		else {
+-			syslog(LOG_ERR,"Error: queue send error.\n");
++			syslog(LOG_ERR, "%s", "Error: queue send error.\n");
+ 			}
+ 		}
+ 
+@@ -175,7 +175,7 @@ char* pop_from_queue() {
+ 	zero_string(msg.text, NDO_MAX_MSG_SIZE);
+ 
+ 	if (msgrcv(queue_id, &msg, queue_buff_size, NDO_MSG_TYPE, MSG_NOERROR) < 0) {
+-		syslog(LOG_ERR,"Error: queue recv error.\n");
++		syslog(LOG_ERR, "%s", "Error: queue recv error.\n");
+ 	}
+ 
+ 	int size = strlen(msg.text);
+-- 
+2.13.0
+
diff --git a/net-analyzer/ndoutils/files/ndo2db.init-nagios3 b/net-analyzer/ndoutils/files/ndo2db.init-nagios3
deleted file mode 100644
index 3e1e262f6e0c..000000000000
--- a/net-analyzer/ndoutils/files/ndo2db.init-nagios3
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depends() {
-	before nagios
-	need mysql
-}
-
-start() {
-	ebegin "Starting ndo2db"
-	if [ -S /var/nagios/ndo.sock ] ; then
-		rm -f /var/nagios/ndo.sock
-	fi
-	start-stop-daemon --start --quiet --exec /usr/bin/ndo2db \
-	-- -c /etc/nagios/ndo2db.cfg
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ndo2db"
-	start-stop-daemon --stop --quiet --exec /usr/bin/ndo2db
-	eend $?
-}
diff --git a/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch b/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch
index 146132c21de3..21cf837ba36d 100644
--- a/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch
+++ b/net-analyzer/ndoutils/files/ndoutils-2.0.0-asprintf.patch
@@ -1,3 +1,9 @@
+This is a fix for the QA warnings that result from using asprintf()
+without defining it. That happens because asprintf() is a GNU
+extension, but somehow gets used before _GNU_SOURCE is defined.
+
+Upstream-Bug: https://github.com/NagiosEnterprises/ndoutils/issues/43
+
 --- a/include/config.h.in
 +++ b/include/config.h.in
 @@ -9,6 +9,7 @@
diff --git a/net-analyzer/ndoutils/files/ndoutils-2.0.0-sleep.patch b/net-analyzer/ndoutils/files/ndoutils-2.0.0-sleep.patch
deleted file mode 100644
index 61694baee9e3..000000000000
--- a/net-analyzer/ndoutils/files/ndoutils-2.0.0-sleep.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/queue.c
-+++ b/src/queue.c
-@@ -8,6 +8,7 @@
- #include "../include/queue.h"
- #include <errno.h>
- #include <time.h>
-+#include <unistd.h> /* sleep() */
- 
- #define RETRY_LOG_INTERVAL	600		/* Seconds */
- #define MAX_RETRIES	20				/* Max number of times to retry sending message */
diff --git a/net-analyzer/ndoutils/files/openrc-init.patch b/net-analyzer/ndoutils/files/openrc-init.patch
new file mode 100644
index 000000000000..07fcc63b7f3d
--- /dev/null
+++ b/net-analyzer/ndoutils/files/openrc-init.patch
@@ -0,0 +1,100 @@
+From 61c6e9295bae755713b403626f702b5ac90f2448 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 22 Jul 2017 17:25:29 -0400
+Subject: [PATCH 1/1] startup: simplify the OpenRC init scripts and conf file.
+
+This commit largely rewrites the OpenRC init script with the goal of
+simplifying it. The end result should be functionally the same, but is
+much shorter. The changes are as follows:
+
+ 1. Replace the deprecated /sbin/runscript shebang with /sbin/openrc-run.
+
+ 2. Replace the existing dependencies with "need mysql nagios". The
+    ndo2db daemon needs Nagios to create the TCP or Unix socket over
+    which it will communicate, and obviously it needs mysql to be
+    up and running in order to save any data. The dependencies
+    of mysql and nagios themselves will bring up whatever else is
+    required; nothing else needs to be listed as a dependency of
+    ndo2db.
+
+ 3. Use the "command", "command_args", and "pidfile" OpenRC
+    variables. OpenRC is smart enough to start and stop a well-behaved
+    daemon on its own without a custom start/stop function. By
+    specifying those three variables, we are able to eliminate much of
+    the custom start/stop code in the init script.
+
+Finally, the default value of NDO2DB_CFG in the associated conf file has
+been updated to use @sysconfdir@ instead of @pkgsysconfdir@, which wasn't
+having any effect.
+---
+ startup/openrc-conf.in |  6 ++----
+ startup/openrc-init.in | 42 +++++++++---------------------------------
+ 2 files changed, 11 insertions(+), 37 deletions(-)
+
+diff --git a/startup/openrc-conf.in b/startup/openrc-conf.in
+index d7b5474..69b15b5 100644
+--- a/startup/openrc-conf.in
++++ b/startup/openrc-conf.in
+@@ -1,4 +1,2 @@
+-# /etc/conf.d/ndo2db : config file for /etc/init.d/ndo2db
+-
+-# Configuration file - default is @sysconfdir@/ndo2db.cfg
+-NDO2DB_CFG="@pkgsysconfdir@/ndo2db.cfg"
++# The configuration file to use for ndo2db.
++NDO2DB_CFG="@sysconfdir@/ndo2db.cfg"
+diff --git a/startup/openrc-init.in b/startup/openrc-init.in
+index 119e074..7b3fb40 100644
+--- a/startup/openrc-init.in
++++ b/startup/openrc-init.in
+@@ -1,39 +1,15 @@
+-#!/sbin/runscript
++#!/sbin/openrc-run
+ #
+-# Copyright (c) 2016 Nagios(R) Core(TM) Development Team
++# Copyright (c) 2017 Nagios(R) Core(TM) Development Team
+ #
+-# Start/stop the Nagios Data Out Daemon.
+-#
+-# Goes in /etc/init.d - Config is in /etc/conf.d/ndo2db
+ 
+-NDO2DB_BIN="@sbindir@/ndo2db"
+-NDO2DB_PID="@piddir@/ndo2db.pid"
++command="@sbindir@/ndo2db"
++command_args="-c ${NDO2DB_CFG}"
++description="Nagios Data Out daemon"
++pidfile="@piddir@/ndo2db.pid"
+ 
+ depend() {
+-	use logger dns net localmount netmount nfsmount
+-}
+-
+-checkconfig() {
+-	# Make sure the config file exists
+-	if [ ! -f $NDO2DB_CFG ]; then
+-		eerror "You need to setup $NDO2DB_CFG.
+-		return 1
+-	fi
+-	return 0
+-}
+-
+-start() {
+-	checkconfig || return 1
+-	ebegin "Starting ndo2db"
+-	# Make sure we have a sane current directory
+-	cd /
+-	start-stop-daemon --start --exec $NDO2DB_BIN --pidfile $PID_FILE \
+-		-- -c $NDO2DB_CFG -f
+-	eend $?
+-}
+-
+-stop() {
+-	ebegin "Stopping ndo2db"
+-	start-stop-daemon --stop --exec $NDO2DB_BIN --pidfile $PID_FILE
+-	eend $?
++    # The Nagios core daemon creates the socket that ndo2db tries to
++    # connect to upon starting.
++    need mysql nagios
+ }
+-- 
+2.13.0
+
diff --git a/net-analyzer/ndoutils/files/sample-config-piddir.patch b/net-analyzer/ndoutils/files/sample-config-piddir.patch
new file mode 100644
index 000000000000..902038204988
--- /dev/null
+++ b/net-analyzer/ndoutils/files/sample-config-piddir.patch
@@ -0,0 +1,32 @@
+From 560db1e2bc79bb3321c5f431e149418ec3c28a98 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 23 Jul 2017 07:13:46 -0400
+Subject: [PATCH 1/1] config/ndo2db.cfg-sample.in: use @piddir@ for the pid
+ file.
+
+The "lock_file" setting in ndo2db.cfg specifies where the daemon's pid
+file should be stored. In the past, it was stored in @localstatedir@,
+but @piddir@ is more appropriate. As evidence, all of the init scripts
+in the "startup" directory reference @piddir@ and not @localstatedir@
+for the location of the pid file. This commit updates the sample
+config to agree with the init scripts.
+---
+ config/ndo2db.cfg-sample.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/ndo2db.cfg-sample.in b/config/ndo2db.cfg-sample.in
+index 75266dc..5b46fc9 100644
+--- a/config/ndo2db.cfg-sample.in
++++ b/config/ndo2db.cfg-sample.in
+@@ -10,7 +10,7 @@
+ # This is the lockfile that NDO2DB will use to store its PID number
+ # in when it is running in daemon mode.
+ 
+-lock_file=@localstatedir@/ndo2db.pid
++lock_file=@piddir@/ndo2db.pid
+ 
+ 
+ 
+-- 
+2.13.0
+
diff --git a/net-analyzer/ndoutils/metadata.xml b/net-analyzer/ndoutils/metadata.xml
index 325efab1c501..5c2264521203 100644
--- a/net-analyzer/ndoutils/metadata.xml
+++ b/net-analyzer/ndoutils/metadata.xml
@@ -5,7 +5,10 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mjo@gentoo.org</email>
+	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">nagios</remote-id>
+		<remote-id type="github">NagiosEnterprises/ndoutils</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
deleted file mode 100644
index b813b079881b..000000000000
--- a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-MY_P=${P/_beta/b}
-
-DESCRIPTION="Nagios addon to store Nagios data in a MySQL database"
-HOMEPAGE="http://www.nagios.org"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-
-DEPEND="
-	dev-perl/DBD-mysql
-	dev-perl/DBI
-	virtual/mysql
-"
-RDEPEND="
-	${DEPEND}
-	>=net-analyzer/nagios-core-3.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-asprintf.patch \
-		"${FILESDIR}"/${P}-sleep.patch
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/nagios \
-		--enable-mysql
-}
-
-DOCS=(
-	'docs/NDOUTILS DB Model.pdf'
-	'docs/NDOUtils Documentation.pdf'
-	Changelog
-	README
-	REQUIREMENTS
-	TODO
-	UPGRADING
-)
-
-src_install() {
-	default
-	emake DESTDIR="${D}" install-config
-
-	newinitd "${FILESDIR}"/ndo2db.init-nagios3 ndo2db
-}
-
-pkg_postinst() {
-	elog "To include NDO in your Nagios setup you'll need to activate the NDO broker module"
-	elog "in /etc/nagios/nagios.cfg:"
-	elog "\tbroker_module=/usr/bin/ndomod-3x.o config_file=/etc/nagios/ndomod.cfg"
-}
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild
new file mode 100644
index 000000000000..1872b7849d8d
--- /dev/null
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd
+
+DESCRIPTION="Nagios addon to store Nagios data in a MySQL database"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# We require the "nagios" user from net-analyzer/nagios-core at build
+# time.
+DEPEND="dev-perl/DBD-mysql
+	dev-perl/DBI
+	>=net-analyzer/nagios-core-4
+	virtual/mysql"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DOCS=(
+	Changelog
+	README
+	THANKS
+	TODO
+	UPGRADING
+	"docs/NDOUTILS DB Model.pdf"
+	"docs/NDOUtils Documentation.pdf"
+)
+
+PATCHES=(
+	"${FILESDIR}/format-security.patch"
+	"${FILESDIR}/ndoutils-2.0.0-asprintf.patch"
+	"${FILESDIR}/sample-config-piddir.patch"
+	"${FILESDIR}/openrc-init.patch"
+)
+
+src_configure() {
+	# The localstatedir is where our socket will be created by the
+	# nagios daemon, so we put it in /var/nagios where the "nagios" user
+	# will be able to write.
+	#
+	# And normally, we would use /run for the pid file, but the daemon
+	# drops permissions before creating it, the the piddir also needs
+	# to be writable by the nagios user.
+	econf --enable-mysql \
+		  --localstatedir=/var/nagios \
+		  --sysconfdir=/etc/nagios \
+		  --with-piddir=/var/nagios
+}
+
+src_compile() {
+	# Avoid "emake all" so that we don't build the stuff for nagios-2.x
+	# and nagios-3.x, some of which throws QA warnings. We don't use it
+	# anyway.
+	pushd src
+	emake file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug
+	popd
+}
+
+src_install() {
+	default
+	insinto /etc/nagios
+	newins config/ndo2db.cfg-sample ndo2db.cfg
+	newins config/ndomod.cfg-sample ndomod.cfg
+	newinitd "startup/openrc-init" ndo2db
+	newconfd "startup/openrc-conf" ndo2db
+	systemd_newunit "startup/default-service" "${PN}.service"
+
+	# The documentation isn't installed by the build system
+	dodoc -r docs/html
+
+	# Use symlinks because the installdb/upgradedb scripts use relative
+	# paths to the SQL queries.
+	insinto "/usr/share/${PN}"
+	doins -r db
+	dosym "/usr/share/${PN}/db/installdb" /usr/bin/ndoutils-installdb
+	dosym "/usr/share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb
+}
+
+pkg_postinst() {
+	elog "To include NDO in your Nagios setup, you'll need to activate"
+	elog "the NDO broker module in /etc/nagios/nagios.cfg:"
+	elog "  broker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg"
+}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index efd67d1d9a50..a0f64aa00028 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,8 +1,6 @@
 AUX nessusagent.initd 563 SHA256 8af63cc2f4c139adb87f71fb7178dd554023a3da82e2b45d8e05b1231b067bc1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718 WHIRLPOOL d827f1607d4745beaf343eee0408a66d6fd2cc7b22c92b63132847b0c6bae80add1f9707054456269e364925b4c4d3a46046700496c0096553154fb206910eef
-DIST NessusAgent-6.10.5-es7.x86_64.rpm 15573580 SHA256 47df9f78bc2e79721c4d50c27c7f5d8bf4ddd4f5616ad1dd757d8d6e2d62e853 SHA512 671219b52ad70e5713379447884c4d38488dba62ac44fa9a56145e414ae4890ce9824b99c99218bba1fb3d8ac91ae81674b3c548cf4dc33712ae4ec6438ab826 WHIRLPOOL 75bc381ca9138f0a01a234d34ec45925ef46d08060d35fda0d732efb5779af5d93077b96d592a003542c1534ebb0659464d4129c4b25ce92ceed61c70bbe091c
-DIST NessusAgent-6.10.7-es7.x86_64.rpm 15584200 SHA256 36e90c98e3370df45442b78059fd08c67042e8c01e62b18ed61c0b3397fee2cf SHA512 2a9231abc9f694bd74bf0cc7bfbe56d4d7c58aae4602a5288f3becc5d7c2fddc2fe54c71917f71ed1613596198dbe735f780b38d1836e2e39d63bb9ac28d15b4 WHIRLPOOL c70120a1e7a6d05722189b3697e2c2d9d55343ed523e2da197cbfa2e29b00699d2dd1eea6a732092005b0366bc2ca26951e5536250e5f03d8bb462079360f49b
 DIST NessusAgent-6.10.9-es7.x86_64.rpm 15578800 SHA256 687b2dd40aef6f0cd27613ee05408aec7d9755bb2eed18d243dbb46ce9357f05 SHA512 f84beee03f872a8c5aae4e5d0b63d02b6de5f9786950cf083bc0c9d266f8f5390d6e738c6cdc041c5f927f0644ab382bb4e715445a383a48b3889e89f2b2ef54 WHIRLPOOL 79529bbadfc8ae7abbda7824d660f282bc4a2515c5e9ff1896ead3ddeb8e432b9a4029e46829986f84e4da0aa64a3fc7d9c5f298b41e33aec144c2bbe708e3b9
-EBUILD nessus-agent-bin-6.10.5.ebuild 1953 SHA256 4b5cf962f150d4a2223377d882a5f3198c9cf2ddf75354c7e1c0ccc4b3a6a50a SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c WHIRLPOOL 056003844acbaeb3b467149aa3ff671a82304430a8a412f05ee1b2e2c07b467deb274a3de0d053495b8bfb3efa96341ef400107e2f9dff390facbde43877ae5a
-EBUILD nessus-agent-bin-6.10.7.ebuild 1953 SHA256 4b5cf962f150d4a2223377d882a5f3198c9cf2ddf75354c7e1c0ccc4b3a6a50a SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c WHIRLPOOL 056003844acbaeb3b467149aa3ff671a82304430a8a412f05ee1b2e2c07b467deb274a3de0d053495b8bfb3efa96341ef400107e2f9dff390facbde43877ae5a
+DIST NessusAgent-6.11.2-es7.x86_64.rpm 15539504 SHA256 ed1fe1abfd5790efd1c396ca05fe238cadc937aecf0ada02c6c7b48a43281dbe SHA512 4ce8c8bf1ca8137712a796ddf5a39f139287789a6b966241b0f5831ee69bccdff5519c8fb821a043d00c5014f456a0f941e0d2de278383a49ddd73a0f6c18a2a WHIRLPOOL a6d9bc583af44a503d838991454f6614e3908220eb2aa8a7a371f3ee97fd57543f71b6a29c69f77a353fa30ce73b07e44310fb630bce40004dd20de16cbd9230
 EBUILD nessus-agent-bin-6.10.9.ebuild 1953 SHA256 4b5cf962f150d4a2223377d882a5f3198c9cf2ddf75354c7e1c0ccc4b3a6a50a SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c WHIRLPOOL 056003844acbaeb3b467149aa3ff671a82304430a8a412f05ee1b2e2c07b467deb274a3de0d053495b8bfb3efa96341ef400107e2f9dff390facbde43877ae5a
+EBUILD nessus-agent-bin-6.11.2.ebuild 1953 SHA256 4b5cf962f150d4a2223377d882a5f3198c9cf2ddf75354c7e1c0ccc4b3a6a50a SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c WHIRLPOOL 056003844acbaeb3b467149aa3ff671a82304430a8a412f05ee1b2e2c07b467deb274a3de0d053495b8bfb3efa96341ef400107e2f9dff390facbde43877ae5a
 MISC metadata.xml 245 SHA256 1cbbdb363f68b45429ec1f8c22f5c47251f2376210c285a59e0cf6f905131563 SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a WHIRLPOOL 1c76cb23b2bece7265391203746461cfef14ac3966ecb8c411739ba4f7214bd6952deeb910c04f9f3bf6c60f9847ca006654100a6f76e06a90fa2da2f5a68048
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.7.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.7.ebuild
deleted file mode 100644
index f7e50ca245a6..000000000000
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm pax-utils systemd
-
-MY_P="NessusAgent-${PV}-es7"
-
-DESCRIPTION="A remote security scanner for Linux - agent component"
-HOMEPAGE="https://www.tenable.com/"
-SRC_URI="${MY_P}.x86_64.rpm"
-
-LICENSE="GPL-2 Nessus-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-QA_PREBUILT="opt/nessus_agent/bin/nasl
-	opt/nessus_agent/bin/nessus-mkrand
-	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
-	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
-	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
-	opt/nessus_agent/sbin/nessus-check-signature
-	opt/nessus_agent/sbin/nessus-service
-	opt/nessus_agent/sbin/nessuscli
-	opt/nessus_agent/sbin/nessusd"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}/agent-download"
-	einfo "The archive should then be placed into ${DISTDIR}."
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
-
-	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
-
-	# Make sure these originally empty directories do not vanish,
-	# Nessus will not run properly without them
-	keepdir /opt/nessus_agent/com/nessus/CA
-	keepdir /opt/nessus_agent/etc/nessus
-	keepdir /opt/nessus_agent/var/nessus/logs
-	keepdir /opt/nessus_agent/var/nessus/tmp
-	keepdir /opt/nessus_agent/var/nessus/users
-
-	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
-	systemd_dounit usr/lib/systemd/system/nessusagent.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
-		elog "obtain an appropriate linking key and run"
-		elog ""
-		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
-		elog ""
-		elog "This can be done before the agent is started."
-	fi
-}
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.5.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.11.2.ebuild
index f7e50ca245a6..f7e50ca245a6 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.10.5.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.11.2.ebuild
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 292afa1d15c4..56b7ff524c0c 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -6,11 +6,13 @@ AUX pnp4nagios-0.6.14-makefile.patch 1057 SHA256 71fac5f40ba133258754bdd42d50302
 AUX pnp4nagios-0.6.25-rrdtool-0.6.0-support.patch 3578 SHA256 43f616a5a38e8f4a8c2701621f1f8c0d298521515ef93244d7a57739bf9d5cfc SHA512 a0a5c57808b59b748c7d8cb3febe1b4f29fce1e37abe546ae65b4037da330f580b90f155f7c179f7ae8ddcc8d25d5e595d8e6d5699738531f22dfab40e5cfc84 WHIRLPOOL 82d1990283f0ee66ae238eb61e88b362f23a3365d77c4f2bfd991308ecc3b42b987e6004f0e140d8ef4b653bb57af482130d094df2aac17b614c826102f122f2
 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
 EBUILD pnp4nagios-0.6.24.ebuild 1970 SHA256 fcb20f631a894c71a48cdc98f3c72f89ab3dfd6fc4255f4a3a5f78e52d949842 SHA512 248b5f4ff3bbaa3d2dd71ae1efbb5a65e1926ca709034e2e3d4c62966608f9e83c6136ed0be63586c5dbd4b1d5e0f56705ccd68ccefaeb9d420d89f8bd26fd02 WHIRLPOOL f87c0a48707f97b55c162f143306a45764bc42fa39dc201191a6f9b0d34c9a6832c2f400f216ba4e90d9458d048f409c2e9c471dc73ca4f9c23b6b8e4f2db7bc
 EBUILD pnp4nagios-0.6.25-r1.ebuild 2906 SHA256 b96de829942ae538ff31b96f9a0c91766cf3c0632172877a6737ac7171596101 SHA512 f1c56eba7c88eb6359f50f637f871cedd22f74134522ba0b2e0de355411c4322f013fe438503b366986962072ba168ac4d015145b10aa6893b3999b6776707c5 WHIRLPOOL 7e54c72e9af9ee960589a771ea017ed9c8885270fbc44503b32aa1ad2bf9b3aa4eee160bc65a818157e3bdbfd9a483978c98b8328697435ab00fa07550d2077f
 EBUILD pnp4nagios-0.6.25-r2.ebuild 2995 SHA256 79b65741c1860b7e17ce879bb3acbb6564e44c60dc8f6f3e07ec118711d2f6e7 SHA512 142625f3438c605aab45689b2965bdce80d905680a23f3fb40ffc1bb0b0487842235d28493df0042616341a8e93ee3ee79b70361502f2cd5b85d594d5400f447 WHIRLPOOL a8e06b1efc3ea233d80bd16efe048896bf81a14bc9523206da0c0aaf70aa506f868685d588bf4fde1fe8a96efc101d0dd91bc9dc69f2f99a5416e0984d2bd205
 EBUILD pnp4nagios-0.6.25-r3.ebuild 2868 SHA256 b2244b2c82e63b7ed3187c4dbe82e72ca8dec0aac36842e81be37ed7fca36dbc SHA512 45b01c76de8002a28e804895d55e2fbeb5f5dac61a0f6dd5314b60ac0113f76007f58d4c586b7d3fd19ab8a54e544d64f76b4d3f0c6837dd83544a0868521ff0 WHIRLPOOL 3fff77b86d856bcb65712839ac6a0f69b0cf895553ab8171db6feadf99141fef22febb1d970e523e6b879b9ee72087e829b2ac72fccc7c82e11f075b99a86ae5
 EBUILD pnp4nagios-0.6.25.ebuild 2909 SHA256 b10d7fe23f730289b237229df51c0075144a18ed0d361af29f7a2584d6aa3668 SHA512 79633a38ff8bb00563edcd3ab5b1cad51f104eb696de227599fd4a6dc51fd0d9e5a7fe8c610c72f49bdf4c223834efe47b9456a19f1ad6c5706fb3a905285ae3 WHIRLPOOL 0af2f92e77537730edbfab9385600afd3157d5c2eed23d3b0b224cf0b2f88facc4fb642b8347f6f08922adb46f9d33305566c0cd465f970f688127dcda700fe8
+EBUILD pnp4nagios-0.6.26-r9.ebuild 3105 SHA256 baddb4a1c4c1cb38ba1cd6e9ff6cbbd1b9ffa0d8d7fb20018f1ab5234ccecea2 SHA512 4b614437ec0238f67d72c15e599d6efda10722db58d556137fdb5c1e6e73c3a2af49141d10323117e27212adf8322d9587d232ead307168767c43508c6f7478b WHIRLPOOL 4a4404721181a313064e89ccfb71fcfbd39a95db7ebd7399035e22aa381033a2b3a7c799916af2d860715b1b61ebc401c9006644ba710789caa30cc4b3714579
 MISC ChangeLog 4200 SHA256 aba7c9246c1ca28a458fb1156b4416727cebd6af81d0ab178ad4810bbd6f4743 SHA512 310a84bf7133c6906fad6eeba8e3f53110ab87bd79ab501f291bce5bc91f4fa6eaa129628d54357301d5cfb1bc48c129834251ccdacd5afa01faface6327be01 WHIRLPOOL 2898c5bddd962a7aeb19ed0775939f7e3157ba265fbc20a6fb5ba258b552cc8ab8231f92191f10d06b4d696c0853f4d80c2a058dbd56e9cfe331ac9e32c52c55
 MISC ChangeLog-2015 9727 SHA256 4189bed66a74bfa7d899833ea65c4aee4c4f14b9c0a529cbc85cc14e82510485 SHA512 8a5381301af07559f48300043e9517baa3969452c7abd14fb13c5fa520497d3b17c15eb445d7a75b1a5dbf96aca9652d54601304a61c19222ce9caa2c892000f WHIRLPOOL 8ac59be793b189e21f8e2f3da605cd26852eb86186e42e73ec1197594239cb646e1d825ac3e78aba81f3bd64ea6b3e10786084324da57fcbf79a63b3ced86f96
-MISC metadata.xml 349 SHA256 8ed666651387627607326924873fb0776feb57a57fc515ad4eb9f5fc3f2b6c3d SHA512 b02c2c1f5712b2b2a1debc977f49f1df9843ae029bb723eb6e4dc590ea6dd0411ca65d214c9b0353f157cf44f997101c58aaf1bfcc218a251f9a51244b03a0ff WHIRLPOOL 2f55d716a365c94f7e7067139ab3637be73e095aa755edae83d612a0cd89d841b5fac9812206626b02b75736834287e8cad63a572c7c7948aa95fddf39303910
+MISC metadata.xml 716 SHA256 61b675d702f9f2d18bcd23b38525247cf0fdeebb2caeda8f231f93689cde08d1 SHA512 ad8ef6398f119ad3a0d51613fb67546ff9ec43b57825f1f251d27ea3feaf3fe2cb0029f30c179db9dba79f984e14a15926268868930910266f97671c8bea2a55 WHIRLPOOL ccbdb828737ffda8a97e58c2bec145dbc72549b8f105f40b60150f8e48df89d6268b4916c06004608d7c5fa633150b7db5d5677b47ba2532069f507850d5a696
diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml
index 379fdde3e076..6612bb05751a 100644
--- a/net-analyzer/pnp4nagios/metadata.xml
+++ b/net-analyzer/pnp4nagios/metadata.xml
@@ -5,7 +5,20 @@
     <email>sysadmin@gentoo.org</email>
     <name>Gentoo Sysadmin Project</name>
   </maintainer>
+
+  <use>
+    <flag name="nagios">
+      Build against <pkg>net-analyzer/nagios-core</pkg> (the default)
+    </flag>
+    <flag name="icinga">
+      Build against <pkg>net-analyzer/icinga2</pkg> or
+      <pkg>net-analyzer/icinga</pkg> instead of
+      <pkg>net-analyzer/nagios-core</pkg>
+    </flag>
+  </use>
+
   <upstream>
     <remote-id type="sourceforge">pnp4nagios</remote-id>
+    <remote-id type="github">lingej/pnp4nagios</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
new file mode 100644
index 000000000000..ffa296c13489
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org/"
+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"
+
+REQUIRED_USE="^^ ( icinga nagios )"
+
+# Some things (sync mode, for one) are broken with nagios-4.x, but since
+# nagios-3.x has been end-of-life'd, we don't have much choice here but
+# to accept it.
+DEPEND="
+	dev-lang/php:*[filter,gd,json,simplexml,xml,zlib]
+	net-analyzer/rrdtool[graph,perl]
+	icinga? ( || ( net-analyzer/icinga2 net-analyzer/icinga ) )
+	nagios? ( net-analyzer/nagios-core )"
+
+# A list of modules used in our Apache config file.
+APACHE_MODS="apache2_modules_alias,"       # "Alias" directive
+APACHE_MODS+="apache2_modules_authz_core," # "Require" directive
+APACHE_MODS+="apache2_modules_rewrite"     # "RewriteEngine" and friends
+
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6.14-makefile.patch" )
+
+src_configure() {
+	local user_group=nagios
+	use icinga && user_group=icinga
+
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/pnp \
+		--datarootdir="${EPREFIX}"/usr/share/pnp \
+		--localstatedir="${EPREFIX}"/var/lib/pnp \
+		--with-nagios-user="${user_group}" \
+		--with-nagios-group="${user_group}" \
+		--with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	# Don't use INSTALL_OPTS because they set insecure permissions on
+	# all of /etc/pnp (https://github.com/lingej/pnp4nagios/issues/140).
+	emake INSTALL_OPTS="" DESTDIR="${D}" install install-config
+	einstalldocs
+	newinitd "${FILESDIR}"/npcd.initd npcd
+	rm "${ED%/}/usr/share/pnp/install.php" || \
+		die "unable to remove ${ED%/}/usr/share/pnp/install.php"
+
+	# Fix CVE-2012-3457 (Gentoo bug 430358)
+	fperms o-rwx /etc/pnp/process_perfdata.cfg
+
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf
+	fi
+
+	# The nagios or icinga user needs to write performance data to the
+	# perfdata-dir...
+	local user_group=nagios
+	use icinga && user_group=icinga
+	fowners ":${user_group}" /var/lib/pnp/{,perfdata,spool}
+	fperms g+rwx /var/lib/pnp/{,perfdata,spool}
+
+	# and likewise for its logs...
+	dodir /var/log/pnp
+	fowners ":${user_group}" /var/log/pnp
+	fperms g+rwx /var/log/pnp
+
+	# and its statistics. This one is arguably the responsibility of the
+	# build system, since process_perfdata.cfg refers to this location.
+	dodir /var/lib/pnp/stats
+	fowners ":${user_group}" /var/lib/pnp/stats
+	fperms g+rwx /var/lib/pnp/stats
+}
+
+pkg_postinst() {
+	elog "To enable the pnp4nagios web front-end, please visit"
+	elog "${EROOT%/}/etc/conf.d/apache2 and add \"-D PNP -D PHP\""
+	elog "to APACHE2_OPTS. Then pnp4nagios will be available at,"
+	elog
+	elog "  http://localhost/pnp4nagios"
+	elog
+}
diff --git a/net-analyzer/postal/Manifest b/net-analyzer/postal/Manifest
index fce100b48a42..4e10d885f77d 100644
--- a/net-analyzer/postal/Manifest
+++ b/net-analyzer/postal/Manifest
@@ -1,6 +1,6 @@
 AUX 01_postal-0.70-gcc43.patch 268 SHA256 6e952639dfbb641f5367daec44c7a38e902b061239e2d5de578333b8b6bfc46a SHA512 6d2b6c4a947af4fe7c40315c42a5304bff0ff092016a37c2473a33d1f6e0fb39e527ec028802dc221d5993b50be6b2bd427e69820a20048d5861b1a5840085e6 WHIRLPOOL 3cd67110462d4faeb926c779d345153cdb7fdbd09ea0394cb7123d3526cb3453cad6ca82e8e2c13ffd70646190a0c03805e0031802c05f7ea67f14a38ba5a50d
 AUX 02_postal-0.72-nossl.patch 1905 SHA256 bd9befe311d72ddf027b1ae2ece4ce33747b8883fe7c86dc244f84f7252369d0 SHA512 22a1a3f2300f3da2f79325203889d8bb924721115762935f130d4d93617efba1e4058f57860aa78b16714ebc475f6654d1cfeddf5f93ae140d5e9ecda7d6ef65 WHIRLPOOL 739843838382c3e34a1152ffb0310017669aa879d91be446075ed85cb12229c814bd12c8af29448b7b9bff5e7858334cea41304bd48f1e507d2ad281bf354d17
-AUX 03_postal-0.70-c++0x-integrated.patch 7118 SHA256 687341a58889402a0681d0630b1a7ef2380129af34a431c5358fe454cb0e37ed SHA512 a52675f8951256a37cd54e9993f3377cc23ce80ef7fe94c93289e31b7b2aabaf3619b3cb099b1647cb6f01fad783ba47bce7160ac4ee896a7075a3d77008ef65 WHIRLPOOL c229b06134159187804e498e843e3b51a5f5538a116a6000b44c1f46ea4b8cb791760d284a7875e29eb6ff7acb4c6c78a1c38a85fbb3d249982af65bfbe77884
+AUX 03_postal-0.70-c++0x-integrated.patch 7258 SHA256 8a5ab8f0321dbfee7ef09986bb8660db6ee7c1678e87881face6d17c7011e3b2 SHA512 6e9fee3ab6f08a707e207bebf6d6816db500a4b2b8867e5771b949808aa9a42d32c280cd6ccc2b0e1006103801b18127be21d2b89cdf7f158221389320ff5e98 WHIRLPOOL be192df839c59e5dd9dbfab8acfbaa27470d1ace1a98bb4ec051604047429c525f44e4e81f584104f0ce79675622c6f4d7a0dc9cf169385c453a98f8702cb730
 AUX 04_postal-0.70-warnings.patch 445 SHA256 369b174bc39454cd6ca854cb05d403a56f739a1ab341a22bd2192a73e43791d1 SHA512 14c933f3a998a2dff7e2acc2970369e59509ac79684772da9da1747eda0065c5669cdfe21820883a2b103678d6b85278f9d330c051fc801a719d7e0e7f922422 WHIRLPOOL 4484b0f9efe64433c69a951f7a33f0e0609fd17df40b3c269b2b93a0179b592221ed0567592877f3923d921cf661a497caa96393c893544a68d768c0d6977ea2
 AUX 05_postal-0.70-openssl-1.patch 529 SHA256 552d803986a8adba0f7b88337ba215b41eb0c14a6f61f93e88821dfdb5269b54 SHA512 a1faba251a5939a9f0258c5689e3dc82553e4f66a4c288bca1b30ec5db10ebd912214cf03209035e37aa5dba92a4300b105c28af7f6db24a8f5bbd2b9b537c6d WHIRLPOOL 902f3b2a9ccc8484ef3942427124f825330c457b2204c0b552b2a5cdc84e72f89323674d0c966d0ac7801b3017e1ae10e48241cde761182ebab08bd69fb15edf
 AUX 06_postal-0.70-ldflags.patch 1276 SHA256 63c3ba423c1de13ae3db7d0fa6bd3fb54fc9c1327fe22e9d241febda836a2c60 SHA512 aa509bcc917d0b9c83faf00f9625681f6a394d91260aa304692916a90318e67d03009acbd48cb4fcf7ff0baf0578d70363125b172b1117ec0691d9bd32aa47c1 WHIRLPOOL 12a97d66af855699c2990c11756748e77bb3ce90424c01ae6975a6fccf1ed49dbb5d252cf104ef949d985a60adf5ab3998486614ba92e01b8bfc9e1e026001b7
diff --git a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
index 9ad6a036dcda..448af31a8966 100644
--- a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
+++ b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
@@ -36,7 +36,7 @@ diff -NrU5 postal-0.69.orig/bhmusers.h postal-0.69/bhmusers.h
  #include <string>
  #include "conf.h"
  
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +#include <unordered_map>
 +#include <tr1/functional_hash.h>
 +#else
@@ -58,7 +58,7 @@ diff -NrU5 postal-0.69.orig/bhmusers.h postal-0.69/bhmusers.h
    int sync_time;
  } BHM_DATA;
  
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +typedef unordered_map<string, BHM_DATA , hash<string> > NAME_MAP;
 +#else
  namespace __gnu_cxx
@@ -237,7 +237,7 @@ diff -NrU5 postal-0.69.orig/smtp.h postal-0.69/smtp.h
  #include <cstring>
  #include <time.h>
  #include "conf.h"
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +#include <unordered_map>
 +#else
  #ifdef HAVE_EXT_HASH_MAP
@@ -258,7 +258,7 @@ diff -NrU5 postal-0.69.orig/smtp.h postal-0.69/smtp.h
    }
  };
  
-+#ifdef HAVE_STDCXX_0X
++#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
 +typedef unordered_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
 +#else
  typedef hash_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
index cdd5cdfe62e6..3fafb8207559 100644
--- a/net-analyzer/prometheus-node_exporter/Manifest
+++ b/net-analyzer/prometheus-node_exporter/Manifest
@@ -1,6 +1,6 @@
 AUX prometheus-node_exporter-1.initd 615 SHA256 cdc4233ff3430a15a886d5a38e7f7d5b979663bd47e48706ed5de480838f9c25 SHA512 aecc8180b300660cb6b2882c45a99510d5c12aecaf1aaa24d62f2393c3f5c3e5dd9de6c5e73125f4eb6f3e18ca0d7b7e04e6338db2eed5ab06919e245f7e9d6a WHIRLPOOL 366a5cbea77dbd543e4ccb30bb2064dc8d91dd8d113b0b619eb3404034338424de030b0a6443f3b9567c8c6032a36b5e5c2a0eb99786c648430b468932d8cb4c
 AUX prometheus-node_exporter.confd 111 SHA256 51b9d1c0a9a05f7ccaaa88ae8bc5f6c31c10c7efb097e9cae257cc6af658b533 SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d WHIRLPOOL be439ab6a38d5a61b5c33b4140040f61d783b64ec39d7f0bb837ce09f123293eaec435703df0870b80dc1fee73d0a8c86b65db1d6da0c04c34128037d9add866
-DIST prometheus-node_exporter-0.15.0.tar.gz 1324698 SHA256 87a057081e2034f85e997f9e1343aaf45e1b6ad9fa51411caf97a03fe1c46ccb SHA512 0630c112742ef029d24a0086f9cf0a2efcf1125987dc1e6978055d3e74b820bbd91fd2e7391aa5108881a08a2ec06aff4c1500ebbb6644b46fd7e6271f2b8fa9 WHIRLPOOL 8d4da98c4df9dd344ea68e64deb550197af04b01251dfc784c992007b24677843af8f5d973fafef6e679ce1b2a769512a43419406252cf5f9d35b91c17011a1f
-EBUILD prometheus-node_exporter-0.15.0.ebuild 1226 SHA256 7303117307a7839fe48ae34273a2cd2428f78ca4fb04632445685902db309a8a SHA512 1df7bc1054410c4edd5a8849e1375ae5a798d932514349c18778232157b24df5817b2e705c48f2b57852d6d02400329cd34167308ad2f3283a31eb71a8ab6e60 WHIRLPOOL a990f41b989140aa31fbfe8cd0df76e1ed611de0b5173b5a308082dc26f228cc9b840a1bd9a2e9714c9325ed4317e14fe9ab8497956f0b2d78a070da4fa4f380
+DIST prometheus-node_exporter-0.15.1.tar.gz 1327099 SHA256 63503acd6f4c83f20465b0ad3abe49232ada3a933f0f6717aec99bfe13d20934 SHA512 884f4b3a5e78ecf110e26fbceb6e431cf69f9d0e87ceae33ac767addac197230c2a0d34725fe1f5fe99cbb280e89e4dfea3a6d559027633a7fb071cfdc0f8539 WHIRLPOOL aedcaaf8145952feedac81a5789c9e193624f0ad7da63b2aeef1e96775ae0df69e33dd8e21c64f73a75d698d76d64c7c9b9dec203a9c18374b6083162932a8cf
+EBUILD prometheus-node_exporter-0.15.1.ebuild 1226 SHA256 32131903e923747d1b2ac6dc1a0304cfa2286b60f5709030e308c66ce9071742 SHA512 b98a1095a3493a9172722bff45eedcbca1b3878f87209e122ba4689448be31013b409347345fca78a50c370d7ea41132f2c3b4fdbae897912cd1feaa226673b9 WHIRLPOOL fdce8bac89df95b6bc3b76e0b011888bf80cb274fdf2cf12c74f09e39ea4d11c2103f94af2af6a04a57e73f146f94578a19edf87df30ce1ca9d069f43c106ca3
 MISC ChangeLog 481 SHA256 0ee6994116c7d3d57b63373d23c1eae0c9f937018749b99d9d047fe5fd4d2b23 SHA512 bb4010b6957fef58e18717bed4add6840af8bb60c247e96d1be40612b0d88664186f81f5d99e94c6c0688783424b4bfd0037c71b1ede37097a362520718ef021 WHIRLPOOL b4f6808f2c6c20d1a47c5620942a2dea412f7c0c3bb477be84c89e7fe8dac0dbd107338f0acf344f857bc446e39aa328c62bf601e5d9eff257f4a57cecbb36f2
 MISC metadata.xml 334 SHA256 dce4944e74dfe121777699fe9b10552be275ba92e947a3715f6b60869d67d526 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e WHIRLPOOL d03773ab82553723915864f5bf084d74183fe56cad0628157e6c97e1e95e922edc180db665b6633e09af7df0d279f7bf075ec9066817bd243e656a8a9d0c32e1
diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.0.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.1.ebuild
index b350301d13ea..a300b0f49c9c 100644
--- a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.0.ebuild
+++ b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.1.ebuild
@@ -6,7 +6,7 @@ inherit user golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/prometheus/node_exporter"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="6e2053c"
+NODE_EXPORTER_COMMIT="ba5da2c"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/net-analyzer/prometheus/Manifest b/net-analyzer/prometheus/Manifest
index 1e225f8a0b34..d544d19ad2ef 100644
--- a/net-analyzer/prometheus/Manifest
+++ b/net-analyzer/prometheus/Manifest
@@ -1,9 +1,9 @@
 AUX prometheus-3.initd 659 SHA256 2f5790b241f544e2f73687c15b1cf8efc79fbfbff5502cf973c6bef4ce850498 SHA512 14321f0a0e39e4ed1b879ba956855046c21dff85770d3d269492a6d0b911af69ccbf047ec48b91c56bfb678da9390fb236ce165326dc2139b1255d448f2512fa WHIRLPOOL 595254176744eb3794b760830bb4036813df31dd6ce5f91890463db9db8bde3733b23914c8b725e5543e49d5c3c9ea1a4bd9f87b7ce612e17533ad4bb03884f8
 AUX prometheus.confd 43 SHA256 940f1a3ad08f0eb370951b1a42c29a9217cba9ae2f5cb6cc675bdec1d51e8309 SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c WHIRLPOOL b8bdd0bc16fde3fb99cf8939427781a1b250df7e4a607fb8c780f75d502e7d2aa76aef6a1b4c082d3aa32f0a9a21b3b39df72fcf5e6d26592df43661f8d08169
 AUX prometheus.initd 664 SHA256 566db492c8da87e1de8b655247dce11e43d83b85c9bf9bef7a9fd715e4667516 SHA512 95e2ac4969c26f2e91330b521223e94912d68832ef29429e68930479c29b24027c138011bd1f480546c14a07ae15800967e9ff114cdec3cabd0c15bdca489665 WHIRLPOOL e972726fac805f43772dc871a2a3af45d5421f1c15ab05fd0e7d5368b282164021a0079cfd9d3f5de4656739ccfa339ed80d3fb2ae50b429d5ae806441edc5fa
-DIST prometheus-1.8.1.tar.gz 5194859 SHA256 dc2b7bb5b5f1273c131921d3e306fd198f2a5547abc58dcf511b700c62963595 SHA512 936728f51a12a080a0689c17b134f70f747bb2219f750ea5f7df7460169b3e484689d75df319cfae12fc939b556e4f59ed49682731e43405a4a91e4bbcd9cbb7 WHIRLPOOL 755ac91ecfe9234675bac2cee2c63a50c80a5e02267818b1ac7747c669df81e4e267dd884aa1da7463339f5344e8fdbb488c7521d0d7817360bad74ece256a86
-DIST prometheus-2.0.0_rc2.tar.gz 5539456 SHA256 99340e1708f9dd216048d0de8ce1a069c70879760d833dfee1ef480966d2d53c SHA512 c895e0a561e89a13cee4cba1f4899ffcb4a8094f72618b9c7c2e48a035ceef3b844c0c8b9603f0886fac3e0d1c43b1e235f784f18d289e47c0e858b5d53ed47b WHIRLPOOL 60070eddcaa06ada89e5612c893c97098c48c6d5953d17e1cfe6b16708c332aa9d855aaecf6aa00c28527b22ad77ce6ff26cbade01ea2e71d1bafc9ece59f655
-EBUILD prometheus-1.8.1.ebuild 1603 SHA256 9993a83bfa5726247b2d48a4d6530ba925722f09d515fd00460d9edf46e48a90 SHA512 ee00454a690fd3bb2990baf2612860938916dae85485ec40c7e5921a9b34920ce88a23d18703daf662959b8bb5952deff68d622c7e1b727b91e3b530304c2b91 WHIRLPOOL bd95c86ecb27317c48648cdd5b77fea8574042856b8a496c9b6d7d7340cef92b15979abc0100e5b9f42a0841ab301899f1902e6f2d9859113fe689fc6b5fcb81
-EBUILD prometheus-2.0.0_rc2.ebuild 2000 SHA256 924c2f0264af7e066a1982f1202b2955255c7f71c7bd5b081d5ec3e63efd21cd SHA512 3926d27cd71e34a32f17d3351874f24138de27c0d951685e12322503cbf086c63e30c85cf32dd4a05c17638d965ae399ff80e505702a57e9573fa2594c83cbd1 WHIRLPOOL a64820058773b240b3b273475485c69eeb4d66d44c166f17dfe061acd809734dff171867208ff80011237b6a891cff69c15afefe26f899792fae584383f08a2d
+DIST prometheus-1.8.2.tar.gz 5238057 SHA256 7c8a9c9756790d1c4eb436bb6ebda49e2f671a6319c06a1c63d5df9eff7da0e2 SHA512 ed52ab494ae565d4787b29cf1800605ac3bfdacee25e833704131d57bad9759a3e2585b96316ad754e6612324e68079d7f670004a86aa12c768a2e03542966d2 WHIRLPOOL c61ed7a9238a86e0cdc1813e0d0f88e9b90567986b61e0e856d34f42d1c5ef5f2c66e6e95be659f00883aec39660536653c2d0f5baaf4573600711929480bd00
+DIST prometheus-2.0.0.tar.gz 5603884 SHA256 6947ae9b2d414d49304034a2635f0e1ecd45ac83a4f4592ea5bcca40d6f7951b SHA512 9d23e10b3eb12755781b9edc5c32a0cb1e99055a8a905517619d992a174a8621ebc1e82999ce2412e7fc3e2e0af8a0dfe1eded8bcd2701a5aaaffce79c7fbcc5 WHIRLPOOL d41cd1fea411eec127a1e5c25a545fb46f02168909aeca557cacae4f7a05cd3324ab737539c05255d85f2ca8e8951afb091c98043651488f83040a0bd7bbe2a2
+EBUILD prometheus-1.8.2.ebuild 1603 SHA256 db365cd1f8e7a27cb59b7155d25e3c7bf215744ffabad64e7ba0ee714ad2606e SHA512 4ee12d760b3138cb99e86052d0e32c2ad4ba47b42adf5f4582d3af32d48770f65d9baa7130065fd0af65860bddc501dcb87fa2814278050a38c154630119fdc6 WHIRLPOOL 77510a6d004c9f39c1286afd1813d4232797df4a9d6ac2cc3e5de8ee6fd25bd830afa5976dad741d0dac24d425c664a5e371a26824610d0015f9a8987a1abe28
+EBUILD prometheus-2.0.0.ebuild 2000 SHA256 8c4a99a12d5c72f4af5a59c7eda10ac961784bdfe4b36528817a5de9b8d74632 SHA512 35279a1fa0a51c6e677ded1e73374a046cb863a753e493608c04690c9a11be268b4b48a2204f61f44f8e02891334dafdc3264e52b1630d56d910e93210bfd420 WHIRLPOOL 99f790aa8ed6f1760cd8dbe16f3a3f7a06c16380283dd8508b3d5dd6e7815b3e62f1fc8553d971849ab64bce85cff4c312c815b91c21c355b2807bf3d9b9141a
 MISC ChangeLog 552 SHA256 be1d133e356e6eb2ad19eb3900722da8fa6495af85bc38a2b90f6845c62dc27d SHA512 7d5bf11cda31ce2fcae3a752ec9eb0d17b212c0ea1a480e09436d41a24eae4ba5689aa43727a8ac5882c5b1ddc741c717a3c8d509d69204fd44eeb00460a4e60 WHIRLPOOL 7ddcb758ecc1426a520a97c6b27b1c0e9752422c9c0f16b1746e11aa91edc37f5289b096430a0b8e05535818901f6f1745144107a2000cb771843de038b07963
 MISC metadata.xml 331 SHA256 1e206a714f59c466b3f41285ea73b6b3a0919c2f8c0a4cf5350ccea436bb26d9 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a WHIRLPOOL 0c98900489068124a7afcf1f40d1c9964089ead950e8e16dbc4a0389487187d9af6802a6e86fb6dcf541784f09acd8e0ee27f3215deb16de56495af2b1ee85fc
diff --git a/net-analyzer/prometheus/prometheus-1.8.1.ebuild b/net-analyzer/prometheus/prometheus-1.8.2.ebuild
index 1a0cce6982b9..1006108b0996 100644
--- a/net-analyzer/prometheus/prometheus-1.8.1.ebuild
+++ b/net-analyzer/prometheus/prometheus-1.8.2.ebuild
@@ -6,7 +6,7 @@ inherit user golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/prometheus/prometheus"
 EGIT_COMMIT="v${PV}"
-PROMETHEUS_COMMIT="3a7c51a"
+PROMETHEUS_COMMIT="5211b96"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/net-analyzer/prometheus/prometheus-2.0.0_rc2.ebuild b/net-analyzer/prometheus/prometheus-2.0.0.ebuild
index 6aa654dad848..f316f9e3f9c2 100644
--- a/net-analyzer/prometheus/prometheus-2.0.0_rc2.ebuild
+++ b/net-analyzer/prometheus/prometheus-2.0.0.ebuild
@@ -7,7 +7,7 @@ inherit user golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/prometheus"
 MY_PV=${PV/_rc/-rc.}
 EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="ce63a5a"
+PROMETHEUS_COMMIT="0a74f98"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"