+++ /dev/null
-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];
+++ /dev/null
---- a/php_memcached.c 1970-01-01 04:13:08.000000000 -0500
-+++ b/php_memcached.c 2015-02-16 20:46:34.849201777 -0500
-@@ -1862,8 +1862,11 @@
-
- i_obj = ecalloc(1, sizeof(*i_obj));
- zend_object_std_init( &i_obj->zo, ce TSRMLS_CC );
-+#if PHP_VERSION_ID < 50399
- zend_hash_copy(i_obj->zo.properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
--
-+#else
-+ object_properties_init((zend_object*) &(i_obj->zo), ce);
-+#endif
- i_obj->compression = 1;
-
- retval.handle = zend_objects_store_put(i_obj, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t)php_memc_free_storage, NULL TSRMLS_CC);
+++ /dev/null
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PHP_EXT_NAME="memcached"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="+session"
-
-DEPEND=">=dev-libs/libmemcached-0.38 sys-libs/zlib
- dev-lang/php:*[session?]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- local slot orig_s="${PHP_EXT_S}"
- for slot in $(php_get_slots); do
- php_init_slot_env ${slot}
- epatch "${FILESDIR}/${P}-php54_zend.patch"
- done
- php-ext-source-r2_src_prepare
-}
-
-src_configure() {
- my_conf="--enable-memcached
- --with-zlib-dir=/usr
- $(use_enable session memcached-session)"
- php-ext-source-r2_src_configure
-}