21 files changed, 115 insertions, 77 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b7c013429d51..803972e7cba1 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 9dc1afa26544..8f1216c2fb70 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -346,7 +346,6 @@ dev-python/PyQt4 webkit
 dev-qt/assistant webkit
 dev-qt/designer webkit
 dev-qt/qtdeclarative webkit
-net-irc/kvirc webkit
 
 # Raúl Porcel <armin76@gentoo.org> (28 May 2012)
 # Needs x11-misc/lightdm(which also requires some other deps)
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index a1b7280cd611..bb7cd806ceb7 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
 
+# Andrey Utkin <andrey_utkin@gentoo.org> (13 Jun 2018)
+# No ACPI support on alpha. Bug #657332
+acpi
+
 # Tobias Klausmann <klausman@gentoo.org> (03 March 2017)
 # There is no luajit support on alpha. Bugs #554376, #608322.
 luajit
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index c859a1044c81..6c3c230a4ed2 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,9 +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
+# Jan Vesely <jano.vesely@gmail.com> (15 June 2018)
+# Mesa clover only works on r600 or radeonsi GPUs. The corresponding
+# video_cards useflags are not available on arm
+media-libs/mesa opencl
 
 # Alex Bennee <alex@bennee.com> (31 May 2018)
 # bunch of dev-perl packages not yet keyworded
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 9cef2886a2d9..128b2317214d 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -40,7 +40,7 @@ sci-libs/gdal mdb
 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.
+# kde-frameworks/*:5 not keyworded.
 net-irc/kvirc kde
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (28 Jun 2016)
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index c0aa19b0062b..08880aaf3493 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Jun 2018)
+# Requires not yet stable dev-qt/qtpositioning:5
+sci-astronomy/stellarium gps
+
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
 # Requires not yet stable dependencies
 sys-libs/gwenhywfar sensors serialport webkit
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index bfb6fd69d208..b41ecfa1f279 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -151,7 +151,7 @@ TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE="1"
 
 # Aaron W. Swenson <titanofold@gentoo.org> (9 Jul 2017)
 # Default target(s) for postgres{,-multi}.eclass
-POSTGRES_TARGETS="postgres9_5"
+POSTGRES_TARGETS="postgres9_5 postgres10"
 
 # Michael Orlitzky <mjo@gentoo.org> (17 Nov 2017)
 #
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 8f8cd8ba059c..93e36f459c62 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (13 Jun 2018)
+# Upstream is transitioning to Meson, but does not yet have any configuration
+# options. Until those configuration options are provided, force USE flags on
+# to avoid automagic deps.
+>=x11-apps/intel-gpu-tools-9999 alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv
+
 # Michał Górny <mgorny@gentoo.org> (05 Jun 2017)
 # (on behalf of Treecleaner project)
 # www-apache/mod_python is masked for removal, force agent-only builds.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 4ac5253c5612..960aeced1fbc 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,21 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (13 Jun 2018)
+# Requires app-arch/snappy[static-libs] that is no longer available.
+# Bugs #651604, #651606.
+app-emulation/qemu static
+dev-libs/leveldb static-libs
+sys-block/fio static
+sys-cluster/ceph static-libs
+
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (01 Jun 2018)
+# Qt 4 not available.
+app-i18n/fcitx:4 qt4
+app-i18n/scim qt4
+app-i18n/scim-bridge qt4
+app-i18n/uim qt4
+
 # Michał Górny <mgorny@gentoo.org> (16 May 2018)
 # Depends on last-rited sci-libs/coinhsl.
 sci-libs/ipopt hsl
diff --git a/profiles/categories b/profiles/categories
index 461b9129c9af..7cd3729a895c 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -157,7 +157,6 @@ x11-drivers
 x11-libs
 x11-misc
 x11-plugins
-x11-proto
 x11-terms
 x11-themes
 x11-wm
diff --git a/profiles/desc/php_targets.desc b/profiles/desc/php_targets.desc
index ae4ceacb73ee..62c199c76a10 100644
--- a/profiles/desc/php_targets.desc
+++ b/profiles/desc/php_targets.desc
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of the PHP_TARGETS USE_EXPAND flags
 
+php7-3 - Build against PHP 7.3
 php7-2 - Build against PHP 7.2
 php7-1 - Build against PHP 7.1
 php7-0 - Build against PHP 7.0
diff --git a/profiles/desc/postgres_targets.desc b/profiles/desc/postgres_targets.desc
index 284f4bc00929..464cb04702d5 100644
--- a/profiles/desc/postgres_targets.desc
+++ b/profiles/desc/postgres_targets.desc
@@ -3,10 +3,10 @@
 
 # This file contains descriptions of POSTGRES_TARGETS USE_EXPAND flags.
 
-postgres9_2 - Build against PostgreSQL 9.2
 postgres9_3 - Build against PostgreSQL 9.3
 postgres9_4 - Build against PostgreSQL 9.4
 postgres9_5 - Build against PostgreSQL 9.5
 postgres9_6 - Build against PostgreSQL 9.6
 postgres10 - Build against PostgreSQL 10
 postgres11 - Build against PostgreSQL 11
+postgres12 - Build against PostgreSQL 12
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
index 6f3fa727b6e2..95f5fac3a8dc 100644
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
@@ -19,7 +19,6 @@ sci-libs/gdal mdb
 # 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/kvirc webkit
 
 # Kacper Kowalik <xarthisius@gentoo.org> (25 Apr 2012)
 # Masking due to unsolved dependencies
diff --git a/profiles/license_groups b/profiles/license_groups
index ad1b43c67484..061270706dde 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
+MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libpng libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms Microsemi MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs StarUML-EULA supermicro teamspeak3 TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
+EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms Microsemi MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs StarUML-EULA supermicro teamspeak3 TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index 39e704066339..51866fd0c00f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,10 +29,26 @@
 
 #--- 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
+# Mike Gilbert <floppym@gentoo.org> (15 Jun 2018)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-69
+
+# Brian Evans <grknight@gentoo.org> (14 Jun 2018)
+# Mask new php pre-releases for initial testing
+dev-lang/php:7.3
+virtual/httpd-php:7.3
+
+# Andreas Sturmlechner <asturm@gentoo.org> (10 Jun 2018)
+# Dead upstream, no more revdeps after LO dropped support.
+# Masked for removal in 30 days, bug #657400
+media-libs/libgltf
+
+# Mikle Kolyada <zlogene@gentoo.org> (9 June 2018)
+# Fails to buil, dead upstream, EAPI=2
+# Only the live enuild in the tree.
+# Masked for removal in 30 days
+sys-fs/yaffs-utils
 
 # Daniel Pielmeier <billie@gentoo.org> (8 June 2018)
 # Does not support PyQt5 as well as python 3. Upstream unresponsive.
@@ -192,36 +208,10 @@ sci-libs/freesteam
 # Remaining fetch-restricted game packages missing BLAKE2B hashes.
 # Please provide updated hashes if you have the matching distfiles.
 # Bug #642876.  Removal in 30 days.
-games-action/trine2
 games-misc/dont-starve
 games-puzzle/larry
-games-rpg/avadon
 games-rpg/penumbra-collection
 
-# Michał Górny <mgorny@gentoo.org> (15 May 2018)
-# All current versions are unfetchable.  No maintainer activity
-# since 2014.  Bug #600962.  Removal in 30 days.
-net-misc/asterisk-g729
-
-# 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.
-net-dns/dnssec-lookup
-net-dns/dnssec-nodes
-net-dns/dnssec-system-tray
-
-# Mikle Kolyada <zlogene@gentoo.org> (10 May 2018)
-# The upstream is totally dead (the last release is from 2006).
-# Does not compile against gcc-6, uses old EAPI=3 (#564998, #644262).
-# Use dev-libs/memcached istead. Removal in 30 days.
-dev-libs/libmemcache
-
 # 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.
@@ -241,11 +231,6 @@ dev-ruby/twitter:5
 >=media-libs/coin-4.0.0
 >=media-libs/simage-1.7.1
 
-# 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.
->=www-client/chromium-68
-
 # Aaron Bauman <bman@gentoo.org> (30 Apr 2018)
 # Masked for testing
 =dev-libs/libressl-2.7*
@@ -316,11 +301,6 @@ media-plugins/gst-plugins-mad:1.0
 # that do not make it any more working. Bug #651030.
 >=sys-devel/distcc-3.3
 
-# 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
->=x11-base/xorg-drivers-1.20
-
 # Tim Harder <radhermit@gentoo.org> (01 Mar 2018)
 # Masked for testing.
 >=dev-python/aiohttp-3
@@ -343,10 +323,6 @@ sys-libs/uclibc
 =sys-firmware/intel-microcode-20180108
 =sys-firmware/intel-microcode-20180108-r1
 
-# Patrice Clement <monsieurp@gentoo.org> (26 Jan 2018)
-# Has different symbols. Known to cause issues with i3bar/swaybar.
-media-fonts/fontawesome:0/5
-
 # Eray Aslan <eras@gentoo.org> (22 Jan 2018)
 # Vulnerable - see https://bugs.gentoo.org/630684
 # Please migrate to cyrus-imapd-3.0 releases
diff --git a/profiles/prefix/windows/winnt/package.mask b/profiles/prefix/windows/winnt/package.mask
index 0af713753d95..0b9c2c933897 100644
--- a/profiles/prefix/windows/winnt/package.mask
+++ b/profiles/prefix/windows/winnt/package.mask
@@ -1,8 +1,2 @@
 
 # Distributed under the terms of the GNU General Public License v2
-
-
-# Markus Duft <mduft@gentoo.org> (30 Sep 2009)
-# the patch does not currently apply, and needs some work.
->=x11-proto/xproto-7.0.16
-
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 6e4d872f1dc8..cb0f13731f3d 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (09 Jun 2018)
+# Required by app-office/libreoffice
+dev-libs/xmlsec nss
+
+# Andreas Sturmlechner <asturm@gentoo.org> (09 Jun 2018)
+# Enable sensible defaults for desktop users
+dev-qt/qtwebkit:5 printsupport
+
 # Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
 # Not required, but makes life easier with Qt; bug #457934
 app-arch/unzip natspec
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 28e4455fb408..fabc4f7388db 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -4,7 +4,7 @@
 # Required by >=dev-qt/qtwebengine-5.9
 dev-libs/libxml2 icu
 
-# Required by kde-apps/okteta
+# Required by app-editors/okteta
 dev-qt/qtscript:5 scripttools
 
 # Required by kde-apps/akonadi
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
index 2dcc5c1a3de4..dd014353f564 100644
--- a/profiles/updates/2Q-2015
+++ b/profiles/updates/2Q-2015
@@ -137,7 +137,6 @@ move kde-base/libksane kde-apps/libksane
 move kde-base/lokalize kde-apps/lokalize
 move kde-base/lskat kde-apps/lskat
 move kde-base/marble kde-apps/marble
-move kde-base/okteta kde-apps/okteta
 move kde-base/okular kde-apps/okular
 move kde-base/oxygen-icons kde-frameworks/oxygen-icons
 move kde-base/palapeli kde-apps/palapeli
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
index 3c036af7321b..67ce07101516 100644
--- a/profiles/updates/2Q-2018
+++ b/profiles/updates/2Q-2018
@@ -12,3 +12,4 @@ 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
+move kde-apps/okteta app-editors/okteta
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 42f496546a76..634b100719b9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -288,6 +288,7 @@ app-crypt/aespipe:cpu_flags_x86_padlock - Use VIA padlock instructions, detected
 app-crypt/ccid:kobil-midentity - Build and install Kobil_mIDentity_switch tool
 app-crypt/ccid:twinserial - Enable twinserial reader
 app-crypt/codecrypt:cryptopp - Build algorithms that need Crypto++ support dev-libs/crypto++
+app-crypt/dehydrated:cron - Install cron job to sign/renew non-existent/changed/expiring certificates
 app-crypt/eid-mw:dialogs - Enable "askaccess" dialog box, by using x11-libs/gtk+
 app-crypt/eid-mw:gtk - All dialogs are available, by using x11-libs/gtk+
 app-crypt/eid-mw:p11-kit - Support for app-crypt/p11-kit.
@@ -420,6 +421,7 @@ app-editors/neovim:jemalloc - Use dev-libs/jemalloc for allocations
 app-editors/neovim:nvimpager - Install nvimpager symlink to less.sh macro
 app-editors/neovim:remote - Enable support for remote options using nvr
 app-editors/neovim:tui - Build the neovim unix tui
+app-editors/okteta:designer - Build plugins for dev-qt/designer
 app-editors/pluma:gtk3 - Build with GTK+3 instead of GTK+2
 app-editors/qhexedit2:gui - Install Qt5 hex editor
 app-editors/tea:aspell - Enable spellchecking using app-text/aspell
@@ -524,6 +526,7 @@ app-emulation/libvirt:wireshark-plugins - Build the net-analyzer/wireshark plugi
 app-emulation/libvirt:xen - Support management of Xen virtualisation (app-emulation/xen)
 app-emulation/libvirt:zfs - Enable ZFS backend storage sys-fs/zfs
 app-emulation/lxc:cgmanager - Enable support for cgroup management using app-admin/cgmanager
+app-emulation/lxc:templates - Install old style templates through app-emulation/lxc-templates
 app-emulation/lxd:daemon - Build the system daemon, not just the client tool
 app-emulation/lxd:dnsmasq - Depend on dnsmasq to provide DHCP and DNS.
 app-emulation/nemu:ovf - Adds support for OVA/OVF import
@@ -762,6 +765,7 @@ app-i18n/fcitx:pango - Enable support for x11-libs/pango
 app-i18n/fcitx:qt4 - Install input method module for Qt 4
 app-i18n/fcitx:table - Install table input methods for Simplified Chinese
 app-i18n/fcitx-libpinyin:dictionary-manager - Install dictionary manager
+app-i18n/fcitx-rime:configuration_tool - Install configuration tool
 app-i18n/fcitx-unikey:macro-editor - Install macro editor
 app-i18n/freewnn:uum - Build uum
 app-i18n/ibus:emoji - Enable support for Emoji
@@ -1273,12 +1277,14 @@ app-vim/gentoo-syntax:ignore-glep31 - Remove GLEP 31 (UTF-8 file encodings) sett
 app-vim/youcompleteme:clang - Enable semantic support for C-family languages using sys-devel/clang
 dev-ada/asis:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/asis:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/asis:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/aunit:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/aunit:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/aws:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/aws:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnat_util:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnat_util:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/gnat_util:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/gnat_util:shared - Build gnat_util shared library
 dev-ada/gnat_util:static-pic - Build gnat_util static library with pic code
 dev-ada/gnatcoll:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
@@ -1287,10 +1293,16 @@ dev-ada/gnatcoll:projects - Adds support for projects
 dev-ada/gnatcoll:pygobject - Adds support for pygobject
 dev-ada/gnatcoll:shared - Build shared library
 dev-ada/gnatcoll:tools - Build associated tools
+dev-ada/gnatcoll-core:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
+dev-ada/gnatcoll-core:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/gnatcoll-core:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gnatcoll-core:shared - Build shared library
+dev-ada/gnatcoll-core:static-pic - Build static library with pic code
 dev-ada/gnatmem:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnatmem:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gprbuild:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gprbuild:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/gprbuild:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/gtkada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gtkada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gtkada:shared - Build gtkada as shared library
@@ -1298,10 +1310,12 @@ dev-ada/libadalang:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/libadalang:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/libgpr:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/libgpr:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/libgpr:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/libgpr:shared - Build shared library
 dev-ada/libgpr:static-pic - Build static library with pic code
 dev-ada/xmlada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/xmlada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/xmlada:gnat_2018 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/xmlada:shared - Build shared library
 dev-ada/xmlada:static-pic - Build static library with pic code
 dev-cpp/eigen:c++11 - Build using the C++11 standard
@@ -1317,6 +1331,12 @@ dev-cpp/libjson-rpc-cpp:stubgen - Build header stub code generator (needed for d
 dev-cpp/websocketpp:boost - Use dev-libs/boost instead of C++11
 dev-cpp/xsd:ace - Enable support for serializing to/from an ACE CDR stream
 dev-db/aerospike-server-community:tools - Install extra tools
+dev-db/clickhouse:client - Build CLI client.
+dev-db/clickhouse:kafka - Enables support for kafka consumer.
+dev-db/clickhouse:mongodb - Enabled support for MongoDB-based dictionaries
+dev-db/clickhouse:server - Build server.
+dev-db/clickhouse:tools - Build various tools, like benchmark, copier, etc.
+dev-db/clickhouse:zookeeper - Enable support for clustering (based on Zookeeper).
 dev-db/cppdb:mysql_internal - Don't build a separate mysql loadable module but rather build it into the cppdb library itself
 dev-db/cppdb:odbc_internal - Don't build a separate postgresql loadable module but rather build it into the cppdb library itself
 dev-db/cppdb:postgres_internal - Don't build a separate odbc loadable module but rather build it into the cppdb library itself
@@ -1798,11 +1818,15 @@ dev-java/icedtea:cups - Link against the CUPS library at compile time, rather th
 dev-java/icedtea:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
 dev-java/icedtea:jamvm - Use the JamVM virtual machine rather than HotSpot.
 dev-java/icedtea:jbootstrap - If possible, recompile the final IcedTea executables with itself.
+dev-java/icedtea:kerberos - Link against Kerberos in order to obtain the cache location.
 dev-java/icedtea:nsplugin - Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.
 dev-java/icedtea:pax_kernel - Apply patch needed for pax enabled kernels.
-dev-java/icedtea:shenandoah - Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (x86_64 only)
+dev-java/icedtea:pch - Build using pre-compiled headers.
+dev-java/icedtea:sctp - Build the SCTP NIO channel implementation against lksctp
+dev-java/icedtea:shenandoah - Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)
 dev-java/icedtea:smartcard - Build the PCSC driver against pcsc-lite
 dev-java/icedtea:sunec - Build the SunEC provider against system NSS
+dev-java/icedtea:system-lcms - Build against the system LCMS installation rather than the in-tree copy.
 dev-java/icedtea:webstart - Enable Web Start support (via NetX).
 dev-java/icedtea:zero - Enable Zero assembler port (usually for non-HotSpot architectures)
 dev-java/icedtea-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
@@ -1850,9 +1874,6 @@ dev-lang/crystal:blocking-stdio-hack - Keep STDIO file descriptors in blocking m
 dev-lang/crystal:debug - Build each module as a separate object file. Speeds build up.
 dev-lang/crystal:xml - Use the dev-libs/libxml2 library to enable Crystal xml module
 dev-lang/crystal:yaml - Use the dev-libs/libyaml library to enable Crystal yaml module
-dev-lang/ekopath:mpich - Include pre-built MPICH libraries
-dev-lang/ekopath:openmpi - Include pre-built OpenMPI 1.x libraries
-dev-lang/ekopath:openmpi2 - Include pre-built OpenMPI 2.x libraries
 dev-lang/erlang:compat-ethread - Enable compatibility with pre-pentium 4 CPUs in the ethread library.
 dev-lang/erlang:dirty-schedulers - Enable dirty schedulers
 dev-lang/erlang:hipe - HIgh Performance Erlang extension
@@ -2883,6 +2904,8 @@ dev-util/diffoscope:zip - Use app-arch/unzip
 dev-util/edb-debugger:graphviz - Add support for the Graphviz library
 dev-util/edb-debugger:legacy-mem-write - Probe if writes to /proc/PID/mem are broken.
 dev-util/edb-debugger:pax_kernel - Enable building under a PaX enabled kernel
+dev-util/electron:gconf - Use gnome-base/gconf
+dev-util/electron:gtk3 - Use GTK+3 instead of GTK+2
 dev-util/electron:lto - Build with link time optimization enabled
 dev-util/electron:pic - Disable optimized assembly code that is not PIC friendly
 dev-util/electron:proprietary-codecs - Enable proprietary codecs like H.264, MP3
@@ -2928,7 +2951,7 @@ dev-util/intel-ocl-sdk:system-clang - Use system clang (sys-devel/clang) instead
 dev-util/intel-ocl-sdk:system-tbb - Use system Thread Building Blocks (dev-cpp/tbb) instead of bundled one
 dev-util/intel-ocl-sdk:tools - Install Intel Offline Compiler
 dev-util/kdevelop:gdbui - Enable GUI for attaching GDB to a running process
-dev-util/kdevelop:okteta - Enable hex editor plugin via kde-apps/okteta
+dev-util/kdevelop:hex - Enable hex editor plugin via app-editors/okteta
 dev-util/kdevelop:qmake - Enable support for QMake build system
 dev-util/kdevelop:reviewboard - Enable reviewboard support
 dev-util/kdevelop:webkit - Enable deprecated dev-qt/qtwebkit instead of dev-qt/qtwebengine for integrated documentation
@@ -3052,6 +3075,7 @@ games-action/dxx-rebirth:sc55-musicpack - Include alternate version of the game'
 games-action/dxx-rebirth:textures - Include high resolution (640x480) backgrounds, briefing images and fonts (Descent 1)
 games-action/hotline-miami:bundled-libs - Use bundled libraries.
 games-action/hotline-miami:launcher - Install qt launcher
+games-action/minetest:jsoncpp - Enable using a system-wide JSONCPP
 games-action/minetest:leveldb - Enable LevelDB backend
 games-action/minetest:postgres - Optionally use PostgreSQL as map backend
 games-action/minetest:redis - Enable redis backend via dev-libs/hiredis
@@ -3065,8 +3089,7 @@ games-action/supertuxkart:wiimote - Support for wiimote input devices
 games-action/swordandsworcery:bundled-libs - Use the upstream provided bundled libraries.
 games-action/trine:launcher - Install GTK+ launcher
 games-action/trine-enchanted-edition:launcher - Install GTK+ launcher
-games-action/trine2:bundled-libs - Use bundled libraries.
-games-action/trine2:launcher - Install gtk+ launcher
+games-action/trine2:launcher - Install GTK+ launcher
 games-arcade/bomns:editor - enables building the level editor
 games-arcade/burgerspace:network - Enable client-server support
 games-arcade/commandergenius:tremor - Use media-libs/tremor as ogg decoder instead of media-libs/libvorbis
@@ -3500,7 +3523,6 @@ kde-apps/marble:aprs - Enable support for APRS data sources
 kde-apps/marble:designer - Install plugin for dev-qt/designer
 kde-apps/marble:phonon - Enable sound support via media-libs/phonon
 kde-apps/marble:shapefile - Enable support for ESRI shapefiles
-kde-apps/okteta:designer - Build plugins for dev-qt/designer
 kde-apps/okular:chm - Enable support for Microsoft Compiled HTML Help files
 kde-apps/okular:epub - Enable E-Book support via app-text/ebook-tools
 kde-apps/okular:image-backend - Enable image viewing support
@@ -4457,7 +4479,6 @@ media-sound/aqualung:lua - Enable support for programmable title formatting with
 media-sound/aqualung:mac - Enable support for decoding Monkey's Audio files
 media-sound/aqualung:podcast - Enable podcast support
 media-sound/aqualung:systray - Enable system tray support
-media-sound/ardour:lv2 - Add support for Ladspa V2
 media-sound/ario:audioscrobbler - Enable song tracking via last.fm
 media-sound/ario:idle - Enable experimental support for MPD's idle command to reduce bandwidth and cpu usage, requires MPD 0.14
 media-sound/asunder:mac - Support for creation of Monkey's Audio files (APE)
@@ -4814,7 +4835,6 @@ media-tv/xmltv:ee - Estonia tv listing grabber
 media-tv/xmltv:es_laguiatv - Spain alternative grabber
 media-tv/xmltv:es_miguiatv - Spain alternative grabber
 media-tv/xmltv:eu_dotmedia - Grabber for Europe (xmltv.se / dotmedia)
-media-tv/xmltv:eu_egon - Grabber for german speaking area (Egon zappt)
 media-tv/xmltv:eu_epg - EPG grabber for some European countries.
 media-tv/xmltv:fi - Finland tv listing grabber
 media-tv/xmltv:fi_sv - Grabber for Finland (Swedish)
@@ -4835,14 +4855,12 @@ media-tv/xmltv:no_gf - Norway Gfeed tv listing grabber
 media-tv/xmltv:pt - Portugal tv listing grabber
 media-tv/xmltv:pt_meo - Grabber for Portugal (MEO)
 media-tv/xmltv:re - Reunion Island (France) tv listing grabber
-media-tv/xmltv:sd_json - Grabber for schedulesDirect.org SD-JSON service (many countries)
 media-tv/xmltv:se_swedb - Sweden tv listing grabber
 media-tv/xmltv:se_tvzon - Sweden (tvzon.se) tv listing grabber
 media-tv/xmltv:tr - Turkey (Digiturk) tv listing grabber
 media-tv/xmltv:tv_check - enable GUI checking
 media-tv/xmltv:tv_combiner - enable grabbers combiner
 media-tv/xmltv:tv_pick_cgi - enable CGI support
-media-tv/xmltv:uk_atlas - Fast UK and Ireland tv listing grabber
 media-tv/xmltv:uk_bleb - Britain tv listing grabber
 media-tv/xmltv:uk_rt - Britain alternative tv listing grabber
 media-tv/xmltv:uk_tvguide - UK and Ireland tv listing grabber using TV Guide website
@@ -5573,6 +5591,7 @@ net-firewall/iptables:conntrack - Build against net-libs/libnetfilter_conntrack
 net-firewall/iptables:netlink - Build against libnfnetlink which enables the nfnl_osf util
 net-firewall/iptables:nftables - Support nftables kernel interface
 net-firewall/iptables:pcap - Build against net-libs/libpcap which enables the nfbpf_compile util
+net-firewall/nftables:json - Enable JSON support via dev-libs/jansson
 net-firewall/nufw:nfconntrack - Use netfilter_conntrack
 net-firewall/nufw:nfqueue - Use NFQUEUE instead of QUEUE
 net-firewall/nufw:pam_nuauth - Add support for pam nufw from PAM
@@ -5940,6 +5959,8 @@ net-libs/gnutls:test-full - Enable full test mode
 net-libs/gnutls:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
 net-libs/gnutls:tools - Build extra tools
 net-libs/gnutls:valgrind - Enable usage of dev-util/valgrind in debug
+net-libs/grpc:systemtap - Enable SystemTAP/DTrace tracing
+net-libs/grpc:tools - Install gRPC python tools
 net-libs/iax:snomhack - Use slower memset for SNOM phoneem
 net-libs/ldns:dane - Enable DNS-based Authentication of Named Entities (DANE) support
 net-libs/ldns:ecdsa - Enable ECDSA support
@@ -6708,10 +6729,14 @@ 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
+net-p2p/retroshare:control-socket - Enables API via Unix socket support
 net-p2p/retroshare:feedreader - Enables the Feedreader plugin
 net-p2p/retroshare:gnome-keyring - Enables potentially insecure autologin capability via Gnome Keyring
 net-p2p/retroshare:gui - Enables the GUI version of RetroShare
+net-p2p/retroshare:settings-api - Enables settings control via API
+net-p2p/retroshare:sqlcipher - Enables GXS database encryption via SQLCipher
 net-p2p/retroshare:voip - Enables VOIP plugin
+net-p2p/retroshare:webui - Enables Web interface and API support
 net-p2p/rtorrent:daemon - Uses app-misc/screen to daemonize this application
 net-p2p/syncthing:tools - Install stdiscosrv, strelaysrv and other tools to /usr/libexec/syncthing/.
 net-p2p/transmission:lightweight - Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)
@@ -7555,6 +7580,7 @@ sys-apps/flashrom:gfxnvidia - Enable NVIDIA programmer
 sys-apps/flashrom:internal - Enable internal/onboard support
 sys-apps/flashrom:internal_dmi - Enable internal DMI decoding rather than use sys-apps/dmidecode
 sys-apps/flashrom:it8212 - Support for ITE IT8212F ATA/RAID controllers
+sys-apps/flashrom:linux_mtd - Enable support for Linux mtd SPI flash devices
 sys-apps/flashrom:linux_spi - Enable support for Linux userspace spidev interface
 sys-apps/flashrom:mstarddc_spi - Support for SPI flash ROMs accessible through DDC in MSTAR-equipped displays
 sys-apps/flashrom:nic3com - Enable 3Com NIC programmer
@@ -7809,12 +7835,14 @@ 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
+sys-cluster/ceph:dpdk - Enable DPDK messaging
 sys-cluster/ceph:fuse - Build fuse client
 sys-cluster/ceph:jemalloc - Use dev-libs/jemalloc for allocations
 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: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
@@ -8192,6 +8220,10 @@ sys-libs/gwenhywfar:qml - Enable support for plugins using QML
 sys-libs/gwenhywfar:sensors - Enable support for dev-qt/qtsensors module
 sys-libs/gwenhywfar:serialport - Enable support for dev-qt/qtserialport module
 sys-libs/gwenhywfar:webkit - Enable support for dev-qt/qtwebkit
+sys-libs/ldb:doc - Builds documentation
+sys-libs/ldb:ldap - Enable LDAP support
+sys-libs/ldb:lmdb - Enable LMDB backend
+sys-libs/ldb:python - Enable Python support
 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.
@@ -8585,9 +8617,9 @@ www-servers/xsp:net35 - use .NET 3.5 Framework
 www-servers/xsp:net40 - use .NET 4.0 Framework
 www-servers/xsp:net45 - use .NET 4.5 Framework
 x11-apps/copyq:webkit - enables the application to use advanced HTML rendering and fetching remote images and other data
+x11-apps/intel-gpu-tools:chamelium - Enables support for building Chamelium tests
 x11-apps/intel-gpu-tools:glib - Support reading config files via glib helpers
 x11-apps/intel-gpu-tools:test-programs - Install test programs for DRM driver development
-x11-apps/intel-gpu-tools:unwind - Provide automatic stack traces on test failures
 x11-apps/intel-gpu-tools:valgrind - Support valgrind annotations
 x11-apps/intel-gpu-tools:xrandr - Enable support for the X RandR extension
 x11-apps/mesa-progs:egl - Build EGL utilities