Revert last commit - I make a mistake...

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 11 insertions, 15 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index c60b1f19ce93..5631406219e6 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,10 +1,6 @@
 # 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.137 2010/04/06 03:11:37 abcd Exp $
-
-  06 Apr 2010; Jonathan Callen <abcd@gentoo.org> apache-2.2.14-r1.ebuild,
-  apache-2.2.15.ebuild:
-  Add prefix keywords
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.138 2010/04/06 15:30:23 abcd Exp $
 
   04 Apr 2010; Guy Martin <gmsoft@gentoo.org> apache-2.2.15.ebuild:
   hppa stable, #308049
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index d2cafeabd800..7066e35c297b 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -5,14 +5,14 @@ DIST gentoo-apache-2.2.14-r1-20091008.tar.bz2 62359 RMD160 0e78de9a61265be2ef797
 DIST gentoo-apache-2.2.15-20100307.tar.bz2 63716 RMD160 aa16c46ec930c020820293b884876946b81bd476 SHA1 20fa102d6094d00d3c874b0b1df69d0ddcf34339 SHA256 b3c4ca6eed24ea82ff37bfa331403b09c94f3b2a8b5b1058761651c6824787c1
 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 2357 RMD160 1a789ebc654812d34f43f5d2884cc01b2bbc4938 SHA1 e5d890267795ac2c4981c4a12a5f9f7046bb89df SHA256 4d45fce0f67c6dec28cb5b4cb8bc39c3abba87d8f0a397d328e3cd9ebaf34d8f
-EBUILD apache-2.2.15.ebuild 2408 RMD160 5c58c52871e7f5fb2103dcf92dbc37aeaf912c49 SHA1 2c96de791a347d3695999a01491d70e15ce7c3ae SHA256 d7cef527dd62559ea5c64021924c9741ef9435d6a9c3d58938fd39ccf46c571c
-MISC ChangeLog 110929 RMD160 cd9e1ded15cb22f397204e7fc8163a9b36a5bf6a SHA1 bf93412df22ae120954bcb5c6757d439ecbfdfad SHA256 a9e01bf28360b5e8187164a9e311053349faa80b972dd56145ce4448603f6402
+EBUILD apache-2.2.14-r1.ebuild 2264 RMD160 4bc86924cf1d5fa6c6f51f09deb261dfe84d2aea SHA1 1c2570aaa343d0cb143f3ea44c2de7f14bc311d3 SHA256 49680b67d0b58e858768dc9772ac74a17d0b4894e846b425dac6150ce8df386b
+EBUILD apache-2.2.15.ebuild 2316 RMD160 14d5a100525bc7daaaf834ab5aca46eff64ce36b SHA1 706b1a85ff16c0f4ce1ad9d1353cb89d134fbe85 SHA256 92fb34721e89ff02accdf66547e2794d0d8b7596f627ec299455a8b54be87b9b
+MISC ChangeLog 110808 RMD160 b907ee886f2b8103a7b2faeb6dfab9060d3b9144 SHA1 7518cb4a8be187d1fb31817ba169a15cdc482896 SHA256 42ddb414296d72046e32a0c664a426e3090b074020c2459eade12fb4178ad867
 MISC metadata.xml 622 RMD160 217aba625932dbcfcb8bcee1f8a38e6f248e65a7 SHA1 1e7494fe8e49166c8b87a178aca78c9a658f92c7 SHA256 eb6d4f305a170e97bf29e5c6e9d1df6edea8fcdabd35ac2d99ebc8fe5bbd71b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku6pnMACgkQOypDUo0oQOrUJACg0e4wjf56F9Q1Z9lm2D85BL2W
-xHAAmwe3g6VkGVksH+YQrOBSlDloRFzl
-=wjAb
+iEYEARECAAYFAku7U5oACgkQOypDUo0oQOpykgCgjyvB/k0w6VDX0zAJxRAvuPMt
++NgAoKIVMGj/b+bu7qDMp9ctddiEyt1d
+=Kvwa
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.14-r1.ebuild b/www-servers/apache/apache-2.2.14-r1.ebuild
index 6bb42a344635..9648f0a382cb 100644
--- a/www-servers/apache/apache-2.2.14-r1.ebuild
+++ b/www-servers/apache/apache-2.2.14-r1.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.14-r1.ebuild,v 1.8 2010/04/06 03:11:37 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.14-r1.ebuild,v 1.9 2010/04/06 15:30:23 abcd Exp $
 
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20091008"
@@ -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 ~amd64-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="${DEPEND}
diff --git a/www-servers/apache/apache-2.2.15.ebuild b/www-servers/apache/apache-2.2.15.ebuild
index 9da5706af1fb..95a2a00fd894 100644
--- 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.9 2010/04/06 03:11:37 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.15.ebuild,v 1.10 2010/04/06 15:30:23 abcd 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 ~amd64-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="${DEPEND}