gentoo resync : 31.10.2017

9 files changed, 39 insertions, 32 deletions

diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 9697f8c717cf..bb7a033b84a4 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
+# dev-qt/* stabilisation timeout.
+app-text/poppler cairo-qt
+
 # Andreas Sturmlechner <asturm@gentoo.org> (07 Oct 2017)
 # media-gfx/graphite2 security stabilisation timeout.
 # bug #621724
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index b5e3fc794948..d3362b3bc409 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/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 use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
+# Mask qt4, qt5 for stabilisation timeout, bug #620334
+qt5
+qt4
+
 # Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
 # Mask python targets until dev-lang/python is stable.
 python_single_target_python3_6
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index bf5ea1799a8a..98a61f2dfc72 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
-# Needs net-mail/mailutils which is not keyworded, bug #635216.
-app-editors/emacs-vcs mailutils
-
 # Michał Górny <mgorny@gentoo.org> (10 Aug 2017)
 # Both USE=fluidsynth and USE=timidity are masked in this profile.
 media-libs/sdl-mixer midi
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index d9ddf5b663e5..4de688019de1 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
-# Needs net-mail/mailutils which is not keyworded, bug #635216.
-app-editors/emacs-vcs mailutils
-
 # Gilles Dartiguelongue <eva@gentoo.org> (16 Aug 2017)
 # missing keyword on dev-python/dbusmock, bug #620024
 >=gnome-base/gnome-settings-daemon-3.24 test
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index c62d49a76105..83f840648109 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
+# Depends on deprecated x11-libs/qscintilla[qt4]/qt4, bug #634976
+net-analyzer/linkchecker X
+
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
 # Depends on masked dev-qt/qtwebkit:4, bug #620692
 <app-i18n/fcitx-libpinyin-0.5.0 dictionary-manager
diff --git a/profiles/default/linux/package.use b/profiles/default/linux/package.use
index 3b2e027ebf8a..36a4bb16d5d5 100644
--- a/profiles/default/linux/package.use
+++ b/profiles/default/linux/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mike Gilbert <floppym@gentoo.org> (29 Oct 2017)
+# Override default from make.defaults, bug 635822.
+net-libs/mbedtls -zlib
+
 # Mike Frysinger <vapier@gentoo.org> (12 Nov 2015)
 # We want busybox statically linked by default as it is the system rescue shell.
 # But we cannot statically link pam, so turn that off by default. #468580
diff --git a/profiles/package.mask b/profiles/package.mask
index be2b910fc337..531fa18939ab 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,22 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (30 Oct 2017)
+# Requires dead and vulnerable qtwebkit4.
+# Masked for removal in 30 days. Bug #620708
+media-sound/google-musicmanager
+
+# Andreas Sturmlechner <asturm@gentoo.org> (30 Oct 2017)
+# Requires dead and vulnerable qtwebkit4.
+# Masked for removal in 30 days. Bug #620742
+net-voip/vidyodesktop
+
+# Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4.
+# Use kde-plasma/plasma-vault or app-crypt/kencfs-plasma instead.
+# Masked for removal in 30 days.
+app-crypt/kencfs
+
 # Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
 # Tests segfault, bug 635732.
 # No updates upstream since 2013.
@@ -151,9 +167,7 @@ dev-qt/qtwebkit:4
 <app-misc/anki-2.1
 <app-misc/sleepyhead-1.0.0_beta2
 <media-gfx/freecad-0.17_pre
-media-sound/google-musicmanager
-net-misc/teamviewer
-net-voip/vidyodesktop
+>=net-misc/teamviewer-10
 <sci-libs/opencascade-7.0
 <sci-libs/vtk-6.1.0-r4
 
@@ -292,22 +306,6 @@ app-editors/atom:beta
 # (bug #620710). Masked for removal in 30 days.
 media-sound/lastfm-desktop
 
-# Michael Palimaka <kensington@gentoo.org> (30 Sep 2017)
-# Depends on dead qt4. Dead upstream.
-# Masked for removal in 30 days.
-net-misc/dnetstats
-
-# Michael Palimaka <kensington@gentoo.org> (30 Sep 2017)
-# Depends on dead qt4. Dead upstream.
-# Masked for removal in 30 days.
-app-office/qcharselect
-
-# Michael Palimaka <kensington@gentoo.org> (30 Sep 2017)
-# Blocks cleanup of dead and vulnerable qtwebkit4.
-# Depends on dead qt4. Dead upstream.
-# Masked for removal in 30 days. Bug #624244.
-sci-chemistry/mongochem
-
 # Andrey Grozin <grozin@gentoo.org> (19 Sep 2017)
 # This package was a stopgap to bump dev-python/spyder to 3.*
 # Now >=dev-python/rope-0.10.7 supports python3, use it instead
diff --git a/profiles/updates/4Q-2017 b/profiles/updates/4Q-2017
index 45464e70bb2c..32f7dbdcecc4 100644
--- a/profiles/updates/4Q-2017
+++ b/profiles/updates/4Q-2017
@@ -1,3 +1,2 @@
 move dev-ml/ocaml-dns dev-ml/dns
 move dev-perl/HTML-Format dev-perl/HTML-Formatter
-move app-crypt/kencfs app-crypt/kencfs-plasma
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6120d8fd1055..cee88d37ac52 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1155,6 +1155,9 @@ app-text/gtranslator:gnome-dictionary - Enable plugin for dictionary lookups usi
 app-text/gtranslator:gucharmap - Enable plugin for unicode symbols selection using gnome-extra/gucharmap.
 app-text/hyperestraier:mecab - Enable app-text/mecab support for Estraier
 app-text/jmupdf:system-mupdf - Link against system version of app-text/mupdf
+app-text/kbibtex:webengine - Use dev-qt/qtwebengine for HTML previews
+app-text/kbibtex:webkit - Use dev-qt/qtwebkit for HTML previews
+app-text/kbibtex:zotero - Enable support for synchronisation with zotero.org web service
 app-text/lcdf-typetools:kpathsea - Enable integration with kpathsea search library (TeX related)
 app-text/libebook:tools - Build file conversion tools
 app-text/libmwaw:tools - Build file conversion tools
@@ -2611,6 +2614,7 @@ dev-python/ws4py:server - Install server modules
 dev-python/wxpython:doc - Install HTML wxWidgets docs and wxpython API reference.
 dev-python/wxpython:examples - Install interactive demo module browser and sample applets.
 dev-python/zeep:async - Add async support
+dev-python/zeep:tornado - Add tornado support
 dev-python/zsi:twisted - add support for python-twisted (needs dev-python/twisted-core and dev-python/twisted-web)
 dev-qt/assistant:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/designer:declarative - Build the qdeclarativeview plugin
@@ -2720,8 +2724,6 @@ dev-qt/qtsvg:exceptions - Add support for exceptions - like catching them inside
 dev-qt/qttest:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/qtvirtualkeyboard:handwriting - Adds handwriting recognition integration support
 dev-qt/qtwayland:libinput - Enable support for input devices via dev-libs/libinput
-dev-qt/qtwayland:qml - Build QML/QtQuick bindings
-dev-qt/qtwayland:wayland-compositor - Build Qt compositor for wayland
 dev-qt/qtwebchannel:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtwebengine:geolocation - Enable physical position determination via dev-qt/qtpositioning
 dev-qt/qtwebengine:pax_kernel - Enable building under a PaX enabled kernel
@@ -2741,7 +2743,6 @@ dev-qt/qtwebkit:webchannel - Enable integration with dev-qt/qtwebchannel
 dev-qt/qtwebkit:webp - Add support for WebP image format
 dev-qt/qtwebsockets:qml - Build QML bindings
 dev-qt/qtwidgets:gles2 - Use GLES 2.0 or later instead of full OpenGL
-dev-qt/qtwidgets:gtkstyle - Build a Qt style called GTK+ that mimics the active GTK+ theme
 dev-ros/rosbag:lz4 - Add support for lz4 compressed bags.
 dev-ros/rosconsole:glog - Use dev-cpp/glog as log backend.
 dev-ros/rosconsole:log4cxx - Use dev-libs/log4cxx as log backend.
@@ -3086,6 +3087,7 @@ games-board/freedoko:openclipartcards - Install the openclipartcards card set
 games-board/freedoko:pysolcards - Install the PySol card set
 games-board/freedoko:xskatcards - Install the XSkat card set
 games-board/grhino:gtp - Install the GTP (Go/Game Text Protocol) frontend
+games-board/knights:speech - Enable text-to-speech support
 games-board/pasang-emas:extras - Install some extra themes
 games-board/pioneers:help - Enable gnome ingame help via scrollkeeper
 games-board/pysolfc:extra-cardsets - Install extra cardsets
@@ -6425,7 +6427,6 @@ net-misc/miniupnpd:portinuse - Check if a port is in use before allowing a NAT-P
 net-misc/miniupnpd:strict - Be more strict regarding compliance with UPnP specifications.
 net-misc/modemmanager:mbim - Enable MBIM modem protocol
 net-misc/modemmanager:qmi - Enable support for the QMI modem protocol used by devices with Qualcomm chipsets
-net-misc/modemmanager:qmi-newest - Avoid deprecated QMI commands. Warning: may cause incompatibility with older devices.
 net-misc/mosh:client - Build network client
 net-misc/mosh:examples - Include example scripts
 net-misc/mosh:mosh-hardening - Enable compiler and linker options to frustrate memory corruption exploits