bump version

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

3 files changed, 131 insertions, 2 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 4b5d4deacc8e..5d7cf7eacd58 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.60 2009/10/22 08:01:02 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.61 2009/11/30 16:47:38 bass Exp $
+
+*cherokee-0.99.30 (30 Nov 2009)
+
+  30 Nov 2009; J. Alberto Suárez López <bass@gentoo.org>
+  +cherokee-0.99.30.ebuild:
+  bump version
 
 *cherokee-0.99.24 (22 Oct 2009)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 345aec1ae006..1a5df93180cc 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -2,7 +2,9 @@ AUX cherokee-initd-0.11 755 RMD160 834db29ec8492ea78d7f2698a8aaf327ec343d32 SHA1
 AUX cherokee-initd-0.99.23 542 RMD160 e0ee20b7bb781797c3a53d0e2804e8b0fe985beb SHA1 4a8b43509aa4b9bf1079e0e74ca9d61428672522 SHA256 9e58ed7b3050a17fed08cc682e30dfa14e09eb804084b6cc9b213ccd0843300f
 DIST cherokee-0.99.22.tar.gz 4694070 RMD160 5c72e2da9a2d1083c3fb42756522f72add8fdc79 SHA1 a2160355aee36b4a3bcde0fec3c0c8cdb8c2e91d SHA256 f35bcf0515aeb527aa33529d0845811663a908f5b43475542219035220052adc
 DIST cherokee-0.99.24.tar.gz 5171459 RMD160 390132101b80c040583ebb41b003469b26a69c57 SHA1 a4a81bd9a99ba631f93f593d25a3c69acf8c7455 SHA256 0581b5eafba9a993d035467c51bfa85fa76ca46043fab95e6f7592ad8f4f38e1
+DIST cherokee-0.99.30.tar.gz 4608868 RMD160 7921cf235079e225f7411b1897226fdcc3464250 SHA1 608e1ce0b067d67d138c4f8329016537dd30dabe SHA256 5395f8bb1b4a9600f688aebea2dded64aa2e9cca4ed2ee7cb40a5d9aa07487c5
 EBUILD cherokee-0.99.22.ebuild 3841 RMD160 c38508dbc1b4c66904c45dc636e216a1b7e4e5ed SHA1 746d6550c37fbc41f981740b6ffb74329fe75c47 SHA256 d946dd351cd82cec6e5f6131bbe72719f0118cec0dabb4cf10c94fb37d05640d
 EBUILD cherokee-0.99.24.ebuild 3898 RMD160 ce92d438d6cb5ee1069d251699798189442fb513 SHA1 ccec244761552bcda89182a2dde384c5223779e8 SHA256 a2b6f2229efd5246b0b53f3f82d989cfeb4220417bacbeb7bbb536b55a1170cd
-MISC ChangeLog 15932 RMD160 29e0c68a4bce20ce096e567a46e657dfb35b95b3 SHA1 ba2914af9ec9ed274886a5173124e721680c7135 SHA256 73a5f5b25aa88ad33779ef8573d740e7a7b02b6103d2713bf4f59417f87d45bf
+EBUILD cherokee-0.99.30.ebuild 3374 RMD160 056f4b9f797f3477a6a7edf84b02e3e74d33e9a6 SHA1 fbe87d224cb99c6d1ded3dcbfcbf88410f84ffc8 SHA256 61638788132ccc0743542c3a80a493a0028cf96f57ebcdc7d220941066b2481e
+MISC ChangeLog 16068 RMD160 d9d7427f94ec77a3e7b9c3783bf68aa9e87362b2 SHA1 312f416425f7b425a4ee9e2d9861a8d4fae5de08 SHA256 b641fabfa89b46ff4fc4ea144a41d31a083fe3ef29056754a138053275dcfcf6
 MISC metadata.xml 434 RMD160 bac321b7879fe7793087b221f20554e4b44a5975 SHA1 d77a40137b169af1715d9827f463e2219485a931 SHA256 9cb0163ef5aadb0cafb83c75615bb3f393f5484016695abd15db7ff6d2680f8b
diff --git a/www-servers/cherokee/cherokee-0.99.30.ebuild b/www-servers/cherokee/cherokee-0.99.30.ebuild
new file mode 100644
index 000000000000..6705915c17f6
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.99.30.ebuild
@@ -0,0 +1,121 @@
+# 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.30.ebuild,v 1.1 2009/11/30 16:47:38 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
+	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 -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.99.23" ${PN} || die "newinitd failed"
+
+	dodir /usr/share/doc/${PF}/contrib
+	insinto /usr/share/${PF}/contrib
+	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}
+	use admin || rm -rf "${D}"/usr/sbin/admin "${D}"/usr/share/cherokee/admin
+
+	# 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
+}