Bug #347227: add in mod_reqtimeout (for use on Gentoo Infra). Also add mod_proxy_scgi and document all other modules that are not included.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

3 files changed, 109 insertions, 2 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index a9d22eb283bf..cd62051f1982 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,12 @@
 # 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.146 2010/09/19 17:41:21 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.147 2010/12/02 06:43:42 robbat2 Exp $
+
+*apache-2.2.16-r1 (02 Dec 2010)
+
+  02 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> +apache-2.2.16-r1.ebuild:
+  Bug #347227: add in mod_reqtimeout (for use on Gentoo Infra). Also add
+  mod_proxy_scgi and document all other modules that are not included.
 
   19 Sep 2010; Guy Martin <gmsoft@gentoo.org> apache-2.2.16.ebuild:
   hppa stable wrt #330195
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index f8c8e44e389e..a8aa8221a929 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -6,6 +6,7 @@ DIST httpd-2.2.15.tar.bz2 4959582 RMD160 e5c5da1fdf86a6b0501f6c8e97ccb1982e81cfd
 DIST httpd-2.2.16.tar.bz2 4775545 RMD160 2e6d7d1dae40905be7fdd793140f62cf58112095 SHA1 ef92f5b3124fe5e9ba6121ea7f4bab8c014068f9 SHA256 9457d57a6bea15ce5bde83c88803c030953b99bdd0fbae65854adff527ed4c52
 EBUILD apache-2.2.14-r1.ebuild 2275 RMD160 347fabe296dafc6bbed9f45d8f6b102659c58495 SHA1 bf266591b858a3d59c2b6c0d029ec05bd073b2d9 SHA256 2cd9e5df7b8302247aba75eaea51901defd5b998a911e599fb3ae3a4928d318c
 EBUILD apache-2.2.15.ebuild 2326 RMD160 6d56b8771691af5ad1afb35f1b7b0c76a1c0a317 SHA1 93bad89a62c4c5f22f2eafcda0187186c7820c54 SHA256 2d4d2c0944904f405332893dd7ffe62a6ea4d9ee77a516b64a48b185da933ab0
+EBUILD apache-2.2.16-r1.ebuild 2680 RMD160 619727d2b7f48b8357dbb4112b001f67593ad7b8 SHA1 0afb3ee574c4a2d775e754eb3840e3716140c9fd SHA256 529cc5347e19df6ae31ff0546b7b2f375fd9e35f67f8947e0a1f18742128e24b
 EBUILD apache-2.2.16.ebuild 2326 RMD160 ea97a265f787b20329c592a6a4aaed5a97884a42 SHA1 dcea03fbf229d138f6f42d15813a59875c7bf965 SHA256 2f8ab433d60d88650df0602894606d0c4b4b730dda216b7398eb9c0849f39edb
-MISC ChangeLog 111772 RMD160 1eae4dcf30654b688794772579b420ea27460543 SHA1 7e01f7af15e27d8674e805116e4ffb76688d77a6 SHA256 43163cebb9b21f75185a1de68f51c33fa51b7c97d56bd7b80df3f4accbe57626
+MISC ChangeLog 112030 RMD160 fe82412334b69d8a536db604804cf84a57be41d4 SHA1 4333afbfc67ff9f9b7059c0a1cea0856bef0105c SHA256 c7eaac506fe7d0afee27e585a45e3d775c7604241f55bac8ba71870dbb4bfff9
 MISC metadata.xml 622 RMD160 217aba625932dbcfcb8bcee1f8a38e6f248e65a7 SHA1 1e7494fe8e49166c8b87a178aca78c9a658f92c7 SHA256 eb6d4f305a170e97bf29e5c6e9d1df6edea8fcdabd35ac2d99ebc8fe5bbd71b4
diff --git a/www-servers/apache/apache-2.2.16-r1.ebuild b/www-servers/apache/apache-2.2.16-r1.ebuild
new file mode 100644
index 000000000000..62922836a2ff
--- /dev/null
+++ b/www-servers/apache/apache-2.2.16-r1.ebuild
@@ -0,0 +1,100 @@
+# 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.16-r1.ebuild,v 1.1 2010/12/02 06:43:42 robbat2 Exp $
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20100828"
+GENTOO_DEVELOPER="hollow"
+# We want the patch from r0
+GENTOO_PATCHNAME="gentoo-${P}"
+
+# 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 cgi cgid 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 proxy_scgi rewrite
+reqtimeout setenvif speling status substitute unique_id userdir usertrack
+version vhost_alias"
+# The following are also in the source as of this version, but are not available
+# for user selection:
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
+# optional_fn_import optional_hook_export optional_hook_import
+
+# 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
+	proxy_scgi: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=""
+
+DEPEND="${DEPEND}
+	>=dev-libs/openssl-0.9.8m
+	apache2_modules_deflate? ( sys-libs/zlib )"
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/openssl-0.9.8m
+	apache2_modules_mime? ( app-misc/mime-types )"