New version

Package-Manager: portage-2.1.1

4 files changed, 125 insertions, 15 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 3f2b5c9c0071..023c343d43db 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,13 +1,19 @@
 # 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.26 2006/08/31 10:40:38 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.27 2006/09/23 13:13:26 bass Exp $
+
+*cherokee-0.5.5 (23 Sep 2006)
+
+  23 Sep 2006; J. Alberto Suárez López <bass@gentoo.org>
+  +cherokee-0.5.5.ebuild:
+  new version
+
+*cherokee-0.5.4 (18 Jul 2006)
 
   31 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> ChangeLog:
   Removed the wrong byte out of 16 May 2005 changelog entry, makeing it no
   longer irritate the pager less, Bug #144860.
 
-*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:
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 5672b1047d30..5c1b3e8c5f6e 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -37,18 +37,14 @@ EBUILD cherokee-0.5.4.ebuild 2863 RMD160 f62fd734a087609c9fdbb2065f8e94cbfca505b
 MD5 8fc09b4e0debf486dfc926e704a87169 cherokee-0.5.4.ebuild 2863
 RMD160 f62fd734a087609c9fdbb2065f8e94cbfca505b9 cherokee-0.5.4.ebuild 2863
 SHA256 0fefb6fb2742c9bd3cd81e50f243f3573d37b61a58cef968f1e76cec6e2534d7 cherokee-0.5.4.ebuild 2863
-EBUILD cherokee-0.5.5.ebuild 2863 RMD160 f62fd734a087609c9fdbb2065f8e94cbfca505b9 SHA1 9c774bf9f6d13154f03ebbdf05f720fdf5ee1527 SHA256 0fefb6fb2742c9bd3cd81e50f243f3573d37b61a58cef968f1e76cec6e2534d7
-MD5 8fc09b4e0debf486dfc926e704a87169 cherokee-0.5.5.ebuild 2863
-RMD160 f62fd734a087609c9fdbb2065f8e94cbfca505b9 cherokee-0.5.5.ebuild 2863
-SHA256 0fefb6fb2742c9bd3cd81e50f243f3573d37b61a58cef968f1e76cec6e2534d7 cherokee-0.5.5.ebuild 2863
-MISC .#Manifest.1.53 6735 RMD160 30a072ea44f130d0952e7be5dc05c73f51966a5c SHA1 fd1342958d3574e8613f74c97376707666678a51 SHA256 5cb2cdfe807864a01c88fa93367ca2c5c3e713493a749bdf7c6fd42aa739ab63
-MD5 a5e810d705210802d6ef287381117372 .#Manifest.1.53 6735
-RMD160 30a072ea44f130d0952e7be5dc05c73f51966a5c .#Manifest.1.53 6735
-SHA256 5cb2cdfe807864a01c88fa93367ca2c5c3e713493a749bdf7c6fd42aa739ab63 .#Manifest.1.53 6735
-MISC ChangeLog 9537 RMD160 0c392b806246beef167c7380f723ad1a693710e9 SHA1 7e4444c1be221d7165a5859d29ae77863cf685c8 SHA256 91c587ee5ec3dae558d92ca646f203f2c96ba1bfe747d764e01e61117bc44afc
-MD5 29506bf7ea5f8f6c9b30147520eb0bbb ChangeLog 9537
-RMD160 0c392b806246beef167c7380f723ad1a693710e9 ChangeLog 9537
-SHA256 91c587ee5ec3dae558d92ca646f203f2c96ba1bfe747d764e01e61117bc44afc ChangeLog 9537
+EBUILD cherokee-0.5.5.ebuild 2863 RMD160 e529339d693867b3bef277aed4d61ed8ffb34787 SHA1 d5dbb9343e0141d7299adf6d08548d246fda2224 SHA256 264470536aa097c72685e4e3ad04099a0bbea7899c2dd3f3b50954caf8d9ad1c
+MD5 93ace1c152fe51ca8bc95850d943a686 cherokee-0.5.5.ebuild 2863
+RMD160 e529339d693867b3bef277aed4d61ed8ffb34787 cherokee-0.5.5.ebuild 2863
+SHA256 264470536aa097c72685e4e3ad04099a0bbea7899c2dd3f3b50954caf8d9ad1c cherokee-0.5.5.ebuild 2863
+MISC ChangeLog 9668 RMD160 ab19049623be4c424fdf2900594eaeb340caaa69 SHA1 b612569aeb8f7535abe3892113c203742e0200a1 SHA256 3f2a35bcc47ff6cf40dfa95ec59b54a83df10281ee2061754ad82a6e3313b02f
+MD5 a2817c729464df6e16e7021e8ff77072 ChangeLog 9668
+RMD160 ab19049623be4c424fdf2900594eaeb340caaa69 ChangeLog 9668
+SHA256 3f2a35bcc47ff6cf40dfa95ec59b54a83df10281ee2061754ad82a6e3313b02f ChangeLog 9668
 MISC metadata.xml 165 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 SHA1 f13cc4199505863990c257fe060882a5f9a32aab SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 metadata.xml 165
diff --git a/www-servers/cherokee/cherokee-0.5.5.ebuild b/www-servers/cherokee/cherokee-0.5.5.ebuild
new file mode 100644
index 000000000000..f12c555a42fe
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.5.5.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.5.ebuild,v 1.1 2006/09/23 13:13:26 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.5 b/www-servers/cherokee/files/digest-cherokee-0.5.5
new file mode 100644
index 000000000000..6e7d0591a1c8
--- /dev/null
+++ b/www-servers/cherokee/files/digest-cherokee-0.5.5
@@ -0,0 +1,3 @@
+MD5 fb891b3da7eb921c09a5eb93e296f5e1 cherokee-0.5.5.tar.gz 1559655
+RMD160 04564efc2caa96f5622450ae9ab0b3d87adabbd3 cherokee-0.5.5.tar.gz 1559655
+SHA256 e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a cherokee-0.5.5.tar.gz 1559655