gentoo resync : 12.05.2022

10 files changed, 161 insertions, 3 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index fb873b5e23b4..2b08a6184480 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/ceph_exporter/Manifest b/app-metrics/ceph_exporter/Manifest
new file mode 100644
index 000000000000..b067132ba5cb
--- /dev/null
+++ b/app-metrics/ceph_exporter/Manifest
@@ -0,0 +1,10 @@
+AUX ceph_exporter.confd 48 BLAKE2B 617ddc4f13ee9307f331d0c8de9b9e329786fccc0bbf68211863b61f5a32351a2936972278ef8fe283e0a2cc9ea2ce55d14412cb9777bf88aa9c3a49b3eddfe4 SHA512 bc5be0687671d08d28288d652eae7f699cb406989efa49ccfa38bcf4e8f6ceaf2ca5e2d2a81e5224cfcab7b712b52cca37d5cd0ea2e2b7f49abf8720e217fe00
+AUX ceph_exporter.initd 670 BLAKE2B 57b1ee2932309892f534f363643a93f1e92acf6dc53108d54c9d571574a137e3200440b9b6fce8460ec2c6f7a3b1b4b830be5425b7a76765b1532aa9f8ddf249 SHA512 5014b09cd1cf1ad1e8fa43de16a886b53af43ac011bd94bf517277eb58c4a6739066f5bd7303fd0d9f7fe5b713b5d4305db1dc45916f0677f9f71c0de355b3f7
+DIST ceph_exporter-2.0.7.tar.gz 337138 BLAKE2B c5334ed7650b273d572c8e7b6a7138dc18c086fb4e198e8b3c5c820c95a20e2b9e7d91cbfe2224ba3de9ee03761a59cd929165e638556ce7c57e9a490906f61a SHA512 db3662811c513e732aaecbaaedcb787333886a059304a651e836c4b80661a0593b667608a9298e24561ad2db085f3adacc73ee1777b496ed0ce9760534113457
+DIST ceph_exporter-3.0.0.tar.gz 336128 BLAKE2B 32f25ea46a147be20bb4f095ab01e9f97bc17ad6b852140c9254cfb6099531c51b0867c50abccd04dd396a758e2179ebf20a6cb315fd8c474e320c303c9f1644 SHA512 815cb676d4dcf49a665ec024e82d4047c94b9fbf9c7e0d2998028da6fa074313f0bb10f3831a16d05abd28c2954605f628977f728ac37f1a69fbc9d734304747
+DIST ceph_exporter-4.0.1-deps.tar.xz 7402752 BLAKE2B 4619eba4c1630cd683193fec8f449698587dc8d17c26992e033fa7495934de26bcca84fac4ac174e25e7f405c27033fc324703748cac59f90b6e58c2548f8cd2 SHA512 893a6d246c640647ac55f5f32d657cbd80bec3c9404e1484e6188e4e045a20d01d50559723105f179d438019f66d904938a24ce164f85a41631930067d92f7ba
+DIST ceph_exporter-4.0.1.tar.gz 143653 BLAKE2B 2a8c907fb5ff06bc629644aab94b450646f6b25ff057d2b01485f0131cef3e64e3b159f029f29cf78c8d6b450ff9b750858799fe079256509e31e5b8bcf3e012 SHA512 154e75cc397635450d2b99e5e56c829fd5816e9aad95707eff42500ce21fd92a6d12772a58530b580b8e14e5db7c32d2d24f395175f414df9d89fbcbb8239ece
+EBUILD ceph_exporter-2.0.7.ebuild 1129 BLAKE2B ad8a976633fdec71a7b12e97d1e85ca4892d88c64e2d357080ff45a1168602dcf0c045c4189438bd1fc81f155112b6b3ac8b4512079d580cf53495f9f5752a56 SHA512 56a6eca109e43027f97ced4f4f6a6fec76817bbaa2ecf7c9ce9c4929a088d053310fd05d46ccebbf77a9456841b15a9ec57a54165eba66e119032b3dadf680d7
+EBUILD ceph_exporter-3.0.0.ebuild 1129 BLAKE2B d192cb8d6675e3df665d005de051a4765563cfccaf6ea1a499ec15856fe506dbecede311dd5f53e137446c472f503240f77f778cbf767fc9e30d6cbba0e6383f SHA512 b73edcea6af2832def4781754b49a69f4fd958c5f14aaf463279c6d76f4d954a450ff32ee2d43ffcee8824009f840252017fe2f4d834cf35324eae5ac971062d
+EBUILD ceph_exporter-4.0.1.ebuild 939 BLAKE2B 575f51efcfa7aa42de719f2ac2c8a1760afc5a2fd13f8cbc79ae2401dcaa78b72887938076b6fa6c8769dd4903d05b81f41585d77be872a3677c512ddc9747d5 SHA512 6797ad6fedb132e3caaf465f47a18411791a8f0c9d40a02cd3860c177a381d543775ac47af01a100052de47ea19aae6f4eee0bf90e3db60993f45f970010cbdd
+MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
diff --git a/app-metrics/ceph_exporter/ceph_exporter-2.0.7.ebuild b/app-metrics/ceph_exporter/ceph_exporter-2.0.7.ebuild
new file mode 100644
index 000000000000..c46790608ec0
--- /dev/null
+++ b/app-metrics/ceph_exporter/ceph_exporter-2.0.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/digitalocean/ceph_exporter
+MY_PV="${PV}-luminous"
+# This inherit is deliberate since this version of ceph_exporter isn't a
+# module.
+inherit golang-vcs-snapshot
+
+DESCRIPTION="Prometheus exporter that scrapes metrics from a ceph cluster"
+HOMEPAGE="https://github.com/digitalocean/ceph_exporter"
+SRC_URI="https://github.com/digitalocean/ceph_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	=sys-cluster/ceph-14*
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	pushd src/${EGO_PN} > /dev/null || die
+	GOPATH="${WORKDIR}/${P}" GO111MODULE=auto go build -o bin/ceph_exporter || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} > /dev/null || die
+	dobin bin/ceph_exporter
+	dodoc {README,CONTRIBUTING}.md exporter.yml
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/ceph_exporter /var/log/ceph_exporter
+	fowners ceph:ceph /var/lib/ceph_exporter /var/log/ceph_exporter
+}
diff --git a/app-metrics/ceph_exporter/ceph_exporter-3.0.0.ebuild b/app-metrics/ceph_exporter/ceph_exporter-3.0.0.ebuild
new file mode 100644
index 000000000000..ca3148b06ba0
--- /dev/null
+++ b/app-metrics/ceph_exporter/ceph_exporter-3.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/digitalocean/ceph_exporter
+MY_PV="${PV}-nautilus"
+# This inherit is deliberate since this version of ceph_exporter isn't a
+# module.
+inherit golang-vcs-snapshot
+
+DESCRIPTION="Prometheus exporter that scrapes metrics from a ceph cluster"
+HOMEPAGE="https://github.com/digitalocean/ceph_exporter"
+SRC_URI="https://github.com/digitalocean/ceph_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	=sys-cluster/ceph-15*
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	pushd src/${EGO_PN} > /dev/null || die
+	GOPATH="${WORKDIR}/${P}" GO111MODULE=auto go build -o bin/ceph_exporter || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} > /dev/null || die
+	dobin bin/ceph_exporter
+	dodoc {README,CONTRIBUTING}.md exporter.yml
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/ceph_exporter /var/log/ceph_exporter
+	fowners ceph:ceph /var/lib/ceph_exporter /var/log/ceph_exporter
+}
diff --git a/app-metrics/ceph_exporter/ceph_exporter-4.0.1.ebuild b/app-metrics/ceph_exporter/ceph_exporter-4.0.1.ebuild
new file mode 100644
index 000000000000..ef1c3479b0c1
--- /dev/null
+++ b/app-metrics/ceph_exporter/ceph_exporter-4.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Prometheus exporter that scrapes metrics from a ceph cluster"
+HOMEPAGE="https://github.com/digitalocean/ceph_exporter"
+SRC_URI="https://github.com/digitalocean/ceph_exporter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	=sys-cluster/ceph-16*
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-lang/go-1.18"
+
+src_compile() {
+	go build -o bin/ceph_exporter || die
+}
+
+src_install() {
+	dobin bin/ceph_exporter
+	dodoc {README,CONTRIBUTING}.md exporter.yml
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/ceph_exporter /var/log/ceph_exporter
+	fowners ceph:ceph /var/lib/ceph_exporter /var/log/ceph_exporter
+}
diff --git a/app-metrics/ceph_exporter/files/ceph_exporter.confd b/app-metrics/ceph_exporter/files/ceph_exporter.confd
new file mode 100644
index 000000000000..46da635f4264
--- /dev/null
+++ b/app-metrics/ceph_exporter/files/ceph_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for ceph exporter
+# command_args=""
diff --git a/app-metrics/ceph_exporter/files/ceph_exporter.initd b/app-metrics/ceph_exporter/files/ceph_exporter.initd
new file mode 100644
index 000000000000..59632972d1be
--- /dev/null
+++ b/app-metrics/ceph_exporter/files/ceph_exporter.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus ceph metrics exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-ceph}
+group=${group:-ceph}
+
+command="/usr/bin/ceph_exporter"
+command_background="true"
+output_log="/var/log/ceph_exporter/${RC_SVCNAME}.log"
+error_log="/var/log/ceph_exporter/${RC_SVCNAME}.log"
+start_stop_daemon_args="--user ${user} --group ${group}"
+
+depend() {
+	after net
+}
+
+start_pre() {
+	if [ ! -f "/etc/ceph/ceph.${user}.keyring" ]; then
+		eerror "keyring not found, exporter won't be able to connect to the cluster!"
+		exit 1
+	fi
+}
diff --git a/app-metrics/ceph_exporter/metadata.xml b/app-metrics/ceph_exporter/metadata.xml
new file mode 100644
index 000000000000..3b2a9c591010
--- /dev/null
+++ b/app-metrics/ceph_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>williamh@gentoo.org</email>
+<name>William Hubbs</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index f622a3d4ad69..08f3cbbc60bf 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -5,5 +5,5 @@ AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d2
 AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
 DIST collectd-5.12.0.tar.bz2 1902756 BLAKE2B 9567c55b47c0ea5b7836c0d858c16a637c4a2054486a9d9ca6cd9951a92381bdf4f49d7dc0be0c9c9131802120d0af2e542a3997f01484c89ba135b3c46db795 SHA512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70
 EBUILD collectd-5.12.0-r5.ebuild 19964 BLAKE2B 493a161c5b075a596b1e7e37a3ff441eeeb6bddb523677444117e647115883c2a3d7754a091bcc1c2ede8959181aa74951c397a9da1e0f8376d678da3a916017 SHA512 27cc2f269430f8ff4b4ddab8f62ac1531dfec5902f5e088b4a0f44a2dce6715f1606dfb3010ebcdd5ae9ff8bc5c897143e0a7f9453d6ff3d15abbb5021d31beb
-EBUILD collectd-5.12.0-r6.ebuild 19967 BLAKE2B 07a3c9083a3d6047149460d1f938760377500162d8e82dbfaf080a0b916a2ee6cabac5f5c219b05f84376805e4aa6d60d2a0a43e302b0b1fbfb9ec0ce6aedeff SHA512 c03f2c1c704e39fe072be1a57a379e9f0d5e360c11e8d39ae396eb6ea97d1aef45a31fbdd079bd359147b45774b7d2a58e9e31248d785313927072eae93827f8
+EBUILD collectd-5.12.0-r6.ebuild 19968 BLAKE2B 9953431a3cd0b7f76ca70ae704d098144ed1aefe603f6bd3a2e56626611231143a4e84be2a5e2dee12367187ac9944d473125b6f6bb90b9cfb33b7911c9708af SHA512 2c387a820fd1ce23384e7a1b97aaa24393ac6618e25a5dec31e9cf2538b4f0932aa9e6c28cb29a05b6fcd406bd1bf11c57b28139223ac4e2e8c4d0a7dec8f7a1
 MISC metadata.xml 1516 BLAKE2B eeea8862f3581f61af71394f5862cc88940d7831b3f0902e04fd4f7231cc07f100dc711222b8be6815e36cd683908861b61aeca5f2483623de0b29fd6dea0e11 SHA512 1e7aaf9759e726767b11e5be8e114fdb3b993c035db614f98d2fc31583bfb17951e8eb1c56eb8fdf56b375c05b97e67ce1efd7c4bd2e72ec60b0dfa0eaf67302
diff --git a/app-metrics/collectd/collectd-5.12.0-r6.ebuild b/app-metrics/collectd/collectd-5.12.0-r6.ebuild
index 0d9005d31c3f..608f269fb2c6 100644
--- a/app-metrics/collectd/collectd-5.12.0-r6.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r6.ebuild
@@ -4,8 +4,8 @@
 EAPI="7"
 
 JAVA_PKG_OPT_USE="collectd_plugins_java"
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7..9} )
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info lua-single \
 	multilib perl-functions python-single-r1 systemd tmpfiles udev