summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Alberto Suarez Lopez <bass@gentoo.org>2010-06-16 11:54:54 +0000
committerJose Alberto Suarez Lopez <bass@gentoo.org>2010-06-16 11:54:54 +0000
commit8df5390574fb321ce51f9032b84cd56cb178cabd (patch)
treef48a69865bc340d5cdea15172ffc601b78b236c8 /www-servers
parentVersion Bump, #322929 (diff)
downloadgentoo-2-8df5390574fb321ce51f9032b84cd56cb178cabd.tar.gz
gentoo-2-8df5390574fb321ce51f9032b84cd56cb178cabd.tar.bz2
gentoo-2-8df5390574fb321ce51f9032b84cd56cb178cabd.zip
Fixed python compatibility (thanks xmw)
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/cherokee/ChangeLog8
-rw-r--r--www-servers/cherokee/cherokee-1.0.2-r1.ebuild (renamed from www-servers/cherokee/cherokee-1.0.2.ebuild)8
2 files changed, 10 insertions, 6 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 715744f4326f..b10f39e467e1 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-servers/cherokee
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.66 2010/06/16 07:51:59 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.67 2010/06/16 11:54:54 bass Exp $
+
+*cherokee-1.0.2-r1 (16 Jun 2010)
+
+ 16 Jun 2010; J. Alberto Suárez López <bass@gentoo.org>
+ -cherokee-1.0.2.ebuild, +cherokee-1.0.2-r1.ebuild:
+ Fixed python compatibility (thanks xmw)
*cherokee-1.0.2 (16 Jun 2010)
diff --git a/www-servers/cherokee/cherokee-1.0.2.ebuild b/www-servers/cherokee/cherokee-1.0.2-r1.ebuild
index 12175353fec8..5d3a92df5dcd 100644
--- a/www-servers/cherokee/cherokee-1.0.2.ebuild
+++ b/www-servers/cherokee/cherokee-1.0.2-r1.ebuild
@@ -1,8 +1,9 @@
# 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-1.0.2.ebuild,v 1.1 2010/06/16 07:51:59 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.2-r1.ebuild,v 1.1 2010/06/16 11:54:54 bass Exp $
-PYTHON_DEPEND="2"
+EAPI=2
+PYTHON_DEPEND="admin? 2"
inherit python eutils pam versionator libtool
@@ -21,7 +22,6 @@ RDEPEND="
nls? ( sys-devel/gettext )
ssl? ( dev-libs/openssl )
pam? ( virtual/pam )
- admin? ( dev-lang/python )
geoip? ( dev-libs/geoip )
ldap? ( net-nds/openldap )
mysql? ( virtual/mysql )
@@ -112,8 +112,6 @@ src_install () {
# Puts logs in /var/log/cherokee/
dosed "s:/var/log/cherokee\.:/var/log/cherokee/cherokee\.:g" /etc/cherokee/cherokee.conf
- # Force shebang to use python2
- dosed "s:\#\!/usr/bin/env\ python:\#\!/usr/bin/python2:g" /usr/share/cherokee/admin/server.py
}