gentoo resync : 04.01.2022

26 files changed, 2 insertions, 255 deletions

diff --git a/profiles/default/linux/riscv/17.0/rv32imac/eapi b/profiles/default/linux/riscv/17.0/rv32imac/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/ilp32/eapi b/profiles/default/linux/riscv/17.0/rv32imac/ilp32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/ilp32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/ilp32/parent b/profiles/default/linux/riscv/17.0/rv32imac/ilp32/parent
deleted file mode 100644
index a29c20c15237..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/ilp32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/riscv/rv32imac/ilp32
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/eapi b/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/parent b/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/parent
deleted file mode 100644
index f30144c36328..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/riscv/rv32imac/ilp32d
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/parent b/profiles/default/linux/riscv/17.0/rv32imac/parent
deleted file mode 100644
index 5c520eb16b4e..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../..
-../../../../../arch/riscv/rv32imac
-../../../../../releases/17.0
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/deprecated
deleted file mode 100644
index 36128fb4712c..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-default/linux/riscv/20.0/rv64gc/lp64d
-
-On RISC-V we are switching from two-level library directories (e.g., 
-/usr/lib64/lp64d) to a more traditional directory architecture.
-This is done via the profile upgrade from 17.0 to 20.0 profiles.
-
-We recommend to re-install from scratch using a 20.0 profile based
-stage. 17.0 profiles will be deprecated immediately and removed
-in 6 months.
-
-If you want to upgrade an existing installation, the following
-steps should be taken. Please read all commands carefully first and
-make sure you understand them, since the procedure is risky. The 
-commands are given for a lp64d profile; in case of a lp64 profile, 
-always replace lp64d with lp64.
-
-# cd /usr/local/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /usr/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# sln . lp64d
-
-Note that the last command uses "sln" instead of "ln -s".
-
-Then switch from your 17.0 profile to the corresponding 20.0 profile,
-either by using "eselect profile" or by manually changing the
-/etc/portage/make.profile symlink.
-
-Next, rebuild all packages:
-
-# emerge -eav world
-
-As last step, check if portage has removed any of the symlinks created 
-above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/eapi b/profiles/default/linux/riscv/17.0/rv64gc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated
deleted file mode 100644
index e38047556647..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-default/linux/riscv/20.0/rv64gc/lp64
-
-On RISC-V we are switching from two-level library directories (e.g., 
-/usr/lib64/lp64d) to a more traditional directory architecture.
-This is done via the profile upgrade from 17.0 to 20.0 profiles.
-
-We recommend to re-install from scratch using a 20.0 profile based
-stage. 17.0 profiles will be deprecated immediately and removed
-in 6 months.
-
-If you want to upgrade an existing installation, the following
-steps should be taken. Please read all commands carefully first and
-make sure you understand them, since the procedure is risky. The 
-commands are given for a lp64d profile; in case of a lp64 profile, 
-always replace lp64d with lp64.
-
-# cd /usr/local/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /usr/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# sln . lp64d
-
-Note that the last command uses "sln" instead of "ln -s".
-
-Then switch from your 17.0 profile to the corresponding 20.0 profile,
-either by using "eselect profile" or by manually changing the
-/etc/portage/make.profile symlink.
-
-Next, rebuild all packages:
-
-# emerge -eav world
-
-As last step, check if portage has removed any of the symlinks created 
-above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/eapi b/profiles/default/linux/riscv/17.0/rv64gc/lp64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/parent b/profiles/default/linux/riscv/17.0/rv64gc/lp64/parent
deleted file mode 100644
index 0273fe595371..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/riscv/rv64gc/lp64
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated
deleted file mode 100644
index 70e347cc4398..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-default/linux/riscv/20.0/rv64gc/lp64/systemd
-
-On RISC-V we are switching from two-level library directories (e.g., 
-/usr/lib64/lp64d) to a more traditional directory architecture.
-This is done via the profile upgrade from 17.0 to 20.0 profiles.
-
-We recommend to re-install from scratch using a 20.0 profile based
-stage. 17.0 profiles will be deprecated immediately and removed
-in 6 months.
-
-If you want to upgrade an existing installation, the following
-steps should be taken. Please read all commands carefully first and
-make sure you understand them, since the procedure is risky. The 
-commands are given for a lp64d profile; in case of a lp64 profile, 
-always replace lp64d with lp64.
-
-# cd /usr/local/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /usr/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# sln . lp64d
-
-Note that the last command uses "sln" instead of "ln -s".
-
-Then switch from your 17.0 profile to the corresponding 20.0 profile,
-either by using "eselect profile" or by manually changing the
-/etc/portage/make.profile symlink.
-
-Next, rebuild all packages:
-
-# emerge -eav world
-
-As last step, check if portage has removed any of the symlinks created 
-above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/eapi b/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/parent b/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/parent
deleted file mode 100644
index 44f88d3e2df0..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated
deleted file mode 100644
index 36128fb4712c..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-default/linux/riscv/20.0/rv64gc/lp64d
-
-On RISC-V we are switching from two-level library directories (e.g., 
-/usr/lib64/lp64d) to a more traditional directory architecture.
-This is done via the profile upgrade from 17.0 to 20.0 profiles.
-
-We recommend to re-install from scratch using a 20.0 profile based
-stage. 17.0 profiles will be deprecated immediately and removed
-in 6 months.
-
-If you want to upgrade an existing installation, the following
-steps should be taken. Please read all commands carefully first and
-make sure you understand them, since the procedure is risky. The 
-commands are given for a lp64d profile; in case of a lp64 profile, 
-always replace lp64d with lp64.
-
-# cd /usr/local/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /usr/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# sln . lp64d
-
-Note that the last command uses "sln" instead of "ln -s".
-
-Then switch from your 17.0 profile to the corresponding 20.0 profile,
-either by using "eselect profile" or by manually changing the
-/etc/portage/make.profile symlink.
-
-Next, rebuild all packages:
-
-# emerge -eav world
-
-As last step, check if portage has removed any of the symlinks created 
-above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/eapi b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/parent b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/parent
deleted file mode 100644
index f497f659b838..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/riscv/rv64gc/lp64d
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated
deleted file mode 100644
index cbac179df32e..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-default/linux/riscv/20.0/rv64gc/lp64d/systemd
-
-On RISC-V we are switching from two-level library directories (e.g., 
-/usr/lib64/lp64d) to a more traditional directory architecture.
-This is done via the profile upgrade from 17.0 to 20.0 profiles.
-
-We recommend to re-install from scratch using a 20.0 profile based
-stage. 17.0 profiles will be deprecated immediately and removed
-in 6 months.
-
-If you want to upgrade an existing installation, the following
-steps should be taken. Please read all commands carefully first and
-make sure you understand them, since the procedure is risky. The 
-commands are given for a lp64d profile; in case of a lp64 profile, 
-always replace lp64d with lp64.
-
-# cd /usr/local/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /usr/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# sln . lp64d
-
-Note that the last command uses "sln" instead of "ln -s".
-
-Then switch from your 17.0 profile to the corresponding 20.0 profile,
-either by using "eselect profile" or by manually changing the
-/etc/portage/make.profile symlink.
-
-Next, rebuild all packages:
-
-# emerge -eav world
-
-As last step, check if portage has removed any of the symlinks created 
-above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/eapi b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/parent b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/parent
deleted file mode 100644
index 44f88d3e2df0..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/parent b/profiles/default/linux/riscv/17.0/rv64gc/parent
deleted file mode 100644
index 689797260969..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../..
-../../../../../arch/riscv/rv64gc
-../../../../../releases/17.0
diff --git a/profiles/default/linux/riscv/20.0/rv32imac/parent b/profiles/default/linux/riscv/20.0/rv32imac/parent
index 4e6e3225bf31..b8f5b5cbc9d2 100644
--- a/profiles/default/linux/riscv/20.0/rv32imac/parent
+++ b/profiles/default/linux/riscv/20.0/rv32imac/parent
@@ -1,4 +1,2 @@
 ../..
-../../../../../arch/riscv/rv32imac
 ../../../../../releases/17.0
-../../../../../arch/riscv/1level
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults b/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults
deleted file mode 100644
index 42e660f1a345..000000000000
--- a/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# we need to reset the two-level libdirs here, otherwise the one-level
-# paths lead to collisions... note that the default abi libdir remains
-# "lib64"
-
-LIBDIR_lp64="lib64/lp64"
-LIBDIR_ilp32d="lib32/ilp32d"
-LIBDIR_ilp32="lib32/ilp32"
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent b/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent
index f3229c5b9876..eef8b55d0efc 100644
--- a/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent
@@ -1 +1,2 @@
 ..
+../../../../../../arch/riscv/rv64gc/lp64d-multilib
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/parent b/profiles/default/linux/riscv/20.0/rv64gc/parent
index 0f380a1962bb..b8f5b5cbc9d2 100644
--- a/profiles/default/linux/riscv/20.0/rv64gc/parent
+++ b/profiles/default/linux/riscv/20.0/rv64gc/parent
@@ -1,4 +1,2 @@
 ../..
-../../../../../arch/riscv/rv64gc
 ../../../../../releases/17.0
-../../../../../arch/riscv/1level
diff --git a/profiles/default/linux/riscv/parent b/profiles/default/linux/riscv/parent
index 9f9d2cbed246..1f65d976126f 100644
--- a/profiles/default/linux/riscv/parent
+++ b/profiles/default/linux/riscv/parent
@@ -1,2 +1,3 @@
 ../../../base
 ..
+../../../arch/riscv