gentoo resync : 08.05.2018

13 files changed, 65 insertions, 51 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bd6d5bce6764..be5d0c64fd5a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 88364d688d62..797a1d4a7c84 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -356,10 +356,6 @@ gnome-base/gnome classic extras
 # Missing keywords from dev-ml/lablgtk, bug #487722
 net-p2p/mldonkey gtk guionly
 
-# Pacho Ramos <pacho@gentoo.org> (22 Sep 2013)
-# Missing keywords, bug #484734
-media-sound/rhythmbox visualizer
-
 # Markus Meier <maekke@gentoo.org> (15 Sep 2013)
 # Unkeyworded deps, bug #481462
 dev-python/ipython nbconvert
@@ -380,10 +376,6 @@ app-admin/conky audacious cmus irc lua-cairo lua-imlib lua-rsvg moc xmms2
 # Not tested
 media-libs/devil allegro nvtt
 
-# Agostino Sarubbo <ago@gentoo.org> (23 Jul 2013)
-# java is not stable on arm
-dev-libs/protobuf java
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013)
 # requires net-misc/freerdp which is not keyworded on arm
 # screen-sharing requires rdp flag
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 4d7e22573456..351716712a48 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
+# Requires not stabilised dev-python/matplotlib
+dev-python/numpydoc test
+dev-python/ipython matplotlib
+
 # Andreas Sturmlechner <asturm@gentoo.org> (25 Jan 2018)
 # Requires not stabilised app-text/libexttextcat, bug #637086
 net-mail/dovecot textcat
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 206d918e84d9..fea8efed0ca6 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (06 May 2018)
+# New enough dev-ruby/webmock not keyworded yet
+>=dev-ruby/thor-0.20.0 test
+
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unkeyworded dependencies.
 app-admin/syslog-ng mongodb
@@ -344,10 +348,6 @@ gnome-base/gnome classic
 # Missing keywords from dev-ml/lablgtk, bug #487722
 net-p2p/mldonkey gtk guionly
 
-# Pacho Ramos <pacho@gentoo.org> (22 Sep 2013)
-# Missing keywords, bug #484734
-media-sound/rhythmbox visualizer
-
 # Markus Meier <maekke@gentoo.org> (15 Sep 2013)
 # Unkeyworded deps, bug #481462
 dev-python/ipython nbconvert
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index d50e4b8f1ddd..dd1ef98a4505 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (06 May 2018)
+# No media-libs/freeglut and co stable yet
+media-libs/jasper opengl
+
 # Mart Raudsepp <leio@gentoo.org> (04 May 2018)
 # sci-libs/mpir fails tests, bug 640424
 dev-python/gmpy mpir
@@ -47,7 +51,6 @@ net-fs/samba ads
 # Masked due to unstable deps.
 dev-db/redis tcmalloc
 dev-libs/glib test
-dev-libs/protobuf python
 dev-python/hgdistver test
 dev-python/pycurl test
 dev-python/pyopenssl test
@@ -55,8 +58,6 @@ dev-python/pyyaml libyaml
 dev-python/setuptools_scm mercurial test
 dev-python/sphinx latex test
 dev-python/twisted-core gtk serial
-media-fonts/baekmuk-fonts X
-media-fonts/liberation-fonts X
 net-analyzer/netcat crypt
 
 # Michał Górny <mgorny@gentoo.org> (07 Feb 2018)
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 97088e06cbb7..f15af86c90f9 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -4,15 +4,15 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Mart Raudsepp <leio@gentoo.org> (06 May 2018)
+# net-print/cups not stable yet
+cups
+
 # Michał Górny <mgorny@gentoo.org> (16 Apr 2018)
 # Not stable yet.
 vala
 webp
 
-# Mart Raudsepp <leio@gentoo.org> (03 Mar 2018)
-# media-gfx/fontforge not marked stable yet
-fontforge
-
 # Mart Raudsepp <leio@gentoo.org> (02 Mar 2018)
 # Neither x11-libs/gtk+ SLOT marked stable yet
 gtk
@@ -41,14 +41,6 @@ postgres
 # dev-lang/tk is not stable here.
 tk
 
-# Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
-# app-text/ghostscript-gpl is not stable here.
-postscript
-
-# Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
-# media-libs/jasper is not stable here.
-jpeg2k
-
 # Mart Raudsepp <leio@gentoo.org> (24 Dec 2017)
 # dev-libs/libressl not marked stable yet
 libressl
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index fe22b1e50379..5c3e42b53174 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (6 May 2018)
+# sci-visualization/gnuplot is not stable.
+app-admin/sysstat isag
+sci-mathematics/octave gnuplot
+sci-libs/libqalculate gnuplot
+
 # Andreas Sturmlechner <asturm@gentoo.org> (12 Feb 2018)
 # dev-libs/libical stabilisation timeout, bug #621724
 app-mobilephone/gnokii ical
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 78ba43609c65..2072793be339 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -61,10 +61,6 @@ net-libs/libproxy kde
 sys-auth/polkit kde
 x11-misc/xscreensaver new-login
 
-# Pacho Ramos <pacho@gentoo.org> (15 May 2015)
-# Missing stable
-dev-libs/protobuf python
-
 # Pacho Ramos <pacho@gentoo.org> (06 Sep 2015)
 # webkit-gtk is going to stay in ~all but amd64/x86
 # that are the only arches upstream is taking care
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index a19bc5001c70..406abbd7777a 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -88,10 +88,6 @@ media-sound/audacity midi soundtouch
 # Missing keywords (02 Jun 2015)
 net-misc/connman openconnect
 
-# Pacho Ramos <pacho@gentoo.org> (15 May 2015)
-# Missing stable
-dev-libs/protobuf python
-
 # Michał Górny <mgorny@gentoo.org> (01 Mar 2015)
 # pidgin-opensteamworks is only available for amd64, ppc32 and x86
 net-im/telepathy-connection-managers -steam
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index d8fcc1ae53c1..d9033f513d31 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -38,7 +38,6 @@ media-sound/pulseaudio equalizer
 
 # Pacho Ramos <pacho@gentoo.org> (02 Aug 2015)
 # Missing keywords
-dev-libs/protobuf python
 dev-python/pyquery test
 sys-fs/dmraid klibc
 
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index bd038bebf167..2637f1943f96 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -22,6 +22,22 @@ USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_F
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
 
+# EAPI 7 environment variable blacklist.
+#
+# DBUS_SESSION_BUS_ADDRESS to avoid trying to access the user's session
+# bus.
+#
+# DISPLAY and XAUTHORITY to avoid trying to access the user's X11.
+#
+# XDG_* since the values coming from user environment can collide with
+# ebuild-set ${HOME} (e.g. by referring to user's home directory).
+# We exclude XDG_DATA_DIRS & XDG_CONFIG_DIRS as those are set in env.d.
+#
+# 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"
+
 # Variables that are set exclusively by the profile
 # and not by user configuration files.
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
diff --git a/profiles/package.mask b/profiles/package.mask
index 56dafd525683..9a9a1e3ceb72 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,25 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (7 May 2018)
+# Old slots that are ruby23-only and no longer maintained
+# upstream, and that do not have packages depend on them.
+# Migrate to newer slot of the same package.
+dev-ruby/askismet:0
+dev-ruby/arel:5.0
+dev-ruby/autoprefixer-rails:6
+dev-ruby/blankslate:2
+dev-ruby/http:0.6
+dev-ruby/jquery-ui-rails:4
+dev-ruby/net-ssh:3
+dev-ruby/sanitize:0
+dev-ruby/twitter:5
+
+# Maciej Mrozowski <reavertm@gentoo.org> (6 May 2018)
+# SoQt does not build yet
+>=media-libs/coin-4.0.0
+>=media-libs/simage-1.7.1
+
 # Mikle Kolyada <zlogene@gentoo.org> (4 May 2018)
 # Upstream is dead, no maintainer, no longer updated.
 # Masked for removal in 30 days
@@ -181,15 +200,6 @@ x11-libs/libXp
 # Masked for removal in 30 days. Bug #633386
 media-gfx/scantailor
 
-# Andreas Sturmlechner <asturm@gentoo.org> (08 Apr 2018)
-# Depends on dead Qt4. Masked for removal in 30 days. Bug #649124
-dev-python/PyFoam
-
-# Andreas Sturmlechner <asturm@gentoo.org> (08 Apr 2018)
-# Depends on dead Qt4. Use sci-chemistry/avogadro2 instead.
-# Masked for removal in 30 days. Bug #645030
-sci-chemistry/avogadro
-
 # Jason Zaman <perfinion@gentoo.org> (08 Apr 2018)
 # Dead upstream, for an old version of Xfce
 # Masked for removal in 30 days.
@@ -332,7 +342,7 @@ media-fonts/fontawesome:0/5
 >=dev-libs/mpfr-4.0.0
 
 # Thomas Beierlein <tomjbe@gentoo.org> (23 Dec 2017)
-# To adapt to changed version naming by upstream 
+# To adapt to changed version naming by upstream
 # (pcb-yyyymmdd to pcb-x.y.z) we move the ebuild to
 # pcb-0_pyyyymmdd and mask >=pcb-20000000.
 # Do not remove the mask until newer version gets stable
@@ -442,7 +452,7 @@ sys-kernel/hardened-sources
 >=dev-python/ipython-6
 
 # Mats Lidell <matsl@gentoo.org> (17 Aug 2017)
-# Masked ede and all its dependencies due to security reasons. 
+# Masked ede and all its dependencies due to security reasons.
 # bug #398241
 app-xemacs/ede
 app-xemacs/semantic
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 17f88f918fec..840ab42affd3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -760,6 +760,7 @@ app-i18n/freewnn:uum - Build uum
 app-i18n/ibus:emoji - Enable support for Emoji
 app-i18n/ibus:gconf - Enable support for gnome-base/gconf
 app-i18n/ibus:gtk2 - Enable support for x11-libs/gtk+:2
+app-i18n/ibus:unicode - Enable support for Unicode choice
 app-i18n/ibus-chewing:gconf - Enable support for gnome-base/gconf
 app-i18n/ibus-handwrite:zinnia - Enable support for app-i18n/zinnia
 app-i18n/ibus-libpinyin:boost - Compile against dev-libs/boost libraries
@@ -1076,7 +1077,6 @@ app-office/scribus:tk - Install tk based scripts e.g. FontSample.py
 app-office/skrooge:activities - Enable kactivities support
 app-office/skrooge:designer - Build plugins for dev-qt/designer
 app-office/texmacs:netpbm - Add support for media-libs/netpbm
-app-office/texmacs:pdf - Add the experimental native pdf export
 app-office/texstudio:video - Use phonon for video embedding
 app-office/wps-office:sharedfonts - Install WPS fonts available system wide
 app-pda/barry:boost - Enable boost support
@@ -1092,6 +1092,7 @@ app-portage/g-sorcery:bson - Support BSON file format for package DB
 app-portage/gemato:blake2 - Install dependencies needed for BLAKE2 hash functions
 app-portage/gemato:gpg - Install dependencies needed for OpenPGP signature verification support
 app-portage/gemato:sha3 - Install dependencies needed for SHA3 hash functions
+app-portage/gemato:tools - Install additional utilities (benchmarks, hash testing tools, fast Manifest generators) to /usr/share/gemato.
 app-portage/grs:server - Install all the tools building systems
 app-portage/layman:bazaar - Support dev-vcs/bzr based overlays
 app-portage/layman:cvs - Support dev-vcs/cvs based overlays
@@ -2423,7 +2424,6 @@ dev-php/twig:extension - Build the C extension (only for php-5.6.x).
 dev-php/xcache:coverage - Enable the coverager module (not recommended for production servers).
 dev-python/Kivy:camera - Install libraries needed to support camera
 dev-python/Kivy:garden - Install garden tool to manage user maintained widgets
-dev-python/PyFoam:extras - Enable optional dependencies
 dev-python/PyQt4:X - Build bindings for the QtGui module
 dev-python/PyQt4:compat - Install the deprecated pyqtconfig module for backward compatibility
 dev-python/PyQt4:dbus - Build bindings for the QtDBus module
@@ -5550,7 +5550,9 @@ net-dns/unbound:dnstap - Enable dnstap support
 net-dns/unbound:ecdsa - Enable ECDSA support
 net-dns/unbound:gost - Enable GOST support
 net-firewall/arno-iptables-firewall:plugins - Install optional plugins
-net-firewall/conntrack-tools:libtirpc - Build against net-libs/libtirpc for RPC support
+net-firewall/conntrack-tools:cthelper - Use net-libs/libnetfilter_cthelper for userspace conntrack helper support
+net-firewall/conntrack-tools:cttimeout - Use net-libs/libnetfilter_cttimeout for conntrack timeout support
+net-firewall/conntrack-tools:libtirpc - Use net-libs/libtirpc for RPC support
 net-firewall/ebtables:perl - Install the ebtables-save script which uses perl
 net-firewall/firehol:ipset - Use net-firewall/ipset.
 net-firewall/firewalld:gui - Builds and installs GUI configurator and GTK+ applet
@@ -7036,7 +7038,6 @@ sci-chemistry/apbs:fast - APBS fast mode (experimental)
 sci-chemistry/apbs:fetk - Include support for FeTK
 sci-chemistry/apbs:iapbs - C/C++/Fortran interface
 sci-chemistry/apbs:tools - Install optional tools
-sci-chemistry/avogadro:glsl - Enable glsl features via GLEW.
 sci-chemistry/avogadro2:rpc - Enable RPC server
 sci-chemistry/avogadro2:vtk - include vtk support
 sci-chemistry/ball:cuda - Include cuda support