Fixed a dependency issue where php would be pulled in for e.g ming even without php...
authorOle Markus With <olemarkus@gentoo.org>
Thu, 12 Jan 2012 11:10:47 +0000 (11:10 +0000)
committerOle Markus With <olemarkus@gentoo.org>
Thu, 12 Jan 2012 11:10:47 +0000 (11:10 +0000)
eclass/php-ext-source-r2.eclass

index 4d1778d63a674d617ad0bde9bc36cda1df586771..eba1e97511c4d68e147c9986ded88d459aef32a5 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.19 2012/01/11 18:30:36 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.20 2012/01/12 11:10:47 olemarkus Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -86,7 +86,11 @@ RDEPEND="${RDEPEND}
        ${PHP_EXT_OPTIONAL_USE:+ )}"
 
 DEPEND="${DEPEND}
-${PHPDEPEND}"
+       ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
+       || ( ${SELFDEPEND} )
+       ${PHPDEPEND}
+       ${PHP_EXT_OPTIONAL_USE:+ )}
+"
 
 # @FUNCTION: php-ext-source-r2_src_unpack
 # @DESCRIPTION: