diff options
| author |   Brian Evans <grknight@gentoo.org> | 2015-12-10 11:01:18 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2015-12-10 11:01:18 -0500 |
| commit | 61c22cc75869b7f8f1007711ef73a214d69a31e3 (patch) | |
| tree | 81005535248c78373aa308c4ce90d583c2e68072 /eclass/php-pear-lib-r1.eclass | |
| parent | app-admin/puppetserver: bup (diff) | |
| download | gentoo-61c22cc75869b7f8f1007711ef73a214d69a31e3.tar.gz gentoo-61c22cc75869b7f8f1007711ef73a214d69a31e3.tar.bz2 gentoo-61c22cc75869b7f8f1007711ef73a214d69a31e3.zip | |
php-pear-r1.eclass, php-pear-lib-r1.eclass: Apply metadata_path wrt bug 567894
The metadata_path is new with dev-php/PEAR-PEAR-1.10.
The dependency files are created there instead of a previous location.
We don't need the files, so we set this up to where it used to be and
remove them later.
Signed-off-by: Brian Evans <grknight@gentoo.org>
Diffstat (limited to 'eclass/php-pear-lib-r1.eclass')
| -rw-r--r-- | eclass/php-pear-lib-r1.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass index 03440c8abe1a..3fb9caa134bd 100644 --- a/eclass/php-pear-lib-r1.eclass +++ b/eclass/php-pear-lib-r1.eclass @@ -70,16 +70,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 |