gentoo resync : 25.11.2020

24 files changed, 840 insertions, 13 deletions

diff --git a/profiles/default/linux/amd64/17.0/deprecated b/profiles/default/linux/amd64/17.0/deprecated
new file mode 100644
index 000000000000..c11d41187d8d
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/desktop/deprecated b/profiles/default/linux/amd64/17.0/desktop/deprecated
new file mode 100644
index 000000000000..d29b4ea76578
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/desktop/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/desktop
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated b/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
new file mode 100644
index 000000000000..e65fc37f913d
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/desktop/gnome
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
new file mode 100644
index 000000000000..d5c8416510da
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/desktop/gnome/systemd
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated b/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
new file mode 100644
index 000000000000..c05ef3691bc5
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/desktop/plasma
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
new file mode 100644
index 000000000000..f817b8c47e0e
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/desktop/plasma/systemd
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/developer/deprecated b/profiles/default/linux/amd64/17.0/developer/deprecated
new file mode 100644
index 000000000000..5628b3931f36
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/developer/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/developer
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/hardened/deprecated b/profiles/default/linux/amd64/17.0/hardened/deprecated
new file mode 100644
index 000000000000..1c1eadf982e9
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/hardened/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/hardened
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated b/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
new file mode 100644
index 000000000000..7a9f9d079a5b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/hardened/selinux
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/deprecated
new file mode 100644
index 000000000000..7c071d514eed
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/no-multilib
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
new file mode 100644
index 000000000000..b5d8bd8b093d
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/no-multilib/hardened
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated
new file mode 100644
index 000000000000..0d123229db03
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/no-multilib/hardened/selinux
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/selinux/deprecated b/profiles/default/linux/amd64/17.0/selinux/deprecated
new file mode 100644
index 000000000000..06df9d539675
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/selinux/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/selinux
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.0/systemd/deprecated b/profiles/default/linux/amd64/17.0/systemd/deprecated
new file mode 100644
index 000000000000..9d35e3be2e3f
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/systemd/deprecated
@@ -0,0 +1,59 @@
+default/linux/amd64/17.1/systemd
+
+The amd64 17.1 profiles switch to a more standard 'no SYMLINK_LIB' 
+multilib layout, and require an explicit migration.
+The migration is performed using the app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 3.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+     # eselect profile set default/linux/amd64/17.1/desktop
+
+[at this point you can start using emerge again. emerge will then 
+ not display this message anymore, but the remaining steps are still 
+ required!]
+
+9. Rebuild gcc:
+      # emerge -1v sys-devel/gcc:9.3.0
+      [ repeat for other slots you will be using ]
+
+10. If you are using a multilib profile, rebuild all 32-bit packages.
+    This can be done using:
+      # emerge -1v --deep /lib32 /usr/lib32 /usr/lib/llvm/*/lib32
+
+11. Once the last 32-bit package is rebuilt, your package manager
+    should remove the orphaned /lib32 and /usr/lib32 symlinks.  If that
+    does not happen, remove them manually:
+      # rm /lib32 /usr/lib32
+
+For known issues, please see bug #506276 [1].  If you have any problems
+with the new profiles or the migration procedure, please report a bug
+and make it block the tracker.
+
+[1] https://bugs.gentoo.org/506276
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/eapi b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/parent b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/parent
new file mode 100644
index 000000000000..665aafbea8db
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/eapi b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/parent b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/parent
new file mode 100644
index 000000000000..7eed652658f8
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/eapi b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/parent b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..b3da232ba558
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/prefix/parent b/profiles/default/linux/amd64/17.1/no-multilib/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/hppa/package.use.mask b/profiles/default/linux/hppa/package.use.mask
index 129881bf303d..60580e813822 100644
--- a/profiles/default/linux/hppa/package.use.mask
+++ b/profiles/default/linux/hppa/package.use.mask
@@ -7,8 +7,4 @@
 # No hardware support for NUMA (bug #381313)
 sys-apps/hwloc numa
 
-# Jeroen Roovers <jer@gentoo.org> (2008-08-15)
-# HPPA still isn't supported with anything but -O0.
-www-client/firefox custom-optimization
-
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
diff --git a/profiles/default/linux/musl/package.use.mask b/profiles/default/linux/musl/package.use.mask
index ed9d78166df7..113ac0bd81a2 100644
--- a/profiles/default/linux/musl/package.use.mask
+++ b/profiles/default/linux/musl/package.use.mask
@@ -7,6 +7,9 @@ net-misc/iputils idn
 # See bug #504200
 sys-devel/gcc sanitize
 
+# Disable sanitizers for LLVM, see bug #753935
+sys-devel/clang-runtime sanitize
+
 # These cause collisions with <libintl.h>
 # even with --without-included-gettext
 sys-devel/gettext nls
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 2210983ff5a8..e9696e924b91 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Tony Vroon <chainsaw@gentoo.org> (2020-10-01)
-# Upstream requires Lua 5.2 which is not a satisfiable 
+# Upstream requires Lua 5.2 which is not a satisfiable
 # dependency at this point in time.
 app-arch/rpm lua
 
@@ -20,10 +20,6 @@ net-fs/samba fam
 # One example: https://tracker.ceph.com/issues/41523
 >=sys-cluster/ceph-14.2 dpdk
 
-# Jason Zaman <perfinion@gentoo.org> (2015-09-06)
-# This is masked in base/package.use.mask as Linux only.
-sys-auth/consolekit -cgroups
-
 # Michael Palimaka <kensington@gentoo.org> (2015-09-03)
 # Native inotify support is preferred on linux.
 kde-frameworks/kcoreaddons fam
@@ -44,10 +40,6 @@ sys-auth/pam_mktemp -prevent-removal
 sys-devel/gcc hardened
 sys-libs/glibc hardened
 
-# Samuli Suominen <ssuominen@gentoo.org (2012-03-20)
-# This is masked in base/package.use.mask as Linux only.
-sys-auth/consolekit -acl
-
 # Samuli Suominen <ssuominen@gentoo.org> (2012-01-10)
 # Masked in base/package.use.mask as Linux -only feature
 app-arch/libarchive -e2fsprogs