gentoo resync : 15.12.2019

5 files changed, 6 insertions, 95 deletions

diff --git a/app-emulation/cadvisor/Manifest b/app-emulation/cadvisor/Manifest
index 7d9ccd13ad87..fd4f9bee93cc 100644
--- a/app-emulation/cadvisor/Manifest
+++ b/app-emulation/cadvisor/Manifest
@@ -1,9 +1,5 @@
 AUX cadvisor.initd 555 BLAKE2B eaea61c2f974f9cfd97244243581d20da2f0312b4772f732193a2e3cededa3807ddfebcb417086c4d6d61257ce209019766b01f11b68eb0225cd131c90d4bf34 SHA512 c38d258b2416070076a51354f0b78be42809c571064a2b4098482137130b63c731fe8c97f9d8295170302b04d6bd5b5313c682594a36787f66193dc3d4f67429
 AUX cadvisor.initd-r1 567 BLAKE2B 8cd59227cdc07047c6c62fbcf74ec942468b86881d9b149a44fb60a10d8ed2a07c0cc97d59a9acf6dabac55969a77a6c69305893a4dcc90d10df9f4b007186c6 SHA512 84124c91f718446473644f3ed9e82592b1dbf14aecbf13a0a31a58938df19f8f65a108e03d0f377866ddc9d68cba1cb6963c2e5b9c384e6f6df441b504384460
-DIST cadvisor-0.33.0.tar.gz 4646920 BLAKE2B ce0e264321efcfbbf422f086cd15dfde389a099d183cbc2daaefb5aa6aa36da0c6e213dc4c12a000b9049ce2a1444addee93746f5650a56fa0f7c6612aa25bd9 SHA512 3d1dd1b9dc684e71bca9dc64949911f5f3ae72c97aa3b6cd45dd51a404fc101b5591ec8c19c469d6a410de3cf46c3d8c104d34e5dd1fdc85c18c2d1b6a45b2af
-DIST cadvisor-0.33.1.tar.gz 4646909 BLAKE2B 1ba30d559c018bf11297ded8adcc77a8761f77a1a39d75fb6e704ab84b3118d14587c91fd638da59bc9a46969b0545bdcf55e482390adeef6a4841fd6a57988c SHA512 659b8c48f74ef34044c7b3d9a41d42338c9c90fa443bdf7766001ae570aab8ed61efa948d1d01c324b6f03a0d1bf3d3fb1483d40bfc3b7e67f768253e3638de5
 DIST cadvisor-0.34.0.tar.gz 5210189 BLAKE2B 48cf7ddc94e52f07a0e74868d00f4a45d45aa5233b518da46762743357c17cbe7f2971794deda9936a10c65724928a219c498bf6d2493266f5b0ea547d485cb6 SHA512 accb41afd4683413b846f9380229bfa54c88b3141be68492963444928e40e14fc28da3ce27b09746e29c4dfe6323cd6bea69181826367e830f284d6ab698c633
-EBUILD cadvisor-0.33.0-r1.ebuild 1067 BLAKE2B 1fc65cb53cf5485086b9e09ce4b5d55b03badf1b0897786e7dd110dce93a4b23e51e1594a7c3161a88ee417195ff8e31ec85e26d5a885e68b57155ef4eed43c5 SHA512 defde9918c8120d66a4766eae04c2e7c7d6e0bab1c97f40abd957bdc2d4e70181b672cce19444af071147f71c18a0974847f5eb9804a1cb042db41c1544d1544
-EBUILD cadvisor-0.33.1.ebuild 1067 BLAKE2B 6ca8de198d551133211b7840e54a497cae13e030c0d96294de2a30d86a56f4daf70ada324b308d722be79af6d438fc603902e73cf3659d84157388a94c8b4866 SHA512 52d29f926766995041bcfe545602df81aa24ae1725f853efe203711513ed7bf7c03e41d99fd359d390a4b3df5c72cdcaf256438a15e6903be35458795932c698
-EBUILD cadvisor-0.34.0.ebuild 1067 BLAKE2B 0cbedfd14e5fbb69bcf6a9778f0208ab1f6520f166ccb119dc15a23d95238053e6281e9ae0fbd300724933dc66a04b9d0c0836d6ffa53d0f309919ac571528d2 SHA512 88f20182dd1a60de4b03eee51ab325763eb6ce896348a797900dcd0f46fee8992263d2902f9f63bcd593417e8a7cf62feb1c5430daf7c99301dd8587490a2821
-MISC metadata.xml 325 BLAKE2B 3a83be7d0ee504a5ef4b25d8826101878da8bac2228afbe0598ec0aef7435d69ed6d754b88453336fd84a1ef38ab1646eb890bfbff1e8549836aa12c7d497f4b SHA512 d083dae5366eaea34ba9697c49a4399e822000a19b11cffffe82e08f4a331eb0f4672c8271ac342cebb79a66c1a245e41a17ff1d40ecbad2354940bfa14c1b06
+EBUILD cadvisor-0.34.0.ebuild 1119 BLAKE2B 6e6346ce9c4d8f5f7c46a11683a74b6efbc3479856633a50814ec2675a4ce71c3f0b102e7eb18da407d84b5e55b7c804bdb1fdc589cb20f066c80ce2b553df36 SHA512 0fedf5a3b41fd886e8d8c6f5ef779a3e32108d794c750302b0183634ab3cc33054b80fb25678ccc232645c4f9dc72249b413c2532868f3b9fcda5565d9c61bb6
+MISC metadata.xml 328 BLAKE2B 61bca93d2712241a0988c8b6b2da6859b4bd1e3dba6209d6628c4b69e00a565410ee8a46ea8132b3edf2269a8ab7b44083e59bb4f5d5568c52794ece55130316 SHA512 29a397dddc11fcff90776fb2d90356c162080b7b6ffa24633b7c89d9c0bbd208e5cc3aa77a89ffdd7f81c1f618124883be342566c6b6ab3bc92e443f4c39da09
diff --git a/app-emulation/cadvisor/cadvisor-0.33.0-r1.ebuild b/app-emulation/cadvisor/cadvisor-0.33.0-r1.ebuild
deleted file mode 100644
index 2e4b131c1b4b..000000000000
--- a/app-emulation/cadvisor/cadvisor-0.33.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/google/cadvisor"
-
-inherit user golang-build golang-vcs-snapshot
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-COMMIT="511ec9e"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
-HOMEPAGE="https://github.com/google/cadvisor"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_prepare() {
-	sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
-	sed -i -e "s/git describe.*/echo ${PV} )/"\
-		-e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
-		src/${EGO_PN}/build/build.sh || die
-	default
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}"
-	GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
-	popd || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	dobin src/${EGO_PN}/${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-emulation/cadvisor/cadvisor-0.33.1.ebuild b/app-emulation/cadvisor/cadvisor-0.33.1.ebuild
deleted file mode 100644
index 283eff3a8e7d..000000000000
--- a/app-emulation/cadvisor/cadvisor-0.33.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/google/cadvisor"
-
-inherit user golang-build golang-vcs-snapshot
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-COMMIT="7e9ea00"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
-HOMEPAGE="https://github.com/google/cadvisor"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_prepare() {
-	sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
-	sed -i -e "s/git describe.*/echo ${PV} )/"\
-		-e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
-		src/${EGO_PN}/build/build.sh || die
-	default
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}"
-	GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
-	popd || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	dobin src/${EGO_PN}/${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-emulation/cadvisor/cadvisor-0.34.0.ebuild b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
index 26280e2293af..76ad3d58d03a 100644
--- a/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
+++ b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64"
 DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
 HOMEPAGE="https://github.com/google/cadvisor"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
 SLOT="0"
 IUSE=""
 
@@ -30,6 +30,7 @@ src_prepare() {
 }
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
 	pushd "src/${EGO_PN}"
 	GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
 	popd || die
diff --git a/app-emulation/cadvisor/metadata.xml b/app-emulation/cadvisor/metadata.xml
index 9685b121c378..054ff1968a44 100644
--- a/app-emulation/cadvisor/metadata.xml
+++ b/app-emulation/cadvisor/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">google/cadvisor</remote-id>