12 files changed, 79 insertions, 66 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2af2cd7919dd..43713473bfa9 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 738bca79d0d9..88364d688d62 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -12,7 +12,7 @@ mail-client/mutt notmuch
 >=dev-python/ipython-5.4.1 notebook qt5 smp
 
 # NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for arm
+# net-libs/libmicrodns not yet keyworded for arm, bug #653800
 media-video/vlc microdns
 
 # Andreas Sturmlechner <asturm@gentoo.org> (04 Feb 2018)
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index e0f915bea877..206d918e84d9 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -48,7 +48,7 @@ www-servers/lighttpd memcached
 x11-misc/xscreensaver gdm
 
 # NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for arm64
+# net-libs/libmicrodns not yet keyworded for arm64, bug #653800
 media-video/vlc microdns
 
 # Michał Górny <mgorny@gentoo.org> (28 Feb 2018)
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 6caf19197d90..a4caf255c0df 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/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 use.mask
 
+# Matt Turner <mattst88@gentoo.org> (22 Apr 2018)
+# media-gfx/gimp is ~hppa only
+gimp
+
 # Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
 # Mask qt4, qt5 for stabilisation timeout, bug #620334
 qt5
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 34b87e8547d0..2555d54d3e90 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -18,7 +18,7 @@ app-emulation/qemu capstone
 >=dev-python/ipython-5.4.1 qt5 smp
 
 # NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for ppc
+# net-libs/libmicrodns not yet keyworded for ppc, bug #653800
 media-video/vlc microdns
 
 # Amy Liffey <amynka@gentoo.org (21 Jan 2018)
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index ab73cb222f1a..7f3d00880ab9 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,3 +1,7 @@
+# Mikle Kolyada <zlogene@gentoo.org> (24 Apr 2018)
+# no stable net-misc/aria2 on ppc
+aria2
+
 # Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
 # no stable versions on ppc
 clisp
diff --git a/profiles/arch/powerpc/use.stable.mask b/profiles/arch/powerpc/use.stable.mask
index a82a542b8c22..59721c214c6d 100644
--- a/profiles/arch/powerpc/use.stable.mask
+++ b/profiles/arch/powerpc/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 use.mask
 
+# Matt Turner <mattst88@gentoo.org> (25 Apr 2018)
+# Dropped stable keywords
+octave
+
 # Pacho Ramos <pacho@gentoo.org> (17 Apr 2014)
 # Dropped stable keywords after the discussion caused by
 # Gnome 3.8/3.10 stabilization on this arch
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index b85dd8afd7b5..faab89ba17bd 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 Apr 2018)
+# 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
diff --git a/profiles/package.mask b/profiles/package.mask
index 2354e843d03c..32a2d53c800d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,49 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (27 Apr 2018)
+# No longer supported upstream. Use ruby23 instead.
+# Masked for removal in 30 days. Bug #642258.
+dev-lang/ruby:2.2
+virtual/ruby
+dev-ruby/tzinfo:0
+
+# Andreas Sturmlechner <asturm@gentoo.org> (26 Apr 2018)
+# 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
+
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (26 Apr 2018)
+# Merged into >=dev-cpp/gtest-1.8.0.
+# Masked for removal in 30 days.
+dev-cpp/gmock
+
+# Andreas Sturmlechner <asturm@gentoo.org> (26 Apr 2018)
+# Depends on dead Qt4, no more revdeps. Masked for removal in 30 days.
+dev-libs/qjson
+
 # Michał Górny <mgorny@gentoo.org> (22 Apr 2018)
 # Unmaintained buggy package with unresearched segfaults.  No support
 # for Python 3.  No reverse dependencies.
@@ -201,6 +244,10 @@ sci-chemistry/cyana
 # https://bugs.gentoo.org/651698
 =net-libs/nodejs-9.11*
 
+# Jeroen Roovers <jer@gentoo.org> (6 Apr 2018)
+# Requires >=dev-libs/openssl-1.1.0
+=net-libs/nodejs-10*
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (3 Apr 2018)
 # Merged into >=dev-db/m17n-db-1.7.0.
 # Masked for removal in 30 days.
@@ -354,10 +401,6 @@ app-backup/holland-backup-mysql-lvm
 app-backup/holland-backup-mysqlhotcopy
 
 # Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
-# Forces downgrade of mock (#643506). Removal in a month.
-dev-python/django-social-auth
-
-# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
 # Requires old psycopg (#643614). Removal in a month.
 dev-python/adodb-py
 
@@ -395,11 +438,6 @@ dev-python/jenkins-autojobs
 media-video/cpdvd
 
 # Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
-# No reverse deps, not working properly with python3 (#646718). Removal in a
-# month.
-dev-python/async
-
-# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
 # Relies on dead libs, upstream dead for ages, buggy (#647486). Removal in a
 # month.
 gnome-extra/gpointing-device-settings
@@ -437,11 +475,6 @@ www-apps/collectd-web
 # this old themes (#650744). Removal in a month.
 media-gfx/qingy-themes
 
-# Matt Turner <mattst88@gentoo.org> (17 Mar 2018)
-# Dead. Unlikely to be of any use today. Removal in 30 days.
-# Bug #415611
-x11-misc/Xorgautoconfig
-
 # Lars Wendler <polynomial-c@gentoo.org> (17 Mar 2018)
 # Dead upstream. Authors not reachable. Unclear license situation.
 # Masked for removal in 30 days. See bug #650746
@@ -461,7 +494,7 @@ games-fps/alephone-infinity
 # Broken for a long time (#587806). Removal in a month.
 app-text/zemberek-server
 app-text/zpspell
- 
+
 # Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
 # Hans de Graaff <graaff@gentoo.org> (1 Jun 2014)
 # Mask new rubinius version for testing. This needs more work
@@ -471,11 +504,6 @@ app-text/zpspell
 dev-lang/rubinius
 
 # Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
-# Dead since 2002, many alternatives better maintained in the tree
-# (#590056). Removal in a month.
-x11-terms/hanterm
-
-# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
 # Obsoleted by sys-cluster/drbd-utils many time ago (#590872). Removal in a
 # month.
 sys-cluster/drbd
@@ -513,11 +541,6 @@ dev-vcs/bzr-git
 games-board/freedoko
 
 # Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
-# Obsolete and with security vulnerabilities for a long time (#603760).
-# Removal in a month.
-www-apps/sugarcrm
-
-# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
 # Version in the tree really old, multiple build failures (#604556, #604580,
 # #604586). Removal in a month.
 net-misc/pavuk
@@ -528,11 +551,6 @@ net-misc/pavuk
 app-misc/cwiid
 
 # Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
-# ebuild needs fixing (#612916), upstream dead since 2006. Removal in a
-# month.
-mail-filter/anomy-sanitizer
-
-# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
 # ebuild needs fixing (#612998), our version is completely outdated
 # (#592836). Removal in a month.
 dev-util/bluej
@@ -543,16 +561,6 @@ dev-util/bluej
 media-gfx/k3d
 
 # Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
-# Not compatible with current NetworkManager versions, use net-misc/networkmanager-libreswan
-# instead (#615142). Removal in a month.
-net-misc/networkmanager-openswan
-
-# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
-# Dead for years, many alternatives in the tree (#616146). Removal in a
-# month.
-net-firewall/gshield
-
-# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
 # Not buildable (#616674). Removal in a month.
 app-laptop/powerprefs
 
@@ -579,11 +587,6 @@ dev-games/crystalspace
 =net-dns/dnscrypt-proxy-1.9.5-r1
 
 # Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
-# Upstream dead for a long time, requires obsolete gstreamer and other old
-# libs (#629192), buggy (#490344). Removal in a month.
-media-tv/me-tv
-
-# Pacho Ramos <pacho@gentoo.org> (13 Mar 2018)
 # Major version bump pending (#540322), current version in the tree is
 # completely broken in several ways (#471428, #598260, #621784, #638364).
 # Removal in a month.
@@ -726,11 +729,6 @@ games-kids/crayon-physics
 # Depends on dead Qt4. Last-rites on hold for chance of Qt5-port. Bug #620702
 <media-gfx/freecad-0.18
 
-# Mike Gilbert <floppym@gentoo.org> (05 Nov 2017)
-# Breaks several reverse dependencies.
-# https://bugs.gentoo.org/635934
->=dev-util/scons-3.0.0
-
 # Patrice Clement <monsieurp@gentoo.org> (28 Oct 2017)
 # Missing dependencies.
 >=dev-python/scrapy-1.4.0
@@ -836,7 +834,7 @@ dev-lang/spidermonkey:52
 
 # Nicolas Bock <nicolasbock@gentoo.org> (17 Jul 2017)
 # Keep shotwell development series masked.
->=media-gfx/shotwell-0.27
+>=media-gfx/shotwell-0.29
 
 # Nicolas Bock <nicolasbock@gentoo.org> (31 Oct 2017)
 # There are multiple unresolved upstream issues with >=jabref-bin-4.0 (#636036).
@@ -903,11 +901,6 @@ net-wireless/cpyrit-cuda
 =net-ftp/filezilla-3.30.0-r300
 =net-ftp/filezilla-3.31.0-r300
 
-# Lars Wendler <polynomial-c@gentoo.org> (24 Mar 2017)
-# Masked until Mozilla and Chrome agreed how to handle
-# Symantec trust issues properly (bug #613714)
-=app-misc/ca-certificates-20161130.3.30-r1
-
 # Mart Raudsepp <leio@gentoo.org> (16 Feb 2017)
 # Old gstreamer 0.10 version, which is security vulnerable.
 # Use gstreamer:1.0 with media-plugins/gst-plugins-libav
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
index 49ce4ec28a5b..87eaba8c3a3a 100644
--- a/profiles/updates/2Q-2018
+++ b/profiles/updates/2Q-2018
@@ -4,3 +4,4 @@ move gnome-extra/gnome-builder dev-util/gnome-builder
 move kde-apps/kstars sci-astronomy/kstars
 move media-video/kamoso kde-apps/kamoso
 move app-backup/kbackup kde-apps/kbackup
+move x11-proto/xcb-proto x11-base/xcb-proto
diff --git a/profiles/use.desc b/profiles/use.desc
index 860efe224b26..078226b92250 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -178,7 +178,7 @@ libcaca - Add support for colored ASCII-art graphics
 libedit - Use the libedit library (replacement for readline)
 libffi - Enable support for Foreign Function Interface library
 libnotify - Enable desktop notification support
-libressl - Use dev-libs/libressl instead of dev-libs/openssl as SSL/TLS provider (ineffective with USE=-ssl), packages should not depend on this USE flag
+libressl - Use dev-libs/libressl instead of dev-libs/openssl when applicable (see also the ssl useflag)
 libsamplerate - Build with support for converting sample rates using libsamplerate
 libwww - Add libwww support (General purpose WEB API)
 lirc - Add support for lirc (Linux's Infra-Red Remote Control)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 12d8a34716c5..47c6c46a6dac 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -382,7 +382,6 @@ app-editors/emacs:gzip-el - Compress bundled Emacs Lisp source
 app-editors/emacs:imagemagick - Use media-gfx/imagemagick for image processing
 app-editors/emacs:libxml2 - Use dev-libs/libxml2 to parse XML instead of the internal Lisp implementations
 app-editors/emacs:mailutils - Retrieve e-mail using net-mail/mailutils instead of the internal movemail substitute
-app-editors/emacs:pax_kernel - Enable building under a PaX enabled kernel
 app-editors/emacs:source - Install C source files and make them available for find-function
 app-editors/emacs:toolkit-scroll-bars - Use the selected toolkit's scrollbars in preference to Emacs' own scrollbars
 app-editors/emacs:wide-int - Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size.
@@ -2248,8 +2247,6 @@ dev-libs/poco:pocodoc - POCO documentation generator
 dev-libs/poco:util - Several utility classes (like logger, timer, config file parser)
 dev-libs/poco:zip - Add support for the zip & gz archive formats
 dev-libs/ppl:lpsol - Build the ppl_lpsol linear programming problem solver
-dev-libs/protobuf:java - Builds the Java implementation. This is not needed for Java support in protoc.
-dev-libs/protobuf:python - Builds the Python implementation. This is not needed for Python support in protoc.
 dev-libs/softhsm:migration-tool - Build db migration tool
 dev-libs/starpu:cuda - Enable NVIDIA CUDA toolkit support
 dev-libs/starpu:gcc-plugin - Enable GCC extension plugin (experimental)
@@ -2482,6 +2479,7 @@ dev-python/QtPy:pyqt5 - Enable the dev-python/PyQt5 backend
 dev-python/QtPy:pyside - Enable the dev-python/pyside backend
 dev-python/QtPy:svg - Build bindings for the QtSvg module
 dev-python/QtPy:testlib - Build bindings for the QtTest module
+dev-python/QtPy:webengine - Build bindings for the QtWebEngine module
 dev-python/QtPy:webkit - Build bindings for the QtWebKit module
 dev-python/amqplib:extras - Install extra tools to generate initial Python mod from an AMQP XML file
 dev-python/anyvc:bazaar - Add support for Bazaar
@@ -2611,6 +2609,7 @@ dev-python/simplecv:shell - Enable the iPython SimpleCV shell
 dev-python/simplespectral:faster - Use sci-libs/scipy to speed up drawing
 dev-python/simplespectral:fastest - Use dev-python/pyFFTW to speed up drawing to the max
 dev-python/sphinx:net - enable internet capabilities
+dev-python/spyder:webengine - Build bindings for the QtWebEngine module
 dev-python/sympy:imaging - Add support for dev-python/pillow
 dev-python/sympy:ipython - Add support for dev-python/ipython
 dev-python/sympy:mathml - Add support for mathml
@@ -3094,7 +3093,7 @@ games-arcade/moleinvasion:music - Download and install the music files
 games-arcade/oshu:osu-skin - Include more complete osu-skin (other is minimal)
 games-arcade/performous:midi - Enable MIDI I/O support
 games-arcade/performous:songs - Install a few demo songs
-games-arcade/performous:tools - Install tools
+games-arcade/performous:tools - Enable building of song extraction utilities for SingStar and Guitar Hero
 games-arcade/performous:webcam - Enable Webcam support
 games-arcade/savagewheels:fmod - Enable the fmod music and sound effects library
 games-arcade/slimevolley:net - Enable network support
@@ -4716,7 +4715,6 @@ media-sound/qmmp:tray - Build tray icon
 media-sound/qsampler:libgig - Enable libgig support for loading Gigasampler files and DLS (Downloadable Sounds) Level 1/2 files
 media-sound/qtractor:dssi - Enable support for DSSI Soft Synth Interface
 media-sound/qtractor:rubberband - Enable support for in-place audio clip pitch-shifting through the rubberband library
-media-sound/qtscrobbler:cli - Build commandline client
 media-sound/quark:gnome - Provides tray-icon and enables gconf support
 media-sound/rhythmbox:daap - Build the local network music sharing plugin which uses the DAAP protocol using net-libs/libdmapsharing
 media-sound/rhythmbox:visualizer - Enable support for visualizations using media-plugins/gst-plugins-libvisual
@@ -6732,7 +6730,8 @@ net-p2p/mldonkey:gnutella - enable gnutella and gnutella2 support
 net-p2p/mldonkey:guionly - enable client build only
 net-p2p/mldonkey:magic - enable use of libmagic
 net-p2p/ppcoind:logrotate - Use app-admin/logrotate for rotating logs
-net-p2p/pybitmessage:opencl - Uses dev-python/pyopencl for GPU acceleration.
+net-p2p/pybitmessage:opencl - Enable dev-python/pyopencl for GPU acceleration
+net-p2p/pybitmessage:qrcode - Enable dev-python/qrcode for QR code support
 net-p2p/qbittorrent:webui - Enable the Web UI
 net-p2p/resilio-sync:pax_kernel - Use paxctl to mark binaries
 net-p2p/retroshare:cli - Enables the CLI version of RetroShare
@@ -7182,6 +7181,7 @@ sci-libs/ViSP:ois - Enables dev-games/ois support via ogre.
 sci-libs/ViSP:opencv - Enables media-libs/opencv support.
 sci-libs/ViSP:tutorials - Installs tutorials.
 sci-libs/ViSP:zbar - Enables barcodes reading.
+sci-libs/adolc:boost - Use the boost allocator from dev-libs/boost
 sci-libs/adolc:sparse - Add support for sparse matrix algebra with sci-libs/colpack
 sci-libs/armadillo:arpack - Link with sci-libs/arpack libraries for eigen decomposition
 sci-libs/armadillo:mkl - Use matrix allocation from the Intel MKL sci-libs/mkl
@@ -7827,6 +7827,7 @@ sys-boot/refind:hfs - Builds the EFI binary hfs filesystem driver
 sys-boot/refind:iso9660 - Builds the EFI binary iso9660 filesystem driver
 sys-boot/refind:ntfs - Builds the EFI binary ntfs filesystem driver
 sys-boot/refind:reiserfs - Builds the EFI binary reiserfs filesystem driver
+sys-boot/woeusb:minimal - Install only woeusb tool
 sys-cluster/ceph:babeltrace - Add support for LTTng babeltrace
 sys-cluster/ceph:cephfs - Build support for cephfs, a POSIX compatible filesystem built on top of ceph
 sys-cluster/ceph:cryptopp - Use dev-libs/crypto++ for cryptography
@@ -8216,6 +8217,7 @@ sys-libs/gwenhywfar:webkit - Enable support for dev-qt/qtwebkit
 sys-libs/libblockdev:bcache - Enable block device cache support.
 sys-libs/libblockdev:cryptsetup - Enable sys-fs/cryptsetup support
 sys-libs/libblockdev:dmraid - Support for dmraid devices, also known as ATA-RAID, or Fake RAID.
+sys-libs/libblockdev:escrow - Support for building crypto plugin with escrow device support
 sys-libs/libblockdev:kbd - Enable kernel block device support.
 sys-libs/libblockdev:lvm - Enable support for Logical Volume Management via sys-fs/lvm2.
 sys-libs/libcxx:libcxxabi - Build on top of sys-libs/libcxxabi instead of gcc's libsupc++ (avoids depending on gcc).
@@ -8668,6 +8670,7 @@ x11-libs/libaosd:pango - Enable the textual helpers (requires pangocairo).
 x11-libs/libaosd:tools - Install the aosd_cat tool (requires glib-2.0).
 x11-libs/libdesktop-agnostic:gconf - Enable GConf as configuration backend
 x11-libs/libdesktop-agnostic:glade - Install the Glade catalog for the desktop-agnotstic GTK widgets.
+x11-libs/libdlo:test-program - Build the program for testing Displaylink devices
 x11-libs/libdrm:libkms - Enable building of libkms, a library for applications to interface with KMS
 x11-libs/libdrm:valgrind - Compile in valgrind memory hints
 x11-libs/libfm:automount - Use gnome-base/gvfs for automounting