| 1 |
commit: ab9b5d9e5768d1a65a42a818ab3d82347a8d1cd9 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 30 23:33:48 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 31 00:06:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9b5d9e |
| 7 |
|
| 8 |
profiles: Clean py2.7 leftovers |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/arch/riscv/use.mask | 3 --- |
| 13 |
profiles/base/make.defaults | 4 ++-- |
| 14 |
profiles/base/package.use.force | 1 - |
| 15 |
profiles/desc/python_single_target.desc | 1 - |
| 16 |
profiles/desc/python_targets.desc | 1 - |
| 17 |
profiles/prefix/make.defaults | 6 ------ |
| 18 |
6 files changed, 2 insertions(+), 14 deletions(-) |
| 19 |
|
| 20 |
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask |
| 21 |
index 702524e3a47..dfdacea6f24 100644 |
| 22 |
--- a/profiles/arch/riscv/use.mask |
| 23 |
+++ b/profiles/arch/riscv/use.mask |
| 24 |
@@ -6,9 +6,6 @@ |
| 25 |
|
| 26 |
# Unmask systemd |
| 27 |
-systemd |
| 28 |
-# Our Python has a lot of trouble with the two-level libdir. |
| 29 |
-python_targets_python2_7 |
| 30 |
-python_single_target_python2_7 |
| 31 |
|
| 32 |
# Ben Kohler <bkohler@g.o> (2019-01-09) |
| 33 |
# no fam providers keyworded yet |
| 34 |
|
| 35 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
| 36 |
index 981eda7446a..d77cffe03f2 100644 |
| 37 |
--- a/profiles/base/make.defaults |
| 38 |
+++ b/profiles/base/make.defaults |
| 39 |
@@ -123,13 +123,13 @@ PYTHONDONTWRITEBYTECODE="1" |
| 40 |
# This MUST be kept in sync with the PYTHON_TARGETS below |
| 41 |
# Mike Gilbert <floppym@g.o> (2018-05-23) |
| 42 |
# sys-apps/baslayout-2.5 needs split-usr enabled. |
| 43 |
-BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_8 python_targets_python2_7" |
| 44 |
+BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_8" |
| 45 |
|
| 46 |
# Mike Gilbert <floppym@g.o> (2012-05-15) |
| 47 |
# Default target(s) for python-r1.eclass |
| 48 |
# Mikle Kolyada <zlogene@g.o> (2020-12-02) |
| 49 |
# Updated to python3_8 |
| 50 |
-PYTHON_TARGETS="python2_7 python3_8" |
| 51 |
+PYTHON_TARGETS="python3_8" |
| 52 |
PYTHON_SINGLE_TARGET="python3_8" |
| 53 |
|
| 54 |
# Michał Górny <mgorny@g.o> (2013-08-10) |
| 55 |
|
| 56 |
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force |
| 57 |
index 7fccdd3e185..10958c1f917 100644 |
| 58 |
--- a/profiles/base/package.use.force |
| 59 |
+++ b/profiles/base/package.use.force |
| 60 |
@@ -166,7 +166,6 @@ app-shells/bash:0 readline |
| 61 |
# Michał Górny <mgorny@g.o> (2012-10-14) |
| 62 |
# Force-enable all PYTHON_TARGETS for python-exec to avoid using private |
| 63 |
# API. Please remember to keep it in sync with python_targets.desc. |
| 64 |
-dev-lang/python-exec python_targets_python2_7 |
| 65 |
dev-lang/python-exec python_targets_python3_7 |
| 66 |
dev-lang/python-exec python_targets_python3_8 |
| 67 |
dev-lang/python-exec python_targets_python3_9 |
| 68 |
|
| 69 |
diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc |
| 70 |
index 08637d9955c..1be4dd4001a 100644 |
| 71 |
--- a/profiles/desc/python_single_target.desc |
| 72 |
+++ b/profiles/desc/python_single_target.desc |
| 73 |
@@ -3,7 +3,6 @@ |
| 74 |
|
| 75 |
# This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags. |
| 76 |
|
| 77 |
-python2_7 - Build for Python 2.7 only |
| 78 |
python3_7 - Build for Python 3.7 only |
| 79 |
python3_8 - Build for Python 3.8 only |
| 80 |
python3_9 - Build for Python 3.9 only |
| 81 |
|
| 82 |
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc |
| 83 |
index 0bea2b63748..66d152ff98c 100644 |
| 84 |
--- a/profiles/desc/python_targets.desc |
| 85 |
+++ b/profiles/desc/python_targets.desc |
| 86 |
@@ -3,7 +3,6 @@ |
| 87 |
|
| 88 |
# This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags. |
| 89 |
|
| 90 |
-python2_7 - Build with Python 2.7 |
| 91 |
python3_7 - Build with Python 3.7 |
| 92 |
python3_8 - Build with Python 3.8 |
| 93 |
python3_9 - Build with Python 3.9 |
| 94 |
|
| 95 |
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults |
| 96 |
index 77e5de43270..cf9a80a8525 100644 |
| 97 |
--- a/profiles/prefix/make.defaults |
| 98 |
+++ b/profiles/prefix/make.defaults |
| 99 |
@@ -7,9 +7,3 @@ |
| 100 |
# ncurses: a nice working console drawing library |
| 101 |
# ssl: encrypted connections are a nice feature |
| 102 |
USE="readline zlib ncurses ssl" |
| 103 |
- |
| 104 |
- |
| 105 |
-# In Prefix, aim for Python 3 only, leaving out 2 to avoid unnecessary |
| 106 |
-# builds |
| 107 |
-# NOTE: Both are incremental variables: Need to drop obsolete base values. |
| 108 |
-PYTHON_TARGETS="-python2_7" |
Archives