New version and new USE flags.

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

5 files changed, 53 insertions, 172 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 1d95b8803519..2e9d49d2691b 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,13 @@
 # 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.47 2009/02/03 12:45:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.48 2009/04/01 12:50:05 bass Exp $
+
+*cherokee-0.99.8 (01 Apr 2009)
+
+  01 Apr 2009; J. Alberto Suárez López <bass@gentoo.org>
+  -files/cherokee-initd-0.5.6, -cherokee-0.8.1.ebuild,
+  -cherokee-0.9.0.ebuild, +cherokee-0.99.8.ebuild:
+  New version and new USE flags.
 
   03 Feb 2009; Petteri Räty <betelgeuse@gentoo.org> cherokee-0.98.1.ebuild:
   Block lighttpd until spawn-fcgi collision is fixed. See bug #224781.
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index b7fbb65b6cd3..595bf71a5fd3 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,26 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cherokee-0.5.6-epoll-crosscompile.patch 1255 RMD160 4c7586674523e0577a669b3de30c9dba25618e57 SHA1 8cca53172f668d451b718702c5f5d0b0a8d6cfe8 SHA256 81415ea4588c7bdfe430be85b6b75f5fcdaa7c5915166d059874b08945192e60
 AUX cherokee-0.5.6-gnutls-pkgconfig.patch 553 RMD160 209761a11fb856b9465fbfd03c989c5cf956e785 SHA1 b6d4909f59174752deb27000ec1753de4a29b2f5 SHA256 a660b0dbf728d29b3645f4407702c9d230852885c72afa06e0d55cbde157dbb8
 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-0.7.2-signed_unsigned_char.patch 489 RMD160 0f48eb630ddac51fbb6d27c20305a619af7f1e73 SHA1 6277713dcfaaaa8a63d9cec664534f59c56d7f92 SHA256 720e6db3a41db6c998e9885fa2ecd246807e5eb86d553216507ff450fd49febb
 AUX cherokee-initd-0.11 755 RMD160 834db29ec8492ea78d7f2698a8aaf327ec343d32 SHA1 82c1bc518f3439bf05daf0665caaafcd2ececac6 SHA256 9a666b509d62c27c46db88cec772a8758d54c18db2d02a8e2d3de6c712fdf2f9
-AUX cherokee-initd-0.5.6 587 RMD160 50ab8f40e9258c96685373ad38f9440ca8b496b5 SHA1 b716cac0116c8177e8d0c8064b8500ed90619154 SHA256 09985375cc821db0c12fed621d505bad134acfb578432b1a940216f5e83a5551
 AUX cherokee-initd-0.6 604 RMD160 6058ef7451ef99b5eb12525982be5b925da7cf64 SHA1 2dbf63f2496d82c0cebd3d3f06a6778ba771341b SHA256 d2bbc03010e9a2493fab60873ecbaeaa43263e0f476b2f28145f8c65151e1997
-DIST cherokee-0.8.1.tar.gz 3052809 RMD160 5a085701f272fcb29775bce4983c8f379e925213 SHA1 4715771aa304a2207766fe4390672b4a2050c6aa SHA256 d159eae221221492bfc4d6139926480d713d84c50a00807e0725f7af2e1d6c9f
-DIST cherokee-0.9.0.tar.gz 3024326 RMD160 7f29e9c9e0b4e67830466d463e90da6ca254de9e SHA1 ff05c660f460d04677924391031d133460f83de0 SHA256 d266e2adf77d9b9e0d72f63695da1d03dfd86f38830bbb8d4a8482df2f89ef41
-DIST cherokee-0.98.1.tar.gz 4169234 RMD160 04c65f3ca3c3e20102d36e4bc3972dbf634dc8ef SHA1 17c49dc2e78822810ce908af322a203d050f80c1 SHA256 29a14f12287c4e9ae394dde40eac7e2f8fa0eb0e9f39545a1ba053ec1231c9c6
-EBUILD cherokee-0.8.1.ebuild 2692 RMD160 53f4e5e0167e2a2ccbc3ecc7741bc4b21d91d044 SHA1 df5df4235b7862ccc5aa99df8bf2976601c1c732 SHA256 e8bd56d511ec9874e63cf0840312b2e30381c1f30b571e93c43c616111617275
-EBUILD cherokee-0.9.0.ebuild 2692 RMD160 bd16838bc62021424868fa8d3532821bbdbe2eed SHA1 38c280f9ffe1e0f6e0ba48ff0c3ca60fc8dd4cad SHA256 4f2a91aab836d5e4ec006457f9c0b1b6c2aef7cd701286a246614f18ca016947
+DIST cherokee-0.98.1.tar.gz 1874587 RMD160 ff32654cd4d719af614497db4ca252f53e7028a1 SHA1 2a23e8d8858ad964f9f8eb07ccad3a729e629cb9 SHA256 03baf543abea1a7e5ac0970a01d385697acc86878de10e0f321270bd9cb3eb65
+DIST cherokee-0.99.8.tar.gz 4271275 RMD160 5587362885b2802567795086f23d27e286aeed7d SHA1 c5841618fdae2b4e7f965539ad6b079dc70d3867 SHA256 977e9b06ce144ed54f4a5060832751928a09fe6ae43e50aff860dc8e0aa99eb2
 EBUILD cherokee-0.98.1.ebuild 2732 RMD160 89fe69769563b9868d85b2cc39bab0ab74f2a088 SHA1 f01141fa7b7de9be7c7b26c9703a608e408c8f52 SHA256 d3001b48750b5546e0c07c500c3c0b5c5fa8b18cd873cb4f2cf002f90600c149
-MISC ChangeLog 13767 RMD160 bbc444714c5ccbad0636681fabfaa2dcaa6f81cd SHA1 4404a613c3ad383006fe3258d4997a66f65c8867 SHA256 e8fbedbeb08f2c992435ee84c1bd5e88842b68bc231edac20353e14a1bd3d24f
+EBUILD cherokee-0.99.8.ebuild 3319 RMD160 5c41b970e04fa8b5982e0e1d04c64166e70909b8 SHA1 a3e54246e068d4fa1dfa591648093c6673e6bd00 SHA256 0834f33b4ed222415f98cce434cb5f93eaf3e21f6f738d71fba539c690247254
+MISC ChangeLog 13992 RMD160 f3a9bb5dbdc6554d48e6a4d11885ba975d39af9d SHA1 8489c7bcfc259929aa6a3921e2f41ad80a80905d SHA256 53a4bccc36f530af01a48c7a6915babd71c9869f8d63386fca98f410e1c681ce
 MISC metadata.xml 434 RMD160 bac321b7879fe7793087b221f20554e4b44a5975 SHA1 d77a40137b169af1715d9827f463e2219485a931 SHA256 9cb0163ef5aadb0cafb83c75615bb3f393f5484016695abd15db7ff6d2680f8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmIPOsACgkQcxLzpIGCsLSnqwCfUk+65CECWpVH8uHV6L2IgnfT
-OXEAn2BeE4cdIhaFpyTsllR8wrWgxpI5
-=IsDu
------END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-0.9.0.ebuild b/www-servers/cherokee/cherokee-0.9.0.ebuild
deleted file mode 100644
index 94aaa4d563e3..000000000000
--- a/www-servers/cherokee/cherokee-0.9.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.9.0.ebuild,v 1.1 2008/09/28 17:16:23 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}"
-
-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
-	doins contrib/06to07.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
-}
diff --git a/www-servers/cherokee/cherokee-0.8.1.ebuild b/www-servers/cherokee/cherokee-0.99.8.ebuild
index a6677a16e873..7d6787e0c5ba 100644
--- a/www-servers/cherokee/cherokee-0.8.1.ebuild
+++ b/www-servers/cherokee/cherokee-0.99.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.8.1.ebuild,v 1.1 2008/09/02 19:58:52 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.99.8.ebuild,v 1.1 2009/04/01 12:50:05 bass Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -13,35 +13,36 @@ 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 )
-	)
+KEYWORDS="~x86"
+IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg"
+
+# lighttpd block should be resolved properly
+# http://bugs.gentoo.org/show_bug.cgi?id=224781
+RDEPEND="
+	!www-servers/lighttpd
+	>=sys-libs/zlib-1.1.4-r1
+	ssl? ( dev-libs/openssl )
 	pam? ( virtual/pam )
-	admin? ( dev-lang/python )"
+	admin? ( dev-lang/python )
+	geoip? ( dev-libs/geoip )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	ffmpeg? ( media-video/ffmpeg )"
 DEPEND="${RDEPEND}"
 
 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
 
+	if use debug ; then
+		myconf="${myconf} --enable-trace"
+	fi
+
 	local os="Unknown"
 	case "${CHOST}" in
 		*-freebsd*)
@@ -54,12 +55,17 @@ src_compile() {
 			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 \
@@ -73,15 +79,17 @@ src_compile() {
 
 src_install () {
 	emake -j1 DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed"
-	dodoc AUTHORS ChangeLog TODO
+	dodoc AUTHORS ChangeLog
 
-	newpamd pam.d_cherokee ${PN} || die "newpamd failed"
-	newinitd "${FILESDIR}/${PN}-initd-0.6" ${PN} || die "newinitd failed"
+	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/05to06.py
-	doins contrib/06to07.py
+	doins contrib/07to08.py
+	doins contrib/08to09.py
+	doins contrib/09to010.py
+	doins contrib/011to098.py
 
 	keepdir /etc/cherokee/mods-enabled /etc/cherokee/sites-enabled /var/www/localhost/htdocs
 
@@ -94,6 +102,15 @@ 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"
diff --git a/www-servers/cherokee/files/cherokee-initd-0.5.6 b/www-servers/cherokee/files/cherokee-initd-0.5.6
deleted file mode 100644
index 9e7b325c9338..000000000000
--- a/www-servers/cherokee/files/cherokee-initd-0.5.6
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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.5.6,v 1.1 2006/12/27 02:37:08 flameeyes Exp $
-
-PIDFILE=/var/run/cherokee.pid
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Cherokee Web Server"
-	start-stop-daemon --start --pidfile ${PIDFILE} \
-		--exec /usr/sbin/cherokee -- -b
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Cherokee Web Server"
-	start-stop-daemon --stop --pidfile ${PIDFILE} \
-		--exec /usr/sbin/cherokee
-	eend $?
-}