gentoo resync : 28.04.2018

8 files changed, 33 insertions, 705 deletions

diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 215d65a75820..86a0662f188f 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -2,22 +2,15 @@ AUX conf/lighttpd.conf 8261 BLAKE2B ba8233dba6251ef82647468bf327018ddcba5e2df7c3
 AUX conf/mime-types.conf 3313 BLAKE2B 48b38dbe04939be3fd85ac139146cbc6f266be842f77618d110e8e3565ae1a68d27e9ee82adf800ba1077fc3481d388e4f091ffce7bf5042e5d37ab54baaad5f SHA512 2535c9458f556a7f1a37461b543ff34869ab714438a3e53d13809bb46f0d6f4efa2da1407411678f54a64f6f9bdb32d5c3a7daf76903ef512c6d3b021719ebe7
 AUX conf/mod_cgi.conf 749 BLAKE2B dd565d6052d74aea3489f3a011a5913fcbd331b57ca02e71496eecff7c303cd56e8e43cd5a9b33c27463304a2f2218fc7451cb5754200c9ef48eb4104b820547 SHA512 e611b3ed232af4fb8e9b8821a29fbc32acb0a3431c701e5a64afc192abc288cf90582fbbf79085de9426be23d8d42d90da66e6993ab7cf89943ae23d59d681a1
 AUX conf/mod_fastcgi.conf 553 BLAKE2B 314326e002a25ff8f9becb9868ea54c857f2e671c99d5d9a13aeea13054b61406cf702d9500e1a71664b3d40ee9964b5fd32247bee377c4ff64af551148570c6 SHA512 e2796181ae9f7c55a48b690835f8f84aaab2c5c100846fc8ac5126b9a1351ef1a2ab30f26da2e16afa197bddf555c299a82a5cc133350212e171ac555765a08d
-AUX lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch 1042 BLAKE2B eed3dd39c24e0d0dec634c0d0058cdd98efdebaf422c6ff32e8ddd5a44001057f8ed5a928d620d50382dce3aac3ea575982e44363e02b626cfb915d18e2be121 SHA512 3fc99aae70d00b7cdf691cbb62361ce4db1154f173b95143d76f731fe45f4763b2ff56ed34334006a8bed3a8d029196153c62f7871b41e043c3e5523cfcdb7c3
 AUX lighttpd.confd 240 BLAKE2B 8383c102f9e3a373909f26cda9f73d1edf81ef9dae42a48593f6d6f61c1b1060cc324bb773d402307d54c6cca520ddada8016dc5b3f0922ddf75d24934bfc7c4 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416
 AUX lighttpd.initd 1957 BLAKE2B df5ba8a820d9a75657e6bb3225f86b961d15f11f4b05278c44ffb1840386be5e8dd2c74e4c053ab4c5f10e5987ebac2e9b8e1489436e5ab337a2f96ca403610c SHA512 d5fc03ded923d2aeea19fefdf658ed793114867dd0b50be6836d767108c98fb7de56011f00ea63220c4b198cff45d98fdc8a649efae90673536e03f786219485
 AUX lighttpd.logrotate 366 BLAKE2B 518eb5d54c6aa0cbc40cf8b2b5db7c7828ac1a300e892bed722d061c291051611bd408e3e7c69ebb032e6007a7df62ad3fd51f4ceff360459bc69b089a9bbe1e SHA512 d28b491423d7cf6b2f5d82191da7e816c73c36e2db469f543f4c09b6e60fce4f0931af49ffc4965e3f5906e22ea6439248dce0d3f4727022df9b6fb5e8a0b92a
 AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc7a3078464cf2cb7eec982f626201cc0d0aea7dd7de81cacf603f6d064c8ec6f8dcff09f78dfd48b656aa93 SHA512 8cae2d3acb2f4d9a9043e492c4b15024f85f92d93616d5e92e08d51e2295fde6160c750be08244703f999208c4b43ecfb9a2fcb8e223e52992551a0668302ffe
 AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f
 AUX lighttpd.tmpfiles.conf 44 BLAKE2B 00550d523dc350184ef0d681e9e8da5ad1909dd6226698c79d88c7cab7d35c8e20a0c308b5342f94872442aeac240e202ea6055f4666759f9ec853debac18730 SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936
-DIST lighttpd-1.4.42.tar.xz 652140 BLAKE2B 17cd3c7dfb8eb19fd5c374d79030d603fd693fa7ad6565dce6c2f5c88bfcb3c7b32b16a5337e22daf68efa20ff99eca9a622121080fa20597b8aafa59ba3f56d SHA512 eb43a53f1fe7a115d0cf60ed8b79a22472a4fef939937401a475bdfd7244e53efa3aae1f66cd709989e77064aadd40004455b167ea3c4efc07ced261c18bd773
-DIST lighttpd-1.4.43.tar.xz 656248 BLAKE2B 7c1e91c615c380a64784c1b9e33979e5bc339c6ae7fe30c0f53b12e0b1c8b42fc537e95e6dd734beabd8244927265ca572a2c0ba4495a7c5548c977d0b1b4700 SHA512 131e1d96276a6b5ca597bae9ff78df20bfc9907e9c832b6fdea8b86d493764a5dce24cfc3bb2e931755af18a26b0e8c6fd21714fca7d6c6a402c85f7fe4a588a
-DIST lighttpd-1.4.44.tar.xz 660304 BLAKE2B b8bf21fc84c525a24c3b2ca66324ed75e3ec63a28455ed6166831a6e729f6f669363d9fe72289cf1f5532b231e23298d120fa57bbcc98cdd5ba37f9b84eb89ee SHA512 b7481482bc130c80f076002b2853e1b0ecb2af5d6c6f5428854ae7a60bda591cf96f23e9f3a24cfb36ada3ba97ebff449e102895f7eb4b0aa50ec275eb44725b
 DIST lighttpd-1.4.45.tar.xz 660432 BLAKE2B 31ea3209b8efad32c3811d39b1c1a682d9f2d79a2ecd7d90c413ad066b6a7d5f84df9b3af2ffb2d49a701856ac496626f2a744b25f1dc4fe1c3b9af586fc437f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d
-DIST lighttpd-1.4.47.tar.xz 703012 BLAKE2B 47d8e537c08076b66cd80b35d8d368e7eef55dc0c9edb004e86c033899c13be09ba5f456395647d6c63d461183cfb0be87d36d5e8f26086e0c3ad9bd75791ef4 SHA512 9fac3acc428d9faf69fca2768578dca619f778889e8a3779c429038eec7aff6b3dd497d5437152a070df850861fe2132042fa4418e31c1aab89df23a1c544f99
-EBUILD lighttpd-1.4.42.ebuild 6059 BLAKE2B 0c5a8c90324389dfa00daa7e6a3b3c066ce36096caa079c6f4db5c1050fe083d88c325ad84a8ee288864c583058645f3e6bf41a5e571db6f1aee591fe872728f SHA512 0842d1106bbbeae2f6aa16c40c502271e39fc32c7224e09a1b7185565c4dd676daa17cf8cf30e22fc57bb711207a6b8172641a89ef11145ad3a01a595de90409
-EBUILD lighttpd-1.4.43.ebuild 6068 BLAKE2B 85fbf7ddbef1f2b01c760b8b8c993f756104daec0304eb429aec3513e4f4509cfa2427e3f98746982f5a8ab7bafef0264da1668e6116e75b9f4bcca9392aa857 SHA512 719877b38a77fbf9d69b0098b8c7888859cc0c618ec4fdfba02bbe1387a793086777ea8b3a98ac3c90e2581f9a52bec0cbed7bd814204db99f91798fa0648b89
-EBUILD lighttpd-1.4.44.ebuild 6068 BLAKE2B 85fbf7ddbef1f2b01c760b8b8c993f756104daec0304eb429aec3513e4f4509cfa2427e3f98746982f5a8ab7bafef0264da1668e6116e75b9f4bcca9392aa857 SHA512 719877b38a77fbf9d69b0098b8c7888859cc0c618ec4fdfba02bbe1387a793086777ea8b3a98ac3c90e2581f9a52bec0cbed7bd814204db99f91798fa0648b89
-EBUILD lighttpd-1.4.45.ebuild 6067 BLAKE2B 963de7a8aa7325e85dfee31e4bd951aa9e742b1c0a1c5f54904951a18a960eca982e3d59a0eb8778eb03d0a220b2a649ed29b995a747669d6d9f2bb33a713831 SHA512 9f0e88e79b7e3af64145a5894b50167156fce1449002b830b3587a050a0d32cb764ce1520c11ab5686c3ebcda3f89463b7d1c42feee2928cc09ec4ec558d877b
-EBUILD lighttpd-1.4.47.ebuild 6141 BLAKE2B 9655a4c707553a3d5ea28501e5f2f5916431c9c32395ca4712abd1955230190bfa9926cdceb4ebbc76cb07bbd5d097c3286c148499a9c4d9c62d55de4099a68f SHA512 5941720b6bce49cc70a0493134340b4a9697da6864c4928a1d57cae94761e099bcc61aeae3ddf52dc3b5c59d636af13d39952b03ae8932863fcd9c88f2e7f35b
+DIST lighttpd-1.4.49.tar.xz 710964 BLAKE2B 112ceb36b45f51c7d5526caba27d2b2aa57ec9d14751e1334472c9079c25317c5e37faf884788c84d61fa6cfa2efedc0b4ec02e32308beb6a0b6be28eea44fbd SHA512 de766da68b4cacfb6c322210eafe819b6423334272e9fae4688c2282a66a2e55aaf580c5fdbf02676ed6f7b32d13f2f28cefd22518f77127055ec336ec5d6784
+EBUILD lighttpd-1.4.45.ebuild 6066 BLAKE2B cc04f7982f6c36337232f432c9212b1451eece9415db135f26716826db4e3262e1ab16d256d811a2157db82a3c2f9477e9194917946b33e606cbf5eff34d7ad7 SHA512 caf64046a76554ee3f5953bc0f4b3ba590c88702b0df34287b7937dfe726eb3daf06afcb07a84df5a8ab6f9e1058d5b29f9eb07bc4e6b9778420285882385ee4
+EBUILD lighttpd-1.4.49.ebuild 6469 BLAKE2B 610f88ad7914bd026e9e44a112da45427be7c7dd2c42034eae39d0bd7a93b1d5ae78bd9fb24e2753c77839adfdc2f409eb9eb51bd65b09c42292c0bd4b2c256f SHA512 477022cd24b93328901ccbfa87610cada519899287eab46b1c7970606fa400834a51c291fa02fd603312c8fa4d6658e0da70129f94332812d804499638384daa
 EBUILD lighttpd-9999.ebuild 6097 BLAKE2B 909ce4816861ff7fce4e9cd1fdd69005148a718d0d2c034096384ead8ab4c54be90e7cd97db5031d4deb52ce102cf2dbe2c8f38d6b26c2748254ad1002c7b68e SHA512 f1898fb6b9b9331d206119bd3ca0cec00d8cce4836dda65829d7d82c79ba4a38b8a55cd5e08dedd1780a29f78e0deb7ecbb546826a182202fa1c009a3a794bc9
-MISC metadata.xml 1054 BLAKE2B f019b0e6d0122f004a4b7e44450ad1807c7a9ded2919b443e5e90d61e73337b295bf382f3dee2c9c544b1dab79d356f8088d8f764de43fc91686f0f05fcaee93 SHA512 ce8dc3c1c8afbf6526d82737274ec75d0ab7fe189dc3413ac65ad1aed61e5f94bf45cd8bd564ba6f390357b9dffa4d8685fc3b7c867148ba553f446e5f02eff5
+MISC metadata.xml 1162 BLAKE2B 1c22a68843890ac45b6a9f446ea8494f0768c13d20c77daf512988f18e764921c6f098afdf8a5bde09a3d8600153f30e1232c28f73188c49e83b02777be0150a SHA512 b796cfcd6c4f0340db88f24acd2cc3c11315b35e37f2bd0aea0b8608ad8ce67f8df7a64658628527179db65324ff8a8db441d5991309f70a13c855ab58afcea4
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch b/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch
deleted file mode 100644
index 7916ac0b53f3..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.4.47-3d257ec3-respect-HAVE_IPV6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Backport upstream fixes for Gentoo bug #636650
-
-Original upstream commit message:
-
-Author: nicorac <claudio.nicora@gmail.com>
-Date:   Wed Oct 25 16:48:24 2017 +0200
-
-    [core] fix build --disable-ipv6 (fixes #2832)
-    
-    x-ref:
-      "Build error on systems without IPV6 support (regression from 1.4.46)"
-      https://redmine.lighttpd.net/issues/2832
-    
-    github: closes #87
-
---- a/src/network.c
-+++ b/src/network.c
-@@ -77,9 +77,13 @@ static void network_host_normalize_addr_str(buffer *host, sock_addr *addr) {
-     if (addr->plain.sa_family == AF_INET6)
-         buffer_append_string_len(host, CONST_STR_LEN("]"));
-     if (addr->plain.sa_family != AF_UNIX) {
-+      #ifdef HAVE_IPV6
-         unsigned short port = (addr->plain.sa_family == AF_INET)
-           ? ntohs(addr->ipv4.sin_port)
-           : ntohs(addr->ipv6.sin6_port);
-+      #else
-+        unsigned short port = ntohs(addr->ipv4.sin_port);
-+      #endif
-         buffer_append_string_len(host, CONST_STR_LEN(":"));
-         buffer_append_int(host, (int)port);
-     }
diff --git a/www-servers/lighttpd/lighttpd-1.4.42.ebuild b/www-servers/lighttpd/lighttpd-1.4.42.ebuild
deleted file mode 100644
index f438237b621a..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.42.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools eutils readme.gentoo-r1 user systemd
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
-
-REQUIRED_USE="kerberos? ( ssl !libressl )"
-
-CDEPEND="
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	libev?    ( >=dev-libs/libev-4.01 )
-	lua?      ( >=dev-lang/lua-5.1:= )
-	memcached? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php:*[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${D}/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
-
-	# enable stat() caching
-	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
-
-	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
-	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
-}
-
-# 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.*
-	use zlib    || rm -f ${libdir}/mod_compress.*
-}
-
-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
-	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
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_prepare() {
-	default
-	#dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with libev) \
-		$(use_with lua) \
-		$(use_with memcached) \
-		$(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 zlib)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc || die
-		emake html
-	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() {
-	emake DESTDIR="${D}" install
-
-	# init script stuff
-	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 || die; }
-
-	# 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
-
-	# 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 ipv6 && readme.gentoo_create_doc
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	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
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-}
-
-pkg_postinst () {
-	use ipv6 && readme.gentoo_print_elog
-
-	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.43.ebuild b/www-servers/lighttpd/lighttpd-1.4.43.ebuild
deleted file mode 100644
index 8a691625e6cd..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.43.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools eutils readme.gentoo-r1 user systemd
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
-
-REQUIRED_USE="kerberos? ( ssl !libressl )"
-
-CDEPEND="
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	libev?    ( >=dev-libs/libev-4.01 )
-	lua?      ( >=dev-lang/lua-5.1:= )
-	memcached? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php:*[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${D}/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
-
-	# enable stat() caching
-	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
-
-	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
-	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
-}
-
-# 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.*
-	use zlib    || rm -f ${libdir}/mod_compress.*
-}
-
-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
-	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
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_prepare() {
-	default
-	#dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with libev) \
-		$(use_with lua) \
-		$(use_with memcached) \
-		$(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 zlib)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc || die
-		emake html
-	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() {
-	emake DESTDIR="${D}" install
-
-	# init script stuff
-	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 || die; }
-
-	# 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
-
-	# 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 ipv6 && readme.gentoo_create_doc
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	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
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-}
-
-pkg_postinst () {
-	use ipv6 && readme.gentoo_print_elog
-
-	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.44.ebuild b/www-servers/lighttpd/lighttpd-1.4.44.ebuild
deleted file mode 100644
index 8a691625e6cd..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.44.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools eutils readme.gentoo-r1 user systemd
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
-
-REQUIRED_USE="kerberos? ( ssl !libressl )"
-
-CDEPEND="
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	libev?    ( >=dev-libs/libev-4.01 )
-	lua?      ( >=dev-lang/lua-5.1:= )
-	memcached? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php:*[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${D}/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
-
-	# enable stat() caching
-	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
-
-	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
-	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
-}
-
-# 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.*
-	use zlib    || rm -f ${libdir}/mod_compress.*
-}
-
-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
-	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
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_prepare() {
-	default
-	#dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with libev) \
-		$(use_with lua) \
-		$(use_with memcached) \
-		$(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 zlib)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc || die
-		emake html
-	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() {
-	emake DESTDIR="${D}" install
-
-	# init script stuff
-	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 || die; }
-
-	# 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
-
-	# 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 ipv6 && readme.gentoo_create_doc
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	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
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-}
-
-pkg_postinst () {
-	use ipv6 && readme.gentoo_print_elog
-
-	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.45.ebuild b/www-servers/lighttpd/lighttpd-1.4.45.ebuild
index 67737436c2b1..ad8fafed3d28 100644
--- a/www-servers/lighttpd/lighttpd-1.4.45.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.45.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
diff --git a/www-servers/lighttpd/lighttpd-1.4.47.ebuild b/www-servers/lighttpd/lighttpd-1.4.49.ebuild
index 87c89b4727a5..a8b1cc10cf28 100644
--- a/www-servers/lighttpd/lighttpd-1.4.47.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.49.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit autotools eutils readme.gentoo-r1 user systemd
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 systemd user
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="http://www.lighttpd.net/"
@@ -11,29 +12,34 @@ SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
+IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
 
-REQUIRED_USE="kerberos? ( ssl !libressl )"
+REQUIRED_USE="kerberos? ( ssl !libressl )
+			  webdav? ( sqlite )"
 
 CDEPEND="
 	bzip2?    ( app-arch/bzip2 )
+	dbi?	  ( dev-db/libdbi )
 	fam?      ( virtual/fam )
 	gdbm?     ( sys-libs/gdbm )
+	geoip?	  ( dev-libs/geoip )
 	ldap?     ( >=net-nds/openldap-2.1.26 )
 	libev?    ( >=dev-libs/libev-4.01 )
 	lua?      ( >=dev-lang/lua-5.1:= )
-	memcached? ( dev-libs/libmemcache )
+	memcached? ( dev-libs/libmemcached )
 	mysql?    ( >=virtual/mysql-4.0 )
 	pcre?     ( >=dev-libs/libpcre-3.1 )
 	php?      ( dev-lang/php:*[cgi] )
+	postgres? ( dev-db/postgresql:* )
 	rrdtool?  ( net-analyzer/rrdtool )
+	sasl?     (	dev-libs/cyrus-sasl )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
 		libressl? ( dev-libs/libressl:= )
 	)
+	sqlite?	( dev-db/sqlite:3 )
 	webdav? (
 		dev-libs/libxml2
-		>=dev-db/sqlite-3
 		sys-fs/e2fsprogs
 	)
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
@@ -51,10 +57,6 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-apache )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-3d257ec3-respect-HAVE_IPV6.patch"
-)
-
 # update certain parts of lighttpd.conf based on conditionals
 update_config() {
 	local config="${D}/etc/lighttpd/lighttpd.conf"
@@ -78,7 +80,7 @@ remove_non_essential() {
 
 	# non-essential modules
 	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
+		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
 
 	# allow users to keep some based on USE flags
 	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
@@ -111,6 +113,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+	use memcached && append-ldflags -pthread
 	#dev-python/docutils installs rst2html.py not rst2html
 	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
 		die "sed doc/Makefile.am failed"
@@ -123,8 +126,10 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable mmap) \
 		$(use_with bzip2) \
+		$(use_with dbi) \
 		$(use_with fam) \
 		$(use_with gdbm) \
+		$(use_with geoip ) \
 		$(use_with kerberos krb5) \
 		$(use_with ldap) \
 		$(use_with libev) \
@@ -132,7 +137,10 @@ src_configure() {
 		$(use_with memcached) \
 		$(use_with mysql) \
 		$(use_with pcre) \
+		$(use_with postgres pgsql) \
+		$(use_with sasl) \
 		$(use_with ssl openssl) \
+		$(use_with sqlite sqlite) \
 		$(use_with webdav webdav-props) \
 		$(use_with webdav webdav-locks) \
 		$(use_with xattr attr) \
@@ -158,7 +166,9 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
+
+	find "${D}" -name '*.la' -delete || die
 
 	# init script stuff
 	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
@@ -181,7 +191,7 @@ src_install() {
 	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
 	use ipv6 && readme.gentoo_create_doc
 
-	use doc && dohtml -r doc/*
+	use doc && dodoc -r doc
 
 	docinto txt
 	dodoc doc/outdated/*.txt
@@ -195,7 +205,7 @@ src_install() {
 	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.*
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* || die
 
 	use minimal && remove_non_essential
 
diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index f98b80a07b6e..6131a5ff7f83 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -5,6 +5,10 @@
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
 	<longdescription lang="en">
 		lighttpd a secure, fast, compliant and very flexible web-server
 		which has been optimized for high-performance environments. It has a very