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

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

[Robin H. Johnson (robbat2)]

robbat2     13/06/01 18:51:57

  Modified:             php-ext-source-r2.eclass ChangeLog
  Log:
  Fix REQUIRED_USE with PHP_EXT_OPTIONAL_USE set. Fixes REQUIRED_USE unsatisfied constraints triggered by "USE=-php PHP_TARGETS= emerge media-libs/ming".

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -p -w -b -B -u -u -r1.32 -r1.33
--- php-ext-source-r2.eclass	14 Apr 2013 06:54:43 -0000	1.32
+++ php-ext-source-r2.eclass	1 Jun 2013 18:51:57 -0000	1.33
@@ -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:+? ( }



1.848                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.848&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.848&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.847&r2=1.848

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.847
retrieving revision 1.848
diff -p -w -b -B -u -u -r1.847 -r1.848
--- ChangeLog	1 Jun 2013 13:18:45 -0000	1.847
+++ ChangeLog	1 Jun 2013 18:51:57 -0000	1.848
@@ -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.