Uncomment DEPEND for php-ext-source-r2.eclass, but w/o the SELFDEPEND that breaks...

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 30deb0cf2940726b3a05f5a18b7a5f434847f5fb..d80c15743ebb6a020d17d216cb28459d828f45c0 100644 (file)
--- 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 7c4b12970b9591cdfed21a3e8e1ef1ec0080bed3..ae0cf193e8186905335d50dc65ff410a649be454 100644 (file)
--- 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: