gentoo resync 31.01.2019

5 files changed, 74 insertions, 2 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 3c6dec7ec019..b1503c4e4578 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 41236ad3c902..a00a15791bfe 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -7,5 +7,5 @@ AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f
 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 19416 BLAKE2B 3f5880aa8598e508aa57463801c5add74249c3e1a41a5692f1b32db1d520e7fcfb8f2bce75ca352fed9e0cecaf61b53c74678e5777003e99a6abe740d6b2a39f SHA512 1c8fcb25b433c6e01bd7cf3a1f89be36fcc5cd94b30c4e023745d5fc789015cf06e83a627030e452931804d278da3992008477208d6cbd280d7b91707ff07e1e
-EBUILD collectd-5.8.1.ebuild 19434 BLAKE2B 536d569818cb2097c6612404f62b1a9a601f389fc02b38f002392762acde39e5b7c3dde781020d58aa0cda394980a9280fd21dab663acec9aa184b95f81d2e9f SHA512 52f3882b0f0fd076a61aeb3f49ee8cb0ab943b5a33282bc43d1d8530c5293862da1054d39c2f81a51103b746cfcd6556a1b54e97d724e42e69d4f01f353ff34c
+EBUILD collectd-5.8.1.ebuild 19433 BLAKE2B dd8ecdf5b763c9379d754c612d39b5dcb340a76e9fc8eecde72d353a3179687f8f80feeb46efc82a7986a00cbd4524ce5241b67f06330f5e56f69de812a84b28 SHA512 1b4a547c2673f8531214cc12cf81e5d87d722623ab032da0f80faae35dac510c1655a5407620c80e2a0e8f975b6b02f1d496755b4fa964e6d455f31b11b981eb
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.8.1.ebuild b/app-metrics/collectd/collectd-5.8.1.ebuild
index ae00f557d5c5..5a1b006d7865 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
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 331114c42ecc..c02bc6de2836 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -4,8 +4,10 @@ DIST prometheus-2.4.3.tar.gz 6095284 BLAKE2B 9b9d54cf8ed61453d63e4b93cd81cd1c08a
 DIST prometheus-2.5.0.tar.gz 6123272 BLAKE2B a84b31e24f4448330af63b64ed56b8c535e790930738c0f00d7ec05ff5b49cd52bcae047cfe3a0470909397562f29662003e5b5ad0a747dc209109e360daa18d SHA512 181ef94b75717d116ae8b1307f7351eb889d153b27316e08e8cffe16cf885dbf43bd0bd4214f05e56bc33bbf53f7864721ab666f5ea4356b37a5987347c6a191
 DIST prometheus-2.6.0.tar.gz 6607363 BLAKE2B b9449403c840367b5332e27cf5d76b3becf1abcaaff6b2f2fd48441609b91d969ce078a2a3c4a38cc68b421b8e796561be87858adb77ac780f45650147469596 SHA512 75ae11a49de4277c7b4e49b83d7f34c9eb17b6bde988ab84e735109430361856ae0d33179a678b2cfc88342966a8e393a75062142c6f713f8a974aa8f332691e
 DIST prometheus-2.6.1.tar.gz 6612143 BLAKE2B 33dc64406dd45f494720a1ff5f6d09ed4b45b3880b15626ab7455909258addc5d1549d3edbf8af9a374516930b297c5bdb6ef51a78cac3cb338357896c0d71ae SHA512 80bf6afa00b60aa4245a53e275a2b9579a7936609aba4ffacbbe478f34e530208e0498d8c5ea53dd3a940726e05bd6fac19fed3d6d9dd209af565d5368b2340f
+DIST prometheus-2.7.0.tar.gz 7276755 BLAKE2B 39c5e73f87aa919537eba19c09a0268b1079ffc8527aef6d31637c6cd9339e0c49a60afc44515d18a86aca6056bf0a1707ba02fc441ff63f0f517d864747d5be SHA512 02df7701cc9c50c2792c1a9ddfb6e41345bbc2f12aef8dfb09b5b545499a09a88d13c6d70a090086d35694817d7a5b26312554ebc50b02492bfdbf206f611d03
 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
 EBUILD prometheus-2.6.1.ebuild 2058 BLAKE2B 39d366af15eba910c708c1729592ce9e5c6d461ffc7801f97eb7a7a13c549818ad7f6d5d726312c2dcd4bcf9af7bfedab2ba79680315c4bd33c489655e3caa9d SHA512 75c746cee2e96ac9cda1d4051014193d2f3b0683ac255ffd058c1a56e1898f2959e79a616af7fe149ca7687f48b2c19c935f6a9a7bb637cb17086d6fff6939ef
+EBUILD prometheus-2.7.0.ebuild 2058 BLAKE2B 67aeb66306625024416a57068ec3448a6cdfab622aa366209e46e867e66204babf762810f7765fef2b0f4bc2da5a36bb0a920a4b6fcd4ccd7c4f753d133ed516 SHA512 8545e8cf9424b05213d47e3edad0839fc0ae4361bc90c4e536c57a1f890b4453d07ff8b606b60ffbbcab825032ca9aa1c06db6b2803131819111dd583a6d78b5
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.7.0.ebuild b/app-metrics/prometheus/prometheus-2.7.0.ebuild
new file mode 100644
index 000000000000..297c4d0750fc
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.7.0.ebuild
@@ -0,0 +1,70 @@
+# 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/prometheus"
+MY_PV=${PV/_rc/-rc.}
+EGIT_COMMIT="v${MY_PV}"
+PROMETHEUS_COMMIT="410ee9e"
+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
+	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" 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
+}