diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2008-02-26 16:26:08 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2008-02-26 16:26:08 +0000 |
| commit | b9af64af30a92ea4d212a33f723f595a2cccd2f6 (patch) | |
| tree | 5f59e1472a8b01d88ad231b4f260af5ecc721b08 /eclass | |
| parent | Version bump, security bug #198644; remove unneeded libnet deps. (diff) | |
| download | gentoo-2-b9af64af30a92ea4d212a33f723f595a2cccd2f6.tar.gz gentoo-2-b9af64af30a92ea4d212a33f723f595a2cccd2f6.tar.bz2 gentoo-2-b9af64af30a92ea4d212a33f723f595a2cccd2f6.zip | |
import from php overlay
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/depend.php.eclass | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass index a30be860cbea..003ac46a4129 100644 --- a/eclass/depend.php.eclass +++ b/eclass/depend.php.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.24 2008/02/11 20:47:35 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.25 2008/02/26 16:26:08 armin76 Exp $ # Author: Stuart Herbert <stuart@gentoo.org> # Author: Luca Longinotti <chtekk@gentoo.org> @@ -171,21 +171,13 @@ need_php_by_category() { # need to know which PHP version is being used and where the PHP binaries/data # are installed. has_php() { - # If PHP_PKG is already set, then we have remembered our PHP settings - # from last time - if [[ -n ${PHP_PKG} ]] ; then - return - fi - - if [[ -z ${PHP_VERSION} ]] ; then - # Detect which PHP version we have installed - if has_version '=dev-lang/php-5*' ; then - PHP_VERSION="5" - elif has_version '=dev-lang/php-4*' ; then - PHP_VERSION="4" - else - die "Unable to find an installed dev-lang/php package" - fi + # Detect which PHP version we have installed + if has_version '=dev-lang/php-5*' ; then + PHP_VERSION="5" + elif has_version '=dev-lang/php-4*' ; then + PHP_VERSION="4" + else + die "Unable to find an installed dev-lang/php package" fi # If we get here, then PHP_VERSION tells us which version of PHP we |