amd64/arm stable, bug #308049

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 079c1c6e8255f4e7213f1dad60fb9379858d4ab9..45f75a4e564d67cad53f16a839e7cbaa33bef921 100644 (file)
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.131 2010/03/29 14:04:32 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.132 2010/03/29 21:51:52 maekke Exp $
+
+  29 Mar 2010; Markus Meier <maekke@gentoo.org> apache-2.2.15.ebuild:
+  amd64/arm stable, bug #308049
 
   29 Mar 2010; Christian Faulhammer <fauli@gentoo.org> apache-2.2.15.ebuild:
   stable x86, security bug 308049

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index f670ecb3c577f9a0b82bb03e7b2bc1a2cacecd92..c0eb0eaacb1df0954429f9107b339b4b22a476db 100644 (file)
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -6,13 +6,13 @@ DIST gentoo-apache-2.2.15-20100307.tar.bz2 63716 RMD160 aa16c46ec930c020820293b8
 DIST httpd-2.2.14.tar.bz2 5147171 RMD160 ff5077e444ba995475202bb3b9be733384c809d1 SHA1 eacd04c87b489231ae708c84a77dc8e9ee176fd2 SHA256 b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
 DIST httpd-2.2.15.tar.bz2 4959582 RMD160 e5c5da1fdf86a6b0501f6c8e97ccb1982e81cfdf SHA1 5f0e973839ed2e38a4d03adba109ef5ce3381bc2 SHA256 5ae0c428e7abd87eecbac8564d90a7182104325bae7086c21db7b3a1e3140ca7
 EBUILD apache-2.2.14-r1.ebuild 2268 RMD160 7d889a8a82554e4aa7f512d8b5860b8bc8e3b3df SHA1 a0748f9e31319b0da47b2fd29398e615d8208079 SHA256 5403b4b520041ab1538bfefceca454a1fc38d7d095b20f3f2aec2b21816030b9
-EBUILD apache-2.2.15.ebuild 2326 RMD160 9eecbd9f995bd35ce90748297539439438b69b93 SHA1 ca5acf799379e4bac76548b904b1d9b05219efaf SHA256 2616af3d1f2ad2a6077ff45150fe64761fb6a12852ecb5e33a6ed3d1245dac23
-MISC ChangeLog 110264 RMD160 9dd7232c50ddb124e313efc806658fabd5b6cef0 SHA1 02a63208d2a9c1772055d1a367792645a0de24e5 SHA256 b380bf0acb06a563eea285bc70efee7ccfc5b8ee94df440231350ca018d09922
+EBUILD apache-2.2.15.ebuild 2325 RMD160 ee312aed4ffdae0ed1af44dfdbaceb47b0cb7ba0 SHA1 bcc76e12ba3870851c555e0f2c250c037ed4f5c3 SHA256 3f7c7ce1c6983d174d8f53ae397f74057619fa073d2b372a34ba0532da25938e
+MISC ChangeLog 110368 RMD160 a77bf8ef79d1e193fb8b8c5e7e5b04b059147834 SHA1 8d82b85bba450d0d2fa6efb8c824c6f8fbff462b SHA256 ce894f61a776a120737b71caa39664ba1fb8320baa7fd53db6d02d8c3a0c6f00
 MISC metadata.xml 622 RMD160 217aba625932dbcfcb8bcee1f8a38e6f248e65a7 SHA1 1e7494fe8e49166c8b87a178aca78c9a658f92c7 SHA256 eb6d4f305a170e97bf29e5c6e9d1df6edea8fcdabd35ac2d99ebc8fe5bbd71b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuws3YACgkQNQqtfCuFnePXKgCfYBQHkSBxf0ss+5IEV8T+Wygw
-XAAAnA5YerWXV7qAXdL5XgTbF6+5Y7/o
-=HQ/K
+iEYEARECAAYFAkuxILYACgkQkKaRLQcq0GJJTgCgpH3d6JGnU9oauVagU+/2PLzx
+fkcAmwftapIhR1O73RI+QK8XXTCspXe2
+=SwkS
 -----END PGP SIGNATURE-----

diff --git a/www-servers/apache/apache-2.2.15.ebuild b/www-servers/apache/apache-2.2.15.ebuild
index 95c8b08163660f2008ac047a86422d09ccf3f6b5..097eed140620ec42ce9fc80f5e93aaa63943ebb9 100644 (file)
--- a/www-servers/apache/apache-2.2.15.ebuild
+++ b/www-servers/apache/apache-2.2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.15.ebuild,v 1.3 2010/03/29 14:04:32 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.15.ebuild,v 1.4 2010/03/29 21:51:52 maekke Exp $
 
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20100307"
@@ -80,7 +80,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}