Version bump: added doc/examples useflags, added NEED_PYTHON. Dropped 1.5.4-r1 and 1.6.2.

Package-Manager: portage-2.1.2.2

8 files changed, 42 insertions, 101 deletions

diff --git a/dev-python/paramiko/ChangeLog b/dev-python/paramiko/ChangeLog
index 91e2bd865e29..006a1cf3a391 100644
--- a/dev-python/paramiko/ChangeLog
+++ b/dev-python/paramiko/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/paramiko
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/ChangeLog,v 1.22 2007/03/12 13:36:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/ChangeLog,v 1.23 2007/03/24 16:37:48 lucass Exp $
+
+*paramiko-1.7 (24 Mar 2007)
+
+  24 Mar 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -files/paramiko-1.5.4-no-setuptools.patch, -paramiko-1.5.4-r1.ebuild,
+  -paramiko-1.6.2.ebuild, +paramiko-1.7.ebuild:
+  Version bump: added doc/examples useflags, added NEED_PYTHON.
+  Dropped 1.5.4-r1 and 1.6.2.
 
   12 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> paramiko-1.6.3.ebuild:
   Stable on sparc
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 92931e803a76..c9ede1a9df7d 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX paramiko-1.5.4-no-setuptools.patch 407 RMD160 5066c7d13fdd4214cecfebd44374fd730b102a25 SHA1 18a558389b6159511198ae497fa3bbf32711a80e SHA256 728cb5fd4d48f9f63a9a2f91aa136c8574a44c687aa582de4e9c5e592896a29e
-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
 AUX paramiko-1.6-no-setuptools.patch 399 RMD160 aa8e2e9982460e648be0a694eb5836b6e4a983fa SHA1 414f1e22078fd5b0114c70d0de3c56a42f2d3359 SHA256 a51691936594a572e85e31dd37e8ebb2db0a296d08ec2b5f835a7ca762f91c94
 MD5 f285f601f06640ae12d55f44012c0185 files/paramiko-1.6-no-setuptools.patch 399
 RMD160 aa8e2e9982460e648be0a694eb5836b6e4a983fa files/paramiko-1.6-no-setuptools.patch 399
@@ -13,18 +9,9 @@ AUX paramiko-1.6.3-no-setuptools.patch 439 RMD160 ce04a185ce50907c72cfc8ca78354c
 MD5 6b258ba93ef5c41a954b052459f71b82 files/paramiko-1.6.3-no-setuptools.patch 439
 RMD160 ce04a185ce50907c72cfc8ca78354cee455cbc52 files/paramiko-1.6.3-no-setuptools.patch 439
 SHA256 95ff0f41b119179188fb48d7234a27b418a9da18b9c8c64109fd84b2b2403afa files/paramiko-1.6.3-no-setuptools.patch 439
-DIST paramiko-1.5.4.zip 555426 RMD160 923221c0563ca88e70baadaec43793b61e013f71 SHA1 fe6549ba76932870c4a052a97d744aa2fbf1a18b SHA256 e75cb071a9636858c971ceb713b5bc4c3330d9fe7efb829af038dc494c755104
-DIST paramiko-1.6.2.zip 666371 RMD160 2c66a08406bea863c32189b2809395dcc639994a SHA1 c094a3de26e745ab5a2edf4c6c5c8bc90c1cd9ea SHA256 a99b2c456c8b0950cefccb2444e678543b8df073de75baac2e9e84232e98d980
 DIST paramiko-1.6.3.zip 344395 RMD160 0d12283916655531287a000f0e91b3098dcc69cd SHA1 37ceb1b17a5d34474a87109a2ea61dd830196a4f SHA256 f7e696f0fbd46950be25220f5cc80009d39fb6171f6652409bd7451d157b88c7
 DIST paramiko-1.6.zip 627264 RMD160 6d5f19dd792951ad007befe6ba007e9c253ccca6 SHA1 0bfa4a5e9f78fb84ecb1b0468ba9a9162746af9d SHA256 7158ab5f0860f61a44f9b934d3b1a956b11c5e46956b781f9ca582f948244100
-EBUILD paramiko-1.5.4-r1.ebuild 813 RMD160 b96ced52539605ef29ccf7c146f7b046aad6c161 SHA1 d6c26bbe34ed1739ad5dd46a80f6a7e6cc54d834 SHA256 4349d352acb68dfe1faa7c0e8949274f7396e91e75e80902490a542554ba0499
-MD5 c4f2f021b431be174696438e955af346 paramiko-1.5.4-r1.ebuild 813
-RMD160 b96ced52539605ef29ccf7c146f7b046aad6c161 paramiko-1.5.4-r1.ebuild 813
-SHA256 4349d352acb68dfe1faa7c0e8949274f7396e91e75e80902490a542554ba0499 paramiko-1.5.4-r1.ebuild 813
-EBUILD paramiko-1.6.2.ebuild 812 RMD160 4cd6b3c5739a9d5b13df307aedba384ca38deb2f SHA1 2c3fc7b0818feb6b5661d5778c0900c6425b7ef2 SHA256 bb536e42f402b2a09bd3da1bb308d10392d264ddd8461a1ce526d55d34b9ffb2
-MD5 3109e983e324d749da6315ae9eab2534 paramiko-1.6.2.ebuild 812
-RMD160 4cd6b3c5739a9d5b13df307aedba384ca38deb2f paramiko-1.6.2.ebuild 812
-SHA256 bb536e42f402b2a09bd3da1bb308d10392d264ddd8461a1ce526d55d34b9ffb2 paramiko-1.6.2.ebuild 812
+DIST paramiko-1.7.zip 353294 RMD160 6a155009132f2a9e091b12c79fb2040c72f5840b SHA1 714f12507d0dd6a9ba342560e744431397d7fd2b SHA256 352e8551fa91090fdf0e5e5dc598ac91e74a399f6db04cf97ee08bac519e88c1
 EBUILD paramiko-1.6.3.ebuild 820 RMD160 d647b6233a63466d0a453d8b7f680d3ecc0e06b5 SHA1 f57c3864734c9fef5e54dfbda81865afcbc9385b SHA256 fd2055222223d31a9687d73d786f8f64f765072d2a4f1ed6662eec377ddad4df
 MD5 9e91dd9bfb32cad852f5ab0c811d7180 paramiko-1.6.3.ebuild 820
 RMD160 d647b6233a63466d0a453d8b7f680d3ecc0e06b5 paramiko-1.6.3.ebuild 820
@@ -33,30 +20,31 @@ EBUILD paramiko-1.6.ebuild 803 RMD160 a00a72d923c00db663fed2bc8d3be3f0aae61839 S
 MD5 344469432f4aedad06dda00a2d2cf376 paramiko-1.6.ebuild 803
 RMD160 a00a72d923c00db663fed2bc8d3be3f0aae61839 paramiko-1.6.ebuild 803
 SHA256 edd09c226f7bc95d540038edaa799df9793f9ba1de706d5d8f5587500b68ac5f paramiko-1.6.ebuild 803
-MISC ChangeLog 3325 RMD160 dbc8f336654058c4aae8a260d63dd0c7a7fff50f SHA1 f44e1cba6652d90634d4c44e14ab7a1c97942146 SHA256 7129a0d2456d8d0bec5d25c6bc163bcd640b37be74d0cf0ba93d6fbbc833f3b8
-MD5 1ad1c882a4364c0b48d319720ee7cfdc ChangeLog 3325
-RMD160 dbc8f336654058c4aae8a260d63dd0c7a7fff50f ChangeLog 3325
-SHA256 7129a0d2456d8d0bec5d25c6bc163bcd640b37be74d0cf0ba93d6fbbc833f3b8 ChangeLog 3325
+EBUILD paramiko-1.7.ebuild 895 RMD160 5814482687d2e623fc440902ac2c21dc0cecb670 SHA1 f09d4adbefcb78114427537bfa7f68bd46efc3c6 SHA256 f60510431a30aee7d3640f6f8956266804d9b77c1499068e21d00bac146bd421
+MD5 cfbe3eac4f0c400983ed88b58ec15a42 paramiko-1.7.ebuild 895
+RMD160 5814482687d2e623fc440902ac2c21dc0cecb670 paramiko-1.7.ebuild 895
+SHA256 f60510431a30aee7d3640f6f8956266804d9b77c1499068e21d00bac146bd421 paramiko-1.7.ebuild 895
+MISC ChangeLog 3621 RMD160 511bf7eda5ad272a61535d5cc9f42f07b6b9bc8a SHA1 51d2ff32454e0b37a8e49949edb4ed8a43d86b0a SHA256 5dcaa4e3b809face45cee2a40b9c83f2e5b8ffa83106fcfff16a09173be69479
+MD5 dbe2c164be2651dccce070e881df1464 ChangeLog 3621
+RMD160 511bf7eda5ad272a61535d5cc9f42f07b6b9bc8a ChangeLog 3621
+SHA256 5dcaa4e3b809face45cee2a40b9c83f2e5b8ffa83106fcfff16a09173be69479 ChangeLog 3621
 MISC metadata.xml 897 RMD160 53d2f82df4ad314ad8543ca95e82037f7e4e3a50 SHA1 403f5279ce7df3f3e9a76dd7a7096f855e5abd61 SHA256 2706e534ea7bc52cf5fbc3ce6ee4008ec371db4869a76edcbbbd78782b63fd17
 MD5 4d5b7b5bcf6a70511e46ad6a06420b39 metadata.xml 897
 RMD160 53d2f82df4ad314ad8543ca95e82037f7e4e3a50 metadata.xml 897
 SHA256 2706e534ea7bc52cf5fbc3ce6ee4008ec371db4869a76edcbbbd78782b63fd17 metadata.xml 897
-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
 MD5 8c5509f990856539c27342253ce33770 files/digest-paramiko-1.6 229
 RMD160 e636c17ed677959ecec8792bd68c5943d1de9114 files/digest-paramiko-1.6 229
 SHA256 dd6d94327f49a931297b58f10c00a86ad6f6a3b5b1c8b9edab77d74eccc5a235 files/digest-paramiko-1.6 229
-MD5 4ab4fa2f32c74eb761ec90b1f41d2b53 files/digest-paramiko-1.6.2 235
-RMD160 353d21aff62a8c307be4ce3b3e831f6bbe2d5ea6 files/digest-paramiko-1.6.2 235
-SHA256 ef697bd4e7b1e8d6959f9093005e4caa407a83d4bb7775bde49189f0d31538bc files/digest-paramiko-1.6.2 235
 MD5 3616273105ee7d36052b7963b9c3abcf files/digest-paramiko-1.6.3 235
 RMD160 59f8f3f290ac63573a3cd3442f4c365fa1baa9db files/digest-paramiko-1.6.3 235
 SHA256 b5539d4a6e7a7ad24460d8948f6d095e37fb71fa71fe7b397f9159ca10713df8 files/digest-paramiko-1.6.3 235
+MD5 b08c5eb240c518a3e09c42628da805e1 files/digest-paramiko-1.7 229
+RMD160 072125756189616959b25b5de0d5d3bb8c403eca files/digest-paramiko-1.7 229
+SHA256 6b5c36187954cf795b6296738d826c4a4d1913558cc72427cbfd4381c1de84f1 files/digest-paramiko-1.7 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9Vd2KRy60XGEcJIRAusqAKCO10ZI0/CBSu0SXdfg1Md+x7EEIQCfTasa
-zxq3G0p1d/ggWieMgE3VM5w=
-=59pL
+iD8DBQFGBVPo2jLqHNfbg2URAvysAKCRFUzFIw5cXmL7EceYRnDExckCSACg1el7
+NT2dGUMD35X3D0vKIbu7JfQ=
+=45m5
 -----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
deleted file mode 100644
index bb777f4602c1..000000000000
--- a/dev-python/paramiko/files/digest-paramiko-1.5.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-paramiko-1.6.2 b/dev-python/paramiko/files/digest-paramiko-1.6.2
deleted file mode 100644
index 701c52eb8388..000000000000
--- a/dev-python/paramiko/files/digest-paramiko-1.6.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d43879c86fcc100d199df425a3fcaf05 paramiko-1.6.2.zip 666371
-RMD160 2c66a08406bea863c32189b2809395dcc639994a paramiko-1.6.2.zip 666371
-SHA256 a99b2c456c8b0950cefccb2444e678543b8df073de75baac2e9e84232e98d980 paramiko-1.6.2.zip 666371
diff --git a/dev-python/paramiko/files/digest-paramiko-1.7 b/dev-python/paramiko/files/digest-paramiko-1.7
new file mode 100644
index 000000000000..13617c5a36b2
--- /dev/null
+++ b/dev-python/paramiko/files/digest-paramiko-1.7
@@ -0,0 +1,3 @@
+MD5 11eb2a8688c6719a24a01f82153ffe4e paramiko-1.7.zip 353294
+RMD160 6a155009132f2a9e091b12c79fb2040c72f5840b paramiko-1.7.zip 353294
+SHA256 352e8551fa91090fdf0e5e5dc598ac91e74a399f6db04cf97ee08bac519e88c1 paramiko-1.7.zip 353294
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
deleted file mode 100644
index d088fae54e32..000000000000
--- a/dev-python/paramiko/files/paramiko-1.5.4-no-setuptools.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-=== 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
deleted file mode 100644
index 492b31d4f048..000000000000
--- a/dev-python/paramiko/paramiko-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.2 2006/05/12 21:23:36 flameeyes 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 ~x86-fbsd"
-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"
-}
diff --git a/dev-python/paramiko/paramiko-1.6.2.ebuild b/dev-python/paramiko/paramiko-1.7.ebuild
index 8dfdcba67845..b9bd032ebd3c 100644
--- a/dev-python/paramiko/paramiko-1.6.2.ebuild
+++ b/dev-python/paramiko/paramiko-1.7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.6.2.ebuild,v 1.1 2006/08/17 20:13:49 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.7.ebuild,v 1.1 2007/03/24 16:37:48 lucass Exp $
+
+NEED_PYTHON=2.3
 
 inherit distutils eutils
 
@@ -10,25 +12,28 @@ SRC_URI="http://www.lag.net/paramiko/download/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples"
 
 RDEPEND=">=dev-python/pycrypto-1.9_alpha6"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.6-no-setuptools.patch"
+	epatch "${FILESDIR}/${PN}-1.6.3-no-setuptools.patch"
 }
 
 src_install() {
 	distutils_src_install
-	dohtml -r docs/*
-	insinto /usr/share/doc/${PF}
-	doins -r demos
+
+	use doc && dohtml -r docs/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r demos
+	fi
 }
 
 src_test() {