summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-01-04 23:41:09 +0000
committerBrian Evans <grknight@gentoo.org>2015-01-04 23:41:09 +0000
commitd0e5bd809f4e85e99ec3d35e49bf5a6b4e756253 (patch)
tree1298a96ac1a3ded1d4d987338e036f66f309a5b3 /dev-php/pecl-mysqlnd_ms
parentFix dependencies wrt bug 534616 (diff)
downloadgentoo-2-d0e5bd809f4e85e99ec3d35e49bf5a6b4e756253.tar.gz
gentoo-2-d0e5bd809f4e85e99ec3d35e49bf5a6b4e756253.tar.bz2
gentoo-2-d0e5bd809f4e85e99ec3d35e49bf5a6b4e756253.zip
Fix dependencies wrt bug 531814
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)
Diffstat (limited to 'dev-php/pecl-mysqlnd_ms')
-rw-r--r--dev-php/pecl-mysqlnd_ms/ChangeLog8
-rw-r--r--dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.5.2-r1.ebuild10
2 files changed, 13 insertions, 5 deletions
diff --git a/dev-php/pecl-mysqlnd_ms/ChangeLog b/dev-php/pecl-mysqlnd_ms/ChangeLog
index 803a67642ac6..353f2dcfd06c 100644
--- a/dev-php/pecl-mysqlnd_ms/ChangeLog
+++ b/dev-php/pecl-mysqlnd_ms/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-php/pecl-mysqlnd_ms
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mysqlnd_ms/ChangeLog,v 1.13 2014/10/10 02:01:58 grknight Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mysqlnd_ms/ChangeLog,v 1.14 2015/01/04 23:41:09 grknight Exp $
+
+ 04 Jan 2015; Brian Evans <grknight@gentoo.org>
+ pecl-mysqlnd_ms-1.5.2-r1.ebuild:
+ Fix dependencies wrt bug 531814
*pecl-mysqlnd_ms-1.5.2-r1 (30 Sep 2014)
diff --git a/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.5.2-r1.ebuild b/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.5.2-r1.ebuild
index 2dfaa43f15b0..5f48b027d59f 100644
--- a/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.5.2-r1.ebuild
+++ b/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.5.2-r1.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_ms/pecl-mysqlnd_ms-1.5.2-r1.ebuild,v 1.1 2014/09/30 18:56:14 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.5.2-r1.ebuild,v 1.2 2015/01/04 23:41:09 grknight Exp $
EAPI=5
@@ -23,6 +23,10 @@ IUSE=""
# Specifying targets due to USE flag transition
DEPEND="
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}"