gentoo resync : 05.04.2018

18 files changed, 136 insertions, 127 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 4c18d471469c..ba9788975d36 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index da950d359c4d..febe6c08f51a 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Tobias Klausmann <klausman@gentoo.org> (22 Mar 2018)
 # Masked due to missing deps. Some *could* have their deps keyworded,
 # but we're trying to keep the maintenance load low.
-app-admin/collectd collectd_plugins_amqp
-app-admin/collectd collectd_plugins_gmond
-app-admin/collectd collectd_plugins_gps
-app-admin/collectd collectd_plugins_ipmi
-app-admin/collectd collectd_plugins_modbus
-app-admin/collectd collectd_plugins_nut
-app-admin/collectd collectd_plugins_onewire
-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-admin/collectd collectd_plugins_write_kafka
-app-admin/collectd collectd_plugins_xencpu
-app-admin/collectd collectd_plugins_java
+app-metrics/collectd collectd_plugins_amqp
+app-metrics/collectd collectd_plugins_gmond
+app-metrics/collectd collectd_plugins_gps
+app-metrics/collectd collectd_plugins_ipmi
+app-metrics/collectd collectd_plugins_modbus
+app-metrics/collectd collectd_plugins_nut
+app-metrics/collectd collectd_plugins_onewire
+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
+app-metrics/collectd collectd_plugins_write_kafka
+app-metrics/collectd collectd_plugins_xencpu
+app-metrics/collectd collectd_plugins_java
 
 # Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
 # Needs net-mail/mailutils which is not keyworded, bug #635216.
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index c49832e6640c..3b89d0f1559e 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -150,7 +150,6 @@ net-print/cndrvcups-common-lb
 net-print/cndrvcups-lb
 sci-biology/foldingathome
 sci-chemistry/cara-bin
-sci-chemistry/cyana
 sci-chemistry/mars
 sci-electronics/eagle
 sci-libs/ipp
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index ad5f53f1e2a1..1b915704d01c 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -62,7 +62,7 @@ media-libs/mlt vdpau
 
 # Thomas Deutschmann <whissi@gentoo.org> (22 Sep 2016)
 # Enable MQTT support on supported architectures
-app-admin/collectd -collectd_plugins_mqtt
+app-metrics/collectd -collectd_plugins_mqtt
 
 # Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
 # Enable numa support on supported architectures
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
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 0e5eb740a39b..f5afc21419bf 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (03 Apr 2018)
+# Requires unported sys-libs/netbsd-csu.
+sys-devel/clang-runtime crt
+
 # Mart Raudsepp <leio@gentoo.org> (31 Mar 2018)
 # Boost.Context can be built on arm64
 dev-libs/boost -context
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index f0f2056ea815..fbe2ee1e7b61 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (30 Dec 2017)
@@ -42,7 +42,7 @@ dev-libs/libsecp256k1 asm
 
 # Thomas Deutschmann <whissi@gentoo.org> (22 Sep 2016)
 # Dependency is only keyworded on amd64 and x86
-app-admin/collectd collectd_plugins_mqtt
+app-metrics/collectd collectd_plugins_mqtt
 
 # Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
 # It's only supported on amd64, ia64, powerpc and x86
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 09bd237a49c6..8901da254321 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires >=portage-2.1.1
@@ -76,7 +76,7 @@ app-emulation/libvirt zfs
 
 # Thomas Deutschmann <whissi@gentoo.org> (22 Sep 2016)
 # Enable MQTT support on supported architectures
-app-admin/collectd -collectd_plugins_mqtt
+app-metrics/collectd -collectd_plugins_mqtt
 
 # Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
 # Enable numa support on supported architectures
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b051919d7bfb..c8451e2ab5b2 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Göktürk Yüksek <gokturk@gentoo.org> (4 Apr 2018)
+# libewf is getting treecleaned (#547418).
+# Starting with sleuthkit-4.6.0, we statically link sleuthkit to a
+# locally compiled libewf. Mask the prior versions.
+<app-forensics/sleuthkit-4.6.0 ewf
+
 # Mart Raudsepp <leio@gentoo.org> (1 Apr 2018)
 # rust[extended] file collides with dev-util/cargo, while everything
 # in tree uses the latter at the moment (#645562)
@@ -62,7 +68,6 @@ app-emulation/fuse backend-svga
 # Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
 # libewf is going to be removed, bug #547418
 app-admin/testdisk ewf
-app-forensics/sleuthkit ewf
 
 # Patrick McLean <chutzpah@gentoo.org> (6 Mar 2018)
 # Requires dev-libs/boost-1.66 that is unkeyworded/masked
@@ -74,9 +79,9 @@ app-forensics/sleuthkit ewf
 
 # Brian Evans <grknight@gentoo.org> (28 Feb 2018)
 # Mask client-libs USE to force users to install alternative standard pacakges
->=dev-db/mariadb-10.2.13 client-libs
->=dev-db/mysql-5.7 client-libs
->=dev-db/percona-server-5.7 client-libs
+dev-db/mariadb client-libs
+dev-db/mysql client-libs
+dev-db/percona-server client-libs
 
 # Andreas Sturmlechner <asturm@gentoo.org> (25 Feb 2018)
 # Depends on obsolete media-libs/phonon[qt4]
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 573fbf87cf4f..a13d34d3003e 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Mar 2018)
+# Depends on unstable dependencies; qt3d bug #652046
+sci-geosciences/qgis 3d grass
+
 # Thomas Beierlein <tomjbe@gentoo.org> (21 Mar 2018)
 # ~app-backup/bacula-9.0.6 does not compile with USE=libressl (bug #641492)
 ~app-backup/bacula-9.0.6 libressl
@@ -15,7 +19,7 @@ app-emulation/qemu capstone
 # Zac Medico <zmedico@gentoo.org> (9 Mar 2018)
 # The rsync-verify support is not really stable yet.
 # Bugs #649276, #647964
-sys-apps/portage rsync-verify
+<sys-apps/portage-2.3.28 rsync-verify
 
 # Kent Fredric <kentnl@gentoo.org> (3 Mar 2018)
 # Not an officially supported configuration, as it causes unpredictable
@@ -75,11 +79,6 @@ net-dns/dnsmasq libidn2
 # Requires dev-lang/julia stabilisation, bug #613576
 kde-apps/cantor julia
 
-# Andreas Sturmlechner <asturm@gentoo.org> (22 Feb 2017)
-# Requires not yet stabilised sci-geosciences/grass,
-# which probably needs bump to solve several issues.
-sci-geosciences/qgis grass
-
 # Brian Dolbec <dolsen@gentoo.org> (14 Feb 2017)
 # This is stable masked as g-sorcery is being not actively developed.
 app-portage/layman g-sorcery
@@ -144,10 +143,6 @@ dev-lang/go gccgo
 # Mask monitoring capabilities of Ganeti on stable branches
 app-emulation/ganeti monitoring
 
-# Mike Gilbert <floppym@gentoo.org> (03 Oct 2015)
-# Unmask stable-masked implementations for python-exec
-dev-lang/python-exec -python_targets_python3_6
-
 # Pacho Ramos <pacho@gentoo.org> (15 May 2015)
 # Version compatible with current ffmpeg is not ready to be stabilized
 # bug #539212
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index 2446fd952aff..a864e077b43c 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -115,7 +115,6 @@ net-misc/ps3mediaserver
 sci-biology/foldingathome
 sci-electronics/eagle
 sci-chemistry/cara-bin
-sci-chemistry/cyana
 sci-chemistry/mars
 sci-libs/ipp
 sys-libs/lib-compat-loki
diff --git a/profiles/default/linux/uclibc/arm/package.use.mask b/profiles/default/linux/uclibc/arm/package.use.mask
index b08830050753..361fbecb5d13 100644
--- a/profiles/default/linux/uclibc/arm/package.use.mask
+++ b/profiles/default/linux/uclibc/arm/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Thomas Deutschmann <whissi@gentoo.org> (28 Nov 2017)
@@ -29,15 +29,15 @@ app-admin/rsyslog grok
 # 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
 
 # Matthias Maier <tamiko@gentoo.org> (16 Aug 2015)
 # missing keywords
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index b820b2630d26..554b7b3ca5da 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -141,7 +141,6 @@ net-print/cndrvcups-lb
 sci-biology/foldingathome
 sci-electronics/eagle
 sci-chemistry/cara-bin
-sci-chemistry/cyana
 sci-chemistry/mars
 sci-chemistry/xdsstat-bin
 sci-libs/ipp
diff --git a/profiles/package.mask b/profiles/package.mask
index baf8c8344f81..f0483b076c78 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,49 @@
 
 #--- END OF EXAMPLES ---
 
+# Rick Farina <zerochaos@gentoo.org> (04 Apr 2018)
+# Violates PMS and does not work with stable portage.
+# Masked for removal in 60 days, lift mask if bug #650126 is fixed
+sys-fs/aufs3
+sys-fs/aufs4
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Apr 2018)
+# Dead upstream, depends on dead PyQt4.
+# Masked for removal in 30 days. Bugs #649118, #510066
+media-video/subdownloader
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Apr 2018)
+# Build issues, depends on dead Qt4, no port to Qt5 (or far from ready).
+# Masked for removal in 30 days. Bugs #620474, #624740, #648668
+sci-electronics/qucs
+
+# Michał Górny (03 Apr 2018)
+# Starting with sys-apps/sandbox-2.13+, unloading is possible via
+# disabling (SANDBOX_ON=0) + wiping LD_PRELOAD. This renders the tool
+# obsolete. Removal in 30 days.
+app-portage/unsandbox
+
+# Matthias Maier <tamiko@gentoo.org> (3 Apr 2018)
+# Remove old Intel C/C++/Fortran compiler ebuilds. These packages require
+# to acquire a non-commercial license by Intel and download "Intel Parallel
+# Studio" in ancient versions (3+ years old). Current versions (as of 2018)
+# can be found in the ::science overlay.
+#
+# Corresponding eclass/intel-sdp eclass slated for removal as well.
+#
+# Masked for removal in 30 days.
+<dev-lang/icc-18
+<dev-lang/ifc-18
+dev-lang/idb
+<dev-libs/intel-common-18
+<sci-libs/ipp-18
+sci-chemistry/cyana
+
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (3 Apr 2018)
+# Merged into >=dev-db/m17n-db-1.7.0.
+# Masked for removal in 30 days.
+dev-db/m17n-contrib
+
 # Aaron Bauman <bman@gentoo.org> (1 Apr 2018)
 # Unmaintained upstream. Relies on old PHP. EAPI=0.
 # Masked for removal in 30 days.
@@ -556,38 +599,6 @@ media-gfx/qosmic
 # Bug 649764 Removal in 30 days.
 dev-db/maxscale
 
-# Andreas Sturmlechner <asturm@gentoo.org> (06 Mar 2018)
-# Maintainer not responding, depends on deprecated Qt4.
-# Masked for removal in 30 days. Bug 598651, 635192, 644396
-media-gfx/photivo
-
-# Andreas Sturmlechner <asturm@gentoo.org> (05 Mar 2018)
-# Dead upstream, depends on deprecated Qt4.
-# Masked for removal in 30 days. Bug 644404
-net-fs/smbtatools
-
-# Andreas Sturmlechner <asturm@gentoo.org> (04 Mar 2018)
-# Dead upstream, depends on deprecated Qt4. media-sound/cantata
-# is an actively developed alternative based on Qt5.
-# Masked for removal in 30 days. Bug 644412
-media-sound/qmpdclient
-
-# Andreas Sturmlechner <asturm@gentoo.org> (04 Mar 2018)
-# Dead upstream, depends on deprecated Qt4.
-# Masked for removal in 30 days. Bug 645436
-sci-chemistry/massxpert
-
-# Andreas Sturmlechner <asturm@gentoo.org> (04 Mar 2018)
-# Dead upstream, depends on deprecated Qt4.
-# Masked for removal in 30 days. Bug 514438, 644522
-sci-chemistry/gsim
-
-# Andreas Sturmlechner <asturm@gentoo.org> (04 Mar 2018)
-# Depends on deprecated dev-python/pyqwt, blocks Qt4 removal.
-# Masked for removal in 30 days unless someone bumps to 5.2.2.
-# Bug 645218, 649094
-sci-chemistry/PyMca
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (03 Mar 2018)
 # Fails to build without rpc support in glibc (bug 631044);
 # no maintainer, requires obsolete hardware. Removal in
@@ -620,7 +631,7 @@ dev-python/sepolgen
 # Depends on x11-libs/libXp which is on its way out.
 # If you still need this for third-party binaries, try the
 # workaround outlined in https://bugs.gentoo.org/210021#c19.
-# Masked for removal in 90 days. Bug #649080.
+# Masked for removal in 30 days. Bug #649080.
 x11-libs/motif:2.2
 
 # Anthony G. Basile <blueness@gentoo.org> (25 Feb 2018)
@@ -665,25 +676,6 @@ dev-php/ZendFramework
 # Masked for removal in 30 days. Bug #629184.
 media-sound/moodbar
 
-# Ulrich Müller <ulm@gentoo.org> (21 Feb 2018)
-# Homepage is dead. Apparently the last release was in 2012
-# and it does not work with Emacs 25 and later.
-# Masked for removal in 30 days. Bug #590400.
-app-emacs/mcomplete
-
-# Ulrich Müller <ulm@gentoo.org> (21 Feb 2018)
-# Obsolete predecessor of js-mode, which is included
-# with Emacs since version 23. Homepage is dead.
-# Masked for removal in 30 days. Bug #648150.
-app-emacs/javascript
-
-# Ulrich Müller <ulm@gentoo.org> (21 Feb 2018)
-# Last release in 2006. Homepage is dead. Upstream says
-# that app-emacs/muse should be used as replacement.
-# Masked for removal in 30 days. Bug #619194.
-app-emacs/emacs-wiki
-app-emacs/emacs-wiki-blog
-
 # Eray Aslan <eras@gentoo.org> (08 Feb 2018)
 # Mask experimental software
 =mail-mta/postfix-3.4*
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/packages b/profiles/prefix/darwin/macos/10.5/ppc/packages
new file mode 100644
index 000000000000..f8f1b81f58f4
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/ppc/packages
@@ -0,0 +1,8 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Mac OS X Leopard/PPC uses gcc-apple (not Clang)
+-*sys-devel/gcc
+*sys-devel/gcc-config
+-*sys-devel/clang
+*sys-devel/gcc-apple
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
new file mode 100644
index 000000000000..fdf5c7e5f796
--- /dev/null
+++ b/profiles/updates/2Q-2018
@@ -0,0 +1,3 @@
+move app-admin/collectd app-metrics/collectd
+move app-metrics/prometheus-mysqld_exporter app-metrics/mysqld_exporter
+move gnome-extra/gnome-builder dev-util/gnome-builder
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b7b91289e6e3..6fb043e53531 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -33,11 +33,6 @@ app-admin/clsync:extra-hardened - Enable extra security checks. This will hurt p
 app-admin/clsync:gio - Enable GIO for FS monitoring (glib based alternative to inotify interface, not recommended; if both are compiled, may be selected at runtime).
 app-admin/clsync:highload-locks - Allows to use spinlocks for short delays instead of mutexes, but only on SMP systems.
 app-admin/clsync:namespaces - Enable namespaces isolation.
-app-admin/collectd:contrib - Install user-contributed files in the doc directory
-app-admin/collectd:filecaps - When set collectd daemon will have set required capabilities to run most plugins even if run as unprivileged user
-app-admin/collectd:java - Must be set (workaround for java-pkg-opt-2 eclass limitation) when you want java or genericjmx plugin
-app-admin/collectd:udev - Enable optional udev usage in disk plugin; Required for smart plugin
-app-admin/collectd:xfs - Enable optional capability to filter on XFS file system in df plugin; Requires XFS headers from sys-fs/xfsprogs
 app-admin/conky:apcupsd - Enable support for sys-power/apcupsd
 app-admin/conky:audacious - Enable monitoring of music played by media-sound/audacious
 app-admin/conky:cmus - Enable monitoring of music played by media-sound/cmus
@@ -125,6 +120,7 @@ app-admin/rsyslog:grok - Build the grok modify module (requires dev-libs/grok)
 app-admin/rsyslog:jemalloc - Use dev-libs/jemalloc for allocations.
 app-admin/rsyslog:kafka - Build the Apache Kafka input/output module (requires dev-libs/librdkafka)
 app-admin/rsyslog:kerberos - Build the GSSAPI input and output module (requires virtual/krb5)
+app-admin/rsyslog:kubernetes - Build the kubernetes modify plugin (requires net-misc/curl)
 app-admin/rsyslog:libressl - Use dev-libs/libressl for building the rfc5424hmac modify module (requires rfc5424hmac USE flag)
 app-admin/rsyslog:mdblookup - Build the MaxMind DB lookup message modify plugin using dev-libs/libmaxminddb
 app-admin/rsyslog:mongodb - Build the MongoDB output module (requires dev-libs/libmongo-client)
@@ -861,6 +857,11 @@ app-leechcraft/lc-poshuku:speeddial - Build SpeedDial module.
 app-leechcraft/lc-poshuku:webengine - Build WebEngine- (that is, Chromium-)based rendering backend.
 app-leechcraft/lc-secman:exposecontents - Build the GUI for viewing the stored data.
 app-leechcraft/leechcraft-meta:de - Install components, that allow using Leechcraft as Desktop Environment
+app-metrics/collectd:contrib - Install user-contributed files in the doc directory
+app-metrics/collectd:filecaps - When set collectd daemon will have set required capabilities to run most plugins even if run as unprivileged user
+app-metrics/collectd:java - Must be set (workaround for java-pkg-opt-2 eclass limitation) when you want java or genericjmx plugin
+app-metrics/collectd:udev - Enable optional udev usage in disk plugin; Required for smart plugin
+app-metrics/collectd:xfs - Enable optional capability to filter on XFS file system in df plugin; Requires XFS headers from sys-fs/xfsprogs
 app-misc/anki:recording - Enable support for audio recording
 app-misc/anki:sound - Enable support for adding sound to cards
 app-misc/binwalk:graph - Enable support for generating entropy graphs
@@ -2928,6 +2929,11 @@ dev-util/geany-plugins:pretty-printer - Enable pretty-printer plugin
 dev-util/geany-plugins:scope - Enable the scope plugin which is a graphical GDB front-end
 dev-util/geany-plugins:soup - Enable updatechecker and geniuspaste plugins which require net-libs/libsoup
 dev-util/global:vim - Integrate the GNU GLOBAL source code tag system with Vim
+dev-util/gnome-builder:clang - Provide integration with sys-devel/clang for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support
+dev-util/gnome-builder:git - Provide support for the Git version control system via dev-libs/libgit2-glib (such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)
+dev-util/gnome-builder:sysprof - Provide an integrated profiler via dev-util/sysprof
+dev-util/gnome-builder:vala - Provide an autoindenter, autocompletion, diagnostics, and symbol resolver for Vala
+dev-util/gnome-builder:webkit - Enable net-libs/webkit-gtk using plugins support and the HTML/Markdown previewer plugin
 dev-util/google-perftools:debug - Build a set of libraries with debug support (so-called debugalloc). These are available by default but are not needed unless you're actually developing using tcmalloc.
 dev-util/google-perftools:largepages - Use (experimental) larger pages for tcmalloc, this increases memory usage, but should speed up the allocation/free operations.
 dev-util/google-perftools:minimal - Only build the tcmalloc_minimal library, ignoring the heap checker and the profilers.
@@ -3092,6 +3098,7 @@ games-arcade/commandergenius:tremor - Use media-libs/tremor as ogg decoder inste
 games-arcade/jumpnbump:music - Enable playing of background music
 games-arcade/lbreakout2:themes - Install additional themes
 games-arcade/moleinvasion:music - Download and install the music files
+games-arcade/oshu:osu-skin - Include more complete osu-skin (other is minimal)
 games-arcade/performous:midi - Enable MIDI I/O support
 games-arcade/performous:songs - Install a few demo songs
 games-arcade/performous:tools - Install tools
@@ -3398,11 +3405,6 @@ gnome-extra/evolution-data-server:berkdb - sys-libs/db support needed to migrate
 gnome-extra/evolution-data-server:gnome-online-accounts - Enable net-libs/gnome-online-accounts based Google authentication support
 gnome-extra/evolution-data-server:google - Enable internal Google authentication support. If gnome-online-accounts is enabled and used, this is not necessary, but both can be supported at the same time with different setup at runtime
 gnome-extra/evolution-data-server:weather - Enable optional weather calendar support
-gnome-extra/gnome-builder:clang - Provide integration with sys-devel/clang for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support
-gnome-extra/gnome-builder:git - Provide support for the Git version control system via dev-libs/libgit2-glib (such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)
-gnome-extra/gnome-builder:sysprof - Provide an integrated profiler via dev-util/sysprof
-gnome-extra/gnome-builder:vala - Provide an autoindenter, autocompletion, diagnostics, and symbol resolver for Vala
-gnome-extra/gnome-builder:webkit - Enable net-libs/webkit-gtk using plugins support and the HTML/Markdown previewer plugin
 gnome-extra/gnome-color-manager:packagekit - Enable support for the distro-neutral package manager GUI app-admin/packagekit
 gnome-extra/gnome-commander:chm - Enable metadata support for Microsoft Compiled HTML Help files
 gnome-extra/gnome-commander:gsf - Add metadata support for OLE, OLE2 and ODF
@@ -4036,7 +4038,6 @@ media-gfx/graphviz:gdk-pixbuf - Enables gdk-pixbuf2 plugin
 media-gfx/graphviz:gtk - Enables gtk+ output plugin -Tgtk (needs cairo)
 media-gfx/graphviz:gts - Enables support for gts
 media-gfx/graphviz:lasi - Enables PostScript output via media-libs/lasi, for plugin -Tlasi (needs cairo)
-media-gfx/graphviz:qt4 - Builds gvedit front-end
 media-gfx/gthumb:http - Enable webservice integration through net-libs/libsoup
 media-gfx/gthumb:json - Compile code that uses the libjson-glib library
 media-gfx/gthumb:slideshow - Enable slideshow plugin
@@ -4105,6 +4106,7 @@ media-libs/allegro:dumb - Enable media-libs/dumb module library support
 media-libs/allegro:physfs - Enable physfs support
 media-libs/allegro:vga - Enables the VGA graphics driver
 media-libs/alsa-lib:alisp - Enable support for ALISP (ALSA LISP) interpreter for advanced features.
+media-libs/alsa-lib:thread-safety - thread-safe API functions
 media-libs/alure:dumb - Enable media-libs/dumb module library support
 media-libs/alure:fluidsynth - Enables Fluidsynth MIDI software synthesis
 media-libs/assimp:boost - Build assimp with boost support
@@ -4667,6 +4669,7 @@ media-sound/potamus:opus - Adds support for the Opus codec.
 media-sound/pragha:glyr - Enable music metadata searchengine support using media-libs/glyr
 media-sound/pragha:grilo - Play songs on DLNA servers using media-libs/grilo
 media-sound/pragha:keybinder - Enable shortcut support using dev-libs/keybinder
+media-sound/pragha:koel - Append music on Koel server
 media-sound/pragha:lastfm - Enable last.fm support using media-libs/libclastfm
 media-sound/pragha:peas - Enable various plugins that will pull in dev-libs/libpeas as a dependency
 media-sound/pragha:playlist - Enable enhanced playlist support using dev-libs/totem-pl-parser
@@ -7055,7 +7058,6 @@ sci-biology/yass:dmalloc - Enable debugging with the dmalloc library
 sci-biology/yass:lowmem - Build for environments with low amounts of memory
 sci-calculators/datamash:openssl - Use dev-libs/openssl for cryptographic features
 sci-calculators/units:units_cur - Install the units_cur python script that updates currencies
-sci-chemistry/PyMca:matplotlib - Support for plotting through matplotlib
 sci-chemistry/apbs:fast - APBS fast mode (experimental)
 sci-chemistry/apbs:fetk - Include support for FeTK
 sci-chemistry/apbs:iapbs - C/C++/Fortran interface
@@ -7079,7 +7081,6 @@ sci-chemistry/gromacs:offensive - Enable gromacs partly offensive quotes
 sci-chemistry/gromacs:opencl - Enable opencl non-bonded kernels
 sci-chemistry/gromacs:single-precision - Single precision version of gromacs (default)
 sci-chemistry/gromacs:tng - Enable new trajectory format - tng
-sci-chemistry/gsim:emf - Support for .emf export
 sci-chemistry/jmol:client-only - Install the viewer only, no applet files for httpd
 sci-chemistry/molequeue:client - Build the client application
 sci-chemistry/molequeue:server - Build the serve application
@@ -7584,6 +7585,7 @@ sys-apps/fwupd:colorhug - Enable ColorHug support through x11-misc/colord packag
 sys-apps/fwupd:dell - Enable Dell-specific support.
 sys-apps/fwupd:gpg - Enable GPG support.
 sys-apps/fwupd:man - Build and install man pages
+sys-apps/fwupd:pkcs7 - Enable PKCS7 verification support via net-libs/gnutls.
 sys-apps/fwupd:uefi - Enable UEFI support
 sys-apps/fwupd:uefi_labels - Enable UEFI labels support
 sys-apps/gawk:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)
@@ -7692,6 +7694,7 @@ sys-apps/systemd:libidn2 - If IDN support is enabled, use net-dns/libidn2 instea
 sys-apps/systemd:lz4 - Enable lz4 compression for the journal
 sys-apps/systemd:nat - Enable support for network address translation in networkd
 sys-apps/systemd:qrcode - Enable qrcode output support in journal
+sys-apps/systemd:resolvconf - Install resolvconf symlink for systemd-resolve
 sys-apps/systemd:sysv-utils - Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown
 sys-apps/systemd:usrmerge - Enable /usr merge (experimental)
 sys-apps/systemd:vanilla - Disable Gentoo-specific behavior and compatibility quirks
@@ -7953,6 +7956,7 @@ sys-devel/clang:multitarget - Build all host targets (default: host only)
 sys-devel/clang:static-analyzer - Install the Clang static analyzer
 sys-devel/clang:z3 - Enable the static analyzer constraint manager backend using sci-mathematics/z3
 sys-devel/clang-runtime:compiler-rt - Install sys-libs/compiler-rt for -rtlib=compiler-rt
+sys-devel/clang-runtime:crt - Require a package providing crt*.o files to make it possible to build software without GCC installed
 sys-devel/clang-runtime:libcxx - Install sys-libs/libcxx for -stdlib=libc++
 sys-devel/clang-runtime:openmp - Install sys-libs/libomp for -fopenmp support
 sys-devel/clang-runtime:sanitize - Enable compiler-rt sanitizer (-fsanitize*) support
@@ -8466,6 +8470,7 @@ www-client/uget:gtk3 - Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2
 www-client/uget:hide-temp-files - Make temporary files that are used while downloading hidden.
 www-client/uget:openssl - Use dev-libs/openssl instead of net-libs/gnutls
 www-client/uget:rss - Enable uGet feed messages
+www-client/w3m:gdk-pixbuf - Enable support for x11-libs/gdk-pixbuf
 www-client/w3m:lynxkeymap - If you prefer Lynx-like key binding
 www-client/weboob:deprecated - Enable dev-python/mechanize support (deprecated in favor of dev-python/requests
 www-client/weboob:fast-libs - Enable fast libs