[gentoo-commits] repo/gentoo:master commit in: eclass/

[Brian Evans]

commit:     61c22cc75869b7f8f1007711ef73a214d69a31e3
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 16:01:18 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 16:01:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c22cc7

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 <AT> gentoo.org>

 eclass/php-pear-lib-r1.eclass | 5 +++--
 eclass/php-pear-r1.eclass     | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass
index 03440c8..3fb9caa 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

diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass
index c261030..85eee28 100644
--- 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