gentoo resync : 22.10.2018

3 files changed, 31 insertions, 23 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index a0a1d4f977ba..8e489bf49e13 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -92,11 +92,6 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 # Netbeans modules/clusters
 NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
 
-# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
-# https://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml
-# Build kernel modules from linux-mod by default:
-USE="${USE} modules"
-
 # Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
 # Default Ruby build target
 # Updated to include ruby23 on 21 Jan 2018
@@ -166,4 +161,4 @@ POSTGRES_TARGETS="postgres9_5 postgres10"
 # Moreover, it should only contain targets that have a stable version
 # of PHP, to avoid pulling in an unstable PHP on stable systems.
 #
-PHP_TARGETS="php5-6 php7-0"
+PHP_TARGETS="php5-6 php7-1"
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 6cfe118fb8ae..3e87f3085150 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires >=portage-2.1.1
@@ -7,13 +7,30 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Pacho Ramos <pacho@gento.org> (21 Oct 2018)
+# splashutils is being removed
+sys-power/suspend fbsplash
+
+# Lars Wendler <polynomial-c@gentoo.org> (18 Oct 2018)
+# gnutls is broken in older releases
+<net-libs/gsoap-2.8.64 gnutls
+
+# Matt Turner <mattst88@gentoo.org> (16 Oct 2018)
+# media-libs/libomxil-bellagio is masked for removal.
+media-libs/mesa openmax
+
+# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
+# Requires www-client/firefox which isn't available on all architectures
+# yet, unmask per arch
+app-misc/tracker firefox-bookmarks
+
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (06 Oct 2018)
 # address user visible breakage due to circular dependency #665008
 =media-fonts/encodings-1.0.4-r3 X
 
 # Dirkjan Ochtman <djc@gentoo.org> (29 Sep 2018)
 # Clippy is broken for now, can't find libraries (bug 667286)
-dev-lang/rust clippy
+<dev-lang/rust-1.29.2 clippy
 dev-lang/rust-bin clippy
 
 # Virgil Dupras <vdupras@gentoo.org> (26 Sep 2018)
@@ -121,12 +138,16 @@ sys-libs/glibc compile-locales
 media-video/ffmpeg appkit
 
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
-# Java 9 is not yet fully supported on Gentoo. Having a masked
+# Java 9+ is not yet fully supported on Gentoo. Having a masked
 # gentoo-vm flag allows us to provide it without it breaking Gentoo
 # packages. Those who wish to experiment with it as a fully recognised
 # Gentoo JVM can unmask the flag.
 dev-java/oracle-jdk-bin:9 gentoo-vm
 dev-java/oracle-jre-bin:9 gentoo-vm
+dev-java/oracle-jdk-bin:11 gentoo-vm
+dev-java/oracle-jre-bin:11 gentoo-vm
+dev-java/openjdk-bin:11 gentoo-vm
+dev-java/openjdk:11 gentoo-vm
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (04 Nov 2017)
 # Requires audacious, which is masked. Bug 632513
@@ -160,10 +181,6 @@ sys-devel/clang z3
 # Mask USE flag which has limited keywords for app-crypt/argon2
 dev-lang/php argon2
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (16 Jul 2017)
-# Causes build to fail with ffmpeg-3, #602786
-www-plugins/gnash vaapi
-
 # Mike Gilbert <floppym@gentoo.org> (09 Jul 2017)
 # Matthias Dahl <matthias.dahl@binary-island.eu> (05 Jul 2017)
 # Both are not your typical garden-variety Linux programs and are
@@ -276,10 +293,6 @@ app-editors/emacs-vcs cairo
 # Needs a Gstreamer plugin from gst-plugins-bad that is not packaged to date
 media-plugins/grilo-plugins chromaprint
 
-# Lars Wendler <polynomial-c@gentoo.org> (19 Aug 2016)
-# gnutls is broken for years
->=net-libs/gsoap-2.8.0 gnutls
-
 # Michał Górny <mgorny@gentoo.org> (05 Jul 2016)
 # Mask system-clang support as it requires llvm-3.4 that is subject
 # to security bug cleanup, #585102.
@@ -450,10 +463,6 @@ dev-python/pypy3 sandbox
 # gentoo bugs.
 media-libs/libsdl2 custom-cflags
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
-# Causes build to fail, issue is being discussed with upstream
->=www-plugins/gnash-0.8.10_p20130822 openvg
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013)
 # GL/GLES support in cairo is mutually exclusive, bug #428770.
 x11-libs/cairo gles2
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index c416cbaa11c9..ce0805ba2c06 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> (16 Oct 2018)
+# app-misc/ddcutil is not yet stable.
+kde-plasma/powerdevil brightness-control
+
 # Andreas Sturmlechner <asturm@gentoo.org> (11 Sep 2018)
 # Sometimes crashes Plasma with Appstream versions pre-0.12.
 # Newer versions of dev-libs/appstream are not stable yet. See also:
@@ -31,8 +35,8 @@ dev-python/s3fs test
 =app-office/libreoffice-6.0* kde
 
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Mar 2018)
-# Depends on unstable dependencies; qt3d bug #652046
-sci-geosciences/qgis 3d grass
+# sci-geosciences/grass is not stable
+sci-geosciences/qgis grass
 
 # Thomas Beierlein <tomjbe@gentoo.org> (21 Mar 2018)
 # ~app-backup/bacula-9.0.6 does not compile with USE=libressl (bug #641492)