--- lighttpd-1.4.26-r1.ebuild	2010-05-13 19:18:03.000000000 +0300
+++ lighttpd-1.4.28.ebuild	2010-11-15 19:33:19.720013442 +0200
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils autotools depend.php
+inherit base eutils autotools depend.php
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="http://www.lighttpd.net/"
@@ -12,8 +12,8 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bzip2 doc fam gdbm ipv6 ldap libev lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
 
 RDEPEND="
 	>=sys-libs/zlib-1.1
@@ -21,11 +21,12 @@
 	fam?      ( virtual/fam )
 	gdbm?     ( sys-libs/gdbm )
 	ldap?     ( >=net-nds/openldap-2.1.26 )
+	libev?    ( dev-libs/libev )
 	lua?      ( >=dev-lang/lua-5.1 )
 	memcache? ( dev-libs/libmemcache )
 	mysql?    ( >=virtual/mysql-4.0 )
 	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( virtual/httpd-php )
+	php?      ( dev-lang/php[cgi] )
 	rrdtool?  ( net-analyzer/rrdtool )
 	ssl?    ( >=dev-libs/openssl-0.9.7 )
 	webdav? (
@@ -54,6 +55,10 @@
 	# enable stat() caching
 	use fam && \
 		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
+	
+	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+	use ipv6 && \
+		dosed 's|# server.use-ipv6|server.use-ipv6|' ${config}
 }
 
 # remove non-essential stuff (for USE=minimal)
@@ -73,10 +78,6 @@
 	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
 	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
 	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-
-	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.*
-	fi
 }
 
 pkg_setup() {
@@ -86,21 +87,17 @@
 		ewarn "Otherwise you lose support for some core options such"
 		ewarn "as conditionals and modules such as mod_re{write,direct}"
 		ewarn "and mod_ssi."
-		ebeep 5
 	fi
 
-	use php && require_php_with_use cgi
-
 	enewgroup lighttpd
 	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
 }
 
 src_prepare() {
-	# dev-python/docutils installs rst2html.py not rst2html
+	base_src_prepare
+	dev-python/docutils installs rst2html.py not rst2html
 	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
 		die "sed doc/Makefile.am failed"
-
-	epatch "${FILESDIR}/1.4.26-fix-ssl-return-check-r2716.patch"
 	eautoreconf
 }
 
@@ -111,8 +108,9 @@
 		$(use_with bzip2) \
 		$(use_with fam) \
 		$(use_with gdbm) \
-		$(use_with lua) \
 		$(use_with ldap) \
+		$(use_with libev) \
+		$(use_with lua) \
 		$(use_with memcache) \
 		$(use_with mysql) \
 		$(use_with pcre) \
@@ -164,8 +162,8 @@
 	update_config
 
 	# docs
-	dodoc AUTHORS README NEWS doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
 
 	use doc && dohtml -r doc/*
 
@@ -187,26 +185,19 @@
 }
 
 pkg_postinst () {
-	echo
+	if use ipv6; then
+		elog "IPv6 migration guide:"
+		elog "http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+	fi
 	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
 		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
 		einfo "spawn-fcgi's init script configuration is now located"
 		einfo "at /etc/conf.d/spawn-fcgi."
-		echo
 	fi
 
 	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fastcgi; then
-		ewarn "As of lighttpd-1.4.22, spawn-fcgi is provided by the separate"
-		ewarn "www-servers/spawn-fcgi package. Please install it manually, if"
-		ewarn "you use spawn-fcgi."
-		ewarn "It features a new, more featurefull init script - please migrate"
-		ewarn "your configuration!"
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in /etc/lighttpd.  Please migrate your"
+		elog "existing configuration."
 	fi
 }