[gentoo-commits] gentoo-x86 commit in eclass: python.eclass

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    09/08/04 21:01:25

  Modified:             python.eclass
  Log:
  Update dependency on app-admin/eselect-python. Update check for /usr/bin/python.

Revision  Changes    Path
1.59                 eclass/python.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?r1=1.58&r2=1.59

Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- python.eclass	3 Aug 2009 22:28:01 -0000	1.58
+++ python.eclass	4 Aug 2009 21:01:25 -0000	1.59
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.58 2009/08/03 22:28:01 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.59 2009/08/04 21:01:25 arfrever Exp $
 
 # @ECLASS: python.eclass
 # @MAINTAINER:
@@ -22,7 +22,7 @@
 fi
 
 if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
-	DEPEND="${DEPEND} >=app-admin/eselect-python-20090801"
+	DEPEND="${DEPEND} >=app-admin/eselect-python-20090804"
 fi
 
 __python_eclass_test() {
@@ -112,9 +112,9 @@
 # @DESCRIPTION:
 # Make sure PYTHON_ABIS variable has valid value.
 validate_PYTHON_ABIS() {
-	# Ensure that /usr/bin/python and /usr/bin/python-config are scripts.
-	if [[ "$(</usr/bin/python)" != *"Gentoo Python wrapper script"* ]]; then
-		die "/usr/bin/python isn't valid script"
+	# Ensure that /usr/bin/python and /usr/bin/python-config are valid.
+	if [[ "$(</usr/bin/python)" != *"Gentoo Python wrapper program"* ]]; then
+		die "/usr/bin/python isn't valid program"
 	fi
 	if [[ "$(</usr/bin/python-config)" != *"Gentoo python-config wrapper script"* ]]; then
 		die "/usr/bin/python-config isn't valid script"