From: Markus Meier <maekke@gentoo.org>
Date: Mon, 24 Oct 2011 19:54:35 +0000 (+0000)
Subject: x86 stable, bug #385859
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5609dbe5ca74a6ce4da6fa77eae68511ebf8cb0;p=gentoo.git

x86 stable, bug #385859

Package-Manager: portage-2.1.10.30/cvs/Linux x86_64
---

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index dbbfa4166107..68b635561503 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.171 2011/10/23 11:45:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.172 2011/10/24 19:54:35 maekke Exp $
+
+  24 Oct 2011; Markus Meier <maekke@gentoo.org> apache-2.2.21-r1.ebuild:
+  x86 stable, bug #385859
 
   23 Oct 2011; Markus Meier <maekke@gentoo.org> apache-2.2.21-r1.ebuild:
   arm stable, bug #385859
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index e8b214d31a8b..7b1ef3d9923d 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -20,14 +20,14 @@ EBUILD apache-2.2.16-r1.ebuild 2680 RMD160 619727d2b7f48b8357dbb4112b001f67593ad
 EBUILD apache-2.2.16.ebuild 2326 RMD160 ea97a265f787b20329c592a6a4aaed5a97884a42 SHA1 dcea03fbf229d138f6f42d15813a59875c7bf965 SHA256 2f8ab433d60d88650df0602894606d0c4b4b730dda216b7398eb9c0849f39edb
 EBUILD apache-2.2.17.ebuild 2662 RMD160 504b6e5e1fca0e16802dc07a1244517e7c868b66 SHA1 881c6fa19547502b3d8e33a927d27c707569c8d9 SHA256 5f18d3f92d278467e839898adeb130c13b30be9a4eb9094c6b18a12700ff4332
 EBUILD apache-2.2.20.ebuild 2663 RMD160 45ffdb6ac45a8d2227128c3008aa66dfa84ab797 SHA1 c3d254c5239772964241527083a9d703848c8024 SHA256 abf0ff5141cb2335c9e826dfb59101079c559b945b2042da7266741004df4ce7
-EBUILD apache-2.2.21-r1.ebuild 2749 RMD160 e9fb030e76b5a4d08f467825394b1a6a2fe7f597 SHA1 c01d1d2d1e53b8b94fcedb8b0b0bd3b1e2d62ee3 SHA256 f5be980e4989734d5be83dd45cbdf8e0ccbba2c4d73f1ab9b646f100cd2aea8c
+EBUILD apache-2.2.21-r1.ebuild 2748 RMD160 a629422dc8ede02665f29bfb2d9f71b446cd26fb SHA1 cf169bb9b98dd601b2b384a1746e2e040abf5783 SHA256 7a26aff0f42e72542d617b39d1711e02d02a64ac5e3a30b2d2460a2e451a6ca7
 EBUILD apache-2.2.21.ebuild 2666 RMD160 888196d1e2490b734809bc1f9568ce3c54e58e5d SHA1 78b858ee8ba94444775d157888b013c01b69173b SHA256 9731f01eebf6acdd83c32b982497bc5c22c36bd03387cc192c001a60fc2652e0
-MISC ChangeLog 116128 RMD160 6dda190fcce447815b7c055a051ff22b0f941ab2 SHA1 8b6e6d81f14a0c70343e8ee0a789b434086aefd6 SHA256 e180824e9746119b827dfadc48435bb028b9205ef330743905391be533a952a5
+MISC ChangeLog 116228 RMD160 01f75312335829896dcb2afbebd9df6716502f5d SHA1 0bbb9bfe2a5b96e0b4e7ec8416d6bdbad8a01cc3 SHA256 5dc52cb0e4192a28a545dfe6480894e93edf3bfda471fed8d0ae0ed281b6714d
 MISC metadata.xml 767 RMD160 3b4215160698916a68964b0bcbd63907fef5b124 SHA1 a27777ba897768cfbcebf7779a6cf8be2029ed9b SHA256 8378ce2aa8e0adbe9d7b2f093f115a11d0ec170c74232111b7f46bd692e5aa5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6j/pEACgkQkKaRLQcq0GKQ5ACeKVWlPpboSCVZBPtWT4Uiqa9a
-LiUAn3w95kEl5djwGfLo2fO3vZg8DELG
-=Olf8
+iEYEARECAAYFAk6lwsUACgkQkKaRLQcq0GI30QCfaj+vxyQFTNBZtcASJFNg8tem
+aUwAoIB/0hgeDrVJqimTxv6uh/1s8TKx
+=nm4K
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.21-r1.ebuild b/www-servers/apache/apache-2.2.21-r1.ebuild
index 0e8370ed32e6..ed77a1ca70e9 100644
--- a/www-servers/apache/apache-2.2.21-r1.ebuild
+++ b/www-servers/apache/apache-2.2.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.21-r1.ebuild,v 1.5 2011/10/23 11:45:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.21-r1.ebuild,v 1.6 2011/10/24 19:54:35 maekke Exp $
 
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20111018"
@@ -88,7 +88,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 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="${DEPEND}