gentoo resync : 02.03.2018

13 files changed, 463 insertions, 7 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c66f7e96f15d..dbc4aa94a808 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/namebench/Manifest b/net-analyzer/namebench/Manifest
index ed9301725819..cd134473688c 100644
--- a/net-analyzer/namebench/Manifest
+++ b/net-analyzer/namebench/Manifest
@@ -1,3 +1,3 @@
 DIST namebench-1.3.1-source.tgz 1118505 BLAKE2B eeb1921dcdc627d9ab7d0742f7ad0e17915a301243b8f152472b9c8e545a0510655f637989ccc377b03d2b8c4f7c95dafbb8496fb49449bc9c2f2caad30e5708 SHA512 df9d120bf9f0bcbb5e3d41d2257b2c594e99b7e69b33435b59587e99dac6dca29e4ae81f51838946bc1955540109da6296abc6b69d411af2b91e05b58367bb3b
-EBUILD namebench-1.3.1-r2.ebuild 1056 BLAKE2B 90f8f118a198cb57c31ac4a1555d655eadfe3d74c6684367ea19a0eff79fff3224c15cae1dd045e78430a3d76313cf4cd2dd401c91f3beb5eab7359d2cd5b64b SHA512 89e64eb1acaaba51c5347100bd262252db79a2e358888298acc2375b103d5891b10e2dc597dac328005c7b52e48e99d250732efd117892f4d80da0df88297cb1
+EBUILD namebench-1.3.1-r2.ebuild 1055 BLAKE2B 042b0aec8504587bc4089136abec68fcab6c4853950852e1bb48ad20169251048e04992f3a09bb5d2544e4a2a87a9c9f580355bc9d7b17623e02a4287af81af1 SHA512 3c455685a45426aeeb184f0cca7e9a08997c8050c4543dfdc588d9953358d0684f465ddc6aae65f641aa369e3a3672f349023bcf70b3f7a8102564f4cedae04f
 MISC metadata.xml 359 BLAKE2B ab64609d2c15ddc53f224bd9ef0acd57e4ab0571fa3eee09c8cef165339c8674db40adfa6fc3dfb3c1736dbb7e839fd13171e9a0360e6537855ad866ee6d8c59 SHA512 e7f84527d450abc038dd4962899a3a6789787049c8b097ec485f53b6b6143503e3d394be629c3987a450af6c718086bb5deabb38a8e95271d32fdfda7fcff3f6
diff --git a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
index 2b9d0a2ebfa7..147f06b12436 100644
--- a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
+++ b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="DNS Benchmark Utility"
-HOMEPAGE="https://code.google.com/p/namebench/"
+HOMEPAGE="https://github.com/google/namebench"
 SRC_URI="https://namebench.googlecode.com/files/${P}-source.tgz"
 
 LICENSE="Apache-2.0"
diff --git a/net-analyzer/prometheus-alertmanager/Manifest b/net-analyzer/prometheus-alertmanager/Manifest
index 024a8869b405..52edac0f5376 100644
--- a/net-analyzer/prometheus-alertmanager/Manifest
+++ b/net-analyzer/prometheus-alertmanager/Manifest
@@ -3,5 +3,6 @@ AUX prometheus-alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624b
 DIST prometheus-alertmanager-0.13.0.tar.gz 2782163 BLAKE2B 4918f84a8a8312a3fa53f03b78bb8acc6118e69048ff3fadb2676721340fa120360a636fc11485999e948965569241658eb8ee01204453120adcce6bd1da40d4 SHA512 3f402f577e42bfc9dd9ef2dc1cb634d3654776f3b13d698170e3ae3c1612a45115e0d188d0768880ca968ec9157e05a2082647ca1de132f8be3c7eb7ad0dad42
 DIST prometheus-alertmanager-0.14.0.tar.gz 2786623 BLAKE2B e9c773af81153b3062d27464c6b8d1edcafe66575b8d5a6309b162c6546d3dedf7ae5b1afcf4dafb3dfdb6bcf826aeb9119b27cfe596da365a6272ee71b30441 SHA512 e352d51d86b853ff679892df3c494da2c7b4afb918d807e6d63b76e959b586f43a4c773de18bdd9e6a5067d4034748bb304ebdee2f08983b00890c1ae393d0b8
 EBUILD prometheus-alertmanager-0.13.0.ebuild 1340 BLAKE2B ef6bbcdf5c4fdcfe1f20771da1a2530d25c2fe5354472c02105fbe3b66cf162ff193b6d60c6859804e390878e05b84d210b58f3149996dcc4afdc5f184a490fe SHA512 fdd0595f982192c2c59c18fe0307ef8db1f28bd38a637c9b8826cf7d2955972615ca845467ec330ff2ecfee725a87a385d488d7b2301ab5363f48ddcfbb0c745
+EBUILD prometheus-alertmanager-0.14.0-r1.ebuild 1311 BLAKE2B 347ffeaca216e1b1234b6005fe670696ec2d580738b8b0dc7236a28ba8821176d3eba3a37a0d7772f983be3632d7f709fa37f3d75603607c7bdf25a271955be2 SHA512 64a1ceb5cca20a51ad3ba9c5dee50d20c3774acabae01dcb3ace1a185b125eb44dfe1ba1ffc60876c09e5b14d59d421b9950f4e71d2f937c80bb398e65bf5a08
 EBUILD prometheus-alertmanager-0.14.0.ebuild 1340 BLAKE2B ef6bbcdf5c4fdcfe1f20771da1a2530d25c2fe5354472c02105fbe3b66cf162ff193b6d60c6859804e390878e05b84d210b58f3149996dcc4afdc5f184a490fe SHA512 fdd0595f982192c2c59c18fe0307ef8db1f28bd38a637c9b8826cf7d2955972615ca845467ec330ff2ecfee725a87a385d488d7b2301ab5363f48ddcfbb0c745
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0-r1.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..43de943ea4fb
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 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="fb713f6"
+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 bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/*
+	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-blackbox_exporter/Manifest b/net-analyzer/prometheus-blackbox_exporter/Manifest
index 1c24df4c9976..aa1bc6485c67 100644
--- a/net-analyzer/prometheus-blackbox_exporter/Manifest
+++ b/net-analyzer/prometheus-blackbox_exporter/Manifest
@@ -1,5 +1,7 @@
 AUX prometheus-blackbox_exporter.confd 110 BLAKE2B c3cb7ed7d314ea8b347b4db9839e7c987c91c78378a6085473d687a5f3460f06ca6825567fbe832c3114906156290d00d505e15e3c2461eb844acb4e56937af0 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed
 AUX prometheus-blackbox_exporter.initd 614 BLAKE2B bc2a5d5b3a0383a35cd223c94169b57045f2dd2506753541dbf61b3003b042a5d43bb08237ec367e1d48104f0b30b7a50713e96e9b03c2fbb6e079c9858936eb SHA512 4a25f59d0fb95ac35c07ab15623c2c905db04cb5a14cccd316bd522e2b4892a08d67a4edb15c6c02fbc2b84e92dc48b67f5d14c7617cfccfa09babf22e4d1beb
 DIST prometheus-blackbox_exporter-0.11.0.tar.gz 2143849 BLAKE2B e9a35b4b5adca955c1ac5b2219dd892112f6b3bd2dfe825f6393daca9dee3cba943309be024cc56f3d682a8544a4f78949072de620a4e6b07da61a740a84d55f SHA512 9bc397b846cdaf8cc0054100adffb39bbe2e5cf6743a61565e90f2e4298d8a165a138c985431937083fd88ccac065e278d8c9eab8a83015bf58fddb6da8ea812
+DIST prometheus-blackbox_exporter-0.12.0.tar.gz 2202465 BLAKE2B e3b082f8a491b531b0caf3331ecd391bf8734df0915ccbb7988ac1e67e57436bd45169aa403d5511fbb44eb176f89836ad8c04c491f5194f90f9f8a3b686a656 SHA512 2c98c0f4127bdd04ac54eb182c5468fd38121558f85aa8b4bec860f783f266b144df3153da0b028fdb84a4131a4e374a969bb09ce3a781ddf95f0a008c11bbb6
 EBUILD prometheus-blackbox_exporter-0.11.0-r1.ebuild 1439 BLAKE2B 46176482d2de58a7633d942a618609290685b7bc19241040cc89469d036b41319ddb6e3d2632af8ab7fa01a6fceb75319782c7c4f933e529ac9eb0baf7dc395a SHA512 6be9eb68a9d3b5158cf465dafb7b7ea7dc6e8f72976bb6b574314e55df06041126921bc7e95ef56a12508574fa6a4f2d0a6afa26bc5ba493dcd1b63a7c49a301
+EBUILD prometheus-blackbox_exporter-0.12.0.ebuild 1439 BLAKE2B 56670b1c92cd9ba5d7d287830f984d9d6aae91a1dde0ec5c40f4b8756614ca61fe0306306382fd74bc5c3f9215d682f8be13bc1e6103e559e90d5f8df0741278 SHA512 1a4d929048c828fdd5736427c8714bec7a9ead9315cd7d4fab8cab7ad71bcd203f3ab6b74e5f27613d2da41501313dc0c7720fe85357e3e89378d5c2dcf6f64a
 MISC metadata.xml 338 BLAKE2B 117f205ecdd4c05aba1ce92846f59dc7790c9fdae79db5cc1eb912d34a9e1d83eaaea26feb24245a0c5fc4394552705aa7b23171920d9023ca8e4333b3c09650 SHA512 e431b2ef89e797b9cbb290a70683a4392f07559851550dd22f5410f09c979730c8dd35c095f855565df8d72adb42c6e4b9d03882adf37240b0da28cc508ee2ad
diff --git a/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.12.0.ebuild b/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.12.0.ebuild
new file mode 100644
index 000000000000..40cd040b804f
--- /dev/null
+++ b/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.12.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit fcaps user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/blackbox_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+BLACKBOX_EXPORTER_COMMIT="4a22506"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
+HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+FILECAPS=(
+	cap_net_raw usr/bin/blackbox_exporter
+)
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${BLACBOX_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 blackbox_exporter || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin blackbox_exporter/blackbox_exporter
+	dodoc {README,CONFIGURATION}.md blackbox.yml
+	insinto /etc/blackbox_exporter
+	newins example.yml blackbox.yml.example
+	popd || die
+	keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
+	fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
+	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 c9f47d89e525..45f533079b9f 100644
--- a/net-analyzer/prometheus-snmp_exporter/Manifest
+++ b/net-analyzer/prometheus-snmp_exporter/Manifest
@@ -1,5 +1,7 @@
 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.8.0.tar.gz 3257344 BLAKE2B 32f0cf6c72b518fc62c420bf64ed04243bef8f9b70be2fba15472f63871e96bc113ddc7fe2e6265a29facf8c32c1d3f245bf6fc2dbce934876ebac0225069642 SHA512 0cae5fc107baedd8d498972aa7c6b3b48ff19f951c5366e5be5173009e956de8da06b84a46926d6f157287df0793e996686740c491f502da24172d5806b49339
+DIST prometheus-snmp_exporter-0.9.0.tar.gz 3257207 BLAKE2B 3e7e91d7e66b32e3f84c9e53061f54ffc10116913b91598edfa011663daf2c67314661dbe6cd5b2c20b30968833bd64a48bdd5dd06694e76f1e787d59ad63933 SHA512 eb287f4519f2174a9ce80414c2b7a698bc50e1bcb2303a8190164002af088e0694e01233314cfe2bd89b2cd751f2fd6f8447eb641541701b7bd481373ce084b1
 EBUILD prometheus-snmp_exporter-0.8.0.ebuild 1283 BLAKE2B b3c24b51562921582f3966cd044a58cf5520f56ce510590da95eb8ae21e1b16e29e7f075621f3682ab1887670edffe67131c32c9486a7736874a5e606b36bb02 SHA512 1dbd6445b2e975578ff92cd2e3334d0ee7773c2ad58160ca3d6f5d2843f5668d46d715315481480705d5e0c55bee9dc1bf468bc009884b1c84ac0acb3715386b
+EBUILD prometheus-snmp_exporter-0.9.0.ebuild 1273 BLAKE2B b8f42637b4be7eedd17dcd1423d6bec4e5c83ae4f8a939157c0eea6664110272297e296cc4fbf4554ea523cd951f7c61e6f66ce0208fe1b622ae62ce7b74016b SHA512 dd1a796d0cfdc59cb1993058e5c8bcbaa0bb5f15692ab4629b909f8c46f2500ed79c805baec0136f602cff61a0b495e896750d9567637caea516867ea26b6d92
 MISC metadata.xml 334 BLAKE2B a805d1d3f519c6ac1ef9c7f2cb5a0947740e6fe9a37fc77490e2011a27dae8ff981b3e482a55c117553eaa60f0e3c8d017d867c4fe082c8ebdc4e4bdac22f750 SHA512 7fd3e4314022bf2ff86bd01f335d5c4402676970b9810575225aff3d40bd5bdc9ffc27b438c880dc0a665cf3873502b969dfb30644b3c106278fd353820d6599
diff --git a/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.9.0.ebuild b/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.9.0.ebuild
new file mode 100644
index 000000000000..2d73fe9faa4f
--- /dev/null
+++ b/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.9.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 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="abb143a"
+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,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/sinfo/Manifest b/net-analyzer/sinfo/Manifest
index d72563ee48e3..f38ff20b2669 100644
--- a/net-analyzer/sinfo/Manifest
+++ b/net-analyzer/sinfo/Manifest
@@ -4,5 +4,5 @@ AUX sinfo-0.0.48-gcc6.patch 858 BLAKE2B 992c9b4e6546983ef8392afa846e3ef9d5eeaea9
 AUX sinfod.confd 105 BLAKE2B 3e031b8f0f7aafd1ff8ac7efb97bd87ed7a301fdd82b0de148e85a23a76ca77d0ddf770d13626ddfe1e41d5bc5e4f83b5b646a6f5b88a0941708fd3a13460a52 SHA512 c9ec8ad6dd6126bc9f2860cf6fe54b2119dda428d8eda8cea283b9755c4d64fdb933d81aa2da194b8453dbc6386d6b2306766eecc627dbd1bd8b226b4520ac88
 AUX sinfod.initd 212 BLAKE2B 137067cd9ef3a6f8dcef9997f3ba355bcc55aa6973533fdf9af7bf600c0c5e80f02f0374c15a630d30611302306a19be937f02f13bc41a9fa21e34c03daa642d SHA512 a26e3e1d8dae8a158299a214a7de569051bcfd3ab9dc3d92515767f896c5081efe886bc55b1d1d028547d8ed3d2a747408089f8de34712100e19a06cf5f07577
 DIST sinfo-0.0.48.tar.gz 703237 BLAKE2B b404aef3be802ecf00685b5fc36e8c53bdbfa7afcb4fe1f6339126c7d696ddcd19ea61cb611f94892cbf5ed12f50fe67f66a21c3727d9734d6d656e2b699c5c5 SHA512 9cbc790883dfd78970a5943599128f1af34a82362fa33e7d6f23d560806dce5955c45f7e82e79adcf7696166d1f39fd1856bae76087a3ba46d54e3e4963d4067
-EBUILD sinfo-0.0.48.ebuild 858 BLAKE2B bbdfedc072e0b3bd8faa6966834f44c69ef1776cf47f27eae0b177997adbafcee335de68181960d8d5752b71238d56a3514117c1d12edfe0119886ef4f06e74a SHA512 dee94b72360a690fff18ec1e91dababcd74d76e57d114d5f10e8035cc90c63f15eac4d93afddc5b2b46f8549ab01d60d521cbcb88c11e86bc88bf0145453ae0a
+EBUILD sinfo-0.0.48.ebuild 865 BLAKE2B 57a23e2547ced8f01d32844440600731daab5fbf7371afdffd3748897e70dea3fb4ba498a1f1d820a5f9fce7f772dcfb77303d802fd0a006425f15b97853fcb9 SHA512 fcc20e5b40660e5b0a77106be2f045edcf7b82694c370023431a9cb3c6baee9307c4bfae380b2542a9bce540889742185c8bbe92008e0daa0b72d7a1b1b1eb5b
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/sinfo/sinfo-0.0.48.ebuild b/net-analyzer/sinfo/sinfo-0.0.48.ebuild
index ef6d765d62a3..1ced2d8e3ea7 100644
--- a/net-analyzer/sinfo/sinfo-0.0.48.ebuild
+++ b/net-analyzer/sinfo/sinfo-0.0.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,13 +10,13 @@ SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="ipv6 static-libs"
 
 RDEPEND="
 	!sys-cluster/slurm
 	dev-libs/boost
-	sys-libs/ncurses
+	sys-libs/ncurses:=
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bed49d184c36..f4482c2a68fb 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,10 +6,12 @@ AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f92022
 DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
 DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e SHA512 b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc
+DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f
 EBUILD wireshark-2.2.7-r1.ebuild 6481 BLAKE2B 36529064a3216f6c9ae71ae23ec31049c6a0d7862be41c333f369bfdd0cb62ac5315883c465d2be517e2a4ddd780d110e59c413725f791f0cf9ac0380dbe36ce SHA512 cd90dd82e3418c000ff142a207a4f05db6bfdb5f8087b4c7b1f595bede0847277fba43a615972c2222e4261c647849ff3165fba64d67dcd55e4441b76324e3d0
 EBUILD wireshark-2.4.3-r1.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d
 EBUILD wireshark-2.4.4.ebuild 7383 BLAKE2B b3c2fb215055d0ba48c4edd8a2a846f77187ddb1add61477e03d20a817f0bcf5054876eea2180268afeab0e636325d3afc7de553da6a66fe4fbef98fbde94aaa SHA512 79432eeaa844a0984b35087019dd26c99f4f6b0b4195d3f6cb440a4d13017b42d894718d5d90a0c866502a8aef1a0e92684cca61909c13ae9d32f9809fb3b356
+EBUILD wireshark-2.4.5.ebuild 7384 BLAKE2B b721d072b55aa02654819c782bb0612bbbad0e96a08e76ed7aecb7dd305c2e107ff8b14ec197610254957f7d1facf77ae9458e5ed9e328754b9e4936f9ecb7ab SHA512 f04d308bfe6e84274b72f2718082e155030b7ebc3be6f5618b3a0c38129acf7c4092bd366c0a9e543e26e6c8a84825c1558a285997bd8b23228c8b5dfc531f1e
 EBUILD wireshark-2.5.0.ebuild 7109 BLAKE2B b382d712d053dc7003aab929c53724ad86bb6c71811b77e94c246af5b28bca60eb22d58d09d34075c0b0eb572134c03f19593eaf7caec25ffebfdf7607b495f8 SHA512 d36bad8ff3372c18af5be721a7469a66e93e317ba12efe902ddecd033092b233ed4c00c113222ac341579211bbf147b01914b2895bb4ee8fb854cd0d9ec3a428
 EBUILD wireshark-99999999.ebuild 7128 BLAKE2B 9e7037c3cb3635e0c2e39635f98061bc188dc575053bf54824c9fdfaa8b335b4e7c28dbdc1d11e7aebaac989902c675d8958db0b20829ea0e5bef6fdb6791296 SHA512 692cb84ef62ac6dacc77b7002abe5f15000507d16027fa4dd95146a633ac2ab143847ed97f882bc0bf68e6a67e8fc8f02e7ac336b85148df0764c011c85bde1c
 MISC metadata.xml 4772 BLAKE2B 30bdf52594176cdd8314d5292ed55500f26841c71900acd0d0772e1555f51e9979cce7ff3b301beee21dab10565ccc259596cc78bab455fe8cf42cda40314d86 SHA512 1694eb364cf39049d899d056d209c6fd51cd72b6477132312587de7af4f49bc026d5873e97c3c80e3b99228b3f57da99a00f0a10a6596e4659d2a89d1fd6965b
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
new file mode 100644
index 000000000000..b56e421d4d18
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="
+	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
+	lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
+	tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		|| (
+			media-libs/speexdsp
+			<media-libs/speex-1.2.0
+		)
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+	"${FILESDIR}"/${PN}-2.4.3-libsmi.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
+		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
+		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(use_enable dumpcap) \
+		$(use_enable editcap) \
+		$(use_enable mergecap) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable reordercap) \
+		$(use_enable sharkd) \
+		$(use_enable sshdump) \
+		$(use_enable text2pcap) \
+		$(use_enable tfshark) \
+		$(use_enable tshark) \
+		$(use_enable udpdump) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with lz4) \
+		$(use_with nghttp2) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with snappy) \
+		$(use_with spandsp) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_diag_control.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}