| 1 |
armin76 08/02/26 16:26:09 |
| 2 |
|
| 3 |
Modified: depend.php.eclass |
| 4 |
Log: |
| 5 |
import from php overlay |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.25 eclass/depend.php.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.php.eclass?rev=1.25&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.php.eclass?rev=1.25&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/depend.php.eclass?r1=1.24&r2=1.25 |
| 13 |
|
| 14 |
Index: depend.php.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v |
| 17 |
retrieving revision 1.24 |
| 18 |
retrieving revision 1.25 |
| 19 |
diff -u -r1.24 -r1.25 |
| 20 |
--- depend.php.eclass 11 Feb 2008 20:47:35 -0000 1.24 |
| 21 |
+++ depend.php.eclass 26 Feb 2008 16:26:08 -0000 1.25 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.24 2008/02/11 20:47:35 armin76 Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.25 2008/02/26 16:26:08 armin76 Exp $ |
| 27 |
|
| 28 |
# Author: Stuart Herbert <stuart@g.o> |
| 29 |
# Author: Luca Longinotti <chtekk@g.o> |
| 30 |
@@ -171,21 +171,13 @@ |
| 31 |
# need to know which PHP version is being used and where the PHP binaries/data |
| 32 |
# are installed. |
| 33 |
has_php() { |
| 34 |
- # If PHP_PKG is already set, then we have remembered our PHP settings |
| 35 |
- # from last time |
| 36 |
- if [[ -n ${PHP_PKG} ]] ; then |
| 37 |
- return |
| 38 |
- fi |
| 39 |
- |
| 40 |
- if [[ -z ${PHP_VERSION} ]] ; then |
| 41 |
- # Detect which PHP version we have installed |
| 42 |
- if has_version '=dev-lang/php-5*' ; then |
| 43 |
- PHP_VERSION="5" |
| 44 |
- elif has_version '=dev-lang/php-4*' ; then |
| 45 |
- PHP_VERSION="4" |
| 46 |
- else |
| 47 |
- die "Unable to find an installed dev-lang/php package" |
| 48 |
- fi |
| 49 |
+ # Detect which PHP version we have installed |
| 50 |
+ if has_version '=dev-lang/php-5*' ; then |
| 51 |
+ PHP_VERSION="5" |
| 52 |
+ elif has_version '=dev-lang/php-4*' ; then |
| 53 |
+ PHP_VERSION="4" |
| 54 |
+ else |
| 55 |
+ die "Unable to find an installed dev-lang/php package" |
| 56 |
fi |
| 57 |
|
| 58 |
# If we get here, then PHP_VERSION tells us which version of PHP we |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
-- |
| 63 |
gentoo-commits@l.g.o mailing list |
Archives