gentoo auto-resync : 02:11:2022 - 09:09:18

25 files changed, 84 insertions, 7 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5c9fa63ba2f3..af3c1b68bdf5 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 466175442007..55d0cb78a907 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -36,7 +36,7 @@ sys-block/fio -io-uring -zbc
 # WANG Xuerui <xen0n@gentoo.org> (2022-04-18)
 # We never had non-deprecated libcrypt support from glibc, so disable compat
 # from libxcrypt for a world without libcrypt.so.1
->=sys-libs/libxcrypt-4.4.23-r1 compat
+sys-libs/libxcrypt compat
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-04-18)
 # Catalyst has support for assembling bootloader on this arch
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index f19dbdaf80c5..76b5768c656b 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -130,7 +130,7 @@ sys-kernel/vanilla-kernel initramfs
 # distribution and rely on external providers like libxcrypt.
 # Here we are following that path too.
 <sys-libs/glibc-2.33-r2 crypt
->=sys-libs/libxcrypt-4.4.23-r1 system compat
+sys-libs/libxcrypt system compat
 
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
 # <dev-scheme/guile-2 is package.mask'd, so force USE=guile2
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 5dd77f442ac0..389658bab392 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -486,7 +486,6 @@ dev-python/statsmodels doc
 # distribution and rely on external providers like libxcrypt.
 # Here we are following that path too.
 >=sys-libs/glibc-2.33-r2 crypt
-<sys-libs/libxcrypt-4.4.23-r1 split-usr system
 
 # Craig Andrews <candrews@gentoo.org> (2019-09-12)
 # OpenSSL (as of version 1.1.1) doesn't have APIs for QUIC support
diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force
index e74bebd7fe25..369d1774b6dc 100644
--- a/profiles/features/musl/package.use.force
+++ b/profiles/features/musl/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-11-02)
+# The libxcrypt migration is optional for musl.
+sys-libs/libxcrypt -system -compat
+
 # Sam James <sam@gentoo.org> (2022-10-04)
 # net-misc/netkit-rsh is masked on musl and USE=-crypt depends on it
 sys-cluster/torque crypt
@@ -9,10 +13,6 @@ sys-cluster/torque crypt
 # The musl allocator works well with telegram
 net-im/telegram-desktop -jemalloc
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
-# Do not force system install for libxcrypt here
-<sys-libs/libxcrypt-4.4.28-r2 -system -compat
-
 # Force system-libevent use flag on mozilla packages, since the building of
 # bundled libevent cannot accomodate a system without sysctl.h
 # See bug 574830 for more info.
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 55b305242c18..314a96313cfb 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -34,6 +34,7 @@ dev-python/osc-lib
 dev-python/paramiko
 >=dev-python/pyopenssl-22
 dev-python/pyspnego
+>=dev-python/pytest-trio-0.8.0
 dev-python/python-daemon
 dev-python/python-glanceclient
 dev-python/python-ironicclient
diff --git a/profiles/package.mask b/profiles/package.mask
index bec6793382dd..71b99c8a8d64 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -366,6 +366,7 @@ dev-python/PyQt6
 dev-python/PyQt6-WebEngine
 dev-qt/qt5compat:6
 dev-qt/qtbase:6
+dev-qt/qtcharts:6
 dev-qt/qtdeclarative:6
 dev-qt/qtimageformats:6
 dev-qt/qtlocation:6
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/eapi b/profiles/prefix/darwin/macos/13.0/arm64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/gcc/eapi b/profiles/prefix/darwin/macos/13.0/arm64/gcc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/gcc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/gcc/parent b/profiles/prefix/darwin/macos/13.0/arm64/gcc/parent
new file mode 100644
index 000000000000..5ebbfd24d627
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/gcc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-nold
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/gcc/use.mask b/profiles/prefix/darwin/macos/13.0/arm64/gcc/use.mask
new file mode 100644
index 000000000000..d60bd645fe97
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/gcc/use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# SSP seems to cause asm/assembly errors with GCC, so disable it
+ssp
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/make.defaults b/profiles/prefix/darwin/macos/13.0/arm64/make.defaults
new file mode 100644
index 000000000000..1242e5cea9b9
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="arm64-apple-darwin22"
+CHOST_arm64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/parent b/profiles/prefix/darwin/macos/13.0/arm64/parent
new file mode 100644
index 000000000000..a75c3ad0a555
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/parent
@@ -0,0 +1,2 @@
+..
+../../arch/arm64
diff --git a/profiles/prefix/darwin/macos/13.0/eapi b/profiles/prefix/darwin/macos/13.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/13.0/make.defaults b/profiles/prefix/darwin/macos/13.0/make.defaults
new file mode 100644
index 000000000000..dbdf6fb58958
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+MACOSX_DEPLOYMENT_TARGET="13.0"
diff --git a/profiles/prefix/darwin/macos/13.0/package.use.mask b/profiles/prefix/darwin/macos/13.0/package.use.mask
new file mode 100644
index 000000000000..c43bf1e37402
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (2011-04-10)
+# as long as util-linux installs uuid.h which breaks the system headers
+# (hence we don't) we can't do uuid support here
+x11-libs/libSM -uuid
diff --git a/profiles/prefix/darwin/macos/13.0/parent b/profiles/prefix/darwin/macos/13.0/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/prefix/darwin/macos/13.0/profile.bashrc b/profiles/prefix/darwin/macos/13.0/profile.bashrc
new file mode 100644
index 000000000000..4d83a0ecc98f
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/profile.bashrc
@@ -0,0 +1,4 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+export MACOSX_DEPLOYMENT_TARGET=13.0
diff --git a/profiles/prefix/darwin/macos/13.0/x64/eapi b/profiles/prefix/darwin/macos/13.0/x64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/x64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/13.0/x64/gcc/eapi b/profiles/prefix/darwin/macos/13.0/x64/gcc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/x64/gcc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/13.0/x64/gcc/parent b/profiles/prefix/darwin/macos/13.0/x64/gcc/parent
new file mode 100644
index 000000000000..fceecddb55c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/x64/gcc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-ld64
diff --git a/profiles/prefix/darwin/macos/13.0/x64/make.defaults b/profiles/prefix/darwin/macos/13.0/x64/make.defaults
new file mode 100644
index 000000000000..02d118208919
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/x64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-apple-darwin22"
+CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/13.0/x64/parent b/profiles/prefix/darwin/macos/13.0/x64/parent
new file mode 100644
index 000000000000..269f6f48bb15
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/x64/parent
@@ -0,0 +1,2 @@
+..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/13.0/x64/use.mask b/profiles/prefix/darwin/macos/13.0/x64/use.mask
new file mode 100644
index 000000000000..02ca6e7eae53
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/x64/use.mask
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file masks out USE flags that are simply NOT allowed in the default
+# x86 profile.  This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+
+# Unmask x86 instruction sets
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_ssse3
+-svga
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_vmware
+
+# ibm is only used for ppc64 stuff
+ibm
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 3c83ad1b7cd7..725a7432ddd0 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -388,10 +388,12 @@ x64-macos		prefix/darwin/macos/11.0/x64			exp
 x64-macos		prefix/darwin/macos/11.0/x64/gcc		exp
 x64-macos		prefix/darwin/macos/12.0/x64			exp
 x64-macos		prefix/darwin/macos/12.0/x64/gcc		exp
+x64-macos		prefix/darwin/macos/13.0/x64/gcc		exp
 arm64-macos		prefix/darwin/macos/11.0/arm64			exp
 arm64-macos		prefix/darwin/macos/11.0/arm64/gcc		exp
 arm64-macos		prefix/darwin/macos/12.0/arm64			exp
 arm64-macos		prefix/darwin/macos/12.0/arm64/gcc		exp
+arm64-macos		prefix/darwin/macos/13.0/arm64/gcc		exp
 
 # Solaris Profiles
 sparc-solaris		prefix/sunos/solaris/5.11/sparc			exp