commit: 200dcd061e685c809a8d2859afdf1781b23020ee
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 9 05:02:59 2023 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 05:05:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200dcd06
p/p/{darwin/macos,sunos/solaris}: move the xattr masks downwards.
The masks are more related to userland libc implementations than
kernels, and suits better to macos and solaris subdirectories.
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
profiles/prefix/darwin/macos/package.mask | 6 ++++++
profiles/prefix/{sunos => darwin/macos}/use.mask | 20 --------------------
profiles/prefix/darwin/package.mask | 6 ------
profiles/prefix/darwin/use.mask | 4 ----
profiles/prefix/sunos/package.mask | 8 --------
profiles/prefix/sunos/solaris/package.mask | 6 ++++++
profiles/prefix/sunos/{ => solaris}/use.mask | 20 --------------------
profiles/prefix/sunos/use.mask | 4 ----
8 files changed, 12 insertions(+), 62 deletions(-)
diff --git a/profiles/prefix/darwin/macos/package.mask
b/profiles/prefix/darwin/macos/package.mask
index 0eeeffbc554e..a0d4caecafae 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,6 +1,12 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Benda Xu <hero...@gentoo.org> (2023-07-09)
+# Requires Glibc <sys/xattr.h> to work properly.
+# For example, 'lgetxattr' is not available on macOS or gnulib.
+# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html
+sys-apps/attr
+
# Fabian Groffen <grob...@gentoo.org> (2023-06-05)
# Fails to compile using GCC, misdetecting sincosf
# https://github.com/harfbuzz/harfbuzz/issues/4266
diff --git a/profiles/prefix/sunos/use.mask
b/profiles/prefix/darwin/macos/use.mask
similarity index 54%
copy from profiles/prefix/sunos/use.mask
copy to profiles/prefix/darwin/macos/use.mask
index d9cbd55a4b77..334d27168fee 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/darwin/macos/use.mask
@@ -1,26 +1,6 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Re-add SunOS libc
--elibc_SunOS
--kernel_SunOS
-
# Benda Xu <hero...@gentoo.org> (2023-07-09)
# xattr requires sys-apps/attr, which is masked.
xattr
-
-# these will more than likely never work on solaris
-3dfx
-acpi
-alsa
-apm
-caps
-djbfft
-fbcon
-ggi
-gpm
-hardened
-oss
-svga
-rtc
-v4l
diff --git a/profiles/prefix/darwin/package.mask
b/profiles/prefix/darwin/package.mask
index 770d57809b9a..47b1d8ab9f58 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -1,12 +1,6 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Benda Xu <hero...@gentoo.org> (2023-07-09)
-# Requires Glibc <sys/xattr.h> to work properly.
-# For example, 'lgetxattr' is not available on macOS or gnulib.
-# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html
-sys-apps/attr
-
# Fabian Groffen <grob...@gentoo.org> (2014-01-14)
# util-linux has no business on Darwin systems
sys-apps/util-linux
diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
index 79035bfa7912..b3b6dcd4f1e3 100644
--- a/profiles/prefix/darwin/use.mask
+++ b/profiles/prefix/darwin/use.mask
@@ -34,9 +34,5 @@ introspection
# libcap doesn't work on OSX (fcaps.eclass), bug #534264
filecaps
-# Benda Xu <hero...@gentoo.org> (2023-07-09)
-# xattr requires sys-apps/attr, which is masked.
-xattr
-
# linux-exclusive feature
inotify
diff --git a/profiles/prefix/sunos/package.mask
b/profiles/prefix/sunos/package.mask
deleted file mode 100644
index 1d933faa70cb..000000000000
--- a/profiles/prefix/sunos/package.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Benda Xu <hero...@gentoo.org> (2023-07-09)
-# Requires Glibc <sys/xattr.h> to work properly.
-# For example, 'lgetxattr' is not available on Solaris or gnulib.
-# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html
-sys-apps/attr
diff --git a/profiles/prefix/sunos/solaris/package.mask
b/profiles/prefix/sunos/solaris/package.mask
index bd2fe8fd3273..dbb1185a8cae 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,6 +1,12 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Benda Xu <hero...@gentoo.org> (2023-07-09)
+# Requires Glibc <sys/xattr.h> to work properly.
+# For example, 'lgetxattr' is not available on Solaris or gnulib.
+# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html
+sys-apps/attr
+
# Fabian Groffen <grob...@gentoo.org> (2023-06-09)
# Fails to compile due to missing DT_* symbols
# fix: https://lore.kernel.org/git/20230606205935.3183276-1-ased...@google.com/
diff --git a/profiles/prefix/sunos/use.mask
b/profiles/prefix/sunos/solaris/use.mask
similarity index 54%
copy from profiles/prefix/sunos/use.mask
copy to profiles/prefix/sunos/solaris/use.mask
index d9cbd55a4b77..334d27168fee 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/solaris/use.mask
@@ -1,26 +1,6 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Re-add SunOS libc
--elibc_SunOS
--kernel_SunOS
-
# Benda Xu <hero...@gentoo.org> (2023-07-09)
# xattr requires sys-apps/attr, which is masked.
xattr
-
-# these will more than likely never work on solaris
-3dfx
-acpi
-alsa
-apm
-caps
-djbfft
-fbcon
-ggi
-gpm
-hardened
-oss
-svga
-rtc
-v4l
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index d9cbd55a4b77..1cc476b28157 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -5,10 +5,6 @@
-elibc_SunOS
-kernel_SunOS
-# Benda Xu <hero...@gentoo.org> (2023-07-09)
-# xattr requires sys-apps/attr, which is masked.
-xattr
-
# these will more than likely never work on solaris
3dfx
acpi
