/[gentoo-x86]/eclass/php-pear-lib-r1.eclass
Gentoo

Diff of /eclass/php-pear-lib-r1.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.16 Revision 1.17
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2007 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.16 2010/06/09 11:11:58 mabi Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.17 2010/07/12 17:48:32 mabi Exp $
4# 4#
5# Author: Luca Longinotti <chtekk@gentoo.org> 5# Author: Luca Longinotti <chtekk@gentoo.org>
6 6
7# @ECLASS: php-pear-lib-r1.eclass 7# @ECLASS: php-pear-lib-r1.eclass
8# @MAINTAINER: 8# @MAINTAINER:
49 49
50 if [[ -f "${WORKDIR}"/package2.xml ]] ; then 50 if [[ -f "${WORKDIR}"/package2.xml ]] ; then
51 mv -f "${WORKDIR}/package2.xml" "${S}" 51 mv -f "${WORKDIR}/package2.xml" "${S}"
52 if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then 52 if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
53 local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" 53 local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
54 pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ 54 peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
55 install --force --loose --nodeps --offline --packagingroot="${D}" \ 55 install --force --loose --nodeps --offline --packagingroot="${D}" \
56 "${S}/package2.xml" || die "Unable to install PEAR package" 56 "${S}/package2.xml" || die "Unable to install PEAR package"
57 else 57 else
58 pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ 58 peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
59 "${S}/package2.xml" || die "Unable to install PEAR package" 59 "${S}/package2.xml" || die "Unable to install PEAR package"
60 fi 60 fi
61 else 61 else
62 mv -f "${WORKDIR}/package.xml" "${S}" 62 mv -f "${WORKDIR}/package.xml" "${S}"
63 if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then 63 if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then
64 local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" 64 local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
65 pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ 65 peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
66 install --force --loose --nodeps --offline --packagingroot="${D}" \ 66 install --force --loose --nodeps --offline --packagingroot="${D}" \
67 "${S}/package.xml" || die "Unable to install PEAR package" 67 "${S}/package.xml" || die "Unable to install PEAR package"
68 else 68 else
69 pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ 69 peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
70 "${S}/package.xml" || die "Unable to install PEAR package" 70 "${S}/package.xml" || die "Unable to install PEAR package"
71 fi 71 fi
72 fi 72 fi
73 73
74 rm -Rf "${D}/usr/share/php/.channels" \ 74 rm -Rf "${D}/usr/share/php/.channels" \

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17

  ViewVC Help
Powered by ViewVC 1.1.20