Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

23 files changed, 33 insertions, 85 deletions

diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index a4c95382078b..e12df6de1f98 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/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)
-# Dependency not yet stable (dev-libs/libappindicator).
-ayatana
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-07-22)
 # sys-auth/elogind is not yet stable here. bug #682158
 elogind
@@ -28,7 +24,7 @@ webkit
 
 # Pacho Ramos <pacho@gentoo.org> (2014-04-17)
 # Dropped stable keywords after the discussion caused by
-# Gnome 3.8/3.10 stabilization on this arch
+# Gnome 3.8/3.10 stabilization on this arch   
 colord
 devhelp
 dia
diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask
index 3dfab0817e61..4da55885f761 100644
--- a/profiles/arch/amd64-fbsd/use.mask
+++ b/profiles/arch/amd64-fbsd/use.mask
@@ -33,10 +33,6 @@
 #-video_cards_vmware
 -input_devices_vmmouse
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-ayatana
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not keyworded here.
 elogind
@@ -117,4 +113,4 @@ jemalloc
 
 # Benda Xu <heroxbd@gentoo.org> (2019-06-26)
 # Not tested
-eselect-ldso
+eselect-ldso
\ No newline at end of file
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
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 693fa4127847..d525c9227459 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -26,10 +26,6 @@
 -neon
 -armvfp
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependency not keyworded (dev-libs/libindicate).
-ayatana
-
 # Mart Raudsepp <leio@gentoo.org> (2019-01-07)
 # Does not work on arm64 until dev-lang/luajit-2.1
 # https://github.com/LuaJIT/LuaJIT/issues/26
@@ -102,7 +98,7 @@ libproxy
 darcs
 afs
 lirc
-lm-sensors
+lm_sensors
 scanner
 zvbi
 fluidsynth
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 12eaca127e4c..3c99ab4cf5d1 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -4,10 +4,6 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependency not keyworded (dev-libs/libappindicator).
-ayatana
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not yet keyworded here. bug #681200
 elogind
@@ -248,8 +244,8 @@ video_cards_radeon
 video_cards_radeonsi
 
 # Guy Martin <gmsoft@gentoo.org> (2005-07-25)
-# lm-sensors not supported on hppa and ieee1394 not tested
-lm-sensors
+# lm_sensors not supported on hppa and ieee1394 not tested
+lm_sensors
 iec61883
 ieee1394
 
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index d80d41906d52..f8db01005e76 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -3,10 +3,6 @@
 
 # This is a list of USE flags that should not be used on ia64.
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependency not keyworded (dev-libs/libindicate).
-ayatana
-
 # Michał Górny <mgorny@gentoo.org> (2018-07-16)
 # Python 3.7 support requires fresh versions of packages which are stuck
 # at keywordreqs.
@@ -50,7 +46,7 @@ wifi
 # Hardware not available on ia64
 apm
 battery
-lm-sensors
+lm_sensors
 pm-utils
 
 # Stuff that doesn't work on ia64, or not tested
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index c83a23bed8f5..833297a10352 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -4,10 +4,6 @@
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-ayatana
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not keyworded here.
 elogind
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 13a251b7f9e9..38cd86ebc6c6 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -27,7 +27,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)
 # app-misc/dtach is not keyworded, and tests are restricted anyway, so
diff --git a/profiles/arch/powerpc/make.defaults b/profiles/arch/powerpc/make.defaults
deleted file mode 100644
index 8613dd7619ee..000000000000
--- a/profiles/arch/powerpc/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# All extra USE/etc should be specified in sub-profiles.
-# DO NOT POLLUTE USE ON THIS PROFILE.
-
-# Georgy Yakovlev <gyakovlev@gentoo.org (2019-08-30)
-# Unhide PPC specific USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_PPC"
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index fd21d01a649e..036de06eeaf0 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -106,7 +106,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
 
 # Jason Zaman <perfinion@gentoo.org> (2017-05-09)
 # x11-libs/libXpresent is not keyworded on ppc
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 2fe615c7a405..911a017daa97 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -69,7 +69,7 @@ klibc
 #
 3dfx
 acpi
-lm-sensors
+lm_sensors
 rar
 hdf
 xvmc
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index cdac340949c4..5806afdc7ab1 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -15,7 +15,7 @@ dev-vcs/git pcre-jit
 # do not support python-3.7 yet.
 
 app-admin/syslog-ng amqp dbi geoip geoip2 json kafka mongodb python redis spoof-source smtp snmp
-app-admin/sysstat lm-sensors
+app-admin/sysstat lm_sensors
 app-arch/libarchive lz4 lzo zstd
 app-arch/unzip natspec
 app-crypt/gnupg smartcard tofu wks-server
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 323eff42aa35..91f43a4762f2 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -31,7 +31,3 @@ slang
 sqlite
 systemtap
 X
-
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-ayatana
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 96177705207c..491c1dee8a5c 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -7,10 +7,6 @@
 # Unmask ABI flags for this arch.
 -abi_s390_32
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-ayatana
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not yet keyworded here. bug #681200
 elogind
@@ -90,7 +86,7 @@ motif
 mono
 ocaml
 sdl
-lm-sensors
+lm_sensors
 wxwidgets
 
 # Many X drivers make no sense on this platform.
diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask
index 4b2e55f73197..ed8deae11c86 100644
--- a/profiles/arch/sh/use.mask
+++ b/profiles/arch/sh/use.mask
@@ -1,10 +1,6 @@
 # Unmask the flag which corresponds to ARCH.
 -sh
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-ayatana
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not yet keyworded here. bug #681200
 elogind
@@ -57,7 +53,7 @@ diet
 lirc
 afs
 mono
-lm-sensors
+lm_sensors
 qdbm
 fftw
 eds
@@ -105,7 +101,7 @@ video_cards_r600
 video_cards_radeonsi
 
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-03-07)
-# Modular X: mask for architectures lacking direct rendering
+# Modular X: mask for architectures lacking direct rendering      
 dri
 
 # nspr isnt ported to SuperH which means no seamonkey/firefox/etc...
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index cbc5338bebdf..a5963370adbb 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -6,10 +6,6 @@
 
 # This file contains a list of useflags that cannot be used on sparc.
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependency not keyworded (dev-libs/libappindicator).
-ayatana
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-12-12)
 # mongodb is not keyworded on sparc
 mongodb
@@ -152,7 +148,7 @@ zmq
 ifp
 chipcard
 hbci
-lm-sensors
+lm_sensors
 openct
 bluetooth
 dmraid
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index e5aaf9470aa2..9d4081792d4b 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Ben Kohler <bkohler@gentoo.org> (2019-06-11)
 # Pulls in net-libs/axtls which is not stable for sparc
 curl_ssl_axtls
diff --git a/profiles/arch/x86-fbsd/use.mask b/profiles/arch/x86-fbsd/use.mask
index 385830faf29d..bdecee028a03 100644
--- a/profiles/arch/x86-fbsd/use.mask
+++ b/profiles/arch/x86-fbsd/use.mask
@@ -5,10 +5,6 @@
 -x86-fbsd
 -abi_x86_32
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-ayatana
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not keyworded here.
 elogind
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 0ff8ea4e2409..485f9a085eab 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -12,6 +12,14 @@ dev-qt/qt3d gamepad
 dev-lang/rust-bin -doc
 >=dev-lang/rust-bin-1.37 -clippy -rustfmt
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2019-08-18)
+# media-video/pipewire is not keyworded yet
+dev-libs/weston pipewire
+kde-apps/krfb wayland
+kde-plasma/xdg-desktop-portal-kde screencast
+sys-apps/xdg-desktop-portal screencast
+x11-wm/mutter screencast
+
 # Thomas Deutschmann <whissi@gentoo.org> (2019-08-03)
 # Early microcode loading is supported on x86
 sys-kernel/linux-firmware -initramfs
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 070c71c1d613..01a5ca12941c 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,14 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-09-13)
-# media-video/pipewire is not keyworded yet
-dev-libs/weston pipewire
-kde-apps/krfb wayland
-kde-plasma/xdg-desktop-portal-kde screencast
-sys-apps/xdg-desktop-portal screencast
-x11-wm/mutter screencast
-
 # Brian Evans <grknight@gentoo.org> (2019-05-22)
 # Allow python-exec to install all targets
 # Ack by mgorny