version bump. remove old ebuilds

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

7 files changed, 26 insertions, 545 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index b10f39e467e1..5713837ed184 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.67 2010/06/16 11:54:54 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.68 2010/06/23 09:56:09 bass Exp $
+
+*cherokee-1.0.4 (23 Jun 2010)
+
+  23 Jun 2010; J. Alberto Suárez López <bass@gentoo.org>
+  -cherokee-0.99.30.ebuild, -cherokee-0.99.42.ebuild,
+  -cherokee-0.99.44.ebuild, -cherokee-0.99.48.ebuild,
+  -cherokee-1.0.0.ebuild, +cherokee-1.0.4.ebuild:
+  version bump. remove old ebuilds
 
 *cherokee-1.0.2-r1 (16 Jun 2010)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 420bb879849e..23ae45e99944 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,15 +1,7 @@
 AUX cherokee-initd-0.99.23 542 RMD160 e0ee20b7bb781797c3a53d0e2804e8b0fe985beb SHA1 4a8b43509aa4b9bf1079e0e74ca9d61428672522 SHA256 9e58ed7b3050a17fed08cc682e30dfa14e09eb804084b6cc9b213ccd0843300f
-DIST cherokee-0.99.30.tar.gz 4608868 RMD160 7921cf235079e225f7411b1897226fdcc3464250 SHA1 608e1ce0b067d67d138c4f8329016537dd30dabe SHA256 5395f8bb1b4a9600f688aebea2dded64aa2e9cca4ed2ee7cb40a5d9aa07487c5
-DIST cherokee-0.99.42.tar.gz 5244378 RMD160 1af716a88414ca8c9c38f432cf500989828ba64f SHA1 b5cc065868b565e28c98a4900d3697c03fae1f68 SHA256 66548f100f66197c7b4935a234bcd915d503282bb82b792280e486042931fb1b
-DIST cherokee-0.99.44.tar.gz 6369072 RMD160 cae555b42afee166231bff37e5f53c71e9b455bb SHA1 005b0c9781732cc325c58e61612bd1b97dcea2dc SHA256 1030951ff694d87b4ff22fac9e978bd82e085a5e0466abb881686be3eef87b70
-DIST cherokee-0.99.48.tar.gz 4871636 RMD160 5d4c8b263515aff668668b0b685d0d7baf7ba6b5 SHA1 624e41926527ddafe9e753a9d39be74da69c0cfd SHA256 405c012e05207100ab1a6f18135da330972f17ffe6de5275d659601eab1503b6
-DIST cherokee-1.0.0.tar.gz 5143468 RMD160 0f5c3975772379a6f495ceb0f6f3ed1f4feb6da7 SHA1 8ab1fa32b73d317345938eaa6c2dd88882d1f0c9 SHA256 c7d3d185aaeb3ed5811dba32dcc8a00ff64b4f0eec86461cf0911d0540efbaad
 DIST cherokee-1.0.2.tar.gz 5309634 RMD160 e4dc2f8d43974646109f2c1c3f9ea5f542590171 SHA1 fd5c7cdc2fea84d622f5bc8b7a8f5094eca87f0f SHA256 c499c25afd4e6fffa3e126e60970bbb35aeea0611fc28a9c845768cc0a67e35e
-EBUILD cherokee-0.99.30.ebuild 3374 RMD160 056f4b9f797f3477a6a7edf84b02e3e74d33e9a6 SHA1 fbe87d224cb99c6d1ded3dcbfcbf88410f84ffc8 SHA256 61638788132ccc0743542c3a80a493a0028cf96f57ebcdc7d220941066b2481e
-EBUILD cherokee-0.99.42.ebuild 3898 RMD160 94aae50a66f9405afa2f9d605f5f155c343d056a SHA1 d09f2ac977e57a2caaab7df2f69a98112df87810 SHA256 4c6eb36445327e7168953d1cb62ff5a56396a9be3bf2cc80e4767bea9afe83d2
-EBUILD cherokee-0.99.44.ebuild 3898 RMD160 3ae910e22670f339543369eae9fff16310c70212 SHA1 f046f83e606de05538e9e1e302e11025e9a84d95 SHA256 4cd902166e4fcca9f77c8ce500fab32ae7c94a72995c33ef49ef6bdf446c531a
-EBUILD cherokee-0.99.48.ebuild 3897 RMD160 f5097665c8414cfcedf07a909e1fd41d0012a958 SHA1 841fd81a42044e0eb603392afc8a4fdbc25dd192 SHA256 dd343d39ec389af8dfe34df8ae3b4970db28e0af4aca7db0403a33c3efd3944b
-EBUILD cherokee-1.0.0.ebuild 4002 RMD160 bc2b9c1ad6ab7c2526cdb69ba1eab94a0788442a SHA1 6bc90168786c333c9c38eab0203d326a1b8af24e SHA256 38dfd6bc3129d292c76a0ace9a912d26fe894d76bbb02ffcb63bd2c98a93271b
+DIST cherokee-1.0.4.tar.gz 5326233 RMD160 b17162efae2e54d57e7a9e8380917c0c26a63031 SHA1 f37bb1670823f6529f1dc58a11fb0567ac8c32fc SHA256 d35e6feb1f9908366958c6674979e11bab397d31652f9c4020716a08e185e509
 EBUILD cherokee-1.0.2-r1.ebuild 4118 RMD160 41ea7cd4f7f8a6922f7fc9ad8c309be92a983289 SHA1 bee1555d24c9a635fb3bc6121972b7149fe35a5b SHA256 e242f2758a31929254e53c760b09f55003c96353b760d1f6bbeac87de383fee1
-MISC ChangeLog 17208 RMD160 278637663aa85021d857e234fed9012ef0fe0469 SHA1 2741a3595528776c8e8452b03ec00910889b5f89 SHA256 460184a1aa74cab9ae11ac94aee01bf40dae0006a8b394c0c2e97de4c9c50b30
+EBUILD cherokee-1.0.4.ebuild 4110 RMD160 ec46b0cdb2e38a799eafac55de7b9345739ada59 SHA1 89d58c5c90b2f69783d99562dfe99982dcaccbab SHA256 63e0a17c1cf6d439231bf3089b7f754b4c1242ffc7f13108bb4405175d9e8bc9
+MISC ChangeLog 17492 RMD160 1cae8602a994a94c5fbd26f5e2b02afcfd73044e SHA1 c3d7672705151b47516ddf54d4431976164499de SHA256 47e05641fdeea9c15226b564cd2f2527f4e4743981475fb48d98c84be9a21bac
 MISC metadata.xml 434 RMD160 bac321b7879fe7793087b221f20554e4b44a5975 SHA1 d77a40137b169af1715d9827f463e2219485a931 SHA256 9cb0163ef5aadb0cafb83c75615bb3f393f5484016695abd15db7ff6d2680f8b
diff --git a/www-servers/cherokee/cherokee-0.99.30.ebuild b/www-servers/cherokee/cherokee-0.99.30.ebuild
deleted file mode 100644
index 6705915c17f6..000000000000
--- a/www-servers/cherokee/cherokee-0.99.30.ebuild
+++ /dev/null
@@ -1,121 +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.30.ebuild,v 1.1 2009/11/30 16:47:38 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 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 )
-	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 nls) \
-		$(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.99.23" ${PN} || die "newinitd failed"
-
-	dodir /usr/share/doc/${PF}/contrib
-	insinto /usr/share/${PF}/contrib
-	doins contrib/make-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
-
-	# Puts logs in /var/log/cherokee/
-	dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf
-
-}
-
-pkg_postinst() {
-	enewgroup cherokee
-	enewuser cherokee -1 -1 /var/www/localhost cherokee
-	install -o cherokee -g cherokee -m0775 -d $ROOT/var/log/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.42.ebuild b/www-servers/cherokee/cherokee-0.99.42.ebuild
deleted file mode 100644
index 8b91252762c8..000000000000
--- a/www-servers/cherokee/cherokee-0.99.42.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.99.42.ebuild,v 1.1 2010/02/08 08:35:27 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 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 )
-	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 nls) \
-		$(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.99.23" ${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/make-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
-
-	# Puts logs in /var/log/cherokee/
-	dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf
-
-}
-
-pkg_postinst() {
-	enewgroup cherokee
-	enewuser cherokee -1 -1 /var/www/localhost cherokee
-	install -o cherokee -g cherokee -m0775 -d $ROOT/var/log/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.44.ebuild b/www-servers/cherokee/cherokee-0.99.44.ebuild
deleted file mode 100644
index c8bb07209830..000000000000
--- a/www-servers/cherokee/cherokee-0.99.44.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.99.44.ebuild,v 1.1 2010/04/21 10:09:50 jokey 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 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 )
-	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 nls) \
-		$(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 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.99.23" ${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/make-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
-
-	# Puts logs in /var/log/cherokee/
-	dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf
-
-}
-
-pkg_postinst() {
-	enewgroup cherokee
-	enewuser cherokee -1 -1 /var/www/localhost cherokee
-	install -o cherokee -g cherokee -m0775 -d "${ROOT}"var/log/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.48.ebuild b/www-servers/cherokee/cherokee-0.99.48.ebuild
deleted file mode 100644
index d5d9669ef7a9..000000000000
--- a/www-servers/cherokee/cherokee-0.99.48.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.99.48.ebuild,v 1.1 2010/04/30 09:41: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 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 )
-	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 nls) \
-		$(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 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.99.23" ${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/make-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
-
-	# Puts logs in /var/log/cherokee/
-	dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf
-
-}
-
-pkg_postinst() {
-	enewgroup cherokee
-	enewuser cherokee -1 -1 /var/www/localhost cherokee
-	install -o cherokee -g cherokee -m0775 -d "${ROOT}"var/log/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-1.0.0.ebuild b/www-servers/cherokee/cherokee-1.0.4.ebuild
index 3cdee1556a35..bd125c3e8a5a 100644
--- a/www-servers/cherokee/cherokee-1.0.0.ebuild
+++ b/www-servers/cherokee/cherokee-1.0.4.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.0.ebuild,v 1.2 2010/05/17 16:47:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.4.ebuild,v 1.1 2010/06/23 09:56:09 bass Exp $
 
-inherit eutils pam versionator libtool
+EAPI=2
+PYTHON_DEPEND="admin? 2"
+
+inherit python 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"
@@ -19,7 +22,6 @@ RDEPEND="
 	nls? ( sys-devel/gettext )
 	ssl? ( dev-libs/openssl )
 	pam? ( virtual/pam )
-	admin? ( dev-lang/python )
 	geoip? ( dev-libs/geoip )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
@@ -27,6 +29,10 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg )"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
+
 src_compile() {
 	local myconf
 
@@ -72,7 +78,7 @@ src_compile() {
 		--localstatedir=/var \
 		|| die "configure failed"
 
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install () {
@@ -108,6 +114,10 @@ src_install () {
 
 }
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 pkg_postinst() {
 	enewgroup cherokee
 	enewuser cherokee -1 -1 /var/www/localhost cherokee