Index: eclass/apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.20
diff -u -b -B -r1.20 apache-2.eclass
--- eclass/apache-2.eclass	5 Mar 2010 09:01:07 -0000	1.20
+++ eclass/apache-2.eclass	10 Jul 2010 15:49:57 -0000
@@ -245,14 +245,6 @@
 		MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
 	fi
 
-	if use threads || has ${MY_MPM} ${IUSE_MPMS_THREAD} ; then
-		MY_CONF="${MY_CONF} --enable-cgid=${mod_type}"
-		MY_MODS="${MY_MODS} cgid"
-	else
-		MY_CONF="${MY_CONF} --enable-cgi=${mod_type}"
-		MY_MODS="${MY_MODS} cgi"
-	fi
-
 	if use suexec ; then
 		elog "You can manipulate several configure options of suexec"
 		elog "through the following environment variables:"
Index: www-servers/apache/apache-2.2.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.15.ebuild,v
retrieving revision 1.10
diff -u -b -B -r1.10 apache-2.2.15.ebuild
--- www-servers/apache/apache-2.2.15.ebuild	6 Apr 2010 15:30:23 -0000	1.10
+++ www-servers/apache/apache-2.2.15.ebuild	10 Jul 2010 15:49:57 -0000
@@ -13,11 +13,11 @@
 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"
+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 rewrite setenvif
+speling status substitute unique_id userdir usertrack version vhost_alias"
 
 # inter-module dependencies
 # TODO: this may still be incomplete