Stable for s390, wrt bug #472558

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

3 files changed, 22 insertions, 15 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 95e77e5082c4..06ba2735e6d3 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.741 2013/08/16 11:50:22 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.742 2013/08/16 19:45:16 ago Exp $
+
+  16 Aug 2013; Agostino Sarubbo <ago@gentoo.org> php-5.4.17.ebuild:
+  Stable for s390, wrt bug #472558
 
 *php-5.4.18 (16 Aug 2013)
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 67bfdbd09033..5a686199881a 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 20php5-envd 145 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce WHIRLPOOL b9cfe0e80ba437bbc6008223c268bdafcde306ba8083dce96815804f3e1ec0937706e0db091149785a0076a6c6eaab8f7dff28578b706e84b4bb4e67850a4ecd
 AUX 70_mod_php5.conf-apache2 348 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c SHA512 c74ec09c3c4124a15e14ece4bb769bb889466160cc0878ca3d55d5afc30fd4c05673c40428b75be669f72e82ba29f60ed19767caca77bba8adc12aae1c83f6f3 WHIRLPOOL fd503ec904a3853b90f8f4cc2042cf9014fdb1383a508d22e680559009b5b1e0beb5a09909a393e53868a64712c63e35642915787fa4176af07cb594adedb441
@@ -42,25 +42,29 @@ EBUILD php-5.3.23.ebuild 24632 SHA256 bd66a98f4fdeb0bde9e356bd93ea84c12d6d877680
 EBUILD php-5.3.27.ebuild 21930 SHA256 260cadf6b2f7fd08eccc5f4b256d2ba61588b2c0350bdef12d5d5c73fac11837 SHA512 28dc850134a3257c659afc650d623f33a5e894730a7f1f60f2eade24a8f8ae6b6ef94a8a8f5bb43c3006d067a8f58dec1c29a975e9fe32c7abdf882d5a3a5480 WHIRLPOOL 5910e25da2e2d3bda2b08453346d6aedf4a94995d528b73aee3e2fcd4e88914215fad1f1e177c7b1eae5d5d46e3a39428020c2186f0ed828d5a56172982b96d3
 EBUILD php-5.4.13.ebuild 24072 SHA256 25c72f5e36c54cb64e13c866a9bd9bbe9929365f16af21e4dc2e85c091a45625 SHA512 bb160a674c32497ee94ca7638b79b72d060784dc034a33312e7ceb88e5555f45b80e1262c04e519ab54e6f63f68763bfc94f1beee57f6d8c8f038bd1adc2fc7d WHIRLPOOL 585aa8e33db0b7b9e9dcf81d28945e3228c1fab483581980f50056b65c8351adf6629cef8aa0957b6258c8dc38a8fcd71e0cb3af694cac0e8c1e30eb6a60a313
 EBUILD php-5.4.16.ebuild 22216 SHA256 2e5b44198d4da861b13d943f56b429fa51042ddcfc798efa578f6353daa1447d SHA512 6f09b8c69d6c476c8b812f679742a2f03d0cbb32f667014186e4e3cb16d0828053a0bb4b4632ce47c2fcd6c2d8bd2ba93ba5ed381c2d299df22a1c60887c0e1d WHIRLPOOL 20654035b5b736770925b72583938e1a47a5c573dc420c725ac8f9964dd31d0a4f8696ef72dd1f0bb5da10f19b26c98738ec354c2a92530b883285b52c61da5b
-EBUILD php-5.4.17.ebuild 22211 SHA256 c25031b2acea41f5694eb203b5c3db78438009bb1efe9320a1cc759eebfead9d SHA512 a82858548d870e0c71971bd1df9dfc8e4fb9bb9a3235760dd6e7fc103b8b4bbcfb33b40fac25148fe0eaf691c99fd46d319dd138bdd66481a48dc7ccdd0f3dd4 WHIRLPOOL 0a6b92de35ce30bcd738a0a6bdda927fc291cffbd8e92495d5435e8e93cf19f4b613c7ea00d3919be9de9ddfbc395d48ff911f20e4db43e03c91b7a98aa9f3e8
+EBUILD php-5.4.17.ebuild 22210 SHA256 a1fd708f94c957f42feaf26d472467e0068be9e7dfd74281d1ac22c47deb62a2 SHA512 8c91c4da55b095befa9a086090ccd9f3768e560bb06d38f9c27e38982eb36fba92f5f16820fa6c7fe556b658e8ce97bd9b3f56ba59d4997f3bec030e1220bf8d WHIRLPOOL 54e1c4fc95adf759af4e329231a51e3852ffcd4bc56ba8856628aa73c154f2edace0dc05b5639f9ff183e2edca78d0f1c52e36ef3c16ce114771c16a757ffe54
 EBUILD php-5.4.18.ebuild 22226 SHA256 d0e56fd964cc10180be900206eb741682ad47b3842996ffa4743d4cebbbcf66a SHA512 bf2ae75027d3cef5b0dcb8082e2035e6987321c7b564aca3a11d2c7087620ede81f75ef4e95d69d1f20b827d4bfd7b576852aa0096d08b6e282662b8c6a4237a WHIRLPOOL de41513956d0fa71951a28895c5b24f0b1b876b68e1638e05fd07288993ef9875791f4035e644abad08eb518e7e44b15828c8b04d25e58a9aabb0b2b013277a5
 EBUILD php-5.5.0.ebuild 22009 SHA256 8fe0156dc476297b0669f74dfbf8ec5778c82f9afe0c66795e6ee06ceb3a306a SHA512 7740c523ddbd31835dc269b70c0bc01d239beeb918738b0d62392c9736d38e3a589f2f1c871d19d3bd7310a5a7484bb5c0c26cff363d70cd6c051f61a8814ff2 WHIRLPOOL 139ae4fabf1b883f2f0fd3c7be81c526d063d84f2ff4f2e0859c69edf50e6525fd6406a679487a78004b911aa12b5591cbdd4daa6378755de22a5a08a48a653e
 EBUILD php-5.5.0_rc3.ebuild 22013 SHA256 0963231a429a0135a46b188dbc66a860236f4a44939df5fc097a01572a330739 SHA512 9b47c796b423081283de939e75d76764c628c32321d71d8883a0ca377a2f9b16b233974a6cad06b3268220e6bf98dd5e62964d7f5f20d672690720eae95a6ff2 WHIRLPOOL 3f79f0841b79011ee1c7e396b32ab135c0d608ac0899b5507ea9ce8f35d09b333e3643942e531793d70baf7c14145365b8959a8bf0b58a0fe453fd8121ac98c6
 EBUILD php-5.5.1-r1.ebuild 22173 SHA256 de5903ed5100606da1ed2120a1d2bab92c55a3b2a93bb1e2bd81b1261659ac40 SHA512 021d00598e8f4054a66a3bfd81bc7b9ba780c44d79802083d08b05f72d4a04a921ba3e195fcba31c22bfb8a77c451275b67c7ec092c03f2b7185fb22a92b368d WHIRLPOOL 0a1160044524cbed70af432d92e48a483f5d3cd9374cebefa317aac5711f342938da0ffda934a3289c6e019ac3cb1331083d11bed44af28efae1ba6ee16cc595
 EBUILD php-5.5.1.ebuild 22006 SHA256 e8ca1776b6c09a8352d2e211c682f8f45286a248e1f4c6282db9c59dc6722a5a SHA512 ccf9f9152d5dc8549343037315b9803613ad6c3dd06916cb9552c9d6be3ce82384e1250fe89a9261ba70b9fb7b2fda343c2465ad55e1b01a4311b6ef806f5b4d WHIRLPOOL a079bdf4345e3441fbc33302e8aacbc0f41f41ae2ee76155ace6df7e5540a209b506b1594c8af071db7b59e51770cd1ac68404fdf45dc436c79700189318db01
-MISC ChangeLog 12440 SHA256 ef16a64b31f66a088ba2d28b14b10096eb2d9581b59405acfe8883a335c4f9bc SHA512 ab6a159c721881c42a432abfdcff0e746be5ad203a588f03464399a8d8844b62924f2220fca7b223c41a480a4eec27e8ea2b908a3c94872097fe34de1889eb5d WHIRLPOOL e5b6dee51041efd98a47a070700e13c33b094ce4d33b0fccaa5a7cac0a071ba2defa59a09f3246a84313e3c8e60b16cf2484d5c988fc8882c77a26c3f3c95c29
+MISC ChangeLog 12538 SHA256 024ba80c9c38d3414de3005fd36de4d5d83126caff826c961cbd7257d689f748 SHA512 0e561f0d6c1a7f6b4f9ca5adc098fa06e5c61b47869194182eab89ef0734ac96c0c29dd6d3263802228617b9d35e97bcc897e8fa5aaa8d098a6f4a8b2c4dbf73 WHIRLPOOL b7a360ad5e75b6ed6829a66124814db411c54fd2ac2a7086ed80b50300c24d76db88dfa419c25e51a241ea4e448c030ef849e0433eb1e88a8c8f932dfcd34eaf
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
 MISC metadata.xml 1547 SHA256 2ce287830b8238e330c0585ef3023f86a9e5d46204619c92588244c5d7fa2f77 SHA512 a3a1c2dfddb4d0d92eafa33d74dc0bb90f1a9976e1d2fe0d3717a0d94149d3023dfdc9e68d42d440873561b2e6c34969ae86cec24ac0f0bddcf9ba14103ba450 WHIRLPOOL d9d877b3ae1b304ff89f7b0dd3a1f23d78062280ee935eaaa02c44e8e1dc2fd78bf2c6336cfebb2d9e8dddc03414a7744114ecebee6e364e962c49ff5e2bdf57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQF8BAEBCABmBQJSDhIDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1XTwH/13jdfSjFWlcbbwUzZvi9mwl
-OVv9J+YaAOKA/UM9O7zAplEUQIELcWWJhH+dCEGYQ2GXiJiV+gLla732fM2h4OeV
-qoPh9eesWgNuLL344p/lyEYv3cTnXZ/2x3/6CrKW31jW3dV0yh3vslyaEUGGro88
-jBOEAec1HkH5EvPVTnxcBXnP/saW2cFoqlzFRsKrT84j79trAOzRvLxLFlxIvIxk
-dp1Si5X0mLc6T6M14HQXZSyfx1FM+NjIJq8Kv3poYPAEmXoHph0Q1Q4uHUcBBmcr
-Zd9RAkdWz003rm83ig/favmWwrmG8k0MWQV9hIq6AqFNHDgJjwdfeSRwLnmDrzY=
-=SJLf
+iQIcBAEBCgAGBQJSDoFNAAoJELp701BxlEWfME8P/RqTK6sFeFfEDXZxhkAnW0U+
+gIold7sNbcQVxYaaiOtQU0cL3PvWJfi+pech1XPt/86Nz6R6alUpz9ZEDzY8nlES
+djpnYhqs3iPY8p4cHmmUVYt9ue9b0SjEpnePizVz8Xx9OjTsxj7QsgTbEp0Mobau
+QkAJ8i1CjRSTE+UzapBWLahSrOqndGf8L+6/JZnqr17RvCnQ+/FGJcaAlRLRKwZu
+6b078Mo6Plr0vahKmsnp34eosR3iOTlsp5wEnm2ALa+Bvl58yfqXAX0jMnpO8w4m
+QGmCtZzM0v7cq0hF29fncnrN7yzQYNxjAZR5INjSRTuF+/7tbo2qlUW5GHklxw3x
+OOxXIu07BQYX6tHZGMxZb2vqGRxhzIK8TDManYVUsH3f8iagzTo0x7fsVO0RQzg3
+UFeghPl/RQV8SHXONzyMIx/7Ql7IAioRoruVqqI10mFawFTcwii7f3SESrkdy82a
+Kr9Rviz5JM+VrJ4VXFZJew6EWgVJ+tDZWwOqrLV7CHGiwXJF4NPyowysbUbqKbY0
+WBwTO/Im3aPJXhAdK59D4EO65dParlYbhK0KEAZmAdpbArXcMcPwwIH7XUjTRfpJ
+wp++4cdQm3Nmzn7g9PUTQfwToiuDo38Yimak4eU6HzoXjNJnQAokAAOKH03ETYhs
+WeKrnh67k1dg4S340kAH
+=PmJZ
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.4.17.ebuild b/dev-lang/php/php-5.4.17.ebuild
index ae1dda97c84a..1cc9a29bd684 100644
--- a/dev-lang/php/php-5.4.17.ebuild
+++ b/dev-lang/php/php-5.4.17.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.17.ebuild,v 1.11 2013/07/31 14:29:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.17.ebuild,v 1.12 2013/08/16 19:45:16 ago Exp $
 
 EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
 
-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 ()
 {