Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: python@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH] python*r1.eclass: Remove python-exec:0 leftover
Date: Sat, 30 Nov 2019 10:46:40
Message-Id: 20191130104606.114721-1-mgorny@gentoo.org
Signed-off-by: Michał Górny <mgorny@g.o>
---
 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