Fix deps and removed all the unnecessary confutils stuff. Removed mod-cache,mod-chat, and mod-localizer from IUSE since they're no longer provided. Fixes bug 82010. Also removed vulnerable 1.3.5.

(Portage version: 2.0.51.16)

5 files changed, 19 insertions, 113 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 18df1086c7c4..fd172dcdd81e 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.11 2005/02/14 14:48:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.12 2005/02/16 17:15:42 ka0ttic Exp $
+
+  16 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> lighttpd-1.3.10-r1.ebuild,
+  -lighttpd-1.3.5.ebuild:
+  Fix deps and removed all the unnecessary confutils stuff. Removed
+  mod-cache,mod-chat, and mod-localizer from IUSE since they're no longer
+  provided. Fixes bug 82010. Also removed vulnerable 1.3.5.
 
 *lighttpd-1.3.10-r1 (14 Feb 2005)
 
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index bc156b03d77d..d1bcc1f5b2bd 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,9 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4750f33210e9131c3697e0b093b27325 lighttpd-1.3.5.ebuild 2345
-MD5 63143a483ef2147c02dfdddd14ce9e6e lighttpd-1.3.10-r1.ebuild 2639
-MD5 4753d378825a19a5cc4048787b45cc3b ChangeLog 3935
+MD5 23149b2d5a837758efa0b3abed3ffed9 lighttpd-1.3.10-r1.ebuild 2155
+MD5 891b04c8de1fcf62255a4801d181d066 ChangeLog 4240
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
@@ -13,13 +9,5 @@ MD5 dcfa5883c3433b49204b6b4de25a9a3c files/lighttpd-1.2.2.initd 800
 MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67
 MD5 1b01aa98985e773539dc8b6dc0be977f files/lighttpd-1.3.10-upstream.diff 1974
 MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971
-MD5 0cf0d92da4da90a9fc4f1b9a58b4eb1e files/digest-lighttpd-1.3.5 66
 MD5 40dd57c102e7cefdabf25bff26e5124c files/lighttpd-1.1.8-gentoo.diff 1577
 MD5 faeefb6d35a7cd7b4a2b4b78d63622f7 files/lighttpd-1.3.10-gentoo.diff 1777
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCE1fBEZCkKN40op4RAm9GAJ45SKZP2hdPXpypG6wxU7JFtCPP/gCfdJQY
-FyT5KaJPROGvOpyXLNAt0SY=
-=33Oz
------END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.5 b/www-servers/lighttpd/files/digest-lighttpd-1.3.5
deleted file mode 100644
index be21c3d9ca52..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 15afeba95fa157e3bdedd9a1a22358a0 lighttpd-1.3.5.tar.gz 628719
diff --git a/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild b/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild
index 354ec6d06103..0fa24d99fd79 100644
--- a/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild,v 1.1 2005/02/14 14:48:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild,v 1.2 2005/02/16 17:15:42 ka0ttic Exp $
 
-inherit eutils confutils
+inherit eutils
 
 DESCRIPTION="lightweight high-performance web server"
 HOMEPAGE="http://www.lighttpd.net/"
@@ -10,11 +10,12 @@ SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
-IUSE="mysql ssl php modchat modcache modlocalizer xattr ldap"
+IUSE="mysql ssl php xattr ldap"
 RDEPEND="virtual/libc
+		app-arch/bzip2
 		>=dev-libs/libpcre-3.1
 		>=sys-libs/zlib-1.1
-		>=dev-libs/localizer-0.3.3
+		ldap? ( >=net-nds/openldap-2.1.26 )
 		mysql? ( >=dev-db/mysql-4.0.0 )
 		ssl? ( >=dev-libs/openssl-0.9.7 )
 		php? (
@@ -41,19 +42,11 @@ src_unpack() {
 src_compile() {
 	local my_conf="--libdir=/usr/$(get_libdir)/${PN}"
 
-	#                       extension		USE flag		shared?
-	# -----------------------------------------------------------------
-	enable_extension_enable mod-chat 		modchat			0
-	enable_extension_enable mod-cache		modcache		0
-	enable_extension_enable mod-localizer		modlocalizer		0
-	enable_extension_enable attr			xattr			0
-	enable_extension_enable ldap			ldap			0
-	enable_extension_enable openssl			ssl			0
-	enable_extension_enable mysql			mysql			0
-	# -----------------------------------------------------------------
-	#                       extension		USE flag		shared?
-
-	econf ${my_conf} || die "econf failed"
+	econf ${my_conf} \
+		$(use_with mysql) \
+		$(use_with ldap) \
+		$(use_with xattr attr) \
+		$(use_with ssl openssl) || die "econf failed"
 
 	emake || die "emake failed"
 }
diff --git a/www-servers/lighttpd/lighttpd-1.3.5.ebuild b/www-servers/lighttpd/lighttpd-1.3.5.ebuild
deleted file mode 100644
index 98d4f2b906de..000000000000
--- a/www-servers/lighttpd/lighttpd-1.3.5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.5.ebuild,v 1.3 2005/01/07 07:55:05 swegener Exp $
-
-inherit eutils confutils
-
-DESCRIPTION="lightweight high-performance web server"
-HOMEPAGE="http://jan.kneschke.de/projects/lighttpd/"
-SRC_URI="http://jan.kneschke.de/projects/lighttpd/download/${P}.tar.gz"
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="mysql ssl php modchat modcache modlocalizer xattr ldap"
-RDEPEND="virtual/libc
-		>=dev-libs/libpcre-3.1
-		>=sys-libs/zlib-1.1
-		>=dev-libs/localizer-0.3.3
-		mysql? ( >=dev-db/mysql-4.0.0 )
-		ssl? ( >=dev-libs/openssl-0.9.7 )
-		php? (
-			>=dev-php/php-cgi-4.3.0
-			net-www/spawn-fcgi
-		)"
-
-LIGHTTPD_DIR="/var/www/localhost/htdocs/"
-LOG_DIR="/var/log/lighttpd/"
-
-pkg_setup() {
-	enewuser lighttpd -1 /bin/false "${LIGHTTPD_DIR}" nofiles
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-1.1.8-gentoo.diff
-
-	if useq php ; then
-		epatch ${FILESDIR}/${PN}-1.2.2-php.diff
-	fi
-}
-
-src_compile() {
-	local my_conf="--libdir=/usr/$(get_libdir)/${PN}"
-
-	#                       extension		USE flag		shared?
-	# -----------------------------------------------------------------
-	enable_extension_enable mod-chat 		modchat			0
-	enable_extension_enable mod-cache		modcache		0
-	enable_extension_enable mod-localizer		modlocalizer		0
-	enable_extension_enable attr			xattr			0
-	enable_extension_enable ldap			ldap			0
-	enable_extension_enable openssl			ssl			0
-	enable_extension_enable mysql			mysql			0
-	# -----------------------------------------------------------------
-	#                       extension		USE flag		shared?
-
-	econf ${my_conf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	insinto /etc
-	doins doc/lighttpd.conf || die "doins failed"
-
-	newinitd ${FILESDIR}/${PN}-1.2.2.initd ${PN} || die "newinitd failed"
-
-	keepdir ${LIGHTTPD_DIR} ${LOG_DIR} || die "keepdir failed"
-	fowners lighttpd:root ${LOG_DIR} || die "fowners failed"
-
-	dodoc README COPYING doc/fastcgi.txt doc/authentification.txt || die "dodoc failed"
-	newdoc doc/lighttpd.conf lighttpd.conf.example || die "newdoc failed"
-}
-
-pkg_postinst () {
-	einfo "lighttpd.conf has moved from /etc/conf.d to /etc"
-}