summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/Manifest.gzbin202674 -> 202677 bytes
-rw-r--r--profiles/package.mask6
2 files changed, 6 insertions, 0 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2c1e9e989b97..7274780b681f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/package.mask b/profiles/package.mask
index efe1a67d3fc4..735cb7f47df5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -228,6 +228,12 @@ sci-libs/mpir
# Andreas Sturmlechner <asturm@gentoo.org> (2024-02-28)
# KDE Plasma 6.0.2, Gear 24.02.0 and Frameworks 6.0.0 mask
+#
+# Don't do anything unless you're intentionally moving to Plasma 6, which is
+# masked still for a reason. If you get this message just from conflicts where
+# you're not trying to do that, please cleanup stale entries in /etc/portage
+# and your world file.
+#
# Plasma 6 replaces 5. For conflict resolution between KF5- and KF6-packages:
# - put '-kf6compat' into /etc/portage/profile/use.mask
# - enable USE=kf6compat globally