--- lighttpd-1.4.20.ebuild	2009-02-07 13:43:10.000000000 +0100
+++ lighttpd-1.4.22.ebuild	2009-04-03 22:38:50.000000000 +0200
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.20.ebuild,v 1.8 2009/02/03 12:46:51 betelgeuse Exp $
 
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-inherit eutils autotools depend.php
+EAPI="2"
+
+inherit eutils autotools
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="http://www.lighttpd.net/"
@@ -12,13 +12,10 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
 
-# cherokee block should be resolved properly
-# http://bugs.gentoo.org/show_bug.cgi?id=224781
 RDEPEND="
-	!www-servers/cherokee
 	>=sys-libs/zlib-1.1
 	bzip2?    ( app-arch/bzip2 )
 	fam?      ( virtual/fam )
@@ -28,8 +25,9 @@
 	memcache? ( dev-libs/libmemcache )
 	mysql?    ( >=virtual/mysql-4.0 )
 	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( virtual/httpd-php )
-	rrdtool? ( net-analyzer/rrdtool )
+	php?      ( virtual/httpd-php[cgi] )
+	rrdtool?  ( net-analyzer/rrdtool )
+	fastcgi?  ( www-servers/spawn-fcgi )
 	ssl?    ( >=dev-libs/openssl-0.9.7 )
 	webdav? (
 		dev-libs/libxml2
@@ -77,8 +75,7 @@
 	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
 
 	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.* "${D}"/usr/bin/spawn-fcgi \
-			"${D}"/usr/share/man/man1/spawn-fcgi.*
+		rm -f ${libdir}/mod_fastcgi.*
 	fi
 }
 
@@ -92,30 +89,19 @@
 		ebeep 5
 	fi
 
-	use php && require_php_with_use cgi
-
 	enewgroup lighttpd
 	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="diff" EPATCH_OPTS="-l" epatch "${FILESDIR}"/"${PVR}" || die "Patching failed!"
-
-	eautoreconf || die
-
+src_prepare() {
 	# dev-python/docutils installs rst2html.py not rst2html
 	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
 		die "sed doc/Makefile.in failed"
 
-	# fix typo
-	sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \
-		die "sed doc/cml.txt failed"
+	eautoreconf || die
 }
 
-src_compile() {
+src_configure() {
 	econf --libdir=/usr/$(get_libdir)/${PN} \
 		--enable-lfs \
 		$(use_enable ipv6) \
@@ -132,7 +118,9 @@
 		$(use_with webdav webdav-locks) \
 		$(use_with xattr attr) \
 		|| die "econf failed"
+}
 
+src_compile() {
 	emake || die "emake failed"
 
 	if use doc ; then
@@ -146,22 +134,17 @@
 	make DESTDIR="${D}" install || die "make install failed"
 
 	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd-1.4.13-r3 lighttpd || die
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die
 	newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die
 	use fam && has_version app-admin/fam && \
 		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
 
-	if use php || use fastcgi ; then
-		newinitd "${FILESDIR}"/spawn-fcgi.initd spawn-fcgi || die
-		newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi || die
-	fi
-
 	# configs
 	insinto /etc/lighttpd
 	doins "${FILESDIR}"/conf/lighttpd.conf
 	doins "${FILESDIR}"/conf/mime-types.conf
 	doins "${FILESDIR}"/conf/mod_cgi.conf
-	newins "${FILESDIR}"/conf/mod_fastcgi.conf-1.4.13-r2 mod_fastcgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
 	# Secure directory for fastcgi sockets
 	keepdir /var/run/lighttpd/
 	fperms 0750 /var/run/lighttpd/
@@ -187,13 +170,16 @@
 	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
 	fperms 0750 /var/l{ib,og}/lighttpd
 
+	#spawn-fcgi is installed by a separate package
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
+
 	use minimal && remove_non_essential
 }
 
 pkg_postinst () {
 	echo
 	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now included with lighttpd"
+		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
@@ -206,9 +192,14 @@
 		ebeep 5
 	fi
 
-	if use fam ; then
-		einfo "Remember to re-emerge lighttpd should you switch from"
-		einfo "app-admin/famd to app-admin/gamin or vice versa."
+	if use fastcgi; then
+		ewarn "As of lighttpd-1.4.22, spawn-fcgi is provided by the separate"
+		ewarn " www-servers/spawn-fcgi package."
+		ewarn "It features a new more featurefull init script - please migrate"
+		ewarn "your configuration if you have used spawn-fcgi!"
 	fi
-	echo
+
+	ewarn "The logging-to-pipe patch has been rejected by upstream and has"
+	ewarn "consequently been dropped from the Gentoo ebuild. Please adjust"
+	ewarn "your configuration, if you used pipe logging."
 }