add support for perusers dc branch; breaks old peruser configuration!

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

6 files changed, 27 insertions, 235 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 413ffbeef8fd..09e30fd3fe2c 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,13 @@
 # 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.114 2009/07/11 19:08:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.115 2009/07/24 18:38:38 hollow Exp $
+
+*apache-2.2.11-r3 (24 Jul 2009)
+
+  24 Jul 2009; Benedikt Böhm <hollow@gentoo.org> -apache-2.2.10.ebuild,
+  -apache-2.2.11.ebuild, -apache-2.2.11-r1.ebuild, +apache-2.2.11-r3.ebuild,
+  metadata.xml:
+  add support for perusers dc branch; breaks old peruser configuration!
 
   11 Jul 2009; Raúl Porcel <armin76@gentoo.org> apache-2.2.11-r2.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #276589
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 0a527bd90d8e..8fcf3264e7f7 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,12 +1,7 @@
-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.11-r1-20090705.tar.bz2 63773 RMD160 82f3d13fd041f1761a40ed306f7117d96fd317da SHA1 b306de6e8dcead08215c717257d87904f3abeba5 SHA256 3ca544946338ebe9d10dd3ecaac577ff073a5a933e76c5fa07f93abbc3ba59b6
 DIST gentoo-apache-2.2.11-r2-20090707.tar.bz2 64636 RMD160 07435d8c47288c036d721cf9af49a541d7e33313 SHA1 7472ca661bf1a25ad7f534f2b9331459b7286d04 SHA256 e12ef2f887fa962bbb10da16cae682b2738a9299b06c0eb21d299e25b228d182
-DIST httpd-2.2.10.tar.bz2 5068069 RMD160 30f240222a775efa14b104a2b8df1e1dc65f4b8a SHA1 3a71f4904e359603c3338b07a1178ddfacfaa8c6 SHA256 681d5787288e4e527877f415acce198be96ce7de0dc6e354646b1df4aae21383
+DIST gentoo-apache-2.2.11-r3-20090724.tar.bz2 70256 RMD160 b977f5bf5c448ffa4abc4791da627e1ab6deb6a7 SHA1 984484c2616b5b8c059ddebd73bb5e7136e82287 SHA256 f74d999b8adea6395c1202e10d1412f7aed2f552cf94ce523eb7eb0dc50c2cbe
 DIST httpd-2.2.11.tar.bz2 5230130 RMD160 b2012af716a459f666e0e41eb04808bd0f7fc28d SHA1 7af256d53b79342f82222bd7b86eedbd9ac21d9a SHA256 5ce34825c5b84d1808605a22f8d16d44c6f91882a538bb98a3affed8f5dff6fe
-EBUILD apache-2.2.10.ebuild 2753 RMD160 36530781b03b69fb9070b5c67167493b1485c064 SHA1 c8c4d0bec50458f4f2c97c7d40cf76d52d58bd6c SHA256 3af230e5164379449a8a03953f7deeb7296b9cba82d6bdcb1844a66d05b67535
-EBUILD apache-2.2.11-r1.ebuild 2761 RMD160 c03cf7a8a448ba9a2be7204fe299e5d534655190 SHA1 a743cc59bfa667bfb6a6c72f5d6cb14aba87d76c SHA256 ed8d498b49006d95b66f254fc32cb6844098122050b01bdc5707037f8bd34426
 EBUILD apache-2.2.11-r2.ebuild 2756 RMD160 943198afcb8efa1d1651718bbf61cfc5424e879f SHA1 a6028006694916c50b8e79c599b46fe5f2c7c6f3 SHA256 58ead8597e08898b06761f0006d1fbd1c423ad47474f46eaf803e089c0298439
-EBUILD apache-2.2.11.ebuild 2749 RMD160 5ac59a07e2758e753aebfe803bb60f788823fed4 SHA1 8e0a285496f1a0c427461dc6bf418867cf497832 SHA256 5138ff239264ce12d10afcbd3bcd23dba7d2de379e40b2317c66ff06a8768466
-MISC ChangeLog 107933 RMD160 f4b9763453b99737e0faf0eb5306adbe97a850de SHA1 92958fb6c16503a78c0f38e925a81a21ab94debc SHA256 af2c04c9ee61ed10e80b4c8a1effa359ec449489796cf3322306f60f9f694bce
-MISC metadata.xml 707 RMD160 677af9851f39ffbce95448b9dcca095ec30724a1 SHA1 8354b35e30c99bda1312ed0c2a0cdb630c8a17ff SHA256 dd3c8b528c6623fd9d9ab521471c5b6d775fb78fdd00f1b200b18b6ee95e150d
+EBUILD apache-2.2.11-r3.ebuild 2998 RMD160 9ebf6180929a50c18d353601beee94a04796ea42 SHA1 9f7aa682996436739b693204ef86962e1e2b40f6 SHA256 53f9a50f26d60eb56482062d381dca01bec4f2d216f8de5c0c9fc80fa0fe2f50
+MISC ChangeLog 108204 RMD160 770633df95a405fda77fc6470dbe3abc89d413f8 SHA1 6fefc5970e9f6da1c9ff1ea93a494678f0351c13 SHA256 462e697eb2ab3f5f3bb45d9548665e7a05a9a7fd2a6878f514595eda604db8b1
+MISC metadata.xml 802 RMD160 cef716401b4191c2509fcb6447c7c233d22837ad SHA1 f14bce5f939a169a24bcf524ccbb452406168a72 SHA256 8cdd0bcaad1b9579550d63a4a85025cf57646c6c2f201dc20ea43075ba4627d3
diff --git a/www-servers/apache/apache-2.2.11-r1.ebuild b/www-servers/apache/apache-2.2.11-r1.ebuild
deleted file mode 100644
index 6d077e798934..000000000000
--- a/www-servers/apache/apache-2.2.11-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.11-r1.ebuild,v 1.4 2009/07/07 00:31:21 rich0 Exp $
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20090705"
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="sni"
-
-DEPEND="${DEPEND}
-	apache2_modules_deflate? ( sys-libs/zlib )"
-
-RDEPEND="${RDEPEND}
-	apache2_modules_mime? ( app-misc/mime-types )"
-
-src_unpack() {
-	if ! use sni ; then
-		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"
-	fi
-
-	apache-2_src_unpack
-}
-
-pkg_preinst() {
-	# note regarding IfDefine changes
-	if has_version "<${CATEGORY}/${PN}-2.2.6-r1"; then
-		elog
-		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
-		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
-		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"
-		elog "with AUTH_DIGEST now."
-		elog
-	fi
-}
diff --git a/www-servers/apache/apache-2.2.10.ebuild b/www-servers/apache/apache-2.2.11-r3.ebuild
index f09433651dc4..89ba093ebe28 100644
--- a/www-servers/apache/apache-2.2.10.ebuild
+++ b/www-servers/apache/apache-2.2.11-r3.ebuild
@@ -1,9 +1,9 @@
 # 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.10.ebuild,v 1.7 2009/01/23 11:29:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.11-r3.ebuild,v 1.1 2009/07/24 18:38:38 hollow Exp $
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20081025"
+GENTOO_PATCHSTAMP="20090724"
 GENTOO_DEVELOPER="hollow"
 
 # IUSE/USE_EXPAND magic
@@ -80,8 +80,8 @@ 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"
-IUSE="sni"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="sni peruser_dc"
 
 DEPEND="${DEPEND}
 	apache2_modules_deflate? ( sys-libs/zlib )"
@@ -91,7 +91,15 @@ RDEPEND="${RDEPEND}
 
 src_unpack() {
 	if ! use sni ; then
-		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"
+		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 04_all_mod_ssl_tls_sni.patch"
+	fi
+
+	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
diff --git a/www-servers/apache/apache-2.2.11.ebuild b/www-servers/apache/apache-2.2.11.ebuild
deleted file mode 100644
index 7d91031becf7..000000000000
--- a/www-servers/apache/apache-2.2.11.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.11.ebuild,v 1.7 2009/05/02 13:29:36 jer Exp $
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20090101"
-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 ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="sni"
-
-DEPEND="${DEPEND}
-	apache2_modules_deflate? ( sys-libs/zlib )"
-
-RDEPEND="${RDEPEND}
-	apache2_modules_mime? ( app-misc/mime-types )"
-
-src_unpack() {
-	if ! use sni ; then
-		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"
-	fi
-
-	apache-2_src_unpack
-}
-
-pkg_preinst() {
-	# note regarding IfDefine changes
-	if has_version "<${CATEGORY}/${PN}-2.2.6-r1"; then
-		elog
-		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
-		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
-		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"
-		elog "with AUTH_DIGEST now."
-		elog
-	fi
-}
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index d00b39bdf8d0..6f53eb19c3b5 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -12,6 +12,8 @@
 		provides HTTP services in sync with the current HTTP standards.
 	</longdescription>
 	<use>
+		<flag name="peruser_dc">Enable support for the dc branch of peruser.
+			EXPERIMENTAL!</flag>
 		<flag name='sni'>Enable TLS Server Name Indication (SNI) -
 			EXPERIMENTAL!</flag>
 		<flag name='suexec'>Install suexec with apache</flag>