These versions run but do not install with twisted 2.4, so add a < dep.

Package-Manager: portage-2.1_rc2-r3

4 files changed, 29 insertions, 23 deletions

diff --git a/dev-python/twisted-conch/ChangeLog b/dev-python/twisted-conch/ChangeLog
index ece49ec201fa..731b608fbfeb 100644
--- a/dev-python/twisted-conch/ChangeLog
+++ b/dev-python/twisted-conch/ChangeLog
@@ -1,6 +1,10 @@
 # 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.11 2006/05/03 23:02:25 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/ChangeLog,v 1.12 2006/05/26 17:32:38 marienz Exp $
+
+  26 May 2006; Marien Zwart <marienz@gentoo.org>
+  twisted-conch-0.5.0-r1.ebuild, twisted-conch-0.6.0.ebuild:
+  These versions run but do not install with twisted 2.4, so add a < dep.
 
   03 May 2006; Mark Loeser <halcy0n@gentoo.org>
   twisted-conch-0.5.0-r1.ebuild:
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
index 909b37a0a087..61ee7449902c 100644
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX twisted-conch-0.5.0-root-skip.patch 1142 RMD160 f2c72e0ac6f0ba3528c3724c2ac0f9e77a81b689 SHA1 03d2381388edde729835a3a95054885d81430cc8 SHA256 3f3488c9e72ec8319d2e24c67d2ccdc62578639b85783df9540ba35a43c4854e size 1142
+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
 SHA256 3f3488c9e72ec8319d2e24c67d2ccdc62578639b85783df9540ba35a43c4854e files/twisted-conch-0.5.0-root-skip.patch 1142
-AUX twisted-conch-0.6.0-root-skip.patch 821 RMD160 cd01fe8d450bc07c20b12b466f9d984327ecc678 SHA1 5c19319285ed772f745a09ea9d3a70fd711dc487 SHA256 3c2cf9ba335c334d18d050bb60d3325ff5f086dcd0cca930da3cca391a7b7d7e size 821
+AUX twisted-conch-0.6.0-root-skip.patch 821 RMD160 cd01fe8d450bc07c20b12b466f9d984327ecc678 SHA1 5c19319285ed772f745a09ea9d3a70fd711dc487 SHA256 3c2cf9ba335c334d18d050bb60d3325ff5f086dcd0cca930da3cca391a7b7d7e
 MD5 1697de9cf9c54efc190cf4f7f71fbe89 files/twisted-conch-0.6.0-root-skip.patch 821
 RMD160 cd01fe8d450bc07c20b12b466f9d984327ecc678 files/twisted-conch-0.6.0-root-skip.patch 821
 SHA256 3c2cf9ba335c334d18d050bb60d3325ff5f086dcd0cca930da3cca391a7b7d7e files/twisted-conch-0.6.0-root-skip.patch 821
-DIST TwistedConch-0.5.0.tar.bz2 118875 RMD160 cd64533a0a4580b959e442bc03f5527c8afd3541 SHA256 c088e98763188cab7e7d2538b876482fdbc335f03041a4e5f701d6c8ecce756d size 118875
-DIST TwistedConch-0.6.0.tar.bz2 126034 RMD160 ed37f1d3a9d6736b452cc0f1aa422894253a00e1 SHA256 eaf8adda95062fe94aa1ac28e024a1ec072b99d7dff6c1cdee65b719994d0a28 size 126034
-EBUILD twisted-conch-0.5.0-r1.ebuild 512 RMD160 ec91e17491ba769f5d8cdb08aa7e609411a20e97 SHA1 56e27e1861d71bf986ec10fbb9e5086171e5aaf5 SHA256 e75b827c9c607b0aa1f91efc3a2cde6b2d4178dd76998129a091ddec20b0a065 size 512
-MD5 ea269f9fa6ca85bd4302d612a0ce8000 twisted-conch-0.5.0-r1.ebuild 512
-RMD160 ec91e17491ba769f5d8cdb08aa7e609411a20e97 twisted-conch-0.5.0-r1.ebuild 512
-SHA256 e75b827c9c607b0aa1f91efc3a2cde6b2d4178dd76998129a091ddec20b0a065 twisted-conch-0.5.0-r1.ebuild 512
-EBUILD twisted-conch-0.6.0.ebuild 519 RMD160 50f14bff244e5a3068c884e5851e10a4502cf978 SHA1 bf719f9a137c6a78d9db798ebd527726a365a05b SHA256 b2f8be51a799e8413b5bb3473bddc53ddf0deb9bcfd245c5cf7530a693354e37 size 519
-MD5 5e1fa8e3d543dd71e7be84439e6c9341 twisted-conch-0.6.0.ebuild 519
-RMD160 50f14bff244e5a3068c884e5851e10a4502cf978 twisted-conch-0.6.0.ebuild 519
-SHA256 b2f8be51a799e8413b5bb3473bddc53ddf0deb9bcfd245c5cf7530a693354e37 twisted-conch-0.6.0.ebuild 519
-MISC ChangeLog 1758 RMD160 3fe917c46a4a11dda76f5a89dc2f9b50a36d48a3 SHA1 3f3c455a72bd023c866f0c4bdd2e77de465b61ef SHA256 9d9d918d7ec048f014d198fd6e83911ad57e04330309de7914efe07a9b91933e size 1758
-MD5 5cf9d2ca6b814bb2736fad55388f35c5 ChangeLog 1758
-RMD160 3fe917c46a4a11dda76f5a89dc2f9b50a36d48a3 ChangeLog 1758
-SHA256 9d9d918d7ec048f014d198fd6e83911ad57e04330309de7914efe07a9b91933e ChangeLog 1758
-MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 size 218
+DIST TwistedConch-0.5.0.tar.bz2 118875 RMD160 cd64533a0a4580b959e442bc03f5527c8afd3541 SHA256 c088e98763188cab7e7d2538b876482fdbc335f03041a4e5f701d6c8ecce756d
+DIST TwistedConch-0.6.0.tar.bz2 126034 RMD160 ed37f1d3a9d6736b452cc0f1aa422894253a00e1 SHA1 7090886dfe94399698c79cff27a5f5fec2d3728e SHA256 eaf8adda95062fe94aa1ac28e024a1ec072b99d7dff6c1cdee65b719994d0a28
+EBUILD twisted-conch-0.5.0-r1.ebuild 537 RMD160 354166a4d10e109477ed1f59cea065f109c4f1fb SHA1 9c12d141fc15374fb2819e8755c138530f4c2656 SHA256 dd2d14d7fb6e7b7a2c9f6d03789d4e0691dd608430b3d8023e13afba7bb58f96
+MD5 dce1951c0367d7156067833ca5970279 twisted-conch-0.5.0-r1.ebuild 537
+RMD160 354166a4d10e109477ed1f59cea065f109c4f1fb twisted-conch-0.5.0-r1.ebuild 537
+SHA256 dd2d14d7fb6e7b7a2c9f6d03789d4e0691dd608430b3d8023e13afba7bb58f96 twisted-conch-0.5.0-r1.ebuild 537
+EBUILD twisted-conch-0.6.0.ebuild 544 RMD160 30d0021554badbc459e421a07671caaef79fd664 SHA1 757f0ac846e514f36e64095a2d7d2713b2e89435 SHA256 2e0a21864e3e387c25995b8a2f285bbe55a2b18b44dffc92f475714be609dc57
+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
+MISC ChangeLog 1943 RMD160 500e15e1cc222165d750059857a61e47b2868ea1 SHA1 0c22f4dc579949071462e546987aab87d5c03283 SHA256 d5ad9f9eae09e7938879f74797f49ffb619db35ffb7f4023da5d29d95e06311d
+MD5 7474681e011fcd9c00ca1d258d50b5f9 ChangeLog 1943
+RMD160 500e15e1cc222165d750059857a61e47b2868ea1 ChangeLog 1943
+SHA256 d5ad9f9eae09e7938879f74797f49ffb619db35ffb7f4023da5d29d95e06311d ChangeLog 1943
+MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
 SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata.xml 218
@@ -36,7 +36,7 @@ SHA256 5446c0d9fb69a014e5e1f5583b0ea135876077328f3218c29fc0f69920487e82 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEWTaICRZPokWLroQRApmHAJ4/cx952eZcN89pOCFtyB+VHf1qegCeLSSz
-6DP+sVTT11TyQz+grXA8MJQ=
-=VbQs
+iD8DBQFEdzu+W78445TWHXcRAivyAKCCQPxdKw5qohZedVV2dBaYpgRaSACfaB2c
+bj2yl2PvYv5m8SAPXElN50k=
+=lrey
 -----END PGP SIGNATURE-----
diff --git a/dev-python/twisted-conch/twisted-conch-0.5.0-r1.ebuild b/dev-python/twisted-conch/twisted-conch-0.5.0-r1.ebuild
index ea210e8c4163..05e96d6a11cf 100644
--- a/dev-python/twisted-conch/twisted-conch-0.5.0-r1.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.5.0-r1.ebuild,v 1.5 2006/05/03 23:02:25 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-0.5.0-r1.ebuild,v 1.6 2006/05/26 17:32:38 marienz Exp $
 
 MY_PACKAGE=Conch
 
@@ -11,6 +11,7 @@ DESCRIPTION="Twisted SSHv2 implementation."
 KEYWORDS="~amd64 ~ppc sparc x86"
 
 DEPEND=">=dev-python/twisted-2
+	<dev-python/twisted-2.4
 	>=dev-python/pycrypto-1.9_alpha6"
 
 
diff --git a/dev-python/twisted-conch/twisted-conch-0.6.0.ebuild b/dev-python/twisted-conch/twisted-conch-0.6.0.ebuild
index bc4530c8c1ca..56016075e56f 100644
--- a/dev-python/twisted-conch/twisted-conch-0.6.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # 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.6.0.ebuild,v 1.4 2006/04/29 19:01:44 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-0.6.0.ebuild,v 1.5 2006/05/26 17:32:38 marienz Exp $
 
 MY_PACKAGE=Conch
 
@@ -11,6 +11,7 @@ DESCRIPTION="Twisted SSHv2 implementation."
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND=">=dev-python/twisted-2.1
+	<dev-python/twisted-2.4
 	>=dev-python/pycrypto-1.9_alpha6"