4 files changed, 127 insertions, 2 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 55713083fa66..2830e09482ff 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.21 2006/01/19 11:25:44 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.22 2006/04/03 08:47:44 bass Exp $
+
+*cherokee-0.5.0 (03 Apr 2006)
+
+  03 Apr 2006; J. Alberto Suárez López <bass@gentoo.ororg>
+  +cherokee-0.5.0.ebuild:
+  Version bump. Added USE scgi and fcgi.
 
 *cherokee-0.4.30 (19 Jan 2006)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 7ed557c7bbc9..0a11eac3f778 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,7 +1,8 @@
-MD5 0c9be0514233d9893e4e9843beb73664 ChangeLog 8505
+MD5 4066c62b0d83e830d0c72d5bbff27dd2 ChangeLog 8665
 MD5 1e768d84a82e3580b461fffbc369445f cherokee-0.4.25.ebuild 2775
 MD5 3f2f950ec26314f7ad38fc402d518d86 cherokee-0.4.29.ebuild 2840
 MD5 4f52419400eefa01d2e747af6d8c1ab0 cherokee-0.4.30.ebuild 3084
+MD5 c044586d8cff81ec41825e31a4f78875 cherokee-0.5.0.ebuild 3267
 MD5 b44b2de7ebfdc07ee94d54a514a738f0 files/cherokee-0.4.17-cherokee.conf 2611
 MD5 13c50109a3ebd047c357fcf95f70bed7 files/cherokee-0.4.17-init.d 789
 MD5 e0af76fef298222ff6ad8e6e5aeb10d7 files/cherokee-0.4.21-no-handler_admin.diff 1151
@@ -12,4 +13,5 @@ MD5 a9f08f404f9b738a52e2c82c7ed88e04 files/cherokee-0.4.5-init.d 787
 MD5 bd3ba68faf6e5b4e83dfef434fcaa48f files/digest-cherokee-0.4.25 68
 MD5 1f1bbadf4636ffe419c566bfdd31a8e3 files/digest-cherokee-0.4.29 68
 MD5 58b1bf1602a172a1c435c1b63fc29eff files/digest-cherokee-0.4.30 68
+MD5 82f4b542845515ba0a8ce892bed1007f files/digest-cherokee-0.5.0 67
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
diff --git a/www-servers/cherokee/cherokee-0.5.0.ebuild b/www-servers/cherokee/cherokee-0.5.0.ebuild
new file mode 100644
index 000000000000..e9f0f36c9eeb
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.5.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.5.0.ebuild,v 1.1 2006/04/03 08:47:44 bass Exp $
+
+inherit eutils pam
+
+NAME=cherokee
+S="${WORKDIR}/${NAME}-${PV}"
+
+DESCRIPTION="An extremely fast and tiny web server."
+SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${NAME}-${PV}.tar.gz"
+HOMEPAGE="http://www.0x50.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="ipv6 ssl gnutls static doc pam fcgi scgi"
+
+RDEPEND=">=sys-libs/zlib-1.1.4-r1
+	gnutls? ( net-libs/gnutls )
+	ssl? ( dev-libs/openssl )
+	pam? ( virtual/pam )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7.5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+#     if use static ; then
+#         epatch ${FILESDIR}/${P}-fix-static.diff
+
+#         einfo "Regenerating automake/autoconf files"
+#         libtoolize --copy --force --automake || die "libtoolize failed"
+#         aclocal -I ${S}/m4 || die "aclocal failed"
+#         autoheader || die "autoheader failed"
+#         automake -a || die "automake failed"
+#         autoconf || die "autoconf failed"
+#     fi
+
+	# remove "doc" from SUBDIRS so that html docs don't get installed
+	# to the wrong place (/usr/share/doc/cherokee) and we can install
+	# them conditionally via dohtml in src_install.
+	sed -i -e 's|\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
+		die "sed Makefile.in failed"
+
+	# use cherokee user/group
+	sed -i -e 's|^#\(User \).*$|\1cherokee|' \
+		   -e 's|^#\(Group \).*$|\1cherokee|' cherokee.conf.sample.pre || \
+		   die "sed cherokee.conf failed"
+}
+
+src_compile() {
+	local myconf
+
+	if use ssl && use gnutls ; then
+		myconf="${myconf} --enable-tls=gnutls"
+	elif use ssl && ! use gnutls ; then
+		myconf="${myconf}  --enable-tls=openssl"
+	else
+		myconf="${myconf} --disable-tls"
+	fi
+
+	if use static ; then
+		myconf="${myconf} --enable-static --enable-static-module=all"
+	else
+		myconf="${myconf} --disable-static"
+	fi
+
+	if use fcgi ; then
+		myconf="${myconf} --enable-fcgi"
+	fi
+
+	if use scgi ; then
+		myconf="${myconf} --enable-scgi"
+	fi
+	
+	econf \
+		${myconf} \
+		$(use_enable pam) \
+		$(use_enable ipv6) \
+		--enable-os-string="Gentoo Linux" \
+		--with-wwwroot=/var/www/localhost/htdocs \
+		|| die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog INSTALL README TODO
+	use doc && dohtml -r doc/*
+
+	newpamd pam.d_cherokee ${PN} || die "newpamd failed"
+	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
+
+	# be nice and don't overwrite a user's pre-existing index.html
+	# (unless they're the same).
+	if [[ -f ${ROOT}/var/www/localhost/htdocs/index.html ]] ; then
+		diff ${ROOT}/var/www/localhost/htdocs/index.html \
+		${D}/var/www/localhost/htdocs/index.html &>/dev/null || \
+			mv ${D}/var/www/localhost/htdocs/{,cherokee-}index.html
+	fi
+}
+
+pkg_postinst() {
+	enewgroup cherokee
+	enewuser cherokee -1 -1 /var/www/localhost cherokee
+	echo
+	einfo "Since version 0.4.30 /etc/cherokee/mime.conf is deprecated so"
+	einfo "you need to update your cherokee.conf with: "
+	einfo "		""MimeFile /etc/cherokee/mime.types"
+	einfo "		""MimeFile /etc/cherokee/mime.compression.types"
+	echo
+}
diff --git a/www-servers/cherokee/files/digest-cherokee-0.5.0 b/www-servers/cherokee/files/digest-cherokee-0.5.0
new file mode 100644
index 000000000000..4fe6a69ba4fd
--- /dev/null
+++ b/www-servers/cherokee/files/digest-cherokee-0.5.0
@@ -0,0 +1 @@
+MD5 da7d4dd168c873d91e15a6feeb45e7ff cherokee-0.5.0.tar.gz 1547744