profiles: sync 17.0 deprecation notice with news item

Avoids confusion in support forums when referencing certain
steps and it's only going to help to have these in sync
anyway (to avoid people missing steps).

Signed-off-by: Sam James <sam@gentoo.org>

14 files changed, 475 insertions, 181 deletions

diff --git a/profiles/default/linux/amd64/17.0/deprecated b/profiles/default/linux/amd64/17.0/deprecated
index 91595130b2d6..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/deprecated
+++ b/profiles/default/linux/amd64/17.0/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/desktop/deprecated b/profiles/default/linux/amd64/17.0/desktop/deprecated
index b726cb19ea7a..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/desktop/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/desktop
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated b/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
index 995ec40fcfe2..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/gnome/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/desktop/gnome
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
index e64ddd762146..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/gnome/systemd/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/desktop/gnome/systemd
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated b/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
index 2eecded52231..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/desktop/plasma
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
index 83189d77ef50..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/desktop/plasma/systemd
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/developer/deprecated b/profiles/default/linux/amd64/17.0/developer/deprecated
index f3fe9f7f95bd..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/developer/deprecated
+++ b/profiles/default/linux/amd64/17.0/developer/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/developer
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/hardened/deprecated b/profiles/default/linux/amd64/17.0/hardened/deprecated
index 04b24997b203..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/hardened/deprecated
+++ b/profiles/default/linux/amd64/17.0/hardened/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/hardened
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated b/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
index 255b567bbbf6..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
+++ b/profiles/default/linux/amd64/17.0/hardened/selinux/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/hardened/selinux
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/deprecated
index b031cc932e9e..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/no-multilib/deprecated
+++ b/profiles/default/linux/amd64/17.0/no-multilib/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/no-multilib
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated b/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
index bd30b21ce48e..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/no-multilib/hardened
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
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
index 46ee10d2470c..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated
+++ b/profiles/default/linux/amd64/17.0/no-multilib/hardened/selinux/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/no-multilib/hardened/selinux
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/selinux/deprecated b/profiles/default/linux/amd64/17.0/selinux/deprecated
index 2e4dfe1314c0..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/selinux/deprecated
+++ b/profiles/default/linux/amd64/17.0/selinux/deprecated
@@ -1,53 +1,73 @@
-default/linux/amd64/17.1/selinux
+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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html
diff --git a/profiles/default/linux/amd64/17.0/systemd/deprecated b/profiles/default/linux/amd64/17.0/systemd/deprecated
index cb52626392cd..2c476214c5de 100644
--- a/profiles/default/linux/amd64/17.0/systemd/deprecated
+++ b/profiles/default/linux/amd64/17.0/systemd/deprecated
@@ -1,53 +1,73 @@
 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.
+multilib layout, and require an explicit migration. The migration is
+performed using the app-portage/unsymlink-lib tool.
+
+Read the Gentoo news item [2] for more information!
+
 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:
+2. If you are still running a 13.0 profile, select gcc 6.4.0 or later
+   as the system compiler, source /etc/profile and reinstall libtool:
+
+     # gcc-config -l
+     [1] x86_64-pc-linux-gnu-5.5.0 *
+     [2] x86_64-pc-linux-gnu-8.3.0
+     # gcc-config 2
+     # . /etc/profile
+     # emerge -1v libtool
+
+3. Install the tool:
      # emerge -1v app-portage/unsymlink-lib
 
-3. Run 'unsymlink-lib --analyze' and check the output for obvious
+4. 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. This is a very good time to make a backup.
 
-5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+6. 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.
+7. 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
+8. 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.:
+9. 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:
+10. Rebuild the toolchain:
       # emerge -1v sys-devel/gcc:9.3.0
       [ repeat for other slots you will be using ]
+      [ if you are upgrading from 13.0 profile, also: ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
 
-10. If you are using a multilib profile, rebuild all 32-bit packages.
+11. 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
+    Alternatively, if you are switching from one of the 13.0 profiles
+    you can rebuild all packages as detailed in the 17.0 news item:
+      # emerge -ev @world
+
+12. 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
@@ -57,3 +77,4 @@ with the new profiles or the migration procedure, please report a bug
 and make it block the tracker.
 
 [1] bug #506276
+[2] https://www.gentoo.org/support/news-items/2019-06-05-amd64-17-1-profiles-are-now-stable.html