gentoo resync : 30.06.2018

3 files changed, 19 insertions, 20 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 71d6be12f645..7c2500320aaf 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -123,14 +123,14 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (23 May 2018)
 # sys-apps/baslayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_6 python_targets_python2_7"
+BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_5 python_targets_python2_7"
 
 # Mike Gilbert <floppym@gentoo.org> (15 May 2012)
 # Default target(s) for python-r1.eclass
 # Michał Górny <mgorny@gentoo.org> (22 Jun 2018)
 # Updated to python3_6
-PYTHON_TARGETS="python2_7 python3_6"
-PYTHON_SINGLE_TARGET="python3_6"
+PYTHON_TARGETS="python2_7 python3_5"
+PYTHON_SINGLE_TARGET="python3_5"
 
 # Michał Górny <mgorny@gentoo.org> (10 Aug 2013)
 # Moved from portage's make.globals.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 5b96db88c846..abb186fa2f08 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,18 @@
 # 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> (18 Jun 2018)
+# Qt4 is dead and going away. Bugs #655382, #638260
+x11-libs/qwt qt4
+sci-libs/ViSP qt4
+
+# Andreas Sturmlechner <asturm@gentoo.org> (18 Jun 2018)
+# dev-python/PyQt4 and dev-python/pyside are dead and going away.
+dev-python/pandas X
+media-sound/pulseaudio qt4
+media-video/syncplay gui
+net-wireless/gnuradio qt4
+
 # Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
 # dev-libs/DirectFB is being removed (#606194)
 media-libs/libsdl2 fusionsound
@@ -110,13 +122,6 @@ dev-db/mariadb-galera client-libs
 dev-db/mysql client-libs
 dev-db/percona-server client-libs
 
-# Andreas Sturmlechner <asturm@gentoo.org> (25 Feb 2018)
-# Depends on obsolete media-libs/phonon[qt4]
-dev-qt/designer:4 phonon
-dev-qt/qtdemo:4 phonon
-dev-python/PyQt4 phonon
-dev-python/pyside:0 phonon
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2 Feb 2018)
 # This feature is not ready yet, see bug 146882 comment 26
 sys-libs/glibc compile-locales
@@ -154,16 +159,6 @@ media-libs/freeverb3 jack
 # USE=qt4 depends on masked dev-qt/qtwebkit:4, bug #620754
 sci-physics/root 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
-
 # 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/base/use.mask b/profiles/base/use.mask
index 318e04eaaf3c..b35a30ebccb7 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.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
+# media-sound/mumble is masked/not keyworded at this point, bug #656826.
+mumble
+
 # Matt Turner <mattst88@gentoo.org> (23 Nov 2017)
 # For ancient hardware. Tired of maintaining. Masked for removal in 30 days.
 # Bug #606132.