gentoo resync : 02.08.2019

8 files changed, 7 insertions, 217 deletions

diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index 924f6ecced4a..d6740d014a73 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -1,20 +1,11 @@
 AUX pushgateway-1.confd 827 BLAKE2B b1a089d29ef99f692c4b38a8fb8c2d48ac018e5141fd700d160b944287670eba674035c3929e175bf131a71f2edbd594d2cbdae43a1f6be30dc455784286ce85 SHA512 c83cce3088b426f30b90a50ee507e93f1c8ff3ea4f54ddf4d5da90d4f895e8aa02550952243d044d9e2c819798d8ee6f231206405f61dd350b1ca541e535361f
 AUX pushgateway-1.initd 664 BLAKE2B f24a389eb6f968d63a21ab0e8740604bcae440d3797ff1640c4e5cd09c9bba398db10c385321a6a50da78518ed341ba654baffb2671106e8ae04eb303bedb3a1 SHA512 515a49e4b1aa6934611f86f85e2132004d234d312c13be23887709fbcaad86280034942967b25d7e355ab491ac4c09e7c88221a95279f2f751cbd2387eba9ad5
 AUX pushgateway-1.service 477 BLAKE2B 123c630e40ca47626cf1d6bc93e8556ab1fccb1dd799cd72c245e5a937aff1a5c1b5ad9280d8680a8643d055376960012e36691f9e4f6a8d64bbdc91a749b876 SHA512 0985e8e45b1557adefe5f36ed163440c81f432b95198819d3e46c3f946f255954e5cbe41cf378b33cd3dcb75c457970877f2f6a7585bfc90b58ac2df9abb2970
-AUX pushgateway.confd 819 BLAKE2B 9c42a6d012f70a2ac03d4b90999d94683bc62f6d203ef8d2bf59019e30aea59c3beceae34f2579a2958acfaf882c275453aa5e46e488c5afebaebfc3f17b896b SHA512 c941bc2350bbda14d49effbc0a7988869fc38ccf2236951a88721bd15397c9e5b5d5a98d58285610b33eedc7a26f6cca51e3ec6f4909bdabf0658afd51b99feb
-AUX pushgateway.initd 662 BLAKE2B 652c58309ce31f7a37cb92beb128848ef28118b9b05278e79765b8c6555b6020266c062ef58463488dd39389f6bf0e2d1e0a9b5371ec4b5c26b821d6fac8877e SHA512 7bb32a7848607d939f3343c8d3fc88454b9ffc9d8d89f2af992d9f6f9fafe266c965b068cc466adbcf0ab014f1e5ca9214b567feacce09b73c8c2212e12aab00
 AUX pushgateway.logrotated 95 BLAKE2B 78db6689bbfac484b13a3444ebef47180aa94bfa6fa0c6b4fe273f415713b539116c1c05fc5348d504b9c6de270449a422fa7f49e63854a65d4ef6d25c3bf8c3 SHA512 615a8d105d97412b6819f65b9e34e28cb326457765ec9426f33d71cc4794aa1cbfff0abbcee14dbf94b6ae3f622c95d087ad485250c48b3e3efa8edcfe997069
-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
-DIST pushgateway-0.6.0.tar.gz 1768979 BLAKE2B 50c9a6a00a207787795402ca1198849f38d658233918bb4a34f6b0ac9ccef993ce4ff8060ffd20dc9f0d23b861f953d7e3f7785bbf5d88ffc5ed97342a05c530 SHA512 209e5349d0aeb584dcf45c842923b5280d11ce8af2ff2236454182d1a42554a9d1b7d7add363f31203caf081424187f6bac243f43efb916d90803c6e1de4f76a
 DIST pushgateway-0.7.0.tar.gz 1867703 BLAKE2B 588be72ba8f7b8421e36e7cb33ecc27e8f94c242e03d7a97b2f1f54c167373162a9e9e7dba63897e583331370b96723169359ebd78839a0bd1306f850dc24cc1 SHA512 2057c028e2427a9d63ad2fc47a0f367a9b075c259186659c7d20038d79aaa4f5a014a4304d36eee2e78c08af69e27f7f65e6aed2453c4fa630203fd4bf944c41
 DIST pushgateway-0.8.0.tar.gz 1869626 BLAKE2B 43c288c481160807324f4d247a9d03b1696be934e97dc852f0ee6732d56715a2c78b451247f62f5cd0d93d9ceff64b54ccb20a91d78496a915271b9080d5832c SHA512 fdb8b3e1cd11b7faa329e1b625c7d2d98635624f32623ae99a7bb1cf2222ed682cb9c031afec191a5426d6fafade7bb92add7dc607898e4a839252aca5f1d71c
-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
-EBUILD pushgateway-0.6.0.ebuild 1288 BLAKE2B c73e413b0765e51dbf57822de0282ca6d8b2c1c9a72d2d92182f436e2af70415c097f474aacec1105926f4fcbfaf74a430c0da9b26b16999c86952a9c4bba28d SHA512 462e4ba66c24920f8da44d452c1a240d06da2b72778b3b34a529a01c9fb06809a38d77836bc05506d3c4356ceed45ba1835f32b6c281c0a085887299295c6a64
+DIST pushgateway-0.9.0.tar.gz 4722706 BLAKE2B 6d024819a4729cb4e728a0d1b654be94881e4a439c734655a33f5dc7c978d09205bf97e51668c2da68319df14bf802a142342483c679f4add3bf2d0992f8bef2 SHA512 0dd98f3e35e2d13e4e5e30ee398121b663ebfde240654c49f44bb0b765065f35ecefd9ddaad706f7b9a5365ea2ef1afdebe57441fa2c18c211a8670d795719b0
 EBUILD pushgateway-0.7.0.ebuild 1323 BLAKE2B a27919dcf4d086567e6c64dc760b2102b21b062a859d15d4f0c9e5cf00442bb2ddb988ef380db7feaef7a26ce6735ae4ed9049dff39034bcb0639cec9ba17966 SHA512 20ee0ea96335bad0060a3eaed11b0ea18c18d64330e5acd66488f5e971363cc3e1711f600838eb4c5df000a4f4c32a71486f8e3d8fdf4e51cf332cfaf8cd4083
 EBUILD pushgateway-0.8.0.ebuild 1331 BLAKE2B 90883388cc67b375a836e1c9c1957d1f91a51b76c33da6a8374b9ccad589641c1bc49a818febc13fef6f94ee725e2c73811ec572773c768ef005b7e6032bd8be SHA512 c34814100b7c3b758d84c3ab9409689b4d9aeaff8f91a4789d53e35dfea203c614340de2fd0a27db162a44a3a8d6b9cf46bf15e10b0d78aa7d33ecdbb62f047b
+EBUILD pushgateway-0.9.0.ebuild 1331 BLAKE2B 1adeebfd5d8aec3d4709a07756d30ef5d0bebe127a993264d8442f4d4667e92d83d16d9bb3111fe2897309d8cec62ab808470c53c00ffa602b6a2d76c2a2e2a2 SHA512 c3ce00955a5074a4100fa27a02a303b51e7ed2a8b6624972dca4793ab597f6c47bdd6017f502ab1538d28f5feef8d7a77e7b306ab73d889356a008a57fddc195
 MISC metadata.xml 437 BLAKE2B 904f35ea9287d25e5708e450715f8719004a5349ea871e9730fe36a98257cd0ba2417ec572f0d26a8d5d2de5629bca2d1b81f3e344bb8e4a52653175e8df2f3e SHA512 09284843912bc08aef77485911289fe1050f7d42e726e555650ad73b3ca51bcb62af90ccd69c3529bbdb7373b9ec317e0afd74687b84b123ac4fbbf2a3de9d7f
diff --git a/app-metrics/pushgateway/files/pushgateway.confd b/app-metrics/pushgateway/files/pushgateway.confd
deleted file mode 100644
index de9ef483723f..000000000000
--- a/app-metrics/pushgateway/files/pushgateway.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# -log.format value
-#   	If set use a syslog logger or JSON logging. Example: logger:syslog?appname=bob&local=7 or logger:stdout?json=true. Defaults to stderr.
-# -log.level value
-#   	Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal].
-# -persistence.file string
-#   	File to persist metrics. If empty, metrics are only kept in memory.
-# -persistence.interval duration
-#   	The minimum interval at which to write out the persistence file. (default 5m0s)
-# -web.listen-address string
-#   	Address to listen on for the web interface, API, and telemetry. (default ":9091")
-# -web.telemetry-path string
-#   	Path under which to expose metrics. (default "/metrics")
-
-#command_args="-web.listen-address localhost:9091 -persistence.file=/var/lib/${RC_SVCNAME}/persistence.gob"
diff --git a/app-metrics/pushgateway/files/pushgateway.initd b/app-metrics/pushgateway/files/pushgateway.initd
deleted file mode 100644
index a187e57897ed..000000000000
--- a/app-metrics/pushgateway/files/pushgateway.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus push acceptor for ephemeral and batch jobs"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/pushgateway"
-command_args="${command_args:--web.listen-address localhost:9091 -persistence.file=/var/lib/${RC_SVCNAME}/persistence.gob}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
-	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-depend() {
-	need net
-}
diff --git a/app-metrics/pushgateway/files/pushgateway.service b/app-metrics/pushgateway/files/pushgateway.service
deleted file mode 100644
index 3915fdb5b337..000000000000
--- a/app-metrics/pushgateway/files/pushgateway.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Prometheus exporter for ephemereal jobs
-Documentation=https://prometheus.io/docs/instrumenting/pushing/
-After=network-online.target
-
-[Service]
-User=pushgateway
-Restart=on-failure
-Environment=PUSHGATEWAY_ARGS="-web.listen-address localhost:9091 --persistence.file=/var/lib/pushgateway/persistence.gob"
-ExecStart=/usr/bin/pushgateway $PUSHGATEWAY_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-TimeoutStopSec=20s
-SendSIGKILL=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-metrics/pushgateway/pushgateway-0.4.0.ebuild b/app-metrics/pushgateway/pushgateway-0.4.0.ebuild
deleted file mode 100644
index c701fc15d869..000000000000
--- a/app-metrics/pushgateway/pushgateway-0.4.0.ebuild
+++ /dev/null
@@ -1,51 +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 systemd
-
-EGO_PN="github.com/prometheus/pushgateway"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-pushgateway_COMMIT="6ceb4a1"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-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"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${pushgateway_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/pushgateway
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/${PN} /var/log/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/app-metrics/pushgateway/pushgateway-0.5.0.ebuild b/app-metrics/pushgateway/pushgateway-0.5.0.ebuild
deleted file mode 100644
index 80fde6225b68..000000000000
--- a/app-metrics/pushgateway/pushgateway-0.5.0.ebuild
+++ /dev/null
@@ -1,51 +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 systemd
-
-EGO_PN="github.com/prometheus/pushgateway"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-GIT_COMMIT="3965d2a"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-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"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${GIT_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/pushgateway
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	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"
-}
diff --git a/app-metrics/pushgateway/pushgateway-0.5.2.ebuild b/app-metrics/pushgateway/pushgateway-0.5.2.ebuild
deleted file mode 100644
index 48c3741c2232..000000000000
--- a/app-metrics/pushgateway/pushgateway-0.5.2.ebuild
+++ /dev/null
@@ -1,51 +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 systemd
-
-EGO_PN="github.com/prometheus/pushgateway"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-GIT_COMMIT="231071b"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-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"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${GIT_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/pushgateway
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	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"
-}
diff --git a/app-metrics/pushgateway/pushgateway-0.6.0.ebuild b/app-metrics/pushgateway/pushgateway-0.9.0.ebuild
index 846402c8f22a..ba7d4f8d54e6 100644
--- a/app-metrics/pushgateway/pushgateway-0.6.0.ebuild
+++ b/app-metrics/pushgateway/pushgateway-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit user golang-build golang-vcs-snapshot systemd
 
 EGO_PN="github.com/prometheus/pushgateway"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
-GIT_COMMIT="290ff86"
+GIT_COMMIT="44d7ae6"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
@@ -17,7 +17,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-util/promu"
+DEPEND=">=dev-lang/go-1.12
+	>=dev-util/promu-0.3.0"
 
 pkg_setup() {
 	enewgroup ${PN}
@@ -32,7 +33,7 @@ src_prepare() {
 src_compile() {
 	pushd src/${EGO_PN} || die
 	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
+	GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
 	popd || die
 }