Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

4 files changed, 7 insertions, 10 deletions

diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 3a3a5d0d7113..5ceb9b4d20e1 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -163,7 +163,7 @@ media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (2017-08-08)
 # Requires USE=opencl that is masked in this profile.
-net-misc/bfgminer adl lm-sensors
+net-misc/bfgminer adl lm_sensors
 
 # Michał Górny <mgorny@gentoo.org> (2017-06-28)
 # dev-tcltk/tcllib is not keyworded, and tests are restricted anyway, so
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 2f3ff24cd5eb..18f0f7b726f7 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Michał Górny <mgorny@gentoo.org> (2019-09-08)
-# virtual/jdk is not stable here.
-sci-mathematics/z3 java
-
 # Mart Raudsepp <leio@gentoo.org> (2019-08-27)
 # Missing stable net-libs/webkit-gtk
 dev-util/glade webkit
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index abc7267ea52b..7433f4959664 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -16,6 +16,10 @@ python_single_target_python3_7
 # No ACPI support on arm. Bug #657332
 acpi
 
+# Patrick Lauer <patrick@gentoo.org> (2015-04-28)
+# Dependencies not keyworded
+ayatana
+
 # Andrey Grozin <grozin@gentoo.org> (2014-05-16)
 # gcl keyworded ~arm, bug #509842
 -gcl
@@ -73,7 +77,7 @@ gphoto2
 afs
 mono
 lirc
-lm-sensors
+lm_sensors
 xemacs
 scanner
 sid
@@ -150,3 +154,4 @@ numa
 
 # toolkit for nvidia binary drivers
 cg
+
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 08dc0f3696fe..3c11f961a4dc 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not yet stable.
-ayatana
-
 # Hans de Graaff <graaff@gentoo.org> (2019-07-17)
 # Temporary mask for stable bug 688976
 ruby_targets_ruby25