gentoo resync : 15.12.2019

5 files changed, 9 insertions, 68 deletions

diff --git a/app-metrics/blackbox_exporter/Manifest b/app-metrics/blackbox_exporter/Manifest
index c82ca107c674..83305ce0fece 100644
--- a/app-metrics/blackbox_exporter/Manifest
+++ b/app-metrics/blackbox_exporter/Manifest
@@ -1,10 +1,8 @@
 AUX blackbox_exporter.confd 110 BLAKE2B c3cb7ed7d314ea8b347b4db9839e7c987c91c78378a6085473d687a5f3460f06ca6825567fbe832c3114906156290d00d505e15e3c2461eb844acb4e56937af0 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed
 AUX blackbox_exporter.initd 615 BLAKE2B fce98f2c0740db2309d0395cf1e7e3f8b3b305c688cbafbf14a1787d952d49933ddebee1a688b844a66c95d02c38c38e943ff73e4dce68a1069c69c91540cc47 SHA512 f5ecc87e592fe85e4cfed759f06a1d88a4bbd05a474cb7955aae296ee29ae2ddf875a427bfcc7ff8369367eb8892c85bcc5051d273f8c2693395c8851b5f8669
 AUX blackbox_exporter.logrotated 107 BLAKE2B 255c64f5f0cee8b0b7a3bf2b3a55725f87f3f8067f840a94e9c70819820d1d42b3c2a7727323edf00d32797aab45060d0033fb5d5762263d502e4f0f1ad3d492 SHA512 2bb4782f925f9f416addf9f0a20ada0f0b61d964667eb8114b5fbdc758f69c07c91bf8e6fd18758d3ec21a7e41c931bd9bf42d16d3dfc45e2718126ffb0f21a6
-DIST blackbox_exporter-0.14.0.tar.gz 670297 BLAKE2B e55186723b7877296a62840c842acb87c95f4e060b059c6a5861a6eb6a8bb8ad14c6082f466427ddf048c49fca8df79668c64b77b1dcf64b1239ed5b62c829e3 SHA512 58f379cdeef671376105532450ffb3a6fef0ea071d493fbef40d761c6cbaec47bb49c9c2e5c070f3d0e598396d7ad9b2c5af100c9a69aee04877442c7bdaf120
-DIST blackbox_exporter-0.15.0.tar.gz 2157865 BLAKE2B dee707d8cf568da01e7981a9c2879fb209fac6d640d2cc1905231d56c9e6f8007da8eec09ff89cba82e40ac159529b1a9144aa0b50094a8b798102b19502404b SHA512 dff23d51292ed7b56f403d9a70c02a4d4e1f2a43f0bd6763598b310c07c7564d39fbed29c7b2b03b1848d33c3779b4922396212a3c9252c8149fdd9208d8a3b7
 DIST blackbox_exporter-0.15.1.tar.gz 2120525 BLAKE2B c21a621dce663ccbc184c87b66e894ddc6a94bee9bbd2b9fb432a4d349afb35410f07ad150e946c5f8eb9ec8e6e7f2e6d4cbcafe118e8b2efe34902fbd0bf38a SHA512 2c7d0989bc70982a0fd528c7c6ed5ec6686f5e93db0a90db2b06e4e578503443da0750aaa2d6a01ae4fcd4c722eef522c0e06b019aa59a2eb837f233e317d4e2
-EBUILD blackbox_exporter-0.14.0.ebuild 1545 BLAKE2B bc9cf8d12e453d7d5b0408d81d993c1234c5e845333c71b3e28739ba56c0b2eb1be4470e32f504a1efba688d787653cd5ffd3d5f0b7e56bdd44bbf83b12d5be7 SHA512 19e18e033b4c5ef96da1e7b8ff541633b7e631b7623f0ad213d08f7982be7288d100a2d7ee70b48277cd7e50dce3746a8907a98ac1a4b0c00935724cc6267a2a
-EBUILD blackbox_exporter-0.15.0.ebuild 1545 BLAKE2B 0e3d230602b5f6d2f6c644457b4f66cbcb753d2c6bed90d39ad741ff9fae76cb686621c4ca5ad9f047607ec5faa3839bd23b8ec3950501f7f122b42c63c3b048 SHA512 8abd474ab3291b6c4fe372ded1470d016ad7d3514939144b431254fa912d41805fa5e340e62b8f977961da1e4d592ccd831dae3effa8135eb16b572ad315fb1c
-EBUILD blackbox_exporter-0.15.1.ebuild 1545 BLAKE2B 0c160478d2705c500433e697c63b26b6bcd4057b4807c6b9852d40eaffbee20709dbd18aae02eefc916194d242c3c5f07fde6c79fc9a9e2e383d1f6d94acb992 SHA512 c50e5ab5cc210fa510ba6df00123a0fac68695e837ea1992af6dbd267ea9ffebd2748a47edc29c3965f75326c1bff016140741f875871822cf7a7499d038b380
-MISC metadata.xml 338 BLAKE2B 117f205ecdd4c05aba1ce92846f59dc7790c9fdae79db5cc1eb912d34a9e1d83eaaea26feb24245a0c5fc4394552705aa7b23171920d9023ca8e4333b3c09650 SHA512 e431b2ef89e797b9cbb290a70683a4392f07559851550dd22f5410f09c979730c8dd35c095f855565df8d72adb42c6e4b9d03882adf37240b0da28cc508ee2ad
+DIST blackbox_exporter-0.16.0.tar.gz 2121367 BLAKE2B 92c55dbc3f47d7a2d8c37ad116857dd1d7314a6684d9f228039b09cc086edf72bdf5e0c2cc770ce45d687c45a38f6de72e612c0491ec66f836bed28b75b2e5a9 SHA512 85103b62e345ab5d59626e658047ac75649f9ef991c9bbaff32b95ea75ec2da2bf916573e664520766158805c6cf24163f2850c885a594d32b4f9c4c9dbed1a8
+EBUILD blackbox_exporter-0.15.1.ebuild 1559 BLAKE2B c27b5940d73adecf5fb91c804cca2aa01ae303cf6d828ebf5af883d4b16cd7fc99ce115b29134116911e63a2ad676b6b63ed927998612d1c5825e81a20ed629c SHA512 b2b434684e1303c98ae868161cbc65814be5324c2593ba8e15988d3c1fc518e1ef0954ff369e5a3f48f1e069962985cbd60672de90068c65c9787e921a27d9f1
+EBUILD blackbox_exporter-0.16.0.ebuild 1559 BLAKE2B dbbca41eec9dd2cec880afdc6c8246e59264aa065640779621a585ae154ee3467102ef1eaf71c3efca486392f170ca43f387075a14417bf8b933fb78588003f2 SHA512 eb15af2b26b2bdbb044cbbdccc221c8d71eecb079840d0c80948b8a9d7fd6ec7d69adada283107446365337b88d6c29397b8dc288188afca247fafe9e5eccd7b
+MISC metadata.xml 341 BLAKE2B 30f7b2aac9cbea1444b1555a5a1279a07dfce5908bf507dff2d032daf3ecab8b98588d6e916d3e3e3cc04a5c70ed287504913f685e30aa87dcaad96abebff506 SHA512 65a7d67649765acc64976c511fc26f6f35c172538b03945367bcab3ed9c9766130c2a72a581a2e5b62068c7cf31d9ec2f39c3d7b5f580060a9e9c99035f7663f
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.14.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.14.0.ebuild
deleted file mode 100644
index b6b5824f40fc..000000000000
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.14.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fcaps user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="bba7ef7"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
-	dev-util/promu"
-
-FILECAPS=(
-	cap_net_raw usr/bin/blackbox_exporter
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${BLACKBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GO111MODULE=on GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin blackbox_exporter/blackbox_exporter
-	dodoc {README,CONFIGURATION}.md blackbox.yml
-	insinto /etc/blackbox_exporter
-	newins example.yml blackbox.yml.example
-	popd || die
-	keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild
index c39fbc922b0f..52e9c480877c 100644
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64"
 DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
 HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 IUSE=""
 
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.15.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.16.0.ebuild
index 7c9fdd3a2736..82e0d20ed7f4 100644
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.15.0.ebuild
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.16.0.ebuild
@@ -6,14 +6,14 @@ inherit fcaps user golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/prometheus/blackbox_exporter"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="3f726a8"
+BLACKBOX_EXPORTER_COMMIT="991f898"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
 DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
 HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 IUSE=""
 
diff --git a/app-metrics/blackbox_exporter/metadata.xml b/app-metrics/blackbox_exporter/metadata.xml
index 5d0a20fee17b..568acee6e543 100644
--- a/app-metrics/blackbox_exporter/metadata.xml
+++ b/app-metrics/blackbox_exporter/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">prometheus/blackbox_exporter</remote-id>