1 |
--- |
2 |
eclass/python-single-r1.eclass | 8 ++------ |
3 |
1 file changed, 2 insertions(+), 6 deletions(-) |
4 |
|
5 |
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass |
6 |
index 3b89ef57cfef..84d1f067be14 100644 |
7 |
--- a/eclass/python-single-r1.eclass |
8 |
+++ b/eclass/python-single-r1.eclass |
9 |
@@ -1,4 +1,4 @@ |
10 |
-# Copyright 1999-2015 Gentoo Foundation |
11 |
+# Copyright 1999-2017 Gentoo Foundation |
12 |
# Distributed under the terms of the GNU General Public License v2 |
13 |
|
14 |
# @ECLASS: python-single-r1.eclass |
15 |
@@ -226,14 +226,10 @@ _python_single_set_globals() { |
16 |
# but no point in making this overcomplex, BDEP doesn't hurt anyone |
17 |
# 2) python-exec should be built with all targets forced anyway |
18 |
# but if new targets were added, we may need to force a rebuild |
19 |
- # 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4, |
20 |
- # just fix :2 since := deps are not supported. |
21 |
if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then |
22 |
die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" |
23 |
- elif [[ ${EAPI} != 4 ]]; then |
24 |
- PYTHON_DEPS+=">=dev-lang/python-exec-2:=[${PYTHON_USEDEP}]" |
25 |
else |
26 |
- PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]" |
27 |
+ PYTHON_DEPS+=">=dev-lang/python-exec-2:=[${PYTHON_USEDEP}]" |
28 |
fi |
29 |
readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_USEDEP |
30 |
} |
31 |
-- |
32 |
2.12.0 |