Stable for x86, wrt bug #546872

Package-Manager: portage-2.2.14/cvs/Linux x86_64
RepoMan-Options: --include-arches="x86"
Manifest-Sign-Key: 0x7194459F

4 files changed, 25 insertions, 21 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index b13a9ccd8069..f28e69da9d51 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.958 2015/04/19 08:15:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.959 2015/04/19 08:15:51 ago Exp $
+
+  19 Apr 2015; Agostino Sarubbo <ago@gentoo.org> php-5.4.40.ebuild,
+  php-5.5.24.ebuild:
+  Stable for x86, wrt bug #546872
 
   19 Apr 2015; Agostino Sarubbo <ago@gentoo.org> php-5.4.40.ebuild,
   php-5.5.24.ebuild:
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ea1409c2deb6..bf18b77300cb 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -31,29 +31,29 @@ DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
 EBUILD php-5.3.29.ebuild 22291 SHA256 1fb6337d5024e9c61dd80204d06ff1809d07fd0f367a029dcd7ad80b4b26f7be SHA512 41755f9dca90cd467ed878ee700ca18f3085cdfdbd34436939b9a1762c91c9a920a4f82d7efad327946da8212594ae0492fead8c0ea74f8acd57dfe52c821fa5 WHIRLPOOL 2d82f3cb4f74a24008c5be9c5c358c7afb056a506a59de673851ce7f99f3922f2dea49f495f7fbb7aeccac7a4638bf3785b73ab3cb1feca558fcc5638982adbb
 EBUILD php-5.4.39.ebuild 22438 SHA256 644e9e458d2c18fc6d6c3e838826511388e96fa6a489fd3268e09dfa73fb1310 SHA512 30000086b818759f81a1087261f05e22b0ade5456083ed25680b9e9700d0784c2ccd0cfe3f9483375fb575022b7aae57e92107cc39193831bde7a6e8070e7454 WHIRLPOOL 99e8953df7e4b3263688053aaa6c471aa511598909baa53ab3c651e6c8129fc7aa97d3a8f35bc55dfa774e3e91565da8ed7c3c5e2b0c0c84aaccc9587c82829c
-EBUILD php-5.4.40.ebuild 22445 SHA256 65a98c651cae077036c30e849292f0c3f0f1d08550ef87f673de9b41e563a4fe SHA512 343535e621233d8cc35ef650d7a5361d6477c456c3a81a89f574dfafe2bf560f513db8474191c5661f03256b6031189e90284f6a00215f38d28e941920703209 WHIRLPOOL 5e833356edf3919b2982fe506371c052e95da0eb6bcd188cfaca8a810df1e312e99b22e8b2f73a8fb25d042aac33e1d19703e425b60571f89cc7ddeac349235d
+EBUILD php-5.4.40.ebuild 22444 SHA256 0e4acb0076db5c43967b02f9a952ffbffd2a75baeedd8fc464039018a4a3d0da SHA512 644db4b5f732bc7a4bb299ee1aa9e5b1d84589aca403328fa34d0ca8635f5deb3bf4778a5dd89ed883f8368b52d63dcdccec5027d57a936eb78e32765be9f1be WHIRLPOOL a6e0f293f7d5eca8e8a2afc75790375d83f1f84c0d59e5373863c274de902fe1cf92b691737134195a88ba25120ea49e51dfa0300b5038d2d96699269d656053
 EBUILD php-5.5.22.ebuild 22376 SHA256 aecda81421a919401fd48ecb34430cd77a23be28ec2c8fe0918d80019cf70ef6 SHA512 6fd0da51d344b1121de68365cde7b6f8a17c8b76e1de4b0f8c7b6a543f3f0b7b76ca9c1f01aefed570379901df3e89fd17815d86751efa18c637219f31dfd455 WHIRLPOOL 993da1ec75b5acb9426f625690ee0f5661c749d258bca45e59965ae4ef97754b718518127e5e766445a0a5fb6832759a6e29add428f91da42d4173061f93a09e
 EBUILD php-5.5.23.ebuild 22372 SHA256 689cd71d6a48bd2c0fc1640ced3355c6c1d21c6a500b2fa389afe46e859a8168 SHA512 dca8e4d93beecb85a64fa49e64f1435460b40a30468a4a186fe9786a3a934f95a09fb14c83d5010b31d32d8545041015b5e2098d161aef12cc4200816e336a85 WHIRLPOOL 06069fc8027e6621a7623fbed8f3c78df652a61ad2ce91f2c0b6ed8fdb21e63e3eb1348d6d0cd129e16e765c88669e160da6953137fd5e31d56581bb87c8c9c5
-EBUILD php-5.5.24.ebuild 22379 SHA256 d96771e254f8a5103cb54c97038033705ed775212204902780050b579b8af7cb SHA512 0a6540024dd0dcd1d32cd43889480a9f5f3650bb8003c155597eea2548e8589d17a7cdff08c220607dd7f3a065e2e999d6a8aadeaf95a86395e5279edaeb052a WHIRLPOOL 1c09a43455cc9eca76a84e4c32a7e7d41fb5dbb1170f44a322414bf48134a2553e8774838347762d3c30614c2cd2616c48e3e166c08f1804ccb9997c81d71402
+EBUILD php-5.5.24.ebuild 22378 SHA256 153f6b5c309cc97ae4af86580f73b1c8e4f863416f1774e3647ccdab6cfc7a44 SHA512 132de4877705119dcc2ef805a4faefaf353373539d59f3acaeaed9c0a525a4dd0bb0eba443f3ca15de4976c201ce15902ada8ee30203e438e0dcfa64db0681d2 WHIRLPOOL 9e45b9f60179e289e699f334e82e4c2d67be4750acdf12a57ea237f963c1abecb523535956c74656c5d841483a3d0621af33482cb55811155bdfae02fc3f19ab
 EBUILD php-5.6.7.ebuild 22474 SHA256 6ee711652acd5dfa85b32b2d44dad5a42070b1c41a6e93b9c55f876b4aae7f10 SHA512 fc93409f474cf337ea168d18e114a076d6f55037854672fbb757b03e62e271fbb700c49692046f8c95a1571523086fcd0552996b3b8d690f69bc0fce6221fd5f WHIRLPOOL ff7a125ef8f88436b1e2486dbee8d35e3b4e3565aabd287a4e79c03c1d38119927b5692cfd1bd0d83b3009834fcd921765cad46942577e853e37478352010ef4
 EBUILD php-5.6.8.ebuild 22473 SHA256 64cbf2f1b9bea1c8f26bbf63624e65fe29337a2a499953d68dca87640eef6e6b SHA512 4f34a17c80bed5b59b4eaf6d9e9192641307d7b6c497cef73079dba4276e5b9a9bad23ce54113caf38048b2a8ea22d018d34a9b1dc8c2097966e703cbf45b92a WHIRLPOOL 69aa7e72a3e5c6b7682a42c39addd98e07731eb9b76480fbeab095cc1dc4aa973dfed77dc866765e7ded7e2e80827bfb37188dc739fe3e0d2651949df5918e68
-MISC ChangeLog 42426 SHA256 f3ef6a74a1e335e369816fffea2126e7726a79f65125a6deadc0f50445f8869f SHA512 f4aac106860c052d57694a6f9ee10a11625b0353f48e2e6669421cc6b9d5f510baec228c1239ce2a99f06d5c9785aabebae45842964cf0daa452034037842d50 WHIRLPOOL 4f1d6813e46a6f045572006f2eebd88f7b54c3991cc1cd49cdb2a8e48172a68955dfc73672d969d47b334c62be29c165f95473193bd3ab655aeb66eb9188068e
+MISC ChangeLog 42550 SHA256 09e8eedb273dcc0b334b1bd571fb1065dd10967775c7865c91b2ada35c41e347 SHA512 f2c38abb09b408363d0c8f8d5ddef09c4d158c58ab0182fe03ccb7c36a6e96ab143e881670168a23c06e1619de3db943b7bf4a06fd3de1e671b19fb034b779f0 WHIRLPOOL 129d17f7a02afd3d44f0916deb5c5a60ecc90de3e7378cf5290c8a8766afe4d6d5f16ea7ba06d0a744f500a2165597e7f306420daf2eafe75072583e7b681f0a
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
 MISC metadata.xml 1601 SHA256 0f0d69832d7bf8ca13c940247d67e184d866ae48f4f77167b3b6a508f4c0ebfe SHA512 744b80efb645e7c6e632101c98cb7bcaf2a6530d948e5cb320050cfe4ca3733e29b995e2b1e4677b648c7a9e051a8056c6f38ae03ae18656a9583b24c32b6056 WHIRLPOOL 8ba9c5edf403759541ea1aad65138f48ddc4e4bef73c3a43744e1d0513031ab431fe1e742a39125257c3545ae0a091118d1b36d04a28bdf96e9989185764ae50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVM2QmAAoJELp701BxlEWfbiQP/j3EQIXa9LEBD4DzsNllUIFF
-8ei9jgcH1MNlqjKNAUAZvFxFmu/PBzGXhspZEtqiXvDJrrYys6huj7a8x3I5TNCk
-F9imy4M4TytPTHh/G6SDuwHEsZ+0LD3tAZ/4VLMs19k+JqKGSjn8yOmvzfreQijl
-eX1YUfDh9rTJ+XNJpJ499LdsUm9BtfV6KtRQy38QLDqvjkUerbLaEgbpsx51I30W
-qDMkMq7P3suVmI9lDpX/zbqlwO7rRoAvXPgdqlKKctWT8MtVRjBvGgKCG8lkT9SU
-w5lFwNjphghjRgLidZIuiLthDXRaiT2hHwTRYpaHpADuNev2zqqq1vkRh7/QsjZq
-RL7kDg5fPHsVhnF5wD/VC5GTvTVycxkxhI2hbr7dIREVFlp0oW562a28GHRHhqUi
-KlfakksCsmk6OP3vqHq+m/BQaDIeof12Gn0cX29TEoZjZ6TWZDY/AOqFbj/nJRw2
-HaAMuq8xlzm9ryM0JrAtj0Axf2/4aqAadQlV+wrnd2c7HU/zKcOVs92MqNBNj6qH
-ferOIUc8M6ThfaVFEg+ISOrkp3asZwULjm25w+9WxsSNPFXuk/K2/QVGXGXrOU1g
-KcBiB4hioNnfxnHM3rTM2r+tYicVe5053YljCByLSfWZwGGSo8YWMTU7pJrmO5+g
-vC6KcAVAe8rZ8nTKBA9G
-=iEpk
+iQIcBAEBCAAGBQJVM2Q3AAoJELp701BxlEWfStkP/0vUmlZJYqIMP0medjnB9PBD
+Dvt93ekyj7vRjt+xGAKhr5eycHwDWQT9/S1upOAt0gmSpkj5aUVIHPYL7D4LCBfm
+9ChPzqLOq/Gf4YjBRQHOWdFpa7f36r9AKqjCYbjBtlVxfjvGZEmaZm+Q+jD6Er1R
+6Wopz3475PI7VXM50Y75V+AlRhfPg8Gn9ncZj4XqS/StBTNWKblbQYYx719ralyl
+BLCr6lC+MNhGPJPJToJf1mG5ykfnLLlDL/B6pl8nFCSo0BkZoCJXvOoJ6gjQrX4S
+GHY9K23YtFSCFd9VsRKHFLtIvFDquQgl/9sa5wyxWkHHPCq8QMUBs92BB1kt98tf
+fw705D/VQV6MiFZzFXKSG448ndbz+RGbUjfZ9C9ue5aBv+5B9M8xJF0ngYdHofk4
+k60ioryxGRVj6zfCaQFCP6p9pwi7Qv7Q+rFSDavPAluK5c9vTYd578kxUh5UTxgR
+0S0neRU3UXomfhBzSDqrwijBUFQGfSfDNZYrK8Ww9GQmtggKK/w2Ko91eKZIf0t5
+ta+bugGA1HKAuzZ9DfmT6Bbe6E5Jj92IFoXclC2T4ZLwhHC56FhelAnEiji/l6tL
+DZFZG9+9K2EKukvB2HyWOuJG2ddB8vd9o52fjVpBNW3YEHVBEEuXcWf7YNMur000
+L2Qqk6jn7PFMiFq2SX3l
+=mjrG
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.4.40.ebuild b/dev-lang/php/php-5.4.40.ebuild
index 64d214e9b98e..2c1c560cc70b 100644
--- a/dev-lang/php/php-5.4.40.ebuild
+++ b/dev-lang/php/php-5.4.40.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.40.ebuild,v 1.2 2015/04/19 08:15:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.40.ebuild,v 1.3 2015/04/19 08:15:51 ago Exp $
 
 EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/php/php-5.5.24.ebuild b/dev-lang/php/php-5.5.24.ebuild
index 0cd37cd08626..0a70fc87f8df 100644
--- a/dev-lang/php/php-5.5.24.ebuild
+++ b/dev-lang/php/php-5.5.24.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.24.ebuild,v 1.2 2015/04/19 08:15:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.24.ebuild,v 1.3 2015/04/19 08:15:51 ago Exp $
 
 EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use 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 ()
 {