gentoo resync : 07.01.2022

9 files changed, 17 insertions, 29 deletions

diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
index bbab57a07425..9abd9bab3d01 100644
--- a/profiles/arch/base/make.defaults
+++ b/profiles/arch/base/make.defaults
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 arm64-macos hppa ia64 m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-fbsd x86-linux x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 arm64-macos hppa ia64 m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-linux x86-solaris x86-winnt"
 
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 497a91c05748..b401aee243d9 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (2021-01-07)
@@ -223,7 +223,6 @@ apparmor
 # Mask flags that correspond to all possible ARCH values.
 alpha
 amd64
-amd64-fbsd
 arm
 arm64
 hppa
@@ -236,4 +235,3 @@ riscv
 s390
 sparc
 x86
-x86-fbsd
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 3071bbb0f102..0992daf9b020 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -102,7 +102,7 @@ dev-vcs/mercurial rust
 
 # Joonas Niilola <juippis@gentoo.org> (2020-10-08)
 # Dependency not keyworded on this arch.
-dev-libs/efl avif lua_single_target_luajit physics
+dev-libs/efl avif heif lua_single_target_luajit physics
 
 # Matt Turner <mattst88@gentoo.org> (2020-08-11)
 # No drivers on this architecture support Vulkan
diff --git a/profiles/arch/m68k/package.use.force b/profiles/arch/m68k/package.use.force
index 0430487c6a2f..068dcfea95c4 100644
--- a/profiles/arch/m68k/package.use.force
+++ b/profiles/arch/m68k/package.use.force
@@ -1,6 +1,11 @@
-# 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-01-06)
+# Force Xorg without Mesa. Mesa has been tested on m68k with VirtIO-GPU under
+# QEMU and seems quite broken.
+x11-base/xorg-server minimal
+
 # James Le Cuirot <chewi@gentoo.org> (2021-11-09)
 # dev-perl/Type-Tie fails a test so avoid dependencies.
 dev-perl/Type-Tiny minimal
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 56fb20679473..a9c347e2c04a 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -64,10 +64,6 @@ qt5
 # valgrind has no m68k port.
 valgrind
 
-# Matt Turner <mattst88@gentoo.org> (2019-12-05)
-# media-libs/libglvnd is not keyworded
-libglvnd
-
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependencies not keyworded.
 appindicator
@@ -147,6 +143,4 @@ slang
 systemd
 tcl
 tk
-X
 xemacs
-xpm
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index df0cf762626a..f7ffc3fa8877 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2021-11-15)
@@ -247,10 +247,6 @@ dev-haskell/dlist test
 dev-haskell/haskell-src-exts test
 dev-util/bnfc test
 
-# Anthony G. Basile <blueness@gentoo.org> (2014-08-17)
-# This pulls in qemu[smartcard] which is masked
-net-misc/spice-gtk smartcard
-
 # Anthony G. Basile <blueness@gentoo.org> (2014-08-16)
 # Ultimately pulls in nodejs which is broken.
 dev-ruby/sprockets test
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 2bf76153d4ca..d1d4ea8a027a 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2022-01-04)
+# Dependency not keyworded on this arch.
+dev-libs/efl heif
+
 # Sam James <sam@gentoo.org> (2021-12-31)
 # dev-lang/julia not keyworded here
 # sci-mathematics/polymake not keyworded here
diff --git a/profiles/arch/sparc/package.mask b/profiles/arch/sparc/package.mask
index 2e8748f1a007..6a4f874db264 100644
--- a/profiles/arch/sparc/package.mask
+++ b/profiles/arch/sparc/package.mask
@@ -1,11 +1,6 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@gentoo.org> (2021-11-22)
-# Unmask older libcrypt virtual until libxcrypt is stable on sparc (pending)
-# bug #809410
--virtual/libcrypt:0/1
-
 # Raúl Porcel <armin76@gentoo.org> (2014-11-17)
 # Mask sys-devel/kgcc64 since >=gcc-4.4 can build 64bit kernels
 sys-devel/kgcc64
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index cd3bd5afc540..4ef2939bc3cc 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
@@ -148,10 +148,6 @@ dev-python/pyopengl test
 >=app-admin/syslog-ng-3.25 test
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-20)
-# Not keyworded on sparc
-net-misc/whois xcrypt
-
-# Rolf Eike Beer <eike@sf-mail.de> (2020-04-20)
 # test dependencies for USE=gstreamer not keyworded on sparc
 app-misc/tracker-miners test