gentoo resync : 25.08.2020

3 files changed, 3 insertions, 57 deletions

diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index 3235a863a442..8cd423184cf2 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -3,8 +3,7 @@ AUX node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4
 AUX node_exporter.initd 701 BLAKE2B 6dbe6f147332580c2f1433d293649d818bcb0033faf0cd14567eb1f017a677b3a5568a51c3fe9929d3e6f9f96455d96138709444cba8024235084dbfcaf5b78b SHA512 9af0a58796aa087f1dfbe00bc25e4af0d3a7e4054071bfecd76b9e3dbc3c222b649fe0f7c2a5907ce733d3c0cc3eba127d5815366a749fc16952d1c6b9d397ae
 AUX node_exporter.service 188 BLAKE2B 3e8c0598afc0d52193912cd34e8daaccad1ec6c58d93ee442789851d471b3b89bb6195c3e499560024b4259d8845df11efd51827f9e3f338987083d84601b5aa SHA512 2f61c1b651ec30d8a75da137d6da1cd82b51e87e11264e3109ff28c7269493c746feba52d63b25441dae82dd04d48cca94eb049fed6e63e6cd4297830260499c
 DIST node_exporter-0.18.1.tar.gz 2110072 BLAKE2B 48c73d00cba892e34e95d40bd29c9ca70bc5748590f00cb7f8adcd25d8a9504f669d887b1273cc65316ca55b06c36d97a3e19a66382f35d5768db7c315981a13 SHA512 cf2b854fbec1ba39b18432cdc11ab507ebc5b2828e6b34b4f49af9b949fcd365cb3e5eb1e265d0825783810c6b1572a8b3512ec27a46e5c83f89a505590159c0
-DIST node_exporter-1.0.0_rc0.tar.gz 2753717 BLAKE2B 2e1984d080ce2a16ca710a3da882b311510b2741836d615075281f5fce2641be35084090d9bcedcb8bf4f6a18333c5fcd53eb98817d1efed4c1a26261a02bffd SHA512 ec1d79367c69a7ccdacc9482a38625ffc9adab6d781b789cc226eed0bd893deca5cfc420a096f790ccd57834492551d36e2f307ad27a6c67585c8ef31887b50f
+DIST node_exporter-1.0.1.tar.gz 2792033 BLAKE2B 4e86c348a293e8a4a8d5e22fe99871d84a817cfbbe3ac10b0e7b4fbba3ae7b12352c619f140e3568aa2fb3e4cdfdbde0d19d792497a0b0007b634cb3a4d21e38 SHA512 0643042a04494a65d1ebdedf78671a1e3473b7ac6f3bc606fa2c52e893dfc68b591ef7e38ac6768c4c529c25b831811c01839475a4fde9baeb0a6c581a57839f
 EBUILD node_exporter-0.18.1.ebuild 1452 BLAKE2B 9bfd50a37838b40c36a94197ff5cd39ef38b9f553d2fe3169bdf33cbd2055f40825fd0e4645369fdf0c375d15fd82e62885316b5772556db26e4345d8cbe9149 SHA512 80791542bbbdca7b3ec58f8f25d3c84a13b52809d1981af94bb91cdf5edc0f613e93ce53c4b71da8d805a0f19935bace4c941b4f8d4f20e82e70bea3eed37699
-EBUILD node_exporter-1.0.0_rc0-r1.ebuild 1251 BLAKE2B ff2b7020ed98f0a79d5f51e54db83df2315ff04b7f4c175a3fce3b084007ac7499b27facf98c0e4b6158814cc4c162e6b657e7b0d78fd7f4a5517ed2666b9d9f SHA512 8862c1e98df69ee9567908d9761c341deca56e1daee0910573ed3fb69f872ddf531909c67b7581a2096f4f71739b8322a5a421767bec58b8945a80fa62b5e85c
-EBUILD node_exporter-1.0.0_rc0.ebuild 1526 BLAKE2B 0fd95b50428006f3417061163ed21593f687a8901951123add14927adaa809b3290668b2614146f78a79b9a5f7e89088ccad889191736e4cb02a9704158afd0c SHA512 6c15ec90a199386990b1e88861c62a19a3c5ef314ed58ad1c372a520089a971bfc38df015542c39ff3ccec818295d01f8b9ca2985718c22c357e3607756082c1
+EBUILD node_exporter-1.0.1.ebuild 1251 BLAKE2B 9bd450bb2b143043912e8aeff59ac161516f1b220b026898ab31fd80eaeada00f46d206152e8d2b89c76167e3d7cdb6ad47a0673e87ab7200edb76d8d144319f SHA512 7ba2b66ff69a33596eb6ed08523da98f2a25726e1a60c255528b3d7490e049c7396eeb71d86e1a3e60f9862ce8d9963b5eb3e05c84226fe98b6c2a806805f150
 MISC metadata.xml 337 BLAKE2B d9d866eca2162bd2c647a92d7c2c21eea95e944d81f9f4eb0911f0b111ed4eb62f2bf2c6042afe1a12caf58694ac692498923f9da2733c4fcb4419946e3eb613 SHA512 9a616d85dc1a26ce5bdd84f6a08f5cfaed1f273ee62d3fdec395507b0cfe0cbd23db13c8380671caada62f81e202a2a9ea4793dca6b6f6a88fe6dea9bcf7b8c0
diff --git a/app-metrics/node_exporter/node_exporter-1.0.0_rc0.ebuild b/app-metrics/node_exporter/node_exporter-1.0.0_rc0.ebuild
deleted file mode 100644
index 9eae734e4acd..000000000000
--- a/app-metrics/node_exporter/node_exporter-1.0.0_rc0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/prometheus/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="ef7c058"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-IUSE=""
-
-CDEPEND="acct-group/node_exporter
-	acct-user/node_exporter"
-DEPEND=">=dev-lang/go-1.12
-	>=dev-util/promu-0.3.0
-	${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v --prefix node_exporter || die
-	popd || die
-}
-
-src_install() {
-	# binary and docs
-	dobin src/"${EGO_PN}"/node_exporter/node_exporter
-	dodoc src/"${EGO_PN}"/{README,CHANGELOG,CONTRIBUTING}.md
-	# systemd
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	insinto /etc/sysconfig
-	newins src/"${EGO_PN}"/examples/systemd/sysconfig.node_exporter node_exporter
-	# openrc
-	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	# maintence
-	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-}
diff --git a/app-metrics/node_exporter/node_exporter-1.0.0_rc0-r1.ebuild b/app-metrics/node_exporter/node_exporter-1.0.1.ebuild
index 43ee1e033e0b..ca15b40f88a0 100644
--- a/app-metrics/node_exporter/node_exporter-1.0.0_rc0-r1.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit go-module systemd
 MY_PV="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT=ef7c058
+NODE_EXPORTER_COMMIT=3715be6
 
 DESCRIPTION="Prometheus exporter for machine metrics"
 HOMEPAGE="https://github.com/prometheus/node_exporter"