gentoo resync : 28.04.2021

7 files changed, 18 insertions, 15 deletions

diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 4eab47df955e..ba6b5cee170c 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -59,6 +59,7 @@ games-arcade/thinktanks-demo
 games-emulation/caps
 games-emulation/nestra
 games-emulation/pcsx2
+games-emulation/vgba
 games-emulation/zinc
 games-emulation/zsnes
 games-fps/avp
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index d54c8e8baca2..a8ec3b16bc06 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -3,7 +3,7 @@
 
 # Mike Gilbert <floppym@gentoo.org> (2016-11-17)
 # Enable both efi and pc by default.
-# https://bugs.gentoo.org/600110
+# bug #600110
 sys-boot/grub:2 grub_platforms_efi-64 grub_platforms_pc
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 0a05a79d2523..a97c6325f2e3 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -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
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert <floppym@gentoo.org> (2021-03-29)
+# Unmask TPM on supported archs.
+sys-apps/systemd -tpm
+
+# Michael Orlitzky <mjo@gentoo.org> (2021-03-27)
+# Unmask the use of 64-bit dev-lisp/clozurecl on 64-bit arches.
+# Only maxima makes a distinction between the 32-bit and 64-bit
+# USE flags.
+sci-mathematics/fricas -clozurecl
+<sci-mathematics/maxima-5.44.0-r5 -clozurecl
+sci-mathematics/maxima -clozurecl64
+
 # Thomas Deutschmann <whissi@gentoo.org> (2021-02-17)
 # Unmask PCRE JIT support where dev-libs/libpcre2[jit] is available
 dev-lang/php -jit
@@ -289,8 +301,8 @@ games-emulation/mupen64plus-core new-dynarec
 # Tim Harder <radhermit@gentoo.org> (2013-08-13)
 # dev-lang/luajit keyworded for amd64 (masked in base)
 # dev-scheme/racket keyworded for amd64 (masked in base)
-app-editors/vim -luajit -racket
-app-editors/gvim -luajit -racket
+app-editors/vim -racket
+app-editors/gvim -racket
 
 # Kacper Kowalik <xarthisius@gentoo.org> (2013-08-09)
 # Works on amd64
@@ -305,10 +317,6 @@ dev-python/pypy3-exe cpu_flags_x86_sse2
 # Unmask here, as it's masked in base.
 net-libs/gnutls -dane
 
-# Ben de Groot <yngwin@gentoo.org> (2012-07-30)
-# dependency keyworded here, masked in base
-media-libs/freetype -infinality
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (2012-04-12)
 # Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
 # gobject-introspection[doctool], bug #411761
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 30c8a9b41147..b5cba9077afb 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -55,7 +55,6 @@
 # Andrey Grozin <grozin@gentoo.org> (2014-06-25)
 # keyworded on amd64
 -clisp
--clozurecl
 -ecls
 -gcl
 -sbcl
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index ba88ea41c2eb..ee9b21e49fec 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -20,10 +20,6 @@ firebird
 # The modern versions of CUDA SDK are not suitable for stabilization.
 cuda
 
-# Andrey Grozin <grozin@gentoo.org> (2014-06-25)
-# no stable versions on amd64
-clozurecl
-
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is unstable on this arch.
 python_targets_pypy3
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 8f25b3f974c6..a0a8241c9377 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -68,7 +68,6 @@ kde-apps/parley:5
 kde-apps/pim-data-exporter:5
 kde-apps/pim-sieve-editor:5
 kde-apps/plasma-telepathy-meta:5
-<kde-misc/kio-gdrive-20.12.0
 kde-misc/kmarkdownwebview:5
 kde-misc/tellico:5
 kde-misc/zanshin:5
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 563a7f2c2884..4781af1cf4e0 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -9,7 +9,7 @@ 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 digikam krita
+media-gfx/gmic krita
 net-irc/quassel urlpreview
 net-misc/fatrat bittorrent
 net-misc/seafile-client shibboleth