diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2010-06-09 11:11:58 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2010-06-09 11:11:58 +0000 |
| commit | c84be823ab214207c14d8d19cfcff53267e83fa3 (patch) | |
| tree | 8ef20d7c78fb1862c28ebb7531354b0698b83c1b /eclass/php-pear-lib-r1.eclass | |
| parent | remove old (diff) | |
| download | gentoo-2-c84be823ab214207c14d8d19cfcff53267e83fa3.tar.gz gentoo-2-c84be823ab214207c14d8d19cfcff53267e83fa3.tar.bz2 gentoo-2-c84be823ab214207c14d8d19cfcff53267e83fa3.zip | |
fix PEAR-PEAR dependency (bug #310633)
Diffstat (limited to 'eclass/php-pear-lib-r1.eclass')
| -rw-r--r-- | eclass/php-pear-lib-r1.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass index f92ec0303ef3..5c58dce0a537 100644 --- a/eclass/php-pear-lib-r1.eclass +++ b/eclass/php-pear-lib-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.15 2009/01/12 22:48:06 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.16 2010/06/09 11:11:58 mabi Exp $ # # Author: Luca Longinotti <chtekk@gentoo.org> @@ -17,7 +17,9 @@ inherit depend.php multilib EXPORT_FUNCTIONS src_install -DEPEND="dev-lang/php >=dev-php/PEAR-PEAR-1.6.1" +DEPEND="dev-lang/php + || ( ( >=dev-php/PEAR-PEAR-1.6.1 <dev-php/PEAR-PEAR-1.8.1 ) + >=dev-php/pear-1.8.1 )" RDEPEND="${DEPEND}" # @FUNCTION: php-pear-lib-r1_src_install |