gentoo resync : 21.09.2018

4 files changed, 75 insertions, 3 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 82157fc9e612..80f23d2892e9 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 2a63634bf39e..a1cc37e1d3c4 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,11 +1,13 @@
 AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
-DIST prometheus-2.2.1.tar.gz 5629500 BLAKE2B 7645267a2c5ed1c4138a5dd3929a48cb9dfa27789db38e98addbb06c37c6b482abfcf296ef1a5836bebd971d8224136c24a4ccd3093175882bb0beda1673deff SHA512 a94cf867de2b3be65b0a07307f89ebfa9c0a319820a72b3b6691edcd2e2b56b5268d27fb52bdaefea0e7084906d69b818e5292a39ccd5991e04e56d594f56ea7
 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
-EBUILD prometheus-2.2.1.ebuild 2022 BLAKE2B 35b2eb824625cac8505bcc933130dd2810fd19855f73d975ef1e665baf98a60b95d4f3afcac1edc4b9cb2d6a030e7aeecff9926a460fddd9ea4ad8fa9f34cd6b SHA512 e378cbd27a7e2d033bf2ab6203955207d27f879f8c040cc54e873db8e64b225bf7aa6e977238d0203e00fe688c6328fef611516aea6d8e4afc4a5ea4649df127
+DIST prometheus-2.4.1.tar.gz 6092025 BLAKE2B 4392c3329be255dcc1cd457e13defc6a462f094c47d8032b8389ffee8a384049d58eedf7a8a8724345d01e1d6645cd58d23d1bef078458bdf4fd54bac3c85ae1 SHA512 8d09e87c1af1bde08fc0d95fb51d8b25360d8bcb40c7a4b2f4bfaf79419183a4f90773ced6f53ae9a9bae10eb00af6248acf603cb13f9ce0afb815b2b7e0a8c1
+DIST prometheus-2.4.2.tar.gz 6092847 BLAKE2B 0c9f01e7bce6d406ae472a3e4b75720317a8da34715881350459d5fa52531913eecb402fec08f77f8e18b28d870316e631068077cd1118b710b37e515ef19332 SHA512 3b5d3b761ed2db1bc61225d85e2c9b7619a5fefc72b41432f2d7bc707fd0e9d84746e8ab16b30eb978de713548ca2e8c108cc7a9225ab1bd2e39741b98dd1701
 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
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.2.1.ebuild b/app-metrics/prometheus/prometheus-2.4.1.ebuild
index a9b8e6255937..bca8d5252136 100644
--- a/app-metrics/prometheus/prometheus-2.2.1.ebuild
+++ b/app-metrics/prometheus/prometheus-2.4.1.ebuild
@@ -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="bc6058c"
+PROMETHEUS_COMMIT="ce6716f"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/app-metrics/prometheus/prometheus-2.4.2.ebuild b/app-metrics/prometheus/prometheus-2.4.2.ebuild
new file mode 100644
index 000000000000..c4ee8b60e2be
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.4.2.ebuild
@@ -0,0 +1,70 @@
+# 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
+}