Fixed python compatibility (thanks xmw)

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 715744f4326fcd9265391252f2dbc97cb828bc21..b10f39e467e1194951d09a218f2bb45a86110db2 100644 (file)
--- 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/Manifest b/www-servers/cherokee/Manifest
index 3a4de31da3e0009caaced055bb9e8a3f7bdc201a..8b73f9db86a2a0399878e2b8ff2edef0ac8efac0 100644 (file)
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -10,6 +10,6 @@ EBUILD cherokee-0.99.42.ebuild 3898 RMD160 94aae50a66f9405afa2f9d605f5f155c343d0
 EBUILD cherokee-0.99.44.ebuild 3898 RMD160 3ae910e22670f339543369eae9fff16310c70212 SHA1 f046f83e606de05538e9e1e302e11025e9a84d95 SHA256 4cd902166e4fcca9f77c8ce500fab32ae7c94a72995c33ef49ef6bdf446c531a
 EBUILD cherokee-0.99.48.ebuild 3897 RMD160 f5097665c8414cfcedf07a909e1fd41d0012a958 SHA1 841fd81a42044e0eb603392afc8a4fdbc25dd192 SHA256 dd343d39ec389af8dfe34df8ae3b4970db28e0af4aca7db0403a33c3efd3944b
 EBUILD cherokee-1.0.0.ebuild 4002 RMD160 bc2b9c1ad6ab7c2526cdb69ba1eab94a0788442a SHA1 6bc90168786c333c9c38eab0203d326a1b8af24e SHA256 38dfd6bc3129d292c76a0ace9a912d26fe894d76bbb02ffcb63bd2c98a93271b
-EBUILD cherokee-1.0.2.ebuild 4253 RMD160 3a9061810093604fd9544fd55312f58d4166d39a SHA1 1e1bcc5494b4472853713beac168ce976fe7816a SHA256 497abbb83a148fcc1bc781acb19801178336667aaa0ee4c6ab67ff7fea65db71
-MISC ChangeLog 17019 RMD160 ca4800aeef96be0783803b9fbadb74269d1a51a4 SHA1 080f74ddb6141e25fa43b03ee01c77c61d860803 SHA256 3377d2a41f95f62408d57511923376ba470e3f10b9455b6c8e6ab8d859d3329a
+EBUILD cherokee-1.0.2-r1.ebuild 4115 RMD160 a4213f4b147987e5e981751a0d4677067825401c SHA1 7c2009e8b154c67f7e8d33ecbf9d1fd58c1462c2 SHA256 6d029bb9d2d9268978baa50dc16393c589b29587f25bfc00230dd72ae2f531dc
+MISC ChangeLog 17208 RMD160 278637663aa85021d857e234fed9012ef0fe0469 SHA1 2741a3595528776c8e8452b03ec00910889b5f89 SHA256 460184a1aa74cab9ae11ac94aee01bf40dae0006a8b394c0c2e97de4c9c50b30
 MISC metadata.xml 434 RMD160 bac321b7879fe7793087b221f20554e4b44a5975 SHA1 d77a40137b169af1715d9827f463e2219485a931 SHA256 9cb0163ef5aadb0cafb83c75615bb3f393f5484016695abd15db7ff6d2680f8b

diff --git a/www-servers/cherokee/cherokee-1.0.2.ebuild b/www-servers/cherokee/cherokee-1.0.2-r1.ebuild
similarity index 94%
rename from www-servers/cherokee/cherokee-1.0.2.ebuild
rename to www-servers/cherokee/cherokee-1.0.2-r1.ebuild
index 12175353fec8a42b6c0aa243d59f35ac1ad5a9d6..5d3a92df5dcd66ac6c9a2c8863d3c9e632485373 100644 (file)
--- 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
 
 
 }