summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-01-04 23:35:22 +0000
committerBrian Evans <grknight@gentoo.org>2015-01-04 23:35:22 +0000
commit2a9e82fec03903f941e8c5104f003b832fac6d3b (patch)
tree8903737927cffc50ab4fc923864d6edf3df35022 /dev-php
parentrevbump; conversion -> distutils-r1, rm old (diff)
downloadhistorical-2a9e82fec03903f941e8c5104f003b832fac6d3b.tar.gz
historical-2a9e82fec03903f941e8c5104f003b832fac6d3b.tar.bz2
historical-2a9e82fec03903f941e8c5104f003b832fac6d3b.zip
Fix dependencies wrt bug 534616
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x67C78E1D
Diffstat (limited to 'dev-php')
-rw-r--r--dev-php/pecl-mysqlnd_qc/ChangeLog7
-rw-r--r--dev-php/pecl-mysqlnd_qc/Manifest18
-rw-r--r--dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0.ebuild10
3 files changed, 21 insertions, 14 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/Manifest b/dev-php/pecl-mysqlnd_qc/Manifest
index 6d07609bb18c..30c4c80945e7 100644
--- a/dev-php/pecl-mysqlnd_qc/Manifest
+++ b/dev-php/pecl-mysqlnd_qc/Manifest
@@ -2,17 +2,17 @@
Hash: SHA256
DIST mysqlnd_qc-1.2.0.tgz 147416 SHA256 08d64e917963c2404f77204bcc811adc1230361fcf389d1acde3a1a19edc2ae1 SHA512 7f04167e671f7018a72293c665f7d2b041c90a7005748ad102a2bbcbfb2331a07335f8a624ac35f1dc05066811e3a1caa1a2314c3b083a1276e36818872df8d2 WHIRLPOOL a901d072fab8061ecec7e4757680daaad51ab2ee8bd4aa9eff7caf6a26690491223d1f991d4f859375e346a04fc2df6c30491e28e5d722d5044bec3ad4521363
-EBUILD pecl-mysqlnd_qc-1.2.0.ebuild 1186 SHA256 b30f67cd4f9e7156040e9df01d732ed698beae2b8f833274a17df11d4aca3248 SHA512 af17d9b09704f9c439304fa5db6c0b9cb8131ff131b4dd7cb6493741846988b9139a614d1169103425e967193ca6ec0239ec23b227c912e5df3f6ebbcbc8a0ca WHIRLPOOL ae5972bc59ec815ac4a955a830ef72c5687b2d92896d988d9a0de3d3389c8174d14d682cff06c7f3b67a749f9aa8af22b88cffd874b599afbf38a27a2e04b1ae
-MISC ChangeLog 1092 SHA256 e162cd40af2a710de5711059fe55f099cd0539eb9608ecfd65a23c7c0f748559 SHA512 5242fb962df1b2854a083b5016228ee8acd6cbdf5278b614a1913872a46b1a74815ce5330539fc8a709685ca9cc43823fdf45704df0cb2c9dc53bd040bf41a1f WHIRLPOOL 99767ba53ad8078789f9a261b1270a44c3a85f2bdc422a9fd9ecda046ebc92b4fbad47af8b646072d7b8f3c5f9137877a84726e42ed9fbc5c8ecc2e8fdacd939
+EBUILD pecl-mysqlnd_qc-1.2.0.ebuild 1261 SHA256 6a009ed673612e74ca9c9b1024db48430e2f13cfd0ef9eb6615c6071587e5676 SHA512 158ae686de817b00eda290a51b6abfe2fc7e6ed97be88ff99159c8fcb8e20bbc4791891b54917872d89ca1fbc291a38ab6707670dbb9c9801e03c33907236984 WHIRLPOOL 2e591c26ef4418efa03f5a08f987a26f8e1d4d7c94579aa678c8fbe3d2a1ea1c0896b94783645adcf4ec88cba2e5fd088e6365fb6ffbefcafc5ca1e24781481b
+MISC ChangeLog 1206 SHA256 de8c34741379e089d929d1fbe5d9023b5d25748b8707d1de72d342e0de7004a6 SHA512 6b0a68294092db1367382942aa67900edc423fbad8218e0ef3ad3da054044e784dbba581d7b5f0d3ef66e56b03f278328587bd86ae82e6f6f6ba723f7d4a827e WHIRLPOOL 5b726695511af0b21fe4a500b1f7765ea4f231e68d10d2cadc3a3b9ba40ced31a23fd6aa379b509167270e18a5f0fce3356e96358a195e66d4f0f94e834229d0
MISC metadata.xml 592 SHA256 fbfe7c81b6c61fef82536b049f548ce3114f0ee242ee6c36b3421c9c9a1d1fd5 SHA512 04513358b40ced85c6b334b0fb4c4798eb7260c4e7acbb5c566e3b5646a1e2452b1c653e5397f2dee26b460c99c5adb797369d0cfe282eb17bd224cd52a0195e WHIRLPOOL d5ff40629cf30b114e9d5a88d2c33917001d3fd37f843335bfd367b68a68bd01d94a7bfdca44f7687de21cb5c4dc94354f2469e77d71faec0d1bae1e71a68374
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJUNvA3AAoJEE4V4vFnx44dFdoH/is+WvnZLJyenkckD/43AKK9
-dNIZ1sEAfI3hUBBDMvLJkBqBfAoYvmLcrK+SwP54Y2wpr0DHgmx65osMv+2b0jJH
-7v3WhKjRR+8YY3hR3k0ZDnYG6TyFooSkkTbf0omyqm9fMTBh3QCeK5gcP+Adlf0K
-02snpkASIa5XVJzylhUymAZUcY41028QaIqnvF9JotwztDcGaRuH9vEzX1BUrqnK
-iONn0U6uDpMtKOCwtyzaupmQY1W8AIYdxHgiSGzkQFMbAlXyPsB1IXhDZFoTwPlQ
-uBz2hWJHjFSCcH98WCCtEKU0NKCV4Kqt5b4m/Vn/ScL9b/lkOSCHB5YyDztDMls=
-=n2IS
+iQEcBAEBCAAGBQJUqc42AAoJEE4V4vFnx44ddrcIAIPIZf6evFptU8B2wMlrHet2
+F2CWnUJyupqh7ALKk6lhzvizGwIWjztyia3faPJtIdbhOH+vUZ9zftqwLDMPKbD6
+rhmmuR4PH1HptNlIe4EAHfnp5HwZBrBTN0N5AQGurdb3rjP1cYOQtBp3oujWd5EU
+spTQZYTqcfWsBjGIlNQlSvBO29+vn3RBZ+Q+TMZvv3guK8JRCLmDxuZ9ToOA7fU2
+KzesnY8WxZeu/K5oajM8mx63fnhL0AFzv8pm0d5SvBFyfleoHIWB6ADO5QPTLJ8Q
+fPiOzKy0dHVHroUL4GELtQ/H3NTsuKKBxmiSL4TFWfcOkebLjEnVl3Ykee49sI4=
+=paj/
-----END PGP SIGNATURE-----
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}"