Update dev-lang/php-5.5.38, dev-lang/php-5.6.24, dev-lang/php-5.6.24-r1

5 files changed, 173 insertions, 5 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3f22c60a..7d1501d3 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -16,6 +16,7 @@ AUX php-fpm_at.service 317 SHA256 6bbbbd7b6501305c17b7290bb2a83b0ebe492d421adaac
 AUX php-libvpx.patch 959 SHA256 5dcb65276d46807817335aac280214e5681e3c7659bed33306f0bef5950a86b9 SHA512 4b16d5045d37e962e709de587f49c8c9320e2166e5245a42d8d005dcbb5f15d88dbac8ddee122694df5ae89209547f0217f5d108b4a9e41bffdb3e59e8f37f1a WHIRLPOOL ac4d3cb8369695dd8324c50fa3b74cd5288219236d4eb1c49db4fd9193a34d8532d1acf87849ce1919ee9cd9c9843a9c2b5d8751ddc9e9324b6f4393aa6c9389
 AUX php5-ldvs 22 SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 SHA512 689a0a12b3527741d2e47870c125e93be73a127e5e798c4b685ccb11653be5a8615faf3178c71a6346fe264d3c4ec76601bc05878fef67b9dbd2e45be59a344d WHIRLPOOL b24f193a1067f699c8efb199ba4e3f1fdd22c13dff98655206b30072ce8c8035fb4ed9288f694856f9978bd9935d3a5589cd968316920e712779c45b44897634
 AUX stricter-libc-client-symlink-check.patch 786 SHA256 bc80d286ce3b2805ce41e46580f24c5ba8f613b670757f81e6b2b638aecbf0df SHA512 db94207a3fd883f78b20fd9261720c39ad097566ae4dd913fe33a12adcedaab943ca0975a4f6a4917d40f6fde61e9b5928378ad91f3afe62d84aba3c9351db03 WHIRLPOOL 1ee44c69658d844614b31d09b8ce945075c9491703c04cb57aceec2469a97db65bf80871e4cf2ba6c9d9fe19a4305906e09d0cc474a635c9a1a6001a4d8c982a
+AUX zend_operators_x32-5.patch 4503 SHA256 e8e8ef9de4c95eee8939d617333b1d65129041081872cc940cc6c8f555f3698d SHA512 d3ee1b069856ab5d91f3ff1d541ee41fd546fee9763534571c8b99ed3b1e96f9580fecd4017632810b65cc4380e712eeb73009e829b6596b7176b11c4d327b55 WHIRLPOOL 237232765485016f9f499e7ba7a3e27ebbcc94635e6ee478d5af850bd03f66433754c2003ff77e2f54d9456d550fac2a0577fe18be95be665097fca6f022cb14
 DIST php-5.3.29.tar.bz2 11396771 SHA256 c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091 SHA512 c22c463df7371bbd97beb258f0a9b9d77ec5c3c733fc565091e2bfcda3da2f1d2ab406047afcc70a6da2331acd2698885328d5a334c9922fa7591852eefda5f7 WHIRLPOOL bb9db8ba267016af18d0d993e764561b11d6fc1302ed139d2b047ec84f139b078faf53d27a7dd394b0972199b3990c34a77ef1e2f7b632ceb5660cb1667bf0ab
 DIST php-5.4.39.tar.bz2 12271717 SHA256 7ceb76538e709c74533210ae41148d5c01c330ac8a73220954bbc4fcae69d77e SHA512 b944517b754fbdfc0b50dd18d2644edc9abe3a66ac9806c748b7b98f5c5c07eeaabdf7990799bb39ebf716b90b4e8b34e5fedb3379c1b05bce5530d3cdf4e42d WHIRLPOOL 28fdea55684c99b53545c83fffa686a76714846d2a0af0fa514f450fdf86faa3541f752113a51189a0ec7786a5d55171eaa7be3a8d0418b60fe920be552fcf22
 DIST php-5.4.40.tar.bz2 12272787 SHA256 4898ffe8ac3ccb2d8cc94f7d76a9ea0414d954f5d4479895ddfccdc2e158a51a SHA512 23fc43a310d8f05078c5a0fdc574a49d7037385f6c6fb154c1cb900d87b9f356d2fe8a708d7f20cb1304c4715f1c5bdd64063049f4d7fe157621e36e83cf7535 WHIRLPOOL b74c868e5991562ff0a019f438bc52d228fb17de95e252a7f1e2c323c0cf21da0be8a72f7f44f18051d7bb295974fc1ee605415658e2d5657eddb1e3726a233d
@@ -81,7 +82,7 @@ EBUILD php-5.5.34.ebuild 22506 SHA256 35d274029cc49bc3668d8d085a3c0a2a49bed5a86d
 EBUILD php-5.5.35.ebuild 22505 SHA256 ed7a5e254d68ea4e63b52fbf24a0e66d031953c5ad6ec0a44424e3af6afbf401 SHA512 6517c5afe3c1f43cc1f268832e60e2f788e0ad840ca65d73be9d50d0f866599141955c66fa3db501aff53162db11ad24020e7acbc63f9fe0dbe118566db87a73 WHIRLPOOL 02083db52eadb569c65d6516d11f8a7db3de836309bf5e4a24318effb2ca05818ad8c66f2ac344b0c73b6c41f821e8629ac33d73780162077f1cbbfb52a73243
 EBUILD php-5.5.36.ebuild 22507 SHA256 e36e8932a48ad233c145924a4014ac08e1e5172bf84abed13b172fffe8eea827 SHA512 5b84a4d4abb1e28201018d7171ce95d31e2e46a6a9fac02558081954af691ba0e25af3a9128b7edd6ae74ebb3379020eb4b8d23060ce886ef0e44f26d001a0ad WHIRLPOOL 66278bee9e100289257f5c5604758882e92219e5fc204bda536130896645c14b80871adb0857a5b8d36169bb52924b040755f54b07362ed2a0f0acc70d45bb3b
 EBUILD php-5.5.37.ebuild 22494 SHA256 00e359d4bb88d97ee1ebfceeb8236d579651e792550d2585f76a07629d7a10de SHA512 cd30e700f4684b957d3b2056a28b66c85935afa67ec7d8f3fa70c6dd92ff6ea2d7f70869e35211c63463c4dd8417bfe5960fdae1ae681c04d67b36407645b7cf WHIRLPOOL 748d52a4bb4cbfbf323e9342aad8db3a57209d76dc32068a22a2dfa96fc1514280c6fd68fceb8423c6b40e8a471cffdcb55381883ab0900f1eb2ae624da14fdf
-EBUILD php-5.5.38.ebuild 22827 SHA256 339ca23202890815856aff971669c81918bff53c3550340499f74d1fbd76760d SHA512 c2b385f40026158f5f55c768d9743a162603deea741f73aa9628de2156e3a10db025f4ec446c8977f2b82ea4e5b9dea1cd4971fc2fea833d7144e6adcf8a89da WHIRLPOOL d145cb5910d2799b5803054a7790f18e3ab8dada586708f6ae53511c71904ef85df8948d5f3b2789c19c6a00b9246da4de03fa06c2a4e1639953180188019ed7
+EBUILD php-5.5.38.ebuild 22877 SHA256 3c168e8e4e0628507a7a0d4e9a120d89c1fb453d190974382f3928d4e046ee05 SHA512 82e8eb66e3a8582bacd2d2c29b566f924af6d7f194daa9a21753644fa4e3ecd4c50c2b86237af2e2941baa255a33157295e2101157f45e7381744e9456615be0 WHIRLPOOL 668412742936104e0e55a1e560e807f0f9bc4d3693b7b2ecda7c6a3209e69619132234d3f1c668e63677cd50cfa40a276334ceb00043095f294e69e30d7f92a0
 EBUILD php-5.6.10.ebuild 22555 SHA256 4bb0d2b4ed1a91392afe94783c342543888076a516a1c8cd482c7e23dcadaf21 SHA512 18b22886c95871c4b09cdf00d8e4f7bedfad6834769d164e4412fb0a4fd8b1b07ece75612984a342ff1b88c037e2ffb6ad1aea51ff91833a59006f0fb1d2dce5 WHIRLPOOL b97808ec0e975c919458a6882f511a768cb38159db5c4e9a63e5834de9fae0fdee1e7fe4ad632e25e1cee4a9f70ffc75e913c4b6a6e11383f56e1caba4af0680
 EBUILD php-5.6.12.ebuild 22555 SHA256 4bb0d2b4ed1a91392afe94783c342543888076a516a1c8cd482c7e23dcadaf21 SHA512 18b22886c95871c4b09cdf00d8e4f7bedfad6834769d164e4412fb0a4fd8b1b07ece75612984a342ff1b88c037e2ffb6ad1aea51ff91833a59006f0fb1d2dce5 WHIRLPOOL b97808ec0e975c919458a6882f511a768cb38159db5c4e9a63e5834de9fae0fdee1e7fe4ad632e25e1cee4a9f70ffc75e913c4b6a6e11383f56e1caba4af0680
 EBUILD php-5.6.13.ebuild 22555 SHA256 4bb0d2b4ed1a91392afe94783c342543888076a516a1c8cd482c7e23dcadaf21 SHA512 18b22886c95871c4b09cdf00d8e4f7bedfad6834769d164e4412fb0a4fd8b1b07ece75612984a342ff1b88c037e2ffb6ad1aea51ff91833a59006f0fb1d2dce5 WHIRLPOOL b97808ec0e975c919458a6882f511a768cb38159db5c4e9a63e5834de9fae0fdee1e7fe4ad632e25e1cee4a9f70ffc75e913c4b6a6e11383f56e1caba4af0680
@@ -93,8 +94,8 @@ EBUILD php-5.6.20.ebuild 23311 SHA256 e907cc21ed26ae0c5a24b98f04a8aa0536d484e023
 EBUILD php-5.6.21.ebuild 23310 SHA256 d36c15d9154b9ceb9b98bf447ae3c496d8560a64dae8b4d0c2e22e2746262133 SHA512 bf81982dd51605613cf0203acc48808b521b33be58f91cba164b7fc5f68cef39de0d470e5a091dcdf8f0b93c1cce9e6e1818b29b68d6e6c94e80fe80db903698 WHIRLPOOL e862022bac306047e8bc3ecce448f19affce790cab90c87ecfec415e026293bd34d6acbecc7cdd0bb5ba7eb78968030736c5e2bc99e31ccd034ee3deec885b23
 EBUILD php-5.6.22.ebuild 23312 SHA256 9e64289ccb64ec63505a96aae07d768e62755f7a6416e9c449d025f2464a8013 SHA512 7144f89e79ab25ac1cdc869596bd828087f81afcfbdffe1ad41dfebab1e3f1ccf8c922385f327056da1db432e3711b33df293696ed2e2af58b842468e82967c3 WHIRLPOOL bb74e1ffece45fcb4d6d06af49d1448c23dc42f044acd0a22badf7ff283ee7c75cc790ef875baba4e411e5a723c7a81fbca0b03964e8f93a152d354cc8c13d62
 EBUILD php-5.6.23.ebuild 23298 SHA256 d38a0e7a2ef000f2dc40cb3c2a74b35cce2b967e7225aea47fbc90fbe09c73e4 SHA512 f48c28ff4827758f11c41119554e1f82440994949c1a5890b6199c987e9696e8cae5424bf1293ad97378400a1eee2e3e530eb9f2baf1727cc9331e563aba4f5e WHIRLPOOL f26de63b9ea7a17658ff1f5c4862876ccc65bc4628ab7018d8052146c923e5bcc3e909b77537062195f100d937e5e5b09b0a0787492e4c9d856ef1ef9c49ea42
-EBUILD php-5.6.24-r1.ebuild 22723 SHA256 e71360bab70bcd3f396150fb64ed06025eb4744e96a9708e98dc001b7b0ed9f7 SHA512 9e476c08bc8b56d807276b4dbc8f9051af4961c49cbfd5af7e01ebdcd725ae7a55db855518e62ffb1507f07c4460bc4035dd26bd8fdc52bdd61c2c4be108f206 WHIRLPOOL a854d067a9db1036017d620c92bddfaf289bc7660a1d0b6ca579e0382ce07e6d6bfc5c9ffaa7795490bd9bef7d123469741436af5e77b0f81bc9682172e7c8e6
-EBUILD php-5.6.24.ebuild 23620 SHA256 7d591ef31042255adf2a7ac9cd1e99fc48f823fb1dc5171d2a60f02a61888f9b SHA512 76b77f10359677c9ce6c0e544bba81dc6b527e56ca2449f3629812c870968b39440995e39386eec2d533751732b59823b5f293fbdea6ad3495ee125e2f57e559 WHIRLPOOL 2ce06a3a6458abd7bcb3d0b9dd937c6c54a60417f94cda74326ef97558526d057fcd9e66cbec64606066c2f8d2ece3400c6bf2bb42e3245154a3f13bff5698d2
+EBUILD php-5.6.24-r1.ebuild 22773 SHA256 686632a9b23e9f2ceb8ac51256274daa73255868da4b173a8f37fb27d07f9561 SHA512 f508f4b80150b5012ff1c6300cefc8ccce36967e49296c5fb0dc59155966089d795d836b8e71331a6767bc80494871a2b8f29da2a4d76d1dc1a610beee8314ed WHIRLPOOL 21c57f9618f4870e39322f048cbb2227e31e5247f90dbcd674f0299d670c35f20a87c5489d7abbe7f8ddc89c41645a83a756c4c64d89f15a4009b6653e19432d
+EBUILD php-5.6.24.ebuild 23669 SHA256 40a7837fa885e5230f9b9cee96ca29a876702d83582a02dad64f04d4a82b0a4a SHA512 f6603edd79ca198cb0a3d70ed54e50b0da92bea1a29daebbf0ccc936abfe7a76526393ecf1f0473f90c636e4fd428f2530acdfcaa9b9ffadcc3555d192cdc88d WHIRLPOOL 273ffdb0c01624550fce38253ea712de747c367419191940514636f4ca5cb447b77f52c0ee1efa90871f53e2455638605bc95b8aeea688defd1b610899bbd991
 EBUILD php-5.6.7.ebuild 22710 SHA256 32e3653a6a74e2b851bcf6efcd5893a02d606a6ca8ecb78632a3d7c669312d5e SHA512 bd2d6cfec081fab72076f748a380878d3e6a68bb2b01b7906efa5452641379fde461ca1c20e89c7fbce7c6917396959904000a876b381c33da432946ec47391c WHIRLPOOL 4bac401420e8334706b12e75d277c619979f478f18b16e25f914ca75641f741d0fad1d4d6608c21ed63a60e64c9b68767ca50568281b776b789ae4a006c0a2a5
 EBUILD php-5.6.8.ebuild 22709 SHA256 52a6a549cb79b023ef24f2e53ff1294f8debe71ee22d6b2fb06f910b10085e8c SHA512 62c1bd79a1e9f79c82fd9c23daffaea38083396f87d9cfe328c2f102eff97d2bc1f1815fad6f3bd63db9c821c20cffa3d82b596de5fdca536b52c23ae580ceaa WHIRLPOOL 50b1cc7ea809204c21076b2b2b14b56fff7603f263f722cde9c9bb8cc37be42ff60825b80d531c2d0caf0ebf7fca8ee62877535cc7502a084479f95423ea5b57
 EBUILD php-5.6.9.ebuild 22644 SHA256 a50db8df7a52afffbd6fbec08bbd608d04f7bcf08955d07a336b7e01ab240345 SHA512 22f9c25000b972f93626479a5e1161eb10e005fb817149bd2ce7f811d5dfbc5c012e64bf5ab1b9259fb2f39038065dfd27134d9435e4c08b56a5da8ce635f2be WHIRLPOOL 77dbdbe633497e78e9cb07932f9b4637ef8969d324190c2d0c6f192efce821cd4f4fbc1698728ddb743053bb8e544d34a8257939d3270f15276193300fc45b94
diff --git a/dev-lang/php/files/zend_operators_x32-5.patch b/dev-lang/php/files/zend_operators_x32-5.patch
new file mode 100644
index 00000000..66bd0ece
--- /dev/null
+++ b/dev-lang/php/files/zend_operators_x32-5.patch
@@ -0,0 +1,161 @@
+--- a/Zend/zend_operators.h	2016-06-22 02:50:40.000000000 +0100
++++ b/Zend/zend_operators.h	2016-07-12 17:02:18.000000000 +0100
+@@ -510,26 +510,26 @@
+ static zend_always_inline int fast_increment_function(zval *op1)
+ {
+ 	if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
+-#if defined(__GNUC__) && defined(__i386__)
+-		__asm__(
++#if defined(__GNUC__) && ( defined(__i386__) || ( defined(__x86_64__) && defined(__ILP32__) ) ) /* i386 or un-optimized x32 */
++    __asm__(
+ 			"incl (%0)\n\t"
+ 			"jno  0f\n\t"
+ 			"movl $0x0, (%0)\n\t"
+ 			"movl $0x41e00000, 0x4(%0)\n\t"
+-			"movb %1, %c2(%0)\n"
++			"movl %1, %c2(%0)\n"
+ 			"0:"
+ 			:
+ 			: "r"(&op1->value),
+ 			  "n"(IS_DOUBLE),
+ 			  "n"(ZVAL_OFFSETOF_TYPE)
+ 			: "cc");
+-#elif defined(__GNUC__) && defined(__x86_64__)
++#elif defined(__GNUC__) && defined(__x86_64__) && defined(__LP64__) /* amd64 */
+ 		__asm__(
+ 			"incq (%0)\n\t"
+ 			"jno  0f\n\t"
+ 			"movl $0x0, (%0)\n\t"
+ 			"movl $0x43e00000, 0x4(%0)\n\t"
+-			"movb %1, %c2(%0)\n"
++			"movl %1, %c2(%0)\n"
+ 			"0:"
+ 			:
+ 			: "r"(&op1->value),
+@@ -553,26 +553,26 @@
+ static zend_always_inline int fast_decrement_function(zval *op1)
+ {
+ 	if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
+-#if defined(__GNUC__) && defined(__i386__)
++#if defined(__GNUC__) && ( defined(__i386__) || ( defined(__x86_64__) && defined(__ILP32__) ) ) /* i386 or un-optimized x32 */
+ 		__asm__(
+ 			"decl (%0)\n\t"
+ 			"jno  0f\n\t"
+ 			"movl $0x00200000, (%0)\n\t"
+ 			"movl $0xc1e00000, 0x4(%0)\n\t"
+-			"movb %1,%c2(%0)\n"
++			"movl %1,%c2(%0)\n"
+ 			"0:"
+ 			:
+ 			: "r"(&op1->value),
+ 			  "n"(IS_DOUBLE),
+ 			  "n"(ZVAL_OFFSETOF_TYPE)
+ 			: "cc");
+-#elif defined(__GNUC__) && defined(__x86_64__)
++#elif defined(__GNUC__) && defined(__x86_64__) && defined(__LP64__) /* amd64 */
+ 		__asm__(
+ 			"decq (%0)\n\t"
+ 			"jno  0f\n\t"
+ 			"movl $0x00000000, (%0)\n\t"
+ 			"movl $0xc3e00000, 0x4(%0)\n\t"
+-			"movb %1,%c2(%0)\n"
++			"movl %1,%c2(%0)\n"
+ 			"0:"
+ 			:
+ 			: "r"(&op1->value),
+@@ -597,19 +597,19 @@
+ {
+ 	if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
+ 		if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
+-#if defined(__GNUC__) && defined(__i386__)
++#if defined(__GNUC__) && ( defined(__i386__) || ( defined(__x86_64__) && defined(__ILP32__) ) ) // i386 or un-optimized x32
+ 		__asm__(
+ 			"movl	(%1), %%eax\n\t"
+ 			"addl   (%2), %%eax\n\t"
+ 			"jo     0f\n\t"     
+ 			"movl   %%eax, (%0)\n\t"
+-			"movb   %3, %c5(%0)\n\t"
++			"movl   %3, %c5(%0)\n\t"
+ 			"jmp    1f\n"
+ 			"0:\n\t"
+ 			"fildl	(%1)\n\t"
+ 			"fildl	(%2)\n\t"
+ 			"faddp	%%st, %%st(1)\n\t"
+-			"movb   %4, %c5(%0)\n\t"
++			"movl   %4, %c5(%0)\n\t"
+ 			"fstpl	(%0)\n"
+ 			"1:"
+ 			: 
+@@ -620,19 +620,19 @@
+ 			  "n"(IS_DOUBLE),
+ 			  "n"(ZVAL_OFFSETOF_TYPE)
+ 			: "eax","cc");
+-#elif defined(__GNUC__) && defined(__x86_64__)
++#elif defined(__GNUC__) && defined(__x86_64__) && defined(__LP64__) /* amd64 */
+ 		__asm__(
+ 			"movq	(%1), %%rax\n\t"
+ 			"addq   (%2), %%rax\n\t"
+ 			"jo     0f\n\t"     
+ 			"movq   %%rax, (%0)\n\t"
+-			"movb   %3, %c5(%0)\n\t"
++			"movl   %3, %c5(%0)\n\t"
+ 			"jmp    1f\n"
+ 			"0:\n\t"
+ 			"fildq	(%1)\n\t"
+ 			"fildq	(%2)\n\t"
+ 			"faddp	%%st, %%st(1)\n\t"
+-			"movb   %4, %c5(%0)\n\t"
++			"movl   %4, %c5(%0)\n\t"
+ 			"fstpl	(%0)\n"
+ 			"1:"
+ 			: 
+@@ -683,13 +683,13 @@
+ {
+ 	if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
+ 		if (EXPECTED(Z_TYPE_P(op2) == IS_LONG)) {
+-#if defined(__GNUC__) && defined(__i386__)
++#if defined(__GNUC__) && ( defined(__i386__) || ( defined(__x86_64__) && defined(__ILP32__) ) ) /* i386 or un-optimized x32 */
+ 		__asm__(
+ 			"movl	(%1), %%eax\n\t"
+ 			"subl   (%2), %%eax\n\t"
+ 			"jo     0f\n\t"     
+ 			"movl   %%eax, (%0)\n\t"
+-			"movb   %3, %c5(%0)\n\t"
++			"movl   %3, %c5(%0)\n\t"
+ 			"jmp    1f\n"
+ 			"0:\n\t"
+ 			"fildl	(%2)\n\t"
+@@ -699,7 +699,7 @@
+ #else
+ 			"fsubp	%%st, %%st(1)\n\t"
+ #endif
+-			"movb   %4, %c5(%0)\n\t"
++			"movl   %4, %c5(%0)\n\t"
+ 			"fstpl	(%0)\n"
+ 			"1:"
+ 			: 
+@@ -710,13 +710,13 @@
+ 			  "n"(IS_DOUBLE),
+ 			  "n"(ZVAL_OFFSETOF_TYPE)
+ 			: "eax","cc");
+-#elif defined(__GNUC__) && defined(__x86_64__)
++#elif defined(__GNUC__) && defined(__x86_64__) && defined(__LP64__) /* amd64 */
+ 		__asm__(
+ 			"movq	(%1), %%rax\n\t"
+ 			"subq   (%2), %%rax\n\t"
+ 			"jo     0f\n\t"     
+ 			"movq   %%rax, (%0)\n\t"
+-			"movb   %3, %c5(%0)\n\t"
++			"movl   %3, %c5(%0)\n\t"
+ 			"jmp    1f\n"
+ 			"0:\n\t"
+ 			"fildq	(%2)\n\t"
+@@ -726,7 +726,7 @@
+ #else
+ 			"fsubp	%%st, %%st(1)\n\t"
+ #endif
+-			"movb   %4, %c5(%0)\n\t"
++			"movl   %4, %c5(%0)\n\t"
+ 			"fstpl	(%0)\n"
+ 			"1:"
+ 			: 
diff --git a/dev-lang/php/php-5.5.38.ebuild b/dev-lang/php/php-5.5.38.ebuild
index 5543ea0f..8ab1657a 100644
--- a/dev-lang/php/php-5.5.38.ebuild
+++ b/dev-lang/php/php-5.5.38.ebuild
@@ -308,6 +308,8 @@ src_prepare() {
 			|| die "Failed to fix heimdal crypt library reference"
 	fi
 
+	epatch "${FILESDIR}"/zend_operators_x32-5.patch
+
 	#Add user patches #357637
 	epatch_user
 
diff --git a/dev-lang/php/php-5.6.24-r1.ebuild b/dev-lang/php/php-5.6.24-r1.ebuild
index 41d6ba7c..b79ed4a1 100644
--- a/dev-lang/php/php-5.6.24-r1.ebuild
+++ b/dev-lang/php/php-5.6.24-r1.ebuild
@@ -253,6 +253,8 @@ src_prepare() {
 			|| die "Failed to fix heimdal crypt library reference"
 	fi
 
+	epatch "${FILESDIR}"/zend_operators_x32-5.patch
+
 	# Add user patches #357637
 	epatch_user
 
diff --git a/dev-lang/php/php-5.6.24.ebuild b/dev-lang/php/php-5.6.24.ebuild
index 3a18bbe5..566342ff 100644
--- a/dev-lang/php/php-5.6.24.ebuild
+++ b/dev-lang/php/php-5.6.24.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 117617f759b08cd46ded654d55988acb26afb3b0 $
+# $Id: 4bc483a0e59b0238dd298aaf55864e9e3a2dc196 $
 
 EAPI=5
 
 inherit eutils autotools flag-o-matic versionator libtool systemd
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
@@ -300,6 +300,8 @@ src_prepare() {
 			|| die "Failed to fix heimdal crypt library reference"
 	fi
 
+	epatch "${FILESDIR}"/zend_operators_x32-5.patch
+
 	# Add user patches #357637
 	epatch_user