gentoo auto-resync : 04:02:2023 - 09:13:04

8 files changed, 61 insertions, 79 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index c8ede1085f7e..7d4015012cc6 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/github-exporter/Manifest b/app-metrics/github-exporter/Manifest
index b2c269c3b460..9ad99fd0546f 100644
--- a/app-metrics/github-exporter/Manifest
+++ b/app-metrics/github-exporter/Manifest
@@ -1,9 +1,6 @@
 AUX github-exporter.confd 507 BLAKE2B 46ace5b98c0ec60c7a93c50524258e44537e1a4ed13d77c3b4f6651ce56f5323f2342d967b145515a544edb3203b71052edb12019f9105b8e6b4bce9da0d14aa SHA512 10430a3d1fcb6a7e125fcddfb27a610843f6646091efb8e53fa9eca7bd434c528562857267b59f75452eb78c78821e8856716d417145a9e930861e4340382d1a
 AUX github-exporter.initd 1512 BLAKE2B ab1f34d3084655da8b7f5345e7001f968d0f7361d8c0eb45070e8a7c1bb6216b65ccfec754897c2472b91fa457a50b363d51939ccc772ae64e153abe97b10cba SHA512 d0ebac39a04d94a10f6d38cbad660b7c8f4bf570bbda334d7e7eb6c2d635f6ac4425f462e2ed9b68bd4f8ac56842deaa6ab15b6c883cf4fd17078115feaaa9be
-DIST github-exporter-1.0.2-deps.tar.xz 6692672 BLAKE2B 7b0d32b116d7661c89271c674c01680e7cf5b4af83e7eebf4d069a34696fffdf21c57f376acce02922d8c02a8238d967115d561cca4dec1437efb561b5bb3661 SHA512 4c3c24ab3cdc8723f47226f90bdaeff2b5d92d38184bfdc230351db74a172c3dcb9fb4bd3c240a70a15e71eb0ad782c579f3fa3bb0aff105999aa3f4a6110c1e
-DIST github-exporter-1.0.2.tar.gz 20534 BLAKE2B 344e01adfca6afade30598305ba388878ddfb3a7e277dc95b87bb5a409bc269b4bfce7ba178ac155f3cd06f72fcf69cf8c38c898eaf391e85ce122618c707fcd SHA512 98326a8c33a7b1e3e7d4106bdd58d07ec34a9f56bce5e4caefe07ba31ac50e2c98bf849aa60cf9d5445afd02d3d9c899a3cb59eddf45635130853d740b3d6347
 DIST github-exporter-1.0.3-deps.tar.xz 7786648 BLAKE2B 1dd1876f144e95602131f6f0ec11f4189a88a56821f4ee812b906a1d6d8494651465e416c409a998b19b48081ec8c53d5f11a51f8292002cb9fc50fc13fc4e81 SHA512 247b80369efe54e838868b0c94075031a4430d03f1c8ffefb686d94a6de70f5f288f79459a14f9c1331d2f1a3f9e865e5f7cbd658dc6f01bc7c6e893b5305af2
 DIST github-exporter-1.0.3.tar.gz 22089 BLAKE2B 69ac6a71fa8872c08cb24b6fa3e0aa79a8d49fdc626606f5ae1265cb654f73a320d53c1f934f3b2a116c713412f0cb278e27ed892da19b54ff09405abba5bfc4 SHA512 9b3ab36dc8c76e844afdb7f36099dca86f358072fb0ccc134e4ba6754b2a84122b700bb92607014eb2e21e1e3f3889f842e82cd612e66d223e31aef60d123220
-EBUILD github-exporter-1.0.2.ebuild 846 BLAKE2B 6ae50bbaacae7066b2d32485d442fed91f8c2e974af7346be579b58e2dd6796db1feefe6a4c93bb072e1685589c4dc65d22bddbbae1de8e3db555c707ea2d061 SHA512 0f68bb844d0e991d0d024f3a979cdc92448a5923c939c0e034545da8aed8540cc643f05bd82aaf743279db5823178af93bfd955f2cc006f2e2530dd0b7893e26
 EBUILD github-exporter-1.0.3.ebuild 930 BLAKE2B 7f91f9502d134f983b9cc54ad9304fa1b66a7a46d6a83ee6c8b2fa98c3b2a6dc4eadf93b8b5637a246abb73581e12009b1269ab847fb01aef4543d406cc85e0e SHA512 af755726d38a7f1ac684a3a9a78ca0e390bdb7fb352d87ed8abaa6c4242f98a3724bb30be57a0f948532dabda0b91a67d9e1a5fa3b5b7028f2402a6aefa0993b
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-metrics/github-exporter/github-exporter-1.0.2.ebuild b/app-metrics/github-exporter/github-exporter-1.0.2.ebuild
deleted file mode 100644
index 25fe0600215c..000000000000
--- a/app-metrics/github-exporter/github-exporter-1.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-DESCRIPTION="Github statistics exporter for prometheus"
-HOMEPAGE="https://github.com/infinityworks/github-exporter"
-SRC_URI="https://github.com/infinityworks/github-exporter/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="acct-group/github-exporter
-	acct-user/github-exporter"
-
-src_compile() {
-	ego build
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc *.md
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Before you can use ${PN}, you must configure it in"
-		elog "${EROOT}/etc/conf.d/${PN}"
-	fi
-}
diff --git a/app-metrics/prom2json/Manifest b/app-metrics/prom2json/Manifest
index c1cf17870b80..3fc440a77e08 100644
--- a/app-metrics/prom2json/Manifest
+++ b/app-metrics/prom2json/Manifest
@@ -1,5 +1,3 @@
-DIST prom2json-0.1.0_p20170523.tar.gz 129179 BLAKE2B ef0e42e340d53894c31bff7018b668d8575fc3568584a43dc308955665ac6f59dbabf2d4605bc2a66957df57a29ebb7b3a4eef1f99537eefc2805a5ffd86904f SHA512 824f4c43f4a167dc7dde2f11e84cf482e5cdfa26ab11caf08a5461d525543c3491180f54694c4ae61fdd5dc9763ff16f6e29b332a64dc3ac52fdb7b9c0902571
 DIST prom2json-1.3.0.tar.gz 1646893 BLAKE2B 9b8fcfa4a3e45ee08a57016fa6a7611604cbb578f162f0bf7ff8338f345f98788b75c3ac047ffca95b62020e972c302bc1c44f2f7f00240cfd978f73b8d9c829 SHA512 8f02c7b2616d915e2b4ff5f195a8c2eff89d18417f7396dc02d2aa4cf34711358b0beef6effae9b42a3d6f4b0616c5d3ab995a73ab9e37a4a0ec230adff6f249
-EBUILD prom2json-0.1.0_p20170523.ebuild 906 BLAKE2B 0eaea8f0f93222b4c05b4d7d8e95102ae6a3abd8fdc19665e7a0250f424f4270aa25766cd520cc22a363e347b4440e10039de6362eec62ca12f3b5ac4a444008 SHA512 0b92b64e914e6e8bc2779a5955bf77ad7848ecbff6427a6de61621f1c960f70f591720694c7d7951649208bc94746e69140891abfb188a2c7f3b6f2fb01e7ac0
-EBUILD prom2json-1.3.0.ebuild 746 BLAKE2B 9657a9b4d63a06b7877654e12dd8d5210a515a189c916a4df23c83d959d8ae2723cf656846854f1eeb720b480af83320caae7da17a7dd7b1ec7f3b4194204a27 SHA512 69e5756a85f26c226bc7f2899e68e807a9532c0782b8e7977fa64856127ceb6e53bc151d90d432576f7c61e5e669f529fb3fba01651f8f2a101491b24c21a9c3
+EBUILD prom2json-1.3.0.ebuild 793 BLAKE2B 7b417de377b221c5ffa1fc802e584a6bcf565950531b16828f8bc9c31682c5c2afa51f42d949ffa3c595d3b29f80533ced03f6b41271fb8414d2b921219c81e8 SHA512 5a8e2e89a8eb8000b8ca65428db640e93b10ca55cc01379774f53cd95a8d0a804c1aa3d19413c2218a001ed73413c2438e2b6a6a03e2c1a0003e741e82143f82
 MISC metadata.xml 338 BLAKE2B 323f1010d7bf975b53a7b9e6278425143c59c276af24a6c486a0e0c57524e25efc3d1bffa3652c6f5362b2a81f8a7656a17a81816a731a3073ab6f2d9b34093b SHA512 3ca80debc07302431da65641a6443c3192fb04d3b40fcd3503176fe450d08157b848d1f4c99a40d2d058d8061072116c21694a603c809d28203ad78288d58cca
diff --git a/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild b/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild
deleted file mode 100644
index bc3abad7c8c2..000000000000
--- a/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 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/${PN}"
-EGIT_COMMIT="4a7436442837da72f9e211d99f0145dff3246b66"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A tool to scrape a Prometheus client and dump the result as JSON"
-HOMEPAGE="https://github.com/prometheus/prom2json"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-util/promu"
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${EGIT_COMMIT:0:7}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ${PN}/${PN}
-	dodoc {README,CONTRIBUTING}.md
-	popd || die
-}
diff --git a/app-metrics/prom2json/prom2json-1.3.0.ebuild b/app-metrics/prom2json/prom2json-1.3.0.ebuild
index 464297b7bc1a..ece0dcf32a9b 100644
--- a/app-metrics/prom2json/prom2json-1.3.0.ebuild
+++ b/app-metrics/prom2json/prom2json-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,10 @@ src_compile() {
 	promu build --prefix bin || die
 }
 
+src_test() {
+	emake test-flags= test || die
+}
+
 src_install() {
 	dobin bin/*
 	dodoc {README,CONTRIBUTING}.md
diff --git a/app-metrics/snmp_exporter/Manifest b/app-metrics/snmp_exporter/Manifest
index e9c0bbcdfe75..7d0e8fbd557e 100644
--- a/app-metrics/snmp_exporter/Manifest
+++ b/app-metrics/snmp_exporter/Manifest
@@ -3,5 +3,8 @@ AUX snmp_exporter.initd 591 BLAKE2B 103fec1c2e4ad46bf86893faaaf23bd64c7f22ecc905
 AUX snmp_exporter.logrotated 99 BLAKE2B b0e459df102728238b137443ced2cf717ace780d83caaa7f18117ca8605453e8f325a48f8a4375956209feac210dc452da9cd0a267cf2d663b64f0a2c80f1eb5 SHA512 c1e1264b5a5612b4794c49613b79826245d3d31db65c1541c3ddfb41872993e7039fb0a84f25260d92a78e8e20005560bdd5e41ee6373e85f8f5e866726c9af4
 DIST snmp_exporter-0.20.0-deps.tar.xz 167938880 BLAKE2B 26db1effd4c74c1d8ad063e390e3ebc2f652bc901b679a70dfa2fda479ead9622eb3bf729f24a3a0088d9b154be108e472218a84109ef23d8413e0db2f8afc9e SHA512 f2b2e72967bd7255abf5f808d1dbb5691755d232b32e0c833ebc9b74a469b5c2b704afb7f32c1c591653a4ad6162efc5ec13345e9f5e2d08c7f01d24bdddf3a1
 DIST snmp_exporter-0.20.0.tar.gz 290899 BLAKE2B 81c2c6e8b1f61fe322cf040910744857f0628b61172774069675f5702d7e8dcc443a5567d5fe9d3e26139fee87c3cae8ed5fb7ce21c13b8a0f0cab1cd76384aa SHA512 fe09033e713f12b5a6ad79445def55c8d94c75cbee5e4e7c4683e853c1a8335005462d607e0c7306d2ee6e70178edeb9b6cff0c35aa6d36a4d0fa5ce45cedb51
+DIST snmp_exporter-0.21.0-deps.tar.xz 173870408 BLAKE2B 8bd9699a1ecefcfb90784892e1329919baa06349cde89106a4fa4f7543672aa4de907781183baf714aceb6b1dba5c748130e1b98577830011fed40833bedda20 SHA512 d267e596b2a5c11844aaae66d75bc40c7bcc0263bc04ad2359d29450f44c7a4be263bc453a35a75250424144b4afb4ae15afe9988f95c922d20ec975827fc88e
+DIST snmp_exporter-0.21.0.tar.gz 322098 BLAKE2B 5e28186dc5da1c38be0bc2a8801c56a2a32c835886b7a4d3a8a7add91960679d250bc91e5b75fdb92fb6237d53ca2b5114aa2d6b869c1db9cc371aad6841b153 SHA512 5ebb629ebc48f38035c031f2ebd7109ee681499556771792a3cddc671561b119d144a5fd9f4e51ceaccb58dc50e3852d185ee0c7f1ac57d6307d4936dc1a45b4
 EBUILD snmp_exporter-0.20.0-r1.ebuild 1373 BLAKE2B 325f4e064429e9fd0c20bb556e26b841363c49291275954967b5e718bdde753ab462eac4c35337c64833a1a4378ee1cdd92bcc3fb9c1deb478c41124881abbc2 SHA512 7705b361b31e3551ffe1a97b3183f007fd7ccb2fa28ed0c7371dfb6d9b2f7a2bf8d6275ef0f6a5b78229fde8cb30765127ed71c258133940e35c373874cf6b6b
+EBUILD snmp_exporter-0.21.0.ebuild 1414 BLAKE2B 0be5a68fe3fa12cd4a4baa2492dafadd711e24d2c1065e1fd9bc7c80a8ecceee907756e53f2738ece14cab55acdc1adbd523cf7d851744bf260521aa85b1f712 SHA512 a4b73492c144378f63a41a0846304f157b483baacfd4c02ae23f00d36e37a2fd2cb652bfb5af80d8575ddc08c12f3aeeb8c4238fdd61dd82bfeb3ccf33bb3c30
 MISC metadata.xml 338 BLAKE2B 74a81881d38a3e761120c6d6a4618a7ee680a512b11f9f611177e69a9e8a2010c231b45d7cc15f58ea746268e3e584ddb5f5bb9dba5fe1c9725a6a11a3f704e0 SHA512 280a333a484837548652059d2d13bd3f9ad304c6d4a746c2f2e6e7e9ce229979feeaca7f61de4d64704da207b73e22045dca6596b8102bd92529d88af71e4861
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.21.0.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.21.0.ebuild
new file mode 100644
index 000000000000..57b3032a1a5d
--- /dev/null
+++ b/app-metrics/snmp_exporter/snmp_exporter-0.21.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+SNMP_EXPORTER_COMMIT=0d8c3527
+inherit go-module
+
+DESCRIPTION="Prometheus exporter for snmp metrics"
+HOMEPAGE="https://github.com/prometheus/snmp_exporter"
+SRC_URI="https://github.com/prometheus/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/snmp_exporter
+	acct-user/snmp_exporter
+	net-analyzer/net-snmp"
+	DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+	promu build --prefix bin || die
+	pushd generator || die
+	ego build -o ../bin/generator
+	popd || die
+}
+
+src_test() {
+	emake test-flags= test
+}
+
+src_install() {
+	dobin bin/generator
+	newbin bin/${PN}-${PV} ${PN}
+	dodoc {README,CONTRIBUTING}.md generator/{FORMAT,README}.md generator/generator.yml
+	insinto /etc/snmp_exporter
+	newins snmp.yml snmp.yml.example
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
+	fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
+}