fix #263588, #265547, #231913, #268154, #271470, #272951, #276426

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 14 insertions, 9 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 7b4c8d27ec7b..9b2bf1c57ebb 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.104 2009/05/02 13:29:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.105 2009/07/05 16:12:38 hollow Exp $
+
+*apache-2.2.11-r1 (05 Jul 2009)
+
+  05 Jul 2009; Benedikt Böhm <hollow@gentoo.org> -apache-2.2.9-r1.ebuild,
+  +apache-2.2.11-r1.ebuild:
+  fix #263588, #265547, #231913, #268154, #271470, #272951, #276426
 
   02 May 2009; Jeroen Roovers <jer@gentoo.org> apache-2.2.11.ebuild:
   Stable for HPPA (bug #265705).
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 9c2203d841e5..d46fa6ea5f35 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,11 +1,10 @@
 DIST gentoo-apache-2.2.10-20081025.tar.bz2 60296 RMD160 bc6d9e05a5924cf104e0a07b18ab6c9da526a1dc SHA1 f3ea7bda13b57b9f622890b2d9288cb096472a96 SHA256 e7704ac9a645bb722d8063735c7de17a4041d76cc72244fc928a0a5ad1ee1ccd
 DIST gentoo-apache-2.2.11-20090101.tar.bz2 60721 RMD160 2a2342bcff3778f44ecb148c333da49f71b5ed57 SHA1 6bb963fa73bf2c26d89dc6b808454d1541f103db SHA256 88a24a6e600024386db5cfd704b11cd7a408ba6ef067a2ffe2dc0923993149ca
-DIST gentoo-apache-2.2.9-r1-20080829.tar.bz2 60376 RMD160 0133e1d06417079f10941f52ef839c05b242d634 SHA1 fdeed5aea3a34fcd5b138612e0e58496dd4f9820 SHA256 6f8724a61e5c304b8f16e5d07a71adeece63511bd976aaee6e191d59fed24324
+DIST gentoo-apache-2.2.11-r1-20090705.tar.bz2 63773 RMD160 82f3d13fd041f1761a40ed306f7117d96fd317da SHA1 b306de6e8dcead08215c717257d87904f3abeba5 SHA256 3ca544946338ebe9d10dd3ecaac577ff073a5a933e76c5fa07f93abbc3ba59b6
 DIST httpd-2.2.10.tar.bz2 5068069 RMD160 30f240222a775efa14b104a2b8df1e1dc65f4b8a SHA1 3a71f4904e359603c3338b07a1178ddfacfaa8c6 SHA256 681d5787288e4e527877f415acce198be96ce7de0dc6e354646b1df4aae21383
 DIST httpd-2.2.11.tar.bz2 5230130 RMD160 b2012af716a459f666e0e41eb04808bd0f7fc28d SHA1 7af256d53b79342f82222bd7b86eedbd9ac21d9a SHA256 5ce34825c5b84d1808605a22f8d16d44c6f91882a538bb98a3affed8f5dff6fe
-DIST httpd-2.2.9.tar.bz2 4943462 RMD160 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a SHA1 71715d81e7a5ace4499803df7369c78b85251083 SHA256 d76599fbcf8b3bcff2779f880fb10e4a2bc4af60f64232083c06863e40850b61
 EBUILD apache-2.2.10.ebuild 2753 RMD160 36530781b03b69fb9070b5c67167493b1485c064 SHA1 c8c4d0bec50458f4f2c97c7d40cf76d52d58bd6c SHA256 3af230e5164379449a8a03953f7deeb7296b9cba82d6bdcb1844a66d05b67535
+EBUILD apache-2.2.11-r1.ebuild 2766 RMD160 fec5d96d0e5074d88644ebee4fe65a47be624ae5 SHA1 c729eb57a7197eedacfce30938d1383da1e295a8 SHA256 b0e7e5a604a61b369e26a640734c93bc233ec56f6b80e05659d27a16b2ff7e01
 EBUILD apache-2.2.11.ebuild 2749 RMD160 5ac59a07e2758e753aebfe803bb60f788823fed4 SHA1 8e0a285496f1a0c427461dc6bf418867cf497832 SHA256 5138ff239264ce12d10afcbd3bcd23dba7d2de379e40b2317c66ff06a8768466
-EBUILD apache-2.2.9-r1.ebuild 2754 RMD160 39933201be3e40daf3c7b1b903bda3424b16b3e9 SHA1 aac23bb3fd4bd5101c9eb9becfb0d872f3b31a75 SHA256 bb3bcce3aa230379298915588504dd28c00aab4e444ee1c3aa7d12c161902f9b
-MISC ChangeLog 106677 RMD160 eb522e5389f8f70c787fab98f10c78956d2627bf SHA1 0aa3b96ee33fd6fa8692db4dcace66ae68044675 SHA256 3b57cbcba45f6b84c424271a31faeef14a5674b017c491d64ad174fe9cd9764d
+MISC ChangeLog 106885 RMD160 d6cc10b3d78c7d04a01618ecb65ec12995a24600 SHA1 ab2f320c3cd76667aa010e27a0a01fe1fa8b5790 SHA256 6455184bebc5b27ddf9ad0d796469efd5ee5dafe88cf8d67137908ddeede9c09
 MISC metadata.xml 707 RMD160 677af9851f39ffbce95448b9dcca095ec30724a1 SHA1 8354b35e30c99bda1312ed0c2a0cdb630c8a17ff SHA256 dd3c8b528c6623fd9d9ab521471c5b6d775fb78fdd00f1b200b18b6ee95e150d
diff --git a/www-servers/apache/apache-2.2.9-r1.ebuild b/www-servers/apache/apache-2.2.11-r1.ebuild
index bb6af7a26ed4..1953a858ea83 100644
--- a/www-servers/apache/apache-2.2.9-r1.ebuild
+++ b/www-servers/apache/apache-2.2.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.9-r1.ebuild,v 1.8 2008/11/05 00:41:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.11-r1.ebuild,v 1.1 2009/07/05 16:12:38 hollow Exp $
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20080829"
+GENTOO_PATCHSTAMP="20090705"
 GENTOO_DEVELOPER="hollow"
 
 # IUSE/USE_EXPAND magic
@@ -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 ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="sni"
 
 DEPEND="${DEPEND}