1 |
commit: 5f359655316bd5d4e90fdb323502e7c972af28a7 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 29 08:16:59 2015 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 29 08:19:16 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f359655 |
7 |
|
8 |
python-utils-r1.eclass: Reduce python_do*/new* ban to EAPI < 4 |
9 |
|
10 |
Fix python_do* and python_new* helper ban to EAPIs older than 4. That |
11 |
was the original intent, and restricting it to 5+ breaks old |
12 |
dev-lang/python ebuilds. |
13 |
|
14 |
eclass/python-utils-r1.eclass | 12 ++++++------ |
15 |
1 file changed, 6 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
18 |
index 13e9d38..3dfac9e 100644 |
19 |
--- a/eclass/python-utils-r1.eclass |
20 |
+++ b/eclass/python-utils-r1.eclass |
21 |
@@ -666,8 +666,8 @@ python_newexe() { |
22 |
|
23 |
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' |
24 |
[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>" |
25 |
- if [[ ${EAPI:-0} == [01234] ]]; then |
26 |
- die "python_do* and python_new* helpers are banned in EAPIs older than 5." |
27 |
+ if [[ ${EAPI:-0} == [0123] ]]; then |
28 |
+ die "python_do* and python_new* helpers are banned in EAPIs older than 4." |
29 |
fi |
30 |
|
31 |
local wrapd=${python_scriptroot:-${DESTTREE}/bin} |
32 |
@@ -796,8 +796,8 @@ python_domodule() { |
33 |
debug-print-function ${FUNCNAME} "${@}" |
34 |
|
35 |
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' |
36 |
- if [[ ${EAPI:-0} == [01234] ]]; then |
37 |
- die "python_do* and python_new* helpers are banned in EAPIs older than 5." |
38 |
+ if [[ ${EAPI:-0} == [0123] ]]; then |
39 |
+ die "python_do* and python_new* helpers are banned in EAPIs older than 4." |
40 |
fi |
41 |
|
42 |
local d |
43 |
@@ -837,8 +837,8 @@ python_doheader() { |
44 |
debug-print-function ${FUNCNAME} "${@}" |
45 |
|
46 |
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' |
47 |
- if [[ ${EAPI:-0} == [01234] ]]; then |
48 |
- die "python_do* and python_new* helpers are banned in EAPIs older than 5." |
49 |
+ if [[ ${EAPI:-0} == [0123] ]]; then |
50 |
+ die "python_do* and python_new* helpers are banned in EAPIs older than 4." |
51 |
fi |
52 |
|
53 |
local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} |