gentoo resync : 25.01.2018

133 files changed, 303 insertions, 503 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a2266ec11462..6fc3766c69ea 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch.list b/profiles/arch.list
index 6b702f1cd2d3..64e86438046c 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -14,7 +14,6 @@ riscv
 s390
 sh
 sparc
-sparc-fbsd
 x86
 x86-fbsd
 
diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask
index 28ca0b6472a4..e93d35cd709d 100644
--- a/profiles/arch/amd64-fbsd/use.mask
+++ b/profiles/arch/amd64-fbsd/use.mask
@@ -33,6 +33,14 @@
 #-video_cards_vmware
 -input_devices_vmmouse
 
+# Michał Górny <mgorny@gentoo.org> (23 Feb 2018)
+# sys-libs/libseccomp is not keyworded here.
+seccomp
+
+# Michał Górny <mgorny@gentoo.org> (23 Feb 2018)
+# net-fs/samba is not keyworded here.
+samba
+
 # James Le Cuirot <chewi@gentoo.org> (19 May 2015)
 # icedtea needs testing and gcj isn't supported
 java
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 19cc5e875db6..b013468dfff7 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (25 Jan 2018)
+# Requires not stabilised app-text/libexttextcat, bug #637086
+net-mail/dovecot textcat
+
 # Brian Evans <grknight@gentoo.org> (9 Jun 2017)
 # sys-cluster/galera needs additional deps stable
 dev-db/mariadb galera
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index ffe49921481c..21804a4bc501 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,29 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# Requires dev-libs/efl that is not keyworded.
+dev-libs/dbus-c++ ecore
+
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# USE=eds requires USE=gnome that is masked here.
+# USE=collada requires media-libs/opencollada.
+# USE=gltf requires media-libs/libgltf.
+# USE=postgres requires dev-db/postgresql[kerberos] (USE masked).
+app-office/libreoffice collada eds gltf postgres
+
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# Requires mail-client/thunderbird* that is not keyworded here.
+app-misc/tracker thunderbird
+
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# Requires app-accessibility/brltty that is not keyworded here.
+app-emulation/qemu accessibility
+
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# Requires app-emulation/xen that is not keyworded here.
+app-emulation/libvirt xen
+
 # Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
 # Requires USE=sdl that is masked in this profile.
 media-video/mjpegtools sdlgfx
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 9fc805070230..572ef9602b27 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (21 Jan 2018)
+# systemtap is not yet stable on arm64
+sys-libs/glibc systemtap
+
 # Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
 # idn: Needs net-dns/libidn2 which is not stabilized yet on arm64
 # gnutls: Needs net-libs/gnutls which is not stabilized yet on arm64
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 264cdc30ed9a..68c16727df37 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -26,6 +26,10 @@
 -neon
 -armvfp
 
+# Michał Górny <mgorny@gentoo.org> (23 Feb 2018)
+# sci-geosciences/gpsd is not keyworded here.
+gps
+
 # Mart Raudsepp <leio@gentoo.org> (17 Feb 2017)
 # x11-misc/colord not tested on arm64 yet
 colord
diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
index 29f3d360f06d..d6f8e6b8091e 100644
--- a/profiles/arch/base/make.defaults
+++ b/profiles/arch/base/make.defaults
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 2ef9288fb862..510e4eee001d 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -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
 
 # James Le Cuirot <chewi@gentoo.org> (29 Jun 2017)
@@ -251,6 +251,5 @@ riscv
 s390
 sh
 sparc
-sparc-fbsd
 x86
 x86-fbsd
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 730688845f01..499ca8b9f2c8 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
+# USE=collab requires unkeyworded net-libs/loudmouth & dev-cpp/asio.
+# USE=grammar requires dev-libs/link-grammar.
+# USE=map requires media-libs/libchamplain.
+# Surprisingly, USE=redland requires dev-libs/redland. But also
+# dev-libs/rasqal. None of them keyworded here.
+app-office/abiword collab grammar map redland
+
 # Brian Evans <grknight@gentoo.org> (15 Jan 2018)
 # app-arch/snappy is not tested
 dev-db/mariadb innodb-snappy
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 384fdee257c2..dafba2b335f6 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -1,9 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -mips
 
+# Michał Górny <mgorny@gentoo.org> (23 Feb 2018)
+# net-misc/networkmanager is not keyworded here.
+networkmanager
+
+# Michał Górny <mgorny@gentoo.org> (23 Feb 2018)
+# sci-geosciences/gpsd is not keyworded here.
+gps
+
 # Brian Evans <grknight@gentoo.org> (15 Jan 2018)
 # Mask tcmalloc as dev-util/google-perftools is unavailable
 tcmalloc
diff --git a/profiles/arch/sparc-fbsd/eapi b/profiles/arch/sparc-fbsd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/sparc-fbsd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/sparc-fbsd/make.defaults b/profiles/arch/sparc-fbsd/make.defaults
deleted file mode 100644
index bab6ea3e1254..000000000000
--- a/profiles/arch/sparc-fbsd/make.defaults
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# System-wide defaults for the G/FBSD Portage system
-
-ARCH="sparc-fbsd"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-ACCEPT_KEYWORDS="~sparc-fbsd sparc-fbsd"
diff --git a/profiles/arch/sparc-fbsd/package.use.force b/profiles/arch/sparc-fbsd/package.use.force
deleted file mode 100644
index dbbc84463184..000000000000
--- a/profiles/arch/sparc-fbsd/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
-# Force the host target to avoid dependency hell
-sys-devel/clang llvm_targets_Sparc
-sys-devel/llvm llvm_targets_Sparc
diff --git a/profiles/arch/sparc-fbsd/parent b/profiles/arch/sparc-fbsd/parent
deleted file mode 100644
index eb001c6e8ab8..000000000000
--- a/profiles/arch/sparc-fbsd/parent
+++ /dev/null
@@ -1 +0,0 @@
-../base
diff --git a/profiles/arch/sparc-fbsd/use.force b/profiles/arch/sparc-fbsd/use.force
deleted file mode 100644
index 0520964ebe4e..000000000000
--- a/profiles/arch/sparc-fbsd/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Force the flag which corresponds to ARCH.
-sparc-fbsd
diff --git a/profiles/arch/sparc-fbsd/use.mask b/profiles/arch/sparc-fbsd/use.mask
deleted file mode 100644
index b76d06524ff8..000000000000
--- a/profiles/arch/sparc-fbsd/use.mask
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# Unmask the flag which corresponds to ARCH.
--sparc-fbsd
-
-acpi
-
-# guile fails to build on sparc
-# Even with the patch from FreeBSD Ports it core dumps :/
-guile
-
-# valgrind hasn't been ported to sparc-fbsd yet
-valgrind
-
-# These should work one day
-avahi
-cairo
-dbus
-gnome
-gnome-keyring
-gtk
-mono
-opengl
-php
-qt4
-tk
-xpm
-X
-
-# Ryan Hill <dirtyepic@gentoo.org>
-# Needs sci-mathematics/glpk
-lpsol
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index acad3dcea1ea..0053c3734d92 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -39,7 +39,3 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mach64 mga r128 radeon sunbw2 suncg14 suncg3 \
 	suncg6 sunffb sunleo tdfx voodoo"
-
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary entry to support stable bug 639476
-RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 7768b74c66b7..7169e6e54181 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -357,7 +357,6 @@ dev-python/PyQt4 multimedia
 # Ben de Groot <yngwin@gentoo.org> (11 Nov 2009)
 # Requires qthelp, which requires qtwebkit, bug 292838
 dev-libs/uriparser doc
-media-libs/libxspf doc
 
 # Raúl Porcel <armin76@gentoo.org>
 # Depends on dev-java/fop which requires java...
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 33c7089f46f4..a381058c68d3 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary mask to support stable bug 639476
-ruby_targets_ruby23
-
 # Hans de Graaff <graaff@gentoo.org> (13 Aug 2017)
 # Drop stable ruby on sparc
 ruby
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 6639125e6f26..118c3436da94 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary mask to support stable bug 639476
-ruby_targets_ruby23
-
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Not yet stable.
 elogind
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index bd862234ef26..62ac82a8a191 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -34,12 +34,6 @@ dev-lang/python threads
 # Package fails to build with dbus USE flag being disabled (bug #560208)
 =x11-wm/afterstep-2.2.12 dbus
 
-# Gilles Dartiguelongue <eva@gentoo.org> (25 May 2015)
-# webkit fails to build with USE=wayland, bug #549228
-# https://bugs.webkit.org/show_bug.cgi?id=142879
-# https://bugs.webkit.org/show_bug.cgi?id=136831
->=net-libs/webkit-gtk-2.8 X
-
 # Justin Lecher <jlec@gentoo.org> (10 Aug 2014)
 # Doesn't work without acl support
 # No patch yet, #516626
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 264ae931a2f1..9fc4a4c7d158 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -323,10 +323,6 @@ www-client/firefox system-cairo
 mail-client/thunderbird system-cairo
 >=www-client/seamonkey-2.41 system-cairo
 
-# Michael Palimaka <kensington@gentoo.org> (17 Apr 2016)
-# Fails to build with recent doxygen. Bug #569776.
-dev-cpp/eigen:2 doc
-
 # James Le Cuirot <chewi@gentoo.org> (10 Apr 2016)
 # Slower and less reliable than HotSpot and we don't support Java on
 # any non-HotSpot platforms. Don't unmask these unless you know what
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index f0f583ba3e77..aa24aa01a74c 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,10 +4,15 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Jan 2018)
-# USE=wxwidgets Requires x11-libs/wxGTK:3.0-gtk3 stabilisation
-# USE=tcl does not build reliably, bug #624576
->=sci-libs/plplot-5.12 tcl wxwidgets
+# Andrey Grozin <grozin@gentoo.org> (24 Jan 2018)
+# Depends on unstable dev-python/sphinx-gallery.
+# Bug #643840.
+dev-python/matplotlib doc
+
+# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
+# Requires proprietary fetch-restricted package that is not suitable
+# for stabilization. Bug #645092.
+net-proxy/haproxy device-atlas
 
 # Bernard Cafarelli <voyageur@gentoo.org> (27 Nov 2017)
 # Dependencies have no stable keyword
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/eapi b/profiles/default/bsd/fbsd/sparc/8.2/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/make.defaults b/profiles/default/bsd/fbsd/sparc/8.2/make.defaults
deleted file mode 100644
index eaba730f9ddc..000000000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-CHOST="sparc64-gentoo-freebsd8.2"
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/parent b/profiles/default/bsd/fbsd/sparc/8.2/parent
deleted file mode 100644
index 43010996613b..000000000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-8.2
diff --git a/profiles/default/bsd/fbsd/sparc/eapi b/profiles/default/bsd/fbsd/sparc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/bsd/fbsd/sparc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/bsd/fbsd/sparc/parent b/profiles/default/bsd/fbsd/sparc/parent
deleted file mode 100644
index 134cc7a38402..000000000000
--- a/profiles/default/bsd/fbsd/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/sparc-fbsd
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 793ae3689176..b1e80653f29f 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -20,7 +20,7 @@ LINGUAS="en"
 IUSE_IMPLICIT="prefix prefix-chain prefix-guest"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"
diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask
index 37c202d1ffcf..33e09b35488a 100644
--- a/profiles/hardened/linux/amd64/package.mask
+++ b/profiles/hardened/linux/amd64/package.mask
@@ -14,5 +14,4 @@ media-video/nvidia-settings
 # See bug 426764.
 sci-physics/cernlib
 sci-physics/cernlib-montecarlo
-sci-physics/geant:3
 sci-physics/paw
diff --git a/profiles/package.mask b/profiles/package.mask
index 0ab86239a597..361b72fd4488 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,64 @@
 
 #--- END OF EXAMPLES ---
 
+# Michael Palimaka <kensington@gentoo.org> (25 Jan 2018)
+# Requires dead Qt 4. Dead upstream.
+# Masked for removal in 30 days. Bug #644532.
+media-video/qx11grab
+
+# Hans de Graaff <graaff@gentoo.org> (24 Jan 2018)
+# Remove packages that are ruby22-only, and either cannot
+# be updated to ruby23, or are in old, obsolete, slots.
+# Masked for removal in 30 days.
+dev-ruby/amq-protocol:0
+dev-ruby/aws-sdk:0
+dev-ruby/bson:3
+dev-ruby/camping
+dev-ruby/execjs:1
+dev-ruby/mocha:0.11
+dev-ruby/mocha:0.12
+dev-ruby/mocha:0.13
+dev-ruby/mongo
+dev-ruby/net-ssh-multi
+dev-ruby/pcaprub:0.11
+dev-ruby/postgres_ext:2.4
+dev-ruby/rack:1.4
+dev-ruby/rack:1.5
+dev-ruby/rbtree
+dev-ruby/recog:2.0.14
+dev-ruby/right_http_connection
+dev-ruby/rspec-rails:2
+dev-ruby/sass:0
+dev-ruby/sass-rails:4.0
+dev-ruby/snmplib
+dev-ruby/sprockets:2
+dev-ruby/test-unit:0
+dev-ruby/tilt:0
+virtual/ruby-minitest
+www-apps/jekyll-gist
+
+
+# Andreas Sturmlechner <asturm@gentoo.org> (23 Jan 2018)
+# Depends on deprecated Qt4, no revdeps left.
+# Masked for removal in 30 days.
+dev-libs/libindicate-qt
+
+# Andreas Sturmlechner <asturm@gentoo.org> (22 Jan 2018)
+# Depends on deprecated Qt4, dead project.
+# Masked for removal in 30 days.
+app-emulation/qtemu
+
+# Andreas Sturmlechner <asturm@gentoo.org> (22 Jan 2018)
+# Depends on deprecated Qt4, upstream is slowly doing a qml port.
+# Masked for removal in 60 days. Revisit bug #645504 before deciding
+# eventual removal.
+games-strategy/hedgewars
+
+# Eray Aslan <eras@gentoo.org> (22 Jan 2018)
+# Vulnerable - see https://bugs.gentoo.org/630684
+# Please migrate to cyrus-imapd-3.0 releases
+=net-mail/cyrus-imapd-2.5*
+
 # Andreas Sturmlechner <asturm@gentoo.org> (20 Jan 2018)
 # Outdated and broken for a long time, blocking cleanups.
 # Depends on deprecated LINGUAS/Qt4/kde4-functions.eclass.
@@ -42,10 +100,6 @@ net-p2p/primecoind
 # Masked for removal in 30 days. Bug #513564
 sci-physics/geant-python
 
-# Jeroen Roovers <jer@gentoo.org> (19 Jan 2018)
-# Breaks net-libs/nodejs (bug #645018)
-=dev-libs/libuv-1.19.0
-
 # Patrice Clement <monsieurp@gentoo.org> (18 Jan 2018)
 # mpv-0.28.0 requires changes currently only available in ffmpeg-9999.
 =media-video/mpv-0.28.0
@@ -217,11 +271,6 @@ media-video/2mandvd
 # Masked for removal in 30 days, no more rdeps, bug #602816
 dev-python/python-poppler-qt4
 
-# Mikle Kolyada <zlogene@gentoo.org> (07 Jan 2018)
-# The package was suddenly forgotten during tuxonice-sources masking.
-# Mask for removal in 14 days as the sources package has already been removed.
-sys-apps/tuxonice-userui
-
 # Andreas Sturmlechner <asturm@gentoo.org> (05 Jan 2018)
 # Masked for removal in 30 days, merged into dev-util/kdevelop
 dev-util/kdevplatform
@@ -628,29 +677,11 @@ net-voip/ekiga
 =sys-kernel/gentoo-sources-4.14.10
 =sys-kernel/vanilla-sources-4.14.10
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (27 Dec 2017)
-# Ancient. EAPI=3. (Nearly) no consumers. Needs to go.
-# Removal in 30 days.
-dev-lang/swig:1
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (27 Dec 2017)
-# Last remaining consumer of dev-lang/swig:1, which needs
-# to go the way of the dinosaur. Removal in 30 days.
-dev-python/apse
-
 # 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.
 >=dev-libs/mpfr-4.0.0
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (25 Dec 2017)
-# Provided (and blocked) by app-text/texlive-core
-# Removal in 30 days; bug 628820
-app-text/dvibook
-app-text/dvipdfm
-app-text/dvipdfmx
-app-text/xdvipdfmx
-
 # Thomas Beierlein <tomjbe@gentoo.org> (23 Dec 2017)
 # To adapt to changed version naming by upstream 
 # (pcb-yyyymmdd to pcb-x.y.z) we move the ebuild to
@@ -658,24 +689,6 @@ app-text/xdvipdfmx
 # Do not remove the mask until newer version gets stable
 >=sci-electronics/pcb-20000000
 
-# Mike Gilbert <floppym@gentoo.org> (23 Dec 2017)
-# Fails to build without glibc rpc support, bug 630670.
-# Use net-nds/rpcbind instead.
-# Removal in 30 days.
-net-nds/portmap
-
-# Mike Gilbert <floppym@gentoo.org> (23 Dec 2017)
-# Fails to build without glibc rpc support, bug 641154.
-# Dead upstream.
-# Removal in 30 days.
-mail-client/drac
-
-# Thomas Beierlein <tomjbe@gentoo.org> (22 Dec 2017)
-# Development moved to another naming scheme.
-# Use media-radio/tucnak instead.
-# Masked for removal in 30 days.
-media-radio/tucnak2
-
 # Alice Ferrazzi <alicef@gentoo.org> (22 Dec 2017)
 # Masked for removal in 30 days.
 # Linux kernel 4.13 can break various laptops.
diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent
index 16c974fd71e3..0d2c53ad27fc 100644
--- a/profiles/prefix/linux/amd64/parent
+++ b/profiles/prefix/linux/amd64/parent
@@ -1,2 +1,2 @@
-../../../default/linux/amd64/13.0/no-multilib
+../../../default/linux/amd64/17.0/no-multilib
 ..
diff --git a/profiles/prefix/linux/arm/parent b/profiles/prefix/linux/arm/parent
index c9cb641f50d9..b53dc55dbd9e 100644
--- a/profiles/prefix/linux/arm/parent
+++ b/profiles/prefix/linux/arm/parent
@@ -1,2 +1,2 @@
-../../../default/linux/arm/13.0
+../../../default/linux/arm/17.0
 ..
diff --git a/profiles/prefix/linux/ppc64/parent b/profiles/prefix/linux/ppc64/parent
index 51fedc0bc3e6..ba569be12a9a 100644
--- a/profiles/prefix/linux/ppc64/parent
+++ b/profiles/prefix/linux/ppc64/parent
@@ -1,2 +1,2 @@
-../../../default/linux/powerpc/ppc64/13.0/64bit-userland
+../../../default/linux/powerpc/ppc64/17.0/64bit-userland
 ..
diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent
index 0fbf3318c1e6..c1189513e91b 100644
--- a/profiles/prefix/linux/x86/parent
+++ b/profiles/prefix/linux/x86/parent
@@ -1,2 +1,2 @@
-../../../default/linux/x86/13.0
+../../../default/linux/x86/17.0
 ..
diff --git a/profiles/prefix/windows/winnt/profile.bashrc b/profiles/prefix/windows/winnt/profile.bashrc
index f1c5c365338b..7d1251609c0f 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # On windows, binary files (executables, shared libraries) in use
@@ -13,6 +13,20 @@
 # Need to explicitly set PKG_CONFIG_PATH for cross EPREFIX.
 export PKG_CONFIG_PATH="${EPREFIX}/lib/pkgconfig:${EPREFIX}/usr/lib/pkgconfig"
 
+windows_setup_dllhelper() {
+	case ${CATEGORY}/${PN} in
+	sys-libs/zlib |\
+	'')
+		# When a package build system does not know about Windows at all,
+		# still it can be built for Windows using Gentoo Parity.
+		# But as there is another file to install (the real dll),
+		# and installation is done using cp, we override cp to
+		# additionally copy the dll when the library is copied.
+		windows_setup_dllhelper_cp
+		;;
+	esac
+}
+
 windows_cleanup_removed_files() {
 	local removedlist=$1
 	rm -f "${removedlist}".new
@@ -78,17 +92,36 @@ windows_prepare_file() {
 
 post_src_install() {
 	cd "${ED}"
-	find . -name '*.exe' | while read f; do
-		if file "${f}" | grep "GUI" > /dev/null 2>&1; then
-			if test ! -f "${f%.exe}"; then
-				einfo "Windows GUI Executable $f will have no symlink."
+	find . -name '*.exe' -o -name '*.dll.a' -o -name '*.so' |
+	while read f
+	do
+		f=${f#./}
+		case ${f} in
+		*.exe)
+			if file "./${f}" | grep "GUI" > /dev/null 2>&1; then
+				if test ! -f "./${f%.exe}"; then
+					einfo "Windows GUI Executable $f will have no symlink."
+				fi
+			else
+				if test ! -f "./${f%.exe}"; then
+					ebegin "creating ${f%.exe} -> ${f} for console accessibility."
+					eend $(ln -sf "$(basename "${f}")" "./${f%.exe}" && echo 0 || echo 1)
+				fi
 			fi
-		else
-			if test ! -f "${f%.exe}"; then
-				ebegin "creating ${f%.exe} -> ${f} for console accessibility."
-				eend $(ln -sf "$(basename "${f}")" "${f%.exe}" && echo 0 || echo 1)
+			;;
+		*.dll.a)
+			if test ! -f "./${f%.a}.lib"; then
+				ebegin "creating ${f%.a}.lib -> ${f##*/} for libtool linkability"
+				eend $(ln -sf "$(basename "${f}")" "./${f%.a}.lib" && echo 0 || echo 1)
 			fi
-		fi
+			;;
+		*.so)
+			if test ! -f "${f%.so}.dll.lib"; then
+				ebegin "creating ${f%.so}.dll.lib -> ${f##*/} for libtool linkability"
+				eend $(ln -sf "$(basename "${f}")" "./${f%.so}.dll.lib" && echo 0 || echo 1)
+			fi
+			;;
+		esac
 	done
 }
 
@@ -149,3 +182,109 @@ pre_pkg_postrm() {
 	local removedlist="${EROOT}var/lib/portage/files2bremoved"
 	windows_cleanup_removed_files $removedlist
 }
+
+windows_setup_dllhelper_cp() {
+	if ! [[ $(type -P cp) -ef ${T}/dllhelper/cp ]]
+	then
+		mkdir -p "${T}/dllhelper"
+		cat > "${T}/dllhelper/cp" <<'EOCP'
+#!/usr/bin/env bash
+
+mysrcs=()
+myopts=()
+mydest=
+force_dest_file_opt=
+
+nextargs=( "$@" )
+
+while [[ $# > 0 ]]
+do
+	arg=${1}
+	shift
+	case ${arg} in
+	--)
+		mysrcs+=( "${@}" )
+		break
+		;;
+	-S)
+		myopts+=( "${arg}" ${1+"$1"} )
+		${1:+shift}
+		;;
+	-t)
+		mydest="${1-}"
+		${1:+shift}
+		;;
+	-T)
+		force_dest_file_opt=${arg}
+		;;
+	-*)
+		myopts+=( "${arg}" )
+		;;
+	*)
+		mysrcs+=( "${arg}" )
+		;;
+	esac
+done
+
+me=${0##*/}
+nextPATH=
+oIFS=$IFS
+IFS=:
+for p in ${PATH}
+do
+	[[ ${p}/${me} -ef ${0} ]] && continue
+	nextPATH+=${nextPATH:+:}${p}
+done
+IFS=${oIFS}
+
+PATH=${nextPATH}
+
+${me} "${nextargs[@]}"
+ret=$?
+[[ ${ret} == 0 ]] || exit ${ret}
+
+if [[ -z ${mydest} ]]
+then
+	[[ ${#mysrcs[@]} < 2 ]] && exit 0
+	: "${mysrcs[@]}" "${#mysrcs[@]}"
+	mydest=${mysrcs[${#mysrcs[@]}-1]}
+	unset mysrcs[${#mysrcs[@]}-1]
+elif [[ ${#mysrcs[@]} == 0 ]]
+then
+	exit 0
+fi
+
+for src in ${mysrcs[@]}
+do
+	ret=0
+	[[ ${src##*/} != lib*.so* ]] && continue
+	for ext in dll pdb
+	do
+		[[ ${src##*/} == *.${ext} ]] && continue
+		[[ -f ${src} && -f ${src}.${ext} ]] || continue
+		if [[ -d ${mydest} && ! -n ${force_dest_file_opt} ]]
+		then
+			# When copying to directory we keep the basename.
+			${me} -T "${myopts[@]}" "${src}.${ext}" "${mydest}/${src##*/}.${ext}"
+			ret=$?
+		elif [[ ${mydest##*/} == ${src##*/} ]]
+		then
+			# Copy the dll only when we keep the basename.
+			${me} -T "${myopts[@]}" "${src}.${ext}" "${mydest}.${ext}"
+			ret=$?
+		fi
+		[[ ${ret} == 0 ]] || exit ${ret}
+	done
+done
+
+exit 0
+EOCP
+		chmod +x "${T}/dllhelper/cp"
+		PATH="${T}/dllhelper:${PATH}"
+	fi
+}
+
+if [[ ${EBUILD_PHASE} == 'setup' ]]
+then
+	windows_setup_dllhelper
+fi
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 689031ff912e..d323534ffc42 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -258,13 +258,12 @@ x86		default/linux/x86/17.0/systemd			stable
 
 # Gentoo/FreeBSD Profiles
 # @MAINTAINER: bsd@gentoo.org
-amd64-fbsd	default/bsd/fbsd/amd64/9.1			dev
+amd64-fbsd	default/bsd/fbsd/amd64/9.1			exp
 amd64-fbsd	default/bsd/fbsd/amd64/11.1			dev
 amd64-fbsd	default/bsd/fbsd/amd64/9.1/clang		exp
 amd64-fbsd	default/bsd/fbsd/amd64/11.1/clang		exp
-sparc-fbsd      default/bsd/fbsd/sparc/8.2                      exp
-x86-fbsd	default/bsd/fbsd/x86/9.1			dev
-x86-fbsd	default/bsd/fbsd/x86/11.1			dev
+x86-fbsd	default/bsd/fbsd/x86/9.1			exp
+x86-fbsd	default/bsd/fbsd/x86/11.1			exp
 
 # Hardened Profiles
 # @MAINTAINER: hardened@gentoo.org
@@ -324,27 +323,6 @@ ppc		hardened/linux/uclibc/ppc				exp
 x86		default/linux/uclibc/x86				exp
 x86		hardened/linux/uclibc/x86				exp
 
-# uclibc/embedded multiarch profiles
-# @MAINTAINER: uclibc@gentoo.org
-#amd64		uclibc/amd64					dev
-#arm		uclibc/arm					dev
-#arm		uclibc/arm/2.4					dev
-#mips		uclibc/mips					dev
-#mips		uclibc/mips/hardened				dev
-#ppc		uclibc/ppc					dev
-#ppc		uclibc/ppc/2.4					dev
-#ppc		uclibc/ppc/hardened				dev
-#ppc		uclibc/ppc/hardened/2.4				dev
-#sh		uclibc/sh					dev
-#sh		uclibc/sh/2.4					dev
-#x86		uclibc/x86					dev
-#x86		uclibc/x86/2.4					dev
-#x86		uclibc/x86/2005.1				dev
-#x86		uclibc/x86/2005.1/2.4				dev
-#x86		uclibc/x86/hardened				dev
-#x86		uclibc/x86/hardened/2.4				dev
-
-
 # These are Gentoo Prefix profiles, maintained by the Prefix team
 # @MAINTAINER: prefix@gentoo.org
 
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 3c79e5bbb7e0..554fb2728a6e 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -1,6 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Required by app-office/libreoffice[kde]
+>=app-office/libreoffice-6.1 gtk
+
 # Required by kde-apps/okteta
 dev-qt/qtscript:5 scripttools
 
@@ -25,9 +28,6 @@ media-libs/mesa egl wayland
 # Required by kde-apps/kdenlive
 >=media-libs/mlt-0.9.8-r2 ffmpeg kdenlive melt
 
-# Required by app-office/libreoffice
-media-libs/phonon designer
-
 # Required by kde-plasma/plasma-pa
 media-sound/pulseaudio gnome
 
diff --git a/profiles/uclibc/amd64/eapi b/profiles/uclibc/amd64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/amd64/make.defaults b/profiles/uclibc/amd64/make.defaults
deleted file mode 100644
index 44f66951f3d0..000000000000
--- a/profiles/uclibc/amd64/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-ARCH="amd64"
-ACCEPT_KEYWORDS="amd64"
-
-CHOST="x86_64-gentoo-linux-uclibc"
diff --git a/profiles/uclibc/amd64/parent b/profiles/uclibc/amd64/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/amd64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/2.4/eapi b/profiles/uclibc/arm/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/arm/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/arm/2.4/package.mask b/profiles/uclibc/arm/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/arm/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/arm/2.4/parent b/profiles/uclibc/arm/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/arm/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/armeb/2.4/deprecated b/profiles/uclibc/arm/armeb/2.4/deprecated
deleted file mode 100644
index d6b062e5bcec..000000000000
--- a/profiles/uclibc/arm/armeb/2.4/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/arm/2.4
diff --git a/profiles/uclibc/arm/armeb/2.4/eapi b/profiles/uclibc/arm/armeb/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/arm/armeb/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/arm/armeb/2.4/package.mask b/profiles/uclibc/arm/armeb/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/arm/armeb/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/arm/armeb/2.4/parent b/profiles/uclibc/arm/armeb/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/arm/armeb/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/armeb/deprecated b/profiles/uclibc/arm/armeb/deprecated
deleted file mode 100644
index 6f0cf29c566a..000000000000
--- a/profiles/uclibc/arm/armeb/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/arm
diff --git a/profiles/uclibc/arm/armeb/eapi b/profiles/uclibc/arm/armeb/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/arm/armeb/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/arm/armeb/make.defaults b/profiles/uclibc/arm/armeb/make.defaults
deleted file mode 100644
index 46ce2331360d..000000000000
--- a/profiles/uclibc/arm/armeb/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-CHOST="armeb-gentoo-linux-uclibc"
diff --git a/profiles/uclibc/arm/armeb/parent b/profiles/uclibc/arm/armeb/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/arm/armeb/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/arm/eapi b/profiles/uclibc/arm/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/arm/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/arm/make.defaults b/profiles/uclibc/arm/make.defaults
deleted file mode 100644
index 417e228caf71..000000000000
--- a/profiles/uclibc/arm/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="arm"
-ACCEPT_KEYWORDS="arm"
-
-CHOST="set-CHOST-in-your-/etc/make.conf"
-
-UCLIBC_CPU_DEFAULT="GENERIC_ARM"
diff --git a/profiles/uclibc/arm/package.mask b/profiles/uclibc/arm/package.mask
deleted file mode 100644
index e2011990abf3..000000000000
--- a/profiles/uclibc/arm/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Segfaults, bug #193597
->=net-proxy/squid-3
diff --git a/profiles/uclibc/arm/parent b/profiles/uclibc/arm/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/eapi b/profiles/uclibc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/make.defaults b/profiles/uclibc/make.defaults
deleted file mode 100644
index d891f0b122c8..000000000000
--- a/profiles/uclibc/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc"
-USE="ncurses readline zlib uclibc -fortran -pam -berkdb -ipv6 -pppd"
-CFLAGS="-Os"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-PORTAGE_LIBC="uClibc"
-ELIBC=uclibc
-FEATURES="sandbox sfperms strict nodoc noinfo noman"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc"
diff --git a/profiles/uclibc/mips/eapi b/profiles/uclibc/mips/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/mips/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/mips/hardened/eapi b/profiles/uclibc/mips/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/mips/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/mips/hardened/make.defaults b/profiles/uclibc/mips/hardened/make.defaults
deleted file mode 100644
index 41e2d419addb..000000000000
--- a/profiles/uclibc/mips/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/mips/hardened/package.mask b/profiles/uclibc/mips/hardened/package.mask
deleted file mode 100644
index 44b27cf11476..000000000000
--- a/profiles/uclibc/mips/hardened/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
->=sys-devel/gcc-4.4
diff --git a/profiles/uclibc/mips/hardened/package.use.mask b/profiles/uclibc/mips/hardened/package.use.mask
deleted file mode 100644
index 4c0d131b7087..000000000000
--- a/profiles/uclibc/mips/hardened/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-sys-devel/gcc -hardened
diff --git a/profiles/uclibc/mips/hardened/parent b/profiles/uclibc/mips/hardened/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/mips/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/make.defaults b/profiles/uclibc/mips/make.defaults
deleted file mode 100644
index 2a17bbe61e19..000000000000
--- a/profiles/uclibc/mips/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-ARCH="mips"
-ACCEPT_KEYWORDS="mips"
-
-CHOST="set-CHOST-in-your-/etc/make.conf"
-
-FEATURES="-sandbox"
-
-UCLIBC_CPU_DEFAULT="MIPS_ISA_1"
diff --git a/profiles/uclibc/mips/mipsel/deprecated b/profiles/uclibc/mips/mipsel/deprecated
deleted file mode 100644
index d1d399b5015e..000000000000
--- a/profiles/uclibc/mips/mipsel/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/mips
diff --git a/profiles/uclibc/mips/mipsel/eapi b/profiles/uclibc/mips/mipsel/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/mips/mipsel/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/mips/mipsel/hardened/deprecated b/profiles/uclibc/mips/mipsel/hardened/deprecated
deleted file mode 100644
index 1027bb28ae7c..000000000000
--- a/profiles/uclibc/mips/mipsel/hardened/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-uclibc/mips/hardened
diff --git a/profiles/uclibc/mips/mipsel/hardened/eapi b/profiles/uclibc/mips/mipsel/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/mips/mipsel/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/mips/mipsel/hardened/make.defaults b/profiles/uclibc/mips/mipsel/hardened/make.defaults
deleted file mode 100644
index 41e2d419addb..000000000000
--- a/profiles/uclibc/mips/mipsel/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/mips/mipsel/hardened/parent b/profiles/uclibc/mips/mipsel/hardened/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/mips/mipsel/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/mipsel/make.defaults b/profiles/uclibc/mips/mipsel/make.defaults
deleted file mode 100644
index 80b70299abe4..000000000000
--- a/profiles/uclibc/mips/mipsel/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-CHOST="mipsel-gentoo-linux-uclibc"
diff --git a/profiles/uclibc/mips/mipsel/parent b/profiles/uclibc/mips/mipsel/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/mips/mipsel/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/parent b/profiles/uclibc/mips/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/mips/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/mips/use.mask b/profiles/uclibc/mips/use.mask
deleted file mode 100644
index 55dae7eac0e9..000000000000
--- a/profiles/uclibc/mips/use.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# Henrik Brix Andersen <brix@gentoo.org>
-# According to the mips herd, we currently have no way of testing
-# pcmcia on mips, bug #90359
-pcmcia
-
-# Luca Longinotti <chtekk@gentoo.org>
-# Mask php USE on MIPS profiles
-php
-
-# Peter Volkov <pva@gentoo.org> MPI was never tested on mips, but
-# some programs with this useflag are useful, e.g #227631
-mpi
diff --git a/profiles/uclibc/package.mask b/profiles/uclibc/package.mask
deleted file mode 100644
index ca174b1390ee..000000000000
--- a/profiles/uclibc/package.mask
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# glib-2.x requires working locale/iconv which
-# isn't available atm in uclibc
->=dev-libs/glib-2.5
-
-sys-libs/glibc
-
-# breaks gcc and such
-dev-libs/libiconv
-
-# requires funcs we dont yet provide
->=sys-fs/xfsprogs-2.8.10
diff --git a/profiles/uclibc/package.use b/profiles/uclibc/package.use
deleted file mode 100644
index 3b0ed50687e5..000000000000
--- a/profiles/uclibc/package.use
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-virtual/ssh minimal
diff --git a/profiles/uclibc/packages b/profiles/uclibc/packages
deleted file mode 100644
index d02c949b3e6c..000000000000
--- a/profiles/uclibc/packages
+++ /dev/null
@@ -1,12 +0,0 @@
-*app-misc/pax-utils
-
-# remove stuff not needed on uclibc
--*net-misc/iputils
-# man pages disabled (noman)
--*sys-apps/man
--*virtual/man
--*sys-apps/man-pages
-# this will be added by nls
--*sys-devel/gettext
-
--*sys-apps/hdparm
diff --git a/profiles/uclibc/packages.build b/profiles/uclibc/packages.build
deleted file mode 100644
index 579dfcb01855..000000000000
--- a/profiles/uclibc/packages.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# this should be added by nls only
--sys-devel/gettext
-
-virtual/shadow
diff --git a/profiles/uclibc/parent b/profiles/uclibc/parent
deleted file mode 100644
index 6f0b2fa994bc..000000000000
--- a/profiles/uclibc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../base
-../default/linux
diff --git a/profiles/uclibc/ppc/2.4/eapi b/profiles/uclibc/ppc/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/ppc/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/ppc/2.4/package.mask b/profiles/uclibc/ppc/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/ppc/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/ppc/2.4/parent b/profiles/uclibc/ppc/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/ppc/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/eapi b/profiles/uclibc/ppc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/ppc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/ppc/hardened/2.4/eapi b/profiles/uclibc/ppc/hardened/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/ppc/hardened/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/ppc/hardened/2.4/package.mask b/profiles/uclibc/ppc/hardened/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/ppc/hardened/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/ppc/hardened/2.4/parent b/profiles/uclibc/ppc/hardened/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/ppc/hardened/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/hardened/eapi b/profiles/uclibc/ppc/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/ppc/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/ppc/hardened/make.defaults b/profiles/uclibc/ppc/hardened/make.defaults
deleted file mode 100644
index 41e2d419addb..000000000000
--- a/profiles/uclibc/ppc/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/ppc/hardened/package.mask b/profiles/uclibc/ppc/hardened/package.mask
deleted file mode 100644
index 44b27cf11476..000000000000
--- a/profiles/uclibc/ppc/hardened/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
->=sys-devel/gcc-4.4
diff --git a/profiles/uclibc/ppc/hardened/package.use.mask b/profiles/uclibc/ppc/hardened/package.use.mask
deleted file mode 100644
index 4c0d131b7087..000000000000
--- a/profiles/uclibc/ppc/hardened/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-sys-devel/gcc -hardened
diff --git a/profiles/uclibc/ppc/hardened/parent b/profiles/uclibc/ppc/hardened/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/ppc/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/make.defaults b/profiles/uclibc/ppc/make.defaults
deleted file mode 100644
index 0514ca71084a..000000000000
--- a/profiles/uclibc/ppc/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
-
-CHOST="powerpc-gentoo-linux-uclibc"
-
-UCLIBC_CPU_DEFAULT=""
diff --git a/profiles/uclibc/ppc/package.use.mask b/profiles/uclibc/ppc/package.use.mask
deleted file mode 100644
index 3375a9fc565d..000000000000
--- a/profiles/uclibc/ppc/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Joseph Jezak <josejx@gentoo.org> (28 Jun 2007)
-# Masked Parallel LCD devices for bug #180683
-app-misc/lcd4linux lcd_devices_hd44780
diff --git a/profiles/uclibc/ppc/parent b/profiles/uclibc/ppc/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/ppc/use.mask b/profiles/uclibc/ppc/use.mask
deleted file mode 100644
index 99ded03d7d2a..000000000000
--- a/profiles/uclibc/ppc/use.mask
+++ /dev/null
@@ -1,24 +0,0 @@
--altivec
-
-# Diego Pettenò <flameeyes@gentoo.org> (6 Dec 2006)
-# Unmask the Apple drivers
-# Mask ALSA drivers for ISA cards
-alsa_cards_msnd-pinnacle
-alsa_cards_sb16
-alsa_cards_sbawe
-alsa_cards_sscape
-alsa_cards_wavefront
-
-# app-misc/lcd4linux
-lcd_devices_lph7508
-lcd_devices_m50530
-lcd_devices_noritake
-lcd_devices_routerboard
-
-# app-misc/lcdproc
-lcd_devices_sed1330
-lcd_devices_sed1520
-lcd_devices_stv5730
-
-# Both
-lcd_devices_t6963
diff --git a/profiles/uclibc/sh/2.4/eapi b/profiles/uclibc/sh/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/sh/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/sh/2.4/package.mask b/profiles/uclibc/sh/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/sh/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/sh/2.4/parent b/profiles/uclibc/sh/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/sh/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/sh/eapi b/profiles/uclibc/sh/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/sh/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/sh/make.defaults b/profiles/uclibc/sh/make.defaults
deleted file mode 100644
index 217d96769e7b..000000000000
--- a/profiles/uclibc/sh/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="sh"
-ACCEPT_KEYWORDS="sh"
-
-CHOST="sh4-gentoo-linux-uclibc"
-
-UCLIBC_CPU_DEFAULT="SH4"
diff --git a/profiles/uclibc/sh/parent b/profiles/uclibc/sh/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/sh/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/use.force b/profiles/uclibc/use.force
deleted file mode 100644
index 3904f12fc0b2..000000000000
--- a/profiles/uclibc/use.force
+++ /dev/null
@@ -1 +0,0 @@
-elibc_uclibc
diff --git a/profiles/uclibc/use.mask b/profiles/uclibc/use.mask
deleted file mode 100644
index a8a38bf0b10f..000000000000
--- a/profiles/uclibc/use.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-iconv
-nls
-nis
-
--uclibc
-
--elibc_uclibc
-elibc_glibc
-
--hardened
diff --git a/profiles/uclibc/x86/2.4/eapi b/profiles/uclibc/x86/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/2.4/package.mask b/profiles/uclibc/x86/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/x86/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/x86/2.4/parent b/profiles/uclibc/x86/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/2005.1/2.4/eapi b/profiles/uclibc/x86/2005.1/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/2005.1/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/2005.1/2.4/package.mask b/profiles/uclibc/x86/2005.1/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/x86/2005.1/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/x86/2005.1/2.4/parent b/profiles/uclibc/x86/2005.1/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/2005.1/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/2005.1/eapi b/profiles/uclibc/x86/2005.1/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/2005.1/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/2005.1/parent b/profiles/uclibc/x86/2005.1/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/2005.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/eapi b/profiles/uclibc/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/hardened/2.4/eapi b/profiles/uclibc/x86/hardened/2.4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/hardened/2.4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/hardened/2.4/package.mask b/profiles/uclibc/x86/hardened/2.4/package.mask
deleted file mode 100644
index 2212cb12d718..000000000000
--- a/profiles/uclibc/x86/hardened/2.4/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
->=sys-kernel/linux-headers-2.5
->=sys-kernel/gentoo-sources-2.5
->=sys-kernel/hardened-sources-2.5
->=sys-kernel/vanilla-sources-2.5
diff --git a/profiles/uclibc/x86/hardened/2.4/parent b/profiles/uclibc/x86/hardened/2.4/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/hardened/2.4/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/hardened/eapi b/profiles/uclibc/x86/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/hardened/make.defaults b/profiles/uclibc/x86/hardened/make.defaults
deleted file mode 100644
index 41e2d419addb..000000000000
--- a/profiles/uclibc/x86/hardened/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-GRP_STAGE23_USE="ncurses readline zlib uclibc hardened pic"
-USE="ncurses readline zlib uclibc hardened pic"
-
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
-# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"
diff --git a/profiles/uclibc/x86/hardened/package.mask b/profiles/uclibc/x86/hardened/package.mask
deleted file mode 100644
index 44b27cf11476..000000000000
--- a/profiles/uclibc/x86/hardened/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
->=sys-devel/gcc-4.4
diff --git a/profiles/uclibc/x86/hardened/package.use.mask b/profiles/uclibc/x86/hardened/package.use.mask
deleted file mode 100644
index 4c0d131b7087..000000000000
--- a/profiles/uclibc/x86/hardened/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-sys-devel/gcc -hardened
diff --git a/profiles/uclibc/x86/hardened/parent b/profiles/uclibc/x86/hardened/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/hardened/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/linux24/deprecated b/profiles/uclibc/x86/linux24/deprecated
deleted file mode 100644
index 45453344c8e1..000000000000
--- a/profiles/uclibc/x86/linux24/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-uclibc/x86/2.4
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/uclibc/x86/2.4 make.profile
diff --git a/profiles/uclibc/x86/linux24/eapi b/profiles/uclibc/x86/linux24/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/linux24/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/linux24/parent b/profiles/uclibc/x86/linux24/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/linux24/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/linux26/deprecated b/profiles/uclibc/x86/linux26/deprecated
deleted file mode 100644
index 45729f9460ba..000000000000
--- a/profiles/uclibc/x86/linux26/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-uclibc/x86
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/uclibc/x86 make.profile
diff --git a/profiles/uclibc/x86/linux26/eapi b/profiles/uclibc/x86/linux26/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/uclibc/x86/linux26/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/uclibc/x86/linux26/parent b/profiles/uclibc/x86/linux26/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/linux26/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/make.defaults b/profiles/uclibc/x86/make.defaults
deleted file mode 100644
index 0b41209d6fc9..000000000000
--- a/profiles/uclibc/x86/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-CHOST="i386-gentoo-linux-uclibc"
-
-UCLIBC_CPU_DEFAULT="GENERIC_386"
diff --git a/profiles/uclibc/x86/parent b/profiles/uclibc/x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/uclibc/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/uclibc/x86/use.mask b/profiles/uclibc/x86/use.mask
deleted file mode 100644
index a75b2170bdd6..000000000000
--- a/profiles/uclibc/x86/use.mask
+++ /dev/null
@@ -1,19 +0,0 @@
--cpu_flags_x86_3dnow
--cpu_flags_x86_3dnowext
--cpu_flags_x86_aes
--cpu_flags_x86_avx
--cpu_flags_x86_avx2
--cpu_flags_x86_fma3
--cpu_flags_x86_fma4
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_padlock
--cpu_flags_x86_popcnt
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_sse3
--cpu_flags_x86_sse4_1
--cpu_flags_x86_sse4_2
--cpu_flags_x86_sse4a
--cpu_flags_x86_ssse3
--cpu_flags_x86_xop
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 88f667f04977..7a859264388a 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -1,2 +1,4 @@
 move app-portage/kuroo4 app-portage/kuroo
 slotmove app-portage/kuroo 4 0
+move dev-cpp/gsl dev-cpp/ms-gsl
+slotmove =dev-util/cucumber-3.1.0 3.0 3.1
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0c76afb64ad7..62ef60c1b42f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -100,6 +100,7 @@ app-admin/pass:fish-completion - Enable fish completion support.
 app-admin/pass:git - Use dev-vcs/git for password revisions.
 app-admin/pass:importers - Allow importing passwords from other password managers using various contributed scripts.
 app-admin/passwordsafe:minimal - Avoid collision with app-misc/pwsafe
+app-admin/passwordsafe:qr - Enable QR code password display
 app-admin/passwordsafe:xml - Enable XML import support
 app-admin/passwordsafe:yubikey - Enable support for Yubikey
 app-admin/prelude-manager:dbx - Enables Prelude Manager storing Prelude alerts into database through dev-libs/libpreludedb .
@@ -858,6 +859,7 @@ app-misc/ca-certificates:cacert - Include root certificates from CAcert (http://
 app-misc/ca-certificates:insecure_certs - Install certificates which are known to be untrustworthy.
 app-misc/carbon-c-relay:lz4 - add support for LZ4 compressed transport
 app-misc/ddccontrol:pci - enable direct PCI memory access (the setuid ddcpci util)
+app-misc/ddcutil:drm - Use x11-libs/libdrm for more verbose diagnostics.
 app-misc/ddcutil:usb-monitor - Adds support for monitors attached via USB.
 app-misc/ddcutil:user-permissions - Adds a udev rules to allow non-root users in the i2c group to access the /dev/i2c-* devices. If usb-monitor is selected, users will need to be added to the video group to access the USB monitor. Otherwise, only root will be able to use ddcutil.
 app-misc/digitemp:ds2490 - Build support for the ds2490 sensor
@@ -1019,7 +1021,8 @@ app-office/libreoffice:coinmp - Use sci-libs/coinor-mp as alternative solver
 app-office/libreoffice:collada - Enable Collada for rendering 3D models stored in *.dae and *.kmz format
 app-office/libreoffice:gltf - Use media-libs/libgltf for inserting 3D models in the glTF format into presentations
 app-office/libreoffice:googledrive - Enable support for remote files on Google Drive
-app-office/libreoffice:gtk3 - Enable highly experimental gtk3 frontend
+app-office/libreoffice:gtk2 - Enable legacy gtk2 frontend
+app-office/libreoffice:gtk3 - Enable experimental gtk3 frontend
 app-office/libreoffice:jemalloc - Use dev-libs/jemalloc for allocations
 app-office/libreoffice:odk - Build the Office Development Kit
 app-office/libreoffice:pdfimport - Enable PDF import via the Poppler library
@@ -1283,7 +1286,6 @@ dev-ada/libgpr:static-pic - Build static library with pic code
 dev-ada/xmlada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/xmlada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/xmlada:shared - Build shared library
-dev-ada/xmlada:static - Build static library
 dev-ada/xmlada:static-pic - Build static library with pic code
 dev-cpp/eigen:c++11 - Build using the C++11 standard
 dev-cpp/eigen:cuda - Build with cuda support
@@ -1413,7 +1415,6 @@ dev-db/percona-server:tokudb-backup-plugin - Builds the TokuDB backup plugin
 dev-db/percona-server:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
 dev-db/pgadmin3:databasedesigner - Enable the Database Designer component
 dev-db/pgbouncer:c-ares - Use c-ares as the DNS backend instead of evdns (libevent).
-dev-db/pgbouncer:libevent - Use libevent 2.0+ and evdns as the DNS backend
 dev-db/pgbouncer:udns - Use udns as the DNS backend instead of evdns (libevent). Supports IPv4 only.
 dev-db/pgpool2:memcached - Use memcached for query caching.
 dev-db/pgrouting:drivingdistance - Enable to calculate driving distance
@@ -1936,6 +1937,7 @@ dev-lang/ruby:rdoc - Install dev-ruby/rdoc after installing Ruby.
 dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readline extension, used for instance by the irb tool. This flag is meaningful only if the libedit USE flag is disabled. If neither libedit nor readline USE flags are enabled, the readline extension will not be built (and irb will lose line editing functionality).
 dev-lang/ruby:rubytests - Install ruby tests that can only be run after ruby is installed
 dev-lang/rust:clang - Use sys-devel/clang for building
+dev-lang/rust:jemalloc - Use sys-libs/jemalloc as the standard memory allocator
 dev-lang/rust:libcxx - Use sys-libs/libcxx as standard library when building with sys-devel/clang
 dev-lang/rust:system-llvm - Use system sys-devel/llvm in place of the bundled one
 dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
@@ -1987,6 +1989,7 @@ dev-libs/apr:urandom - Use /dev/urandom instead of /dev/random
 dev-libs/apr-util:libressl - Use dev-libs/libressl instead of dev-libs/openssl for 'openssl' USE flag
 dev-libs/apr-util:nss - Install apr_crypto_nss module
 dev-libs/apr-util:openssl - Install apr_crypto_openssl module
+dev-libs/atcore:gui - Build test GUI
 dev-libs/beignet:ocl-icd - Enable compatibility with the dev-libs/ocl-icd OpenCL ICD loader
 dev-libs/beignet:ocl20 - Enable experimental OpenCL 2.0 support on Skylake and newer architectures
 dev-libs/bitset:jemalloc - Use dev-libs/jemalloc for allocations
@@ -2784,7 +2787,6 @@ dev-scheme/kawa:krl - Build BRL emulation and KRL
 dev-scheme/kawa:sax - Assume SAX2 is available with dev-java/sax
 dev-scheme/kawa:servlets - Build support for generating servlets with dev-java/servletapi
 dev-scheme/kawa:swing - Assume Swing is available
-dev-scheme/kawa:swt - Assume SWT is available with dev-java/swt
 dev-scheme/kawa:xqtests - Support XQuery Test Suite
 dev-scheme/racket:backtrace - Support GC backtrace dumps
 dev-scheme/racket:futures - Enable racket/future library for fine-grained hardware parallelism
@@ -4165,7 +4167,6 @@ media-libs/libextractor:archive - Enable archive support using app-arch/libarchi
 media-libs/libextractor:gsf - Enable OLE2 (MS Office) plug-in support using gnome-extra/libgsf
 media-libs/libextractor:magic - Enable magic support using sys-apps/file
 media-libs/libextractor:midi - Enable MIDI support through media-libs/libsmf
-media-libs/libffado:qt4 - Install qt4-based mixer frontend
 media-libs/libffado:test-programs - Install standalone test programs
 media-libs/libggi:vis - Enables sparc vis support for libggi
 media-libs/libgphoto2:serial - Enable serial port support
@@ -4281,7 +4282,6 @@ media-libs/openimageio:cpu_flags_x86_f16c - SIMD Optimization
 media-libs/openimageio:field3d - Use media-libs/Field3D
 media-libs/openimageio:opencv - Use media-libs/opencv
 media-libs/openimageio:ptex - Use media-libs/ptex
-media-libs/openimageio:tbb - Use dev-cpp/tbb
 media-libs/opensubdiv:cuda - Enable NVIDIA CUDA Toolkit support through dev-util/nvidia-cuda-toolkit.
 media-libs/opensubdiv:opencl - Enable OpenCL support through virtual/opencl.
 media-libs/opensubdiv:ptex - Adds support for faster per-face texture mapping through media-libs/ptex.
@@ -4439,8 +4439,6 @@ media-plugins/vdr-xineliboutput:xine - Compile the xine input plugin for display
 media-radio/ax25-tools:X - Enable some X based configuration tools.
 media-radio/fldigi:hamlib - Enables support by the Hamlib amateur radio rig control library to get/set frequency and mode of the ham radio in use
 media-radio/tucnak:hamlib - Enables support by the Hamlib amateur radio rig control library to get/set frequency and mode of the ham radio
-media-radio/tucnak2:ftdi - Enable support for FTDI USB chips
-media-radio/tucnak2:hamlib - Enables support by the Hamlib amateur radio rig control library to get/set frequency and mode of the ham radio
 media-radio/unixcw:ncurses - Enables building the curses based morse code tutor program 'cwcp'.
 media-radio/xastir:festival - Enable text to speech synthesizer
 media-radio/xastir:gdal - Support for some further map formats
@@ -4711,6 +4709,7 @@ media-sound/split2flac:flake - Add support for Flake, alternative FLAC encoder
 media-sound/split2flac:mac - Add support for Monkey's Audio files
 media-sound/split2flac:replaygain - Support for Replay Gain metadata, for relative volume adjustment
 media-sound/spotify:pax_kernel - Triggers a paxmarking of the main Spotify binary
+media-sound/spotify:systray - Pulls in dependencies needed for systray support on some desktop environments
 media-sound/supercollider:emacs - Enable the SCEL user interface
 media-sound/supercollider:gedit - Enable the SCED user interface
 media-sound/supercollider:gpl3 - Build GPL-3 licensed code (recommended)
@@ -6914,6 +6913,7 @@ net-p2p/primecoin-qt:qrcode - Enable generation of QR Codes for receiving paymen
 net-p2p/primecoind:logrotate - Use app-admin/logrotate for rotating logs
 net-p2p/pybitmessage:opencl - Uses dev-python/pyopencl for GPU acceleration.
 net-p2p/qbittorrent:webui - Enable the Web UI
+net-p2p/resilio-sync:pax_kernel - Use paxctl to mark binaries
 net-p2p/retroshare:cli - Enables the CLI version of RetroShare
 net-p2p/retroshare:feedreader - Enables the Feedreader plugin
 net-p2p/retroshare:gnome-keyring - Enables potentially insecure autologin capability via Gnome Keyring
@@ -7836,6 +7836,7 @@ sys-apps/policycoreutils:audit - Enable support for sys-process/audit and use th
 sys-apps/portage:epydoc - Build html API documentation with epydoc.
 sys-apps/portage:ipc - Use inter-process communication between portage and running ebuilds.
 sys-apps/portage:native-extensions - Compiles native "C" extensions (speedups, instead of using python backup code). Currently includes libc-locales. This should only be temporarily disabled for some bootstrapping operations. Cross-compilation is not supported.
+sys-apps/portage:rsync-verify - Enable full-tree cryptographic verification of Gentoo repository rsync checkouts using app-portage/gemato.
 sys-apps/portage:xattr - Preserve extended attributes (filesystem-stored metadata) when installing files. Usually only required for hardened systems.
 sys-apps/proot:care - Build dynamic CARE binary (more info - http://reproducible.io/)
 sys-apps/pyrenamer:music - Enable support for renaming music
@@ -7880,7 +7881,6 @@ sys-apps/systemd:vanilla - Disable Gentoo-specific behavior and compatibility qu
 sys-apps/systemd:xkb - Depend on x11-libs/libxkbcommon to allow logind to control the X11 keymap
 sys-apps/tcp-wrappers:netgroups - Support matching NIS (host) netgroup names via the @netgroup syntax (if you don't know what this means, you most likely do not need it)
 sys-apps/timer_entropyd:debug - Enable printf debugging and logging to the syslog at DEBUG level
-sys-apps/tuxonice-userui:fbsplash - Add support for framebuffer splash
 sys-apps/usb_modeswitch:jimtcl - Use dev-lang/jimtcl instead of dev-lang/tcl for smaller memory footprint
 sys-apps/usermode-utilities:fuse - Build tools (currently umlmount) needing fuse
 sys-apps/util-linux:caps - build setpriv helper (run programs with diff capabilities)
@@ -8218,7 +8218,6 @@ sys-freebsd/freebsd-sbin:ipfilter - Build tools to administer the ipfilter firew
 sys-freebsd/freebsd-sbin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP).
 sys-freebsd/freebsd-sbin:pf - Build tools to administer the PF firewall.
 sys-freebsd/freebsd-sbin:zfs - Enable ZFS support.
-sys-freebsd/freebsd-share:isdn - Enable ISDN support
 sys-freebsd/freebsd-share:zfs - Enable ZFS support.
 sys-freebsd/freebsd-sources:build-kernel - Build and install a kernel (recommended).
 sys-freebsd/freebsd-sources:dtrace - Enable DTrace support.