gentoo resync : 04.08.2018

25 files changed, 106 insertions, 385 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7cbe1eb6d898..0c51624b093e 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask
index 763749f7d4b8..4bca0e5e6c2b 100644
--- a/profiles/arch/amd64-fbsd/use.mask
+++ b/profiles/arch/amd64-fbsd/use.mask
@@ -61,10 +61,6 @@ audit
 # google-perftools does not work on FreeBSD.
 tcmalloc
 
-# Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
-# dev-libs/DirectFB is not keyworded here.
-directfb
-
 # Michał Górny <mgorny@gentoo.org> (17 Feb 2018)
 # libraw is not keyworded here.
 raw
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index bbcccdd6586c..58c01717f093 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -107,7 +107,6 @@ games-fps/sauerbraten
 games-fps/serious-sam-tfe
 games-fps/serious-sam-tse
 games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
 games-fps/unreal-tournament
 games-fps/ut2003
 games-fps/ut2003-demo
@@ -132,7 +131,6 @@ games-strategy/darwinia-demo
 games-strategy/defcon-demo
 games-strategy/dominions2
 games-strategy/heroes3
-games-strategy/heroes3-demo
 games-strategy/knights-demo
 games-strategy/majesty-demo
 games-strategy/smac
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index ed5b4ebf574c..8b26a8794e8d 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -5,10 +5,6 @@
 # dev-libs/xxhash not keyworded for arm
 app-admin/rsyslog xxhash
 
-# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
-# kde-plasma/plasma-browser-integration not yet keyworded, bug #659936
-kde-plasma/plasma-meta browser-integration
-
 # Tomáš Mózes <hydrapolic@gmail.com> (19 Jun 2018)
 # Needs dev-libs/libmaxminddb which isn't keyworded
 www-servers/nginx nginx_modules_http_geoip2 nginx_modules_stream_geoip2
@@ -356,10 +352,6 @@ net-im/prosody jit
 # rjb doesn't work on arm, so no java hacks for metasploit
 net-analyzer/metasploit java
 
-# Julian Ospald <hasufell@gentoo.org> (04 Jan 2014)
-# no keyword for media-libs/swfdec and media-libs/libtimidity
->=dev-libs/DirectFB-1.7.1 timidity swfdec
-
 # Markus Meier <maekke@gentoo.org> (26 Dec 2013)
 # Unkeyworded deps, bug #488724
 app-office/gnumeric libgda
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 42b0f00fdef8..48cd36f11131 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -360,10 +360,6 @@ dev-libs/efl physics
 # gcj-6.3 won't bootstrap icedtea 7
 >=sys-devel/gcc-6 gcj
 
-# Julian Ospald <hasufell@gentoo.org> (04 Jan 2014)
-# no keyword for media-libs/swfdec and media-libs/libtimidity
->=dev-libs/DirectFB-1.7.1 timidity swfdec
-
 # Markus Meier <maekke@gentoo.org> (26 Dec 2013)
 # Unkeyworded deps, bug #488724
 app-office/gnumeric libgda
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 4bcd00aedd27..5b3f724a4e79 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (24 Jul 2018)
+# Temporary mask due to test failures in sys-libs/libcxxabi
+# and sys-libs/compiler-rt-sanitizers
+sys-devel/clang-runtime libcxx sanitize
+sys-devel/clang default-libcxx
+
 # Mart Raudsepp <leio@gentoo.org> (28 Jun 2018)
 # net-misc/lksctp-tools not stable yet
 dev-libs/openssl sctp
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index edbebc0d7c86..eb20ce81e8d8 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -62,10 +62,6 @@ gps
 # x11-misc/colord not tested on arm64 yet
 colord
 
-# Mart Raudsepp <leio@gentoo.org> (05 Feb 2017)
-# dev-libs/DirectFB not tested on arm64 (and we probably don't want it)
-directfb
-
 # Mart Raudsepp <leio@gentoo.org> (04 Feb 2017)
 # net-fs/samba not tested on arm64 yet
 samba
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 030e882e83d6..7961ffd22c59 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (25 Jul 2018)
+# USE=server does not compile and needs upstream fix: bug #662040
+>=sys-devel/gdb-8.1 server
+
 # Joonas Niilola <juippis@gmail.com> (17 Jun 2018)
 # Optional dependency not available for this arch
 dev-libs/efl vlc
@@ -251,10 +255,6 @@ dev-util/dbus-test-runner test
 # Missing keywords, bug #478254
 gnome-base/gnome classic extras
 
-# Julian Ospald <hasufell@gentoo.org> (04 Jan 2014)
-# no keyword for media-libs/tremor
->=dev-libs/DirectFB-1.7.1 tremor
-
 # Pacho Ramos <pacho@gentoo.org> (02 Dec 2013)
 # Missing keywords, bug #493156
 media-libs/libgphoto2 serial
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index fa955997fbd1..6819c4f39b7a 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -84,10 +84,6 @@ net-im/telepathy-connection-managers -steam
 # Missing keywords
 app-misc/workrave mate
 
-# Patrick Lauer <patrick@gentoo.org> (13 Jan 2015)
-# Dependencies lack keywords
-games-fps/lsdldoom shareware
-
 # Julian Ospald <hasufell@gentoo.org> (23 Nov 2013)
 # FIXME: app-arch/innoextract not available under ppc yet
 games-fps/duke3d-data gog
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index e24a23f55975..6f9c3f8869d8 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -11,6 +11,12 @@ app-text/ghostscript-gpl cups
 # VCS for oberlays yet.
 app-portage/layman bazaar darcs mercurial
 dev-python/setuptools_scm mercurial test
+# no practical use of zsh completion here (at least now)
+dev-util/ninja zsh-completion
+# no nmap gui
+net-analyzer/nmap zenmap
+# no lua support for vim
+app-editors/vim luajit lua
 
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 7c2500320aaf..01744a72fa90 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -123,14 +123,14 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (23 May 2018)
 # sys-apps/baslayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_5 python_targets_python2_7"
+BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_6 python_targets_python2_7"
 
 # Mike Gilbert <floppym@gentoo.org> (15 May 2012)
 # Default target(s) for python-r1.eclass
-# Michał Górny <mgorny@gentoo.org> (22 Jun 2018)
+# Mikle Kolyada <zlogene@gentoo.org> (24 Jul 2018)
 # Updated to python3_6
-PYTHON_TARGETS="python2_7 python3_5"
-PYTHON_SINGLE_TARGET="python3_5"
+PYTHON_TARGETS="python2_7 python3_6"
+PYTHON_SINGLE_TARGET="python3_6"
 
 # Michał Górny <mgorny@gentoo.org> (10 Aug 2013)
 # Moved from portage's make.globals.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 25cae1754c34..adcfa1f3ca18 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.
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (3 Aug 2018)
+# New and for Gentoo still quite experimental. You've been
+# warned. (Also, works only on x86_64 and with certain CPUs
+# and compiler/binutils combinations.)
+sys-libs/glibc cet
+
 # Nick Sarnie <sarnex@gentoo.org> (15 Jul 2018)
 # Requires media-video/ffmpeg-4 which is masked
 app-emulation/wine-any ffmpeg
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 56babc9b2196..6f64db71a53f 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> (22 Jul 2018)
+# >=media-video/libav-12 not stable yet, bug #617508
+>=media-libs/mlt-6.6.0 libav
+
 # Michał Górny <mgorny@gentoo.org> (07 Jun 2018)
 # sys-libs/netbsd-csu not stable yet.
 sys-devel/clang-runtime crt
@@ -26,10 +30,6 @@ dev-python/s3fs test
 # Not ready for stable, crashes LO on some systems.
 >=app-office/libreoffice-6.0 kde
 
-# Michał Górny <mgorny@gentoo.org> (21 Apr 2018)
-# Apparently requires newer dev-python/django stable.
-=dev-python/django-tastypie-0.13.3 doc
-
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Mar 2018)
 # Depends on unstable dependencies; qt3d bug #652046
 sci-geosciences/qgis 3d grass
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/developer/decprecated b/profiles/default/linux/mips/13.0/mipsel/o32/developer/deprecated
index 3d6ab01f22f4..3d6ab01f22f4 100644
--- a/profiles/default/linux/mips/13.0/mipsel/o32/developer/decprecated
+++ b/profiles/default/linux/mips/13.0/mipsel/o32/developer/deprecated
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index bd2e1559c9bf..4dbd1e687ac7 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -39,7 +39,6 @@ games-arcade/aquaria
 games-arcade/barbarian-bin
 games-arcade/dynamitejack
 games-arcade/jardinains
-games-arcade/marbleblastgold-demo
 games-arcade/thinktanks-demo
 games-emulation/nestra
 games-emulation/zinc
@@ -56,7 +55,6 @@ games-fps/quake3-demo
 games-fps/rtcwmp-demo
 games-fps/rtcwsp-demo
 games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
 games-fps/transfusion-bin
 games-fps/tribes2
 games-fps/ut2003
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index 6c805c2936ec..f674b76e8e1e 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.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
 
 # AMD64 Team <amd64@gentoo.org>
@@ -79,7 +79,6 @@ games-fps/sauerbraten
 games-fps/serious-sam-tfe
 games-fps/serious-sam-tse
 games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
 games-fps/unreal-tournament
 games-fps/ut2003
 games-fps/ut2003-demo
@@ -97,7 +96,6 @@ games-strategy/darwinia-demo
 games-strategy/defcon-demo
 games-strategy/dominions2
 games-strategy/heroes3
-games-strategy/heroes3-demo
 games-strategy/majesty-demo
 games-strategy/smac
 games-strategy/spaz
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index 21d6c09ce882..56369db82066 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -22,7 +22,6 @@ games-action/descent3-demo
 games-action/shadowgrounds-bin
 games-action/shadowgrounds-survivor-bin
 games-action/trine
-games-arcade/marbleblastgold-demo
 games-fps/enemy-territory
 games-fps/enemy-territory-etpro
 games-fps/enemy-territory-truecombat
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 23f79922d54a..38535593b5c3 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -35,4 +35,4 @@ USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_F
 
 # Variables that are set exclusively by the profile
 # and not by user configuration files.
-PROFILE_ONLY_VARIABLES="ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
+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"
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index c9535802b6d9..370aa149e56a 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,3 +1,6 @@
+# Matthew Thode <prometheanfire@gentoo.org> (30 Jul 2018)
+# sys-apps/bolt links against systemd, which gentoo SELinux does not support
+sys-apps/bolt
 
 # Göktürk Yüksek <gokturk@gentoo.org> (09 Nov 2016)
 # On behalf of proxy-maint
@@ -25,6 +28,7 @@ gnome-extra/gnome-logs
 gnome-extra/gnome-shell-extensions
 gnome-extra/gnome-shell-frippery
 gnome-extra/gnome-shell-extensions-topicons-plus
+gnome-extra/gnome-shell-extension-gsconnect
 gnome-extra/gnome-tweak-tool
 x11-themes/zukitwo-shell
 gnome-extra/office-runner
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index 8dee37aab29a..fd047b076a7d 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -99,7 +99,6 @@ games-fps/sauerbraten
 games-fps/serious-sam-tfe
 games-fps/serious-sam-tse
 games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
 games-fps/unreal-tournament
 games-fps/ut2003
 games-fps/ut2003-demo
@@ -119,7 +118,6 @@ games-strategy/darwinia-demo
 games-strategy/defcon-demo
 games-strategy/dominions2
 games-strategy/heroes3
-games-strategy/heroes3-demo
 games-strategy/majesty-demo
 games-strategy/smac
 games-strategy/spaz
diff --git a/profiles/package.mask b/profiles/package.mask
index 328931d03340..f2262d95cfa8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,39 @@
 
 #--- END OF EXAMPLES ---
 
+# Virgil Dupras <vdupras@gentoo.org> (02 Aug 2018)
+# Django 1.8 is unsupported and insecure. These packages haven't been updated
+# to work with up-to-date django. Removal in 30 days. Bug #662632
+<dev-python/django-1.11
+dev-python/django-compressor
+dev-python/django-openstack-auth
+dev-python/django-tastypie
+dev-python/jingo
+dev-python/Coffin
+dev-python/jsonfield
+
+# Michał Górny <mgorny@gentoo.org> (01 Aug 2018)
+# Multiprocessing versions of gemato.  They are known to hang on some
+# users, so let's keep them masked until somebody figures out what's
+# wrong.  Bug #647964.
+~app-portage/gemato-14.0m
+~app-portage/gemato-9999m
+
+# Joonas Niilola <juippis@gmail.com> (31 Jul 2018)
+# Old and obsolete. Merged into one EFL package since 1.18 release. 
+# Removal in ~30 days. Bug #662510
+=dev-libs/efl-1.17.0-r1
+media-libs/elementary
+media-plugins/emotion_generic_players
+media-plugins/evas_generic_loaders
+x11-themes/ethemes
+
+# Virgil Dupras <vdupras@gentoo.org> (22 Jul 2018)
+# Depends on an unsupported version of django (1.8, will be removed soon) and
+# is rendered obsolete by the direct inclusion of django support in
+# >=dev-python/celery-4.0. Removal in 30 days. Bug #661804
+dev-python/django-celery
+
 # Mart Raudsepp <leio@gentoo.org> (16 Jul 2018)
 # Obsolete early GNOME 2 era print libraries. Applications
 # use printing support found directly in x11-libs/gtk+ now.
@@ -133,18 +166,6 @@ dev-python/jaraco-utils
 # for generating new keys and doing key maintenance. Removal in a month
 app-crypt/gkeys-gen
 
-# Pacho Ramos <pacho@gentoo.org> (28 Jun 2018)
-# Doesn't work at all (#645388). Removal in a month
-net-misc/whatportis
-
-# Pacho Ramos <pacho@gentoo.org> (28 Jun 2018)
-# Doesn't work, dead since 2005, bug #658984. Removal in a month.
-dev-python/pyrtf
-
-# Pacho Ramos <pacho@gentoo.org> (28 Jun 2018)
-# Cannot be imported, bug #659410. Removal in a month.
-app-misc/jira-cli
-
 # Andreas Sturmlechner <asturm@gentoo.org> (26 Jun 2018)
 # Mask Qt4 for removal. Bug #631788
 =dev-qt/assistant-4.8.7
@@ -201,17 +222,6 @@ app-i18n/qimhangul
 # Doesn't pass QA full boot test
 =sys-kernel/ck-sources-4.16.17
 
-# Mike Auty <ikelos@gentoo.org> (22 Jun 2018)
-# Not maintained upstream, at least one bug and three upstream bugs
-# Alternatives include gitg and git-cola.
-# Removal in 30 days. Bug #658264
-dev-vcs/giggle
-
-# Matt Turner <mattst88@gentoo.org> (20 Jun 2018)
-# No reverse deps after removal of app-i18n/fbiterm
-# Removal in 30 days. Bug #658528
-x11-libs/libiterm-mbt
-
 # Michał Górny <mgorny@gentoo.org> (20 Jun 2018)
 # Multiple serious bugs.  Upstream does not support Gentoo, and getting
 # any fixes applied is very difficult.  Regularly fails to build.
@@ -221,229 +231,19 @@ x11-libs/libiterm-mbt
 sys-apps/paludis
 
 # Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't work on amd64, upstream dead for ages, bug #254510
-# Removal in a month.
-games-arcade/xevil
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't work (#348124), dead since 2004. Removal in a month.
-x11-plugins/wmlaptop
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Package obsolete since many years ago (#398689). Removal in a month.
-dev-java/servletapi
-dev-java/sun-jacc-api
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Needs a major version bump to stop relying on old versions of other libs
-# (#421427). Removal in a month.
-dev-java/easyneurons
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Upstream dead for ages, relies on dead gstreamer:0.10 (#552528). Removal
-# in a month.
-x11-misc/winswitch
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Obsolete package not needed for a long time, bug #559994. Removal in a
-# month.
-dev-java/jdom-jaxen
-=dev-java/jdom-1.0-r4
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to build, nothing requires it (#561366, #579600, #618936). Removal
-# in a month.
-net-misc/openvpn-auth-ldap
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Upstream dead for a long time, bug #606194. Removal in a month.
-dev-libs/DirectFB
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Not usable anymore after server shutdown (#608806). Removal in a month.
-games-fps/postal2mp-demo
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Segfaults at start (#612322). Removal in a month.
-games-arcade/snake3d
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# tests fail with python >= 3.4 (#620082), nothing requires this package,
-# removal in a month.
-dev-python/eliot
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Not compatible with recent python versions (#624668), needs a major
-# version bump. Removal in a month.
-dev-python/django-two-factor-auth
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to build (#624688). Removal in a month.
-sci-physics/hoomd-blue
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Upstream dead, relies on obsolete gstreamer:0.10. Please use alternatives
-# (like soundconverter) instead (#629182). Removal in a month.
-media-sound/gnac
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to run (#630576). Removal in a month.
-games-simulation/dangerdeep
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# frogr is a good replacement for this old package still relying on dead
-# gnome2 python bindings (#640046). Removal in a month.
-media-gfx/postr
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to fetch (#640584). Removal in a month.
-games-strategy/gorky17-demo
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
 # Dead since 2013, not compatible with latest profiles (#642568). Removal in
 # a month
 net-vpn/miredo
 
 # Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to compile (#648430), crashes from time to time (#222065). Removal
-# in a month.
-app-misc/wyrd
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Not compatible with recent perl, not needed by anything in the tree
-# (#648582). Removal in a month.
-app-doc/mkdoxy
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Not compatible with recent PHP, upstream dead for ages (#650870, #650934)
-#, removal in a month.
-www-apps/gnopaste
-www-apps/openwebstats
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Upstream dead, security vulnerable (#650936). Removal in a month.
-www-apps/phprojekt
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
 # Doesn't run, cannot bump it (#651146). Removal in a month.
 games-emulation/hatari
 
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't work even with current PHP versions, upstream dead (#651148),
-# removal in a month.
-www-apps/mypictures
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't work with PHP7, dead upstream (#651184, #651194), removal in a month.
-www-apps/phpmp
-www-apps/polarblog
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Multiple bugs (#424383, #554944), upstream dead (#651340). Removal in a
-# month.
-net-irc/ircservices
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Dead since 2002, orphan, nothing requires it (#651344). Removal in a
-# month.
-app-text/rhyme
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Dead lib not used by anything in the tree (#652186). Removal in a month.
-net-libs/libwhisker
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Obsolete package for the old documentation system (#653168). Removal in a
-# month.
-app-text/gentoo-guide-xml-dtd
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Dead for ages, nothing requires it, needs klibc (that is also completely
-# unmaintained in our side) (#653390). Removal in a month.
-sys-boot/getdvhoff
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Not needed by anything anymore (#653664). Removal in a month.
-dev-python/pyxml
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Both games crash on start (#653812). Removal in a month.
-games-arcade/marbleblast-demo
-games-arcade/marbleblastgold-demo
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Crashes at start (#653998). Removal in a month.
-games-arcade/skystreets
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Merged in games-emulation/advancemame long time ago (#654286). Removal in
-# a month.
-games-emulation/advancemenu
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# This installs an older GUI than the one provided by fceux package
-# (#654294). Removal in a month.
-games-emulation/gfceux
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Upstream dead for ages, doesn't work on amd64, other distros killed it
-# long time ago (#654302). Removal in a month.
-games-emulation/hugo
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't support amd64, relies on virtual/libstdc++ (#654306). Removal in a
-# month.
-games-emulation/kigb
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Our version is completely outdated, a major version bump and rework of the
-# ebuild is needed (#654336). Removal in a month.
-games-emulation/raine
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Upstream dead for a long time, not compatible with amd64, people can use
-# quake2-icculus with aalib under SDL (#654348). Removal in a month.
-games-fps/aaquake2
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Not required by anything in the tree, upstream disappeared long time ago
-# (#654352). Removal in a month.
-games-fps/doomsday-resources
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to run, use eduke32 instead (#654480). Removal in a month.
-games-fps/duke3d
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't run on amd64, prboom can be used instead (#654482). Removal in a
-# month.
-games-fps/lsdldoom
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to start (#654492). Removal in a month.
-games-fps/soldieroffortune-demo
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Fails to run (#654510). Removal in a month.
-games-puzzle/brainworkshop
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Dead since 2003, not ported ever to amd64 (#654516). Removal in a month.
-games-puzzle/ensemblist
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't run (#654520). Removal in a month.
-games-puzzle/hoh-bin
-
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't run (#654554, #654650). Removal in a month.
-games-sports/miniracer
-games-strategy/heroes3-demo
-
 # Mart Raudsepp <leio@gentoo.org> (16 Jun 2018)
 # No upstream (website disappeared), no upstream plugin maintainer,
 # and pretty much a fringe format anyway.
-# Marked for removal in 30 days, bug #658194
+# Please keep this package.mask entry until at least 16th Sep 2018 for
+# extra notification of the deprecation and replacement. Bug #658194
 media-plugins/gst-plugins-schroedinger
 
 # Mike Gilbert <floppym@gentoo.org> (15 Jun 2018)
@@ -465,15 +265,6 @@ virtual/httpd-php:7.3
 =sys-kernel/vanilla-sources-4.9.104
 =sys-kernel/vanilla-sources-4.4.134
 
-# Michał Górny <mgorny@gentoo.org> (30 May 2018)
-# Gentoo repository mirrors are now running on Gentoo Infastructure,
-# and the key used to sign commits is appropriately part of the regular
-# keyring (>=app-crypt/openpgp-keys-gentoo-release-20180530).  Please
-# upgrade this keyring, and remove the custom sync-openpgp-key-path from
-# your repos.conf to make Portage use the release keys.
-# Removal in 30 days.
-app-crypt/openpgp-keys-gentoo-mirror
-
 # Kent Fredric <kentnl@gentoo.org> (27 May 2018)
 # Subject to Man-in-the-middle security bypass vulnerability.
 # Retained in tree only for users who need older versions
@@ -481,11 +272,6 @@ app-crypt/openpgp-keys-gentoo-mirror
 # Bug: #623942
 <dev-perl/DBD-mysql-4.44.0
 
-# Akinori Hattori <hattya@gentoo.org> (27 May 2018)
-# Dead upstream, for old versions of iBus
-# Masked for removal in 30 days.
-app-i18n/ibus-tutcode
-
 # Matt Turner <mattst88@gentoo.org> (25 May 2018)
 # New package. Needs to interact with media-libs/mesa and
 # x11-drivers/nvidia-drivers. Work in progress.
@@ -514,12 +300,6 @@ media-libs/libglvnd
 # Masked for initial testing
 >=dev-db/mysql-connector-c++-8.0.0
 
-# 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
-
 # Jeroen Roovers <jer@gentoo.org> (6 Apr 2018)
 # Requires >=dev-libs/icu-61.1
 # https://bugs.gentoo.org/651698
@@ -529,13 +309,6 @@ sys-fs/aufs4
 # Requires >=dev-libs/openssl-1.1.0
 =net-libs/nodejs-10*
 
-# Mart Raudsepp <leio@gentoo.org> (30 Mar 2018)
-# GStreamer mp3 decoder plugin based on libmad is removed with gstreamer-1.12.
-# media-plugins/gst-plugins-mpg123 is the suggested replacement.
-# Please keep this package.mask entry until at least 26th June 2018 for
-# extra notification of the deprecation and replacement. Bug #631128.
-media-plugins/gst-plugins-mad:1.0
-
 # Lars Wendler <polynomial-c@gentoo.org> (27 Mar 2018)
 # Breaks a couple of revdeps. See tracker bug at
 # https://bugs.gentoo.org/651698
@@ -677,14 +450,14 @@ sys-kernel/hardened-sources
 # Mats Lidell <matsl@gentoo.org> (17 Aug 2017)
 # Masked ede and all its dependencies due to security reasons.
 # bug #398241
-app-xemacs/ede
-app-xemacs/semantic
-app-xemacs/jde
-app-xemacs/xslt-process
-app-xemacs/xetla
-app-xemacs/cogre
-app-xemacs/ecb
-app-xemacs/xemacs-packages-all
+<=app-xemacs/ede-1.03-r1
+<=app-xemacs/semantic-1.21
+<=app-xemacs/jde-1.52
+<=app-xemacs/xslt-process-1.12
+<=app-xemacs/xetla-1.02
+<=app-xemacs/cogre-1.02
+<=app-xemacs/ecb-1.22
+<=app-xemacs/xemacs-packages-all-2010.07.29
 
 # Kent Fredric <kentnl@gentoo.org> (21 Jul 2017)
 # Masked due to serious regression that introduces widespread data
@@ -695,17 +468,6 @@ app-xemacs/xemacs-packages-all
 # See: https://github.com/perl5-dbi/DBD-mysql/issues/117
 =dev-perl/DBD-mysql-4.42.0
 
-# Ian Stakenvicius <axs@gentoo.org> (19 Jul 2017)
-# Mask spidermonkey:52 as it is a self-rolled release, no official
-# release has been rolled.  Is only committed to support development
-# versions of gjs.  Will unmask when gnome-3.26 is ready for testing
-# or when upstream releases an official tarball.
-dev-lang/spidermonkey:52
-# Lars Wendler <polynomial-c@gentoo.org> (09 May 2018)
-# Depends on masked spidermonkey:52.
-# Please remove both masks together.
->=sys-auth/polkit-0.114
-
 # Nicolas Bock <nicolasbock@gentoo.org> (17 Jul 2017)
 # Keep shotwell development series masked.
 >=media-gfx/shotwell-0.29
@@ -767,8 +529,8 @@ net-wireless/cpyrit-cuda
 # Bernard Cafarelli <voyageur@gentoo.org> (8 May 2017)
 # Coordinated conversion to wxGTK:3.0-gtk3
 # Drop mask after migration of existing wxGTK:3.0 users
-=net-ftp/filezilla-3.33.0-r300
 =net-ftp/filezilla-3.34.0-r300
+=net-ftp/filezilla-3.35.1-r300
 =dev-util/codeblocks-17.12-r300
 =dev-util/codeblocks-17.12-r301
 
@@ -885,7 +647,6 @@ games-action/phobiaii
 games-fps/rtcw
 games-fps/unreal
 games-strategy/heroes3
-games-strategy/heroes3-demo
 games-strategy/smac
 
 # Mikle Kolyada <zlogene@gentoo.org> (27 Jun 2014)
diff --git a/profiles/releases/13.0/package.mask b/profiles/releases/13.0/package.mask
index 378422f5160e..1df5dca362c3 100644
--- a/profiles/releases/13.0/package.mask
+++ b/profiles/releases/13.0/package.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Andreas Sturmlechner <asturm@gentoo.org> (15 Jul 2018)
-# Unmask ICU 58 only for 13.0 based profiles
--<dev-libs/icu-59
--<dev-libs/icu-layoutex-59
-
 # Patrick McLean <chutzpah@gentoo.org> (10 Jul 2018)
 # requires >=nodejs-8.10 which is not available in 13.0 based profiles.
 # Please migrate to one of the 17.0 release profiles
diff --git a/profiles/releases/13.0/package.unmask b/profiles/releases/13.0/package.unmask
new file mode 100644
index 000000000000..9193178ce873
--- /dev/null
+++ b/profiles/releases/13.0/package.unmask
@@ -0,0 +1,7 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Jul 2018)
+# Unmask ICU 58 only for 13.0 based profiles
+<dev-libs/icu-59
+<dev-libs/icu-layoutex-59
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index cb0f13731f3d..0ec0279187b2 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (22 Jul 2018)
+# Required by media-video/shotcut, kde-apps/kdenlive
+>=media-libs/mlt-6.6.0 sdl2
+
 # Andreas Sturmlechner <asturm@gentoo.org> (09 Jun 2018)
 # Required by app-office/libreoffice
 dev-libs/xmlsec nss
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 99baca679f30..c1a30297c48b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -96,7 +96,7 @@ app-admin/pass:dmenu - Add support for x11-misc/dmenu with the 'passmenu' progra
 app-admin/pass:fish-completion - Enable fish completion support.
 app-admin/pass:git - Use dev-vcs/git for password revisions.
 app-admin/pass:importers - Allow importing passwords from other password managers using various contributed scripts.
-app-admin/pass-otp:qrcode - Add support for qtcodes using media-gfx/qrencode
+app-admin/pass-otp:qrcode - Add support for qrcodes using media-gfx/qrencode
 app-admin/passwordsafe:minimal - Avoid collision with app-misc/pwsafe
 app-admin/passwordsafe:qr - Enable QR code password display
 app-admin/passwordsafe:xml - Enable XML import support
@@ -813,6 +813,7 @@ app-i18n/mozc:renderer - Enable native candidate window
 app-i18n/pyzy:boost - Enable support for dev-libs/boost
 app-i18n/pyzy:doc - Generate API documentation
 app-i18n/pyzy:opencc - Enable support for app-i18n/opencc
+app-i18n/rime-data:extra - Install extra packages
 app-i18n/scim:gtk3 - Enable support for x11-libs/gtk+:3
 app-i18n/scim-anthy:gtk3 - Enable support for x11-libs/gtk+:3
 app-i18n/scim-anthy:kasumi - Use Anthy dictionary maintenance tool (app-dicts/kasumi)
@@ -1027,6 +1028,7 @@ app-misc/screenfetch:X - Use the media-gfx/scrot package to take screenshots
 app-misc/skim:tmux - Install sk-tmux script to run skim in a tmux pane
 app-misc/skim:vim - Install vim plugin for skim
 app-misc/sphinx:id64 - use 64-bit document and word IDs
+app-misc/sphinx:mariadb - Add mariadb database support
 app-misc/sphinx:re2 - use the dev-libs/re2 regular expression library
 app-misc/sphinx:stemmer - Enable language stemming support
 app-misc/task:sync - Enable "task sync" support
@@ -2072,24 +2074,6 @@ dev-lang/swi-prolog:uuid - Use ossp-uuid for UUID pack
 dev-lang/swi-prolog:yaml - Use libyaml for YAML pack
 dev-lang/swig:ccache - build ccache-swig(a fast compiler cache)
 dev-lang/yap:R - Enable support for connecting R to Prolog
-dev-libs/DirectFB:bmp - build BMP image provider
-dev-libs/DirectFB:divine - enable DiVine
-dev-libs/DirectFB:drmkms - build with DRM/KMS support
-dev-libs/DirectFB:dynload - enable dynload support
-dev-libs/DirectFB:egl - build with EGL support
-dev-libs/DirectFB:fusiondale - enable FusionDale
-dev-libs/DirectFB:fusionsound - enable FusionSound
-dev-libs/DirectFB:gles2 - build gles2 gfxdriver
-dev-libs/DirectFB:imlib2 - build Imlib2 image provider
-dev-libs/DirectFB:input_hub - provides an asynchronous interface to the input devices available and those being added/removed
-dev-libs/DirectFB:mpeg2 - build MPEG2 image provider
-dev-libs/DirectFB:mpeg3 - build Libmpeg3 video provider
-dev-libs/DirectFB:multicore - enable multicore support
-dev-libs/DirectFB:pnm - build PNM (PBM/PGM/PPM) image provider
-dev-libs/DirectFB:sawman - enable SaWMan (window manager and application manager)
-dev-libs/DirectFB:swfdec - build Swfdec (Flash decoder) video provider
-dev-libs/DirectFB:tremor - build Ogg/Vorbis music provider using Tremor
-dev-libs/DirectFB:webp - build WebP image provider
 dev-libs/ace:ciao - Include Component Intergraced Ace ORB into the build of ace
 dev-libs/ace:tao - Include the ACE ORB (CORBA stuff) (called tao) into the build of ace
 dev-libs/actor-framework:benchmarks - Due to the number of out-of-tree deps, these only get installed as docs
@@ -2163,7 +2147,6 @@ 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
 dev-libs/efl:tga - Enable Tga image loader
-dev-libs/efl:tgv - Enable TGV image loader
 dev-libs/efl:tslib - Enable x11-libs/tslib for touchscreen events
 dev-libs/efl:unwind - Enable debug support via sys-libs/libunwind
 dev-libs/efl:valgrind - Enable usage of dev-util/valgrind in debug
@@ -2605,8 +2588,8 @@ dev-python/django-cms:snippet - Install djangocms snippet plugin
 dev-python/django-cms:teaser - Install djangocms teaser plugin
 dev-python/django-cms:video - Install djangocms video plugin
 dev-python/django-tastypie:bip - An optional serialiser dev-python/biplist
-dev-python/django-two-factor-auth:yubikey - Adds support for Yubikeys via django-otp-yubikey
 dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
+dev-python/fabric:fab2 - Install as "fab2", allowing side-by-side install with fabric 1.x
 dev-python/falcon:cython - Build cython-based python modules
 dev-python/fastparquet:brotli - Enable support for brotli compression
 dev-python/fastparquet:lz4 - Enable support for lz4 compression
@@ -2714,6 +2697,7 @@ dev-python/sympy:pyglet - Use dev-python/pyglet for plots and print preview
 dev-python/sympy:symengine - Add support for a dev-python/symengine backend
 dev-python/sympy:texmacs - Add app-office/texmacs interface
 dev-python/sympy:theano - Add support for dev-python/theano
+dev-python/tappy:yaml - Pull dependencies needed to support YAML blocks associated with test results.
 dev-python/translate-toolkit:html - Support conversion between po and html files
 dev-python/translate-toolkit:ical - Support conversion between po and ical files
 dev-python/translate-toolkit:ini - Support conversion between po and ini files
@@ -2890,6 +2874,7 @@ dev-ruby/faraday_middleware:oauth - Include FaradayMiddleware::OAuth
 dev-ruby/faraday_middleware:parsexml - Include FaradayMiddleware::ParseXml
 dev-ruby/faraday_middleware:rashify - Include FaradayMiddleware::Rashify
 dev-ruby/maruku:highlight - Enable source code highlighting via dev-ruby/syntax
+dev-ruby/mysql2:mariadb - Use mariadb bindings
 dev-ruby/net-ssh:sodium - Use dev-libs/libsodium via dev-ruby/rbnacl for Ed25519 support
 dev-ruby/rails:asset-pipeline - Also install the default components for the asset pipeline. These are not required but they are activated automatically in new Rails projects by default.
 dev-ruby/rrdtool-bindings:graph - Enable support for graphing functions
@@ -2913,7 +2898,7 @@ dev-scheme/kawa:frontend - Build "kawa" front-end program using sys-libs/readlin
 dev-scheme/kawa:jemacs - Build JEmacs
 dev-scheme/kawa:krl - Build BRL emulation and KRL
 dev-scheme/kawa:sax - Assume SAX2 is available with dev-java/sax
-dev-scheme/kawa:servlets - Build support for generating servlets with dev-java/servletapi
+dev-scheme/kawa:servlets - Build support for generating servlets with Java servletapi
 dev-scheme/kawa:swing - Assume Swing is available
 dev-scheme/kawa:xqtests - Support XQuery Test Suite
 dev-scheme/racket:futures - Enable racket/future library for fine-grained hardware parallelism
@@ -3236,9 +3221,9 @@ games-board/stockfish:optimize - Enable upstream -O3 optimizations (default enab
 games-board/tablebase-syzygy:6-pieces - Install tablebases for 6 pieces (huge!)
 games-board/xboard:default-font - Install the default font that xboard uses
 games-board/xboard:zippy - Enable experimental zippy client
+games-emulation/dolphin:discord-presence - Enables Discord Rich Presence, show the current game on Discord
 games-emulation/dolphin:egl - Enable EGL support
 games-emulation/dolphin:evdev - Enable evdev input support
-games-emulation/dolphin:llvm - Enable the LLVM-based disassembler for debugger mode
 games-emulation/dolphin:log - Increase logging output
 games-emulation/dolphin:lto - Add support for link-time optimizations.
 games-emulation/dosbox:glide - Enable unofficial Glide emulation via media-libs/openglide
@@ -3305,8 +3290,6 @@ games-fps/doomsday:freedoom - Install launcher for doom1.wad from games-fps/free
 games-fps/doomsday:heretic - Install launcher for jheretic game
 games-fps/doomsday:hexen - Install launcher for jhexen game
 games-fps/doomsday:tools - Build additional tools such as doomsday-shell, md2tool and texc
-games-fps/duke3d:demo - Install the demo files
-games-fps/duke3d:pic - disable optimized assembly code that is not PIC friendly
 games-fps/duke3d-data:gog - Extract the data from the GOG.com installer.
 games-fps/eduke32:demo - Install the Duke Nukem 3D demo files, provided by games-fps/duke3d-demodata.
 games-fps/eduke32:fluidsynth - Install media-libs/sdl2-mixer with fluidsynth support.
@@ -3321,9 +3304,6 @@ 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/lsdldoom:freedoom - Install games-fps/freedoom wad file
-games-fps/lsdldoom:net - Enables network game support
-games-fps/lsdldoom:shareware - Install games-fps/doom-data for shareware wad file
 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)
@@ -3359,6 +3339,7 @@ games-fps/xonotic:ode - Enable support for physics engine from dev-games/ode
 games-fps/yamagi-quake2:client - Build client
 games-fps/yamagi-quake2:ctf - Build support for the 'Capture The Flag' addon
 games-fps/yamagi-quake2:rogue - Build support for the 'Ground Zero' Mission Pack
+games-fps/yamagi-quake2:softrender - Build software renderer
 games-fps/yamagi-quake2:xatrix - Build support for the 'The Reckoning' Mission Pack
 games-misc/katawa-shoujo:system-renpy - Use games-engines/renpy instead of the bundled one (experimental)
 games-misc/little-inferno:bundled-libs - Use bundled libraries.
@@ -4275,6 +4256,7 @@ media-libs/gstreamer:orc - Disable some PaX memory protections to allow plugins
 media-libs/gstreamer:unwind - Enable sys-libs/libunwind usage for better backtrace support in leaks tracer module
 media-libs/harfbuzz:glib - Compile with GLib Unicode support
 media-libs/harfbuzz:graphite - Use graphite to render complex non-Roman writing systems
+media-libs/imlib2:shm - Use MIT shared memory support for X image transfer.
 media-libs/jbig2enc:webp - Add support for WEBP image format
 media-libs/leptonica:utils - Install command-line utilities
 media-libs/leptonica:webp - Adds support for the WebP image format
@@ -4592,6 +4574,7 @@ media-sound/alsa-utils:libsamplerate - install utils that use libsamplerate (e.g
 media-sound/alsa-utils:ncurses - install utils that use ncurses (e.g. alsamixer)
 media-sound/alsaplayer:id3tag - Enables ID3 tagging with id3tag library
 media-sound/amsynth:dssi - Enable support for DSSI Soft Synth Interface
+media-sound/apulse:pa-headers - Install PulseAudio headers
 media-sound/aqualung:ifp - Enable support for iRiver iFP portable audio players
 media-sound/aqualung:lua - Enable support for programmable title formatting with dev-lang/lua
 media-sound/aqualung:mac - Enable support for decoding Monkey's Audio files
@@ -4788,9 +4771,8 @@ media-sound/pulseaudio:doc - Build the doxygen-described API documentation.
 media-sound/pulseaudio:equalizer - Enable the equalizer module (requires sci-libs/fftw).
 media-sound/pulseaudio:gconf - Ensure gnome-base/gconf is present for pulseaudio GConf to GSettings module automatic migration (keeping the user configuration)
 media-sound/pulseaudio:gdbm - Use sys-libs/gdbm to store PulseAudio databases. Recommended for desktop usage. This flag causes the whole package to be licensed under GPL-2 or later.
-media-sound/pulseaudio:glib - Add support to dev-libs/glib-based mainloop for the libpulse client library, to allow using libpulse on glib-based programs.
+media-sound/pulseaudio:glib - Add support to dev-libs/glib-based mainloop for the libpulse client library, to allow using libpulse on glib-based programs. Build the GSettings PA module.
 media-sound/pulseaudio:gnome - Use GConf to store user preferences on streams and so on. Don't enable this flag if you want to use a system wide instance. If unsure, enable this flag.
-media-sound/pulseaudio:gsettings - Use GSettings instead of GConf to store user preferences.
 media-sound/pulseaudio:native-headset - Build with native HSP backend for bluez 5.
 media-sound/pulseaudio:ofono-headset - Build with oFono HFP backend for bluez 5, requires net-misc/ofono.
 media-sound/pulseaudio:oss - Enable OSS sink/source (output/input). Deprecated, upstream does not support this on systems where other sink/source systems are available (i.e.: Linux). The padsp wrapper is now always build if the system supports OSS at all.
@@ -7590,7 +7572,6 @@ sci-physics/hepmc:cm - Build with cm instead of default mm for length units
 sci-physics/hepmc:gev - Build with GeV instead of default MeV for momentum units
 sci-physics/herwig++:c++11 - Build Herwig++ using the C++11 standard. Experimental feature, not for production use.
 sci-physics/herwig++:fastjet - Adds support for sci-physics/fastjet
-sci-physics/hoomd-blue:cuda - Enable cuda non-bonded kernels
 sci-physics/lammps:cuda - Enable cuda non-bonded kernels
 sci-physics/lammps:lammps-memalign - Enables the use of the posix_memalign() call instead of malloc() when large chunks or memory are allocated by LAMMPS. Aliengnment is on 16 byte boundaries.
 sci-physics/lhapdf:octave - Add bindings for sci-mathematics/octave
@@ -7989,7 +7970,7 @@ sys-cluster/ceph:libaio - Use libaio as asynchronous input/output library
 sys-cluster/ceph:libatomic - Use libatomic instead of builtin atomic operations
 sys-cluster/ceph:lttng - Add support for LTTng
 sys-cluster/ceph:mgr - Build the ceph-mgr daemon
-sys-cluster/ceph:mgr-frontend - Build/install the mgr/dashboard frontend with npm
+sys-cluster/ceph:mgr-frontend - Build the mgr/dashboard frontend with npm, this is not required for the frontend to work
 sys-cluster/ceph:nss - Use dev-libs/nss for cryptography
 sys-cluster/ceph:radosgw - Add radosgw support
 sys-cluster/ceph:system-boost - Use system dev-libs/boost instead of the bundled one
@@ -8238,22 +8219,6 @@ sys-freebsd/freebsd-usbin:audit - Build auditing tools.
 sys-freebsd/freebsd-usbin:floppy - Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).
 sys-freebsd/freebsd-usbin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP).
 sys-freebsd/freebsd-usbin:zfs - Enable ZFS support.
-sys-fs/aufs3:debug - Enable additional debugging support
-sys-fs/aufs3:fuse - Enable fuse support
-sys-fs/aufs3:hfs - Enable hfs support
-sys-fs/aufs3:inotify - Enable inotify support
-sys-fs/aufs3:kernel-patch - Patch the current kernel for aufs3 support
-sys-fs/aufs3:nfs - Enable support for nfs export
-sys-fs/aufs3:pax_kernel - Apply patch needed for pax enabled kernels
-sys-fs/aufs3:ramfs - Enable initramfs/rootfs support
-sys-fs/aufs4:debug - Enable additional debugging support
-sys-fs/aufs4:fuse - Enable fuse support
-sys-fs/aufs4:hfs - Enable hfs support
-sys-fs/aufs4:inotify - Enable inotify support
-sys-fs/aufs4:kernel-patch - Patch the current kernel for aufs3 support
-sys-fs/aufs4:nfs - Enable support for nfs export
-sys-fs/aufs4:pax_kernel - Apply patch needed for pax enabled kernels
-sys-fs/aufs4:ramfs - Enable initramfs/rootfs support
 sys-fs/btrfs-progs:convert - Build ext2 conversion utility (btrfs-convert)
 sys-fs/btrfs-progs:reiserfs - Enable reiserfs support in btrfs-convert tool.
 sys-fs/btrfs-progs:static - Build static binaries in addition to the dynamic ones
@@ -8320,8 +8285,6 @@ sys-fs/squashfs-tools:lz4 - Enable support for LZ4 compression using app-arch/lz
 sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
 sys-fs/squashfs-tools:zstd - Enable support for ZSTD compression using app-arch/zstd
 sys-fs/squashfuse:lz4 - Enable support for lz4 compression
-sys-fs/udev:firmware-loader - Enable the userspace firmware loader (DEPRECATED, replaced by the in-kernel loader starting from 3.8)
-sys-fs/udev:gudev - Build the gobject interface library
 sys-fs/udev:kmod - Enable kernel module loading/unloading support using sys-apps/kmod
 sys-fs/udisks:cryptsetup - Enable sys-fs/cryptsetup support
 sys-fs/udisks:elogind - Use sys-auth/elogind for session tracking
@@ -8365,6 +8328,7 @@ sys-libs/db:rpc - Enable rpc client/server
 sys-libs/freeipmi:nagios - Install a nagios plugin to check sensors' status.
 sys-libs/gdbm:berkdb - enable compatibility layer for UNIX-like dbm and ndbm interfaces
 sys-libs/gdbm:exporter - enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9
+sys-libs/glibc:cet - Enable Intel Control-flow Enforcement Technology (needs binutils 2.29 and gcc 8)
 sys-libs/glibc:compile-locales - build *all* locales in src_install; this is generally meant for stage building only as it ignores /etc/locale.gen file and can be pretty slow
 sys-libs/glibc:debug - When USE=hardened, allow fortify/stack violations to dump core (SIGABRT) and not kill self (SIGKILL)
 sys-libs/glibc:gd - build memusage and memusagestat tools
@@ -8892,6 +8856,7 @@ x11-misc/fbpager:xrender - Enable transparency support via x11-libs/libXrender
 x11-misc/gpaste:applet - Enable gpaste-applet
 x11-misc/gpaste:gnome - Enable proper gnome support and enable gnome shell extension.
 x11-misc/gtkdialog:glade - Enable support for gnome-base/libglade
+x11-misc/gtkdialog:gtk3 - Build with GTK+3 instead of GTK+2
 x11-misc/gtkdialog:vte - Enable support for x11-libs/vte
 x11-misc/i3status:filecaps - Linux capabilities library is required for i3status to be able to read net bandwith
 x11-misc/ktsuss:sudo - Use the sudo backend instead the su one