gentoo resync : 29.12.2022

3 files changed, 16 insertions, 3 deletions

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