gentoo resync : 23.06.2018

38 files changed, 444 insertions, 157 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 803972e7cba1..1e227b1c6031 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 8f1216c2fb70..cd573e22b0ec 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gmail.com> (17 Jun 2018)
+# Optional dependency not available for this arch
+dev-libs/efl vlc
+
 # Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
 # Needs sys-apps/fakechroot which isn't keyworded
 app-arch/rpm test
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 2b54cc864822..26506ba744e3 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -117,6 +117,7 @@ games-kids/crayon-physics
 games-misc/little-inferno
 games-misc/papers-please
 games-puzzle/hoh-bin
+games-puzzle/triptych
 games-roguelike/adom
 games-rpg/baldurs-gate-ee
 games-rpg/dear-esther
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index eecfbb757e49..fd348f9dde13 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Georgy Yakovlev <ya@sysdump.net> (14 May 2018)
+# Georgy Yakovlev <gyakovlev@gentoo.org> (14 May 2018)
 # Force the host target to avoid dependency hell
 dev-lang/rust llvm_targets_X86
 
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 4bb059665fa3..5109e4af610f 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (17 Jun 2018)
+# Vulkan support is only available on few selected arches atm.
+# Mask everywhere, unmask where appropriate.
+media-video/mpv -vulkan
+
 # Mikle Kolyada <zlogene@gentoo.org> (02 Jun 2018)
 # Too many untested ruby dependencies
 <dev-ruby/haml-5 test
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index a8638afdd530..d455bec2bdfb 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Tomáš Mózes <hydrapolic@gmail.com> (19 Jun 2018)
+# Needs dev-libs/libmaxminddb which isn't keyworded
+www-servers/nginx nginx_modules_http_geoip2 nginx_modules_stream_geoip2
+
 # Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
 # Needs sys-apps/fakechroot which isn't keyworded
 app-arch/rpm test
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index b5359fbb5015..5066dd8050f3 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -5,6 +5,10 @@
 -cpu_flags_arm_iwmmxt
 -iwmmxt
 
+# Andrey Utkin <andrey_utkin@gentoo.org> (13 Jun 2018)
+# No ACPI support on arm. Bug #657332
+acpi
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unmask elogind since it is keyworded here.
 -elogind
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 31226f273464..cadd4e1b4c97 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Georgy Yakovlev <ya@sysdump.net> (14 May 2018)
+# Georgy Yakovlev <gyakovlev@gentoo.org> (14 May 2018)
 # Force the host target to avoid dependency hell
 dev-lang/rust llvm_targets_AArch64
 
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 6c3c230a4ed2..fe71c0404f27 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Tomáš Mózes <hydrapolic@gmail.com> (19 Jun 2018)
+# Needs dev-libs/libmaxminddb which isn't keyworded
+www-servers/nginx nginx_modules_http_geoip2 nginx_modules_stream_geoip2
+
 # 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
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 7538ed4c406a..a25dc05caa7a 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (17 Jun 2018)
+# Vulkan support is only available on few selected arches atm.
+# Mask everywhere, unmask where appropriate.
+media-video/mpv vulkan
+
 # Nick Sarnie <sarnex@gentoo.org> (29 Apr 2018)
 # media-libs/vulkan-loader and app-emulation/vkd3d are not available everywhere
 app-emulation/wine-any vkd3d vulkan
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index acf5931ca845..030e882e83d6 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
 
+# Joonas Niilola <juippis@gmail.com> (17 Jun 2018)
+# Optional dependency not available for this arch
+dev-libs/efl vlc
+
 # Thomas Deutschmann <whissi@gentoo.org> (06 Jun 2018)
 # Needs sys-apps/fakechroot which isn't keyworded
 app-arch/rpm test
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 3b9295ec5153..c9e0a7b9710b 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -17,8 +17,9 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# Andreas Sturmlechner <asturm@gentoo.org> (20 Jun 2018)
 # dev-python/PyQt5 is not stable.
+media-sound/pulseaudio qt5
 net-print/hplip qt5
 
 # Andreas Sturmlechner <asturm@gentoo.org> (15 Mar 2018)
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 35aa1a46e827..257e6854bcef 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -6,6 +6,7 @@
 app-crypt/pinentry fltk
 dev-python/cssselect doc
 dev-vcs/subversion kwallet
+app-text/ghostscript-gpl cups
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 6cb2daaf6398..f940e0c6be02 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (17 Jun 2018)
+# Mask broken HIPE support on sparc32 (bug #656618)
+dev-lang/erlang hipe
+
 # Sergei Trofimovich <slyfox@gentoo.org> (08 May 2018)
 # Mask USE=games to avoid unkeyworded games-util/qstat.
 net-analyzer/monitoring-plugins game
diff --git a/profiles/arch/x86/package.use.force b/profiles/arch/x86/package.use.force
index c234a241e4f7..69bbbf335c38 100644
--- a/profiles/arch/x86/package.use.force
+++ b/profiles/arch/x86/package.use.force
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Georgy Yakovlev <ya@sysdump.net> (14 May 2018)
+# Georgy Yakovlev <gyakovlev@gentoo.org> (14 May 2018)
 # Force the host target to avoid dependency hell
 dev-lang/rust llvm_targets_X86
 
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index d4d4995e561f..9f057c9bc06d 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,11 @@
 
 # This file requires >=portage-2.1.1
 
+# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (17 Jun 2018)
+# Vulkan support is only available on few selected arches atm.
+# Mask everywhere, unmask where appropriate.
+media-video/mpv -vulkan
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (21 May 2018)
 # LO kde support on x86 is broken, see bug 523496
 =app-office/libreoffice-bin-6.0* kde
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index b41ecfa1f279..71d6be12f645 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # System-wide defaults for the Portage system
@@ -123,13 +123,14 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (23 May 2018)
 # sys-apps/baslayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_5 python_targets_python2_7"
+BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_6 python_targets_python2_7"
 
 # Mike Gilbert <floppym@gentoo.org> (15 May 2012)
 # Default target(s) for python-r1.eclass
-# Updated to python3_5 on 28 Nov 2017
-PYTHON_TARGETS="python2_7 python3_5"
-PYTHON_SINGLE_TARGET="python3_5"
+# Michał Górny <mgorny@gentoo.org> (22 Jun 2018)
+# Updated to python3_6
+PYTHON_TARGETS="python2_7 python3_6"
+PYTHON_SINGLE_TARGET="python3_6"
 
 # Michał Górny <mgorny@gentoo.org> (10 Aug 2013)
 # Moved from portage's make.globals.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 960aeced1fbc..5b96db88c846 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,11 +7,17 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# dev-libs/DirectFB is being removed (#606194)
+media-libs/libsdl2 fusionsound
+media-libs/xine-lib fusionsound
+www-plugins/gnash directfb
+
 # 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
+<dev-libs/leveldb-1.20 static-libs
 sys-block/fio static
 sys-cluster/ceph static-libs
 
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 5b09e2890c89..318e04eaaf3c 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -13,10 +13,6 @@ video_cards_tdfx
 # ... since audacious is being last-rited ... bug 632513
 audacious
 
-# Patrick Lauer <patrick@gentoo.org> (22 Oct 2017)
-# postgres-9.2 is EOL and masked
-postgres_targets_postgres9_2
-
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unkeyworded on most arches, unmasked in supported arch profiles.
 elogind
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index d256ea2e706d..02d03c5ab310 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -75,6 +75,7 @@ media-libs/libsdl2 kms
 media-libs/mesa gbm dri3 d3d9
 x11-base/xorg-drivers video_cards_radeonsi
 x11-drivers/xf86-video-ati glamor
+media-libs/gst-plugins-base gbm
 
 # connman is Linux only
 dev-qt/qtbearer connman
diff --git a/profiles/default/linux/musl/ppc/package.use.stable.mask b/profiles/default/linux/musl/ppc/package.use.stable.mask
new file mode 100644
index 000000000000..e4a2e9f61138
--- /dev/null
+++ b/profiles/default/linux/musl/ppc/package.use.stable.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# dev-qt/qtwebkit:5 not stable.
+dev-qt/designer webkit
diff --git a/profiles/default/linux/uclibc/ppc/package.use.mask b/profiles/default/linux/uclibc/ppc/package.use.mask
index 0b2122040de3..29c58634b8e0 100644
--- a/profiles/default/linux/uclibc/ppc/package.use.mask
+++ b/profiles/default/linux/uclibc/ppc/package.use.mask
@@ -5,12 +5,5 @@
 # kde-frameworks/*:5 not keyworded.
 net-irc/kvirc kde
 
-# 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/kvirc webkit
-
 dev-libs/libpcre cxx
 sys-libs/ncurses cxx
diff --git a/profiles/default/linux/uclibc/ppc/package.use.stable.mask b/profiles/default/linux/uclibc/ppc/package.use.stable.mask
new file mode 100644
index 000000000000..e4a2e9f61138
--- /dev/null
+++ b/profiles/default/linux/uclibc/ppc/package.use.stable.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# dev-qt/qtwebkit:5 not stable.
+dev-qt/designer webkit
diff --git a/profiles/desc/lcd_devices.desc b/profiles/desc/lcd_devices.desc
index df6352251435..911ed4c6618a 100644
--- a/profiles/desc/lcd_devices.desc
+++ b/profiles/desc/lcd_devices.desc
@@ -5,20 +5,29 @@
 
 # Keep it sorted.
 acoolsdcm - Add support for Alphacool USB display modules
+astusb - Add support for ASTUSB LCD modules
 bayrad - Add support for BayRAD LCD modules by EMAC
 beckmannegle - Add support for Beckmann+Egle "Mini Terminals" and "Compact Terminals"
 bwct - Add support for BWCT USB LCD displays
 cfontz633 - Add support for CrystalFontz 633 chipset displays
 cfontz - Add support for CrystalFontz displays
 cfontzpacket - Add support for CrystalFontz chipsets CFA-631, CFA-633 and CFA-635 
+crystalfontz - Add support for modern Crystalfontz display modules
+curses - Add support for a ncurses based virtual display
 cwlinux - Add support for serial / USB displays CW12232 and CW1602 by CwLinux
+d4d - Add support for 4D Systems display graphics modules with SGC PmmC
 ddusbt - Add support for DD usb touch screen
 directgfx - Add support for output via SDL
 displaylink - Add support for displaylink based LCDs
+dpf - Add support for DPF display modulees
 ea232 - Add support for the Electronic Assembly RS232 graphic driver
+ea232graphic - Add support for the Electronic Assembly RS232 graphic driver
 ea65 - Add support for the VFD in the AOpen XC Cube-AV EA65 media barebone
+efn - Add support for the English Font display Network based displays
 eyeboxone - Add support for the displays on Rightvision's EyeboxOne server
 framebuffer - Add support for output on a framebuffer
+futabavfd - Add support for Futaba M402SD06GL display module
+fw8888 - Add support for the Allnet FW8888 firewall appliance LCD
 g15 - Add support for Logitech G15 Keyboard LCDs
 glcd2usb - Add support for GLCD2USB LCD module
 glk - Add support for MatrixOrbital GLK chipset
@@ -26,12 +35,14 @@ goldelox - Add support for Goldelox MD1 display modules
 graphlcd - Meta-driver to support drivers via app-misc/graphlcd-base
 hd44780 - Add support for Hitachi HD44780 and compatible displays
 hd44780i2c - Enable hd44780 via i2c instead of parallel port driver
+hd44780-i2c - Enable hd44780 via i2c instead of parallel port driver
 i2500vfd - Add support for the Intra2net Intranator 2500 VFD display
 i2c - Add generic support for i2c based modules
 icpa106 - Add support for ICP A106 alarm/LCD boards for 19" racks
 imon - Add support for Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON IR/VFD modules (Antec Fusion)
 imonlcd - Add support for Soundgraph iMON LCD modules (Antec Fusion)
 iowarrior - Add support for IO-Warrior displays
+irlcd - Add support for the USBtiny DIY USB to IR receiver
 irtrans - Add support for the 16x2 IRTrans VFD device
 ks0108 - Add support for KS0108 based graphical LCDs
 l4m - Add support for Linux4Media displays
@@ -47,27 +58,37 @@ lh155 - Add support for Sharp LH155 based displays
 lis - Add support for the VLSystem L.I.S MCE 2005 VFD
 lph7508 - Add support for the Pollin LPH7508
 luise - Add support for the Wallbraun Electronics LCD-USB-Interface to Hitachi SP14Q002
+lw_abp - Add support for the LW_ABP display module
+matrixorbital - Add support for Matrix Orbital LCDs
+matrixorbitalgx - Add support for Matrix Orbital graphical LCDs
 m50530 - Add support for M50530 and compatible displays
 md8800 - Add support for the VFD of the Medion MD8800 PC
 mdm166a - Add support for the Futaba / Targa USB Graphic Vacuum Fluorescent Display
 milfordbpk - Add support for Milford Instruments BPK serial interface board for HD44780
+milfordinstruments - Add support for Milford Intruments LCDs
 ms6931 - Add support for MSI-6931 displays in MSI rack servers
 mtcs16209x - Add support for MTC_S16209x displays
 mtxorb - Add support for Matrix Orbital LCD* LKD* VFD* and VKD* displays
 ncurses - Add support for emulated LCD display on terminal using ncurses
+newhaven - Add support for various Newhaven displays
 nokcol - Add support for Nokias 3510i and 3530 display modules
 noritake - Add support for the Noritake GU128x32-311 graphical display
 noritakevfd - Add support for the Noritake VFD Device CU20045SCPB-T28A
 null - Add support for a NULL driver (for testing)
 pcd8544 - Add support for PCD8544 and compilant display modules
+pertelian - Add support for the Pertelian X2040 displays
+phanderson - Add support for the PHAnderson serial-to-HD44780 controller
+picgraphic - Add support for PIC graphic displays
 picolcd - Add support for Mini-Box's picoLCD
+picolcdgraphic - Add support for Mini-Box's graphical picoLCD
 png - Add support for PNG output
 ppm - Add support for PNG output
 pyramid - Add support for the Pyramid LCD device
 remote - Add suport for remote display modules
 routerboard - Add support for the Router Board LCD port
 rs232 - Add support for generic RS232 based displays
-SureElec - Add support drivers from the 'SURE electronics' shop
+sample - Add support for the sample driver
+samsungspf - Add support for Samsung SPF displays
 sed1330 - Add support for Seiko Epson SED1330/1335 graphical displays (S1D13300/S1D13305)
 sed133x - Add suppor tfor SED133x based display modules
 sed153x - Add support for OPTREX 323 based display modules
@@ -82,14 +103,19 @@ sli - Add support for a Wirz SLI display
 ssdoled - Add support for Bolymin BL160128A OLED display
 stv5730 - Add support for STV5730A on-screen display chips
 stv8105 - Add support for STV8105 on-screen display chips
+SureElec - Add support drivers from the 'SURE electronics' shop
 svga - Add support for output via media-libs/svgalib
 t6963 - Add support for Toshiba T6963 based LCD displays
+teaklcm - Add support for TeakLCM displays
 text - Add support for TextMode displaying
 trefon - Add support for Trefon USB LCD displays
 tyan - Add support for LCDs of the Barebone GS series
 ula200 - Add support for ULA200 USB devices that allow USB connection of HD44780s
 usbhub - Add support for USBHUB displays
 usblcd - Add support for USBLCD displays
+vnc - Add support for output on a vnc connection
 wincor - Add support for the WincorNixdorf serial cashier displays BA63 and BA66
+wincornixdorf - Add support for the WincorNixdorf serial cashier displays BA63 and BA66
 X - Add support for X11 displaying
+x11 - Add support for X11 displaying
 xosd - Add support for xosdlib
diff --git a/profiles/desc/nginx_modules_http.desc b/profiles/desc/nginx_modules_http.desc
index 656dd577c1d9..ce7da74c6392 100644
--- a/profiles/desc/nginx_modules_http.desc
+++ b/profiles/desc/nginx_modules_http.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of NGINX_MODULES_HTTP USE_EXPAND flags.
@@ -25,6 +25,7 @@ fastcgi - This module allows Nginx to interact with FastCGI processes and contro
 flv - This module provides the ability to seek within FLV (Flash) files using time-based offsets.
 geo - This module creates variables, whose values depend on the IP-address of the client.
 geoip - This module creates variables based on the IP-address of the client matched against the MaxMind GeoIP binary files.
+geoip2 - This module creates variables based on the IP-address of the client matched against the MaxMind GeoIP2 binary files.
 grpc - This module provides gRPC support.
 gunzip - Permits to decompress gzip'ed files on-the-fly for clients not supporting the gzip encoding method.
 gzip - This module allows for on-the-fly gzip compression.
diff --git a/profiles/desc/nginx_modules_stream.desc b/profiles/desc/nginx_modules_stream.desc
index dd7d28916962..8d8e9cb5a5f9 100644
--- a/profiles/desc/nginx_modules_stream.desc
+++ b/profiles/desc/nginx_modules_stream.desc
@@ -7,6 +7,7 @@
 access - This module allows limiting access to certain client addresses.
 geo - This module creates variables, whose values depend on the IP-address of the client.
 geoip - This module creates variables based on the IP-address of the client matched against the MaxMind GeoIP binary files.
+geoip2 - This module creates variables based on the IP-address of the client matched against the MaxMind GeoIP2 binary files.
 javascript - This module implements location and variable handlers in nginScript.
 limit_conn - This module is used to limit the number of connections per the defined key.
 map - This module allows you to classify, or map a set of values into a different set of values and store the result in a variable.
diff --git a/profiles/features/prefix/rpath/packages b/profiles/features/prefix/rpath/packages
index ca559fb1847a..7b95aaf26833 100644
--- a/profiles/features/prefix/rpath/packages
+++ b/profiles/features/prefix/rpath/packages
@@ -1,10 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# we don't ever will install these, so no need to depend on them
--*virtual/libc
--*virtual/os-headers
-
 -*>=sys-apps/baselayout-2
 # add back prefix baselayout
 *sys-apps/baselayout-prefix
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 95f5fac3a8dc..e61f45948744 100644
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
@@ -14,12 +14,6 @@ x11-base/xorg-drivers video_cards_glint
 # Requires masked USE flags.
 sci-libs/gdal mdb
 
-# 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
-
 # Kacper Kowalik <xarthisius@gentoo.org> (25 Apr 2012)
 # Masking due to unsolved dependencies
 app-admin/puppet rrdtool
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.stable.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.stable.mask
new file mode 100644
index 000000000000..def7d26e3f8a
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.stable.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
+# dev-qt/qtwebkit:5 not stable.
+dev-qt/designer webkit
diff --git a/profiles/license_groups b/profiles/license_groups
index 061270706dde..820a1074a117 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -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 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 protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs SPS StarUML-EULA Steam 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 51866fd0c00f..8ecb892f3a02 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,254 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Auty <ikelos@gentoo.org> (22 Jun 2018)
+# Not maintained upstream, at least one bug and three upstream bugs
+# Removal in 30 days. Bug #658264
+dev-vcs/giggle
+
+# Matt Turner <mattst88@gentoo.org> (20 Jun 2018)
+# No reverse deps after removal of app-i18n/fbiterm
+# Removal in 30 days. Bug #658528
+x11-libs/libiterm-mbt
+
+# Michał Górny <mgorny@gentoo.org> (20 Jun 2018)
+# Multiple serious bugs.  Upstream does not support Gentoo, and getting
+# any fixes applied is very difficult.  Regularly fails to build.
+# Does not support modern EAPIs, Manifests, news items...  Most severe
+# issues are tracked in bug #658278.  Somebody really needs to step up
+# and start actively maintaining it.  Otherwise -- removal in 90 days.
+sys-apps/paludis
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Doesn't work on amd64, upstream dead for ages, bug #254510
+# Removal in a month.
+games-arcade/xevil
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Doesn't work (#348124), dead since 2004. Removal in a month.
+x11-plugins/wmlaptop
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Package obsolete since many years ago (#398689). Removal in a month.
+dev-java/servletapi
+dev-java/sun-jacc-api
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Needs a major version bump to stop relying on old versions of other libs
+# (#421427). Removal in a month.
+dev-java/easyneurons
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Upstream dead for ages, relies on dead gstreamer:0.10 (#552528). Removal
+# in a month.
+x11-misc/winswitch
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Obsolete package not needed for a long time, bug #559994. Removal in a
+# month.
+dev-java/jdom-jaxen
+=dev-java/jdom-1.0-r4
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Fails to build, nothing requires it (#561366, #579600, #618936). Removal
+# in a month.
+net-misc/openvpn-auth-ldap
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Upstream dead for a long time, bug #606194. Removal in a month.
+dev-libs/DirectFB
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Not usable anymore after server shutdown (#608806). Removal in a month.
+games-fps/postal2mp-demo
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Segfaults at start (#612322). Removal in a month.
+games-arcade/snake3d
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# tests fail with python >= 3.4 (#620082), nothing requires this package,
+# removal in a month.
+dev-python/eliot
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Not compatible with recent python versions (#624668), needs a major
+# version bump. Removal in a month.
+dev-python/django-two-factor-auth
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Fails to build (#624688). Removal in a month.
+sci-physics/hoomd-blue
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Upstream dead, relies on obsolete gstreamer:0.10. Please use alternatives
+# (like soundconverter) instead (#629182). Removal in a month.
+media-sound/gnac
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Fails to run (#630576). Removal in a month.
+games-simulation/dangerdeep
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# frogr is a good replacement for this old package still relying on dead
+# gnome2 python bindings (#640046). Removal in a month.
+media-gfx/postr
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Fails to fetch (#640584). Removal in a month.
+games-strategy/gorky17-demo
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Dead since 2013, not compatible with latest profiles (#642568). Removal in
+# a month
+net-vpn/miredo
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Fails to build (#642996). Removal in a month.
+games-engines/gargoyle
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Fails to compile (#648430), crashes from time to time (#222065). Removal
+# in a month.
+app-misc/wyrd
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Not compatible with recent perl, not needed by anything in the tree
+# (#648582). Removal in a month.
+app-doc/mkdoxy 
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Not compatible with recent PHP, upstream dead for ages (#650870, #650934)
+#, removal in a month.
+www-apps/gnopaste
+www-apps/openwebstats
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Upstream dead, security vulnerable (#650936). Removal in a month.
+www-apps/phprojekt
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Doesn't run, cannot bump it (#651146). Removal in a month.
+games-emulation/hatari
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Doesn't work even with current PHP versions, upstream dead (#651148),
+# removal in a month.
+www-apps/mypictures
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Doesn't work with PHP7, dead upstream (#651184, #651194), removal in a month.
+www-apps/phpmp
+www-apps/polarblog
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Multiple bugs (#424383, #554944), upstream dead (#651340). Removal in a
+# month.
+net-irc/ircservices
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Dead since 2002, orphan, nothing requires it (#651344). Removal in a
+# month.
+app-text/rhyme
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Dead lib not used by anything in the tree (#652186). Removal in a month.
+net-libs/libwhisker
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Obsolete package for the old documentation system (#653168). Removal in a
+# month.
+app-text/gentoo-guide-xml-dtd
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Dead for ages, nothing requires it, needs klibc (that is also completely
+# unmaintained in our side) (#653390). Removal in a month.
+sys-boot/getdvhoff
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Not needed by anything anymore (#653664). Removal in a month.
+dev-python/pyxml
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Both games crash on start (#653812). Removal in a month.
+games-arcade/marbleblast-demo
+games-arcade/marbleblastgold-demo
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Crashes at start (#653998). Removal in a month.
+games-arcade/skystreets
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Merged in games-emulation/advancemame long time ago (#654286). Removal in
+# a month.
+games-emulation/advancemenu
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# This installs an older GUI than the one provided by fceux package
+# (#654294). Removal in a month.
+games-emulation/gfceux
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Upstream dead for ages, doesn't work on amd64, other distros killed it
+# long time ago (#654302). Removal in a month.
+games-emulation/hugo
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Doesn't support amd64, relies on virtual/libstdc++ (#654306). Removal in a
+# month.
+games-emulation/kigb
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Our version is completely outdated, a major version bump and rework of the
+# ebuild is needed (#654336). Removal in a month.
+games-emulation/raine
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Upstream dead for a long time, not compatible with amd64, people can use
+# quake2-icculus with aalib under SDL (#654348). Removal in a month.
+games-fps/aaquake2
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Not required by anything in the tree, upstream disappeared long time ago
+# (#654352). Removal in a month.
+games-fps/doomsday-resources
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Fails to run, use eduke32 instead (#654480). Removal in a month.
+games-fps/duke3d
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Doesn't run on amd64, prboom can be used instead (#654482). Removal in a
+# month.
+games-fps/lsdldoom
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Fails to start (#654492). Removal in a month.
+games-fps/soldieroffortune-demo
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Fails to run (#654510). Removal in a month.
+games-puzzle/brainworkshop
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Dead since 2003, not ported ever to amd64 (#654516). Removal in a month.
+games-puzzle/ensemblist
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Doesn't run (#654520). Removal in a month.
+games-puzzle/hoh-bin
+
+# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
+# Doesn't run (#654554, #654650). Removal in a month.
+games-sports/miniracer
+games-strategy/heroes3-demo
+
+# Mart Raudsepp <leio@gentoo.org> (16 Jun 2018)
+# No upstream (website disappeared), no upstream plugin maintainer,
+# and pretty much a fringe format anyway.
+# Marked for removal in 30 days, bug #658194
+media-plugins/gst-plugins-schroedinger
+
 # 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.
@@ -107,27 +355,6 @@ kde-frameworks/kdelibs
 kde-frameworks/kdelibs-env
 kde-plasma/qguiplatformplugin_kde
 
-# Matt Turner <mattst88@gentoo.org> (20 May 2018)
-# Removal in 30 days. Bug #655102
-x11-libs/libXfont
-
-# Matt Turner <mattst88@gentoo.org> (20 May 2018)
-# Unmaintained. Dead homepage. Depends on dead libXfont.
-# Removal in 30 days. Bug #655104
-app-i18n/fbiterm
-
-# Joonas Niilola <juippis@gmail.com> (18 May 2018)
-# Unmaintained, bugs open without activity, makes users
-# install ancient version of enlightenment by typing
-# 'emerge enlightenment' due to obnoxious package slotting.
-# Bug #656020. Removal in ~30 days
-=x11-wm/enlightenment-1.0.17
-=x11-wm/enlightenment-0.16.9999
-app-doc/edox-data
-x11-misc/e16keyedit
-x11-misc/e16menuedit2
-x11-plugins/epplets
-
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
 # Breaking consumers by internal header cleanup and removal of deprecated
 # qt5_use_modules from Qt5CoreMacros.cmake. File bugs with fixes upstream
@@ -185,47 +412,6 @@ x11-plugins/epplets
 ~dev-qt/qtxmlpatterns-5.11.0_rc2
 ~dev-qt/qtxml-5.11.0_rc2
 
-# Amy Liffey <amynka@gentoo.org> (16 May 2018)
-# Obsolete and not used anymore replaced by app-crypt/eid-mw.
-# Requested by maintainer Vincent Hardy <vincent.hardy.be@gmail.com>
-# Removal in 30 days.
-app-misc/eid-viewer-bin
-
-# Michał Górny <mgorny@gentoo.org> (16 May 2018)
-# Ancient, unmaintained and seriously broken.  Applying patches
-# in the ebuild was broken in 2014 and nobody even reported that.
-# Building tests is broken.  No reverse dependencies.  Back in the day,
-# the package was so bad and incomplete that I've decided it's easier to
-# write my own implementation.  sci-libs/libh2o is a good replacement.
-# Bug #655852.  Removal in 30 days.
-sci-libs/freesteam
-
-# Michał Górny <mgorny@gentoo.org> (16 May 2018)
-# Broken *FLAGS handling.  Use -r3 instead.
-=dev-util/scons-3.0.1-r2
-
-# Michał Górny <mgorny@gentoo.org> (15 May 2018)
-# 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-misc/dont-starve
-games-puzzle/larry
-games-rpg/penumbra-collection
-
-# 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.
-# Migrate to newer slot of the same package.
-dev-ruby/askismet:0
-dev-ruby/arel:5.0
-dev-ruby/autoprefixer-rails:6
-dev-ruby/blankslate:2
-dev-ruby/http:0.6
-dev-ruby/jquery-ui-rails:4
-dev-ruby/net-ssh:3
-dev-ruby/sanitize:0
-dev-ruby/twitter:5
-
 # Maciej Mrozowski <reavertm@gentoo.org> (6 May 2018)
 # SoQt does not build yet
 >=media-libs/coin-4.0.0
@@ -235,13 +421,6 @@ dev-ruby/twitter:5
 # Masked for testing
 =dev-libs/libressl-2.7*
 
-# 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
@@ -332,17 +511,6 @@ sys-libs/uclibc
 # mpv >= 0.28.0 requires currently masked ffmpeg >= 4.0.
 >=media-video/mpv-0.28.0
 
-# Richard Freeman <rich0@gentoo.org> (09 Jan 2018)
-# Bug 644048 - temp QA mask until it can get sorted out
-# Lars Wendler <polynomial-c@gentoo.org> (26 Feb 2018)
-# See also tracker bug: https://bugs.gentoo.org/648864
-~sys-apps/attr-2.4.48
-
-# Lars Wendler <polynomial-c@gentoo.org> (10 Jan 2018)
-# Mask followup bugfixes for =sys-apps/attr-2.4.48 as well until proper
-# testing has been conducted.
-=sys-apps/acl-2.2.52-r2
-
 # Matthias Maier <tamiko@gentoo.org> (26 Dec 2017)
 # gcc depends on mpfr and this version changes soname. Spare users with
 # FEATURES=-preserve-libs from completely frying their system.
@@ -375,16 +543,6 @@ net-misc/cocaine-core
 # Depends on dead Qt4, upstream porting inquiry pending. Bug #631788
 games-kids/crayon-physics
 
-# Michał Górny <mgorny@gentoo.org> (25 Nov 2017)
-# Testing branch GTK+3 release. Changes API, breaks xfce-base/xfdesktop.
-# Masked until the latter sees a new release.
->=dev-python/thunarx-python-0.4.0
->=xfce-base/thunar-1.7
->=xfce-extra/thunar-archive-plugin-0.4.0
->=xfce-extra/thunar-media-tags-plugin-0.3.0
->=xfce-extra/thunar-shares-plugin-0.3.0
->=xfce-extra/thunar-vcs-plugin-0.1.90
-
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
 # Depends on dead Qt4. Last-rites on hold for chance of Qt5-port. Bug #620702
 <media-gfx/freecad-0.17
@@ -552,8 +710,8 @@ net-wireless/cpyrit-cuda
 # Bernard Cafarelli <voyageur@gentoo.org> (8 May 2017)
 # Coordinated conversion to wxGTK:3.0-gtk3
 # Drop mask after migration of existing wxGTK:3.0 users
-=net-ftp/filezilla-3.31.0-r300
 =net-ftp/filezilla-3.33.0-r300
+=net-ftp/filezilla-3.34.0-r300
 =dev-util/codeblocks-17.12-r300
 
 # Mart Raudsepp <leio@gentoo.org> (16 Feb 2017)
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.mask b/profiles/prefix/darwin/macos/10.5/ppc/package.mask
index 13d119cb0a6d..9e50ba7ffb7a 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/10.5/ppc/package.mask
@@ -1,2 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (18 Jun 2018)
+# FSF GCC is our system compiler here
+-sys-devel/gcc
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/packages b/profiles/prefix/darwin/macos/10.5/ppc/packages
index f8f1b81f58f4..6d26e5615614 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/packages
+++ b/profiles/prefix/darwin/macos/10.5/ppc/packages
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Mac OS X Leopard/PPC uses gcc-apple (not Clang)
--*sys-devel/gcc
+# Mac OS X Leopard/PPC uses FSF gcc and gcc-apple (not Clang)
+*sys-devel/gcc
 *sys-devel/gcc-config
 -*sys-devel/clang
 *sys-devel/gcc-apple
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index 9cd0b2c7bb8f..3c8c9964ce42 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Some USE-flags that only die-hards don't want:
@@ -8,13 +8,5 @@
 # ssl:       encrypted connections are a nice feature
 USE="readline zlib ncurses ssl"
 
-FEATURES="collision-protect"
-
-# Python 3.5 is unmasked for us, build stuff by default, in particular
-# for bug #572502 where the default python is set to 3.5 for it was
-# built first.  Drop Python 3.4 to avoid unnecessary builds.
-PYTHON_TARGETS="python2_7 python3_5"
-PYTHON_SINGLE_TARGET="python3_5"
-
-# Move away from ruby21, fast forward to ruby24, we don't have ruby23
-RUBY_TARGETS="ruby22 ruby24"
+# Move away from ruby22 fast forward to ruby24, we don't have ruby23
+RUBY_TARGETS="ruby24"
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index b97a4bb71789..aa30efa71a27 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (27 Jun 2016)
-# sys-libs/libseccomp is a linux interface, not sure if it will work
-# in prefix for Linux either, bug #585756
-app-misc/pax-utils seccomp
-
 # Mikle Kolyada <zlogene@gentoo.org> (29 Nov 2014)
 # Masked because of lack of manpower/time (bug #497068)
 dev-vcs/git mediawiki mediawiki-experimental
diff --git a/profiles/prefix/use.mask b/profiles/prefix/use.mask
index 134085a9be51..80601532ae21 100644
--- a/profiles/prefix/use.mask
+++ b/profiles/prefix/use.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (21 Jun 2018)
+# sys-libs/libseccomp is a linux interface, not sure if it will work
+# in prefix for Linux either, bug #585756
+seccomp
+
 # Mask all glibc/linux combination, unmasked in the appropriate profiles
 elibc_glibc
 kernel_linux
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
index 67ce07101516..f1d5ae0a4b12 100644
--- a/profiles/updates/2Q-2018
+++ b/profiles/updates/2Q-2018
@@ -13,3 +13,4 @@ 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
+move games-puzzle/triptych-demo games-puzzle/triptych
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 634b100719b9..7f9e36fd93a3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -458,6 +458,7 @@ app-emulation/bochs:avx - Enable support for emulating Advanced Vector Extension
 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/buildah:ostree - Enables dependencies for handling of OSTree images.
 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.
@@ -923,7 +924,47 @@ app-misc/gramps:reports - All external software that is needed for graphical rep
 app-misc/graphlcd-base:g15 - Add support for app-misc/g15daemon driver (e.g. Logitech G15 Keybord)
 app-misc/irtrans-irserver:mono - Enable mono support
 app-misc/jq:oniguruma - Use dev-libs/oniguruma for regular expression support
-app-misc/lcd4linux:mpd - Add support for display of mpd controlled music (media-libs/libmpd)
+app-misc/kryoflux-dtc:demos - Install example floppy game files.
+app-misc/kryoflux-dtc:fast-firmware - Install fast firmware instead of slow firmware.
+app-misc/kryoflux-dtc:gui - Install the Kryoflux GUI
+app-misc/lcd4linux:apm - Enable the APM plugin.
+app-misc/lcd4linux:asterisk - Enable the Asterisk plugin.
+app-misc/lcd4linux:button_exec - Enable the Button plugin, to execute something on keypress.
+app-misc/lcd4linux:cpuinfo - Enable the cpuinfo plugin.
+app-misc/lcd4linux:dbus - Enable the dbus plugin.
+app-misc/lcd4linux:diskstats - Enable the diskstats plugin.
+app-misc/lcd4linux:dmalloc - Enable dmalloc for debugging.
+app-misc/lcd4linux:dvb - Enable support for the DVB plugin.
+app-misc/lcd4linux:event - Enable the event plugin.
+app-misc/lcd4linux:exec - Enable the exec plugin, to read output from external programs.
+app-misc/lcd4linux:fifo - Enable the FIFO (First-In, First-Out) plugin.
+app-misc/lcd4linux:file - Enable the file plugin, to read from input from files.
+app-misc/lcd4linux:gps - Enable the gps plugin, for reading gps coordinates.
+app-misc/lcd4linux:hddtemp - Enable the hddtemp plugin, to read from the hddtemp daemon.
+app-misc/lcd4linux:huawei - Enable the huawei plugin, to read from a huawei device.
+app-misc/lcd4linux:i2c_sensors - Enable the i2c_sensors plugin, to read sensor data.
+app-misc/lcd4linux:iconv - Enable the iconv plugin, to convert between encodings.
+app-misc/lcd4linux:isdn - Enable the isdn plugin, to get information about ISDN.
+app-misc/lcd4linux:kvv - Enable the kvv plugin, to get realtime train schedule from the Karlsruher Verkehrsverbund.
+app-misc/lcd4linux:loadavg - Enable the loadavg plugin, to get stats load
+app-misc/lcd4linux:meminfo - Enable the meminfo plugin, to get memory statistics.
+app-misc/lcd4linux:mpd - Enable the mpd plugin, to read from the Music Player Daemon.
+app-misc/lcd4linux:mpris_dbus - Enable the mpris plugin, to read data via dbus for mpris.
+app-misc/lcd4linux:mysql - Enable the mysql plugin, to get mysql database information.
+app-misc/lcd4linux:netdev - Enable the netdev plugin, to get interface statistics.
+app-misc/lcd4linux:netinfo - Enable the netinfo plugin, to get more interface statistic.
+app-misc/lcd4linux:outb - Enable raw i/o access.
+app-misc/lcd4linux:pop3 - Enable the pop3 plugin, to get notified about new mails.
+app-misc/lcd4linux:proc_stat - Enable the proc_stat plugin, to read data from the proc file system.
+app-misc/lcd4linux:python - Enable support for dev-lang/python and enable the python plugin, to execute own python scripts.
+app-misc/lcd4linux:qnaplog - Enable the qnaplog plugin, to read a log from a QNAP device.
+app-misc/lcd4linux:raspi - Enable the raspi plugin, to read sensor data from a Raspberry Pi.
+app-misc/lcd4linux:sample - Enable the sample plugin.
+app-misc/lcd4linux:statfs - Enable the statfs plugin, to get statistics about the file system.
+app-misc/lcd4linux:uname - Enable the uname plugin, to get the output of uname.
+app-misc/lcd4linux:uptime - Enable the uptime plugin.
+app-misc/lcd4linux:w1retap - Enable the w1retap plugin.
+app-misc/lcd4linux:wireless - Enable the wireless plugin, to get wireless statistics.
 app-misc/lcdproc:ftdi - Enable support for FTDI connections in some selected LCD_DEVICES (currently hd44780)
 app-misc/lcdproc:hid - Enable HID support using libhid
 app-misc/lcdproc:irman - Enable support for IRMan (media-libs/libirman)
@@ -1280,6 +1321,7 @@ 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/aunit:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 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
@@ -1293,6 +1335,11 @@ 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-bindings:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
+dev-ada/gnatcoll-bindings:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/gnatcoll-bindings:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+dev-ada/gnatcoll-bindings:shared - Build shared library
+dev-ada/gnatcoll-bindings:static-pic - Build shared library
 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
@@ -2517,9 +2564,6 @@ dev-python/django-cms:snippet - Install djangocms snippet plugin
 dev-python/django-cms:teaser - Install djangocms teaser plugin
 dev-python/django-cms:video - Install djangocms video plugin
 dev-python/django-tastypie:bip - An optional serialiser dev-python/biplist
-dev-python/django-tastypie:digest - Library to aid in implementing HTTP Digest Authentication
-dev-python/django-tastypie:lxml - An optional serialiser dev-python/lxml
-dev-python/django-tastypie:yaml - An optional serialiser dev-python/yaml
 dev-python/django-two-factor-auth:yubikey - Adds support for Yubikeys via django-otp-yubikey
 dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
 dev-python/falcon:cython - Build cython-based python modules
@@ -2988,6 +3032,7 @@ dev-util/schroot:lvm - Enable support for chroots using LVM snapshots.
 dev-util/squashdelta:lz4 - Enable support for LZ4 compression using app-arch/lz4
 dev-util/squashmerge:lz4 - Enable support for LZ4 compression using app-arch/lz4
 dev-util/strace:aio - Enable dev-libs/libaio support for tracing Asynchronous I/O operations
+dev-util/strace:elfutils - Enable stack backtraces (-k flag) via dev-libs/elfutils
 dev-util/strace:unwind - Enable stack backtraces (-k flag) via sys-libs/libunwind
 dev-util/suse-build:symlink - Provide compatibility symlinks with original openSUSE package (might clash with other packages)
 dev-util/sysdig:modules - Build kernel modules needed for tracing local events. Disable this only if you intend to use sysdig purely to work with dumpfiles.
@@ -4155,8 +4200,14 @@ media-libs/grilo:playlist - Enable support for playlists through dev-libs/totem-
 media-libs/gst-plugins-bad:bzip2 - Enable bzip2 encoder/decoder plugin
 media-libs/gst-plugins-bad:egl - Enable EGL support
 media-libs/gst-plugins-bad:gles2 - Enable GLES2 support
+media-libs/gst-plugins-base:X - Enable ximagesink and xvimagesink plugins; build GLX platform support if USE=opengl is enabled; build x11 windowing system support if USE=egl is enabled
+media-libs/gst-plugins-base:egl - Enable EGL platform support
+media-libs/gst-plugins-base:gbm - Enable Graphics Buffer Manager based EGL windowing system support (requires egl and at least one of gles or opengl)
+media-libs/gst-plugins-base:gles2 - Enable OpenGL library and plugin via GLESv2 API (requires egl)
 media-libs/gst-plugins-base:ivorbis - Enable integer based vorbis decoder
+media-libs/gst-plugins-base:opengl - Enable OpenGL library and plugin via desktop OpenGL API
 media-libs/gst-plugins-base:pango - Enable pango GStreamer plugin
+media-libs/gst-plugins-base:wayland - Enable Wayland EGL windowing system support (requires egl and at least one of gles2 or opengl)
 media-libs/gstreamer:orc - Disable some PaX memory protections to allow plugins that use dev-lang/orc for runtime optimization to be used on hardened PaX systems
 media-libs/gstreamer:unwind - Enable sys-libs/libunwind usage for better backtrace support in leaks tracer module
 media-libs/harfbuzz:glib - Compile with GLib Unicode support
@@ -4409,12 +4460,16 @@ media-plugins/grilo-plugins:tracker - Build support for content discovery using
 media-plugins/grilo-plugins:vimeo - Build support for Vimeo content discovery using net-libs/libsoup and dev-libs/libgcrypt
 media-plugins/grilo-plugins:youtube - Build support for YouTube content discovery using dev-libs/libgdata
 media-plugins/gst-plugins-gl:libvisual - Enable visualization effects via media-libs/libvisual
+media-plugins/gst-plugins-gtk:egl - Enable EGL platform usage
+media-plugins/gst-plugins-gtk:gles2 - Enable gtkglsink OpenGL sink based on GLESv2 API
+media-plugins/gst-plugins-gtk:opengl - Enable gtkglsink OpenGL sink based on desktop OpenGL API
 media-plugins/gst-plugins-meta:http - Enable http streaming via net-libs/libsoup
 media-plugins/gst-plugins-meta:libvisual - Enable visualization effects via media-libs/libvisual
 media-plugins/gst-plugins-meta:opus - Enable Opus audio codec support
 media-plugins/gst-plugins-meta:vpx - Enables vp8 codec support using libvpx, required to play some HTML5 videos
 media-plugins/gst-plugins-vaapi:drm - Enable DRM renderer
 media-plugins/gst-plugins-vaapi:egl - Enable EGL support
+media-plugins/gst-plugins-vaapi:gles2 - Enable GLESv2 and GLESv3 support
 media-plugins/hexter:gtk2 - Enable x11-libs/gtk+:2 based GUI
 media-plugins/imlib2_loaders:eet - Enable Eet image loader
 media-plugins/imlib2_loaders:xcf - Enable XCF image loader
@@ -4671,6 +4726,7 @@ media-sound/pulseaudio:alsa-plugin - Request installing media-plugins/alsa-plugi
 media-sound/pulseaudio:asyncns - Use libasyncns for asynchronous name resolution.
 media-sound/pulseaudio:doc - Build the doxygen-described API documentation.
 media-sound/pulseaudio:equalizer - Enable the equalizer module (requires sci-libs/fftw).
+media-sound/pulseaudio:gconf - Ensure gnome-base/gconf is present for pulseaudio GConf to GSettings module automatic migration (keeping the user configuration)
 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.
@@ -5041,12 +5097,13 @@ media-video/mpv:jpeg - Enable support for saving screenshots in JPEG format
 media-video/mpv:libass - Enable OSD (On Screen Display) and subtitles support via media-libs/libass
 media-video/mpv:libmpv - Build mpv shared library
 media-video/mpv:lua - Enable Lua scripting, OSC (On Screen Controller) GUI and net-misc/youtube-dl hook-script
-media-video/mpv:opengl - Enable the recommended 'opengl' video output
+media-video/mpv:opengl - Enable support for various OpenGL-based video backends
 media-video/mpv:raspberry-pi - Enable support for the Raspberry Pi
 media-video/mpv:rubberband - Enable high quality pitch correction via media-libs/rubberband
 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:vulkan - Enable support for various Vulkan-based video backends
 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.
@@ -5458,7 +5515,9 @@ net-analyzer/zmap:redis - Add support for storing in a redis DB via dev-libs/hir
 net-dialup/accel-ppp:ipoe - Build IPoE kernel module
 net-dialup/accel-ppp:shaper - Support for traffic shaping
 net-dialup/accel-ppp:valgrind - Compile in valgrind hints
+net-dialup/freeradius:memcached - Include dev-libs/libmemcached in caching drivers
 net-dialup/freeradius:pcap - Build the RADIUS sniffer which requires net-libs/libpcap.
+net-dialup/freeradius:rest - Include support for sending and receiving HTTP requests
 net-dialup/freeradius-client:scp - Add service type hints derived from username prefix
 net-dialup/freeradius-client:shadow - Enable shadow password support
 net-dialup/mgetty:fax - Enables fax support
@@ -5886,7 +5945,7 @@ net-irc/psybnc:multinetwork - Adds support for multiple networks
 net-irc/psybnc:oidentd - Adds support for oidentd
 net-irc/psybnc:scripting - Adds scripting support
 net-irc/quassel:X - Build the Qt5 GUI client for quassel. If this USE flag is disabled, the GUI is not built, and cannot be used. You might want to disable this on the server, but you need it enabled on the client.
-net-irc/quassel:breeze - Support the Breeze and Breeze-Dark icon sets (default for Plasma 5).
+net-irc/quassel:bundled-icons - Use icon themes bundled with Quassel, rather than depending on system packages.
 net-irc/quassel:crypt - Support core->network per-channel and per-query blowfish encryption via app-crypt/qca SLOT 2.
 net-irc/quassel:dbus - Support desktop notifications via the StatusNotifier D-Bus service (used by most modern desktop environments).
 net-irc/quassel:monolithic - Build standalone client with integrated core, no external quasselcore needed. Only useful if you don't want to use Quassel's client/server model. The server and X flags are not needed in this case but it is possible to enable them too.
@@ -7104,7 +7163,7 @@ sci-chemistry/pymol:web - Install Pymodule needed for web app support
 sci-chemistry/raster3d:gd - libgd support for PNG and JPEG output
 sci-chemistry/vmd:cuda - Use nvidia cuda toolkit for speeding up computations
 sci-chemistry/vmd:gromacs - Add support for TNG file format
-sci-chemistry/vmd:msms - Add support for MSMS SAS calcualtion tool
+sci-chemistry/vmd:msms - Add support for MSMS SES calcualtion tool
 sci-chemistry/vmd:povray - Add support for povray raytracer for HQ images
 sci-chemistry/vmd:tachyon - Add support for tachyon raytracer for HQ images
 sci-chemistry/votca-csg:extras - Pull in extra applications from sci-chemistry/votca-csgapps
@@ -7640,6 +7699,7 @@ sys-apps/lm_sensors:sensord - Enable sensord - a daemon that can be used to peri
 sys-apps/man-db:manpager - Enable manpager wrapper for colorizing output
 sys-apps/mawk:forced-sandbox - Always enable -W sandbox mode for simpler/secure runtime
 sys-apps/memtest86:serial - Compile with serial console support
+sys-apps/memtest86+:boot - Also install to /boot instead of just /usr/share/memtest86+/
 sys-apps/memtest86+:floppy - Install a script to create floppy disks containing memtest86+ binaries.
 sys-apps/memtest86+:iso - Compile an ISO image
 sys-apps/memtest86+:serial - Compile with serial console support
@@ -7690,7 +7750,6 @@ sys-apps/roccat-tools:input_devices_roccat_suora - Enable support for Suora keyb
 sys-apps/s390-tools:fuse - build cmsfs-fuse to read files stored on a z/VM CMS disk
 sys-apps/s390-tools:ncurses - build hyptop monitoring program
 sys-apps/s390-tools:pfm - build the cpacfstats tool
-sys-apps/s390-tools:zfcpdump - build the kernel disk dumping utility
 sys-apps/s390-tools:zlib - build the zgetdump utility
 sys-apps/sed:forced-sandbox - Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands). Note: This may break many configure scripts, so it should be avoided on dev systems (and generally used on binpkg/final systems only).
 sys-apps/selinux-python:audit - Enable support for sys-process/audit and use the audit_* functions (like audit_getuid instead of getuid())
@@ -8230,6 +8289,7 @@ sys-libs/libblockdev:dmraid - Support for dmraid devices, also known as ATA-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/libblockdev:vdo - Enable Virtual Data Optimizer support.
 sys-libs/libcxx:libcxxabi - Build on top of sys-libs/libcxxabi instead of gcc's libsupc++ (avoids depending on gcc).
 sys-libs/libcxx:libcxxrt - Build on top of sys-libs/libcxxrt instead of gcc's libsupc++ (avoids depending on gcc).
 sys-libs/libcxx:libunwind - Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependence on gcc.
@@ -8675,8 +8735,6 @@ x11-libs/gtksourceview:glade - Install a glade catalog file
 x11-libs/libQGLViewer:designer - Installs dev-qt/designer plugin.
 x11-libs/libSM:uuid - Use UUID for session identification instead of IP address and system time.
 x11-libs/libXaw:deprecated - Install deprecated Xaw6 library.
-x11-libs/libXfont:bzip2 - Support bzip2 compressed PCF fonts.
-x11-libs/libXfont:truetype - Use media-libs/freetype for font rasterization.
 x11-libs/libXfont2:bzip2 - Support bzip2 compressed PCF fonts.
 x11-libs/libXfont2:truetype - Use media-libs/freetype for font rasterization.
 x11-libs/libaosd:pango - Enable the textual helpers (requires pangocairo).
@@ -8767,6 +8825,7 @@ x11-plugins/pidgin-sipe:ocs2005-message-hack - Disable message timeout for OCS20
 x11-plugins/pidgin-sipe:openssl - Enable crypto support via dev-libs/openssl
 x11-plugins/pidgin-sipe:telepathy - Support use as a telepathy backend
 x11-plugins/pidgin-sipe:voice - Enable experimental voice/video support
+x11-plugins/pidgin-telegram:gcrypt - Use dev-libs/libgcrypt instead of dev-libs/openssl.
 x11-plugins/purple-plugin_pack:talkfilters - Enable support for app-text/talkfilters
 x11-plugins/vicious:contrib - Install extra widgets, some for less common hardware, some contributed by Vicious users.
 x11-plugins/wmfire:session - Enable session management
@@ -8904,9 +8963,7 @@ x11-wm/enlightenment:enlightenment_modules_wl-wl - Wayland-in-Wayland module
 x11-wm/enlightenment:enlightenment_modules_wl-x11 - Wayland-in-X11 module
 x11-wm/enlightenment:enlightenment_modules_xkbswitch - Keyboard layout configuration and switcher
 x11-wm/enlightenment:enlightenment_modules_xwayland - X/Wayland integration
-x11-wm/enlightenment:pango - Enable pango font rendering
 x11-wm/enlightenment:ukit - Use upower/udisks to automount devices
-x11-wm/enlightenment:xrandr - Enable support for the X xrandr extension
 x11-wm/fluxbox:bidi - Enable bidirectional language support with dev-libs/fribidi
 x11-wm/fluxbox:slit - Enables the Fluxbox slit (or dock)
 x11-wm/fluxbox:systray - Enables the system tray in the Fluxbox toolbar