gentoo resync : 30.05.2020

7 files changed, 13 insertions, 24 deletions

diff --git a/profiles/arch/arm/armv5te/use.mask b/profiles/arch/arm/armv5te/use.mask
index ac64860e2fac..c10a8b70d18e 100644
--- a/profiles/arch/arm/armv5te/use.mask
+++ b/profiles/arch/arm/armv5te/use.mask
@@ -1,6 +1,4 @@
 # Unmask armv5 specific USE flags
--armv5te
-
 -cpu_flags_arm_v4
 -cpu_flags_arm_v5
 
diff --git a/profiles/arch/arm/armv6j/use.mask b/profiles/arch/arm/armv6j/use.mask
index 14b9b73775a9..5a841abd6e10 100644
--- a/profiles/arch/arm/armv6j/use.mask
+++ b/profiles/arch/arm/armv6j/use.mask
@@ -1,8 +1,4 @@
 # Unmask armv6 specific USE flags
--armvfp
--armv6
--armv6t2
-
 -cpu_flags_arm_v4
 -cpu_flags_arm_v5
 -cpu_flags_arm_v6
diff --git a/profiles/arch/arm/armv7a/use.force b/profiles/arch/arm/armv7a/use.force
index a2d86cc89d0a..6ced0f7ac91d 100644
--- a/profiles/arch/arm/armv7a/use.force
+++ b/profiles/arch/arm/armv7a/use.force
@@ -1,8 +1,4 @@
 # armv7 has these instruction sets
-armv5te
-armv6
-armv6t2
-
 cpu_flags_arm_v4
 cpu_flags_arm_v5
 cpu_flags_arm_v6
diff --git a/profiles/arch/arm/armv7a/use.mask b/profiles/arch/arm/armv7a/use.mask
index 943381017df6..25991f5fd76d 100644
--- a/profiles/arch/arm/armv7a/use.mask
+++ b/profiles/arch/arm/armv7a/use.mask
@@ -1,9 +1,5 @@
 # Unmask armv7 specific USE flags
 -neon
--armvfp
--armv5te
--armv6
--armv6t2
 
 -cpu_flags_arm_v4
 -cpu_flags_arm_v5
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 960cb9e43842..296af178d13c 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Jimi Huotari <chiitoo@gentoo.org> (2020-05-17)
+# Mask until 'app-arch/lxqt-archiver' is keyworded.
+lxqt-base/lxqt-meta archiver
+
 # Mikle Kolyada <zlogene@gentoo.org> (2020-05-06)
 # no keywords
 dev-python/pbr test
@@ -97,10 +101,6 @@ sys-apps/fwupd dell thunderbolt
 # Requires dev-php/pecl-imagick which is not keyworded on arm
 www-apps/nextcloud imagemagick
 
-# Corentin Pazdera <nado@troglodyte.be> (2018-12-28)
-# Requires dev-python/pypy which isn't keyworded for ARM.
-www-servers/uwsgi pypy
-
 # Davide Pesavento <pesa@gentoo.org> (2018-12-27)
 # The corresponding Qt5 modules are not keyworded on arm, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
@@ -271,7 +271,6 @@ app-metrics/collectd collectd_plugins_modbus
 app-metrics/collectd collectd_plugins_oracle
 app-metrics/collectd collectd_plugins_routeros
 app-metrics/collectd collectd_plugins_sigrok
-app-metrics/collectd collectd_plugins_tokyotyrant
 app-metrics/collectd collectd_plugins_varnish
 app-metrics/collectd collectd_plugins_virt
 app-metrics/collectd collectd_plugins_write_mongodb
@@ -410,10 +409,6 @@ dev-libs/efl physics
 # luajit isn't keyworded for arm yet, which is a bummer
 net-im/prosody jit
 
-# Rick Farina <zerochaos@gentoo.org> (2014-01-09)
-# rjb doesn't work on arm, so no java hacks for metasploit
-net-analyzer/metasploit java
-
 # Markus Meier <maekke@gentoo.org> (2013-12-26)
 # Unkeyworded deps, bug #488724
 app-office/gnumeric libgda
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 79669edb61d7..89059484015f 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -142,7 +142,6 @@ net-misc/connman l2tp pptp
 
 # Pacho Ramos <pacho@gentoo.org> (2014-07-02)
 # Mask due Gnome3 not going to be stabilized on this arch
->=gnome-base/gnome-desktop-2.32.1-r2 license-docs
 gnome-base/gvfs google
 net-libs/libproxy webkit
 >=x11-libs/gtk+-3.12.2 cloudprint
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index feb40f29c013..215c0cae19b8 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -4,6 +4,15 @@
 # Unmask the flag which corresponds to ARCH.
 -arm
 
+# Michał Górny <mgorny@gentoo.org> (2020-05-28)
+# Moving from arch/base.
+python_targets_python3_8
+python_single_target_python3_8
+
+# Michał Górny <mgorny@gentoo.org> (2020-05-28)
+# Unmask once arm is FINALLY done with bug #719700.
+python_targets_python3_9
+
 # Unmask arm arch specific flags
 -cpu_flags_arm_iwmmxt
 -cpu_flags_arm_iwmmxt2