summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-01-04 23:41:14 +0000
committerBrian Evans <grknight@gentoo.org>2015-01-04 23:41:14 +0000
commit18be5be81c05dc030137e6b88ff6bc6bb22acedb (patch)
tree3c01f6967f8f8218a2600c4d2679f10eb2265aa3 /dev-php/pecl-mysqlnd_ms
parentFix dependencies wrt bug 534616 (diff)
downloadhistorical-18be5be81c05dc030137e6b88ff6bc6bb22acedb.tar.gz
historical-18be5be81c05dc030137e6b88ff6bc6bb22acedb.tar.bz2
historical-18be5be81c05dc030137e6b88ff6bc6bb22acedb.zip
Fix dependencies wrt bug 531814
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x67C78E1D
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/Manifest18
-rw-r--r--dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.5.2-r1.ebuild10
3 files changed, 22 insertions, 14 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/Manifest b/dev-php/pecl-mysqlnd_ms/Manifest
index e0e30adcdeb0..c039ec8f9343 100644
--- a/dev-php/pecl-mysqlnd_ms/Manifest
+++ b/dev-php/pecl-mysqlnd_ms/Manifest
@@ -2,17 +2,17 @@
Hash: SHA256
DIST mysqlnd_ms-1.5.2.tgz 385916 SHA256 22b9ba1afb36b3df11c1051c813bc07889c815d1d9993bb07ffda182665b472f SHA512 5ab888d683384e9d2b33df8d057cf438411b6506759a80b8bad79608bb4029abf77535ffc8472e8e478d5d456c2260b5dd4bc68396180a9ebfed45f90bdc8d7d WHIRLPOOL 6d3d8786c74d4dfac384af3ea9f0cd8664e99aeaa766806ef8319c955135ab57092c2db27ef615def5574ab05c5a8a4e8e1f7bff9888a4cd3b3fc660c623fbe0
-EBUILD pecl-mysqlnd_ms-1.5.2-r1.ebuild 708 SHA256 a6e655a8d346868f9e59a11d848edb80295ab779b1d83efc394a3a64e2c75f25 SHA512 58efcc0d523db053328f0f44b96dac3e3ee9570d586a927085a79e7969ed2a19b6176f21493af56c16143b1a534babf2e7ff3ab76c2ea5aff5c1871d7afe464e WHIRLPOOL ae7e8bb26618617f9e055192bfbb34f804ed7bef900e20fa79d25dca58bb6c48f020b3a3228e7044e150082e4cf004314db441b413f87add6e3f7ae6a304dd5e
-MISC ChangeLog 2065 SHA256 a48f383dda0bd57016c964b6a782623fef1d03e2288a6ba056baa14288cbb26d SHA512 6d5e00c718e17b817027faf5b23d22af356f04f1c07732f822ac9f6ddcb2641d7937b570e2b77f3108159c621b944b631c4c6f8118a512f378417f3f02dc419a WHIRLPOOL 23561e3b52df8276dfe494a0b43245b6f81a3b9b6d3a925d5c183607335856af93b4c00f2a9f5de07068c333afcc03f8560c89aa49d732e173e1b41171083163
+EBUILD pecl-mysqlnd_ms-1.5.2-r1.ebuild 779 SHA256 0e5df154dc80ca6458dd7bf3ff5a3cf4f1bfd3d76f63713d79cea4a56bf9b302 SHA512 7a0dd9afd98c0d03e7ee427a0fa06384c540d853040a5dd801a0da02509eb432c62f0d61b140ce9508160e987c0d353ed81a46835b7d658894906148585fdd43 WHIRLPOOL 5c097f015f0eda70b54c9ece5c65e900968a33fe6262f92d577a95406b5885a1c0a1b2224abfcf9d48ca20a2b7bd2a2a77ac47b67ff7b72348cca64ee8a2719a
+MISC ChangeLog 2184 SHA256 2e50fc05892f57d3a60e4a73e8691f16d9cb5aeec2c384377e1145f9577add86 SHA512 ab14cb60d8d2a6aca48898ac57658289853aa684ed458697a6703f3a453c779f823d469856187517833bb95fd0efba185259e9e50bc69bdfefb616df514ff1c0 WHIRLPOOL de6a8428eb5b7b095930ec01e2583302a3bd3a53a66277f662893e5ec733ed45371ef4c6bc20831bd7e055d3f163b6ad99347b25c11d9f9c9fd54964d45dae00
MISC metadata.xml 229 SHA256 d3e4dd589bb36d5dba17cbb4125f97ca1bb0484f0babf5c8393b396ed3087283 SHA512 07cdaea8e24d201b756f70b6db3fd74b4941d37ad94d61b38c40126d4c09f67e1e08079f2e0cd9fb687dc5416fec8d1cc52a3268fd0060380d4bbc6e560d6d0e WHIRLPOOL 0b52c14becc4fe095362a19b55a91524dee0d0ae0bad68f245966096dea597ed3bd0662d9a891bbd8f608cb5a3a1b81cf6774778fc32b0c08975c18ced3c64c3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJUNz4aAAoJEE4V4vFnx44d5zoH/isw+gm2tgnNhMG53sqQn0Lg
-njzgT2TfOtpwlj7Noj/OVYkmoRwez3bcJ811NCIZIlpEFT6kT/BEjs2mkj2q+fsy
-6pe14mnP8subvUxYirtQvCjKTSzgtCbW9WigVMFAxjuUlBDWl1yZq41/QlrMAz5q
-F2BdYNeWjv+zsBb+EpR+ZuyMAiKqzem71ROd5vWWK8I7WTx/86pbyfZOlbfuyd0A
-/40lRLTybhxw45/gLw3hsMvLrVLm8bbMy/o2XoN7DTU3eAHpDly7IMc2LGclUaH6
-l/j1MameRW9c6T3hCk+9z0L/NqWAFJb/fI9GLaL7L05gp+ArTxmytRrtn8PoBzI=
-=yo9z
+iQEcBAEBCAAGBQJUqc+WAAoJEE4V4vFnx44dDVsH/3AJrN9pEo5NdzClgqMeKrxB
+ppdedsbYc6eI632itPryc6BaDbcM72YcVxNwp0WhTx6GMcUShiYVh16wFzwmGPSj
+IxZ0JmZsw7TYKKP9I2cWHsjdHucudcx3Xx46rwjKxnLptLRvALkyaKCq4SJnPxpr
+nH3eSN2YNT3Lm2oIPQS5aoRZvu7exV5h0F6IJFAvqPtDxqvrS36OixtY9h/FEVfq
+k+fyMBMXpUppCJTj9cbgWT3PdIOPnyfPUuK2LBwKEQJeekuo8+64CKpkE2wt9TjG
+K4RIh08yElfpOfn7VW32a6464pvyYJlKi5X3ZTcgu2M+NeBzh0rOzj+A/XoUwNk=
+=G7xz
-----END PGP SIGNATURE-----
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}"