summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-01-04 23:35:13 +0000
committerBrian Evans <grknight@gentoo.org>2015-01-04 23:35:13 +0000
commit376249b662d3cd0c3e6a6a9d08e3f60009114236 (patch)
tree00ad91fb25c8969ee7d66b0a456eb97607296b6f /dev-php
parentrevbump; conversion -> distutils-r1, rm old (diff)
downloadgentoo-2-376249b662d3cd0c3e6a6a9d08e3f60009114236.tar.gz
gentoo-2-376249b662d3cd0c3e6a6a9d08e3f60009114236.tar.bz2
gentoo-2-376249b662d3cd0c3e6a6a9d08e3f60009114236.zip
Fix dependencies wrt bug 534616
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)
Diffstat (limited to 'dev-php')
-rw-r--r--dev-php/pecl-mysqlnd_qc/ChangeLog7
-rw-r--r--dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0.ebuild10
2 files changed, 12 insertions, 5 deletions
diff --git a/dev-php/pecl-mysqlnd_qc/ChangeLog b/dev-php/pecl-mysqlnd_qc/ChangeLog
index 981290fed138..17d8a0c62a19 100644
--- a/dev-php/pecl-mysqlnd_qc/ChangeLog
+++ b/dev-php/pecl-mysqlnd_qc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-php/pecl-mysqlnd_qc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mysqlnd_qc/ChangeLog,v 1.7 2014/10/09 20:29:41 grknight Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mysqlnd_qc/ChangeLog,v 1.8 2015/01/04 23:35:13 grknight Exp $
+
+ 04 Jan 2015; Brian Evans <grknight@gentoo.org> pecl-mysqlnd_qc-1.2.0.ebuild:
+ Fix dependencies wrt bug 534616
*pecl-mysqlnd_qc-1.2.0 (02 Oct 2014)
diff --git a/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0.ebuild b/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0.ebuild
index fbdc837e4569..cb78428430a0 100644
--- a/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0.ebuild
+++ b/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0.ebuild,v 1.1 2014/10/02 03:47:20 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0.ebuild,v 1.2 2015/01/04 23:35:13 grknight Exp $
EAPI=5
@@ -25,7 +25,11 @@ DEPEND="
memcached? ( dev-libs/libmemcached )
sqlite? ( dev-db/sqlite:3 )
php_targets_php5-4? ( dev-lang/php:5.4[mysqlnd] )
- php_targets_php5-5? ( dev-lang/php:5.5[-libmysqlclient] )
+ php_targets_php5-5? ( || (
+ dev-lang/php:5.5[-libmysqlclient,mysql]
+ dev-lang/php:5.5[-libmysqlclient,mysqli]
+ )
+ )
"
RDEPEND="${DEPEND}"