gentoo resync : 09.06.2018

25 files changed, 129 insertions, 139 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c27cdf48266b..b7c013429d51 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index d46392a89773..9dc1afa26544 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
+# Needs sys-apps/fakechroot which isn't keyworded
+app-arch/rpm test
+
+# Tomáš Mózes <hydrapolic@gmail.com> (05 Jun 2018)
+# Unkeyworded dependencies.
+app-admin/syslog-ng amqp mongodb
+
 # Thomas Deutschmann <whissi@gentoo.org> (02 Jun 2018)
 # Needs dev-ruby/asciidoctor which has a lot of unstable deps
 net-analyzer/wireshark doc
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 4ee4d9f04da2..1de040a58101 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -57,7 +57,7 @@ app-doc/doxygen clang
 dev-perl/GD fcgi
 media-libs/libcanberra gnome
 media-libs/mesa vaapi
-media-sound/pulseaudio equalizer qt4 realtime
+media-sound/pulseaudio equalizer qt4 qt5 realtime
 media-video/ffmpeg celt ebur128 kvazaar libilbc openh264
 media-video/ffmpeg rubberband sdl ssh x265 zeromq zimg
 net-libs/gnutls idn
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 1ca36a8d4f3d..48ae66bb3eb1 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -62,3 +62,8 @@ USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86"
 # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
 # by non-multilib ebuilds when non-native ABIs are disabled.
 IUSE_IMPLICIT="abi_x86_64"
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2 Jun 2017)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 649c65331dde..2b54cc864822 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -36,9 +36,6 @@ app-emulation/winetricks
 app-office/ooextras
 dev-embedded/libftd2xx
 dev-embedded/openocd
-dev-lang/icc
-dev-lang/idb
-dev-lang/ifc
 dev-util/android-ndk
 dev-util/android-sdk-update-manager
 dev-util/android-studio
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index cbe1c0f8f654..a8638afdd530 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
+# Needs sys-apps/fakechroot which isn't keyworded
+app-arch/rpm test
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# net-wireless/soapysdr not keyworded
+net-wireless/gr-osmosdr soapy
+
 # Markus Meier <maekke@gentoo.org> (30 May 2018)
 # unkeyworded deps for bug #621434
 net-analyzer/zmap mongo
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index f985ef0637e5..df725d4fdf2a 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -17,6 +17,11 @@ LIBDIR_arm64="lib64"
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
 
+# Mart Raudsepp <leio@gentoo.org> (5 Jun 2018)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
+
 # Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index fc75fc61cf83..c859a1044c81 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
+# Needs sys-apps/fakechroot which isn't keyworded
+app-arch/rpm test
+
+# Alex Bennee <alex@bennee.com> (31 May 2018)
+# bunch of dev-perl packages not yet keyworded
+# and the i3 ebuild currently has RESTRICT="test" due to upstream bug
+x11-wm/i3 test
+
 # Mart Raudsepp <leio@gentoo.org> (30 May 2018)
 # app-text/pandoc not keyworded yet
 app-emulation/xen-tools doc
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index dbfa5efa2134..0f0509dd7730 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -10,6 +10,11 @@ CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
 
+# Sergei Trofimovich <slyfox@gentoo.org> (3 Jun 2017)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
+
 # Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
 # Set ABI & DEFAULT_ABI consistently with ${ARCH}, to make ebuild
 # checks simpler.
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index d38ac61fcce9..acf5931ca845 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
 
+# Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
+# Needs sys-apps/fakechroot which isn't keyworded
+app-arch/rpm test
+
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unkeyworded deps.
 net-misc/curl curl_ssl_axtls
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 051dd2a3ae48..1a3eba7d3b0b 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,18 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (08 Jun 2018)
+# Requires unported sys-libs/netbsd-csu
+sys-devel/clang-runtime crt
+
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (08 Jun 2018)
+# sys-devel/llvmgold not yet keyworded
+sys-devel/llvm gold
+
+# Tomáš Mózes <hydrapolic@gmail.com> (05 Jun 2018)
+# Unkeyworded dependencies.
+app-admin/syslog-ng mongodb
+
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
 # media-libs/libaom not yet keyworded
 media-video/vlc aom
@@ -111,10 +123,6 @@ sys-auth/polkit kde
 sys-block/gparted kde
 virtual/notification-daemon kde
 
-# Davide Pesavento <pesa@gentoo.org> (06 Jun 2016)
-# Requires unkeyworded dev-python/PyQt5
-net-print/hplip qt5
-
 # Johannes Huber <johu@gentoo.org> (26 Mar 2016)
 # Unkeyworded dependency x11-libs/snorenotify
 net-irc/quassel snorenotify
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 2072793be339..3b9295ec5153 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# dev-python/PyQt5 is not stable.
+net-print/hplip qt5
+
 # Andreas Sturmlechner <asturm@gentoo.org> (15 Mar 2018)
 # Requires media-libs/portmidi which is not stable
 media-sound/hydrogen portmidi
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index ba62d2f2003d..9cef2886a2d9 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -5,10 +5,6 @@
 # kde-frameworks/kdelibs4support not keyworded on ppc
 x11-wm/sawfish kde
 
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Feb 2018)
-# Requires not yet keyworded dependencies
-sys-libs/gwenhywfar sensors serialport webkit
-
 # Andreas Sturmlechner <asturm@gentoo.org> (29 Jan 2018)
 # Requires media-libs/libffado, which requires dev-python/PyQt5,
 # which is not keyworded.
@@ -45,7 +41,7 @@ sys-devel/clang-runtime openmp
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (01 Aug 2016)
 # dev-qt/qtwebkit:5 and kde-frameworks/*:5 not keyworded.
-net-irc/kvirc kde webkit
+net-irc/kvirc kde
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (28 Jun 2016)
 # Missing keywords on app-text/gspell - bug #587368
@@ -57,14 +53,6 @@ media-plugins/audacious-plugins qt5
 net-analyzer/wireshark qt5
 sci-astronomy/stellarium sound
 
-# Davide Pesavento <pesa@gentoo.org> (06 Jun 2016)
-# Requires unkeyworded dev-qt/qtwebkit:5, which is a PITA to maintain on
-# minor arches and has been declared deprecated by upstream. So we'd like
-# to avoid keywording it, unless requested by users.
-dev-qt/designer webkit
-net-irc/quassel webkit
-kde-plasma/libksysguard detailedmemory
-
 # James Le Cuirot <chewi@gentoo.org> (30 Jan 2016)
 # scrollview requires Java, which is unsupported on ppc.
 app-text/tesseract scrollview
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 19da80b5d443..c0aa19b0062b 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# Requires not yet stable dependencies
+sys-libs/gwenhywfar sensors serialport webkit
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# dev-qt/qtwebkit:5 is not stable.
+dev-qt/designer webkit
+
 # Michael Weber <xmw@gentoo.org> (01 Mar 2017)
 # Mask until >sys-cluster/ceph-0.94 goes stable
 net-analyzer/rrdtool rados
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index aadc14726b50..d1eed069ec84 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -58,10 +58,6 @@ net-analyzer/rrdtool rados
 # Missing keywords on deps #567458
 kde-apps/kalzium editor
 
-# Michael Palimaka <kensington@gentoo.org> (17 Oct 2015)
-# Unkeyworded dependencies
-dev-qt/qtwebkit webchannel
-
 # Ben de Groot <yngwin@gentoo.org> (20 Jul 2015)
 # missing keywords
 media-sound/audacity midi soundtouch
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 74ad5000a41e..35aa1a46e827 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,10 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mikle Kolyada <zlogene@gentoo.org> (03 Jun 2018)
+# Not tested
+app-crypt/pinentry fltk
+dev-python/cssselect doc
+dev-vcs/subversion kwallet
+
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
 media-libs/mesa vulkan
 
+# Robin H. Johnson <robbat2@gentoo.org> (05 Aug 2017)
+# Upstream Git is switching to PCRE2 w/ JIT.
+# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
+dev-vcs/git pcre-jit
+
+# Lars Wendler <polynomial-c@gentoo.org> (17 Nov 2016)
+# jit not supported on ia64 (bug #600052).
+dev-libs/libpcre2 jit
+
 # Sergey Popov <pinkbyte@gentoo.org> (24 Oct 2015)
 # Not tested
 net-mail/dovecot lz4
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index bf9dbcfa2b33..c361207bea32 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -50,6 +50,7 @@ directfb
 lirc
 java
 hardened
+qt5
 
 # Needs java
 pdfannotextractor
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 2e9b5fa264c6..d11e26fedd16 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -46,3 +46,8 @@ ABI_X86="32"
 # Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
 # Temporary entry to support stable bug 639476
 RUBY_TARGETS="ruby22"
+
+# Thomas Deutschmann <whissi@gentoo.org> (6 Jun 2018)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 5ba559abf262..884fbc406423 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
 
+# Michał Górny <mgorny@gentoo.org> (07 Jun 2018)
+# sys-libs/netbsd-csu not stable yet.
+sys-devel/clang-runtime crt
+
 # Thomas Deutschmann <whissi@gentoo.org> (01 Jun 2018)
 # Needs dev-ruby/asciidoctor which has a lot of unstable deps
 net-analyzer/wireshark doc
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index 82dd641f675f..468564c334a9 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -20,9 +20,6 @@ app-emulation/winetricks
 app-text/acroread
 dev-embedded/libftd2xx
 dev-embedded/openocd
-dev-lang/icc
-dev-lang/idb
-dev-lang/ifc
 dev-perl/Archive-Rar
 dev-util/android-sdk-update-manager
 dev-util/android-ndk
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index 2e28bee7cd74..62a977ee8dd1 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -37,9 +37,6 @@ app-emulation/winetricks
 app-text/acroread
 dev-embedded/libftd2xx
 dev-embedded/openocd
-dev-lang/icc
-dev-lang/idb
-dev-lang/ifc
 dev-perl/Archive-Rar
 dev-util/android-sdk-update-manager
 dev-util/android-studio
diff --git a/profiles/package.mask b/profiles/package.mask
index a4915d46e026..39e704066339 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Lars Wendler <polynomial-c@gentoo.org> (9 June 2018)
+# Causes high system load when being used with kde or gnome print manager.
+# https://bugs.gentoo.org/657526
+=net-print/cups-2.2.8
+
+# Daniel Pielmeier <billie@gentoo.org> (8 June 2018)
+# Does not support PyQt5 as well as python 3. Upstream unresponsive.
+# Masked for removal in 30 days. Bug #649112.
+media-sound/puddletag
+
 # Mike Pagano <mpagano@gentoo.org> (30 May 2018)
 # Masking due to bad commit in the networking stack.
 =sys-kernel/gentoo-sources-4.14.46
@@ -212,36 +222,6 @@ net-dns/dnssec-system-tray
 # Use dev-libs/memcached istead. Removal in 30 days.
 dev-libs/libmemcache
 
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4. Masked for removal in 30 days.
-dev-python/pyside-tools:0
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, does not build, needs someone to bump to Qt5.
-# Masked for removal in 30 days. Bugs #588892, #588898, #649656
-media-libs/libprojectm-qt
-media-sound/projectm-pulseaudio
-media-sound/projectm-jack
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, no revdeps. Masked for removal in 30 days.
-dev-libs/sni-qt
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, dead upstream.
-# Masked for removal in 30 days. Bugs #408651, #642950, #651622
-media-gfx/structure-synth
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, dead upstream.
-# Masked for removal in 30 days. Bug #640258
-dev-util/valkyrie
-
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, severely outdated, no one does the bump.
-# Masked for removal in 30 days. Bugs #489190, #648666
-media-gfx/ipe
-
 # Hans de Graaff <graaff@gentoo.org> (7 May 2018)
 # Old slots that are ruby23-only and no longer maintained
 # upstream, and that do not have packages depend on them.
@@ -261,11 +241,6 @@ dev-ruby/twitter:5
 >=media-libs/coin-4.0.0
 >=media-libs/simage-1.7.1
 
-# Mikle Kolyada <zlogene@gentoo.org> (4 May 2018)
-# Upstream is dead, no maintainer, no longer updated.
-# Masked for removal in 30 days
-games-misc/fortune-mod-gentoo-ru
-
 # Mike Gilbert <floppym@gentoo.org> (30 Apr 2018)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.
@@ -275,12 +250,6 @@ games-misc/fortune-mod-gentoo-ru
 # Masked for testing
 =dev-libs/libressl-2.7*
 
-# Mikle Kolyada <zlogene@gentoo.org> (27 Apr 2018)
-# Upstream is dead, the site with the sources is down.
-# There's no chance to get the sources (fetch restricted)
-# Removal in 30 days (bug #642866)
-app-emulation/armv8-fast-model
-
 # Hans de Graaff <graaff@gentoo.org> (27 Apr 2018)
 # No longer supported upstream. Use ruby23 instead.
 # Masked for removal in 30 days. Bug #642258.
@@ -292,35 +261,6 @@ dev-ruby/tzinfo:0
 # Package version depends on Qt-5.10 that was/is/will not be in tree.
 >=sci-misc/mendeleydesktop-1.18
 
-# Michał Górny <mgorny@gentoo.org> (26 Apr 2018)
-# Apparently redundant to built-in Python features.  Homepage gone
-# without trace.  Last release in 2003.  No reverse dependencies.
-# Removal in 30 days.  Bug #537720.
-dev-python/iconvcodec
-
-# Michał Górny <mgorny@gentoo.org> (26 Apr 2018)
-# Does not work with any of the unmasked django versions.  Unmaintained.
-# No reverse dependencies.  Removal in 30 days.  Bug #527176.
-dev-python/django-evolution
-
-# Michał Górny <mgorny@gentoo.org> (26 Apr 2018)
-# Produces a lot of Pango warnings, then segfaults.  Unmaintained.
-# No reverse dependencies.  Removal in 30 days.  Bug #526668.
-dev-python/kiwi
-
-# Michał Górny <mgorny@gentoo.org> (26 Apr 2018)
-# Obsolete package used during some past GSoC development
-# and unmaintained since.  All of its users have retired already.
-# No reverse dependencies.  The ebuild runs test suite of CPython
-# instead of its own.  Removal in 30 days.  Bug #526552.
-dev-python/tdaemon
-
-# Michał Górny <mgorny@gentoo.org> (22 Apr 2018)
-# Unmaintained buggy package with unresearched segfaults.  No support
-# for Python 3.  No reverse dependencies.
-# Removal in 30 days.  Bug #454680.
-dev-python/simpleparse
-
 # Alexis Ballier <aballier@gentoo.org> (21 Apr 2018)
 # Needs porting of revdeps
 # See: https://bugs.gentoo.org/653678
@@ -337,28 +277,6 @@ dev-python/simpleparse
 sys-fs/aufs3
 sys-fs/aufs4
 
-# Michał Górny (03 Apr 2018)
-# Starting with sys-apps/sandbox-2.13+, unloading is possible via
-# disabling (SANDBOX_ON=0) + wiping LD_PRELOAD. This renders the tool
-# obsolete. Removal in 30 days.
-app-portage/unsandbox
-
-# Matthias Maier <tamiko@gentoo.org> (3 Apr 2018)
-# Remove old Intel C/C++/Fortran compiler ebuilds. These packages require
-# to acquire a non-commercial license by Intel and download "Intel Parallel
-# Studio" in ancient versions (3+ years old). Current versions (as of 2018)
-# can be found in the ::science overlay.
-#
-# Corresponding eclass/intel-sdp eclass slated for removal as well.
-#
-# Masked for removal in 30 days.
-<dev-lang/icc-18
-<dev-lang/ifc-18
-dev-lang/idb
-<dev-libs/intel-common-18
-<sci-libs/ipp-18
-sci-chemistry/cyana
-
 # Jeroen Roovers <jer@gentoo.org> (6 Apr 2018)
 # Requires >=dev-libs/icu-61.1
 # https://bugs.gentoo.org/651698
@@ -398,12 +316,6 @@ media-plugins/gst-plugins-mad:1.0
 # that do not make it any more working. Bug #651030.
 >=sys-devel/distcc-3.3
 
-# Georgy Yakovlev <ya@sysdump.net> (13 Mar 2018)
-# 1.x version is no longer maintained by upstream
-# 2.x is in the tree and is better in almost every way
-# Removal in 90 days. Bug #650464
-=net-dns/dnscrypt-proxy-1.9.5-r1
-
 # Sebastian Pipping <sping@gentoo.org> (11 Mar 2018)
 # Breaks XFCE, 1.19.6 was fine (in that regard). Bug #650228
 >=x11-base/xorg-server-1.19.7
diff --git a/profiles/prefix/windows/cygwin/package.use b/profiles/prefix/windows/cygwin/package.use
index e115972f7c11..e84dda26175c 100644
--- a/profiles/prefix/windows/cygwin/package.use
+++ b/profiles/prefix/windows/cygwin/package.use
@@ -3,7 +3,7 @@
 
 # Michael Haubenwallner <haubi@gentoo.org> (14 May 2018)
 # stack protector does not fully work on Cygwin yet
-=sys-devel/gcc-6* -ssp
+sys-devel/gcc -ssp
 
 # Michael Haubenwallner <haubi@gentoo.org> (23 Mar 2017)
 # Using nettle hides a conflict between wincrypt and openssl.
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
index b6003491e016..3c036af7321b 100644
--- a/profiles/updates/2Q-2018
+++ b/profiles/updates/2Q-2018
@@ -10,3 +10,5 @@ move ros-meta/geometry_experimental ros-meta/geometry2
 slotmove =dev-ruby/websocket-driver-0.7.0 0 0.7
 move kde-plasma/oxygen-fonts media-fonts/oxygen-fonts
 move media-libs/vulkan-tools dev-util/vulkan-tools
+move games-strategy/ufo-ai games-strategy/ufoai
+slotmove =net-mail/getmail-5.4 4 0
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 14dd30861bc8..42f496546a76 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -280,7 +280,6 @@ app-cdr/brasero:packagekit - Enable support for the distro-neutral package manag
 app-cdr/brasero:playlist - Enable support for playlists through dev-libs/totem-pl-parser
 app-cdr/brasero:tracker - Enable audio playlist search using the app-misc/tracker indexer
 app-cdr/cdemu:cdemu-daemon - Pull app-cdr/cdemu-daemon dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.
-app-cdr/cuetools:extras - Install additional script that tag files based on cue/toc file information
 app-cdr/dvdisaster:debug - Enable memory debugging.
 app-cdr/gaffitter:scripts - Install additional gaffitter scripts for external programs
 app-cdr/mirage2iso:pinentry - Support app-crypt/pinentry password input backend.
@@ -458,6 +457,9 @@ app-emulation/bochs:debugger - Enable debugger (slows down emulation)
 app-emulation/bochs:gdb - Enable support for the remote GDB stub
 app-emulation/bochs:x86-64 - Enable support for emulation of 64-bit CPUs
 app-emulation/containerd:btrfs - Support for BTRFS snapshot driver
+app-emulation/cri-o:btrfs - Enables dependencies for the "btrfs" graph driver, including necessary kernel flags.
+app-emulation/cri-o:device-mapper - Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags.
+app-emulation/cri-o:ostree - Enables dependencies for handling of OSTree images.
 app-emulation/crossover-bin:capi - Enable ISDN support via CAPI
 app-emulation/crossover-bin:opencl - Enable OpenCL support
 app-emulation/docker:apparmor - Enable AppArmor support.
@@ -1951,6 +1953,7 @@ dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readli
 dev-lang/ruby:rubytests - Install ruby tests that can only be run after ruby is installed
 dev-lang/rust:extended - Build and install rls, rustfmt and cargo alongside the compiler and stdlib
 dev-lang/rust:jemalloc - Use dev-libs/jemalloc as the standard memory allocator
+dev-lang/rust:wasm - Build support for the wasm32-unknown-unknown target
 dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
 dev-lang/smlnj:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
 dev-lang/spidermonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
@@ -2064,6 +2067,7 @@ dev-libs/efl:xpresent - Enable x11-libs/libXpresent support
 dev-libs/elfutils:lzma - Support automatic decompression of LZMA-compressed files and kernel images
 dev-libs/elfutils:threads - Build the libraries with thread safe support
 dev-libs/elfutils:utils - Install command-line utilities (all the eu-* programs)
+dev-libs/ell:glib - Enable dev-libs/glib support
 dev-libs/fcgi:html - Install HTML documentation
 dev-libs/folks:telepathy - Load contacts from the Telepathy framework
 dev-libs/folks:tracker - Load contacts from app-misc/tracker index
@@ -2267,7 +2271,6 @@ dev-libs/weston:ivi - Enable the IVI shell
 dev-libs/weston:launch - Install weston-launch utility
 dev-libs/weston:rdp - Enable Remote Desktop Protocol compositor support
 dev-libs/weston:resize-optimization - Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi
-dev-libs/weston:rpi - Raspberry Pi GPU support
 dev-libs/weston:screen-sharing - Enable screen-sharing through RDP
 dev-libs/weston:unwind - Enable libunwind usage for backtraces
 dev-libs/weston:wayland-compositor - Enable Wayland compositor support
@@ -2500,7 +2503,9 @@ dev-python/django-two-factor-auth:yubikey - Adds support for Yubikeys via django
 dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
 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
 dev-python/fastparquet:snappy - Enable support for snappy compression
+dev-python/fastparquet:zstd - Enable support for zstandard compression
 dev-python/flask-restful:paging - Enable resource paging support
 dev-python/geopy:timezone - Enables localized date support
 dev-python/geopy:yahoo - Enables use of YahooPlaceFinder
@@ -2600,7 +2605,6 @@ 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/tdaemon:coverage - Enable code coverage support
 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
@@ -2943,6 +2947,8 @@ dev-util/nvidia-cuda-sdk:opencl - Build OpenCL binaries
 dev-util/nvidia-cuda-toolkit:debugger - Installs the CUDA debugger
 dev-util/nvidia-cuda-toolkit:eclipse - Install plugins for eclipse
 dev-util/nvidia-cuda-toolkit:profiler - Installs the NVIDIA CUDA visual profiler
+dev-util/ostree:grub - Enable grub configuration generator
+dev-util/ostree:soup - Use libsoup for networking
 dev-util/perf:demangle - Enable C++ symbol name demangling, using libbfd from sys-devel/binutils. When this flag is enabled, the package will have to be rebuilt after every version bump of binutils.
 dev-util/perf:doc - Build documentation and man pages. With this USE flag disabled, the --help parameter for perf and its sub-tools will not be available. This is optional because it depends on a few documentation handling tools that are not always welcome on user systems.
 dev-util/perf:numa - Enable NUMA support
@@ -3317,7 +3323,9 @@ games-strategy/megaglest:tools - Build model import/export tools
 games-strategy/megaglest:unicode - Use unicode strings for wxwidgets
 games-strategy/megaglest:wxuniversal - Use the wxUniversal port which implements the various GUI controls by drawing them itself
 games-strategy/naev:mixer - Enables media-libs/sdl-mixer sound backend in addition to media-libs/openal one.
-games-strategy/ufo-ai:editor - Build map editor
+games-strategy/ufoai:client - Build the main game client
+games-strategy/ufoai:editor - Build the map editor and compiler
+games-strategy/ufoai:server - Build the dedicated server
 games-strategy/uqm:music - download and install music files (large)
 games-strategy/uqm:remix - download and install music remix files (large)
 games-strategy/uqm:voice - download and install voice files (large)
@@ -3955,8 +3963,6 @@ media-gfx/digikam:marble - Enable support for geolocation using kde-apps/marble
 media-gfx/digikam:mediaplayer - Enable support for media player using media-libs/qtav
 media-gfx/digikam:panorama - Build the panorama plugin which requires media-gfx/hugin
 media-gfx/digikam:semantic-desktop - Enable kde-frameworks/kfilemetadata support
-media-gfx/enblend:gpu - GPU support for Enblend
-media-gfx/enblend:image-cache - allow for processing of large images
 media-gfx/eog-plugins:map - Enable world map display using media-libs/libchamplain
 media-gfx/eog-plugins:picasa - Enable uploading to Google's Picasa Web Albums
 media-gfx/eom:gtk3 - Build with GTK+3 instead of GTK+2
@@ -4647,6 +4653,7 @@ media-sound/pulseaudio:equalizer - Enable the equalizer module (requires sci-lib
 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: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.
@@ -5471,8 +5478,6 @@ net-dns/bind-tools:gssapi - Enable gssapi support
 net-dns/bind-tools:urandom - Use /dev/urandom instead of /dev/random
 net-dns/ddclient:cloudflare - Enable support for updating IP address via CloudFlare
 net-dns/ddclient:hardened - Use iproute2 instead of ifconfig to grab an IP address
-net-dns/dnscrypt-proxy:plugins - Enable plugin support to inspect and modify queries and responses
-net-dns/dnscrypt-proxy:systemd - Use systemd's socket activation instead of creating the sockets itself
 net-dns/dnsdist:dnscrypt - Enable the ability to act as a DNSCrypt server
 net-dns/dnsdist:regex - Enable support for regular expression matching via dev-libs/re2
 net-dns/dnsdist:remote-logging - Enable support for remote logging via dev-libs/protobuf
@@ -6884,6 +6889,7 @@ net-wireless/bladerf-fpga:x115 - bitstream for the x115KLE Cyclone IV FPGA blade
 net-wireless/bladerf-fpga:x40 - bitstream for the x40KLE Cyclone IV FPGA bladerf model"
 net-wireless/blueman:appindicator - Enable usage of dev-libs/libappindicator to export menu options
 net-wireless/blueman:network - Add functionality to setup (host) PAN connections using either net-dns/dnsmasq or net-misc/dhcp
+net-wireless/bluez:btpclient - Enable BTP client
 net-wireless/bluez:deprecated - Build deprecated plugins
 net-wireless/bluez:experimental - Build experimental plugins
 net-wireless/bluez:extra-tools - Install tools that upstream doesn't install on purpose by default. All this tools shouldn't be used. Then, please notify upstream about you still need them to let them know the situation.
@@ -8494,6 +8500,12 @@ www-plugins/gnash:ssl - Enable directly using OpenSSL in libnet (not needed for
 www-plugins/lightspark:gles - Replace default OpenGL renderer with GLESv2
 www-plugins/lightspark:ppapi - Install the PPAPI plugin (for Chromium)
 www-plugins/lightspark:rtmp - Enable Real Time Messaging Protocol using librtmp
+www-plugins/passff:firefox - Install plugin for www-client/firefox
+www-plugins/passff:firefox-bin - Install plugin for www-client/firefox-bin
+www-plugins/passff-host:chrome - Install plugin for chrome (which also includes opera)
+www-plugins/passff-host:chromium - Install plugin for chromium
+www-plugins/passff-host:firefox - Install plugin for firefox
+www-plugins/passff-host:vivaldi - Install plugin for vivaldi
 www-servers/apache:apache2_modules_access_compat - Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.
 www-servers/apache:apache2_modules_authn_core - Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).
 www-servers/apache:apache2_modules_authz_core - Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.