Version bump.

(Portage version: 2.0.51.22-r1)

8 files changed, 120 insertions, 24 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 1bfccefa1ab4..a02f2fd1103f 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2005/07/12 13:46:30 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.23 2005/07/17 11:57:52 ka0ttic Exp $
+
+*lighttpd-1.3.15 (17 Jul 2005)
+
+  17 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> lighttpd-1.3.10-r1.ebuild,
+  lighttpd-1.3.13-r1.ebuild, lighttpd-1.3.13-r3.ebuild,
+  lighttpd-1.3.14-r1.ebuild, +lighttpd-1.3.15.ebuild:
+  Version bump.
 
 *lighttpd-1.3.14-r1 (12 Jul 2005)
 
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 4ad97619ee00..5a6c3ea08703 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6f6e484b00d4e8aec2543f9f9e2cca00 lighttpd-1.3.14-r1.ebuild 2476
-MD5 01b5ea9b6aa9a88852ed91bb7b9256b7 lighttpd-1.3.10-r1.ebuild 2181
-MD5 6cb6272eff577cd6f6c300091c117e1b lighttpd-1.3.13-r1.ebuild 2353
-MD5 f877df365bac7754166eaeb5da06e293 lighttpd-1.3.13-r3.ebuild 2475
-MD5 31fe5cc3ae401ede12e4ce3cd5454cd7 ChangeLog 6679
+MD5 44a8dcd87df0b35b464eb9dbe7e6f2e6 lighttpd-1.3.15.ebuild 2483
+MD5 44a8dcd87df0b35b464eb9dbe7e6f2e6 lighttpd-1.3.14-r1.ebuild 2483
+MD5 6a2af275a075eb7ffb93874bd711e2d8 lighttpd-1.3.10-r1.ebuild 2181
+MD5 b93b30f056d92347b8d1de9b02dcc8cd lighttpd-1.3.13-r1.ebuild 2360
+MD5 d2992615c39a662f3b3ce747393a23a0 lighttpd-1.3.13-r3.ebuild 2482
+MD5 966ae002e7c7664088bcbbeae1c0a865 ChangeLog 6914
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
@@ -18,16 +16,10 @@ MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67
 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r1 67
 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r3 67
 MD5 c18826cf0d687fd3c9fb6456e60c28d6 files/digest-lighttpd-1.3.14-r1 67
+MD5 2299a6229d7b298b7b0f66d611c041d9 files/digest-lighttpd-1.3.15 67
 MD5 1b01aa98985e773539dc8b6dc0be977f files/lighttpd-1.3.10-upstream.diff 1974
 MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971
 MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
 MD5 0c57eeef1963af5add8b9608e0bc0d0f files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
 MD5 faeefb6d35a7cd7b4a2b4b78d63622f7 files/lighttpd-1.3.10-gentoo.diff 1777
 MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC08nLEZCkKN40op4RAqfLAKCoVSIVr6k3ArP5worvPBS2E8RQLgCeJUh2
-vfpmMQKIrSWuEhBC9bK7Tl0=
-=WRJ5
------END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.15 b/www-servers/lighttpd/files/digest-lighttpd-1.3.15
new file mode 100644
index 000000000000..ca59f54ede2d
--- /dev/null
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.3.15
@@ -0,0 +1 @@
+MD5 e605ade1071f25dec9001730ec753112 lighttpd-1.3.15.tar.gz 702088
diff --git a/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild b/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild
index f2f3d0603e38..631dc393d4d9 100644
--- a/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2005/07/02 12:44:23 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild,v 1.5 2005/07/17 11:57:52 ka0ttic Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="mysql ssl php xattr ldap"
 
 RDEPEND="virtual/libc
diff --git a/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild
index 2271131462f4..3f77163e03d6 100644
--- a/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.13-r1.ebuild,v 1.3 2005/07/12 13:46:30 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild,v 1.4 2005/07/17 11:57:52 ka0ttic Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mysql ssl php xattr ldap"
 
 RDEPEND="virtual/libc
diff --git a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
index 0b2932ea32e5..88508f16ce80 100644
--- a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.13-r3.ebuild,v 1.3 2005/07/12 13:46:30 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild,v 1.4 2005/07/17 11:57:52 ka0ttic Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mysql ssl php xattr ldap"
 
 RDEPEND="virtual/libc
diff --git a/www-servers/lighttpd/lighttpd-1.3.14-r1.ebuild b/www-servers/lighttpd/lighttpd-1.3.14-r1.ebuild
index b1f6487c0876..ea71bae24393 100644
--- a/www-servers/lighttpd/lighttpd-1.3.14-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.14-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.14-r1.ebuild,v 1.1 2005/07/12 13:46:30 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.14-r1.ebuild,v 1.2 2005/07/17 11:57:52 ka0ttic Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mysql ssl php xattr ldap"
 
 RDEPEND="virtual/libc
diff --git a/www-servers/lighttpd/lighttpd-1.3.15.ebuild b/www-servers/lighttpd/lighttpd-1.3.15.ebuild
new file mode 100644
index 000000000000..9d03cbcbae7e
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.3.15.ebuild
@@ -0,0 +1,96 @@
+# 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.15.ebuild,v 1.1 2005/07/17 11:57:52 ka0ttic Exp $
+
+inherit eutils
+
+RESTRICT="test"
+
+DESCRIPTION="lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mysql ssl php xattr ldap"
+
+RDEPEND="virtual/libc
+		app-arch/bzip2
+		>=dev-libs/libpcre-3.1
+		>=sys-libs/zlib-1.1
+		ldap? ( >=net-nds/openldap-2.1.26 )
+		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() {
+	enewgroup lighttpd
+	enewuser lighttpd -1 /bin/false "${LIGHTTPD_DIR}" lighttpd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff
+	epatch ${FILESDIR}/${PN}-1.3.13-no-mysql-means-no-mysql.diff
+	epatch ${FILESDIR}/${PN}-1.3.13-zope-deserves-lovins-too.diff
+	epatch ${FILESDIR}/${PN}-1.3.13-valid-user.diff
+	epatch ${FILESDIR}/${PN}-1.3.13-ldap-binddn.diff
+	use php && epatch ${FILESDIR}/${PN}-1.3.13-php.diff
+}
+
+src_compile() {
+	local my_conf="--libdir=/usr/$(get_libdir)/${PN}"
+
+	einfo "Regenerating automake/autoconf files"
+	autoreconf -f -i || die "autoreconf 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"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc
+	doins doc/lighttpd.conf || die "doins failed"
+
+	newinitd ${FILESDIR}/${PN}-1.3.10.initd ${PN}
+
+	if use php ; then
+		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi
+		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi
+	fi
+
+	keepdir ${LIGHTTPD_DIR} ${LOG_DIR} || die "keepdir failed"
+	fowners lighttpd:lighttpd ${LOG_DIR} || die "fowners failed"
+
+	dodoc README COPYING
+	cd doc
+	dodoc *.txt *.sh *.ps.gz
+	newdoc lighttpd.conf lighttpd.conf.example || die "newdoc failed"
+}
+
+pkg_postinst () {
+	echo
+	einfo "lighttpd.conf has moved from /etc/conf.d to /etc"
+	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
+		einfo
+		einfo "spawn-fcgi is now included with lighttpd"
+		einfo "spawn-fcgi's init script configuration is now located"
+		einfo "at /etc/conf.d/spawn-fcgi."
+	fi
+	echo
+}