diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php-pear-lib-r1.eclass | 12 | ||||
| -rw-r--r-- | eclass/php-pear-r1.eclass | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass index b0a99f0b849c..019a564136f6 100644 --- a/eclass/php-pear-lib-r1.eclass +++ b/eclass/php-pear-lib-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.8 2006/02/02 11:53:09 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.9 2006/03/10 10:47:49 sebastian Exp $ # # Author: Luca Longinotti <chtekk@gentoo.org> # Maintained by the PHP Herd <php-bugs@gentoo.org> @@ -41,11 +41,17 @@ php-pear-lib-r1_src_install() { cd "${S}" mv "${WORKDIR}/package.xml" "${S}" + if has_version '=dev-php/PEAR-PEAR-1.3*' ; then - pear -d php_bin="${PHP_BIN}" install --nodeps --installroot="${D}" "${S}/package.xml" || die "Unable to install PEAR package" + pear -d php_bin="${PHP_BIN}" install --nodeps --installroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package" else - pear -d php_bin="${PHP_BIN}" install --nodeps --packagingroot="${D}" "${S}/package.xml" || die "Unable to install PEAR package" + if has_version '>=dev-php/PEAR-PEAR-1.4.8' ; then + pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package" + else + pear -d php_bin="${PHP_BIN}" install --nodeps --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package" + fi fi + rm -rf "${D}/usr/share/php/.channels" \ "${D}/usr/share/php/.depdblock" \ "${D}/usr/share/php/.depdb" \ diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass index fc5db83cd1e3..9f9d742ee9c9 100644 --- a/eclass/php-pear-r1.eclass +++ b/eclass/php-pear-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.12 2006/02/02 11:53:09 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.13 2006/03/10 10:47:49 sebastian Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Maintained by the PHP Herd <php-bugs@gentoo.org> @@ -58,11 +58,17 @@ php-pear-r1_src_install() { cd "${S}" mv "${WORKDIR}/package.xml" "${S}" + if has_version '=dev-php/PEAR-PEAR-1.3*' ; then - pear -d php_bin="${PHP_BIN}" install --nodeps --installroot="${D}" "${S}/package.xml" || die "Unable to install PEAR package" + pear -d php_bin="${PHP_BIN}" install --nodeps --installroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package" else - pear -d php_bin="${PHP_BIN}" install --nodeps --packagingroot="${D}" "${S}/package.xml" || die "Unable to install PEAR package" + if has_version '>=dev-php/PEAR-PEAR-1.4.8' ; then + pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package" + else + pear -d php_bin="${PHP_BIN}" install --nodeps --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package" + fi fi + rm -rf "${D}/usr/share/php/.channels" \ "${D}/usr/share/php/.depdblock" \ "${D}/usr/share/php/.depdb" \ |