4 files changed, 104 insertions, 38 deletions
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 3db4f176fc4e..98a61f2dfc72 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -327,10 +327,6 @@ dev-python/PyQt4 multimedia
 # Keep deps minimal
 x11-wm/fvwm lock
 
-# Raúl Porcel <armin76@gentoo.org> (11 Apr 2009)
-# net-libs/webkit-gtk segfaults but dev-qt/qtwebkit doesn't
-dev-python/PyQt4 -webkit
-
 # Raúl Porcel <armin76@gentoo.org> (07 Jul 2008)
 # Make clisp deps minimal
 dev-lisp/clisp hyperspec pari svm
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index f3a074a2d860..c62d49a76105 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,15 +7,29 @@
 # 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> (16 Oct 2017)
+# Depends on masked dev-qt/qtwebkit:4, bug #620692
+<app-i18n/fcitx-libpinyin-0.5.0 dictionary-manager
+
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
+# USE=qt4 depends on masked dev-qt/qtwebkit:4, bug #620754
+# USE=geocad depends on masked <sci-libs/opencascade-6.8.0
+sci-physics/root geocad qt4
+
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
+# Depends on masked dev-qt/qtwebkit:4, bug #620684
+dev-qt/assistant:4 webkit
+dev-qt/designer:4 webkit
+dev-qt/qt-meta:4 webkit
+dev-qt/qtdeclarative:4 webkit
+dev-qt/qtdemo:4 webkit
+dev-python/PyQt4 webkit
+dev-python/pyside:0 webkit
+
 # Mike Gilbert <floppym@gentoo.org> (10 Oct 2017)
 # Depends on old ffmpeg-2, which no longer exists in the repo.
 <=media-tv/tvheadend-4.0.9 ffmpeg
 
-# Andreas Sturmlechner <asturm@gentoo.org> (30 Sep 2017)
-# Depends on masked net-libs/libtorrent-rasterbar-1.1
-# bugs #580760, #630364
-net-misc/fatrat bittorrent
-
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (18 Sep 2017)
 # Ian Stakenvicius <axs@gentoo.org> (27 Sep 2017)
 # Depends on >=icu-59, still masked.
diff --git a/profiles/package.mask b/profiles/package.mask
index e0750063ce71..fa7f1ac8f928 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,82 @@
 
 #--- END OF EXAMPLES ---
 
+# Jonas Stein <jstein@gentoo.org> (17 Oct 2017)
+# dev-tex/texmfind was superseded by app-portage/pfl 
+# See also bug #634494. Masked for removal on 2017-11-30
+dev-tex/texmfind
+
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
+# Qt4WebKit is ancient and is likely to have more holes
+# in it than swiss cheese. Bug #620684
+dev-qt/qtwebkit:4
+
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
+# Reverse-deps on dead Qt4WebKit. Bug #620684
+<app-misc/anki-2.1
+<app-misc/sleepyhead-1.0.0_beta2
+<media-gfx/freecad-0.17_pre
+media-sound/google-musicmanager
+net-im/qutim
+net-misc/teamviewer
+net-voip/vidyodesktop
+<sci-libs/opencascade-7.0
+<sci-libs/vtk-6.1.0-r4
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4/Qt3Support.
+# Possible alternatives are net-mail/gnubiff, kde-misc/gmailfeed.
+# Masked for removal in 30 days. Bug #629018
+kde-misc/kbiff
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4/Qt3Support.
+# Masked for removal in 30 days. Bug #629018
+kde-misc/kfax
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4/Qt3Support.
+# Use any image viewer instead, like gwenview.
+# Masked for removal in 30 days. Bug #629018
+kde-misc/kover
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4/Qt3Support.
+# Use media-sound/fmit instead.
+# Masked for removal in 30 days. Bug #633498
+media-sound/k4guitune
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4.
+# Masked for removal in 30 days. Bug #633510
+media-sound/kenvy24
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4/Qt3Support.
+# Masked for removal in 30 days. Bug #633502
+media-sound/kmidimon
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4/Qt3Support.
+# Masked for removal in 30 days. Bug #629018
+media-sound/kradio
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4.
+# Masked for removal in 30 days. Bug #629018
+media-sound/waheela
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4.
+# Masked for removal in 30 days. Bug #629018
+media-video/loopy
+
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4/Qt3Support.
+# Use net-p2p/amule instead.
+# Masked for removal in 30 days. Bug #629018
+net-p2p/kmldonkey
+
 # Raymond Jennings <shentino@gmail.com> (08 Jun 2017)
 # Depends on qt4 which is being removed.
 # Upstream announced EOL effective July 2017.
@@ -273,18 +349,6 @@ app-xemacs/cogre
 app-xemacs/ecb
 app-xemacs/xemacs-packages-all
 
-# Lars Wendler <polynomial-c@gentoo.org> (06 Aug 2017)
-# Masked for security reasons:
-# https://bugs.gentoo.org/600214
-<app-emulation/virtualbox-5.0.40
-<app-emulation/virtualbox-additions-5.0.40
-<app-emulation/virtualbox-bin-5.0.40
-<app-emulation/virtualbox-extpack-oracle-5.0.40
-<app-emulation/virtualbox-guest-additions-5.0.40
-<app-emulation/virtualbox-modules-5.0.40
-<x11-drivers/xf86-video-virtualbox-5.0.40
-
-
 # Bernard Cafarelli <voyageur@gentoo.org> (04 Aug 2017)
 # Temporary mask as current net-ftp/filezilla does not compile
 # with it, bug #626292
@@ -501,10 +565,6 @@ x11-libs/gtk+:1
 =app-emulation/ganeti-2.16*
 =app-emulation/ganeti-2.17*
 
-# Markos Chandras <hwoarang@gentoo.org> (10 Dec 2016)
-# Reverse dependencies need testing, wrt bug #580760
->=net-libs/libtorrent-rasterbar-1.1.1
-
 # Michał Górny <mgorny@gentoo.org> (17 Nov 2016)
 # New version masked for testing. It supports source-window buffer size
 # over 2G but it 'currently performs 3-5% slower and has 1-2% worse
@@ -598,11 +658,6 @@ sys-fs/bedup
 # Upcoming, too young to go into testing unmasked
 dev-libs/iniparser:4
 
-# Davide Pesavento <pesa@gentoo.org> (23 Jul 2015)
-# Standalone version of qtwebkit from the 2.3 upstream branch.
-# Needs revdep testing. Bug #388207.
-=dev-qt/qtwebkit-4.10*
-
 # Justin Lecher <jlec@gentoo.org> (28 Feb 2015)
 # Unfixed security problems
 # No upstream support anymore
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 188359b29bcd..fdc58cd6a64b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -992,7 +992,14 @@ app-misc/worker:magic - Add magic file support from sys-apps/file to automatical
 app-misc/workrave:mate - Add support for MATE panel
 app-misc/workrave:xfce - Add support for XFCE panel
 app-misc/zygrib:maps - Installs additional GSHHS maps for high resolution coastline data and cities
+app-mobilephone/gammu:bluetooth - Enables bluetooth support
+app-mobilephone/gammu:curl - Enables curl support
 app-mobilephone/gammu:irda - Enables infrared support
+app-mobilephone/gammu:mysql - Use mysql for data storage
+app-mobilephone/gammu:nls - Enable native language support
+app-mobilephone/gammu:odbc - Use ODBC as DB connector
+app-mobilephone/gammu:postgres - Use PostgreSQL for data storage
+app-mobilephone/gammu:usb - Enable USB suport
 app-mobilephone/gnokii:ical - Enable support for dev-libs/libical
 app-mobilephone/gnokii:irda - Enable infrared support
 app-mobilephone/gnokii:pcsc-lite - Enable smartcard support with sys-apps/pcsc-lite
@@ -2455,7 +2462,6 @@ dev-python/PyQt5:xmlpatterns - Build bindings for the QtXmlPatterns module
 dev-python/PythonQt:extensions - Install extensions
 dev-python/QtPy:designer - Build bindings for the QtDesigner module and enable the designer plugin
 dev-python/QtPy:gui - Build bindings for the QtGui module
-dev-python/QtPy:pyqt4 - Enable the dev-python/PyQt4 backend
 dev-python/QtPy:pyqt5 - Enable the dev-python/PyQt5 backend
 dev-python/QtPy:pyside - Enable the dev-python/pyside backend
 dev-python/QtPy:svg - Build bindings for the QtSvg module
@@ -2544,14 +2550,10 @@ dev-python/pypax:ptpax - Enable PT_PAX_FLAGS support.
 dev-python/pypax:xtpax - Enable XATTR_PAX_FLAGS support.
 dev-python/pyplusplus:indexing - Install indexing_suite_v2 to enhance boost python
 dev-python/pyplusplus:numpy - Generate code for dev-libs/boost-numpy to accelerate arrays
-dev-python/pypy:low-memory - Build using PyPy with the engine configured towards low memory footprint. \ This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time. Please note that you will need an extra ~1G of extra RAM or \ swap since the translation memory (unused at the time) is not freed when the C compiler is spawned.
+dev-python/pypy:low-memory - Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time.
 dev-python/pypy:sandbox - Enable sandboxing functionality
-dev-python/pypy:shadowstack - Use a shadow stack for finding GC roots
-dev-python/pypy-bin:shadowstack - Use a shadow stack for finding GC roots
-dev-python/pypy3:low-memory - Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time. Please note that you will need an extra ~1G of extra RAM or swap since the translation memory (unused at the time) is not freed when the C compiler is spawned.
+dev-python/pypy3:low-memory - Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time.
 dev-python/pypy3:sandbox - Enable sandboxing functionality
-dev-python/pypy3:shadowstack - Use a shadow stack for finding GC roots
-dev-python/pypy3-bin:shadowstack - Use a shadow stack for finding GC roots
 dev-python/pyside:X - Build QtGui and QtTest modules
 dev-python/pyside:declarative - Build QtDeclarative module
 dev-python/pyside:designer - Build QtDesigner and QtUiTools modules
@@ -4241,7 +4243,6 @@ media-libs/opensubdiv:cuda - Enable NVIDIA CUDA Toolkit support through dev-util
 media-libs/opensubdiv:opencl - Enable OpenCL support through virtual/opencl.
 media-libs/opensubdiv:ptex - Adds support for faster per-face texture mapping through media-libs/ptex.
 media-libs/opensubdiv:tbb - Enable multithreading with the Intel Threads Building Blocks through dev-cpp/tbb.
-media-libs/opensubdiv:tutorials - 
 media-libs/opus:ambisonics - Enable ambisonics support (experimental).
 media-libs/opus:custom-modes - Build with custom-modes.
 media-libs/opusfile:fixed-point - Enable fixed-point arithmetic operations