diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2019-11-30 11:42:27 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2019-12-07 15:36:29 +0100 |
| commit | c6dbe442785be83968c942aa7608bb17fccba555 (patch) | |
| tree | bb825ef1606101cb3c4eb0c57d6effc1e1a18459 /eclass | |
| parent | python*r1.eclass: Reliably allow empty <pattern>s to gen funcs (diff) | |
| download | gentoo-c6dbe442785be83968c942aa7608bb17fccba555.tar.gz gentoo-c6dbe442785be83968c942aa7608bb17fccba555.tar.bz2 gentoo-c6dbe442785be83968c942aa7608bb17fccba555.zip | |
python*r1.eclass: Remove python-exec:0 leftover
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/python-r1.eclass | 6 | ||||
| -rw-r--r-- | eclass/python-single-r1.eclass | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 479c4d08234b..e87b59967cde 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -195,11 +195,7 @@ _python_set_globals() { # but no point in making this overcomplex, BDEP doesn't hurt anyone # 2) python-exec should be built with all targets forced anyway # but if new targets were added, we may need to force a rebuild - if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then - die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" - else - deps+=">=dev-lang/python-exec-2:=[${usedep}]" - fi + deps+=">=dev-lang/python-exec-2:=[${usedep}]" if [[ ${PYTHON_DEPS+1} ]]; then # IUSE is magical, so we can't really check it diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 5c6be1c9b11c..f42c0fb6197a 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -210,11 +210,7 @@ _python_single_set_globals() { # but no point in making this overcomplex, BDEP doesn't hurt anyone # 2) python-exec should be built with all targets forced anyway # but if new targets were added, we may need to force a rebuild - if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then - die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" - else - deps+=">=dev-lang/python-exec-2:=[${usedep}]" - fi + deps+=">=dev-lang/python-exec-2:=[${usedep}]" if [[ ${PYTHON_DEPS+1} ]]; then if [[ ${PYTHON_DEPS} != "${deps}" ]]; then |