gentoo resync : 31.03.2018

39 files changed, 2 insertions, 666 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index cc60af2cccb4..69623ec0e410 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/prometheus-blackbox_exporter/Manifest b/net-analyzer/prometheus-blackbox_exporter/Manifest
deleted file mode 100644
index e7d237b07b29..000000000000
--- a/net-analyzer/prometheus-blackbox_exporter/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX prometheus-blackbox_exporter.confd 110 BLAKE2B c3cb7ed7d314ea8b347b4db9839e7c987c91c78378a6085473d687a5f3460f06ca6825567fbe832c3114906156290d00d505e15e3c2461eb844acb4e56937af0 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed
-AUX prometheus-blackbox_exporter.initd 615 BLAKE2B fce98f2c0740db2309d0395cf1e7e3f8b3b305c688cbafbf14a1787d952d49933ddebee1a688b844a66c95d02c38c38e943ff73e4dce68a1069c69c91540cc47 SHA512 f5ecc87e592fe85e4cfed759f06a1d88a4bbd05a474cb7955aae296ee29ae2ddf875a427bfcc7ff8369367eb8892c85bcc5051d273f8c2693395c8851b5f8669
-DIST prometheus-blackbox_exporter-0.12.0.tar.gz 2202465 BLAKE2B e3b082f8a491b531b0caf3331ecd391bf8734df0915ccbb7988ac1e67e57436bd45169aa403d5511fbb44eb176f89836ad8c04c491f5194f90f9f8a3b686a656 SHA512 2c98c0f4127bdd04ac54eb182c5468fd38121558f85aa8b4bec860f783f266b144df3153da0b028fdb84a4131a4e374a969bb09ce3a781ddf95f0a008c11bbb6
-EBUILD prometheus-blackbox_exporter-0.12.0.ebuild 1439 BLAKE2B 56670b1c92cd9ba5d7d287830f984d9d6aae91a1dde0ec5c40f4b8756614ca61fe0306306382fd74bc5c3f9215d682f8be13bc1e6103e559e90d5f8df0741278 SHA512 1a4d929048c828fdd5736427c8714bec7a9ead9315cd7d4fab8cab7ad71bcd203f3ab6b74e5f27613d2da41501313dc0c7720fe85357e3e89378d5c2dcf6f64a
-MISC metadata.xml 338 BLAKE2B 117f205ecdd4c05aba1ce92846f59dc7790c9fdae79db5cc1eb912d34a9e1d83eaaea26feb24245a0c5fc4394552705aa7b23171920d9023ca8e4333b3c09650 SHA512 e431b2ef89e797b9cbb290a70683a4392f07559851550dd22f5410f09c979730c8dd35c095f855565df8d72adb42c6e4b9d03882adf37240b0da28cc508ee2ad
diff --git a/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.confd b/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.confd
deleted file mode 100644
index 39887477dff9..000000000000
--- a/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for prometheus blackbox exporter
-command_args="--config.file=/etc/blackbox_exporter/blackbox.yml"
diff --git a/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd b/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd
deleted file mode 100644
index ab001d41abe9..000000000000
--- a/net-analyzer/prometheus-blackbox_exporter/files/prometheus-blackbox_exporter.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus blackbox exporter"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/blackbox_exporter"
-command_args="${command_args:---config.file=/etc/blackbox_exporter/blackbox.yml}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/blackbox_exporter/${RC_SVCNAME}.log \
-	--stderr /var/log/blackbox_exporter/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
diff --git a/net-analyzer/prometheus-blackbox_exporter/metadata.xml b/net-analyzer/prometheus-blackbox_exporter/metadata.xml
deleted file mode 100644
index 5d0a20fee17b..000000000000
--- a/net-analyzer/prometheus-blackbox_exporter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">prometheus/blackbox_exporter</remote-id>
-	</upstream>
-</pkgmetadata>
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
deleted file mode 100644
index 40cd040b804f..000000000000
--- a/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
deleted file mode 100644
index 9365eda43183..000000000000
--- a/net-analyzer/prometheus-node_exporter/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX prometheus-node_exporter-1.initd 615 BLAKE2B 4d5d30126a1491b4771365b7db31a4849a3eeda3a09283a6befdf35614e6a3cf4cb1e20ab1d57a53c3715555fb0af73e62f76a4b99e58b83d77d44382f72edb3 SHA512 aecc8180b300660cb6b2882c45a99510d5c12aecaf1aaa24d62f2393c3f5c3e5dd9de6c5e73125f4eb6f3e18ca0d7b7e04e6338db2eed5ab06919e245f7e9d6a
-AUX prometheus-node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
-DIST prometheus-node_exporter-0.15.2.tar.gz 1327204 BLAKE2B ee694771ed6d736fd4bb6a10f713f31becc930fb8225499d4b3a2a2cc7416c1816605cd8f4205dc37a2264af8d9f85e3519bc01844d252b6a70d4ee5f6308ece SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52
-EBUILD prometheus-node_exporter-0.15.2.ebuild 1225 BLAKE2B 3e5633734ba2be8f83953b4851a17ba76a619aae1490348f4f0fdf83e34a26e07c561a5fce9e41bb6f86aef9cc537f48cea6bba74082821fbd7fe4395aec8e39 SHA512 54286e2c5957524374885335e512bfed3b609e8e2e293fb7e0d842603e1bbc026536a96a6a75ea141baed7a96fbe57f9fcb8067968ae162745c813855b9d7976
-MISC metadata.xml 334 BLAKE2B 4152458bd76dc5a5150cf8ec6e6b967d88b89b85c7145c158d981c92dad663df3259b2ee229298727e862139215e69ac97f9aecf3b66c182a13fc9bf6e651057 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e
diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd
deleted file mode 100644
index e8268e487d2d..000000000000
--- a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter-1.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus machine metrics exporter"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/node_exporter"
-command_args="${command_args:---collector.textfile.directory=/var/lib/node_exporter/}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/node_exporter/${RC_SVCNAME}.log \
-	--stderr /var/log/node_exporter/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd
deleted file mode 100644
index b65652001308..000000000000
--- a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for prometheus node exporter
-command_args="--collector.textfile.directory=/var/lib/node_exporter/"
diff --git a/net-analyzer/prometheus-node_exporter/metadata.xml b/net-analyzer/prometheus-node_exporter/metadata.xml
deleted file mode 100644
index d758c8dfc417..000000000000
--- a/net-analyzer/prometheus-node_exporter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">prometheus/node_exporter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild
deleted file mode 100644
index c85ca942ce7c..000000000000
--- a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="98bc649"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_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}}/${NODE_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 node_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin node_exporter/node_exporter
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus-pushgateway/Manifest b/net-analyzer/prometheus-pushgateway/Manifest
deleted file mode 100644
index 24152e1786d9..000000000000
--- a/net-analyzer/prometheus-pushgateway/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX prometheus-pushgateway.confd 819 BLAKE2B 9c42a6d012f70a2ac03d4b90999d94683bc62f6d203ef8d2bf59019e30aea59c3beceae34f2579a2958acfaf882c275453aa5e46e488c5afebaebfc3f17b896b SHA512 c941bc2350bbda14d49effbc0a7988869fc38ccf2236951a88721bd15397c9e5b5d5a98d58285610b33eedc7a26f6cca51e3ec6f4909bdabf0658afd51b99feb
-AUX prometheus-pushgateway.initd 662 BLAKE2B 652c58309ce31f7a37cb92beb128848ef28118b9b05278e79765b8c6555b6020266c062ef58463488dd39389f6bf0e2d1e0a9b5371ec4b5c26b821d6fac8877e SHA512 7bb32a7848607d939f3343c8d3fc88454b9ffc9d8d89f2af992d9f6f9fafe266c965b068cc466adbcf0ab014f1e5ca9214b567feacce09b73c8c2212e12aab00
-AUX prometheus-pushgateway.logrotated 117 BLAKE2B b296783f46625672ed7ada814a11b0fd763f6bbbe28b7750e33c7d0a3a1f9f6698776562c5ccc0e1210c5e72c40caadc65dc915d427a9c96267cf7b28396fd4c SHA512 4b104316bf512f9a59181b1db14a7d21e0771213553681b5575f3c637897c0c3ee649a8972b3ab5bb3159275eb501fcc2f9b9bbafa4855bb0c5382fbd3c46f5a
-AUX prometheus-pushgateway.service 498 BLAKE2B 59d1f49d39ed86057cef678216487a4181baa002874cf61d67ccbe090dd8c3cfbb0b38f169cae232d8a8f833010c3d2759e5aee3e49d126b96b2eb16655f7df3 SHA512 a631057a3aad30957c2f41ff674bc9c3449758b75455e9f95a73d1114056be574300f99a5bd1c4c76a876e79cd1b36bc6cae32206d5520878a4e7b139fa43977
-DIST prometheus-pushgateway-0.4.0.tar.gz 1140644 BLAKE2B ea82e2e7f6fd817de02044e5aafde724a4089e4f2961f0b581f90df7e04e65af5a3c3e044ef94bd600a92468a8aed791c838a8fdc64b05b7a91d6288e7e96fb3 SHA512 67f25e5f7fdc54143c5d10720f27bd256f22695ced93088cf2b72fe3197e45324d4353357ae40d7d3e92019480c0bec009e38ed3f583724d46411d76adbdc927
-EBUILD prometheus-pushgateway-0.4.0.ebuild 1317 BLAKE2B bd02c4ce881a2d09342d65b1356447157a4f3a2150dfd0082d3c3b212f92ea9afc3e28434ea94bbd60f885dd4714e73db25fbd49bdee2c8228b19590bd6c2fd3 SHA512 d0f3e4fe75c870a4e329503673bdf5f3db9f30f9e6b26544ae13b69839c4c272da719e9ad7d6d71a7cb764493438f819d4b5c5dbbbe983c16909b363c071a093
-MISC metadata.xml 437 BLAKE2B 904f35ea9287d25e5708e450715f8719004a5349ea871e9730fe36a98257cd0ba2417ec572f0d26a8d5d2de5629bca2d1b81f3e344bb8e4a52653175e8df2f3e SHA512 09284843912bc08aef77485911289fe1050f7d42e726e555650ad73b3ca51bcb62af90ccd69c3529bbdb7373b9ec317e0afd74687b84b123ac4fbbf2a3de9d7f
diff --git a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.confd b/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.confd
deleted file mode 100644
index de9ef483723f..000000000000
--- a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# -log.format value
-#   	If set use a syslog logger or JSON logging. Example: logger:syslog?appname=bob&local=7 or logger:stdout?json=true. Defaults to stderr.
-# -log.level value
-#   	Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal].
-# -persistence.file string
-#   	File to persist metrics. If empty, metrics are only kept in memory.
-# -persistence.interval duration
-#   	The minimum interval at which to write out the persistence file. (default 5m0s)
-# -web.listen-address string
-#   	Address to listen on for the web interface, API, and telemetry. (default ":9091")
-# -web.telemetry-path string
-#   	Path under which to expose metrics. (default "/metrics")
-
-#command_args="-web.listen-address localhost:9091 -persistence.file=/var/lib/${RC_SVCNAME}/persistence.gob"
diff --git a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.initd b/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.initd
deleted file mode 100644
index a187e57897ed..000000000000
--- a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus push acceptor for ephemeral and batch jobs"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/pushgateway"
-command_args="${command_args:--web.listen-address localhost:9091 -persistence.file=/var/lib/${RC_SVCNAME}/persistence.gob}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
-	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-depend() {
-	need net
-}
diff --git a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.logrotated b/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.logrotated
deleted file mode 100644
index 3645c9be1762..000000000000
--- a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.logrotated
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/prometheus-pushgateway/prometheus-pushgateway.log {
-	missingok
-	size 5M
-	rotate 3
-	compress
-	copytruncate
-}
diff --git a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.service b/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.service
deleted file mode 100644
index 4377850f2c5c..000000000000
--- a/net-analyzer/prometheus-pushgateway/files/prometheus-pushgateway.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Prometheus exporter for ephemereal jobs
-Documentation=https://prometheus.io/docs/instrumenting/pushing/
-After=network-online.target
-
-[Service]
-User=prometheus-pushgateway
-Restart=on-failure
-Environment=PUSHGATEWAY_ARGS="-web.listen-address localhost:9091 --persistence.file=/var/lib/prometheus-pushgateway/persistence.gob"
-ExecStart=/usr/bin/pushgateway $PUSHGATEWAY_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-TimeoutStopSec=20s
-SendSIGKILL=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/prometheus-pushgateway/metadata.xml b/net-analyzer/prometheus-pushgateway/metadata.xml
deleted file mode 100644
index f233ac35e254..000000000000
--- a/net-analyzer/prometheus-pushgateway/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">prometheus/pushgateway</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/prometheus-pushgateway/prometheus-pushgateway-0.4.0.ebuild b/net-analyzer/prometheus-pushgateway/prometheus-pushgateway-0.4.0.ebuild
deleted file mode 100644
index 848c8d3c334e..000000000000
--- a/net-analyzer/prometheus-pushgateway/prometheus-pushgateway-0.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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 systemd
-
-EGO_PN="github.com/prometheus/pushgateway"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-pushgateway_COMMIT="6ceb4a1"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
-HOMEPAGE="https://github.com/prometheus/pushgateway"
-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}}/${pushgateway_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix pushgateway || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin pushgateway/pushgateway
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/${PN} /var/log/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/net-analyzer/prometheus-redis_exporter/Manifest b/net-analyzer/prometheus-redis_exporter/Manifest
deleted file mode 100644
index 2cf0cda89c71..000000000000
--- a/net-analyzer/prometheus-redis_exporter/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX prometheus-redis_exporter.confd 1274 BLAKE2B 9219114db37ca7005de03cc911111c5ad0f8a4aa7ac8fd29c983651d2d3508f23a2065bf79102a56cdc76c807934ece56a431085ef1c0b549120411b1adafdc8 SHA512 8a119f447269cb605ca00be96124fba113042c4e50227f50575077200a3146597cdd9ce084a7dee4b92e18d8e1cfdbcc45abdf0305e366e889e149ffe9fddf78
-AUX prometheus-redis_exporter.initd 618 BLAKE2B 15e68da38f7644013ffafc94de4740912918fcfb5c0b2ee8bf6f05b059ce25be9e9edf268d0fd67f646910e9df3f84770d2c765c1a4ff64f54f44feb15e6d205 SHA512 d6d4410fb66a1eb0402b26e8dac77e263aa686f1abc72a04a30465f9ebaa24eb8f77f6a712bbbdd9fb360180c728317ee9f9927a075c0f86383c1346b7c9a09a
-AUX prometheus-redis_exporter.logrotated 123 BLAKE2B a81bb20061fb4a971a854bc0b29b1273f504987770b28a6a1381a5e9cc713171420643b29d39025d747ddbb8fc6204cc9f1852985e72d7dcf444da1803690fd8 SHA512 ed69382e027ab631fc7e938e51dace227070804aca458c9785475f15ca485b7edc5e28e2c2577272290397901754363830e8a488f226e03a60f43defb1194fc3
-AUX prometheus-redis_exporter.service 456 BLAKE2B 215d061d7f823287a48c387a547b752734a15d02392874b76771915426f53b650ab1aa8506a910fcd8302d7f129828f79840abe689b236ffbcc1401ba1d9beb9 SHA512 3edfb3d91fa4cbff30594b66c75222bd2a41527610c24f65a967d6895f0f82c76ee22d113827409a475a24c65c44effc73df55b31a23b47c71ea347c345b79d6
-DIST prometheus-redis_exporter-0.15.0.tar.gz 1232990 BLAKE2B ade899ef0f21594d3bb59c379f44d941e2a42f06a5c2ba5b304cc0b8b83def12eb036e6011a7d88abe7d97104ae663cb025ca60287ec9aba7be93a734d84c959 SHA512 8892306500943ec18d8fa5110fc6f4954ec886fca4d0023cdc2134ee2498c6f39ab06bec8f998ecde796cc2053b66103146503b76a185db3da5cbab81ebd9f2a
-EBUILD prometheus-redis_exporter-0.15.0.ebuild 1456 BLAKE2B 4efc6a890875ce7619d4ec1f88b3eba6f1bc3c10d2ada7ba7fbe8339e9a829aa51ccbea95fbb7a3cb4241589ccabd762de28b1e8018af8856cf191c2472db8c5 SHA512 8d9e3275bdc72a21615c71549eefa1b20ac31f128e3d83d6911b103ef0a281efa2e5c52a32557307c9ddbbd94352d87d17944ea468f7e71074d85e015777e342
-MISC metadata.xml 333 BLAKE2B 8eb8199bafb906f2b58072cf9765c7c44a4daeb54216db95f25a6c1545bf30720d73314fafe5d129dbbc200990e7a553e0ddc1486c22aa5d24c8616d21d4af80 SHA512 b1a040dc4cc2762aea081dc99209191da6f0d3d77c343148e3eb539bbc6527586e46de1b97e7cbec9f5098adb2f655059aa8609542353ddd88d19febb43c6fec
diff --git a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.confd b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.confd
deleted file mode 100644
index 8573aef35405..000000000000
--- a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.confd
+++ /dev/null
@@ -1,30 +0,0 @@
-# -check-keys string
-#   	Comma separated list of keys to export value and length/size
-# -debug
-#   	Output verbose debug information
-# -log-format string
-#   	Log format, valid options are txt and json (default "txt")
-# -namespace string
-#   	Namespace for metrics (default "redis")
-# -redis-only-metrics
-#   	Whether to export go runtime metrics also
-# -redis.addr string
-#   	Address of one or more redis nodes, separated by separator
-# -redis.alias string
-#   	Redis instance alias for one or more redis nodes, separated by separator
-# -redis.file string
-#   	Path to file containing one or more redis nodes, separated by newline. NOTE: mutually exclusive with redis.addr
-# -redis.password string
-#   	Password for one or more redis nodes, separated by separator
-# -separator string
-#   	separator used to split redis.addr, redis.password and redis.alias into several elements. (default ",")
-# -use-cf-bindings
-#   	Use Cloud Foundry service bindings
-# -version
-#   	Show version information and exit
-# -web.listen-address string
-#   	Address to listen on for web interface and telemetry. (default ":9121")
-# -web.telemetry-path string
-#   	Path under which to expose metrics. (default "/metrics")
-
-#command_args="--web.listen-address=:9121 --redis.addr=localhost:6379"
diff --git a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.initd b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.initd
deleted file mode 100644
index 741a0b4e4682..000000000000
--- a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus Exporter for Redis Metrics"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/redis_exporter"
-command_args="${command_args:---web.listen-address=:9121 --redis.addr=localhost:6379}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
-	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
diff --git a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.logrotated b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.logrotated
deleted file mode 100644
index b1252b3d13f4..000000000000
--- a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.logrotated
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/prometheus-redis_exporter/prometheus-redis_exporter.log {
-	missingok
-	size 5M
-	rotate 3
-	compress
-	copytruncate
-}
diff --git a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.service b/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.service
deleted file mode 100644
index 9d2ba756a261..000000000000
--- a/net-analyzer/prometheus-redis_exporter/files/prometheus-redis_exporter.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Prometheus Exporter for Redis Metrics
-Documentation=https://github.com/oliver006/redis_exporter/
-After=network-online.target
-
-[Service]
-User=prometheus-redis_exporter
-Restart=on-failure
-Environment=REDIS_EXPORTER_ARGS="--web.listen-address=:9121 --redis.addr=localhost:6379"
-ExecStart=/usr/bin/redis_exporter $REDIS_EXPORTER_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-TimeoutStopSec=20s
-SendSIGKILL=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/prometheus-redis_exporter/metadata.xml b/net-analyzer/prometheus-redis_exporter/metadata.xml
deleted file mode 100644
index ad438766d9bb..000000000000
--- a/net-analyzer/prometheus-redis_exporter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">oliver006/redis_exporter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/prometheus-redis_exporter/prometheus-redis_exporter-0.15.0.ebuild b/net-analyzer/prometheus-redis_exporter/prometheus-redis_exporter-0.15.0.ebuild
deleted file mode 100644
index 3e3d871df3c8..000000000000
--- a/net-analyzer/prometheus-redis_exporter/prometheus-redis_exporter-0.15.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 systemd
-
-EGO_PN="github.com/oliver006/redis_exporter"
-EGIT_COMMIT="a0d9e4c704b4d35cd08544d395038f417716a03a"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
-HOMEPAGE="https://github.com/oliver006/redis_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
-		-e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
-		-e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
-		-i src/${EGO_PN}/main.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	popd || die
-}
-
-src_install() {
-	dobin bin/redis_exporter
-	dodoc src/${EGO_PN}/README.md
-	local dir
-	for dir in /var/{lib,log}/${PN}; do
-		keepdir "${dir}"
-		fowners ${PN}:${PN} "${dir}"
-	done
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/net-analyzer/prometheus-snmp_exporter/Manifest b/net-analyzer/prometheus-snmp_exporter/Manifest
deleted file mode 100644
index cd1938dc555e..000000000000
--- a/net-analyzer/prometheus-snmp_exporter/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX prometheus-snmp_exporter.confd 98 BLAKE2B 3058ed314dd66772e0d299f135cc1ddb4f3c1f47403848fd249e949173430673991a12e794c74bfb53d0f25f313513d2d70c03d589b6d947659d03e33e6dea8a SHA512 e757dd327252ffd29a65170837aea147128d8effee3d88ac4f0474efffaa10748b51bfbecab999605284030a3026b13ce3ce2c1a7ec347a6ff191e44040d84aa
-AUX prometheus-snmp_exporter.initd 591 BLAKE2B 103fec1c2e4ad46bf86893faaaf23bd64c7f22ecc905b059e31199c08d610d58852f678d18826cb06f51beab65c8777f49a05a005ad35b77dcfc3e5eef398926 SHA512 903fbcf43a737d2823ab74e954f40134a64414cc1e79a14c78ad51682baa52c3443e85e94ec1abb294753c93a55483c148239e738b72c03bcdc7d4a595580f41
-DIST prometheus-snmp_exporter-0.9.0.tar.gz 3257207 BLAKE2B 3e7e91d7e66b32e3f84c9e53061f54ffc10116913b91598edfa011663daf2c67314661dbe6cd5b2c20b30968833bd64a48bdd5dd06694e76f1e787d59ad63933 SHA512 eb287f4519f2174a9ce80414c2b7a698bc50e1bcb2303a8190164002af088e0694e01233314cfe2bd89b2cd751f2fd6f8447eb641541701b7bd481373ce084b1
-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/files/prometheus-snmp_exporter.confd b/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.confd
deleted file mode 100644
index c5e56a67e15e..000000000000
--- a/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for prometheus snmp exporter
-command_args="--config.file=/etc/snmp_exporter/snmp.yml"
diff --git a/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd b/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd
deleted file mode 100644
index b214422704e2..000000000000
--- a/net-analyzer/prometheus-snmp_exporter/files/prometheus-snmp_exporter.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus snmp exporter"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/snmp_exporter"
-command_args="${command_args:---config.file=/etc/snmp_exporter/snmp.yml}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/snmp_exporter/${RC_SVCNAME}.log \
-	--stderr /var/log/snmp_exporter/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
diff --git a/net-analyzer/prometheus-snmp_exporter/metadata.xml b/net-analyzer/prometheus-snmp_exporter/metadata.xml
deleted file mode 100644
index 9ea37fba673a..000000000000
--- a/net-analyzer/prometheus-snmp_exporter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">prometheus/snmp_exporter</remote-id>
-	</upstream>
-</pkgmetadata>
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
deleted file mode 100644
index 2d73fe9faa4f..000000000000
--- a/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.9.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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/prometheus-uwsgi_exporter/Manifest b/net-analyzer/prometheus-uwsgi_exporter/Manifest
deleted file mode 100644
index 684cecf0d60a..000000000000
--- a/net-analyzer/prometheus-uwsgi_exporter/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX prometheus-uwsgi_exporter.confd 857 BLAKE2B ab9ab9a1b80247d552a64d2b3d4d5ff22cf4d8f9dc6c4b819ccf8c8e2508de30cd1212a8bdfcc814f9c11867c0115867fd8b2ddcc7796a22b9dbd5b60ad1f55a SHA512 45b158629daec99a19508bddc297c3e2c5a781ef6d0e0571cff8d51308460faa499d5ce47829061be470a4d9177a90f806937ddf3322d35d2e950620e8c56ddd
-AUX prometheus-uwsgi_exporter.initd 627 BLAKE2B 37b6a417bbf2073dd30c7233266edd683e571217eb0aa12a9617ffafe44bbba449e508a437da1facf387e1ad801003a20bf8eed57177c5f62fad875d7ac185d6 SHA512 9735466e203f42c415742c2f6384357c7cd6e2e990dd75761ba79fff471680f2a41ae3324431e6c214f33c227b7d3eaece459cb9f10c6fba9a6080adf2448e30
-AUX prometheus-uwsgi_exporter.logrotated 123 BLAKE2B 29d0ba2bb1ae46aee8b6c635a8d22ef11738d6a83d2f99bea7105e984a9d6319a10f9e7ba2b34d44a3b15abda970525fbf70b218d5e01d3114032a6111fcf745 SHA512 4aaa140fb2827279717b21e17f09af1c2dbb26d03ab39b0921e61774a1bfc402629b8e3af210307fa8ed8e0147986280123e09b6d3533fb4284a9021190745de
-AUX prometheus-uwsgi_exporter.service 465 BLAKE2B babe8338d8b89e1e0d31bc35b08aa6714667daa051c4048d70ae467cf8c78184686f745e16ec4e04681cd86b2408a2c6171cb17e4a7cf95dc388a16e079da5e4 SHA512 603630107b9bb64065dd9c29416036e03a167dca33d50417c9ecd5542d15bfcbcdd7435a29a20a9764b2e7982e6e7d14c7f3438d116ef204e326f401073a5360
-DIST prometheus-uwsgi_exporter-0.7.0.tar.gz 3039893 BLAKE2B a6efdae7f9a19ad21a283b586b5667bd99456274ed419d1b64aaf4cdb4df1e1c4fb2a08edf6df2b15813d21311fe54c2f2394f0bf25ac11c49db8a924596da05 SHA512 380ef4515eaa81d4dee853682efa7a5e82af2ec00c096e7471028c9932d46e0a7406b75cb40f0f8efec15cd77b06c5477a07919d0b44720e3e194b5bb023b593
-EBUILD prometheus-uwsgi_exporter-0.7.0.ebuild 1312 BLAKE2B e8b1accdd2f511749db197fc58e14b845b2bd52dacef5e1ef1d617c57b80a8e360753a1e5304a746edc20714a6a94bb1c120f9a8a45a247ed1bd9d57663b4bd7 SHA512 f47253ced3a79ea39e754301407c8a086ae72dbf93d20fc36388f0c752eb25ee2297b68e74583c7eae25a6fa341f948e9aca8b7b3da04ddc063dbd8030356c9c
-MISC metadata.xml 333 BLAKE2B 95f858b4f8e6c056cdc531b5a8e5dcd4f1a3ef72937d8e9d25276fec38ac13d5da50c3a97c221735bb93cc1bc431e6408c5ef4a68a694a94f077270bb4acac62 SHA512 95be3084c4d196026c2447fbdba6c4c8ca982f04757e613a2b097c0481ca49b5eb0a10e0814fd7bbf1dbcc5862e5704a5ae6cc0b7192e0f4fe87e0ba9ea14e0d
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.confd b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.confd
deleted file mode 100644
index 6db54fb3cc0e..000000000000
--- a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# --web.listen-address=":9117"
-#                     Address on which to expose metrics and web interfaces.
-# --web.telemetry-path="/metrics"
-#                     Path under which to expose metrics.
-# --stats.uri=""      URI for accessing uwsgi stats.
-# --stats.timeout=5s  Timeout for trying to get stats from uwsgi.
-# --collect.cores     Collect cores information per uwsgi worker.
-# --log.level="info"  Only log messages with the given severity or above.
-#                     Valid levels: [debug, info, warn, error, fatal]
-# --log.format="logger:stderr"
-#                     Set the log target and format. Example:
-#                     "logger:syslog?appname=bob&local=7" or
-#                     "logger:stdout?json=true"
-# --version           Show application version.
-
-#command_args="--web.listen-address=:9117 --stats.uri=http://localhost:1717"
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.initd b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.initd
deleted file mode 100644
index b456a0b10505..000000000000
--- a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="uWSGI metrics exporter for prometheus.io"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/uwsgi_exporter"
-command_args="${command_args:---web.listen-address=:9117 --stats.uri=http://localhost:1717}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
-	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.logrotated b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.logrotated
deleted file mode 100644
index 8703cb2be385..000000000000
--- a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.logrotated
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter.log {
-	missingok
-	size 5M
-	rotate 3
-	compress
-	copytruncate
-}
diff --git a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.service b/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.service
deleted file mode 100644
index 39824c7efe7e..000000000000
--- a/net-analyzer/prometheus-uwsgi_exporter/files/prometheus-uwsgi_exporter.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=uWSGI metrics exporter for prometheus.io
-Documentation=https://github.com/timonwong/uwsgi_exporter/
-After=network-online.target
-
-[Service]
-User=prometheus-uwsgi_exporter
-Restart=on-failure
-Environment=UWSGI_EXPORTER_ARGS="--web.listen-address=:9117 --stats.uri=http://localhost:1717"
-ExecStart=/usr/bin/uwsgi_exporter $UWSGI_EXPORTER_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-TimeoutStopSec=20s
-SendSIGKILL=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/prometheus-uwsgi_exporter/metadata.xml b/net-analyzer/prometheus-uwsgi_exporter/metadata.xml
deleted file mode 100644
index ba98a1a69cd7..000000000000
--- a/net-analyzer/prometheus-uwsgi_exporter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">timonwong/uwsgi_exporter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter-0.7.0.ebuild b/net-analyzer/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter-0.7.0.ebuild
deleted file mode 100644
index 26946cce453c..000000000000
--- a/net-analyzer/prometheus-uwsgi_exporter/prometheus-uwsgi_exporter-0.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 systemd
-
-EGO_PN="github.com/timonwong/uwsgi_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-UWSGI_EXPORTER_COMMIT="20e35a9"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="uWSGI metrics exporter for prometheus.io"
-HOMEPAGE="https://github.com/timonwong/uwsgi_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}}/${UWSGI_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 uwsgi_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin uwsgi_exporter/uwsgi_exporter
-	dodoc README.md
-	popd || die
-	local dir
-	for dir in /var/{lib,log}/${PN}; do
-		keepdir "${dir}"
-		fowners ${PN}:${PN} "${dir}"
-	done
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f4ca292631c6..950f41f83273 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -10,7 +10,7 @@ DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d149
 DIST wireshark-2.5.1.tar.xz 28229472 BLAKE2B ac832e3d8727a20754153949d7dfba9cfbc359955e55c06a9181ecbd3c9d9ddac269a745a430c47907b3e205d1b593241e0908b5b6c232613cbd4d23c96c4f61 SHA512 c3e1abb1c8b6a035640d655c59bfb8a9a846c88f49035b8086ae81a6e74cb296419f15bc4969489208fdce6578d279663c6fbc8d6eebff1b6097d1dbd0e71b75
 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.5.ebuild 7394 BLAKE2B 8f6e0f25efb4323fb9235aed8350d96caef347a5c7b9965b574672d395832183bcc50b6bedcbefc5a23e90076dc0bb07c3bbacd5c3fe4aefe80bd4d009494ca0 SHA512 f34f4b16362e7bdedeba62927ebad5ab70e5a85a1d1b959d28b24e9be3141b6016b2ed7b9db865b4a945f8c9cd3ca9ad4f6dfe9edd6bd888a09d034f06253a0f
+EBUILD wireshark-2.4.5.ebuild 7393 BLAKE2B 480ba1146f7fa04f3ba3dc8ee2c31b0fdbb259aa35893b972a75cfd85ffe9d804dbd3b04162921e97d4faed7c6bbe0606a9f3718fafcde851d21c9f590ed47a1 SHA512 7d3f9b423ab116274cf3e7d9f8c7e566cb667c7b2cb66b35c0cf13f4f5722d22b94ee87e07bc14089e8c13dd233706be0ad3598ea3f1f352e7474172205a66f8
 EBUILD wireshark-2.5.0.ebuild 7136 BLAKE2B 0d4694ca0f61af34f8b54ac29d43d146ffabe22ec905e78f4ca1f49667d9a09dd4e5bfbb01f42d6ca2003712e2daaf4c52d4c00c03afdf492b638cfae95016a3 SHA512 642a7f788b98b0f820880f14a3245122803ce5f96a4290b327144be3c22f4ea7c23eb9142bf47332defa9b63ed2e8e5a81f20a69137d1ce1d5af84d14377deea
 EBUILD wireshark-2.5.1.ebuild 6664 BLAKE2B a6385ce71f757f3ac7fa7a38b6cacff2b21cbb235af9aeba31088f1965bdad709a848a3f2365c8eb31dd648d5eafb981dd58017719222afda341632b1e9866ca SHA512 fb2d172976a00b24e1bb7507bc0f3f5707a57e515bcccfb6561749d6d0857530c3e7d705ddfb571bc07ef0d4541f9c5d8ec2b30ea966b3e73b165e16284c7af3
 EBUILD wireshark-99999999.ebuild 7143 BLAKE2B 1f37c8e34e6d65965ba0b54056198c7d1fd15f763c987a9a753cf8a6c6c8487ebf977c8ccd6171d1336e1074cad7fe28620721b8b4eae74f1dc7e84b6a0ab38d SHA512 ef42790fdbf27aed911a8922abc7e094e2ccf08ea2c34f04587f17a3b9b892238bc401a4a9a9b017a1025098ddc17a8c47970d5b84811dd6690a742969d276ba
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index 8c52245ee8b3..cd5317d22461 100644
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
@@ -10,7 +10,7 @@ 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"
+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