| 1 |
jokey 07/10/22 22:55:04 |
| 2 |
|
| 3 |
Modified: php-pear-r1.eclass |
| 4 |
Log: |
| 5 |
proper pear call |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.18 eclass/php-pear-r1.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.18&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.18&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.17&r2=1.18 |
| 13 |
|
| 14 |
Index: php-pear-r1.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v |
| 17 |
retrieving revision 1.17 |
| 18 |
retrieving revision 1.18 |
| 19 |
diff -u -r1.17 -r1.18 |
| 20 |
--- php-pear-r1.eclass 1 Sep 2007 15:58:17 -0000 1.17 |
| 21 |
+++ php-pear-r1.eclass 22 Oct 2007 22:55:04 -0000 1.18 |
| 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/php-pear-r1.eclass,v 1.17 2007/09/01 15:58:17 jokey Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.18 2007/10/22 22:55:04 jokey Exp $ |
| 27 |
# |
| 28 |
# Author: Tal Peer <coredumb@g.o> |
| 29 |
# Author: Luca Longinotti <chtekk@g.o> |
| 30 |
@@ -17,7 +17,7 @@ |
| 31 |
|
| 32 |
EXPORT_FUNCTIONS src_install |
| 33 |
|
| 34 |
-DEPEND="dev-lang/php >=dev-php/PEAR-PEAR-1.4.6" |
| 35 |
+DEPEND="dev-lang/php >=dev-php/PEAR-PEAR-1.4.8" |
| 36 |
RDEPEND="${DEPEND}" |
| 37 |
|
| 38 |
# @ECLASS-VARIABLE: PHP_PEAR_PKG_NAME |
| 39 |
@@ -70,10 +70,10 @@ |
| 40 |
cd "${S}" |
| 41 |
mv -f "${WORKDIR}/package.xml" "${S}" |
| 42 |
|
| 43 |
- if has_version '>=dev-php/PEAR-PEAR-1.4.8' ; then |
| 44 |
- pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package" |
| 45 |
+ if [[ -f "${S}"/package2.xml ]] ; then |
| 46 |
+ pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package2.xml" > /dev/null || die "Unable to install PEAR package" |
| 47 |
else |
| 48 |
- pear -d php_bin="${PHP_BIN}" install --nodeps --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package" |
| 49 |
+ pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package" |
| 50 |
fi |
| 51 |
|
| 52 |
rm -Rf "${D}/usr/share/php/.channels" \ |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
-- |
| 57 |
gentoo-commits@g.o mailing list |
Archives