gentoo resync : 18.08.2019

3 files changed, 30 insertions, 27 deletions

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index c68f65c9bc60..081b86bcd413 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2019-08-17)
+# USE=-cxx us a sure way to break native install as modern gcc
+# requires C++ to bootstrap. But in rare cases it's useful
+# to have a compiler not capable of C++, bug #692126.
+sys-devel/gcc cxx
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2019-04-14)
 # Make sure glibc static libs are installed for now. Not installing
 # them is an experimental feature and needs testing.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index f1a5693fc8d5..42b7549742bd 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,21 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Kent Fredric <kentnl@gentoo.org> (2019-08-07)
+# Newer versions of nqp need newer versions of jdk to run on the jvm,
+# but these currently don't exist in gentoo. The USE flags have to be
+# kept around for dependency reasons from rakudo and friends.
+>=dev-lang/nqp-2019.07 java
+
+# Aaron Bauman <bman@gentoo.org> (2019-08-04)
+# media-libs/ming will be removed in 30 days
+media-gfx/pstoedit flash
+sci-chemistry/wxmacmolplt flash
+
+# Thomas Deutschmann <whissi@gentoo.org> (2019-08-03)
+# Early microcode loading is only supported on amd64 & x86
+sys-kernel/linux-firmware initramfs
+
 # Lars Wendler <polynomial-c@gentoo.org> (2019-07-26)
 # Requires dev-libs/gumbo which is only keyworded for amd64 and x86
 mail-client/claws-mail litehtml
@@ -33,16 +48,6 @@ net-proxy/ziproxy jpeg2k
 sci-libs/grib_api jasper jpeg2k
 x11-libs/gdk-pixbuf jpeg2k
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-07-07)
-# media-video/pipewire is masked for now
-sys-apps/xdg-desktop-portal screencast
-kde-plasma/xdg-desktop-portal-kde screencast
-
-# Mike Gilbert <floppym@gentoo.org> (2019-06-21)
-# Fails to build.
-# https://bugs.gentoo.org/661880
-<www-client/chromium-76 system-icu
-
 # James Le Cuirot <chewi@gentoo.org> (2019-05-21)
 # Doesn't support ffmpeg-4. Portage takes a long time to report the
 # conflict and the feature is half broken anyway. See
@@ -186,11 +191,6 @@ dev-python/paramiko server
 # and compiler/binutils combinations.)
 sys-libs/glibc cet
 
-# Göktürk Yüksek <gokturk@gentoo.org> (2018-07-06)
-# Dependency app-crypt/jitterentropy is keyworded for
-# only a subset of the archs rng-tools supports
-sys-apps/rng-tools jitterentropy
-
 # Michał Górny <mgorny@gentoo.org> (2018-06-13)
 # Requires app-arch/snappy[static-libs] that is no longer available.
 # Bugs #651604, #651606.
@@ -239,8 +239,8 @@ dev-db/mysql client-libs
 dev-db/percona-server client-libs
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-02-02)
-# This feature is not ready yet, see bug 146882 comment 26
-sys-libs/glibc compile-locales
+# This feature is not ready yet pre-2.29-r4, see bug 146882 comment 26
+<sys-libs/glibc-2.29-r4 compile-locales
 
 # Mart Raudsepp <leio@gentoo.org> (2018-01-10)
 # Failing tests, with extra deps that aren't keyworded due to that
@@ -368,8 +368,9 @@ mate-base/mate bluetooth
 # Ulrich Müller <ulm@gentoo.org> (2016-10-15)
 # The --with-cairo option is considered as experimental by upstream
 # and causes problems with updating the X window, bug #592238
-app-editors/emacs cairo
-app-editors/emacs-vcs cairo
+app-editors/emacs:25 cairo
+app-editors/emacs:26 cairo
+app-editors/emacs-vcs:26 cairo
 
 # Michał Górny <mgorny@gentoo.org> (2016-07-05)
 # Mask system-clang support as it requires llvm-3.4 that is subject
@@ -399,12 +400,6 @@ sys-devel/gcc vtv
 # invokes it wrong.
 dev-lang/moarvm asan
 
-# Patrice Clement <monsieurp@gentoo.org>
-# Merged on behalf of:
-# Jonathan Scruggs <j.scruggs@gmail.com> (2017-09-28)
-# Newer versions have a patch to fix the python issues.
-<=media-libs/openimageio-1.6.13 python
-
 # Ian Stakenvicius <axs@gentoo.org> (2016-04-28)
 # system-cairo support causes lots of crashing in mozilla pkgs
 # (see bug #556378 and others)
@@ -615,5 +610,3 @@ net-proxy/squid ipf-transparent pf-transparent
 # Alexis Ballier <aballier@gentoo.org> (2011-02-16)
 # Win32 specific useflag for vlc. Can be used for cross-compiling.
 media-video/vlc directx
-# Mac OSX / iPhone OS specific useflags
-media-video/vlc macosx-qtkit
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index e10b6ab0157d..21c108c9ec8d 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.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 package.use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2019-08-16)
+# dev-libs/libical[glib] was not stable tested, bug #689434
+=dev-libs/libical-3.0.5 glib
+
 # Michał Górny <mgorny@gentoo.org> (2019-07-31)
 # Freshly added test dependency for a test-restricted package.  Mask
 # the flag to avoid stabilizing it for the time being.