[gentoo-commits] gentoo-x86 commit in eclass: php-ext-source-r2.eclass

[Ole Markus With (olemarkus)]

olemarkus    12/01/12 11:10:47

  Modified:             php-ext-source-r2.eclass
  Log:
  Fixed a dependency issue where php would be pulled in for e.g ming even without php USE flag being set (bug 398649)

Revision  Changes    Path
1.20                 eclass/php-ext-source-r2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?r1=1.19&r2=1.20

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- php-ext-source-r2.eclass	11 Jan 2012 18:30:36 -0000	1.19
+++ php-ext-source-r2.eclass	12 Jan 2012 11:10:47 -0000	1.20
@@ -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 @@
 	${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: