7 files changed, 2 insertions, 40 deletions
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