Remove old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

5 files changed, 21 insertions, 681 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 332356bcac45..ad5c596869ab 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.325 2014/04/01 19:00:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.326 2014/04/06 10:20:34 hwoarang Exp $
+
+  06 Apr 2014; Markos Chandras <hwoarang@gentoo.org> -lighttpd-1.4.32-r2.ebuild,
+  -lighttpd-1.4.32.ebuild, -lighttpd-1.4.33.ebuild:
+  Remove old
 
   01 Apr 2014; Markus Meier <maekke@gentoo.org> lighttpd-1.4.35.ebuild:
   arm stable, bug #504330
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 5aa3606cedd8..e78f79299825 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -15,21 +15,29 @@ AUX lighttpd.logrotate 487 SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721e
 AUX lighttpd.service 252 SHA256 bcd5a17df1bf5fe1cd2af9393e18c33a23eca5fb706de44472b214dd0cfb82fc SHA512 0a890005a8eb7d813c687bca8611018cf158152d04eb8355abf963cb74c06d712060bb66cb96d8d6d48ac71839b89bfec74e32b8f143b411c8570ec9c38ae5be WHIRLPOOL 811c4cfe203e261493da5d42dac541001982faffc0335e1a0359cb5d0b174aae136d825d4c63d89d90b3ed33d5d47fb6ce39dce6792443486b3d113ba99fecfb
 AUX lighttpd.tmpfiles.conf 44 SHA256 a31237336ad02b22579b5e2168485d43d350f78ed010d39a2dbc554dd574bbcb SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936 WHIRLPOOL 5774c609ead3af3758766cd69111af5e080dc230cb7632ae54ade74313a20f5680d83117a2a369230e2d7c5328e1703ecc315fa1555f79a688e8728a7a209b4a
 DIST lighttpd-1.4.32.tar.bz2 681065 SHA256 60691b2dcf3ad2472c06b23d75eb0c164bf48a08a630ed3f308f61319104701f SHA512 ffd5488a2ed57daa26b6d16223f422a94e88f2488cdc50bbb354c45daa535fbf9231fbbe73c23327a0adb708cc2b67fbdc60c34195a2a46a171dcc0f30bb3efb WHIRLPOOL 0f537296ae2a321962a4e4bc9a45631d334cf180a5aee1a182e6d95ebdcabfec6df4d229e888ce9170f526ab716c323cc66947413747ee91e6f73e2a4a0d4526
-DIST lighttpd-1.4.33.tar.bz2 664850 SHA256 2ff2324658c0f90e7d39afd40f08f11ca230903b9019c31a2bbecd8f087f235e SHA512 f380adb20944846340b409290c43d54188f94e7992fe1e90121ab866f75048dfb7c2c1592b07b1df0af3b6d12b60d1d7e5d41de75c8684b8939b3df736f00762 WHIRLPOOL 26997d6813f59e7f26ed83c2d50d17b13d72d16565779ac85eedf5e0753f5f2b48882086e88f94f9c3050e8a0ede0a4d216a07e429f0916bed6f194585c98871
 DIST lighttpd-1.4.34.tar.bz2 665651 SHA256 e4b5682ef21b0bdea4a18dc7ccac6b5a0bf526b691ad0fe5c25c8b9fc38d0c12 SHA512 ad8b25090f81bcb55d3aac89cd17119ed3574a86756992bf36f7d302cf5966006bbc4a76e2d3926a4f096c0db30b01722aa7fb7fa556200ace6c3b82874d81ee WHIRLPOOL 7a10dcdbaeb47b440e567edc3cec46480af059a2f2556579f1d5f25f31218beb9b1c91ae8b3f3b1e9d87183de0dd23fee3262ba2a09c658d7a145c53146dc61e
 DIST lighttpd-1.4.35.tar.bz2 665955 SHA256 4a71c1f6d8af41ed894b507720c4c17184dc320590013881d5170ca7f15c5bf7 SHA512 13f8562fb735964fe7ef1b127a15c43907f34be70b6bd2dd4ba61b59275d7c2a8d9a7947ff1a4d7cc5fd7efd309fc66b7de6d954b59424f814ea2eb98fd876b9 WHIRLPOOL edbeb94ae29475be398e9281135fc43f915be68c5836ae3da302f7c94c3af19eeca601cedc9bfe59d552f45c6248a945b2de725613de395087e4e195efe9a62e
-EBUILD lighttpd-1.4.32-r2.ebuild 6628 SHA256 0ac6fa299552dc3306d61965f7a1c4bff55c705080605a8d40c6861f61efacd7 SHA512 64615224e9c4314897848eafaca2c0501bf5023c01bd39f5a694cfc8ff6ecd3d1857830f0bbf16155008dddefd16d6f83b57ed30a403ea90b88ff2a2f8f09aa9 WHIRLPOOL 9a4a376beca26ddd5f0914c3b1ba65cd770f1e367821ef49788d8d7571e1448246a37c23a1197f41f67b9a1aa0a0ad06cc3902754c7e5eaa614e6cffca0ca308
 EBUILD lighttpd-1.4.32-r3.ebuild 6679 SHA256 120b3dbe294b12c592ea6443dd059b2e8ddef86518193eb7ad0e4fbb98302a18 SHA512 51506dae7baa4dc8e24999a32497487f90f5ee7a596fe9e40f50e4d40c0f94dcfbd184df4322cfe8b973814752bc5a8e9ea8a5481dd75b8f0ed38adf61297cf9 WHIRLPOOL f7e37e4c393d83d9409b143789484c2b714841088e3eff82873c3601fdd15079ff92a973e8ebff7c051b5fecda5891f10832f42541715c068310520f520c3962
-EBUILD lighttpd-1.4.32.ebuild 6647 SHA256 6d618327ba9b945cf1f0f9fc52ad40e32fd9804e93d0129802d46bba586c7477 SHA512 33069ef5915441223451a5071895092a348f8afc0f84b7bc2641e1e3458d90aeac5b4c90507fa9be60a2aa30cb8874407ff59822ed0997f4e42ad4414403dab9 WHIRLPOOL 32803a9b66dc3b2986679da0d1cc979f46d164e3e7c2357522b5bf71354b7fe7f03548520b1f728c50bcffe306d306acbc044336c18701c065f29cfd58aa4de1
-EBUILD lighttpd-1.4.33.ebuild 6744 SHA256 dc5822b11b6dc823c5a9ded841fcd3a7b531a55f58e9868b6cb44adcc68c5187 SHA512 37d832f986f9bd9f66ec277e2bcfb7dc4463ef15e159d16fdbcb313019d3423d979f5b82def14ac1796d947f481e1226adfab9ce16ab74f06c67a4fccbb531cd WHIRLPOOL 49d97491ca2e12a13f987add8667c396384ede1951853da56be1bf71642f62ded747eb794294ebb198b7f30f710489d66725bc53bccaeb917fc237269cb100cc
 EBUILD lighttpd-1.4.34.ebuild 6691 SHA256 57ec97ff478720f587b4c18732cfe9755429da8d05b34da833a024edc1990762 SHA512 a86dc991f705e13db22fbb73dceccb2d3a7fe3f095a422b1b5c44eae9d17cc44fbfd44e5bf5de64903934fcd160cda31b65fc844e72b2da746d4f596c9a6274b WHIRLPOOL cbbd6c5e0d775998e25926d7c3f6f75d82e1182e8b144f78c1d8151d8ece8192c5f82ba5fac4b2d72fb3ed22e5ca2aaa30ba82a81a1d640128e597086a326b8a
 EBUILD lighttpd-1.4.35.ebuild 6686 SHA256 5b8b4363b2147e737cfe25993415b3d87d35f799d4c1784050cadcf7e5fa309e SHA512 474209949176bbf78a2cc696f87eb02413c46c4cfe4087d77d9f983e70d0012766a58df0a1838f0dd84ab0ab519425f72db00dc26e66f6f88b3280a7d9b07cc8 WHIRLPOOL 02ca64f57a49917eb65ac0af019121e68e6e00041f1d4eeb373c4a19b7ab8bb02b263e9625f89486c1b69a05e5fd44889243d8845084c1af18f2580fbe9dcbc4
-MISC ChangeLog 65498 SHA256 fc9464fd378570a1a4f501ea5c7108d1a51f04cb32ac56120caa0af2afaf5ffc SHA512 44b7b88c29703a0e6aeb4f858ce20e1f63d2999eac71f8d6bc3f04dced19ded7285dbaf0982874333cb03089cba8d174a2c0f62998241cc37487180ca1db18fc WHIRLPOOL 2a5c54abe096563cb113846b0156e37fabaa18db9b58150b21a717011d9abc63b97e98c29c79a947172d7b157003b5f0ccf56c2424f2656daeb47774a876cf99
+MISC ChangeLog 65647 SHA256 7fcc38ea3667207dcee75f9bc201ed089dfeed31c8bc79885f3169ef4bc00d02 SHA512 f46a065d67a7586464019185dc08c1c90118c58fa82fa7d4c92e6abd134dbaa00d04cbfa051d5a730481cc9a9b41ddf55cff1d685760dd4b092214ef909ee447 WHIRLPOOL 8ad2e994c8f9bb5a4196ee8cb2c3eb2cae08c4bfd863bca5e6090f17c5b10aa1db99dd526a45eeca8f045365469b8b48baf18253e6f0f597c4a0147263f0000c
 MISC metadata.xml 1315 SHA256 4a5b911cadfb5f48332d4c252cabdae052af96232321f0171e5ed1fa7194abce SHA512 4ff65b32d294a5ff288eafb81561e4160db69bbea3fab90dc7e80135901ce7c6aded4743b88d3e52e936c73d71b2ddef7d65523e6f737fd76994776bb9a6ea77 WHIRLPOOL 83a654aa9c34b778cded6acad83aaa891d57b3effc220a4a006123beef73d69e075eeb580d9b5c3021535da8a8ec64a933d0d62bd1e8ab639ccff4f3592b92f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM7DoQACgkQkKaRLQcq0GL2iwCfRksKCQQx4GAnoB0NFcOmqCZT
-Y4gAoJX/PM63+RnIiQzYzOa+einDRGdu
-=8Cdj
+iQJ8BAEBCABmBQJTQSonXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88QnAP/0hvWIFTGtApXawDU2Z1eRwv
+HiYnp0aki87jzgVP9hDnWDBKEJ1wqvNuFKa4VRZt7zvaqkdsG6LuRAf9hXeIcu8M
+bwXOtt6w7FiSPWCQ8FozlgsTOWvgsZcELD0JWBOsvW1RuEtH6H47xxj3MRdIon4U
+HbIqnCBcamWb73UL0QxOBL2PECZOk9Ahg99rOyoJ2jn1epWMN7zcMexoiCvT1lWC
+PoVm+NCz8xQPO3xK9cvJ+keNFgic4DE8hscvZTN3IBz4CJI2ySZTjRU6ziU1pRoh
+1nzY5nr7KiU9OFR2wuN+HQel+j5PSYAjP4DkkS/DKwxnKcJSH7pOWNOqDIPjFTsq
+ciY/0emlJ9Fb/kuHR61Dp2SsTwp9dSA3z0ULtS8twVBo19hbpzwGaUqWVPFrkCXF
+1Ks1ulG7kQqgvOEiS3NHo7K+wjr4XqMD1/WztgewVUYcex81aSQTpsr+xuaSdKJD
+FJVfbykc4Qkc3fv+eMQ2WuFczXHXtyYJTtJGIS/kYQ8njd+LNLdFWvJlzqIj8nKR
+mgzwsFY45cOCjkYoO/OPU9VNhMaXzeONXm3dFOT98ubKJ0DgvxujMpunh/yql9M5
+GGpjza5vHwu0Wgn581JnvsIvItiu/6UmBXH//arqKMI/XhlRMaci8B5xJsLdKm+C
+g/W9A2IFYzpmwOeGpzeF
+=AUp1
 -----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/lighttpd-1.4.32-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.32-r2.ebuild
deleted file mode 100644
index e6095d97c19b..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.32-r2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.32-r2.ebuild,v 1.12 2013/09/22 09:36:05 pacho Exp $
-
-EAPI="4"
-inherit base autotools eutils depend.php readme.gentoo 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.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-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="
-	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 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	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 ) )
-	zlib? (	>=sys-libs/zlib-1.1 )"
-
-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="${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() {
-	base_src_prepare
-	#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"
-	# 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 \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(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 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 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"
-}
-
-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
-
-	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/lighttpd-1.4.32.ebuild b/www-servers/lighttpd/lighttpd-1.4.32.ebuild
deleted file mode 100644
index faa8399126a1..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.32.ebuild
+++ /dev/null
@@ -1,223 +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.32.ebuild,v 1.6 2012/11/25 19:04:53 armin76 Exp $
-
-EAPI="4"
-
-inherit base autotools eutils depend.php user
-
-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 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-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="
-	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 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	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 ) )
-	zlib? (	>=sys-libs/zlib-1.1 )"
-
-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="${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
-}
-
-src_prepare() {
-	base_src_prepare
-	#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"
-	# 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 \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(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 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
-	# 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/outdated/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate 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
-}
-
-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
-
-	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/lighttpd-1.4.33.ebuild b/www-servers/lighttpd/lighttpd-1.4.33.ebuild
deleted file mode 100644
index 139a399bde09..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.33.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.33.ebuild,v 1.2 2013/10/16 20:26:13 hwoarang Exp $
-
-EAPI="4"
-inherit base autotools eutils depend.php readme.gentoo 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.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-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="
-	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 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	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 ) )
-	zlib? (	>=sys-libs/zlib-1.1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-ipv6-build.patch )
-
-# 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() {
-	base_src_prepare
-	#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"
-	# 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 \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(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 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 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
-
-	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
-}