public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ole Markus With (olemarkus)" <olemarkus@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: php-ext-source-r2.eclass
Date: Thu, 12 Jan 2012 11:10:47 +0000 (UTC)	[thread overview]
Message-ID: <20120112111047.4E0F62004B@flycatcher.gentoo.org> (raw)

olemarkus    12/01/12 11:10:47

  Modified:             php-ext-source-r2.eclass
  Log:
  Fixed a dependency issue where php would be pulled in for e.g ming even without php USE flag being set (bug 398649)

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

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

Index: php-ext-source-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- php-ext-source-r2.eclass	11 Jan 2012 18:30:36 -0000	1.19
+++ php-ext-source-r2.eclass	12 Jan 2012 11:10:47 -0000	1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.19 2012/01/11 18:30:36 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.20 2012/01/12 11:10:47 olemarkus Exp $
 
 # @ECLASS: php-ext-source-r2.eclass
 # @MAINTAINER:
@@ -86,7 +86,11 @@
 	${PHP_EXT_OPTIONAL_USE:+ )}"
 
 DEPEND="${DEPEND}
-${PHPDEPEND}"
+	${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
+	|| ( ${SELFDEPEND} )
+	${PHPDEPEND}
+	${PHP_EXT_OPTIONAL_USE:+ )}
+"
 
 # @FUNCTION: php-ext-source-r2_src_unpack
 # @DESCRIPTION:






             reply	other threads:[~2012-01-12 11:10 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-12 11:10 Ole Markus With (olemarkus) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-08-01 10:55 [gentoo-commits] gentoo-x86 commit in eclass: php-ext-source-r2.eclass Ole Markus With (olemarkus)
2012-06-22 20:05 Ole Markus With (olemarkus)
2012-02-16 11:25 Ole Markus With (olemarkus)
2012-01-15 17:18 Ole Markus With (olemarkus)
2012-01-13  5:38 Ole Markus With (olemarkus)
2012-01-11 18:30 Ole Markus With (olemarkus)
2011-11-24  0:04 Mike Frysinger (vapier)
2011-09-09 14:39 Ole Markus With (olemarkus)
2011-08-19  9:15 Ole Markus With (olemarkus)
2011-08-15 12:48 Ole Markus With (olemarkus)
2011-07-22 12:13 Ole Markus With (olemarkus)
2011-07-22  9:19 Ole Markus With (olemarkus)
2011-06-29  7:04 Ole Markus With (olemarkus)
2011-05-22  7:18 Ole Markus With (olemarkus)
2011-01-10 11:25 Ole Markus With (olemarkus)
2011-01-09  0:05 Robin H. Johnson (robbat2)
2010-12-27 22:19 Jeremy Olexa (darkside)
2010-11-03 22:47 Ole Markus With (olemarkus)
2010-11-02 21:46 Ole Markus With (olemarkus)
2010-11-02 17:09 Ole Markus With (olemarkus)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120112111047.4E0F62004B@flycatcher.gentoo.org \
    --to=olemarkus@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox