New version

Package-Manager: portage-2.0.54

7 files changed, 36 insertions, 155 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 2830e09482ff..a424c2086998 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,16 @@
 # 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.22 2006/04/03 08:47:44 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.23 2006/04/10 12:27:40 bass Exp $
+
+  10 Apr 2006; J. Alberto Suárez López <bass@gentoo.orgrg>
+  -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>
+  -cherokee-0.4.25.ebuild, -cherokee-0.4.29.ebuild, +cherokee-0.5.1.ebuild:
+  New version
 
 *cherokee-0.5.0 (03 Apr 2006)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index f1b32b5630ee..144e5bd2e178 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,61 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4066c62b0d83e830d0c72d5bbff27dd2 ChangeLog 8665
-RMD160 06880120f059b6522cc26f561265602ea027d225 ChangeLog 8665
-SHA256 225f46b522eb93ac5d947bfdffeab4a28dba118ea8cb70a164ca38b274488b9c ChangeLog 8665
-MD5 1e768d84a82e3580b461fffbc369445f cherokee-0.4.25.ebuild 2775
-RMD160 6e8a07a1c018d9c8bea676004d82c45f1c1897d1 cherokee-0.4.25.ebuild 2775
-SHA256 14b9c6e8ed1bfe6b2cd7fa222609cc75fc264b4af549bc9d5e83ed66a28626c3 cherokee-0.4.25.ebuild 2775
-MD5 3f2f950ec26314f7ad38fc402d518d86 cherokee-0.4.29.ebuild 2840
-RMD160 63e3b3119985d61372148f239aed27b9a03e4242 cherokee-0.4.29.ebuild 2840
-SHA256 e04a69489432e885b5e2a7204336419b01ffdf9bae57ec2fbb31ddc20fc89cf0 cherokee-0.4.29.ebuild 2840
+MD5 2dbbb05bc34077e172ca27dc70158a6e ChangeLog 9000
 MD5 4f52419400eefa01d2e747af6d8c1ab0 cherokee-0.4.30.ebuild 3084
-RMD160 0dde73b6a368f096bad949abe026f7278058ca15 cherokee-0.4.30.ebuild 3084
-SHA256 d4df7c1ef1c8698399d9e8c076d6a8c0411d420a2a52f13bd0aba0b8435ed125 cherokee-0.4.30.ebuild 3084
 MD5 b41957984b97b592f9de7ac9c20f289c cherokee-0.5.0.ebuild 3272
-RMD160 88602057e45f99daf86430103e8ed342bae48300 cherokee-0.5.0.ebuild 3272
-SHA256 cbeddca26c4635ace56230f24248dd9823d7bbdedb27696363cb80654f890798 cherokee-0.5.0.ebuild 3272
+MD5 39a7be3ecf0f0b28664386440e187ca5 cherokee-0.5.1.ebuild 3272
 MD5 b44b2de7ebfdc07ee94d54a514a738f0 files/cherokee-0.4.17-cherokee.conf 2611
-RMD160 441af0dfa47c5763d9ecb2c11f6b406290c4a304 files/cherokee-0.4.17-cherokee.conf 2611
-SHA256 25cef07b8af365bb2a5823403b14e5b3d05c7cae5883242e2c9a47ec2fea6399 files/cherokee-0.4.17-cherokee.conf 2611
 MD5 13c50109a3ebd047c357fcf95f70bed7 files/cherokee-0.4.17-init.d 789
-RMD160 c6b6dac2177cd74c53abe46cee9716961992e0c0 files/cherokee-0.4.17-init.d 789
-SHA256 e1070c02cce1c5b7be9057f4a05c3661032b3d9803be0163d6afbfa262300062 files/cherokee-0.4.17-init.d 789
 MD5 e0af76fef298222ff6ad8e6e5aeb10d7 files/cherokee-0.4.21-no-handler_admin.diff 1151
-RMD160 a010ae5e819b5a5261f6043ffe5825b6451439fa files/cherokee-0.4.21-no-handler_admin.diff 1151
-SHA256 8121a28f895bed2e7bf7ec2ea6b0c4ab5427b7e53171ae9c55ec4fd4398513b7 files/cherokee-0.4.21-no-handler_admin.diff 1151
 MD5 29f1a34d26b0830d4a62b2b42241b64a files/cherokee-0.4.25-fix-static.diff 728
-RMD160 1050a97e0d1079c677b98fc80e6e0598eb50c4db files/cherokee-0.4.25-fix-static.diff 728
-SHA256 757bae8f9b034bacb3c93ef6d6f5a90d0c4773a39114f02caa81118a087d2819 files/cherokee-0.4.25-fix-static.diff 728
 MD5 6da94000869b804248b03d61703b69bb files/cherokee-0.4.5-Makefile.am.patch 956
-RMD160 02bece0e5ce8d864e8a091b9c65aa045bc4af111 files/cherokee-0.4.5-Makefile.am.patch 956
-SHA256 f41cfdac2a19f845db52f5c87d1390f9c1748ee7b7e1dfd982e0d7698b80c1ea files/cherokee-0.4.5-Makefile.am.patch 956
 MD5 8278b4acda7637c68885863ddd58f712 files/cherokee-0.4.5-cherokee.conf 2769
-RMD160 386569def6468f60da16bef9e3e6a7dfea5d7eea files/cherokee-0.4.5-cherokee.conf 2769
-SHA256 8539b59f4eeba27084256cca03e6283af4f795bdccacb2a44f565e0a3d0490b5 files/cherokee-0.4.5-cherokee.conf 2769
 MD5 a9f08f404f9b738a52e2c82c7ed88e04 files/cherokee-0.4.5-init.d 787
-RMD160 7e042b3a11c7bd6c7c1ba9c51bffe80f79c161f5 files/cherokee-0.4.5-init.d 787
-SHA256 ab3f9239cafd50e1f47b9c0236f168f4596b484eea479cd7243f48758204f433 files/cherokee-0.4.5-init.d 787
-MD5 bd3ba68faf6e5b4e83dfef434fcaa48f files/digest-cherokee-0.4.25 68
-RMD160 dcf8e96765ce3dae7ff92d67a839faf07c3984a5 files/digest-cherokee-0.4.25 68
-SHA256 516ec8aebdcbeb661284a0973241384e18eee530428cedf5a6efd4cd8a2c406c files/digest-cherokee-0.4.25 68
-MD5 1f1bbadf4636ffe419c566bfdd31a8e3 files/digest-cherokee-0.4.29 68
-RMD160 94762c70dfddd1833e15a55acdcc3635be09cb0c files/digest-cherokee-0.4.29 68
-SHA256 ff428bc38852bc6dbaa05c3a451a0212c5f3493da9418e56fd66e70fa795f4c4 files/digest-cherokee-0.4.29 68
 MD5 58b1bf1602a172a1c435c1b63fc29eff files/digest-cherokee-0.4.30 68
-RMD160 189f5e5a639c5b8a3ec20f828232b070f229dd56 files/digest-cherokee-0.4.30 68
-SHA256 860878968707fb334931c3330f27a2e4717b9eee0713fa6a321775bb5b5fc69e files/digest-cherokee-0.4.30 68
 MD5 82f4b542845515ba0a8ce892bed1007f files/digest-cherokee-0.5.0 67
-RMD160 a169fd0326d461781bd04e1719378299740beaca files/digest-cherokee-0.5.0 67
-SHA256 e063966a9a5463f5fc9c964469f0d552051dbc5c53f8d4f7be98778f86f33d42 files/digest-cherokee-0.5.0 67
+MD5 6fb4fb1a87bde8a4d09047345076137b files/digest-cherokee-0.5.1 67
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
-RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 metadata.xml 165
-SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c metadata.xml 165
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENY6AI1lqEGTUzyQRAqJ5AJ4/7HOn/dqGAT4kj6vfbcR8swMeagCeLEAc
-Yo5MAyXGRhCuZ7oLZLDtTjY=
-=f3It
------END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-0.4.25.ebuild b/www-servers/cherokee/cherokee-0.4.25.ebuild
deleted file mode 100644
index f62056f03873..000000000000
--- a/www-servers/cherokee/cherokee-0.4.25.ebuild
+++ /dev/null
@@ -1,99 +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/cherokee/cherokee-0.4.25.ebuild,v 1.4 2005/12/27 09:19:48 bass Exp $
-
-inherit eutils pam
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.0x50.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE="ipv6 ssl gnutls static doc pam"
-
-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
-
-	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
-}
diff --git a/www-servers/cherokee/cherokee-0.4.29.ebuild b/www-servers/cherokee/cherokee-0.5.1.ebuild
index 3804d977391e..4a9cc1397fbc 100644
--- a/www-servers/cherokee/cherokee-0.4.29.ebuild
+++ b/www-servers/cherokee/cherokee-0.5.1.ebuild
@@ -1,17 +1,20 @@
 # 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.4.29.ebuild,v 1.3 2006/01/19 07:25:30 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.5.1.ebuild,v 1.1 2006/04/10 12:27:40 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}/${P}.tar.gz"
+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"
+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 )
@@ -65,6 +68,14 @@ src_compile() {
 		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) \
@@ -96,4 +107,10 @@ src_install () {
 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.4.25 b/www-servers/cherokee/files/digest-cherokee-0.4.25
deleted file mode 100644
index 8e418451330d..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.25
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d6c1a6e9a83ca0b881f45f946e3f3c6 cherokee-0.4.25.tar.gz 1419364
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.29 b/www-servers/cherokee/files/digest-cherokee-0.4.29
deleted file mode 100644
index 1419a9678b0e..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.29
+++ /dev/null
@@ -1 +0,0 @@
-MD5 854e6e61a69781746496012658d8ef98 cherokee-0.4.29.tar.gz 1474498
diff --git a/www-servers/cherokee/files/digest-cherokee-0.5.1 b/www-servers/cherokee/files/digest-cherokee-0.5.1
new file mode 100644
index 000000000000..a575d4dd0330
--- /dev/null
+++ b/www-servers/cherokee/files/digest-cherokee-0.5.1
@@ -0,0 +1 @@
+MD5 9835a293044ab1592d61550c1f26f1b2 cherokee-0.5.1.tar.gz 1546966