1 |
commit: 30122ca588e0b7e86bb149aeef439b806c6ab0e0 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 1 08:36:50 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 8 07:35:46 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30122ca5 |
7 |
|
8 |
python-r1.eclass: Remove stale EAPI=4 branch in globals |
9 |
|
10 |
eclass/python-r1.eclass | 8 ++------ |
11 |
1 file changed, 2 insertions(+), 6 deletions(-) |
12 |
|
13 |
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass |
14 |
index 4d27881cd5c..18f11fd597d 100644 |
15 |
--- a/eclass/python-r1.eclass |
16 |
+++ b/eclass/python-r1.eclass |
17 |
@@ -1,4 +1,4 @@ |
18 |
-# Copyright 1999-2015 Gentoo Foundation |
19 |
+# Copyright 1999-2017 Gentoo Foundation |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
|
22 |
# @ECLASS: python-r1.eclass |
23 |
@@ -195,14 +195,10 @@ _python_set_globals() { |
24 |
# but no point in making this overcomplex, BDEP doesn't hurt anyone |
25 |
# 2) python-exec should be built with all targets forced anyway |
26 |
# but if new targets were added, we may need to force a rebuild |
27 |
- # 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4, |
28 |
- # just fix :2 since := deps are not supported. |
29 |
if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then |
30 |
die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" |
31 |
- elif [[ ${EAPI} != 4 ]]; then |
32 |
- PYTHON_DEPS+=">=dev-lang/python-exec-2:=[${PYTHON_USEDEP}]" |
33 |
else |
34 |
- PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]" |
35 |
+ PYTHON_DEPS+=">=dev-lang/python-exec-2:=[${PYTHON_USEDEP}]" |
36 |
fi |
37 |
readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_USEDEP |
38 |
} |