gentoo resync : 23.06.2018

5 files changed, 19 insertions, 20 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 060d22ccee0b..a6ad05f98310 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
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_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"
 
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index e6e32cbeff5d..515aab948781 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -7,6 +7,8 @@ AUX pushgateway.logrotated 95 BLAKE2B 78db6689bbfac484b13a3444ebef47180aa94bfa6f
 AUX pushgateway.service 476 BLAKE2B 1634abf2aebcc5423654bb70855d46917569e687c2b545590dbee5a99cb11ebe0744aff53969c9e20685e4c7fa8bb81bfd354e907fdd6c913c34ba43e1eb3588 SHA512 6564ba12bdda356b8dd368191e19383f2363f997a443e93c754ea1f6b1485deaf200167ede550d9a1d49d6c3787f215fb24d88cbcb05f3e4ce179ab0c7d9576b
 DIST pushgateway-0.4.0.tar.gz 1140644 BLAKE2B ea82e2e7f6fd817de02044e5aafde724a4089e4f2961f0b581f90df7e04e65af5a3c3e044ef94bd600a92468a8aed791c838a8fdc64b05b7a91d6288e7e96fb3 SHA512 67f25e5f7fdc54143c5d10720f27bd256f22695ced93088cf2b72fe3197e45324d4353357ae40d7d3e92019480c0bec009e38ed3f583724d46411d76adbdc927
 DIST pushgateway-0.5.0.tar.gz 1566969 BLAKE2B 255592d172ba910cd4c031f33045ee92fa02b8ba04c69a844e1a81d0fb4c0425f4a71931c917cb70f90422e25ad8761892cde344acb3fa7465e682ff8671f31b SHA512 d0a96aa8b1a59266a8864ab760ad6fdbdc131c49b08aa3bf89f54ed9c6ced6a4b7ab2f8c70d15dad1605ec7b46c5e784dc77be10f26ebd56a3a0f16f7285d607
+DIST pushgateway-0.5.2.tar.gz 1567286 BLAKE2B b62092b349ca8248937795f868e32fbd130df0b23de8b0c81a780102f8df3930db97a86061cf409d658c3e29e8d2eb6e350e18b9101a0bc9a0ba7b77a7fd79fc SHA512 4d6dcbc0199a83fe0469540ec70dbe230cf7c1d3efa66c55679b40e8882736b54af40423c7a2c1ab8693edca839bc67b4cd7125d52f9beab296c55f220e51482
 EBUILD pushgateway-0.4.0.ebuild 1301 BLAKE2B 328b451698ceec2cd6f6020cadba897836c66513fcc25169be9e92ca7715e97e52fd245c51e7cb5f58a56967c486294f0164501dfbc9099d1d0144452f379c1a SHA512 81b652f6f3a78a39aa1604a7fa1209fd73595ea318736a735ddb00cd7d35ec48575eb4106c12efbacb3ac095c8280ec96fb9a0decc60631847079dcbf805bcec
 EBUILD pushgateway-0.5.0.ebuild 1291 BLAKE2B 267e67938461d4b8461822f9986ad1782ebb66e4e01fb623f265d07c9f47b4af7041ff07ba11660596ac6e3452c53eeed941679ab47690979173bf660a7ae822 SHA512 c2d44c055d5aa6f871f05ac459fa88c2f4321c4977ef07073b16ccbc72b5fc1199adaedffd0d5e70d4df05920596066282f8eb91cca4d0fd4f4a17f02b2ef16e
+EBUILD pushgateway-0.5.2.ebuild 1291 BLAKE2B 2ac140c425dc74dfb9163522c45d827a99a63a03565e4b51228857bbe96bb973ec18ad452ba8790e330ba1c51f3c48e361e20c1d28c99e83f9f8ba6a8e04ca3d SHA512 848ae6f60ab5cf26a9b6eda1619eae7120725581594d069dc3be4fadd0ca1ff1cff6ca2aca84ff8e155cb3b63f1d5daff8c21c79129cc4c631daf92592a801d7
 MISC metadata.xml 437 BLAKE2B 904f35ea9287d25e5708e450715f8719004a5349ea871e9730fe36a98257cd0ba2417ec572f0d26a8d5d2de5629bca2d1b81f3e344bb8e4a52653175e8df2f3e SHA512 09284843912bc08aef77485911289fe1050f7d42e726e555650ad73b3ca51bcb62af90ccd69c3529bbdb7373b9ec317e0afd74687b84b123ac4fbbf2a3de9d7f
diff --git a/app-metrics/alertmanager/alertmanager-0.15.0_rc2.ebuild b/app-metrics/pushgateway/pushgateway-0.5.2.ebuild
index d6a59d0bb444..48c3741c2232 100644
--- a/app-metrics/alertmanager/alertmanager-0.15.0_rc2.ebuild
+++ b/app-metrics/pushgateway/pushgateway-0.5.2.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit user golang-build golang-vcs-snapshot
+inherit user golang-build golang-vcs-snapshot systemd
 
-EGO_PN="github.com/prometheus/alertmanager"
+EGO_PN="github.com/prometheus/pushgateway"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="ec2cc57"
+GIT_COMMIT="231071b"
 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"
+DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
+HOMEPAGE="https://github.com/prometheus/pushgateway"
 SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,8 +19,6 @@ IUSE=""
 
 DEPEND="dev-util/promu"
 
-RESTRICT="test"
-
 pkg_setup() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 -1 ${PN}
@@ -28,7 +26,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
 }
 
 src_compile() {
@@ -40,13 +38,14 @@ src_compile() {
 
 src_install() {
 	pushd src/${EGO_PN} || die
-	dobin bin/*
+	dobin bin/pushgateway
 	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}
+	keepdir /var/lib/${PN} /var/log/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}-1.service"
 }