gentoo resync : 25.08.2018

7 files changed, 23 insertions, 23 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index a91a650f61ca..870a32753003 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/alertmanager/Manifest b/app-metrics/alertmanager/Manifest
index 53b489edef9c..3076884db54a 100644
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@@ -3,7 +3,9 @@ AUX alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6d
 DIST alertmanager-0.14.0.tar.gz 2786623 BLAKE2B e9c773af81153b3062d27464c6b8d1edcafe66575b8d5a6309b162c6546d3dedf7ae5b1afcf4dafb3dfdb6bcf826aeb9119b27cfe596da365a6272ee71b30441 SHA512 e352d51d86b853ff679892df3c494da2c7b4afb918d807e6d63b76e959b586f43a4c773de18bdd9e6a5067d4034748bb304ebdee2f08983b00890c1ae393d0b8
 DIST alertmanager-0.15.0.tar.gz 2755787 BLAKE2B 3c13f31c87605d7ff1e90ed8734c5415aa8ee3f9d5ba2713bd8ea8d6d56b013d70e60e3571714b4b423c82c139cb784eff146339a62e2e302c92e7e045d8b977 SHA512 df3b5146c333227ce463b7eed318c30e5c5192ed1728acd3e8664cab85be18b3c430d776063a4101611cdbb08be36f4a04cef9f9d8e053f4db443ea2dcab5853
 DIST alertmanager-0.15.1.tar.gz 2756389 BLAKE2B 8da152f3edc856ea12025e08b108b47501d95a278e621198712831cc3b105085f4b6b0073c184314b2cc4b291c6d27d6fecf35d5c423476a92ed35f63fe66ede SHA512 b71c59fb1fb745e0d1aac39617cd208b778d215db9d4c72703f5d88a6f293451b63f941dab1c86a8a2257657aa1d9a243044711724e3bfcc66e64db36f473c6b
+DIST alertmanager-0.15.2.tar.gz 2758175 BLAKE2B c2b612c2ad5723085c1d5515ce20505405e46d902a90a0aa1a32e51c35b5fd3b7e7e413e681907c4b0e9cdefc7b48d76354e55101add309a44e25f5e4f197f74 SHA512 05b1a5ad06f30b2f104196e96046faa8a0672db3d043e1c4308dbc542cbfee257b41e16d40f937495d45ca481e359b07a32e2c8ef4dfd9386154b4c68a2696b3
 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
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.9.0.ebuild b/app-metrics/alertmanager/alertmanager-0.15.2.ebuild
index c81866ee8510..bd0035aef269 100644
--- a/app-metrics/snmp_exporter/snmp_exporter-0.9.0.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.15.2.ebuild
@@ -4,14 +4,14 @@
 EAPI=6
 inherit user golang-build golang-vcs-snapshot
 
-EGO_PN="github.com/prometheus/snmp_exporter"
+EGO_PN="github.com/prometheus/alertmanager"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
-SNMP_EXPORTER_COMMIT="abb143a"
+ALERTMANAGER_COMMIT="d19fae3"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
-DESCRIPTION="Prometheus exporter for snmp metrics"
-HOMEPAGE="https://github.com/prometheus/snmp_exporter"
+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"
@@ -19,6 +19,8 @@ IUSE=""
 
 DEPEND="dev-util/promu"
 
+RESTRICT="test"
+
 pkg_setup() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 -1 ${PN}
@@ -26,7 +28,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
 }
 
 src_compile() {
@@ -38,13 +40,13 @@ src_compile() {
 
 src_install() {
 	pushd src/${EGO_PN} || die
-	dobin bin/snmp_exporter
-	dodoc {README,CONTRIBUTING}.md
-	insinto /etc/snmp_exporter
-	newins snmp.yml snmp.yml.example
+	dobin bin/*
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
 	popd || die
-	keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
-	fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
+	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/buildbot-prometheus/Manifest b/app-metrics/buildbot-prometheus/Manifest
index c37d724464f8..9301427f16b4 100644
--- a/app-metrics/buildbot-prometheus/Manifest
+++ b/app-metrics/buildbot-prometheus/Manifest
@@ -1,4 +1,4 @@
 AUX buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch 2430 BLAKE2B 1c7cc11d95301cf119b3cf0a1d9b1c0af9e48fd486a03350138d97c625abcb72e0f13b0eb4c826341f4e9a6938a708f0afee4c1cd36750a99580a34b23aa290b SHA512 ef63fbfabe5bef28eae222dca2509e24f5f1ec3aa71aa3af3c0092cf78cb9efe58296d54e46760c43ecd38c3d9ab741d1c83c79f2eee7f96572a82f125a389b6
 DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b
 EBUILD buildbot-prometheus-17.7.2-r2.ebuild 1122 BLAKE2B 4ed47d8f6f252be8866c997639f7380d0ecf33f7813c1c08b7f6fd83837b216dac116cc78bdd3e5d892ba8a8952f65564919b59286d1375b2b09f42b36065f51 SHA512 b72291f2d007542bd510e3f2f2b0bd42439d3c70583909a742a02a209e9f8507850597512222acfb99f355b4dcedb51777b7f1c67177fccd5bd2a1373b9e3d2e
-MISC metadata.xml 498 BLAKE2B e2cfffddc7ee5bcf879529fea9c97b2c5f93134c16b57dcac5a9f445cba4097f001f973668d82a9a619a524e03da6d79f8910a76637ed1070beb742ad25599c1 SHA512 6a99e044eef36810ef2dee8b090e852ec9518fb8cc8a019257543e77200aae69faf0e0e89f54d562be701dd8f5ebae9d90af860e3bdc3c54fa079e669af16202
+MISC metadata.xml 392 BLAKE2B e9618f93a6f7cc7fe7b3b42db9a1899e24638dcff9d4f5d13ba6e1be93f738421859ee09214a26652516088ff333bd039cb57f25bfef6a911c2ecacdc2a90979 SHA512 9fa3b273c27a7dba7ea6e75ffe7062667816bf145e06b735a66e23f1ffafd768954fbe729e400fecd82983b883529905b08b252a60601178dc68b9cba94179bd
diff --git a/app-metrics/buildbot-prometheus/metadata.xml b/app-metrics/buildbot-prometheus/metadata.xml
index 81ebfb154a13..94c578720712 100644
--- a/app-metrics/buildbot-prometheus/metadata.xml
+++ b/app-metrics/buildbot-prometheus/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
diff --git a/app-metrics/snmp_exporter/Manifest b/app-metrics/snmp_exporter/Manifest
index e8d7778c33fa..7c1844059f38 100644
--- a/app-metrics/snmp_exporter/Manifest
+++ b/app-metrics/snmp_exporter/Manifest
@@ -1,9 +1,7 @@
 AUX snmp_exporter.confd 98 BLAKE2B 3058ed314dd66772e0d299f135cc1ddb4f3c1f47403848fd249e949173430673991a12e794c74bfb53d0f25f313513d2d70c03d589b6d947659d03e33e6dea8a SHA512 e757dd327252ffd29a65170837aea147128d8effee3d88ac4f0474efffaa10748b51bfbecab999605284030a3026b13ce3ce2c1a7ec347a6ff191e44040d84aa
 AUX snmp_exporter.initd 591 BLAKE2B 103fec1c2e4ad46bf86893faaaf23bd64c7f22ecc905b059e31199c08d610d58852f678d18826cb06f51beab65c8777f49a05a005ad35b77dcfc3e5eef398926 SHA512 903fbcf43a737d2823ab74e954f40134a64414cc1e79a14c78ad51682baa52c3443e85e94ec1abb294753c93a55483c148239e738b72c03bcdc7d4a595580f41
-DIST snmp_exporter-0.10.0.tar.gz 3507371 BLAKE2B 8ad65ef8593e08fa1749013dcaf91e985df13ad12a988fb3691fed6436b979ce0edf668844240485437acbe5c19894dd52472e89dcff705a822dc633bde4d36a SHA512 70a1c6f1f3f89a68af71d6b1f2d6975c677e8c9470b9e1d5168c7fa9e60cacef808559b7d318c742704ab0358b7724e14d8583629747c118307381ba80d4bd6c
 DIST snmp_exporter-0.11.0.tar.gz 3631252 BLAKE2B 9786a17d667f8e6d45691f9df099f67ce103fbb93c9069ca497e59ff9207de05335fe3fac56d3d3bc0617069eb26a9c5b5682a8ec65c78d7e44303002427e9fa SHA512 a5d671d1bf2a98bbdb6ff85ac84ca5fe8da8d075bb1133aae650e73c45770be0403bcfea93595b2f5bc75b2e50cf96ccada0407d6956b4b5d1dc5b7ff604254a
-DIST snmp_exporter-0.9.0.tar.gz 3257207 BLAKE2B 3e7e91d7e66b32e3f84c9e53061f54ffc10116913b91598edfa011663daf2c67314661dbe6cd5b2c20b30968833bd64a48bdd5dd06694e76f1e787d59ad63933 SHA512 eb287f4519f2174a9ce80414c2b7a698bc50e1bcb2303a8190164002af088e0694e01233314cfe2bd89b2cd751f2fd6f8447eb641541701b7bd481373ce084b1
-EBUILD snmp_exporter-0.10.0.ebuild 1253 BLAKE2B c8428b4260d085ec6b39bd5f8d4215e620364ba8a2e2e1739daafd415772c2c4bbde2f17fe3a68c96bd15642b2bb342a332f27220f261fc4bac2afa3bcdf0021 SHA512 59bee80fe644fdf5a2de2b52698c222869d24393fc49c95ed98f8567a340f188702fd10ea05d7d1e206040e713a15a69a430ea3f77b5af6d7c6f2578346dd4c1
+DIST snmp_exporter-0.12.0.tar.gz 3631641 BLAKE2B 4a1be9f51ffd9c2bc7a2eeb853d30499ae967e53980f81a3b14e9d0a201f33b7f3eec76711a4f3d8d54f5f07b74f1f66aab11093e7c0ab076f544da2ac8399f8 SHA512 9da5e4c43bf59562541992456c046063874860f2e7a24f0693b2f5655e0eb6eacd18734a4c932fce01bb535ac7530d71234bfa9d977fcbf15a1468f642e1d157
 EBUILD snmp_exporter-0.11.0.ebuild 1253 BLAKE2B e46a95e5164e369949a3087ce4ad6208e4353b5424961e419a3f289a859ffb6dcf621221aff432818815e4742e500aa8b82d90e75d6ed83adfb6cc2a6b6d64b5 SHA512 b762c4e488fc6c97811e1f7e9e34d78cdab6a354a03f61302f59543e33e24289a972b30f279a7b4f727487d4f88b7fc2cae0919ff1025053cba2c06f60e4f4a8
-EBUILD snmp_exporter-0.9.0.ebuild 1253 BLAKE2B 2973b4c2d3365036156bec70dad4236680d56a84e2d2bb1d6b0048a5644c9891c9f284fd8430d04161dc2d23c0c9dfd24380304f9e7bc8ff0d22463ead1ec0e1 SHA512 694d6121b6bb39f296daec971e4b79fcfdfe2bbffff94d4dc4aebc19680bd18e47a306c07a49873cd6760c46de194b5a54653aaca83c8344c33048fc9094ce33
+EBUILD snmp_exporter-0.12.0.ebuild 1371 BLAKE2B 8fdf0d48f6caa6321282abeb5a8eb68431b92ed0b463960715a4d5662f6415a3695f3b59cdc5a70fbca275028971091a14b910bdbe7079c652ae9addee6f70d6 SHA512 795e01e0443442f17f0f71f7cd5a3fb08bf98a917bf886dba1015f340edae59a5ba20c3f40d6d0a13710ffdf2b96ca5b065575bce670fda05f137da9e51e2155
 MISC metadata.xml 334 BLAKE2B a805d1d3f519c6ac1ef9c7f2cb5a0947740e6fe9a37fc77490e2011a27dae8ff981b3e482a55c117553eaa60f0e3c8d017d867c4fe082c8ebdc4e4bdac22f750 SHA512 7fd3e4314022bf2ff86bd01f335d5c4402676970b9810575225aff3d40bd5bdc9ffc27b438c880dc0a665cf3873502b969dfb30644b3c106278fd353820d6599
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.10.0.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.12.0.ebuild
index 63ed8670a2ef..bba19bc7040d 100644
--- a/app-metrics/snmp_exporter/snmp_exporter-0.10.0.ebuild
+++ b/app-metrics/snmp_exporter/snmp_exporter-0.12.0.ebuild
@@ -6,7 +6,7 @@ inherit user golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/prometheus/snmp_exporter"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
-SNMP_EXPORTER_COMMIT="5c997da"
+SNMP_EXPORTER_COMMIT="26b3c85"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
@@ -33,13 +33,15 @@ src_compile() {
 	pushd src/${EGO_PN} || die
 	mkdir -p bin || die
 	GOPATH="${S}" promu build -v --prefix bin || die
+	pushd generator || die
+	GOPATH="${S}" go build -o ../bin/generator . || die
 	popd || die
 }
 
 src_install() {
 	pushd src/${EGO_PN} || die
-	dobin bin/snmp_exporter
-	dodoc {README,CONTRIBUTING}.md
+	dobin bin/*
+	dodoc {README,CONTRIBUTING}.md generator/{FORMAT,README}.md generator/generator.yml
 	insinto /etc/snmp_exporter
 	newins snmp.yml snmp.yml.example
 	popd || die