gentoo resync : 10.02.2019

7 files changed, 58 insertions, 147 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index b1503c4e4578..c16000549671 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/alertmanager/Manifest b/app-metrics/alertmanager/Manifest
index 6d338610f705..f47dc4a54c5f 100644
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@@ -6,10 +6,12 @@ DIST alertmanager-0.15.1.tar.gz 2756389 BLAKE2B 8da152f3edc856ea12025e08b108b475
 DIST alertmanager-0.15.2.tar.gz 2758175 BLAKE2B c2b612c2ad5723085c1d5515ce20505405e46d902a90a0aa1a32e51c35b5fd3b7e7e413e681907c4b0e9cdefc7b48d76354e55101add309a44e25f5e4f197f74 SHA512 05b1a5ad06f30b2f104196e96046faa8a0672db3d043e1c4308dbc542cbfee257b41e16d40f937495d45ca481e359b07a32e2c8ef4dfd9386154b4c68a2696b3
 DIST alertmanager-0.15.3.tar.gz 2758678 BLAKE2B 68c319e00e800fc35ce5a319b0c6bc3717bc7d5479e3204420949cc937a1470006d1e582f79b1562a810dc67c5827a6e0c8985618101a05c62c4231541d299a5 SHA512 95822f786b488fe747dbd780267f91830dbf0629878942a0ad131dcd3c8b18c34e672cb1e59151fb2ac9bcbf25095d0b134dabe4ff87d6a3625b4f443784f716
 DIST alertmanager-0.16.0.tar.gz 3608969 BLAKE2B a0cc7af4da45cb240e85cb39bd1eb87a8b8705f2ee2e87227cccd7e9ccc78278a89a089dd4a19a5a3d9f9667a0934b4e681e2fbbb378fb22510a742ee76fbaa3 SHA512 a3a2288d2a2205e0d94915603e4758447f194ebe06e69b5518fb7ebdb7d6ec4bab5db623e4dec57938a7936a9ac96be7cebd57304c7983deac11c61edd39b2b3
+DIST alertmanager-0.16.1.tar.gz 3611221 BLAKE2B 9871ff9c6e117cc8655d61b24d2f70a4061246d4c8902850c1802215b0dfa69d3b840ce46b237ae7d0caa2de33b956e7e9f47a8db40c6c32df53117e2d5e69b5 SHA512 7ac369bca5a3425bb80e5610a3e4141a2e112dac7c44d468096c7b80bcf7d77c7f653fd14d2db999f4abdea07df5ea250b27aa78c073be412777bdd289983332
 EBUILD alertmanager-0.14.0-r1.ebuild 1311 BLAKE2B 347ffeaca216e1b1234b6005fe670696ec2d580738b8b0dc7236a28ba8821176d3eba3a37a0d7772f983be3632d7f709fa37f3d75603607c7bdf25a271955be2 SHA512 64a1ceb5cca20a51ad3ba9c5dee50d20c3774acabae01dcb3ace1a185b125eb44dfe1ba1ffc60876c09e5b14d59d421b9950f4e71d2f937c80bb398e65bf5a08
 EBUILD alertmanager-0.15.0.ebuild 1311 BLAKE2B 796affcc4eae677d9b0c82046415dfc22a740332686abf0da40969d6ed92825377a8e331f93b5f11af4175bf04ef629831522cb905134a2e80af732c1aa6dcbe SHA512 91352629f1dac90a54811392fbfe07070cc05abd544b6d2937bce9e8e654cd020c7feb7e0624ab8dc203055f7ec5c7c53744ca4a848912dc6e01428716dc5901
 EBUILD alertmanager-0.15.1.ebuild 1311 BLAKE2B 7280246a9da3cd00c5c5545190629305aa7c117eb9ad28b5f110908a035cb56c6c5153eceb76761bd29e81195d15720acc81de660eff2603eb64be8dd72e95ac SHA512 4adf84dd9e3adef99e85badcde86356a5179c90cc7074516353a097708c8faf3561ae5c95edd859fab644de0cc578b7ddf84b029ad95273e8e43b34937a8df83
 EBUILD alertmanager-0.15.2.ebuild 1311 BLAKE2B 6fc37b7ec57a8ceb6bdca0fe4283cdb1a50140803c8295efa9771bb9c36b6c726b5a47869c25fdb1e610240ab465435d5f77e861d41cfb77def7d45f57c9a2d1 SHA512 204245925a97b66368aec65d8a926c0383288e742bfd8c7ce3c604afe9aec8b9363d42b920781358a3cdb2d90789a82ed70df3e6dfc3fa71453dc8ee8493951e
 EBUILD alertmanager-0.15.3.ebuild 1308 BLAKE2B 744dba8f84d44ce597e26595e0d9d6caef802a1179529391e8d2d5c6531f51f28ea253e82579c873ed5ea9b15e712405f4419c1f9fc29a1265ba79c935cad9e9 SHA512 7eecf1a69876116e9932966fb6a62c2cae3fa905df34931dff1093f483ce56df7121dd6d610b3883739f8babb87302b96fa851396585c570ed39e809c0c20b1f
 EBUILD alertmanager-0.16.0.ebuild 1367 BLAKE2B e3c3400d6c9edcf11906fddb89e26d8bc228bc47567327255b3707385ef0a2a18ff31c58d7e08fd5eb7f523bc8a0ccf273556154de35b75753b401c8cb9bda7f SHA512 878e5754a03dfcaa727aab18faf76032a392d54f172d627e7abad10752fb86d1ad7caa51343e58fa5ca52ac709a2a7dbe2ca723be8f9d09ec4a077dfb6378ec9
+EBUILD alertmanager-0.16.1.ebuild 1367 BLAKE2B dd7d43626a81a68b6adfcae82f98aa4c6fe39960a9ffc3371249e1c07dad704f76bac7ab12be6eae8e9b69a3414d4a775571226d6f4a5d06cf8b6ee289fee808 SHA512 03bf09fc6a4eec2ef539c2b437f537fac9ca5e6dc25bf84380d5c190d6474225e5b8b23b83e00c8ecd073566701386fed19fe0021a1ab354666557a8ad3b7863
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/app-metrics/alertmanager/alertmanager-0.16.1.ebuild b/app-metrics/alertmanager/alertmanager-0.16.1.ebuild
new file mode 100644
index 000000000000..16d6bf4df5c4
--- /dev/null
+++ b/app-metrics/alertmanager/alertmanager-0.16.1.ebuild
@@ -0,0 +1,53 @@
+# 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/alertmanager"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+ALERTMANAGER_COMMIT="571caec"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.11
+	dev-util/promu"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_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 bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/*
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
+	popd || die
+	keepdir /var/lib/alertmanager /var/log/alertmanager
+	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index c02bc6de2836..00efaa15b65b 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,13 +1,9 @@
 AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 DIST prometheus-2.4.3.tar.gz 6095284 BLAKE2B 9b9d54cf8ed61453d63e4b93cd81cd1c08a732b2238830aa1b83b63076205569b8f947a94d0528b910c0958bc77f98605ab3eaf98a1e93d361ea6b431d5df48c SHA512 c86ce48416d32ca4310315dd7195a6ee471244b7a9323ddc49270c2b885bda38c2922047dc8fd7d9b19c9f62f8bc788d30387d38f956cbf04130d7041f9a479b
-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
+DIST prometheus-2.7.1.tar.gz 7276631 BLAKE2B 1066204eebd8e9589ce5972c78f1c56c74ae40739e850731beb7c39a6100aa0c252b444571cffb6cedabddd71f0b6f927e52ce4ebb35a7fd061ed5e4d50436f7 SHA512 d9a9a5cfca48b6a5ea5dda2b319f8c498b11e0e0a4ce0d18fc4d59fba9e5337048120ba12b29d18b957ac5c268f8c17996a9e88ff9ed1e3041d0ed00bc1454d0
 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
+EBUILD prometheus-2.7.1.ebuild 2058 BLAKE2B adc3cdc07693c4ac7f83d2e4a9c329f358c7cffc4e5af24064d4743570e78be281b099dad8cd49daef2dcf81d1e09a8ca9ee8257c1f74674704ecc80d34a2b9f SHA512 b74c502cec42c87b1d36f6f6a9fc924fc65bd0bd9f12028b595ebdf116bfdb6a49cebb26359cd84da31506dadf8e30ebfb165737d472c08109ab90923cab53f0
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.5.0.ebuild b/app-metrics/prometheus/prometheus-2.5.0.ebuild
deleted file mode 100644
index a0662bd93d29..000000000000
--- a/app-metrics/prometheus/prometheus-2.5.0.ebuild
+++ /dev/null
@@ -1,70 +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/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="67dc912"
-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.6.0.ebuild b/app-metrics/prometheus/prometheus-2.6.0.ebuild
deleted file mode 100644
index 3b3cc87749d5..000000000000
--- a/app-metrics/prometheus/prometheus-2.6.0.ebuild
+++ /dev/null
@@ -1,70 +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/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="dbd1d58"
-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}" 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.7.0.ebuild b/app-metrics/prometheus/prometheus-2.7.1.ebuild
index 297c4d0750fc..0687f8f10dfc 100644
--- a/app-metrics/prometheus/prometheus-2.7.0.ebuild
+++ b/app-metrics/prometheus/prometheus-2.7.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="410ee9e"
+PROMETHEUS_COMMIT="62e591f"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"