Bump version. Cleanup. Fixed: #303753 #285858 #291633

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 11 insertions, 172 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 5d7cf7eacd58..47cefc7170f8 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,13 @@
 # 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.61 2009/11/30 16:47:38 bass Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.62 2010/02/08 08:35:27 bass Exp $
+
+*cherokee-0.99.42 (08 Feb 2010)
+
+  08 Feb 2010; J. Alberto Suárez López <bass@gentoo.org>
+  -files/cherokee-initd-0.11, -cherokee-0.99.22.ebuild,
+  -cherokee-0.99.24.ebuild, +cherokee-0.99.42.ebuild:
+  Bump version. Cleanup. Fixed: #303753 #285858 #291633
 
 *cherokee-0.99.30 (30 Nov 2009)
 
diff --git a/www-servers/cherokee/cherokee-0.99.22.ebuild b/www-servers/cherokee/cherokee-0.99.22.ebuild
deleted file mode 100644
index c843b888bc97..000000000000
--- a/www-servers/cherokee/cherokee-0.99.22.ebuild
+++ /dev/null
@@ -1,134 +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.22.ebuild,v 1.1 2009/08/06 07:14:56 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/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.24.ebuild b/www-servers/cherokee/cherokee-0.99.42.ebuild
index 09b560a1ef58..8b91252762c8 100644
--- a/www-servers/cherokee/cherokee-0.99.24.ebuild
+++ b/www-servers/cherokee/cherokee-0.99.42.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.24.ebuild,v 1.1 2009/10/22 08:01:02 bass Exp $
+# $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
 
diff --git a/www-servers/cherokee/files/cherokee-initd-0.11 b/www-servers/cherokee/files/cherokee-initd-0.11
deleted file mode 100644
index b49f347bb399..000000000000
--- a/www-servers/cherokee/files/cherokee-initd-0.11
+++ /dev/null
@@ -1,34 +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.11,v 1.1 2008/12/26 09:04:43 bass Exp $
-
-PIDFILE=/var/run/cherokee.pid
-
-opt="reload"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Cherokee Web Server"
-	start-stop-daemon --start -b --pidfile ${PIDFILE} \
-		--exec /usr/sbin/cherokee
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Cherokee Web Server"
-	start-stop-daemon --stop --pidfile ${PIDFILE} \
-		--exec /usr/sbin/cherokee
-	eend $?
-}
-
-reload() {
-	ebegin "Restarting Cherokee Web Server and closing all open connections"
-	start-stop-daemon --stop --pidfile ${PIDFILE} \
-		--signal USR1
-	eend $?
-}
-