gentoo resync : 16.02.1018

7 files changed, 64 insertions, 104 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index c16000549671..4c84ff0b43b5 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index caadba1797ea..cf9b70bbe4a6 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,11 +1,7 @@
 AUX node_exporter-1.initd 615 BLAKE2B 4d5d30126a1491b4771365b7db31a4849a3eeda3a09283a6befdf35614e6a3cf4cb1e20ab1d57a53c3715555fb0af73e62f76a4b99e58b83d77d44382f72edb3 SHA512 aecc8180b300660cb6b2882c45a99510d5c12aecaf1aaa24d62f2393c3f5c3e5dd9de6c5e73125f4eb6f3e18ca0d7b7e04e6338db2eed5ab06919e245f7e9d6a
 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 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
+EBUILD node_exporter-0.17.0-r1.ebuild 1431 BLAKE2B a7ea90bb866b80c252800870ee77cb42ce454666ba1b013825608b960e1c64322bc9c98d1f8101aaf5c284dffc4bb7168025ab3c675a198ebd691690a846a46a SHA512 2e167902bbc134f6e42d2e78193c0af3f1c9268a8cea20bb5bdd65e1e96b87324159d44f4c7f7833974a1001bc4a7378b77aec992b65d63f0f7c46b2b0a98965
 MISC metadata.xml 334 BLAKE2B 4152458bd76dc5a5150cf8ec6e6b967d88b89b85c7145c158d981c92dad663df3259b2ee229298727e862139215e69ac97f9aecf3b66c182a13fc9bf6e651057 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e
diff --git a/app-metrics/node_exporter/node_exporter-0.15.2.ebuild b/app-metrics/node_exporter/node_exporter-0.15.2.ebuild
deleted file mode 100644
index c85ca942ce7c..000000000000
--- a/app-metrics/node_exporter/node_exporter-0.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="98bc649"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix node_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin node_exporter/node_exporter
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/node_exporter/node_exporter-0.17.0.ebuild b/app-metrics/node_exporter/node_exporter-0.17.0-r1.ebuild
index d7f3cfbb8be5..b87120db72a4 100644
--- a/app-metrics/node_exporter/node_exporter-0.17.0.ebuild
+++ b/app-metrics/node_exporter/node_exporter-0.17.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit user golang-build golang-vcs-snapshot
+inherit user golang-build golang-vcs-snapshot systemd
 
 EGO_PN="github.com/prometheus/node_exporter"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
@@ -33,7 +33,7 @@ src_prepare() {
 src_compile() {
 	pushd src/${EGO_PN} || die
 	mkdir -p bin || die
-	GO111MODULE=on GOPATH="${S}" promu build -v --prefix node_exporter || die
+	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v --prefix node_exporter || die
 	popd || die
 }
 
@@ -41,6 +41,9 @@ src_install() {
 	pushd src/${EGO_PN} || die
 	dobin node_exporter/node_exporter
 	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	systemd_dounit examples/systemd/node_exporter.service
+	insinto /etc/sysconfig/node_exporter
+	doins examples/systemd/sysconfig.node_exporter
 	popd || die
 	keepdir /var/lib/node_exporter /var/log/node_exporter
 	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
diff --git a/app-metrics/node_exporter/node_exporter-0.17.0_rc0.ebuild b/app-metrics/node_exporter/node_exporter-0.17.0_rc0.ebuild
deleted file mode 100644
index ee86f6359021..000000000000
--- a/app-metrics/node_exporter/node_exporter-0.17.0_rc0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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="d42bd70"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix node_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin node_exporter/node_exporter
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/snmp_exporter/Manifest b/app-metrics/snmp_exporter/Manifest
index 581301940169..8d6f3bf996c6 100644
--- a/app-metrics/snmp_exporter/Manifest
+++ b/app-metrics/snmp_exporter/Manifest
@@ -3,6 +3,8 @@ AUX snmp_exporter.initd 591 BLAKE2B 103fec1c2e4ad46bf86893faaaf23bd64c7f22ecc905
 AUX snmp_exporter.logrotated 99 BLAKE2B b0e459df102728238b137443ced2cf717ace780d83caaa7f18117ca8605453e8f325a48f8a4375956209feac210dc452da9cd0a267cf2d663b64f0a2c80f1eb5 SHA512 c1e1264b5a5612b4794c49613b79826245d3d31db65c1541c3ddfb41872993e7039fb0a84f25260d92a78e8e20005560bdd5e41ee6373e85f8f5e866726c9af4
 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
+DIST snmp_exporter-0.15.0.tar.gz 1482592 BLAKE2B f7695eb37f2d702f3a6792337de7a1e878229ec20c8f4bea17d35e174219b71958aaf09bf91daaaffe12c5d03840887ce2ef3b37ce58a56352e8bcbb418bdb5f SHA512 1050a25d12a8201deab0ab7ea95dc35e250954a321d14251c10f87b016c879cf036e01f4043e3463607200381de63f12ea6bcf094dea2939707545f978c2675b
 EBUILD snmp_exporter-0.13.0.ebuild 1394 BLAKE2B 5bf4dde1a95b79892dd6ab7ebd26e714906e5634a9cd901cbb86b58dd03f4053c955294bed84cc41e4f3c23fb415eb9ae06e20632d101aff4145001de9e421b9 SHA512 8b2ded50a44003041fe7fc0ecb6bea1ce4f21e45136ddfe3283697dcda5f26ad85f45bfb2c8a90e77226f5791d1a091f0725b91db716985eb886049ecf62bc4d
 EBUILD snmp_exporter-0.14.0-r2.ebuild 1562 BLAKE2B 03c30a5877954cf964d64ca970cab73169d4fdbf072a2c8f9dc3125855767d6b7febea3a4591e72619de6ab554908bd8b891b8ff2d8feafac6a08908aef5d1f6 SHA512 1d5dd0f289a0833ad4ab8dc188b1677bad9e7a4ddcf363e92ae4ed4613ab4b86c443b70080aca3a66f9c99add199295c439a5f8128894e033420d47016abbedf
+EBUILD snmp_exporter-0.15.0.ebuild 1562 BLAKE2B 8585f5cfb843ab34b345a1d1cb2851edf3c45ec907df0a08f7c983b84e5bf0a9e78829d69244d2d0c8e5d64689d9e10977b81f165e4de222989ee645ee4203cc SHA512 d54cdc2728b13ccabaa6f7b17632b927bf8d5fd55b791fd9bb53fefc633f6c87ef5005ce8fc39e043d9ef91fa9f54569a7268bd99f045048ef3340949551f40c
 MISC metadata.xml 334 BLAKE2B a805d1d3f519c6ac1ef9c7f2cb5a0947740e6fe9a37fc77490e2011a27dae8ff981b3e482a55c117553eaa60f0e3c8d017d867c4fe082c8ebdc4e4bdac22f750 SHA512 7fd3e4314022bf2ff86bd01f335d5c4402676970b9810575225aff3d40bd5bdc9ffc27b438c880dc0a665cf3873502b969dfb30644b3c106278fd353820d6599
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild
new file mode 100644
index 000000000000..1c01a04e3bbe
--- /dev/null
+++ b/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 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="92a3da4"
+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
+	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v || die
+	pushd generator || die
+	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache go build -mod=vendor -o ../bin/generator . || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/generator snmp_exporter
+	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}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+}