gentoo resync : 23.06.2018

3 files changed, 3 insertions, 57 deletions

diff --git a/app-metrics/alertmanager/Manifest b/app-metrics/alertmanager/Manifest
index cbdb82208dda..b880d1243f01 100644
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@@ -1,9 +1,7 @@
 AUX alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589ce80e616be6d8faf24224f804c564296955487760c155649c184b3132a2741cf30d171c88dcfdd469583 SHA512 391eb26d67310fba9371d274b1e9552cf0c9c02de1e3616c3e5514ae99bf7d36b52c6caa7e94a96f640b0f8542b15b4dded9d59154173c01d4e9a99ec2219fbc
 AUX alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
 DIST alertmanager-0.14.0.tar.gz 2786623 BLAKE2B e9c773af81153b3062d27464c6b8d1edcafe66575b8d5a6309b162c6546d3dedf7ae5b1afcf4dafb3dfdb6bcf826aeb9119b27cfe596da365a6272ee71b30441 SHA512 e352d51d86b853ff679892df3c494da2c7b4afb918d807e6d63b76e959b586f43a4c773de18bdd9e6a5067d4034748bb304ebdee2f08983b00890c1ae393d0b8
-DIST alertmanager-0.15.0_rc1.tar.gz 2982827 BLAKE2B 76c36dab3b2569c81d1738320b7ac7f480715cf119a416df8fa2d7718641390709cb984c48235d7ebfd2413cd7b9c90b62eaa69786e55dc3ad38626f0c46a486 SHA512 93e5d1b068a1dea37f6de3c91fbb86329275e9ecd4a518eb874a735c386acfc19399611c061fff8c7f53cfc0b73fbbce0e17a6ac4757ea120e701dfe673b44e0
-DIST alertmanager-0.15.0_rc2.tar.gz 2722554 BLAKE2B b2f5261c1dfef93075df72cb1997e3dfe71a2642bb0b4a43616e85fda9ec3d2985cebb247bab6703478bc2d64f7ba2ba72adfeb9f209a16cf728abae760a814b SHA512 54177fd233ff4d6d15eb3f1653171f12727a6a1473784044ab6201a64dcacf601db9cf3a2c565493c707f61099db61f5b04523b576719e3611f5b32e5ea2ebe1
+DIST alertmanager-0.15.0_rc3.tar.gz 2755833 BLAKE2B 60f17b61ad3ba518064b2999f2fab05d53fdf55c5b787314efbad0e427166442b76017951d3ca7bf2c886328d01713eeca7a36f975dad30d9fb19c0c176e1b5e SHA512 73370f18ba085e8b6701400d88983a849eb53734b14b187e56aacd89a57cf4e236332906add1f6ee8c3eaada0284b62d7a9b4174a888c694d48b8ecd120c186d
 EBUILD alertmanager-0.14.0-r1.ebuild 1311 BLAKE2B 347ffeaca216e1b1234b6005fe670696ec2d580738b8b0dc7236a28ba8821176d3eba3a37a0d7772f983be3632d7f709fa37f3d75603607c7bdf25a271955be2 SHA512 64a1ceb5cca20a51ad3ba9c5dee50d20c3774acabae01dcb3ace1a185b125eb44dfe1ba1ffc60876c09e5b14d59d421b9950f4e71d2f937c80bb398e65bf5a08
-EBUILD alertmanager-0.15.0_rc1.ebuild 1311 BLAKE2B 0d44a75ed88eefc4efaf827190b86b5e57855f0794065579e074d753b421866d325bcd2156c1e40d5ff0b0f35aab4dd779e51e67c732c5fa700ef5d5ef1a08c8 SHA512 95bdb0b824df01fa7192b8269f5df6b80c347da48223abbe3051826bee75906c07406d7fbedc6a4aee4d211c91d15d78ca3c53463ba1b0de6f074f01037400ae
-EBUILD alertmanager-0.15.0_rc2.ebuild 1311 BLAKE2B 6d132fed94865b7ceaa87f2206dc820d378f94204a9c05ce05a54d76071d1d803c503695acab874323cb9637191b6ffea5f3f9bd27d1ddbec6c1e9bd2afff915 SHA512 303170a0b257d3cc1dc0caa2c3b484afcbd3ea0f5c1e85c7c9de0296833780d8d828395937ff406f0d10072fe109e409bbabcb48b4e9b9a2cd18f56f898f15a2
+EBUILD alertmanager-0.15.0_rc3.ebuild 1311 BLAKE2B 27d9754d5bf2fd21a9c6b0deeef73321ea194e103bbb77f24533f83776014e83fa35fed03fb89389b0ea6220b80fa32099a4ac8c0d967713bb62bd3d37063e6d SHA512 ae2631447334d9cd180490d6d0cb18fd2c251cb7e20e46ec8fee8843dbb200880d7d20bca88200ecd3ffe317662c3c45bdd7aa52f54056bdda8120c797480af1
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/app-metrics/alertmanager/alertmanager-0.15.0_rc2.ebuild b/app-metrics/alertmanager/alertmanager-0.15.0_rc2.ebuild
deleted file mode 100644
index d6a59d0bb444..000000000000
--- a/app-metrics/alertmanager/alertmanager-0.15.0_rc2.ebuild
+++ /dev/null
@@ -1,52 +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/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="ec2cc57"
-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-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
-	GOPATH="${S}" 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/alertmanager/alertmanager-0.15.0_rc1.ebuild b/app-metrics/alertmanager/alertmanager-0.15.0_rc3.ebuild
index 611d288b3d40..ce37eebba0db 100644
--- a/app-metrics/alertmanager/alertmanager-0.15.0_rc1.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.15.0_rc3.ebuild
@@ -6,7 +6,7 @@ inherit user golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/prometheus/alertmanager"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="acb111e"
+ALERTMANAGER_COMMIT="5e86f61"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"