7 files changed, 23 insertions, 59 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f26398883da1..bd6d5bce6764 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index c63af8b7a2b7..d50e4b8f1ddd 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (04 May 2018)
+# sci-libs/mpir fails tests, bug 640424
+dev-python/gmpy mpir
+
 # Michał Górny <mgorny@gentoo.org> (01 May 2018)
 # More non-stable dependencies.
 dev-python/urllib3 test
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 701bfd515b9f..5c26824c66cd 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -206,11 +206,6 @@ media-video/parole clutter
 # Needs patch to even build, subs are broken and not supported anymore.
 media-video/mpv libav
 
-# Maciej Mrozowski <reavertm@gmail.com> (15 Jun 2017)
-# Mask due to bug #621810
-dev-games/simgear gdal
-games-simulation/flightgear gdal
-
 # Michał Górny <mgorny@gentoo.org> (05 Jun 2017)
 # (on behalf of Treecleaner project)
 # dev-libs/dee is masked for removal, mask flags that requires it.
diff --git a/profiles/desc/grub_platforms.desc b/profiles/desc/grub_platforms.desc
index eaff3072c419..ef7153c971a4 100644
--- a/profiles/desc/grub_platforms.desc
+++ b/profiles/desc/grub_platforms.desc
@@ -9,7 +9,7 @@ coreboot - Coreboot platform support
 efi-32 - EFI 32 bit platform support (Old MACs)
 efi-64 - EFI 64 bit platform support
 emu - Emulation platform support
-ieee1275 - IEEE1275 pltaform support
+ieee1275 - IEEE1275 platform support
 loongson - MIPS loongson platform support
 multiboot - Multiboot platform support
 pc - PC platform support
diff --git a/profiles/package.mask b/profiles/package.mask
index 9a8f0a752c5d..56dafd525683 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,11 @@
 
 #--- END OF EXAMPLES ---
 
+# 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.
@@ -78,11 +83,6 @@ dev-python/kiwi
 # 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
@@ -103,10 +103,6 @@ x11-libs/xpyb
 x11-proto/printproto
 x11-libs/libXp
 
-# Andreas Sturmlechner <asturm@gentoo.org> (21 Apr 2018)
-# Package moved into kde-apps/kate as a feature. Masked for removal.
-kde-misc/ktexteditorpreviewplugin
-
 # Alexis Ballier <aballier@gentoo.org> (21 Apr 2018)
 # Needs porting of revdeps
 # See: https://bugs.gentoo.org/653678
@@ -199,16 +195,6 @@ sci-chemistry/avogadro
 # Masked for removal in 30 days.
 xfce-extra/xfce-theme-manager
 
-# Andreas Sturmlechner <asturm@gentoo.org> (06 Apr 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days. Bugs #644478
-x11-libs/libqxt
-
-# Andreas Sturmlechner <asturm@gentoo.org> (06 Apr 2018)
-# Dead upstream, dead homepage, depends on dead Qt4.
-# Masked for removal in 30 days. Bugs #642448, #636472
-media-video/bdsup2sub++
-
 # 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
@@ -246,21 +232,6 @@ sci-chemistry/cyana
 # 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.
-dev-db/m17n-contrib
-
-# Aaron Bauman <bman@gentoo.org> (1 Apr 2018)
-# Unmaintained upstream. Relies on old PHP. EAPI=0.
-# Masked for removal in 30 days.
-www-apps/freeradius-dialupadmin
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (30 Mar 2018)
-# Fails to build (bug 408463). EAPI=3 (bug 648452).
-# Masked for removal in 30 days.
-dev-scheme/ikarus
-
 # 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.
@@ -318,11 +289,6 @@ sys-libs/uclibc
 net-libs/webkit-gtk:2
 net-libs/webkit-gtk:3
 
-# Steve Dibb <beandog@gentoo.org> (22 Feb 2018)
-# Dead upstream, long since replaced by libaacs for functionality.
-# Masked for removal in 30 days. Bug #648560
-media-video/aacskeys
-
 # Eray Aslan <eras@gentoo.org> (08 Feb 2018)
 # Mask experimental software
 =mail-mta/postfix-3.4*
@@ -470,11 +436,6 @@ sys-kernel/hardened-sources
 # Package testing tracked in bug #611022.
 >=dev-libs/msgpack-1.4.2
 
-# Hanno Boeck <hanno@gentoo.org> (21 Aug 2017)
-# Open security bugs, no upstream, bug 628432
-# Alternatives: app-arch/libarchive, app-arch/unar
-app-arch/unrar-gpl
-
 # Sébastien Fabbro <bicatali@gentoo.org> (19 Aug 2017)
 # ipython-6 is python-3 only and causes circular dependencies
 # Unset python_targets_python2_7 for ipykernel and ipyparallel if needed.
@@ -571,6 +532,7 @@ net-wireless/cpyrit-cuda
 # Drop mask after migration of existing wxGTK:3.0 users
 =net-ftp/filezilla-3.30.0-r300
 =net-ftp/filezilla-3.31.0-r300
+=dev-util/codeblocks-17.12-r300
 
 # Mart Raudsepp <leio@gentoo.org> (16 Feb 2017)
 # Old gstreamer 0.10 version, which is security vulnerable.
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
index 87eaba8c3a3a..14d26d0f118a 100644
--- a/profiles/updates/2Q-2018
+++ b/profiles/updates/2Q-2018
@@ -5,3 +5,4 @@ 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
+move dev-db/xtrabackup-bin dev-db/percona-xtrabackup-bin
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 42c8ca5cf78e..17f88f918fec 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2300,6 +2300,8 @@ dev-lisp/clisp:hyperspec - Use local hyperspec instead of online version
 dev-lisp/clisp:new-clx - Build CLISP with support for the NEW-CLX module which is a -C binding to the Xorg libraries
 dev-lisp/clisp:svm - Build CLISP with support for the Support Vector Machine module
 dev-lisp/clx:doc - Builds documentation
+dev-lisp/cmucl:X - Build CLX, CLM, or Hemlock
+dev-lisp/cmucl:doc - Installs package documentation
 dev-lisp/cmucl:source - Include source code for CMUCL in installation
 dev-lisp/ecls:gengc - Use generational garbage collection (experimental)
 dev-lisp/ecls:libatomic - Use dev-libs/libatomic_ops library
@@ -2851,6 +2853,7 @@ dev-util/cmake:server - Enable cmake-server support.
 dev-util/cmake:system-jsoncpp - Use system copy of dev-libs/jsoncpp instead of bundled one.
 dev-util/coccigrep:vim - Install the coccigrep vim plugin
 dev-util/codeblocks:contrib - Build additional contrib components
+dev-util/codeblocks:fortran - Build FortranProject plugin which enables to use Code::Blocks IDE for Fortran language
 dev-util/cppcheck:htmlreport - install cppcheck-htmlreport
 dev-util/ctags:json - Enable JSON output support
 dev-util/ctags:xml - Enable XML parsing support
@@ -4100,6 +4103,7 @@ media-libs/clutter:gtk - Use gdk-pixbuf from x11-libs/gtk+ as image rendering ba
 media-libs/cogl:gles2 - Enable OpenGL ES 2.0 support
 media-libs/cogl:kms - Enable KMS support.
 media-libs/cogl:pango - Build cogl-pango library for x11-libs/pango integration
+media-libs/coin:qthelp - Build API documentation in QtHelp format
 media-libs/coin:simage - Texture loading via media-libs/simage library
 media-libs/devil:allegro - Add support for Allegro
 media-libs/devil:nvtt - Add support for media-gfx/nvidia-texture-tools
@@ -4414,9 +4418,9 @@ media-plugins/mythplugins:mythzoneminder - Adds support for zoneminder (requires
 media-plugins/mythplugins:raw - Allows MythGallery to view photos saved in RAW format
 media-plugins/vdr-burn:dvdarchive - DMH DVD - Archive
 media-plugins/vdr-dvbapi:dvbcsa - use media-libs/libdvbcsa free implementation of the DVB Common Scrambling Algorithm
-media-plugins/vdr-epgsearch:conflictcheckonly - ToDo
-media-plugins/vdr-epgsearch:epgsearchonly - ToDo
-media-plugins/vdr-epgsearch:quicksearch - ToDo
+media-plugins/vdr-epgsearch:conflictcheckonly - install the "conflictcheckonly" vdr-plugin
+media-plugins/vdr-epgsearch:epgsearchonly - install the "epgsearchonly" vdr-plugin
+media-plugins/vdr-epgsearch:quicksearch - install the "quicksearch" vdr-plugin
 media-plugins/vdr-epgsearch:tre - Add support for unlimited fuzzy searching with help of dev-libs/tre library
 media-plugins/vdr-music:graphtft - Enable support for vdr-graphtft plugin
 media-plugins/vdr-pvr350:yaepg - Enables full support for the output format of vdr-yaepg
@@ -6038,7 +6042,6 @@ net-libs/qxmpp:opus - Enable Opus codec support via media-libs/opus
 net-libs/qxmpp:vpx - Enable VP8 codec support via media-libs/libvpx
 net-libs/rabbitmq-c:tools - Builds cli tools to interact with brokers
 net-libs/shairplay:alac - Add support for Apple Lossless Audio Codec files
-net-libs/shairplay:static-libs - Build static versions of dynamic libraries as well
 net-libs/shairplay:tools - Build and install a binary shairplay in /usr/bin
 net-libs/telepathy-qt:farstream - Enable support for audio/video calls via farstream
 net-libs/tox:av - Adds support for audio and video.
@@ -6567,7 +6570,6 @@ net-misc/stargazer:sgconf - Enable build of command-line utility for configuring
 net-misc/stargazer:sgconf_xml - Enable build of command-line xml-based utility for configuring Stargazer.
 net-misc/stargazer:sgconv - Enable build of utility to convert Stargazer data between storage backends.
 net-misc/stargazer:stargazer - Enable build of Stargazer billing system.
-net-misc/stargazer:static-libs - Install static libraries.
 net-misc/streamtuner:shout - Enable shoutcast plug-in.
 net-misc/streamtuner:xiph - Enable xiph.org plug-in.
 net-misc/stunnel:stunnel3 - Install the stunnel3 wrapper.
@@ -8633,10 +8635,6 @@ x11-libs/libdrm:valgrind - Compile in valgrind memory hints
 x11-libs/libfm:automount - Use gnome-base/gvfs for automounting
 x11-libs/libfm:udisks - Use libfm's udisks-based volume monitor implementation instead of using the one from gvfs
 x11-libs/libfm:vala - Support custom actions in menus
-x11-libs/libqxt:berkdb - Build the QxtBerkeley module
-x11-libs/libqxt:sql - Build the QxtSql module
-x11-libs/libqxt:web - Build the QxtWeb module
-x11-libs/libqxt:zeroconf - Build the QxtZeroconf module
 x11-libs/libva:drm - Enables VA/DRM API support.
 x11-libs/libva:egl - Enables EGL support.
 x11-libs/libva:utils - Install VA-API utility programs.
@@ -8678,6 +8676,10 @@ x11-misc/mate-notification-daemon:gtk3 - Build with GTK+3 instead of GTK+2
 x11-misc/mozo:gtk3 - Build with GTK+3 instead of GTK+2
 x11-misc/openbox-menu:icons - Enable support for icons in menus
 x11-misc/openbox-menu:svg - Support SVG icons
+x11-misc/polybar:i3wm - Add support for i3 window manager
+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