bump version

Package-Manager: portage-2.1.4.4

4 files changed, 126 insertions, 5 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/Manifest b/www-servers/cherokee/Manifest
index aafcf542080a..934fe87e2a32 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -3,10 +3,12 @@ AUX cherokee-0.5.6-gnutls-pkgconfig.patch 553 RMD160 209761a11fb856b9465fbfd03c9
 AUX cherokee-0.5.6-replace-with-sed.patch 805 RMD160 b8398d4bcf86ef6480333382ee70fac21c39a355 SHA1 7ef02e1cf7ae62b87a448802fb03eb0f9a7ccdb0 SHA256 abcee67605d09ebf1c9ab397a8cb1e5c7a4ea1b50cada4b89a46a1bbf94223df
 AUX cherokee-0.5.6-sendfile-crosscompile.patch 615 RMD160 13359b59d8bd4a0971fc5fefbb1c3be6396f829e SHA1 a8b61dd4679dc6614c9351e36d3e73e44c595fcb SHA256 a6cb6bb6f70a62e241eaed9aa1900aa375ab287c1d5acabac6a58cdbe8ba4465
 AUX cherokee-initd-0.5.6 587 RMD160 50ab8f40e9258c96685373ad38f9440ca8b496b5 SHA1 b716cac0116c8177e8d0c8064b8500ed90619154 SHA256 09985375cc821db0c12fed621d505bad134acfb578432b1a940216f5e83a5551
-AUX cherokee-initd-0.6 609 RMD160 dfd17f050f9e5a3b53f99a15d099b7af771a1e60 SHA1 b4e011e27354bf52315826eb60d70fd42bcaf8d5 SHA256 bd2f0066f304addfad5a8720e4e04f42a469edbd0e0d4d0516ac19bb4a97a5ab
+AUX cherokee-initd-0.6 604 RMD160 6058ef7451ef99b5eb12525982be5b925da7cf64 SHA1 2dbf63f2496d82c0cebd3d3f06a6778ba771341b SHA256 d2bbc03010e9a2493fab60873ecbaeaa43263e0f476b2f28145f8c65151e1997
 DIST cherokee-0.5.6.tar.gz 1392282 RMD160 fd5661449bd845e3be1911490f02144a805f5c9f SHA1 5e437c2315782bc6ac1d98f8db3b7838313a229a SHA256 d19ac8a85c252ccfe04c06ce0ec9b03d036b27d07c6db4601ce7d6b33c4e9cc8
 DIST cherokee-0.6.0.tar.gz 2494621 RMD160 82def24f5ec981b86cb45f235ed3c829dc3a7d22 SHA1 8e9d0ea41e3c9f8e5895e2550c674988b2df078e SHA256 58c13ffc71f2c3ed03cd258fba8d4b916310559aae2bdc89f57f4e609cf9e42c
+DIST cherokee-0.6.1.tar.gz 2496364 RMD160 9672aa1336419d8f0808ee20f9f27074913a25f3 SHA1 947fd3e19203b334301515a91b5d895ac01239c8 SHA256 44f5ba40435b1dc8855d6c7ae4d52927eefd6f0ce4c2afb598aecba5e9ba576a
 EBUILD cherokee-0.5.6.ebuild 2673 RMD160 a9083e76122aef92f7cdaf74d1e1764dbdebe4ca SHA1 4018a37716e445136e38250e22906db30de07b9a SHA256 25225e0b44aacb9e9eaf5de68f5e544023153b6ac40e8fd8581392a6b3cb2f4f
 EBUILD cherokee-0.6.0.ebuild 2935 RMD160 8c9466dc2b9781542fc73a2819d17455bc2d0fae SHA1 1037760ebbed189e8efa1f0016d00bcf0c22b37f SHA256 de4c43d5b718be5baf0225403d0484134d50a7699f4fe0fe8449e3e6f0cd8bd2
-MISC ChangeLog 12167 RMD160 fd95e94c06647d9b4c05634269c716b311b7d4db SHA1 5c729492ca0f867c9b402df944b1ff3ccd4a13d8 SHA256 fab15a4b79935301ee24e907412637554ac3feab322d4852d2bbae2622df2a62
+EBUILD cherokee-0.6.1.ebuild 2930 RMD160 169ffece4800f7b71dfb148f6c7b511a23927b8b SHA1 34d1b996f8bbd03251e88d520ab9baad13283b4d SHA256 45a617be66c11eda3bfb9360587e07af8439c7c7647d7018d04409becb55ee24
+MISC ChangeLog 12325 RMD160 424b50050a382e6967f781c2b3169979145541a7 SHA1 d1b33604efa8f8f7c629ff43fa70ab5b737a1d79 SHA256 7d5687ab6e8583b4a378008fe3227065a72ae065611ee324751c4ff47829b997
 MISC metadata.xml 278 RMD160 289661471d4556515a01a6ddffe61500fbddfadc SHA1 0b1c28d6446aba4197173c104b24151fa362dbd6 SHA256 db15e152ee6f7005958cf6e736c0c2527d872993f571df5603a3fe8009a77653
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 $?
 }