gentoo resync : 28.04.2019

4 files changed, 34 insertions, 18 deletions

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index a4f67f42aa5b..e18ccc6024ff 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,9 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Lars Wendler <polynomial-c@gentoo.org> (20 Mar 2019)
-# USE="-gnutls" is broken (#675694)
->=net-fs/samba-4.10.0_rc1 gnutls
+# Andreas K. Hüttel <dilfridge@gentoo.org> (14 Apr 2019)
+# Make sure glibc static libs are installed for now. Not installing
+# them is an experimental feature and needs testing.
+sys-libs/glibc static-libs
 
 # Mart Raudsepp <leio@gentoo.org> (14 Dec 2018)
 # Security is not optional if available for the architecture/kernel.
@@ -53,10 +54,6 @@ dev-lang/python threads
 # Workaround until resolved upstream (bug #586840)
 >=dev-games/simgear-2016.2.1 dns
 
-# Lars Wendler <polynomial-c@gentoo.org> (11 Sep 2015)
-# Package fails to build with dbus USE flag being disabled (bug #560208)
-=x11-wm/afterstep-2.2.12 dbus
-
 # Justin Lecher <jlec@gentoo.org> (10 Aug 2014)
 # Doesn't work without acl support
 # No patch yet, #516626
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 97c7a2ddd346..7eb87820486d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,26 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Ulrich Müller <ulm@gentoo.org> (25 Apr 2019)
+# Pulls in media-fonts/kochi-substitute as dependency, which allows
+# only non-commercial distribution and can therefore not be included
+# with Gentoo install media. Mask the l10n_ja flag until a better
+# solution is found, e.g., transition to a free font package.
+app-text/ghostscript-gpl l10n_ja
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (17 Apr 2019)
+# Mask jre useflags for use as system java-vm until it's proven to work
+dev-java/openjdk-jre-bin:8 gentoo-vm
+dev-java/openjdk-jre-bin:11 gentoo-vm
+
+# Michał Górny <mgorny@gentoo.org> (13 Apr 2019)
+# net-libs/ftplib is slated for removal.
+app-cdr/xbiso ftp
+
+# Michał Górny <mgorny@gentoo.org> (10 Apr 2019)
+# media-sound/aacplusenc is slated for removal.
+media-video/h264enc aac
+
 # Michał Górny <mgorny@gentoo.org> (31 Mar 2019)
 # dev-libs/grok is slated for removal.
 app-admin/rsyslog grok
@@ -94,12 +114,6 @@ sci-libs/ceres-solver sparse
 # jit brokes build of gnat-gpl
 dev-lang/gnat-gpl jit
 
-# Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
-# Requires www-client/firefox and mail-client/thunderbird
-# which are not available on all architectures
-# yet, unmask per arch
-app-misc/tracker firefox-bookmarks thunderbird
-
 # 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
@@ -107,7 +121,7 @@ app-misc/tracker firefox-bookmarks thunderbird
 # Dirkjan Ochtman <djc@gentoo.org> (29 Sep 2018)
 # Clippy is broken for now, can't find libraries (bug 667286)
 <dev-lang/rust-1.29.2 clippy
-dev-lang/rust-bin clippy
+<dev-lang/rust-bin-1.34.1 clippy
 
 # Virgil Dupras <vdupras@gentoo.org> (26 Sep 2018)
 # Server feature in paramiko is patched out for security reasons. It can
@@ -326,10 +340,6 @@ mate-base/mate bluetooth
 app-editors/emacs cairo
 app-editors/emacs-vcs cairo
 
-# Gilles Dartiguelongue <eva@gentoo.org> (21 Aug 2016)
-# Needs a Gstreamer plugin from gst-plugins-bad that is not packaged to date
-media-plugins/grilo-plugins chromaprint
-
 # 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.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index a18c16751d10..aff54b5205d7 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Mart Raudsepp <leio@gentoo.org> (14 Apr 2019)
+# Needs media-plugins/gst-plugins-chromaprint, which is not stable
+# anywhere yet.
+media-plugins/grilo-plugins chromaprint
+
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Feb 2019)
 # Unstable dependencies.
 media-gfx/digikam vkontakte
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index e3a5778afb95..06cbcf1c91aa 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Hans de Graaff <graaff@gentoo.org> (7 Apr 2019)
+# Mask Ruby 2.3 as EOL
+ruby_targets_ruby23
+
 # Brian Evans <grknight@gentoo.org> (11 Jan 2019)
 # Mask PHP 7.0 target as EOL
 php_targets_php7-0