diff options
| author |   Stuart Shelton <stuart@shelton.me> | 2015-12-11 17:38:25 +0000 |
|---|---|---|
| committer | Stuart Shelton <stuart@shelton.me> | 2015-12-11 17:38:25 +0000 |
| commit | e784cc50bed602032bd04af061e9f97c7c6214ff (patch) | |
| tree | af52893711ff8015d9d35a01c6fbc3e4ad129fc3 /eclass | |
| parent | Update sys-apps/openrc-0.18.4 (diff) | |
| download | srcshelton-e784cc50bed602032bd04af061e9f97c7c6214ff.tar.gz srcshelton-e784cc50bed602032bd04af061e9f97c7c6214ff.tar.bz2 srcshelton-e784cc50bed602032bd04af061e9f97c7c6214ff.zip | |
Update eclass/php-pear-lib-r1, eclass/php-pear-r1
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php-pear-lib-r1.eclass | 7 | ||||
| -rw-r--r-- | eclass/php-pear-r1.eclass | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass index 38b6d6a7..050a5f4e 100644 --- a/eclass/php-pear-lib-r1.eclass +++ b/eclass/php-pear-lib-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: 03440c8abe1ae9bdd662d05513f7b737d7c4f241 $ +# $Id: 3fb9caa134bd05a2ac4c0e3bfe2a4dfb77daee75 $ # @ECLASS: php-pear-lib-r1.eclass # @MAINTAINER: @@ -75,16 +75,17 @@ php-pear-lib-r1_src_install() { cd "${S}" + # metadata_dir needs to be set relative to ${D} for >=dev-php/PEAR-PEAR-1.10 if [[ -f "${WORKDIR}"/package2.xml ]] ; then mv -f "${WORKDIR}/package2.xml" "${S}" local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" - peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ + peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \ install --force --loose --nodeps --offline --packagingroot="${D}" \ "${S}/package2.xml" || die "Unable to install PEAR package" else mv -f "${WORKDIR}/package.xml" "${S}" local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" - peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ + peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \ install --force --loose --nodeps --offline --packagingroot="${D}" \ "${S}/package.xml" || die "Unable to install PEAR package" fi diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass index 81a5dc15..099db6de 100644 --- a/eclass/php-pear-r1.eclass +++ b/eclass/php-pear-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: c2610307c7138276161ea440c1be1b6a7f226e22 $ +# $Id: 85eee287746b1ade83e8a63e210708e845396c3e $ # @ECLASS: php-pear-r1.eclass # @MAINTAINER: @@ -90,11 +90,12 @@ php-pear-r1_src_install() { cd "${S}" + # metadata_dir needs to be set relative to ${D} for >=dev-php/PEAR-PEAR-1.10 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" - peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ + peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \ install --force --loose --nodeps --offline --packagingroot="${D}" \ "${S}/package2.xml" || die "Unable to install PEAR package" else @@ -105,7 +106,7 @@ php-pear-r1_src_install() { 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" - peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ + peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \ install --force --loose --nodeps --offline --packagingroot="${D}" \ "${S}/package.xml" || die "Unable to install PEAR package" else |