gentoo resync : 18.11.2018

5 files changed, 55 insertions, 17 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 8e489bf49e13..b957a95fa4fc 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -36,7 +36,11 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
 # PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX:
 # These are guaranteed to confuse perl module installation. Pre-EAPI7
 # the Perl eclasses bail out if they are set. Now we declare them here.
-ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX"
+#
+# GOBIN needs to be cleaned as random values in GOBIN can affect the
+# building of some packages:
+# https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0
+ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN"
 
 # Variables that are set exclusively by the profile
 # and not by user configuration files.
@@ -93,9 +97,9 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
 
 # Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
-# Default Ruby build target
-# Updated to include ruby23 on 21 Jan 2018
-RUBY_TARGETS="ruby23"
+# Default Ruby build target(s)
+# Updated to include ruby24 on 12 Nov 2018
+RUBY_TARGETS="ruby23 ruby24"
 
 # Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009)
 # Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 4f06999b3290..b7aa41527c4e 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,41 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Pacho Ramos <pacho@gentoo.org> (11 Nov 2018)
+# pm-utils will be removed, bug #659616
+net-misc/wicd pm-utils
+sys-apps/razercfg pm-utils
+sys-power/powermgmt-base pm-utils
+
+# Pacho Ramos <pacho@gentoo.org> (11 Nov 2018)
+# sci-libs/spqr is going to be removed
+dev-cpp/eigen test
+kde-apps/cantor julia
+sci-libs/ceres-solver sparse
+
+# Alon Bar-Lev <alonbl@gentoo.org> (08 Nov 2018)
+# Waiting for >=dev-libs/libressl-2.7 to be unmasked.
+>=app-crypt/xca-2.1.0 libressl
+
+# Pacho Ramos <pacho@gento.org> (04 Nov 2018)
+# upower-pm-utils will be removed (#596988)
+mate-extra/mate-power-manager pm-utils
+
+# Pacho Ramos <pacho@gento.org> (04 Nov 2018)
+# media-libs/schroedinger will be removed (#602938)
+media-libs/libquicktime schroedinger
+media-video/ffmpeg schroedinger
+media-video/libav schroedinger
+media-video/vlc schroedinger
+
+# Pacho Ramos <pacho@gento.org> (04 Nov 2018)
+# media-plugins/mediastreamer-silk will be removed (#599580)
+media-libs/mediastreamer silk
+
+# Pacho Ramos <pacho@gento.org> (04 Nov 2018)
+# cman and co. are going to be removed (#650738)
+sys-cluster/pacemaker cman
+
 # Pacho Ramos <pacho@gento.org> (01 Nov 2018)
 # cman and co. are going to be removed (#650738)
 sys-fs/lvm2 cman clvm
@@ -32,9 +67,10 @@ sys-power/suspend fbsplash
 media-libs/mesa openmax
 
 # Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
-# Requires www-client/firefox which isn't available on all architectures
+# Requires www-client/firefox and mail-client/thunderbird
+# which are not available on all architectures
 # yet, unmask per arch
-app-misc/tracker firefox-bookmarks
+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
@@ -383,11 +419,6 @@ sys-auth/consolekit cgroups
 sys-devel/gcc awt
 dev-java/gcj-jdk awt
 
-# Heather Cynede <cynede@gentoo.org> (13 Aug 2015)
-# mono currently fails with doc most likely because of xattr
-# Gentoo bug: 554484
->=dev-lang/mono-3.12.1 doc
-
 # Mike Gilbert <floppym@gentoo.org> (16 May 2015)
 # dev-lang/python[berkdb] fails with recent multilib sys-libs/db (bug 519584).
 dev-lang/python berkdb
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index ce0805ba2c06..b91562be1e74 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
 
+# Mikle Kolyada <zlogene@gentoo.org> (07 Nov 2018)
+# sssd is only stable for amd64 and x86
+app-admin/sudo sssd
+
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2018)
 # app-misc/ddcutil is not yet stable.
 kde-plasma/powerdevil brightness-control
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 66ff1e1f71b8..047e6b0cfcdc 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.
 
+# Matt Turner <mattst88@gentoo.org> (11 Nov 2018)
+# d3d9 only works on amd64/x86.
+d3d9
+
 # Matt Turner <mattst88@gentoo.org> (02 Nov 2018)
 # xf86-input-tslib is dead and is masked for removal. Bug #664096
 input_devices_tslib
@@ -12,10 +16,6 @@ input_devices_tslib
 # Mask PostgreSQL 12 while in (pre-)alpha.
 postgres_targets_postgres12
 
-# Aaron W. Swenson <titanofold@gentoo.org> (09 Sep 2018)
-# Mask PostgreSQL 11 while in beta/RC.
-postgres_targets_postgres11
-
 # Brian Evans <grknight@gentoo.org> (10 Aug 2018)
 # Mask PHP 7.3 target while in beta
 php_targets_php7-3
@@ -30,7 +30,7 @@ mumble
 video_cards_tdfx
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (04 Nov 2017)
-# ... since audacious is being last-rited ... bug 632513
+# Unkeyworded on most arches, unmasked in supported arch profiles.
 audacious
 
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 8d065fe4f51d..49932570cc7f 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -13,7 +13,6 @@ python_single_target_pypy3
 
 # Hans de Graaff <graaff@gentoo.org> (25 Dec 2017)
 # Currently in testing and not ready to go stable yet.
-ruby_targets_ruby24
 ruby_targets_ruby25
 
 # Patrick Lauer <patrick@gentoo.org> (28 Apr 2015)