gentoo resync : 07.01.2022

4 files changed, 8 insertions, 40 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index c5ece9882992..82b1c3521aaf 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index f8d89fb2c94c..e7624886fce8 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -4,6 +4,6 @@ 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.12.0.tar.bz2 1902756 BLAKE2B 9567c55b47c0ea5b7836c0d858c16a637c4a2054486a9d9ca6cd9951a92381bdf4f49d7dc0be0c9c9131802120d0af2e542a3997f01484c89ba135b3c46db795 SHA512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70
-EBUILD collectd-5.12.0-r1.ebuild 20681 BLAKE2B 365ef86ade1d69d581f15faa3ff5cee1794fe9085ada44944004343fd45f651ef597295453bbec37e1c09629fa9283894bc50059beebdbae4c9fb05865e54be6 SHA512 59c632565bb25d9287da27f75d71f56135ff89ee7a65413e83a2a5f21190c2921ddc1e8c49eba6c763dffa6b70d5fb63d770474c04730cb22bf856bcc5eb415d
-EBUILD collectd-5.12.0-r2.ebuild 20684 BLAKE2B b786be66bd9f7bb553a279ca900a23ecc2d4c23cd681600699e4bf4d2a1971d9d4590712176eee3d9965b9ebac30d774d38bbefa73ef4cadb3ebdf78834710ef SHA512 399a2b5d3473d508cca930bd05b52a61c5fcc70293f7cee2ba90c7103a199c7e7a540c5d18607b2d9b85211e4e18a400fc5a9b1442cbddfb81d0df2f2f1a5017
+EBUILD collectd-5.12.0-r1.ebuild 19959 BLAKE2B 93a3e469de3f25b5036cd3587c4795288a254a534fb70a5cc8f920de0003a694fddb2b4754e33d3869c3af5b4f78fa86e1aae030e743c8701c2c2e5f462fe745 SHA512 6ada24211e4b89301819cd52ca53e2ce09775852dab2053cdde5e9073722017e34a0e39ad530f51fb30ed52dc3aab70530ac18f2a5aa984591e6212a14f4eeb9
+EBUILD collectd-5.12.0-r2.ebuild 19962 BLAKE2B 851ad74ab762240dc9bd8362abaf791b224c2a250be54fe28f4ab1dcb7400a30bc104ffcd4c79bda611f3a0349025fa7ae97c10257c9988fdaa6c50721a6fe95 SHA512 a63ecf07352019289ef000e86c0bed839846ddd235f90d82e0545fc9ef37720d335ceba2540b08d30d9c89a00bee92c2f7174c690149e39cdbe7abbec67ab0a3
 MISC metadata.xml 1516 BLAKE2B eeea8862f3581f61af71394f5862cc88940d7831b3f0902e04fd4f7231cc07f100dc711222b8be6815e36cd683908861b61aeca5f2483623de0b29fd6dea0e11 SHA512 1e7aaf9759e726767b11e5be8e114fdb3b993c035db614f98d2fc31583bfb17951e8eb1c56eb8fdf56b375c05b97e67ce1efd7c4bd2e72ec60b0dfa0eaf67302
diff --git a/app-metrics/collectd/collectd-5.12.0-r1.ebuild b/app-metrics/collectd/collectd-5.12.0-r1.ebuild
index 1c16631dc941..658cbb79591d 100644
--- a/app-metrics/collectd/collectd-5.12.0-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,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"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+IUSE="contrib debug java perl selinux static-libs udev xfs"
 
 # The plugin lists have to follow here since they extend IUSE
 
@@ -150,15 +150,7 @@ COMMON_DEPEND="
 	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:= )
-	)"
+"
 
 # FIXME: should virtual/jdk be here as well?
 BDEPEND="virtual/pkgconfig"
@@ -337,9 +329,6 @@ src_configure() {
 	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}
@@ -376,11 +365,6 @@ src_configure() {
 			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
diff --git a/app-metrics/collectd/collectd-5.12.0-r2.ebuild b/app-metrics/collectd/collectd-5.12.0-r2.ebuild
index c3aaedc933aa..3d7dd49059cc 100644
--- a/app-metrics/collectd/collectd-5.12.0-r2.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,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"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+IUSE="contrib debug java perl selinux static-libs udev xfs"
 
 # The plugin lists have to follow here since they extend IUSE
 
@@ -150,15 +150,7 @@ COMMON_DEPEND="
 	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:= )
-	)"
+"
 
 # FIXME: should virtual/jdk be here as well?
 BDEPEND="virtual/pkgconfig"
@@ -337,9 +329,6 @@ src_configure() {
 	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}
@@ -376,11 +365,6 @@ src_configure() {
 			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