gentoo resync : 18.05.2019

3 files changed, 17 insertions, 6 deletions

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index e18ccc6024ff..04fc8f63c525 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -24,12 +24,6 @@ net-misc/netkit-bootparamd libtirpc
 sci-astronomy/esomidas libtirpc
 sys-cluster/glusterfs libtirpc
 
-# Matt Turner <mattst88@gentoo.org> (13 Jun 2018)
-# Upstream is transitioning to Meson, but does not yet have any configuration
-# options. Until those configuration options are provided, force USE flags on
-# to avoid automagic deps.
->=x11-apps/igt-gpu-tools-1.23 alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv
-
 # NP-Hardass <NP-Hardass@gentoo.org> (10 Apr 2017)
 # Always force patch on appropriate variant to ensure
 # similar experience when using app-emulation/wine-any
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 36d440be9eb8..abf268d48588 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# app-accessibility/festival:
+# Outdated, EAPI=2, unmaintained, segfaults immediately.
+# See bug 634928 and bug 612980. Removal in 30 days.
+media-radio/xastir festival
+
 # Virgil Dupras <vdupras@gentoo.org> (29 Apr 2019)
 # Docs are temporarily broken. See bug #680014
 dev-python/pandas doc
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index aff54b5205d7..ceaca7eb8ee2 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,17 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (10 May 2019)
+# needs llvm slots which are not stable #678908
+# also prone to weird compilation failures
+# masking this for now, will readjust as situation changes
+>=dev-lang/rust-1.34 system-llvm
+
+# Virgil Dupras <vdupras@gentoo.org> (10 May 2019)
+# Needs openssl 1.1 which isn't going stable for a while and blocks
+# bug #684972. See bug #685584
+>=app-text/mupdf-1.14.0-r3 ssl
+
 # Mart Raudsepp <leio@gentoo.org> (14 Apr 2019)
 # Needs media-plugins/gst-plugins-chromaprint, which is not stable
 # anywhere yet.