gentoo auto-resync : 25:02:2024 - 17:40:36

7 files changed, 198 insertions, 141 deletions

diff --git a/profiles/default/linux/amd64/17.0/x32/systemd/deprecated b/profiles/default/linux/amd64/17.0/x32/systemd/deprecated
new file mode 100644
index 000000000000..76dd7eb1ebe9
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/x32/systemd/deprecated
@@ -0,0 +1,33 @@
+default/linux/amd64/17.0/x32/systemd/merged-usr
+
+As warned about previously in a news item, systemd-255 has dropped
+support for split-usr systems. All Gentoo systems running systemd will
+need to be migrated to merged-usr.
+
+Migrating to merged-usr will move all data from /bin, /sbin, and /lib
+into the /usr/bin and /usr/lib directories. The directories in / are
+replaced with symlinks.
+
+To facilitate this, a new set of sub-profiles has been created, and a
+script is available to perform the actual migration.
+
+To migrate a system to merged-usr, follow this procedure:
+
+1. Ensure your system backups are up to date. Please also update
+   your system fully and depclean before proceeding.
+
+2. Install sys-apps/merge-usr.
+
+3. Run "merge-usr --dryrun" as root to check for conflicts. These will
+   appear with the word ERROR at the start of the line.
+
+4. Resolve any conflicts. This may involve deleting duplicate files. If
+   in doubt, seek support in a Gentoo support channel.
+
+5. Run the merge-usr script from a root shell. Avoid running it via sudo
+   directly to avoid locking yourself out if an unexpected error occurs.
+
+6. Switch to a merged-usr profile.
+
+7. Run emerge with the --newuse or --changed-use option to rebuild
+   any packages that have a "split-usr" USE flag.
diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/deprecated b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/deprecated
new file mode 100644
index 000000000000..6564f566a31d
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/deprecated
@@ -0,0 +1,33 @@
+default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr
+
+As warned about previously in a news item, systemd-255 has dropped
+support for split-usr systems. All Gentoo systems running systemd will
+need to be migrated to merged-usr.
+
+Migrating to merged-usr will move all data from /bin, /sbin, and /lib
+into the /usr/bin and /usr/lib directories. The directories in / are
+replaced with symlinks.
+
+To facilitate this, a new set of sub-profiles has been created, and a
+script is available to perform the actual migration.
+
+To migrate a system to merged-usr, follow this procedure:
+
+1. Ensure your system backups are up to date. Please also update
+   your system fully and depclean before proceeding.
+
+2. Install sys-apps/merge-usr.
+
+3. Run "merge-usr --dryrun" as root to check for conflicts. These will
+   appear with the word ERROR at the start of the line.
+
+4. Resolve any conflicts. This may involve deleting duplicate files. If
+   in doubt, seek support in a Gentoo support channel.
+
+5. Run the merge-usr script from a root shell. Avoid running it via sudo
+   directly to avoid locking yourself out if an unexpected error occurs.
+
+6. Switch to a merged-usr profile.
+
+7. Run emerge with the --newuse or --changed-use option to rebuild
+   any packages that have a "split-usr" USE flag.
diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/deprecated b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/deprecated
new file mode 100644
index 000000000000..1bec4128defd
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/deprecated
@@ -0,0 +1,33 @@
+default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr
+
+As warned about previously in a news item, systemd-255 has dropped
+support for split-usr systems. All Gentoo systems running systemd will
+need to be migrated to merged-usr.
+
+Migrating to merged-usr will move all data from /bin, /sbin, and /lib
+into the /usr/bin and /usr/lib directories. The directories in / are
+replaced with symlinks.
+
+To facilitate this, a new set of sub-profiles has been created, and a
+script is available to perform the actual migration.
+
+To migrate a system to merged-usr, follow this procedure:
+
+1. Ensure your system backups are up to date. Please also update
+   your system fully and depclean before proceeding.
+
+2. Install sys-apps/merge-usr.
+
+3. Run "merge-usr --dryrun" as root to check for conflicts. These will
+   appear with the word ERROR at the start of the line.
+
+4. Resolve any conflicts. This may involve deleting duplicate files. If
+   in doubt, seek support in a Gentoo support channel.
+
+5. Run the merge-usr script from a root shell. Avoid running it via sudo
+   directly to avoid locking yourself out if an unexpected error occurs.
+
+6. Switch to a merged-usr profile.
+
+7. Run emerge with the --newuse or --changed-use option to rebuild
+   any packages that have a "split-usr" USE flag.
diff --git a/profiles/default/linux/amd64/17.1/desktop/systemd/deprecated b/profiles/default/linux/amd64/17.1/desktop/systemd/deprecated
new file mode 100644
index 000000000000..3c0b3773bd56
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/systemd/deprecated
@@ -0,0 +1,33 @@
+default/linux/amd64/17.1/desktop/systemd/merged-usr
+
+As warned about previously in a news item, systemd-255 has dropped
+support for split-usr systems. All Gentoo systems running systemd will
+need to be migrated to merged-usr.
+
+Migrating to merged-usr will move all data from /bin, /sbin, and /lib
+into the /usr/bin and /usr/lib directories. The directories in / are
+replaced with symlinks.
+
+To facilitate this, a new set of sub-profiles has been created, and a
+script is available to perform the actual migration.
+
+To migrate a system to merged-usr, follow this procedure:
+
+1. Ensure your system backups are up to date. Please also update
+   your system fully and depclean before proceeding.
+
+2. Install sys-apps/merge-usr.
+
+3. Run "merge-usr --dryrun" as root to check for conflicts. These will
+   appear with the word ERROR at the start of the line.
+
+4. Resolve any conflicts. This may involve deleting duplicate files. If
+   in doubt, seek support in a Gentoo support channel.
+
+5. Run the merge-usr script from a root shell. Avoid running it via sudo
+   directly to avoid locking yourself out if an unexpected error occurs.
+
+6. Switch to a merged-usr profile.
+
+7. Run emerge with the --newuse or --changed-use option to rebuild
+   any packages that have a "split-usr" USE flag.
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/systemd/deprecated b/profiles/default/linux/amd64/17.1/no-multilib/systemd/deprecated
new file mode 100644
index 000000000000..8ac160031416
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/deprecated
@@ -0,0 +1,33 @@
+default/linux/amd64/17.1/no-multilib/systemd/merged-usr
+
+As warned about previously in a news item, systemd-255 has dropped
+support for split-usr systems. All Gentoo systems running systemd will
+need to be migrated to merged-usr.
+
+Migrating to merged-usr will move all data from /bin, /sbin, and /lib
+into the /usr/bin and /usr/lib directories. The directories in / are
+replaced with symlinks.
+
+To facilitate this, a new set of sub-profiles has been created, and a
+script is available to perform the actual migration.
+
+To migrate a system to merged-usr, follow this procedure:
+
+1. Ensure your system backups are up to date. Please also update
+   your system fully and depclean before proceeding.
+
+2. Install sys-apps/merge-usr.
+
+3. Run "merge-usr --dryrun" as root to check for conflicts. These will
+   appear with the word ERROR at the start of the line.
+
+4. Resolve any conflicts. This may involve deleting duplicate files. If
+   in doubt, seek support in a Gentoo support channel.
+
+5. Run the merge-usr script from a root shell. Avoid running it via sudo
+   directly to avoid locking yourself out if an unexpected error occurs.
+
+6. Switch to a merged-usr profile.
+
+7. Run emerge with the --newuse or --changed-use option to rebuild
+   any packages that have a "split-usr" USE flag.
diff --git a/profiles/default/linux/amd64/17.1/systemd/deprecated b/profiles/default/linux/amd64/17.1/systemd/deprecated
new file mode 100644
index 000000000000..9fc683582596
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/systemd/deprecated
@@ -0,0 +1,33 @@
+default/linux/amd64/17.1/systemd/merged-usr
+
+As warned about previously in a news item, systemd-255 has dropped
+support for split-usr systems. All Gentoo systems running systemd will
+need to be migrated to merged-usr.
+
+Migrating to merged-usr will move all data from /bin, /sbin, and /lib
+into the /usr/bin and /usr/lib directories. The directories in / are
+replaced with symlinks.
+
+To facilitate this, a new set of sub-profiles has been created, and a
+script is available to perform the actual migration.
+
+To migrate a system to merged-usr, follow this procedure:
+
+1. Ensure your system backups are up to date. Please also update
+   your system fully and depclean before proceeding.
+
+2. Install sys-apps/merge-usr.
+
+3. Run "merge-usr --dryrun" as root to check for conflicts. These will
+   appear with the word ERROR at the start of the line.
+
+4. Resolve any conflicts. This may involve deleting duplicate files. If
+   in doubt, seek support in a Gentoo support channel.
+
+5. Run the merge-usr script from a root shell. Avoid running it via sudo
+   directly to avoid locking yourself out if an unexpected error occurs.
+
+6. Switch to a merged-usr profile.
+
+7. Run emerge with the --newuse or --changed-use option to rebuild
+   any packages that have a "split-usr" USE flag.
diff --git a/profiles/default/linux/amd64/23.0/readme.txt b/profiles/default/linux/amd64/23.0/readme.txt
deleted file mode 100644
index a4fb52c03bc5..000000000000
--- a/profiles/default/linux/amd64/23.0/readme.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-
-WARNING - the 23.0 profile tree is still experimental.
-
-Recommended upgrade path:
-(please make sure to read the annotations like [*] if applicable)
-
-default/linux/amd64/17.1
-==> default/linux/amd64/23.0/split-usr
-
-default/linux/amd64/17.1/selinux
-==> default/linux/amd64/23.0/split-usr/hardened/selinux [%]
-
-default/linux/amd64/17.1/hardened
-==> default/linux/amd64/23.0/split-usr/hardened
-
-default/linux/amd64/17.1/hardened/selinux
-==> default/linux/amd64/23.0/split-usr/hardened/selinux
-
-default/linux/amd64/17.1/desktop
-==> default/linux/amd64/23.0/split-usr/desktop
-
-default/linux/amd64/17.1/desktop/gnome
-==> default/linux/amd64/23.0/split-usr/desktop/gnome
-
-default/linux/amd64/17.1/desktop/gnome/systemd
-==> default/linux/amd64/23.0/desktop/gnome/systemd  [*]
-
-default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr
-==> default/linux/amd64/23.0/desktop/gnome/systemd
-
-default/linux/amd64/17.1/desktop/plasma
-==> default/linux/amd64/23.0/split-usr/desktop/plasma
-
-default/linux/amd64/17.1/desktop/plasma/systemd
-==> default/linux/amd64/23.0/desktop/plasma/systemd  [*]
-
-default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr
-==> default/linux/amd64/23.0/desktop/plasma/systemd
-
-default/linux/amd64/17.1/desktop/systemd
-==> default/linux/amd64/23.0/desktop/systemd  [*]
-
-default/linux/amd64/17.1/desktop/systemd/merged-usr
-==> default/linux/amd64/23.0/desktop/systemd
-
-default/linux/amd64/17.1/developer
-==> default/linux/amd64/23.0  [*,#]
-
-default/linux/amd64/17.1/no-multilib
-==> default/linux/amd64/23.0/split-usr/no-multilib
-
-default/linux/amd64/17.1/no-multilib/hardened
-==> default/linux/amd64/23.0/split-usr/no-multilib/hardened
-
-default/linux/amd64/17.1/no-multilib/hardened/selinux
-==> default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux
-
-default/linux/amd64/17.1/no-multilib/systemd
-==> default/linux/amd64/23.0/no-multilib/systemd  [*]
-
-default/linux/amd64/17.1/no-multilib/systemd/merged-usr
-==> default/linux/amd64/23.0/no-multilib/systemd
-
-default/linux/amd64/17.1/no-multilib/systemd/selinux
-==> default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd  [*,%]
-
-default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr
-==> default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd  [%]
-
-default/linux/amd64/17.1/systemd
-==> default/linux/amd64/23.0/systemd  [*]
-
-default/linux/amd64/17.1/systemd/merged-usr
-==> default/linux/amd64/23.0/systemd
-
-default/linux/amd64/17.1/systemd/selinux
-==> default/linux/amd64/23.0/hardened/selinux/systemd  [*,%]
-
-default/linux/amd64/17.1/systemd/selinux/merged-usr
-==> default/linux/amd64/23.0/hardened/selinux/systemd  [%]
-
-default/linux/amd64/17.1/clang
-==> default/linux/amd64/23.0/split-usr/llvm
-
-default/linux/amd64/17.1/systemd/clang
-==> default/linux/amd64/23.0/llvm/systemd  [*]
-
-default/linux/amd64/17.1/systemd/clang/merged-usr
-==> default/linux/amd64/23.0/llvm/systemd
-
-default/linux/amd64/17.0/x32
-==> default/linux/amd64/23.0/split-usr/x32
-
-default/linux/amd64/17.0/x32/systemd
-==> default/linux/amd64/23.0/x32/systemd  [*]
-
-default/linux/amd64/17.0/x32/systemd/merged-usr
-==> default/linux/amd64/23.0/x32/systemd
-
-default/linux/amd64/17.0/musl
-==> default/linux/amd64/23.0/split-usr/musl
-
-default/linux/amd64/17.0/musl/clang
-==> default/linux/amd64/23.0/split-usr/musl/llvm
-
-default/linux/amd64/17.0/musl/hardened
-==> default/linux/amd64/23.0/split-usr/musl/hardened
-
-default/linux/amd64/17.0/musl/hardened/selinux
-==> default/linux/amd64/23.0/split-usr/musl/hardened/selinux
-
-default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+
-==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+  [&]
-
-default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+
-==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+  [&]
-
-default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+
-==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+  [&]
-
-default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+
-==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+
-
-default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+
-==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+
-
-default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+
-==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+
-
-
-
-[*] This upgrade switches from split-usr to merged-usr layout since
-    the corresponding profile is not available anymore.
-    Please follow the migration guide.
-
-[#] The developer profiles are gone. Please migrate eventual settings
-    to your make.conf.
-
-[&] You will have to do the symlink migration from 17.0 to 17.1 first.
-
-[%] There are no standalone selinux profiles anymore, only hardened/selinux.