summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-08-04 21:01:25 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-08-04 21:01:25 +0000
commit634d8c83a98a5124bc905fef4d6d13bf36bc8e2d (patch)
tree8e8c90243848af032a24c9e68dc0a8039dcf8d56 /eclass/python.eclass
parentFix S definition for PN=mythtv, conditionalize the S redifinition based on wh... (diff)
downloadhistorical-634d8c83a98a5124bc905fef4d6d13bf36bc8e2d.tar.gz
historical-634d8c83a98a5124bc905fef4d6d13bf36bc8e2d.tar.bz2
historical-634d8c83a98a5124bc905fef4d6d13bf36bc8e2d.zip
Update dependency on app-admin/eselect-python. Update check for /usr/bin/python.
Diffstat (limited to 'eclass/python.eclass')
-rw-r--r--eclass/python.eclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/python.eclass b/eclass/python.eclass
index 9cf28490bfb9..2bb00686bf08 100644
--- a/eclass/python.eclass
+++ b/eclass/python.eclass
@@ -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 @@ else
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 @@ get_python() {
# @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"