6 files changed, 18 insertions, 9 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5c4c7b5bd904..65d45ee3fdee 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 147012d31d75..c2480a6987c5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (14 May 2018)
+# All current releases do not install, as well as the latest nightly
+# build upstream (dated July 2017).  Last upstream activity around
+# May 2017.  Masked for removal in 30 days.  Bug #638478.
+dev-lang/ekopath
+
 # Andreas Sturmlechner <asturm@gentoo.org> (12 May 2018)
 # Depends on dead Qt4, upstream TRAC and SVN dead. No maint. response.
 # Masked for removal in 30 days, bugs #645418, #591866, #574244.
diff --git a/profiles/prefix/aix/package.unmask b/profiles/prefix/aix/package.unmask
index 9419418bd1b9..7dbad76ea3e6 100644
--- a/profiles/prefix/aix/package.unmask
+++ b/profiles/prefix/aix/package.unmask
@@ -10,7 +10,3 @@
 # Michael Haubenwallner <haubi@gentoo.org> (14 Apr 2014)
 # Endless loop while compiling gcc-4.2.4 for yet unknown reason.
 ~sys-devel/make-4.0
-
-# Fabian Groffen <grobian@gentoo.org> (04 Apr 2007)
-# This is the only linker for AIX
--sys-devel/native-cctools
diff --git a/profiles/prefix/windows/cygwin/package.use b/profiles/prefix/windows/cygwin/package.use
index 9439b6ac23c0..e115972f7c11 100644
--- a/profiles/prefix/windows/cygwin/package.use
+++ b/profiles/prefix/windows/cygwin/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (14 May 2018)
+# stack protector does not fully work on Cygwin yet
+=sys-devel/gcc-6* -ssp
+
 # Michael Haubenwallner <haubi@gentoo.org> (23 Mar 2017)
 # Using nettle hides a conflict between wincrypt and openssl.
 app-arch/libarchive nettle
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
index 08e0ef5e53d0..9effb4e77c8a 100644
--- a/profiles/updates/2Q-2018
+++ b/profiles/updates/2Q-2018
@@ -7,3 +7,4 @@ move app-backup/kbackup kde-apps/kbackup
 move x11-proto/xcb-proto x11-base/xcb-proto
 move dev-db/xtrabackup-bin dev-db/percona-xtrabackup-bin
 move ros-meta/geometry_experimental ros-meta/geometry2
+slotmove =dev-ruby/websocket-driver-0.7.0 0 0.7
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cf54c2624f7b..9756b40649b1 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1948,10 +1948,8 @@ dev-lang/ruby:jemalloc - Use dev-libs/jemalloc for memory allocation.
 dev-lang/ruby:rdoc - Install dev-ruby/rdoc after installing Ruby.
 dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readline extension, used for instance by the irb tool. This flag is meaningful only if the libedit USE flag is disabled. If neither libedit nor readline USE flags are enabled, the readline extension will not be built (and irb will lose line editing functionality).
 dev-lang/ruby:rubytests - Install ruby tests that can only be run after ruby is installed
-dev-lang/rust:clang - Use sys-devel/clang for building
 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:libcxx - Use sys-libs/libcxx as standard library when building with sys-devel/clang
 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)
@@ -5025,7 +5023,6 @@ media-video/mpv:rubberband - Enable high quality pitch correction via media-libs
 media-video/mpv:sdl - Enable media-libs/libsdl2 based video and audio outputs (Note: these outputs exist for compatibility reasons only, avoid if possible)
 media-video/mpv:tools - Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv
 media-video/mpv:uchardet - Enable subtitles charset discovery via app-i18n/uchardet
-media-video/mpv:vf-dlopen - Install additional video filters to be used with -vf dlopen
 media-video/noad:libmpeg2 - Support for libmpeg2 library
 media-video/nvidia-settings:gtk3 - Additionally build the GTK 3 library
 media-video/nvidia_video_sdk:tools - Build and install example tools.
@@ -5308,14 +5305,19 @@ net-analyzer/pchar:pcap - Use the net-libs/libpcap library
 net-analyzer/pinger:gtk2 - Install the gtkpinger GUI utility based on x11-libs/gtk+:2
 net-analyzer/pinger:gtk3 - Install the gtkpinger GUI utility based on x11-libs/gtk+:3
 net-analyzer/pmacct:64bit - Use 64bit counters instead of 32bit ones
+net-analyzer/pmacct:bgp-bins - Link BGP daemon binaries
+net-analyzer/pmacct:bmp-bins - Link BMP daemon binaries
 net-analyzer/pmacct:geoipv2 - Enable support for GeoIP2 through dev-libs/libmaxminddb
 net-analyzer/pmacct:jansson - Enable support for JSON through dev-libs/jansson
 net-analyzer/pmacct:kafka - Enable support for Apache Kafka through dev-libs/librdkafka
+net-analyzer/pmacct:l2 - Enable Layer-2 features and support
 net-analyzer/pmacct:mongodb - Enable support for MongoDB through dev-libs/mongo-c-driver
 net-analyzer/pmacct:ndpi - Enable support for nDPI through net-libs/nDPI
 net-analyzer/pmacct:nflog - Enable support for NFLOG through uacctd
+net-analyzer/pmacct:plabel - Enable IP prefix labels
 net-analyzer/pmacct:rabbitmq - Enable support for RabbitMQ through net-libs/rabbitmq-c
-net-analyzer/pmacct:ulog - Enable support for ULOG in older kernels (deprecated)
+net-analyzer/pmacct:st-bins - Link Streaming Telemetry daemon binaries
+net-analyzer/pmacct:traffic-bins - Link IPv4/IPv6 traffic accounting binaries
 net-analyzer/pmacct:zmq - Enable support for ZeroMQ through net-libs/zeromq
 net-analyzer/pnp4nagios:icinga - Build against net-analyzer/icinga2 or net-analyzer/icinga instead of net-analyzer/nagios-core
 net-analyzer/pnp4nagios:nagios - Build against net-analyzer/nagios-core (the default)
@@ -7810,6 +7812,7 @@ sys-cluster/ceph:radosgw - Add radosgw support
 sys-cluster/ceph:system-boost - Use system dev-libs/boost instead of the bundled one
 sys-cluster/ceph:xfs - Add xfs support
 sys-cluster/ceph:zfs - Add zfs support
+sys-cluster/charliecloud:pv - Use sys-apps/pv to enable progress bar functionality
 sys-cluster/charm:ampi - Build implementation of MPI on top of Charm++
 sys-cluster/charm:charmdebug - Enable the charm debugger
 sys-cluster/charm:charmproduction - Optimize performance of Charm++ runtime
@@ -8682,7 +8685,6 @@ x11-misc/polybar:ipc - Add support for Inter-Process Messaging
 x11-misc/polybar:mpd - Add support for Music Player Daemon
 x11-misc/polybar:network - Enable network support
 x11-misc/qt5ct:dbus - Enable system tray and global menu support
-x11-misc/qt5ct:systray - Enable system tray support
 x11-misc/redshift:geoclue - Control dependency on app-misc/geoclue
 x11-misc/rofi:windowmode - Enable normal window mode
 x11-misc/rss-glx:quesoglc - Enable support for OpenGL Character Renderer