Stable for amd64, wrt bug #476568

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

3 files changed, 28 insertions, 5 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 217e84d72fe8..7011ec4e8bcd 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.234 2013/07/22 03:57:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.235 2013/07/22 13:16:56 ago Exp $
+
+  22 Jul 2013; Agostino Sarubbo <ago@gentoo.org> apache-2.2.25.ebuild:
+  Stable for amd64, wrt bug #476568
 
 *apache-2.4.6 (22 Jul 2013)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 39162db2d925..6cafedb15129 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 AUX apache.conf 32 SHA256 dea0d272faab1be2f608334b76d327a4c90c69f4c9171df53b73fdcfbea4cfdb SHA512 ca37332f07590114256fb3eefc286a3da5ed41328ecef7e921b6b8c8f515549590fdfd2bc45d72bc3136ac04b399e4290ca30e79a647799afb15c01c70e4dc88 WHIRLPOOL e4715824f12bc464670a8607cb03b8a664da3fa0111d615b0957887c7b6543d73573a1c357e63fc75fcdbc5573a2be93dc91aa41fef6ce8d61dad963d73d3e0c
@@ -12,10 +15,27 @@ 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 3272 SHA256 a3ace4823de0ab1b2902aed052037c1349241d112491acace44e3752347b1078 SHA512 1d64ff53df3c680ae280b467eb02f140e61aa045652e9d173cfb01a518a85cc6dbc0944b42ecdbd4dc867d8e62d2fbbb2d0577c3a23ea4a7f134df72fddbb009 WHIRLPOOL 4ee816f850834b3490ad5938451c1e62a8aa5ebd7de2d5772b59f5c27be962a2e7e0e55d60d835f048716c6cfb2a7874af49f067b0d02ed2c229b6f58c5cec38
+EBUILD apache-2.2.25.ebuild 3262 SHA256 ca1635f5296b82a9065ee7fa93565a5a648eba3a8c68dc023a0299646ea0836a SHA512 bc7e9e921516b2135e89a3b1157c7d1f3549c6a5399bc75e31b4d7b4a7709f45131c09bbf3887fac5176ce1fcc37f5605704d641a9b57f703389017d4be2aa36 WHIRLPOOL 4f4e0ec256c8c1c7da96cc646f46900fb44812d9f2dff97a976c67207f7d7be57d224636f0a6e91b520863831bf44c178685889db038e2e2b547f21de6acde4b
 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 19982 SHA256 6e3bd6d9e1684d4999c9a2de7c0952299557515ef0163cbdf66bb8b63c04e4db SHA512 3daa16f7a0e6eb92c5e0111a5bd9919ab89f254a35c055ff5a4e6d40c2e529474f61e82faf3f76fdbd0901f186f1a1acf28a329927be76f76f80d4fbadee5614 WHIRLPOOL 35f5d0cdcc18ed35fecfbd247e042e68440ea4250e5949c4e7e8477e606da6fd7589a40ccdfc9fa566583e7085e5d57a4d6a8087b73220c1a84796b086a3978c
+MISC ChangeLog 20086 SHA256 024d6c0ee6f4eb81094c1e0adc61f9b0db253cd522198bf37542abe306139671 SHA512 cecb2bc70da011eaef84f6019c9a5ce3f61f4604a86ba941cc642a5a46c3e3e071eba764287c2ba8893a839b60ce16dc247c00b2fcc3a66334c6549759ec7aab WHIRLPOOL cb48581b27ce10711bd6f9c17aea41481a55a013218d02b7bc0c621b8aa762249cc87421bbb5d03470903553cb7cdfa2438acd2855f0c2fb869195435e361b24
 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)
+
+iQIcBAEBCgAGBQJR7TDDAAoJELp701BxlEWfCJYQAKlVRiCFsyAddmfF3xp3ut+A
+mPTnrYj5zSoJvm/kVSu4KHgKdunSggyEjiH/Sb2Ni2wkGpPMzcvbwI+cOQA3KhXx
+R2NPX+HNBTlsCJ3Xbko9xnr1Ec5OE+wqno1UysZV7wcZzo8aQ6GprtffF/EPBGU9
+LuUmiVo8gXGgMKRMQ6H+jqDDByMLJqJaZXExpxlFmhI8OmGtetWADsAv60owOYkg
+CiB8YYv1Cg0rfDSSiOW8qtgyb1lHrDDFYnZKHP9n7vwwFIF9jnVVY7ihdJ22xOxf
++0oDa2jufQhcOBVvKWF/odJIt9PwX7/pDhECyLBc0Nz25Php/oZ1pOTkwMz82LSB
+RfiBVPSmpGLVE2OJrw3EErpOrWaU5qfpSCq5Jj3rRRGI7F8O4rXQi7xK53kQWR3O
+Gr7U2pn3Dzbu0axitgTFM0X3otQEOEogGQTnev2O3w5z9IzkhvyTbDt50T6TE2yy
+e4OV1V1GRuljY8CloMGnNFyKggWtIZFZI3I8KAuc2Z6kO6CnnzCC+UYimH9SRVKJ
+3Y1aZ2C4qRYxAbWdtd3iF9dhTPFMejeESBRdzrR17X1Qyo5Lf4bGIByhajk+lwF5
+XDb/5ioSNwDNnu72zVGrPNlX1F9pTQNTwzVLersPB8vV3YYHn0OmBWQZcQq7yFeq
+DPouYjfXYISkp3zS1QJ6
+=CERB
+-----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.25.ebuild b/www-servers/apache/apache-2.2.25.ebuild
index 077d7831fbfd..42f2628d8a90 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.1 2013/07/18 13:26:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.25.ebuild,v 1.2 2013/07/22 13:16:56 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}