diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2012-01-13 23:25:40 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2012-01-13 23:25:40 +0000 |
| commit | 1da432e26fbb2a720285ac1dc46a6fce9f0e8cb7 (patch) | |
| tree | 940ee7901a4d2ac922dfd8b4f56069ec607554fa /eclass | |
| parent | Apply pkglibexec patch. Thanks to Alphat-PC <AlphatPC@gmail.com>. Bug #397399 (diff) | |
| download | historical-1da432e26fbb2a720285ac1dc46a6fce9f0e8cb7.tar.gz historical-1da432e26fbb2a720285ac1dc46a6fce9f0e8cb7.tar.bz2 historical-1da432e26fbb2a720285ac1dc46a6fce9f0e8cb7.zip | |
Uncomment DEPEND for php-ext-source-r2.eclass, but w/o the SELFDEPEND that breaks pecl ebuilds (bug #398553)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/php-ext-source-r2.eclass | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 30deb0cf2940..d80c15743ebb 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.77 2012/01/13 20:52:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.78 2012/01/13 23:25:40 mabi Exp $ + + 13 Jan 2012; Matti Bickel <mabi@gentoo.org> php-ext-source-r2.eclass: + Uncomment DEPEND for php-ext-source-r2.eclass, but w/o the SELFDEPEND that + breaks pecl ebuilds (bug #398553) 13 Jan 2012; Ulrich Müller <ulm@gentoo.org> +cdrom.eclass: New cdrom.eclass, split out CD-ROM functions from eutils.eclass. diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass index 7c4b12970b95..ae0cf193e818 100644 --- a/eclass/php-ext-source-r2.eclass +++ b/eclass/php-ext-source-r2.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.21 2012/01/13 05:38:42 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.22 2012/01/13 23:25:40 mabi Exp $ # @ECLASS: php-ext-source-r2.eclass # @MAINTAINER: @@ -85,12 +85,11 @@ RDEPEND="${RDEPEND} ${PHPDEPEND} ${PHP_EXT_OPTIONAL_USE:+ )}" -#DEPEND="${DEPEND} -# ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } -# || ( ${SELFDEPEND} ) -# ${PHPDEPEND} -# ${PHP_EXT_OPTIONAL_USE:+ )} -#" +DEPEND="${DEPEND} + ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } + ${PHPDEPEND} + ${PHP_EXT_OPTIONAL_USE:+ )} +" # @FUNCTION: php-ext-source-r2_src_unpack # @DESCRIPTION: |