gentoo resync : 01.12.2017

6 files changed, 8 insertions, 47 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index e7a3077c777c..db5f53897915 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -113,12 +113,13 @@ PYTHONDONTWRITEBYTECODE="1"
 # Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE
 # Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-* ${BOOTSTRAP_USE}"
 # This MUST be kept in sync with the PYTHON_TARGETS below
-BOOTSTRAP_USE="cxx unicode internal-glib python_targets_python3_4 python_targets_python2_7"
+BOOTSTRAP_USE="cxx unicode internal-glib python_targets_python3_5 python_targets_python2_7"
 
 # Mike Gilbert <floppym@gentoo.org> (15 May 2012)
 # Default target(s) for python-r1.eclass
-PYTHON_TARGETS="python2_7 python3_4"
-PYTHON_SINGLE_TARGET="python3_4"
+# Updated to python3_5 on 28 Nov 2017
+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.mask b/profiles/base/package.mask
index 07fc9a5e631d..320a6bbb1a0c 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,9 +1,2 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2017)
-# This release and later require C++11 or C++14
-# So we mask it here, and unmask in 17.0 release profiles
->=dev-libs/icu-59
->=dev-libs/icu-layoutex-59
->=net-libs/nodejs-9.0.0
diff --git a/profiles/base/package.use b/profiles/base/package.use
index b21593100fb3..a931d7a05160 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -2,13 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # David Seifert <soap@gentoo.org> (17 Apr 2017)
-# Only python 3.5 supported
-kde-apps/kajongg:5 python_single_target_python3_5 python_targets_python3_5
-dev-python/pygcrypt python_targets_python3_5
-dev-python/uvloop python_targets_python3_5
-media-gfx/blender python_targets_python3_5
-
-# David Seifert <soap@gentoo.org> (17 Apr 2017)
 # These py2-only packages also support pypy, enable
 # Python 2.7 as the default implementation, preparing
 # for the eventual switch to py3 in PYTHON_SINGLE_TARGET
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index e43d91dd3f99..fcf5de55ca73 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -12,14 +12,10 @@
 =media-libs/freeverb3-3.1.2_pre20151102-r1 jack
 
 # Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
-# Depends on deprecated x11-libs/qscintilla[qt4]/qt4, bug #634976
+# Depends on deprecated x11-libs/qscintilla[qt4]/qt4, bug #634972
 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
-
-# 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
@@ -317,10 +313,6 @@ dev-cpp/eigen:2 doc
 # you're doing. This has upstream's approval.
 dev-java/icedtea cacao jamvm
 
-# Maciej Mrozowski <reavertm@gmail.com> (23 Mar 2016)
-# Experimental cairo-qt backend (see bug #568000).
-app-text/poppler cairo-qt
-
 # Lars Wendler <polynomial-c@gentoo.org> (20 Mar 2016)
 # Need vulnerable libotr version (see bug #576914).
 net-im/centerim otr
@@ -366,10 +358,6 @@ sci-libs/gdal ruby
 # See bug #547834
 <sys-apps/paludis-2.4.0 ruby
 
-# Andreas K. Huettel <dilfridge@gentoo.org> (1 Sep 2015)
-# Currently broken upstream. We still hope it will get fixed.
-app-office/libreoffice telepathy
-
 # James Le Cuirot <chewi@gentoo.org> (18 Aug 2015)
 # gcc[awt] is only used by gcj-jdk[awt] and that isn't needed by
 # anything in the tree. The toolchain folks aren't keen to support it
@@ -550,11 +538,6 @@ gnustep-apps/cynthiune flac
 app-text/yagf cuneiform
 dev-python/pyocr cuneiform
 
-# Christoph Junghans <junghans@gentoo.org> (10 Mar 2013)
-# log4cxx has known memory leaking issues wrt bug #287697,
-# unmask when log4cxx is fixed and stable.
-media-sound/google-musicmanager log
-
 # Tom Wijsman <TomWij@gentoo.org> (10 Mar 2013)
 # Experimental, masked until it compiles and works.
 media-libs/avidemux-core system-ffmpeg
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index ec52ae87822d..b6cde8be40c7 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,9 +4,9 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
-# Requires PYTHON_TARGETS="python3_5", bug #620940
-kde-apps/kdegames-meta python
+# Bernard Cafarelli <voyageur@gentoo.org> (27 Nov 2017)
+# Dependencies have no stable keyword
+app-backup/backup-manager s3
 
 # Brian Evans <grknight@gentoo.org (6 Nov 2017)
 # Requires stable phpunit
@@ -36,10 +36,6 @@ sci-libs/gdal mdb
 # Requires guile-2 which is still unstable.
 >=net-irc/weechat-1.7 guile
 
-# Andreas Sturmlechner <asturm@gentoo.org> (17 Aug 2017)
-# Unstable dependencies.
-kde-apps/kopete cryptography
-
 # Andreas Sturmlechner <asturm@gentoo.org> (12 Aug 2017)
 # Not operational, bug #619534
 >=kde-apps/cantor-17.04.3 R
@@ -134,7 +130,6 @@ app-emulation/ganeti monitoring
 
 # Mike Gilbert <floppym@gentoo.org> (03 Oct 2015)
 # Unmask stable-masked implementations for python-exec
-dev-lang/python-exec -python_targets_python3_5
 dev-lang/python-exec -python_targets_python3_6
 
 # Pacho Ramos <pacho@gentoo.org> (15 May 2015)
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 6d7e7b6148f8..16f1aefe03c2 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -50,10 +50,6 @@ audacious
 # postgres-9.2 is EOL and masked
 postgres_targets_postgres9_2
 
-# Brian Evans <grknight@gentoo.org> (14 Aug 2017)
-# php 7.2 beta is masked for initial testing
-php_targets_php7-2
-
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unkeyworded on most arches, unmasked in supported arch profiles.
 elogind