Version bump. Fix: #256617 #210830 #240458

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.25-gentoo-r8 i686

3 files changed, 24 insertions, 30 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 0c066852bfe1..39b43ffa3a80 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.45 2008/12/26 09:05:53 bass Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.46 2009/02/02 09:12:26 bass Exp $
+
+*cherokee-0.98.1 (02 Feb 2009)
+
+  02 Feb 2009; J. Alberto Suárez López <bass@gentoo.org>
+  -cherokee-0.11.6.ebuild, +cherokee-0.98.1.ebuild:
+  Version bump. Fix: #256617 #210830 #240458
 
   26 Dec 2008; J. Alberto Suárez López <bass@gentoo.org> ChangeLog:
   Version bump
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 26eb0c6c670a..e2d640740b54 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,6 +1,3 @@
------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
@@ -9,18 +6,11 @@ AUX cherokee-0.7.2-signed_unsigned_char.patch 489 RMD160 0f48eb630ddac51fbb6d27c
 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.11.6.tar.gz 2857892 RMD160 a069e4ed440fcc104fe0ee8ca87c9f82298c75d6 SHA1 8ea85f6ed5bdfe2cfaa5045e5af6f61f40284b52 SHA256 c3409be1e15807fc17470952e14fd70166cb35fec52b910e1d54f60ff7fb99bb
 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
-EBUILD cherokee-0.11.6.ebuild 2624 RMD160 c621f65d320d85948e226a0a7ee3612f1b2b1e8a SHA1 b2dd97ae846bfee416694a66a903a1811d54c7b2 SHA256 c5da8d2d8bf19c76eae8375332e2811c9166b2389b4cba542521f057b8ab3380
+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
-MISC ChangeLog 13423 RMD160 569951869c3ffcc644c3f95090d9e99993c9ece6 SHA1 187b42ef5d53fc84fdeb05dced1c9f79c41e0021 SHA256 c8222b239128e85d4cdba83b0103908208d18e6d96cb3c7fe8c6c46eba2bb84f
+EBUILD cherokee-0.98.1.ebuild 2608 RMD160 23e759b35ea87d9ffb021288df904ab59fc6d08a SHA1 9ef5e262c988db41e44960eb9e2cef7c727d9ff2 SHA256 9a8c7af244cf072e9a9b81e24577edde99ddd949acb7916ab6e3723abfc3e59a
+MISC ChangeLog 13612 RMD160 0dfb12231e120f1cf6a91479070d63ad3d91ae12 SHA1 5be11775c1a359436bb0f23daccb2230fd59ebee SHA256 e2172e16711ac825729c4900b294075659df20ce2f6d4d993368d0624147824d
 MISC metadata.xml 434 RMD160 bac321b7879fe7793087b221f20554e4b44a5975 SHA1 d77a40137b169af1715d9827f463e2219485a931 SHA256 9cb0163ef5aadb0cafb83c75615bb3f393f5484016695abd15db7ff6d2680f8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklWuNwACgkQ/ejvha5XGaMx+ACgp7iK1Pk4E8YYsj6SXv3k0Kw4
-VKEAoPPhpZug14Lw3po1Uax5aFrHga7c
-=7VZX
------END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-0.11.6.ebuild b/www-servers/cherokee/cherokee-0.98.1.ebuild
index 1cebe2ef9846..f60c900a6189 100644
--- a/www-servers/cherokee/cherokee-0.11.6.ebuild
+++ b/www-servers/cherokee/cherokee-0.98.1.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.11.6.ebuild,v 1.1 2008/12/26 09:04:43 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.98.1.ebuild,v 1.1 2009/02/02 09:12:26 bass Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -13,8 +13,8 @@ HOMEPAGE="http://www.cherokee-project.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin"
+KEYWORDS="~x86"
+IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug"
 
 RDEPEND=">=sys-libs/zlib-1.1.4-r1
 	ssl? ( dev-libs/openssl )
@@ -25,18 +25,16 @@ DEPEND="${RDEPEND}"
 src_compile() {
 	local myconf
 
-	if use ssl ; 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*)
@@ -49,6 +47,7 @@ src_compile() {
 			os="Linux" ;;
 	esac
 
+	# No options to enable or disable ssl since Cherokee 0.11
 	econf \
 		${myconf} \
 		$(use_enable pam) \
@@ -68,18 +67,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"
+	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/09to10.py
+	doins contrib/09to010.py
+	doins contrib/011to098.py
 
 	keepdir /etc/cherokee/mods-enabled /etc/cherokee/sites-enabled /var/www/localhost/htdocs