Fix to compile with newer libmemcached per patch by Allen Parker <infowolfe@gmail.com>

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 131 insertions, 22 deletions

diff --git a/dev-php/pecl-memcached/ChangeLog b/dev-php/pecl-memcached/ChangeLog
index 9c0370485e2e..7ba4794006a9 100644
--- a/dev-php/pecl-memcached/ChangeLog
+++ b/dev-php/pecl-memcached/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/pecl-memcached
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/ChangeLog,v 1.13 2013/08/13 21:55:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/ChangeLog,v 1.14 2013/12/16 08:12:13 robbat2 Exp $
+
+*pecl-memcached-2.1.0-r3 (16 Dec 2013)
+
+  16 Dec 2013; Robin H. Johnson <robbat2@gentoo.org> +files/libmc-1.09-fix.diff,
+  +pecl-memcached-2.1.0-r3.ebuild:
+  Fix to compile with newer libmemcached per patch by Allen Parker
+  <infowolfe@gmail.com>
 
   13 Aug 2013; Agostino Sarubbo <ago@gentoo.org> pecl-memcached-2.1.0-r2.ebuild:
   Stable for x86, wrt bug #480460
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 95101ed2bddd..2ea2dc9e274d 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX libmc-1.09-fix.diff 3766 SHA256 1690115c10f6e893ca1ed9ce722794d9f978d575d9393cf3ac182c32f7d62437 SHA512 9bf6855e021d343145992bedacf51a50bfda59b5b58725cad932780b557e1fd614fd5b49caac78dbe40103f821e5d0b5582ac9934c1df130b2e10ccee28c4e7e WHIRLPOOL e671a10d000b2eaccbde66984c383c6aa807137ec183eacc12d4f0bdd682e11f434c08385e7c145c68ab7c84cda6d76550cdd80d11115423be5adbb88552f321
 DIST memcached-1.0.2.tgz 22724 SHA256 16de77317e43b0a5bfd802c0bd2ef575adbad2093e8632d58738974e6cb14129 SHA512 02ccd76a540b86fbd392fcdb0bb632fa3d715b702ee90a10bd7a0330d9b181c7c4f1420bc60ffbcd1e0315fd602382a93b0d50aa8c7d1d9b9152868b60f595b3 WHIRLPOOL 674b1e9437b4cccce48810db5cb71961d88716c25e66b83e06307e718265a8de4053e3b260aa78f64a91c9f17779448f372217a85a4245c249957fbfcc32bec5
 DIST memcached-2.1.0.tgz 39095 SHA256 bc4940015be74f47908d410d7b55e10a3d5bf65674036d944c73558227fcc4af SHA512 47695ee2ba90861810b0b7dda06ea0b72931b1e0be28c99535a98d4644500cdd7719bc98ff0500b798af46f6fa78336084c61e24fef5235891937b679cfd58d6 WHIRLPOOL 3ae08a948c7ecf03d8c1fd71bcc9899eac46a89f633d74c78a5e8cddde0c923a54b035f1c99e0d08e49b7adb77dad7139adf61d6ccb8e6acfddd989e04809319
 EBUILD pecl-memcached-1.0.2-r1.ebuild 746 SHA256 53f250f84ef1ba4439a2982c79fa6e9baa3deab86f145865179a1cec66d24da4 SHA512 155b6f88314a3e082a5879e69678442b79b8902220b494a671aa05d5bae7a89249aa2fbd0832a5ea2ce9183e30ab5aedbf845d81482095f3621831344317a16b WHIRLPOOL 2661110b1df6b9e9a1236afce2f3578a7ed725d1e51d000e088bff1cccbe05f1975127c4a72216def55b828a1467d08350482ab3c07e5d5e9fddfd86b9316af7
 EBUILD pecl-memcached-2.1.0-r1.ebuild 900 SHA256 d899df7e4bdf7da23b5dcb197a883a849e2eccc056998110c0151eda5fa0609a SHA512 deb404be0f035c987cb9058528d8353231f88197d0ae40aaf7669e6bb5cea738971b064cf1aea59ea5045d3d81b3f36bc08ad212899d2c4c05cf0f67acba9365 WHIRLPOOL e0196e00d54c6aaa58f03a6827b81383f09b791fd0ba9b73a5fb9c9b72d98dc1551e3024a04e21da8c015bdecb9674b761aa89b32ca4d3c4fd76ecf4da9dd324
 EBUILD pecl-memcached-2.1.0-r2.ebuild 1031 SHA256 395ece751d3790aaeaf23f749bed49190da9fe8e8100f8546ca2af5e15b490e3 SHA512 2f6a458b827e17313654d91518ed08ee76322124094d3e8d5fb6e2dd8f0c14dc918b40d1ca919a43fccaec5b36cc9008b7c414cd3052f017c69d040fc97eeb49 WHIRLPOOL e54998d313558f7e389aef0b2aa80b52ccdb2eef4c4f893aa6770a23c9000afd440c4b3b4d3520405ff82a6de42b81fda0be4556d8362622bec8396d43b3e509
-MISC ChangeLog 3100 SHA256 a564e804ad8d0b982e314cf6ec22fccea5c6b8fbf3446c368f5a37e7a841219a SHA512 f15ebf22d4b362648acd07951c33b95edb0e9e27a10c2cc7c8eac36eb243df9fba9dfc6c53876ea197e7cc7acd9be341c429fd60be145c6f4c3b6ba8a93e5d7c WHIRLPOOL ee6c766dcbf288e631e1fcee3bfefd30a410a63181a38e11d9d2b2b2ef7729d8aa443ec077be58195ab7bb348274945d70a43e158dc2821c62f77d44732ad99a
+EBUILD pecl-memcached-2.1.0-r3.ebuild 1300 SHA256 b5b62b0ea0033ec83e68ac4ea932e69cfbc91e89a9e47482e3e53a151fb10e9f SHA512 c8e9d619a89cf5a66f4eb8025460080a9fe09087cf60e7f2c5b176826a53a21c4a0b67ec163596a2d215e77477b96e1ec4dc8012c8f90720b81efab694894518 WHIRLPOOL 585ff5001505dd23df86788398cde44cf1c9dbad4af16c3e16d7021928fdbc7542a7ae56655da9a1b1461f7dd66a1ef3fd4e12ce095665240cefc6471d75c972
+MISC ChangeLog 3352 SHA256 9039689483f5e6b9d620d05ef5b5799ee7c5858be208796bec37c568196a0503 SHA512 d9238becd6d5a15f55407f8224284ad02485bce266117d84c10746089edc5f3a95128837fc39b7cff76e717f291f58df40fc3d3dc84bc59fe9316de89770ec29 WHIRLPOOL 0b3e974728d3aa1b880ca21e92a39568c751cd10fe9ff70982c0414a07fecc5d699719f6392c19b80da0eb5e74bd14f969285dbddb01f622c3d65a10dbfc06d3
 MISC metadata.xml 376 SHA256 ec4d9a01457a45c793d73b90cee8395c992699ca3fbaf9774cc1f34090d9c1e2 SHA512 86c40dea4cd4fbea398d07ccfb529ad0c3c94ab6e835434ddefc06bd3dde28129c1027adf541d3c496f3e5a23ded4bb1741625f90edfa1966789cc29dea9db82 WHIRLPOOL 43bb8090ffe56136f1e03fa71710cdc1fb60d51b0ee1cb8524431200d0c3cc13bb77f4ecf1fa23ee96dd22b93be8506a33943572424209d027eec3f767e283ee
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSCqtvAAoJELp701BxlEWf+DQP/R67RVDK7VNmdDNygxsoXlwS
-IOjmC5W0KY7DsoQtNhJFgU1+YsOPl9UqwajLjcOmxaupLt6JzZ8G1itSWGrLlvvt
-BoB3syyPa9BQVZ5E4uhvkzALFQzpOE08TkWzOh0AmGUtW7/DaHlJaExJTuyC9Ilh
-404GQgYxQkX4KBkUkEqVQKLD6N/nZr+h5+vKFkEhq+QnjYIb0VzBigS7gWF8GSad
-M9DARiouspHayYorowpsGJpdz/T9N3wrNjTV7yq6ocYj5hQwb2pi/8iLys3CApoP
-Val/6JRdWskC6AhlWNpOCCbyVjY5zyXIAq2jy9RkuJED3+6gO259rel6GTcHNqo2
-w7wengmCPs2s8wKq5KSSgbKEUbigwF5JeWKEEGUyE+x1bGGu6fIBGXWZ/3H43xBw
-X8Bczwowl/BAW82kk1gbR+fyRauOTFMbtsl7HBohDtP2QadYWu0+gsEcyBlF7Xt0
-NV1OTC4dveLg7Lq1N6oGWai2dtdeyl0zw+EnfHQ6BYM3ZwErxR43q3QcJbLBPMbK
-CHDhaX9bn54OYWWn78aypgw906aGk+Vj1d3qD30d/WegfGqGTyjlnrWTsn5JSReK
-dwgbJJzh73oBHR1Q6NXokJgS/EysTjea1pVnKzc5PGvz3HKWoAr+2khCLWd2skLH
-Z4NHGPFr+ou8kkdfkwm3
-=Vzrk
------END PGP SIGNATURE-----
diff --git a/dev-php/pecl-memcached/files/libmc-1.09-fix.diff b/dev-php/pecl-memcached/files/libmc-1.09-fix.diff
new file mode 100644
index 000000000000..1b014dfd6422
--- /dev/null
+++ b/dev-php/pecl-memcached/files/libmc-1.09-fix.diff
@@ -0,0 +1,71 @@
+This patch is fixes to compile with newer versions of libmemcached ported from the fork at:
+https://github.com/paravoid/php-memcached/commit/37069e18ad399a8cc03d5fe9757e1481814ecb44
+
+X-Ported-By: Allen Parker <infowolfe@gmail.com>
+Signed-off-by: Allen Parker <infowolfe@gmail.com>
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nurw memcached-2.1.0/php_memcached.c memcached-2.1.0-fixed/php_memcached.c
+--- memcached-2.1.0-broken/php_memcached.c	2012-08-07 05:02:46.000000000 +0000
++++ memcached-2.1.0/php_memcached.c	2013-12-16 06:14:17.420837278 +0000
+@@ -315,9 +315,15 @@
+ static void php_memc_getDelayed_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key);
+ static memcached_return php_memc_do_cache_callback(zval *memc_obj, zend_fcall_info *fci, zend_fcall_info_cache *fcc, char *key, size_t key_len, zval *value TSRMLS_DC);
+ static int php_memc_do_result_callback(zval *memc_obj, zend_fcall_info *fci, zend_fcall_info_cache *fcc, memcached_result_st *result TSRMLS_DC);
++#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++static memcached_return php_memc_do_serverlist_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context);
++static memcached_return php_memc_do_stats_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context);
++static memcached_return php_memc_do_version_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context);
++#else
+ static memcached_return php_memc_do_serverlist_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context);
+ static memcached_return php_memc_do_stats_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context);
+ static memcached_return php_memc_do_version_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context);
++#endif
+ static void php_memc_destroy(struct memc_obj *m_obj, zend_bool persistent TSRMLS_DC);
+ 
+ /****************************************
+@@ -1855,7 +1861,7 @@
+ 	zval **z_host, **z_port, **z_weight = NULL;
+ 	uint32_t weight = 0;
+ 	int   entry_size, i = 0;
+-	memcached_server_st *list = NULL;
++	memcached_server_list_st list = NULL;
+ 	memcached_return status;
+ 	MEMC_METHOD_INIT_VARS;
+ 
+@@ -2573,7 +2579,11 @@
+ /* }}} */
+ 
+ /* {{{ internal API functions */
++#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++static memcached_return php_memc_do_serverlist_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context)
++#else
+ static memcached_return php_memc_do_serverlist_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context)
++#endif
+ {
+ 	struct callbackContext* context = (struct callbackContext*) in_context;
+ 	zval *array;
+@@ -2590,7 +2600,11 @@
+ 	return MEMCACHED_SUCCESS;
+ }
+ 
++#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++static memcached_return php_memc_do_stats_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context)
++#else
+ static memcached_return php_memc_do_stats_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context)
++#endif
+ {
+ 	char *hostport = NULL;
+ 	int hostport_len;
+@@ -2634,7 +2648,11 @@
+ 	return MEMCACHED_SUCCESS;
+ }
+ 
++#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++static memcached_return php_memc_do_version_callback(const memcached_st *ptr, const memcached_instance_st *instance, void *in_context)
++#else
+ static memcached_return php_memc_do_version_callback(const memcached_st *ptr, memcached_server_instance_st instance, void *in_context)
++#endif
+ {
+ 	char *hostport = NULL;
+ 	char version[16];
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.1.0-r3.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.1.0-r3.ebuild
new file mode 100644
index 000000000000..930d02c6e075
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-2.1.0-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/pecl-memcached-2.1.0-r3.ebuild,v 1.1 2013/12/16 08:12:13 robbat2 Exp $
+
+EAPI="4"
+PHP_EXT_NAME="memcached"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README"
+
+USE_PHP="php5-5 php5-3 php5-4"
+
+inherit base php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="+session igbinary json sasl"
+
+DEPEND="|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] )
+		sys-libs/zlib
+		dev-lang/php[session?,json?]
+		igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?,php_targets_php5-3?] )"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/libmc-1.09-fix.diff" )
+
+src_prepare() {
+	local slot orig_s="${S}"
+	for slot in $(php_get_slots); do
+		export S="${WORKDIR}/${slot}"
+		cd "${S}"
+		base_src_prepare
+	done
+	export S="${orig_s}"
+	cd "${S}"
+	php-ext-source-r2_src_prepare
+}
+
+src_configure() {
+	my_conf="--enable-memcached
+		$(use_enable session memcached-session)
+		$(use_enable sasl memcached-sasl)
+		$(use_enable json memcached-json)
+		$(use_enable igbinary memcached-igbinary)"
+
+	php-ext-source-r2_src_configure
+}