summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-02-03 12:46:51 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-02-03 12:46:51 +0000
commit91ada539aae03f2effc4ab61e9cbe0cb0d90fa30 (patch)
tree5563091487e79c5898fbddbe5c8a85e449e144b5 /www-servers/lighttpd
parentVersion bump (diff)
downloadhistorical-91ada539aae03f2effc4ab61e9cbe0cb0d90fa30.tar.gz
historical-91ada539aae03f2effc4ab61e9cbe0cb0d90fa30.tar.bz2
historical-91ada539aae03f2effc4ab61e9cbe0cb0d90fa30.zip
Block lighttpd until spawn-fcgi collision is fixed. See bug #224781.
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo i686
Diffstat (limited to 'www-servers/lighttpd')
-rw-r--r--www-servers/lighttpd/ChangeLog7
-rw-r--r--www-servers/lighttpd/lighttpd-1.4.20.ebuild10
2 files changed, 12 insertions, 5 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index c1c0d1331968..1deb502f09da 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/lighttpd
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.192 2008/10/06 20:09:17 hoffie Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.193 2009/02/03 12:46:51 betelgeuse Exp $
+
+ 03 Feb 2009; Petteri Räty <betelgeuse@gentoo.org> lighttpd-1.4.20.ebuild:
+ Block lighttpd until spawn-fcgi collision is fixed. See bug #224781.
06 Oct 2008; Christian Hoffmann <hoffie@gentoo.org> metadata.xml:
adding myself to metadata (should've done that earlier probably; got
diff --git a/www-servers/lighttpd/lighttpd-1.4.20.ebuild b/www-servers/lighttpd/lighttpd-1.4.20.ebuild
index d7ac63ae3953..0b08ed34a522 100644
--- a/www-servers/lighttpd/lighttpd-1.4.20.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.20.ebuild,v 1.7 2008/10/01 17:39:57 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.20.ebuild,v 1.8 2009/02/03 12:46:51 betelgeuse Exp $
WANT_AUTOCONF=latest
WANT_AUTOMAKE=latest
@@ -15,7 +15,11 @@ SLOT="0"
KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
-RDEPEND=">=sys-libs/zlib-1.1
+# cherokee block should be resolved properly
+# http://bugs.gentoo.org/show_bug.cgi?id=224781
+RDEPEND="
+ !www-servers/cherokee
+ >=sys-libs/zlib-1.1
bzip2? ( app-arch/bzip2 )
fam? ( virtual/fam )
gdbm? ( sys-libs/gdbm )