bump version

(Portage version: 2.1.4.4)

3 files changed, 122 insertions, 3 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index c9e0fa6dc9d0..d141483f5372 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.37 2008/03/17 16:22:32 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.38 2008/03/25 10:39:34 bass Exp $
+
+*cherokee-0.6.1 (25 Mar 2008)
+
+  25 Mar 2008; J. Alberto Suárez López <bass@gentoo.org>
+  files/cherokee-initd-0.6, +cherokee-0.6.1.ebuild:
+  bump version
 
   17 Mar 2008; J. Alberto Suárez López <bass@gentoo.org>
   cherokee-0.6.0.ebuild:
diff --git a/www-servers/cherokee/cherokee-0.6.1.ebuild b/www-servers/cherokee/cherokee-0.6.1.ebuild
new file mode 100644
index 000000000000..1ac5006c5260
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.6.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.6.1.ebuild,v 1.1 2008/03/25 10:39:34 bass Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils pam versionator libtool autotools
+
+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="~amd64 ~ppc ~sparc ~x86"
+IUSE="ipv6 ssl gnutls static pam coverpage threads kernel_linux admin"
+
+RDEPEND=">=sys-libs/zlib-1.1.4-r1
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+	)
+	pam? ( virtual/pam )
+	admin? ( dev-lang/python )"
+DEPEND="${RDEPEND}"
+
+#S="${WORKDIR}/${P}b1240"
+
+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
+
+	local os="Unknown"
+	case "${CHOST}" in
+		*-freebsd*)
+			os="FreeBSD" ;;
+		*-netbsd*)
+			os="NetBSD" ;;
+		*-openbsd*)
+			os="OpenBSD" ;;
+		*)
+			os="Linux" ;;
+	esac
+
+	econf \
+		${myconf} \
+		$(use_enable pam) \
+		$(use_enable ipv6) \
+		$(use_enable threads pthread) \
+		$(use_enable kernel_linux epoll) \
+		--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 TODO
+
+	newpamd pam.d_cherokee ${PN} || die "newpamd failed"
+	newinitd "${FILESDIR}/${PN}-initd-0.6" ${PN} || die "newinitd failed"
+
+	dodir /usr/share/doc/${PF}/contrib
+	insinto /usr/share/${PF}/contrib
+	doins contrib/05to06.py
+
+	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
+
+	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 a easy way to configure cherokee."
+		echo  ""
+	fi
+
+	echo ""
+	elog "Cherokee conf is quite different in 0.6.x series. You must use"
+	elog " cherokee-admin to create a new config or use	/usr/share/doc/${PF}/contrib/05to06.py"
+	elog " to export your old config (not ever works)."
+	echo ""
+}
diff --git a/www-servers/cherokee/files/cherokee-initd-0.6 b/www-servers/cherokee/files/cherokee-initd-0.6
index 6f9c7cfd0c8d..fec415393ba7 100644
--- a/www-servers/cherokee/files/cherokee-initd-0.6
+++ b/www-servers/cherokee/files/cherokee-initd-0.6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/files/cherokee-initd-0.6,v 1.1 2008/03/17 16:02:18 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/files/cherokee-initd-0.6,v 1.2 2008/03/25 10:39:35 bass Exp $
 
 PIDFILE=/var/run/cherokee-guardian.pid
 
@@ -18,7 +18,7 @@ start() {
 
 stop() {
 	ebegin "Stopping Cherokee Web Server"
-	start-stop-daemon --stop -s 9 --pidfile ${PIDFILE} \
+	start-stop-daemon --stop --pidfile ${PIDFILE} \
 		--exec /usr/sbin/cherokee-guardian
 	eend $?
 }