From: Matti Bickel <mabi@gentoo.org>
Date: Wed, 9 Jun 2010 11:11:58 +0000 (+0000)
Subject: fix PEAR-PEAR dependency (bug #310633)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54a9f7c8273865fa83dc6daddb30c0e64df9d530;p=gentoo.git

fix PEAR-PEAR dependency (bug #310633)
---

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