gentoo resync : 03.03.2019

4 files changed, 17 insertions, 41 deletions

diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index 632d201d62bf..58e903db0e98 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1,7 +1,5 @@
-DIST promu-0.1.0.tar.gz 1065003 BLAKE2B f56dfda69dae632b1946182b1a92c059cac52867c677d415c2f321f95800d3902f8f0fbd4d4b670870f3dce34603b0c1a50df9311be70404f27e9f5afbaf4699 SHA512 18ad54b1ec9fe8975a0048b5c85609858cd500a2d3aa34e51e5c2c3d07a0df4337bac9648562e2007d5c8572e07c814c6bba7522b94836c258cde457df5815e2
-DIST promu-0.1.0_p20180227.tar.gz 1068386 BLAKE2B b850c1dfa51f86099bd7e32c131ef99a05d4f4caab441a945fddc9a2895e72b74ed3456f18ab69493fc2283902c570e78f99ea303f32998416fdfbf91c3d0cd8 SHA512 6fbe5fe92602437aee90a442028cd846d9d72179b32e601b6167420dab0a3aed22cd9d1c527320ca54a3cfce7b79167753ad9cbeb000762e845056c692212a74
 DIST promu-0.2.0.tar.gz 1072026 BLAKE2B 2b68d992b37421d6b9a08cc9a9134f9ae52643d4c2844c8e1f6f6724f015582c99a8724ab6b8d1ee69437c660e3b972af85949e3221d8d8c709fd8c1a45e1256 SHA512 4da4716a9d4fb96b6016c9bd452fed0403721ab15f95e6955db2ab6e8e482f3bbb35cb4c1c94f690af9520729a93c100015ee48cb69627e129004ae0b15257ae
-EBUILD promu-0.1.0.ebuild 852 BLAKE2B 9233be82753b67b6396d85a6df6f49a7ea34857ee751c3b56dab70a47ce0eb7032d1abedf1d4c36ab83317050468b10598f09bfb2adefbbb43b2c15a5a4f474e SHA512 4bc962ebfd3c78d9e8190fa1c11262e8303d76c6ba95760c1dd1aa4a7d9cb8fbb2e4a8048a22737255e56927e0b09798237252b6cb4548afd97be4dbad1a3877
-EBUILD promu-0.1.0_p20180227.ebuild 898 BLAKE2B 8dff410ec5b0c1b8049f6b5b704076c7a3d190b5f545606f296f95e742d7cf2589d8a972ff4f9875d70c7f6fed7cbd98bafb3421f8f69f15ca297d6a158c340d SHA512 c5679affaaffa1d9bab60d3f0b965381161e94f24e88bfab6f6f19fe3b476ccdcbe7b60e6248235359b85f2f2ff0fa6992af1e13fc3d6112b4049128c6bd4d5c
-EBUILD promu-0.2.0.ebuild 761 BLAKE2B 4b7fe9bdae893d106ae4cd8056f8c08b9b08ecf0483811c2f94ef491664e17af4f43d859b36bd9c1956885adeea81a8fe6cf471fcb44981a15e73d2e90f0fc01 SHA512 032754a16e5b9bcb6ec81fbcdaf959702f25c1004ac58490609442ca42151fe830464dff1f81704bbd6e8646275e22e9db9cc2502c6277fdccfeb8caeb5ecfb2
+DIST promu-0.3.0.tar.gz 366019 BLAKE2B 0e6e93bb573da0ef20947b72989d8a68a7d6d1490efc802acaee58c9f546e9b46162054172d445e4dcb5cbc33c152529f006edf3acc594b92927df0ab489f86a SHA512 543cb514fcab9700bc45cb1b4a9f056720af4acf8ed949e03445c2f4e52d89f6fb8eda3ee538bc92feb2dc06db31026bebad9bf6c86a6e37a0be294d17e4b518
+EBUILD promu-0.2.0.ebuild 760 BLAKE2B 2630eaaef487fc9edf249c7ec4f61bc6d8d3245e6225c26cee3af0736b1d13549bfafd4be026646e29f29b1e9a5305a4b79c012cd2a03117fbe364091abb614c SHA512 b4ba612c32787b1d85398dc1cefa49e6dd35be60790c5029d4d8a8ed697154b116e2f1cd8b0dfa648df742c7455eeeac2b79113a070b3fec9af8f16ac0e14aae
+EBUILD promu-0.3.0.ebuild 838 BLAKE2B 1da81a88a2ef2a94bc4ff5d0f0e0884348dd9827e38d71b098e9e7f8ec6143c6778ea9ffcd94531779dce1b99633c0894f29e0e9c886635bbb19fcbb6eb90750 SHA512 9baa5ba3573c4edc7e08d1744964d0d514347960cf9ac96edde825d4914cb66df72690b7005d5ca5270630f7281b08cf881bcb5e2ff77dc592530638a6ec7dbe
 MISC metadata.xml 326 BLAKE2B 84a14632c102d52e02ac2c9a8e7f8e2edfabb3401ab04d5fe94eab4c83ef053f27260aff0ad2b04769653665325afa6db028c8ee281835b925456b432d593eb1 SHA512 2870183c141e5d9ec65aba01e7ab02443f42d13d0f39c4ba51af7adacabdf360cb2308cb898c4bf4f0a8c3e20b35d511af2b978fafcb4de47177de77819f6853
diff --git a/dev-util/promu/promu-0.1.0_p20180227.ebuild b/dev-util/promu/promu-0.1.0_p20180227.ebuild
deleted file mode 100644
index 94c084e7161a..000000000000
--- a/dev-util/promu/promu-0.1.0_p20180227.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/promu"
-EGIT_COMMIT="5a3cc08574c63bb853a21c570d719a0fb548dae0"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus Utility Tool"
-HOMEPAGE="https://github.com/prometheus/promu"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	LDFLAGS="-X github.com/prometheus/vendor/github.com/prometheus/common/version.Version=$(cat src/${EGO_PN}/VERSION)
-	-X github.com/prometheus/vendor/github.com/prometheus/common/version.Revision=${EGIT_COMMIT:0:7}
-	-extldflags \"-static\""
-	GOPATH="${S}" go build -ldflags "${LDFLAGS}" -o bin/promu src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{doc,{README,CONTRIBUTING}.md}
-}
diff --git a/dev-util/promu/promu-0.2.0.ebuild b/dev-util/promu/promu-0.2.0.ebuild
index b00d33f73cfa..df89ca92f81f 100644
--- a/dev-util/promu/promu-0.2.0.ebuild
+++ b/dev-util/promu/promu-0.2.0.ebuild
@@ -7,7 +7,7 @@ inherit golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/promu"
 EGIT_COMMIT="264dc36af9ea3103255063497636bd5713e3e9c1"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus Utility Tool"
 HOMEPAGE="https://github.com/prometheus/promu"
diff --git a/dev-util/promu/promu-0.1.0.ebuild b/dev-util/promu/promu-0.3.0.ebuild
index 027fda9afb03..ea822459f7d3 100644
--- a/dev-util/promu/promu-0.1.0.ebuild
+++ b/dev-util/promu/promu-0.3.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/prometheus/promu"
-EGIT_COMMIT="5e82f2f"
+EGIT_COMMIT="295a70a7f580b886572861b19545b28accfd4491"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 DESCRIPTION="Prometheus Utility Tool"
 HOMEPAGE="https://github.com/prometheus/promu"
@@ -15,11 +15,17 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
+DEPEND=">=dev-lang/go-1.11"
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${EGIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
 src_compile() {
-	LDFLAGS="-X github.com/prometheus/vendor/github.com/prometheus/common/version.Version=$(cat src/${EGO_PN}/VERSION)
-	-X github.com/prometheus/vendor/github.com/prometheus/common/version.Revision=${EGIT_COMMIT}
-	-extldflags \"-static\""
-	GOPATH="${S}" go build -ldflags "${LDFLAGS}" -o bin/promu src/${EGO_PN}/main.go || die
+	pushd src/${EGO_PN} || die
+	GO111MODULES=on GOCACHE="${T}/go-cache" GOPATH="${S}" go install -v github.com/prometheus/promu || die
+	popd || die
 }
 
 src_install() {