gentoo resync : 18.11.2017

2 files changed, 19 insertions, 8 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index ee84bc0b7f0f..e7a3077c777c 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -49,10 +49,6 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer"
 # By default build all koffice / calligra features.
 CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author"
 
-# Ole Markus With <olemarkus@gentoo.org> (09 Oct 2010)
-# Default PHP targets (should always be latest stable version)
-PHP_TARGETS="php5-6"
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (28 Sep 2010)
 # Small default list of enabled plugins for collectd
 COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog"
@@ -145,3 +141,18 @@ TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE="1"
 # Aaron W. Swenson <titanofold@gentoo.org> (9 Jul 2017)
 # Default target(s) for postgres{,-multi}.eclass
 POSTGRES_TARGETS="postgres9_5"
+
+# Michael Orlitzky <mjo@gentoo.org> (17 Nov 2017)
+#
+# Default PHP targets, used only for extensions at the moment.
+#
+# The value of this variable should be chosen to be "least annoying by
+# default." For example, some packages support only php-5.x and some
+# only php-7.x. By having both "php5-6" and php7-0" in PHP_TARGETS, we
+# ensure that users who don't care one way or the other don't have to
+# mess with this variable in order to install those packages.
+#
+# Moreover, it should only contain targets that have a stable version
+# of PHP, to avoid pulling in an unstable PHP on stable systems.
+#
+PHP_TARGETS="php5-6 php7-0"
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index f05f779bca86..ec52ae87822d 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # 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
+
 # Brian Evans <grknight@gentoo.org (6 Nov 2017)
 # Requires stable phpunit
 dev-php/PEAR-Text_Password test
@@ -44,10 +48,6 @@ kde-apps/kopete cryptography
 # Unstable dependencies.
 dev-util/rpmdevtools emacs
 
-# Andreas Sturmlechner <asturm@gentoo.org> (06 Aug 2017)
-# Requires dev-lang/python-3.5 stabilisation
->=kde-apps/kdegames-meta-17.04.3 python
-
 # Patrick McLean <chutzpah@gentoo.org> (11 Jul 2017)
 # Requires >=net-dns/libidn2-2.0 stabilization
 net-dns/dnsmasq libidn2