new version and new ebuild :)

(Portage version: 2.0.51.19)

8 files changed, 196 insertions, 17 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 4ad422e0d4d9..5ee6376e6f6d 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,15 @@
 # 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.9 2005/05/12 01:14:57 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.10 2005/05/16 19:09:32 bass Exp $
+
+*cherokee-0.4.22 (16 May 2005)
+ 16 May 2005; J.Alberto S.L. <bass@gentoo.org> +cherokee-0.4.22.ebuild:
+ Bump Version.
+
+*cherokee-0.4.21-r1 (16 May 2005)
+ 16 May 2005; J.Alberto S.L. <bass@gentoo.org> +cherokee-0.4.21-r1.ebuild:
+ Patch to no build handle-admin (thanks to ka0ttic) and a few USEs added
+ (ssl, gnutls, pic, static & ipv6).
 
 *cherokee-0.4.21 (11 May 2005)
 
@@ -94,7 +103,7 @@
   15 Apr 2004; <bass@gentoo.org> cherokee-0.4.16.ebuild:
   New version.
   Removed the gnome-vfs support, the main cherokee-dev say this:
-   (00:33:56) Alo: quita lo de GNOME-VFS.. que eso sólo es un peligro
+   (00:33:56) Alo: quita lo de GNOME-VFS.. que eso sólo es un peligro
                    y no vale para nada en el mundo real :)
   (gnome-vfs is dengerous and don't usefull in the real world)
    (00:45:14) Alo: es un buen ejemplo de como hacer un handler
@@ -144,12 +153,12 @@
 
 *chrokee-4.1 (18 Mar 2003)
 
- 18 Mar 2003; J.Alberto Suárez L. <bass@gentoo.org> cherokee-4.1.ebuild:
+ 18 Mar 2003; J.Alberto Suárez L. <bass@gentoo.org> cherokee-4.1.ebuild:
  Bumped version
 
 *cherokee-4.0.0 (11 Jan 2003)
 
-  10 Jan 2002; J.Alberto Suárez L. <bass@gentoo.org> cherokee-4.0.0.ebuild:
+  10 Jan 2002; J.Alberto Suárez L. <bass@gentoo.org> cherokee-4.0.0.ebuild:
   First relase. Beta5 version. 
 
 *cherokee-0.4.0 (11 Jan 2003)
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index c2d31c0c31ad..400ad01afcb2 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,13 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8ced6a0c13e419d66f63651dae08e1a3 cherokee-0.4.21.ebuild 1415
+MD5 2695698cc7ac7596caf8f69b25e73eed cherokee-0.4.22.ebuild 1590
+MD5 3332cd22443ba1c243cb051a0e05c41b cherokee-0.4.21.ebuild 1431
 MD5 693100f7d7a22ddb1762918c931a3885 cherokee-0.4.17.ebuild 1315
 MD5 987e734e6bc2d0d2845efb991e7ccd3d cherokee-0.4.17.1.ebuild 1542
 MD5 9866faff941afcb8b5834588c14c0b3e cherokee-0.4.19.ebuild 1413
+MD5 0eaf5853ad585522a2d5c44a9df9f7ea cherokee-0.4.21-r1.ebuild 1885
 MD5 2a338274e3b176bc1b83221670a84b46 cherokee-0.4.5.ebuild 1723
-MD5 1db93b1f79b3a46e07e881d4788dd8d1 ChangeLog 6057
+MD5 95e5daf395eebe52f7f7b8db99c45095 ChangeLog 6398
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
+MD5 e0af76fef298222ff6ad8e6e5aeb10d7 files/cherokee-0.4.21-no-handler_admin.diff 1151
+MD5 fbddeb3fc079036d82ba359c98cc4bf1 files/digest-cherokee-0.4.21-r1 68
 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
@@ -15,13 +16,7 @@ MD5 13c50109a3ebd047c357fcf95f70bed7 files/cherokee-0.4.17-init.d 789
 MD5 7abc32dac306688c90e1ef1757603b3a files/digest-cherokee-0.4.17 67
 MD5 c8394a4871a8edbc12c1bddfbaea22fd files/digest-cherokee-0.4.19 68
 MD5 fbddeb3fc079036d82ba359c98cc4bf1 files/digest-cherokee-0.4.21 68
+MD5 dbf8285e5a19940db8b60f76b25cf7ae files/digest-cherokee-0.4.22 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.1 (GNU/Linux)
-
-iD8DBQFCgq5jEZCkKN40op4RAnfKAJ9LZFEQPoD1UYfPo8+ZJcwAx3Os2ACgk9tr
-8v9PNSej/JAk6r18Qedqn44=
-=Q9Ml
------END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-0.4.21-r1.ebuild b/www-servers/cherokee/cherokee-0.4.21-r1.ebuild
new file mode 100644
index 000000000000..fba9f0412cf6
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.4.21-r1.ebuild
@@ -0,0 +1,75 @@
+# 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.1 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
+	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
index 4eb8de50e50f..6e88c272a3ec 100644
--- a/www-servers/cherokee/cherokee-0.4.21.ebuild
+++ b/www-servers/cherokee/cherokee-0.4.21.ebuild
@@ -1,6 +1,8 @@
 # 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.1 2005/05/12 01:14:57 ka0ttic Exp $
+# $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"
diff --git a/www-servers/cherokee/cherokee-0.4.22.ebuild b/www-servers/cherokee/cherokee-0.4.22.ebuild
new file mode 100644
index 000000000000..f853d3f21705
--- /dev/null
+++ b/www-servers/cherokee/cherokee-0.4.22.ebuild
@@ -0,0 +1,68 @@
+# 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.1 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
+	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/files/cherokee-0.4.21-no-handler_admin.diff b/www-servers/cherokee/files/cherokee-0.4.21-no-handler_admin.diff
new file mode 100644
index 000000000000..a2bab544822b
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-0.4.21-no-handler_admin.diff
@@ -0,0 +1,28 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN cherokee-0.4.21.orig/cherokee/Makefile.in cherokee-0.4.21/cherokee/Makefile.in
+--- cherokee-0.4.21.orig/cherokee/Makefile.in	2005-05-13 03:48:44.000000000 -0400
++++ cherokee-0.4.21/cherokee/Makefile.in	2005-05-13 04:05:18.000000000 -0400
+@@ -801,15 +801,15 @@
+ #
+ # Handler admin
+ #
+-handler_admin = \
+-handler_admin.c \
+-handler_admin.h
+-
+-libplugin_admin_la_LDFLAGS = -module -export-dynamic -avoid-version  
+-libplugin_admin_la_SOURCES = $(handler_admin)
+-libplugin_admin_la_LIBADD = -lcherokee-config -lcherokee-client
+-@STATIC_HANDLER_ADMIN_TRUE@static_handler_admin_src = $(handler_admin)
+-@STATIC_HANDLER_ADMIN_FALSE@dynamic_handler_admin_lib = libplugin_admin.la
++# handler_admin = \
++# handler_admin.c \
++# handler_admin.h
++
++# libplugin_admin_la_LDFLAGS = -module -export-dynamic -avoid-version  
++# libplugin_admin_la_SOURCES = $(handler_admin)
++# libplugin_admin_la_LIBADD = -lcherokee-config -lcherokee-client
++# @STATIC_HANDLER_ADMIN_TRUE@static_handler_admin_src = $(handler_admin)
++# @STATIC_HANDLER_ADMIN_FALSE@dynamic_handler_admin_lib = libplugin_admin.la
+ 
+ #
+ # Handler GNOME VFS
diff --git a/www-servers/cherokee/files/digest-cherokee-0.4.21-r1 b/www-servers/cherokee/files/digest-cherokee-0.4.21-r1
new file mode 100644
index 000000000000..33d5b4cbdf3d
--- /dev/null
+++ b/www-servers/cherokee/files/digest-cherokee-0.4.21-r1
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..852810d9154e
--- /dev/null
+++ b/www-servers/cherokee/files/digest-cherokee-0.4.22
@@ -0,0 +1 @@
+MD5 91e44fd5b58285164a974a6b17755af4 cherokee-0.4.22.tar.gz 1336956