Stable for HPPA (bug #476568).

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
RepoMan-Options: --ignore-arches
Manifest-Sign-Key: 0xA792A613

3 files changed, 12 insertions, 19 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 4f8710fc9552..e94fc5a988b1 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.236 2013/07/22 13:17:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.237 2013/07/22 13:44:08 jer Exp $
+
+  22 Jul 2013; Jeroen Roovers <jer@gentoo.org> apache-2.2.25.ebuild:
+  Stable for HPPA (bug #476568).
 
   22 Jul 2013; Agostino Sarubbo <ago@gentoo.org> apache-2.2.25.ebuild:
   Stable for ppc, wrt bug #476568
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index f5afa1516a80..bc692e47ae6b 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 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
@@ -15,27 +15,17 @@ 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 3259 SHA256 1eb78626aa91e59e88f5ab26b7973d984406d8c769db3bd58c68b084b3173140 SHA512 cb6957393bd299f201f5d1878b6b04570858549a83b946eb984adf5e4b8fd94e9a13121c518db4d0e698f48cb86a1c875903abdf07094bd61088d0924c73c83e WHIRLPOOL abd34265a62cd238f954bb29c4d690686d917288af69fe57c4a9fe2481206bea2e2de580c40f752e47dbddfe1d86b9d603d5c1a0d047fb47df1335ebb3c21f55
+EBUILD apache-2.2.25.ebuild 3259 SHA256 45b985090dfc68fd7f8d715b898c646b42e185c621868c4bb8defd986cb2b825 SHA512 bd1f97039c6192aaa11045e91bdd3a8a15a8ffc559f3a818fa235b0c4b92817fca2a7c904bb43e171e9d7511a8349b27f3025e80e4c2bac7c6a503c293b0c27a WHIRLPOOL dedbb258509e18ded666c5bb405fc8f4af8c92d5d5d2de10c324e32a529ed79446d77557a07dc1b7e4fbfc5e7c0e46791c4eb271e8075ad1485cd629b2c1c2e3
 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.ebuild 7542 SHA256 25a3cdf349400e9345bc0808568310d24ffd92cd3a5f84a17417fc0347789316 SHA512 fbcd2aebb8b22a464e7ed66dfe4dee294d7b53022622df4e6f30346427cc83f72116e3b295a899d852ad399c921ddaf8f7b600deacbfd9889550f976e6e3e366 WHIRLPOOL f1bfa32c781c4164a40eb5d7ebe70f03aa7e71af0726cdddcfebaed2bd3e172cb8f2e0d29fc55946344594c74b9701d4ed8dc580afd03d35bc9b4f7702f27548
-MISC ChangeLog 20192 SHA256 d6f569320570b0dbc99450a4bf3e7ba2f9c8a86c5162a83654cbe94870918dbf SHA512 ad0a6bdba7cdf6fdb254ff881599680296c954ffd84bb2b9bca477622138e62934802a690a6d95533e145d7a50b728f322e9109e6dda0f5f7b5bcfeb11bedb90 WHIRLPOOL c00386d384a873dc6ca09835fafe64ae648734f739b2fe601dd6b6483ec0193edde30420c2c7d17c53252f479af424166bba4b8d347eaf2096a56fb968a588d1
+MISC ChangeLog 20295 SHA256 eb32ad721750dfe2155a9d2e41a21b2b7eb3079feb00fe22ea58095b237ded3f SHA512 0c2fb4990dcf0d5aedf721026c77aefb99df6bccdf5b4934c38048426df3162f0dd37126ff91343f57865c716c4904a56451a0f46dee98db07dcff573a2373f0 WHIRLPOOL 77df968132b401b8e5acfb0804664732fb7c16d88256a020eaf426fef22c81840f019565777063cddce7c67c765206af2bd24e452b329e06596eb37b6a825acb
 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)
 
-iQIcBAEBCgAGBQJR7TDwAAoJELp701BxlEWfLrEQAL0lCWmiX0+nkGZUYnOHFmL9
-2NWaZoYtQ4R3zbEn1bmT1VO/BkSTxMtXdo5eKgod1J0GIYWLjjC1llw7qbSBInAP
-sW3oPVMLBRtMkWxKHdaVnZ0dV5TtuZLF6UPYz6UdUhYc9i54q/ipI56tF73i9r0T
-o+hbPJu2dWqn54aj2Y7Ts8gAiJRtmLhsxcdz4idI99VbnmZwSB5DA5C3v77+Iry6
-B8OrrsUTNv+S/X5YRSH4YwUUy6o7ErpKJGNQ6HQLHRLe0HWrsad6o0uB6T49ZVRR
-T+HFhZSrtCZvBvQSZrCfcBxr+cw9R86WuOUWYMDRBnM3+959RwN7S+3Ll4UrS65z
-kytWJdlAtTZhJ4UH8pB4sjR+UePkj4Ui3bhjndg9jh42B0EhM+2go8zNN5iAm+an
-oohdKAU34IspgBMgCLkkCk/pjF7ankGDRMr6a1rqYTpEvWyRpn6/E1ZTDbi3HWuX
-/E/UMIlWRctFxLO4+2t3+c+GhDj4Wa93pRQK+UirRO9IlT+2FgiYfpDzhmKPzmtN
-IK802JlOdhcQBvhSOvhgWNZTyWnsARgbiEQtQ/aJ39CZgRZMy8XZ22CwRZFoezy7
-AGRfIOD6qN5IeWCurrs4Oy/yFp+HEY/OMzq7LNRKgYOyj/fiZZuy9uohj6S96xll
-4Ev5g21zuaMzJEE0qKdf
-=fzbt
+iEUEAREIAAYFAlHtNzIACgkQVWmRsqeSphOT6QCfdKjUTxayxQV7p2sUxalhrfbP
+kOMAmP0X5QSSZxAxgNc/tXhP5wDlrj4=
+=VE9f
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.25.ebuild b/www-servers/apache/apache-2.2.25.ebuild
index 277692b730f4..59935d97e9c7 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.3 2013/07/22 13:17:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v 1.4 2013/07/22 13:44:08 jer 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}