gentoo resync : 18.05.2019

5 files changed, 61 insertions, 3 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 88c2615bfcbc..8456de7bbc8a 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 cf9b70bbe4a6..a4f244d2804a 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,7 +1,9 @@
-AUX node_exporter-1.initd 615 BLAKE2B 4d5d30126a1491b4771365b7db31a4849a3eeda3a09283a6befdf35614e6a3cf4cb1e20ab1d57a53c3715555fb0af73e62f76a4b99e58b83d77d44382f72edb3 SHA512 aecc8180b300660cb6b2882c45a99510d5c12aecaf1aaa24d62f2393c3f5c3e5dd9de6c5e73125f4eb6f3e18ca0d7b7e04e6338db2eed5ab06919e245f7e9d6a
+AUX node_exporter-1.initd 700 BLAKE2B 227144ddc11245120e4cd32d1e152509bd48a787d6b1794cd1b3e9e7507c774199fc83555a1ee48e90468d81ecffe61413e11a51d004f51c1180f9e2c8c36db5 SHA512 bc683ef0cd04e0253376d7cfaeed4b37c0b2c5152acb6f8019f78441e7dbac154f99cc32319304aa86e436f3d046fa21201232971b20f6a6effc0b6fafd0595e
 AUX node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
 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.18.0.tar.gz 2104908 BLAKE2B 3062e48e656f3a7b4c5b3ae8744ae9283d340b14f245a42b6de54832aaa0bfc126cf5a9eb566269237042cffd4e5afe85f85e9d7814896507d7d4d38e5d09d02 SHA512 9c6f9f82b0d3f5147cef8cc933ab9d7854065782f83b9821d4ae394a5101c45de6c8e8fcdc53d076af0c8683c47030557ec8e2bd27386a81a815d714e0f88987
 EBUILD node_exporter-0.16.0.ebuild 1222 BLAKE2B 7eda658fb0ae4da2405691dc0f985774cd6379d8b8266d2321f1b4af4b9fe7905fd68c259d5c706e36cb0b28f3959069e34482919752e129d454b4a02dd80547 SHA512 f639c0fb79301ddd66e6e1d5aef682e1e91b1ff1812ee535eae4e254139ce04a8affcb8f01d83b8d3df8793532478fa2366cfc298d1c6e53b98ad9519018a2f2
-EBUILD node_exporter-0.17.0-r1.ebuild 1431 BLAKE2B a7ea90bb866b80c252800870ee77cb42ce454666ba1b013825608b960e1c64322bc9c98d1f8101aaf5c284dffc4bb7168025ab3c675a198ebd691690a846a46a SHA512 2e167902bbc134f6e42d2e78193c0af3f1c9268a8cea20bb5bdd65e1e96b87324159d44f4c7f7833974a1001bc4a7378b77aec992b65d63f0f7c46b2b0a98965
+EBUILD node_exporter-0.17.0-r1.ebuild 1430 BLAKE2B 02133bdaf3b0affad833eed523aad20552e1f34782d9055aa6cb9940bc18bf6e80ca39eb46100336d217224a98fefe3adaabe535f863c3782aaf8936cca93b81 SHA512 b1ac399fdac6251c965be19ae8ad93f96a8478383e2c532d8c7e0308430ebc5892adc022e8717a821007fbee2e67b5d904be68883493999bd7d83c5a10121190
+EBUILD node_exporter-0.18.0.ebuild 1439 BLAKE2B f8979790148d599ed492b91fa29eb17aa7cd762e20b2691b967cfb34b9a88acb78ad87b92f411591bb007e2d59d1efe7383ac9a2935621d633cccc9a95de31f5 SHA512 dbf6b057bb2768be849b27e209861d93adda6917340d0af6f202cc73e952da124d3a8ac26397363733943db4ba3c0e019c96914fdabe468e4c8394d44856753b
 MISC metadata.xml 334 BLAKE2B 4152458bd76dc5a5150cf8ec6e6b967d88b89b85c7145c158d981c92dad663df3259b2ee229298727e862139215e69ac97f9aecf3b66c182a13fc9bf6e651057 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e
diff --git a/app-metrics/node_exporter/files/node_exporter-1.initd b/app-metrics/node_exporter/files/node_exporter-1.initd
index e8268e487d2d..f38a9fe133d9 100644
--- a/app-metrics/node_exporter/files/node_exporter-1.initd
+++ b/app-metrics/node_exporter/files/node_exporter-1.initd
@@ -17,3 +17,7 @@ start_stop_daemon_args="--user ${user} --group ${group} \
 depend() {
 	after net
 }
+
+start_pre() {
+	checkpath -q -d -m 0755 -o ${user}:${group} /var/log/node_exporter
+}
diff --git a/app-metrics/node_exporter/node_exporter-0.17.0-r1.ebuild b/app-metrics/node_exporter/node_exporter-0.17.0-r1.ebuild
index b87120db72a4..6cd46a01032a 100644
--- a/app-metrics/node_exporter/node_exporter-0.17.0-r1.ebuild
+++ b/app-metrics/node_exporter/node_exporter-0.17.0-r1.ebuild
@@ -8,7 +8,7 @@ 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"
+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.18.0.ebuild b/app-metrics/node_exporter/node_exporter-0.18.0.ebuild
new file mode 100644
index 000000000000..37e6de0eb379
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-0.18.0.ebuild
@@ -0,0 +1,52 @@
+# 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 systemd
+
+EGO_PN="github.com/prometheus/node_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+NODE_EXPORTER_COMMIT="f97f01c"
+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-0.3.0"
+
+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}" GOCACHE="${T}"/go-cache 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
+	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
+	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}