gentoo resync : 02.06.2019

30 files changed, 243 insertions, 301 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b3b66f812cbb..a8bb9b65cb63 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 3c1fc8c89200..567c53840b2b 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -41,6 +41,7 @@ games-action/brutal-legend
 games-action/cs2d
 games-action/descent3
 games-action/descent3-demo
+games-action/guacamelee
 games-action/heretic2
 games-action/heretic2-demo
 games-action/hotline-miami
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 9a134f645267..8bae7dd1d1cf 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (22 May 2019)
+# Allow python-exec to install all targets
+# Ack by mgorny
+dev-lang/python-exec -python_targets_python3_7
+
+# Andreas Sturmlechner <asturm@gentoo.org> (21 May 2019)
+# dev-db/oracle-instantclient ain't stable
+dev-qt/qtsql oci8
+
 # Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
 # Depends on unstable media-libs/dav1d
 media-video/vlc dav1d
@@ -36,6 +45,8 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (01 Nov 2018)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
+# Ben Kohler <bkohler@gentoo.org> (22 May 2019)
+net-misc/connman iwd
 
 # Mikle Kolyada <zlogene@gentoo.org> (15 Sep 2018)
 # the dependency is unstable
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 747e71d461bd..9e4d8a253d08 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -57,7 +57,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-13 frei0r
-<=media-video/ffmpeg-3.4.5 frei0r sofalizer
+<=media-video/ffmpeg-4.1.3 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (18 Apr 2017)
 # No gst-plugins-vp8:0.10, gst-plugins-musepack:0.10 stable
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index f5f8a290b1b3..7e89ef2ce62e 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (01 June 2019)
+# not yet keyworded
+dev-java/openjdk javafx
+
+# Aaron Bauman <bman@gentoo.org> (27 May 2019)
+# plasma is not stable yet
+kde-frameworks/purpose kaccounts
+
 # Aaron Bauman <bman@gentoo.org> (20 May 2019)
 # doc USE ultimately pulls in dev-lang/ocaml[ocamlopt]
 media-gfx/enblend doc
@@ -15,11 +23,6 @@ www-servers/uwsgi uwsgi_plugins_rados
 # app-text/dblatex not keyword yet
 net-firewall/nftables doc
 
-# Roy Bamford <neddyseagoon@gentoo.org> (19 Mar 2019)
-# Let kde-apps/akonadi use mysql.
-dev-qt/qtsql -mysql
-kde-apps/akonadi -mysql
-
 # Mart Raudsepp <leio@gentoo.org> (11 Mar 2019)
 # media-libs/bcg729 not keyworded yet
 net-analyzer/wireshark bcg729
@@ -65,11 +68,6 @@ virtual/ffmpeg -sdl
 # It builds OK but is not yet in ::gentoo. bug #678404
 kde-apps/cantor lua
 
-# Davide Pesavento <pesa@gentoo.org> (27 Dec 2018)
-# The corresponding Qt5 modules are not keyworded on arm64, and we don't want to
-# keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 networkauth
-
 # Dirkjan Ochtman <djc@gentoo.org> (29 Sep 2018)
 # Upstream doesn't build docs for tier 2 and lower architectures.
 # Bug #660512.
@@ -88,10 +86,6 @@ sci-electronics/kicad occ oce ngspice
 <app-editors/emacs-25.3-r6:25 imagemagick
 <app-editors/emacs-26.1-r3:26 imagemagick
 
-# Tomáš Mózes <hydrapolic@gmail.com> (10 Aug 2018)
-# Needs dev-libs/libmaxminddb which isn't keyworded
-app-admin/syslog-ng geoip2
-
 # Matthew Thode <prometheanfire@gentoo.org> (18 Jul 2018)
 # dev-python/pandas not keyworded and test uses pandas
 dev-python/networkx pandas test
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index d1a6dc06e536..855f907eaea4 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Aaron Bauman <bman@gentoo.org> (27 May 2019)
+# media-libs/dav1d is not stable
+media-video/vlc dav1d
+
 # Aaron Bauman <bman@gentoo.org> (20 May 2019)
 # deps are not stable yet
 virtual/notification-daemon gnome kde
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index e730f1ed5372..c0acbe59c7ac 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -119,7 +119,6 @@ xemacs
 rpm
 scanner
 zvbi
-mysql
 fluidsynth
 sid
 mms
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 2e1a9ab86a31..ba6ecb3233e2 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -13,10 +13,6 @@ ocamlopt
 consolekit
 
 # Mart Raudsepp <leio@gentoo.org> (07 Feb 2019)
-# app-misc/tracker not stable yet
-tracker
-
-# Mart Raudsepp <leio@gentoo.org> (07 Feb 2019)
 # media-sound/musepack-tools not stable yet
 musepack
 
@@ -24,10 +20,6 @@ musepack
 # media-libs/portaudio not stable yet
 portaudio
 
-# Mart Raudsepp <leio@gentoo.org> (18 Jan 2019)
-# x11-libs/libva not stable yet
-vaapi
-
 # Mart Raudsepp <leio@gentoo.org> (27 Nov 2018)
 # x11-libs/fltk not stable yet
 fltk
@@ -37,14 +29,6 @@ fltk
 python_targets_python3_7
 python_single_target_python3_7
 
-# Michał Górny <mgorny@gentoo.org> (16 Apr 2018)
-# Not stable yet.
-vala
-
-# Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
-# virtual/{jdk,jre} are not stable here.
-java
-
 # Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
 # dev-lang/tk is not stable here.
 tk
@@ -56,7 +40,3 @@ subversion
 # Mart Raudsepp <leio@gentoo.org> (28 Jan 2017)
 # sys-auth/skey not marked stable yet
 skey
-
-# Ben de Groot <yngwin@gentoo.org> (24 Aug 2015)
-# Not yet stable, bug #543326
-qt5
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index e87d47208193..007e8c6841d1 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sergei Trofimovich <slyfox@gentoo.org> (25 May 2019)
+# libgo needs an explicit port to hppa: bug #686624
+sys-devel/gcc go
+
 # Jeroen Roovers (jer@gentoo.org) (22 Mar 2018)
 # HiPE does not work on HPPA
 dev-lang/erlang hipe
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 541a9c44f2ff..90c52e0b84f0 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -2,8 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Sergei Trofimovich <slyfox@gentoo.org> (21 May 2019)
-# No ia64 arch support for jit.
+# No ia64 arch support for jit. Version 17 USE=debug
+# required USE=jit.
 dev-lang/spidermonkey jit
+=dev-lang/spidermonkey-17* debug
 
 # Mart Raudsepp <leio@gentoo.org> (17 Mar 2019)
 # Unkeyworded media-libs/opencv dependency, bug #680656
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index a6add7ff54bd..208d8b8210ba 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (01 June 2019)
+# not yet keyworded
+dev-java/openjdk javafx
+
 # Patrick McLean <chutzpah@gentoo.org> (15 Apr 2019)
 # deps not available on platform
 sys-cluster/ceph babeltrace lttng
diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults b/profiles/arch/riscv/rv64gc/lp64/make.defaults
index 8c6534c6999a..f4b3042683c5 100644
--- a/profiles/arch/riscv/rv64gc/lp64/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults
@@ -3,13 +3,15 @@
 
 # RISC-V rv64gc/lp64 no-multilib profile
 
-CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64"
+CFLAGS="-O2 -pipe"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
 
 # We have only one ABI
 MULTILIB_ABIS="lp64"
+DEFAULT_ABI="lp64"
+ABI="lp64"
 
 # We hide the useflags for the ABIs
 USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.force b/profiles/arch/riscv/rv64gc/lp64/use.force
new file mode 100644
index 000000000000..d04bb8b3d835
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64/use.force
@@ -0,0 +1,5 @@
+# Un-force the original multilib default-abi flag
+-abi_riscv_lp64d
+
+# Force the abi of this profile here
+abi_riscv_lp64
diff --git a/profiles/arch/sparc/package.mask b/profiles/arch/sparc/package.mask
index 2c683288e66c..19e2f5841dd5 100644
--- a/profiles/arch/sparc/package.mask
+++ b/profiles/arch/sparc/package.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Patrice Clement <monsieurp@gentoo.org> (30 Oct 2015)
-# Requires dependencies that are not stable on sparc yet.
-# See https://qa-reports.gentoo.org/output/gentoo-ci/7182f7a/5.html#l2294
-mail-mta/postfix
-
 # Raúl Porcel <armin76@gentoo.org> (17 Nov 2014)
 # Mask sys-devel/kgcc64 since >=gcc-4.4 can build 64bit kernels
 sys-devel/kgcc64
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index b943c309a4ef..00a1efed92fd 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (22 May 2019)
+# Allow python-exec to install all targets
+# Ack by mgorny
+dev-lang/python-exec -python_targets_python3_7
+
+# Andreas Sturmlechner <asturm@gentoo.org> (21 May 2019)
+# dev-db/oracle-instantclient ain't stable
+dev-qt/qtsql oci8
+
 # Andreas Sturmlechner <asturm@gentoo.org> (06 May 2019)
 # media-libs/dav1d is not yet stable
 media-video/vlc dav1d
@@ -36,6 +45,8 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (01 Nov 2018)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
+# Ben Kohler <bkohler@gentoo.org> (22 May 2019)
+net-misc/connman iwd
 
 # Thomas Deutschmann <whissi@gentoo.org> (27 Sep 2018)
 # sys-devel/lld is unstable
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 2ffb8d9669ea..053b0e4ac859 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -52,8 +52,9 @@ KERNEL="linux"
 USERLAND="GNU"
 INPUT_DEVICES="keyboard mouse"
 
-# Accept any license except those in the EULA license group.
-ACCEPT_LICENSE="* -@EULA"
+# Accept only licenses in the FREE license group, i.e., with
+# the freedom to use, share, modify and share modifications
+ACCEPT_LICENSE="-* @FREE"
 
 # Tomáš Chvátal <scarabeus@gentoo.org> (23 Mar 2013)
 # By default enable libreoffice implementation only.
@@ -153,7 +154,7 @@ TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE="1"
 
 # Aaron W. Swenson <titanofold@gentoo.org> (9 Jul 2017)
 # Default target(s) for postgres{,-multi}.eclass
-POSTGRES_TARGETS="postgres9_5 postgres10"
+POSTGRES_TARGETS="postgres10 postgres11"
 
 # Michael Orlitzky <mjo@gentoo.org> (17 Nov 2017)
 #
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 03f8e8c920bd..bd7f8963dc12 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.
 
+# James Le Cuirot <chewi@gentoo.org> (21 May 2019)
+# Doesn't support ffmpeg-4. Portage takes a long time to report the
+# conflict and the feature is half broken anyway. See
+# https://github.com/visualboyadvance-m/visualboyadvance-m/issues/179.
+games-emulation/vbam ffmpeg
+
 # Ulrich Müller <ulm@gentoo.org> (18 May 2019)
 # Firmware images without a known license. Most likely, upstream
 # redistribution may conflict with the licenses or lack thereof
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 0879dc3bdde3..8bde36761be2 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,12 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Bernd Waibel <waebbl@gmail.com> (22 May 2019)
+# Marked experimental, needs build and runtime testing. Due to non-
+# available licenses for arnold and maya I can not test these addons.
+# Build and functional tests and reports on issues are appreciated!
+media-gfx/alembic arnold maya
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (10 May 2019)
 # needs llvm slots which are not stable #678908
 # also prone to weird compilation failures
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index e6b015af4fc0..10c7b0d0affa 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -19,6 +19,7 @@ games-action/beathazardultra
 games-action/brutal-legend
 games-action/descent3
 games-action/descent3-demo
+games-action/guacamelee
 games-action/heretic2-demo
 games-action/hotline-miami
 games-action/intrusion2
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index 58037537e75d..f8fa6ac1b00e 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -19,6 +19,7 @@ dev-games/gtkradiant
 dev-games/ps2-packer
 games-action/descent3
 games-action/descent3-demo
+games-action/guacamelee
 games-action/shadowgrounds-bin
 games-action/shadowgrounds-survivor-bin
 games-action/trine
diff --git a/profiles/desc/enlightenment_modules.desc b/profiles/desc/enlightenment_modules.desc
deleted file mode 100644
index 9ed9d46414c4..000000000000
--- a/profiles/desc/enlightenment_modules.desc
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of ENLIGHTENMENT_MODULES USE_EXPAND
-# for x11-wm/enlightenment.
-
-appmenu - Gadget that holds the menubar of the foreground application
-backlight - Backlight control slider gadget
-battery - A gadget to visualize your battery status
-bluez4 - Configure Bluetooth devices
-clock - Nice clock gadget to show current time
-cpufreq - Gadget to monitor and change the CPU frequency
-everything - The run command module provides an application launcher dialog
-fileman - Enlightenment's integrated file manager
-fileman-opinfo - Allows EFM to be placen on the desktop or in a shelf
-gadman - Module to manage gadgets on the desktop
-geolocation - Geolocation information
-ibar - Iconic application launcher
-ibox - A home for your iconified applications
-lokker - Screen locker
-luncher - Iconic application launcher
-mixer - A module to provide a mixer for changing volume
-msgbus - DBus Extension
-music-control - Control your music in your shelf
-notification - Notification-daemon alternative
-packagekit - Package manager integration
-pager - Gadget to allow you to visualize your virtual desktops and the windows they contain
-pager-plain - A simpler desktop pager
-quickaccess - Enlightenment Quickaccess Launcher
-shot - Simple screenshot+save/upload module
-start - Enlightenment's 'Start' button equivalent
-syscon - Provides a unified popup dialog for all the system actions in Enlightenment
-sysinfo - A gadget to visualize your system info
-systray - System tray that hold applications icons like Skype, Pidgin, Kopete and others
-tasks - Gadget to allow you to switch tasks
-teamwork - Enable teamwork module
-temperature - Temperature monitor
-time - Time related gadgets
-tiling - Positions/resizes your windows tilingly
-vkbd - Virtual keyboard
-winlist - A module to show the list of client applications presently running
-wizard - First Run Wizard
-wireless - WiFi monitoring
-wl-buffer - Wayland buffer
-wl-desktop-shell - Enlightenment Wayland Desktop Shell
-wl-drm - Wayland DRM (Direct Rendering Manager) compositing module
-wl-text-input - Wayland text input support
-wl-weekeyboard - Wayland virtual keyboard
-wl-wl - Wayland-in-Wayland module
-wl-x11 - Wayland-in-X11 module
-xkbswitch - Keyboard layout configuration and switcher
-xwayland - X/Wayland integration
-conf - Settings Panel
-conf-applications - Allows configuration of Ibar, Restart, and Startup applications
-conf-bindings - Input Control Settings
-conf-dialogs - Configure default dialog properties
-conf-display - Used to configure your screen
-conf-interaction - Configure Mouse and Touch input
-conf-intl - Used to select a default language
-conf-menus - Configures menu behavior
-conf-paths - Specifies the Enlightenment search paths and default directories
-conf-performance - Used to configure certain performance related items as frame rates and cache settings
-conf-randr - Used to configure your screen's resolution
-conf-shelves - Shelf configuration dialog
-conf-theme - Used to configure your theme preferences
-conf-window-manipulation - Configures window raise, resistance, and maximize policies
-conf-window-remembers - Delete existing window remembers
diff --git a/profiles/desc/postgres_targets.desc b/profiles/desc/postgres_targets.desc
index 464cb04702d5..e8fc83457668 100644
--- a/profiles/desc/postgres_targets.desc
+++ b/profiles/desc/postgres_targets.desc
@@ -10,3 +10,4 @@ postgres9_6 - Build against PostgreSQL 9.6
 postgres10 - Build against PostgreSQL 10
 postgres11 - Build against PostgreSQL 11
 postgres12 - Build against PostgreSQL 12
+postgres13 - Build against PostgreSQL 13
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index a00f6334f287..3382ca7db562 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -40,5 +40,6 @@ USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_F
 # and not by user configuration files.
 PROFILE_ONLY_VARIABLES="IUSE_IMPLICIT USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
 
-# Accept any license except those in the EULA license group.
-ACCEPT_LICENSE="* -@EULA"
+# Accept only licenses in the FREE license group, i.e., with
+# the freedom to use, share, modify and share modifications
+ACCEPT_LICENSE="-* @FREE"
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index f6b0c2f82955..82649fc8202e 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -38,6 +38,7 @@ dev-util/biew
 games-action/cs2d
 games-action/descent3
 games-action/descent3-demo
+games-action/guacamelee
 games-action/heretic2
 games-action/heretic2-demo
 games-action/intrusion2
diff --git a/profiles/license_groups b/profiles/license_groups
index 14649929f535..f5f9968c575d 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -10,7 +10,7 @@
 ######################################################################
 
 # GPL compatible licenses approved by the Free Software Foundation
-# http://www.gnu.org/licenses/license-list.html
+# https://www.gnu.org/licenses/license-list.html
 # GPL or LGPL with various exceptions are also included here, because
 # they are more permissive than the licenses they are based on.
 GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-2+-with-openssl-exception GPL-3 GPL-3+ GPL-3+-with-cuda-exception GPL-3+-with-cuda-openssl-exception GPL-3-with-font-exception GPL-3+-with-opencl-exception GPL-3+-with-opencl-openssl-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 ZLIB ZPL
@@ -19,18 +19,18 @@ GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0
 FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4 CDDL CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 Zend-2.0
 
 # Licenses approved by the Open Source Initiative
-# http://www.opensource.org/licenses
+# https://www.opensource.org/licenses
 # Note that the FSF lists these as nonfree: Artistic NOSA Watcom-1.0
 OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL Sleepycat UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL
 
 # Misc licenses that are probably free software, i.e. follow the
-# Free Software Definition at http://www.gnu.org/philosophy/free-sw.html
+# Free Software Definition at https://www.gnu.org/philosophy/free-sw.html
 # but are not approved by either FSF or OSI. Preferably on the long
 # term these should be cleared up and moved to other sets.
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
+MISC-FREE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -42,7 +42,7 @@ FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
 FSF-APPROVED-OTHER Arphic CC-BY-2.0 CC-BY-2.5 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.1 FDL-1.1+ FDL-1.2 FDL-1.2+ FDL-1.3 FDL-1.3+ FreeArt GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ IPAfont OFL OFL-1.1 OPL
 
 # Misc licenses for free documents and other works (including fonts)
-# that follow the definition at http://freedomdefined.org/ but are NOT
+# that follow the definition at https://freedomdefined.org/ but are NOT
 # listed in @FSF-APPROVED-OTHER
 MISC-FREE-DOCS BitstreamVera CC-BY-SA-1.0 CC-PD CC-SA-1.0 LDP-1 LDP-1a man-pages man-pages-posix man-pages-posix-2013 MaxMind2 mplus-fonts myspell-en_CA-KevinAtkinson quake1-textures Texinfo-manual UbuntuFontLicense-1.0 Unicode_Fonts_for_Ancient_Scripts vlgothic wxWinFDL-3
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 11bef7b32355..65855617bd50 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,15 +29,123 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2 Jun 2019)
+# Test version with all new Gentoo defaults. 
+# Fixes bug 676946 bug may break other things.
+# Masked for testing.
+=dev-ruby/rubygems-3.0.3-r1
+
+# Fabian Groffen <grobian@gentoo.org> (30 May 2019)
+# Pre-release for upcoming 0.80
+# You're invited to try this version out (and report bugs), but beware,
+# it is still subject to changes, as well as some applets having changed
+# considerably
+=app-portage/portage-utils-0.80_pre20190530
+
+# Mikle Kolyada <zlogene@gentoo.org> (30 May 2019)
+# Start adding texlive-2019 (still may be terribly broken)
+=app-text/texlive-core-2019
+=dev-libs/ptexenc-1.3.7_p20190410
+=app-text/dvipsk-5.999_p20190410
+=app-text/ttf2pk2-2.0_p20190410
+=app-text/ps2pkm-1.8_p20190410
+=dev-tex/bibtexu-3.71_p20190410
+=dev-libs/kpathsea-6.3.1_p20190410
+=dev-texlive/texlive-basic-2019
+=dev-texlive/texlive-bibtexextra-2019
+=dev-texlive/texlive-context-2019
+=dev-texlive/texlive-fontsextra-2019
+=dev-texlive/texlive-fontsrecommended-2019
+=dev-texlive/texlive-fontutils-2019
+=dev-texlive/texlive-formatsextra-2019
+=dev-texlive/texlive-games-2019
+=dev-texlive/texlive-humanities-2019
+=dev-texlive/texlive-langarabic-2019
+=dev-texlive/texlive-langchinese-2019
+=dev-texlive/texlive-langcjk-2019
+=dev-texlive/texlive-langcyrillic-2019
+=dev-texlive/texlive-langczechslovak-2019
+=dev-texlive/texlive-langenglish-2019
+=dev-texlive/texlive-langeuropean-2019
+=dev-texlive/texlive-langfrench-2019
+=dev-texlive/texlive-langgerman-2019
+=dev-texlive/texlive-langgreek-2019
+=dev-texlive/texlive-langitalian-2019
+=dev-texlive/texlive-langjapanese-2019
+=dev-texlive/texlive-langkorean-2019
+=dev-texlive/texlive-langother-2019
+=dev-texlive/texlive-langpolish-2019
+=dev-texlive/texlive-langportuguese-2019
+=dev-texlive/texlive-langspanish-2019
+=dev-texlive/texlive-latex-2019
+=dev-texlive/texlive-latexextra-2019
+=dev-texlive/texlive-latexrecommended-2019
+=dev-texlive/texlive-luatex-2019
+=dev-texlive/texlive-mathscience-2019
+=dev-texlive/texlive-metapost-2019
+=dev-texlive/texlive-music-2019
+=dev-texlive/texlive-pictures-2019
+=dev-texlive/texlive-plaingeneric-2019
+=dev-texlive/texlive-pstricks-2019
+=dev-texlive/texlive-publishers-2019
+=dev-texlive/texlive-xetex-2019
+=app-text/texlive-2019
+
+# Zac Medico <zmedico@gentoo.org> (31 May 2019)
+# Upstream is dead and there are multiple security vulnerabilities.
+# Removal in 30 days. Bug #687100.
+app-emulation/rkt
+
+# Hanno Boeck <hanno@gentoo.org> (27 May 2019)
+# Obsolete LXDE modules, see #652658, #651964
+lxde-base/lxshortcut
+lxde-base/lxsession-edit
+
+# Virgil Dupras <vdupras@gentoo.org> (24 May 2019)
+# py2 only, dead upstream, removal in 30 days. Bug #686668
+dev-python/drpython
+
+# Aaron Bauman <bman@gentoo.org> (23 May 2019)
+# Upstreami now requires registration to download
+# EAPI2. Removal in 30 days.
+net-misc/mindterm
+
+# Aaron Bauman <bman@gentoo.org> (23 May 2019)
+# Unmaintained, EAPI2, updates available upstream
+# Oh yea, removal in 30 days
+dev-util/pmd
+
+# Patrick Lauer <patrick@gentoo.org> (23 May 2019)
+# PostgreSQL beta and release candidate releases are pre-release testing
+# versions, not meant for production use. They are feature-frozen, and are
+# released to the public for testing before final release
+#
+# NOTE: Successive beta or candidate releases may not be backwards compatible,
+# so it is important that you review the release notes before upgrading.
+#
+# For more information about beta and release candidate versions, see:
+#     https://www.postgresql.org/developer/beta/
+dev-db/postgresql:12
+
+# Jonas Stein <jstein@gentoo.org> (22 May 2019)
+# Masked for removal after 2019-06-23. (bug #686260)
+# Wrong license, ships non-GPL image, maintainer needed.
+x11-plugins/gkrellflynn
+
+# Sebastian Pipping <sping@gentoo.org> (22 May 2019)
+# Masked for removal in 30 days (bug #686562)
+# Unfixed bug, dead upstream, not relevant enough
+sys-fs/pytagsfs
+
+# Lars Wendler <polynomial-c@gentoo.org> (21 May 2019)
+# Masked for testing
+=sys-libs/ncurses-6.1_p20181020
+
 # Stefan Strogin <steils@gentoo.org> (21 May 2019)
 # Unmaintained. Last release in 2005. Does not build with
 # >=dev-libs/bglibs-2.04. Bug #686438.
 net-mail/qmail-qfilter
 
-# Stefan Strogin <steils@gentoo.org> (21 May 2019)
-# Depends on >=dev-libs/bglibs-2.04. Bug #347479.
->=net-mail/mailfront-2.22
-
 # Michał Górny <mgorny@gentoo.org> (19 May 2019)
 # Unmaintained.  The program breaks init.d script (#626580).  Homepage
 # and public sources disappeared.  Last release in 2006.
@@ -68,10 +176,6 @@ dev-ruby/elasticsearch-api:0
 dev-ruby/elasticsearch-transport:0
 dev-ruby/filesize:0.1.1
 
-# Stefan Strogin <steils@gentoo.org> (17 May 2019)
-# Depends on >=dev-libs/bglibs-2.04. Bug #685238.
->=net-libs/cvm-0.97
-
 # Matt Turner <mattst88@gentoo.org> (16 May 2019)
 # Not supported by the Xserver since v1.6.0 (2008)
 # Masked for removal.
@@ -95,53 +199,6 @@ dev-db/mariadb-galera
 dev-python/detox
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
-# Perl 5.30 preparation block. Will be unmasked some time after the
-# actual release of Perl 5.30.0.
-=dev-lang/perl-5.30*
-~virtual/perl-Archive-Tar-2.320.0
-~virtual/perl-CPAN-2.220.0
-~virtual/perl-Compress-Raw-Bzip2-2.84.0
-~virtual/perl-Compress-Raw-Zlib-2.84.0
-~virtual/perl-DB_File-1.843.0
-~virtual/perl-Data-Dumper-2.174.0
-~virtual/perl-Devel-PPPort-3.520.0
-~virtual/perl-Digest-SHA-6.20.0
-~virtual/perl-Encode-3.10.0
-~virtual/perl-ExtUtils-CBuilder-0.280.231
-~virtual/perl-ExtUtils-Manifest-1.720.0
-~virtual/perl-ExtUtils-ParseXS-3.400.0
-~virtual/perl-File-Path-2.160.0
-~virtual/perl-File-Spec-3.780.0
-~perl-core/File-Temp-0.230.900
-~virtual/perl-File-Temp-0.230.900
-~virtual/perl-HTTP-Tiny-0.76.0
-~virtual/perl-IO-1.400.0
-~virtual/perl-IO-Compress-2.84.0
-~virtual/perl-IPC-Cmd-1.20.0
-~virtual/perl-JSON-PP-4.20.0
-~virtual/perl-Math-BigInt-1.999.816
-~virtual/perl-Math-BigInt-FastCalc-0.500.800
-~virtual/perl-Math-BigRat-0.261.400
-~virtual/perl-Module-CoreList-5.201.905.200
-~virtual/perl-Module-Load-0.340.0
-~virtual/perl-Module-Metadata-1.0.36
-~virtual/perl-Net-Ping-2.710.0
-~virtual/perl-Storable-3.150.0
-~virtual/perl-Test-Simple-1.302.162
-~virtual/perl-Thread-Queue-3.130.0
-~virtual/perl-Time-HiRes-1.976.0
-~virtual/perl-Time-Local-1.280.0
-~virtual/perl-Time-Piece-1.330.0
-~virtual/perl-Unicode-Collate-1.270.0
-~virtual/perl-bignum-0.510.0
-~virtual/perl-parent-0.237.0
-~virtual/perl-podlators-4.110.0
-~virtual/perl-threads-shared-1.600.0
-~virtual/perl-version-0.992.400
-~dev-perl/Math-BigInt-GMP-1.600.600
-~dev-perl/Math-BigInt-Lite-0.180.0
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
 # Perl 5.24 will be removed soon. Please upgrade.
 <dev-lang/perl-5.26.2
 =virtual/perl-Archive-Tar-2.40.100_rc-r6
@@ -235,14 +292,6 @@ dev-python/pytest-relaxed
 # it. Removal in 30 days. Bug #581720.
 media-tv/tvbrowser
 
-# Stefan Strogin <stefan.strogin@gmail.com> (05 May 2019)
-# Depends on >=dev-libs/bglibs-2.04. Bug #670694.
->=sys-process/bcron-0.11
-
-# Stefan Strogin <stefan.strogin@gmail.com> (04 May 2019)
-# Masked for testing reverse dependencies. Bug #591300.
->=dev-libs/bglibs-2.04
-
 # Michał Górny <mgorny@gentoo.org> (02 May 2019)
 # Discontinued upstream, and no longer required by any packages
 # in Gentoo.  Removal in 30 days.  Bug #684828.
@@ -331,43 +380,6 @@ dev-python/gst-python:0.10
 media-libs/gnonlin:0.10
 net-libs/farstream:0.1
 
-# Virgil Dupras <vdupras@gentoo.org> (26 Apr 2019)
-# Should have been removed with django-cms a while back but wasn't.
-# Removal in 30 days. Bug #683862
-dev-python/djangocms-attributes-field
-
-# Virgil Dupras <vdupras@gentoo.org> (26 Apr 2019)
-# Unmaintained, no revdeps. Removal in 30 days. Bug #618734
-dev-python/yapps
-
-# Jason Zaman <perfinion@gentoo.org> (25 Apr 2019)
-# net-mail/perdition was last-rited in 2016. The
-# SELinux policy packge is no longer needed.
-# Removal in 30 days.
-sec-policy/selinux-perdition
-
-# Michał Górny <mgorny@gentoo.org> (25 Apr 2019)
-# This programs suffers severe code quality problems and should have
-# never been added to Gentoo.  It looks like a shell script badly
-# converted to a C program with a lot of system() calls with globs,
-# horribly unreadable code and broken memory management including
-# reading past end-of-string (which only recently replaced writing into
-# uninitialized memory).  Auditing the program completely would probably
-# be more costly than rewriting it from scratch.
-# Removal in 30 days.  Bug #684340.
-app-admin/lsat
-
-# Alon Bar-Lev <alonbl@gentoo.org> (24 Apr 2019)
-# Commercial. Upstream does not provide sources any more.
-# Tend to break per kernel upgrades.
-# Removal in 30 days. Bug#684268.
-app-crypt/bestcrypt
-
-# Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
-# Unmainained since 2011.  Ebuild broken since 2016.  Last release
-# in 2005.  Removal in 30 days.  Bug #588032.
-net-mail/bincimap
-
 # Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
 # Unmaintained.  Vulnerable init.d script.  Missing dependencies causing
 # build failures (#514412, #544942).  Insecure format strings (#520574).
@@ -375,68 +387,17 @@ net-mail/bincimap
 # Removal in 30 days.  Bug #629450.
 mail-filter/mimedefang
 
-# Richard Freeman <rich0@gentoo.org> (24 Apr 2019)
-# Masked for removal in 30 days.  Likely does not work
-# and is essentially unmainted.  Please comment in 
-# bug 548926 if you want to give this some care.
-games-rpg/eternal-lands
-games-rpg/eternal-lands-bloodsucker
-games-rpg/eternal-lands-data
-
-# Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
-# Unmaintained.  Vulnerable init.d script.  Missing dependencies causing
-# build failures (#514136).  Last bumped in 2011, pending bump since
-# at least 2014 (#540502).
-# Removal in 30 days.  Bug #630986.
-mail-filter/spamass-milter
-
-# Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
-# Unmaintained.  Does not build with current version of courier
-# (#684254), also had a different build failure in the past (#513976).
-# Last bumped in 2013, pending bump since 2014 (#519452).
-# Removal in 30 days.  Bug #684256.
-mail-filter/zdkimfilter
-
 # Jeroen Roovers <jer@gentoo.org> (24 Apr 2019)
 # Depends on =dev-libs/openssl-1.1.1* due to newly introduced
 # support for EVP_PKEY_ED25519 and EVP_PKEY_ED448 (bug #670574).
+=net-libs/nodejs-10.16.0
 =net-libs/nodejs-11.15.0
 =net-libs/nodejs-12*
 
-# Lars Wendler <polynomial-c@gentoo.org> (21 Apr 2019)
-# Masked for removal (bug #683926)
-sys-libs/ntdb
-
-# Alexys Jacob <ultrabug@gentoo.org> (20 Apr 2019)
-# Unmaintained. Not active any more with latest release Jul 23, 2017.
-# Does not build with recent openssl. Dropping useless python driver as well.
-# Removal in 30 days.  Bug #597340, #674236.
-dev-db/rethinkdb
-dev-python/python-rethinkdb
-
-# Alexys Jacob <ultrabug@gentoo.org> (20 Apr 2019)
-# Unmaintained. Only version in portage has been EOL for a while.
-# No strong user base or herd support. Breaks fuse-3.
-# Removal in 30 days.  Bug #650256, #673672.
-sys-cluster/moosefs
-
-# James Le Cuirot <chewi@gentoo.org> (20 Apr 2019)
-# Ancient and long dead upstream. Use app-emulation/fs-uae
-# instead. Removal in 30 days. Bugs #432092, #602966.
-app-emulation/uae
-app-emulation/e-uae
-
 # Miroslav Šulc <fordfrog@gentoo.org> (19 Apr 2019)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.19
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (18 Apr 2019)
-# This version is provided for testing of the upcoming 0.8.0 release.
-# It is not recommended for use, it contains known bugs.
-# This version supports TRIM.
-=sys-fs/zfs-kmod-0.8.0_rc*
-=sys-fs/zfs-0.8.0_rc*
-
 # Michał Górny <mgorny@gentoo.org> (18 Apr 2019)
 # All current versions of SystemRescueCD contain vulnerable packages.
 # Bug #683724.
@@ -461,6 +422,9 @@ sys-boot/systemrescuecd-x86-grub
 >=dev-libs/boost-1.70.0
 >=dev-util/boost-build-1.70.0
 >=net-mail/libpst-0.6.66-r2
+>=net-proxy/trojan-1.12.2
+>=dev-python/graph-tool-2.27
+=dev-python/graph-tool-9999
 
 # Robin H. Johnson <robbat2@gentoo.org> (25 Mar 2019)
 # Requires >=dev-lang/lua-5.3 which is masked
@@ -566,11 +530,6 @@ dev-libs/gost-engine
 # Masked for removal on 2018-11-24, bug #669650.
 dev-db/pgadmin3
 
-# Lars Wendler <polynomial-c@gentoo.org> (22 Oct 2018)
-# Breaks dev-libs/gobject-introspection and its consumers
-# See #669278
-=xfce-base/xfconf-4.13.6
-
 # Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
 # EOL and has known vulnerabilities. Please move to
 # Firefox 60 or newer if you can.
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index a50334dc5a41..ac1d126eb4f5 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Some USE-flags that only die-hards don't want:
@@ -9,11 +9,11 @@
 USE="readline zlib ncurses ssl"
 
 
-# Python 3.6 is unmasked for us, build stuff by default with latest to
-# avoid unnecessary builds
+# In Prefix, aim for Python 3 only, leaving out 2 to avoid unnecessary
+# builds
 # NOTE: Both are incremental variables: Need to drop obsolete base values.
-PYTHON_TARGETS="python2_7 -python3_5 python3_6"
-PYTHON_SINGLE_TARGET="-python3_5 python3_6"
+PYTHON_TARGETS="-python2_7 python3_6"
+PYTHON_SINGLE_TARGET="python3_6"
 
 # Move away from ruby22 fast forward to ruby24, we don't have ruby23
 RUBY_TARGETS="ruby24"
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index 4ca2d473d009..8d8dd0a834cc 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (30 Apr 2019)
-# Fails to compile, bug #684024
-=dev-lang/perl-5.28.2*
-
 # Fabian Groffen <grobian@gentoo.org> (22 Mar 2019)
 # fails to compile, bug #681316
 =app-crypt/gnupg-2.2.14
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 019ef2e56ef5..1465ef6062f6 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -256,6 +256,7 @@ ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd	exp
 # @MAINTAINER: riscv@gentoo.org
 riscv		default/linux/riscv/17.0/rv64gc			stable
 riscv		default/linux/riscv/17.0/rv64gc/lp64d		dev
+riscv		default/linux/riscv/17.0/rv64gc/lp64		exp
 
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3d0e9d932b1d..a95902cb7cca 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -501,8 +501,6 @@ app-emulation/docker-credential-helpers:pass - Build pass helper for the pass ut
 app-emulation/docker-runc:ambient - Enable support for ambient capability
 app-emulation/docker-runc:apparmor - Enable AppArmor support
 app-emulation/dosemu:fluidsynth - use media-sound/fluidsynth for MIDI emulation
-app-emulation/e-uae:capslib - Add CAPS library support
-app-emulation/e-uae:sdl-sound - Use media-libs/sdl-sound for audio output
 app-emulation/faudio:ffmpeg - FAudio has optional support for decoding xWMA resources using FFmpeg, requiring: media-video/ffmpeg (note: this feature is not supported by media-video/libav).
 app-emulation/faudio:test - Build and run faudio testsuite.
 app-emulation/faudio:utils - Build all faudio utilities.
@@ -644,7 +642,6 @@ app-emulation/runv:xen - Enable support for the Xen Hypervisor
 app-emulation/spice:lz4 - Enable support for LZ4 compression using app-arch/lz4
 app-emulation/spice:smartcard - Enable smartcard remoting using app-emulation/libcacard
 app-emulation/spice-vdagent:consolekit - Use sys-auth/consolekit to determine the master vdagentd in case of multiple running vdagentds (highly recommended)
-app-emulation/uae:scsi - Enable the uaescsi.device
 app-emulation/vagrant:virtualbox - Use VirtualBox provider.
 app-emulation/vice:ethernet - Enable ethernet emulation
 app-emulation/vice:fullscreen - Enable the ability to run fullscreen
@@ -1213,12 +1210,14 @@ app-portage/layman:squashfs - Support mounting squashfs image overlays locally r
 app-portage/layman:subversion - Support dev-vcs/subversion based overlays
 app-portage/layman:sync-plugin-portage - Install the sys-apps/portage sync module
 app-portage/pfl:network-cron - Adds a cron job which does a weekly submit of the package database
+app-portage/portage-utils:qmanifest - Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing
 app-portage/tatt:templates - Install template scripts to be used with tatt
 app-shells/autojump:ipython - Add support for dev-python/ipython
 app-shells/bash:bashlogger - Log ALL commands typed into bash; should ONLY be used in restricted environments such as honeypots
 app-shells/bash:mem-scramble - Build with custom malloc/free overwriting allocated/freed memory
 app-shells/bash:net - Enable /dev/tcp/host/port redirection
 app-shells/bash:plugins - Add support for loading builtins at runtime via 'enable'
+app-shells/bash-completion:eselect - Support blacklisting of completions via 'eselect bash-completion'. This enables custom Gentoo patching of upstream completion loader.
 app-shells/dash:vanilla - Support echo -n, and enable echo -e all the time (unsupported)
 app-shells/pdsh:rsh - This allows the use of rsh (remote shell) and rcp (remote copy) for authoring websites. sftp is a much more secure protocol and is preferred.
 app-shells/shish:diet - Use dev-libs/dietlibc
@@ -1389,15 +1388,18 @@ app-xemacs/xemacs-packages-all:mule - Add multi-language support to XEmacs
 dev-ada/asis:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/asis:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/asis:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/asis:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/aunit:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/aunit:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/aunit:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/aws:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/aws:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/aws:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/aws:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnat_util:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnat_util:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnat_util:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gnat_util:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnat_util:shared - Build gnat_util shared library
 dev-ada/gnat_util:static-pic - Build gnat_util static library with pic code
 dev-ada/gnatcoll:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
@@ -1409,16 +1411,19 @@ dev-ada/gnatcoll:tools - Build associated tools
 dev-ada/gnatcoll-bindings:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnatcoll-bindings:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnatcoll-bindings:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gnatcoll-bindings:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnatcoll-bindings:shared - Build shared library
 dev-ada/gnatcoll-bindings:static-pic - Build shared library
 dev-ada/gnatcoll-core:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnatcoll-core:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnatcoll-core:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gnatcoll-core:gnat_2019 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/gnatcoll-core:shared - Build shared library
 dev-ada/gnatcoll-core:static-pic - Build static library with pic code
 dev-ada/gnatcoll-db:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnatcoll-db:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnatcoll-db:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gnatcoll-db:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnatcoll-db:gnatcoll_db2ada - Build gnatcoll_db2ada
 dev-ada/gnatcoll-db:gnatinspect - Build gnatinspect
 dev-ada/gnatcoll-db:shared - Build shared library
@@ -1431,16 +1436,19 @@ dev-ada/gnatmem:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/gprbuild:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gprbuild:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gprbuild:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gprbuild:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gps:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gps:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gps:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/gtkada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gtkada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gtkada:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gtkada:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gtkada:shared - Build gtkada as shared library
 dev-ada/libadalang:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/libadalang:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/libadalang:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/libadalang:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/libadalang:shared - Build shared library
 dev-ada/libadalang-tools:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/libadalang-tools:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
@@ -1448,11 +1456,13 @@ dev-ada/libadalang-tools:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/libgpr:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/libgpr:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/libgpr:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/libgpr:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/libgpr:shared - Build shared library
 dev-ada/libgpr:static-pic - Build static library with pic code
 dev-ada/xmlada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/xmlada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/xmlada:gnat_2018 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/xmlada:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/xmlada:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/xmlada:shared - Build shared library
 dev-ada/xmlada:static-pic - Build static library with pic code
 dev-cpp/eigen:c++11 - Build using the C++11 standard
@@ -1589,7 +1599,6 @@ dev-db/postgresql:server - Disable to build and install the clients and librarie
 dev-db/postgresql:uuid - Enable server side UUID generation (via dev-libs/ossp-uuid).
 dev-db/psqlodbc:iodbc - Use dev-db/libiodbc. Disable to use dev-db/unixODBC.
 dev-db/redis:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations.
-dev-db/rethinkdb:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations.
 dev-db/soci:boost - Enable boost support
 dev-db/soci:empty - Build the sample backend called Empty
 dev-db/spatialite:geos - Add the sci-libs/geos library for exact topological tests
@@ -1982,6 +1991,7 @@ dev-java/lucene:contrib - Include extra functionality from contrib/
 dev-java/miglayout:swt - Add support for the SWT toolkit.
 dev-java/openjdk:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/openjdk:headless-awt - Don't install the X backend for AWT, needed by some GUIs
+dev-java/openjdk:javafx - Import OpenJFX modules at build time, via dev-java/openjfx
 dev-java/openjdk:jbootstrap - Build OpenJDK twice, the second time using the result of the first
 dev-java/openjdk:source - Install JVM sources
 dev-java/openjdk:systemtap - Enable SystemTAP/DTrace tracing
@@ -1993,6 +2003,8 @@ dev-java/openjdk-bin:webstart - Provide javaws command through symlink to icedte
 dev-java/openjdk-jre-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/openjdk-jre-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
 dev-java/openjdk-jre-bin:webstart - Provide javaws command through symlink to icedtea-web
+dev-java/openjfx:media - Compile media module, based on gstreamer-minimal (does not pull gstreamer)
+dev-java/openjfx:source - Install JavaFX sources
 dev-java/oracle-jdk-bin:commercial - Install features requiring a commercial license for production use
 dev-java/oracle-jdk-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/oracle-jdk-bin:gtk2 - Enable GTK+ 2 support in JavaFX
@@ -2044,6 +2056,7 @@ dev-lang/gnat-gpl:pgo - Build GCC using Profile Guided Optimization (PGO)
 dev-lang/gnat-gpl:regression-test - Run the testsuite and install the results (requires FEATURES=test)
 dev-lang/gnat-gpl:sanitize - Build support for various sanitizer functions (ASAN/TSAN/etc...)
 dev-lang/gnat-gpl:ssp - Build packages with stack smashing protector on by default
+dev-lang/gnat-gpl:systemtap - enable systemtap static probe points
 dev-lang/gnat-gpl:vtv - Build support for virtual table verification (a C++ hardening feature)
 dev-lang/go:gccgo - Bootstrap using sys-devel/gcc[go]
 dev-lang/go:system-bootstrap - Bootstrap using previously installed dev-lang/go
@@ -2354,11 +2367,9 @@ dev-libs/efl:harfbuzz - Enable complex text shaping and layout support
 dev-libs/efl:hyphen - Enable text hyphenation support
 dev-libs/efl:ibus - Enable Intelligent Input Bus
 dev-libs/efl:ico - Enable Ico image loader
-dev-libs/efl:ivi - Enable ivi-shell support
 dev-libs/efl:libuv - Enable dev-libs/libuv support
 dev-libs/efl:luajit - USE dev-lang/luajit instead of dev-lang/lua
 dev-libs/efl:physics - Enable Bullet physics effects and support
-dev-libs/efl:pixman - Enable PixMan for software rendering
 dev-libs/efl:ppm - Enable PMAPS image loader
 dev-libs/efl:psd - Enable PSD image loader
 dev-libs/efl:scim - Enable Smart Common Input Method
@@ -3092,6 +3103,8 @@ dev-util/bustle:threaded - Build with support for multithreaded execution.
 dev-util/catalyst:ccache - Enables ccache support
 dev-util/catalyst:iso - Pulls in the depends for building iso images
 dev-util/catalyst:system-bootloader - Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar
+dev-util/cccc:apidoc - Build software docs with doxygen/graphviz and metrics with cccc
+dev-util/cccc:mfc - Add patch for MFC dialect options
 dev-util/clion:custom-jdk - Install and use IntelliJ's custom JRE.
 dev-util/cmake:server - Enable cmake-server support.
 dev-util/cmake:system-jsoncpp - Use system copy of dev-libs/jsoncpp instead of bundled one.
@@ -3470,6 +3483,8 @@ games-fps/eduke32:tools - Install the support tools for mapster32.
 games-fps/eduke32:voxels - Install the Duke Nukem 3D Voxels Pack.
 games-fps/eduke32:vpx - Enable support for media-libs/libvpx.
 games-fps/eduke32:xmp - Enable support for media-libs/exempi.
+games-fps/gzdoom:fluidsynth - Use media-sound/fluidsynth for MIDI support
+games-fps/gzdoom:gtk2 - Enable support for GTK+2 instead of GTK+3
 games-fps/nexuiz:maps - Install the community map pack
 games-fps/quake2-icculus:demo - Install the demo files (quake2-demodata) and configure for use
 games-fps/quake2-icculus:qmax - Build the pretty version (quake max)
@@ -4043,6 +4058,7 @@ mail-client/thunderbird:system-libevent - Use the system-wide dev-libs/libevent
 mail-client/thunderbird:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled.
 mail-client/thunderbird:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
 mail-client/thunderbird-bin:crashreporter - Enable crash reporter for bugs
+mail-client/trojita:addressbook - Build kde-apps/akonadi addressbook plugin
 mail-client/trojita:password - Store passwords securely via dev-libs/qtkeychain
 mail-filter/MailScanner:exim - Set mail-mta/exim to used MTA
 mail-filter/MailScanner:postfix - Set mail-mta/postfix to used MTA
@@ -4121,8 +4137,6 @@ mail-filter/rspamd:torch - Enable torch support. This is required for the neural
 mail-filter/spamassassin:cron - Install a cron job to update SpamAssassin's rules daily.
 mail-filter/spamassassin:qmail - Build qmail functionality and docs
 mail-filter/spamdyke:ssl - Enables TLS protocol for spamdyke
-mail-filter/zdkimfilter:debug - Log process and signal information. Also leave the child process running for gdb examination.
-mail-filter/zdkimfilter:opendbx - An alternate statistics based storage engine.
 mail-mta/courier:fax - Enables fax support in the courier mail server
 mail-mta/courier:norewrite - Prevents courier mail server from mangling virtual user addresses when sending
 mail-mta/courier:web - Enable the web interface
@@ -4209,6 +4223,7 @@ media-fonts/intlfonts:bdf - Installs BDF fonts in addition to PCF
 media-fonts/liberation-fonts:fontforge - Use media-gfx/fontforge to build fonts from source
 media-fonts/montecarlo:bdf - Install BDF fonts in addition to PCF
 media-fonts/mplus-outline-fonts:ipafont - Generates new fonts merged with media-fonts/ja-ipafonts
+media-fonts/noto:extra - Install full upstream font set
 media-fonts/sil-charis:compact - Use more compactly spaced font
 media-fonts/sil-gentium:compact - Also install more compact version of the font.
 media-fonts/terminus-font:a-like-o - Changes view of letter 'a' - a looks like o (see homepage)
@@ -5936,6 +5951,7 @@ net-fs/samba:dmapi - Enable support for DMAPI. This currently works only in comb
 net-fs/samba:gpg - Use app-crypt/gpgme for AD DC
 net-fs/samba:iprint - Enabling iPrint technology by Novell
 net-fs/samba:json - Enable json audit support through dev-libs/jansson
+net-fs/samba:profiling-data - Enables support for collecting profiling data
 net-fs/samba:quota - Enables support for user quotas
 net-fs/samba:system-heimdal - Use app-crypt/heimdal instead of bundled heimdal.
 net-fs/samba:system-mitkrb5 - Use app-crypt/mit-krb5 instead of app-crypt/heimdal.
@@ -6162,16 +6178,19 @@ net-irc/hexchat:plugin-checksum - Build Checksum plugin (needs plugins)
 net-irc/hexchat:plugin-fishlim - Build FiSHLiM plugin (needs plugins )
 net-irc/hexchat:plugin-sysinfo - Build SysInfo plugin (needs plugins)
 net-irc/hexchat:theme-manager - Build the theme manager (mono)
-net-irc/inspircd:geoip - Add geoip support for country and city lookup based on IPs
 net-irc/inspircd:gnutls - Enable TLS support
-net-irc/inspircd:ipv6 - Enable support for IP version 6
 net-irc/inspircd:ldap - Enable LDAP support
+net-irc/inspircd:maxminddb - Add support for geolocation using libMaxMindDB
+net-irc/inspircd:mbedtls - Add support for TLS using the mbedTLS library
 net-irc/inspircd:mysql - Enable MySQL database backend
 net-irc/inspircd:pcre - Adds support for Perl Compatible Regular Expressions
-net-irc/inspircd:posix - Adds support for POSIX-compatible functions
 net-irc/inspircd:postgres - Enable PostgreSQL database backend
+net-irc/inspircd:re2 - Add support for Google RE2 regular expressions library
+net-irc/inspircd:regex-posix - Adds support for POSIX Regular Expressions
+net-irc/inspircd:regex-stdlib - Add support for C++ stdlib regular expressions
 net-irc/inspircd:sqlite - Enable Sqlite database backend
 net-irc/inspircd:ssl - Enable SSL support
+net-irc/inspircd:sslrehashsignal - Enable rehashing SSL module by SIGUSR1
 net-irc/inspircd:tre - Enable support for TRE, a lightweight, robust, and efficient POSIX compliant regexp matching library
 net-irc/iroffer-dinoex:admin - Compile with HTTP Admin
 net-irc/iroffer-dinoex:blowfish - Compile with blowfish encryption support
@@ -6261,6 +6280,7 @@ net-libs/gnutls:test-full - Enable full test mode
 net-libs/gnutls:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
 net-libs/gnutls:tools - Build extra tools
 net-libs/gnutls:valgrind - Enable usage of dev-util/valgrind in debug
+net-libs/grpc:perftools - Enable profiling using dev-util/google-perftools
 net-libs/grpc:systemtap - Enable SystemTAP/DTrace tracing
 net-libs/grpc:tools - Install gRPC python tools
 net-libs/iax:snomhack - Use slower memset for SNOM phoneem
@@ -6378,6 +6398,7 @@ net-libs/shairplay:tools - Build and install a binary shairplay in /usr/bin
 net-libs/telepathy-qt:farstream - Enable support for audio/video calls via farstream
 net-libs/tox:av - Adds support for audio and video.
 net-libs/tox:daemon - Enable the DHT Bootstrap Daemon.
+net-libs/tox:dht-node - Enables DHT Bootstrap Node.
 net-libs/tox:log-debug - Log level: 4
 net-libs/tox:log-error - Log level: 1
 net-libs/tox:log-info - Log level: 3
@@ -7459,6 +7480,7 @@ sci-geosciences/gshhs:data - Add earth data with sci-geosciences/gshhs-data
 sci-geosciences/liblas:gdal - Add support for the sci-libs/gdal geospatial raster library
 sci-geosciences/mapnik:gdal - Enable sci-libs/gdal library support
 sci-geosciences/mapnik:osmfonts - Enable openstreetmaps font styles
+sci-geosciences/mapserver:apache - Enable mapserver to run under apache
 sci-geosciences/mapserver:gdal - Enable sci-libs/gdal library support
 sci-geosciences/mapserver:geos - Enable sci-libs/geos library support
 sci-geosciences/mapserver:postgis - Enable dev-db/postgis support
@@ -8249,8 +8271,6 @@ sys-cluster/legion:hwloc - Enable HWLoc lib support
 sys-cluster/maui:pbs - Enable pbs integration
 sys-cluster/maui:slurm - Enable slurm integration
 sys-cluster/minikube:libvirt - Build plugin for kvm
-sys-cluster/moosefs:cgi - Install CGI server and scripts.
-sys-cluster/moosefs:fuse - Install the mfsmount utility.
 sys-cluster/mpich:mpi-threads - Enable MPI_THREAD_MULTIPLE
 sys-cluster/mpich:romio - Build the ROMIO MPI-IO component
 sys-cluster/mpich2:mpi-threads - Enable MPI_THREAD_MULTIPLE
@@ -8346,7 +8366,6 @@ sys-devel/clang-runtime:crt - Require a package providing crt*.o files to make i
 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
-sys-devel/distcc:crossdev - Enable support for sys-devel/crossdev
 sys-devel/distcc:gssapi - Enable support for net-libs/libgssglue
 sys-devel/gcc:awt - Useful only when building GCJ, this enables Abstract Window Toolkit (AWT) peer support on top of GTK+
 sys-devel/gcc:boundschecking - Add the bounds checking patch by Haj Ten Brugge, this will DISABLE the hardened PIE+SSP patches
@@ -8552,6 +8571,10 @@ sys-kernel/genkernel-next:iscsi - Enable support for open-iscsi (include open-is
 sys-kernel/genkernel-next:mdadm - Enable support for mdadm (include mdadm dependency)
 sys-kernel/genkernel-next:plymouth - Enable support for Plymouth (include Plymouth dependency)
 sys-kernel/gentoo-sources:experimental - Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
+sys-kernel/kpatch:contrib - Enable contrib kpatch services files.
+sys-kernel/kpatch:kmod - Enable a kernel module (.ko file) which provides an interface for the patch modules to register new functions for replacement.
+sys-kernel/kpatch:kpatch - Enable a command-line tool which allows a user to manage a collection of patch modules.
+sys-kernel/kpatch:kpatch-build - Enable tools which convert a source diff patch to a patch module.
 sys-kernel/linux-firmware:redistributable - Install also non-free (but redistributable) firmware files
 sys-kernel/linux-firmware:savedconfig - Allows individual selection of firmware files
 sys-kernel/linux-firmware:unknown-license - Install firmware files whose license is unknown