version bump

(Portage version: 2.1-r1)

4 files changed, 122 insertions, 5 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index f81dfd22d5a0..2869f30322e6 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,26 +1,33 @@
 # 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.24 2006/04/17 10:53:27 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.25 2006/07/18 06:52:35 bass Exp $
+
+*cherokee-0.5.4 (18 Jul 2006)
+
+  18 Jul 2006; J. Alberto Suárez López <bass@gentoo.org>
+  -cherokee-0.4.30.ebuild, -cherokee-0.5.0.ebuild, -cherokee-0.5.1.ebuild,
+  +cherokee-0.5.4.ebuild:
+  version bump
 
 *cherokee-0.5.2 (17 Apr 2006)
 
-  17 Apr 2006; J. Alberto Suárez López <bass@gentoo.orgrg>
+  17 Apr 2006; J. Alberto Suárez López <bass@gentoo.org>
   +cherokee-0.5.2.ebuild:
   New version. Important bugfix.
 
-  10 Apr 2006; J. Alberto Suárez López <bass@gentoo.orgrg>
+  10 Apr 2006; J. Alberto Suárez López <bass@gentoo.org>
   -cherokee-0.4.25.ebuild, -cherokee-0.4.29.ebuild, +cherokee-0.5.1.ebuild:
   New version
 
 *cherokee-0.5.1 (10 Apr 2006)
 
-  10 Apr 2006; J. Alberto Suárez López <bass@gentoo.orgrg>
+  10 Apr 2006; J. Alberto Suárez López <bass@gentoo.org>
   -cherokee-0.4.25.ebuild, -cherokee-0.4.29.ebuild, +cherokee-0.5.1.ebuild:
   New version
 
 *cherokee-0.5.0 (03 Apr 2006)
 
-  03 Apr 2006; J. Alberto Suárez López <bass@gentoo.ororg>
+  03 Apr 2006; J. Alberto Suárez López <bass@gentoo.oro>
   +cherokee-0.5.0.ebuild:
   Version bump. Added USE scgi and fcgi.
 
diff --git a/www-servers/cherokee/cherokee-0.5.4.ebuild b/www-servers/cherokee/cherokee-0.5.4.ebuild
new file mode 100644
index 000000000000..4f49ff1bb5c4
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.5.4.ebuild
@@ -0,0 +1,105 @@
+# 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.4.ebuild,v 1.1 2006/07/18 06:52:35 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 fastcgi 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}
+
+	# 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 fastcgi ; 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.2 b/www-servers/cherokee/files/digest-cherokee-0.5.2
index b0eac686a910..8b0118ee888e 100644
--- a/www-servers/cherokee/files/digest-cherokee-0.5.2
+++ b/www-servers/cherokee/files/digest-cherokee-0.5.2
@@ -1 +1,3 @@
 MD5 d7a2a590864b8ec27b9b116a2c8f1c6f cherokee-0.5.2.tar.gz 1547715
+RMD160 d2bb2ad3f1b8179ead0322d5cddf970a452cc6fa cherokee-0.5.2.tar.gz 1547715
+SHA256 a572e3077091f759b3e42133a2e98b4d2f2af52ab8ab0ac27d66e97e572c7338 cherokee-0.5.2.tar.gz 1547715
diff --git a/www-servers/cherokee/files/digest-cherokee-0.5.4 b/www-servers/cherokee/files/digest-cherokee-0.5.4
new file mode 100644
index 000000000000..4d539dfb9bf5
--- /dev/null
+++ b/www-servers/cherokee/files/digest-cherokee-0.5.4
@@ -0,0 +1,3 @@
+MD5 4e207961bc8204a2e2026391649dd8af cherokee-0.5.4.tar.gz 1556342
+RMD160 84420215c8eafef7bb4993d5d38d5ef3dd4ef5a8 cherokee-0.5.4.tar.gz 1556342
+SHA256 f44f16e8cf581ba8a7b22e4c9631e432967f43c9af50cf706432e8ad58a9c331 cherokee-0.5.4.tar.gz 1556342