gentoo resync : 25.03.2022

4 files changed, 51 insertions, 79 deletions

diff --git a/app-metrics/grok_exporter/Manifest b/app-metrics/grok_exporter/Manifest
index 86b15deb7453..89b714be60c6 100644
--- a/app-metrics/grok_exporter/Manifest
+++ b/app-metrics/grok_exporter/Manifest
@@ -1,12 +1,4 @@
-AUX grok_exporter.initd 582 BLAKE2B e9501f3b3a50860d2fddc0c0d84854422ae40df6aaac7dffc94fa74989f34287d6bf0b4a8c68a853c6f72c28d4fa532729405c72eb03f18f3f7f9e75ee204298 SHA512 589efbe89ff0655fcc13ea55907da0276f41c6fb9fc20f241365815b6fe8e429f3cf613c88df2b3e086d043f919d7ecdc094691a6271ed7e9e6757ccad60a14d
-DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-go-yaml-yaml-51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz 70766 BLAKE2B 3ea4412e259626b25145feacbe68b529d2bcf353bd098899c3a906d01f75bac5f93ec20967f7261feb388356d7b12fa945ec73822e21e029e38ce7c0b27855e7 SHA512 dec54681845fb5cdb159d44bf91cb703bb38a6af1821566d7b11a0668ee50247f542e3b7bfc21571198f9bda8ff31ce32cf67f98a8c906dee7ea9194643699f9
-DIST github.com-golang-protobuf-347cf4a86c1cb8d262994d8ef5924d4576c5b331.tar.gz 329489 BLAKE2B 828678cee603917e7f4efee2dd0902730a73932b94b12d4f4b35f0fcecaa329cdc39c3fa9926ce3706f86cc52c0aa4984f68ee0943ecc6d9571b0175ff671ab0 SHA512 de4307b91923a6890ab2f8eaf2ed4f7f32a45a4a0cc7b0d6f53ce31c5fe3ed08f378072075456d2c99c89a3b5acbca315814b8e5ec70e6ceb0ca62f7013f618c
-DIST github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz 37541 BLAKE2B f78899afa1390aca6cb1b412271713c60107771d512ead83482e0bb1716d175b791b4b04bd24b7f469cc1a29176eadcf0545ac3bf166c5b350602420d3c05aec SHA512 141b1b781a4d1c59f5eb1af93c966343b80ed405a5f63774e6cda9f12c34536e892c7a84699d6cf2e9c775457a4c2ad5d5d0b4d302fc25a923ab81d46ad65580
-DIST github.com-prometheus-client_golang-18d13eacc9cce330610a70daf4ed0fef2e846589.tar.gz 133489 BLAKE2B 75ba882c9378d9062ed510af425f39e81e1d980dbd183f4e1228110880b3143cac74fecaa5d224e8516afcab71886041d1fbcff0832c8ab604976bbf34977eb3 SHA512 80142c7e659c3213a0990f1f871b3578b2899b14c5082a04d8eb67048da768203bb7228b2fa33d2f49d0f57596f6ad12fed47b54790a3c16d8a4cd43eb35005d
-DIST github.com-prometheus-client_model-56726106282f1985ea77d5305743db7231b0c0a8.tar.gz 57192 BLAKE2B 83bbc3c756f993a8bbf3b3f4bd5437b466b8fddc1f434554f1138eb6a830dd76ac495ceaa8b8a324498b05513c4ae67d571f263cce2de5275d87cadc2bf9691a SHA512 531b3e185f96ef23c8d5791f3caa7ccbb78870811343a4630d79dcf3e217a1f9a176390752cbb427ba3550bebb984e31ade8529a2b56ea93af2ab6b7a2e98320
-DIST github.com-prometheus-common-2998b132700a7d019ff618c06a234b47c1f3f681.tar.gz 87368 BLAKE2B fc6c6e197d4cc61afefa9fb8e3a8d6b36ab029f62e3cf9adf8359e4885554f94427f17218d45c90c9d7f4a6985b2e4143a4d304d39f806bd70d2c6f05de29bc2 SHA512 b2095da96596fc500ece6b331cda2558f8c813720853f2489aee3dec65de95eb13f7b0853e3812433fdc040f16990d2f05b2a6b8b41275210c504ff333ca625d
-DIST github.com-prometheus-procfs-b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1.tar.gz 61720 BLAKE2B 2f9b25506527aaf6e1bf560a1b680b958d1281acbaa2bb896bfea50b5b7de8992d10e8e812f8ae449ab67145c88179c15afe1f719851d1717b28963071088082 SHA512 5938b4a8fa9a5ee32be995fed0d0e6b26941765470aca4eda63a7c42db457e83da43fde2f33b2d4ded3545e5643f607ec7060406b0a1b15e64cc732bb2badd4a
-DIST grok_exporter-0.2.6.tar.gz 478354 BLAKE2B 082331eb7606517fb103af7a74088bae75740ae77d2b1fdeaee87791c4a0be706883ca505cb723f3853d3786692477086183b303de0ad82833499b231fc55909 SHA512 5204974702a8d29cc80fb7857a46f3242c78019d8a37e18e595d4bfc2f64662dbd48f9e0d5cae7b2f4f2390c35b0d621a7212718bf3c88d675601af2977de874
-EBUILD grok_exporter-0.2.6.ebuild 1977 BLAKE2B d030fa9023e0a0dabbb847654d7538d2c9b6a552ae64758ce8091fd324dd5f91ee9f41f50377d9d50ca22b2ac63f4650e3730e5d9e0aeca9a373a7317dac1a5b SHA512 dcb554df90b76ffbb958b4f7c0047e6877aa7013c882de568de103cbb32788a356644e8d4bec1fcd84ab5e307824ee4afdf7151ffa0e6157c2fa694934fb945f
+AUX grok_exporter.initd 566 BLAKE2B b95ccaa8e4829a02b1bf57f22693629b6e853ac7fb9410c88c5ece617209d52ae4453123300032fc1e424c13c9ab4f0f19cad2b417c0f3b1e62500e44b4dc613 SHA512 b3ff88a1339dfc54b694a4bd73e9256eaef75cbfcf7a8a077fa5b7e51548fef9b0887e5d42892b8b985d9b200605eea6bf5da579fba9732fe3e066dea9e36c3b
+DIST grok_exporter-1.0.0_rc5.tar.gz 2324696 BLAKE2B 2042067127e18fb63d2ecc412fa75184b410e27a755fd06c3634c7b345c13b1bd1d000e323467d10cc5a0cf13363b6782c4c98532875158a793111fe56a36edd SHA512 5b4772aa4b147dadc2d8298d043cc8329cbfeb081dc9bc686c34e16ae0c8a4fa30e55478a8328293349fda2d3f785a5feeda22d5ea1722ab3fa586375b696a92
+EBUILD grok_exporter-1.0.0_rc5.ebuild 1012 BLAKE2B e8adb17a75b2e6413fa55927c1885a1c35ef7975323eaab8ffc05b88151ab958c25f89b021c7ff9b852a252cb827758e19e14414393ecfcb6cf910d2d4193acc SHA512 65f937922d192e63469d108011f113c2a64e34ed57132299d4408baecbfd851f0bc94d7544c31e354dc0d8e93cf478516d6d5d260ef6b63a08fbde57e7ba1605
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-metrics/grok_exporter/files/grok_exporter.initd b/app-metrics/grok_exporter/files/grok_exporter.initd
index d38d0af63ab3..bd25c5170e9a 100644
--- a/app-metrics/grok_exporter/files/grok_exporter.initd
+++ b/app-metrics/grok_exporter/files/grok_exporter.initd
@@ -3,13 +3,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 description="Unstructured log data exporter for Prometheus"
-config_file="${config_file:-/etc/${RC_SVCNAME}/${RC_SVCNAME}.yml}"
+config_file="/etc/grok_exporter/${RC_SVCNAME}.yml"
 command=/usr/bin/grok_exporter
 command_background=yes
-command_user=${RC_SVCNAME}:${RC_SVCNAME}
+command_user=grok_exporter:grok_exporter
 pidfile=/var/run/${RC_SVCNAME}.pid
-error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-output_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+error_log="/var/log/grok_exporter/${RC_SVCNAME}.log"
+output_log="/var/log/grok_exporter/${RC_SVCNAME}.log"
 required_files="${config_file}"
 command_args="-config \"${config_file}\""
 
diff --git a/app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild b/app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild
deleted file mode 100644
index 29464c26fe09..000000000000
--- a/app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN=github.com/fstab/grok_exporter
-EGO_REVISION=81c0afe
-EGO_VENDOR=(
-	"github.com/prometheus/client_model 56726106282f1985ea77d5305743db7231b0c0a8"
-	"github.com/prometheus/common 2998b132700a7d019ff618c06a234b47c1f3f681"
-	"github.com/prometheus/client_golang 18d13eacc9cce330610a70daf4ed0fef2e846589"
-	"github.com/prometheus/procfs b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1"
-	"github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
-	"github.com/golang/protobuf 347cf4a86c1cb8d262994d8ef5924d4576c5b331"
-	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-	"gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml" # branch v2.2.2
-)
-
-inherit user golang-build golang-vcs-snapshot
-
-DESCRIPTION="Unstructured log data exporter for Prometheus"
-HOMEPAGE="https://github.com/fstab/Grok_exporter"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-libs/oniguruma-6.9.0"
-RDEPEND=">=dev-libs/oniguruma-6.9.0:="
-
-RESTRICT="strip"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	cd src/${EGO_PN} || die
-	GOPATH="${S}" go build -ldflags="
-		-X ${EGO_PN}/exporter.Version=${PV}
-		-X ${EGO_PN}/exporter.BuildDate=$(date +%Y-%m-%d)
-		-X ${EGO_PN}/exporter.Branch=master
-		-X ${EGO_PN}/exporter.Revision=${EGO_REVISION}" || die "compile failed"
-}
-
-src_install() {
-	cd src/${EGO_PN} || die
-	dobin ${PN}
-	dodoc -r *.md example
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-keepdir /etc/"${PN}"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-	elog "You need to create /etc/${PN}/${PN}.yml"
-	elog "Please see /usr/share/doc/${PVR} for examples"
-	fi
-}
diff --git a/app-metrics/grok_exporter/grok_exporter-1.0.0_rc5.ebuild b/app-metrics/grok_exporter/grok_exporter-1.0.0_rc5.ebuild
new file mode 100644
index 000000000000..04782b54343c
--- /dev/null
+++ b/app-metrics/grok_exporter/grok_exporter-1.0.0_rc5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+MY_PV=${PV/_rc/.RC}
+inherit go-module
+
+DESCRIPTION="Unstructured log data exporter for Prometheus"
+HOMEPAGE="https://github.com/fstab/Grok_exporter"
+SRC_URI="https://github.com/fstab/grok_exporter/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/grok_exporter
+	acct-user/grok_exporter"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/oniguruma-6.9.0"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/oniguruma-6.9.0:="
+
+RESTRICT="strip"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	ego build .
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc -r *.md example
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+keepdir /etc/"${PN}"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+	elog "You need to create /etc/${PN}/${PN}.yml"
+	elog "Please see /usr/share/doc/${PVR} for examples"
+	fi
+}