gentoo resync : 17.12.2017

5 files changed, 56 insertions, 2 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 700fbe8e93b7..c9bf9b6bcd42 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 03cee6f5c188..da4e8875e38e 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -2,5 +2,5 @@ AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac0
 DIST nagios-plugins-2.0.3.tar.gz 2659772 BLAKE2B d4deccf04458daccde5fbe7e6c659282d36fec69096e6b1b8487455db0089f7a5073ce14ef6a74f82869de08ad740b0d3b617d691c85b8895e475302152ca33c SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36
 DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
 EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 BLAKE2B 2581655bd322f74c6253811b6a10de420c5f1c90677d87d5f344f4939d45b00d394fe8b026b44ed9bf76024d18ef67d4f7ab222e6fa75e72d88e7c4f44eae94a SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91
-EBUILD nagios-plugins-2.2.1-r2.ebuild 3112 BLAKE2B dfb5455d7820fbc055c7d385f6f84c9645c2a1b38136eb2c91cb3dd1cf01c1ad0de0fa56f9190a91ef920dff32361dfc1d47d5d870132ffb1ab2263ed8a95706 SHA512 9091fe476d025734e299b1080d2a9cb3ec2348a20c54c5c5c46467cadb953895314cdf599312e239c75807bc3f8a2a95b06b552a494a3a0a055cb8a2f35b4c9e
+EBUILD nagios-plugins-2.2.1-r2.ebuild 3111 BLAKE2B 673f3e6e8e8de4d7520986d888a38b0f8a1b3b21d9fbf238cd7c3cb6e6fc6032b3c47404e7c64cb746e31420d2562766575a12b65730b219904a81981184c7d7 SHA512 0868f3bd07033f7e00726cacef8c45bddf885a12ad64be20d0b77d61256a40f836c36db81b7972468cd28ee4d0c4bafc38d5fbf8dcb0e084be7f34735a5e52d3
 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
index cfd98439d3cf..bbd21403f5b2 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc ~x86"
 IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/prometheus-alertmanager/Manifest b/net-analyzer/prometheus-alertmanager/Manifest
index 5ab55c80a3f9..d0e51e34a723 100644
--- a/net-analyzer/prometheus-alertmanager/Manifest
+++ b/net-analyzer/prometheus-alertmanager/Manifest
@@ -1,5 +1,7 @@
 AUX prometheus-alertmanager.confd 56 BLAKE2B ef4e238231a5ecfcfb87e99cb86661b267df17352f36ca2de7074d755c7d722674d49615361ba6dd730b6b54bcb132b89d4d9c65c7c41ab0104d4fd39bf527a5 SHA512 3ec5894fa121a3449f2b1c3f82283abc3fc31f39b4397760101a5d3c7c41a35cad50b03387542e4c950ae61bcc456b3ff4a92b52c53a04d12755005d0287d57e
 AUX prometheus-alertmanager.initd 587 BLAKE2B 64b5409b07e04567a5ecfd7928866f0287f4b70cda725f7d464d4a9a59f08dc54ee32e0c07375108b7ab12ccc8cc150a6a1f6162b7c316041620266cc48863a2 SHA512 7e19c82d62d9b226d2bc5926ba6a988bdd283bbeb911cb9339e451885ded5a1e9a4a1f5635f5d5266b23f3fbe896a334586c940ccc505ffbb84ff9fb9ff7d75f
 DIST prometheus-alertmanager-0.11.0.tar.gz 3683030 BLAKE2B b362c8d35762c13ae31597f9633378639061095e0ca1f9361a9c0376290bbb1534bd7ced2488c79d04b0c053d5a7930e39b12f309bd3a8e57660ead48264ef1d SHA512 33e6d5010979a7abab032019c1e50bc3e8f3630dd7e2453b1a1b37ce1035694bc78ae748ad1903afef95b6646aa167a3c0fa7f4e7b74bd3f1336106ca998b342
+DIST prometheus-alertmanager-0.12.0.tar.gz 3683962 BLAKE2B 92d968d85771d5921146e207040e03551826e72117f600a2d185c34f5e49e9d1a4da61c116656efd44ea1afbc94143bce1c786f569b77238aa973e48af128dfd SHA512 568031418bcfaa671531b0d4b96a9d60054ac7a8f8853c83edaf121d0502b1809d9981646e8d7575daba740b0aed221268e52b91506a3468bcf6fe27ccef17a7
 EBUILD prometheus-alertmanager-0.11.0.ebuild 1340 BLAKE2B c7e3f5ca4737612aaf4496517bae2fa80db9488e4367c2dcf7e64f6782d13eb48e5c0be5626485b1b31ceef7fe4bed8a119167c25dc73e58013ec87f028c2264 SHA512 f16322bbd9bdf3709debaadbe39e8bc33d8f9422ead655554b43b791a52275901798dc3a1e02769c238f4255061cde4a03fe4fbec89c321b90262aca6d1ee6f0
+EBUILD prometheus-alertmanager-0.12.0.ebuild 1340 BLAKE2B 95445d8c18170127d110ea80c08a4ad52fd6f126902d9f7c8f1d171a314c325c9f2709ff9e8282c60a38421efc8b2e6a37110ae8f9e4edf6a7b32cb2a1e21637 SHA512 2b7ddc41840416ea980e2a7251483b7bd799ef261927f622c9a8d9134ae7a2f15bd56ce1402a49055c169082b0ece363a7c2cef11088228521b9c5db29a44b0c
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.12.0.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.12.0.ebuild
new file mode 100644
index 000000000000..10bd1927649b
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.12.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 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="fc33cc7"
+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 alertmanager || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin alertmanager/alertmanager
+	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}
+}