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

Package-Manager: portage-2.1_pre9-r5

5 files changed, 115 insertions, 26 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/Manifest b/dev-python/paramiko/Manifest
index b238bd0b0326..c1d8c47bcf9b 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,46 +1,69 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4b156096c9b4e8a74988b7f81d5ef30d ChangeLog 1753
-RMD160 bbd902db045cb5e7af0be413c5a2315aa90fbe42 ChangeLog 1753
-SHA256 290d28a5304e7c379b999b0e6dca9c079d60a33aae70a612e8496a6e0c099173 ChangeLog 1753
-MD5 c117912a6af93099a7e2bc82fb50526f files/digest-paramiko-0.9h 68
-RMD160 21a40d203dcedcb6f9718bb09a5768764a19ecc6 files/digest-paramiko-0.9h 68
-SHA256 ff447fbefcae7a5bcd1f7c34df44b0ea1338c468a3d89c5b441f0d398efa0264 files/digest-paramiko-0.9h 68
-MD5 1d11d85c9926b3c9d029aab756fa3f3f files/digest-paramiko-1.3 61
-RMD160 a5db5b147cbe55d568afe76510282ff6e3f82b94 files/digest-paramiko-1.3 61
-SHA256 b54860c37290fefac8db18b426bb35ffcee8b9bf1ed98513d88786bf663ba30c files/digest-paramiko-1.3 61
-MD5 3b3cb92a8ee9a548558763e6867dcd06 files/digest-paramiko-1.5 61
-RMD160 1ecf0b1567070279dbcb98fee764d34a9a631f6e files/digest-paramiko-1.5 61
-SHA256 bd36fadeda5d58c7bf1cb0ef0bbac8868e2bcec950c131299296e51d11c5ff09 files/digest-paramiko-1.5 61
-MD5 36c542c1f7a1181e82cdc75af28f635f files/digest-paramiko-1.5.2 63
-RMD160 7e14ce17c49c54af82c18dbb863f21be2b407ba4 files/digest-paramiko-1.5.2 63
-SHA256 2c0d22bae595fdb2f3d640b6f7c26075db5b9cf80d1e192e0587314e66060f02 files/digest-paramiko-1.5.2 63
-MD5 2d6345e29c6ce170c06668d5759d3c1b files/digest-paramiko-1.5.4 235
-RMD160 ff90fd698780549fc47c11ddc4e73552f1eec290 files/digest-paramiko-1.5.4 235
-SHA256 ec3dbdb657276b724941cf657cfbd9dcfd65744e3989ee7edc07bcab4c238675 files/digest-paramiko-1.5.4 235
-MD5 4d5b7b5bcf6a70511e46ad6a06420b39 metadata.xml 897
-RMD160 53d2f82df4ad314ad8543ca95e82037f7e4e3a50 metadata.xml 897
-SHA256 2706e534ea7bc52cf5fbc3ce6ee4008ec371db4869a76edcbbbd78782b63fd17 metadata.xml 897
+AUX paramiko-1.5.4-no-setuptools.patch 407 RMD160 5066c7d13fdd4214cecfebd44374fd730b102a25 SHA1 18a558389b6159511198ae497fa3bbf32711a80e SHA256 728cb5fd4d48f9f63a9a2f91aa136c8574a44c687aa582de4e9c5e592896a29e size 407
+MD5 dfdf3b5887db734850c7252174160c7c files/paramiko-1.5.4-no-setuptools.patch 407
+RMD160 5066c7d13fdd4214cecfebd44374fd730b102a25 files/paramiko-1.5.4-no-setuptools.patch 407
+SHA256 728cb5fd4d48f9f63a9a2f91aa136c8574a44c687aa582de4e9c5e592896a29e files/paramiko-1.5.4-no-setuptools.patch 407
+DIST paramiko-0.9-horsea.zip 383586 size 383586
+DIST paramiko-1.3.zip 507946 size 507946
+DIST paramiko-1.5.2.zip 555303 size 555303
+DIST paramiko-1.5.4.zip 555426 RMD160 923221c0563ca88e70baadaec43793b61e013f71 SHA256 e75cb071a9636858c971ceb713b5bc4c3330d9fe7efb829af038dc494c755104 size 555426
+DIST paramiko-1.5.zip 533034 size 533034
+EBUILD paramiko-0.9h.ebuild 645 RMD160 a59e16c153a201c84d6f6bda5a2008dbaa48bef0 SHA1 9f4c5d93e72705bf044db202e3f364e902a20e17 SHA256 3802fb597ba49dc7f29c3ad952f6d02152a822fb9e638af420f12595daeb2092 size 645
 MD5 f46fea7290a62998eb139b377a3c823e paramiko-0.9h.ebuild 645
 RMD160 a59e16c153a201c84d6f6bda5a2008dbaa48bef0 paramiko-0.9h.ebuild 645
 SHA256 3802fb597ba49dc7f29c3ad952f6d02152a822fb9e638af420f12595daeb2092 paramiko-0.9h.ebuild 645
+EBUILD paramiko-1.3.ebuild 636 RMD160 c9f8baa5c143d2a716610b708afd204888a37dc4 SHA1 ca13406d83b6ab6bc5936d549d8f99abfc5b743d SHA256 e54ac22b2e9a1ee9acd80293b39e88d1389ec55a99b5da99f5e5008702b5c44e size 636
 MD5 9871b7a4b64c90a5252117a8c2f81f32 paramiko-1.3.ebuild 636
 RMD160 c9f8baa5c143d2a716610b708afd204888a37dc4 paramiko-1.3.ebuild 636
 SHA256 e54ac22b2e9a1ee9acd80293b39e88d1389ec55a99b5da99f5e5008702b5c44e paramiko-1.3.ebuild 636
+EBUILD paramiko-1.5.2.ebuild 722 RMD160 9f360e8235e871ff8657798f67e4811eb372ee3e SHA1 2ec06e47b03b2eaec3c0b7a09a646d26a8400dd1 SHA256 94e9ab064b1e767f6091b6fc368e997c3974f4b5d8288f074b9edfcf9d4f35a0 size 722
 MD5 bdd250275b6aa4e3ad225696e93c0e09 paramiko-1.5.2.ebuild 722
 RMD160 9f360e8235e871ff8657798f67e4811eb372ee3e paramiko-1.5.2.ebuild 722
 SHA256 94e9ab064b1e767f6091b6fc368e997c3974f4b5d8288f074b9edfcf9d4f35a0 paramiko-1.5.2.ebuild 722
+EBUILD paramiko-1.5.4-r1.ebuild 801 RMD160 80a7b362b04ebf990beb557c4f3bc3928686dc91 SHA1 642759186c5b8f38b5e7df879990e2780f3600be SHA256 12ee0ec7ac987c32cc1e9d1efcccfe1a1dfa67ab67a3b121e521e9f0d74c53c5 size 801
+MD5 d7756002c49b920d8b732d68fb521e56 paramiko-1.5.4-r1.ebuild 801
+RMD160 80a7b362b04ebf990beb557c4f3bc3928686dc91 paramiko-1.5.4-r1.ebuild 801
+SHA256 12ee0ec7ac987c32cc1e9d1efcccfe1a1dfa67ab67a3b121e521e9f0d74c53c5 paramiko-1.5.4-r1.ebuild 801
+EBUILD paramiko-1.5.4.ebuild 700 RMD160 3203314a3c24bd87260e3112549c1644af580e3e SHA1 ec4b5967f2de3d60a9235876c4f04f161cdcf00e SHA256 2447ef87b13f2969a84b626a9e3c238510d78a19cd8c890c655303d1137066e6 size 700
 MD5 6271505a657212ff3fb1952ed0b6ecf6 paramiko-1.5.4.ebuild 700
 RMD160 3203314a3c24bd87260e3112549c1644af580e3e paramiko-1.5.4.ebuild 700
 SHA256 2447ef87b13f2969a84b626a9e3c238510d78a19cd8c890c655303d1137066e6 paramiko-1.5.4.ebuild 700
+EBUILD paramiko-1.5.ebuild 647 RMD160 f68d230775fd32458dc5432ea8f82f540248bfdf SHA1 844fb7ba2837a511846f4b5d6795d7bd6117306c SHA256 f8f3f9a241700fb8fcec417bd441ca7d19111769f1ecef94d129d570123c9b7d size 647
 MD5 725ae933b503280d10ebac123c10bd6c paramiko-1.5.ebuild 647
 RMD160 f68d230775fd32458dc5432ea8f82f540248bfdf paramiko-1.5.ebuild 647
 SHA256 f8f3f9a241700fb8fcec417bd441ca7d19111769f1ecef94d129d570123c9b7d paramiko-1.5.ebuild 647
+MISC ChangeLog 1992 RMD160 1db1bc105c6d5654fd165916082723d39cfef3c5 SHA1 975f1c63d063e1eb52b64a0b2aa170c1b9db1e55 SHA256 efaacb7fec5313af1726bf5e6705b28254c6bb9a01c2909f758da5bd42db2fa8 size 1992
+MD5 2ccd155fbccb8ef51ae0f4847e068d6d ChangeLog 1992
+RMD160 1db1bc105c6d5654fd165916082723d39cfef3c5 ChangeLog 1992
+SHA256 efaacb7fec5313af1726bf5e6705b28254c6bb9a01c2909f758da5bd42db2fa8 ChangeLog 1992
+MISC metadata.xml 897 RMD160 53d2f82df4ad314ad8543ca95e82037f7e4e3a50 SHA1 403f5279ce7df3f3e9a76dd7a7096f855e5abd61 SHA256 2706e534ea7bc52cf5fbc3ce6ee4008ec371db4869a76edcbbbd78782b63fd17 size 897
+MD5 4d5b7b5bcf6a70511e46ad6a06420b39 metadata.xml 897
+RMD160 53d2f82df4ad314ad8543ca95e82037f7e4e3a50 metadata.xml 897
+SHA256 2706e534ea7bc52cf5fbc3ce6ee4008ec371db4869a76edcbbbd78782b63fd17 metadata.xml 897
+MD5 c117912a6af93099a7e2bc82fb50526f files/digest-paramiko-0.9h 68
+RMD160 21a40d203dcedcb6f9718bb09a5768764a19ecc6 files/digest-paramiko-0.9h 68
+SHA256 ff447fbefcae7a5bcd1f7c34df44b0ea1338c468a3d89c5b441f0d398efa0264 files/digest-paramiko-0.9h 68
+MD5 1d11d85c9926b3c9d029aab756fa3f3f files/digest-paramiko-1.3 61
+RMD160 a5db5b147cbe55d568afe76510282ff6e3f82b94 files/digest-paramiko-1.3 61
+SHA256 b54860c37290fefac8db18b426bb35ffcee8b9bf1ed98513d88786bf663ba30c files/digest-paramiko-1.3 61
+MD5 3b3cb92a8ee9a548558763e6867dcd06 files/digest-paramiko-1.5 61
+RMD160 1ecf0b1567070279dbcb98fee764d34a9a631f6e files/digest-paramiko-1.5 61
+SHA256 bd36fadeda5d58c7bf1cb0ef0bbac8868e2bcec950c131299296e51d11c5ff09 files/digest-paramiko-1.5 61
+MD5 36c542c1f7a1181e82cdc75af28f635f files/digest-paramiko-1.5.2 63
+RMD160 7e14ce17c49c54af82c18dbb863f21be2b407ba4 files/digest-paramiko-1.5.2 63
+SHA256 2c0d22bae595fdb2f3d640b6f7c26075db5b9cf80d1e192e0587314e66060f02 files/digest-paramiko-1.5.2 63
+MD5 2d6345e29c6ce170c06668d5759d3c1b files/digest-paramiko-1.5.4 235
+RMD160 ff90fd698780549fc47c11ddc4e73552f1eec290 files/digest-paramiko-1.5.4 235
+SHA256 ec3dbdb657276b724941cf657cfbd9dcfd65744e3989ee7edc07bcab4c238675 files/digest-paramiko-1.5.4 235
+MD5 2d6345e29c6ce170c06668d5759d3c1b files/digest-paramiko-1.5.4-r1 235
+RMD160 ff90fd698780549fc47c11ddc4e73552f1eec290 files/digest-paramiko-1.5.4-r1 235
+SHA256 ec3dbdb657276b724941cf657cfbd9dcfd65744e3989ee7edc07bcab4c238675 files/digest-paramiko-1.5.4-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEPgqU2jLqHNfbg2URAnh/AKCLaVxShx3IfGXnu9qbnI/wJF0UnACgi2S+
-29mT5yaL43xWpddgdEP3+9g=
-=uoco
+iD8DBQFEU5tlW78445TWHXcRAliKAJ93mjidIAmvTiTOXM5mnWeaeFwJjgCeKlpM
+qcCotf/o2yHbjNQwyCcIA5U=
+=ja8t
 -----END PGP SIGNATURE-----
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"
+}