Revision bump disabling the conditional setuptools use, should fix bug #131678.

(Portage version: 2.1_pre9-r5)

4 files changed, 67 insertions, 1 deletions

diff --git a/dev-python/paramiko/ChangeLog b/dev-python/paramiko/ChangeLog
index d41efd8e95d0..53f122e8fb48 100644
--- a/dev-python/paramiko/ChangeLog
+++ b/dev-python/paramiko/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/paramiko
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/ChangeLog,v 1.11 2006/04/13 08:23:01 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/ChangeLog,v 1.12 2006/04/29 16:59:11 marienz Exp $
+
+*paramiko-1.5.4-r1 (29 Apr 2006)
+
+  29 Apr 2006; Marien Zwart <marienz@gentoo.org>
+  +files/paramiko-1.5.4-no-setuptools.patch, +paramiko-1.5.4-r1.ebuild:
+  Revision bump disabling the conditional setuptools use, should fix bug #131678.
 
 *paramiko-1.5.4 (13 Apr 2006)
 
diff --git a/dev-python/paramiko/files/digest-paramiko-1.5.4-r1 b/dev-python/paramiko/files/digest-paramiko-1.5.4-r1
new file mode 100644
index 000000000000..bb777f4602c1
--- /dev/null
+++ b/dev-python/paramiko/files/digest-paramiko-1.5.4-r1
@@ -0,0 +1,3 @@
+MD5 a580fab7d295e7c731d0c270465d9560 paramiko-1.5.4.zip 555426
+RMD160 923221c0563ca88e70baadaec43793b61e013f71 paramiko-1.5.4.zip 555426
+SHA256 e75cb071a9636858c971ceb713b5bc4c3330d9fe7efb829af038dc494c755104 paramiko-1.5.4.zip 555426
diff --git a/dev-python/paramiko/files/paramiko-1.5.4-no-setuptools.patch b/dev-python/paramiko/files/paramiko-1.5.4-no-setuptools.patch
new file mode 100644
index 000000000000..d088fae54e32
--- /dev/null
+++ b/dev-python/paramiko/files/paramiko-1.5.4-no-setuptools.patch
@@ -0,0 +1,21 @@
+=== modified file 'a/setup.py'
+--- a/setup.py	
++++ b/setup.py	
+@@ -32,14 +32,8 @@
+ #import ez_setup
+ #ez_setup.use_setuptools()
+ 
+-try:
+-    from setuptools import setup
+-    kw = {
+-        'install_requires': 'pycrypto >= 1.9',
+-    }
+-except ImportError:
+-    from distutils.core import setup
+-    kw = {}
++from distutils.core import setup
++kw = {}
+ 
+ setup(name = "paramiko",
+       version = "1.5.4",
+
diff --git a/dev-python/paramiko/paramiko-1.5.4-r1.ebuild b/dev-python/paramiko/paramiko-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..ea848442eb69
--- /dev/null
+++ b/dev-python/paramiko/paramiko-1.5.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.5.4-r1.ebuild,v 1.1 2006/04/29 16:59:11 marienz Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="SSH2 implementation for Python"
+HOMEPAGE="http://www.lag.net/paramiko/"
+SRC_URI="http://www.lag.net/paramiko/download/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pycrypto-1.9_alpha6"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-no-setuptools.patch"
+}
+
+src_install() {
+	distutils_src_install
+	dohtml -r docs/*
+	insinto /usr/share/doc/${PF}
+	doins -r demos
+}
+
+src_test() {
+	"${python}" test.py || die "tests failed"
+}