gentoo resync : 16.06.2019

641 files changed, 136 insertions, 2004 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 397270742680..4cd8c0f1ae6a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index a91e38fb7940..342260e94ddc 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -85,6 +85,7 @@ app-doc/doxygen clang
 dev-perl/GD fcgi
 media-libs/libcanberra gnome
 media-libs/mesa vaapi
+media-libs/openal sdl
 media-sound/pulseaudio equalizer qt5 realtime
 media-video/ffmpeg ebur128 kvazaar libilbc openh264
 media-video/ffmpeg rubberband sdl ssh x265 zeromq zimg
@@ -128,6 +129,7 @@ media-video/vlc opencv
 # Lars Wendler <polynomial-c@gentoo.org> (23 Jan 2015)
 # Missing keywords
 dev-libs/openssl sctp
+dev-libs/openssl-compat sctp
 net-misc/openssh sctp
 
 # Pacho Ramos <pacho@gentoo.org> (01 Jun 2014)
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index 5c86f6ef2ce8..a539c08776c6 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -36,3 +36,4 @@ media-gfx/iscan-plugin-gt-f500 minimal
 # <blubb@gentoo.org> (23 Oct 2006)
 # upstream forces sse2 on regardless of what the use flag is
 dev-libs/openssl cpu_flags_x86_sse2
+dev-libs/openssl-compat cpu_flags_x86_sse2
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 4b06f8b458ea..e8bbd94d91ab 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (09 May 2019)
+# media-libs/libplacebo is keyworded on amd64
+media-video/vlc -libplacebo
+
 # Denis Lisov <dennis.lissov@gmail.com> (09 May 2019)
 # Overlay can only be built on amd64 and x86
 x11-apps/igt-gpu-tools -overlay
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 8bae7dd1d1cf..482dc45773a6 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -28,7 +28,7 @@ dev-qt/qtsql oci8
 
 # Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
 # Depends on unstable media-libs/dav1d
-media-video/vlc dav1d
+~media-video/vlc-3.0.6 dav1d
 
 # Amy Liffey <amynka@gentoo.org> (15 Jan 2019)
 # Mask experimental contrib repo
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 00124b594bbc..17a064b8ce9b 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Thomas Deutschmann <whissi@gentoo.org> (08 Jun 2019)
+# Needs dev-lang/php:7.3 stable
+php_targets_php7-3
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 7e89ef2ce62e..16af3a18b901 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Patrick McLean <chutzpah@gentoo.org> (14 June 2019)
+# test deps not keyworded
+dev-util/bcc test
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (01 June 2019)
 # not yet keyworded
 dev-java/openjdk javafx
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 855f907eaea4..d2b033d880ab 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -3,7 +3,7 @@
 
 # Aaron Bauman <bman@gentoo.org> (27 May 2019)
 # media-libs/dav1d is not stable
-media-video/vlc dav1d
+~media-video/vlc-3.0.6 dav1d
 
 # Aaron Bauman <bman@gentoo.org> (20 May 2019)
 # deps are not stable yet
@@ -38,6 +38,7 @@ sys-devel/clang default-libcxx
 # Mart Raudsepp <leio@gentoo.org> (28 Jun 2018)
 # net-misc/lksctp-tools not stable yet
 dev-libs/openssl sctp
+dev-libs/openssl-compat sctp
 net-misc/openssh sctp
 
 # Mart Raudsepp <leio@gentoo.org> (30 May 2018)
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 8c88200fef33..3a4467d0071e 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (09 May 2019)
+# media-libs/libplacebo is not keyworded anywhere except amd64 yet
+media-video/vlc libplacebo
+
 # Denis Lisov <dennis.lissov@gmail.com> (09 May 2019)
 # Overlay can only be built on amd64 and x86
 x11-apps/igt-gpu-tools overlay
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index c39a53b28c2c..93d77d2c9b88 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (05 Jun 2019)
+# sys-auth/polkit stable timeout, bug #661470
+sys-apps/pcsc-lite policykit
+x11-misc/colord policykit
+
 # Sergei Trofimovich <slyfox@gentoo.org> (03 May 2019)
 # net-wireless/bluez has no stable keywords, bug #676430
 app-pda/pilot-link bluetooth
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index b2b9113b7138..0618774364db 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (05 Jun 2019)
+# sys-auth/consolekit will not be stabilised anymore.
+consolekit
+
 # Sergei Trofimovich <slyfox@gentoo.org> (03 Mar 2019)
 # No stable sys-apps/systemd on hppa.
 systemd
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 208d8b8210ba..fbcd0483d8bd 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -19,10 +19,6 @@ www-servers/uwsgi uwsgi_plugins_rados
 # Tests fail with jpeg2k flag. Bug #662686
 dev-python/pillow jpeg2k
 
-# Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
-# media-libs/dav1d is not yet keyworded
-media-video/vlc dav1d
-
 # Thomas Deutschmann <whissi@gentoo.org> (26 Feb 2019)
 # nginx_modules_http_lua requires USE=luajit which requires
 # dev-lang/luajit which is not keyworded on PowerPC
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 1ef0f29e32bf..6ed43759c74c 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -66,7 +66,8 @@ gnome-extra/libgda reports
 
 # Anthony G. Basile <blueness@gentoo.org> (26 Oct 2015)
 # Mask x265 on vlc for bug #564138
-media-video/vlc x265
+# media-libs/dav1d is not yet keyworded
+media-video/vlc dav1d x265
 
 # Ben de Groot <yngwin@gentoo.org> (20 Jul 2015)
 # missing keyword
diff --git a/profiles/arch/powerpc/ppc64/32ul/package.use.mask b/profiles/arch/powerpc/ppc64/32ul/package.use.mask
index 097f9b1187d1..8afd2a21b2d8 100644
--- a/profiles/arch/powerpc/ppc64/32ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/32ul/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (09 Jun 2019)
+# media-libs/dav1d is not yet keyworded
+media-video/vlc dav1d
+
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Feb 2019)
 # app-text/libwpd and app-text/libwpg are not keyworded
 media-gfx/inkscape cdr visio wpg
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index bbc650054cec..227a18b8cdb1 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (09 Jun 2019)
+# media-libs/dav1d is not stable yet
+~media-video/vlc-3.0.6 dav1d
+
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Feb 2019)
 # app-text/libwpd and app-text/libwpg are not stable
 media-gfx/inkscape cdr visio wpg
diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask
index b047e41efe76..3490fa2ef497 100644
--- a/profiles/arch/powerpc/ppc64/use.mask
+++ b/profiles/arch/powerpc/ppc64/use.mask
@@ -6,7 +6,7 @@
 
 # Samuli Suominen <ssuominen@gentoo.org> (24 Nov 2012)
 # TODO: Keyword and stabilize media-gfx/opencolorio and media-libs/opencv
-colorio
+color-management
 opencv
 
 # Brent Baude <ranger@gentoo.org> (3 Oct 2008)
diff --git a/profiles/arch/sparc/package.use b/profiles/arch/sparc/package.use
index 76457771a8f8..8c7e997a623c 100644
--- a/profiles/arch/sparc/package.use
+++ b/profiles/arch/sparc/package.use
@@ -6,7 +6,3 @@
 dev-ml/llvm-ocaml llvm_targets_AMDGPU
 sys-devel/clang llvm_targets_AMDGPU
 sys-devel/llvm llvm_targets_AMDGPU
-
-# Pacho Ramos <pacho@gentoo.org> (15 Feb 2014)    
-# libev isn't supported on this arch, use another default (#499498)
-dev-libs/libverto libevent
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 61d3d1245087..e5b189ea8998 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Sergei Trofimovich <slyfox@gentoo.org> (02 Feb 2019)
+# No stable app-arch/rpm on sparc.
+rpm
+
 # Andreas Sturmlechner <asturm@gentoo.org> (23 Apr 2019)
 openal
 
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 00a1efed92fd..f72a49e022a2 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -28,7 +28,7 @@ dev-qt/qtsql oci8
 
 # Andreas Sturmlechner <asturm@gentoo.org> (06 May 2019)
 # media-libs/dav1d is not yet stable
-media-video/vlc dav1d
+~media-video/vlc-3.0.6 dav1d
 
 # Amy Liffey <amynka@gentoo.org> (15 Jan 2019)
 # Mask experimental contrib repo
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 053b0e4ac859..cc08beb437d3 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -169,4 +169,4 @@ POSTGRES_TARGETS="postgres10 postgres11"
 # Moreover, it should only contain targets that have a stable version
 # of PHP, to avoid pulling in an unstable PHP on stable systems.
 #
-PHP_TARGETS="php5-6 php7-1"
+PHP_TARGETS="php7-2"
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 2f3562ed47e0..741d220aa4b7 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/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
 
-# Brian Evans <grknight@gentoo.org> (11 Jan 2019)
-# Mask PHP 7.3 target while unstable
-php_targets_php7-3
-
 # Zac Medico <zmedico@gentoo.org> (01 Sep 2016)
 # Needs virtual/pypy* stable
 python_targets_pypy
diff --git a/profiles/default/linux/alpha/13.0/deprecated b/profiles/default/linux/alpha/13.0/deprecated
deleted file mode 100644
index 15345d4866b7..000000000000
--- a/profiles/default/linux/alpha/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/17.0
diff --git a/profiles/default/linux/alpha/13.0/desktop/deprecated b/profiles/default/linux/alpha/13.0/desktop/deprecated
deleted file mode 100644
index 572c7a7d075d..000000000000
--- a/profiles/default/linux/alpha/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/17.0/desktop
diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/deprecated b/profiles/default/linux/alpha/13.0/desktop/gnome/deprecated
deleted file mode 100644
index cc40f08b5b42..000000000000
--- a/profiles/default/linux/alpha/13.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/17.0/desktop/gnome
diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/eapi b/profiles/default/linux/alpha/13.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/alpha/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/parent b/profiles/default/linux/alpha/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e01478..000000000000
--- a/profiles/default/linux/alpha/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/deprecated
deleted file mode 100644
index 0de99d2db127..000000000000
--- a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/17.0/desktop/gnome/systemd
diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/eapi b/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f5c1ae438de4..000000000000
--- a/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/alpha/13.0/desktop/parent b/profiles/default/linux/alpha/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/alpha/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/alpha/13.0/developer/deprecated b/profiles/default/linux/alpha/13.0/developer/deprecated
deleted file mode 100644
index 9e27c1788808..000000000000
--- a/profiles/default/linux/alpha/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/alpha/17.0/developer
diff --git a/profiles/default/linux/alpha/13.0/developer/eapi b/profiles/default/linux/alpha/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/alpha/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/alpha/13.0/developer/parent b/profiles/default/linux/alpha/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/alpha/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/alpha/13.0/eapi b/profiles/default/linux/alpha/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/alpha/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/alpha/13.0/parent b/profiles/default/linux/alpha/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/alpha/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/alpha/13.0/use.mask b/profiles/default/linux/alpha/13.0/use.mask
deleted file mode 100644
index 66abcb4373f8..000000000000
--- a/profiles/default/linux/alpha/13.0/use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
-# Pulls in net-libs/axtls which is not keyworded for arch
-curl_ssl_axtls
diff --git a/profiles/default/linux/alpha/13.0/use.stable.mask b/profiles/default/linux/alpha/13.0/use.stable.mask
deleted file mode 100644
index f54e7a1f560a..000000000000
--- a/profiles/default/linux/alpha/13.0/use.stable.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/default/linux/amd64/13.0/deprecated b/profiles/default/linux/amd64/13.0/deprecated
deleted file mode 100644
index 43f4f6d735c9..000000000000
--- a/profiles/default/linux/amd64/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0
diff --git a/profiles/default/linux/amd64/13.0/desktop/deprecated b/profiles/default/linux/amd64/13.0/desktop/deprecated
deleted file mode 100644
index 4e8fca413726..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/desktop
diff --git a/profiles/default/linux/amd64/13.0/desktop/eapi b/profiles/default/linux/amd64/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/deprecated b/profiles/default/linux/amd64/13.0/desktop/gnome/deprecated
deleted file mode 100644
index 71bef6c62d16..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/desktop/gnome
diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/eapi b/profiles/default/linux/amd64/13.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/parent b/profiles/default/linux/amd64/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e01478..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/deprecated
deleted file mode 100644
index faa290cf8049..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/desktop/gnome/systemd
diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/eapi b/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f5c1ae438de4..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/amd64/13.0/desktop/parent b/profiles/default/linux/amd64/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/amd64/13.0/desktop/plasma/deprecated b/profiles/default/linux/amd64/13.0/desktop/plasma/deprecated
deleted file mode 100644
index b910cbb1645f..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/plasma/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/desktop/plasma
diff --git a/profiles/default/linux/amd64/13.0/desktop/plasma/eapi b/profiles/default/linux/amd64/13.0/desktop/plasma/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/plasma/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/desktop/plasma/parent b/profiles/default/linux/amd64/13.0/desktop/plasma/parent
deleted file mode 100644
index ff3a7b1ec814..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/plasma/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/amd64/13.0/desktop/plasma/systemd/deprecated b/profiles/default/linux/amd64/13.0/desktop/plasma/systemd/deprecated
deleted file mode 100644
index 7d93fab27113..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/plasma/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/desktop/plasma/systemd
diff --git a/profiles/default/linux/amd64/13.0/desktop/plasma/systemd/eapi b/profiles/default/linux/amd64/13.0/desktop/plasma/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/plasma/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/desktop/plasma/systemd/parent b/profiles/default/linux/amd64/13.0/desktop/plasma/systemd/parent
deleted file mode 100644
index 44f88d3e2df0..000000000000
--- a/profiles/default/linux/amd64/13.0/desktop/plasma/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/amd64/13.0/developer/deprecated b/profiles/default/linux/amd64/13.0/developer/deprecated
deleted file mode 100644
index 99ccb2be8776..000000000000
--- a/profiles/default/linux/amd64/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/developer
diff --git a/profiles/default/linux/amd64/13.0/developer/eapi b/profiles/default/linux/amd64/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/developer/make.defaults b/profiles/default/linux/amd64/13.0/developer/make.defaults
deleted file mode 100644
index 28426a7b24f1..000000000000
--- a/profiles/default/linux/amd64/13.0/developer/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2010-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/amd64 dev profile
-# This will help developers track packages, that don't respect LDFLAGS, down
-# more effectively
-LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/profiles/default/linux/amd64/13.0/developer/parent b/profiles/default/linux/amd64/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/amd64/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/amd64/13.0/eapi b/profiles/default/linux/amd64/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/no-multilib/deprecated b/profiles/default/linux/amd64/13.0/no-multilib/deprecated
deleted file mode 100644
index 5bf1896e884a..000000000000
--- a/profiles/default/linux/amd64/13.0/no-multilib/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/no-multilib
diff --git a/profiles/default/linux/amd64/13.0/no-multilib/eapi b/profiles/default/linux/amd64/13.0/no-multilib/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/no-multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/no-multilib/parent b/profiles/default/linux/amd64/13.0/no-multilib/parent
deleted file mode 100644
index 7f1f3bc017ee..000000000000
--- a/profiles/default/linux/amd64/13.0/no-multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/amd64/no-multilib
diff --git a/profiles/default/linux/amd64/13.0/parent b/profiles/default/linux/amd64/13.0/parent
deleted file mode 100644
index 644b98fa601f..000000000000
--- a/profiles/default/linux/amd64/13.0/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../arch/amd64/lib32
-../../../../releases/13.0
diff --git a/profiles/default/linux/amd64/13.0/selinux/deprecated b/profiles/default/linux/amd64/13.0/selinux/deprecated
deleted file mode 100644
index 06be0ad90b49..000000000000
--- a/profiles/default/linux/amd64/13.0/selinux/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/selinux
diff --git a/profiles/default/linux/amd64/13.0/selinux/eapi b/profiles/default/linux/amd64/13.0/selinux/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/selinux/parent b/profiles/default/linux/amd64/13.0/selinux/parent
deleted file mode 100644
index 933e67923d1a..000000000000
--- a/profiles/default/linux/amd64/13.0/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/default/linux/amd64/13.0/systemd/deprecated b/profiles/default/linux/amd64/13.0/systemd/deprecated
deleted file mode 100644
index f9089b49b586..000000000000
--- a/profiles/default/linux/amd64/13.0/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/systemd
diff --git a/profiles/default/linux/amd64/13.0/systemd/eapi b/profiles/default/linux/amd64/13.0/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/systemd/parent b/profiles/default/linux/amd64/13.0/systemd/parent
deleted file mode 100644
index ced72403bde9..000000000000
--- a/profiles/default/linux/amd64/13.0/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/systemd
diff --git a/profiles/default/linux/amd64/13.0/x32/deprecated b/profiles/default/linux/amd64/13.0/x32/deprecated
deleted file mode 100644
index 4127245e831e..000000000000
--- a/profiles/default/linux/amd64/13.0/x32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/x32
diff --git a/profiles/default/linux/amd64/13.0/x32/eapi b/profiles/default/linux/amd64/13.0/x32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/13.0/x32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/13.0/x32/make.defaults b/profiles/default/linux/amd64/13.0/x32/make.defaults
deleted file mode 100644
index 4fdae91f3d3f..000000000000
--- a/profiles/default/linux/amd64/13.0/x32/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="x86_64-pc-linux-gnux32"
diff --git a/profiles/default/linux/amd64/13.0/x32/parent b/profiles/default/linux/amd64/13.0/x32/parent
deleted file mode 100644
index cf0023cf48ae..000000000000
--- a/profiles/default/linux/amd64/13.0/x32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/amd64/x32
diff --git a/profiles/default/linux/arm/13.0/armv4/deprecated b/profiles/default/linux/arm/13.0/armv4/deprecated
deleted file mode 100644
index 3eecbaa283d2..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv4
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/deprecated b/profiles/default/linux/arm/13.0/armv4/desktop/deprecated
deleted file mode 100644
index c8eeb4c07c66..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv4/desktop
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/eapi b/profiles/default/linux/arm/13.0/armv4/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/gnome/deprecated b/profiles/default/linux/arm/13.0/armv4/desktop/gnome/deprecated
deleted file mode 100644
index b9a1e50769c5..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv4/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/armv4/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/gnome/parent b/profiles/default/linux/arm/13.0/armv4/desktop/gnome/parent
deleted file mode 100644
index 9e06c4505a75..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/parent b/profiles/default/linux/arm/13.0/armv4/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/plasma/deprecated b/profiles/default/linux/arm/13.0/armv4/desktop/plasma/deprecated
deleted file mode 100644
index f1357d4046c4..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/plasma/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv4/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/plasma/eapi b/profiles/default/linux/arm/13.0/armv4/desktop/plasma/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/plasma/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv4/desktop/plasma/parent b/profiles/default/linux/arm/13.0/armv4/desktop/plasma/parent
deleted file mode 100644
index 00b252f479ce..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/desktop/plasma/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/armv4/developer/deprecated b/profiles/default/linux/arm/13.0/armv4/developer/deprecated
deleted file mode 100644
index f14c7bc07463..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv4/developer
diff --git a/profiles/default/linux/arm/13.0/armv4/developer/eapi b/profiles/default/linux/arm/13.0/armv4/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv4/developer/parent b/profiles/default/linux/arm/13.0/armv4/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/armv4/eapi b/profiles/default/linux/arm/13.0/armv4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv4/parent b/profiles/default/linux/arm/13.0/armv4/parent
deleted file mode 100644
index 06fe2e606c30..000000000000
--- a/profiles/default/linux/arm/13.0/armv4/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv4
diff --git a/profiles/default/linux/arm/13.0/armv4t/deprecated b/profiles/default/linux/arm/13.0/armv4t/deprecated
deleted file mode 100644
index 1a738c6b153f..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv4t
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/deprecated b/profiles/default/linux/arm/13.0/armv4t/desktop/deprecated
deleted file mode 100644
index a7e5bcfed678..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv4t/desktop
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/eapi b/profiles/default/linux/arm/13.0/armv4t/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/deprecated b/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/deprecated
deleted file mode 100644
index 1f3ff5664758..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv4t/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/parent b/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/parent
deleted file mode 100644
index 9e06c4505a75..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/parent b/profiles/default/linux/arm/13.0/armv4t/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/deprecated b/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/deprecated
deleted file mode 100644
index bc9ffc3068ac..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv4t/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/eapi b/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/parent b/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/parent
deleted file mode 100644
index 00b252f479ce..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/desktop/plasma/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/armv4t/developer/deprecated b/profiles/default/linux/arm/13.0/armv4t/developer/deprecated
deleted file mode 100644
index 1dad77bfe67b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv4t/developer
diff --git a/profiles/default/linux/arm/13.0/armv4t/developer/eapi b/profiles/default/linux/arm/13.0/armv4t/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv4t/developer/parent b/profiles/default/linux/arm/13.0/armv4t/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/armv4t/eapi b/profiles/default/linux/arm/13.0/armv4t/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv4t/parent b/profiles/default/linux/arm/13.0/armv4t/parent
deleted file mode 100644
index 8ab37175d94e..000000000000
--- a/profiles/default/linux/arm/13.0/armv4t/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv4t
diff --git a/profiles/default/linux/arm/13.0/armv5te/deprecated b/profiles/default/linux/arm/13.0/armv5te/deprecated
deleted file mode 100644
index dbb0af6db4d6..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv5te
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/deprecated b/profiles/default/linux/arm/13.0/armv5te/desktop/deprecated
deleted file mode 100644
index d8a9074f2b8c..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv5te/desktop
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/eapi b/profiles/default/linux/arm/13.0/armv5te/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/deprecated b/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/deprecated
deleted file mode 100644
index cbcc11fc4df6..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv5te/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/parent b/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/parent
deleted file mode 100644
index 9e06c4505a75..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/parent b/profiles/default/linux/arm/13.0/armv5te/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/deprecated b/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/deprecated
deleted file mode 100644
index 2c1028758f03..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv5te/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/eapi b/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/parent b/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/parent
deleted file mode 100644
index 00b252f479ce..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/desktop/plasma/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/armv5te/developer/deprecated b/profiles/default/linux/arm/13.0/armv5te/developer/deprecated
deleted file mode 100644
index 3c0f6f60d176..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv5te/developer
diff --git a/profiles/default/linux/arm/13.0/armv5te/developer/eapi b/profiles/default/linux/arm/13.0/armv5te/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv5te/developer/parent b/profiles/default/linux/arm/13.0/armv5te/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/armv5te/eapi b/profiles/default/linux/arm/13.0/armv5te/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv5te/parent b/profiles/default/linux/arm/13.0/armv5te/parent
deleted file mode 100644
index 8036085b374e..000000000000
--- a/profiles/default/linux/arm/13.0/armv5te/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv5te
diff --git a/profiles/default/linux/arm/13.0/armv6j/deprecated b/profiles/default/linux/arm/13.0/armv6j/deprecated
deleted file mode 100644
index 21a020f5259f..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv6j
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/deprecated b/profiles/default/linux/arm/13.0/armv6j/desktop/deprecated
deleted file mode 100644
index ab882698ddc8..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv6j/desktop
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/eapi b/profiles/default/linux/arm/13.0/armv6j/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/deprecated b/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/deprecated
deleted file mode 100644
index 5bf259fb86d8..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv6j/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/parent b/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/parent
deleted file mode 100644
index 9e06c4505a75..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/parent b/profiles/default/linux/arm/13.0/armv6j/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/deprecated b/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/deprecated
deleted file mode 100644
index b40ad522de1c..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv6j/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/eapi b/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/parent b/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/parent
deleted file mode 100644
index 00b252f479ce..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/desktop/plasma/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/armv6j/developer/deprecated b/profiles/default/linux/arm/13.0/armv6j/developer/deprecated
deleted file mode 100644
index 8ffadd08b901..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv6j/developer
diff --git a/profiles/default/linux/arm/13.0/armv6j/developer/eapi b/profiles/default/linux/arm/13.0/armv6j/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv6j/developer/parent b/profiles/default/linux/arm/13.0/armv6j/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/armv6j/eapi b/profiles/default/linux/arm/13.0/armv6j/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv6j/make.defaults b/profiles/default/linux/arm/13.0/armv6j/make.defaults
deleted file mode 100644
index 88750c055d7d..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/make.defaults
+++ /dev/null
@@ -1,2 +0,0 @@
-CHOST="armv6j-hardfloat-linux-gnueabi"
-CHOST_arm="${CHOST}"
diff --git a/profiles/default/linux/arm/13.0/armv6j/package.mask b/profiles/default/linux/arm/13.0/armv6j/package.mask
deleted file mode 100644
index f1209c547739..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/package.mask
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
-# Clang does not work correctly with the old *-hardfloat-* triplets.
-# Please switch to 17.0 profiles that use *eabihf triplets instead.
-# https://bugs.gentoo.org/595834
-dev-python/clang-python
-dev-qt/qdoc
-dev-util/lldb
-sys-devel/clang
-sys-devel/clang-common
-sys-devel/clang-runtime
-sys-libs/compiler-rt
-sys-libs/compiler-rt-sanitizers
-sys-libs/libcxx
-sys-libs/libcxxabi
-sys-libs/libomp
-sys-libs/llvm-libunwind
diff --git a/profiles/default/linux/arm/13.0/armv6j/package.use.mask b/profiles/default/linux/arm/13.0/armv6j/package.use.mask
deleted file mode 100644
index 1eb89092c7df..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/package.use.mask
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Davide Pesavento <pesa@gentoo.org> (23 Dec 2018)
-# These require masked sys-devel/clang.
-dev-qt/qt-creator clang clangcodemodel clangstaticanalyzer
-dev-util/perf clang
-
-# Michał Górny <mgorny@gentoo.org> (22 Dec 2018)
-# Those require masked dev-qt/qdoc.
-dev-qt/qt-creator doc
-dev-util/qbs doc
diff --git a/profiles/default/linux/arm/13.0/armv6j/parent b/profiles/default/linux/arm/13.0/armv6j/parent
deleted file mode 100644
index f61eccdfba43..000000000000
--- a/profiles/default/linux/arm/13.0/armv6j/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv6j
diff --git a/profiles/default/linux/arm/13.0/armv7a/deprecated b/profiles/default/linux/arm/13.0/armv7a/deprecated
deleted file mode 100644
index 2063c2646bdf..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv7a
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/deprecated b/profiles/default/linux/arm/13.0/armv7a/desktop/deprecated
deleted file mode 100644
index ca195e126df2..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv7a/desktop
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/eapi b/profiles/default/linux/arm/13.0/armv7a/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/deprecated b/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/deprecated
deleted file mode 100644
index 604cd9d4eef3..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv7a/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/parent b/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/parent
deleted file mode 100644
index 9e06c4505a75..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/parent b/profiles/default/linux/arm/13.0/armv7a/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/deprecated b/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/deprecated
deleted file mode 100644
index a243d03947f7..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv7a/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/eapi b/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/parent b/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/parent
deleted file mode 100644
index 00b252f479ce..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/desktop/plasma/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/armv7a/developer/deprecated b/profiles/default/linux/arm/13.0/armv7a/developer/deprecated
deleted file mode 100644
index 9af071899d1a..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv7a/developer
diff --git a/profiles/default/linux/arm/13.0/armv7a/developer/eapi b/profiles/default/linux/arm/13.0/armv7a/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv7a/developer/parent b/profiles/default/linux/arm/13.0/armv7a/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/armv7a/eapi b/profiles/default/linux/arm/13.0/armv7a/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/armv7a/make.defaults b/profiles/default/linux/arm/13.0/armv7a/make.defaults
deleted file mode 100644
index dd7639e152d5..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/make.defaults
+++ /dev/null
@@ -1,2 +0,0 @@
-CHOST="armv7a-hardfloat-linux-gnueabi"
-CHOST_arm="${CHOST}"
diff --git a/profiles/default/linux/arm/13.0/armv7a/package.mask b/profiles/default/linux/arm/13.0/armv7a/package.mask
deleted file mode 100644
index f1209c547739..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/package.mask
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
-# Clang does not work correctly with the old *-hardfloat-* triplets.
-# Please switch to 17.0 profiles that use *eabihf triplets instead.
-# https://bugs.gentoo.org/595834
-dev-python/clang-python
-dev-qt/qdoc
-dev-util/lldb
-sys-devel/clang
-sys-devel/clang-common
-sys-devel/clang-runtime
-sys-libs/compiler-rt
-sys-libs/compiler-rt-sanitizers
-sys-libs/libcxx
-sys-libs/libcxxabi
-sys-libs/libomp
-sys-libs/llvm-libunwind
diff --git a/profiles/default/linux/arm/13.0/armv7a/package.use.mask b/profiles/default/linux/arm/13.0/armv7a/package.use.mask
deleted file mode 100644
index 1eb89092c7df..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/package.use.mask
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Davide Pesavento <pesa@gentoo.org> (23 Dec 2018)
-# These require masked sys-devel/clang.
-dev-qt/qt-creator clang clangcodemodel clangstaticanalyzer
-dev-util/perf clang
-
-# Michał Górny <mgorny@gentoo.org> (22 Dec 2018)
-# Those require masked dev-qt/qdoc.
-dev-qt/qt-creator doc
-dev-util/qbs doc
diff --git a/profiles/default/linux/arm/13.0/armv7a/parent b/profiles/default/linux/arm/13.0/armv7a/parent
deleted file mode 100644
index 873750b15e0e..000000000000
--- a/profiles/default/linux/arm/13.0/armv7a/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/arm/armv7a
diff --git a/profiles/default/linux/arm/13.0/deprecated b/profiles/default/linux/arm/13.0/deprecated
deleted file mode 100644
index a99c5fa1e963..000000000000
--- a/profiles/default/linux/arm/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0
diff --git a/profiles/default/linux/arm/13.0/desktop/deprecated b/profiles/default/linux/arm/13.0/desktop/deprecated
deleted file mode 100644
index c38fb2e1c2bd..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/desktop
diff --git a/profiles/default/linux/arm/13.0/desktop/eapi b/profiles/default/linux/arm/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/deprecated b/profiles/default/linux/arm/13.0/desktop/gnome/deprecated
deleted file mode 100644
index 889c66f529db..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/eapi b/profiles/default/linux/arm/13.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/parent b/profiles/default/linux/arm/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e01478..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/arm/13.0/desktop/gnome/systemd/deprecated
deleted file mode 100644
index 484ff7dc21b3..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/desktop/gnome/systemd
diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/eapi b/profiles/default/linux/arm/13.0/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f5c1ae438de4..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/arm/13.0/desktop/parent b/profiles/default/linux/arm/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/arm/13.0/desktop/plasma/deprecated b/profiles/default/linux/arm/13.0/desktop/plasma/deprecated
deleted file mode 100644
index 19c920467a9c..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/plasma/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/desktop/plasma/eapi b/profiles/default/linux/arm/13.0/desktop/plasma/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/plasma/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/desktop/plasma/parent b/profiles/default/linux/arm/13.0/desktop/plasma/parent
deleted file mode 100644
index ff3a7b1ec814..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/plasma/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/arm/13.0/desktop/plasma/systemd/deprecated b/profiles/default/linux/arm/13.0/desktop/plasma/systemd/deprecated
deleted file mode 100644
index a1f2fb781f42..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/plasma/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/desktop/plasma/systemd
diff --git a/profiles/default/linux/arm/13.0/desktop/plasma/systemd/eapi b/profiles/default/linux/arm/13.0/desktop/plasma/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/plasma/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/desktop/plasma/systemd/parent b/profiles/default/linux/arm/13.0/desktop/plasma/systemd/parent
deleted file mode 100644
index 44f88d3e2df0..000000000000
--- a/profiles/default/linux/arm/13.0/desktop/plasma/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/arm/13.0/developer/deprecated b/profiles/default/linux/arm/13.0/developer/deprecated
deleted file mode 100644
index 694c5a86f821..000000000000
--- a/profiles/default/linux/arm/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/developer
diff --git a/profiles/default/linux/arm/13.0/developer/eapi b/profiles/default/linux/arm/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/developer/parent b/profiles/default/linux/arm/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/arm/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/arm/13.0/eapi b/profiles/default/linux/arm/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/13.0/parent b/profiles/default/linux/arm/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/arm/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/arm64/13.0/deprecated b/profiles/default/linux/arm64/13.0/deprecated
deleted file mode 100644
index 4f618b09cb41..000000000000
--- a/profiles/default/linux/arm64/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm64/17.0
diff --git a/profiles/default/linux/arm64/13.0/desktop/deprecated b/profiles/default/linux/arm64/13.0/desktop/deprecated
deleted file mode 100644
index 4755eb879a8c..000000000000
--- a/profiles/default/linux/arm64/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm64/17.0/desktop
diff --git a/profiles/default/linux/arm64/13.0/desktop/eapi b/profiles/default/linux/arm64/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm64/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm64/13.0/desktop/parent b/profiles/default/linux/arm64/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/arm64/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/arm64/13.0/desktop/systemd/deprecated b/profiles/default/linux/arm64/13.0/desktop/systemd/deprecated
deleted file mode 100644
index 1a721bb40559..000000000000
--- a/profiles/default/linux/arm64/13.0/desktop/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm64/17.0/desktop/systemd
diff --git a/profiles/default/linux/arm64/13.0/desktop/systemd/eapi b/profiles/default/linux/arm64/13.0/desktop/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm64/13.0/desktop/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm64/13.0/desktop/systemd/parent b/profiles/default/linux/arm64/13.0/desktop/systemd/parent
deleted file mode 100644
index 7e061533c151..000000000000
--- a/profiles/default/linux/arm64/13.0/desktop/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/systemd
diff --git a/profiles/default/linux/arm64/13.0/developer/deprecated b/profiles/default/linux/arm64/13.0/developer/deprecated
deleted file mode 100644
index a85ff5b5e763..000000000000
--- a/profiles/default/linux/arm64/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm64/17.0/developer
diff --git a/profiles/default/linux/arm64/13.0/developer/eapi b/profiles/default/linux/arm64/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm64/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm64/13.0/developer/parent b/profiles/default/linux/arm64/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/arm64/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/arm64/13.0/eapi b/profiles/default/linux/arm64/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm64/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm64/13.0/parent b/profiles/default/linux/arm64/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/arm64/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/arm64/13.0/systemd/deprecated b/profiles/default/linux/arm64/13.0/systemd/deprecated
deleted file mode 100644
index 94f203bfd798..000000000000
--- a/profiles/default/linux/arm64/13.0/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm64/17.0/systemd
diff --git a/profiles/default/linux/arm64/13.0/systemd/eapi b/profiles/default/linux/arm64/13.0/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm64/13.0/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm64/13.0/systemd/parent b/profiles/default/linux/arm64/13.0/systemd/parent
deleted file mode 100644
index ced72403bde9..000000000000
--- a/profiles/default/linux/arm64/13.0/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/systemd
diff --git a/profiles/default/linux/hppa/13.0/deprecated b/profiles/default/linux/hppa/13.0/deprecated
deleted file mode 100644
index 791ed7f5d9fc..000000000000
--- a/profiles/default/linux/hppa/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/hppa/17.0
diff --git a/profiles/default/linux/hppa/13.0/desktop/deprecated b/profiles/default/linux/hppa/13.0/desktop/deprecated
deleted file mode 100644
index 42b2c8452a08..000000000000
--- a/profiles/default/linux/hppa/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/hppa/17.0/desktop
diff --git a/profiles/default/linux/hppa/13.0/desktop/eapi b/profiles/default/linux/hppa/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/hppa/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/hppa/13.0/desktop/parent b/profiles/default/linux/hppa/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/hppa/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/hppa/13.0/developer/deprecated b/profiles/default/linux/hppa/13.0/developer/deprecated
deleted file mode 100644
index 0ed4eb67a64c..000000000000
--- a/profiles/default/linux/hppa/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/hppa/17.0/developer
diff --git a/profiles/default/linux/hppa/13.0/developer/eapi b/profiles/default/linux/hppa/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/hppa/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/hppa/13.0/developer/parent b/profiles/default/linux/hppa/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/hppa/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/hppa/13.0/eapi b/profiles/default/linux/hppa/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/hppa/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/hppa/13.0/parent b/profiles/default/linux/hppa/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/hppa/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/ia64/13.0/deprecated b/profiles/default/linux/ia64/13.0/deprecated
deleted file mode 100644
index 3da6a26f484b..000000000000
--- a/profiles/default/linux/ia64/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/17.0
diff --git a/profiles/default/linux/ia64/13.0/desktop/deprecated b/profiles/default/linux/ia64/13.0/desktop/deprecated
deleted file mode 100644
index 9f71346d2bac..000000000000
--- a/profiles/default/linux/ia64/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/17.0/desktop
diff --git a/profiles/default/linux/ia64/13.0/desktop/eapi b/profiles/default/linux/ia64/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/ia64/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/ia64/13.0/desktop/gnome/deprecated b/profiles/default/linux/ia64/13.0/desktop/gnome/deprecated
deleted file mode 100644
index 5507c4a3cd81..000000000000
--- a/profiles/default/linux/ia64/13.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/17.0/desktop/gnome
diff --git a/profiles/default/linux/ia64/13.0/desktop/gnome/eapi b/profiles/default/linux/ia64/13.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/ia64/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/ia64/13.0/desktop/gnome/parent b/profiles/default/linux/ia64/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e01478..000000000000
--- a/profiles/default/linux/ia64/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/deprecated
deleted file mode 100644
index 370bab6d8497..000000000000
--- a/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/17.0/desktop/gnome/systemd
diff --git a/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/eapi b/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f5c1ae438de4..000000000000
--- a/profiles/default/linux/ia64/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/ia64/13.0/desktop/parent b/profiles/default/linux/ia64/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/ia64/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/ia64/13.0/developer/deprecated b/profiles/default/linux/ia64/13.0/developer/deprecated
deleted file mode 100644
index 5ccd12f10b65..000000000000
--- a/profiles/default/linux/ia64/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/17.0/developer
diff --git a/profiles/default/linux/ia64/13.0/developer/eapi b/profiles/default/linux/ia64/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/ia64/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/ia64/13.0/developer/parent b/profiles/default/linux/ia64/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/ia64/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/ia64/13.0/eapi b/profiles/default/linux/ia64/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/ia64/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/ia64/13.0/parent b/profiles/default/linux/ia64/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/ia64/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/ia64/13.0/use.mask b/profiles/default/linux/ia64/13.0/use.mask
deleted file mode 100644
index 15d9352dba95..000000000000
--- a/profiles/default/linux/ia64/13.0/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
-# Pulls in net-libs/axtls which is not keyworded for arch
-curl_ssl_axtls
diff --git a/profiles/default/linux/ia64/13.0/use.stable.mask b/profiles/default/linux/ia64/13.0/use.stable.mask
deleted file mode 100644
index 90062e0f6d10..000000000000
--- a/profiles/default/linux/ia64/13.0/use.stable.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/default/linux/m68k/13.0/deprecated b/profiles/default/linux/m68k/13.0/deprecated
deleted file mode 100644
index f89fa8f95f0a..000000000000
--- a/profiles/default/linux/m68k/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/m68k/17.0
diff --git a/profiles/default/linux/m68k/13.0/desktop/deprecated b/profiles/default/linux/m68k/13.0/desktop/deprecated
deleted file mode 100644
index f89fa8f95f0a..000000000000
--- a/profiles/default/linux/m68k/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/m68k/17.0
diff --git a/profiles/default/linux/m68k/13.0/desktop/eapi b/profiles/default/linux/m68k/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/m68k/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/m68k/13.0/desktop/gnome/deprecated b/profiles/default/linux/m68k/13.0/desktop/gnome/deprecated
deleted file mode 100644
index f89fa8f95f0a..000000000000
--- a/profiles/default/linux/m68k/13.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/m68k/17.0
diff --git a/profiles/default/linux/m68k/13.0/desktop/gnome/eapi b/profiles/default/linux/m68k/13.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/m68k/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/m68k/13.0/desktop/gnome/parent b/profiles/default/linux/m68k/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e01478..000000000000
--- a/profiles/default/linux/m68k/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/m68k/13.0/desktop/parent b/profiles/default/linux/m68k/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/m68k/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/m68k/13.0/developer/deprecated b/profiles/default/linux/m68k/13.0/developer/deprecated
deleted file mode 100644
index f89fa8f95f0a..000000000000
--- a/profiles/default/linux/m68k/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/m68k/17.0
diff --git a/profiles/default/linux/m68k/13.0/developer/eapi b/profiles/default/linux/m68k/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/m68k/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/m68k/13.0/developer/parent b/profiles/default/linux/m68k/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/m68k/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/m68k/13.0/eapi b/profiles/default/linux/m68k/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/m68k/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/m68k/13.0/package.mask b/profiles/default/linux/m68k/13.0/package.mask
deleted file mode 100644
index 17532723914b..000000000000
--- a/profiles/default/linux/m68k/13.0/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/default/linux/m68k/13.0/parent b/profiles/default/linux/m68k/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/m68k/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/mips/13.0/desktop/deprecated b/profiles/default/linux/mips/13.0/desktop/deprecated
deleted file mode 100644
index f2e17521662e..000000000000
--- a/profiles/default/linux/mips/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/n32
diff --git a/profiles/default/linux/mips/13.0/desktop/eapi b/profiles/default/linux/mips/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/desktop/parent b/profiles/default/linux/mips/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/mips/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/developer/deprecated b/profiles/default/linux/mips/13.0/developer/deprecated
deleted file mode 100644
index f2e17521662e..000000000000
--- a/profiles/default/linux/mips/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/n32
diff --git a/profiles/default/linux/mips/13.0/developer/eapi b/profiles/default/linux/mips/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/developer/parent b/profiles/default/linux/mips/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/mips/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/eapi b/profiles/default/linux/mips/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/desktop/deprecated b/profiles/default/linux/mips/13.0/mipsel/desktop/deprecated
deleted file mode 100644
index c5d362332349..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/desktop/eapi b/profiles/default/linux/mips/13.0/mipsel/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/desktop/parent b/profiles/default/linux/mips/13.0/mipsel/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/mipsel/developer/deprecated b/profiles/default/linux/mips/13.0/mipsel/developer/deprecated
deleted file mode 100644
index c5d362332349..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/developer/eapi b/profiles/default/linux/mips/13.0/mipsel/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/developer/parent b/profiles/default/linux/mips/13.0/mipsel/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/mipsel/eapi b/profiles/default/linux/mips/13.0/mipsel/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/deprecated b/profiles/default/linux/mips/13.0/mipsel/multilib/deprecated
deleted file mode 100644
index 671dcba4e721..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/multilib/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/eapi b/profiles/default/linux/mips/13.0/mipsel/multilib/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/n32/deprecated b/profiles/default/linux/mips/13.0/mipsel/multilib/n32/deprecated
deleted file mode 100644
index ba568c179e38..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/mipsel/multilib/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/n32/eapi b/profiles/default/linux/mips/13.0/mipsel/multilib/n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/n32/parent b/profiles/default/linux/mips/13.0/mipsel/multilib/n32/parent
deleted file mode 100644
index b2a231799a71..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../../arch/mips/mipsel/mips64el/multilib/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/n64/deprecated b/profiles/default/linux/mips/13.0/mipsel/multilib/n64/deprecated
deleted file mode 100644
index b6ad0afeb646..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/mipsel/multilib/n64
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/n64/eapi b/profiles/default/linux/mips/13.0/mipsel/multilib/n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/n64/parent b/profiles/default/linux/mips/13.0/mipsel/multilib/n64/parent
deleted file mode 100644
index d74eb45cf1dc..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../../arch/mips/mipsel/mips64el/multilib/n64
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/o32/deprecated b/profiles/default/linux/mips/13.0/mipsel/multilib/o32/deprecated
deleted file mode 100644
index 55af573368b1..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/o32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/mipsel/multilib/o32
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/o32/eapi b/profiles/default/linux/mips/13.0/mipsel/multilib/o32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/o32/parent b/profiles/default/linux/mips/13.0/mipsel/multilib/o32/parent
deleted file mode 100644
index 5fe2ba62654a..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../../arch/mips/mipsel/mips64el/multilib/o32
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/parent b/profiles/default/linux/mips/13.0/mipsel/multilib/parent
deleted file mode 100644
index 5d7957a6376e..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel/mips64el/multilib
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/deprecated b/profiles/default/linux/mips/13.0/mipsel/n32/deprecated
deleted file mode 100644
index 997a4945fc4f..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/mipsel/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/desktop/deprecated b/profiles/default/linux/mips/13.0/mipsel/n32/desktop/deprecated
deleted file mode 100644
index c5d362332349..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/desktop/eapi b/profiles/default/linux/mips/13.0/mipsel/n32/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/desktop/parent b/profiles/default/linux/mips/13.0/mipsel/n32/desktop/parent
deleted file mode 100644
index fae96e8d36b2..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/developer/deprecated b/profiles/default/linux/mips/13.0/mipsel/n32/developer/deprecated
deleted file mode 100644
index c5d362332349..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/developer/eapi b/profiles/default/linux/mips/13.0/mipsel/n32/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/developer/parent b/profiles/default/linux/mips/13.0/mipsel/n32/developer/parent
deleted file mode 100644
index 4bb06e409236..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/eapi b/profiles/default/linux/mips/13.0/mipsel/n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/parent b/profiles/default/linux/mips/13.0/mipsel/n32/parent
deleted file mode 100644
index 58de0a92430a..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel/mips64el/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/deprecated b/profiles/default/linux/mips/13.0/mipsel/n64/deprecated
deleted file mode 100644
index 2742db424254..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/mipsel/n64
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/desktop/deprecated b/profiles/default/linux/mips/13.0/mipsel/n64/desktop/deprecated
deleted file mode 100644
index 208814e1fb1e..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/n64
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/desktop/eapi b/profiles/default/linux/mips/13.0/mipsel/n64/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/desktop/parent b/profiles/default/linux/mips/13.0/mipsel/n64/desktop/parent
deleted file mode 100644
index fae96e8d36b2..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/developer/deprecated b/profiles/default/linux/mips/13.0/mipsel/n64/developer/deprecated
deleted file mode 100644
index 208814e1fb1e..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/n64
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/developer/eapi b/profiles/default/linux/mips/13.0/mipsel/n64/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/developer/parent b/profiles/default/linux/mips/13.0/mipsel/n64/developer/parent
deleted file mode 100644
index 4bb06e409236..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/eapi b/profiles/default/linux/mips/13.0/mipsel/n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/parent b/profiles/default/linux/mips/13.0/mipsel/n64/parent
deleted file mode 100644
index ef8c3e992d72..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/deprecated b/profiles/default/linux/mips/13.0/mipsel/o32/deprecated
deleted file mode 100644
index 0b4da443b64e..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/o32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/mipsel/o32
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/desktop/deprecated b/profiles/default/linux/mips/13.0/mipsel/o32/desktop/deprecated
deleted file mode 100644
index 3d6ab01f22f4..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/o32/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/o32
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/desktop/eapi b/profiles/default/linux/mips/13.0/mipsel/o32/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/o32/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/desktop/parent b/profiles/default/linux/mips/13.0/mipsel/o32/desktop/parent
deleted file mode 100644
index fae96e8d36b2..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/o32/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/developer/deprecated b/profiles/default/linux/mips/13.0/mipsel/o32/developer/deprecated
deleted file mode 100644
index 3d6ab01f22f4..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/o32/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/mipsel/o32
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/developer/eapi b/profiles/default/linux/mips/13.0/mipsel/o32/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/o32/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/developer/parent b/profiles/default/linux/mips/13.0/mipsel/o32/developer/parent
deleted file mode 100644
index 4bb06e409236..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/o32/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/eapi b/profiles/default/linux/mips/13.0/mipsel/o32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/parent b/profiles/default/linux/mips/13.0/mipsel/o32/parent
deleted file mode 100644
index f4b62c6e996d..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/default/linux/mips/13.0/mipsel/parent b/profiles/default/linux/mips/13.0/mipsel/parent
deleted file mode 100644
index 4d84ba7b9c08..000000000000
--- a/profiles/default/linux/mips/13.0/mipsel/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mipsel
diff --git a/profiles/default/linux/mips/13.0/multilib/deprecated b/profiles/default/linux/mips/13.0/multilib/deprecated
deleted file mode 100644
index 57b2c0bfe986..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/multilib/n32
diff --git a/profiles/default/linux/mips/13.0/multilib/eapi b/profiles/default/linux/mips/13.0/multilib/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/multilib/n32/deprecated b/profiles/default/linux/mips/13.0/multilib/n32/deprecated
deleted file mode 100644
index ca9e0e35c430..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/multilib/n32
diff --git a/profiles/default/linux/mips/13.0/multilib/n32/eapi b/profiles/default/linux/mips/13.0/multilib/n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/multilib/n32/parent b/profiles/default/linux/mips/13.0/multilib/n32/parent
deleted file mode 100644
index c48bd8858ef8..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../arch/mips/mips64/multilib/n32
diff --git a/profiles/default/linux/mips/13.0/multilib/n64/deprecated b/profiles/default/linux/mips/13.0/multilib/n64/deprecated
deleted file mode 100644
index 0e3d02e8bad7..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/multilib/n64
diff --git a/profiles/default/linux/mips/13.0/multilib/n64/eapi b/profiles/default/linux/mips/13.0/multilib/n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/multilib/n64/parent b/profiles/default/linux/mips/13.0/multilib/n64/parent
deleted file mode 100644
index c77705fe7e43..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../arch/mips/mips64/multilib/n64
diff --git a/profiles/default/linux/mips/13.0/multilib/o32/deprecated b/profiles/default/linux/mips/13.0/multilib/o32/deprecated
deleted file mode 100644
index d71e4e59c9ff..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/o32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/multilib/o32
diff --git a/profiles/default/linux/mips/13.0/multilib/o32/eapi b/profiles/default/linux/mips/13.0/multilib/o32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/multilib/o32/parent b/profiles/default/linux/mips/13.0/multilib/o32/parent
deleted file mode 100644
index 19367dfc91e9..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../..
-../../../../../../arch/mips/mips64/multilib/o32
diff --git a/profiles/default/linux/mips/13.0/multilib/parent b/profiles/default/linux/mips/13.0/multilib/parent
deleted file mode 100644
index 107ec55840f4..000000000000
--- a/profiles/default/linux/mips/13.0/multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mips64/multilib
diff --git a/profiles/default/linux/mips/13.0/n32/deprecated b/profiles/default/linux/mips/13.0/n32/deprecated
deleted file mode 100644
index 3f9f288b09a9..000000000000
--- a/profiles/default/linux/mips/13.0/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/n32
diff --git a/profiles/default/linux/mips/13.0/n32/desktop/deprecated b/profiles/default/linux/mips/13.0/n32/desktop/deprecated
deleted file mode 100644
index f2e17521662e..000000000000
--- a/profiles/default/linux/mips/13.0/n32/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/n32
diff --git a/profiles/default/linux/mips/13.0/n32/desktop/eapi b/profiles/default/linux/mips/13.0/n32/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/n32/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/n32/desktop/parent b/profiles/default/linux/mips/13.0/n32/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/mips/13.0/n32/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/n32/developer/deprecated b/profiles/default/linux/mips/13.0/n32/developer/deprecated
deleted file mode 100644
index f2e17521662e..000000000000
--- a/profiles/default/linux/mips/13.0/n32/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/n32
diff --git a/profiles/default/linux/mips/13.0/n32/developer/eapi b/profiles/default/linux/mips/13.0/n32/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/n32/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/n32/developer/parent b/profiles/default/linux/mips/13.0/n32/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/mips/13.0/n32/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/n32/eapi b/profiles/default/linux/mips/13.0/n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/n32/parent b/profiles/default/linux/mips/13.0/n32/parent
deleted file mode 100644
index ae0dc9302892..000000000000
--- a/profiles/default/linux/mips/13.0/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mips64/n32
diff --git a/profiles/default/linux/mips/13.0/n64/deprecated b/profiles/default/linux/mips/13.0/n64/deprecated
deleted file mode 100644
index 22fdb33af1a3..000000000000
--- a/profiles/default/linux/mips/13.0/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/n64
diff --git a/profiles/default/linux/mips/13.0/n64/desktop/deprecated b/profiles/default/linux/mips/13.0/n64/desktop/deprecated
deleted file mode 100644
index cc12a878cf62..000000000000
--- a/profiles/default/linux/mips/13.0/n64/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/n64
diff --git a/profiles/default/linux/mips/13.0/n64/desktop/eapi b/profiles/default/linux/mips/13.0/n64/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/n64/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/n64/desktop/parent b/profiles/default/linux/mips/13.0/n64/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/mips/13.0/n64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/n64/developer/deprecated b/profiles/default/linux/mips/13.0/n64/developer/deprecated
deleted file mode 100644
index cc12a878cf62..000000000000
--- a/profiles/default/linux/mips/13.0/n64/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/n64
diff --git a/profiles/default/linux/mips/13.0/n64/developer/eapi b/profiles/default/linux/mips/13.0/n64/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/n64/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/n64/developer/parent b/profiles/default/linux/mips/13.0/n64/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/mips/13.0/n64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/n64/eapi b/profiles/default/linux/mips/13.0/n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/n64/parent b/profiles/default/linux/mips/13.0/n64/parent
deleted file mode 100644
index 801102774c66..000000000000
--- a/profiles/default/linux/mips/13.0/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/mips64/n64
diff --git a/profiles/default/linux/mips/13.0/o32/deprecated b/profiles/default/linux/mips/13.0/o32/deprecated
deleted file mode 100644
index 98ce3606a057..000000000000
--- a/profiles/default/linux/mips/13.0/o32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/o32
diff --git a/profiles/default/linux/mips/13.0/o32/desktop/deprecated b/profiles/default/linux/mips/13.0/o32/desktop/deprecated
deleted file mode 100644
index 57eb958dce7b..000000000000
--- a/profiles/default/linux/mips/13.0/o32/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/o32
diff --git a/profiles/default/linux/mips/13.0/o32/desktop/eapi b/profiles/default/linux/mips/13.0/o32/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/o32/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/o32/desktop/parent b/profiles/default/linux/mips/13.0/o32/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/mips/13.0/o32/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/mips/13.0/o32/developer/deprecated b/profiles/default/linux/mips/13.0/o32/developer/deprecated
deleted file mode 100644
index 57eb958dce7b..000000000000
--- a/profiles/default/linux/mips/13.0/o32/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/13.0/o32
diff --git a/profiles/default/linux/mips/13.0/o32/developer/eapi b/profiles/default/linux/mips/13.0/o32/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/o32/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/o32/developer/parent b/profiles/default/linux/mips/13.0/o32/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/mips/13.0/o32/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/mips/13.0/o32/eapi b/profiles/default/linux/mips/13.0/o32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/13.0/o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/13.0/o32/parent b/profiles/default/linux/mips/13.0/o32/parent
deleted file mode 100644
index 347406129648..000000000000
--- a/profiles/default/linux/mips/13.0/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/mips/o32
diff --git a/profiles/default/linux/mips/13.0/parent b/profiles/default/linux/mips/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/mips/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/musl/amd64/deprecated b/profiles/default/linux/musl/amd64/deprecated
deleted file mode 100644
index 4c737f95b902..000000000000
--- a/profiles/default/linux/musl/amd64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/musl
diff --git a/profiles/default/linux/musl/amd64/eapi b/profiles/default/linux/musl/amd64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/musl/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/musl/amd64/make.defaults b/profiles/default/linux/musl/amd64/make.defaults
deleted file mode 100644
index 496becbfe820..000000000000
--- a/profiles/default/linux/musl/amd64/make.defaults
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="x86_64-gentoo-linux-musl"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
-# Multilib-related setup, bug #515130
-ABI="amd64"
-DEFAULT_ABI="amd64"
-MULTILIB_ABIS="amd64"
-CHOST_amd64="${CHOST}"
-LIBDIR_amd64="lib"
-IUSE_IMPLICIT="abi_x86_64"
-
-# Anthony G. Basile <blueness@gentoo.org> (31 Aug 2015)
-# Relect these flags from arch/amd64 which we don't inherit
-CPU_FLAGS_X86="mmx mmxext sse sse2"
-
-# Anthony G. Basile <blueness@gentoo.org> (26 Jan 2013)
-# Unhide the CPU_FLAGS_X86 USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
diff --git a/profiles/default/linux/musl/amd64/package.mask b/profiles/default/linux/musl/amd64/package.mask
deleted file mode 100644
index e6bfd5387f92..000000000000
--- a/profiles/default/linux/musl/amd64/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Ulrich Müller <ulm@gentoo.org> (18 Mar 2013)
-# Packages that rely on multilib
-app-editors/emacs:18
-net-misc/icaclient
diff --git a/profiles/default/linux/musl/amd64/package.use.force b/profiles/default/linux/musl/amd64/package.use.force
deleted file mode 100644
index 553802649559..000000000000
--- a/profiles/default/linux/musl/amd64/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-dev-ml/llvm-ocaml llvm_targets_X86
-sys-devel/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
diff --git a/profiles/default/linux/musl/amd64/package.use.mask b/profiles/default/linux/musl/amd64/package.use.mask
deleted file mode 100644
index 49830f81047d..000000000000
--- a/profiles/default/linux/musl/amd64/package.use.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/default/linux/musl/amd64/use.force b/profiles/default/linux/musl/amd64/use.force
deleted file mode 100644
index 181cb39654fc..000000000000
--- a/profiles/default/linux/musl/amd64/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
-amd64
-abi_x86_64
diff --git a/profiles/default/linux/musl/amd64/use.mask b/profiles/default/linux/musl/amd64/use.mask
deleted file mode 100644
index cc3b7ca5f0e3..000000000000
--- a/profiles/default/linux/musl/amd64/use.mask
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
--amd64
--abi_x86_64
-
-# unmask all SIMD assembler flags
--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
-
-# Lilo works on amd64
--lilo
-
-# These work
--input_devices_synaptics
--input_devices_wacom
--video_cards_qxl
diff --git a/profiles/default/linux/musl/amd64/x32/deprecated b/profiles/default/linux/musl/amd64/x32/deprecated
deleted file mode 100644
index 5cbfaf5838b0..000000000000
--- a/profiles/default/linux/musl/amd64/x32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-# no successor
diff --git a/profiles/default/linux/musl/amd64/x32/eapi b/profiles/default/linux/musl/amd64/x32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/musl/amd64/x32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/musl/amd64/x32/make.defaults b/profiles/default/linux/musl/amd64/x32/make.defaults
deleted file mode 100644
index 88509a6717c0..000000000000
--- a/profiles/default/linux/musl/amd64/x32/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="x86_64-gentoo-linux-muslx32"
-
-# Anthony G. Basile <blueness@gentoo.org> (31 Aug 2015)
-# Multilib-related setup, bug #515130
-ABI="x32"
-DEFAULT_ABI="x32"
-MULTILIB_ABIS="x32"
-CHOST_x32="${CHOST}"
-LIBDIR_x32="lib"
-IUSE_IMPLICIT="abi_x86_x32"
diff --git a/profiles/default/linux/musl/amd64/x32/parent b/profiles/default/linux/musl/amd64/x32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/musl/amd64/x32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/musl/amd64/x32/use.force b/profiles/default/linux/musl/amd64/x32/use.force
deleted file mode 100644
index a837531f8a4a..000000000000
--- a/profiles/default/linux/musl/amd64/x32/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
--abi_x86_64
-abi_x86_x32
diff --git a/profiles/default/linux/musl/amd64/x32/use.mask b/profiles/default/linux/musl/amd64/x32/use.mask
deleted file mode 100644
index fb16cbe71565..000000000000
--- a/profiles/default/linux/musl/amd64/x32/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
--abi_x86_x32
-abi_x86_64
diff --git a/profiles/default/linux/musl/arm/armv7a/deprecated b/profiles/default/linux/musl/arm/armv7a/deprecated
deleted file mode 100644
index 2300c15ba6cc..000000000000
--- a/profiles/default/linux/musl/arm/armv7a/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/musl/armv7a
diff --git a/profiles/default/linux/musl/arm/armv7a/eapi b/profiles/default/linux/musl/arm/armv7a/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/musl/arm/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/musl/arm/armv7a/make.defaults b/profiles/default/linux/musl/arm/armv7a/make.defaults
deleted file mode 100644
index 9310aa7711dd..000000000000
--- a/profiles/default/linux/musl/arm/armv7a/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/musl/arm/armv7a/package.mask b/profiles/default/linux/musl/arm/armv7a/package.mask
deleted file mode 100644
index 6a132627c621..000000000000
--- a/profiles/default/linux/musl/arm/armv7a/package.mask
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
-# Clang does not work correctly with the old *-hardfloat-* triplets.
-# Please switch to 17.0 profiles that use *eabihf triplets instead.
-# https://bugs.gentoo.org/595834
-dev-python/clang-python
-dev-util/lldb
-sys-devel/clang
-sys-devel/clang-common
-sys-devel/clang-runtime
-sys-libs/compiler-rt
-sys-libs/compiler-rt-sanitizers
-sys-libs/libcxx
-sys-libs/libcxxabi
-sys-libs/libomp
-sys-libs/llvm-libunwind
diff --git a/profiles/default/linux/musl/arm/armv7a/parent b/profiles/default/linux/musl/arm/armv7a/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/musl/arm/armv7a/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/musl/arm/eapi b/profiles/default/linux/musl/arm/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/musl/arm/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/musl/arm/make.defaults b/profiles/default/linux/musl/arm/make.defaults
deleted file mode 100644
index a56035197c43..000000000000
--- a/profiles/default/linux/musl/arm/make.defaults
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="arm"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="arm-unknown-linux-musleabi"
-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
-ABI="arm"
-DEFAULT_ABI="arm"
-MULTILIB_ABIS="arm"
-CHOST_arm="${CHOST}"
-LIBDIR_arm="lib"
-
-# Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
-# Unhide the ARM-specific USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/default/linux/musl/arm/package.use.force b/profiles/default/linux/musl/arm/package.use.force
deleted file mode 100644
index da0371bfbf6e..000000000000
--- a/profiles/default/linux/musl/arm/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-dev-ml/llvm-ocaml llvm_targets_ARM
-sys-devel/clang llvm_targets_ARM
-sys-devel/llvm llvm_targets_ARM
diff --git a/profiles/default/linux/musl/arm/parent b/profiles/default/linux/musl/arm/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/musl/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/musl/arm/use.force b/profiles/default/linux/musl/arm/use.force
deleted file mode 100644
index 11e95dae7631..000000000000
--- a/profiles/default/linux/musl/arm/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to ARCH.
-arm
diff --git a/profiles/default/linux/musl/arm/use.mask b/profiles/default/linux/musl/arm/use.mask
deleted file mode 100644
index 8dffd62b8e39..000000000000
--- a/profiles/default/linux/musl/arm/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to ARCH.
--arm
diff --git a/profiles/default/linux/musl/arm64/deprecated b/profiles/default/linux/musl/arm64/deprecated
deleted file mode 100644
index fd62fe78077a..000000000000
--- a/profiles/default/linux/musl/arm64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm64/17.0/musl
diff --git a/profiles/default/linux/musl/arm64/eapi b/profiles/default/linux/musl/arm64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/musl/arm64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/musl/arm64/make.defaults b/profiles/default/linux/musl/arm64/make.defaults
deleted file mode 100644
index d9ba618fa184..000000000000
--- a/profiles/default/linux/musl/arm64/make.defaults
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="arm64"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="aarch64-gentoo-linux-musl"
-CFLAGS="-O2"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
-# Multilib-related setup, bug #515130
-ABI="arm64"
-DEFAULT_ABI="arm64"
-MULTILIB_ABIS="arm64"
-CHOST_arm64="${CHOST}"
-LIBDIR_arm64="lib"
-
-# Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
-# Unhide the ARM-specific USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/default/linux/musl/arm64/package.use.force b/profiles/default/linux/musl/arm64/package.use.force
deleted file mode 100644
index 476eb96b7ec4..000000000000
--- a/profiles/default/linux/musl/arm64/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-dev-ml/llvm-ocaml llvm_targets_AArch64
-sys-devel/clang llvm_targets_AArch64
-sys-devel/llvm llvm_targets_AArch64
diff --git a/profiles/default/linux/musl/arm64/parent b/profiles/default/linux/musl/arm64/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/musl/arm64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/musl/arm64/use.force b/profiles/default/linux/musl/arm64/use.force
deleted file mode 100644
index 1fa2eca30677..000000000000
--- a/profiles/default/linux/musl/arm64/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to ARCH.
-arm64
diff --git a/profiles/default/linux/musl/arm64/use.mask b/profiles/default/linux/musl/arm64/use.mask
deleted file mode 100644
index 04a2bed3cacf..000000000000
--- a/profiles/default/linux/musl/arm64/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to ARCH.
--arm64
diff --git a/profiles/default/linux/musl/ppc/deprecated b/profiles/default/linux/musl/ppc/deprecated
deleted file mode 100644
index 47463d6e50fa..000000000000
--- a/profiles/default/linux/musl/ppc/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/17.0/musl
diff --git a/profiles/default/linux/musl/ppc/eapi b/profiles/default/linux/musl/ppc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/musl/ppc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/musl/ppc/make.defaults b/profiles/default/linux/musl/ppc/make.defaults
deleted file mode 100644
index 2022413f04a2..000000000000
--- a/profiles/default/linux/musl/ppc/make.defaults
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="powerpc-gentoo-linux-musl"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-ABI="ppc"
-DEFAULT_ABI="ppc"
-MULTILIB_ABIS="ppc"
-CHOST_ppc="${CHOST}"
-LIBDIR_ppc="lib"
-IUSE_IMPLICIT="abi_ppc_32"
diff --git a/profiles/default/linux/musl/ppc/package.mask b/profiles/default/linux/musl/ppc/package.mask
deleted file mode 100644
index 56345622fa74..000000000000
--- a/profiles/default/linux/musl/ppc/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# gcc-4.8 still doesn't work on ppc musl
->sys-devel/gcc-4.8
diff --git a/profiles/default/linux/musl/ppc/package.use.force b/profiles/default/linux/musl/ppc/package.use.force
deleted file mode 100644
index fc297563763a..000000000000
--- a/profiles/default/linux/musl/ppc/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-dev-ml/llvm-ocaml llvm_targets_PowerPC
-sys-devel/clang llvm_targets_PowerPC
-sys-devel/llvm llvm_targets_PowerPC
diff --git a/profiles/default/linux/musl/ppc/package.use.stable.mask b/profiles/default/linux/musl/ppc/package.use.stable.mask
deleted file mode 100644
index e4a2e9f61138..000000000000
--- a/profiles/default/linux/musl/ppc/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
-# dev-qt/qtwebkit:5 not stable.
-dev-qt/designer webkit
diff --git a/profiles/default/linux/musl/ppc/parent b/profiles/default/linux/musl/ppc/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/musl/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/musl/ppc/use.force b/profiles/default/linux/musl/ppc/use.force
deleted file mode 100644
index f4c29429b272..000000000000
--- a/profiles/default/linux/musl/ppc/use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to ARCH.
-ppc
-
-# Force the flag corresponding to the only ABI.
-abi_ppc_32
diff --git a/profiles/default/linux/musl/ppc/use.mask b/profiles/default/linux/musl/ppc/use.mask
deleted file mode 100644
index e1f5512c8bb0..000000000000
--- a/profiles/default/linux/musl/ppc/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# Unmask the flag which corresponds to ARCH.
--ppc
-
-# Unmask the flag corresponding to the only ABI.
--abi_ppc_32
diff --git a/profiles/default/linux/musl/x86/depcrecated b/profiles/default/linux/musl/x86/depcrecated
deleted file mode 100644
index de584d75234d..000000000000
--- a/profiles/default/linux/musl/x86/depcrecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/musl
diff --git a/profiles/default/linux/musl/x86/eapi b/profiles/default/linux/musl/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/musl/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/musl/x86/make.defaults b/profiles/default/linux/musl/x86/make.defaults
deleted file mode 100644
index 73fedb030e1d..000000000000
--- a/profiles/default/linux/musl/x86/make.defaults
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="i686-gentoo-linux-musl"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
-# Multilib-related setup, bug #515130
-ABI="x86"
-DEFAULT_ABI="x86"
-MULTILIB_ABIS="x86"
-CHOST_x86="${CHOST}"
-LIBDIR_x86="lib"
-IUSE_IMPLICIT="abi_x86_32"
-
-# Anthony G. Basile <blueness@gentoo.org> (26 Jan 2013)
-# Unhide the CPU_FLAGS_X86 USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
diff --git a/profiles/default/linux/musl/x86/package.use.force b/profiles/default/linux/musl/x86/package.use.force
deleted file mode 100644
index 553802649559..000000000000
--- a/profiles/default/linux/musl/x86/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-dev-ml/llvm-ocaml llvm_targets_X86
-sys-devel/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
diff --git a/profiles/default/linux/musl/x86/parent b/profiles/default/linux/musl/x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/musl/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/musl/x86/use.force b/profiles/default/linux/musl/x86/use.force
deleted file mode 100644
index eb8c5dfc7f70..000000000000
--- a/profiles/default/linux/musl/x86/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
-x86
-abi_x86_32
diff --git a/profiles/default/linux/musl/x86/use.mask b/profiles/default/linux/musl/x86/use.mask
deleted file mode 100644
index 61e5564be9fc..000000000000
--- a/profiles/default/linux/musl/x86/use.mask
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
--x86
--abi_x86_32
-
-# ssp is broken on x86 musl.  This is critical for gcc-6.
-ssp
-
-# unmask all SIMD assembler flags
--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
-
-# Masked on all profiles but x86, bug #458354
--video_cards_geode
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/deprecated b/profiles/default/linux/powerpc/ppc32/13.0/deprecated
deleted file mode 100644
index 929365451947..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/17.0
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/deprecated b/profiles/default/linux/powerpc/ppc32/13.0/desktop/deprecated
deleted file mode 100644
index e2da581811c3..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/17.0/desktop
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/eapi b/profiles/default/linux/powerpc/ppc32/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/deprecated b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/deprecated
deleted file mode 100644
index a23caf119aa0..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/17.0/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/parent
deleted file mode 100644
index 9e06c4505a75..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/deprecated
deleted file mode 100644
index 2cae831340aa..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/eapi b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index 2122741fb81c..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/parent b/profiles/default/linux/powerpc/ppc32/13.0/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/developer/deprecated b/profiles/default/linux/powerpc/ppc32/13.0/developer/deprecated
deleted file mode 100644
index 7842a4833c63..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/17.0/developer
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/developer/eapi b/profiles/default/linux/powerpc/ppc32/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/developer/parent b/profiles/default/linux/powerpc/ppc32/13.0/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/eapi b/profiles/default/linux/powerpc/ppc32/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/package.use.stable.mask b/profiles/default/linux/powerpc/ppc32/13.0/package.use.stable.mask
deleted file mode 100644
index 75a4ccc88c9a..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/package.use.stable.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/parent b/profiles/default/linux/powerpc/ppc32/13.0/parent
deleted file mode 100644
index 697ad587088f..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/13.0
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use
new file mode 100644
index 000000000000..c5b2c94bf034
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use
@@ -0,0 +1,3 @@
+# Anthony G. Basile <blueness@gentoo.org> (14 Jun 2019)
+# This is needed for default stage3
+sys-libs/gdbm berkdb
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use.mask b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use.mask
new file mode 100644
index 000000000000..19760ecc41d1
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use.mask
@@ -0,0 +1,7 @@
+# Anthony G. Basile <blueness@gentoo.org> (12 Jun 2019)
+# Unfortunately pie has broken on ppc uclibc for years
+sys-devel/gcc pie
+
+# Anthony G. Basile <blueness@gentoo.org> (14 Jun 2019)
+# pie is also broken on openssh uclibc
+net-misc/openssh pie
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/deprecated
deleted file mode 100644
index af483b2343a8..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/32bit-userland
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/deprecated
deleted file mode 100644
index 8cb866130cf7..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/32bit-userland/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/eapi b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/deprecated
deleted file mode 100644
index 68ce162f784c..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/parent
deleted file mode 100644
index d5a56a13f692..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/deprecated
deleted file mode 100644
index bb04ad2f40fa..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/eapi b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
deleted file mode 100644
index 288aeccdce82..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/parent
deleted file mode 100644
index fae96e8d36b2..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/deprecated
deleted file mode 100644
index ec904edfe3df..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/32bit-userland/developer
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/eapi b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/parent
deleted file mode 100644
index 4bb06e409236..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/eapi b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/parent b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/parent
deleted file mode 100644
index 898d55cbcebd..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/powerpc/ppc64/32ul
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/deprecated
deleted file mode 100644
index 828f4a3d5bf5..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/64bit-userland
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/deprecated
deleted file mode 100644
index 9b4007edf6b7..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/64bit-userland/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/eapi b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/deprecated
deleted file mode 100644
index e918e93ae215..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/parent
deleted file mode 100644
index d5a56a13f692..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/deprecated
deleted file mode 100644
index d9d3432e7ac3..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/eapi b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
deleted file mode 100644
index 288aeccdce82..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/parent
deleted file mode 100644
index fae96e8d36b2..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/deprecated
deleted file mode 100644
index aa83bfd819ad..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/64bit-userland/developer
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/eapi b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/parent
deleted file mode 100644
index 4bb06e409236..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/eapi b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/deprecated
deleted file mode 100644
index 8d2913c222f8..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/make.defaults b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/make.defaults
deleted file mode 100644
index a4712d66ffa0..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Keep this in the 13.0 version profile.  Drop in next upgrade.
-SYMLINK_LIB="no"
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/parent
deleted file mode 100644
index 64683a942ea2..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../arch/powerpc/ppc64/64le
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/systemd/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/systemd/deprecated
deleted file mode 100644
index f6427ca9cb26..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/systemd/parent
deleted file mode 100644
index f7739b405877..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/make.defaults b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/make.defaults
deleted file mode 100644
index ce149bcd4e65..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Keep this in the 13.0 version profile.  Drop in next upgrade.
-SYMLINK_LIB="yes"
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/parent b/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/parent
deleted file mode 100644
index 0e4ae1732886..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/64bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/powerpc/ppc64/64ul
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/eapi b/profiles/default/linux/powerpc/ppc64/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/package.use.stable.mask b/profiles/default/linux/powerpc/ppc64/13.0/package.use.stable.mask
deleted file mode 100644
index 5db2201ccef7..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/package.use.stable.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/parent b/profiles/default/linux/powerpc/ppc64/13.0/parent
deleted file mode 100644
index 697ad587088f..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/13.0
diff --git a/profiles/default/linux/s390/13.0/deprecated b/profiles/default/linux/s390/13.0/deprecated
deleted file mode 100644
index baf48dfd301b..000000000000
--- a/profiles/default/linux/s390/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/s390/17.0
diff --git a/profiles/default/linux/s390/13.0/eapi b/profiles/default/linux/s390/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/s390/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/s390/13.0/parent b/profiles/default/linux/s390/13.0/parent
deleted file mode 100644
index 99a816a82e3d..000000000000
--- a/profiles/default/linux/s390/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../releases/13.0
-..
diff --git a/profiles/default/linux/s390/13.0/s390x/deprecated b/profiles/default/linux/s390/13.0/s390x/deprecated
deleted file mode 100644
index e7aff27cef21..000000000000
--- a/profiles/default/linux/s390/13.0/s390x/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/s390/17.0/s390x
diff --git a/profiles/default/linux/s390/13.0/s390x/eapi b/profiles/default/linux/s390/13.0/s390x/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/s390/13.0/s390x/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/s390/13.0/s390x/parent b/profiles/default/linux/s390/13.0/s390x/parent
deleted file mode 100644
index 9e170a6edfdf..000000000000
--- a/profiles/default/linux/s390/13.0/s390x/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../arch/s390/s390x
diff --git a/profiles/default/linux/sh/13.0/deprecated b/profiles/default/linux/sh/13.0/deprecated
deleted file mode 100644
index d3f97aaef8ce..000000000000
--- a/profiles/default/linux/sh/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sh/17.0
diff --git a/profiles/default/linux/sh/13.0/desktop/deprecated b/profiles/default/linux/sh/13.0/desktop/deprecated
deleted file mode 100644
index d3f97aaef8ce..000000000000
--- a/profiles/default/linux/sh/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sh/17.0
diff --git a/profiles/default/linux/sh/13.0/desktop/eapi b/profiles/default/linux/sh/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sh/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sh/13.0/desktop/gnome/deprecated b/profiles/default/linux/sh/13.0/desktop/gnome/deprecated
deleted file mode 100644
index d3f97aaef8ce..000000000000
--- a/profiles/default/linux/sh/13.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sh/17.0
diff --git a/profiles/default/linux/sh/13.0/desktop/gnome/eapi b/profiles/default/linux/sh/13.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sh/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sh/13.0/desktop/gnome/parent b/profiles/default/linux/sh/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e01478..000000000000
--- a/profiles/default/linux/sh/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/sh/13.0/desktop/parent b/profiles/default/linux/sh/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/sh/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/sh/13.0/developer/deprecated b/profiles/default/linux/sh/13.0/developer/deprecated
deleted file mode 100644
index d3f97aaef8ce..000000000000
--- a/profiles/default/linux/sh/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sh/17.0
diff --git a/profiles/default/linux/sh/13.0/developer/eapi b/profiles/default/linux/sh/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sh/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sh/13.0/developer/parent b/profiles/default/linux/sh/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/sh/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/sh/13.0/eapi b/profiles/default/linux/sh/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sh/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sh/13.0/parent b/profiles/default/linux/sh/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/sh/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/sparc/13.0/deprecated b/profiles/default/linux/sparc/13.0/deprecated
deleted file mode 100644
index 8b5335341bb3..000000000000
--- a/profiles/default/linux/sparc/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/17.0
diff --git a/profiles/default/linux/sparc/13.0/desktop/deprecated b/profiles/default/linux/sparc/13.0/desktop/deprecated
deleted file mode 100644
index 58447181ca1c..000000000000
--- a/profiles/default/linux/sparc/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/17.0/desktop
diff --git a/profiles/default/linux/sparc/13.0/desktop/eapi b/profiles/default/linux/sparc/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sparc/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/deprecated b/profiles/default/linux/sparc/13.0/desktop/gnome/deprecated
deleted file mode 100644
index af47a3bf08fb..000000000000
--- a/profiles/default/linux/sparc/13.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/17.0/desktop/gnome
diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/eapi b/profiles/default/linux/sparc/13.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sparc/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/parent b/profiles/default/linux/sparc/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e01478..000000000000
--- a/profiles/default/linux/sparc/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/deprecated
deleted file mode 100644
index 2e26196d6e2b..000000000000
--- a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/17.0/desktop/gnome/systemd
diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/eapi b/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f5c1ae438de4..000000000000
--- a/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/sparc/13.0/desktop/parent b/profiles/default/linux/sparc/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/sparc/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/sparc/13.0/developer/deprecated b/profiles/default/linux/sparc/13.0/developer/deprecated
deleted file mode 100644
index 5e615ec123ac..000000000000
--- a/profiles/default/linux/sparc/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/sparc/17.0/developer
diff --git a/profiles/default/linux/sparc/13.0/developer/eapi b/profiles/default/linux/sparc/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sparc/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sparc/13.0/developer/parent b/profiles/default/linux/sparc/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/sparc/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/sparc/13.0/eapi b/profiles/default/linux/sparc/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sparc/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sparc/13.0/make.defaults b/profiles/default/linux/sparc/13.0/make.defaults
deleted file mode 100644
index 15095e86283a..000000000000
--- a/profiles/default/linux/sparc/13.0/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# LIBDIR_* moved from features/multilib, #609178.
-# TODO: figure out whether this can be moved to arch/sparc
-LIBDIR_sparc32="lib"
-LIBDIR_sparc64="lib64"
diff --git a/profiles/default/linux/sparc/13.0/package.use.mask b/profiles/default/linux/sparc/13.0/package.use.mask
deleted file mode 100644
index 865559c72173..000000000000
--- a/profiles/default/linux/sparc/13.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
-#
-# Mask the vde flag on tinc because net-misc/vde is not
-# keyworded for sparc
-net-vpn/tinc vde
diff --git a/profiles/default/linux/sparc/13.0/packages b/profiles/default/linux/sparc/13.0/packages
deleted file mode 100644
index 762eba92e459..000000000000
--- a/profiles/default/linux/sparc/13.0/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# 2008.0 sparc profile
-
-# Remove kgcc64 since >=gcc-4.4 is able to compile 64bit kernels
--*sys-devel/kgcc64
diff --git a/profiles/default/linux/sparc/13.0/parent b/profiles/default/linux/sparc/13.0/parent
deleted file mode 100644
index 483b02751681..000000000000
--- a/profiles/default/linux/sparc/13.0/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../releases/13.0
-../../../../features/multilib
diff --git a/profiles/default/linux/sparc/13.0/use.mask b/profiles/default/linux/sparc/13.0/use.mask
deleted file mode 100644
index 2fed294c1832..000000000000
--- a/profiles/default/linux/sparc/13.0/use.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# this is not a multilib profile
-multilib
-
-# Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
-# Pulls in net-libs/axtls which is not keyworded for arch
-curl_ssl_axtls
diff --git a/profiles/default/linux/sparc/13.0/use.stable.mask b/profiles/default/linux/sparc/13.0/use.stable.mask
deleted file mode 100644
index f54e7a1f560a..000000000000
--- a/profiles/default/linux/sparc/13.0/use.stable.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/default/linux/sparc/17.0/packages b/profiles/default/linux/sparc/17.0/packages
deleted file mode 100644
index 762eba92e459..000000000000
--- a/profiles/default/linux/sparc/17.0/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# 2008.0 sparc profile
-
-# Remove kgcc64 since >=gcc-4.4 is able to compile 64bit kernels
--*sys-devel/kgcc64
diff --git a/profiles/default/linux/sparc/17.0/use.mask b/profiles/default/linux/sparc/17.0/use.mask
index 2fed294c1832..a7e3f10090f9 100644
--- a/profiles/default/linux/sparc/17.0/use.mask
+++ b/profiles/default/linux/sparc/17.0/use.mask
@@ -1,9 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # this is not a multilib profile
 multilib
-
-# Anthony G. Basile <blueness@gentoo.org> (15 Apr 2012)
-# Pulls in net-libs/axtls which is not keyworded for arch
-curl_ssl_axtls
diff --git a/profiles/default/linux/sparc/17.0/use.stable.mask b/profiles/default/linux/sparc/17.0/use.stable.mask
index f54e7a1f560a..3fb80d37e93d 100644
--- a/profiles/default/linux/sparc/17.0/use.stable.mask
+++ b/profiles/default/linux/sparc/17.0/use.stable.mask
@@ -1,3 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ben Kohler <bkohler@gentoo.org> (11 Jun 2019)
+# Pulls in net-libs/axtls which is not stable for sparc
+curl_ssl_axtls
diff --git a/profiles/default/linux/uclibc/amd64/deprecated b/profiles/default/linux/uclibc/amd64/deprecated
deleted file mode 100644
index 8a945baef61f..000000000000
--- a/profiles/default/linux/uclibc/amd64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/uclibc
diff --git a/profiles/default/linux/uclibc/amd64/eapi b/profiles/default/linux/uclibc/amd64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/uclibc/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/uclibc/amd64/make.defaults b/profiles/default/linux/uclibc/amd64/make.defaults
deleted file mode 100644
index 8782b948bc46..000000000000
--- a/profiles/default/linux/uclibc/amd64/make.defaults
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="x86_64-gentoo-linux-uclibc"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
-# Multilib-related setup, bug #515130
-ABI="amd64"
-DEFAULT_ABI="amd64"
-MULTILIB_ABIS="amd64"
-CHOST_amd64="${CHOST}"
-LIBDIR_amd64="lib"
-IUSE_IMPLICIT="abi_x86_64"
-
-# Anthony G. Basile <blueness@gentoo.org> (31 Aug 2015)
-# Relect these flags from arch/amd64 which we don't inherit
-CPU_FLAGS_X86="mmx mmxext sse sse2"
-
-# Anthony G. Basile <blueness@gentoo.org> (26 Jan 2013)
-# Unhide the CPU_FLAGS_X86 USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
deleted file mode 100644
index dd84e65b1a8a..000000000000
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# AMD64 Team <amd64@gentoo.org>
-# Mask packages that rely on amd64 multilib
-app-accessibility/mbrola
-app-accessibility/perlbox-voice
-app-arch/stuffit
-app-benchmarks/cpuburn
-app-editors/emacs:18
-app-emulation/crossover-bin
-app-emulation/playonlinux
-app-emulation/q4wine
-app-emulation/virtualbox
-app-emulation/virtualbox-extpack-oracle
-app-emulation/virtualbox-guest-additions
->=app-i18n/atokx3-3.0.0
-app-office/ooextras
-app-emulation/winetricks
-dev-embedded/libftd2xx
-dev-embedded/openocd
-dev-util/android-sdk-update-manager
-dev-util/android-ndk
-dev-util/biew
-games-action/cs2d
-games-action/descent3
-games-action/descent3-demo
-games-action/heretic2
-games-action/heretic2-demo
-games-action/lugaru
-games-action/mutantstorm-demo
-games-action/phobiaii
-games-action/rune
-games-action/spacetripper-demo
-games-arcade/aquaria
-games-arcade/barbarian-bin
-games-arcade/jardinains
-games-arcade/gish-demo
-games-emulation/caps
-games-emulation/nestra
-games-emulation/zinc
-games-emulation/zsnes
-games-fps/avp
-games-fps/doom3-cdoom
-games-fps/doom3-chextrek
-games-fps/doom3-data
-games-fps/doom3-demo
-games-fps/doom3-ducttape
-games-fps/doom3-eventhorizon
-games-fps/doom3-hellcampaign
-games-fps/doom3-inhell
-games-fps/doom3-lms
-games-fps/doom3-mitm
-games-fps/doom3-roe
-games-fps/doom3
-games-fps/enemy-territory-etpro
-games-fps/enemy-territory-omnibot
-games-fps/enemy-territory-truecombat
-games-fps/enemy-territory
-games-fps/etqw-bin
-games-fps/etqw-data
-games-fps/etqw-demo
-games-fps/glxquake-bin
-games-fps/legends
-games-fps/postal2
-games-fps/quake3-bin
-games-fps/quake3-demo
-games-fps/quake3-ra3
-games-fps/quake4-bin
-games-fps/quake4-data
-games-fps/quake4-demo
-games-fps/rtcw
-games-fps/rtcwmp-demo
-games-fps/rtcwsp-demo
-games-fps/sauerbraten
-games-fps/serious-sam-tfe
-games-fps/serious-sam-tse
-games-fps/soldieroffortune
-games-fps/unreal-tournament
-games-fps/ut2003
-games-fps/ut2003-demo
-games-fps/ut2004-demo
-games-roguelike/adom
-games-rpg/eschalon-book-1-demo
-games-server/etqw-ded
-games-server/nwn-ded
-games-simulation/bcs-demo
-games-strategy/darwinia
-games-strategy/darwinia-demo
-games-strategy/defcon-demo
-games-strategy/dominions2
-games-strategy/heroes3
-games-strategy/majesty-demo
-games-strategy/smac
-games-strategy/spaz
-media-sound/ventrilo-server-bin
-media-video/binkplayer
-media-video/tsmuxer
-net-print/cndrvcups-common-lb
-net-print/cndrvcups-lb
-net-misc/icaclient
-net-misc/ps3mediaserver
-sci-biology/foldingathome
-sci-electronics/eagle
-sci-chemistry/cara-bin
-sci-chemistry/mars
-sys-libs/lib-compat-loki
diff --git a/profiles/default/linux/uclibc/amd64/package.use.force b/profiles/default/linux/uclibc/amd64/package.use.force
deleted file mode 100644
index 553802649559..000000000000
--- a/profiles/default/linux/uclibc/amd64/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-dev-ml/llvm-ocaml llvm_targets_X86
-sys-devel/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
diff --git a/profiles/default/linux/uclibc/amd64/parent b/profiles/default/linux/uclibc/amd64/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/uclibc/amd64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/uclibc/amd64/use.force b/profiles/default/linux/uclibc/amd64/use.force
deleted file mode 100644
index 181cb39654fc..000000000000
--- a/profiles/default/linux/uclibc/amd64/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
-amd64
-abi_x86_64
diff --git a/profiles/default/linux/uclibc/amd64/use.mask b/profiles/default/linux/uclibc/amd64/use.mask
deleted file mode 100644
index cc3b7ca5f0e3..000000000000
--- a/profiles/default/linux/uclibc/amd64/use.mask
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
--amd64
--abi_x86_64
-
-# unmask all SIMD assembler flags
--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
-
-# Lilo works on amd64
--lilo
-
-# These work
--input_devices_synaptics
--input_devices_wacom
--video_cards_qxl
diff --git a/profiles/default/linux/uclibc/arm/armv7a/eapi b/profiles/default/linux/uclibc/arm/armv7a/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/uclibc/arm/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/uclibc/arm/armv7a/make.defaults b/profiles/default/linux/uclibc/arm/armv7a/make.defaults
deleted file mode 100644
index 397875e9b6bb..000000000000
--- a/profiles/default/linux/uclibc/arm/armv7a/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/uclibc/arm/armv7a/package.mask b/profiles/default/linux/uclibc/arm/armv7a/package.mask
deleted file mode 100644
index 6a132627c621..000000000000
--- a/profiles/default/linux/uclibc/arm/armv7a/package.mask
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (18 Oct 2018)
-# Clang does not work correctly with the old *-hardfloat-* triplets.
-# Please switch to 17.0 profiles that use *eabihf triplets instead.
-# https://bugs.gentoo.org/595834
-dev-python/clang-python
-dev-util/lldb
-sys-devel/clang
-sys-devel/clang-common
-sys-devel/clang-runtime
-sys-libs/compiler-rt
-sys-libs/compiler-rt-sanitizers
-sys-libs/libcxx
-sys-libs/libcxxabi
-sys-libs/libomp
-sys-libs/llvm-libunwind
diff --git a/profiles/default/linux/uclibc/arm/armv7a/parent b/profiles/default/linux/uclibc/arm/armv7a/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/uclibc/arm/armv7a/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/uclibc/arm/eapi b/profiles/default/linux/uclibc/arm/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/uclibc/arm/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/uclibc/arm/make.defaults b/profiles/default/linux/uclibc/arm/make.defaults
deleted file mode 100644
index ae32c6cdd3ae..000000000000
--- a/profiles/default/linux/uclibc/arm/make.defaults
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="arm"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="arm-unknown-linux-uclibc"
-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
-ABI="arm"
-DEFAULT_ABI="arm"
-MULTILIB_ABIS="arm"
-CHOST_arm="${CHOST}"
-LIBDIR_arm="lib"
-
-# Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
-# Unhide the ARM-specific USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/default/linux/uclibc/arm/package.use.force b/profiles/default/linux/uclibc/arm/package.use.force
deleted file mode 100644
index da0371bfbf6e..000000000000
--- a/profiles/default/linux/uclibc/arm/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-dev-ml/llvm-ocaml llvm_targets_ARM
-sys-devel/clang llvm_targets_ARM
-sys-devel/llvm llvm_targets_ARM
diff --git a/profiles/default/linux/uclibc/arm/package.use.mask b/profiles/default/linux/uclibc/arm/package.use.mask
deleted file mode 100644
index 621faba08873..000000000000
--- a/profiles/default/linux/uclibc/arm/package.use.mask
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Thomas Deutschmann <whissi@gentoo.org> (28 Nov 2017)
-# Requires dev-libs/mongo-c-driver which isn't keyworded
->=app-admin/rsyslog-8.31 mongodb
-
-# Thomas Deutschmann <whissi@whissi.de> (19 Mar 2016), on behalf of
-# Ian Delaney <idella4@gentoo.org> (19 Mar 2016)
-# for the proxy-maintainers project
-# Unkeyworded deps, bug #564274
-app-metrics/collectd collectd_plugins_gmond
-app-metrics/collectd collectd_plugins_ipmi
-app-metrics/collectd collectd_plugins_modbus
-app-metrics/collectd collectd_plugins_oracle
-app-metrics/collectd collectd_plugins_routeros
-app-metrics/collectd collectd_plugins_sigrok
-app-metrics/collectd collectd_plugins_tokyotyrant
-app-metrics/collectd collectd_plugins_varnish
-app-metrics/collectd collectd_plugins_virt
-
-# Matthias Maier <tamiko@gentoo.org> (16 Aug 2015)
-# missing keywords
-net-misc/spice-gtk smartcard
-
-# Matthias Maier <tamiko@gentoo.org> (17 Oct 2014)
-# virtual/jre is not keyworded on arm.
-net-print/cups java
diff --git a/profiles/default/linux/uclibc/arm/parent b/profiles/default/linux/uclibc/arm/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/uclibc/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/uclibc/arm/use.force b/profiles/default/linux/uclibc/arm/use.force
deleted file mode 100644
index 11e95dae7631..000000000000
--- a/profiles/default/linux/uclibc/arm/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to ARCH.
-arm
diff --git a/profiles/default/linux/uclibc/arm/use.mask b/profiles/default/linux/uclibc/arm/use.mask
deleted file mode 100644
index 8dffd62b8e39..000000000000
--- a/profiles/default/linux/uclibc/arm/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to ARCH.
--arm
diff --git a/profiles/default/linux/uclibc/ppc/eapi b/profiles/default/linux/uclibc/ppc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/uclibc/ppc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/uclibc/ppc/make.defaults b/profiles/default/linux/uclibc/ppc/make.defaults
deleted file mode 100644
index 5da53aa13384..000000000000
--- a/profiles/default/linux/uclibc/ppc/make.defaults
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="powerpc-gentoo-linux-uclibc"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
-# Multilib-related setup, bug #515130
-ABI="ppc"
-DEFAULT_ABI="ppc"
-MULTILIB_ABIS="ppc"
-CHOST_ppc="${CHOST}"
-LIBDIR_ppc="lib"
-IUSE_IMPLICIT="abi_ppc_32"
diff --git a/profiles/default/linux/uclibc/ppc/package.mask b/profiles/default/linux/uclibc/ppc/package.mask
deleted file mode 100644
index 337e632a725c..000000000000
--- a/profiles/default/linux/uclibc/ppc/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fails to find openssl headers, bug #517160
-net-misc/openssh
diff --git a/profiles/default/linux/uclibc/ppc/package.use.force b/profiles/default/linux/uclibc/ppc/package.use.force
deleted file mode 100644
index fc297563763a..000000000000
--- a/profiles/default/linux/uclibc/ppc/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-dev-ml/llvm-ocaml llvm_targets_PowerPC
-sys-devel/clang llvm_targets_PowerPC
-sys-devel/llvm llvm_targets_PowerPC
diff --git a/profiles/default/linux/uclibc/ppc/package.use.mask b/profiles/default/linux/uclibc/ppc/package.use.mask
deleted file mode 100644
index 29c58634b8e0..000000000000
--- a/profiles/default/linux/uclibc/ppc/package.use.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (01 Aug 2016)
-# kde-frameworks/*:5 not keyworded.
-net-irc/kvirc kde
-
-dev-libs/libpcre cxx
-sys-libs/ncurses cxx
diff --git a/profiles/default/linux/uclibc/ppc/package.use.stable.mask b/profiles/default/linux/uclibc/ppc/package.use.stable.mask
deleted file mode 100644
index e4a2e9f61138..000000000000
--- a/profiles/default/linux/uclibc/ppc/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
-# dev-qt/qtwebkit:5 not stable.
-dev-qt/designer webkit
diff --git a/profiles/default/linux/uclibc/ppc/parent b/profiles/default/linux/uclibc/ppc/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/uclibc/ppc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/uclibc/ppc/use.force b/profiles/default/linux/uclibc/ppc/use.force
deleted file mode 100644
index 6da16ab57182..000000000000
--- a/profiles/default/linux/uclibc/ppc/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
-ppc
-abi_ppc_32
diff --git a/profiles/default/linux/uclibc/ppc/use.mask b/profiles/default/linux/uclibc/ppc/use.mask
deleted file mode 100644
index 9ab8c5ff79c9..000000000000
--- a/profiles/default/linux/uclibc/ppc/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to arch/abi, bug #515130
--ppc
--abi_ppc_32
diff --git a/profiles/default/linux/uclibc/x86/deprecated b/profiles/default/linux/uclibc/x86/deprecated
deleted file mode 100644
index 833a2d0f9412..000000000000
--- a/profiles/default/linux/uclibc/x86/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/uclibc
diff --git a/profiles/default/linux/uclibc/x86/eapi b/profiles/default/linux/uclibc/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/uclibc/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/uclibc/x86/make.defaults b/profiles/default/linux/uclibc/x86/make.defaults
deleted file mode 100644
index 79b8d75c8733..000000000000
--- a/profiles/default/linux/uclibc/x86/make.defaults
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="i686-gentoo-linux-uclibc"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
-# Multilib-related setup, bug #515130
-ABI="x86"
-DEFAULT_ABI="x86"
-MULTILIB_ABIS="x86"
-CHOST_x86="${CHOST}"
-LIBDIR_x86="lib"
-IUSE_IMPLICIT="abi_x86_32"
-
-# Anthony G. Basile <blueness@gentoo.org> (26 Jan 2013)
-# Unhide the CPU_FLAGS_X86 USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
diff --git a/profiles/default/linux/uclibc/x86/package.use.force b/profiles/default/linux/uclibc/x86/package.use.force
deleted file mode 100644
index 553802649559..000000000000
--- a/profiles/default/linux/uclibc/x86/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-dev-ml/llvm-ocaml llvm_targets_X86
-sys-devel/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
diff --git a/profiles/default/linux/uclibc/x86/parent b/profiles/default/linux/uclibc/x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/uclibc/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/uclibc/x86/use.force b/profiles/default/linux/uclibc/x86/use.force
deleted file mode 100644
index eb8c5dfc7f70..000000000000
--- a/profiles/default/linux/uclibc/x86/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
-x86
-abi_x86_32
diff --git a/profiles/default/linux/uclibc/x86/use.mask b/profiles/default/linux/uclibc/x86/use.mask
deleted file mode 100644
index a70efb03255b..000000000000
--- a/profiles/default/linux/uclibc/x86/use.mask
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
--x86
--abi_x86_32
-
-# unmask all SIMD assembler flags
--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
-
-# Masked on all profiles but x86, bug #458354
--video_cards_geode
diff --git a/profiles/default/linux/x86/13.0/deprecated b/profiles/default/linux/x86/13.0/deprecated
deleted file mode 100644
index 5048c7d0ec91..000000000000
--- a/profiles/default/linux/x86/13.0/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0
diff --git a/profiles/default/linux/x86/13.0/desktop/deprecated b/profiles/default/linux/x86/13.0/desktop/deprecated
deleted file mode 100644
index 0e5552799bcc..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/desktop
diff --git a/profiles/default/linux/x86/13.0/desktop/eapi b/profiles/default/linux/x86/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/deprecated b/profiles/default/linux/x86/13.0/desktop/gnome/deprecated
deleted file mode 100644
index cd70a3a55c7c..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/desktop/gnome
diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/eapi b/profiles/default/linux/x86/13.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/parent b/profiles/default/linux/x86/13.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e01478..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/x86/13.0/desktop/gnome/systemd/deprecated
deleted file mode 100644
index 6a715f61e304..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/desktop/gnome/systemd
diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/eapi b/profiles/default/linux/x86/13.0/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f5c1ae438de4..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/x86/13.0/desktop/parent b/profiles/default/linux/x86/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/x86/13.0/desktop/plasma/deprecated b/profiles/default/linux/x86/13.0/desktop/plasma/deprecated
deleted file mode 100644
index 51c1b2588609..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/plasma/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/desktop/plasma
diff --git a/profiles/default/linux/x86/13.0/desktop/plasma/eapi b/profiles/default/linux/x86/13.0/desktop/plasma/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/plasma/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/13.0/desktop/plasma/parent b/profiles/default/linux/x86/13.0/desktop/plasma/parent
deleted file mode 100644
index ff3a7b1ec814..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/plasma/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/x86/13.0/desktop/plasma/systemd/deprecated b/profiles/default/linux/x86/13.0/desktop/plasma/systemd/deprecated
deleted file mode 100644
index f019521cdae0..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/plasma/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/desktop/plasma/systemd
diff --git a/profiles/default/linux/x86/13.0/desktop/plasma/systemd/eapi b/profiles/default/linux/x86/13.0/desktop/plasma/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/plasma/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/13.0/desktop/plasma/systemd/parent b/profiles/default/linux/x86/13.0/desktop/plasma/systemd/parent
deleted file mode 100644
index 44f88d3e2df0..000000000000
--- a/profiles/default/linux/x86/13.0/desktop/plasma/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/13.0/developer/deprecated b/profiles/default/linux/x86/13.0/developer/deprecated
deleted file mode 100644
index b993349721cc..000000000000
--- a/profiles/default/linux/x86/13.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/developer
diff --git a/profiles/default/linux/x86/13.0/developer/eapi b/profiles/default/linux/x86/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/13.0/developer/make.defaults b/profiles/default/linux/x86/13.0/developer/make.defaults
deleted file mode 100644
index e0cc9679f948..000000000000
--- a/profiles/default/linux/x86/13.0/developer/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2010-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Adding -Wl,--defsym=__gentoo_check_ldflags__=0 to default LDFLAGS for linux/x86 dev profile
-# This will help developers track down packages, that don't respect LDFLAGS,
-# more easily
-LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
diff --git a/profiles/default/linux/x86/13.0/developer/parent b/profiles/default/linux/x86/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/x86/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/x86/13.0/eapi b/profiles/default/linux/x86/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/13.0/parent b/profiles/default/linux/x86/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/x86/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/x86/13.0/selinux/deprecated b/profiles/default/linux/x86/13.0/selinux/deprecated
deleted file mode 100644
index c4c1e5a8a0b3..000000000000
--- a/profiles/default/linux/x86/13.0/selinux/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/selinux
diff --git a/profiles/default/linux/x86/13.0/selinux/eapi b/profiles/default/linux/x86/13.0/selinux/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/13.0/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/13.0/selinux/parent b/profiles/default/linux/x86/13.0/selinux/parent
deleted file mode 100644
index 933e67923d1a..000000000000
--- a/profiles/default/linux/x86/13.0/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/default/linux/x86/13.0/systemd/deprecated b/profiles/default/linux/x86/13.0/systemd/deprecated
deleted file mode 100644
index c60c36b416a4..000000000000
--- a/profiles/default/linux/x86/13.0/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/systemd
diff --git a/profiles/default/linux/x86/13.0/systemd/eapi b/profiles/default/linux/x86/13.0/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/13.0/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/13.0/systemd/parent b/profiles/default/linux/x86/13.0/systemd/parent
deleted file mode 100644
index ced72403bde9..000000000000
--- a/profiles/default/linux/x86/13.0/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/systemd
diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc
index 4d30aa57eb3d..fdca61b96130 100644
--- a/profiles/desc/l10n.desc
+++ b/profiles/desc/l10n.desc
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of L10N USE_EXPAND flags.
 
-# Keep it sorted. Entries must be valid IETF language tags (BCP 47).
+# Keep it sorted. Entries must be valid IETF language tags (BCP 47):
+# https://www.iana.org/assignments/language-subtag-registry
 
 # The following are considered duplicates. Use the generic language
 # tag without region subtag instead.
diff --git a/profiles/features/hardened/make.defaults b/profiles/features/hardened/make.defaults
index 88e165c4611a..cd5eaf2d5655 100644
--- a/profiles/features/hardened/make.defaults
+++ b/profiles/features/hardened/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
@@ -14,8 +14,8 @@ USE="hardened pic xtpax -jit -orc"
 # of running hardened.
 PROFILE_IS_HARDENED=1
 
-# We set the default markings to XATTR_PAX
-PAX_MARKINGS="XT"
+# We set the default markings to none
+PAX_MARKINGS="none"
 USE="${USE} -ptpax"
 
 # Default starting set of USE flags for all default/linux profiles.
diff --git a/profiles/hardened/linux/arm/armv6j/deprecated b/profiles/hardened/linux/arm/armv6j/deprecated
deleted file mode 100644
index 21a020f5259f..000000000000
--- a/profiles/hardened/linux/arm/armv6j/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv6j
diff --git a/profiles/hardened/linux/arm/armv6j/eapi b/profiles/hardened/linux/arm/armv6j/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/arm/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv6j/parent b/profiles/hardened/linux/arm/armv6j/parent
deleted file mode 100644
index 3204d16ca17f..000000000000
--- a/profiles/hardened/linux/arm/armv6j/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux
-../../../../arch/arm/armv6j
-..
diff --git a/profiles/hardened/linux/arm/armv7a/deprecated b/profiles/hardened/linux/arm/armv7a/deprecated
deleted file mode 100644
index 2063c2646bdf..000000000000
--- a/profiles/hardened/linux/arm/armv7a/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/armv7a
diff --git a/profiles/hardened/linux/arm/armv7a/eapi b/profiles/hardened/linux/arm/armv7a/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/arm/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv7a/parent b/profiles/hardened/linux/arm/armv7a/parent
deleted file mode 100644
index e6df25feb3ee..000000000000
--- a/profiles/hardened/linux/arm/armv7a/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux
-../../../../arch/arm/armv7a
-..
diff --git a/profiles/hardened/linux/arm/eapi b/profiles/hardened/linux/arm/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/arm/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/package.use.mask b/profiles/hardened/linux/arm/package.use.mask
deleted file mode 100644
index 2e55b7f3ccae..000000000000
--- a/profiles/hardened/linux/arm/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
-
-# Magnus Granberg <zorry@gentoo.org> (30 Sep 2016)
-# This target supports VTV #547040.
->=sys-devel/gcc-6 -vtv
diff --git a/profiles/hardened/linux/arm/parent b/profiles/hardened/linux/arm/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/hardened/linux/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/mips/eapi b/profiles/hardened/linux/mips/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/eapi b/profiles/hardened/linux/mips/mipsel/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/mipsel/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/eapi b/profiles/hardened/linux/mips/mipsel/multilib/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/n32/deprecated b/profiles/hardened/linux/mips/mipsel/multilib/n32/deprecated
deleted file mode 100644
index ba568c179e38..000000000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/mipsel/multilib/n32
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/n32/eapi b/profiles/hardened/linux/mips/mipsel/multilib/n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/n32/parent b/profiles/hardened/linux/mips/mipsel/multilib/n32/parent
deleted file mode 100644
index 96eb536b7f68..000000000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../../default/linux/mips/13.0/mipsel/multilib/n32
-..
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/n64/deprecated b/profiles/hardened/linux/mips/mipsel/multilib/n64/deprecated
deleted file mode 100644
index b6ad0afeb646..000000000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/mipsel/multilib/n64
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/n64/eapi b/profiles/hardened/linux/mips/mipsel/multilib/n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/n64/parent b/profiles/hardened/linux/mips/mipsel/multilib/n64/parent
deleted file mode 100644
index 64bafbbc37bf..000000000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../../default/linux/mips/13.0/mipsel/multilib/n64
-..
diff --git a/profiles/hardened/linux/mips/mipsel/multilib/parent b/profiles/hardened/linux/mips/mipsel/multilib/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/hardened/linux/mips/mipsel/multilib/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/mips/mipsel/n32/deprecated b/profiles/hardened/linux/mips/mipsel/n32/deprecated
deleted file mode 100644
index 997a4945fc4f..000000000000
--- a/profiles/hardened/linux/mips/mipsel/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/mipsel/n32
diff --git a/profiles/hardened/linux/mips/mipsel/n32/eapi b/profiles/hardened/linux/mips/mipsel/n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/mipsel/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/n32/parent b/profiles/hardened/linux/mips/mipsel/n32/parent
deleted file mode 100644
index 3798606e4f94..000000000000
--- a/profiles/hardened/linux/mips/mipsel/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/mips/13.0/mipsel/n32
-..
diff --git a/profiles/hardened/linux/mips/mipsel/n64/deprecated b/profiles/hardened/linux/mips/mipsel/n64/deprecated
deleted file mode 100644
index 2742db424254..000000000000
--- a/profiles/hardened/linux/mips/mipsel/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/mipsel/n64
diff --git a/profiles/hardened/linux/mips/mipsel/n64/eapi b/profiles/hardened/linux/mips/mipsel/n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/mipsel/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/mipsel/n64/parent b/profiles/hardened/linux/mips/mipsel/n64/parent
deleted file mode 100644
index 2a1971504aa1..000000000000
--- a/profiles/hardened/linux/mips/mipsel/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/mips/13.0/mipsel/n64
-..
diff --git a/profiles/hardened/linux/mips/mipsel/parent b/profiles/hardened/linux/mips/mipsel/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/hardened/linux/mips/mipsel/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/mips/multilib/eapi b/profiles/hardened/linux/mips/multilib/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/multilib/n32/deprecated b/profiles/hardened/linux/mips/multilib/n32/deprecated
deleted file mode 100644
index ca9e0e35c430..000000000000
--- a/profiles/hardened/linux/mips/multilib/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/multilib/n32
diff --git a/profiles/hardened/linux/mips/multilib/n32/eapi b/profiles/hardened/linux/mips/multilib/n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/multilib/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/multilib/n32/parent b/profiles/hardened/linux/mips/multilib/n32/parent
deleted file mode 100644
index 1c6cb6de7296..000000000000
--- a/profiles/hardened/linux/mips/multilib/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/mips/13.0/multilib/n32
-..
diff --git a/profiles/hardened/linux/mips/multilib/n64/deprecated b/profiles/hardened/linux/mips/multilib/n64/deprecated
deleted file mode 100644
index 0e3d02e8bad7..000000000000
--- a/profiles/hardened/linux/mips/multilib/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/multilib/n64
diff --git a/profiles/hardened/linux/mips/multilib/n64/eapi b/profiles/hardened/linux/mips/multilib/n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/multilib/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/multilib/n64/parent b/profiles/hardened/linux/mips/multilib/n64/parent
deleted file mode 100644
index abca1bea0c38..000000000000
--- a/profiles/hardened/linux/mips/multilib/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/mips/13.0/multilib/n64
-..
diff --git a/profiles/hardened/linux/mips/multilib/parent b/profiles/hardened/linux/mips/multilib/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/hardened/linux/mips/multilib/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/mips/n32/deprecated b/profiles/hardened/linux/mips/n32/deprecated
deleted file mode 100644
index 3f9f288b09a9..000000000000
--- a/profiles/hardened/linux/mips/n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/n32
diff --git a/profiles/hardened/linux/mips/n32/eapi b/profiles/hardened/linux/mips/n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/n32/parent b/profiles/hardened/linux/mips/n32/parent
deleted file mode 100644
index 4503d56fcf5f..000000000000
--- a/profiles/hardened/linux/mips/n32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/mips/13.0/n32
-..
diff --git a/profiles/hardened/linux/mips/n64/deprecated b/profiles/hardened/linux/mips/n64/deprecated
deleted file mode 100644
index 22fdb33af1a3..000000000000
--- a/profiles/hardened/linux/mips/n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/mips/17.0/n64
diff --git a/profiles/hardened/linux/mips/n64/eapi b/profiles/hardened/linux/mips/n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/mips/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/mips/n64/parent b/profiles/hardened/linux/mips/n64/parent
deleted file mode 100644
index 822543c78747..000000000000
--- a/profiles/hardened/linux/mips/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/mips/13.0/n64
-..
diff --git a/profiles/hardened/linux/mips/parent b/profiles/hardened/linux/mips/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/hardened/linux/mips/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/musl/amd64/deprecated b/profiles/hardened/linux/musl/amd64/deprecated
deleted file mode 100644
index 075b2b8c9a7b..000000000000
--- a/profiles/hardened/linux/musl/amd64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/musl/hardened
diff --git a/profiles/hardened/linux/musl/amd64/eapi b/profiles/hardened/linux/musl/amd64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/musl/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/musl/amd64/parent b/profiles/hardened/linux/musl/amd64/parent
deleted file mode 100644
index e5409d5f56f4..000000000000
--- a/profiles/hardened/linux/musl/amd64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/musl/amd64
-..
diff --git a/profiles/hardened/linux/musl/amd64/x32/deprecated b/profiles/hardened/linux/musl/amd64/x32/deprecated
deleted file mode 100644
index 5cbfaf5838b0..000000000000
--- a/profiles/hardened/linux/musl/amd64/x32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-# no successor
diff --git a/profiles/hardened/linux/musl/amd64/x32/eapi b/profiles/hardened/linux/musl/amd64/x32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/musl/amd64/x32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/musl/amd64/x32/parent b/profiles/hardened/linux/musl/amd64/x32/parent
deleted file mode 100644
index 6deffb52fb62..000000000000
--- a/profiles/hardened/linux/musl/amd64/x32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/musl/amd64/x32
-..
diff --git a/profiles/hardened/linux/musl/arm/armv7a/deprecated b/profiles/hardened/linux/musl/arm/armv7a/deprecated
deleted file mode 100644
index 97118bd98bd2..000000000000
--- a/profiles/hardened/linux/musl/arm/armv7a/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm/17.0/musl/armv7a/hardened
diff --git a/profiles/hardened/linux/musl/arm/armv7a/eapi b/profiles/hardened/linux/musl/arm/armv7a/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/musl/arm/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/musl/arm/armv7a/parent b/profiles/hardened/linux/musl/arm/armv7a/parent
deleted file mode 100644
index 4be939d87ce7..000000000000
--- a/profiles/hardened/linux/musl/arm/armv7a/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../../../default/linux/musl/arm/armv7a
-..
-../..
diff --git a/profiles/hardened/linux/musl/arm/eapi b/profiles/hardened/linux/musl/arm/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/musl/arm/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/musl/arm64/deprecated b/profiles/hardened/linux/musl/arm64/deprecated
deleted file mode 100644
index b78b64e11c9f..000000000000
--- a/profiles/hardened/linux/musl/arm64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/arm64/17.0/musl/hardened
diff --git a/profiles/hardened/linux/musl/arm64/eapi b/profiles/hardened/linux/musl/arm64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/musl/arm64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/musl/arm64/parent b/profiles/hardened/linux/musl/arm64/parent
deleted file mode 100644
index f687b3f5f7c4..000000000000
--- a/profiles/hardened/linux/musl/arm64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/musl/arm64
-..
diff --git a/profiles/hardened/linux/musl/ppc/deprecated b/profiles/hardened/linux/musl/ppc/deprecated
deleted file mode 100644
index 031f987bc7e7..000000000000
--- a/profiles/hardened/linux/musl/ppc/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/17.0/musl/hardened
diff --git a/profiles/hardened/linux/musl/ppc/eapi b/profiles/hardened/linux/musl/ppc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/musl/ppc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/musl/ppc/parent b/profiles/hardened/linux/musl/ppc/parent
deleted file mode 100644
index 08b096c5a3e0..000000000000
--- a/profiles/hardened/linux/musl/ppc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/musl/ppc
-..
diff --git a/profiles/hardened/linux/musl/x86/deprecated b/profiles/hardened/linux/musl/x86/deprecated
deleted file mode 100644
index 5cbfaf5838b0..000000000000
--- a/profiles/hardened/linux/musl/x86/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-# no successor
diff --git a/profiles/hardened/linux/musl/x86/eapi b/profiles/hardened/linux/musl/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/musl/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/musl/x86/parent b/profiles/hardened/linux/musl/x86/parent
deleted file mode 100644
index 1efd929961c6..000000000000
--- a/profiles/hardened/linux/musl/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/musl/x86
-..
diff --git a/profiles/hardened/linux/powerpc/eapi b/profiles/hardened/linux/powerpc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/powerpc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/powerpc/make.defaults b/profiles/hardened/linux/powerpc/make.defaults
deleted file mode 100644
index 785c3daeb100..000000000000
--- a/profiles/hardened/linux/powerpc/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2005-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-FEATURES="-sandbox"
diff --git a/profiles/hardened/linux/powerpc/package.mask b/profiles/hardened/linux/powerpc/package.mask
deleted file mode 100644
index 4ccfde4f70b3..000000000000
--- a/profiles/hardened/linux/powerpc/package.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (29 Sep 2018)
-# All nodejs versions with ppc keywords are masked in 13.0 profile.
-dev-ruby/coffee-rails
-dev-ruby/coffee-script
-dev-ruby/execjs
-dev-ruby/uglifier
-
-# Wulf C. Krueger <philantrop@gentoo.org> (22 Sep 2007)
-# Needs OOo.
-app-text/bibus
diff --git a/profiles/hardened/linux/powerpc/package.use.mask b/profiles/hardened/linux/powerpc/package.use.mask
deleted file mode 100644
index b61fa6ddef75..000000000000
--- a/profiles/hardened/linux/powerpc/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Michał Górny <mgorny@gentoo.org> (29 Sep 2018)
-# All nodejs versions with ppc keywords are masked in 13.0 profile.
-dev-ruby/rails asset-pipeline
-dev-ruby/tilt test
-
-# Diego Pettenò <flameeyes@gentoo.org> (10 Nov 2007)
-# Tests for Linux-PAM 0.99 require >=sys-libs/glibc-2.4
->=sys-libs/pam-0.99.8 test
diff --git a/profiles/hardened/linux/powerpc/parent b/profiles/hardened/linux/powerpc/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/hardened/linux/powerpc/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/powerpc/ppc32/deprecated b/profiles/hardened/linux/powerpc/ppc32/deprecated
deleted file mode 100644
index 929365451947..000000000000
--- a/profiles/hardened/linux/powerpc/ppc32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc32/17.0
diff --git a/profiles/hardened/linux/powerpc/ppc32/eapi b/profiles/hardened/linux/powerpc/ppc32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/powerpc/ppc32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/powerpc/ppc32/make.defaults b/profiles/hardened/linux/powerpc/ppc32/make.defaults
deleted file mode 100644
index 70c5284ec7ae..000000000000
--- a/profiles/hardened/linux/powerpc/ppc32/make.defaults
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/hardened/linux/powerpc/ppc32/parent b/profiles/hardened/linux/powerpc/ppc32/parent
deleted file mode 100644
index 227873e978fb..000000000000
--- a/profiles/hardened/linux/powerpc/ppc32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/powerpc/ppc32
-..
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/deprecated b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/deprecated
deleted file mode 100644
index af483b2343a8..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/32bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/eapi b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults
deleted file mode 100644
index f01d29ae6a5e..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# All extra USE/etc should be specified in sub-profiles.
-# DO NOT POLLUTE USE ON THIS PROFILE.
-
-ACCEPT_KEYWORDS="-* ${ARCH}"
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.mask
deleted file mode 100644
index 633c704dafd1..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
deleted file mode 100644
index 5641eeb1b34d..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Matt Turner <mattst88@gentoo.org> (19 Sep 2018)
-# Requires Java, but no java keywords
-app-office/libreoffice libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher
-
-# Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
-# Unresolved dependencies.
-app-admin/conky apcupsd hddtemp xmms2
-app-admin/gkrellm hddtemp
-media-video/ffmpeg frei0r
-media-video/gpac dvb
-media-video/libav frei0r
-x11-base/xorg-drivers video_cards_glint
-
-# Michał Górny <mgorny@gentoo.org> (28 Feb 2018)
-# Requires masked USE flags.
-sci-libs/gdal mdb
-
-# Kacper Kowalik <xarthisius@gentoo.org> (25 Apr 2012)
-# Masking due to unsolved dependencies
-app-admin/puppet rrdtool
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.stable.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.stable.mask
deleted file mode 100644
index def7d26e3f8a..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Jun 2018)
-# dev-qt/qtwebkit:5 not stable.
-dev-qt/designer webkit
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages
deleted file mode 100644
index c347bb5cf302..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2006-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# We need kgcc64 to build kernels.
-*sys-devel/kgcc64
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
deleted file mode 100644
index 97dffb64c4d1..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/multilib
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.force b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.force
deleted file mode 100644
index ebef4d036967..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to ARCH.
-ppc
-
-# Unforce the flag which corresponds to the 64-bit ARCH.
--ppc64
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask
deleted file mode 100644
index 62c6f30edb03..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
-# Unresolved dependencies.
-luajit
-
-# Thomas Deutschmann <whissi@gentoo.org> (28 Jan 2017)
-# No JAVA in 32-bit userland
-java
-
-# We mask this since we're not really a multilib profile
-multilib
-
-# Unmask the flag which corresponds to ARCH.
--ppc
-
-# Mask the flag which corresponds to the 64-bit ARCH.
-ppc64
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/deprecated b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/deprecated
deleted file mode 100644
index 828f4a3d5bf5..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/powerpc/ppc64/17.0/64bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/eapi b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults
deleted file mode 100644
index 20953c7d8159..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# moved from features/64bit-native
-# TODO: figure out how to inherit this from arch profile
-SYMLINK_LIB="yes"
-LIBDIR_ppc64="lib64"
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask
deleted file mode 100644
index 499e2125d213..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
-# Unresolved dependencies.
-app-admin/puppet rrdtool
-media-video/gpac dvb
-x11-base/xorg-drivers video_cards_glint
-
-# Thomas Deutschmann <whissi@gentoo.org> (17 Oct 2017)
-# No lua keyworded for this arch yet
-# libpcre jit is not (yet?) support on this arch
-www-servers/nginx nginx_modules_http_lua pcre-jit
-
-# Kacper Kowalik <xarthisius@gentoo.org> (25 Apr 2012)
-# Masking wrt bug 274847 and other unsolved
-# dependencies
-app-admin/conky apcupsd xmms2 hddtemp
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask
deleted file mode 100644
index 7961a08d7290..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask
+++ /dev/null
@@ -1,15 +0,0 @@
-# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (26 Feb 2018)
-# There is no luajit support on ppc64 userland. Bug #608326.
-# This mirrors USE mask from non-hardened 64ul.
-luajit
-
-# We mask this since we don't have a stable sys-process/audit yet
-audit
-
-# Mirror mask from nonhardened 64ul on app-admin/hddtemp
-hddtemp
-
-# Mirror mask from nonhardened 64ul on media-plugins/frei0r-plugins
-# Kacper Kowalik <xarthisius@gentoo.org> (10 Aug 2011)
-# Masking frei0r wrt bug #365451
-frei0r
diff --git a/profiles/hardened/linux/powerpc/ppc64/eapi b/profiles/hardened/linux/powerpc/ppc64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/powerpc/ppc64/make.defaults b/profiles/hardened/linux/powerpc/ppc64/make.defaults
deleted file mode 100644
index 70c5284ec7ae..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/make.defaults
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/hardened/linux/powerpc/ppc64/parent b/profiles/hardened/linux/powerpc/ppc64/parent
deleted file mode 100644
index eb7e3e41d880..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/powerpc/ppc64
-..
diff --git a/profiles/hardened/linux/powerpc/ppc64/use.mask b/profiles/hardened/linux/powerpc/ppc64/use.mask
deleted file mode 100644
index a68fb1d35788..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/use.mask
+++ /dev/null
@@ -1,27 +0,0 @@
-# this is a list of USE flags
-# that should not be used on PPC64
-# Tom Gall <tgall@gentoo.org> manages this list
-mplayer
-ruby
-mono
-
-guile
-
-# need to test libaio
-aio
-# needs some asm written
-ocaml
-
-# until media-libs/portaudio is keyworded for ppc64
-portaudio
-
-# mask mozilla/firefox (bug #108020)
-mozilla
-
-# Masked p2p for bug #155302 <josejx@gentoo.org>
-p2p
-
-# USE=audit masked prior to testing on alpha, arm, hppa, ppc64, s390, sh.
-# Bug #184563, 18 Sep 2007 
-# Robin H. Johnson <robbat2@gentoo.org>
-audit
diff --git a/profiles/hardened/linux/powerpc/use.mask b/profiles/hardened/linux/powerpc/use.mask
deleted file mode 100644
index f1fe2d01a8cb..000000000000
--- a/profiles/hardened/linux/powerpc/use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2005-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Matt Turner <mattst88@gentoo.org> (19 Sep 2018)
-# kde is not keyworded
-kde
-
diff --git a/profiles/hardened/linux/uclibc/amd64/deprecated b/profiles/hardened/linux/uclibc/amd64/deprecated
deleted file mode 100644
index b5528b4811c0..000000000000
--- a/profiles/hardened/linux/uclibc/amd64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/amd64/17.0/uclibc/hardened
diff --git a/profiles/hardened/linux/uclibc/amd64/eapi b/profiles/hardened/linux/uclibc/amd64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/uclibc/amd64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/amd64/parent b/profiles/hardened/linux/uclibc/amd64/parent
deleted file mode 100644
index 61f6f489dc18..000000000000
--- a/profiles/hardened/linux/uclibc/amd64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/uclibc/amd64
-..
diff --git a/profiles/hardened/linux/uclibc/arm/armv7a/eapi b/profiles/hardened/linux/uclibc/arm/armv7a/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/uclibc/arm/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/arm/armv7a/parent b/profiles/hardened/linux/uclibc/arm/armv7a/parent
deleted file mode 100644
index 7bea4235c084..000000000000
--- a/profiles/hardened/linux/uclibc/arm/armv7a/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../../../default/linux/uclibc/arm/armv7a
-..
-../..
diff --git a/profiles/hardened/linux/uclibc/arm/eapi b/profiles/hardened/linux/uclibc/arm/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/uclibc/arm/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/ppc/eapi b/profiles/hardened/linux/uclibc/ppc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/uclibc/ppc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/ppc/parent b/profiles/hardened/linux/uclibc/ppc/parent
deleted file mode 100644
index 3ad55647a3f7..000000000000
--- a/profiles/hardened/linux/uclibc/ppc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/uclibc/ppc
-..
diff --git a/profiles/hardened/linux/uclibc/x86/deprecated b/profiles/hardened/linux/uclibc/x86/deprecated
deleted file mode 100644
index a923ebfd48bb..000000000000
--- a/profiles/hardened/linux/uclibc/x86/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/x86/17.0/uclibc/hardened
diff --git a/profiles/hardened/linux/uclibc/x86/eapi b/profiles/hardened/linux/uclibc/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/uclibc/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/x86/parent b/profiles/hardened/linux/uclibc/x86/parent
deleted file mode 100644
index 54abcade7471..000000000000
--- a/profiles/hardened/linux/uclibc/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/uclibc/x86
-..
diff --git a/profiles/package.mask b/profiles/package.mask
index 94949b190e07..9c6cd00df90b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,36 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (15 Jun 2019)
+# Abandoned upstream, last release 8 years ago,
+# multiple bugs, fails with boost 1.70 and
+# openssl 1.1, removal in 30 days
+# Bug #561314, #594894, #672090, #674606.
+net-analyzer/sslsniff
+
+# Mikle Kolyada <zlogene@gentoo.org> (15 Jun 2019)
+# Part of dev-texlive/texlive-latexextra
+# does not work with utf-8 (bug #688096)
+# removal in 30 days
+dev-tex/quotchap
+
+# Miroslav Šulc <fordfrog@gentoo.org> (12 Jun 2019)
+# Depends on >=virtual/{jdk,jre}-11 which is masked
+=www-servers/tomcat-9.0.21
+
+# Brian Evans <grknight@gentoo.org> (11 Jun 2019)
+# Mask these packages for further testing
+# There is known API breakage and some packages fail,
+# particuarly with "my_bool" dropped for "bool"
+>=dev-db/myodbc-8.0
+>=dev-db/mysql-connector-c-8.0
+~virtual/libmysqlclient-21
+
+# James Le Cuirot <chewi@gentoo.org> (9 Jun 2019)
+# Dead upstream, no release since 2008, not used by anything, possibly
+# doesn't work any more. Removal in 30 days.
+dev-libs/liblazy
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (5 Jun 2019)
 # Unhandled version bumps since 2015, bug 293306. EAPI=2.
 # Removal in 30 days unless updated.
@@ -111,11 +141,6 @@ net-proxy/nylon
 dev-libs/beecrypt
 <dev-util/debugedit-4
 
-# Mart Raudsepp <leio@gentoo.org> (18 May 2019)
-# Old name and SLOT for gui-libs/tepl, which is now used instead.
-# Masked for removal in 15 days. Bug #686222
-x11-libs/gtef
-
 # Hans de Graaff <graaff@gentoo.org> (18 May 2019)
 # Old, ruby24-only, slots of ruby packages without any reverse
 # dependencies. Use the newer slot version instead.
@@ -126,23 +151,10 @@ dev-ruby/elasticsearch-api:0
 dev-ruby/elasticsearch-transport:0
 dev-ruby/filesize:0.1.1
 
-# Matt Turner <mattst88@gentoo.org> (16 May 2019)
-# Not supported by the Xserver since v1.6.0 (2008)
-# Masked for removal.
-x11-apps/xtrap
-x11-libs/libXTrap
-
 # Miroslav Šulc <fordfrog@gentoo.org> (15 May 2019)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.20
 
-# Brian Evans <grknight@gentoo.org> (14 May 2019)
-# MariaDB 10.0 has reached end of life and has security issues
-# dev-db/mariadb-galera users should upgrade to mariadb-10.1 or greater
-# Removal in 30 days
-dev-db/mariadb-galera
-=dev-db/mariadb-10.0*
-
 # Virgil Dupras <vdupras@gentoo.org> (13 May 2019)
 # detox has been deprecated by the release of tox 3.7.0 which duplicates the
 # feature. Removal in 30 days. Bug #685870
@@ -210,18 +222,10 @@ dev-python/detox
 =virtual/perl-version-0.991.600-r1
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
-# Severely outdated, no commits since 2009, EAPI=2.
-# Bug 679686. Removal in 30 days.
-dev-lang/confluence
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
-# Build failures, other QA issues, EAPI=2. See bug 681046
-# Removal in 30 days.
-dev-embedded/tavrasm
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
 # Outdated, EAPI=2, unmaintained, segfaults immediately.
-# See bug 634928 and bug 612980. Removal in 30 days.
+# See bug 634928 and bug 612980.
+# Andrew Savchenko <bircoph@gentoo.org> (09 Jun 2019)
+# festival and speech-tools update is WIP now, so postponing removal.
 app-accessibility/festival
 app-accessibility/festival-freebsoft-utils
 app-accessibility/festival-hts
@@ -232,11 +236,6 @@ app-accessibility/perlbox-voice
 app-accessibility/pidgin-festival
 dev-ros/sound_play
 
-# Virgil Dupras <vdupras@gentoo.org> (10 May 2019)
-# Has very limited use and is disruptive of other tests when activated.
-# Bug #685538. Removal in 30 days.
-dev-python/pytest-relaxed
-
 # Patrice Clement <monsieurp@gentoo.org> (06 May 2019)
 # Broken build. Outdated version. No interest from the Java team to maintain
 # it. Removal in 30 days. Bug #581720.
@@ -339,10 +338,6 @@ mail-filter/mimedefang
 =net-libs/nodejs-11.15.0
 =net-libs/nodejs-12*
 
-# Miroslav Šulc <fordfrog@gentoo.org> (19 Apr 2019)
-# Depends on >=virtual/{jdk,jre}-11 which is masked
-=www-servers/tomcat-9.0.19
-
 # Michał Górny <mgorny@gentoo.org> (18 Apr 2019)
 # All current versions of SystemRescueCD contain vulnerable packages.
 # Bug #683724.
@@ -375,10 +370,6 @@ sys-boot/systemrescuecd-x86-grub
 # Requires >=dev-lang/lua-5.3 which is masked
 sys-apps/likwid
 
-# Miroslav Šulc <fordfrog@gentoo.org> (19 Mar 2019)
-# Depends on >=virtual/{jdk,jre}-11 which is masked
-=www-servers/tomcat-9.0.17
-
 # Matt Turner <mattst88@gentoo.org> (16 Mar 2019)
 # Previously packaged drivers, now removed from Gentoo.
 # Keep this mask in place so users are aware, but can also easily unmask them
diff --git a/profiles/prefix/windows/winnt/package.use.mask b/profiles/prefix/windows/winnt/package.use.mask
index 51b019b65f26..c42d3466be6f 100644
--- a/profiles/prefix/windows/winnt/package.use.mask
+++ b/profiles/prefix/windows/winnt/package.use.mask
@@ -1,6 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (02 Oct 2017)
 # requires nasm, which is hard to use via parity atm
 dev-libs/openssl asm
+dev-libs/openssl-compat asm
diff --git a/profiles/default/linux/alpha/13.0/desktop/eapi b/profiles/prefix/windows/winnt/x86/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/alpha/13.0/desktop/eapi
+++ b/profiles/prefix/windows/winnt/x86/eapi
diff --git a/profiles/prefix/windows/winnt/x86/make.defaults b/profiles/prefix/windows/winnt/x86/make.defaults
new file mode 100644
index 000000000000..3c45b788d160
--- /dev/null
+++ b/profiles/prefix/windows/winnt/x86/make.defaults
@@ -0,0 +1,12 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="x86-winnt"
+ACCEPT_KEYWORDS="~x86-winnt"
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="x86"
+DEFAULT_ABI="x86"
+ABI="x86"
+IUSE_IMPLICIT="abi_x86_32"
+LIBDIR_x86="lib"
diff --git a/profiles/default/linux/musl/amd64/parent b/profiles/prefix/windows/winnt/x86/parent
index f3229c5b9876..f3229c5b9876 100644
--- a/profiles/default/linux/musl/amd64/parent
+++ b/profiles/prefix/windows/winnt/x86/parent
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 3396c5ffe8f7..4b490671c213 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -8,11 +8,6 @@
 
 # Alpha Profiles
 # @MAINTAINER: alpha@gentoo.org
-alpha           default/linux/alpha/13.0                        stable
-alpha           default/linux/alpha/13.0/desktop                stable
-alpha           default/linux/alpha/13.0/desktop/gnome          stable
-alpha           default/linux/alpha/13.0/desktop/gnome/systemd  stable
-alpha           default/linux/alpha/13.0/developer              stable
 alpha           default/linux/alpha/17.0                        stable
 alpha           default/linux/alpha/17.0/desktop                stable
 alpha           default/linux/alpha/17.0/desktop/gnome          stable
@@ -21,17 +16,6 @@ alpha           default/linux/alpha/17.0/developer              stable
 
 # AMD64 Profiles
 # @MAINTAINER: amd64@gentoo.org
-amd64           default/linux/amd64/13.0                                stable
-amd64           default/linux/amd64/13.0/selinux                        dev
-amd64           default/linux/amd64/13.0/desktop                        stable
-amd64           default/linux/amd64/13.0/desktop/gnome                  stable
-amd64           default/linux/amd64/13.0/desktop/gnome/systemd          stable
-amd64           default/linux/amd64/13.0/desktop/plasma                 stable
-amd64           default/linux/amd64/13.0/desktop/plasma/systemd         stable
-amd64           default/linux/amd64/13.0/developer                      stable
-amd64           default/linux/amd64/13.0/no-multilib                    stable
-amd64           default/linux/amd64/13.0/systemd                        stable
-amd64           default/linux/amd64/13.0/x32                            dev
 amd64           default/linux/amd64/17.0                                stable
 amd64           default/linux/amd64/17.0/selinux                        stable
 amd64           default/linux/amd64/17.0/hardened                       stable
@@ -68,38 +52,6 @@ amd64           default/linux/amd64/17.1/systemd                   stable
 
 # ARM Profiles
 # @MAINTAINER: arm@gentoo.org
-arm             default/linux/arm/13.0                          stable
-arm             default/linux/arm/13.0/desktop                  dev
-arm             default/linux/arm/13.0/desktop/gnome            dev
-arm             default/linux/arm/13.0/desktop/gnome/systemd    dev
-arm             default/linux/arm/13.0/desktop/plasma           dev
-arm             default/linux/arm/13.0/desktop/plasma/systemd   dev
-arm             default/linux/arm/13.0/developer                dev
-arm             default/linux/arm/13.0/armv4                    dev
-arm             default/linux/arm/13.0/armv4/desktop            dev
-arm             default/linux/arm/13.0/armv4/desktop/gnome      dev
-arm             default/linux/arm/13.0/armv4/desktop/plasma     dev
-arm             default/linux/arm/13.0/armv4/developer          dev
-arm             default/linux/arm/13.0/armv4t                   dev
-arm             default/linux/arm/13.0/armv4t/desktop           dev
-arm             default/linux/arm/13.0/armv4t/desktop/gnome     dev
-arm             default/linux/arm/13.0/armv4t/desktop/plasma    dev
-arm             default/linux/arm/13.0/armv4t/developer         dev
-arm             default/linux/arm/13.0/armv5te                  dev
-arm             default/linux/arm/13.0/armv5te/desktop          dev
-arm             default/linux/arm/13.0/armv5te/desktop/gnome    dev
-arm             default/linux/arm/13.0/armv5te/desktop/plasma   dev
-arm             default/linux/arm/13.0/armv5te/developer        dev
-arm             default/linux/arm/13.0/armv6j                   dev
-arm             default/linux/arm/13.0/armv6j/desktop           dev
-arm             default/linux/arm/13.0/armv6j/desktop/gnome     dev
-arm             default/linux/arm/13.0/armv6j/desktop/plasma    dev
-arm             default/linux/arm/13.0/armv6j/developer         dev
-arm             default/linux/arm/13.0/armv7a                   dev
-arm             default/linux/arm/13.0/armv7a/desktop           dev
-arm             default/linux/arm/13.0/armv7a/desktop/gnome     dev
-arm             default/linux/arm/13.0/armv7a/desktop/plasma    dev
-arm             default/linux/arm/13.0/armv7a/developer         dev
 arm             default/linux/arm/17.0                          stable
 arm             default/linux/arm/17.0/desktop                  dev
 arm             default/linux/arm/17.0/desktop/gnome            dev
@@ -135,11 +87,6 @@ arm             default/linux/arm/17.0/armv7a/developer         dev
 
 # ARM64 Profiles
 # @MAINTAINER: arm64@gentoo.org
-arm64           default/linux/arm64/13.0                        exp
-arm64           default/linux/arm64/13.0/desktop                exp
-arm64           default/linux/arm64/13.0/desktop/systemd        exp
-arm64           default/linux/arm64/13.0/developer              exp
-arm64           default/linux/arm64/13.0/systemd                exp
 arm64           default/linux/arm64/17.0                        dev
 arm64           default/linux/arm64/17.0/desktop                exp
 arm64           default/linux/arm64/17.0/desktop/systemd        dev
@@ -154,20 +101,12 @@ arm64           default/linux/arm64/17.0/big-endian             exp
 
 # HPPA Profiles
 # @MAINTAINER: hppa@gentoo.org
-hppa            default/linux/hppa/13.0                         exp
-hppa            default/linux/hppa/13.0/desktop                 exp
-hppa            default/linux/hppa/13.0/developer               exp
 hppa            default/linux/hppa/17.0                         exp
 hppa            default/linux/hppa/17.0/desktop                 exp
 hppa            default/linux/hppa/17.0/developer               exp
 
 # IA64 Profiles
 # @MAINTAINER: ia64@gentoo.org
-ia64            default/linux/ia64/13.0                         stable
-ia64            default/linux/ia64/13.0/desktop                 stable
-ia64            default/linux/ia64/13.0/desktop/gnome           stable
-ia64            default/linux/ia64/13.0/desktop/gnome/systemd   stable
-ia64            default/linux/ia64/13.0/developer               stable
 ia64            default/linux/ia64/17.0                         stable
 ia64            default/linux/ia64/17.0/desktop                 stable
 ia64            default/linux/ia64/17.0/desktop/gnome           stable
@@ -176,10 +115,6 @@ ia64            default/linux/ia64/17.0/developer               stable
 
 # M68K Profiles
 # @MAINTAINER: m68k@gentoo.org
-m68k            default/linux/m68k/13.0                         exp
-m68k            default/linux/m68k/13.0/desktop                 exp
-m68k            default/linux/m68k/13.0/desktop/gnome           exp
-m68k            default/linux/m68k/13.0/developer               exp
 m68k            default/linux/m68k/17.0                         exp
 m68k            default/linux/m68k/17.0/desktop                 exp
 m68k            default/linux/m68k/17.0/desktop/gnome           exp
@@ -187,18 +122,6 @@ m68k            default/linux/m68k/17.0/developer               exp
 
 # MIPS Profiles
 # @MAINTAINER: mips@gentoo.org
-mips            default/linux/mips/13.0/o32                     exp
-mips            default/linux/mips/13.0/n32                     exp
-mips            default/linux/mips/13.0/n64                     exp
-mips            default/linux/mips/13.0/multilib/o32            exp
-mips            default/linux/mips/13.0/multilib/n32            exp
-mips            default/linux/mips/13.0/multilib/n64            exp
-mips            default/linux/mips/13.0/mipsel/o32              exp
-mips            default/linux/mips/13.0/mipsel/n32              exp
-mips            default/linux/mips/13.0/mipsel/n64              exp
-mips            default/linux/mips/13.0/mipsel/multilib/o32     exp
-mips            default/linux/mips/13.0/mipsel/multilib/n32     exp
-mips            default/linux/mips/13.0/mipsel/multilib/n64     exp
 mips            default/linux/mips/17.0/o32                     exp
 mips            default/linux/mips/17.0/n32                     exp
 mips            default/linux/mips/17.0/n64                     exp
@@ -214,11 +137,6 @@ mips            default/linux/mips/17.0/mipsel/multilib/n64     exp
 
 # PPC32 Profiles
 # @MAINTAINER: ppc@gentoo.org
-ppc             default/linux/powerpc/ppc32/13.0                       exp
-ppc             default/linux/powerpc/ppc32/13.0/desktop               exp
-ppc             default/linux/powerpc/ppc32/13.0/desktop/gnome         exp
-ppc             default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd exp
-ppc             default/linux/powerpc/ppc32/13.0/developer             exp
 ppc             default/linux/powerpc/ppc32/17.0                       stable
 ppc             default/linux/powerpc/ppc32/17.0/desktop               stable
 ppc             default/linux/powerpc/ppc32/17.0/desktop/gnome         stable
@@ -227,18 +145,6 @@ ppc             default/linux/powerpc/ppc32/17.0/developer             stable
 
 # PPC64 Profiles
 # @MAINTAINER: ppc64@gentoo.org
-ppc             default/linux/powerpc/ppc64/13.0/32bit-userland                         exp
-ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/desktop                 exp
-ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome           exp
-ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd   exp
-ppc             default/linux/powerpc/ppc64/13.0/32bit-userland/developer               exp
-ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland                         exp
-ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop                 exp
-ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome           exp
-ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd   exp
-ppc64           default/linux/powerpc/ppc64/13.0/64bit-userland/developer               exp
-ppc64		default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian		exp
-ppc64		default/linux/powerpc/ppc64/13.0/64bit-userland/little-endian/systemd	exp
 ppc             default/linux/powerpc/ppc64/17.0/32bit-userland                         stable
 ppc             default/linux/powerpc/ppc64/17.0/32bit-userland/desktop                 stable
 ppc             default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome           stable
@@ -260,17 +166,11 @@ riscv		default/linux/riscv/17.0/rv64gc/lp64		exp
 
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
-s390            default/linux/s390/13.0                         exp
-s390            default/linux/s390/13.0/s390x                   exp
 s390            default/linux/s390/17.0                         exp
 s390            default/linux/s390/17.0/s390x                   exp
 
 # SH Profiles
 # @MAINTAINER: sh@gentoo.org
-sh              default/linux/sh/13.0                           exp
-sh              default/linux/sh/13.0/desktop                   exp
-sh              default/linux/sh/13.0/desktop/gnome             exp
-sh              default/linux/sh/13.0/developer                 exp
 sh              default/linux/sh/17.0                           exp
 sh              default/linux/sh/17.0/desktop                   exp
 sh              default/linux/sh/17.0/desktop/gnome             exp
@@ -278,11 +178,6 @@ sh              default/linux/sh/17.0/developer                 exp
 
 # SPARC Profiles
 # @MAINTAINER: sparc@gentoo.org
-sparc           default/linux/sparc/13.0                        exp
-sparc           default/linux/sparc/13.0/desktop                exp
-sparc           default/linux/sparc/13.0/desktop/gnome          exp
-sparc           default/linux/sparc/13.0/desktop/gnome/systemd  exp
-sparc           default/linux/sparc/13.0/developer              exp
 sparc           default/linux/sparc/17.0                        exp
 sparc           default/linux/sparc/17.0/desktop                exp
 sparc           default/linux/sparc/17.0/desktop/gnome          exp
@@ -291,15 +186,6 @@ sparc           default/linux/sparc/17.0/developer              exp
 
 # x86 Profiles
 # @MAINTAINER: x86@gentoo.org
-x86             default/linux/x86/13.0                          stable
-x86             default/linux/x86/13.0/selinux                  dev
-x86             default/linux/x86/13.0/desktop                  stable
-x86             default/linux/x86/13.0/desktop/gnome            stable
-x86             default/linux/x86/13.0/desktop/gnome/systemd    stable
-x86             default/linux/x86/13.0/desktop/plasma           stable
-x86             default/linux/x86/13.0/desktop/plasma/systemd   stable
-x86             default/linux/x86/13.0/developer                stable
-x86		default/linux/x86/13.0/systemd			stable
 x86             default/linux/x86/17.0                          stable
 x86             default/linux/x86/17.0/selinux                  stable
 x86             default/linux/x86/17.0/hardened                 stable
@@ -318,23 +204,6 @@ amd64-fbsd	default/bsd/fbsd/amd64/11.1			stable
 amd64-fbsd	default/bsd/fbsd/amd64/11.1/clang		exp
 x86-fbsd	default/bsd/fbsd/x86/11.1			exp
 
-# Hardened Profiles
-# @MAINTAINER: hardened@gentoo.org
-arm		hardened/linux/arm/armv6j				dev
-arm		hardened/linux/arm/armv7a				dev
-ia64		hardened/linux/ia64					dev
-mips		hardened/linux/mips/mipsel/multilib/n32			exp
-mips		hardened/linux/mips/mipsel/multilib/n64			exp
-mips		hardened/linux/mips/mipsel/n32				exp
-mips		hardened/linux/mips/mipsel/n64				exp
-mips		hardened/linux/mips/multilib/n32			exp
-mips		hardened/linux/mips/multilib/n64			exp
-mips		hardened/linux/mips/n32					exp
-mips		hardened/linux/mips/n64					exp
-ppc		hardened/linux/powerpc/ppc32				dev
-ppc		hardened/linux/powerpc/ppc64/32bit-userland		dev
-ppc64		hardened/linux/powerpc/ppc64/64bit-userland		dev
-
 # musl profiles
 # @MAINTAINER: musl@gentoo.org
 amd64		default/linux/amd64/17.0/musl				exp
@@ -359,8 +228,6 @@ x86		default/linux/x86/17.0/musl/selinux			exp
 # @MAINTAINER: uclibc@gentoo.org
 amd64		default/linux/amd64/17.0/uclibc				exp
 amd64		default/linux/amd64/17.0/uclibc/hardened		exp
-arm		default/linux/uclibc/arm/armv7a				exp
-arm		hardened/linux/uclibc/arm/armv7a			exp
 arm		default/linux/arm/17.0/uclibc/armv6j			exp
 arm		default/linux/arm/17.0/uclibc/armv6j/hardened		exp
 arm		default/linux/arm/17.0/uclibc/armv7a			exp
@@ -369,8 +236,6 @@ mips		default/linux/uclibc/mips				exp
 mips		hardened/linux/uclibc/mips				exp
 mips		default/linux/uclibc/mips/mipsel			exp
 mips		hardened/linux/uclibc/mips/mipsel			exp
-ppc		default/linux/uclibc/ppc				exp
-ppc		hardened/linux/uclibc/ppc				exp
 ppc		default/linux/powerpc/ppc32/17.0/uclibc			exp
 ppc		default/linux/powerpc/ppc32/17.0/uclibc/hardened	exp
 x86		default/linux/x86/17.0/uclibc				exp
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5f2fc62bf060..73402210d59f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1516,22 +1516,6 @@ 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: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: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: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
-dev-db/mariadb-galera:sphinx - Add suport for the sphinx full-text search engine
-dev-db/mariadb-galera:sst-rsync - Add tools needed to support the rsync SST method
-dev-db/mariadb-galera:sst-xtrabackup - Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods
-dev-db/mariadb-galera:systemtap - Build support for profiling and tracing using dev-util/systemtap
-dev-db/mariadb-galera:test - Install upstream testsuites for end use.
-dev-db/mariadb-galera:tokudb - Add support for TokuDB storage engine
-dev-db/mariadb-galera:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
 dev-db/mongodb:lto - Adds support for link time optimization
 dev-db/mongodb:mms-agent - Install the MongoDB Monitoring Service agent
 dev-db/mongodb:tools - Install the MongoDB tools (mongoimport, mongodump...) from app-admin/mongo-tools
@@ -2544,6 +2528,12 @@ dev-libs/openssl:rfc3779 - Enable support for RFC 3779 (X.509 Extensions for IP
 dev-libs/openssl:sslv2 - Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https
 dev-libs/openssl:sslv3 - Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https
 dev-libs/openssl:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
+dev-libs/openssl-compat:asm - Support assembly hand optimized crypto functions (i.e. faster run time)
+dev-libs/openssl-compat:bindist - Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI
+dev-libs/openssl-compat:rfc3779 - Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)
+dev-libs/openssl-compat:sslv2 - Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https
+dev-libs/openssl-compat:sslv3 - Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https
+dev-libs/openssl-compat:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
 dev-libs/pkcs11-helper:nss - Enable NSS crypto engine
 dev-libs/poco:7z - Add Support for the 7z archive format
 dev-libs/poco:apache - Enable support to write Apache modules using POCO
@@ -2613,7 +2603,6 @@ dev-libs/xmlsec:nss - Install xmlsec-nss library
 dev-libs/xmlsec:openssl - Install xmlsec-openssl library
 dev-libs/yaz:ziffy - Install ziffy, a promiscuous Z39.50 APDU sniffer
 dev-lisp/clisp:hyperspec - Use local hyperspec instead of online version
-dev-lisp/clisp:new-clx - Build CLISP with support for the NEW-CLX module which is a -C binding to the Xorg libraries
 dev-lisp/clisp:svm - Build CLISP with support for the Support Vector Machine module
 dev-lisp/clx:doc - Builds documentation
 dev-lisp/cmucl:X - Build CLX, CLM, or Hemlock
@@ -3097,7 +3086,6 @@ dev-util/catalyst:system-bootloader - Pulls in the depends needed to setup livec
 dev-util/cccc:apidoc - Build software docs with doxygen/graphviz and metrics with cccc
 dev-util/cccc:mfc - Add patch for MFC dialect options
 dev-util/clion:custom-jdk - Install and use IntelliJ's custom JRE.
-dev-util/cmake:server - Enable cmake-server support.
 dev-util/cmake:system-jsoncpp - Use system copy of dev-libs/jsoncpp instead of bundled one.
 dev-util/coccigrep:vim - Install the coccigrep vim plugin
 dev-util/codeblocks:contrib - Build additional contrib components
@@ -3330,11 +3318,12 @@ games-action/dxx-rebirth:sc55-musicpack - Include alternate version of the game'
 games-action/dxx-rebirth:textures - Include high resolution (640x480) backgrounds, briefing images and fonts (Descent 1)
 games-action/hotline-miami:bundled-libs - Use bundled libraries.
 games-action/hotline-miami:launcher - Install qt launcher
+games-action/minetest:client - Build Minetest client
 games-action/minetest:jsoncpp - Enable using a system-wide JSONCPP
 games-action/minetest:leveldb - Enable LevelDB backend
 games-action/minetest:postgres - Optionally use PostgreSQL as map backend
 games-action/minetest:redis - Enable redis backend via dev-libs/hiredis
-games-action/minetest:server - Build minetest server
+games-action/minetest:server - Build Minetest server
 games-action/minetest:spatial - Enable SpatialIndex AreaStore backend
 games-action/solar2:bundled-libs - Use the upstream provided bundled libraries.
 games-action/supermariowar:server - Compile and install Super Mario War server files
@@ -4078,7 +4067,6 @@ mail-filter/maildrop:authlib - Add courier-authlib support
 mail-filter/maildrop:dovecot - Add dovecot authentication support
 mail-filter/maildrop:tools - Install maildirmake and deliverquota tools
 mail-filter/maildrop:trashquota - Count deleted messages as part of the maildir quota
-mail-filter/mimedefang:poll - Use poll instead of select
 mail-filter/opendkim:ldap - Enable openldap as a dataset facilitator or keys, determining domains to sign for, and any other dataset that opendkim supports.
 mail-filter/opendkim:lmdb - Add support for using dev-db/lmdb
 mail-filter/opendkim:lua - Enables control over signature verification, filtering and policy to be controlled by user defined lua scripts.
@@ -4241,7 +4229,6 @@ media-gfx/alembic:examples - Install alembic examples
 media-gfx/alembic:hdf5 - Add support sci-libs/hdf5
 media-gfx/alembic:maya - Compile Alembic plugin for Maya (experimental)
 media-gfx/alembic:prman - Compile Alembic plugin for Renderman (experimental)
-media-gfx/alembic:pyalembic - Build pyalembic python bindings (needs dev-python/pyilmbase)
 media-gfx/alembic:python - Build pyalembic python bindings (needs dev-python/pyilmbase)
 media-gfx/alembic:test - Build and run the test-suite
 media-gfx/alembic:zlib - Use sys-libs/zlib for compressions
@@ -4252,7 +4239,7 @@ media-gfx/asymptote:offscreen - Enables off-screen rendering
 media-gfx/asymptote:sigsegv - Enables using dev-libs/libsigsegv
 media-gfx/blender:bullet - Enable Bullet (Physics Engine).
 media-gfx/blender:collada - Add support for Collada interchange format through media-libs/opencollada.
-media-gfx/blender:colorio - Enable OpenColorIO color management through media-libs/opencolorio.
+media-gfx/blender:color-management - Enable color management via media-libs/opencolorio.
 media-gfx/blender:cuda - Build cycles renderer with nVidia CUDA support.
 media-gfx/blender:cycles - Build cycles renderer (requires media-libs/openimageio and dev-libs/boost).
 media-gfx/blender:dds - Adds DDS textures support to Blender.
@@ -4601,12 +4588,12 @@ media-libs/opencv:testprograms - Build and install programs for testing OpenCV (
 media-libs/opencv:vtk - Build new 3D visualization module viz based on sci-libs/vtk
 media-libs/openh264:plugin - Install the Gecko Media Plugin (GMP) for use with Mozilla packages
 media-libs/openh264:utils - Install the CLI encoder and decoder utilities
-media-libs/openimageio:colorio - Use media-libs/opencolorio
+media-libs/openimageio:color-management - Enable color management via media-libs/opencolorio
 media-libs/openimageio:cpu_flags_x86_avx512f - SIMD Optimization
 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:field3d - Enable f3d file (write) support via media-libs/Field3D
+media-libs/openimageio:opencv - Enable OpenCV support via media-libs/opencv
+media-libs/openimageio:ptex - Enable Ptex texture mapping system file support via media-libs/ptex
 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.
@@ -5106,7 +5093,6 @@ media-tv/mythtv:mythlogserver - Enable support for syslog and file logging. Not
 media-tv/mythtv:perl - Builds the perl bindings for MythTV. Allows you to write scripts in Perl to control your MythTV setup or communicate with it.
 media-tv/mythtv:wrapper - Use Ubuntu mythtfrontend wrapper.
 media-tv/mythtv:xmltv - Pulls in the media-tv/xmltv TV listing grabbers for users not using Schedules Direct.
-media-tv/tvbrowser:themes - Install extra theme packs
 media-tv/tvheadend:capmt - Enable support for capmt (dvbapi) protocol
 media-tv/tvheadend:constcw - Enable support for the constcw protocol
 media-tv/tvheadend:cwc - Enable support for the cwc (newcamd) protocol
@@ -5835,6 +5821,7 @@ net-dns/opendnssec:opensc - Enables support for storing DNSSEC keys through a de
 net-dns/opendnssec:signer - Enables signing capabilities for OpenDNSSEC
 net-dns/opendnssec:softhsm - Enables support for storing DNSSEC keys in a dev-libs/softhsm PKCS#11 object
 net-dns/pdns:botan - Make it possible to use the dev-libs/botan library for crypto-related stuff (like DNSSec) which can be significantly faster than PolarSSL.
+net-dns/pdns:lua-records - Enable LUA records.
 net-dns/pdns:mydns - Making it possible to use a MyDNS MySQL database with PowerDNS (not recommended for new deployments).
 net-dns/pdns:opendbx - Use a database supported by dev-db/opendbx as backend.
 net-dns/pdns:protobuf - Enable support for dev-libs/protobuf.
@@ -6925,6 +6912,7 @@ net-misc/vinagre:spice - Enable access to SPICE-enabled virtual machines
 net-misc/vinagre:ssh - Enable ssh plugin using x11-libs/vte
 net-misc/vinagre:telepathy - Enable access to remote desktop via a net-libs/telepathy-glib client
 net-misc/vino:telepathy - Enable desktop sharing through a telepathy client
+net-misc/wget:cookie_check - Enable cookie checks via net-libs/libpsl
 net-misc/wget:ntlm - Enable support for NTLM (Windows-based) authorization
 net-misc/wget:uuid - Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)
 net-misc/wicd:ambiance - Install icons from Ubuntu's ambiance theme
@@ -7064,6 +7052,7 @@ net-print/cups:python - Add support for the Python interpeter in the web server
 net-print/cups-filters:foomatic - Build the included foomatic-rip printer driver. Strongly recommended.
 net-print/cups-filters:ipp_autosetup - Let cups-browsed automatically set up IPP network printers by default.
 net-print/cups-filters:pclm - Enable PCLm support
+net-print/dymo-cups-drivers:usb_modeswitch - Include usb_modeswitch for some hardware (bug #601242)
 net-print/fax4cups:efax - Install net-misc/efax backend
 net-print/fax4cups:hylafax - Install net-misc/hylafax backend
 net-print/fax4cups:mgetty-fax - Install net-dialup/mgetty backend
@@ -7228,7 +7217,8 @@ net-wireless/bluez:deprecated - Build deprecated plugins
 net-wireless/bluez:experimental - Build experimental plugins
 net-wireless/bluez:extra-tools - Install tools that upstream doesn't install on purpose by default. All this tools shouldn't be used. Then, please notify upstream about you still need them to let them know the situation.
 net-wireless/bluez:mesh - Add support for Bluetooth Mesh control application and advertising bearer.
-net-wireless/bluez:obex - Enable OBEX transfer support.
+net-wireless/bluez:midi - Enable MIDI support
+net-wireless/bluez:obex - Enable OBEX transfer support
 net-wireless/bluez:test-programs - Install tools for testing of various Bluetooth functions
 net-wireless/bluez:user-session - Allow compatibility with user-session semantics for session bus under systemd
 net-wireless/chirp:radioreference - support downloading data from radioreference.com (premium users only)
@@ -7565,7 +7555,6 @@ sci-libs/grib_api:aec - Build with Adaptive Entropy Coding compression, needs sc
 sci-libs/grib_api:jasper - Use media-libs/jasper instead of media-libs/openjpeg for JPEG 2000 support
 sci-libs/gsl:cblas-external - Link gsl with external cblas provided by (virtual/cblas) instead of shipped internal version
 sci-libs/gsl:deprecated - Enable deprecated functions
-sci-libs/hdf5:fortran2003 - Enable new features that require Fortran 2003 (http://www.hdfgroup.org/HDF5/doc/fortran/NewFeatures_F2003.pdf)
 sci-libs/hdf5:hl - Enable high level API (https://support.hdfgroup.org/HDF5/doc/HL/index.html)
 sci-libs/hypre:fei - Build the internal Finite Element Interface routines
 sci-libs/hypre:int64 - Build the 64 bits integer library
@@ -8911,7 +8900,6 @@ www-plugins/adobe-flash:nsplugin - Install the Netscape Flash API plugin (for Fi
 www-plugins/adobe-flash:ppapi - Install the Pepper Flash API plugin (for Chrome and similar browsers)
 www-plugins/chrome-binary-plugins:widevine - Install the Widevine DRM library
 www-plugins/freshplayerplugin:gles2 - Use system GLESv2 libraries instead of ANGLE for shader translation
-www-plugins/freshplayerplugin:gtk3 - Build with GTK+ 3 instead of GTK+ 2
 www-plugins/freshplayerplugin:v4l - Use libv4l2 for colorspace conversion
 www-plugins/lightspark:gles - Replace default OpenGL renderer with GLESv2
 www-plugins/lightspark:ppapi - Install the PPAPI plugin (for Chromium)
@@ -9129,6 +9117,7 @@ x11-misc/polybar:network - Enable network support
 x11-misc/py3status:gevent - Install extra requirement dev-python/gevent to enable green threads.
 x11-misc/py3status:udev - Install extra requirement dev-python/pyudev to enable udev events monitoring on modules.
 x11-misc/qt5ct:dbus - Enable system tray and global menu support
+x11-misc/qtfm:dbus - Install the qtfm-tray removable device manager
 x11-misc/qtfm:shared - Install the libQtFM shared library and headers
 x11-misc/redshift:geoclue - Control dependency on app-misc/geoclue
 x11-misc/rofi:windowmode - Enable normal window mode
@@ -9310,6 +9299,7 @@ x11-wm/xpra:pillow - Enable pillow support
 x11-wm/xpra:server - Build server-side code
 x11-wm/xpra:vpx - Enable vpx image format support
 x11-wm/xpra:webcam - Enable webcam support via opencv
+xfce-base/exo:gtk2 - Build deprecated GTK+2 libexo-1 library.
 xfce-base/garcon:gtk2 - Build the garcon-gtk2-1 library (required for xfce-base/xfce4-panel < 4.13 only).
 xfce-base/libxfce4ui:glade - Build support for Glade 3's GtkBuilder implementation
 xfce-base/thunar:trash-panel-plugin - Build the trash status indicator plugin for the XFCE panel