version bump

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

3 files changed, 112 insertions, 2 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 09e30fd3fe2c..4bdecbf48f06 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.115 2009/07/24 18:38:38 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.116 2009/07/29 08:13:35 hollow Exp $
+
+*apache-2.2.12 (29 Jul 2009)
+
+  29 Jul 2009; Benedikt Böhm <hollow@gentoo.org> +apache-2.2.12.ebuild:
+  version bump
 
 *apache-2.2.11-r3 (24 Jul 2009)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 8fcf3264e7f7..d0a3b0ff238f 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,7 +1,10 @@
 DIST gentoo-apache-2.2.11-r2-20090707.tar.bz2 64636 RMD160 07435d8c47288c036d721cf9af49a541d7e33313 SHA1 7472ca661bf1a25ad7f534f2b9331459b7286d04 SHA256 e12ef2f887fa962bbb10da16cae682b2738a9299b06c0eb21d299e25b228d182
 DIST gentoo-apache-2.2.11-r3-20090724.tar.bz2 70256 RMD160 b977f5bf5c448ffa4abc4791da627e1ab6deb6a7 SHA1 984484c2616b5b8c059ddebd73bb5e7136e82287 SHA256 f74d999b8adea6395c1202e10d1412f7aed2f552cf94ce523eb7eb0dc50c2cbe
+DIST gentoo-apache-2.2.12-20090729.tar.bz2 64057 RMD160 b5b3da34571053598c813e87c825d29967394e53 SHA1 f32c29d69888aa64b6460058ef6495f23ca5fbe2 SHA256 c966648a23bdabb6a4608348dfbd6ab4056d0fa1ef71f543d20794e288260520
 DIST httpd-2.2.11.tar.bz2 5230130 RMD160 b2012af716a459f666e0e41eb04808bd0f7fc28d SHA1 7af256d53b79342f82222bd7b86eedbd9ac21d9a SHA256 5ce34825c5b84d1808605a22f8d16d44c6f91882a538bb98a3affed8f5dff6fe
+DIST httpd-2.2.12.tar.bz2 5140433 RMD160 4c8e781e5e60a7a332383a798fe0ddc1adffc914 SHA1 76e243a5b7dc9896e83bdfac1aa98bbfdc85aeae SHA256 b1e95d4f19a8f6cf9c2b9d44f5f109d22d79d3efb3e0a3c8265eebc9f82fc416
 EBUILD apache-2.2.11-r2.ebuild 2756 RMD160 943198afcb8efa1d1651718bbf61cfc5424e879f SHA1 a6028006694916c50b8e79c599b46fe5f2c7c6f3 SHA256 58ead8597e08898b06761f0006d1fbd1c423ad47474f46eaf803e089c0298439
 EBUILD apache-2.2.11-r3.ebuild 2998 RMD160 9ebf6180929a50c18d353601beee94a04796ea42 SHA1 9f7aa682996436739b693204ef86962e1e2b40f6 SHA256 53f9a50f26d60eb56482062d381dca01bec4f2d216f8de5c0c9fc80fa0fe2f50
-MISC ChangeLog 108204 RMD160 770633df95a405fda77fc6470dbe3abc89d413f8 SHA1 6fefc5970e9f6da1c9ff1ea93a494678f0351c13 SHA256 462e697eb2ab3f5f3bb45d9548665e7a05a9a7fd2a6878f514595eda604db8b1
+EBUILD apache-2.2.12.ebuild 2526 RMD160 a704004a30c912b67b0cc201cbb06afaaf9eab48 SHA1 ab625c398225c5dfb35a3d056a611bf0443fc752 SHA256 f29ebd83910e512cc148d249f526b53e352d88bd6f2da2107b1227142fc680f6
+MISC ChangeLog 108323 RMD160 15231d66a16765177a4aec17992461b4aca50a6d SHA1 06374da752cc7cc5cdcf734e11c5bf576da9d860 SHA256 c3611b9e340c3381f56ba24c114cd9f399d757e8fcdf59611ea90a0f6f24e65c
 MISC metadata.xml 802 RMD160 cef716401b4191c2509fcb6447c7c233d22837ad SHA1 f14bce5f939a169a24bcf524ccbb452406168a72 SHA256 8cdd0bcaad1b9579550d63a4a85025cf57646c6c2f201dc20ea43075ba4627d3
diff --git a/www-servers/apache/apache-2.2.12.ebuild b/www-servers/apache/apache-2.2.12.ebuild
new file mode 100644
index 000000000000..ee6bbe90c0cc
--- /dev/null
+++ b/www-servers/apache/apache-2.2.12.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.12.ebuild,v 1.1 2009/07/29 08:13:35 hollow Exp $
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20090729"
+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_unpack() {
+	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_unpack
+}