gentoo auto-resync : 27:11:2023 - 22:51:09

12 files changed, 44 insertions, 16 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a825b079103f..22ce50f8a8e2 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/no-multilib/package.use.force b/profiles/arch/amd64/no-multilib/package.use.force
index 17acf1185e81..2897c534ec47 100644
--- a/profiles/arch/amd64/no-multilib/package.use.force
+++ b/profiles/arch/amd64/no-multilib/package.use.force
@@ -1,6 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2023-10-06)
+# Undo multilib forcing.
+dev-libs/libatomic_ops -abi_x86_32
+dev-libs/boehm-gc -abi_x86_32
+
 # Michał Górny <mgorny@gentoo.org> (2017-04-08)
 # Undo multilib forcing.
 sys-apps/sandbox -abi_x86_32
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index da0808237ad6..5c9f06cdb0c4 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -1,6 +1,12 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2023-10-06)
+# Require ABIs matching MULTILIB_ABIS in gcc dependencies -- otherwise
+# sys-devel/gcc[multilib] (which is forced) will fail late in build.
+dev-libs/libatomic_ops abi_x86_32
+dev-libs/boehm-gc abi_x86_32
+
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # We have ready-to-use configs here.
 sys-kernel/gentoo-kernel -savedconfig
diff --git a/profiles/arch/amd64/x32/package.use.force b/profiles/arch/amd64/x32/package.use.force
index 388c2861e5f2..c414ca9911c3 100644
--- a/profiles/arch/amd64/x32/package.use.force
+++ b/profiles/arch/amd64/x32/package.use.force
@@ -1,6 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2023-10-06)
+# Require ABIs matching MULTILIB_ABIS in gcc dependencies -- otherwise
+# sys-devel/gcc[multilib] (which is forced) will fail late in build.
+dev-libs/libatomic_ops abi_x86_64
+dev-libs/boehm-gc abi_x86_64
+
 # Michał Górny <mgorny@gentoo.org> (2017-04-08)
 # Require sandbox to be multilib-capable to avoid failures when building
 # multilib packages, #611292.
diff --git a/profiles/arch/hppa/package.mask b/profiles/arch/hppa/package.mask
index b5338568bc80..bfaec4b9a8f4 100644
--- a/profiles/arch/hppa/package.mask
+++ b/profiles/arch/hppa/package.mask
@@ -6,14 +6,6 @@
 # See https://github.com/systemd/systemd/issues/29775 and bug #916469.
 >=sys-apps/systemd-254
 
-# Sam James <sam@gentoo.org> (2023-08-28)
-# libuv >=1.45.0 starts to use iouring (but via its own implementation, not sys-libs/liburing)
-# which means CMake then starts using iouring. There are some kernel bugs which
-# got shaken out on hppa: linux 6.4.x is okay, but 6.1.x at least need backports.
-#
-# See https://lore.kernel.org/linux-parisc/87jztggow5.fsf@gentoo.org/T/.
->=dev-libs/libuv-1.45.0
-
 # Sam James <sam@gentoo.org> (2023-07-03)
 # Broken memory handling
 # https://lore.kernel.org/linux-parisc/612eaa53-6904-6e16-67fc-394f4faa0e16@bell.net/
diff --git a/profiles/arch/mips/mips64/multilib/package.use.force b/profiles/arch/mips/mips64/multilib/package.use.force
new file mode 100644
index 000000000000..b400461470d5
--- /dev/null
+++ b/profiles/arch/mips/mips64/multilib/package.use.force
@@ -0,0 +1,8 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (2023-10-06)
+# Require ABIs matching MULTILIB_ABIS in gcc dependencies -- otherwise
+# sys-devel/gcc[multilib] (which is forced) will fail late in build.
+dev-libs/libatomic_ops abi_mips_n32 abi_mips_n64 abi_mips_o32
+dev-libs/boehm-gc abi_mips_n32 abi_mips_n64 abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/package.use.force b/profiles/arch/mips/mipsel/mips64el/multilib/package.use.force
new file mode 100644
index 000000000000..b400461470d5
--- /dev/null
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/package.use.force
@@ -0,0 +1,8 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (2023-10-06)
+# Require ABIs matching MULTILIB_ABIS in gcc dependencies -- otherwise
+# sys-devel/gcc[multilib] (which is forced) will fail late in build.
+dev-libs/libatomic_ops abi_mips_n32 abi_mips_n64 abi_mips_o32
+dev-libs/boehm-gc abi_mips_n32 abi_mips_n64 abi_mips_o32
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 7a64707118bc..e1fdfe824659 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2023-11-26)
+# Qt 5 is not keyworded here
+dev-vcs/subversion kwallet
+
+# matoro <matoro_gentoo@matoro.tk> (2023-11-24)
+# sys-cluster/ceph not keyworded here.
+net-analyzer/rrdtool rados
+
 # matoro <matoro_gentoo@matoro.tk> (2023-11-24)
 # media-libs/shaderc not keyworded here.
 >=media-video/ffmpeg-5 shaderc
@@ -11,13 +19,14 @@ app-admin/setools X
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-22)
 # Qt 5 is not keyworded here
-net-p2p/bitcoin-core gui
+net-p2p/bitcoin-core gui qrcode
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-20)
 # media-libs/libaom casualties
 # https://bugs.chromium.org/p/aomedia/issues/detail?id=3487
 media-video/ffmpeg libaom
 media-libs/libavif aom
+media-libs/libheif aom
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-19)
 # Pulls in LXDE which is not keyworded here
diff --git a/profiles/default/linux/amd64/23.0/no-multilib/selinux/eapi b/profiles/default/linux/amd64/23.0/no-multilib/selinux/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/23.0/no-multilib/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/23.0/no-multilib/selinux/parent b/profiles/default/linux/amd64/23.0/no-multilib/selinux/parent
deleted file mode 100644
index 2190e9797eaa..000000000000
--- a/profiles/default/linux/amd64/23.0/no-multilib/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../features/selinux
diff --git a/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/eapi b/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/parent b/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/parent
deleted file mode 100644
index 44f88d3e2df0..000000000000
--- a/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd