gentoo resync : 24.12.2018

95 files changed, 63 insertions, 247 deletions

diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/deprecated b/profiles/default/bsd/fbsd/amd64/9.1/clang/deprecated
deleted file mode 100644
index 13f0df199043..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-default/bsd/fbsd/amd64/11.1/clang
-Please read carefully the wiki.
-Follow the correct steps, or your system will be broken.
-https://wiki.gentoo.org/wiki/Gentoo_FreeBSD/Upgrade_Guide
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/parent b/profiles/default/bsd/fbsd/amd64/9.1/clang/parent
deleted file mode 100644
index 7dbda405f0ab..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/amd64-fbsd/clang
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/deprecated b/profiles/default/bsd/fbsd/amd64/9.1/deprecated
deleted file mode 100644
index 88ac54609b93..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-default/bsd/fbsd/amd64/11.1
-Please read carefully the wiki.
-Follow the correct steps, or your system will be broken.
-https://wiki.gentoo.org/wiki/Gentoo_FreeBSD/Upgrade_Guide
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/make.defaults b/profiles/default/bsd/fbsd/amd64/9.1/make.defaults
deleted file mode 100644
index 8faa71fa90db..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-CHOST="x86_64-gentoo-freebsd9.1"
-CHOST_amd64_fbsd="x86_64-gentoo-freebsd9.1"
-CHOST_x86_fbsd="i686-gentoo-freebsd9.1"
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/parent b/profiles/default/bsd/fbsd/amd64/9.1/parent
deleted file mode 100644
index 9e6af7fa2087..000000000000
--- a/profiles/default/bsd/fbsd/amd64/9.1/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-9.1
diff --git a/profiles/default/bsd/fbsd/package.use.mask b/profiles/default/bsd/fbsd/package.use.mask
index f8738cd8f8a0..2a37504795be 100644
--- a/profiles/default/bsd/fbsd/package.use.mask
+++ b/profiles/default/bsd/fbsd/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (06 Apr 2018)
@@ -109,10 +109,6 @@ net-fs/samba dmapi
 # Mask numa on sys-apps/hwloc. numactl not available on FreeBSD
 sys-apps/hwloc numa
 
-# Matt Turner <mattst88@gentoo.org> (07 Mar 2014)
-# media-libs/libomxil-bellagio keyworded on amd64/x86
-media-libs/mesa openmax
-
 # Naohiro Aota <naota@gentoo.org> (07 Jul 2014)
 # xattr support is not available on BSD #501534
 sys-apps/portage xattr
diff --git a/profiles/default/bsd/fbsd/x86/9.1/deprecated b/profiles/default/bsd/fbsd/x86/9.1/deprecated
deleted file mode 100644
index 546bed1271ab..000000000000
--- a/profiles/default/bsd/fbsd/x86/9.1/deprecated
+++ /dev/null
@@ -1,4 +0,0 @@
-default/bsd/fbsd/x86/11.1
-Please read carefully the wiki.
-Follow the correct steps, or your system will be broken.
-https://wiki.gentoo.org/wiki/Gentoo_FreeBSD/Upgrade_Guide
diff --git a/profiles/default/bsd/fbsd/x86/9.1/eapi b/profiles/default/bsd/fbsd/x86/9.1/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/bsd/fbsd/x86/9.1/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/bsd/fbsd/x86/9.1/make.defaults b/profiles/default/bsd/fbsd/x86/9.1/make.defaults
deleted file mode 100644
index e2041a7e2c58..000000000000
--- a/profiles/default/bsd/fbsd/x86/9.1/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-CHOST="i686-gentoo-freebsd9.1"
diff --git a/profiles/default/bsd/fbsd/x86/9.1/parent b/profiles/default/bsd/fbsd/x86/9.1/parent
deleted file mode 100644
index 9e6af7fa2087..000000000000
--- a/profiles/default/bsd/fbsd/x86/9.1/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-9.1
diff --git a/profiles/default/bsd/use.mask b/profiles/default/bsd/use.mask
index 804ed3af341f..b72658438e2f 100644
--- a/profiles/default/bsd/use.mask
+++ b/profiles/default/bsd/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License, v2
 
 # Mart Raudsepp <leio@gentoo.org>
@@ -56,7 +56,6 @@ tslib
 
 # Mask Xorg-modular drivers that are Linux-specific
 input_devices_evdev
-input_devices_tslib
 input_devices_synaptics
 input_devices_vmmouse
 video_cards_vmware
diff --git a/profiles/default/linux/alpha/13.0/deprecated b/profiles/default/linux/alpha/13.0/deprecated
new file mode 100644
index 000000000000..15345d4866b7
--- /dev/null
+++ b/profiles/default/linux/alpha/13.0/deprecated
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..572c7a7d075d
--- /dev/null
+++ b/profiles/default/linux/alpha/13.0/desktop/deprecated
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..cc40f08b5b42
--- /dev/null
+++ b/profiles/default/linux/alpha/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/alpha/17.0/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
new file mode 100644
index 000000000000..0de99d2db127
--- /dev/null
+++ b/profiles/default/linux/alpha/13.0/desktop/gnome/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/alpha/17.0/desktop/gnome/systemd
diff --git a/profiles/default/linux/alpha/13.0/developer/deprecated b/profiles/default/linux/alpha/13.0/developer/deprecated
new file mode 100644
index 000000000000..9e27c1788808
--- /dev/null
+++ b/profiles/default/linux/alpha/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/alpha/17.0/developer
diff --git a/profiles/default/linux/amd64/dev/32bit-userland/README b/profiles/default/linux/amd64/dev/32bit-userland/README
deleted file mode 100644
index f4de3d032949..000000000000
--- a/profiles/default/linux/amd64/dev/32bit-userland/README
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-IMPORTANT
-=========
-
-Here's how to use this profile. Any other use will probably break your installation, so you better follow it closely.
-
-1. Download the latest amd64 stage2 tarball
-2. Unpack it to your chroot location and do all the bind mounts
-3. Chroot in
-4. run `find /usr/lib64 /lib64 -exec touch {} \;'
-5. remove the "CHOST=" line from /etc/make.conf
-6. change the /etc/make.profile link to this profile
-7. run `emerge -e world'
-
-Dependencies might not always be quite correct. Don't use this profile for anything else then creating emul-libs.
diff --git a/profiles/default/linux/amd64/dev/32bit-userland/eapi b/profiles/default/linux/amd64/dev/32bit-userland/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/dev/32bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/dev/32bit-userland/make.defaults b/profiles/default/linux/amd64/dev/32bit-userland/make.defaults
deleted file mode 100644
index 00af93eb7f4c..000000000000
--- a/profiles/default/linux/amd64/dev/32bit-userland/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DEFAULT_ABI="x86"
-ABI="x86"
-
-CHOST="i686-pc-linux-gnu"
-
-FEATURES="collision-protect multilib-strict"
-
-CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
diff --git a/profiles/default/linux/amd64/dev/32bit-userland/parent b/profiles/default/linux/amd64/dev/32bit-userland/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/amd64/dev/32bit-userland/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/amd64/dev/eapi b/profiles/default/linux/amd64/dev/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/dev/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/dev/parent b/profiles/default/linux/amd64/dev/parent
deleted file mode 100644
index 36c90bd12373..000000000000
--- a/profiles/default/linux/amd64/dev/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/amd64/lib32
diff --git a/profiles/default/linux/arm/13.0/armv6j/package.mask b/profiles/default/linux/arm/13.0/armv6j/package.mask
index 6a132627c621..f1209c547739 100644
--- a/profiles/default/linux/arm/13.0/armv6j/package.mask
+++ b/profiles/default/linux/arm/13.0/armv6j/package.mask
@@ -6,6 +6,7 @@
 # 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
diff --git a/profiles/default/linux/arm/13.0/armv6j/package.use.mask b/profiles/default/linux/arm/13.0/armv6j/package.use.mask
new file mode 100644
index 000000000000..828731960a1a
--- /dev/null
+++ b/profiles/default/linux/arm/13.0/armv6j/package.use.mask
@@ -0,0 +1,11 @@
+# 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
+
+# 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/package.mask b/profiles/default/linux/arm/13.0/armv7a/package.mask
index 6a132627c621..f1209c547739 100644
--- a/profiles/default/linux/arm/13.0/armv7a/package.mask
+++ b/profiles/default/linux/arm/13.0/armv7a/package.mask
@@ -6,6 +6,7 @@
 # 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
diff --git a/profiles/default/linux/arm/13.0/armv7a/package.use.mask b/profiles/default/linux/arm/13.0/armv7a/package.use.mask
new file mode 100644
index 000000000000..828731960a1a
--- /dev/null
+++ b/profiles/default/linux/arm/13.0/armv7a/package.use.mask
@@ -0,0 +1,11 @@
+# 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
+
+# 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/arm64/13.0/deprecated b/profiles/default/linux/arm64/13.0/deprecated
new file mode 100644
index 000000000000..4f618b09cb41
--- /dev/null
+++ b/profiles/default/linux/arm64/13.0/deprecated
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..4755eb879a8c
--- /dev/null
+++ b/profiles/default/linux/arm64/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/desktop
diff --git a/profiles/default/linux/arm64/13.0/desktop/systemd/deprecated b/profiles/default/linux/arm64/13.0/desktop/systemd/deprecated
new file mode 100644
index 000000000000..1a721bb40559
--- /dev/null
+++ b/profiles/default/linux/arm64/13.0/desktop/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/desktop/systemd
diff --git a/profiles/default/linux/arm64/13.0/developer/deprecated b/profiles/default/linux/arm64/13.0/developer/deprecated
new file mode 100644
index 000000000000..a85ff5b5e763
--- /dev/null
+++ b/profiles/default/linux/arm64/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/developer
diff --git a/profiles/default/linux/arm64/13.0/systemd/deprecated b/profiles/default/linux/arm64/13.0/systemd/deprecated
new file mode 100644
index 000000000000..94f203bfd798
--- /dev/null
+++ b/profiles/default/linux/arm64/13.0/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/systemd
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/eapi b/profiles/default/linux/arm64/17.0/big-endian/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/bsd/fbsd/amd64/9.1/eapi
+++ b/profiles/default/linux/arm64/17.0/big-endian/eapi
diff --git a/profiles/default/linux/arm64/17.0/big-endian/parent b/profiles/default/linux/arm64/17.0/big-endian/parent
new file mode 100644
index 000000000000..a7cd964146bc
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/big-endian/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/arm64/big-endian
diff --git a/profiles/default/linux/musl/amd64/deprecated b/profiles/default/linux/musl/amd64/deprecated
new file mode 100644
index 000000000000..4c737f95b902
--- /dev/null
+++ b/profiles/default/linux/musl/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/musl
diff --git a/profiles/default/linux/musl/amd64/x32/deprecated b/profiles/default/linux/musl/amd64/x32/deprecated
new file mode 100644
index 000000000000..5cbfaf5838b0
--- /dev/null
+++ b/profiles/default/linux/musl/amd64/x32/deprecated
@@ -0,0 +1 @@
+# no successor
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index e0a59b79143b..709efdd81d3d 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -1,7 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
-sys-libs/uclibc
 sys-libs/uclibc-ng
 sys-libs/glibc
 
diff --git a/profiles/default/linux/musl/package.use.mask b/profiles/default/linux/musl/package.use.mask
index 1d3c7789f416..d7dd0ba8ca40 100644
--- a/profiles/default/linux/musl/package.use.mask
+++ b/profiles/default/linux/musl/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See bug #604542
@@ -15,9 +15,6 @@ sys-devel/llvm sanitize
 sys-devel/gettext nls
 sys-fs/e2fsprogs nls
 
-# See bug #576928
-media-libs/mesa nptl
-
 # bash-malloc relies on sbrk which is implemented
 # as a fail-only stub in musl. breaks horribly if enabled.
 # bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated)
diff --git a/profiles/default/linux/musl/x86/depcrecated b/profiles/default/linux/musl/x86/depcrecated
new file mode 100644
index 000000000000..de584d75234d
--- /dev/null
+++ b/profiles/default/linux/musl/x86/depcrecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/musl
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 5e7de422f432..596bcd617ea5 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Jason Zaman <perfinion@gentoo.org> (06 Sep 2015)
@@ -15,10 +15,6 @@ kde-frameworks/kcoreaddons fam
 # https://archives.gentoo.org/gentoo-dev/message/38503d86a1c41bccfa607745467b1be7
 net-dns/bind seccomp
 
-# Matt Turner <mattst88@gentoo.org> (07 Mar 2014)
-# media-libs/libomxil-bellagio keyworded on amd64/x86
-media-libs/mesa openmax
-
 # Diego Elio Pettenò (27 Aug 2012)
 # The libpci access is only used for linux.
 net-analyzer/net-snmp -pci
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/deprecated b/profiles/default/linux/powerpc/ppc32/13.0/deprecated
new file mode 100644
index 000000000000..929365451947
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/13.0/deprecated
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..e2da581811c3
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/desktop
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/deprecated b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/deprecated
new file mode 100644
index 000000000000..a23caf119aa0
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/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
new file mode 100644
index 000000000000..2cae831340aa
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/developer/deprecated b/profiles/default/linux/powerpc/ppc32/13.0/developer/deprecated
new file mode 100644
index 000000000000..7842a4833c63
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/developer
diff --git a/profiles/default/linux/powerpc/ppc32/13.0/package.use.mask b/profiles/default/linux/powerpc/ppc32/13.0/package.use.mask
deleted file mode 100644
index c78ec8644a58..000000000000
--- a/profiles/default/linux/powerpc/ppc32/13.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/package.use.mask b/profiles/default/linux/powerpc/ppc32/17.0/package.use.mask
deleted file mode 100644
index c78ec8644a58..000000000000
--- a/profiles/default/linux/powerpc/ppc32/17.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/deprecated b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/deprecated
new file mode 100644
index 000000000000..af483b2343a8
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/deprecated
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..8cb866130cf7
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc64/17.0/32bit-userland/desktop
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
new file mode 100644
index 000000000000..68ce162f784c
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc64/17.0/32bit-userland/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
new file mode 100644
index 000000000000..bb04ad2f40fa
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd
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
new file mode 100644
index 000000000000..ec904edfe3df
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/13.0/32bit-userland/developer/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc64/17.0/32bit-userland/developer
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/eapi b/profiles/default/linux/powerpc/ppc64/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/parent
deleted file mode 100644
index 9e06c4505a75..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/eapi b/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f7739b405877..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/desktop/parent b/profiles/default/linux/powerpc/ppc64/13.0/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/developer/eapi b/profiles/default/linux/powerpc/ppc64/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/developer/parent b/profiles/default/linux/powerpc/ppc64/13.0/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc64/13.0/package.use.mask b/profiles/default/linux/powerpc/ppc64/13.0/package.use.mask
deleted file mode 100644
index c78ec8644a58..000000000000
--- a/profiles/default/linux/powerpc/ppc64/13.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/desktop/eapi b/profiles/default/linux/powerpc/ppc64/17.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/eapi b/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/parent b/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/parent
deleted file mode 100644
index 9e06c4505a75..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/eapi b/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f7739b405877..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/desktop/parent b/profiles/default/linux/powerpc/ppc64/17.0/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/developer/eapi b/profiles/default/linux/powerpc/ppc64/17.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/developer/parent b/profiles/default/linux/powerpc/ppc64/17.0/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/package.use.mask b/profiles/default/linux/powerpc/ppc64/17.0/package.use.mask
deleted file mode 100644
index c78ec8644a58..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
diff --git a/profiles/default/linux/sparc/13.0/deprecated b/profiles/default/linux/sparc/13.0/deprecated
new file mode 100644
index 000000000000..8b5335341bb3
--- /dev/null
+++ b/profiles/default/linux/sparc/13.0/deprecated
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..58447181ca1c
--- /dev/null
+++ b/profiles/default/linux/sparc/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/sparc/17.0/desktop
diff --git a/profiles/default/linux/sparc/13.0/desktop/gnome/deprecated b/profiles/default/linux/sparc/13.0/desktop/gnome/deprecated
new file mode 100644
index 000000000000..af47a3bf08fb
--- /dev/null
+++ b/profiles/default/linux/sparc/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/sparc/17.0/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
new file mode 100644
index 000000000000..2e26196d6e2b
--- /dev/null
+++ b/profiles/default/linux/sparc/13.0/desktop/gnome/systemd/deprecated
@@ -0,0 +1 @@
+default/linux/sparc/17.0/desktop/gnome/systemd
diff --git a/profiles/default/linux/sparc/13.0/developer/deprecated b/profiles/default/linux/sparc/13.0/developer/deprecated
new file mode 100644
index 000000000000..5e615ec123ac
--- /dev/null
+++ b/profiles/default/linux/sparc/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/sparc/17.0/developer
diff --git a/profiles/default/linux/sparc/13.0/package.use.mask b/profiles/default/linux/sparc/13.0/package.use.mask
index 5762f25bece2..865559c72173 100644
--- a/profiles/default/linux/sparc/13.0/package.use.mask
+++ b/profiles/default/linux/sparc/13.0/package.use.mask
@@ -1,12 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
-
 # Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
 #
 # Mask the vde flag on tinc because net-misc/vde is not
diff --git a/profiles/default/linux/sparc/17.0/package.use.mask b/profiles/default/linux/sparc/17.0/package.use.mask
index 5762f25bece2..865559c72173 100644
--- a/profiles/default/linux/sparc/17.0/package.use.mask
+++ b/profiles/default/linux/sparc/17.0/package.use.mask
@@ -1,12 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (Jul 24, 2014)
-# dmarc needs mail-filter/opendmarc, bug #489676
-# redis needs dev-libs/hiredis
-mail-mta/exim dmarc
-mail-mta/exim redis
-
 # Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
 #
 # Mask the vde flag on tinc because net-misc/vde is not
diff --git a/profiles/default/linux/sparc/experimental/eapi b/profiles/default/linux/sparc/experimental/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sparc/experimental/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sparc/experimental/multilib/desktop/eapi b/profiles/default/linux/sparc/experimental/multilib/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sparc/experimental/multilib/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sparc/experimental/multilib/desktop/parent b/profiles/default/linux/sparc/experimental/multilib/desktop/parent
deleted file mode 100644
index db8ce088c69a..000000000000
--- a/profiles/default/linux/sparc/experimental/multilib/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/sparc/experimental/multilib/developer/eapi b/profiles/default/linux/sparc/experimental/multilib/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sparc/experimental/multilib/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sparc/experimental/multilib/developer/parent b/profiles/default/linux/sparc/experimental/multilib/developer/parent
deleted file mode 100644
index 5c8258a71e32..000000000000
--- a/profiles/default/linux/sparc/experimental/multilib/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/developer
diff --git a/profiles/default/linux/sparc/experimental/multilib/eapi b/profiles/default/linux/sparc/experimental/multilib/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/sparc/experimental/multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults
deleted file mode 100644
index 32c57a2aa5e7..000000000000
--- a/profiles/default/linux/sparc/experimental/multilib/make.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Multilib stuff
-MULTILIB_ABIS="sparc32 sparc64"
-
-# without this glibc will segfault when compiling a sparc64 abi
-FEATURES="userpriv"
-
-# can't set this in the top level make.defaults as it breaks
-# sys-kernel/linux-headers for non-multilib profiles
-CFLAGS_sparc64="-m64"
-
-LIBDIR_sparc32="lib32"
-LIBDIR_sparc64="lib64"
diff --git a/profiles/default/linux/sparc/experimental/multilib/package.use.mask b/profiles/default/linux/sparc/experimental/multilib/package.use.mask
deleted file mode 100644
index 1e3b836871c0..000000000000
--- a/profiles/default/linux/sparc/experimental/multilib/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Needs all X libraries in both 32 and 64 bit..
-sys-devel/gcc awt
diff --git a/profiles/default/linux/sparc/experimental/multilib/packages b/profiles/default/linux/sparc/experimental/multilib/packages
deleted file mode 100644
index cc2785b25d52..000000000000
--- a/profiles/default/linux/sparc/experimental/multilib/packages
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# older versions of gcc don't support biarch
-*>=sys-devel/gcc-4.3.2-r1
-
-# building a sparc64 ABI with older versions doesn't work right
-*>=sys-libs/glibc-2.7
diff --git a/profiles/default/linux/sparc/experimental/multilib/parent b/profiles/default/linux/sparc/experimental/multilib/parent
deleted file mode 100644
index 04ec01cf0979..000000000000
--- a/profiles/default/linux/sparc/experimental/multilib/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../releases/13.0
-../../../../../features/multilib
diff --git a/profiles/default/linux/sparc/experimental/multilib/profile.bashrc b/profiles/default/linux/sparc/experimental/multilib/profile.bashrc
deleted file mode 100644
index 00533800398d..000000000000
--- a/profiles/default/linux/sparc/experimental/multilib/profile.bashrc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [[ "${EBUILD_PHASE}" == "setup" ]]
-then
-	if [[ ! "${I_READ_THE_MULTILIB_MIGRATION_GUIDE}" == "yes" ]]
-	then
-		ewarn "When migrating to the new sparc mutlilib profile please keep in mind that it"
-		ewarn "is still in an experimental state. Also note that you need to follow the"
-		ewarn "migration guide [0], otherwise important packages such as gcc or glibc will"
-		ewarn "fail to compile and most other packages will be installed incorrectly."
-		ewarn ""
-		ewarn "[0] http://sparc.gentoo.org/multilib.xml"
-		echo
-	fi
-fi
diff --git a/profiles/default/linux/sparc/experimental/parent b/profiles/default/linux/sparc/experimental/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/sparc/experimental/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/uclibc/amd64/deprecated b/profiles/default/linux/uclibc/amd64/deprecated
new file mode 100644
index 000000000000..8a945baef61f
--- /dev/null
+++ b/profiles/default/linux/uclibc/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/uclibc
diff --git a/profiles/default/linux/uclibc/arm/armv6j/eapi b/profiles/default/linux/uclibc/arm/armv6j/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/uclibc/arm/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/uclibc/arm/armv6j/make.defaults b/profiles/default/linux/uclibc/arm/armv6j/make.defaults
deleted file mode 100644
index 85682272eded..000000000000
--- a/profiles/default/linux/uclibc/arm/armv6j/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="armv6j-hardfloat-linux-uclibceabi"
-CHOST_arm="${CHOST}"
-
-CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/uclibc/arm/armv6j/package.mask b/profiles/default/linux/uclibc/arm/armv6j/package.mask
deleted file mode 100644
index 6a132627c621..000000000000
--- a/profiles/default/linux/uclibc/arm/armv6j/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/armv6j/parent b/profiles/default/linux/uclibc/arm/armv6j/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/uclibc/arm/armv6j/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/uclibc/arm/package.use.mask b/profiles/default/linux/uclibc/arm/package.use.mask
index ffa173872180..de5fa3dc4237 100644
--- a/profiles/default/linux/uclibc/arm/package.use.mask
+++ b/profiles/default/linux/uclibc/arm/package.use.mask
@@ -5,16 +5,6 @@
 # Requires dev-libs/mongo-c-driver which isn't keyworded
 >=app-admin/rsyslog-8.31 mongodb
 
-# Davide Pesavento <pesa@gentoo.org> (19 Dec 2016)
-# Various unkeyworded deps: >=sys-devel/clang-3.9 (#591822),
-# dev-qt/qtquickcontrols2 (#603054), dev-qt/qtwebengine (#581478)
-dev-qt/qt-creator clangcodemodel clangstaticanalyzer test webengine
-
-# Davide Pesavento <pesa@gentoo.org> (28 Jul 2016)
-# The corresponding Qt5 modules are not keyworded on arm, and we don't want to
-# keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 webengine
-
 # Thomas Deutschmann <whissi@whissi.de> (25 Apr 2016), on behalf of
 # Ian Delaney <idella4@gentoo.org> (25 Apr 2016)
 # for the proxy-maintainers project
diff --git a/profiles/default/linux/uclibc/x86/deprecated b/profiles/default/linux/uclibc/x86/deprecated
new file mode 100644
index 000000000000..833a2d0f9412
--- /dev/null
+++ b/profiles/default/linux/uclibc/x86/deprecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/uclibc