[gentoo-python] [PATCH 1/4] Make Python checks consistent.

[Michał Górny]

Always use _python_EPYTHON_supported(), and always check for the package
being installed.
---
 gx86/eclass/python-any-r1.eclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gx86/eclass/python-any-r1.eclass b/gx86/eclass/python-any-r1.eclass
index dc3443b..3799491 100644
--- a/gx86/eclass/python-any-r1.eclass
+++ b/gx86/eclass/python-any-r1.eclass
@@ -158,7 +158,11 @@ _python_EPYTHON_supported() {
 	esac
 
 	if has "${i}" "${PYTHON_COMPAT[@]}"; then
-		return 0
+		local PYTHON_PKG_DEP
+		python_export "${i}" PYTHON_PKG_DEP
+		if ROOT=/ has_version "${PYTHON_PKG_DEP}"; then
+			return 0
+		fi
 	elif ! has "${i}" "${_PYTHON_ALL_IMPLS[@]}"; then
 		ewarn "Invalid EPYTHON: ${EPYTHON}"
 	fi
@@ -202,10 +206,9 @@ python-any-r1_pkg_setup() {
 		fi
 	done
 
-	local PYTHON_PKG_DEP
 	for i in "${rev_impls[@]}"; do
-		python_export "${i}" PYTHON_PKG_DEP EPYTHON PYTHON
-		if ROOT=/ has_version "${PYTHON_PKG_DEP}"; then
+		python_export "${i}" EPYTHON PYTHON
+		if _python_EPYTHON_supported "${EPYTHON}"; then
 			python_wrapper_setup "${T}"
 			return
 		fi
-- 
1.8.1.5