gentoo resync : 15.12.2019

5 files changed, 5 insertions, 117 deletions

diff --git a/app-metrics/snmp_exporter/Manifest b/app-metrics/snmp_exporter/Manifest
index 8d6f3bf996c6..605244cfd56b 100644
--- a/app-metrics/snmp_exporter/Manifest
+++ b/app-metrics/snmp_exporter/Manifest
@@ -1,10 +1,6 @@
 AUX snmp_exporter.confd 98 BLAKE2B 3058ed314dd66772e0d299f135cc1ddb4f3c1f47403848fd249e949173430673991a12e794c74bfb53d0f25f313513d2d70c03d589b6d947659d03e33e6dea8a SHA512 e757dd327252ffd29a65170837aea147128d8effee3d88ac4f0474efffaa10748b51bfbecab999605284030a3026b13ce3ce2c1a7ec347a6ff191e44040d84aa
 AUX snmp_exporter.initd 591 BLAKE2B 103fec1c2e4ad46bf86893faaaf23bd64c7f22ecc905b059e31199c08d610d58852f678d18826cb06f51beab65c8777f49a05a005ad35b77dcfc3e5eef398926 SHA512 903fbcf43a737d2823ab74e954f40134a64414cc1e79a14c78ad51682baa52c3443e85e94ec1abb294753c93a55483c148239e738b72c03bcdc7d4a595580f41
 AUX snmp_exporter.logrotated 99 BLAKE2B b0e459df102728238b137443ced2cf717ace780d83caaa7f18117ca8605453e8f325a48f8a4375956209feac210dc452da9cd0a267cf2d663b64f0a2c80f1eb5 SHA512 c1e1264b5a5612b4794c49613b79826245d3d31db65c1541c3ddfb41872993e7039fb0a84f25260d92a78e8e20005560bdd5e41ee6373e85f8f5e866726c9af4
-DIST snmp_exporter-0.13.0.tar.gz 4096479 BLAKE2B a41ad876ca73a997bc48ac6fcdbc3ca01ff1c689f2f908cf14874f948a50ecd846a2996fc0cbf7d86a473fb80e42e15a7aca1c1b57f2cb3ebfa68a62db8d13ac SHA512 6e4a607cb58e6721acfd77b570dc62589cba5b23d250c9f654659632c97039156869722e1e43bec2b0656f08021ff89b4089f6b91ef28229964f32a34e0067f3
-DIST snmp_exporter-0.14.0.tar.gz 1458373 BLAKE2B 3251022b236b1da7c675fff1119bf358a7b19bec02c552357dde689654e655f7ab5569c5580db8d8cb587860dfb18a5111220bcb07041488ff2d02fe4d204d44 SHA512 58439e9ef8f05e48ebfb4ea82d42568e40968224e609485960f8a81c6e349ca18d16ec3f4eee469dfaa0b9fd50feb28c1e6a6a988fb251485748f10dbc4f8d12
 DIST snmp_exporter-0.15.0.tar.gz 1482592 BLAKE2B f7695eb37f2d702f3a6792337de7a1e878229ec20c8f4bea17d35e174219b71958aaf09bf91daaaffe12c5d03840887ce2ef3b37ce58a56352e8bcbb418bdb5f SHA512 1050a25d12a8201deab0ab7ea95dc35e250954a321d14251c10f87b016c879cf036e01f4043e3463607200381de63f12ea6bcf094dea2939707545f978c2675b
-EBUILD snmp_exporter-0.13.0.ebuild 1394 BLAKE2B 5bf4dde1a95b79892dd6ab7ebd26e714906e5634a9cd901cbb86b58dd03f4053c955294bed84cc41e4f3c23fb415eb9ae06e20632d101aff4145001de9e421b9 SHA512 8b2ded50a44003041fe7fc0ecb6bea1ce4f21e45136ddfe3283697dcda5f26ad85f45bfb2c8a90e77226f5791d1a091f0725b91db716985eb886049ecf62bc4d
-EBUILD snmp_exporter-0.14.0-r2.ebuild 1562 BLAKE2B 03c30a5877954cf964d64ca970cab73169d4fdbf072a2c8f9dc3125855767d6b7febea3a4591e72619de6ab554908bd8b891b8ff2d8feafac6a08908aef5d1f6 SHA512 1d5dd0f289a0833ad4ab8dc188b1677bad9e7a4ddcf363e92ae4ed4613ab4b86c443b70080aca3a66f9c99add199295c439a5f8128894e033420d47016abbedf
-EBUILD snmp_exporter-0.15.0.ebuild 1562 BLAKE2B 8585f5cfb843ab34b345a1d1cb2851edf3c45ec907df0a08f7c983b84e5bf0a9e78829d69244d2d0c8e5d64689d9e10977b81f165e4de222989ee645ee4203cc SHA512 d54cdc2728b13ccabaa6f7b17632b927bf8d5fd55b791fd9bb53fefc633f6c87ef5005ce8fc39e043d9ef91fa9f54569a7268bd99f045048ef3340949551f40c
-MISC metadata.xml 334 BLAKE2B a805d1d3f519c6ac1ef9c7f2cb5a0947740e6fe9a37fc77490e2011a27dae8ff981b3e482a55c117553eaa60f0e3c8d017d867c4fe082c8ebdc4e4bdac22f750 SHA512 7fd3e4314022bf2ff86bd01f335d5c4402676970b9810575225aff3d40bd5bdc9ffc27b438c880dc0a665cf3873502b969dfb30644b3c106278fd353820d6599
+EBUILD snmp_exporter-0.15.0.ebuild 1576 BLAKE2B d5d657d3898b8acac133f0651e3f3e457909d1eb0b2f4840e727e40d7051e01368f68063f9e27e5addd4b4e357c263bffc612462e06fa832d87de3dc32458b27 SHA512 6fea24a17f4448f1fc2c02e28ec9e6a9345e4f7f2a2f1c5f973b543292eb4899ce262bdd2d08893141fe2aefa026ca7a72a415e78de792e711484be90b31eb32
+MISC metadata.xml 337 BLAKE2B 9406f48bba3dc818fa7edd066a951edacb9e15afd64fe59765cb142d4396103bfeeec8d55482a3ab90d12e53c7e105a35967bb90771daf6544dc32e4390bdc1d SHA512 051711d284e01bba8751427fc6c17f64b2b276ce2832bc7af22d55a76835164e7cbbfea4f2162866c2791695100bc750a40f11771caceb65fbce04cc32361037
diff --git a/app-metrics/snmp_exporter/metadata.xml b/app-metrics/snmp_exporter/metadata.xml
index 9ea37fba673a..7be2b809f629 100644
--- a/app-metrics/snmp_exporter/metadata.xml
+++ b/app-metrics/snmp_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/snmp_exporter</remote-id>
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.13.0.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.13.0.ebuild
deleted file mode 100644
index f4215957f69a..000000000000
--- a/app-metrics/snmp_exporter/snmp_exporter-0.13.0.ebuild
+++ /dev/null
@@ -1,53 +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
-
-EGO_PN="github.com/prometheus/snmp_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-SNMP_EXPORTER_COMMIT="84cab6d"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for snmp metrics"
-HOMEPAGE="https://github.com/prometheus/snmp_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu
-	net-analyzer/net-snmp"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_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
-	pushd generator || die
-	GOPATH="${S}" go build -o ../bin/generator . || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/*
-	dodoc {README,CONTRIBUTING}.md generator/{FORMAT,README}.md generator/generator.yml
-	insinto /etc/snmp_exporter
-	newins snmp.yml snmp.yml.example
-	popd || die
-	keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
-	fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.14.0-r2.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.14.0-r2.ebuild
deleted file mode 100644
index b6d3bb792c75..000000000000
--- a/app-metrics/snmp_exporter/snmp_exporter-0.14.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/snmp_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-SNMP_EXPORTER_COMMIT="da73490"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for snmp metrics"
-HOMEPAGE="https://github.com/prometheus/snmp_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
-	dev-util/promu
-	net-analyzer/net-snmp"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v || die
-	pushd generator || die
-	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache go build -mod=vendor -o ../bin/generator . || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/generator snmp_exporter
-	dodoc {README,CONTRIBUTING}.md generator/{FORMAT,README}.md generator/generator.yml
-	insinto /etc/snmp_exporter
-	newins snmp.yml snmp.yml.example
-	popd || die
-	keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
-	fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_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/snmp_exporter/snmp_exporter-0.15.0.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild
index 1c01a04e3bbe..aaf7c2142f37 100644
--- a/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild
+++ b/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64"
 DESCRIPTION="Prometheus exporter for snmp metrics"
 HOMEPAGE="https://github.com/prometheus/snmp_exporter"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 IUSE=""