commit:     ae6a4261843cf6617c47a65674c333e74cf641e0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 02:07:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 02:46:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae6a4261

profiles/features/musl: restructure use.mask a bit for all bin-related masks

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

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

diff --git a/profiles/features/musl/package.use.mask 
b/profiles/features/musl/package.use.mask
index 1c854d175c4b..d2ed7cb1242c 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -23,12 +23,6 @@ www-client/qutebrowser widevine
 # nls support, see bug #712828
 x11-wm/fluxbox nls
 
-# Marco Genasci <[email protected]> (2022-01-06)
-# Pulls dev-db/oracle-instantclient which doesn't work on musl
-app-metrics/collectd collectd_plugins_oracle
-dev-lang/php oci8-instant-client
-dev-qt/qtsql oci8
-
 # Ulrich Müller <[email protected]> (2022-01-04)
 # musl iconv doesn't know about shift-jis which is needed for Japanese
 # documentation (bug #830436)

diff --git a/profiles/features/musl/use.mask b/profiles/features/musl/use.mask
index 4bd837547d59..f43bb9ce228a 100644
--- a/profiles/features/musl/use.mask
+++ b/profiles/features/musl/use.mask
@@ -6,12 +6,18 @@
 elibc_glibc
 
 # Sam James <[email protected]> (2022-10-04)
-# dev-libs/luise is a binary package linked against glibc and is masked on musl
+# Mask USE flags which pull in a binary package linked against glibc (rolling
+# mask, use for all such packages)
+collectd_plugins_oracle
 lcd_devices_luise
+oracle
+oci8
+oci8-instant-client
 
 # Sam James <[email protected]> (2022-10-03)
 # x11-drivers/nvidia-drivers is a binary package linked against glibc
-# and is masked on musl
+# and is masked on musl. (We give nvidia its own block given they're
+# all related).
 cuda
 cudnn
 collectd_plugins_gpu_nvidia
@@ -20,10 +26,6 @@ nvidia
 nvml
 video_cards_nvidia
 
-# Marco Genasci <[email protected]> (2022-01-06)
-# Pulls dev-db/oracle-instantclient which doesn't work on musl
-oracle
-
 # sys-apps/systemd is masked
 systemd
 uwsgi_plugins_systemd_logger

Reply via email to