use peardev instead of pear to avoid memory limits (bug #265413)
authorMatti Bickel <mabi@gentoo.org>
Wed, 31 Mar 2010 20:37:56 +0000 (20:37 +0000)
committerMatti Bickel <mabi@gentoo.org>
Wed, 31 Mar 2010 20:37:56 +0000 (20:37 +0000)
eclass/php-pear-r1.eclass

index 42a3df3751144167f52f87cf1e86a547b3626b2c..f1b1c552b92c9a841c7b9f4579b214312567ad00 100644 (file)
@@ -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-r1.eclass,v 1.23 2010/02/16 04:14:13 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.24 2010/03/31 20:37:56 mabi Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Luca Longinotti <chtekk@gentoo.org>
@@ -78,22 +78,22 @@ php-pear-r1_src_install() {
                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}" \
+                       peardev -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}" \
+                       peardev -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}" \
+                       peardev -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}" \
+                       peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
                                "${S}/package.xml" || die "Unable to install PEAR package"
                fi
        fi