diff options
| author |   Markus Meier <maekke@gentoo.org> | 2009-01-12 23:09:46 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2009-01-12 23:09:46 +0000 |
| commit | 6f5f218865f8bccb88e659674e528846642748d9 (patch) | |
| tree | b1b9e55b82f05bc71effb16424c38ebeb2244db1 /eclass/php-pear-lib-r1.eclass | |
| parent | Import fix for ksquares-4.1.3 from kde-testing (diff) | |
| download | historical-6f5f218865f8bccb88e659674e528846642748d9.tar.gz historical-6f5f218865f8bccb88e659674e528846642748d9.tar.bz2 historical-6f5f218865f8bccb88e659674e528846642748d9.zip | |
whitespace
Diffstat (limited to 'eclass/php-pear-lib-r1.eclass')
| -rw-r--r-- | eclass/php-pear-lib-r1.eclass | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass index ef67fd1ef4b2..f92ec0303ef3 100644 --- a/eclass/php-pear-lib-r1.eclass +++ b/eclass/php-pear-lib-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.14 2008/03/19 09:27:28 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.15 2009/01/12 22:48:06 maekke Exp $ # # Author: Luca Longinotti <chtekk@gentoo.org> @@ -45,29 +45,29 @@ php-pear-lib-r1_src_install() { cd "${S}" - if [[ -f "${WORKDIR}"/package2.xml ]] ; then - mv -f "${WORKDIR}/package2.xml" "${S}" - if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then - local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" - pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ - install --force --loose --nodeps --offline --packagingroot="${D}" \ - "${S}/package2.xml" || die "Unable to install PEAR package" - else - pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ - "${S}/package2.xml" || die "Unable to install PEAR package" - fi - else - mv -f "${WORKDIR}/package.xml" "${S}" - if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then - local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" - pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ - install --force --loose --nodeps --offline --packagingroot="${D}" \ - "${S}/package.xml" || die "Unable to install PEAR package" - else - pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ - "${S}/package.xml" || die "Unable to install PEAR package" - fi - fi + if [[ -f "${WORKDIR}"/package2.xml ]] ; then + mv -f "${WORKDIR}/package2.xml" "${S}" + if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then + local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" + pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ + install --force --loose --nodeps --offline --packagingroot="${D}" \ + "${S}/package2.xml" || die "Unable to install PEAR package" + else + pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ + "${S}/package2.xml" || die "Unable to install PEAR package" + fi + else + mv -f "${WORKDIR}/package.xml" "${S}" + if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then + local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" + pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ + install --force --loose --nodeps --offline --packagingroot="${D}" \ + "${S}/package.xml" || die "Unable to install PEAR package" + else + pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ + "${S}/package.xml" || die "Unable to install PEAR package" + fi + fi rm -Rf "${D}/usr/share/php/.channels" \ "${D}/usr/share/php/.depdblock" \ |