* [gentoo-dev] [PATCH] python*r1.eclass: Remove python-exec:0 leftover
@ 2019-11-30 10:46 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2019-11-30 10:46 UTC (permalink / raw
To: gentoo-dev; +Cc: python, Michał Górny
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
eclass/python-r1.eclass | 6 +-----
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
--
2.24.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-11-30 10:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-30 10:46 [gentoo-dev] [PATCH] python*r1.eclass: Remove python-exec:0 leftover Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox