Gentoo Archives: gentoo-commits

From: "Matti Bickel (mabi)" <mabi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: php-pear-r1.eclass
Date: Wed, 31 Mar 2010 20:37:58
Message-Id: E1Nx4fk-00010f-Lc@stork.gentoo.org
1 mabi 10/03/31 20:37:56
2
3 Modified: php-pear-r1.eclass
4 Log:
5 use peardev instead of pear to avoid memory limits (bug #265413)
6
7 Revision Changes Path
8 1.24 eclass/php-pear-r1.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.24&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?rev=1.24&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-pear-r1.eclass?r1=1.23&r2=1.24
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.23
18 retrieving revision 1.24
19 diff -u -r1.23 -r1.24
20 --- php-pear-r1.eclass 16 Feb 2010 04:14:13 -0000 1.23
21 +++ php-pear-r1.eclass 31 Mar 2010 20:37:56 -0000 1.24
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.23 2010/02/16 04:14:13 beandog Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.24 2010/03/31 20:37:56 mabi Exp $
27 #
28 # Author: Tal Peer <coredumb@g.o>
29 # Author: Luca Longinotti <chtekk@g.o>
30 @@ -78,22 +78,22 @@
31 mv -f "${WORKDIR}/package2.xml" "${S}"
32 if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
33 local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
34 - pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
35 + peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
36 install --force --loose --nodeps --offline --packagingroot="${D}" \
37 "${S}/package2.xml" || die "Unable to install PEAR package"
38 else
39 - pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
40 + peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
41 "${S}/package2.xml" || die "Unable to install PEAR package"
42 fi
43 else
44 mv -f "${WORKDIR}/package.xml" "${S}"
45 if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
46 local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
47 - pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
48 + peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
49 install --force --loose --nodeps --offline --packagingroot="${D}" \
50 "${S}/package.xml" || die "Unable to install PEAR package"
51 else
52 - pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
53 + peardev -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