gentoo auto-resync : 09:07:2023 - 10:24:32

9 files changed, 52 insertions, 5 deletions

diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults b/profiles/prefix/darwin/macos/arch/x64/make.defaults
index 9dee8c00f5f0..e4b9746c663a 100644
--- a/profiles/prefix/darwin/macos/arch/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="x64-macos"
 ACCEPT_KEYWORDS="~x64-macos"
 
+USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
 CPU_FLAGS_X86="mmx mmxext sse sse2"
 
 # multilib build stuff, single ABI (no multilib)
diff --git a/profiles/prefix/darwin/macos/arch/x64/use.mask b/profiles/prefix/darwin/macos/arch/x64/use.mask
index 01a9fae674b6..6bf08722e781 100644
--- a/profiles/prefix/darwin/macos/arch/x64/use.mask
+++ b/profiles/prefix/darwin/macos/arch/x64/use.mask
@@ -4,3 +4,26 @@
 # Unmask the flag corresponding to the default ABI
 -x64-macos
 -abi_x86_64
+
+# Benda Xu <heroxbd@gentoo.org> (2023-07-09)
+# Unmask the CPU-flag related USE EXPAND, as in the general arch/amd64
+
+-cpu_flags_x86_3dnow
+-cpu_flags_x86_3dnowext
+-cpu_flags_x86_aes
+-cpu_flags_x86_avx
+-cpu_flags_x86_avx2
+-cpu_flags_x86_fma3
+-cpu_flags_x86_fma4
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_padlock
+-cpu_flags_x86_popcnt
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_sse3
+-cpu_flags_x86_sse4_1
+-cpu_flags_x86_sse4_2
+-cpu_flags_x86_sse4a
+-cpu_flags_x86_ssse3
+-cpu_flags_x86_xop
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index cc6f25ce78cf..a0d4caecafae 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,8 +1,13 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Benda Xu <heroxbd@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 <grobian@gentoo.org> (2023-06-05)
 # Fails to compile using GCC, misdetecting sincosf
 # https://github.com/harfbuzz/harfbuzz/issues/4266
-=media-libs/harfbuzz-7.2.0
 =media-libs/harfbuzz-7.3.0
diff --git a/profiles/prefix/darwin/macos/use.mask b/profiles/prefix/darwin/macos/use.mask
new file mode 100644
index 000000000000..334d27168fee
--- /dev/null
+++ b/profiles/prefix/darwin/macos/use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Benda Xu <heroxbd@gentoo.org> (2023-07-09)
+# xattr requires sys-apps/attr, which is masked.
+xattr
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index fbda04428af4..47b1d8ab9f58 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (2014-01-14)
diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
index 980886cdc0dc..b3b6dcd4f1e3 100644
--- a/profiles/prefix/darwin/use.mask
+++ b/profiles/prefix/darwin/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 #Add USE flags that don't work on Darwin/OpenDarwin/OS X here
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 <heroxbd@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 <grobian@gentoo.org> (2023-06-09)
 # Fails to compile due to missing DT_* symbols
 # fix: https://lore.kernel.org/git/20230606205935.3183276-1-asedeno@google.com/
diff --git a/profiles/prefix/sunos/solaris/use.mask b/profiles/prefix/sunos/solaris/use.mask
new file mode 100644
index 000000000000..334d27168fee
--- /dev/null
+++ b/profiles/prefix/sunos/solaris/use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Benda Xu <heroxbd@gentoo.org> (2023-07-09)
+# xattr requires sys-apps/attr, which is masked.
+xattr
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index 875fdb97c4dd..1cc476b28157 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Re-add SunOS libc