Revbump old API with new php patches in case anyone still needs them. Drop old revision

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

diff --git a/dev-php/pecl-memcached/ChangeLog b/dev-php/pecl-memcached/ChangeLog
index a5f206e95a9b937a4e10e0f5afd30e3f6be09aef..7cab83d896ca8e8696cd7248eb39ef06a2445eb6 100644 (file)
--- 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/Manifest b/dev-php/pecl-memcached/Manifest
index 548e27cb6d6b4912b6b2933004ee3e1f86a35398..06e5858a66c8de7e9e69e7c419ceb8f5414f5fda 100644 (file)
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -2,30 +2,32 @@
 Hash: SHA256
 
 AUX libmc-1.09-fix.diff 3766 SHA256 1690115c10f6e893ca1ed9ce722794d9f978d575d9393cf3ac182c32f7d62437 SHA512 9bf6855e021d343145992bedacf51a50bfda59b5b58725cad932780b557e1fd614fd5b49caac78dbe40103f821e5d0b5582ac9934c1df130b2e10ccee28c4e7e WHIRLPOOL e671a10d000b2eaccbde66984c383c6aa807137ec183eacc12d4f0bdd682e11f434c08385e7c145c68ab7c84cda6d76550cdd80d11115423be5adbb88552f321
+AUX pecl-memcached-1.0.2-php54_zend.patch 684 SHA256 d6dd51ab2e3911ef81519175f0b0329a531fda73e69701cff6464329153ce651 SHA512 0b4034e5a7549746809488f512dc77d2aece0430be619cf919fc61c41894c1c63d2cfbfd3c1df8cf66c68b287c3d34a3dc2e26e3d98892c15e503fe8c3888422 WHIRLPOOL 54e67279dafa30a5e288b7def74898b7808071931c9ca9368b2cfe6c84384b5bd8d26a0d44c694d79de10de44e8e6c1c8f63e8b573f8ef7358474f1debf1ab7f
 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
 DIST memcached-2.2.0.tgz 70449 SHA256 17b9600f6d4c807f23a3f5c45fcd8775ca2e61d6eda70370af2bef4c6e159f58 SHA512 61207d3f8c11b0620dbcb20fb2ebb6d1fc10159a7e879ee91556a303c3dcdf3d2571e8dda5efcbed77ff779f5c9b226aa48800630b9e7781cd964126b848c356 WHIRLPOOL 1114a4c4371cfb42e3e4cb991980b32894f438abacf61c6da3dd6d9742c93e20df7691287c852c17dfe8261046227d73b1887c0b7b9c03a0e895a713005dc95a
-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-1.0.2-r2.ebuild 971 SHA256 fc865b6f417d6a1ce690534e59b88bf411d307894f262e3f3d0c345e7daaba18 SHA512 6dfe917c1bc9ecd2806a862642147cd228d7ded28c28e4817d4174cbecd73b1157448841bf59710d45e0a1a44ae14f6e8178827eb70af26c0b14d74384d47700 WHIRLPOOL 90bf5ea4256fe4bbca111c5a717b009d8c621d1cacb630299fbab2aef68948a3c24e1efd4d4d028a6a29129132f28c29c8608495f499ea909e44b293a08ddb59
 EBUILD pecl-memcached-2.1.0-r2.ebuild 1031 SHA256 395ece751d3790aaeaf23f749bed49190da9fe8e8100f8546ca2af5e15b490e3 SHA512 2f6a458b827e17313654d91518ed08ee76322124094d3e8d5fb6e2dd8f0c14dc918b40d1ca919a43fccaec5b36cc9008b7c414cd3052f017c69d040fc97eeb49 WHIRLPOOL e54998d313558f7e389aef0b2aa80b52ccdb2eef4c4f893aa6770a23c9000afd440c4b3b4d3520405ff82a6de42b81fda0be4556d8362622bec8396d43b3e509
 EBUILD pecl-memcached-2.1.0-r3.ebuild 1295 SHA256 94ed527126d59f42d1a863d9dd4ff529695066cd5dac8517079bc48b96a3a000 SHA512 74f0f89249c694c0af6763a5a36b31dff325a0bef2b734622fd48b98e478ad636d323edf0092bf8015629da592604ec7f6d1cb4454408d33978228b15d358c75 WHIRLPOOL 4331601f5344743f68618efaf1d53548dc602bb666b9ff7ac804749101d5ce516268d41f935e256e6f7d882f96401bf05c5a295e7274bbee8e418b7ecbbcad89
 EBUILD pecl-memcached-2.2.0.ebuild 1252 SHA256 610ebca050f8e8e727d10426d94187547fc9e762d85818ca6c25bf643a0c217a SHA512 51de4f27d8e1658c128051afeb8c1b203fc2bdd154d15c301177e4a9f1ec3eff7db418148ef4ca32ed2d27514aee48abc528167cbc2dfe94e759a35fab2aa959 WHIRLPOOL 16820a09e8afaee6e733636a5ce1ff8d7230dc439305306cd1159d6fb866c684c3232ff95920fff105bdb8f52c7417f51c0169871a214fae6b93cc895bcba2cb
-MISC ChangeLog 3726 SHA256 2428844aabacb4f6e78d773806761ff126ffe8fdf8a897f44849ee7bbbc1e278 SHA512 26df9198e3698223b120e21f8f3a73533db07f1590781f80721a3e045d5db3a322e6d63473d05051c3a39e93f37804b8e4899c743152cc6dfbeb27e6d3aa40a5 WHIRLPOOL 7382bfdf4257392b0afe93edac16df20bae28d68f200bad824ed4edde09a7f541ef9b51ba42f881e1f47994659b0220383e15cbb212a6e789cae8fc99aa75f6d
+MISC ChangeLog 4062 SHA256 372f70805f29e13c2470a0acea34d87521403f3b2688408374fdf3aee5473dbc SHA512 805a41cd9a3153a97229e87b2bfbb4d2f3620b63d5c8ba86192554a9bbb85b0141552b98130ebb6844a018d5b9bad4c2a5a1c80cf640249d97dd23c69f8c080f WHIRLPOOL 3753facbd3a81404e666a61eb3aa139c1f6a5a5ab1911c63f421439ca00bbd092e2c1d7706d9f81daabb8ad999b173e1be7d021a89d57edebe6cea883a744b6c
 MISC metadata.xml 376 SHA256 ec4d9a01457a45c793d73b90cee8395c992699ca3fbaf9774cc1f34090d9c1e2 SHA512 86c40dea4cd4fbea398d07ccfb529ad0c3c94ab6e835434ddefc06bd3dde28129c1027adf541d3c496f3e5a23ded4bb1741625f90edfa1966789cc29dea9db82 WHIRLPOOL 43bb8090ffe56136f1e03fa71710cdc1fb60d51b0ee1cb8524431200d0c3cc13bb77f4ecf1fa23ee96dd22b93be8506a33943572424209d027eec3f767e283ee
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUzOJjAAoJELp701BxlEWf7MEP/A+Ly+aCmG9sPQLULjyR+YTo
-JJMD8k/7Wz0HO1x3mWsT5hL0Jf41V3YjR+XW+3zW4nCCo7N4D5cTSUxdoq6rqrJJ
-mgTH6TdUu0Sc7rIiWfH68qZqPvfpOCkhIb7TaCsM54ChAwfSZZXLQCXB94P3kgJN
-W5WxYHo4e21mB8494zrVlRwZw+kTvAXqLBdD9IN7vSu7auctIBslQcxe22j34W7Z
-dNYcPVXLodGVxF/cAlWBZHv8qo0wlmJUA/Yr2ONWKM51dIoO29v2grXssMr4MUfC
-QfapLrEVaSB7dR0Kr9NPwcXf8XFb4pNqYh9Gp+jy2gzX9maRfPV3unBij7XFYqXJ
-TyPTSBOwNB/qoH2CnMyl6EUnJ4ILIXtBpV/CvaJGWpZK+yDDoXk2EQ+Uxvg6QWnd
-Is9xxHXxqTOQVqgJJQJDcB6IksTPQEeKQ5YxD1WkKpb1iLjb0KVJCC+b07djF5/y
-sCceKcmoOFot3ElSzfKGS0inVagG/bNbXMS5QcYYGDMA+QKoPLyVGS/J38iYViis
-KYwcGDt4wnV+S2TW1bz20ppx2hANkSayh1XKz3r5GndBRdI9o3V9ts5J8NVCngdt
-GvCzLabmv66d5BJiUOpBrSdEtpIGjVpH/FYnlrDA1Fc9O8PoZhmYlEIFEKJn4SyK
-3GplVn5D0dm1XkS7m9Re
-=p6xY
+iQJ8BAEBCABmBQJU4qLRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2r8MP/0TDGdHDuFFRMdupfu6qW1qf
+FqvybI/uptymqEUf0TKMBD5eoGC63/TBBPnC9ufJGMJio/hr16j/qQcg8wOFQSbV
+/1uLNMkC49/mNrEtv3qgbM59EH38FCYd7B/MDL6UlHE6nnBFAiP0447m3vYhHKeD
+Vc43eJvuEAb79UTLuYbzgX8BYuDBtXmWXQsAVJ09J361kNl1sEeSNfrsbhhrvdOq
+/A8EnQqfNljTxa/fYeFl29E3aLt3LRopJbLGue6vnClKAi2ckD+hUTiA6Of3NEIl
+UO+8g/Pog/ICTGLWihhlWMqlkR//GFwhEPuhlWOIY7wO4QrGe9F1l9dQI8CVhn3u
+TlKeDFklLWvKcVJVvGAv1+eF7L0+S8K68Yp+NYaoSTOj3KSBc1OedKheaN4Yqvy7
+8Fhl2FfVz/skd2+W3QiOD5IfimaKPvWQ8TXFT1YZPelmQHyXR3M7qUSx3SN1iDpx
+Xyr7D5wa3mu1775sjpHsjoW22jG4i6HCp8V+RvYv4GWtcL7xCMxqOVfJ18l8OGtF
+L/zNTmZqVd/hGWo2R5y4TkhQePsxv5bQ029iCiLSK9wEUzspYID+FMutyEdSz7ft
+HQ3UU9X4Ca727n2mUd/LXM7vloaOs6Oj0Jr1L1sqgvpaTXwwcRC/U/WQE2+1ovjx
+qr+oKZVq8zUBoYU5Pd+P
+=GqNJ
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..22d550f
--- /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
similarity index 60%
rename from dev-php/pecl-memcached/pecl-memcached-1.0.2-r1.ebuild
rename to dev-php/pecl-memcached/pecl-memcached-1.0.2-r2.ebuild
index a7ea4264d0bc55ac4a47167b41b1b0927b845fac..af55a0e4eab0560c09683231080dc6613e09b126 100644 (file)
--- 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 (file)
index 4932dbe..0000000
--- 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
-}