summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@gentoo.org>2006-01-21 09:02:44 +0000
committerSebastian Bergmann <sebastian@gentoo.org>2006-01-21 09:02:44 +0000
commit173f8943188c5dc4f1d7c6b4da1a98ddd480fcb5 (patch)
tree5761be49055c348100be533c9730c41241d9a478 /eclass
parentStable on ppc64; bug #111968 (diff)
downloadgentoo-2-173f8943188c5dc4f1d7c6b4da1a98ddd480fcb5.tar.gz
gentoo-2-173f8943188c5dc4f1d7c6b4da1a98ddd480fcb5.tar.bz2
gentoo-2-173f8943188c5dc4f1d7c6b4da1a98ddd480fcb5.zip
Fix bug 119137. Patch has been reviewd by Jakub Moc <jakub@gentoo.org>.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/depend.php.eclass12
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