Verison bump; drop 5.3 support

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

5 files changed, 62 insertions, 29 deletions

diff --git a/dev-php/pecl-mysqlnd_qc/ChangeLog b/dev-php/pecl-mysqlnd_qc/ChangeLog
index f36e137f22e9..97222a380e2c 100644
--- a/dev-php/pecl-mysqlnd_qc/ChangeLog
+++ b/dev-php/pecl-mysqlnd_qc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2014/08/10 21:03:02 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mysqlnd_qc/ChangeLog,v 1.6 2014/10/02 03:47:20 grknight Exp $
+
+*pecl-mysqlnd_qc-1.2.0 (02 Oct 2014)
+
+  02 Oct 2014;  <grknight@gentoo.org> +pecl-mysqlnd_qc-1.2.0.ebuild,
+  -pecl-mysqlnd_qc-1.0.1.ebuild, metadata.xml:
+  Verison bump; drop 5.3 support
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   pecl-mysqlnd_qc-1.0.1.ebuild:
diff --git a/dev-php/pecl-mysqlnd_qc/Manifest b/dev-php/pecl-mysqlnd_qc/Manifest
index 06b4245a4d85..a004263a832d 100644
--- a/dev-php/pecl-mysqlnd_qc/Manifest
+++ b/dev-php/pecl-mysqlnd_qc/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST mysqlnd_qc-1.0.1.tgz 131073 SHA256 42297e7e057207f41d29a758cd3e9ad4e6ac61036a614d4f72e6cd3951e23d47 SHA512 77ec1c6ce8a3ea5812264bf56b6743b111b012deeac271573e863b7ea0236610299348a0ccd90ec04bdfcfe5ed0ceb3a92d2f65308a11f3282510e9fc5242894 WHIRLPOOL 9c3050af981caf6989e56d10fc62a50608b893205e6ec06258154615690f7f9119f3484ffe8f994fba77a4bdb66f9eeef60bc6cc8e56d64671647e3639855287
-EBUILD pecl-mysqlnd_qc-1.0.1.ebuild 497 SHA256 fc3669f5a51cee567455cd25084f8f382baf1a650822d8acc56171ecee7ff5c6 SHA512 7619853a14c9b8c2a725b902152fef148c67d1b4e609968d3b600223a90762a015bd5bcdd8c20ceda8b48d14a5da0ffdd5025074fa67676ce954536697bf339e WHIRLPOOL da1d98c50f43f5b5bf7b233c2f42ad8e6b92d8aeb064904bc319993c4de30f9f129fa57c7507b45ef4f478c726aef9727f599f05a27cf4f4ad8af60e9430d8b7
-MISC ChangeLog 891 SHA256 2f69c3ef5a23c36d25e5757c70967aa73013b0a560b02b993f83676aeaa82e80 SHA512 228a3491aa4b52ff9ad93d40d6baa7e6862fc8dd94b2a43527b285f99549beacebdec78875524b2f809ba31eca0e21b3918d9d3ce64a02606cc193bd5b943fd7 WHIRLPOOL d6ada5b87ccd0040ea528e75197b0bd5561abdb57d4925f74561715b17bc89e5d966f92c11afad2c72161d7515d0bbb401aeab6c8bc2a773bce40d974bb9210c
-MISC metadata.xml 402 SHA256 7ebaff32f99b0719984e12b4494ae6276d75f534614607fb490f9e98fb902957 SHA512 c85403f17066f86bb9057c1793536d7d163db55bb1b021ddec558f100889ec43cacc9c5e5098421bc1d5b71c364e1c15636a699c7ae09e3ac1b8b46461c879fa WHIRLPOOL 80e4a72bd5833a1daf8b8c73d7354c83b7d7b21413904f8a49e7a9228ab7d74e80efe7a1e79aa337613bb21480ff955a128e6bc097d83051fe0417d23339a162
+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 1081 SHA256 dc95c6bc323e20bf66e44ada1aa1fd9b7e1209a1a56222179237b2d76012fd68 SHA512 e41bb892a3fdb7a9a3542f677594fa6e645acfe2b7c40eb8ed5799706a8fec3f1fa2453b00f26a3c4296879a9801f7762069aa372c14b2cf4c1ab588fd14f6f1 WHIRLPOOL de52db3f56cf806a42818e299574310b6575c4b3a48e71c892bd40a5577d52dfd1da81176c52b075dc51ac9bd975295c206ee35af9428dd319e0c14fa8eb82cd
+MISC metadata.xml 592 SHA256 fbfe7c81b6c61fef82536b049f548ce3114f0ee242ee6c36b3421c9c9a1d1fd5 SHA512 04513358b40ced85c6b334b0fb4c4798eb7260c4e7acbb5c566e3b5646a1e2452b1c653e5397f2dee26b460c99c5adb797369d0cfe282eb17bd224cd52a0195e WHIRLPOOL d5ff40629cf30b114e9d5a88d2c33917001d3fd37f843335bfd367b68a68bd01d94a7bfdca44f7687de21cb5c4dc94354f2469e77d71faec0d1bae1e71a68374
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn3gcACgkQcaHudmEf86o1ZgCeJY8DH6HOF8u80mhIpa7h05Uw
-qNcAniXpfc0XONN8iwao1rXhOjopmH4O
-=UOCX
+iQEcBAEBCAAGBQJULMrSAAoJEE4V4vFnx44d2hUIALWpAnNwClcqqr9AiALRU6Sv
+cXti0z7lzh9Ae3RI0oQrwuWKMZYKDXq2l+k7HVo85DB1E1i8juYpZ2JuS+a+PPur
+/qOEM2qVvrYpG8ZwwvRzu++vlml5p9gBazM/Y/MIj9Gtn0hYu/A57GfTyND9S2ZN
+k+8azNb3iFyM1B1ME2yhGcxorqd35MZobZEJSRzX7JtdGEEl6v4qx1PMOo+kKQZL
+xZKemzDpF44rVevFmqXaN3vzmGWLuY00+SFufv3vRyWrUGBISn7pskmqWpdZIoHc
+/xOC05Lugdnk1JqKByQaiq8rFzdeebx7It29e4RvlEnpb0GuSUD+OjRAmOBpveo=
+=P82r
 -----END PGP SIGNATURE-----
diff --git a/dev-php/pecl-mysqlnd_qc/metadata.xml b/dev-php/pecl-mysqlnd_qc/metadata.xml
index 3a3fefff1ee1..ed4ce47b9e83 100644
--- a/dev-php/pecl-mysqlnd_qc/metadata.xml
+++ b/dev-php/pecl-mysqlnd_qc/metadata.xml
@@ -10,4 +10,8 @@
 	  <email>pavel@senbonzakura.eu</email>
     <description>Proxied co-maintainer, CC on all bugs</description>
   </maintainer>
+  <use>
+    <flag name="memcached">Use <pkg>dev-libs/libmemcached</pkg> as a storage handler</flag>
+    <flag name="sqlite">Use <pkg>dev-db/sqlite</pkg> as a storage handler</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.0.1.ebuild b/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.0.1.ebuild
deleted file mode 100644
index 55ec12483ad9..000000000000
--- a/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 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.0.1.ebuild,v 1.4 2014/08/10 21:03:02 slyfox Exp $
-
-EAPI=4
-
-PHP_EXT_NAME="mysqlnd_qc"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A query cache plugin for the mysqlnd library"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/php[mysqlnd]"
-RDEPEND="${DEPEND}"
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
new file mode 100644
index 000000000000..fbdc837e4569
--- /dev/null
+++ b/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 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 $
+
+EAPI=5
+
+PHP_EXT_NAME="mysqlnd_qc"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+# Fails to build with php5-6
+USE_PHP="php5-5 php5-4"
+
+inherit php-ext-pecl-r2 confutils flag-o-matic
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A query cache plugin for the mysqlnd library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="memcached sqlite"
+
+# Specifying targets due to USE flag transition
+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] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# configure does not find pthreads when memcache is enabled
+	use memcached && append-flags -pthread
+	enable_extension_withonly libmemcached-dir memcached 0 "${ROOT}usr"
+	enable_extension_enable mysqlnd_qc_memcache memcached
+	enable_extension_withonly sqlite-dir sqlite 0 "${ROOT}usr"
+	enable_extension_enable mysqlnd_qc_sqlite sqlite
+	php-ext-source-r2_src_configure
+}