New version. Added : fastcgi depend and conversion scripts #270370

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 141 insertions, 2 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index fcef1d83aee5..2c217ee58ac2 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.54 2009/05/15 08:11:43 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.55 2009/06/22 07:34:21 bass Exp $
+
+*cherokee-0.99.17 (22 Jun 2009)
+
+  22 Jun 2009; J. Alberto Suárez López <bass@gentoo.org>
+  +cherokee-0.99.17.ebuild:
+  New version. Added : fastcgi depend and conversion scripts #270370
 
 *cherokee-0.99.15 (15 May 2009)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index c2bc848bfcd8..d9c0d1a8c86d 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,9 +1,11 @@
 AUX cherokee-initd-0.11 755 RMD160 834db29ec8492ea78d7f2698a8aaf327ec343d32 SHA1 82c1bc518f3439bf05daf0665caaafcd2ececac6 SHA256 9a666b509d62c27c46db88cec772a8758d54c18db2d02a8e2d3de6c712fdf2f9
 DIST cherokee-0.98.1.tar.gz 4169234 RMD160 04c65f3ca3c3e20102d36e4bc3972dbf634dc8ef SHA1 17c49dc2e78822810ce908af322a203d050f80c1 SHA256 29a14f12287c4e9ae394dde40eac7e2f8fa0eb0e9f39545a1ba053ec1231c9c6
 DIST cherokee-0.99.15.tar.gz 4637443 RMD160 3368a62696f276301e15c827dddafdb63080832a SHA1 ea15ee1314a9afcd5eafd76d954dc4c593c7ec9b SHA256 9fef14aa9960b7cfc38a7902882abd8b9edb0d9bf8a224381546f74cd00ede22
+DIST cherokee-0.99.17.tar.gz 4842829 RMD160 127ca53b78504b1bb7db51a6e9d08356c881a895 SHA1 d70cdb0cb285c75e966fb5b7779415193150a01f SHA256 bd5ab4ba6bdecd5ccbdcadb6122d9851ecd6ea2a269176b844397f93e16e1e8a
 DIST cherokee-0.99.9.tar.gz 4278030 RMD160 09f9a76c84bc2ea3c3f5da4033505c4f5af60e29 SHA1 0d2bfa80125692088983ecf6ba049e2fca2a6597 SHA256 9893507653086d22406367c66e11ce9836b4ff8dc57a12e218f4fc28f9e029cf
 EBUILD cherokee-0.98.1.ebuild 2732 RMD160 89fe69769563b9868d85b2cc39bab0ab74f2a088 SHA1 f01141fa7b7de9be7c7b26c9703a608e408c8f52 SHA256 d3001b48750b5546e0c07c500c3c0b5c5fa8b18cd873cb4f2cf002f90600c149
 EBUILD cherokee-0.99.15.ebuild 3155 RMD160 dc07271aa6c88b7a4393838ea26bc4edfb349388 SHA1 d3cf821e128670b4089a6e1291e09dded48b933e SHA256 1bf9eab07882114b57dd3fad63f03fa3822ed76ee422167651ac8f387edaea86
+EBUILD cherokee-0.99.17.ebuild 3640 RMD160 fb6bbb030307a82b32bfa8ab33153195a074113e SHA1 2c66e81d282aa548f78f89b9e5f7891f38d146ab SHA256 5d73c6741877af8d61333322ce246ac0df7efba240e1fddf3f1aee1cc16f6ee1
 EBUILD cherokee-0.99.9.ebuild 3156 RMD160 37ec726e59d1bcb495a8f5d7ba452fb766cc7258 SHA1 25d1635d39db9a45a4606c046db4a071c63cdeb0 SHA256 34964053f20a7cae2c4ca4ab55f8e25be82ec3c483bf1adf74f0e7570634c400
-MISC ChangeLog 15042 RMD160 a630625277787247079f95af0cf6741456c373c1 SHA1 d4dfe046961cb03b1d543b4890513d07e92a422c SHA256 5aae252d634e3c2c4a666567b565df48b50bb095ed6be86048b1f137852192f9
+MISC ChangeLog 15232 RMD160 8114bb9f0004987b87fc69fee6233a81d7abd843 SHA1 180abe9ac770c5266e6c0fdffe89127e40d5553c SHA256 e7b0673a79f8a50631c8bca1f7bdc2bad0ae6646d1da93ca831c8ee106faaf57
 MISC metadata.xml 434 RMD160 bac321b7879fe7793087b221f20554e4b44a5975 SHA1 d77a40137b169af1715d9827f463e2219485a931 SHA256 9cb0163ef5aadb0cafb83c75615bb3f393f5484016695abd15db7ff6d2680f8b
diff --git a/www-servers/cherokee/cherokee-0.99.17.ebuild b/www-servers/cherokee/cherokee-0.99.17.ebuild
new file mode 100644
index 000000000000..72109f387a25
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.99.17.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.99.17.ebuild,v 1.1 2009/06/22 07:34:21 bass Exp $
+
+inherit eutils pam versionator libtool
+
+DESCRIPTION="An extremely fast and tiny web server."
+SRC_URI="http://www.cherokee-project.com/download/$(get_version_component_range 1-2)/${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.cherokee-project.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug geoip ldap
+mysql ffmpeg fastcgi"
+
+RDEPEND="
+	>=sys-libs/zlib-1.1.4-r1
+	ssl? ( dev-libs/openssl )
+	pam? ( virtual/pam )
+	admin? ( dev-lang/python )
+	geoip? ( dev-libs/geoip )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	fastcgi? ( www-servers/spawn-fcgi )
+	ffmpeg? ( media-video/ffmpeg )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	local myconf
+
+	if use static ; then
+		myconf="${myconf} --enable-static --enable-static-module=all"
+	else
+		myconf="${myconf} --disable-static"
+	fi
+
+	if use debug ; then
+		myconf="${myconf} --enable-trace"
+	fi
+
+	local os="Unknown"
+	case "${CHOST}" in
+		*-freebsd*)
+			os="FreeBSD" ;;
+		*-netbsd*)
+			os="NetBSD" ;;
+		*-openbsd*)
+			os="OpenBSD" ;;
+		*)
+			os="Linux" ;;
+	esac
+
+	# No options to enable or disable ssl since Cherokee 0.11
+	econf \
+		${myconf} \
+		$(use_enable pam) \
+		$(use_enable ipv6) \
+		$(use_enable threads pthread) \
+		$(use_enable kernel_linux epoll) \
+		$(use_with geoip) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with ffmpeg) \
+		--disable-dependency-tracking \
+		--enable-os-string="Gentoo ${os}" \
+		--with-wwwroot=/var/www/localhost/htdocs \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		|| die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed"
+	dodoc AUTHORS ChangeLog
+
+	use pam && pamd_mimic system-auth cherokee auth account session
+	newinitd "${FILESDIR}/${PN}-initd-0.11" ${PN} || die "newinitd failed"
+
+	dodir /usr/share/doc/${PF}/contrib
+	insinto /usr/share/${PF}/contrib
+	doins contrib/07to08.py
+	doins contrib/08to09.py
+	doins contrib/09to010.py
+	doins contrib/011to098.py
+	doins contrib/098to099.py
+	doins contrib/0999to09910.py
+	doins contrib/mk-cert.sh
+
+	keepdir /etc/cherokee/mods-enabled /etc/cherokee/sites-enabled /var/www/localhost/htdocs
+
+	use coverpage || rm -rf "${D}"/var/www/localhost/htdocs/{index.html,images}
+	use admin || rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin
+
+}
+
+pkg_postinst() {
+	enewgroup cherokee
+	enewuser cherokee -1 -1 /var/www/localhost cherokee
+
+	# check if user/group was defined if not add it
+	gr="/bin/grep -q"
+	ec="/bin/echo"
+	$gr server\!user /etc/cherokee/cherokee.conf ; rtu=$?
+	$gr server\!group /etc/cherokee/cherokee.conf ; rtg=$?
+
+	[[ "x$rtu" == "x1" ]] && $ec server\!user = cherokee >> /etc/cherokee/cherokee.conf
+	[[ "x$rtg" == "x1" ]] && $ec server\!group = cherokee >> /etc/cherokee/cherokee.conf
+
+	if use admin ; then
+		echo  ""
+		elog "Just run 'cherokee-admin' and go to: http://localhost:9090"
+		echo  ""
+	else
+		echo  ""
+		elog "Try USE=admin if you want an easy way to configure cherokee."
+		echo  ""
+	fi
+
+	echo ""
+	elog "Config format can change in different versions. Check converter script in:"
+	elog "	  /usr/share/cherokee-0.99.15/contrib/"
+	elog "for example:"
+	elog "	  PYTHONPATH="/usr/share/cherokee/admin/" python \\"
+	elog "	  /usr/share/cherokee-0.99.15/contrib/0999to09910.py \\"
+	elog "	  /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15"
+
+}