4 files changed, 39 insertions, 39 deletions
diff --git a/dev-php/pecl-memcached/ChangeLog b/dev-php/pecl-memcached/ChangeLog
index a5f206e95a9b..7cab83d896ca 100644
--- a/dev-php/pecl-memcached/ChangeLog
+++ b/dev-php/pecl-memcached/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php/pecl-memcached
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/ChangeLog,v 1.17 2015/01/31 14:10:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/ChangeLog,v 1.18 2015/02/17 02:09:16 grknight Exp $
+
+*pecl-memcached-1.0.2-r2 (17 Feb 2015)
+
+  17 Feb 2015; Brian Evans <grknight@gentoo.org>
+  +files/pecl-memcached-1.0.2-php54_zend.patch, +pecl-memcached-1.0.2-r2.ebuild,
+  -pecl-memcached-1.0.2-r1.ebuild, -pecl-memcached-2.1.0-r1.ebuild:
+  Revbump old API with new php patches in case anyone still needs them. Drop old
+  revision
 
   31 Jan 2015; Agostino Sarubbo <ago@gentoo.org> pecl-memcached-2.1.0-r3.ebuild:
   Stable for amd64, wrt bug #502770
diff --git a/dev-php/pecl-memcached/files/pecl-memcached-1.0.2-php54_zend.patch b/dev-php/pecl-memcached/files/pecl-memcached-1.0.2-php54_zend.patch
new file mode 100644
index 000000000000..22d550f29972
--- /dev/null
+++ b/dev-php/pecl-memcached/files/pecl-memcached-1.0.2-php54_zend.patch
@@ -0,0 +1,15 @@
+--- 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);
diff --git a/dev-php/pecl-memcached/pecl-memcached-1.0.2-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-1.0.2-r2.ebuild
index a7ea4264d0bc..af55a0e4eab0 100644
--- a/dev-php/pecl-memcached/pecl-memcached-1.0.2-r1.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-1.0.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 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-memcached/pecl-memcached-1.0.2-r1.ebuild,v 1.3 2013/03/05 09:42:16 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/pecl-memcached-1.0.2-r2.ebuild,v 1.1 2015/02/17 02:09:16 grknight Exp $
 
 EAPI="5"
 PHP_EXT_NAME="memcached"
@@ -8,9 +8,11 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS="README"
 
+USE_PHP="php5-5 php5-4"
+
 inherit php-ext-pecl-r2
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
 LICENSE="PHP-3"
@@ -18,9 +20,18 @@ SLOT="0"
 IUSE="+session"
 
 DEPEND=">=dev-libs/libmemcached-0.38 sys-libs/zlib
-		dev-lang/php[session?]"
+		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
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.1.0-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.1.0-r1.ebuild
deleted file mode 100644
index 4932dbe16f60..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/09/05 11:27:22 olemarkus Exp $
-
-EAPI="4"
-PHP_EXT_NAME="memcached"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-USE_PHP="php5-3 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 igbinary"
-
-DEPEND=">=dev-libs/libmemcached-1.0 sys-libs/zlib
-		dev-lang/php[session?]
-		igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-3?] )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	my_conf="--enable-memcached
-		--with-zlib-dir=/usr
-		$(use_enable session memcached-session)
-		$(use_enable igbinary memcached-igbinary)"
-
-	php-ext-source-r2_src_configure
-}