1 |
Signed-off-by: Michał Górny <mgorny@g.o> |
2 |
--- |
3 |
eclass/python-r1.eclass | 6 +----- |
4 |
eclass/python-single-r1.eclass | 6 +----- |
5 |
2 files changed, 2 insertions(+), 10 deletions(-) |
6 |
|
7 |
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass |
8 |
index 479c4d08234b..e87b59967cde 100644 |
9 |
--- a/eclass/python-r1.eclass |
10 |
+++ b/eclass/python-r1.eclass |
11 |
@@ -195,11 +195,7 @@ _python_set_globals() { |
12 |
# but no point in making this overcomplex, BDEP doesn't hurt anyone |
13 |
# 2) python-exec should be built with all targets forced anyway |
14 |
# but if new targets were added, we may need to force a rebuild |
15 |
- if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then |
16 |
- die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" |
17 |
- else |
18 |
- deps+=">=dev-lang/python-exec-2:=[${usedep}]" |
19 |
- fi |
20 |
+ deps+=">=dev-lang/python-exec-2:=[${usedep}]" |
21 |
|
22 |
if [[ ${PYTHON_DEPS+1} ]]; then |
23 |
# IUSE is magical, so we can't really check it |
24 |
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass |
25 |
index 5c6be1c9b11c..f42c0fb6197a 100644 |
26 |
--- a/eclass/python-single-r1.eclass |
27 |
+++ b/eclass/python-single-r1.eclass |
28 |
@@ -210,11 +210,7 @@ _python_single_set_globals() { |
29 |
# but no point in making this overcomplex, BDEP doesn't hurt anyone |
30 |
# 2) python-exec should be built with all targets forced anyway |
31 |
# but if new targets were added, we may need to force a rebuild |
32 |
- if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then |
33 |
- die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" |
34 |
- else |
35 |
- deps+=">=dev-lang/python-exec-2:=[${usedep}]" |
36 |
- fi |
37 |
+ deps+=">=dev-lang/python-exec-2:=[${usedep}]" |
38 |
|
39 |
if [[ ${PYTHON_DEPS+1} ]]; then |
40 |
if [[ ${PYTHON_DEPS} != "${deps}" ]]; then |
41 |
-- |
42 |
2.24.0 |