diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2013-06-01 18:51:57 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-06-01 18:51:57 +0000 |
| commit | 06ef54e1b5e9baf17a13913bc20770d9f32c52b3 (patch) | |
| tree | 5036b0b9c145ea6d3a19049ca570f14aa353d787 /eclass | |
| parent | Patchset moved to Gentoo mirrors. (diff) | |
| download | historical-06ef54e1b5e9baf17a13913bc20770d9f32c52b3.tar.gz historical-06ef54e1b5e9baf17a13913bc20770d9f32c52b3.tar.bz2 historical-06ef54e1b5e9baf17a13913bc20770d9f32c52b3.zip | |
Fix REQUIRED_USE with PHP_EXT_OPTIONAL_USE set. Fixes REQUIRED_USE unsatisfied constraints triggered by "USE=-php PHP_TARGETS= emerge media-libs/ming".
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/php-ext-source-r2.eclass | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 573464fa6927..11643ec6225a 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.847 2013/06/01 13:18:45 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.848 2013/06/01 18:51:57 robbat2 Exp $ + + 01 Jun 2013; Robin H. Johnson <robbat2@gentoo.org> php-ext-source-r2.eclass: + Fix REQUIRED_USE with PHP_EXT_OPTIONAL_USE set. Fixes REQUIRED_USE + unsatisfied constraints triggered by "USE=-php PHP_TARGETS= emerge + media-libs/ming". 01 Jun 2013; Hans de Graaff <graaff@gentoo.org> ruby-fakegem.eclass: Quote DISTDIR. diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass index 8d723b5a6730..97b44ee3f674 100644 --- a/eclass/php-ext-source-r2.eclass +++ b/eclass/php-ext-source-r2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.32 2013/04/14 06:54:43 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.33 2013/06/01 18:51:57 robbat2 Exp $ # @ECLASS: php-ext-source-r2.eclass # @MAINTAINER: @@ -69,7 +69,7 @@ esac [[ -z "${PHP_EXT_S}" ]] && PHP_EXT_S="${S}" #Make sure at least one target is installed. -REQUIRED_USE="|| ( " +REQUIRED_USE="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| ( " for target in ${USE_PHP}; do IUSE="${IUSE} php_targets_${target}" target=${target/+} @@ -79,7 +79,7 @@ for target in ${USE_PHP}; do PHPDEPEND="${PHPDEPEND} php_targets_${target}? ( dev-lang/php:${slot} )" done -REQUIRED_USE+=")" +REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}" RDEPEND="${RDEPEND} ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } |