gentoo resync : 29.12.2022

8 files changed, 55 insertions, 9 deletions

diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index 024a54a65ab1..adee98f1e014 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -1,6 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# James Le Cuirot <chewi@gentoo.org> (2022-06-25)
+# This flag concerns a 32-bit x86-specific problem.
+sys-libs/glibc stack-realign
+sys-libs/ncurses stack-realign
+
+# Ben Kohler <bkohler@gentoo.org> (2022-06-07)
+# Disable 32bit builds on no-multilib
+sys-apps/memtest86+ bios32 efi32 iso32
+
 # Sam James <sam@gentoo.org> (2020-12-27)
 # dev-embedded/libftd2xx unavailable here
 dev-embedded/urjtag ftd2xx
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index 7c624bfc42b6..c057afab7c94 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -1,6 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# James Le Cuirot <chewi@gentoo.org> (2022-06-25)
+# Realign the stack in the 32-bit build for compatibility with older binaries by
+# default. This is not the default on x86 because it has a performance cost.
+sys-libs/glibc stack-realign
+sys-libs/ncurses stack-realign
+
+# Ben Kohler <bkohler@gentoo.org> (2022-06-07)
+# Enable BIOS & UEFI targets by default
+sys-apps/memtest86+ bios64 efi64
+
 # Theo Anderson <telans@posteo.de> (2021-03-06)
 # Enable 32-bit clang runtime to ease -m32 builds with non-GCC runtime
 sys-devel/clang-runtime abi_x86_32
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 2482500d3cf3..55790a52e4cd 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,18 @@
 
 #--- END OF EXAMPLES ---
 
+# James Le Cuirot <chewi@gentoo.org> (2022-06-25)
+# Allow stack to be realigned for compatibility with older 32-bit binaries.
+sys-libs/glibc -stack-realign
+sys-libs/ncurses -stack-realign
+
+# Unmask media-libs/libxmp here
+media-sound/qmmp -xmp
+
+# Kai-Chun Ning <kaichun.ning@gmail.com> (2022-05-23)
+# Need intel-hybrid-codec-driver, which only works on amd64
+x11-libs/libva-intel-driver -hybrid
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-01)
 # requires sys-apps/dbus-broker, which is keyworded here.
 sys-apps/systemd -hostnamed-fallback
@@ -208,7 +220,7 @@ media-video/mpv -vulkan
 
 # Nick Sarnie <sarnex@gentoo.org> (2018-04-29)
 # media-libs/vulkan-loader and app-emulation/vkd3d are keyworded on amd64
-app-emulation/wine-staging -vkd3d -vulkan
+app-emulation/wine-staging -vulkan
 app-emulation/wine-vanilla -vkd3d -vulkan
 
 # Richard Yao <ryao@gentoo.org> (2018-04-16)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index b73ea069d9a0..e4d678e532c0 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Kai-Chun Ning <kaichun.ning@gmail.com> (2022-05-23)
+# Dependency x11-libs/intel-hybrid-codec-driver is only available on unstable
+# branch
+x11-libs/libva-intel-driver hybrid
+
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # needs stabilizing
 media-video/ffmpeg vmaf
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index d21568f5d05e..7e8fbecd25e4 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -39,9 +39,6 @@
 # dev-db/firebird is keyworded ~amd64
 -firebird
 
-# cilk has been ported to this arch.
--cilk
-
 # Mike Gilbert <floppym@gentoo.org> (2014-10-19)
 # sys-libs/libapparmor
 -apparmor
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 444da1029e7b..cd290cb6075e 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Kai-Chun Ning <kaichun.ning@gmail.com> (2022-05-26)
+# intel-hybrid-codec-driver does not work on x32
+x11-libs/intel-hybrid-codec-driver
+
 # Jonas Licht <jonas.licht@gmail.com> (2022-05-01)
 # Requires net-libs/nodejs, plus mask all reverse-dependecies.
 net-analyzer/gsa
@@ -125,7 +129,6 @@ net-libs/xrootd-ceph
 
 # Hasan ÇALIŞIR <hasan.calisir@psauxit.com> (2019-10-28)
 # requires net-libs/nodejs | sys-apps/yarn
->=net-analyzer/greenbone-security-assistant-8.0.1
 net-analyzer/gvm
 
 # Marek Szuba <marecki@gentoo.org> (2019-07-26)
diff --git a/profiles/arch/amd64/x32/package.use b/profiles/arch/amd64/x32/package.use
new file mode 100644
index 000000000000..1383f0ef9805
--- /dev/null
+++ b/profiles/arch/amd64/x32/package.use
@@ -0,0 +1,7 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mike Gilbert <floppym@gentoo.org> (2022-05-30)
+# Provide sensible default for EFI.
+sys-boot/gnu-efi abi_x86_64
+sys-boot/syslinux abi_x86_64
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 4123fc89f691..a1066f06652e 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Kai-Chun Ning <kaichun.ning@gmail.com> (2022-05-26)
+# Dependency x11-libs/intel-hybrid-codec-driver does not work on x32
+x11-libs/libva-intel-driver hybrid
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2021-02-09)
 # Requires net-libs/nodejs, plus mask all reverse-dependencies.
 app-i18n/fcitx-libpinyin dictionary-manager
@@ -11,7 +15,6 @@ kde-apps/kde-apps-meta:5 pim
 kde-apps/kdenetwork-meta:5 bittorrent
 kde-apps/umbrello:5 php
 kde-misc/kio-gdrive kaccounts
-media-gfx/gmic krita
 net-irc/quassel urlpreview
 net-misc/fatrat bittorrent
 net-misc/seafile-client shibboleth
@@ -22,7 +25,7 @@ sci-physics/root qt5
 # Patrick McLean <chutzpah@gentoo.org> (2020-02-05)
 # sys-cluster/ceph no longer supports x86, versions that support
 # it no longer build thanks to python2 removals
-app-backup/bareos ceph cephfs rados rados-striper
+app-backup/bareos ceph
 app-emulation/libvirt rbd
 app-emulation/qemu rbd
 net-analyzer/rrdtool rados