summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Walker <ka0ttic@gentoo.org>2005-04-17 13:12:30 +0000
committerAaron Walker <ka0ttic@gentoo.org>2005-04-17 13:12:30 +0000
commite6fa19b78a7bfc92ebd16f1c71f9c9b630830baa (patch)
tree7180a6528247dbdf23202337200c851b2dc77d76 /www-servers
parentVersion bump; closes bugs 88152, 88326, 88797, and 88799. (diff)
downloadgentoo-2-e6fa19b78a7bfc92ebd16f1c71f9c9b630830baa.tar.gz
gentoo-2-e6fa19b78a7bfc92ebd16f1c71f9c9b630830baa.tar.bz2
gentoo-2-e6fa19b78a7bfc92ebd16f1c71f9c9b630830baa.zip
Version bump for bug 87447; fixed 0.4.17.1 and 0.4.19 to build with >=net-libs/gnutls-1.2.0 for bug 86038. Also tidy'd the sleu of old ebuilds.
(Portage version: 2.0.51.19)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/cherokee/ChangeLog14
-rw-r--r--www-servers/cherokee/Manifest31
-rw-r--r--www-servers/cherokee/cherokee-0.4.0.ebuild23
-rw-r--r--www-servers/cherokee/cherokee-0.4.1.ebuild30
-rw-r--r--www-servers/cherokee/cherokee-0.4.10.ebuild69
-rw-r--r--www-servers/cherokee/cherokee-0.4.14.ebuild69
-rw-r--r--www-servers/cherokee/cherokee-0.4.15.ebuild69
-rw-r--r--www-servers/cherokee/cherokee-0.4.16.ebuild57
-rw-r--r--www-servers/cherokee/cherokee-0.4.17.1.ebuild22
-rw-r--r--www-servers/cherokee/cherokee-0.4.19.ebuild53
-rw-r--r--www-servers/cherokee/cherokee-0.4.4.ebuild19
-rw-r--r--www-servers/cherokee/files/cherokee-0.4.1-gcc3.patch24
-rw-r--r--www-servers/cherokee/files/digest-cherokee-0.4.01
-rw-r--r--www-servers/cherokee/files/digest-cherokee-0.4.11
-rw-r--r--www-servers/cherokee/files/digest-cherokee-0.4.101
-rw-r--r--www-servers/cherokee/files/digest-cherokee-0.4.141
-rw-r--r--www-servers/cherokee/files/digest-cherokee-0.4.151
-rw-r--r--www-servers/cherokee/files/digest-cherokee-0.4.161
-rw-r--r--www-servers/cherokee/files/digest-cherokee-0.4.191
-rw-r--r--www-servers/cherokee/files/digest-cherokee-0.4.41
20 files changed, 85 insertions, 403 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index db7c12a4f709..6fa4b4734236 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for www-servers/cherokee
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.6 2004/11/01 10:34:08 hansmi Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.7 2005/04/17 13:12:30 ka0ttic Exp $
+
+*cherokee-0.4.19 (17 Apr 2005)
+
+ 17 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+ -files/cherokee-0.4.1-gcc3.patch, -cherokee-0.4.0.ebuild,
+ -cherokee-0.4.1.ebuild, -cherokee-0.4.4.ebuild, -cherokee-0.4.10.ebuild,
+ -cherokee-0.4.14.ebuild, -cherokee-0.4.15.ebuild, -cherokee-0.4.16.ebuild,
+ cherokee-0.4.17.1.ebuild, +cherokee-0.4.19.ebuild:
+ Version bump for bug 87447; fixed 0.4.17.1 and 0.4.19 to build with
+ >=net-libs/gnutls-1.2.0 for bug 86038. Also tidy'd the sleu of old ebuilds.
01 Nov 2004; Michael Hanselmann <hansmi@gentoo.org>
cherokee-0.4.17.1.ebuild:
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index a7a189f4c8ab..a025fa9642fb 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,38 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 89e05a275427eda4b12b3c72520c1c83 cherokee-0.4.15.ebuild 1698
-MD5 81e40f00c4b9884288b2c337d7ba5da3 cherokee-0.4.4.ebuild 619
-MD5 def6629e7cd82ee6acb3f3e7e63b9371 cherokee-0.4.10.ebuild 1693
MD5 693100f7d7a22ddb1762918c931a3885 cherokee-0.4.17.ebuild 1315
-MD5 ac6a6f8727422772a96a87b34619fd89 cherokee-0.4.1.ebuild 702
-MD5 81847ce379caece2c6799fad9861c125 cherokee-0.4.17.1.ebuild 1331
-MD5 cc9f30c20fb6d25d81b67bfe582faaf1 cherokee-0.4.14.ebuild 1697
-MD5 ed0e528223775b6bbc99ac89f2c20fcb cherokee-0.4.16.ebuild 1334
+MD5 0326d7b9884529b8692bc79b932809b3 cherokee-0.4.17.1.ebuild 1541
+MD5 2b5e4de160e9519fa08438ef3365e6a4 cherokee-0.4.19.ebuild 1409
MD5 2a338274e3b176bc1b83221670a84b46 cherokee-0.4.5.ebuild 1723
-MD5 1d0701b3aab6f278ee8fbce211e037f6 cherokee-0.4.0.ebuild 640
-MD5 b6fecca00b7300ad5833b0a3285c21f0 ChangeLog 5343
+MD5 7aa17024a34cc45c0bca7d0450c73eb5 ChangeLog 5838
MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
-MD5 88661e2618ec207291c2a9948ee90d73 files/cherokee-0.4.1-gcc3.patch 674
MD5 289de164081060280437629085fce186 files/digest-cherokee-0.4.17.1 69
MD5 8278b4acda7637c68885863ddd58f712 files/cherokee-0.4.5-cherokee.conf 2769
MD5 b44b2de7ebfdc07ee94d54a514a738f0 files/cherokee-0.4.17-cherokee.conf 2611
MD5 13c50109a3ebd047c357fcf95f70bed7 files/cherokee-0.4.17-init.d 789
-MD5 af8c59cc3ff3018823e5050bc61c619d files/digest-cherokee-0.4.10 67
-MD5 9039251180a9ae02ee3b8077cd09c274 files/digest-cherokee-0.4.14 67
-MD5 57162fc67ff684e4198d041a8cd90f47 files/digest-cherokee-0.4.15 67
-MD5 f5860d77fca2046152680af040c1a978 files/digest-cherokee-0.4.16 67
MD5 7abc32dac306688c90e1ef1757603b3a files/digest-cherokee-0.4.17 67
-MD5 328043d9bd3472aa21ed3eab65a8bb87 files/digest-cherokee-0.4.0 72
-MD5 c4c2ec2b5ce18737c27b306f0ba93578 files/digest-cherokee-0.4.1 66
-MD5 a4010247cc6d338421781155b7ad324b files/digest-cherokee-0.4.4 66
+MD5 c8394a4871a8edbc12c1bddfbaea22fd files/digest-cherokee-0.4.19 68
MD5 298dfdd3c83893b3123d85278d1c1e7e files/digest-cherokee-0.4.5 66
MD5 a9f08f404f9b738a52e2c82c7ed88e04 files/cherokee-0.4.5-init.d 787
MD5 6da94000869b804248b03d61703b69bb files/cherokee-0.4.5-Makefile.am.patch 956
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCE1e5EZCkKN40op4RAldLAKCzLB9xkj+Z0yxeQWDDVZ19WN4K8wCeJVzI
-aM9IaguWtJMz3F2wkBRK2LQ=
-=utp3
------END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-0.4.0.ebuild b/www-servers/cherokee/cherokee-0.4.0.ebuild
deleted file mode 100644
index c3be5aacb3f6..000000000000
--- a/www-servers/cherokee/cherokee-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +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.0.ebuild,v 1.2 2004/09/05 09:34:32 swegener Exp $
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/${P}-beta5.tar.gz"
-HOMEPAGE="http://www.alobbs.com/cherokee"
-LICENSE="GPL-2"
-DEPEND="sys-libs/glibc"
-KEYWORDS="x86"
-SLOT="0"
-IUSE=""
-
-src_compile() {
- econf || die "econf failed"
- emake || die
-}
-
-src_install () {
- make DESTDIR=${D} install || die
-
- dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README
-}
diff --git a/www-servers/cherokee/cherokee-0.4.1.ebuild b/www-servers/cherokee/cherokee-0.4.1.ebuild
deleted file mode 100644
index 4d01b320ccb0..000000000000
--- a/www-servers/cherokee/cherokee-0.4.1.ebuild
+++ /dev/null
@@ -1,30 +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.1.ebuild,v 1.2 2004/09/05 09:34:32 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="An extremely fast and tiny web server."
-SRC_URI="ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/${P}.tar.gz"
-HOMEPAGE="http://www.alobbs.com/cherokee"
-LICENSE="GPL-2"
-DEPEND="sys-libs/glibc"
-KEYWORDS="x86"
-SLOT="0"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- epatch ${FILESDIR}/${P}-gcc3.patch
-}
-
-src_compile() {
- econf || die
- emake || die
-}
-
-src_install () {
- make DESTDIR=${D} install || die
-
- dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README
-}
diff --git a/www-servers/cherokee/cherokee-0.4.10.ebuild b/www-servers/cherokee/cherokee-0.4.10.ebuild
deleted file mode 100644
index fdb2abf706a5..000000000000
--- a/www-servers/cherokee/cherokee-0.4.10.ebuild
+++ /dev/null
@@ -1,69 +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.10.ebuild,v 1.3 2004/09/05 09:34:32 swegener 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
- 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"
-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}/cherokee-0.4.5-init.d ${D}/etc/init.d/cherokee
-}
diff --git a/www-servers/cherokee/cherokee-0.4.14.ebuild b/www-servers/cherokee/cherokee-0.4.14.ebuild
deleted file mode 100644
index 675d3ecf48a6..000000000000
--- a/www-servers/cherokee/cherokee-0.4.14.ebuild
+++ /dev/null
@@ -1,69 +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.14.ebuild,v 1.4 2004/09/05 09:34:32 swegener 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
- 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 ppc"
-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}/cherokee-0.4.5-init.d ${D}/etc/init.d/cherokee
-}
diff --git a/www-servers/cherokee/cherokee-0.4.15.ebuild b/www-servers/cherokee/cherokee-0.4.15.ebuild
deleted file mode 100644
index 866e3667d269..000000000000
--- a/www-servers/cherokee/cherokee-0.4.15.ebuild
+++ /dev/null
@@ -1,69 +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.15.ebuild,v 1.4 2004/09/05 09:34:32 swegener 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
- 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 ppc"
-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}/cherokee-0.4.5-init.d ${D}/etc/init.d/cherokee
-}
diff --git a/www-servers/cherokee/cherokee-0.4.16.ebuild b/www-servers/cherokee/cherokee-0.4.16.ebuild
deleted file mode 100644
index 6cbdba108d6f..000000000000
--- a/www-servers/cherokee/cherokee-0.4.16.ebuild
+++ /dev/null
@@ -1,57 +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.16.ebuild,v 1.3 2004/09/05 09:34:32 swegener 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}/cherokee-0.4.5-init.d ${D}/etc/init.d/cherokee
-}
diff --git a/www-servers/cherokee/cherokee-0.4.17.1.ebuild b/www-servers/cherokee/cherokee-0.4.17.1.ebuild
index 937b4c140b37..0e8e8ff06aa7 100644
--- a/www-servers/cherokee/cherokee-0.4.17.1.ebuild
+++ b/www-servers/cherokee/cherokee-0.4.17.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2 2004/11/01 10:34:08 hansmi Exp $
+# $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
@@ -21,13 +21,21 @@ IUSE=""
S="${WORKDIR}/${PN}-${MY_PV}"
-src_compile() {
+src_unpack() {
+ unpack ${A}
+ cd ${S}
-# coming soon ;-)
-# use php && my_conf="$my_conf --with-php"
-# use mono && my_conf="$my_conf --with-mono"
+ # 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
+}
- ./configure --prefix=/usr --sysconfdir=/etc --disable-static $my_conf --with-pic
+src_compile() {
+ ./configure \
+ --prefix=/usr --sysconfdir=/etc \
+ --disable-static $my_conf --with-pic || die "configure failed"
emake || die
}
diff --git a/www-servers/cherokee/cherokee-0.4.19.ebuild b/www-servers/cherokee/cherokee-0.4.19.ebuild
new file mode 100644
index 000000000000..8b0f7210dc4e
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.4.19.ebuild
@@ -0,0 +1,53 @@
+# 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.1 2005/04/17 13:12:30 ka0ttic 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"
+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.4.ebuild b/www-servers/cherokee/cherokee-0.4.4.ebuild
deleted file mode 100644
index 1a2de73c4cfc..000000000000
--- a/www-servers/cherokee/cherokee-0.4.4.ebuild
+++ /dev/null
@@ -1,19 +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.4.ebuild,v 1.2 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"
-DEPEND="sys-libs/glibc"
-KEYWORDS="~x86"
-SLOT="0"
-IUSE=""
-
-src_install () {
- make DESTDIR=${D} install || die
-
- dodoc AUTHORS ChangeLog COPYING INSTALL README
-}
diff --git a/www-servers/cherokee/files/cherokee-0.4.1-gcc3.patch b/www-servers/cherokee/files/cherokee-0.4.1-gcc3.patch
deleted file mode 100644
index 07cec44c4b25..000000000000
--- a/www-servers/cherokee/files/cherokee-0.4.1-gcc3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r -u cherokee-0.4.1-old/src/common.c cherokee-0.4.1/src/common.c
---- cherokee-0.4.1-old/src/common.c 2003-02-23 08:36:02.000000000 -0700
-+++ cherokee-0.4.1/src/common.c 2004-02-15 23:17:22.000000000 -0700
-@@ -23,7 +23,7 @@
- * USA
- */
-
--#include <varargs.h>
-+#include <stdarg.h>
- #include "common.h"
-
- /* Global mini-buffer for quickly use
-diff -r -u cherokee-0.4.1-old/src/log.c cherokee-0.4.1/src/log.c
---- cherokee-0.4.1-old/src/log.c 2003-02-23 08:36:31.000000000 -0700
-+++ cherokee-0.4.1/src/log.c 2004-02-15 23:17:37.000000000 -0700
-@@ -24,7 +24,7 @@
- */
-
- #include "log.h"
--#include <varargs.h>
-+#include <stdarg.h>
-
- static int __cherokee_logging = 0;
-
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.0 b/www-servers/cherokee/files/digest-cherokee-0.4.0
deleted file mode 100644
index 1d80d29a1e6f..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd204abaeb75f4b7a3a2c238f468b447 cherokee-0.4.0-beta5.tar.gz 207094
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.1 b/www-servers/cherokee/files/digest-cherokee-0.4.1
deleted file mode 100644
index 5916dd39d1ef..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 15ed888989350ad9b1e1d36609a7bd0d cherokee-0.4.1.tar.gz 212222
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.10 b/www-servers/cherokee/files/digest-cherokee-0.4.10
deleted file mode 100644
index 94ae94565758..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1934b6f20e774c6981b80575bfd7427f cherokee-0.4.10.tar.gz 680687
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.14 b/www-servers/cherokee/files/digest-cherokee-0.4.14
deleted file mode 100644
index c3c739731c90..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7210fd4960af21e4b285a5f6fb7fad4 cherokee-0.4.14.tar.gz 749879
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.15 b/www-servers/cherokee/files/digest-cherokee-0.4.15
deleted file mode 100644
index f2ca53179c69..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e08c299da597feebaecd5839b8aaafc3 cherokee-0.4.15.tar.gz 755199
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.16 b/www-servers/cherokee/files/digest-cherokee-0.4.16
deleted file mode 100644
index 87ea0c17028c..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0e390c247952756bec877189583be22 cherokee-0.4.16.tar.gz 771568
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.19 b/www-servers/cherokee/files/digest-cherokee-0.4.19
new file mode 100644
index 000000000000..0238d4a76ee8
--- /dev/null
+++ b/www-servers/cherokee/files/digest-cherokee-0.4.19
@@ -0,0 +1 @@
+MD5 ecd2b9e52450bdd70f0eed8f0c803871 cherokee-0.4.19.tar.gz 1024984
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.4 b/www-servers/cherokee/files/digest-cherokee-0.4.4
deleted file mode 100644
index 390943d6a340..000000000000
--- a/www-servers/cherokee/files/digest-cherokee-0.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 efed5a8351acee511686c8662629162a cherokee-0.4.4.tar.gz 338818