| 1 |
commit: b62ce3f69b25033f2393d438e756d26852c81b28 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 28 10:51:36 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 28 16:43:16 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62ce3f6 |
| 7 |
|
| 8 |
profiles: Switch default PYTHON_TARGET to Python 3.5 |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/6330 |
| 11 |
|
| 12 |
profiles/arch/alpha/use.stable.mask | 4 +--- |
| 13 |
profiles/base/make.defaults | 7 ++++--- |
| 14 |
profiles/base/package.use | 7 ------- |
| 15 |
profiles/base/package.use.stable.mask | 1 - |
| 16 |
profiles/features/prefix/standalone/legacy/make.defaults | 2 +- |
| 17 |
profiles/prefix/use.stable.mask | 7 ------- |
| 18 |
6 files changed, 6 insertions(+), 22 deletions(-) |
| 19 |
|
| 20 |
diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask |
| 21 |
index 7185868eba8..32749b5d84a 100644 |
| 22 |
--- a/profiles/arch/alpha/use.stable.mask |
| 23 |
+++ b/profiles/arch/alpha/use.stable.mask |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2015 Gentoo Foundation |
| 26 |
+# Copyright 1999-2017 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
# This file requires eapi 5 or later. New entries go on top. |
| 30 |
@@ -8,8 +8,6 @@ |
| 31 |
# Mask python targets until dev-lang/python is stable. |
| 32 |
python_single_target_python3_6 |
| 33 |
python_targets_python3_6 |
| 34 |
-python_single_target_python3_5 |
| 35 |
-python_targets_python3_5 |
| 36 |
|
| 37 |
# Tobias Klausmann <klausman@g.o> (17 Mar 2016) |
| 38 |
# Webkit itself is enormous (~13h compile+test on our fastest dev machine), so |
| 39 |
|
| 40 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
| 41 |
index e7a3077c777..db5f5389791 100644 |
| 42 |
--- a/profiles/base/make.defaults |
| 43 |
+++ b/profiles/base/make.defaults |
| 44 |
@@ -113,12 +113,13 @@ PYTHONDONTWRITEBYTECODE="1" |
| 45 |
# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE |
| 46 |
# Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-* ${BOOTSTRAP_USE}" |
| 47 |
# This MUST be kept in sync with the PYTHON_TARGETS below |
| 48 |
-BOOTSTRAP_USE="cxx unicode internal-glib python_targets_python3_4 python_targets_python2_7" |
| 49 |
+BOOTSTRAP_USE="cxx unicode internal-glib python_targets_python3_5 python_targets_python2_7" |
| 50 |
|
| 51 |
# Mike Gilbert <floppym@g.o> (15 May 2012) |
| 52 |
# Default target(s) for python-r1.eclass |
| 53 |
-PYTHON_TARGETS="python2_7 python3_4" |
| 54 |
-PYTHON_SINGLE_TARGET="python3_4" |
| 55 |
+# Updated to python3_5 on 28 Nov 2017 |
| 56 |
+PYTHON_TARGETS="python2_7 python3_5" |
| 57 |
+PYTHON_SINGLE_TARGET="python3_5" |
| 58 |
|
| 59 |
# Michał Górny <mgorny@g.o> (10 Aug 2013) |
| 60 |
# Moved from portage's make.globals. |
| 61 |
|
| 62 |
diff --git a/profiles/base/package.use b/profiles/base/package.use |
| 63 |
index b21593100fb..a931d7a0516 100644 |
| 64 |
--- a/profiles/base/package.use |
| 65 |
+++ b/profiles/base/package.use |
| 66 |
@@ -2,13 +2,6 @@ |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
# David Seifert <soap@g.o> (17 Apr 2017) |
| 70 |
-# Only python 3.5 supported |
| 71 |
-kde-apps/kajongg:5 python_single_target_python3_5 python_targets_python3_5 |
| 72 |
-dev-python/pygcrypt python_targets_python3_5 |
| 73 |
-dev-python/uvloop python_targets_python3_5 |
| 74 |
-media-gfx/blender python_targets_python3_5 |
| 75 |
- |
| 76 |
-# David Seifert <soap@g.o> (17 Apr 2017) |
| 77 |
# These py2-only packages also support pypy, enable |
| 78 |
# Python 2.7 as the default implementation, preparing |
| 79 |
# for the eventual switch to py3 in PYTHON_SINGLE_TARGET |
| 80 |
|
| 81 |
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask |
| 82 |
index a1abd99d1d7..cb305c5679d 100644 |
| 83 |
--- a/profiles/base/package.use.stable.mask |
| 84 |
+++ b/profiles/base/package.use.stable.mask |
| 85 |
@@ -138,7 +138,6 @@ app-emulation/ganeti monitoring |
| 86 |
|
| 87 |
# Mike Gilbert <floppym@g.o> (03 Oct 2015) |
| 88 |
# Unmask stable-masked implementations for python-exec |
| 89 |
-dev-lang/python-exec -python_targets_python3_5 |
| 90 |
dev-lang/python-exec -python_targets_python3_6 |
| 91 |
|
| 92 |
# Pacho Ramos <pacho@g.o> (15 May 2015) |
| 93 |
|
| 94 |
diff --git a/profiles/features/prefix/standalone/legacy/make.defaults b/profiles/features/prefix/standalone/legacy/make.defaults |
| 95 |
index 254b730a79c..22044de8763 100644 |
| 96 |
--- a/profiles/features/prefix/standalone/legacy/make.defaults |
| 97 |
+++ b/profiles/features/prefix/standalone/legacy/make.defaults |
| 98 |
@@ -14,4 +14,4 @@ ac_cv_func_utimensat=no |
| 99 |
ac_cv_func_pipe2=no |
| 100 |
|
| 101 |
# >=python-3 is masked. |
| 102 |
-PYTHON_TARGETS="-python3_4" |
| 103 |
+PYTHON_TARGETS="-python3_5" |
| 104 |
|
| 105 |
diff --git a/profiles/prefix/use.stable.mask b/profiles/prefix/use.stable.mask |
| 106 |
deleted file mode 100644 |
| 107 |
index 6a2768f662a..00000000000 |
| 108 |
--- a/profiles/prefix/use.stable.mask |
| 109 |
+++ /dev/null |
| 110 |
@@ -1,7 +0,0 @@ |
| 111 |
-# Copyright 1999-2016 Gentoo Foundation |
| 112 |
-# Distributed under the terms of the GNU General Public License v2 |
| 113 |
- |
| 114 |
-# Re-enable python-3.5, we are fully ~arch, so avoid problems with |
| 115 |
-# Portage like bug #572502 |
| 116 |
--python_targets_python3_5 |
| 117 |
--python_single_target_python3_5 |
Archives