diff options
| author |   Sebastian Bergmann <sebastian@gentoo.org> | 2006-01-21 09:02:44 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@gentoo.org> | 2006-01-21 09:02:44 +0000 |
| commit | 0de50997c437c931a3fb0a2b81660452ad4322f6 (patch) | |
| tree | 1c876c3203b08b6f5a40ca752b47cbf771c2ff65 /eclass/depend.php.eclass | |
| parent | Stable on ppc64; bug #111968 (diff) | |
| download | historical-0de50997c437c931a3fb0a2b81660452ad4322f6.tar.gz historical-0de50997c437c931a3fb0a2b81660452ad4322f6.tar.bz2 historical-0de50997c437c931a3fb0a2b81660452ad4322f6.zip | |
Fix bug 119137. Patch has been reviewd by Jakub Moc <jakub@gentoo.org>.
Diffstat (limited to 'eclass/depend.php.eclass')
| -rw-r--r-- | eclass/depend.php.eclass | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass index 6331b67dc92c..394b9faffff7 100644 --- a/eclass/depend.php.eclass +++ b/eclass/depend.php.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.8 2006/01/01 01:14:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.9 2006/01/21 09:02:44 sebastian Exp $ # # ======================================================================== # @@ -381,16 +381,22 @@ require_php_cgi() # detect which PHP version installed if has_version '=dev-lang/php-4*' ; then + PHP_PACKAGE_FOUND=1 pkg="`best_version '=dev-lang/php-4*'`" if built_with_use =${pkg} cgi ; then PHP_VERSION=4 fi - elif has_version '=dev-lang/php-5*' ; then + fi + + if has_version '=dev-lang/php-5*' ; then + PHP_PACKAGE_FOUND=1 pkg="`best_version '=dev-lang/php-5*'`" if built_with_use =${pkg} cgi ; then PHP_VERSION=5 fi - else + fi + + if [[ -z ${PHP_PACKAGE_FOUND} ]]; then die "Unable to find an installed dev-lang/php package" fi |