bump version

(Portage version: 2.1.6.13/cvs/Linux i686)

8 files changed, 44 insertions, 606 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 009afe8c4404..4b5d4deacc8e 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.59 2009/08/06 07:14:56 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.60 2009/10/22 08:01:02 bass Exp $
+
+*cherokee-0.99.24 (22 Oct 2009)
+
+  22 Oct 2009; J. Alberto Suárez López <bass@gentoo.org>
+  +cherokee-0.99.24.ebuild:
+  Bump version. Fix: #283373
 
 *cherokee-0.99.22 (06 Aug 2009)
 
diff --git a/www-servers/cherokee/cherokee-0.98.1.ebuild b/www-servers/cherokee/cherokee-0.98.1.ebuild
deleted file mode 100644
index d1d02306bae5..000000000000
--- a/www-servers/cherokee/cherokee-0.98.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.98.1.ebuild,v 1.2 2009/02/03 12:45:46 betelgeuse 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="~x86"
-IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug"
-
-# 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 )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	local myconf
-
-	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*)
-			os="FreeBSD" ;;
-		*-netbsd*)
-			os="NetBSD" ;;
-		*-openbsd*)
-			os="OpenBSD" ;;
-		*)
-			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) \
-		--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
-
-	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/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
-
-	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.99.15.ebuild b/www-servers/cherokee/cherokee-0.99.15.ebuild
deleted file mode 100644
index 39db58ef7fc1..000000000000
--- a/www-servers/cherokee/cherokee-0.99.15.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.99.15.ebuild,v 1.1 2009/05/15 08:11:43 bass Exp $
-
-inherit eutils pam versionator libtool
-
-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 ~x86"
-IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg"
-
-RDEPEND="
-	>=sys-libs/zlib-1.1.4-r1
-	ssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	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 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*)
-			os="FreeBSD" ;;
-		*-netbsd*)
-			os="NetBSD" ;;
-		*-openbsd*)
-			os="OpenBSD" ;;
-		*)
-			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 \
-		--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
-
-	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/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
-
-	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
-
-	# 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"
-		echo  ""
-	else
-		echo  ""
-		elog "Try USE=admin if you want an easy way to configure cherokee."
-		echo  ""
-	fi
-}
diff --git a/www-servers/cherokee/cherokee-0.99.17.ebuild b/www-servers/cherokee/cherokee-0.99.17.ebuild
deleted file mode 100644
index 53947a2a7ac5..000000000000
--- a/www-servers/cherokee/cherokee-0.99.17.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.99.17.ebuild,v 1.2 2009/06/22 07:35:48 bass Exp $
-
-inherit eutils pam versionator libtool
-
-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="~x86 ~amd64"
-IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug geoip ldap
-mysql ffmpeg fastcgi"
-
-RDEPEND="
-	>=sys-libs/zlib-1.1.4-r1
-	ssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	admin? ( dev-lang/python )
-	geoip? ( dev-libs/geoip )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	fastcgi? ( www-servers/spawn-fcgi )
-	ffmpeg? ( media-video/ffmpeg )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	local myconf
-
-	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*)
-			os="FreeBSD" ;;
-		*-netbsd*)
-			os="NetBSD" ;;
-		*-openbsd*)
-			os="OpenBSD" ;;
-		*)
-			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 \
-		--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
-
-	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/07to08.py
-	doins contrib/08to09.py
-	doins contrib/09to010.py
-	doins contrib/011to098.py
-	doins contrib/098to099.py
-	doins contrib/0999to09910.py
-	doins contrib/mk-cert.sh
-
-	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
-
-	# 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"
-		echo  ""
-	else
-		echo  ""
-		elog "Try USE=admin if you want an easy way to configure cherokee."
-		echo  ""
-	fi
-
-	echo ""
-	elog "Config format can change in different versions. Check converter script in:"
-	elog "	  /usr/share/cherokee-0.99.15/contrib/"
-	elog "for example:"
-	elog "	  PYTHONPATH="/usr/share/cherokee/admin/" python \\"
-	elog "	  /usr/share/cherokee-0.99.15/contrib/0999to09910.py \\"
-	elog "	  /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15"
-
-}
diff --git a/www-servers/cherokee/cherokee-0.99.19.ebuild b/www-servers/cherokee/cherokee-0.99.19.ebuild
deleted file mode 100644
index a0b249f4afeb..000000000000
--- a/www-servers/cherokee/cherokee-0.99.19.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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.99.19.ebuild,v 1.1 2009/06/24 07:08:45 bass Exp $
-
-inherit eutils pam versionator libtool
-
-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="~x86 ~amd64"
-IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi"
-
-RDEPEND="
-	>=sys-libs/zlib-1.1.4-r1
-	ssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	admin? ( dev-lang/python )
-	geoip? ( dev-libs/geoip )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	fastcgi? ( www-servers/spawn-fcgi )
-	ffmpeg? ( media-video/ffmpeg )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	local myconf
-
-	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*)
-			os="FreeBSD" ;;
-		*-netbsd*)
-			os="NetBSD" ;;
-		*-openbsd*)
-			os="OpenBSD" ;;
-		*)
-			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 \
-		--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
-
-	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/07to08.py
-	doins contrib/08to09.py
-	doins contrib/09to010.py
-	doins contrib/011to098.py
-	doins contrib/098to099.py
-	doins contrib/0999to09910.py
-	doins contrib/mk-cert.sh
-
-	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
-
-	# 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"
-		echo  ""
-	else
-		echo  ""
-		elog "Try USE=admin if you want an easy way to configure cherokee."
-		echo  ""
-	fi
-
-	echo ""
-	elog "Config format can change in different versions. Check converter script in:"
-	elog "	  /usr/share/cherokee-0.99.15/contrib/"
-	elog "for example:"
-	elog "	  PYTHONPATH="/usr/share/cherokee/admin/" python \\"
-	elog "	  /usr/share/cherokee-0.99.15/contrib/0999to09910.py \\"
-	elog "	  /etc/cherokee/cherokee.conf /etc/cherokee/cherokee.conf-0.99.15"
-
-}
diff --git a/www-servers/cherokee/cherokee-0.99.19-r1.ebuild b/www-servers/cherokee/cherokee-0.99.24.ebuild
index f09db38e7491..09b560a1ef58 100644
--- a/www-servers/cherokee/cherokee-0.99.19-r1.ebuild
+++ b/www-servers/cherokee/cherokee-0.99.24.ebuild
@@ -1,6 +1,6 @@
 # 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.99.19-r1.ebuild,v 1.1 2009/06/28 16:01:00 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.99.24.ebuild,v 1.1 2009/10/22 08:01:02 bass Exp $
 
 inherit eutils pam versionator libtool
 
@@ -11,10 +11,11 @@ HOMEPAGE="http://www.cherokee-project.com/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi"
+IUSE="ipv6 nls ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi"
 
 RDEPEND="
 	>=sys-libs/zlib-1.1.4-r1
+	nls? ( sys-devel/gettext )
 	ssl? ( dev-libs/openssl )
 	pam? ( virtual/pam )
 	admin? ( dev-lang/python )
@@ -55,6 +56,7 @@ src_compile() {
 		${myconf} \
 		$(use_enable pam) \
 		$(use_enable ipv6) \
+		$(use_enable nls) \
 		$(use_enable threads pthread) \
 		$(use_enable kernel_linux epoll) \
 		$(use_with geoip) \
@@ -77,7 +79,7 @@ src_install () {
 	dodoc AUTHORS ChangeLog
 
 	use pam && pamd_mimic system-auth cherokee auth account session
-	newinitd "${FILESDIR}/${PN}-initd-0.11" ${PN} || die "newinitd failed"
+	newinitd "${FILESDIR}/${PN}-initd-0.99.23" ${PN} || die "newinitd failed"
 
 	dodir /usr/share/doc/${PF}/contrib
 	insinto /usr/share/${PF}/contrib
@@ -87,7 +89,7 @@ src_install () {
 	doins contrib/011to098.py
 	doins contrib/098to099.py
 	doins contrib/0999to09910.py
-	doins contrib/mk-cert.sh
+	doins contrib/make-cert.sh
 
 	keepdir /etc/cherokee/mods-enabled /etc/cherokee/sites-enabled /var/www/localhost/htdocs
 
diff --git a/www-servers/cherokee/cherokee-0.99.9.ebuild b/www-servers/cherokee/cherokee-0.99.9.ebuild
deleted file mode 100644
index d4789040465f..000000000000
--- a/www-servers/cherokee/cherokee-0.99.9.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.99.9.ebuild,v 1.2 2009/04/22 21:09:03 maekke Exp $
-
-inherit eutils pam versionator libtool
-
-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 ~x86"
-IUSE="ipv6 ssl static pam coverpage threads kernel_linux admin debug geoip ldap mysql ffmpeg"
-
-RDEPEND="
-	>=sys-libs/zlib-1.1.4-r1
-	ssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	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 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*)
-			os="FreeBSD" ;;
-		*-netbsd*)
-			os="NetBSD" ;;
-		*-openbsd*)
-			os="OpenBSD" ;;
-		*)
-			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 \
-		--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
-
-	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/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
-
-	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
-
-	# 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"
-		echo  ""
-	else
-		echo  ""
-		elog "Try USE=admin if you want an easy way to configure cherokee."
-		echo  ""
-	fi
-}
diff --git a/www-servers/cherokee/files/cherokee-initd-0.99.23 b/www-servers/cherokee/files/cherokee-initd-0.99.23
new file mode 100644
index 000000000000..2ffdde46a1ab
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-initd-0.99.23
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+opt="reload"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting Cherokee Web Server"
+	start-stop-daemon --start -b \
+		--exec /usr/sbin/cherokee
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Cherokee Web Server"
+	start-stop-daemon --stop \
+		--exec /usr/sbin/cherokee
+	eend $?
+}
+
+reload() {
+	ebegin "Restarting Cherokee Web Server and closing all open connections"
+	start-stop-daemon --stop \
+		--signal USR1
+	eend $?
+}
+