[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/features/musl/

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/features/musl/

[Sam James]

commit:     e617820e9eba576c0546c2a756a1b564370aa43b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 13:31:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 13:48:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e617820e

profiles: mask/unmask musl on musl/non musl profiles

Closes: https://bugs.gentoo.org/869515
Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/27199
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/base/package.mask          | 6 +++++-
 profiles/features/musl/package.mask | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 58f5f5ac5739..4d33927de983 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-09-10)
+# Mask in general and unmask on specific profiles
+sys-libs/musl
+
 # Sam James <sam@gentoo.org> (2021-11-22)
 # Mask the older libcrypt virtual (which accepted glibc[crypt]) to ease
 # dependency resolution. In a fair number of cases, this has helped

diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 52e3d47eb93c..ae834bd2698b 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -287,6 +287,7 @@ app-emulation/dosemu
 # Old undated blocks of masks
 #
 sys-libs/glibc
+-sys-libs/musl
 
 # As of 2021-08-08, >=sys-fs/udev-249-r2 is patched in Gentoo
 # to work on musl, so no need to mask udev.

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/features/musl/

[Sam James]

commit:     9c5387ec25069e924bac85e6510ca9aa91f35475
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 18:35:57 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 18:36:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5387ec

profiles: kwin[caps] -> kwin[filecaps]

The masks/forces need updating for caps->filecaps when we fixed
eclass use in bug #941628.

Bug: https://bugs.gentoo.org/931215
Bug: https://bugs.gentoo.org/941628
Closes: https://bugs.gentoo.org/946505
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/base/package.use.force          | 2 +-
 profiles/features/musl/package.use.force | 2 +-
 profiles/features/musl/package.use.mask  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index ba9258292499..8d5e49dffa12 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -38,7 +38,7 @@ dev-lang/gnat-gpl ada cxx
 
 # Sam James <sam@gentoo.org> (2024-06-03)
 # Poor rendering performance otherwise (bug #931215).
-kde-plasma/kwin caps
+kde-plasma/kwin filecaps
 
 # James Le Cuirot <chewi@gentoo.org> (2024-06-02)
 # Requires FFmpeg 7.0, which we don't have yet, so force Chromium fork.

diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force
index 5dc756fc6d32..734c2ad4026f 100644
--- a/profiles/features/musl/package.use.force
+++ b/profiles/features/musl/package.use.force
@@ -4,7 +4,7 @@
 # Sam James <sam@gentoo.org> (2024-06-03)
 # Poor rendering performance otherwise (bug #931215) but it doesn't
 # work on musl.
-kde-plasma/kwin -caps
+kde-plasma/kwin -filecaps
 
 # Violet Purcell <vimproved@inventati.org> (2023-04-25)
 # SBCL Upstream does not provide musl binaries for bootstrap, use CLisp.

diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index 0c4d83f9ea0c..e60e8be3a4d3 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -26,7 +26,7 @@ app-emulation/virt-firmware test
 # Sam James <sam@gentoo.org> (2024-06-03)
 # Poor rendering performance otherwise (bug #931215) but it doesn't
 # work on musl.
-kde-plasma/kwin caps
+kde-plasma/kwin filecaps
 
 # Violet Purcell <vimproved@inventati.org> (2024-05-15)
 # Python does not support JIT on musl, see