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

["Sam James" <sam@gentoo.org>]

commit:     c41487e0ebd5855ca89d6da5fbecb65ca4d0e18b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 05:26:44 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 05:27:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41487e0

profiles/features/musl: consolidate masks (mostly binary)

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

 profiles/features/musl/package.mask     | 14 ++++----------
 profiles/features/musl/package.use.mask | 11 ++++-------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 992a594434c0..b78b576093f6 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Maciej Barć <xgqt@gentoo.org> (2023-01-07)
-# Currently ACL2 (sci-mathematics/acl2) unconditionally depends
-# on SBCL (dev-lisp/sbcl), which is masked on the musl profile.
-sci-mathematics/acl2
-
 # Sam James <sam@gentoo.org> (2023-01-02)
 # Uses error.h, bug #888956
 =sys-libs/liburing-2.3
@@ -25,16 +20,15 @@ dev-libs/intel-compute-runtime
 =sys-devel/gcc-12.2.1_p20230121:12
 
 # Andrey Grozin <grozin@gentoo.org> (2022-12-01)
-# These packages depend on dev-lisp/sbcl unconditionally
+# sbcl upstream supports only glibc Linux systems, bug #712626
+# and these packages depend on dev-lisp/sbcl unconditionally
+dev-lisp/sbcl
 app-emacs/sly
 dev-lisp/alexandria
+sci-mathematics/acl2
 x11-wm/stumpwm
 x11-wm/stumpwm-contrib
 
-# Andrey Grozin <grozin@gentoo.org> (2022-12-01)
-# The upstream supports only glibc Linux systems, bug #712626
-dev-lisp/sbcl
-
 # Sam James <sam@gentoo.org> (2022-10-17)
 # Needs porting to musl
 # https://github.com/rr-debugger/rr/issues/2236

diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index c16b86e9582d..86f5640af642 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -5,13 +5,6 @@
 # dev-lisp/sbcl is masked on musl
 sci-mathematics/fricas sbcl
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-12-10)
-# sci-libs/mkl is binary only and links to glibc
-sci-chemistry/gromacs mkl
-sci-libs/armadillo mkl
-sci-libs/dlib mkl
-sci-libs/trilinos mkl
-
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2022-10-04)
 # Mask loguru until fixed upstream #873601
 sci-libs/vtk logging
@@ -41,6 +34,10 @@ media-video/ffmpeg amf
 net-fs/openafs tsm
 net-analyzer/nagios-plugin-check_raid megaraid-sas
 sys-apps/hwloc gl
+sci-chemistry/gromacs mkl
+sci-libs/armadillo mkl
+sci-libs/dlib mkl
+sci-libs/trilinos mkl
 www-client/qutebrowser widevine
 
 # Sam James <sam@gentoo.org> (2022-10-03)