7 files changed, 13 insertions, 469 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 697e5cfa705e..6f3de13251e3 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2008/09/02 19:58:52 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.44 2008/09/28 17:16:23 bass Exp $
+
+*cherokee-0.9.0 (28 Sep 2008)
+
+  28 Sep 2008; J. Alberto Suárez López <bass@gentoo.org>
+  -cherokee-0.5.6.ebuild, -cherokee-0.6.0.ebuild, -cherokee-0.6.1.ebuild,
+  -cherokee-0.7.0.ebuild, -cherokee-0.7.2.ebuild, +cherokee-0.9.0.ebuild:
+  Version bump
 
 *cherokee-0.8.1 (02 Sep 2008)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 09703b4c0635..b320af90d710 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -5,17 +5,9 @@ AUX cherokee-0.5.6-sendfile-crosscompile.patch 615 RMD160 13359b59d8bd4a0971fc5f
 AUX cherokee-0.7.2-signed_unsigned_char.patch 489 RMD160 0f48eb630ddac51fbb6d27c20305a619af7f1e73 SHA1 6277713dcfaaaa8a63d9cec664534f59c56d7f92 SHA256 720e6db3a41db6c998e9885fa2ecd246807e5eb86d553216507ff450fd49febb
 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.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
-DIST cherokee-0.7.0.tar.gz 2590422 RMD160 991a4f08dd5ade1b250f98d9234a65d8a6fc4487 SHA1 33d3668b641b7f4b7d361169f0c389d97d4720b5 SHA256 559ef38b2ab4b8fc04986cc58a2fdef12b04f55795dcf7133d80426c692a2910
-DIST cherokee-0.7.2.tar.gz 2593067 RMD160 40daf7aab840d8c7cbdaada52a4af3d1e75e2270 SHA1 cb5ec6752737afae3505d1387b52a4230ec21f42 SHA256 55178338db38effa01ca3e02091c59696549e60c229a7b2a6b07028d38f79e7d
 DIST cherokee-0.8.1.tar.gz 3052809 RMD160 5a085701f272fcb29775bce4983c8f379e925213 SHA1 4715771aa304a2207766fe4390672b4a2050c6aa SHA256 d159eae221221492bfc4d6139926480d713d84c50a00807e0725f7af2e1d6c9f
-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
-EBUILD cherokee-0.6.1.ebuild 2930 RMD160 169ffece4800f7b71dfb148f6c7b511a23927b8b SHA1 34d1b996f8bbd03251e88d520ab9baad13283b4d SHA256 45a617be66c11eda3bfb9360587e07af8439c7c7647d7018d04409becb55ee24
-EBUILD cherokee-0.7.0.ebuild 2935 RMD160 7a61a44224241d78a927d7c60d2d0b2e6af866fd SHA1 ed3401bdf0720cb09f3a2fbc229a0d89fd055418 SHA256 5121a635f69fb2fae23c756dc4010314843d891a7a282cf143d4f92faea55152
-EBUILD cherokee-0.7.2.ebuild 3053 RMD160 208fdcb929f62ee57dfbf490636fd2331c3ea42c SHA1 36fa723e55beebecf164e5fac9a457f72c484f84 SHA256 2a5fe00dbc9e40a3b11b014b443c719cf9c1536251106b294cc12bf66dfd0af3
+DIST cherokee-0.9.0.tar.gz 3024326 RMD160 7f29e9c9e0b4e67830466d463e90da6ca254de9e SHA1 ff05c660f460d04677924391031d133460f83de0 SHA256 d266e2adf77d9b9e0d72f63695da1d03dfd86f38830bbb8d4a8482df2f89ef41
 EBUILD cherokee-0.8.1.ebuild 2692 RMD160 53f4e5e0167e2a2ccbc3ecc7741bc4b21d91d044 SHA1 df5df4235b7862ccc5aa99df8bf2976601c1c732 SHA256 e8bd56d511ec9874e63cf0840312b2e30381c1f30b571e93c43c616111617275
-MISC ChangeLog 13083 RMD160 2f063eef3caf9a665bbf57435748f94286437fea SHA1 930b00b9b2cc5699c8accdc925b4d66eb8321bf4 SHA256 de3744c7ea7c5a5706187ad38fa4a25b3a93a269223ea20784c1190e6a776a18
+EBUILD cherokee-0.9.0.ebuild 2692 RMD160 bd16838bc62021424868fa8d3532821bbdbe2eed SHA1 38c280f9ffe1e0f6e0ba48ff0c3ca60fc8dd4cad SHA256 4f2a91aab836d5e4ec006457f9c0b1b6c2aef7cd701286a246614f18ca016947
+MISC ChangeLog 13337 RMD160 0254e06726154bdbd57bac43095dc7dae7c303f9 SHA1 e3580d7584cae9b0da35eb110a63b41929bdfccb SHA256 0d2270b5cc6f1c04dfda3b59d17f9802459b241b140036489fb202b917a9f937
 MISC metadata.xml 434 RMD160 bac321b7879fe7793087b221f20554e4b44a5975 SHA1 d77a40137b169af1715d9827f463e2219485a931 SHA256 9cb0163ef5aadb0cafb83c75615bb3f393f5484016695abd15db7ff6d2680f8b
diff --git a/www-servers/cherokee/cherokee-0.5.6.ebuild b/www-servers/cherokee/cherokee-0.5.6.ebuild
deleted file mode 100644
index 00c9eb8e3754..000000000000
--- a/www-servers/cherokee/cherokee-0.5.6.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.5.6.ebuild,v 1.4 2006/12/27 06:06:49 flameeyes 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"
-
-RDEPEND=">=sys-libs/zlib-1.1.4-r1
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-	)
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-epoll-crosscompile.patch"
-	epatch "${FILESDIR}/${P}-sendfile-crosscompile.patch"
-	epatch "${FILESDIR}/${P}-gnutls-pkgconfig.patch"
-	epatch "${FILESDIR}/${P}-replace-with-sed.patch"
-
-	AT_M4DIR="m4" eautoreconf
-
-	# use cherokee user/group
-	sed -i -e 's|^#\(User \).*$|\1cherokee|' \
-		   -e 's|^#\(Group \).*$|\1cherokee|' "${S}/cherokee.conf.sample.pre" || \
-		   die "sed cherokee.conf failed"
-}
-
-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 \
-		|| 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.5.6" ${PN} || die "newinitd failed"
-
-	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}
-}
-
-pkg_postinst() {
-	enewgroup cherokee
-	enewuser cherokee -1 -1 /var/www/localhost cherokee
-}
diff --git a/www-servers/cherokee/cherokee-0.6.0.ebuild b/www-servers/cherokee/cherokee-0.6.0.ebuild
deleted file mode 100644
index 11b942e3d016..000000000000
--- a/www-servers/cherokee/cherokee-0.6.0.ebuild
+++ /dev/null
@@ -1,113 +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.6.0.ebuild,v 1.3 2008/03/17 17:19:31 mr_bones_ 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/cherokee-0.7.0.ebuild b/www-servers/cherokee/cherokee-0.7.0.ebuild
deleted file mode 100644
index d5cd57485ec0..000000000000
--- a/www-servers/cherokee/cherokee-0.7.0.ebuild
+++ /dev/null
@@ -1,113 +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.7.0.ebuild,v 1.2 2008/06/03 15:40:36 mr_bones_ 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/cherokee-0.7.2.ebuild b/www-servers/cherokee/cherokee-0.7.2.ebuild
deleted file mode 100644
index beced80b763a..000000000000
--- a/www-servers/cherokee/cherokee-0.7.2.ebuild
+++ /dev/null
@@ -1,119 +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.7.2.ebuild,v 1.2 2008/06/20 08:35:51 dev-zero 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-signed_unsigned_char.patch"
-}
-
-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
-
-	echo ""
-	elog "Cherokee conf is quite different in 0.6.x and 0.7.x  series. You must use"
-	elog " cherokee-admin to create a new config or use /usr/share/doc/${PF}/contrib/05to06.py"
-	elog " or 06to07.py to export your old config (not ever works)."
-	echo ""
-}
diff --git a/www-servers/cherokee/cherokee-0.6.1.ebuild b/www-servers/cherokee/cherokee-0.9.0.ebuild
index 1ac5006c5260..94aaa4d563e3 100644
--- a/www-servers/cherokee/cherokee-0.6.1.ebuild
+++ b/www-servers/cherokee/cherokee-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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"
@@ -25,8 +25,6 @@ RDEPEND=">=sys-libs/zlib-1.1.4-r1
 	admin? ( dev-lang/python )"
 DEPEND="${RDEPEND}"
 
-#S="${WORKDIR}/${P}b1240"
-
 src_compile() {
 	local myconf
 
@@ -83,6 +81,7 @@ src_install () {
 	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
 
@@ -104,10 +103,4 @@ pkg_postinst() {
 		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 ""
 }