gentoo resync : 29.12.2022

5 files changed, 10 insertions, 563 deletions

diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 08f3cbbc60bf..857ebcfc34df 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -1,9 +1,8 @@
 AUX collectd-5.11.0-libsigrok-0.4+.patch 5447 BLAKE2B 6de12feb7226ae3a16a89f3282b54d363cc64e176fe4f9cc9a6bfef0874bca0447a8d21689f8d3c91b2840d12ba4abd3c6f38cfc0b4e885582cc42c81865a1f8 SHA512 a7c99664f632eaff35eef18a0bd8da5bfa39812d223eb6449acd0fa871c5d43a401ed48b1003275a2ae0362b92c69ab52b46af39fa69dd7e4cc2b2969dc4b2de
 AUX collectd.confd-r2 2005 BLAKE2B 1f68f769d06b1f486c33f76060cf13f784d5b45ff7a04c209a6e23b8a9af94b3db54744532c74f8c95dae4fccb7f89a4e9a5f5353575c7099da0a2db3c1f8f37 SHA512 89fd2d60e1e0c7f4145d0791d65e29821e7f585015f1ba6bf94f80f47ffcefb7bdd75b2ba3e0acb18f0ee27f64100b3c4737ad30ce516785571d277a6923666f
-AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc75e9cb36e1f2dba85b3b2b587336f976059af165ae89333d681ffe0cf53bbcd8098eaeff75228cb80b68 SHA512 8f0a73f0f2b2280c0f2e35894a9dfa38af937930eb090eab52cbe81089a146bd974f6a2a3062b7147611f9c13b770a945a1a9228a026405d31578e27a3fd3b80
+AUX collectd.initd-r3 1877 BLAKE2B 8e81c314abdd366a7583dd18bdad10c9d7da14589c030b9c3121090f9ee74b300f1bb919168117ce84aec3af6f0708f14fa6a71c5be049b099d5221656ac7dac SHA512 0dd1541bf6a17f7b26e8671ba236b11a599c07b30be6700d2e37ee2d6f59114d95c83b3ca8ddcb98d6a8e0d7321d994682411aff815c1b1f792314a6a17de4b5
 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
 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 19968 BLAKE2B 9953431a3cd0b7f76ca70ae704d098144ed1aefe603f6bd3a2e56626611231143a4e84be2a5e2dee12367187ac9944d473125b6f6bb90b9cfb33b7911c9708af SHA512 2c387a820fd1ce23384e7a1b97aaa24393ac6618e25a5dec31e9cf2538b4f0932aa9e6c28cb29a05b6fcd406bd1bf11c57b28139223ac4e2e8c4d0a7dec8f7a1
-MISC metadata.xml 1516 BLAKE2B eeea8862f3581f61af71394f5862cc88940d7831b3f0902e04fd4f7231cc07f100dc711222b8be6815e36cd683908861b61aeca5f2483623de0b29fd6dea0e11 SHA512 1e7aaf9759e726767b11e5be8e114fdb3b993c035db614f98d2fc31583bfb17951e8eb1c56eb8fdf56b375c05b97e67ce1efd7c4bd2e72ec60b0dfa0eaf67302
+EBUILD collectd-5.12.0-r7.ebuild 19947 BLAKE2B c0bcd824576ecba911be3c0b2ff58aca8f64281a986bfa4282d853a78046a1a36e9abd9b33e5c97d16dcc7c316690e75f5751a2d57022b4c658c9091098e61d2 SHA512 27d4da2e232487788bdab8982b32d0dfe514176fa90ca1090d65d711424833a2f484f831be149a40a5758d10e31e74efa9987d1a6e66a85d8dffe44774fb80f4
+MISC metadata.xml 1515 BLAKE2B 318f796bfacb0e1facbd60f80fc9176e24f06661fc4dce4acda3a218aab10766231566a9ae58f9985770513fb53a52e9ea5e985aba0bcff62c042c75fb662c70 SHA512 4c886d89143d2862a3d915e5b0ef14382c76d758a306fa9971a762fdae400086175c470045e85775f028947156a4bb40a09bd9810c56dda08662e835cba3b45c
diff --git a/app-metrics/collectd/collectd-5.12.0-r5.ebuild b/app-metrics/collectd/collectd-5.12.0-r5.ebuild
deleted file mode 100644
index 31e9c7f7be72..000000000000
--- a/app-metrics/collectd/collectd-5.12.0-r5.ebuild
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-JAVA_PKG_OPT_USE="collectd_plugins_java"
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info lua-single \
-	multilib perl-functions python-single-r1 systemd tmpfiles udev
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
-
-HOMEPAGE="https://collectd.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm x86"
-IUSE="contrib debug java perl selinux static-libs udev xfs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors:  Requires libIOKit
-# amqp1:          Requires libqpid-proton
-# aquaero:        Requires aerotools-ng/libaquaero5
-# barometer:      Requires libi2c (i2c_smbus_read_i2c_block_data)
-# dpdkevents:     Requires dpdk
-# dpdkstat:       Requires dpdk
-# dpdk_telemetry: Requires dpdk
-# grpc:           Requires libgrpc
-# intel_pmu:      Requires libjevents (pmu-tools)
-# intel_rdt:      Requires libpqos from intel-cmt-cat project
-# lpar:           Requires libperfstat (AIX only)
-# mic:            Requires Intel Many Integrated Core Architecture API
-#                 (part of Intel's  Xeon Phi software)
-# netapp:         Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
-# onewire:        Requires sys-fs/owfs which was removed from repository
-# pf:             Requires BSD packet filter
-# pinba:          Requires MySQL Pinba engine (http://pinba.org/)
-# redfish:        Requires libredfish
-# tape:           Requires libkstat (Solaris only)
-# tokyotyrant:    Requires tokyotyrant
-# write_riemann:  Requires riemann-c-client
-# xmms:           Requires libxmms (v1)
-# zone:           Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors amqp1 aquaero barometer
-	dpdkevents dpdkstat dpdk_telemetry grpc intel_pmu intel_rdt lpar
-	mic netapp onewire pf pinba redfish tape tokyotyrant write_riemann
-	xmms zone"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
-	buddyinfo capabilities ceph cgroups check_uptime chrony connectivity
-	conntrack contextswitch cpu cpufreq cpusleep csv curl curl_json
-	curl_xml dbi df disk dns drbd email entropy ethstat exec fhcount
-	filecount fscache gmond gps gpu_nvidia hddtemp hugepages interface ipc
-	ipmi iptables ipvs irq java lua load logfile logparser log_logstash
-	madwifi match_empty_counter match_hashed match_regex match_timediff
-	match_value mbmon mcelog md memcachec memcached memory modbus mqtt
-	multimeter mysql netlink network network nfs nginx notify_desktop
-	notify_email notify_nagios ntpd numa nut olsrd onewire openldap
-	openvpn oracle ovs_events ovs_stats pcie_errors perl ping postgresql
-	powerdns procevent processes protocols python redis routeros
-	rrdcached rrdtool sensors serial sigrok slurm smart snmp snmp_agent
-	statsd swap synproxy sysevent syslog table tail tail_csv
-	target_notification target_replace target_scale target_set tcpconns
-	teamspeak2 ted thermal threshold turbostat ubi unixsock uptime users
-	uuid varnish virt vmem vserver wireless write_graphite write_http
-	write_influxdb_udp write_kafka write_log write_mongodb write_prometheus
-	write_redis write_sensu write_stackdriver write_syslog write_tsdb
-	xencpu zfs_arc zookeeper"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
-
-COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
-
-for plugin in ${COLLECTD_ALL_PLUGINS}; do
-	IUSE="${IUSE} collectd_plugins_${plugin}"
-done
-unset plugin
-
-# Now come the dependencies.
-
-COMMON_DEPEND="
-	acct-group/collectd
-	acct-user/collectd
-	dev-libs/libgcrypt:=
-	dev-libs/libltdl:0=
-	sys-libs/libcap
-	perl?					( dev-lang/perl:=[ithreads] )
-	udev?					( virtual/udev )
-	xfs?					( sys-fs/xfsprogs )
-	collectd_plugins_amqp?			( net-libs/rabbitmq-c )
-	collectd_plugins_apache?		( net-misc/curl:0= )
-	collectd_plugins_ascent?		( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_bind?			( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_ceph?			( dev-libs/yajl:= )
-	collectd_plugins_capabilities?		( dev-libs/jansson net-libs/libmicrohttpd:= )
-	collectd_plugins_connectivity?		( dev-libs/yajl:= net-libs/libmnl )
-	collectd_plugins_curl?			( net-misc/curl:0= )
-	collectd_plugins_curl_json?		( net-misc/curl:0= dev-libs/yajl:= )
-	collectd_plugins_curl_xml?		( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_dbi?			( dev-db/libdbi )
-	collectd_plugins_dns?			( net-libs/libpcap )
-	collectd_plugins_gmond?			( sys-cluster/ganglia )
-	collectd_plugins_gps?			( sci-geosciences/gpsd:= )
-	collectd_plugins_gpu_nvidia?		( dev-util/nvidia-cuda-toolkit )
-	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
-	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13:0= )
-	collectd_plugins_log_logstash?		( dev-libs/yajl:= )
-	collectd_plugins_lua?			( ${LUA_DEPS} )
-	collectd_plugins_memcachec?		( dev-libs/libmemcached )
-	collectd_plugins_modbus?		( dev-libs/libmodbus )
-	collectd_plugins_mqtt?			( app-misc/mosquitto )
-	collectd_plugins_mysql?			( dev-db/mysql-connector-c:= )
-	collectd_plugins_netlink?		( net-libs/libmnl )
-	collectd_plugins_nginx?			( net-misc/curl:0= )
-	collectd_plugins_notify_desktop?	( x11-libs/libnotify )
-	collectd_plugins_notify_email?		( net-libs/libesmtp:= )
-	collectd_plugins_nut?			( >=sys-power/nut-2.7.2-r2 )
-	collectd_plugins_openldap?		( net-nds/openldap:= )
-	collectd_plugins_oracle?		( dev-db/oracle-instantclient[sdk] )
-	collectd_plugins_ovs_events?		( dev-libs/yajl:= )
-	collectd_plugins_ovs_stats?		( dev-libs/yajl:= )
-	collectd_plugins_perl?			( dev-lang/perl:=[ithreads] )
-	collectd_plugins_ping?			( net-libs/liboping )
-	collectd_plugins_postgresql?		( dev-db/postgresql:= )
-	collectd_plugins_procevent?		( dev-libs/yajl:= )
-	collectd_plugins_python?		( ${PYTHON_DEPS} )
-	collectd_plugins_redis?			( dev-libs/hiredis:= )
-	collectd_plugins_routeros?		( net-libs/librouteros )
-	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
-	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
-	collectd_plugins_sensors?		( sys-apps/lm-sensors:= )
-	collectd_plugins_sigrok?		( >=sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
-	collectd_plugins_slurm?			( sys-cluster/slurm )
-	collectd_plugins_smart?			( dev-libs/libatasmart:0= )
-	collectd_plugins_snmp?			( net-analyzer/net-snmp:= )
-	collectd_plugins_snmp_agent?		( net-analyzer/net-snmp:= )
-	collectd_plugins_sysevent?		( dev-libs/yajl:= )
-	collectd_plugins_varnish?		( www-servers/varnish:= )
-	collectd_plugins_virt?			( app-emulation/libvirt:= dev-libs/libxml2:2= )
-	collectd_plugins_write_http?		( net-misc/curl:0= dev-libs/yajl:= )
-	collectd_plugins_write_kafka?		( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
-	collectd_plugins_write_mongodb?		( >=dev-libs/mongo-c-driver-1.8.2:= )
-	collectd_plugins_write_prometheus?	( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= )
-	collectd_plugins_write_redis?		( dev-libs/hiredis:= )
-	collectd_plugins_write_stackdriver?	( net-misc/curl:0= dev-libs/yajl:= )
-	collectd_plugins_xencpu?		( app-emulation/xen-tools:= )
-"
-
-# FIXME: should virtual/jdk be here as well?
-BDEPEND="virtual/pkgconfig"
-
-# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
-DEPEND="${COMMON_DEPEND}
-	collectd_plugins_iptables?		( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
-	collectd_plugins_java?			( >=virtual/jdk-1.6 )"
-
-RDEPEND="${COMMON_DEPEND}
-	collectd_plugins_java?			( >=virtual/jre-1.6 )
-	collectd_plugins_syslog?		( virtual/logger )
-	selinux?				( sec-policy/selinux-collectd )"
-
-REQUIRED_USE="
-	collectd_plugins_lua?			( ${LUA_REQUIRED_USE} )
-	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
-	collectd_plugins_smart?			( udev )
-	contrib?				( perl )"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.11.0-libsigrok-0.4+.patch )
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plugin name> <kernel_options> <severity>
-# kernel_options is a list of kernel configurations options; the check tests whether at least
-#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
-#   is emitted.
-collectd_plugin_kernel_linux() {
-	local multi_opt opt
-	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
-		if use collectd_plugins_${1}; then
-			for opt in ${2}; do
-				if linux_chkconfig_present ${opt}; then
-					return 0;
-				fi
-			done
-			multi_opt=${2//\ /\ or\ }
-			case ${3} in
-				(info)
-					elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(warn)
-					ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(error)
-					eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(*)
-					die "function collectd_plugin_kernel_linux called with invalid third argument"
-				;;
-			esac
-		fi
-	fi
-}
-
-collectd_linux_kernel_checks() {
-	if ! linux_chkconfig_present PROC_FS; then
-		ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
-	fi
-
-	if ! linux_chkconfig_present SYSFS; then
-		ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
-	fi
-
-	# battery.c: /proc/pmu/battery_%i
-	# battery.c: /proc/acpi/battery
-	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-	# cgroups.c: /sys/fs/cgroup/
-	collectd_plugin_kernel_linux cgroups CGROUPS warn
-
-	# cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
-	collectd_plugin_kernel_linux cpufreq SYSFS warn
-	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
-
-	# drbd.c: /proc/drbd
-	collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
-
-	# conntrack.c: /proc/sys/net/netfilter/*
-	collectd_plugin_kernel_linux conntrack NETFILTER warn
-
-	# fscache.c: /proc/fs/fscache/stats
-	collectd_plugin_kernel_linux fscache FSCACHE warn
-
-	# nfs.c: /proc/net/rpc/nfs
-	# nfs.c: /proc/net/rpc/nfsd
-	collectd_plugin_kernel_linux nfs NFS_COMMON warn
-
-	# serial.c: /proc/tty/driver/serial
-	# serial.c: /proc/tty/driver/ttyS
-	collectd_plugin_kernel_linux serial SERIAL_CORE warn
-
-	# swap.c: /proc/meminfo
-	collectd_plugin_kernel_linux swap SWAP warn
-
-	# thermal.c: /proc/acpi/thermal_zone
-	# thermal.c: /sys/class/thermal
-	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
-
-	# turbostat.c: /dev/cpu/%d/msr
-	collectd_plugin_kernel_linux turbostat X86_MSR warn
-
-	# vmem.c: /proc/vmstat
-	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
-	# vserver.c: /proc/virtual
-	collectd_plugin_kernel_linux vserver VSERVER warn
-
-	# uuid.c: /sys/hypervisor/uuid
-	collectd_plugin_kernel_linux uuid SYSFS info
-
-	# wireless.c: /proc/net/wireless
-	collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
-
-	# zfs_arc.c: /proc/spl/kstat/zfs/arcstats
-	collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if linux_config_exists; then
-			einfo "Checking your linux kernel configuration:"
-			collectd_linux_kernel_checks
-		else
-			elog "Cannot find a linux kernel configuration. Continuing anyway."
-		fi
-	fi
-
-	if use collectd_plugins_java; then
-		java-pkg-opt-2_pkg_setup
-	fi
-
-	use collectd_plugins_lua && lua-single_pkg_setup
-	use collectd_plugins_python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# There's some strange prefix handling in the default config file, resulting in
-	# paths like "/usr/var/..."
-	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
-
-	# Adjust upstream's systemd unit
-	#   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
-	#   - Add User=collectd to run collectd as user "collectd" per default
-	sed -i \
-		-e '/^EnvironmentFile=.*/d' \
-		-e '/^\[Service\]/aUser=collectd' \
-		contrib/systemd.${PN}.service || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
-	# should work independent of the operating system.
-
-	local linux_plugins="barometer battery cpu cpufreq disk
-		drbd entropy ethstat hugepages interface iptables
-		ipvs irq ipc load memory md netlink nfs numa processes
-		serial swap tcpconns thermal turbostat users vmem wireless
-		zfc_arc"
-
-	local need_libstatgrab=0
-	local libstatgrab_plugins="cpu disk interface load memory swap users"
-	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
-
-	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
-
-	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
-	local myos_plugins=""
-	if use kernel_linux; then
-		einfo "Enabling Linux plugins."
-		myos_plugins=${linux_plugins}
-	elif use kernel_Darwin; then
-		einfo "Enabling Darwin plugins."
-		myos_plugins=${darwin_plugins}
-	fi
-
-	local myconf="--disable-werror"
-
-	# Do we debug?
-	myconf+=" $(use_enable debug)"
-
-	# udev support?
-	# Required for smart plugin via REQUIRED_USE; Optional for disk plugin
-	if use udev; then
-		myconf+=" --with-libudev"
-	else
-		myconf+=" --without-libudev"
-	fi
-
-	local plugin
-
-	# Disable what needs to be disabled.
-	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
-		if [[ "${plugin}" == 'dpdkstat' ]]; then
-			myconf+=" --without-libdpdk"
-		else
-			myconf+=" --disable-${plugin}"
-		fi
-	done
-
-	# Set enable/disable for each single plugin.
-	for plugin in ${COLLECTD_ALL_PLUGINS}; do
-		if has ${plugin} ${osdependent_plugins}; then
-			# plugin is os-dependent ...
-			if has ${plugin} ${myos_plugins}; then
-				# ... and available in this os
-				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-			else
-				# ... and NOT available in this os
-				if use collectd_plugins_${plugin}; then
-					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
-					ewarn "kernel. Disabling it automatically."
-				fi
-				myconf+=" --disable-${plugin}"
-			fi
-		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
-			if use collectd_plugins_perl && ! use perl; then
-				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
-				myconf+= --disable-perl
-			else
-				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-			fi
-		else
-			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-		fi
-	done
-
-	if [ "${need_libstatgrab}" -eq 1 ]; then
-		myconf+=" --with-libstatgrab"
-	else
-		myconf+=" --without-libstatgrab"
-	fi
-
-	# JAVA_HOME is set by eclasses.
-	if use collectd_plugins_java; then
-		myconf+=" --with-java"
-	fi
-
-	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
-	# lots of libs are only needed for plugins, if they are disabled, also disable the lib
-	use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
-	use collectd_plugins_openldap || myconf+=" --with-libldap=no"
-	use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
-	use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
-	use collectd_plugins_gps      || myconf+=" --with-libgps=no"
-
-	if use collectd_plugins_gpu_nvidia; then
-		myconf+=" --with-cuda=${EPREFIX}/opt/cuda"
-	else
-		myconf+=" --with-cuda=no"
-	fi
-
-	if use perl; then
-		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-	else
-		myconf+=" --without-perl-bindings"
-	fi
-
-	# No need for v5upgrade
-	myconf+=" --disable-target_v5upgrade"
-
-	# Python
-	if use collectd_plugins_python; then
-		myconf+=" --with-libpython=yes"
-		export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
-	else
-		myconf+=" --with-libpython=no"
-	fi
-
-	# XFS support
-	myconf+=" $(use_enable xfs)"
-
-	# Finally, run econf.
-	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
-		$(use_enable static-libs static) \
-		--localstatedir=/var ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	perl_delete_localpod
-
-	find "${ED}"/usr/ -name "*.la" -delete || die
-
-	if use collectd_plugins_java; then
-		java-pkg_regjar "${ED}"/usr/share/${PN}/java/*.jar
-	fi
-
-	if use collectd_plugins_disk && use udev; then
-		udev_newrules contrib/99-storage-collectd.rules 60-persistent-storage-collectd.rules
-	fi
-
-	fowners root:collectd /etc/collectd.conf
-	fperms u=rw,g=r,o= /etc/collectd.conf
-
-	einstalldocs
-
-	if use contrib; then
-		insinto /usr/share/${PN}
-		doins -r contrib
-	fi
-
-	keepdir /var/lib/${PN}
-	fowners collectd:collectd /var/lib/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":#PIDFile     "/run/collectd.pid":' "${ED}"/etc/collectd.conf || die
-	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/run/collectd/collectd.socket":' "${ED}"/etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${ED}"/etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${ED}"/etc/collectd.conf || die
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	if use filecaps; then
-		local caps=()
-		use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
-		use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
-		use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
-		use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
-
-		if use collectd_plugins_dns || use collectd_plugins_ping; then
-			caps+=('CAP_NET_RAW')
-		fi
-
-		if use collectd_plugins_turbostat || use collectd_plugins_smart; then
-			caps+=('CAP_SYS_RAWIO')
-		fi
-
-		if [ ${#caps[@]} -gt 0 ]; then
-			local caps_str=$(IFS=","; echo "${caps[*]}")
-			fcaps ${caps_str} usr/sbin/collectd
-			elog "Capabilities for ${EROOT}/usr/sbin/collectd set to:"
-			elog "  ${caps_str}+EP"
-			elog
-
-			local systemd_unit="$(systemd_get_systemunitdir)/collectd.service"
-			if [[ -e "${systemd_unit}" ]]; then
-				caps_str="${caps[*]}"
-				sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
-					die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
-
-				elog "CapabilityBoundingSet in '${systemd_unit}'"
-				elog "updated to match capabilities set above."
-				elog
-			else
-				if has_version "sys-apps/systemd"; then
-					# Bug 596852
-					ewarn "Failed to update CapabilityBoundingSet in '${systemd_unit}'"
-					ewarn "because unit was not found. Please file a bug about this."
-				fi
-			fi
-		fi
-	fi
-
-	elog "Note: Collectd is only the collector."
-	elog "      You need to install 'data' sources (applications) locally or"
-	elog "      remotely on your own."
-
-	elog
-	elog "Collectd is configured to run as unprivileged user by default."
-	elog "You may want to revisit the configuration."
-	elog
-
-	if use collectd_plugins_email; then
-		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
-	fi
-
-	if use collectd_plugins_smart; then
-		elog ""
-		elog "If you are using smart plugin and don't run collectd as root make sure"
-		elog "that the collectd user is allowed to access the disk you want to monitor"
-		elog "(can be done via udev rule for example) and that collectd has the required"
-		elog "capabilities set (which is the default when package was emerged with"
-		elog "'filecaps' USE flag set)."
-	fi
-
-	if use contrib; then
-		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
-		elog "dev-perl/CGI, dev-perl/Config-General and net-analyzer/rrdtool[perl] to be installed."
-	fi
-}
diff --git a/app-metrics/collectd/collectd-5.12.0-r6.ebuild b/app-metrics/collectd/collectd-5.12.0-r7.ebuild
index 608f269fb2c6..1b25586eb8fc 100644
--- a/app-metrics/collectd/collectd-5.12.0-r6.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r7.ebuild
@@ -5,10 +5,9 @@ EAPI="7"
 
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info lua-single \
-	multilib perl-functions python-single-r1 systemd tmpfiles udev
+inherit autotools fcaps java-pkg-opt-2 linux-info lua-single perl-functions python-single-r1 systemd tmpfiles udev
 
 DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
 
@@ -17,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 x86"
 IUSE="contrib debug java perl selinux static-libs udev xfs"
 
 # The plugin lists have to follow here since they extend IUSE
@@ -464,7 +463,7 @@ src_install() {
 	keepdir /var/lib/${PN}
 	fowners collectd:collectd /var/lib/${PN}
 
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
 	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
 
diff --git a/app-metrics/collectd/files/collectd.initd-r2 b/app-metrics/collectd/files/collectd.initd-r3
index 0a4ca71494f6..aa3396d5a451 100644
--- a/app-metrics/collectd/files/collectd.initd-r2
+++ b/app-metrics/collectd/files/collectd.initd-r3
@@ -14,6 +14,7 @@ COLLECTD_OPTS=${COLLECTD_OPTS:-""}
 command="/usr/sbin/collectd"
 command_args="${COLLECTD_OPTS} -C \"${COLLECTD_CONFIGFILE}\" -f"
 command_background=true
+command_group="${COLLECTD_GROUP}"
 command_user="${COLLECTD_USER}"
 start_stop_daemon_args="${COLLECTD_SSDARGS} --nice ${COLLECTD_NICELEVEL}"
 pidfile="${COLLECTD_PIDFILE}"
diff --git a/app-metrics/collectd/metadata.xml b/app-metrics/collectd/metadata.xml
index fe866f048665..47eeb1f98f50 100644
--- a/app-metrics/collectd/metadata.xml
+++ b/app-metrics/collectd/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<longdescription lang="en">
 		Collectd gathers statistics about the system it is running on and stores this