| 1 |
maekke 09/01/12 22:48:06 |
| 2 |
|
| 3 |
Modified: php-pear-lib-r1.eclass |
| 4 |
Log: |
| 5 |
whitespace |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.15 eclass/php-pear-lib-r1.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.15&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-lib-r1.eclass?rev=1.15&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-lib-r1.eclass?r1=1.14&r2=1.15 |
| 13 |
|
| 14 |
Index: php-pear-lib-r1.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v |
| 17 |
retrieving revision 1.14 |
| 18 |
retrieving revision 1.15 |
| 19 |
diff -u -r1.14 -r1.15 |
| 20 |
--- php-pear-lib-r1.eclass 19 Mar 2008 09:27:28 -0000 1.14 |
| 21 |
+++ php-pear-lib-r1.eclass 12 Jan 2009 22:48:06 -0000 1.15 |
| 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-lib-r1.eclass,v 1.14 2008/03/19 09:27:28 jokey Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.15 2009/01/12 22:48:06 maekke Exp $ |
| 27 |
# |
| 28 |
# Author: Luca Longinotti <chtekk@g.o> |
| 29 |
|
| 30 |
@@ -45,29 +45,29 @@ |
| 31 |
|
| 32 |
cd "${S}" |
| 33 |
|
| 34 |
- if [[ -f "${WORKDIR}"/package2.xml ]] ; then |
| 35 |
- mv -f "${WORKDIR}/package2.xml" "${S}" |
| 36 |
- if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then |
| 37 |
- local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" |
| 38 |
- pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ |
| 39 |
- install --force --loose --nodeps --offline --packagingroot="${D}" \ |
| 40 |
- "${S}/package2.xml" || die "Unable to install PEAR package" |
| 41 |
- else |
| 42 |
- pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ |
| 43 |
- "${S}/package2.xml" || die "Unable to install PEAR package" |
| 44 |
- fi |
| 45 |
- else |
| 46 |
- mv -f "${WORKDIR}/package.xml" "${S}" |
| 47 |
- if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then |
| 48 |
- local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" |
| 49 |
- pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ |
| 50 |
- install --force --loose --nodeps --offline --packagingroot="${D}" \ |
| 51 |
- "${S}/package.xml" || die "Unable to install PEAR package" |
| 52 |
- else |
| 53 |
- pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ |
| 54 |
- "${S}/package.xml" || die "Unable to install PEAR package" |
| 55 |
- fi |
| 56 |
- fi |
| 57 |
+ if [[ -f "${WORKDIR}"/package2.xml ]] ; then |
| 58 |
+ mv -f "${WORKDIR}/package2.xml" "${S}" |
| 59 |
+ if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then |
| 60 |
+ local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" |
| 61 |
+ pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ |
| 62 |
+ install --force --loose --nodeps --offline --packagingroot="${D}" \ |
| 63 |
+ "${S}/package2.xml" || die "Unable to install PEAR package" |
| 64 |
+ else |
| 65 |
+ pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ |
| 66 |
+ "${S}/package2.xml" || die "Unable to install PEAR package" |
| 67 |
+ fi |
| 68 |
+ else |
| 69 |
+ mv -f "${WORKDIR}/package.xml" "${S}" |
| 70 |
+ if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then |
| 71 |
+ local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" |
| 72 |
+ pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ |
| 73 |
+ install --force --loose --nodeps --offline --packagingroot="${D}" \ |
| 74 |
+ "${S}/package.xml" || die "Unable to install PEAR package" |
| 75 |
+ else |
| 76 |
+ pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ |
| 77 |
+ "${S}/package.xml" || die "Unable to install PEAR package" |
| 78 |
+ fi |
| 79 |
+ fi |
| 80 |
|
| 81 |
rm -Rf "${D}/usr/share/php/.channels" \ |
| 82 |
"${D}/usr/share/php/.depdblock" \ |
Archives