gentoo resync : 17.05.2018

28 files changed, 152 insertions, 63 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 65d45ee3fdee..6328fe23210f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index d35dfcf8dc5a..eecfbb757e49 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <ya@sysdump.net> (14 May 2018)
+# Force the host target to avoid dependency hell
+dev-lang/rust llvm_targets_X86
+
 # NP-Hardass <NP-Hardass@gentoo.org> (23 May 2017)
 # Packages with optional 64-bit variant
 app-emulation/wine-vanilla -abi_x86_64
diff --git a/profiles/arch/arm/armv4/make.defaults b/profiles/arch/arm/armv4/make.defaults
index 7dede6e9e7d3..75bd5699da21 100644
--- a/profiles/arch/arm/armv4/make.defaults
+++ b/profiles/arch/arm/armv4/make.defaults
@@ -1,4 +1,6 @@
 CHOST="armv4l-unknown-linux-gnu"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv4"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/armv4t/make.defaults b/profiles/arch/arm/armv4t/make.defaults
index c99eb3fbd66f..da47bc0c518c 100644
--- a/profiles/arch/arm/armv4t/make.defaults
+++ b/profiles/arch/arm/armv4t/make.defaults
@@ -1,4 +1,6 @@
 CHOST="armv4tl-softfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv4t"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/armv5te/make.defaults b/profiles/arch/arm/armv5te/make.defaults
index 4c5a401c2205..f539415059d5 100644
--- a/profiles/arch/arm/armv5te/make.defaults
+++ b/profiles/arch/arm/armv5te/make.defaults
@@ -1,4 +1,6 @@
 CHOST="armv5tel-softfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv5te"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/armv6j/make.defaults b/profiles/arch/arm/armv6j/make.defaults
index b85e76c8b446..f23e0de09e37 100644
--- a/profiles/arch/arm/armv6j/make.defaults
+++ b/profiles/arch/arm/armv6j/make.defaults
@@ -1,4 +1,6 @@
-CHOST="armv6j-hardfloat-linux-gnueabi"
+CHOST="armv6j-unknown-linux-gnueabihf"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv6j"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm/armv7a/make.defaults b/profiles/arch/arm/armv7a/make.defaults
index 2ca07ab4130f..525a73346b19 100644
--- a/profiles/arch/arm/armv7a/make.defaults
+++ b/profiles/arch/arm/armv7a/make.defaults
@@ -1,4 +1,6 @@
-CHOST="armv7a-hardfloat-linux-gnueabi"
+CHOST="armv7a-unknown-linux-gnueabihf"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv7-a"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 35055867c2fc..31226f273464 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <ya@sysdump.net> (14 May 2018)
+# Force the host target to avoid dependency hell
+dev-lang/rust llvm_targets_AArch64
+
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
 sys-devel/clang llvm_targets_AArch64
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 406abbd7777a..463a5b3b737f 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -107,7 +107,3 @@ games-fps/duke3d-data gog
 # Maciej Mrozowski <reavertm@gentoo.org> (26 Jun 2010)
 # Needs media-libs/simage keyworded, bug 325623
 media-libs/coin simage
-
-#nixnut <nixnut@gentoo.org> (24 jan 2009)
-#don't want zemberek for enchant for ppc32
-app-text/enchant zemberek
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index d4d81618ef5b..d909bbd691ee 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -20,7 +20,3 @@ app-admin/conky apcupsd
 # Brent Baude <ranger@gentoo.org> (6  Feb 2009)
 # Masking solver/ocaml USE from kalzium to fix tree borkage
 kde-apps/kalzium solver
-
-# Brent Baude <ranger@gentoo.org> (28 January 2009)
-# Masking zemberek for enchant
-app-text/enchant zemberek
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index aa67ba2a5f99..6cb2daaf6398 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -379,9 +379,6 @@ app-text/texlive xindy
 # Needs krb4 USE flag for mit-krb5 (Bug #255579), and we believe it to be unstable.
 net-im/pidgin zephyr
 
-# Mask zemberek for enchant because it requires java.
-app-text/enchant zemberek
-
 # Mask srtp for ortp because libsrtp is marked -sparc
 net-libs/ortp srtp
 
diff --git a/profiles/arch/x86/package.use.force b/profiles/arch/x86/package.use.force
index 6d74f7f7c286..c234a241e4f7 100644
--- a/profiles/arch/x86/package.use.force
+++ b/profiles/arch/x86/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <ya@sysdump.net> (14 May 2018)
+# Force the host target to avoid dependency hell
+dev-lang/rust llvm_targets_X86
+
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
 sys-devel/clang llvm_targets_X86
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 14e2eb45d763..df676fb475aa 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # 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> (16 May 2018)
+# Depends on last-rited sci-libs/coinhsl.
+sci-libs/ipopt hsl
+
 # Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
 # Depends on obsolete dev-libs/sni-qt and dead Qt4.
 kde-plasma/plasma-desktop qt4
@@ -56,10 +60,6 @@ sys-fabric/ofed mstflint
 # x11-themes/vdrgraphtft-avp is being removed (#592066)
 media-plugins/vdr-music graphtft
 
-# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
-# app-text/zemberek-server is being removed (#587806)
-app-text/enchant zemberek
-
 # Lars Wendler <polynomial-c@gentoo.org> (14 Mar 2018)
 # Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having
 # no active upstream anymore.
@@ -78,12 +78,18 @@ app-admin/testdisk ewf
 >=sys-cluster/ceph-12.2.4 system-boost
 
 # Brian Evans <grknight@gentoo.org> (5 Mar 2018)
-# Mask embedded USE on virtual/mysql to transition it to be obsolete
->=virtual/mysql-5.6-r11 embedded
+# Mask embedded USE on virtual/mysql and friends to transition it to be obsolete
+virtual/mysql embedded
+dev-db/mariadb embedded
+dev-db/mariadb-galera embedded
+dev-db/mysql embedded
+dev-db/mysql-cluster embedded
+dev-perl/DBD-mysql embedded
 
 # Brian Evans <grknight@gentoo.org> (28 Feb 2018)
 # Mask client-libs USE to force users to install alternative standard pacakges
 dev-db/mariadb client-libs
+dev-db/mariadb-galera client-libs
 dev-db/mysql client-libs
 dev-db/percona-server client-libs
 
@@ -119,13 +125,6 @@ net-analyzer/nagios-plugin-check_raid i2o
 # Can be unmasked in prefix/darwin/macos profiles. Bug #637482
 media-video/ffmpeg appkit
 
-# Pacho Ramos <pacho@gentoo.org> (28 Dec 2017)
-# The whole zeitgeist stack is dead (#629180)
-gnome-extra/synapse zeitgeist
-app-editors/gedit-plugins zeitgeist
-dev-libs/folks zeitgeist
-www-client/midori zeitgeist
-
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
 # Java 9 is not yet fully supported on Gentoo. Having a masked
 # gentoo-vm flag allows us to provide it without it breaking Gentoo
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index 47c5a5b16a63..f1326439248d 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michał Górny <mgorny@gentoo.org> (11 May 2018)
-# USE=doc uses non-BSD 'cp' syntax, bug #655444.
->=dev-lang/nasm-2.13 doc
-
 # Fabian Groffen <grobian@gentoo.org> (07 Dec 2016)
 # unkeyworded notmuch dependency, bug #587560
 mail-client/mutt notmuch
diff --git a/profiles/default/linux/amd64/17.1/profile.bashrc b/profiles/default/linux/amd64/17.1/profile.bashrc
index 44dc51c55408..7019782fb8f9 100644
--- a/profiles/default/linux/amd64/17.1/profile.bashrc
+++ b/profiles/default/linux/amd64/17.1/profile.bashrc
@@ -1,7 +1,9 @@
-if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -L ${ROOT%/}/lib || -L ${ROOT%/}/usr/lib ]] ; then
-	eerror "Please follow the instructions in the news item:"
-	eerror "2017-12-26-experimental-amd64-17-1-profiles"
-	eerror "or choose the 17.0 profile."
-	die "ERROR: 17.1 migration has not been performed!!"
+if [[ "${EBUILD_PHASE}" == "setup" ]] ; then
+	if [[ "$(realpath ${ROOT%/}/lib)" == "${ROOT%/}/lib64" || "$(realpath ${ROOT%/}/usr/lib)" == "${ROOT%/}/usr/lib64" ]] ; then
+		eerror "Please follow the instructions in the news item:"
+		eerror "2017-12-26-experimental-amd64-17-1-profiles"
+		eerror "or choose the 17.0 profile."
+		die "ERROR: 17.1 migration has not been performed!!"
+	fi
 fi
 
diff --git a/profiles/default/linux/arm/13.0/armv6j/make.defaults b/profiles/default/linux/arm/13.0/armv6j/make.defaults
new file mode 100644
index 000000000000..88750c055d7d
--- /dev/null
+++ b/profiles/default/linux/arm/13.0/armv6j/make.defaults
@@ -0,0 +1,2 @@
+CHOST="armv6j-hardfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
diff --git a/profiles/default/linux/arm/13.0/armv7a/make.defaults b/profiles/default/linux/arm/13.0/armv7a/make.defaults
new file mode 100644
index 000000000000..dd7639e152d5
--- /dev/null
+++ b/profiles/default/linux/arm/13.0/armv7a/make.defaults
@@ -0,0 +1,2 @@
+CHOST="armv7a-hardfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
diff --git a/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults b/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults
index c0cb6c11748f..608aa101c645 100644
--- a/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults
+++ b/profiles/default/linux/arm/17.0/musl/armv7a/make.defaults
@@ -1,7 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST="armv7a-hardfloat-linux-musleabi"
+CHOST="armv7a-unknown-linux-musleabihf"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/musl/arm/armv7a/make.defaults b/profiles/default/linux/musl/arm/armv7a/make.defaults
index c680f6aa2e5a..9310aa7711dd 100644
--- a/profiles/default/linux/musl/arm/armv7a/make.defaults
+++ b/profiles/default/linux/musl/arm/armv7a/make.defaults
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="armv7a-hardfloat-linux-musleabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/musl/arm/make.defaults b/profiles/default/linux/musl/arm/make.defaults
index e0e4051efde6..a56035197c43 100644
--- a/profiles/default/linux/musl/arm/make.defaults
+++ b/profiles/default/linux/musl/arm/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
 
 ARCH="arm"
@@ -9,6 +9,7 @@ CFLAGS="-O2"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
+CHOST_arm="${CHOST}"
 
 # Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
 # Multilib-related setup, bug #515130
diff --git a/profiles/default/linux/uclibc/arm/armv6j/make.defaults b/profiles/default/linux/uclibc/arm/armv6j/make.defaults
index 10e4e8d35be2..85682272eded 100644
--- a/profiles/default/linux/uclibc/arm/armv6j/make.defaults
+++ b/profiles/default/linux/uclibc/arm/armv6j/make.defaults
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="armv6j-hardfloat-linux-uclibceabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/uclibc/arm/armv7a/make.defaults b/profiles/default/linux/uclibc/arm/armv7a/make.defaults
index 0ac8f14a75a5..397875e9b6bb 100644
--- a/profiles/default/linux/uclibc/arm/armv7a/make.defaults
+++ b/profiles/default/linux/uclibc/arm/armv7a/make.defaults
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="armv7a-hardfloat-linux-uclibceabi"
+CHOST_arm="${CHOST}"
+
 CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/uclibc/arm/make.defaults b/profiles/default/linux/uclibc/arm/make.defaults
index a551dc5118c0..ae32c6cdd3ae 100644
--- a/profiles/default/linux/uclibc/arm/make.defaults
+++ b/profiles/default/linux/uclibc/arm/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
 
 ARCH="arm"
@@ -9,6 +9,7 @@ CFLAGS="-O2"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
+CHOST_arm="${CHOST}"
 
 # Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
 # Multilib-related setup, bug #515130
diff --git a/profiles/desc/lcd_devices.desc b/profiles/desc/lcd_devices.desc
index 0b5469757cb8..df6352251435 100644
--- a/profiles/desc/lcd_devices.desc
+++ b/profiles/desc/lcd_devices.desc
@@ -1,9 +1,10 @@
-# Copyright 2007-2012 Gentoo Foundation.
+# Copyright 2007-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of LCD_DEVICES USE_EXPAND flags.
 
 # Keep it sorted.
+acoolsdcm - Add support for Alphacool USB display 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
@@ -11,27 +12,38 @@ 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 
 cwlinux - Add support for serial / USB displays CW12232 and CW1602 by CwLinux
+ddusbt - Add support for DD usb touch screen
+directgfx - Add support for output via SDL
+displaylink - Add support for displaylink based LCDs
 ea232 - Add support for the Electronic Assembly RS232 graphic driver
 ea65 - Add support for the VFD in the AOpen XC Cube-AV EA65 media barebone
 eyeboxone - Add support for the displays on Rightvision's EyeboxOne server
+framebuffer - Add support for output on a framebuffer
 g15 - Add support for Logitech G15 Keyboard LCDs
+glcd2usb - Add support for GLCD2USB LCD module
 glk - Add support for MatrixOrbital GLK chipset
+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
 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
 irtrans - Add support for the 16x2 IRTrans VFD device
+ks0108 - Add support for KS0108 based graphical LCDs
+l4m - Add support for Linux4Media displays
 lb216 - Add support for RTN's LB216 display
 lcd2usb - Add support for the open lcd2usb connector to hd44780 displays
+lc7981 - Add support for the DG-16080 display family
 lcdlinux - Add support for HD44780 displays via the LCD-Linux kernel driver
 lcdm001 - Add support for the Kernelconcepts LCDM001 display
 lcdterm - Add support for LCDTerm serial-to-HD44780 adapter boards
 lcterm - Add support for Neumark's LCTerm serial LCD
 ledmatrix - Add support for SLM1606/8 LED Matrix displays
+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
@@ -43,16 +55,23 @@ 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
-noritake - Add support for the Noritake GU128x32-311 graphical display.
+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
 picolcd - Add support for Mini-Box's 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
 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
+sed156x - Add support for Nokias 7110 display module
 sed1520 - Add support for the Seiko Epson SED1520 Controller
 serdisplib - Meta-driver to support drivers via dev-libs/serdisplib
 serialpos - Add support for character displays in serial point of sale ("POS") devices
@@ -60,7 +79,9 @@ serialvfd - Add support for most NEC, Futaba and Noritake VFDs
 shuttlevfd - Add support for several Shuttle VFDs such as M1000, M2000, G5 3300m and SG33G5M
 simplelcd - Add support for a simple serial terminal display
 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
 svga - Add support for output via media-libs/svgalib
 t6963 - Add support for Toshiba T6963 based LCD displays
 text - Add support for TextMode displaying
diff --git a/profiles/package.mask b/profiles/package.mask
index c2480a6987c5..7eac10b6033f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,52 @@
 
 #--- END OF EXAMPLES ---
 
+# 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)
+# Distfile missing BLAKE2B hash.  The package is fetch-restricted,
+# the sources can apparently by only obtained by buying it, or filing
+# an academic license request and having it approved.  Please provide
+# the updated hash if you have the matching distfile.
+# Bug #642908.  Removal in 30 days.
+sci-libs/coinhsl
+
+# 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-action/shadowgrounds-bin
+games-action/shadowgrounds-survivor-bin
+games-action/trine2
+games-misc/dont-starve
+games-puzzle/larry
+games-rpg/avadon
+games-rpg/bastion
+games-rpg/penumbra-collection
+games-rpg/wasteland2
+
+# 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
@@ -50,7 +96,7 @@ dev-libs/libmemcache
 
 # Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
 # Depends on dead Qt4. Masked for removal in 30 days.
-dev-python/pyside-tools
+dev-python/pyside-tools:0
 
 # Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
 # Depends on dead Qt4, does not build, needs someone to bump to Qt5.
@@ -687,12 +733,6 @@ dev-java/jcs
 # the suggested replacement for the meantime.
 sys-fs/bedup
 
-# Lars Wendler <polynomial-c@gentoo.org> (20 Aug 2015)
-# Releases are not from original upstream but from a fork.
-# Masked as requested by vapier.
-~net-misc/iputils-20160308
-~net-misc/iputils-20161105
-
 # Justin Lecher <jlec@gentoo.org> (28 Feb 2015)
 # Unfixed security problems
 # No upstream support anymore
diff --git a/profiles/prefix/linux/arm/make.defaults b/profiles/prefix/linux/arm/make.defaults
index 33360a56b8f2..22479baf6f0e 100644
--- a/profiles/prefix/linux/arm/make.defaults
+++ b/profiles/prefix/linux/arm/make.defaults
@@ -1,6 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="arm"
 # This is a pretty specific profile to the armv7 arch, we can change that later
 CHOST="armv7a-softfloat-linux-gnueabi"
+CHOST_arm="${CHOST}"
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 8cdca896fc69..54236e654589 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -11,7 +11,7 @@ gimp		https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ http://artfiles.
 github		https://github.com/downloads
 gmt		ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.iag.usp.br/pub/gmt/ ftp://ftp.geologi.uio.no/pub/gmt/ ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt
 gnome		https://download.gnome.org/
-gnu		https://ftpmirror.gnu.org/https://ftpmirror.gnu.org/ https://artfiles.org/gnu.org/ https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/
+gnu		https://ftp.gnu.org/gnu/ https://ftpmirror.gnu.org/ https://artfiles.org/gnu.org/ https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/
 gnu-alpha	https://www.mirrorservice.org/sites/alpha.gnu.org/gnu/ https://gnualpha.uib.no/ https://mirrors.fe.up.pt/pub/gnu-alpha/ http://alpha.gnu.org/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ ftp://alpha.gnu.org/gnu/
 gnupg		https://artfiles.org/gnupg.org/ https://www.mirrorservice.org/sites/ftp.gnupg.org/ https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ https://mirrors.dotsrc.org/gcrypt/ ftp://ftp.gnupg.org/gcrypt/
 hackage		https://hackage.haskell.org/
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9756b40649b1..f1fc08b5cf7f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1355,13 +1355,13 @@ dev-db/mariadb:test - Install upstream testsuites for end use.
 dev-db/mariadb:tokudb - Add support for TokuDB storage engine
 dev-db/mariadb:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
 dev-db/mariadb-connector-c:mysqlcompat - Enable mysqlclient library symbolic links
-dev-db/mariadb-galera:embedded - Build embedded server (libmysqld)
+dev-db/mariadb-galera:client-libs - Build the client libraries from the server package instead of the C Connector packages
 dev-db/mariadb-galera:extraengine - Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)
 dev-db/mariadb-galera:jdbc - Enable the CONNECT engine to access foreign databases via JDBC
 dev-db/mariadb-galera:jemalloc - Use dev-libs/jemalloc for allocations.
 dev-db/mariadb-galera:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/mariadb-galera:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
-dev-db/mariadb-galera:openssl - Enable SSL connections and crypto functions using dev-libs/openssl
+dev-db/mariadb-galera:numa - Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)
 dev-db/mariadb-galera:oqgraph - Add support for the Open Query GRAPH engine
 dev-db/mariadb-galera:profiling - Add support for statement profiling (requires USE=community).
 dev-db/mariadb-galera:server - Build the server program
@@ -2067,7 +2067,6 @@ dev-libs/fcgi:html - Install HTML documentation
 dev-libs/folks:telepathy - Load contacts from the Telepathy framework
 dev-libs/folks:tracker - Load contacts from app-misc/tracker index
 dev-libs/folks:utils - Build the folks-inspect utility
-dev-libs/folks:zeitgeist - Add support for Zeitgeist event tracking system
 dev-libs/fstrm:utils - Build fstrm utility programs
 dev-libs/gecode:gist - Enable Gist, the Gecode Interactive Search Tool
 dev-libs/gecode:gmp - Enable trigonometric and transcendental float constraints
@@ -2237,6 +2236,7 @@ dev-libs/poco:pocodoc - POCO documentation generator
 dev-libs/poco:util - Several utility classes (like logger, timer, config file parser)
 dev-libs/poco:zip - Add support for the zip & gz archive formats
 dev-libs/ppl:lpsol - Build the ppl_lpsol linear programming problem solver
+dev-libs/serdisplib:tools - Build optional tools.
 dev-libs/softhsm:migration-tool - Build db migration tool
 dev-libs/starpu:cuda - Enable NVIDIA CUDA toolkit support
 dev-libs/starpu:gcc-plugin - Enable GCC extension plugin (experimental)
@@ -2510,12 +2510,12 @@ dev-python/glance_store:vmware - enable vmware backend supprt
 dev-python/gmpy:mpir - Use sci-libs/mpir as gmp implementation
 dev-python/icalendar:doc - Generate examples and other extra documentation
 dev-python/ipython:matplotlib - Add support for dev-python/matplotlib
-dev-python/ipython:mongodb - Enable support for MongoDB via dev-python/pymongo
 dev-python/ipython:nbconvert - Enable support for converting notebooks to various formats using app-text/pandoc
 dev-python/ipython:notebook - Install requirements for the web notebook based on www-servers/tornado
-dev-python/ipython:octave - Enable octave bridge via dev-python/oct2py
 dev-python/jira:filemagic - Include filemagic support (for identifying uploaded filetypes)
 dev-python/jira:ipython - Include Interactive Python (IPython)
+dev-python/jira:jirashell - Include dependencies for jirashell (ipython, oauthlib)
+dev-python/jira:kerberos - Support Kerberos authentication
 dev-python/jira:oauth - Support OAuth authentication
 dev-python/kaa-base:tls - SSL/TLS support via dev-python/tlslite
 dev-python/kafka-python:snappy - Install snappy compression/decompression support
@@ -7964,6 +7964,7 @@ sys-devel/gcc:pgo - Build GCC using Profile Guided Optimization (PGO)
 sys-devel/gcc:regression-test - Run the testsuite and install the results (requires FEATURES=test)
 sys-devel/gcc:sanitize - Build support for various sanitizer functions (ASAN/TSAN/etc...)
 sys-devel/gcc:ssp - Build packages with stack smashing protector on by default
+sys-devel/gcc:systemtap - enable systemtap static probe points
 sys-devel/gcc:vtv - Build support for virtual table verification (a C++ hardening feature)
 sys-devel/gcc-apple:objc - Build support for the Objective C code language
 sys-devel/gcc-apple:objc++ - Build support for the Objective C++ language
@@ -8793,7 +8794,7 @@ x11-themes/zuki-themes:mate - Install Metacity theme for mate-base/mate
 x11-themes/zuki-themes:xfce - Install theme for xfce-base/xfwm4
 x11-themes/zukitwo:gnome-shell - Install theme for gnome-base/gnome-shell
 x11-wm/echinus:xrandr - Enable support for multihead configuration
-x11-wm/enlightenment:enlightenment_modules_appmenu - Gadget that hold the toolbar of the foreground application
+x11-wm/enlightenment:enlightenment_modules_appmenu - Gadget that holds the menubar of the foreground application
 x11-wm/enlightenment:enlightenment_modules_backlight - Backlight control slider gadget
 x11-wm/enlightenment:enlightenment_modules_battery - A gadget to visualize your battery status
 x11-wm/enlightenment:enlightenment_modules_bluez4 - Configure Bluetooth devices
@@ -8817,32 +8818,36 @@ x11-wm/enlightenment:enlightenment_modules_connman - Control Wifi and wired netw
 x11-wm/enlightenment:enlightenment_modules_cpufreq - Gadget to monitor and change the CPU frequency
 x11-wm/enlightenment:enlightenment_modules_everything - The run command module provides an application launcher dialog
 x11-wm/enlightenment:enlightenment_modules_fileman - Enlightenment's integrated file manager
-x11-wm/enlightenment:enlightenment_modules_fileman-opinfo - Can be placed on the desktop or in a shelf
+x11-wm/enlightenment:enlightenment_modules_fileman-opinfo - Allows EFM to be placen on the desktop or in a shelf
 x11-wm/enlightenment:enlightenment_modules_gadman - Module to manage gadgets on the desktop
-x11-wm/enlightenment:enlightenment_modules_geolocation - Geolocation
+x11-wm/enlightenment:enlightenment_modules_geolocation - Geolocation information
 x11-wm/enlightenment:enlightenment_modules_ibar - Iconic application launcher
 x11-wm/enlightenment:enlightenment_modules_ibox - A home for your iconified applications
 x11-wm/enlightenment:enlightenment_modules_lokker - Screen locker
+x11-wm/enlightenment:enlightenment_modules_luncher - Iconic application launcher
 x11-wm/enlightenment:enlightenment_modules_mixer - A module to provide a mixer for changing volume
 x11-wm/enlightenment:enlightenment_modules_msgbus - DBus Extension
 x11-wm/enlightenment:enlightenment_modules_music-control - Control your music in your shelf
-x11-wm/enlightenment:enlightenment_modules_notification - notification-daemon alternative. Popup if an event occur
+x11-wm/enlightenment:enlightenment_modules_notification - Notification-daemon alternative
 x11-wm/enlightenment:enlightenment_modules_packagekit - Package manager integration
 x11-wm/enlightenment:enlightenment_modules_pager - Gadget to allow you to visualize your virtual desktops and the windows they contain
 x11-wm/enlightenment:enlightenment_modules_pager-plain - A simpler desktop pager
 x11-wm/enlightenment:enlightenment_modules_quickaccess - Enlightenment Quickaccess Launcher
 x11-wm/enlightenment:enlightenment_modules_shot - Simple screenshot+save/upload module
 x11-wm/enlightenment:enlightenment_modules_start - Enlightenment's 'Start' button equivalent
-x11-wm/enlightenment:enlightenment_modules_syscon - This module provides a unified popup dialog for all the system actions in Enlightenment
-x11-wm/enlightenment:enlightenment_modules_systray - system tray that hold applications icons like Skype, Pidgin, Kopete and others
+x11-wm/enlightenment:enlightenment_modules_syscon - Provides a unified popup dialog for all the system actions in Enlightenment
+x11-wm/enlightenment:enlightenment_modules_sysinfo - A gadget to visualize your system info
+x11-wm/enlightenment:enlightenment_modules_systray - System tray that hold applications icons like Skype, Pidgin, Kopete and others
 x11-wm/enlightenment:enlightenment_modules_tasks - Gadget to allow you to switch tasks
 x11-wm/enlightenment:enlightenment_modules_teamwork - Enable teamwork module
 x11-wm/enlightenment:enlightenment_modules_temperature - Temperature monitor
 x11-wm/enlightenment:enlightenment_modules_tiling - Positions/resizes your windows tilingly
 x11-wm/enlightenment:enlightenment_modules_time - Time related gadgets
+x11-wm/enlightenment:enlightenment_modules_vkbd - Virtual keyboard
 x11-wm/enlightenment:enlightenment_modules_winlist - A module to show the list of client applications presently running
 x11-wm/enlightenment:enlightenment_modules_wireless - WiFi monitoring
 x11-wm/enlightenment:enlightenment_modules_wizard - First Run Wizard
+x11-wm/enlightenment:enlightenment_modules_wl-buffer - Wayland buffer
 x11-wm/enlightenment:enlightenment_modules_wl-desktop-shell - Enlightenment Wayland Desktop Shell
 x11-wm/enlightenment:enlightenment_modules_wl-drm - Wayland DRM (Direct Rendering Manager) compositing module
 x11-wm/enlightenment:enlightenment_modules_wl-text-input - Wayland text input support