Version bump, make twisted dependency stricter, drop revision patched to work with python 2.5 (use the new bump instead).

Package-Manager: portage-2.1.2_rc4-r8

3 files changed, 27 insertions, 42 deletions

diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
index 11bb4739e9f7..e30a819e8862 100644
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX twisted-conch-0.5.0-root-skip.patch 1142 RMD160 f2c72e0ac6f0ba3528c3724c2ac0f9e77a81b689 SHA1 03d2381388edde729835a3a95054885d81430cc8 SHA256 3f3488c9e72ec8319d2e24c67d2ccdc62578639b85783df9540ba35a43c4854e
 MD5 01a72ffee827119c0440b70c3b7d3cdf files/twisted-conch-0.5.0-root-skip.patch 1142
 RMD160 f2c72e0ac6f0ba3528c3724c2ac0f9e77a81b689 files/twisted-conch-0.5.0-root-skip.patch 1142
@@ -10,9 +13,10 @@ AUX twisted-conch-0.7.0-python-2.5-compat.patch 2272 RMD160 2f268a1fc8a22121d6f6
 MD5 293250225bdedac93b7f215549dec68c files/twisted-conch-0.7.0-python-2.5-compat.patch 2272
 RMD160 2f268a1fc8a22121d6f60efdfe33bff97c1e292a files/twisted-conch-0.7.0-python-2.5-compat.patch 2272
 SHA256 c35f62d168e09323aedcadf431312ac6ec8890007e6fd304fdff39bbdef8a805 files/twisted-conch-0.7.0-python-2.5-compat.patch 2272
-DIST TwistedConch-0.5.0.tar.bz2 118875 RMD160 cd64533a0a4580b959e442bc03f5527c8afd3541 SHA256 c088e98763188cab7e7d2538b876482fdbc335f03041a4e5f701d6c8ecce756d
+DIST TwistedConch-0.5.0.tar.bz2 118875 RMD160 cd64533a0a4580b959e442bc03f5527c8afd3541 SHA1 2f5df74316b395468093474943b638840872b02f SHA256 c088e98763188cab7e7d2538b876482fdbc335f03041a4e5f701d6c8ecce756d
 DIST TwistedConch-0.6.0.tar.bz2 126034 RMD160 ed37f1d3a9d6736b452cc0f1aa422894253a00e1 SHA1 7090886dfe94399698c79cff27a5f5fec2d3728e SHA256 eaf8adda95062fe94aa1ac28e024a1ec072b99d7dff6c1cdee65b719994d0a28
 DIST TwistedConch-0.7.0.tar.bz2 127274 RMD160 d9334942b887af86a7a19dcf6e15d5f3b54b558e SHA1 f57dfe66907115b5d262fd0055d3dc41ae30a226 SHA256 d5e41c90f0319a4bed48725626ee46b9f33a0744cf060b64184248623ca112c0
+DIST TwistedConch-0.8.0.tar.bz2 128356 RMD160 9fd001522a92bbef48e928ca9634089276a801c2 SHA1 56f86804631eaf46a7810e8305ecdc2ce111cc48 SHA256 242ba2402d8e530a0594dc6c3668718524999f227220b0e67004b0aa9104b561
 EBUILD twisted-conch-0.5.0-r1.ebuild 540 RMD160 02e5887de193360aee9027034cc3218037872a13 SHA1 b65170b35f506877304f84ddd9af8f6ffa1968d9 SHA256 ca1d6ce2b9d42b0d74a439dd180cd93aaf3c873a31dd2bfb516553f06baf8331
 MD5 9dba494b1fc8ca9ec2915a11b04d8537 twisted-conch-0.5.0-r1.ebuild 540
 RMD160 02e5887de193360aee9027034cc3218037872a13 twisted-conch-0.5.0-r1.ebuild 540
@@ -21,18 +25,18 @@ EBUILD twisted-conch-0.6.0.ebuild 544 RMD160 30d0021554badbc459e421a07671caaef79
 MD5 26f118f035a0fe957445caf78babde0b twisted-conch-0.6.0.ebuild 544
 RMD160 30d0021554badbc459e421a07671caaef79fd664 twisted-conch-0.6.0.ebuild 544
 SHA256 2e0a21864e3e387c25995b8a2f285bbe55a2b18b44dffc92f475714be609dc57 twisted-conch-0.6.0.ebuild 544
-EBUILD twisted-conch-0.7.0-r1.ebuild 587 RMD160 6a6c17eb0629cfe1503b2a37e4571ed06b51f2bb SHA1 c20004ed7ab3e06cc121d69aecc30de0a10564d6 SHA256 78eae744f5799c51e27b3f77decfbc976bdf585f54fcc24ad0bced89a38e985c
-MD5 ec22543181042e2a6758a1c2f8a1f1f1 twisted-conch-0.7.0-r1.ebuild 587
-RMD160 6a6c17eb0629cfe1503b2a37e4571ed06b51f2bb twisted-conch-0.7.0-r1.ebuild 587
-SHA256 78eae744f5799c51e27b3f77decfbc976bdf585f54fcc24ad0bced89a38e985c twisted-conch-0.7.0-r1.ebuild 587
-EBUILD twisted-conch-0.7.0.ebuild 528 RMD160 517a5d30723c8a1783d242d95c672ff83b02e6e1 SHA1 6301177c63d589eaaac83ea653c721c98aa20ac0 SHA256 194ae880fee018d2b573f5503ebb2a49ea150f2350f1ccd0e62ce34993c6319e
-MD5 70462aa697f149e31cc62bcc3e95319e twisted-conch-0.7.0.ebuild 528
-RMD160 517a5d30723c8a1783d242d95c672ff83b02e6e1 twisted-conch-0.7.0.ebuild 528
-SHA256 194ae880fee018d2b573f5503ebb2a49ea150f2350f1ccd0e62ce34993c6319e twisted-conch-0.7.0.ebuild 528
-MISC ChangeLog 3025 RMD160 bc5c6472b134b882b2fff1cd2792caf3aeace0f2 SHA1 dabbfa40b118b0442aa177c08a4a3ec04a8e4890 SHA256 067f7df7e1c257b666f8149fa7301927e2a4407810a9a5040eda914dabb9fe92
-MD5 3d6e4687f1b6bb01717b31485674c0ab ChangeLog 3025
-RMD160 bc5c6472b134b882b2fff1cd2792caf3aeace0f2 ChangeLog 3025
-SHA256 067f7df7e1c257b666f8149fa7301927e2a4407810a9a5040eda914dabb9fe92 ChangeLog 3025
+EBUILD twisted-conch-0.7.0.ebuild 529 RMD160 0172e30a3754e61a66d873b7fe0150ad83c36544 SHA1 cbb990f4cf2c52ec18d90f50e117394675ac4f60 SHA256 f2fbfeefb6960fe165e546c201001bb246bff9efdba48c52c1ad03099ddae89e
+MD5 adc4cde41393b90510cb70cae3644cad twisted-conch-0.7.0.ebuild 529
+RMD160 0172e30a3754e61a66d873b7fe0150ad83c36544 twisted-conch-0.7.0.ebuild 529
+SHA256 f2fbfeefb6960fe165e546c201001bb246bff9efdba48c52c1ad03099ddae89e twisted-conch-0.7.0.ebuild 529
+EBUILD twisted-conch-0.8.0.ebuild 439 RMD160 f966e524d4276d8d0a3814a4fcdb74a1eb1cc75e SHA1 b6ae051a7085ae6204e0dc74035fbb8030a92b19 SHA256 511767b36123083a968e9310f9ac6101b6d06ba04834c298351ff403a1f47079
+MD5 c124924424e873856920240910f72233 twisted-conch-0.8.0.ebuild 439
+RMD160 f966e524d4276d8d0a3814a4fcdb74a1eb1cc75e twisted-conch-0.8.0.ebuild 439
+SHA256 511767b36123083a968e9310f9ac6101b6d06ba04834c298351ff403a1f47079 twisted-conch-0.8.0.ebuild 439
+MISC ChangeLog 3329 RMD160 1509c9f976f2eb25144a6409fcc3145180af6e3d SHA1 9dfe3f47188d8ee6a1672bab34c4e2f384a27b03 SHA256 8ad0dd4d92533fc16c3e11e4791a1aee40dafae85942b1358f4435f3847c31d8
+MD5 d1a578a6611d9579606173e73a7a8852 ChangeLog 3329
+RMD160 1509c9f976f2eb25144a6409fcc3145180af6e3d ChangeLog 3329
+SHA256 8ad0dd4d92533fc16c3e11e4791a1aee40dafae85942b1358f4435f3847c31d8 ChangeLog 3329
 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
@@ -46,6 +50,13 @@ SHA256 5446c0d9fb69a014e5e1f5583b0ea135876077328f3218c29fc0f69920487e82 files/di
 MD5 89965ba29ada7e2cf788b96cc4c072ec files/digest-twisted-conch-0.7.0 259
 RMD160 4423c542599c7ef35e501f0f646db72b804d2095 files/digest-twisted-conch-0.7.0 259
 SHA256 cb6d3c38acddbe64828c1b10fb43922d04cef94baaf198fe3bdd2457b32dc228 files/digest-twisted-conch-0.7.0 259
-MD5 89965ba29ada7e2cf788b96cc4c072ec files/digest-twisted-conch-0.7.0-r1 259
-RMD160 4423c542599c7ef35e501f0f646db72b804d2095 files/digest-twisted-conch-0.7.0-r1 259
-SHA256 cb6d3c38acddbe64828c1b10fb43922d04cef94baaf198fe3bdd2457b32dc228 files/digest-twisted-conch-0.7.0-r1 259
+MD5 6a72f2f08e3615e0836b05c81618b1f3 files/digest-twisted-conch-0.8.0 259
+RMD160 b9f28c095e14be1d230c2bad9845ebce3690dbb5 files/digest-twisted-conch-0.8.0 259
+SHA256 f5914f7375c575c68098fede19eda61ce4fa39a68d7f1129966c51fdd233c318 files/digest-twisted-conch-0.8.0 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFprZ5UElL7eJpfEQRAg3QAJ0V6FXnHj/TDDESVBwdXC00fzxBRwCggDSX
+Zin0q3dtZEyY6oUzOxXz/F4=
+=6mcY
+-----END PGP SIGNATURE-----
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
deleted file mode 100644
index 3d8253a1008e..000000000000
--- a/dev-python/twisted-conch/files/digest-twisted-conch-0.7.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/twisted-conch-0.7.0-r1.ebuild b/dev-python/twisted-conch/twisted-conch-0.7.0-r1.ebuild
deleted file mode 100644
index 87b283db6e22..000000000000
--- a/dev-python/twisted-conch/twisted-conch-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,23 +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/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"
-}