From: Markus Meier <maekke@gentoo.org>
Date: Sun, 23 Oct 2011 11:45:11 +0000 (+0000)
Subject: arm stable, bug #385859
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11f402d1c2fbe796c52a6f2e61c1b93c89f2a9d1;p=gentoo.git

arm 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 dbe0dccc9ca5..dbbfa4166107 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.170 2011/10/22 16:21:11 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.171 2011/10/23 11:45:11 maekke Exp $
+
+  23 Oct 2011; Markus Meier <maekke@gentoo.org> apache-2.2.21-r1.ebuild:
+  arm stable, bug #385859
 
   22 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> apache-2.2.21-r1.ebuild:
   ppc/ppc64 stable wrt #385859
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 56dd008e8445..e8b214d31a8b 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST gentoo-apache-2.2.14-r1-20091008.tar.bz2 62359 RMD160 0e78de9a61265be2ef797e02bce0cf89f0a5fd2a SHA1 357316581f7d7d289655992216be6c5f5342f32c SHA256 99db378884b33af1c97713f63d92f0bb1d02eef6dc1f8f47a9addd258b3f7233
 DIST gentoo-apache-2.2.15-20100307.tar.bz2 63716 RMD160 aa16c46ec930c020820293b884876946b81bd476 SHA1 20fa102d6094d00d3c874b0b1df69d0ddcf34339 SHA256 b3c4ca6eed24ea82ff37bfa331403b09c94f3b2a8b5b1058761651c6824787c1
@@ -20,24 +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 2754 RMD160 5da05b0182d83f79a76eabd66155c72b7322ecf0 SHA1 70bbc546547c9e09e9572d08d30f61bb71cc8d4e SHA256 24fe1b5da5453632875bd168c31bfb9517c8e98b3a7db58d6d453161e9c449bc
+EBUILD apache-2.2.21-r1.ebuild 2749 RMD160 e9fb030e76b5a4d08f467825394b1a6a2fe7f597 SHA1 c01d1d2d1e53b8b94fcedb8b0b0bd3b1e2d62ee3 SHA256 f5be980e4989734d5be83dd45cbdf8e0ccbba2c4d73f1ab9b646f100cd2aea8c
 EBUILD apache-2.2.21.ebuild 2666 RMD160 888196d1e2490b734809bc1f9568ce3c54e58e5d SHA1 78b858ee8ba94444775d157888b013c01b69173b SHA256 9731f01eebf6acdd83c32b982497bc5c22c36bd03387cc192c001a60fc2652e0
-MISC ChangeLog 116032 RMD160 f8d788ed8ac2bf12956fec8db19708f6b9148510 SHA1 f2b0033b2905ee4f847ffd481f0937f836ed8e50 SHA256 c52ae51c981fe5bb47b9ab7f414b8cdb3649daf302b62e75f6b88a951b783a41
+MISC ChangeLog 116128 RMD160 6dda190fcce447815b7c055a051ff22b0f941ab2 SHA1 8b6e6d81f14a0c70343e8ee0a789b434086aefd6 SHA256 e180824e9746119b827dfadc48435bb028b9205ef330743905391be533a952a5
 MISC metadata.xml 767 RMD160 3b4215160698916a68964b0bcbd63907fef5b124 SHA1 a27777ba897768cfbcebf7779a6cf8be2029ed9b SHA256 8378ce2aa8e0adbe9d7b2f093f115a11d0ec170c74232111b7f46bd692e5aa5c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOou19AAoJEF0huFKJUZL5NicP/30+7hUl1HbYgr2vpQWg3zzO
-s/xOHH3emvwyo6MTbytJ9dea2OwCnQv4EOtAH+nQ5/n0OcjLHuJQR8GaDLjflRq6
-A/V3ghODpfBPcUiD7JGoqPtSktFXd45c2gfeCfbbw7WAEviDNRJ5eD0jij6gjWpM
-bo04j/5zAJRHqORInDNOK3KbxRrsF8h2JCu7C6+Yb/gFC2MxI0gvC1CKdExXqvqf
-ONUDDD5HfwKNuSZZaUQF76CP+CD8UUWuWKYxEqHSK5+MgBM9Oq4/b1KNBijUfXao
-qlECg2UcsU7t4cCy47BefGIaAgKwsjTFxDXF43NwvTgT0Q5Q0gKWmw2W7Io238Qx
-QZTW2o0hpE+Dz/CtJ6AwcgrcU4Nz/JQtMsn67USqdmhJdOz2ZOzGFNhxhO83pdjI
-U80vlapJg1zqcBh7N1MbKqksYMUDP7w2c+aGRVwPZ5YrsDfLugOCTh64OjqQ0V/a
-pmx1RUX9uusEDTEip0TDo6REPexQMgbAslLHD6N7wwMy79vLG7v9FdgZdAm9jp8N
-5bqhHOQgiSr55fnDp0osF5CDqVWseRpbIGLJhx0Vhioyd+LTYqnKkG75eSdo9+Vt
-gNVBdutb039Dpm2eM9pgQhT9YVQzv84RbOmu/ypLPnTzsl7K8C9VLL/dsS704Duv
-u9TJtCjKzHZJEwmP+uyN
-=DimJ
+iEYEARECAAYFAk6j/pEACgkQkKaRLQcq0GKQ5ACeKVWlPpboSCVZBPtWT4Uiqa9a
+LiUAn3w95kEl5djwGfLo2fO3vZg8DELG
+=Olf8
 -----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 c9d9f8f0c01a..0e8370ed32e6 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.4 2011/10/22 16:21:11 xarthisius Exp $
+# $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 $
 
 # 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}