gentoo resync : 24.12.2018

22 files changed, 346 insertions, 301 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 1edb5769133e..f4a7b27cabd9 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/blackbox_exporter/Manifest b/app-metrics/blackbox_exporter/Manifest
index 8e83e9bb5e9d..8927ce500f34 100644
--- a/app-metrics/blackbox_exporter/Manifest
+++ b/app-metrics/blackbox_exporter/Manifest
@@ -1,5 +1,7 @@
 AUX blackbox_exporter.confd 110 BLAKE2B c3cb7ed7d314ea8b347b4db9839e7c987c91c78378a6085473d687a5f3460f06ca6825567fbe832c3114906156290d00d505e15e3c2461eb844acb4e56937af0 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed
 AUX blackbox_exporter.initd 615 BLAKE2B fce98f2c0740db2309d0395cf1e7e3f8b3b305c688cbafbf14a1787d952d49933ddebee1a688b844a66c95d02c38c38e943ff73e4dce68a1069c69c91540cc47 SHA512 f5ecc87e592fe85e4cfed759f06a1d88a4bbd05a474cb7955aae296ee29ae2ddf875a427bfcc7ff8369367eb8892c85bcc5051d273f8c2693395c8851b5f8669
 DIST blackbox_exporter-0.12.0.tar.gz 2202465 BLAKE2B e3b082f8a491b531b0caf3331ecd391bf8734df0915ccbb7988ac1e67e57436bd45169aa403d5511fbb44eb176f89836ad8c04c491f5194f90f9f8a3b686a656 SHA512 2c98c0f4127bdd04ac54eb182c5468fd38121558f85aa8b4bec860f783f266b144df3153da0b028fdb84a4131a4e374a969bb09ce3a781ddf95f0a008c11bbb6
+DIST blackbox_exporter-0.13.0.tar.gz 668255 BLAKE2B 08c772175fa911ced04576c43b03b8594a1e6d30767742cea6630561045dd0440e1cd26847f2e7e506fb4fefc603a9a3e1b4228e46735f8d559a55462c0d11e4 SHA512 49290860e5e1713cc0e1edd93fd193d6e23aebe55a6f62778da89450f5ba79787d4ac3fd6ca3aae37f4941c16976db4570f2d4888534f2ce2c86e25e250b12f1
 EBUILD blackbox_exporter-0.12.0.ebuild 1440 BLAKE2B cb3900045d4128eb313c1e7c0d314e65c1773f491d314ffe052dbb6390dd4e8eddd4351a1f220fff80d9a88d9ca0676d862716fe83e6a56d84e142daea041854 SHA512 3b9c53156662bc16538f0db00b741ada3b3fd6373f7ef3272c97cd7080dc36b83ef8f40007ca307dcd73e5b82274e3f16a2de67743858c0f39eec99d76f6a3d1
+EBUILD blackbox_exporter-0.13.0.ebuild 1472 BLAKE2B cb3f74b15010c1cb39c3eb8e35a17a25b86c2703a549c8631878fd1f5661068d86691689db499848110ec4a6ffafdad3f558f6ae8c84fb7b475a5af0ce8752c8 SHA512 1660db3d6724b1b04a13b6929447b74b9de87c0437e91472388617a1f69493a78e889722785e3ec359cbc49fb4b7b5d6202ca408591a549c5cb6c9808025086d
 MISC metadata.xml 338 BLAKE2B 117f205ecdd4c05aba1ce92846f59dc7790c9fdae79db5cc1eb912d34a9e1d83eaaea26feb24245a0c5fc4394552705aa7b23171920d9023ca8e4333b3c09650 SHA512 e431b2ef89e797b9cbb290a70683a4392f07559851550dd22f5410f09c979730c8dd35c095f855565df8d72adb42c6e4b9d03882adf37240b0da28cc508ee2ad
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0.ebuild
new file mode 100644
index 000000000000..52be350e039e
--- /dev/null
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="1cfb751"
+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-lang/go-1.11
+	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}}/${BLACKBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GO111MODULE=on 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/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index fa9e757bc9a7..2b6d63fb14e7 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -1,10 +1,11 @@
 AUX collectd-5.8.0-disk-plugin-udev-fix.patch 2659 BLAKE2B 9b787040e34e62f06993d5bc2ccf92032b9880a1ba65f69c351300ad61ffa6e1ff5ace074285abf3e05962b61a2aa15f355f48ab9f789357197dc24d50138025 SHA512 bdac64df91de88d0cb8220a9cd5a9d303a5d9f3551484bf6319c8a2987ef69c2becc4dfb37350836767aed06704be3da9500433c21f1363c80c6d3faac13e1e5
+AUX collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch 2595 BLAKE2B cd60e42c3870611b30068d09410abc1cc80e5c2c945805d9a105050a52f3c2fc2ca2c5e10f33cd9c5063b0773a1bdad9ea7446f88632674cbd2cdd5202a69247 SHA512 6c04f6651a4bbe0c051202cfc3fae3e366cacf34c74e9ff3f09ca83887eb165e4febf8957ede66c22195c03c1f111b24a8859a56921cd42f68f938e87d784f52
 AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c1ba1d71e68213e8f978c3cad0dfc5eb2c536ced8213f172804f0596b3494f9b42b0cacf3432105cab5a SHA512 729f2b4e06c4a8c95d32c03c6f3f292eaa4895780ace180b74fcf139a949e9c28a2b3ae823bdebec0014f9b4d919adb399bc7f019c68c0e268b263326959edb7
 AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc75e9cb36e1f2dba85b3b2b587336f976059af165ae89333d681ffe0cf53bbcd8098eaeff75228cb80b68 SHA512 8f0a73f0f2b2280c0f2e35894a9dfa38af937930eb090eab52cbe81089a146bd974f6a2a3062b7147611f9c13b770a945a1a9228a026405d31578e27a3fd3b80
 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
 AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
 DIST collectd-5.8.0.tar.bz2 1686017 BLAKE2B 26d995cdb9c25869bf96a056e6ba879de9f009fd4bbf1364a7dedba93b822e57c4b606ca8c84da68cc29db8e77333047695e85d7eb101080de9cee783240f5ea SHA512 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008
 DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e SHA512 8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901
-EBUILD collectd-5.8.0-r1.ebuild 19414 BLAKE2B 3bdf9270dacb93480694b7ccfc0b2cae4fbc5aa2a2ca9b1acc9c8d9dfe1fdc4725a86ac064504b7df2ebecff1ac1d0f7625596717b1fadaa2491c5586bc2df94 SHA512 4967130b806f6395e1116c03f90cc2b84bb586c862e24a9adc86b653b079ef08121911fdbebdcfd80a0dddfd72d661949210f1027a793e933ab038a37fb46052
-EBUILD collectd-5.8.1.ebuild 19359 BLAKE2B 96231aee3d7f6ee5d2f2f683b37a421858710b77f552284742bba0e650f0e0862236ff7ae585758a1fa0c73e86d75d93e33cb2b7fed734cb29eca8bffe3a6655 SHA512 effb2409d83a234ccb9275c1c51418b1fce3a0717d8738fcb18fb1f8f6f191a9f9d5cfc6b99e2b5db1b904303108c9ca6e070b1f6a569392813ae92623d834fa
+EBUILD collectd-5.8.0-r1.ebuild 19416 BLAKE2B 3f5880aa8598e508aa57463801c5add74249c3e1a41a5692f1b32db1d520e7fcfb8f2bce75ca352fed9e0cecaf61b53c74678e5777003e99a6abe740d6b2a39f SHA512 1c8fcb25b433c6e01bd7cf3a1f89be36fcc5cd94b30c4e023745d5fc789015cf06e83a627030e452931804d278da3992008477208d6cbd280d7b91707ff07e1e
+EBUILD collectd-5.8.1.ebuild 19435 BLAKE2B 039ba1b3847dca9f785123a5522e1e61bcfcde49d3873bcb87399f0f0b28f91484ce0d3c9e6cc109c51bd8fc715e7623b8ae0eae3b3cf99dc5209feadd291a97 SHA512 1dd23fe915e29f9a5183fc0d49d5b418fa8ebdd6df936302d1ac5e29d49c9dea26b6d6264718f5f763eb53f88a5d09cf23320c1b0c02a08a1f23467aba614e34
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.8.0-r1.ebuild b/app-metrics/collectd/collectd-5.8.0-r1.ebuild
index d0f6da99fd52..806483a900e5 100644
--- a/app-metrics/collectd/collectd-5.8.0-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.8.0-r1.ebuild
@@ -119,7 +119,7 @@ COMMON_DEPEND="
 	collectd_plugins_routeros?		( net-libs/librouteros )
 	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
 	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
-	collectd_plugins_sensors?		( sys-apps/lm_sensors )
+	collectd_plugins_sensors?		( sys-apps/lm_sensors:= )
 	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
 	collectd_plugins_smart?			( dev-libs/libatasmart )
 	collectd_plugins_snmp?			( net-analyzer/net-snmp )
diff --git a/app-metrics/collectd/collectd-5.8.1.ebuild b/app-metrics/collectd/collectd-5.8.1.ebuild
index b334e07575c4..e4a2fbf25d09 100644
--- a/app-metrics/collectd/collectd-5.8.1.ebuild
+++ b/app-metrics/collectd/collectd-5.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
+KEYWORDS="~alpha amd64 ~arm x86"
 IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
 
 # The plugin lists have to follow here since they extend IUSE
@@ -119,7 +119,7 @@ COMMON_DEPEND="
 	collectd_plugins_routeros?		( net-libs/librouteros )
 	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
 	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
-	collectd_plugins_sensors?		( sys-apps/lm_sensors )
+	collectd_plugins_sensors?		( sys-apps/lm_sensors:= )
 	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
 	collectd_plugins_smart?			( dev-libs/libatasmart )
 	collectd_plugins_snmp?			( net-analyzer/net-snmp )
@@ -159,6 +159,8 @@ REQUIRED_USE="
 	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
 	collectd_plugins_smart?			( udev )"
 
+PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lm_sensors-4.5.0-compatibility.patch )
+
 # @FUNCTION: collectd_plugin_kernel_linux
 # @DESCRIPTION:
 # USAGE: <plugin name> <kernel_options> <severity>
diff --git a/app-metrics/collectd/files/collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch b/app-metrics/collectd/files/collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch
new file mode 100644
index 000000000000..3476d50664a5
--- /dev/null
+++ b/app-metrics/collectd/files/collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch
@@ -0,0 +1,70 @@
+https://github.com/collectd/collectd/issues/3006
+
+--- old/src/sensors.c
++++ new/src/sensors.c
+@@ -149,7 +149,7 @@
+ static char *conffile = SENSORS_CONF_PATH;
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
+ typedef struct featurelist {
+   const sensors_chip_name *chip;
+   const sensors_feature *feature;
+@@ -159,9 +159,9 @@
+ 
+ static char *conffile = NULL;
+ static _Bool use_labels = 0;
+-/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
++/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
+ 
+-#else /* if SENSORS_API_VERSION >= 0x500 */
++#else /* if SENSORS_API_VERSION >= 0x600 */
+ #error "This version of libsensors is not supported yet. Please report this " \
+ 	"as bug."
+ #endif
+@@ -223,7 +223,7 @@
+     if (IS_TRUE(value))
+       ignorelist_set_invert(sensor_list, 0);
+   }
+-#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
+   else if (strcasecmp(key, "UseLabels") == 0) {
+     use_labels = IS_TRUE(value) ? 1 : 0;
+   }
+@@ -353,7 +353,7 @@
+   }   /* while sensors_get_detected_chips */
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
+   chip_num = 0;
+   while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
+     const sensors_feature *feature;
+@@ -410,7 +410,7 @@
+       } /* while (subfeature) */
+     }   /* while (feature) */
+   }     /* while (chip) */
+-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
++#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
+ 
+   if (first_feature == NULL) {
+     sensors_cleanup();
+@@ -485,7 +485,7 @@
+   } /* for fl = first_feature .. NULL */
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
+   for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
+     double value;
+     int status;
+@@ -528,7 +528,7 @@
+ 
+     sensors_submit(plugin_instance, type, type_instance, value);
+   } /* for fl = first_feature .. NULL */
+-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
++#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
+ 
+   return 0;
+ } /* int sensors_read */
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index b483422b564b..caadba1797ea 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -2,8 +2,10 @@ AUX node_exporter-1.initd 615 BLAKE2B 4d5d30126a1491b4771365b7db31a4849a3eeda3a0
 AUX node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
 DIST node_exporter-0.15.2.tar.gz 1327204 BLAKE2B ee694771ed6d736fd4bb6a10f713f31becc930fb8225499d4b3a2a2cc7416c1816605cd8f4205dc37a2264af8d9f85e3519bc01844d252b6a70d4ee5f6308ece SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52
 DIST node_exporter-0.16.0.tar.gz 1413131 BLAKE2B 7561ae8cc4994c6772816b72d6e3ea98934cb02eee7fab6c08a58ca853e492192defbadf25ea6f992fd044d23826241a4c0fb54c423b59394210803a5fa517e3 SHA512 59a2286024de76e7213e430ba77a366190d626d3b410c8dc960ad2bf68798e8ec3aeb851396673fb402eef15b2596f6835cf0197a53b9a3d1c0f8a1a81965fc7
+DIST node_exporter-0.17.0.tar.gz 1758763 BLAKE2B 4c5d994e9b57bfd52353681b786149f6972abcdef908b872420172864b53875f26aff291ce76fe4a8b8d134ff1157e15cb45d50a4b552f1c72c8dfe55005d725 SHA512 8650fa24014f317b23cdbe2a6f12da0912ffc74cab815d1c94fdc0a3dc01ac1dff42a454af2ebbd4d402b7834d227bcf91ebdefa630ebe997cfd478e05ee01e5
 DIST node_exporter-0.17.0_rc0.tar.gz 1741645 BLAKE2B 483d5b100fdef9725486c62017491eb33c20df313859d2bc24a2d326324ca65cdd38412689f15d39acc22bd913ddcbd2967408f25ef2dd3ad3d09fd60ea42c3c SHA512 6df9d5e89b6ac14604530e255c68dc160a85299d93ce406137d45c0963391adc2e31260ef67e10cdbdd3299fc26ba65cc0c39999dff876927e08133250bb797e
 EBUILD node_exporter-0.15.2.ebuild 1225 BLAKE2B 3e5633734ba2be8f83953b4851a17ba76a619aae1490348f4f0fdf83e34a26e07c561a5fce9e41bb6f86aef9cc537f48cea6bba74082821fbd7fe4395aec8e39 SHA512 54286e2c5957524374885335e512bfed3b609e8e2e293fb7e0d842603e1bbc026536a96a6a75ea141baed7a96fbe57f9fcb8067968ae162745c813855b9d7976
-EBUILD node_exporter-0.16.0.ebuild 1226 BLAKE2B be97741e0fe9334c14b5c39d7fc6171a4abc963029987fb2f489f31a88bb283507dc7950c1adda41cf6ca473370b9f3ee4d12b29624614903754c1458557d31a SHA512 e826701a4091faa7cdab11ef4092aaae6858eff9af96e1f698e1a224b9710c395b1fd99770d6872138bbd39460c800e41e24a41ca42ab50b26d5c06a2685c7ed
+EBUILD node_exporter-0.16.0.ebuild 1222 BLAKE2B 7eda658fb0ae4da2405691dc0f985774cd6379d8b8266d2321f1b4af4b9fe7905fd68c259d5c706e36cb0b28f3959069e34482919752e129d454b4a02dd80547 SHA512 f639c0fb79301ddd66e6e1d5aef682e1e91b1ff1812ee535eae4e254139ce04a8affcb8f01d83b8d3df8793532478fa2366cfc298d1c6e53b98ad9519018a2f2
+EBUILD node_exporter-0.17.0.ebuild 1258 BLAKE2B b6d96c7d2d4d77a3d49955d1f1e6416c752146871af38a4ff42519c4826c20db0574e905691d7aecf7f0d83ba526a796527283bb8d580039fd3d5413cdd319b5 SHA512 7f779ff32fd8547ae440241f4aba642202c5a180ee945b6fd34ac25954745763fa43f9495776336540f0ec0e5499d9feeaf73d6c4526078778d8860e7a3c2481
 EBUILD node_exporter-0.17.0_rc0.ebuild 1223 BLAKE2B 070bc8c63315608ea78ce9801867a33bae0a4164c5a26c5e75ccf5b20e43c6de8e25b033b8751eb8edbe3de74ae10915da060322331808bab224a585d37950b3 SHA512 15d4c8d0b85095a34a9aa82e02b23a185d76f1e22d0f1fdbf3dc6490647ac4dc05267594c0fe78e856e5ca08960dfd13389f011babcb7869732b1e95ea4b0650
 MISC metadata.xml 334 BLAKE2B 4152458bd76dc5a5150cf8ec6e6b967d88b89b85c7145c158d981c92dad663df3259b2ee229298727e862139215e69ac97f9aecf3b66c182a13fc9bf6e651057 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e
diff --git a/app-metrics/node_exporter/node_exporter-0.16.0.ebuild b/app-metrics/node_exporter/node_exporter-0.16.0.ebuild
index 629bed7201a0..12dc43dd88a6 100644
--- a/app-metrics/node_exporter/node_exporter-0.16.0.ebuild
+++ b/app-metrics/node_exporter/node_exporter-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ EGO_PN="github.com/prometheus/node_exporter"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
 NODE_EXPORTER_COMMIT="d42bd70"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus exporter for machine metrics"
 HOMEPAGE="https://github.com/prometheus/node_exporter"
diff --git a/app-metrics/node_exporter/node_exporter-0.17.0.ebuild b/app-metrics/node_exporter/node_exporter-0.17.0.ebuild
new file mode 100644
index 000000000000..d7f3cfbb8be5
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-0.17.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="f6f6194"
+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-lang/go-1.11
+	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
+	GO111MODULE=on 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/app-metrics/postgres_exporter/Manifest b/app-metrics/postgres_exporter/Manifest
index 42ef180e5dc8..5794891cec56 100644
--- a/app-metrics/postgres_exporter/Manifest
+++ b/app-metrics/postgres_exporter/Manifest
@@ -1,5 +1,7 @@
 AUX postgres_exporter.confd 61 BLAKE2B ce1fac504bd44cd87bec492b2fc5ccc8fc7c1f1bc19b44d7c9572025f82c365655f4269679acf2b40adfbe30c624d59b1a72a2a802c50310ef3259d0c46264b4 SHA512 8792b42a98f807aab7f33ef2dd679f79b14afa3f61a41ac86e9d829199a14b1a21d116c1f921a646c460ebb568591605272fa028ef99c66d16b529ce9da66c54
 AUX postgres_exporter.initd 560 BLAKE2B 2a813208d623460930d0e2288fb4102dde6add57bd9e83caa60a46cfb4770734bfcfd88a29713c881a36f2d1e20ff0c8e3ed47a23e024d865cbcc7d6cddf99ed SHA512 7ab3c8ea837e48ee776e12254a6c968ffceb6fa3f9f994aa44897f3a8fe6bea3d5ce29e8b4f85b626b690b50171feff5901952cbbad28ccc0e49333496ca7c87
 DIST postgres_exporter-0.4.6.tar.gz 3698795 BLAKE2B 5d8a370d6f5ddbe0c8570ad14d8547a5d56dbbd9d4f2d5ef604550cd0e1e97baa5c7bbd0940704f3d8f7f25da0f26d54318b4e4732a82f68e9394c5c9b044a20 SHA512 16062a372ad8048ca0bdb41e302bde9d18dfcdc519fbf387cc7ea414667d4a8ad2984b524e7a2c86132f4b37a175c6dd9d4ce67be5cc3c9d91aa9e73cb8c4e3b
+DIST postgres_exporter-0.4.7.tar.gz 3699251 BLAKE2B b4232858464ae30f714dda58a414ec343aedc5972b44066aa45a85cf64d98ef40925ca77956c218a3962e22a35f3229795cc730fec9fc10565a43fc9e827200c SHA512 81afce765830a5c16597f0ac9a95d21466edb20e40cff8e26079663db75f0051a6e0eb4ff828eb825b51a6fc52b3b534e0f6ffbb2ecf2c94e2ec8656de4a2ff6
 EBUILD postgres_exporter-0.4.6.ebuild 945 BLAKE2B 0f8ea22ff54917e578d0713ca8f40fa0f53796fa42432c22615a06057526770c03c45516f7126b491e45150ed747d99c7e8c0e04fca18c6ee17c409282d8d6a9 SHA512 52d4ec2a3f8666509ef1dfa2277085905da5fed3fda393492fc3b2960045c573dac2365404887c6a71fea9530135ae801e2a0ea3d7aa7306d2faad1acece4e93
+EBUILD postgres_exporter-0.4.7.ebuild 942 BLAKE2B a97fe2eaa63d04df76749b64a38f83cd65efa84eb9868ccfabdfde601f58509384f90df305aa9e30c5748d3e34911a5881a91c7dda5c48e4b3fb0404eb1b92ea SHA512 17b42694342236fcdae3c042df8c029877bba1ce2759e6e574217e90383160d649251c60b9f73b6dace9a1e1766d44ae45a34bbb24a0010d6d8969eff56f9dea
 MISC metadata.xml 337 BLAKE2B 79c683483a3d5f1c6d2c12885d54ff7770b228fcff132d43fcc13bbe2c54e5eae455c11c02d007f17a80e16e72b75da2708121d5704be65de15f596c7a5f1ec5 SHA512 e14d296a2b04ea3a0c49f51d340d5d3eb8d5d52ab40e635d03d6b37db62f442d3d8d5671be5ad5b0b397c95e091de0d12a5b3a169b0991d1798ef055321ff559
diff --git a/app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild b/app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild
new file mode 100644
index 000000000000..09c01b139aab
--- /dev/null
+++ b/app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/wrouesnel/postgres_exporter"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="PostgreSQL stats exporter for Prometheus"
+HOMEPAGE="https://github.com/wrouesnel/postgres_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	VERSION_SHORT="${PV}" VERSION="${PV}" GOPATH="${S}" go run mage.go binary || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin ${PN}
+	dodoc README.md queries.yaml
+	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-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 9e0e1dd41e4f..c5d1e335955f 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,17 +1,9 @@
 AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
-DIST prometheus-2.3.1.tar.gz 6175030 BLAKE2B 395808ce10eee18469a34caa7a358325830717cce7199f4cd3e6da346326573e65695cd444ad1c37586f9744db51808ef78f4a50fac971fa0fbc7fd7a4089994 SHA512 f0930a8de3885f9d870d41b41b602cd19addaa362d0473c95723b6cff32fd28870f8d47c89b9d39e13f43e189ad991d7569baa1a6ecd1ca59ba85cbb3d3cd6b1
-DIST prometheus-2.3.2.tar.gz 6175804 BLAKE2B 98d7fe58043e5104b6eb181edd13a2aec3c347ae6d0325f08a267b02eef3bd8963603fb17c113244b47967a549ebe860f2a3f11e297ceca85b57495df7f19070 SHA512 35bd654f3326d36846654775e924821de9efc7b39c93d5ffc5e8f4db6feb456cf3b8833de3aa3df9d9f63481c487f2633b55b9610cef4e7a037f2a9b1ffbbd23
-DIST prometheus-2.4.0.tar.gz 6090871 BLAKE2B 553d3292abfc58aba11e14786892b7dfc9ace00b29bba38a964e5b36113a4827759f5229d36693be225aca0962d7577751a8778201929b1f987a000fe31c2544 SHA512 a2fc7d67ac2fd8e17b5c69983daa385fe042e88c8c00ce71c51ae0e66d3cba201bcc7ef52ce34bef9724df002769c6fd9ee44115f397e253859f4c3f77427839
-DIST prometheus-2.4.1.tar.gz 6092025 BLAKE2B 4392c3329be255dcc1cd457e13defc6a462f094c47d8032b8389ffee8a384049d58eedf7a8a8724345d01e1d6645cd58d23d1bef078458bdf4fd54bac3c85ae1 SHA512 8d09e87c1af1bde08fc0d95fb51d8b25360d8bcb40c7a4b2f4bfaf79419183a4f90773ced6f53ae9a9bae10eb00af6248acf603cb13f9ce0afb815b2b7e0a8c1
-DIST prometheus-2.4.2.tar.gz 6092847 BLAKE2B 0c9f01e7bce6d406ae472a3e4b75720317a8da34715881350459d5fa52531913eecb402fec08f77f8e18b28d870316e631068077cd1118b710b37e515ef19332 SHA512 3b5d3b761ed2db1bc61225d85e2c9b7619a5fefc72b41432f2d7bc707fd0e9d84746e8ab16b30eb978de713548ca2e8c108cc7a9225ab1bd2e39741b98dd1701
 DIST prometheus-2.4.3.tar.gz 6095284 BLAKE2B 9b9d54cf8ed61453d63e4b93cd81cd1c08a732b2238830aa1b83b63076205569b8f947a94d0528b910c0958bc77f98605ab3eaf98a1e93d361ea6b431d5df48c SHA512 c86ce48416d32ca4310315dd7195a6ee471244b7a9323ddc49270c2b885bda38c2922047dc8fd7d9b19c9f62f8bc788d30387d38f956cbf04130d7041f9a479b
 DIST prometheus-2.5.0.tar.gz 6123272 BLAKE2B a84b31e24f4448330af63b64ed56b8c535e790930738c0f00d7ec05ff5b49cd52bcae047cfe3a0470909397562f29662003e5b5ad0a747dc209109e360daa18d SHA512 181ef94b75717d116ae8b1307f7351eb889d153b27316e08e8cffe16cf885dbf43bd0bd4214f05e56bc33bbf53f7864721ab666f5ea4356b37a5987347c6a191
-EBUILD prometheus-2.3.1.ebuild 2022 BLAKE2B f99591f9347de5c0ed88e05939bd81969f51e133ecaae1f8d275560a888e238bb1cae03085935639fcec6992ca67f16a70dfed8d923f1d2128a191921c597cf8 SHA512 6f458e28f7c6f35ad6f184a836220eeb559f966de760bdeb01f16ddeee6fa139838ed504fe07226cca4c5af6ce926fa52e96ea836a3e6f738146c51069320a4a
-EBUILD prometheus-2.3.2.ebuild 2022 BLAKE2B e35104c0f2c9d2ce49e6256287adf008344f6e75c61e7f97b46563e3e16be1c4d4759b65799fb612bff45619b9abcd4ca009e328a944733c81592329059219b1 SHA512 19b085b959bde4f81218938de7c010f585abb201eea28d3b06479635626ee955e84e094daeed41253a857d7e47db828628aa6742fa5eaa1e17aa126aa4e893a0
-EBUILD prometheus-2.4.0.ebuild 2022 BLAKE2B c5cb642b5da16bccdb03d5a2b7a1ec9446b976612981c02b6d99f1afacd299c6ac6e9d4fccc1a21e27d304d1fbce5b36dea690d386aef070fd06fac05ab0fe4e SHA512 4299f58b8aed5a4866167ceca4ed973cd21db0eb75a180c4a3796113367b1d0dfcbb2c00f5f7454fa382a38659a4ac9fadcb3560240cd2ad0a8e4ebcbafceee7
-EBUILD prometheus-2.4.1.ebuild 2022 BLAKE2B c0ec56e42c9aaf02f165f467be4fc250ce5d1e193932dfb99eee023cf94debebbd6ed91f1ddac735b9b4ddd1b0fff906a654fbc817743ecd8d5bff23077e3ce3 SHA512 a0c7541b1b59f8f2d8bcc34abd8d5c2598759eb763185d2d91d99ace036bc90c0dce96e07ce89dd2b4027a954688b5586fada529df88d9f8aaa1e2571d1470dd
-EBUILD prometheus-2.4.2.ebuild 2022 BLAKE2B 69eea2c4dfab150401f9e2f5d5eee0b39302360aca4b50264d638af6aca8cb80f8d6d424c4c23559999c88a693e947ddc92c0ba7267f12de2d31b0a40e0069d6 SHA512 ad39a7549630cec742b8fc5f09afb2552b74ccc8084f8e8213d5c3fda5aecc63bc9e9a9c740226ce721b2cd9e50703fa58573aa9a05d31f88c91f98d52609952
+DIST prometheus-2.6.0.tar.gz 6607363 BLAKE2B b9449403c840367b5332e27cf5d76b3becf1abcaaff6b2f2fd48441609b91d969ce078a2a3c4a38cc68b421b8e796561be87858adb77ac780f45650147469596 SHA512 75ae11a49de4277c7b4e49b83d7f34c9eb17b6bde988ab84e735109430361856ae0d33179a678b2cfc88342966a8e393a75062142c6f713f8a974aa8f332691e
 EBUILD prometheus-2.4.3.ebuild 2018 BLAKE2B 680b446079aa4f6c63973ec7c551e15d3fd413532c0b8e9fe4bd052d818b8d4e0dddc50711660168b8d17e43a6ea9c03f47097f6309fe4a2c7489a7ea1578aa2 SHA512 7188d7761b276ad8b91dfdd45cb68db13d7f4bfb05457a475f3e180e91a3ce150cfadf5cf0ffb6d20eff48f0ae63c5ec8fe9e7fb8fc104c61c9517e1d9ce9285
 EBUILD prometheus-2.5.0.ebuild 2019 BLAKE2B a2eb9a001197cedcd08bd09382a7b7fe979bed18fef9140f6c0a1087a06be13cf294808ddbb9a78c69513976679eacdbf52cf5081eddf34eb42c3f2873cb5eb5 SHA512 11e164cd754c917975743f3251cc1e50e9612c14129041c1f69eaee0b32917e58575e68d7e3d801b65d695f2bcd6aa448a4687abde436015ead18d15ed477cf9
+EBUILD prometheus-2.6.0.ebuild 2034 BLAKE2B 24a96bf1f7536fe537bea865463c29a5f385adbee87e1597693b9a0d1f7087a5b4a106fa409844c2c80d5308ce67a7612ef636448bccf45e979306f8a60429cf SHA512 276dafc414e4394cbf2f23235f9d6551bfcc55b61c8bf4da1f352870727184ca74806954e3716444b0891f543a803b7f680705ffa5435f742bdca1f68c2d46e9
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.3.2.ebuild b/app-metrics/prometheus/prometheus-2.3.2.ebuild
deleted file mode 100644
index 1bb29b3310b7..000000000000
--- a/app-metrics/prometheus/prometheus-2.3.2.ebuild
+++ /dev/null
@@ -1,70 +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/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="71af5e2"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.10
-	dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-metrics/prometheus/prometheus-2.4.0.ebuild b/app-metrics/prometheus/prometheus-2.4.0.ebuild
deleted file mode 100644
index aa5bbf88634d..000000000000
--- a/app-metrics/prometheus/prometheus-2.4.0.ebuild
+++ /dev/null
@@ -1,70 +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/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="068eaa5"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.10
-	dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-metrics/prometheus/prometheus-2.4.1.ebuild b/app-metrics/prometheus/prometheus-2.4.1.ebuild
deleted file mode 100644
index bca8d5252136..000000000000
--- a/app-metrics/prometheus/prometheus-2.4.1.ebuild
+++ /dev/null
@@ -1,70 +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/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="ce6716f"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.10
-	dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-metrics/prometheus/prometheus-2.4.2.ebuild b/app-metrics/prometheus/prometheus-2.4.2.ebuild
deleted file mode 100644
index c4ee8b60e2be..000000000000
--- a/app-metrics/prometheus/prometheus-2.4.2.ebuild
+++ /dev/null
@@ -1,70 +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/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="c305ffa"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.10
-	dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/app-metrics/prometheus/prometheus-2.3.1.ebuild b/app-metrics/prometheus/prometheus-2.6.0.ebuild
index 962fcfb2d936..3b3cc87749d5 100644
--- a/app-metrics/prometheus/prometheus-2.3.1.ebuild
+++ b/app-metrics/prometheus/prometheus-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit user golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/prometheus"
 MY_PV=${PV/_rc/-rc.}
 EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="188ca45"
+PROMETHEUS_COMMIT="dbd1d58"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
@@ -38,7 +38,7 @@ src_prepare() {
 
 src_compile() {
 	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
+	GO111MODULE=on GOPATH="${S}" promu build -v || die
 	popd || die
 }
 
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index 70aafe375d16..20da6df7b315 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -9,8 +9,10 @@ DIST pushgateway-0.4.0.tar.gz 1140644 BLAKE2B ea82e2e7f6fd817de02044e5aafde724a4
 DIST pushgateway-0.5.0.tar.gz 1566969 BLAKE2B 255592d172ba910cd4c031f33045ee92fa02b8ba04c69a844e1a81d0fb4c0425f4a71931c917cb70f90422e25ad8761892cde344acb3fa7465e682ff8671f31b SHA512 d0a96aa8b1a59266a8864ab760ad6fdbdc131c49b08aa3bf89f54ed9c6ced6a4b7ab2f8c70d15dad1605ec7b46c5e784dc77be10f26ebd56a3a0f16f7285d607
 DIST pushgateway-0.5.2.tar.gz 1567286 BLAKE2B b62092b349ca8248937795f868e32fbd130df0b23de8b0c81a780102f8df3930db97a86061cf409d658c3e29e8d2eb6e350e18b9101a0bc9a0ba7b77a7fd79fc SHA512 4d6dcbc0199a83fe0469540ec70dbe230cf7c1d3efa66c55679b40e8882736b54af40423c7a2c1ab8693edca839bc67b4cd7125d52f9beab296c55f220e51482
 DIST pushgateway-0.6.0.tar.gz 1768979 BLAKE2B 50c9a6a00a207787795402ca1198849f38d658233918bb4a34f6b0ac9ccef993ce4ff8060ffd20dc9f0d23b861f953d7e3f7785bbf5d88ffc5ed97342a05c530 SHA512 209e5349d0aeb584dcf45c842923b5280d11ce8af2ff2236454182d1a42554a9d1b7d7add363f31203caf081424187f6bac243f43efb916d90803c6e1de4f76a
+DIST pushgateway-0.7.0.tar.gz 1867703 BLAKE2B 588be72ba8f7b8421e36e7cb33ecc27e8f94c242e03d7a97b2f1f54c167373162a9e9e7dba63897e583331370b96723169359ebd78839a0bd1306f850dc24cc1 SHA512 2057c028e2427a9d63ad2fc47a0f367a9b075c259186659c7d20038d79aaa4f5a014a4304d36eee2e78c08af69e27f7f65e6aed2453c4fa630203fd4bf944c41
 EBUILD pushgateway-0.4.0.ebuild 1301 BLAKE2B 328b451698ceec2cd6f6020cadba897836c66513fcc25169be9e92ca7715e97e52fd245c51e7cb5f58a56967c486294f0164501dfbc9099d1d0144452f379c1a SHA512 81b652f6f3a78a39aa1604a7fa1209fd73595ea318736a735ddb00cd7d35ec48575eb4106c12efbacb3ac095c8280ec96fb9a0decc60631847079dcbf805bcec
 EBUILD pushgateway-0.5.0.ebuild 1291 BLAKE2B 267e67938461d4b8461822f9986ad1782ebb66e4e01fb623f265d07c9f47b4af7041ff07ba11660596ac6e3452c53eeed941679ab47690979173bf660a7ae822 SHA512 c2d44c055d5aa6f871f05ac459fa88c2f4321c4977ef07073b16ccbc72b5fc1199adaedffd0d5e70d4df05920596066282f8eb91cca4d0fd4f4a17f02b2ef16e
 EBUILD pushgateway-0.5.2.ebuild 1291 BLAKE2B 2ac140c425dc74dfb9163522c45d827a99a63a03565e4b51228857bbe96bb973ec18ad452ba8790e330ba1c51f3c48e361e20c1d28c99e83f9f8ba6a8e04ca3d SHA512 848ae6f60ab5cf26a9b6eda1619eae7120725581594d069dc3be4fadd0ca1ff1cff6ca2aca84ff8e155cb3b63f1d5daff8c21c79129cc4c631daf92592a801d7
 EBUILD pushgateway-0.6.0.ebuild 1288 BLAKE2B c73e413b0765e51dbf57822de0282ca6d8b2c1c9a72d2d92182f436e2af70415c097f474aacec1105926f4fcbfaf74a430c0da9b26b16999c86952a9c4bba28d SHA512 462e4ba66c24920f8da44d452c1a240d06da2b72778b3b34a529a01c9fb06809a38d77836bc05506d3c4356ceed45ba1835f32b6c281c0a085887299295c6a64
+EBUILD pushgateway-0.7.0.ebuild 1323 BLAKE2B a27919dcf4d086567e6c64dc760b2102b21b062a859d15d4f0c9e5cf00442bb2ddb988ef380db7feaef7a26ce6735ae4ed9049dff39034bcb0639cec9ba17966 SHA512 20ee0ea96335bad0060a3eaed11b0ea18c18d64330e5acd66488f5e971363cc3e1711f600838eb4c5df000a4f4c32a71486f8e3d8fdf4e51cf332cfaf8cd4083
 MISC metadata.xml 437 BLAKE2B 904f35ea9287d25e5708e450715f8719004a5349ea871e9730fe36a98257cd0ba2417ec572f0d26a8d5d2de5629bca2d1b81f3e344bb8e4a52653175e8df2f3e SHA512 09284843912bc08aef77485911289fe1050f7d42e726e555650ad73b3ca51bcb62af90ccd69c3529bbdb7373b9ec317e0afd74687b84b123ac4fbbf2a3de9d7f
diff --git a/app-metrics/pushgateway/pushgateway-0.7.0.ebuild b/app-metrics/pushgateway/pushgateway-0.7.0.ebuild
new file mode 100644
index 000000000000..af0d7bd02d48
--- /dev/null
+++ b/app-metrics/pushgateway/pushgateway-0.7.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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.}"
+GIT_COMMIT="d5a56ba"
+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-lang/go-1.11
+	dev-util/promu"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/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}-1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}-1.service"
+}
diff --git a/app-metrics/snmp_exporter/Manifest b/app-metrics/snmp_exporter/Manifest
index 62cfe9b287d2..5cb3d23d23a4 100644
--- a/app-metrics/snmp_exporter/Manifest
+++ b/app-metrics/snmp_exporter/Manifest
@@ -3,7 +3,9 @@ AUX snmp_exporter.initd 591 BLAKE2B 103fec1c2e4ad46bf86893faaaf23bd64c7f22ecc905
 DIST snmp_exporter-0.11.0.tar.gz 3631252 BLAKE2B 9786a17d667f8e6d45691f9df099f67ce103fbb93c9069ca497e59ff9207de05335fe3fac56d3d3bc0617069eb26a9c5b5682a8ec65c78d7e44303002427e9fa SHA512 a5d671d1bf2a98bbdb6ff85ac84ca5fe8da8d075bb1133aae650e73c45770be0403bcfea93595b2f5bc75b2e50cf96ccada0407d6956b4b5d1dc5b7ff604254a
 DIST snmp_exporter-0.12.0.tar.gz 3631641 BLAKE2B 4a1be9f51ffd9c2bc7a2eeb853d30499ae967e53980f81a3b14e9d0a201f33b7f3eec76711a4f3d8d54f5f07b74f1f66aab11093e7c0ab076f544da2ac8399f8 SHA512 9da5e4c43bf59562541992456c046063874860f2e7a24f0693b2f5655e0eb6eacd18734a4c932fce01bb535ac7530d71234bfa9d977fcbf15a1468f642e1d157
 DIST snmp_exporter-0.13.0.tar.gz 4096479 BLAKE2B a41ad876ca73a997bc48ac6fcdbc3ca01ff1c689f2f908cf14874f948a50ecd846a2996fc0cbf7d86a473fb80e42e15a7aca1c1b57f2cb3ebfa68a62db8d13ac SHA512 6e4a607cb58e6721acfd77b570dc62589cba5b23d250c9f654659632c97039156869722e1e43bec2b0656f08021ff89b4089f6b91ef28229964f32a34e0067f3
+DIST snmp_exporter-0.14.0.tar.gz 1458373 BLAKE2B 3251022b236b1da7c675fff1119bf358a7b19bec02c552357dde689654e655f7ab5569c5580db8d8cb587860dfb18a5111220bcb07041488ff2d02fe4d204d44 SHA512 58439e9ef8f05e48ebfb4ea82d42568e40968224e609485960f8a81c6e349ca18d16ec3f4eee469dfaa0b9fd50feb28c1e6a6a988fb251485748f10dbc4f8d12
 EBUILD snmp_exporter-0.11.0.ebuild 1253 BLAKE2B e46a95e5164e369949a3087ce4ad6208e4353b5424961e419a3f289a859ffb6dcf621221aff432818815e4742e500aa8b82d90e75d6ed83adfb6cc2a6b6d64b5 SHA512 b762c4e488fc6c97811e1f7e9e34d78cdab6a354a03f61302f59543e33e24289a972b30f279a7b4f727487d4f88b7fc2cae0919ff1025053cba2c06f60e4f4a8
 EBUILD snmp_exporter-0.12.0.ebuild 1394 BLAKE2B b69ab04c0348d27e01dd6961501aa986c7c16eddb83e1b1a9846d3718a4c89d812f6d455434c17be51319548f2e5e19a5bf03baf1ee90bf861cf68e5537e2328 SHA512 a0b7918b8529b92d230a966a73ba9d53cfd051877d537c23985401c9d9bacab67631be91bb5477370771ee53dbd84fa2c0d5ccfb4953720ba20c23fbfb3fd99a
 EBUILD snmp_exporter-0.13.0.ebuild 1394 BLAKE2B 5bf4dde1a95b79892dd6ab7ebd26e714906e5634a9cd901cbb86b58dd03f4053c955294bed84cc41e4f3c23fb415eb9ae06e20632d101aff4145001de9e421b9 SHA512 8b2ded50a44003041fe7fc0ecb6bea1ce4f21e45136ddfe3283697dcda5f26ad85f45bfb2c8a90e77226f5791d1a091f0725b91db716985eb886049ecf62bc4d
+EBUILD snmp_exporter-0.14.0.ebuild 1441 BLAKE2B 51283d6b09e44ce3cf17976dc56171e72d1d787fe7bbe18fc92ed3c61f455e8b7174e872f887ca9f0dbae2fcf3d0350d5349be62e1f91f0e4008cfe60da096b9 SHA512 32ac3a9675d62aac7ec1e1169228abf2b91b66fa3f12a92cdd5841f3b68ff712a93e94bd2e715bbf01e032555867d07c0cb422c54cc35e3259b14c5cc82ea7a0
 MISC metadata.xml 334 BLAKE2B a805d1d3f519c6ac1ef9c7f2cb5a0947740e6fe9a37fc77490e2011a27dae8ff981b3e482a55c117553eaa60f0e3c8d017d867c4fe082c8ebdc4e4bdac22f750 SHA512 7fd3e4314022bf2ff86bd01f335d5c4402676970b9810575225aff3d40bd5bdc9ffc27b438c880dc0a665cf3873502b969dfb30644b3c106278fd353820d6599
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.14.0.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.14.0.ebuild
new file mode 100644
index 000000000000..4038386446d1
--- /dev/null
+++ b/app-metrics/snmp_exporter/snmp_exporter-0.14.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="da73490"
+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-lang/go-1.11
+	dev-util/promu
+	net-analyzer/net-snmp"
+
+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
+	GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
+	pushd generator || die
+	GO111MODULE=on GOPATH="${S}" go build -o ../bin/generator . || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/*
+	dodoc {README,CONTRIBUTING}.md generator/{FORMAT,README}.md generator/generator.yml
+	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}
+}