--- /usr/portage/www-servers/apache/apache-2.4.2.ebuild	2012-04-20 05:58:46.000000000 +0200
+++ /usr/local/portage/www-servers/apache/apache-2.4.2-r1.ebuild	2012-07-23 14:19:54.378426656 +0200
@@ -13,15 +13,34 @@
 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
+# << obsolete modules:
+# authn_default authz_default mem_cache 
+# mem_cache is replaced by cache_disk
+# ?? buggy modules
+# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
+# >> added modules for reason:
+# compat: compatibility with 2.2 access control
+# authz_host: new module for access control
+# authn_core: functionality provided by authn_alias in previous versions
+# authz_core: new module, provides core authorization capabilities
+# cache_disk: replacement for mem_cache
+# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
+# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
+# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
+# socache_shmcb: shared object cache provider. Default config with ssl needs it
+# unixd: fixes startup error: Invalid command 'User'
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon
+authn_core authn_dbd authn_dbm authn_file authz_core authz_dbm
+authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta
+charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir 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
+lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat
+log_config log_forensic logio 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"
+reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
+unixd 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
@@ -33,12 +52,17 @@
 	dav_fs:dav
 	dav_lock:dav
 	deflate:filter
-	disk_cache:cache
+	cache_disk:cache
 	ext_filter:filter
 	file_cache:cache
+	lbmethod_byrequests:proxy_balancer
+	lbmethod_byrequests:slotmem_shm
+	lbmethod_bytraffic:proxy_balancer
+	lbmethod_bybusyness:proxy_balancer
+	lbmethod_heartbeat:proxy_balancer
 	log_forensic:log_config
 	logio:log_config
-	mem_cache:cache
+	cache_disk:cache
 	mime_magic:mime
 	proxy_ajp:proxy
 	proxy_balancer:proxy
@@ -54,20 +78,20 @@
 	auth_digest:AUTH_DIGEST
 	authnz_ldap:AUTHNZ_LDAP
 	cache:CACHE
+	cache_disk: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
+	socache_shmcb:SSL
 	ssl:SSL
 	status:STATUS
 	suexec:SUEXEC
@@ -76,12 +100,18 @@
 
 # critical modules for the default config
 MODULE_CRITICAL="
+	authn_core
+	authz_core
 	authz_host
 	dir
 	mime
+	unixd
 "
+# dependend criticals
+use ssl && MODULE_CRITICAL+=" socache_shmcb"
+use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
 
-inherit apache-2
+inherit eutils apache-2
 
 DESCRIPTION="The Apache Web Server."
 HOMEPAGE="http://httpd.apache.org/"
@@ -104,6 +134,14 @@
 
 # init script fixup - should be rolled into next tarball #389965
 src_prepare() {
+	# the following patch can be removed once it is included in
+	# GENTOO_PATCHNAME="gentoo-apache-2.4.1" ...
+	if [ -f "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" ]; then
+		cd "${GENTOO_PATCHDIR}" || die "Failed to cd to ${GENTOO_PATCHDIR}"
+		epatch "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" \
+			|| die "epatch failed"
+		cd "${S}" || die "Failed to cd to ${S}"
+	fi
 	apache-2_src_prepare
 	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
 }
@@ -126,4 +164,49 @@
 	# well, actually installing things makes them more installed, I guess?
 	cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs"
 	chmod 0755 "${D}"/usr/sbin/apxs
+
+	# create dir defined in 40_mod_ssl.conf
+	if use ssl; then
+		dodir /var/run/apache_ssl_mutex || die "Failed to mkdir ssl_mutex"
+	fi
+}
+
+pkg_postinst()
+{
+	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
+	# warnings that default config might not work out of the box
+	for mod in $MODULE_CRITICAL; do
+		if ! use "apache2_modules_${mod}"; then
+			echo
+			ewarn "Warning: Critical module not installed!"
+			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
+			ewarn "are highly recomended but might not be in the base profile yet."
+			ewarn "Default config for ssl needs module 'socache_shmcb'."
+			ewarn "Enabling the following flags is highly recommended:"
+			for cmod in $MODULE_CRITICAL; do
+				use "apache2_modules_${cmod}" || \
+					ewarn "+ apache2_modules_${cmod}"
+			done
+			echo
+			break
+		fi
+	done
+	# warning for proxy_balancer and missing load balancing scheduler
+	if use apache2_modules_proxy_balancer; then
+		local lbset=
+		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
+			if use "apache2_modules_${mod}"; then
+				lbset=1 && break
+			fi
+		done
+		if [ ! $lbset ]; then
+			echo
+			ewarn "Info: Missing load balancing scheduler algorithm module"
+			ewarn "(They were split off from proxy_balancer in 2.3)"
+			ewarn "In order to get the ability of load balancing, at least"
+			ewarn "one of these modules has to be present:"
+			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
+			echo
+		fi
+	fi
 }