| 1 |
robbat2 13/06/01 18:51:57 |
| 2 |
|
| 3 |
Modified: php-ext-source-r2.eclass ChangeLog |
| 4 |
Log: |
| 5 |
Fix REQUIRED_USE with PHP_EXT_OPTIONAL_USE set. Fixes REQUIRED_USE unsatisfied constraints triggered by "USE=-php PHP_TARGETS= emerge media-libs/ming". |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.33 eclass/php-ext-source-r2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?rev=1.33&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?rev=1.33&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?r1=1.32&r2=1.33 |
| 13 |
|
| 14 |
Index: php-ext-source-r2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v |
| 17 |
retrieving revision 1.32 |
| 18 |
retrieving revision 1.33 |
| 19 |
diff -p -w -b -B -u -u -r1.32 -r1.33 |
| 20 |
--- php-ext-source-r2.eclass 14 Apr 2013 06:54:43 -0000 1.32 |
| 21 |
+++ php-ext-source-r2.eclass 1 Jun 2013 18:51:57 -0000 1.33 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2013 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.32 2013/04/14 06:54:43 olemarkus Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.33 2013/06/01 18:51:57 robbat2 Exp $ |
| 27 |
|
| 28 |
# @ECLASS: php-ext-source-r2.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -69,7 +69,7 @@ esac |
| 31 |
[[ -z "${PHP_EXT_S}" ]] && PHP_EXT_S="${S}" |
| 32 |
|
| 33 |
#Make sure at least one target is installed. |
| 34 |
-REQUIRED_USE="|| ( " |
| 35 |
+REQUIRED_USE="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| ( " |
| 36 |
for target in ${USE_PHP}; do |
| 37 |
IUSE="${IUSE} php_targets_${target}" |
| 38 |
target=${target/+} |
| 39 |
@@ -79,7 +79,7 @@ for target in ${USE_PHP}; do |
| 40 |
PHPDEPEND="${PHPDEPEND} |
| 41 |
php_targets_${target}? ( dev-lang/php:${slot} )" |
| 42 |
done |
| 43 |
-REQUIRED_USE+=")" |
| 44 |
+REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}" |
| 45 |
|
| 46 |
RDEPEND="${RDEPEND} |
| 47 |
${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.848 eclass/ChangeLog |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.848&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.848&content-type=text/plain |
| 55 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.847&r2=1.848 |
| 56 |
|
| 57 |
Index: ChangeLog |
| 58 |
=================================================================== |
| 59 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 60 |
retrieving revision 1.847 |
| 61 |
retrieving revision 1.848 |
| 62 |
diff -p -w -b -B -u -u -r1.847 -r1.848 |
| 63 |
--- ChangeLog 1 Jun 2013 13:18:45 -0000 1.847 |
| 64 |
+++ ChangeLog 1 Jun 2013 18:51:57 -0000 1.848 |
| 65 |
@@ -1,6 +1,11 @@ |
| 66 |
# ChangeLog for eclass directory |
| 67 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 68 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.847 2013/06/01 13:18:45 graaff Exp $ |
| 69 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.848 2013/06/01 18:51:57 robbat2 Exp $ |
| 70 |
+ |
| 71 |
+ 01 Jun 2013; Robin H. Johnson <robbat2@g.o> php-ext-source-r2.eclass: |
| 72 |
+ Fix REQUIRED_USE with PHP_EXT_OPTIONAL_USE set. Fixes REQUIRED_USE |
| 73 |
+ unsatisfied constraints triggered by "USE=-php PHP_TARGETS= emerge |
| 74 |
+ media-libs/ming". |
| 75 |
|
| 76 |
01 Jun 2013; Hans de Graaff <graaff@g.o> ruby-fakegem.eclass: |
| 77 |
Quote DISTDIR. |
Archives