gentoo resync : 03.11.2021

11 files changed, 14 insertions, 28 deletions

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 6749b9c0a44d..0d2b90931c43 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="alpha"
@@ -23,11 +23,6 @@ LIBDIR_alpha="lib"
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 
-# Chris Gianelloni <wolf31o2@gentoo.org> (2007-02-05)
-# Defaults for audio drivers. These are copied from x86 (minus modems), since
-# Alpha supports the same busses.
-ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 maestro3 trident usb-audio via82xx ymfpci"
-
 # Tobias Klausmann <klausman@gentoo.org> (2018-06-25)
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 775103c63ac8..0c05dec124e2 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -50,10 +50,6 @@ ABI_X86="64"
 # Defaults for video drivers
 VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa"
 
-# Danny van Dyk <kugelfang@gentoo.org> (2006-12-22)
-# Default for ALSA_CARDS USE_EXPAND variable.
-ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
-
 # Michał Górny <mgorny@gentoo.org> (2013-01-26)
 # Unhide the x86-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86"
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index b5cba9077afb..6ccf21fe1f2f 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -112,6 +112,7 @@
 -input_devices_vmmouse
 -input_devices_wacom
 -video_cards_ast
+-video_cards_crocus
 -video_cards_i915
 -video_cards_i965
 -video_cards_intel
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 88a8463a0774..fa5842d8a528 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-31)
+# dev-python/pyilmbase isn't keyworded on arm
+media-gfx/alembic python
+
 # Sam James <sam@gentoo.org> (2021-10-26)
 # Avoid dragging in obscure parts of dev-qt/* unless/until
 # somebody needs them. bug #816981.
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 4dbdd22f3d18..badf15963e1c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-31)
+# dev-python/pyilmbase isn't keyworded on arm64
+media-gfx/alembic python
+
 # Ben Kohler <bkohler@gentoo.org> (2021-10-18)
 # missing keywords on net-misc/pyhoca-cli and its deps
 net-misc/remmina x2go
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 887839c48153..497a91c05748 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -124,6 +124,7 @@ video_cards_geode
 # not needed on non-x86, non-amd64 systems
 input_devices_vmmouse
 video_cards_ast
+video_cards_crocus
 video_cards_i915
 video_cards_i965
 video_cards_intel
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index c87d017b15e5..4327e5757079 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="ia64"
@@ -27,7 +27,3 @@ CHOST_ia64="${CHOST}"
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mga nv r128 radeon"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2006-12-23)
-# Defaults for audio drivers - Took from x86 profile
-ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
diff --git a/profiles/arch/mips/make.defaults b/profiles/arch/mips/make.defaults
index cb1dead24e75..9d3d5a8a1bfc 100644
--- a/profiles/arch/mips/make.defaults
+++ b/profiles/arch/mips/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
@@ -15,7 +15,3 @@ USE="-fortran -openmp"
 LIBDIR_o32="lib"
 LIBDIR_n32="lib32"
 LIBDIR_n64="lib64"
-
-# Matt Turner <mattst88@gentoo.org> (2010-12-06)
-# Probably missing a bunch for various SGI systems.
-ALSA_CARDS="au1x00"
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 0332427d751e..51f2ea0ad11e 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -17,10 +17,6 @@ FCFLAGS="${CFLAGS}"
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mga nv r128 radeon"
 
-# Diego Pettenò <flameeyes@gentoo.org> (2006-12-06)
-# Defaults for PowerPC sound driver
-ALSA_CARDS="aoa aoa-fabric-layout aoa-onyx aoa-soundbus aoa-soundbus-i2s aoa-tas aoa-toonie powermac usb-audio via82xx"
-
 # Michał Górny <mgorny@gentoo.org> (2014-06-27)
 # Multilib-related setup for compatibility with future multilib.
 ABI="ppc"
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 4a9685fa276e..c1f35ac18d3a 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -30,10 +30,6 @@ LIBDIR_x86="lib"
 # Defaults for video drivers
 VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa"
 
-# Andrej Kacian <ticho@gentoo.org> (2006-12-21)
-# Defaults for audio drivers
-ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
-
 # Michał Górny <mgorny@gentoo.org> (2014-06-25)
 # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
 # by non-multilib ebuilds when non-native ABIs are disabled.
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 8a86d7306ed6..8e6b5ac51c3b 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -131,6 +131,7 @@
 -input_devices_vmmouse
 -input_devices_wacom
 -video_cards_ast
+-video_cards_crocus
 -video_cards_i915
 -video_cards_i965
 -video_cards_intel