From fc19415f651171c4dc81e718a82818b443a95447 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Thu, 12 Jan 2012 11:10:47 +0000 Subject: [PATCH] Fixed a dependency issue where php would be pulled in for e.g ming even without php USE flag being set (bug 398649) --- eclass/php-ext-source-r2.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass index 4d1778d63a67..eba1e97511c4 100644 --- a/eclass/php-ext-source-r2.eclass +++ b/eclass/php-ext-source-r2.eclass @@ -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: -- 2.26.2