Revision bump with patch to work with python 2.5.

(Portage version: 2.1.2_pre1)

4 files changed, 105 insertions, 1 deletions

diff --git a/dev-python/twisted-conch/ChangeLog b/dev-python/twisted-conch/ChangeLog
index 918524b39924..4d62bee10eeb 100644
--- a/dev-python/twisted-conch/ChangeLog
+++ b/dev-python/twisted-conch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/twisted-conch
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/ChangeLog,v 1.19 2006/08/01 15:16:59 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/ChangeLog,v 1.20 2006/09/25 11:28:26 marienz Exp $
+
+*twisted-conch-0.7.0-r1 (25 Sep 2006)
+
+  25 Sep 2006; Marien Zwart <marienz@gentoo.org>
+  +files/twisted-conch-0.7.0-python-2.5-compat.patch,
+  +twisted-conch-0.7.0-r1.ebuild:
+  Revision bump with patch to work with python 2.5.
 
   01 Aug 2006; Simon Stelling <blubb@gentoo.org> twisted-conch-0.7.0.ebuild:
   stable on amd64
diff --git a/dev-python/twisted-conch/files/digest-twisted-conch-0.7.0-r1 b/dev-python/twisted-conch/files/digest-twisted-conch-0.7.0-r1
new file mode 100644
index 000000000000..3d8253a1008e
--- /dev/null
+++ b/dev-python/twisted-conch/files/digest-twisted-conch-0.7.0-r1
@@ -0,0 +1,3 @@
+MD5 0236162d53cf7f34ed341d9179e7783b TwistedConch-0.7.0.tar.bz2 127274
+RMD160 d9334942b887af86a7a19dcf6e15d5f3b54b558e TwistedConch-0.7.0.tar.bz2 127274
+SHA256 d5e41c90f0319a4bed48725626ee46b9f33a0744cf060b64184248623ca112c0 TwistedConch-0.7.0.tar.bz2 127274
diff --git a/dev-python/twisted-conch/files/twisted-conch-0.7.0-python-2.5-compat.patch b/dev-python/twisted-conch/files/twisted-conch-0.7.0-python-2.5-compat.patch
new file mode 100644
index 000000000000..b5765d702784
--- /dev/null
+++ b/dev-python/twisted-conch/files/twisted-conch-0.7.0-python-2.5-compat.patch
@@ -0,0 +1,71 @@
+Index: twisted/conch/unix.py
+===================================================================
+--- twisted/conch/unix.py	(revision 17447)
++++ twisted/conch/unix.py	(revision 17448)
+@@ -4,12 +4,11 @@
+ #
+ 
+ from twisted.cred import portal
+-from twisted.python import components, log, util
++from twisted.python import components, log
+ from twisted.internet.process import ProcessExitedAlready
+ from zope import interface
+ from ssh import session, forwarding, filetransfer
+ from ssh.filetransfer import FXF_READ, FXF_WRITE, FXF_APPEND, FXF_CREAT, FXF_TRUNC, FXF_EXCL
+-from ssh.connection import OPEN_UNKNOWN_CHANNEL_TYPE
+ from twisted.conch.ls import lsLine
+ 
+ from avatar import ConchUser
+@@ -21,7 +20,6 @@
+ import pwd, grp
+ import pty
+ import ttymodes
+-import os
+ 
+ try:
+     import utmp
+@@ -320,8 +318,8 @@
+             "uid" : s.st_uid,
+             "gid" : s.st_gid,
+             "permissions" : s.st_mode,
+-            "atime" : s.st_atime,
+-            "mtime" : s.st_mtime
++            "atime" : int(s.st_atime),
++            "mtime" : int(s.st_mtime)
+         }
+ 
+     def _absPath(self, path):
+Index: twisted/conch/test/test_manhole.py
+===================================================================
+--- twisted/conch/test/test_manhole.py (revision 17246)
++++ twisted/conch/test/test_manhole.py (revision 17478)
+@@ -4,4 +4,6 @@
+ 
+ from __future__ import generators
++
++import traceback
+ 
+ from twisted.trial import unittest
+@@ -9,4 +11,15 @@
+ from twisted.conch.test.test_recvline import _TelnetMixin, _SSHMixin, _StdioMixin, stdio, ssh
+ from twisted.conch import manhole
++
++def determineDefaultFunctionName():
++    """
++    Return the string used by Python as the name for code objects which are
++    compiled from interactive input or at the top-level of modules.
++    """
++    try:
++        1 / 0
++    except:
++        return traceback.extract_stack()[0][2]
++defaultFunctionName = determineDefaultFunctionName()
+ 
+ 
+@@ -130,5 +143,5 @@
+                 [">>> 1 / 0",
+                  "Traceback (most recent call last):",
+-                 '  File "<console>", line 1, in ?',
++                 '  File "<console>", line 1, in ' + defaultFunctionName,
+                  "ZeroDivisionError: integer division or modulo by zero",
+                  ">>> done"])
diff --git a/dev-python/twisted-conch/twisted-conch-0.7.0-r1.ebuild b/dev-python/twisted-conch/twisted-conch-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..87b283db6e22
--- /dev/null
+++ b/dev-python/twisted-conch/twisted-conch-0.7.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-0.7.0-r1.ebuild,v 1.1 2006/09/25 11:28:26 marienz Exp $
+
+MY_PACKAGE=Conch
+
+inherit twisted eutils
+
+DESCRIPTION="Twisted SSHv2 implementation."
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-python/twisted-2.4
+	>=dev-python/pycrypto-1.9_alpha6"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-0.6.0-root-skip.patch"
+	epatch "${FILESDIR}/${P}-python-2.5-compat.patch"
+}