Version bump

(Portage version: 2.1.10.63/cvs/Linux x86_64)

8 files changed, 57 insertions, 1080 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 2d1f65bce1c7..58e76b282e38 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.276 2012/05/02 21:49:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.277 2012/06/01 21:12:21 hwoarang Exp $
+
+*lighttpd-1.4.31 (01 Jun 2012)
+
+  01 Jun 2012; Markos Chandras <hwoarang@gentoo.org> +lighttpd-1.4.31.ebuild,
+  -lighttpd-1.4.23-r1.ebuild, -lighttpd-1.4.25-r2.ebuild,
+  -lighttpd-1.4.25-r3.ebuild, -lighttpd-1.4.26-r2.ebuild,
+  -lighttpd-1.4.28-r3.ebuild, -lighttpd-1.4.28-r4.ebuild, metadata.xml:
+  Version bump
 
   02 May 2012; Jeff Horelick <jdhore@gentoo.org> lighttpd-1.4.23-r1.ebuild,
   lighttpd-1.4.25-r2.ebuild, lighttpd-1.4.25-r3.ebuild,
diff --git a/www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild
deleted file mode 100644
index 326e08626fcf..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild,v 1.3 2012/05/02 21:49:38 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.bz2"
-
-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"
-
-RDEPEND="
-	>=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	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 )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	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() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		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
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	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
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS ChangeLog doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	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 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!"
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild
deleted file mode 100644
index 697180c8dc2f..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild,v 1.2 2012/05/02 21:49:38 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
-
-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"
-
-RDEPEND="
-	>=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	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 )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	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() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		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() {
-	epatch "${FILESDIR}"/1.4.25-fix-unknown-AM_SILENT_RULES.patch
-	# 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"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	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
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	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 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!"
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild
deleted file mode 100644
index b9a10c8e1e48..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild,v 1.2 2012/05/02 21:49:38 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
-
-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"
-
-RDEPEND="
-	>=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	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 )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	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() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		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() {
-	epatch "${FILESDIR}"/1.4.25-fix-unknown-AM_SILENT_RULES.patch
-	epatch "${FILESDIR}"/1.4.25-fix-CVE-2010-0295.patch
-	# 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"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	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
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	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 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!"
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild
deleted file mode 100644
index b0fafbbbbfb6..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild,v 1.2 2012/05/02 21:49:38 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
-
-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"
-
-RDEPEND="
-	>=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	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 )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	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() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		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
-	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
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	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
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	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 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!"
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild
deleted file mode 100644
index 34fe36b81bef..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild,v 1.2 2012/05/02 21:49:38 jdhore Exp $
-
-EAPI="2"
-
-inherit base eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc 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
-	bzip2?    ( app-arch/bzip2 )
-	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?      ( dev-lang/php[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# 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)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		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."
-	fi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_prepare() {
-	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"
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with ldap) \
-		$(use_with libev) \
-		$(use_with lua) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	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
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS doc/scripts/*.sh
-	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	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."
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in /etc/lighttpd.  Please migrate your"
-		elog "existing configuration."
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.28-r4.ebuild b/www-servers/lighttpd/lighttpd-1.4.31.ebuild
index a14450f53738..60b100418c0e 100644
--- a/www-servers/lighttpd/lighttpd-1.4.28-r4.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.31.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.28-r4.ebuild,v 1.2 2012/05/02 21:49:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.31.ebuild,v 1.1 2012/06/01 21:12:21 hwoarang Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit base eutils autotools depend.php
+inherit base autotools eutils depend.php
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="http://www.lighttpd.net/"
@@ -13,10 +13,11 @@ SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bzip2 doc fam gdbm ipv6 ldap libev lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
+IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test uploadprogress webdav xattr zlib"
+
+REQUIRED_USE="kerberos? ( ssl )"
 
 RDEPEND="
-	>=sys-libs/zlib-1.1
 	bzip2?    ( app-arch/bzip2 )
 	fam?      ( virtual/fam )
 	gdbm?     ( sys-libs/gdbm )
@@ -28,13 +29,15 @@ RDEPEND="
 	pcre?     ( >=dev-libs/libpcre-3.1 )
 	php?      ( dev-lang/php[cgi] )
 	rrdtool?  ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
+	selinux? ( sec-policy/selinux-apache )
+	ssl?    ( >=dev-libs/openssl-0.9.7[kerberos?] )
 	webdav? (
 		dev-libs/libxml2
 		>=dev-db/sqlite-3
 		sys-fs/e2fsprogs
 	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? (	>=sys-libs/zlib-1.1 )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -46,19 +49,16 @@ DEPEND="${RDEPEND}
 
 # update certain parts of lighttpd.conf based on conditionals
 update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
+	local config="${D}/etc/lighttpd/lighttpd.conf"
 
 	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
+	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
 
 	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
+	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
 
 	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
-	use ipv6 && \
-		dosed 's|# server.use-ipv6|server.use-ipv6|' ${config}
+	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
 }
 
 # remove non-essential stuff (for USE=minimal)
@@ -78,6 +78,7 @@ remove_non_essential() {
 	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
 	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
 	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+	use zlib    || rm -f ${libdir}/mod_compress.*
 }
 
 pkg_setup() {
@@ -88,7 +89,11 @@ pkg_setup() {
 		ewarn "as conditionals and modules such as mod_re{write,direct}"
 		ewarn "and mod_ssi."
 	fi
-
+	if use mmap; then
+		ewarn "You have enabled the mmap option. This option may allow"
+		ewarn "local users to trigger SIGBUG crashes. Use this option"
+		ewarn "with EXTRA care."
+	fi
 	enewgroup lighttpd
 	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
 }
@@ -96,12 +101,14 @@ pkg_setup() {
 src_prepare() {
 	base_src_prepare
 	#dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
+	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
 		die "sed doc/Makefile.am failed"
-	epatch "${FILESDIR}"/${P}-detect-libev.patch
+	# Experimental patch for progress bar. Bug #380093
+	if use uploadprogress; then
+	    epatch "${FILESDIR}"/${PN}-1.4.29-mod_uploadprogress.patch
+	fi
 	eautoreconf
 }
-
 src_configure() {
 	econf --libdir=/usr/$(get_libdir)/${PN} \
 		--enable-lfs \
@@ -109,25 +116,28 @@ src_configure() {
 		$(use_with bzip2) \
 		$(use_with fam) \
 		$(use_with gdbm) \
+		$(use_with kerberos kerberos5) \
 		$(use_with ldap) \
 		$(use_with libev) \
 		$(use_with lua) \
 		$(use_with memcache) \
+		$(use_with mmap) \
 		$(use_with mysql) \
 		$(use_with pcre) \
 		$(use_with ssl openssl) \
 		$(use_with webdav webdav-props) \
 		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr)
+		$(use_with xattr attr) \
+		$(use_with zlib)
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	if use doc ; then
 		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
+		cd doc || die
+		emake html
 	fi
 }
 
@@ -140,13 +150,13 @@ src_test() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 
 	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
 	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
+		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
 
 	# configs
 	insinto /etc/lighttpd
@@ -169,11 +179,11 @@ src_install() {
 	use doc && dohtml -r doc/*
 
 	docinto txt
-	dodoc doc/*.txt
+	dodoc doc/outdated/*.txt
 
 	# logrotate
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
+	newins "${FILESDIR}"/lighttpd.logrotate lighttpd
 
 	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
 	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
@@ -201,4 +211,13 @@ pkg_postinst () {
 		elog "which is now located in /etc/lighttpd.  Please migrate your"
 		elog "existing configuration."
 	fi
+
+	if use uploadprogress; then
+		elog "WARNING! mod_uploadprogress is a backported module from the"
+		elog "1.5x-branch, which is not considered stable yet. Please go to"
+		elog "http://redmine.lighttpd.net/wiki/1/Docs:ModUploadProgress"
+		elog "for more information. This configuration also is NOT supported"
+		elog "by upstream, so please refrain from reporting bugs. You have"
+		elog "been warned!"
+	fi
 }
diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index 63cf2a4ed85e..c2f3a89122a6 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name='libev'>Enable fdevent handler</flag>
 		<flag name='memcache'>Enable memcache support for mod_cml and
 			mod_trigger_b4_dl</flag>
+		<flag name='mmap'>Use mmap with files owned by lighttpd. This is a dangerous option as it may allow local users to trigger SIGBUS crashes.</flag>
 		<flag name='rrdtool'>Enable rrdtool support via mod_rrdtool</flag>
 		<flag name='uploadprogress'>Apply experimental patch for upload progress module</flag>
 		<flag name='webdav'>Enable webdav properties</flag>