gentoo resync : 05.04.2018

2 files changed, 12 insertions, 12 deletions

diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 86e0f72ac665..2cbfc4b5dc4b 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -92,7 +92,7 @@ dev-java/oracle-jdk-bin visualvm
 
 # Patrice Clement <monsieurp@gentoo.org> (09 Apr 2017)
 # Enable MQTT support on supported architectures
-app-admin/collectd -collectd_plugins_mqtt
+app-metrics/collectd -collectd_plugins_mqtt
 
 # Michael Weber <xmw@gentoo.org> (15 Mar 2017)
 # Cannot test non-free dependency dev-libs/device-atlas-api-c
@@ -160,15 +160,15 @@ sys-cluster/ceph test
 # Ian Delaney <idella4@gentoo.org> (19 Mar 2016)
 # for the proxy-maintainers project
 # Unkeyworded deps, bug #564274
-app-admin/collectd collectd_plugins_gmond
-app-admin/collectd collectd_plugins_ipmi
-app-admin/collectd collectd_plugins_modbus
-app-admin/collectd collectd_plugins_oracle
-app-admin/collectd collectd_plugins_routeros
-app-admin/collectd collectd_plugins_sigrok
-app-admin/collectd collectd_plugins_tokyotyrant
-app-admin/collectd collectd_plugins_varnish
-app-admin/collectd collectd_plugins_virt
+app-metrics/collectd collectd_plugins_gmond
+app-metrics/collectd collectd_plugins_ipmi
+app-metrics/collectd collectd_plugins_modbus
+app-metrics/collectd collectd_plugins_oracle
+app-metrics/collectd collectd_plugins_routeros
+app-metrics/collectd collectd_plugins_sigrok
+app-metrics/collectd collectd_plugins_tokyotyrant
+app-metrics/collectd collectd_plugins_varnish
+app-metrics/collectd collectd_plugins_virt
 
 # Markus Meier <maekke@gentoo.org> (02 Mar 2016)
 # unkeyworded deps for bug #573324
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 4b1c0c228806..73268526617d 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -3,7 +3,7 @@
 
 # Andreas Sturmlechner <asturm@gentoo.org> (06 Feb 2018)
 # Requires sci-geosciences/gpsd which is not stable, bug #632372
-app-admin/collectd collectd_plugins_gps
+app-metrics/collectd collectd_plugins_gps
 app-misc/geoclue gps
 
 # Andreas Sturmlechner <asturm@gentoo.org> (25 Jan 2018)
@@ -50,7 +50,7 @@ media-libs/libbluray java
 # Thomas Deutschmann <whissi@gentoo.org> (20 Mar 2017)
 # Requires dev-java/java-config and deps which is not stable on arm
 # Requires app-emulation/xen-tools which is not stable on arm
-app-admin/collectd collectd_plugins_java collectd_plugins_xencpu
+app-metrics/collectd collectd_plugins_java collectd_plugins_xencpu
 
 # Michael Palimaka <kensington@gentoo.org> (19 Mar 2017)
 # Required media-plugins/gst-plugins-x264 is not stable