[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-mysqlnd_qc/files/, dev-php/pecl-mysqlnd_qc/

[Brian Evans]

commit:     d01821ddf4cddf03c9f752cf668c23b7a9f535a4
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 20:57:49 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 20:57:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d01821dd

dev-php/pecl-mysqlnd_qc: Revbump with patch to build with php 5.6

Package-Manager: portage-2.3.0

 .../files/pecl-mysqlnd_qc-1.2.0-php56.patch        | 48 +++++++++++++++++++
 .../pecl-mysqlnd_qc-1.2.0-r1.ebuild                | 55 ++++++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/dev-php/pecl-mysqlnd_qc/files/pecl-mysqlnd_qc-1.2.0-php56.patch b/dev-php/pecl-mysqlnd_qc/files/pecl-mysqlnd_qc-1.2.0-php56.patch
new file mode 100644
index 0000000..6f3b241
--- /dev/null
+++ b/dev-php/pecl-mysqlnd_qc/files/pecl-mysqlnd_qc-1.2.0-php56.patch
@@ -0,0 +1,48 @@
+--- a/mysqlnd_qc.c	2013/09/17 08:28:58	331414
++++ b/mysqlnd_qc.c	2014/03/22 08:20:55	333056
+@@ -613,7 +613,11 @@
+ 
+ /* {{{ MYSQLND_METHOD(mysqlnd_qc, store_result) */
+ static MYSQLND_RES *
++#if PHP_VERSION_ID < 50600
+ MYSQLND_METHOD(mysqlnd_qc, store_result)(MYSQLND_CONN_DATA * const conn TSRMLS_DC)
++#else
++MYSQLND_METHOD(mysqlnd_qc, store_result)(MYSQLND_CONN_DATA * const conn, const unsigned int flags TSRMLS_DC)
++#endif
+ {
+ 	MYSQLND_RES * result;
+ 	uint64_t store_time;
+@@ -621,7 +625,11 @@
+ 	DBG_ENTER("mysqlnd_qc::store_result");
+ 
+ 	STATS_TIME_SET(store_time);
++#if PHP_VERSION_ID < 50600
+ 		result = QC_CALL_ORIGINAL_CONN_DATA_METHOD(store_result)(conn TSRMLS_CC);
++#else
++		result = QC_CALL_ORIGINAL_CONN_DATA_METHOD(store_result)(conn, flags TSRMLS_CC);
++#endif
+ 	STATS_TIME_DIFF(store_time);
+ 	MYSQLND_QC_INC_STATISTIC_W_VALUE(QC_STAT_QUERY_AGGR_STORE_TIME_TOTAL, (uint64_t)store_time);
+ 
+@@ -777,13 +785,21 @@
+ 
+ /* {{{ MYSQLND_METHOD(mysqlnd_qc, use_result) */
+ static MYSQLND_RES *
++#if PHP_VERSION_ID < 50600
+ MYSQLND_METHOD(mysqlnd_qc, use_result)(MYSQLND_CONN_DATA * const conn TSRMLS_DC)
++#else
++MYSQLND_METHOD(mysqlnd_qc, use_result)(MYSQLND_CONN_DATA * const conn, const unsigned int flags TSRMLS_DC)
++#endif
+ {
+ 	MYSQLND_RES * ret;
+ 	DBG_ENTER("mysqlnd_qc::use_result");
+ 	MYSQLND_QC_INC_STATISTIC_W_VALUE2(QC_STAT_MISS, 1, QC_STAT_QUERY_UNCACHED_USE_RESULT, 1);
+ 
++#if PHP_VERSION_ID < 50600
+ 	ret = QC_CALL_ORIGINAL_CONN_DATA_METHOD(use_result)(conn TSRMLS_CC);
++#else
++	ret = QC_CALL_ORIGINAL_CONN_DATA_METHOD(use_result)(conn, flags TSRMLS_CC);
++#endif
+ 	if (ret) {
+ 		QC_DECLARE_AND_LOAD_CONN_DATA(conn_data_pp, conn);
+ 

diff --git a/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0-r1.ebuild b/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0-r1.ebuild
new file mode 100644
index 0000000..f729106
--- /dev/null
+++ b/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PHP_EXT_NAME="mysqlnd_qc"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-5 php5-6"
+
+inherit php-ext-pecl-r3 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-5? ( || (
+				 dev-lang/php:5.5[-libmysqlclient,mysql]
+				 dev-lang/php:5.5[-libmysqlclient,mysqli]
+				)
+			    )
+	php_targets_php5-6? ( || (
+				 dev-lang/php:5.6[-libmysqlclient,mysql]
+				 dev-lang/php:5.6[-libmysqlclient,mysqli]
+				)
+			    )
+"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-php56.patch" )
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=()
+	if use memcached ; then
+		# configure does not find pthreads when memcache is enabled
+		append-flags -pthread
+		PHP_EXT_ECONF_ARGS+=( --enable-mysqlnd_qc_memcache --with-libmemcached-dir="${ROOT}usr" )
+	else
+		PHP_EXT_ECONF_ARGS+=( --disable-mysqlnd_qc_memcache )
+	fi
+	if use sqlite ; then
+		PHP_EXT_ECONF_ARGS+=( --enable-mysqlnd_qc_sqlite --with-sqlite-dir="${ROOT}usr" )
+	else
+		PHP_EXT_ECONF_ARGS+=( --disable-mysqlnd_qc_sqlite )
+	fi
+	php-ext-source-r3_src_configure
+}