From 8c364c784966be1700ea39ae45028f3e9be9cae0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 27 Mar 2018 22:40:05 +0100
Subject: gentoo resync : 27.03.2018

---
 app-admin/Manifest.gz                              | Bin 34306 -> 33507 bytes
 app-admin/bind_exporter/Manifest                   |   5 --
 .../bind_exporter-0.2.0_p20180307.ebuild           |  59 ---------------------
 app-admin/bind_exporter/files/bind_exporter.confd  |   2 -
 app-admin/bind_exporter/files/bind_exporter.initd  |  19 -------
 app-admin/bind_exporter/metadata.xml               |  11 ----
 app-admin/consul-replicate/Manifest                |   2 +-
 .../consul-replicate/consul-replicate-0.2.0.ebuild |   3 +-
 app-admin/elasticsearch_exporter/Manifest          |   5 --
 .../elasticsearch_exporter-1.0.2.ebuild            |  47 ----------------
 .../files/elasticsearch_exporter.confd             |   2 -
 .../files/elasticsearch_exporter.initd             |  19 -------
 app-admin/elasticsearch_exporter/metadata.xml      |  11 ----
 app-admin/fleet/Manifest                           |   4 --
 app-admin/fleet/fleet-0.11.5.ebuild                |  46 ----------------
 app-admin/fleet/fleet-0.11.8.ebuild                |  46 ----------------
 app-admin/kube-bench/Manifest                      |   2 -
 app-admin/kube-bench/kube-bench-0.0.8.ebuild       |  59 ---------------------
 app-admin/mongodb_exporter/Manifest                |   5 --
 .../mongodb_exporter/files/mongodb_exporter.confd  |   2 -
 .../mongodb_exporter/files/mongodb_exporter.initd  |  19 -------
 app-admin/mongodb_exporter/metadata.xml            |  11 ----
 .../mongodb_exporter/mongodb_exporter-0.4.0.ebuild |  47 ----------------
 app-admin/nginx-vts-exporter/Manifest              |   5 --
 .../files/nginx-vts-exporter.confd                 |   2 -
 .../files/nginx-vts-exporter.initd                 |  19 -------
 app-admin/nginx-vts-exporter/metadata.xml          |  11 ----
 .../nginx-vts-exporter-0.10.0.ebuild               |  47 ----------------
 app-admin/prom2json/Manifest                       |   3 --
 app-admin/prom2json/metadata.xml                   |  11 ----
 .../prom2json/prom2json-0.1.0_p20170523.ebuild     |  38 -------------
 app-admin/puppet-lint/Manifest                     |  10 +---
 app-admin/puppet-lint/puppet-lint-2.0.2.ebuild     |  24 ---------
 app-admin/puppet-lint/puppet-lint-2.2.1.ebuild     |  25 ---------
 app-admin/puppet-lint/puppet-lint-2.3.0.ebuild     |  25 ---------
 app-admin/puppet-lint/puppet-lint-2.3.2.ebuild     |  29 ----------
 app-admin/puppet-lint/puppet-lint-2.3.5.ebuild     |  29 ++++++++++
 app-admin/stow/Manifest                            |   2 +-
 app-admin/stow/stow-2.2.2-r1.ebuild                |   2 +-
 app-admin/systemrescuecd-x86/Manifest              |   2 +-
 .../systemrescuecd-x86-5.2.1.ebuild                |   2 +-
 app-admin/webapp-config/Manifest                   |   2 +-
 .../webapp-config/webapp-config-1.55-r1.ebuild     |   2 +-
 43 files changed, 39 insertions(+), 677 deletions(-)
 delete mode 100644 app-admin/bind_exporter/Manifest
 delete mode 100644 app-admin/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild
 delete mode 100644 app-admin/bind_exporter/files/bind_exporter.confd
 delete mode 100644 app-admin/bind_exporter/files/bind_exporter.initd
 delete mode 100644 app-admin/bind_exporter/metadata.xml
 delete mode 100644 app-admin/elasticsearch_exporter/Manifest
 delete mode 100644 app-admin/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild
 delete mode 100644 app-admin/elasticsearch_exporter/files/elasticsearch_exporter.confd
 delete mode 100644 app-admin/elasticsearch_exporter/files/elasticsearch_exporter.initd
 delete mode 100644 app-admin/elasticsearch_exporter/metadata.xml
 delete mode 100644 app-admin/fleet/fleet-0.11.5.ebuild
 delete mode 100644 app-admin/fleet/fleet-0.11.8.ebuild
 delete mode 100644 app-admin/kube-bench/kube-bench-0.0.8.ebuild
 delete mode 100644 app-admin/mongodb_exporter/Manifest
 delete mode 100644 app-admin/mongodb_exporter/files/mongodb_exporter.confd
 delete mode 100644 app-admin/mongodb_exporter/files/mongodb_exporter.initd
 delete mode 100644 app-admin/mongodb_exporter/metadata.xml
 delete mode 100644 app-admin/mongodb_exporter/mongodb_exporter-0.4.0.ebuild
 delete mode 100644 app-admin/nginx-vts-exporter/Manifest
 delete mode 100644 app-admin/nginx-vts-exporter/files/nginx-vts-exporter.confd
 delete mode 100644 app-admin/nginx-vts-exporter/files/nginx-vts-exporter.initd
 delete mode 100644 app-admin/nginx-vts-exporter/metadata.xml
 delete mode 100644 app-admin/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild
 delete mode 100644 app-admin/prom2json/Manifest
 delete mode 100644 app-admin/prom2json/metadata.xml
 delete mode 100644 app-admin/prom2json/prom2json-0.1.0_p20170523.ebuild
 delete mode 100644 app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
 delete mode 100644 app-admin/puppet-lint/puppet-lint-2.2.1.ebuild
 delete mode 100644 app-admin/puppet-lint/puppet-lint-2.3.0.ebuild
 delete mode 100644 app-admin/puppet-lint/puppet-lint-2.3.2.ebuild
 create mode 100644 app-admin/puppet-lint/puppet-lint-2.3.5.ebuild

(limited to 'app-admin')

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 278df9b70afd..0365a88b270a 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/bind_exporter/Manifest b/app-admin/bind_exporter/Manifest
deleted file mode 100644
index 7172e25f7988..000000000000
--- a/app-admin/bind_exporter/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX bind_exporter.confd 57 BLAKE2B dfffea2f2859b377d5132a2c56ace0260f2d272463c104144acea0a2489141d01e35f4899d53af1526fe0ca1ae760fef62c96a0b6849c8b8678b7693a53ac20f SHA512 54c5162993d488eecec2453b06b2cbedd5eb4599074cf43fda644e2faba4c35ad481840dbb8b05979bf1a0dcdff32edd9efa56bc779f264d81056793d1d00be0
-AUX bind_exporter.initd 550 BLAKE2B fcb4eb3066023024b8605a2c9787ba7c8871d05d1b11a1ea97ebab91e403e21876c8b29136b114c6ceef29e9be79056accdde7061e13f615b1f55c25998b938e SHA512 1471a0644c1c2d5a242987638b6fa0576913b9dfbcf886ade42951b3cc71f632c210060a619637988c5239a3ff934c2073e2bd34b913abd9871eb028fd71e2e1
-DIST bind_exporter-0.2.0_p20180307.tar.gz 873965 BLAKE2B e59cbd2ccbd13dd60b673c6816e2d4c151e85ed159daa272996081814f7f276bc686b5d6a94db59e41085d57a12974bd2dcb8ef7696dba3940de705dfc800f25 SHA512 63331f877d988a41b86c0204569a1cd19cbfa176be9e811ef8fa5509d0af4a2f7dda0b27f9ba3b0f3df985f7c075f4535225298ce8808f97497d8bfa3b41256d
-EBUILD bind_exporter-0.2.0_p20180307.ebuild 1550 BLAKE2B 5448c9f30f97c14a72f8063af4b335d5ea34f092d6c07adc5f27e72a366acccaf437b5c83a74117f9ce2f55fc6823762d587e823615745a004d38d85d201d09d SHA512 f94d6e633a3fff0c9b1b84e4ce3bc4034abce0519dbba1d332f54dc188278821e874d4e32323aca926d01e2b06c7506378e0318d1acba22f1a66da248cc5d6c9
-MISC metadata.xml 336 BLAKE2B 5b39247fdfd604232cfc3025e79ef77b109e9751e5eb2221da402420058a2b54686030592b30f6337575e5d6fc7f4080b46afc133e06ca4c48408b15bfd550e9 SHA512 e66208ff143de58a4a947c7de9b1ef414211dfd68ef5d2b18529c5b23252941bb32208cd6747cd5892d01986eb4a872f96083ee8ca166d322d8bdcdbe998c7c1
diff --git a/app-admin/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild b/app-admin/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild
deleted file mode 100644
index 2a1f34a01290..000000000000
--- a/app-admin/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild
+++ /dev/null
@@ -1,59 +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/digitalocean/bind_exporter"
-EXPORTER_COMMIT="38ef3a6caa68e8c42a08e72d51e90b00333e6894"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EXPORTER_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for BIND"
-HOMEPAGE="https://github.com/digitalocean/bind_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$/d" -e "s/{{.Revision}}/${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 bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/${PN}
-	dodoc {README,CHANGELOG}.md
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	elog "Make sure BIND was built with libxml2 support. You can check with the"
-	elog "following command: named -V | grep libxml2."
-	elog "Configure BIND to open a statistics channel. It's recommended to run"
-	elog "the bind_exporter next to BIND, so it's only necessary to open a port"
-	elog "locally."
-	elog ""
-	elog "statistics-channels {"
-	elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };"
-	elog "};"
-}
diff --git a/app-admin/bind_exporter/files/bind_exporter.confd b/app-admin/bind_exporter/files/bind_exporter.confd
deleted file mode 100644
index e1cc826703e4..000000000000
--- a/app-admin/bind_exporter/files/bind_exporter.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for prometheus bind exporter
-command_args=""
diff --git a/app-admin/bind_exporter/files/bind_exporter.initd b/app-admin/bind_exporter/files/bind_exporter.initd
deleted file mode 100644
index 1167b2430573..000000000000
--- a/app-admin/bind_exporter/files/bind_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 bind exporter"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/bind_exporter"
-command_args="${command_args:-}"
-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/app-admin/bind_exporter/metadata.xml b/app-admin/bind_exporter/metadata.xml
deleted file mode 100644
index 202de383a4e7..000000000000
--- a/app-admin/bind_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">digitalocean/bind_exporter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/consul-replicate/Manifest b/app-admin/consul-replicate/Manifest
index cb692868bb64..72ef1d16b486 100644
--- a/app-admin/consul-replicate/Manifest
+++ b/app-admin/consul-replicate/Manifest
@@ -10,5 +10,5 @@ DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 BLAKE2B 083cc
 DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 BLAKE2B eb7d4e853621798b63ec9806e2fb0d609d33fc7b370276433f055bea4282ab938488272e5a7334a54cf351f4380bc36cb0a0e991d8856e7ed1dc26de76110055 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c
 DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 BLAKE2B 1ae7805273210e02ed1779c29b24f7ea32233e860d3ea324af670547ae85f9ce66a9a98ad2105e59bec222d74ee385bf0051974a38503bff3fb464d68959e8f4 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f
 DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 BLAKE2B 1e28027d9dc21fafd181ba772ae79049584f803c19dbd9da01ef488a5c9f3998071bb87df0b0a8982b31823e1b4bead2386860ca5309fd4c32aa36941c784445 SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f
-EBUILD consul-replicate-0.2.0.ebuild 3449 BLAKE2B 1b17c7114c6bfa3020c96788f18a716e7274da15438c57dd7895eb85d8dc0db3ed93e71cbb2462bfbc82577951785977f3c1fc42bb7bac3dd626168213cf1fb4 SHA512 e5e0bb67529e732323428c7e3ebd4bb93943700b28b1f8fd4301e0284f44ab0f88ce91601b766fea703adce8f82be9212c230cd7ec69ac8858044f3670dfa4e1
+EBUILD consul-replicate-0.2.0.ebuild 3432 BLAKE2B 38f8847deec7b4fa8f7ae83174cc0af9c0fdf149202378741242586fbcb0234a68c941d3eeae8c94494a253ede30697455cf7b6fc8dc4a7dca2b9ee76b6cbb47 SHA512 2c8895e6e5c48ab59267381d94a9dc6efca3f16c75d2a0be99cf17ea617c95cf7e284dc650392837ab46f8a6df9537baf669b1c13b7b0b116ac58d6220ada835
 MISC metadata.xml 317 BLAKE2B 8e79b0f3b2b9099081cf94886f39e476e0bde6dd5eacffdfe48c70e1c2d2eb1d7902e8543e1bd3ae9427bd67cc699d6531be23d964cd72e993ebec7cb7cfdc0f SHA512 f99b2d57b72e37417fe17dfc9e71aa7be80fa554c6e75500953ad150a761e0f54634fc0c37787b8ac603d3d5e06e6980ffffdae87fe738dab6071620367bee3d
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
index be3251197b84..d13477938edb 100644
--- a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
+++ b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -29,7 +29,6 @@ SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
 	https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz"
 
-STRIP_MASK="*.a"
 S="${WORKDIR}/src/${EGO_PN%/*}"
 
 get_archive_go_package() {
diff --git a/app-admin/elasticsearch_exporter/Manifest b/app-admin/elasticsearch_exporter/Manifest
deleted file mode 100644
index 45fe1190392c..000000000000
--- a/app-admin/elasticsearch_exporter/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX elasticsearch_exporter.confd 96 BLAKE2B 4a65204509588b3bc93dfc5aa8f32c68a78b9dad05a3d8f95ba1095ee8bce8a2b3e94eb9b1b7d912b4d5953d99317233715e8c25e9ec1ee79809f0cdea09cf23 SHA512 f50fda8691d50ff59ba0679641d8211c117ba24b00b3ad4035ad5fdd144fdea909e26a9474e640049e778c256327642437d4b178aaa9f652b840420875ff152a
-AUX elasticsearch_exporter.initd 616 BLAKE2B ea0a311d6cf94063375a2369868ff258fe1f1e1335ccb664f032de975d7e2824c4d1d78716e706828e5a83efa91435ff225570eb68c18f330e3c46dc9e505aad SHA512 9780cc87adaca2be90e94baad679685781112de02e2eb68ff3270162ea38b228bc8960e670e80e20015855f6256d772208898e43f5924a1633ffdef98d2b4621
-DIST elasticsearch_exporter-1.0.2.tar.gz 207764 BLAKE2B f626c53d04e05912d1db480d6078b44fb6a05e42ec1751bfc2ddd45ff2f0bc0550517e16b10064adcf8c2ab2db175011543a2953fff1624cd575318e6fad943b SHA512 f610660761d761a26b840a969008763ecb19bdc07ab4a076cec7fc40f7d00a68e863fb72b0ea3b56446621a99fa31384ab79789a2e6526fc5b12dcc20df3c684
-EBUILD elasticsearch_exporter-1.0.2.ebuild 1162 BLAKE2B 28d273015563f09be796c6a7b671cf48fcfae9e84291eaeff2b9736c5baa710f09e5c184e833a0d11468f02cf44fa76c743ae868864b566166f6efdab2c54046 SHA512 a98d977d13a3b400935c75b00133c7ea92cde165a266f75b815b874285b2328ff3fcd1d823b5d6ed524efaaa4d521071c080b8635493cf0d756506ef8156d166
-MISC metadata.xml 345 BLAKE2B 3398877ce76e92f81d618b919ff45a674e72ba7987bb8bf5275bbcaa170eecb6927ccabe179f67cd36462c28f37d527cfa94eebc941f8858441207d5d8960b75 SHA512 0f625082213dedfd0ced3aa529cf77a73691361eea2d407df7d0eddabc93c7cb25a43ed631da508a31b50065bb945ae7576b1911fbcc4df57475794b76262f68
diff --git a/app-admin/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild b/app-admin/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild
deleted file mode 100644
index 20be32d6cf4f..000000000000
--- a/app-admin/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild
+++ /dev/null
@@ -1,47 +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/justwatchcom/elasticsearch_exporter"
-EXPORTER_COMMIT="92dcbf3"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Elasticsearch stats exporter for Prometheus"
-HOMEPAGE="https://github.com/justwatchcom/elasticsearch_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$/d" -e "s/{{.Revision}}/${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 bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/elasticsearch_exporter
-	dodoc {README,CHANGELOG}.md
-	popd || die
-	keepdir /var/log/elasticsearch_exporter
-	fowners ${PN}:${PN} /var/log/elasticsearch_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-admin/elasticsearch_exporter/files/elasticsearch_exporter.confd b/app-admin/elasticsearch_exporter/files/elasticsearch_exporter.confd
deleted file mode 100644
index 9a4dcce5b4b2..000000000000
--- a/app-admin/elasticsearch_exporter/files/elasticsearch_exporter.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for prometheus elasticsearch exporter
-command_args="--es.uri=http://localhost:9200"
diff --git a/app-admin/elasticsearch_exporter/files/elasticsearch_exporter.initd b/app-admin/elasticsearch_exporter/files/elasticsearch_exporter.initd
deleted file mode 100644
index fe932b923d14..000000000000
--- a/app-admin/elasticsearch_exporter/files/elasticsearch_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 elasticsearch exporter"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/elasticsearch_exporter"
-command_args="${command_args:---es.uri=http://localhost:9200}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/elasticsearch_exporter/${RC_SVCNAME}.log \
-	--stderr /var/log/elasticsearch_exporter/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
diff --git a/app-admin/elasticsearch_exporter/metadata.xml b/app-admin/elasticsearch_exporter/metadata.xml
deleted file mode 100644
index 2e5a147e290b..000000000000
--- a/app-admin/elasticsearch_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">justwatchcom/elasticsearch_exporter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/fleet/Manifest b/app-admin/fleet/Manifest
index 67d36741a3e6..6a86363d3c4c 100644
--- a/app-admin/fleet/Manifest
+++ b/app-admin/fleet/Manifest
@@ -1,10 +1,6 @@
 AUX fleet.service 195 BLAKE2B 4d229f3ea79b9ab6c400703456881e6978c8c5d4976e6e91c02dd2a84ba57b46d5d628c4b17644d6075ca12a195885144b74020852339b8d4499b774dae88117 SHA512 a654cc4f72a5b49c2383713660acfbc127dbc21d363f063a88d0afe02a76c191100b18b6f93bbbce26452458d7afd532a24b44e20bbd321787a63b25178182e5
 AUX fleet.socket 42 BLAKE2B 4b9fc506da1a5910ab2f4ce9eb01f3be4348a9a533870ca884fb1a3e6b8f08803a0f1ca60b300a90750b052768a30bde245a7c20e2e6e6576e61696ef3705bfe SHA512 85a9bd9bd93c61726ee59e2d00fe3cc7abd91d2f20b1ef2fbb8ad7522f682a2a5376070fa360f3e8c1d19011050fe822445bda4015ed2838efd343242b778230
-DIST fleet-0.11.5.tar.gz 456152 BLAKE2B b5c4d2763b39a1dff41f72b2cafb4e91aab0b78a57ad638ca0f5512a189e592be8f4776d3a96ccda18b1ecc34df73044b3274b8e550579bbac6b38c84bee0682 SHA512 1d97e386430db948d8730ec26b7d55a1dad00343600400bf21f9a1cb855e068063244ffe55774e72920c210181ff80bd9706ec99fd9eeb2ac28be14bba1dfbf9
-DIST fleet-0.11.8.tar.gz 443257 BLAKE2B 4b6d7a19e6d5e2dbc6460ba9df003945fca4bac57c111533339ae1eb06fc1caca585fb11511a6943258fddb8383f636f6c44df52118d77b5f3ca5538e3b038ca SHA512 637332716928efba0f49af1234cfccd1d3979982ad974eb86980263230db5f2bce4eed5dcd80546e371653678e3d3ec448edb50d04b8f336d7402525dfb4ef2f
 DIST fleet-1.0.0.tar.gz 4865693 BLAKE2B 33991c25ff2f7bf4307a9a3d2a6274b08a358d8041f641eb33b68946a2e682caae8b20643ac2735f447398cd305b9e3a77370ad6fc2ebe26b12c2f290a03e1e6 SHA512 77f38b605e37499e31effd82c3c4f0efd6adda73e9ded86db68efcd19a34bdc44b9f6f88b7fc94f7ea4f55b2027a1270d3c87897bf12b121614384a91bd9a3cf
-EBUILD fleet-0.11.5.ebuild 892 BLAKE2B ca82dfda92c27f5d9d738eb64db53afe35cb17c99187e5120058db66bdbe2eae043a75a0bd3d571d7bed3be662fff549a7b932cc2d1d67baecba1c7846e5769f SHA512 13dfa0acbaf68d1db6ca15b00850b49a070356447d23e2726f744ffc40a602130add718f60a8e8765f4a9488649db8413aec59bbbfc79a69ef23ad2c63006fba
-EBUILD fleet-0.11.8.ebuild 892 BLAKE2B d6cb58cdad14976305fcb942a6398dfe82c9f653672983174a4f884cf13bd74ef9c673b46152919c002eea81f44d56ba97f2776d7545015059bc0de3d1aea48b SHA512 64ce91a85bea30df7feaf172506a229e2d52e7e352031d493cae58dffdeada77c2761d36cd5422f6198a0f829e05c194de75fa2dce1f242d325b39bd729ff988
 EBUILD fleet-1.0.0.ebuild 892 BLAKE2B fa6dbe21f4b1133f6dec33e68d347207d8d81a704762af7545a302ca2539ce8d45f6e016fb905749052741dd1fefa66c78060db55e4324b2003b17da2f3f6b97 SHA512 770ca8ab09535293f0811072e0982dab8169ad20341ff4d50882fd3fdaf68aef0ed7f3f7c916e51f519da8878833ed641fce3969e4d6ff9f56d5d431c53848df
 EBUILD fleet-9999.ebuild 828 BLAKE2B a07823eb208b09d3a58b1d45d586371b3f58ac23e5031e61e6c7cddd201e8004a40f5f62da1c940372c65ee5327b040d4d29479f10fcf56027c9824096ecbbb1 SHA512 4b61f4138e8eb306f38a9cc1aaa637bb75d4d779e000cbe481313576151bd47a1d5f1bbdbe752b283ead3d0cfa0646db62d4e93f018763d9b5e2007b75a10e5a
 MISC metadata.xml 249 BLAKE2B 007ead1effe6366e0c4a08465f2bfb507cfe181aba96029dcb5ad4e46b7da6d954a6327200e3261d4cce93abc43b3da50040c818b1c16832b812d4c4f941b435 SHA512 a7cb996459f6adb6863fa7d51363ebcc5e4bee2a62b0416b1fc17767aa145442de6d3bceb69aa19cc59e3b5e7b51f06ee87bc4d2a4b1cc5f2b7c9c7caa60cac9
diff --git a/app-admin/fleet/fleet-0.11.5.ebuild b/app-admin/fleet/fleet-0.11.5.ebuild
deleted file mode 100644
index b983d3184a10..000000000000
--- a/app-admin/fleet/fleet-0.11.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_PN="github.com/coreos/fleet"
-
-inherit systemd vcs-snapshot
-
-DESCRIPTION="A Distributed init System"
-HOMEPAGE="https://github.com/coreos/fleet"
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples test"
-
-DEPEND="
-	>=dev-lang/go-1.4:=
-	test? ( dev-go/go-tools )
-"
-RDEPEND=""
-
-src_compile() {
-	./build || die 'Build failed'
-}
-
-src_test() {
-	./test || die 'Tests failed'
-}
-
-src_install() {
-	dobin "${S}"/bin/fleetd
-	dobin "${S}"/bin/fleetctl
-
-	systemd_dounit "${FILESDIR}"/fleet.service
-	systemd_dounit "${FILESDIR}"/fleet.socket
-
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	use examples && dodoc -r examples
-
-	insinto /etc/${PN}
-	newins "${PN}".conf.sample "${PN}".conf
-}
diff --git a/app-admin/fleet/fleet-0.11.8.ebuild b/app-admin/fleet/fleet-0.11.8.ebuild
deleted file mode 100644
index 2de9c9d839c5..000000000000
--- a/app-admin/fleet/fleet-0.11.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_PN="github.com/coreos/fleet"
-
-inherit systemd vcs-snapshot
-
-DESCRIPTION="A Distributed init System"
-HOMEPAGE="https://github.com/coreos/fleet"
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples test"
-
-DEPEND="
-	>=dev-lang/go-1.4:=
-	test? ( dev-go/go-tools )
-"
-RDEPEND=""
-
-src_compile() {
-	./build || die 'Build failed'
-}
-
-src_test() {
-	./test || die 'Tests failed'
-}
-
-src_install() {
-	dobin "${S}"/bin/fleetd
-	dobin "${S}"/bin/fleetctl
-
-	systemd_dounit "${FILESDIR}"/fleet.service
-	systemd_dounit "${FILESDIR}"/fleet.socket
-
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	use examples && dodoc -r examples
-
-	insinto /etc/${PN}
-	newins "${PN}".conf.sample "${PN}".conf
-}
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 759788995464..c85f6b951265 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -21,7 +21,5 @@ DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b
 DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
 DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
 DIST kube-bench-0.0.11.tar.gz 175361 BLAKE2B 844e252ccf270561154f1bab9c02144ff10a0594d71a2cd6e63a828ecabee2132a8756848642c475bfa705f360a5d69812519f705ad7c4717d5a4bf9d84cbd1b SHA512 52debf132bae38588f0b49c54f07d2550fc254665a0549b7369fb34b6884724624a44d14e6ea1120dc0c2586f2647b56d30e66695f2d8829c3f26ec5f2443f38
-DIST kube-bench-0.0.8.tar.gz 175035 BLAKE2B 55b80833c7bd5d69ffee312495693718b529f95473280648ff475c5193a3830a4062c2a253317b292d78a5f2a87917721e6bfe81a988376b62ddb2703ceb3eda SHA512 dfdecd10e942f44a4fd2a87ac96d3e0139112c018293a5021fa0a631b37a6d2177a766318058b60926ee6f7fbe232f677206f89b0c2d31022f935ba4d1e7a9cf
 EBUILD kube-bench-0.0.11.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
-EBUILD kube-bench-0.0.8.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.8.ebuild b/app-admin/kube-bench/kube-bench-0.0.8.ebuild
deleted file mode 100644
index 01b95b2a0ede..000000000000
--- a/app-admin/kube-bench/kube-bench-0.0.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
-	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
-	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
-	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
-	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
-	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
-	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
-	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
-	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
-	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
-	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
-	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
-	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
-	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
-	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
-	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	insinto /etc/kube-bench
-	doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/mongodb_exporter/Manifest b/app-admin/mongodb_exporter/Manifest
deleted file mode 100644
index 9e46d955213d..000000000000
--- a/app-admin/mongodb_exporter/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX mongodb_exporter.confd 94 BLAKE2B 25c98466e22b137a33f347d2c8c53fb15e0727423b6e0d8d804547a9b4220ca1c742cfdea6f6afbbb1fc6a38adafda56d1d372b5175bf3293ee5094ba2c835d5 SHA512 3ead6c80528042a436d8b0d013998e410c9a4216f532876766b7631187051b29b37bc4d834dcdc1483b1575dfa3b975baaef03e0637e63e279a5fbd9b3b75073
-AUX mongodb_exporter.initd 609 BLAKE2B 21f2130b139aa6a42fecbe388caf0b1d237c6bdd840247c66dfcc0423fa5988624936b38a76dca8500cb4e35913e6e62d62b70d8a52ab0a2437ca37485ac07a5 SHA512 6d37475feb73d5b8cfa1b5c32e9de8ce3201ae3b16c56b379f986780815d342cdd20983172bc6bb63ee653fda3ac764344f8b31a8b544a46243a97c61f86edc5
-DIST mongodb_exporter-0.4.0.tar.gz 3386266 BLAKE2B a6bebada2792e620b2107b72b3ab8b2a4e7a08fc53747f266b30a3cf2fe42ed7e09e3be9aa36332cba2df124947064f545821f355726e09649509c671a56c30b SHA512 0db1abd8c7439239cf59b24968ef33f83c6609a9deaed250315dd7fcb6844ef3d0d0c1f50b979f931beb539038a13eb7b88c03c899333d981112695be2e031b3
-EBUILD mongodb_exporter-0.4.0.ebuild 1110 BLAKE2B 5ad73d6b2c0cea692de28c2bac400beca74be721fe4c0766d8f12fede1f598e45f91f29ef001ec21a72a25884a2bc789ed51771ebeac751d63d22de4316e0b92 SHA512 75956d5f16c5723cfc2e2f7758f4645d87d6539bd8a3f5dbd0244d1985ece9372df28d9747ffec068c7bb352fc236abc25f0f0edea66e41c5d9477ac6ac7d581
-MISC metadata.xml 334 BLAKE2B d5ba9240caf276981ccc375de2ff7d205b0a04bd58903fa60a486d26cb099f5c32d1921fcc433b091bf30fddf20196deb8dbfb3f5e76cffe951cf170e79d6202 SHA512 e854872327de5d18b24ce3b6d5f93f35e44f4cdff88018b8e7aafdc1cdc4953820ef855b5d1be1d53dd8ede67119399c39e52fff04fe928ba2847467cbecf613
diff --git a/app-admin/mongodb_exporter/files/mongodb_exporter.confd b/app-admin/mongodb_exporter/files/mongodb_exporter.confd
deleted file mode 100644
index bd85fa288304..000000000000
--- a/app-admin/mongodb_exporter/files/mongodb_exporter.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for prometheus mongodb exporter
-command_args="-mongodb.uri=http://localhost:9200"
diff --git a/app-admin/mongodb_exporter/files/mongodb_exporter.initd b/app-admin/mongodb_exporter/files/mongodb_exporter.initd
deleted file mode 100644
index 2a2c985c4f64..000000000000
--- a/app-admin/mongodb_exporter/files/mongodb_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 MongoDB exporter"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/mongodb_exporter"
-command_args="${command_args:--mongodb.uri=http://localhost:27017}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/elasticsearch_exporter/${RC_SVCNAME}.log \
-	--stderr /var/log/elasticsearch_exporter/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
diff --git a/app-admin/mongodb_exporter/metadata.xml b/app-admin/mongodb_exporter/metadata.xml
deleted file mode 100644
index b54031048cbc..000000000000
--- a/app-admin/mongodb_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">percona/mongodb_exporter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/mongodb_exporter/mongodb_exporter-0.4.0.ebuild b/app-admin/mongodb_exporter/mongodb_exporter-0.4.0.ebuild
deleted file mode 100644
index 5ea07ecd61c8..000000000000
--- a/app-admin/mongodb_exporter/mongodb_exporter-0.4.0.ebuild
+++ /dev/null
@@ -1,47 +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/percona/mongodb_exporter"
-EXPORTER_COMMIT="01f0ef9"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for MongoDB"
-HOMEPAGE="https://github.com/percona/mongodb_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$/d" -e "s/{{.Revision}}/${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 bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/mongodb_exporter
-	dodoc {README,CHANGELOG}.md
-	popd || die
-	keepdir /var/log/mongodb_exporter
-	fowners ${PN}:${PN} /var/log/mongodb_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-admin/nginx-vts-exporter/Manifest b/app-admin/nginx-vts-exporter/Manifest
deleted file mode 100644
index 1317f6d44c4e..000000000000
--- a/app-admin/nginx-vts-exporter/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX nginx-vts-exporter.confd 138 BLAKE2B 5276947629899f4e338324d7bbfcd7afadac604fbe9d0b9bc101fbbfc5af2bccc2d9968315abcf060932defb3a054885527dd058e6ff20594ddfb77fafc8d138 SHA512 2b41b8efdef35f4beaf8b991e77a7ccf76be55290f9ddfa1262f860dc3b57411bcd1a3332f23119d87e3f72640d23da28d9080df43902f711cb1d1bff838532f
-AUX nginx-vts-exporter.initd 637 BLAKE2B 9fb8c9e1908846391ef0afc4b586f40a0ae13410c9f04e0ee594874b0434fe6fc0bab029f9d5021e5ce41a67df622bd2d7dff1f014baf25deee07d3e65a22eed SHA512 75ed5cfb084022e86058e20a7daee0c9c0fed3ee68090818e6f9d9b92dd8aee86145267c6b5309ede12f0a5103f80b74c43fd2522015ec866217e927c16a3803
-DIST nginx-vts-exporter-0.10.0.tar.gz 149620 BLAKE2B 6856240886d1a7082c901535954193798e8636ef744a5960441726cb12a5510706f7b8c1757e9f719c756d0beabc355cde8ec626c9bd4f14f7ff84894d0cc6da SHA512 bdd3993b3fee24d3332db720df2880493eeb0724cd5b099ccdd5fe6456df1b344132e4e585271999df355fb2042954cb3d452e6dc0b92dead288e94dd71f627c
-EBUILD nginx-vts-exporter-0.10.0.ebuild 1120 BLAKE2B d1200212f0ae09284a27b18826a49d3a30e55334d7f55e48134d4d6cfb704fa27ec95f99c5e8d5ee8a5c40c5f92bada71092d6b2c1e5bccdd58ac5fc1452e274 SHA512 871899a662d4d6b4c3b36fcce440cdc5ef57abf36016b8d0f535b0fb3a3e78adc71aff16ffc314cc1ef99167324aa1230dfe423bab0ffab7def00650f28842c3
-MISC metadata.xml 336 BLAKE2B 1efba2e3d984ebbd079fe45c406fb14932d9eaf9275e25b62fd915c6e9216fe2af377808436f66a8f0e3167126c1dbd2667021e155906e1e880a03ab1397b9bd SHA512 4f84f5262f71494fe5edbc2e1ffd96213f856f317c732f8833a865fa8bd4ea8268b43134e5f0dbcb51f18c3d52203b9000fd7afd346c68d631c5c42d2237917f
diff --git a/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.confd b/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.confd
deleted file mode 100644
index ae134353a235..000000000000
--- a/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for prometheus nginx virtual host traffic stats exporter
-command_args="-nginx.scrape_uri=http://localhost/status/format/json"
diff --git a/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.initd b/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.initd
deleted file mode 100644
index f61549b061d7..000000000000
--- a/app-admin/nginx-vts-exporter/files/nginx-vts-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 nginx virtual host traffic status exporter"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/nginx-vts-exporter"
-command_args="${command_args:--nginx.scrape_uri=http://localhost/status/format/json}"
-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/app-admin/nginx-vts-exporter/metadata.xml b/app-admin/nginx-vts-exporter/metadata.xml
deleted file mode 100644
index 0baff3eb9512..000000000000
--- a/app-admin/nginx-vts-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">hnlq715/nginx-vts-exporter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild b/app-admin/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild
deleted file mode 100644
index 761f9630f63c..000000000000
--- a/app-admin/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild
+++ /dev/null
@@ -1,47 +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/hnlq715/nginx-vts-exporter"
-EXPORTER_COMMIT="f5b3491cd0a8cc2df7088470f2727b0ae39a2700"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Nginx virtual host traffic stats exporter for Prometheus"
-HOMEPAGE="https://github.com/hnlq715/nginx-vts-exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${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 bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/${PN}
-	dodoc README.md
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-admin/prom2json/Manifest b/app-admin/prom2json/Manifest
deleted file mode 100644
index 4ea08c2b5ec4..000000000000
--- a/app-admin/prom2json/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prom2json-0.1.0_p20170523.tar.gz 129179 BLAKE2B ef0e42e340d53894c31bff7018b668d8575fc3568584a43dc308955665ac6f59dbabf2d4605bc2a66957df57a29ebb7b3a4eef1f99537eefc2805a5ffd86904f SHA512 824f4c43f4a167dc7dde2f11e84cf482e5cdfa26ab11caf08a5461d525543c3491180f54694c4ae61fdd5dc9763ff16f6e29b332a64dc3ac52fdb7b9c0902571
-EBUILD prom2json-0.1.0_p20170523.ebuild 921 BLAKE2B 8c4c359398fd7941f127c2fec6f8a0306f53dee43d2948873ffffe840b27f35ce2753c787f2bdfc6445ef9371fa10b4edc36dc3c2565e358ee7f9c8fe868b6ad SHA512 85ba4728a68ea42bc69f196e0e027f38ece006b9af5b2c9fe2da30b2605f79dc568017132e2eaa116b109bc7f18109581c8d69df641f82c7ce0066ea5dd9d3f2
-MISC metadata.xml 330 BLAKE2B 0e691de7e25e1287ed59fe2606e788b073ca53a20e893ca26ae274968f42050cc6c86e8b62dbdfdd361d98f212386249cb0d028de54f52f6cc3e1b211e2da679 SHA512 17cb63ee862d80eb3e6d15cd209acee351873802eae2f3a943b17b68e8d042706c2eb6e4ee9b5bdc6e0c9901888eadf6fbd3ee9969a517f417b25237b70b5470
diff --git a/app-admin/prom2json/metadata.xml b/app-admin/prom2json/metadata.xml
deleted file mode 100644
index eaf3cc3d6f87..000000000000
--- a/app-admin/prom2json/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/prom2json</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/prom2json/prom2json-0.1.0_p20170523.ebuild b/app-admin/prom2json/prom2json-0.1.0_p20170523.ebuild
deleted file mode 100644
index 8bc84e323834..000000000000
--- a/app-admin/prom2json/prom2json-0.1.0_p20170523.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/${PN}"
-EGIT_COMMIT="4a7436442837da72f9e211d99f0145dff3246b66"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A tool to scrape a Prometheus client and dump the result as JSON"
-HOMEPAGE="https://github.com/prometheus/prom2json"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${EGIT_COMMIT:0:7}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ${PN}/${PN}
-	dodoc {README,CONTRIBUTING}.md
-	popd || die
-}
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index ee75a6a58add..c3b888c7b36a 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,11 +1,5 @@
-DIST puppet-lint-2.0.2.gem 60928 BLAKE2B b43877499ee5d2af19932d776b0dc69a1de5960a499a2fd25e51c74ec26e4701b24ab1258602aad603a081bd1a7411eb646c470781490d8321eb97836261da50 SHA512 e3cdba2cb3c55b73489bdd9e8df24f225ff8134cebc1f2a05a7118905c59eab47e8998f5afc6294288f4a7e226029e17351812b918ee51b81be921e16c94f692
-DIST puppet-lint-2.2.1.gem 74240 BLAKE2B 1fa67e60103c22fdd20cf63f4d4c0d57f956c907ebbceef908edbe720a97a4c9f2fa4528214d4be7658da90d150f5a02ae7a9fb65a4bdd2af7bba15e92c06525 SHA512 16aeaf4614104c5d3642c7c61acacbb33f4c0518a18c814cf2cc20aa40c19ac2e392758a980178d50c80c41544c8164d407ad7cd8d783a0d97b1606c55680570
-DIST puppet-lint-2.3.0.gem 76288 BLAKE2B 0192bc7808dbf40c6685f4610b625360c6c16ed4d880db2062e93f75f710ef319bc626334b5d996c0b9609ebbd34ce3c645fc2b8d350b1bb2a6274654f9f70ca SHA512 d0c21bad8eb5e7e2352de7e919ad44cccfb0086980a52e8d26b167c29a2a78e2e6efb692c8ac88c28cffcec125e1bf2f26973dca642d2ee9fea62a1342dfb709
-DIST puppet-lint-2.3.2.gem 82432 BLAKE2B 7586bc15654e7a33ad8a4f98341c0fc19c2349bfce9c8afd4fb7a731a715c611b93837b02a3ee875297c71dd9021fee8cca04da3790a47ae06aa43e7226876c1 SHA512 5da388ad11285172e74de775d691ea49ebbbcadf938e7bddadff1bb9c9485dc30d7fa51e51db74d7912d23434223e3625e267a6785bd7f37243136553716db5e
 DIST puppet-lint-2.3.3.gem 84992 BLAKE2B 57b6d6332b7d26daf193ba983ff1e5d560cf4f902f1b476de3b1f7254755851397685d7b435dd7365f81e1427d91ca47ffa889a9d87a14e1c4720e44aa2b7996 SHA512 9203e8d29cb4a5c5abf8279598599db4a9063d33d7b7d6c76f8ebf09c3ba539f6035083b5438bae2b0fda1d16880ffcb69a2776ebce7f54bc1a1430c2ceb0d68
-EBUILD puppet-lint-2.0.2.ebuild 503 BLAKE2B f551675e56d30071dc74239dabad1bf7caf5ea0a84ade2d0862e35974cb07dc50d5bdd604f75b48276cee3bc78ec86ea53cfb8d19b126f70d5f7be8e39965947 SHA512 b459abca72be46ac909ac058848aaf16b0b2fd767093f3f1545ef18bd162227673af8ef282b0d030b750fec50dc879b618eb0a9363eedb10c026b09ac0351149
-EBUILD puppet-lint-2.2.1.ebuild 530 BLAKE2B b0cf079076ebd1fe96cb6068ef4bfc6db2a20f313471613a62036477278d93ae16ac8e0d65671286ad8f8a9a51fa24642b90ac1f3b566119ac96a231b644e734 SHA512 7971536bbc61e2d936da84855473c7153eadf4f88efbce369c9b75291065022e22d21edc0d8e3e32e2b00c6181a640490c3da637ebeda50c3be35b94d8cf3dd1
-EBUILD puppet-lint-2.3.0.ebuild 530 BLAKE2B b1c06852daefdb586e6ec3599f7806ce08b690fc57ccd8ebfac70bf0a534bd153aa6f13d38b450731d470f36a72e5a631b5292b2aaf7336f2ceaf6a18a16e4d9 SHA512 54d1567d795e072b67acfd4f67ec485d9d1e3b4f9790b0a9e79ea39f8b643703e28b8df52d5a6dfad848869a2ce18483c859cf599ea3a1b6e11577ffc8918755
-EBUILD puppet-lint-2.3.2.ebuild 620 BLAKE2B 8f3a4952c092b4ed4bc1a0fdb400a170faf7aa5f3dcb6a94a38a36dfd3c493c6f8c5fc2bfbc2f15dedf84fab404bcfa70124b7cefb68c845aea2cf222153e180 SHA512 a4cb6b8dedfc02d929c7b78bbba4eab2099cf5b3d81628f994c1e5389c76ac52171e376aa9bd470facd5d26b82f4d41cbd7c04d81af0c393bd1fa543f07dc736
+DIST puppet-lint-2.3.5.gem 86528 BLAKE2B 7455c729cb0512cb26838439c854c70d2581f2102594ac60d76a34f9839b0bb7dbab65beb87369419dc0e66583bfac1ad9f22d65ee3ee9bf35aa3c37e8f0d1b9 SHA512 5e1978c5438869c12c2151e76fe6cea12c447d9f59f1fbbc90fb80e61c7ff9c220be85f70cf95dec2380cd35205ffec0473cc7eda0db21b94a30b533d4214707
 EBUILD puppet-lint-2.3.3.ebuild 620 BLAKE2B 8f3a4952c092b4ed4bc1a0fdb400a170faf7aa5f3dcb6a94a38a36dfd3c493c6f8c5fc2bfbc2f15dedf84fab404bcfa70124b7cefb68c845aea2cf222153e180 SHA512 a4cb6b8dedfc02d929c7b78bbba4eab2099cf5b3d81628f994c1e5389c76ac52171e376aa9bd470facd5d26b82f4d41cbd7c04d81af0c393bd1fa543f07dc736
+EBUILD puppet-lint-2.3.5.ebuild 620 BLAKE2B 8f3a4952c092b4ed4bc1a0fdb400a170faf7aa5f3dcb6a94a38a36dfd3c493c6f8c5fc2bfbc2f15dedf84fab404bcfa70124b7cefb68c845aea2cf222153e180 SHA512 a4cb6b8dedfc02d929c7b78bbba4eab2099cf5b3d81628f994c1e5389c76ac52171e376aa9bd470facd5d26b82f4d41cbd7c04d81af0c393bd1fa543f07dc736
 MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
diff --git a/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild b/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
deleted file mode 100644
index cf379613b0f5..000000000000
--- a/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit eutils ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1 )"
diff --git a/app-admin/puppet-lint/puppet-lint-2.2.1.ebuild b/app-admin/puppet-lint/puppet-lint-2.2.1.ebuild
deleted file mode 100644
index b2e360053d8b..000000000000
--- a/app-admin/puppet-lint/puppet-lint-2.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit eutils ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.0.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.0.ebuild
deleted file mode 100644
index c53ed5cf7c68..000000000000
--- a/app-admin/puppet-lint/puppet-lint-2.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit eutils ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild
deleted file mode 100644
index e672004b0fd5..000000000000
--- a/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit eutils ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild
new file mode 100644
index 000000000000..e672004b0fd5
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec-its:1
+	dev-ruby/rspec-collection_matchers:1
+	dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index b4f5723a9391..4d6530637352 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,3 +1,3 @@
 DIST stow-2.2.2.tar.gz 579324 BLAKE2B fc4ab7f386e8245b361cee5fc0decd91caec543ec6178c82720866c33a974ba9d68e999a68c3b7357d873ab1b58bb8b022bf02dad029972f42c317ffc288bd04 SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5
-EBUILD stow-2.2.2-r1.ebuild 604 BLAKE2B a13e8903738049963109d49fce6be1f2943eacc13689822c300a26d2e36f7e7eb5b85290868914c5578b650e32a1152a198dd5d03f357fd8ca1375c5896cdf13 SHA512 d3405f3722fea01623e0ec49973743df773d1e48095f51b22a9cd48a0b70f8be16fb59c5276d9520392e8bef73d7f904bc77bdd9ab480182916e477e645a0bda
+EBUILD stow-2.2.2-r1.ebuild 610 BLAKE2B d6ad75f18424f88fff14d7546c842ff46b22ef550066b189dd878fbc82607f29f21b7b3a5261a3b0fd42ea0d06ff2b2b668852dbb55b112a9be30ba610e6141b SHA512 081d44d6e5601065b29a1d791a0baa6256f8b5cc3e0c0c9c4dcb0688ae2495581f9b1fe45791148325f14de34a2e92cb6c69c3adbbcfebe453a346984988d1cc
 MISC metadata.xml 469 BLAKE2B c09f5d5ad52c89661d6c2b43f1762584cf3282ec9812233df01900ea4b738faf2c66b4405f0d5b01f33016b7c98714cb14fb503f84ed2332596d65ad676217f1 SHA512 d2dedba051ac4de16316392a51e87ea36f435c7f568523ddbd06aa620f4d350edafc6bc996954d9982dd1496951c22731fc5cb5df2725414986281709dafb126
diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
index bd7405804f21..b11a141ca91e 100644
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ b/app-admin/stow/stow-2.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/stow/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 
 DEPEND="dev-lang/perl
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index dfab588b47a3..1a2bb92874d4 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -63,5 +63,5 @@ EBUILD systemrescuecd-x86-5.1.0.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e
 EBUILD systemrescuecd-x86-5.1.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
 EBUILD systemrescuecd-x86-5.1.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
 EBUILD systemrescuecd-x86-5.2.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
-EBUILD systemrescuecd-x86-5.2.1.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
+EBUILD systemrescuecd-x86-5.2.1.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
 MISC metadata.xml 585 BLAKE2B e0ce16c78e84339e1171bbf2e0aee7e27c3c32d4f795b1d176d872596330c531e6f960acd52526707464da2ad8d058035c42f3b9ff440bce139ce4b5703933d6 SHA512 51a7820398c4c637017c4a38bc0cd7b8b157e5dca57af0495a05c3df0bf09662287954bc04b24995585e8ecf3ff510177561db4dae3fadc64490d184319c18b6
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild
index 7bfc35a7dd27..1ceb856d826f 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
 
 LICENSE="GPL-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+isohybrid"
 
 DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index f3048fc9e6c7..e20ebb201a49 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -9,6 +9,6 @@ DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3
 EBUILD webapp-config-1.52-r1.ebuild 1606 BLAKE2B 9f9f8643009e63730bc35ef404784d4883dfc396cf901d1cd13099c49bd8ccd5fea30603d2f8a2951dabcc5f4c9755a1cebde4457e4a26aed54bcce26530d4d8 SHA512 bff85d0cd35afc3fc99525ea34db8a6a49c0aa56b91ba4e8a6ad5dab9f5a34880b7f193166c0cdc40d37e51741306e091a080dfb363cc5d5401a315fce0d4d79
 EBUILD webapp-config-1.53-r2.ebuild 1690 BLAKE2B 07202fd26910ab49aeaeb12ccbacde118d19bbb99e748fa454add902b38fcbfe7b4444c668ffe3c0c7727f2915fb7fd687893d67c178d3f988d89f8deafee7b4 SHA512 3d4ba6d9bfae336fab02b3fcd5b5d11b7c28dbdaf2d32594e98ad79c321914af33cc9c761d7fb7b6b4f734e35f8d47734712d2866ca7981e4c4b296135638b46
 EBUILD webapp-config-1.54-r2.ebuild 1743 BLAKE2B 4fd352e2f29ba7289935662e424a9cbdc1e484b2021f027cb60c102aa790621535a8861e0a0f9dae07556ee303d1ffc109735c7e0db1beb2c7f0d0434ec04a55 SHA512 be5330d0ecd6d05d8a5a539baaffd1919079bbbf22eb508789ef306a0e9cdc513268a3ca19fde73ebc7182adff30b34813fe47d1226b8d66758fd6f2da8525d3
-EBUILD webapp-config-1.55-r1.ebuild 1751 BLAKE2B 5859c360f06d8071aa4d10a06c5ea20b109714b2d1b687870e616c346d66095ea63abcc031e34ae41c0671447a5620cb5f86e955c9c249026b8ffe64c8e95175 SHA512 844c4ae84a6790f09795cbd824e0ace2027d6be155320003ed1ed76c6bce3649ab6722a998439c8b08f4803d7e946c4f37725277b649142e9aba2e76151b2ccf
+EBUILD webapp-config-1.55-r1.ebuild 1750 BLAKE2B 3bd572bc76a070994d0073700873a340c40e17114d0a453731559ec0d78b0a0e89676521d8bc8d65fea5b403ef01bf10a110193d67c2729510001f3a7fe25227 SHA512 dc0c4ea63ba8b305fe66ecd565802ccd465c03db28812ead28f24545f0d1217c8cfe9fef941a9b38a29714567047c348996df8ae9ad59fa7535ad1cdae6f7d44
 EBUILD webapp-config-9999.ebuild 1875 BLAKE2B 34626a203c536160711fdc2a90129c33d1223f1275dd5ab21564454c0ac50addb18a6688677936539f357a0fd56f1ec1f454090b43975c3d6b521d308e29bd31 SHA512 badc7e1f37c48da80e1550a8486fc537a644d06fdbaa5f598c2389c29383f096b109b7274827e1b99d23a4a0490761cbcea24e1d7fe2e170273676dc9cfa5b49
 MISC metadata.xml 661 BLAKE2B f82847c0e1fb4f92339258755eb15899b5f4ce6e0acbc8bfcc1dc428e9c76f335b40f8b878de5de009bf09dd7e4e7f119104b4fdac78179b8e2a5abe5d2f87f4 SHA512 bd5161502c6e93cef50b1206247f26920d011d87ca9b9d83217f30a2c29e67728262804d42b13eeb956b69432adbf27d9f42ca75b48a92b6335c9eac25a9976c
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
index 871ffb75c6a7..9f4d3c31c228 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1 prefix
 
 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
-- 
cgit v1.2.3