version bump, solves #319915 #319543 #318663

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

3 files changed, 154 insertions, 2 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 3f572580722b..dd497547481e 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.64 2010/04/30 09:41:45 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.65 2010/05/17 09:18:19 bass Exp $
+
+*cherokee-1.0.0 (17 May 2010)
+
+  17 May 2010; J. Alberto Suárez López <bass@gentoo.org>
+  +cherokee-1.0.0.ebuild:
+  version bump, solves #319915 #319543 #318663
 
 *cherokee-0.99.48 (30 Apr 2010)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index a124b1e2b478..d25c391de848 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -3,9 +3,11 @@ DIST cherokee-0.99.30.tar.gz 4608868 RMD160 7921cf235079e225f7411b1897226fdcc346
 DIST cherokee-0.99.42.tar.gz 5244378 RMD160 1af716a88414ca8c9c38f432cf500989828ba64f SHA1 b5cc065868b565e28c98a4900d3697c03fae1f68 SHA256 66548f100f66197c7b4935a234bcd915d503282bb82b792280e486042931fb1b
 DIST cherokee-0.99.44.tar.gz 6369072 RMD160 cae555b42afee166231bff37e5f53c71e9b455bb SHA1 005b0c9781732cc325c58e61612bd1b97dcea2dc SHA256 1030951ff694d87b4ff22fac9e978bd82e085a5e0466abb881686be3eef87b70
 DIST cherokee-0.99.48.tar.gz 4871636 RMD160 5d4c8b263515aff668668b0b685d0d7baf7ba6b5 SHA1 624e41926527ddafe9e753a9d39be74da69c0cfd SHA256 405c012e05207100ab1a6f18135da330972f17ffe6de5275d659601eab1503b6
+DIST cherokee-1.0.0.tar.gz 5143468 RMD160 0f5c3975772379a6f495ceb0f6f3ed1f4feb6da7 SHA1 8ab1fa32b73d317345938eaa6c2dd88882d1f0c9 SHA256 c7d3d185aaeb3ed5811dba32dcc8a00ff64b4f0eec86461cf0911d0540efbaad
 EBUILD cherokee-0.99.30.ebuild 3374 RMD160 056f4b9f797f3477a6a7edf84b02e3e74d33e9a6 SHA1 fbe87d224cb99c6d1ded3dcbfcbf88410f84ffc8 SHA256 61638788132ccc0743542c3a80a493a0028cf96f57ebcdc7d220941066b2481e
 EBUILD cherokee-0.99.42.ebuild 3898 RMD160 94aae50a66f9405afa2f9d605f5f155c343d056a SHA1 d09f2ac977e57a2caaab7df2f69a98112df87810 SHA256 4c6eb36445327e7168953d1cb62ff5a56396a9be3bf2cc80e4767bea9afe83d2
 EBUILD cherokee-0.99.44.ebuild 3898 RMD160 3ae910e22670f339543369eae9fff16310c70212 SHA1 f046f83e606de05538e9e1e302e11025e9a84d95 SHA256 4cd902166e4fcca9f77c8ce500fab32ae7c94a72995c33ef49ef6bdf446c531a
 EBUILD cherokee-0.99.48.ebuild 3897 RMD160 f5097665c8414cfcedf07a909e1fd41d0012a958 SHA1 841fd81a42044e0eb603392afc8a4fdbc25dd192 SHA256 dd343d39ec389af8dfe34df8ae3b4970db28e0af4aca7db0403a33c3efd3944b
-MISC ChangeLog 16615 RMD160 325bdd4d3a856a6d48b8bc649af860d8a7cd750e SHA1 0f15469e167b1634209294c10fcd3d41cc6b0bda SHA256 d96900040980015b073eedb5fe2cce5dd0c626683ac18ab161a782085ee7eb36
+EBUILD cherokee-1.0.0.ebuild 3998 RMD160 aadec3646b0a02124597df90092ddf0d326733b8 SHA1 3518558016952038e1a3fc186572e84db30bb992 SHA256 18df3510de5f04fb67c8108f691520cc436e674be45415eb7127a37589b0ef27
+MISC ChangeLog 16779 RMD160 1494e457791e570ba106b73c4419c2190f26e7d8 SHA1 8a2966e04505d4b7f7e70b4758848f904595d860 SHA256 1935cdf0f275bc5f26f838b441a13b40232ac2b359be5030fe1e649aea09d19b
 MISC metadata.xml 434 RMD160 bac321b7879fe7793087b221f20554e4b44a5975 SHA1 d77a40137b169af1715d9827f463e2219485a931 SHA256 9cb0163ef5aadb0cafb83c75615bb3f393f5484016695abd15db7ff6d2680f8b
diff --git a/www-servers/cherokee/cherokee-1.0.0.ebuild b/www-servers/cherokee/cherokee-1.0.0.ebuild
new file mode 100644
index 000000000000..33bfaab2872c
--- /dev/null
+++ b/www-servers/cherokee/cherokee-1.0.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.0.ebuild,v 1.1 2010/05/17 09:18:19 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 ~amd64"
+IUSE="ipv6 nls ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi"
+
+RDEPEND="
+	>=sys-libs/zlib-1.1.4-r1
+	net-analyzer/rrdtool
+	nls? ( sys-devel/gettext )
+	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 nls) \
+		$(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 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.99.23" ${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/make-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}
+	if use admin ; then
+		exeinto /usr/share/cherokee/admin
+		doexe admin/server.py
+	else
+		rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin
+	fi
+
+	# Puts logs in /var/log/cherokee/
+	dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf
+
+
+}
+
+pkg_postinst() {
+	enewgroup cherokee
+	enewuser cherokee -1 -1 /var/www/localhost cherokee
+	install -o cherokee -g cherokee -m0775 -d "${ROOT}"var/log/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"
+
+}