Stable for s390, wrt bug #476568

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

3 files changed, 22 insertions, 9 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 451ef6ff99f2..811564b66a8c 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.245 2013/08/04 17:52:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.246 2013/08/06 12:35:51 ago Exp $
+
+  06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> apache-2.2.25.ebuild:
+  Stable for s390, wrt bug #476568
 
   04 Aug 2013; Mike Gilbert <floppym@gentoo.org> files/apache.conf:
   Create /run/apache_ssl_mutex directory via tmpfiles.d, bug 479658.
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index b69cc6eb39ae..d9eb91dd85e9 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 00_systemd.conf 88 SHA256 487e7451ce2d834d8af09a1db09bfe235fbc87b17b13a88bf849f0739b023ce3 SHA512 c510b77450f45d8ca5b8f00ebae5de9e3dc0ecb45f9857e391ac923dadb6b5193b13e9bc372790de20bb8829f2bee5bfc0e85ad03b3a72818c5dd6a0d7f45353 WHIRLPOOL 35ff7234f1ac513a522481ed08d2281dc331835cccd1049dbbadd9f2dff7fce1700a3ae9fd8f2f490f09d82edd960f4a0b4f00a91db2bafb7c647e3b54733cef
 AUX 2.2.22-envvars-std.in 1071 SHA256 1721b424f2335640e49d71e671a4be15424d29fe90f55fe4f52bd241a998d3ee SHA512 c18fd461f02ab79fc456a1ad99bf91c8891ecdabd90f41437ebf87e20b3d28d2006a10d6726164c2f0333e7aee350bd125838abaff3a188d8ab2f5f34d3e5466 WHIRLPOOL 59cbee68fc8012df01229b8d5e38045eb974bab3f08ebf5b01097dabb5275bb83e28cd09a058ce71949ca4a2439811cff457d4c7df88d7b3fc5318c6b7ef0075
@@ -17,19 +17,29 @@ DIST httpd-2.4.4.tar.bz2 4780289 SHA256 92aabddeca76a4ac7330b143df1407bbf35574c7
 DIST httpd-2.4.6.tar.bz2 4949897 SHA256 dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea SHA512 8ade7ec5291f07a60e279f7a73a79c11c150dbf09c9e7b059e136fcb250130aa0f381b118f84e230184b065d452d5e946df8a5766991be8cdc6e8f5d4c4bac01 WHIRLPOOL 81f036bb438afa30106a402e256d641a2687b619ef7f6ea3e4ab61f30715560e1c9dd3afa3e53c4d99c77de72f100e8a1894a5a898247c381100ceb165b8a146
 EBUILD apache-2.2.24-r1.ebuild 3268 SHA256 b3b27b6bba5c1558fd0ce68ee4c70e86f5d901ce683550d72a8d3d465c955a2b SHA512 1118413d380f01f3a3a2351df3218f30a01c3bbc2d472adb0b57b01cffdc69a20d87755cbb253df7ca66f155367fdafa728a642e503de6e9da3a67d88c436eb0 WHIRLPOOL 37283df89b9e555196af0b8cb9a7a71bd8fa988532fae989288f3755a41c35615c86ada39b23627b488774999f3df261842fb45dc5e9cf236c9a40c87ea0e602
 EBUILD apache-2.2.24.ebuild 3098 SHA256 c742f39514dab10ec7732ac351b98fd3a5c4995e68797fa8694bc9460b0cfb21 SHA512 1dfd4da41b5c0e04f476881af504a22b553742b021177855f2d182ec14b73fb4c3ae66e9c1be87fd7a8cf4eaf9c4f4ab06514b10e2e29548bc792e40709ddf75 WHIRLPOOL 8fa3e7067a38e6b13577b801d45c8fd9dd25243730e53cb0dc3e8b9652540bb60ba19b2f5d1782fd100413f700e017ab9aa38c608ff68ee26e16a5821f7422a5
-EBUILD apache-2.2.25.ebuild 3255 SHA256 21e9558462cbb3aefec72f670f2414c52050b9a6a7e1265a011bbbda71432881 SHA512 9f9897996a25c50c52634d3a04c3646b69362626691d43717f228e0acba4d6b96d8b928b80a56257a1b6dd1e7334c7dde2ea7934cd8f8aa8151c31d7c3f2bb25 WHIRLPOOL 3da5398f5e451bfe60dd5757385a913919ab4ab1b17c2d4ff63f6a0db1b1a03b5b797f9e27e6b44ff8089b6306ed139761290d62476187bb0cec75745c891a86
+EBUILD apache-2.2.25.ebuild 3254 SHA256 816a32c3dd366bf8636d9085a35235def85b914686101efab4a4c5dc719e11ea SHA512 4a89b02f6c74fb114da64ca7f60217f5e35a69eb92136394baaf7bd825984789ce3604a7f13953a8de4c1f54a5db2e5f4f1ab98438c9f75cd8355327fe882a9c WHIRLPOOL 26d1522014765b48aac8a6401ce179fbfb7ac9fa4c16a5ffc49351a4f163297feceba56a4234e9d5ae5c839148abdbb0aa841add1fd8b5c1ec90660a48b9dbd7
 EBUILD apache-2.4.4-r3.ebuild 7545 SHA256 e1a2d8b84131cb9086e702a189e2e8438062ae7637a8fededd5e3fb67f422dec SHA512 d4bbf08abf58f279abc9bf4c5c34bf8226b2c6eae2f7b332bfcd4bde4735a4f077484478a894cac343be114cb96d90cfadc54fc935ebcbb0460fb7ec30d814e5 WHIRLPOOL 6c4be7a6060d0df07fa64e4f33830e215970ff95dc9b9fbb56f4b366f72909c22c641b1c783fb2428e7e2650b4201c0252550fea5aa7c98925c7ce6c60651ed1
 EBUILD apache-2.4.4.ebuild 7122 SHA256 484112ce1681f6ea85f2e7f8c8d106a0831da108ad5e3ecebf4adb26d4973965 SHA512 84d10fb9aff453c4b5f71307799c1f1f65775b5aeba22e4f6fe97e144be08ec3c0150c30331277ce60ab279e66edd0f964fbd684257b1e6834f1ba04d205c2af WHIRLPOOL 6b7d067a8a719a961240255e99388089f56d45f951e33c3c802723cc3375ece4b9b1e94386a666adfcd42abd84871297136134eea7a9cf26f6b29babd2fd8fab
 EBUILD apache-2.4.6-r1.ebuild 7428 SHA256 0de9512a37ad49bc6e8dc1be1330122013f3bb7a633381ea727122e739d3b1da SHA512 17bdd612955fdb21ff274ae740afbc70d90f9c370cc77b1f90231da4ab1d60d8c58c371123da45cd64a6827c0bc315732e78a244ace5b53dc79e1f2022981d14 WHIRLPOOL c711849fd0c521f5f2c7aa52c66e22c9b2cb06b2b4303d532f45f79bbae50edad40bc684f8b66dc9f0b6aedb94fe967e227b10ba090e4bd0108a20e65d8435be
 EBUILD apache-2.4.6-r2.ebuild 7430 SHA256 c6eec8a7c1d45c6094a884ed3ca8de808af81403a5be14619c05174e60be903a SHA512 a446c8cf8f2859e4fbd29e1b17424fcde4f56e3c336279e39251e10a24f4f9a7bef0419a9a5cf9cb4b67f5a28f6cd243575b179a4a8c054c1ed85d85b5faac09 WHIRLPOOL 693e3ce747a156cb62ceb211ad9580b08d3b43d2ee63fc623411871ca02240065811332774654eda2d64528b3efa477cea416264891fdf4578fba65fc4861df0
 EBUILD apache-2.4.6.ebuild 7542 SHA256 25a3cdf349400e9345bc0808568310d24ffd92cd3a5f84a17417fc0347789316 SHA512 fbcd2aebb8b22a464e7ed66dfe4dee294d7b53022622df4e6f30346427cc83f72116e3b295a899d852ad399c921ddaf8f7b600deacbfd9889550f976e6e3e366 WHIRLPOOL f1bfa32c781c4164a40eb5d7ebe70f03aa7e71af0726cdddcfebaed2bd3e172cb8f2e0d29fc55946344594c74b9701d4ed8dc580afd03d35bc9b4f7702f27548
-MISC ChangeLog 21358 SHA256 028ec1d73b9928b76f62396ab594081ef71f98a1f920c889f4c2f40bfd446ca5 SHA512 39607cc96a749c20addf294932104940e288114001675efa89ab23a5a4e8354d66b878f3b3dfeda5c851747e66ec250f7dedd629517a4b44ba5af85b4c923de3 WHIRLPOOL 1e5886da8ec51fbd4660bbf289eadc868b165025059aabe94c68b783d47feb9ff36eee77429b8297038954b75cf055af9b171782fedf905684c1f645b4f4e9be
+MISC ChangeLog 21461 SHA256 5d9d06c0d48da8545c314d8b2a58e1be345714936fceb2bbcd2fb88e56be0c1b SHA512 cec3c1bb9dd8cfcfd7554b4289533583667acbd4a2730c2405e68a6dd747e631ae93bb7ae6b91d0b004a09f3a9d172e1704ee205e4243851f4b67d72209577a9 WHIRLPOOL fcbb83a2560f98347713cef3c627a32a61a0e7328cf84e6c536a251413e3655f87e2194677cd4657864c2b34019f3bd3073dccbdb9d455d2cdee49264eb7b31a
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 2492 SHA256 f132bc37567605f338e23ed6ec22c553e1443d2b6cf407ab0bcff359fc9b3f90 SHA512 0582259bc2d615f1f640d375aab4452613a4006dca03c8bcf9757c376599bc2c7789df44003db914e2e3a5cd5a3ce725b0bf76d92488f65c67f4859927c83d11 WHIRLPOOL 6e826e0847788527dc2499e10c8c4ec59b78e2e4859b23127c26f103fc679c1516720be587ee25753c52d04f0544e634f553a769bed2d24db8442d57be22d26f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlH+lOAACgkQC77qH+pIQ6Q7hAEAw5p1MKZAE2Nxo74TP5/SVkHt
-1J0YQ5CCd48vmqQ8yPEBAI6yG84I40p8TrgHANrgKnjIISCbswCYEB6qpXtwHz0k
-=IMwl
+iQIcBAEBCgAGBQJSAOznAAoJELp701BxlEWf5qcP/1+6Fjf3VHXKXsAILVRZ/oWb
+ly84bA3pG2pR5wL6SEC6fTWsY27w6IcWQjo0TaIPE8e7CafNIoRamBEvk1sWuvGZ
+lgRjb1NX0S6rHIXLVplSxdKN2P2cS2NjYZcZNTovimf87FGOEUFsBJHC8CCc/UEt
+HJUDm5+TcRCcLJrUpNkaRxFbSMpOyMxGe8DNgqaNAlFlrZKv4Wm9srLFElPbIp6Q
+65mvT3pu6RxteaynBGbWYByRlSfCjbIYFzrXXDSauroaPX9jh5xh7BgzdOFHaeeA
+BY95am4/tE1+3YKduiYRjNek+1hFtWNMZ9JLqg94nbTGW03GhE8KoZeddNxwntOi
+peQVQbObJ5oF5Sx+yYbWoxcDdIWrq70gLjXNlWByBjLS5NHYeI1yElKcYVN9aCBU
+bStiPVINcewAw8S4VjZspamLBNXlPtLuv52tmrQhUMnulZdCUCgqV1EMoQlBqb13
+LQDpgxsVePBE4G5MOzP+oMTFRPU0JFvugXyV5C4fEH6TkPtOoWoWxKgp3qmy39KJ
+5OCF7Ffy1mpukT1IP36UEEvIvvT/AkSJFuYHCU/RNRe1WiA9j9SDp8RBPtILPE0l
+U+jyv1DgxI3hpthixhNSMogs/5QL0gGXlJR44MLsgWzgNxApg/sXC2Axq9XMvZV1
+XKDuvQDmYgF7LxjVfw/0
+=GQMM
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.25.ebuild b/www-servers/apache/apache-2.2.25.ebuild
index 793e7c3eeddf..0327a37efdda 100644
--- a/www-servers/apache/apache-2.2.25.ebuild
+++ b/www-servers/apache/apache-2.2.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v 1.8 2013/08/04 11:42:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v 1.9 2013/08/06 12:35:51 ago Exp $
 
 EAPI="2"
 
@@ -91,7 +91,7 @@ HOMEPAGE="http://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="${DEPEND}