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>

diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass
index 03440c8abe1ae9bdd662d05513f7b737d7c4f241..3fb9caa134bd05a2ac4c0e3bfe2a4dfb77daee75 100644 (file)
--- 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

diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass
index c2610307c7138276161ea440c1be1b6a7f226e22..85eee287746b1ade83e8a63e210708e845396c3e 100644 (file)
--- a/eclass/php-pear-r1.eclass
+++ b/eclass/php-pear-r1.eclass
@@ -85,11 +85,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
@@ -100,7 +101,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