version bump wrt #283729

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

3 files changed, 112 insertions, 2 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 9b1cca59a850..13c5c6260d85 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # 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.118 2009/09/20 08:37:34 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.119 2009/10/06 12:44:47 hollow Exp $
+
+*apache-2.2.14 (06 Oct 2009)
+
+  06 Oct 2009; Benedikt Böhm <hollow@gentoo.org> +apache-2.2.14.ebuild:
+  version bump wrt #283729
 
 *apache-2.2.13-r1 (20 Sep 2009)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index ffe8a255b402..b7a30a0db29f 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,10 +1,13 @@
 DIST gentoo-apache-2.2.11-r2-20090707.tar.bz2 64636 RMD160 07435d8c47288c036d721cf9af49a541d7e33313 SHA1 7472ca661bf1a25ad7f534f2b9331459b7286d04 SHA256 e12ef2f887fa962bbb10da16cae682b2738a9299b06c0eb21d299e25b228d182
 DIST gentoo-apache-2.2.13-20090826.tar.bz2 64063 RMD160 38a00f52ff7798b535afe41a069f02670ccb83e3 SHA1 298e21c8244c71f222331921a64ca07eb13cecff SHA256 1d129b6111437029197b5bb5c2cab9ae11ef250640d278aafff16464f689d4f1
 DIST gentoo-apache-2.2.13-r1-20090920.tar.bz2 63767 RMD160 452af532b651c72d4ee265861738869344235cec SHA1 1a052d549005e3e76d6535d5ea09f7af20b3e93e SHA256 48212f91ec6d4a7e5c9f5e78da35ea8e97c9a3faddd8a165bccc5d5658360d32
+DIST gentoo-apache-2.2.14-20091006.tar.bz2 63730 RMD160 0aa9d8ef866114f65e1f7d7a63b53f8aa0766e5c SHA1 64b82d1b6f4535d99c2817b30c4a980475a98753 SHA256 5ceb1fdb7a924636185198d78e3befb5fd5a95a8e66837d3273ea7f7afdc9ecd
 DIST httpd-2.2.11.tar.bz2 5230130 RMD160 b2012af716a459f666e0e41eb04808bd0f7fc28d SHA1 7af256d53b79342f82222bd7b86eedbd9ac21d9a SHA256 5ce34825c5b84d1808605a22f8d16d44c6f91882a538bb98a3affed8f5dff6fe
 DIST httpd-2.2.13.tar.bz2 5300199 RMD160 4a6a2247cc118175a9a36f1e14344ee71da24627 SHA1 44d85da1b8e6c579d4514cfefbea00b284717b69 SHA256 24a812e010d936a3114141bad56461fcaa1089aa720bd16355feb3516ab8d6d6
+DIST httpd-2.2.14.tar.bz2 5147171 RMD160 ff5077e444ba995475202bb3b9be733384c809d1 SHA1 eacd04c87b489231ae708c84a77dc8e9ee176fd2 SHA256 b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
 EBUILD apache-2.2.11-r2.ebuild 2757 RMD160 42bbb7b9198d82cb251bf6cf0c5f0f78eb02de6f SHA1 acdcdb0cc6d327060ca1fc77732d77c009cbf94d SHA256 59d5c23884cbbe84fd6c69e6bf762e5624a0e3d9427b5b8f1879e605ef3b8834
 EBUILD apache-2.2.13-r1.ebuild 2531 RMD160 c66515e7152671b957b886d4df4fa13e66e87111 SHA1 30f3ff801317927da9e32bfd1a2b70bebee9e6f0 SHA256 8c726c2bb6fcdb4ff9c4a2944da351739a05c005e824180f690b373ab1861b43
 EBUILD apache-2.2.13.ebuild 2528 RMD160 00b363cb6393ca38d7ce1b824b30100dbcef1076 SHA1 461146070a0e33be39514d478dbe20f351233ba1 SHA256 ea4c7fb8d4e7a13228bbca233222e9addf65322aaad10cb642f23a377ae518e6
-MISC ChangeLog 108705 RMD160 03dbfc9d1950fc649168e6b782dc81a65eada165 SHA1 200e9df68b1f6906ff3f0d8b1064687ac94fffdb SHA256 023e22faeee333e74644259e45a3a249a7ac23f18a20c340ace874f3d3f687b0
+EBUILD apache-2.2.14.ebuild 2528 RMD160 9da7bbb21dd85b2cf7b13ebefe34295d3b7d8f8e SHA1 f5f65d87f6464e86f95377d3fe6492b55ce072d4 SHA256 7b4a5f0bdd18d694d12cfe878c04f5d0e7cf38773a2dbb36ee5846804e654cea
+MISC ChangeLog 108836 RMD160 2a417ba624bebd0ce05da4ad6cf207d9dcdcae6b SHA1 6d82fa0280ab1bea2967e2cc2262b5f53ddb7d25 SHA256 99d167128df64d7e0a6779ef267906ea662721518d8976ad4b0187c6d6ea8fe6
 MISC metadata.xml 802 RMD160 cef716401b4191c2509fcb6447c7c233d22837ad SHA1 f14bce5f939a169a24bcf524ccbb452406168a72 SHA256 8cdd0bcaad1b9579550d63a4a85025cf57646c6c2f201dc20ea43075ba4627d3
diff --git a/www-servers/apache/apache-2.2.14.ebuild b/www-servers/apache/apache-2.2.14.ebuild
new file mode 100644
index 000000000000..96c5a661aa44
--- /dev/null
+++ b/www-servers/apache/apache-2.2.14.ebuild
@@ -0,0 +1,102 @@
+# 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.14.ebuild,v 1.1 2009/10/06 12:44:47 hollow Exp $
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20091006"
+GENTOO_DEVELOPER="hollow"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="itk peruser prefork"
+IUSE_MPMS_THREAD="event worker"
+
+IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
+authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
+authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
+charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires
+ext_filter file_cache filter headers ident imagemap include info log_config
+log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp
+proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling
+status substitute unique_id userdir usertrack version vhost_alias"
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	disk_cache:cache
+	ext_filter:filter
+	file_cache:cache
+	log_forensic:log_config
+	logio:log_config
+	mem_cache:cache
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_http:proxy
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	disk_cache:CACHE
+	file_cache:CACHE
+	info:INFO
+	ldap:LDAP
+	mem_cache:CACHE
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_http:PROXY
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authz_host
+	dir
+	mime
+"
+
+inherit apache-2
+
+DESCRIPTION="The Apache Web Server."
+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"
+IUSE="peruser_dc"
+
+DEPEND="${DEPEND}
+	apache2_modules_deflate? ( sys-libs/zlib )"
+
+RDEPEND="${RDEPEND}
+	apache2_modules_mime? ( app-misc/mime-types )"
+
+src_prepare() {
+	if use peruser_dc ; then
+		if ! use apache2_mpms_peruser ; then
+			die "USE=peruser_dc requires APACHE2_MPMS=peruser"
+		fi
+	else
+		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 22_all_peruser_0.3.0-dc3.patch"
+	fi
+
+	apache-2_src_prepare
+}