old ebuilds remved. marked 0.4.29 as x86

(Portage version: 2.0.53)

23 files changed, 16 insertions, 679 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 1270e8a0e486..f243bf17cbc2 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,9 +1,18 @@
 # ChangeLog for www-servers/cherokee
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.19 2005/12/27 09:19:48 bass Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.20 2006/01/19 07:25:30 bass Exp $
 
 *cherokee-0.4.29 (13 Nov 2005)
 
+  19 Jan 2006; josé Alberto Suárez López <bass@gentoo.org>
+  -cherokee-0.4.5.ebuild, -cherokee-0.4.17.ebuild,
+  -cherokee-0.4.17.1.ebuild, -cherokee-0.4.19.ebuild,
+  -cherokee-0.4.21.ebuild, -cherokee-0.4.21-r1.ebuild,
+  -cherokee-0.4.22.ebuild, -cherokee-0.4.23.ebuild, -cherokee-0.4.24.ebuild,
+  -cherokee-0.4.24-r1.ebuild, cherokee-0.4.29.ebuild:
+  Remove old ebuilds.
+  Marked 0.4.29 as stable in x86.
+
   27 Dec 2005; josé Alberto Suárez López <bass@gentoo.org>
   +files/cherokee-0.4.25-fix-static.diff, cherokee-0.4.23.ebuild,
   cherokee-0.4.24.ebuild, cherokee-0.4.24-r1.ebuild, cherokee-0.4.25.ebuild,
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 322839d64990..756f23de580e 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 573a36d59fa80312247d00370966b08f ChangeLog 7958
-MD5 987e734e6bc2d0d2845efb991e7ccd3d cherokee-0.4.17.1.ebuild 1542
-MD5 693100f7d7a22ddb1762918c931a3885 cherokee-0.4.17.ebuild 1315
-MD5 9866faff941afcb8b5834588c14c0b3e cherokee-0.4.19.ebuild 1413
-MD5 8a190d1da8b8cac0b51a645ca36517cb cherokee-0.4.21-r1.ebuild 1885
-MD5 0324ea00a11bb9c0f61328812a4b707a cherokee-0.4.21.ebuild 1428
-MD5 d81bf5f9012286774993f8f1db3a2409 cherokee-0.4.22.ebuild 1587
-MD5 29321d8fedb392dd369ee22bc7ba9225 cherokee-0.4.23.ebuild 1530
-MD5 6e6b0e5f544610a7184ed159767bfb78 cherokee-0.4.24-r1.ebuild 1610
-MD5 7004a21e7a4df93caff0aefefe15ca9e cherokee-0.4.24.ebuild 1523
+MD5 2cfbd695264c3235763dfda13a24b87e ChangeLog 8368
 MD5 1e768d84a82e3580b461fffbc369445f cherokee-0.4.25.ebuild 2775
-MD5 61ea17bfef7a6039414b3ef5652e6fdd cherokee-0.4.29.ebuild 2841
-MD5 2a338274e3b176bc1b83221670a84b46 cherokee-0.4.5.ebuild 1723
+MD5 f38a71927a856ecfbc4cb8ec6ad2e9d1 cherokee-0.4.29.ebuild 2840
 MD5 b44b2de7ebfdc07ee94d54a514a738f0 files/cherokee-0.4.17-cherokee.conf 2611
 MD5 13c50109a3ebd047c357fcf95f70bed7 files/cherokee-0.4.17-init.d 789
 MD5 e0af76fef298222ff6ad8e6e5aeb10d7 files/cherokee-0.4.21-no-handler_admin.diff 1151
@@ -21,23 +8,6 @@ MD5 29f1a34d26b0830d4a62b2b42241b64a files/cherokee-0.4.25-fix-static.diff 728
 MD5 6da94000869b804248b03d61703b69bb files/cherokee-0.4.5-Makefile.am.patch 956
 MD5 8278b4acda7637c68885863ddd58f712 files/cherokee-0.4.5-cherokee.conf 2769
 MD5 a9f08f404f9b738a52e2c82c7ed88e04 files/cherokee-0.4.5-init.d 787
-MD5 7abc32dac306688c90e1ef1757603b3a files/digest-cherokee-0.4.17 67
-MD5 289de164081060280437629085fce186 files/digest-cherokee-0.4.17.1 69
-MD5 c8394a4871a8edbc12c1bddfbaea22fd files/digest-cherokee-0.4.19 68
-MD5 fbddeb3fc079036d82ba359c98cc4bf1 files/digest-cherokee-0.4.21 68
-MD5 fbddeb3fc079036d82ba359c98cc4bf1 files/digest-cherokee-0.4.21-r1 68
-MD5 dbf8285e5a19940db8b60f76b25cf7ae files/digest-cherokee-0.4.22 68
-MD5 ff48fbffa275e24d9f2efe79b7f9048c files/digest-cherokee-0.4.23 68
-MD5 90214e6f2bb27a3eae7e97e5d90dbe68 files/digest-cherokee-0.4.24 68
-MD5 90214e6f2bb27a3eae7e97e5d90dbe68 files/digest-cherokee-0.4.24-r1 68
 MD5 bd3ba68faf6e5b4e83dfef434fcaa48f files/digest-cherokee-0.4.25 68
 MD5 1f1bbadf4636ffe419c566bfdd31a8e3 files/digest-cherokee-0.4.29 68
-MD5 298dfdd3c83893b3123d85278d1c1e7e files/digest-cherokee-0.4.5 66
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDsUNoI1lqEGTUzyQRAokoAJ9Y0GfTKTWLBdOairXz5nY7g7IZLgCgroDo
-3Rdqb1KbmQadxyKyIlp8eLg=
-=11EJ
------END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-0.4.17.1.ebuild b/www-servers/cherokee/cherokee-0.4.17.1.ebuild
deleted file mode 100644
index 0e8e8ff06aa7..000000000000
--- a/www-servers/cherokee/cherokee-0.4.17.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.17.1.ebuild,v 1.3 2005/04/17 13:12:30 ka0ttic Exp $
-
-MY_PV=0.4.17
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="ftp://alobbs.com/cherokee/0.4/${MY_PV}/${P}.tar.gz"
-HOMEPAGE="http://www.alobbs.com/cherokee"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	${RDEPEND}"
-
-KEYWORDS="x86 ppc"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# bug 86038 - cherokee will fail to build with >=gnutls-1.2.0 (API change)
-	if has_version '>=net-libs/gnutls-1.2.0' ; then
-		sed -i 's/\(gnutls_certificate_set_rsa\)\(_params\)/\1_export\2/' \
-			src/virtual_server.c || die "sed failed"
-	fi
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr --sysconfdir=/etc \
-		--disable-static $my_conf --with-pic || die "configure failed"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-
-	# install the Gentoo-ised config file
-
-	cp ${FILESDIR}/${PN}-${MY_PV}-cherokee.conf ${D}/etc/cherokee/cherokee.conf
-
-	# remove the installed sample config file
-#	rm ${D}/etc/cherokee/cherokee.conf.sample
-
-	# add default doc-root and cgi-bin locations
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
-	# add init.d script
-	dodir /etc/init.d
-	cp ${FILESDIR}/${PN}-${MY_PV}-init.d ${D}/etc/init.d/cherokee
-}
diff --git a/www-servers/cherokee/cherokee-0.4.17.ebuild b/www-servers/cherokee/cherokee-0.4.17.ebuild
deleted file mode 100644
index 877c0148c722..000000000000
--- a/www-servers/cherokee/cherokee-0.4.17.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.17.ebuild,v 1.4 2004/10/06 18:23:45 tester Exp $
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/0.4/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.alobbs.com/cherokee"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	${RDEPEND}"
-
-KEYWORDS="x86 ppc"
-SLOT="0"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-
-# coming soon ;-)
-#	use php && my_conf="$my_conf --with-php"
-#	use mono && my_conf="$my_conf --with-mono"
-
-	./configure --prefix=/usr --sysconfdir=/etc --disable-static $my_conf --with-pic
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-
-	# install the Gentoo-ised config file
-
-#	cp ${FILESDIR}/${P}-cherokee.conf ${D}/etc/cherokee/cherokee.conf
-
-	# remove the installed sample config file
-#	rm ${D}/etc/cherokee/cherokee.conf.sample
-
-	# add default doc-root and cgi-bin locations
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
-	# add init.d script
-	dodir /etc/init.d
-	cp ${FILESDIR}/${P}-init.d ${D}/etc/init.d/cherokee
-}
diff --git a/www-servers/cherokee/cherokee-0.4.19.ebuild b/www-servers/cherokee/cherokee-0.4.19.ebuild
deleted file mode 100644
index ad54131f7a1e..000000000000
--- a/www-servers/cherokee/cherokee-0.4.19.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.19.ebuild,v 1.2 2005/04/17 17:05:33 weeve Exp $
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.0x50.org/"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	${RDEPEND}"
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# bug 86038 - cherokee will fail to build with >=gnutls-1.2.0 (API change)
-	if has_version '>=net-libs/gnutls-1.2.0' ; then
-		sed -i 's/\(gnutls_certificate_set_rsa\)\(_params\)/\1_export\2/' \
-			cherokee/virtual_server.c || die "sed failed"
-	fi
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-static \
-		--with-pic || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-
-	insinto /etc/cherokee
-	newins ${FILESDIR}/${PN}-0.4.17-cherokee.conf cherokee.conf || \
-		die "newins failed"
-
-	# add default doc-root and cgi-bin locations
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
-	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
-}
diff --git a/www-servers/cherokee/cherokee-0.4.21-r1.ebuild b/www-servers/cherokee/cherokee-0.4.21-r1.ebuild
deleted file mode 100644
index 782cdf58dee7..000000000000
--- a/www-servers/cherokee/cherokee-0.4.21-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.21-r1.ebuild,v 1.2 2005/05/16 22:25:25 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.0x50.org/"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	gnutls? ( net-libs/gnutls )
-	ssl? ( dev-libs/openssl )
-	${RDEPEND}"
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-IUSE="ipv6 ssl gnutls pic static"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# bug 86038 - cherokee will fail to build with >=gnutls-1.2.0 (API change)
-	if has_version '>=net-libs/gnutls-1.2.0' ; then
-		sed -i 's/\(gnutls_certificate_set_rsa\)\(_params\)/\1_export\2/' \
-			cherokee/virtual_server.c || die "sed failed"
-	fi
-
-	epatch ${FILESDIR}/cherokee-0.4.21-no-handler_admin.diff
-}
-
-src_compile() {
-	local myconf
-
-	if use ssl && use gnutls ; then
-		myconf="${myconf} --enable-ssl=gnutls"
-	elif use ssl && ! use gnutls ; then
-		myconf="${myconf}  --enable-ssl=openssl"
-	else
-		myconf="${myconf} --disable-ssl"
-	fi
-	if use pic ; then
-		myconf="${myconf} --with-pic"
-	fi
-	if ! use ipv6 ; then
-		myconf="${myconf} --disable-ipv6"
-	fi
-	if ! use static ; then
-		myconf="${myconf} --disable-static"
-	fi
-
-	econf \
-		${myconf} \
-		--with-wwwroot=/var/www/localhost/htdocs \
-		--enable-os-string="Gentoo Linux" \
-		|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-
-	# add default doc-root and cgi-bin locations
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
-	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
-}
diff --git a/www-servers/cherokee/cherokee-0.4.21.ebuild b/www-servers/cherokee/cherokee-0.4.21.ebuild
deleted file mode 100644
index 6e88c272a3ec..000000000000
--- a/www-servers/cherokee/cherokee-0.4.21.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.21.ebuild,v 1.2 2005/05/16 19:09:32 bass Exp $
-
-inherit eutils
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.0x50.org/"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	${RDEPEND}"
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# bug 86038 - cherokee will fail to build with >=gnutls-1.2.0 (API change)
-	if has_version '>=net-libs/gnutls-1.2.0' ; then
-		sed -i 's/\(gnutls_certificate_set_rsa\)\(_params\)/\1_export\2/' \
-			cherokee/virtual_server.c || die "sed failed"
-	fi
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-static \
-		--with-pic || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-
-	insinto /etc/cherokee
-	newins ${FILESDIR}/${PN}-0.4.17-cherokee.conf cherokee.conf || \
-		die "newins failed"
-
-	# add default doc-root and cgi-bin locations
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
-	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
-}
diff --git a/www-servers/cherokee/cherokee-0.4.22.ebuild b/www-servers/cherokee/cherokee-0.4.22.ebuild
deleted file mode 100644
index b3b402bc668c..000000000000
--- a/www-servers/cherokee/cherokee-0.4.22.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.22.ebuild,v 1.2 2005/05/16 22:25:25 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.0x50.org/"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	gnutls? ( net-libs/gnutls )
-	ssl? ( dev-libs/openssl )
-	${RDEPEND}"
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-IUSE="ipv6 ssl gnutls pic static"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/cherokee-0.4.21-no-handler_admin.diff
-}
-
-src_compile() {
-	local myconf
-
-	if use ssl && use gnutls ; then
-		myconf="${myconf} --enable-ssl=gnutls"
-	elif use ssl && ! use gnutls ; then
-		myconf="${myconf}  --enable-ssl=openssl"
-	else
-		myconf="${myconf} --disable-ssl"
-	fi
-	if use pic ; then
-		myconf="${myconf} --with-pic"
-	fi
-	if ! use ipv6 ; then
-		myconf="${myconf} --disable-ipv6"
-	fi
-	if ! use static ; then
-		myconf="${myconf} --disable-static"
-	fi
-
-	econf \
-		${myconf} \
-		--with-wwwroot=/var/www/localhost/htdocs \
-		--enable-os-string="Gentoo Linux" \
-		|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
-	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
-}
diff --git a/www-servers/cherokee/cherokee-0.4.23.ebuild b/www-servers/cherokee/cherokee-0.4.23.ebuild
deleted file mode 100644
index 9fbda3001f5c..000000000000
--- a/www-servers/cherokee/cherokee-0.4.23.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.23.ebuild,v 1.3 2005/12/27 09:19:48 bass Exp $
-
-inherit eutils
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.0x50.org/"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	gnutls? ( net-libs/gnutls )
-	ssl? ( dev-libs/openssl )
-	${RDEPEND}"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-SLOT="0"
-IUSE="ipv6 ssl gnutls static"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/cherokee-0.4.21-no-handler_admin.diff
-}
-
-src_compile() {
-	local myconf
-
-	if use ssl && use gnutls ; then
-		myconf="${myconf} --enable-ssl=gnutls"
-	elif use ssl && ! use gnutls ; then
-		myconf="${myconf}  --enable-ssl=openssl"
-	else
-		myconf="${myconf} --disable-ssl"
-	fi
-	if ! use ipv6 ; then
-		myconf="${myconf} --disable-ipv6"
-	fi
-	if ! use static ; then
-		myconf="${myconf} --disable-static"
-	fi
-
-	econf \
-		${myconf} \
-		--with-wwwroot=/var/www/localhost/htdocs \
-		--enable-os-string="Gentoo Linux" \
-		|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
-	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
-}
diff --git a/www-servers/cherokee/cherokee-0.4.24-r1.ebuild b/www-servers/cherokee/cherokee-0.4.24-r1.ebuild
deleted file mode 100644
index 7d7cc7d72210..000000000000
--- a/www-servers/cherokee/cherokee-0.4.24-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.24-r1.ebuild,v 1.2 2005/12/27 09:19:48 bass Exp $
-
-inherit eutils
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.0x50.org/"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	gnutls? ( net-libs/gnutls )
-	ssl? ( dev-libs/openssl )
-	${RDEPEND}"
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-IUSE="ipv6 ssl gnutls static"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/cherokee-0.4.21-no-handler_admin.diff
-}
-
-src_compile() {
-	local myconf
-
-	if use ssl && use gnutls ; then
-		myconf="${myconf} --enable-ssl=gnutls"
-	elif use ssl && ! use gnutls ; then
-		myconf="${myconf}  --enable-ssl=openssl"
-	else
-		myconf="${myconf} --disable-ssl"
-	fi
-	if ! use ipv6 ; then
-		myconf="${myconf} --disable-ipv6"
-	fi
-	if use static ; then
-		myconf="${myconf} --enable-static --enable-static-module=all --disble-shared"
-	else
-		myconf="${myconf} --disable-static"
-	fi
-
-	econf \
-		${myconf} \
-		--with-wwwroot=/var/www/localhost/htdocs \
-		--enable-os-string="Gentoo Linux" \
-		|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-
-	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
-}
diff --git a/www-servers/cherokee/cherokee-0.4.24.ebuild b/www-servers/cherokee/cherokee-0.4.24.ebuild
deleted file mode 100644
index 966fecb5e89f..000000000000
--- a/www-servers/cherokee/cherokee-0.4.24.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.24.ebuild,v 1.2 2005/12/27 09:19:48 bass Exp $
-
-inherit eutils
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.0x50.org/"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	gnutls? ( net-libs/gnutls )
-	ssl? ( dev-libs/openssl )
-	${RDEPEND}"
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-IUSE="ipv6 ssl gnutls static"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/cherokee-0.4.21-no-handler_admin.diff
-}
-
-src_compile() {
-	local myconf
-
-	if use ssl && use gnutls ; then
-		myconf="${myconf} --enable-ssl=gnutls"
-	elif use ssl && ! use gnutls ; then
-		myconf="${myconf}  --enable-ssl=openssl"
-	else
-		myconf="${myconf} --disable-ssl"
-	fi
-	if ! use ipv6 ; then
-		myconf="${myconf} --disable-ipv6"
-	fi
-	if ! use static ; then
-		myconf="${myconf} --disable-static"
-	fi
-
-	econf \
-		${myconf} \
-		--with-wwwroot=/var/www/localhost/htdocs \
-		--enable-os-string="Gentoo Linux" \
-		|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-
-	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
-}
diff --git a/www-servers/cherokee/cherokee-0.4.29.ebuild b/www-servers/cherokee/cherokee-0.4.29.ebuild
index a6c019fc4190..3804d977391e 100644
--- a/www-servers/cherokee/cherokee-0.4.29.ebuild
+++ b/www-servers/cherokee/cherokee-0.4.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.4.29.ebuild,v 1.2 2005/12/27 09:19:48 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.29.ebuild,v 1.3 2006/01/19 07:25:30 bass Exp $
 
 inherit eutils pam
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.0x50.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE="ipv6 ssl gnutls static doc pam"
 
 RDEPEND=">=sys-libs/zlib-1.1.4-r1
diff --git a/www-servers/cherokee/cherokee-0.4.5.ebuild b/www-servers/cherokee/cherokee-0.4.5.ebuild
deleted file mode 100644
index 9a1aadc4c0e4..000000000000
--- a/www-servers/cherokee/cherokee-0.4.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.5.ebuild,v 1.3 2004/09/05 09:34:32 swegener Exp $
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="ftp://alobbs.com/cherokee/${PV}/${P}.tar.gz
-	ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.alobbs.com/cherokee"
-LICENSE="GPL-2"
-
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1
-	gnome? ( >=dev-libs/glib-2.2.2
-		>=gnome-base/orbit-2.6.1
-		>=gnome-base/gnome-vfs-2.2.4 )"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	${RDEPEND}"
-
-KEYWORDS="~x86 ~sparc"
-SLOT="0"
-IUSE="gnome"
-
-src_unpack ()
-{
-	unpack "${A}"
-
-	# patch to fix Makefile DESTDIR compliance
-
-	einfo "Applying Makefile.am patch"
-	patch ${S}/Makefile.am < ${FILESDIR}/${P}-Makefile.am.patch
-
-	einfo "Running automake to update Makefile.in"
-	cd ${S}
-	automake
-}
-
-src_compile ()
-{
-	use gnome && my_conf="$my_conf --enable-gnomevfs"
-
-# coming soon ;-)
-#	use php && my_conf="$my_conf --with-php"
-#	use mono && my_conf="$my_conf --with-mono"
-
-	./configure --prefix=/usr --sysconfdir=/etc --disable-static $my_conf --with-pic
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
-
-	# install the Gentoo-ised config file
-
-	cp ${FILESDIR}/${P}-cherokee.conf ${D}/etc/cherokee/cherokee.conf
-
-	# remove the installed sample config file
-	rm ${D}/etc/cherokee/cherokee.conf.sample
-
-	# add default doc-root and cgi-bin locations
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
-	# add init.d script
-
-	dodir /etc/init.d
-	cp ${FILESDIR}/${P}-init.d ${D}/etc/init.d/cherokee
-}
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.17 b/www-servers/cherokee/files/digest-cherokee-0.4.17
deleted file mode 100644
index 80824cbd0cc3..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cf8c8eb973e6b3e5578406b467f23b5 cherokee-0.4.17.tar.gz 800872
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.17.1 b/www-servers/cherokee/files/digest-cherokee-0.4.17.1
deleted file mode 100644
index cdcec2309009..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.17.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 53cf1fc92e98ef33b064a5c5af5c0795 cherokee-0.4.17.1.tar.gz 805906
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.19 b/www-servers/cherokee/files/digest-cherokee-0.4.19
deleted file mode 100644
index 0238d4a76ee8..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ecd2b9e52450bdd70f0eed8f0c803871 cherokee-0.4.19.tar.gz 1024984
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.21 b/www-servers/cherokee/files/digest-cherokee-0.4.21
deleted file mode 100644
index 33d5b4cbdf3d..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a7b3a22f68643f6bce9b09a53d033ef cherokee-0.4.21.tar.gz 1180793
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.21-r1 b/www-servers/cherokee/files/digest-cherokee-0.4.21-r1
deleted file mode 100644
index 33d5b4cbdf3d..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.21-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a7b3a22f68643f6bce9b09a53d033ef cherokee-0.4.21.tar.gz 1180793
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.22 b/www-servers/cherokee/files/digest-cherokee-0.4.22
deleted file mode 100644
index 852810d9154e..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91e44fd5b58285164a974a6b17755af4 cherokee-0.4.22.tar.gz 1336956
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.23 b/www-servers/cherokee/files/digest-cherokee-0.4.23
deleted file mode 100644
index 29459fcaacc9..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 915416b891a7ac60d4d7a0868c305bd2 cherokee-0.4.23.tar.gz 1340107
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.24 b/www-servers/cherokee/files/digest-cherokee-0.4.24
deleted file mode 100644
index 2a7539980c8f..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc51a96e46835fd2644048b12255bb81 cherokee-0.4.24.tar.gz 1402157
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.24-r1 b/www-servers/cherokee/files/digest-cherokee-0.4.24-r1
deleted file mode 100644
index 2a7539980c8f..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.24-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc51a96e46835fd2644048b12255bb81 cherokee-0.4.24.tar.gz 1402157
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.5 b/www-servers/cherokee/files/digest-cherokee-0.4.5
deleted file mode 100644
index 3e5e5a48bd4e..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d06bfce5bbb6c99f6d3349383be7377c cherokee-0.4.5.tar.gz 508784