--- /usr/portage/eclass/webapp.eclass	2007-01-03 21:36:52.000000000 +0100
+++ webapp.eclass	2008-02-21 15:50:22.000000000 +0100
@@ -23,8 +23,29 @@
 # ------------------------------------------------------------------------
 
 SLOT="${PVR}"
-IUSE="vhosts"
-DEPEND=">=app-admin/webapp-config-1.50.15"
+
+need_httpd() {
+	DEPEND="${DEPEND}
+		|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi )"
+}
+
+need_httpd_cgi() {
+	DEPEND="${DEPEND}
+		|| ( virtual/httpd-cgi virtual/httpd-fastcgi )"
+}
+
+need_httpd_fastcgi() {
+	DEPEND="${DEPEND}
+		virtual/httpd-fastcgi"
+}
+
+if [[ -z ${WEBAPP_OPTIONAL} ]] ; then
+	IUSE="vhosts"
+	DEPEND="${DEPEND}
+		>=app-admin/webapp-config-1.50.15"
+	need_httpd
+fi
+
 RDEPEND="${DEPEND}"
 
 EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm