gentoo resync : 16.09.2020

7 files changed, 645 insertions, 0 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index fb001cf21819..8f5827ca50a2 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 9ea22b881a73..205d337ef208 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -4,5 +4,7 @@ AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc7
 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
 AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
 DIST collectd-5.11.0.tar.bz2 1851663 BLAKE2B b07c727ed553b3d11967da734a98fda753794be199377b08a2780b7d3f79acef345f160d930dda68cd12aa0949bbc0aee6ca5e7ae01e16a5e392a4a73e272d1d SHA512 87671545e3d01770c204ba4439265d1c0add6a105bf04ff02dc04db3731fd933d32ecb9b0dc15f2e504d70c3e421a64cf19728c897aa4fb1fda86e393ffc15bf
+DIST collectd-5.12.0.tar.bz2 1902756 BLAKE2B 9567c55b47c0ea5b7836c0d858c16a637c4a2054486a9d9ca6cd9951a92381bdf4f49d7dc0be0c9c9131802120d0af2e542a3997f01484c89ba135b3c46db795 SHA512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70
 EBUILD collectd-5.11.0-r3.ebuild 20164 BLAKE2B 7ea228cdeac7edb949b248a2fff3b4e3cd8aa05c10fbba6d5476d4c3bd1eea1b1e809c1669fdecb5d7fd62e7ed2c04d3ad978915f594638dcae8e096c648e189 SHA512 716d61fea0bc0a06f7fa6507f590b5375f0c9d88985060fa40cbb9cee3d6a47ee0ee9b258fd92302a157e21f6064ed941a68b86a37fa59e9167432b286efa48e
+EBUILD collectd-5.12.0.ebuild 20368 BLAKE2B e91d2a05a023568ef627cfd50dcb6db94d6361032bd53fe364a7e86c48c4eb4ce910aa4ac14815358be0198602ee84b8813d5f66f048d5346a7b405a33496122 SHA512 c6ef9967b5e5303df8e82fb4c1e3f590186706e2fd395d1349e53082369c2e08f6e63d1e54c497ee41ba4dbf13b9f737ead1467718782a38083c5dd04c13168d
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.12.0.ebuild b/app-metrics/collectd/collectd-5.12.0.ebuild
new file mode 100644
index 000000000000..b4afd4d953e8
--- /dev/null
+++ b/app-metrics/collectd/collectd-5.12.0.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
+
+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 kernel_Darwin kernel_FreeBSD kernel_linux 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)
+# 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 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="
+	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?			( dev-lang/lua:0= )
+	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_onewire?		( >=sys-fs/owfs-3.1:= )
+	collectd_plugins_oracle?		( dev-db/oracle-instantclient-basic )
+	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:= )
+
+	kernel_FreeBSD? (
+		collectd_plugins_disk?		( sys-libs/libstatgrab:= )
+		collectd_plugins_interface?	( sys-libs/libstatgrab:= )
+		collectd_plugins_load?		( sys-libs/libstatgrab:= )
+		collectd_plugins_memory?	( sys-libs/libstatgrab:= )
+		collectd_plugins_swap?		( sys-libs/libstatgrab:= )
+		collectd_plugins_users?		( sys-libs/libstatgrab:= )
+	)"
+
+# 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 )
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_java?			( >=virtual/jre-1.6 )
+	collectd_plugins_syslog?		( virtual/logger )
+	selinux?				( sec-policy/selinux-collectd )"
+
+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_python && python-single-r1_pkg_setup
+
+	enewgroup collectd
+	enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+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_FreeBSD; then
+		einfo "Enabling FreeBSD plugins."
+		myos_plugins=${bsd_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})"
+				# ... must we link against libstatgrab? Bug #541518
+				if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
+					einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
+					need_libstatgrab=1
+				fi
+			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
+
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
+
+	dodoc AUTHORS ChangeLog README
+
+	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/consul_exporter/Manifest b/app-metrics/consul_exporter/Manifest
index b2912a64cadf..7a8994b9c66c 100644
--- a/app-metrics/consul_exporter/Manifest
+++ b/app-metrics/consul_exporter/Manifest
@@ -2,6 +2,8 @@ AUX consul_exporter.confd 95 BLAKE2B 11a6f462b15c57e8b97504feb1dc8070c1c6f6b1cd8
 AUX consul_exporter.initd 445 BLAKE2B 4b0f58b838e02b46597734580b1b409c6b2426bbd92d88278d960cd29ae3fe018a7a945bb64ac324657b7a96f13d3ff996458d1c0571c6645e9270638129e6b6 SHA512 fe26e5ea6a272143f18567600580c3cf0f557299fd39353ebaf195feee5a916333be1a779b87716810a2dd77ec6e4fb78052dcf7996065723119369c1081e3df
 DIST consul_exporter-0.4.0.tar.gz 1107092 BLAKE2B 7f3d6ce797252e5895387d3bbd2a3ad41777bf4d98a4a7a4efc3e8caa0c71fd29be91675ae6fe304016f1cbf87ecf4ee3442b49d3bc08939d471326d4e5d4cd4 SHA512 faac0dfeec5b6fadf73ef68c0d24c059c89891918e498e145a50512b8c961764a02388b2bcce305e12ecf703fa76afdf5634b35aecbee0ac37926d78ce0b1e93
 DIST consul_exporter-0.6.0.tar.gz 617536 BLAKE2B eee039209fd4563c50c229bc18dd57ca31356a33bfba2644781f728eadbbaaee8ba594a1556ddb2dc4612ae7f4b27429b274fec5872a18c34d2a2cb8374839b1 SHA512 b941b8c15f20b696af3d121bb4de63b0cebd9ad1257f3cfa0dff7e7f3877c315567053042a7c88da5ae7830b9143e01751a6b561dcaff209f157be4cde1c4c49
+DIST consul_exporter-0.7.1.tar.gz 1583526 BLAKE2B 8c3211f1d75a767e18e47e16eef056dc07403abbd1cdb165a45b8d0830124e3e91b7dac67301e1b5d1ed564a94dfe9ff05c43267dbeb950ca1ff9b698ebd25ce SHA512 bc5ef24151d53abefd4b975f1ca3a18c98837c6c650c4bf6851fbc1299620db6e8e79a05d2355579ee78c1d2721ceec4bc946ee76d6bf7acdecb6f76957f5984
 EBUILD consul_exporter-0.4.0.ebuild 1268 BLAKE2B 686e280f1bd6c668a21cde74369fb7b3c0eec0650142d59af233d13277338c6a1b1756395e50d8d543450f86b8c2eb4374258f2d0bc79e5935c1915d8acbfb3c SHA512 21a16e6a2c2e5ba17db529ad3119bc5b1c16a4d1c11481e5f38df7e1783bdb5583758671ba6a0cc9ab363404393db05e71ce1f8b531bc1f5d530071cbe6113b4
 EBUILD consul_exporter-0.6.0.ebuild 1058 BLAKE2B c7ee1b2e8f9691e396d57a91cb056c87f978033c733af3eef70f3b0f189511ee4c14e2d81cf3ab662bb5badd4dbe09516e55e1be542ff6284e559e87eb7106f6 SHA512 f25b9f95a4da0f03f738176842929c6cf00ccbd9a5842fd95f3b73e8302d2efef5bfbf7ac6dfa350204eb9281e380fcdbc38ace8dd6e484afbf5d43ecaaa49f1
+EBUILD consul_exporter-0.7.1.ebuild 1060 BLAKE2B 62658136fa4b1b92c62108a698b53fdca951520e47139255abc786fc6344abd91fb5ad89e6f7321a3b251dabe647839d4f5bcfd7c51f1e19249415ed23744dac SHA512 95c7cb6f8e4ca89b53af552c3634b5ffea34e78825def22bfb9f5176c99e3b87cffffbdb7480cc928a2de0e6d6c13ff05e9a67c9650f76c54f91b814c0fa1aca
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/consul_exporter/consul_exporter-0.7.1.ebuild b/app-metrics/consul_exporter/consul_exporter-0.7.1.ebuild
new file mode 100644
index 000000000000..b081f85524e7
--- /dev/null
+++ b/app-metrics/consul_exporter/consul_exporter-0.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+CONSUL_EXPORTER_COMMIT=ae46e2e
+MY_PV="v${PV/_rc/-rc.}"
+
+DESCRIPTION="Prometheus exporter for consul metrics"
+HOMEPAGE="https://github.com/prometheus/consul_exporter"
+SRC_URI="https://github.com/prometheus/consul_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/promu"
+COMMON_DEPEND="acct-group/consul_exporter
+	acct-user/consul_exporter"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/{{.Revision}}/${CONSUL_EXPORTER_COMMIT}/" \
+		-e "s/{{.Version}}/${PV}/" \
+		.promu.yml || die "Sed failed"
+}
+
+src_compile() {
+	promu build -v || die
+}
+
+src_install() {
+	newbin ${P} ${PN}
+	dodoc {README,CONTRIBUTING}.md
+	keepdir /var/log/consul_exporter
+	fowners ${PN}:${PN} /var/log/consul_exporter
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/mongodb_exporter/Manifest b/app-metrics/mongodb_exporter/Manifest
index c689d669c935..4aef5dd89809 100644
--- a/app-metrics/mongodb_exporter/Manifest
+++ b/app-metrics/mongodb_exporter/Manifest
@@ -1,7 +1,9 @@
 AUX mongodb_exporter.confd 94 BLAKE2B 25c98466e22b137a33f347d2c8c53fb15e0727423b6e0d8d804547a9b4220ca1c742cfdea6f6afbbb1fc6a38adafda56d1d372b5175bf3293ee5094ba2c835d5 SHA512 3ead6c80528042a436d8b0d013998e410c9a4216f532876766b7631187051b29b37bc4d834dcdc1483b1575dfa3b975baaef03e0637e63e279a5fbd9b3b75073
 AUX mongodb_exporter.initd 591 BLAKE2B bc176954356a3633fc9a3ca314803e1149c14767f11da5d3d6c29cef0e0455b6e61571ca85b19628a5d6e61c653c2de37b16bed34d0d36e51aee1c3fc2ff1c7e SHA512 d81430cce189c5655c2432e5133826e73a92f04f33b3a4d632d0bcf27dc31d9fc2fcaf7a3322e9c6905606770be032647b5beaa1561c967522a4f331f43fe939
 DIST mongodb_exporter-0.11.0.tar.gz 2638227 BLAKE2B c8d6cde2fcc40bcdbbd84276d78e8ee2012a0237637ce51a67d458d030a4f8b8d5b72b3eb434cbbfd403aa7481ed76651b2af181b3785abf913ae6cfd4f2faf0 SHA512 08c2f889c5f503804af35e41220729fa9fae3226cfb89642964edc8c391fe8209cd6f8246b0e904711a63a1c0cf613d5666373035d94db537840ae9ac561c2cf
+DIST mongodb_exporter-0.11.1.tar.gz 2640277 BLAKE2B 8ae0418466462d4dfebe97d48b47d0a163435f1776bceb6d35ab50d98cefa0bf737f57fc74aadebf16c285e2dd63fe2e4719571db7c5a9f942e740dab7509d91 SHA512 81a9c5877bba6e85fcdcc9e3781bbec82b255710e8292ea377ea9c9234526b7ad521350f8bd36ae7773f76f40b650cd724d552020e17feb61210ed6197be5172
 DIST mongodb_exporter-0.6.2.tar.gz 1296198 BLAKE2B 4cd04b5e69788f2bbe3e87eafe6a7cf4f0a2e72abff4784176299e46943eac2219141beed2f8d11cc8a2458737456d8edaed42a5392bedd017e85315dc75ba1d SHA512 52c1464af82c09fc79338e805e62936d4da8131cea1bb6608500fa36a2d4069676eace5da0ed1b14d82de9d626be301b42c7bc1d5c620bbecb47ae9a350ecd65
 EBUILD mongodb_exporter-0.11.0.ebuild 784 BLAKE2B db8651fece4fd52be70fb02531b9a00b9d5ec1181fa101a0efcec452d34cc970ae106e78c41b1310cadd6e29a9843187119d42e639fd5c34b9082c0420260cef SHA512 6183afa9cad01b0033a14c6e76551ac13304e8d05bfb1cfae807c9fdd9f0436663c916ae77f742e42b3c98d772cda0fd32bd7d586b79b24d2d6a353af82b73c5
+EBUILD mongodb_exporter-0.11.1.ebuild 955 BLAKE2B 2c612a3c98cc043a218fa447f47ef94ea7602a7c79524eb9cb28ca9f4b7db523470c92b394af93eb9fba8a0abb1b214470f85ab4567b63bc903001184acee622 SHA512 3ce9e8bc24be0597b3af0caccdd330bf16f0a3603488cf6a7825c942d7fae9adf0c21c35bac7f5b19b0849a1f07dfc623ac409c1beb716c331efc6f8f2f66981
 EBUILD mongodb_exporter-0.6.2-r1.ebuild 1083 BLAKE2B 4db266988c99c5698bf89e6455a622efed443ecabc51026c41ba7300482701ab4e8e2535e726c1c707f86d2448a49162dafbb634fe156c449fad422e87392364 SHA512 6619382b4b71fe31acdb68a032d64c41212aec4645d0a694d0de97299a2cc5da4efafb944d5a18e2b51faf23429a043a001b1a28c9ad60e2141918684484b4ae
 MISC metadata.xml 337 BLAKE2B fa3533a2b316cff8f853637e56b468ef32c28af3b61584b98119b51bc3c9fcef189a951dcdf64867fd5f9de15f8dbbe145891fcea84e77dd43cb059e2294fc8e SHA512 95f1209123d7cff4bc1765db88a5dbd91248a310a70f7637c71e088a1458db54b4d00d83db47899062d36036a9951f60be004104b7dd3f22f72564de7662356b
diff --git a/app-metrics/mongodb_exporter/mongodb_exporter-0.11.1.ebuild b/app-metrics/mongodb_exporter/mongodb_exporter-0.11.1.ebuild
new file mode 100644
index 000000000000..30b674765a5d
--- /dev/null
+++ b/app-metrics/mongodb_exporter/mongodb_exporter-0.11.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+COMMIT=f5e8ebea31d6fa128ae3a2fb1b747fdf4b782b2b
+BRANCH=0.11.0
+
+DESCRIPTION="Prometheus exporter for MongoDB"
+HOMEPAGE="https://github.com/percona/mongodb_exporter"
+SRC_URI="https://github.com/percona/mongodb_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 AGPL-3 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/mongodb_exporter
+	acct-user/mongodb_exporter"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	GOFLAGS="${GOFLAGS} -mod=vendor" emake \
+		TRAVIS_TAG="${PV}" \
+		APP_REVISION=${COMMIT} \
+		TRAVIS_BRANCH=${BRANCH} \
+		build
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc {README,CHANGELOG}.md
+	keepdir /var/log/mongodb_exporter
+	fowners ${PN}:${PN} /var/log/mongodb_exporter
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}