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

Package-Manager: portage-2.1_rc2-r3

7 files changed, 21 insertions, 8 deletions

diff --git a/dev-python/twisted-web/ChangeLog b/dev-python/twisted-web/ChangeLog
index 1581e0f344e1..3b0d1935d7e7 100644
--- a/dev-python/twisted-web/ChangeLog
+++ b/dev-python/twisted-web/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/twisted-web
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/ChangeLog,v 1.13 2006/05/12 18:56:57 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/ChangeLog,v 1.14 2006/05/26 17:46:43 marienz Exp $
+
+  26 May 2006; Marien Zwart <marienz@gentoo.org>
+  twisted-web-0.5.0-r1.ebuild, twisted-web-0.5.0-r2.ebuild:
+  These versions run but do not install with twisted 2.4, so add a < dep.
 
   12 May 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   twisted-web-0.5.0-r2.ebuild:
diff --git a/dev-python/twisted-web/files/digest-twisted-web-0.5.0-r2 b/dev-python/twisted-web/files/digest-twisted-web-0.5.0-r2
index f598a1c139f6..58850c744dfb 100644
--- a/dev-python/twisted-web/files/digest-twisted-web-0.5.0-r2
+++ b/dev-python/twisted-web/files/digest-twisted-web-0.5.0-r2
@@ -1 +1,3 @@
 MD5 287b9402ca99d05e6d3be99413317633 TwistedWeb-0.5.0.tar.bz2 263139
+RMD160 61829c8ae492c7cf3f43f45c70a5653584e50378 TwistedWeb-0.5.0.tar.bz2 263139
+SHA256 7d33de4924c0f7819b3ba9980461ca2bf7b8f5619f21f90755c29255570b599e TwistedWeb-0.5.0.tar.bz2 263139
diff --git a/dev-python/twisted-web/twisted-web-0.5.0-r1.ebuild b/dev-python/twisted-web/twisted-web-0.5.0-r1.ebuild
index 0366de3fcbbe..d5ff46603eb9 100644
--- a/dev-python/twisted-web/twisted-web-0.5.0-r1.ebuild
+++ b/dev-python/twisted-web/twisted-web-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-web/twisted-web-0.5.0-r1.ebuild,v 1.7 2006/05/03 23:04:34 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-0.5.0-r1.ebuild,v 1.8 2006/05/26 17:46:43 marienz Exp $
 
 MY_PACKAGE=Web
 
@@ -10,7 +10,8 @@ DESCRIPTION="Twisted web server, programmable in Python"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sh sparc x86"
 
-DEPEND=">=dev-python/twisted-2"
+DEPEND=">=dev-python/twisted-2
+	<dev-python/twisted-2.4"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-python/twisted-web/twisted-web-0.5.0-r2.ebuild b/dev-python/twisted-web/twisted-web-0.5.0-r2.ebuild
index f931c79c64a2..deb893a6f4e5 100644
--- a/dev-python/twisted-web/twisted-web-0.5.0-r2.ebuild
+++ b/dev-python/twisted-web/twisted-web-0.5.0-r2.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-web/twisted-web-0.5.0-r2.ebuild,v 1.4 2006/05/12 18:56:57 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-0.5.0-r2.ebuild,v 1.5 2006/05/26 17:46:43 marienz Exp $
 
 MY_PACKAGE=Web
 
@@ -10,7 +10,7 @@ DESCRIPTION="Twisted web server, programmable in Python"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
-DEPEND=">=dev-python/twisted-2.2"
+DEPEND="=dev-python/twisted-2.2*"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-python/twisted-words/ChangeLog b/dev-python/twisted-words/ChangeLog
index 33490f17b1c6..755a612dd092 100644
--- a/dev-python/twisted-words/ChangeLog
+++ b/dev-python/twisted-words/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/twisted-words
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.10 2006/05/03 23:04:51 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.11 2006/05/26 17:51:06 marienz Exp $
+
+  26 May 2006; Marien Zwart <marienz@gentoo.org>
+  twisted-words-0.1.0-r1.ebuild, twisted-words-0.3.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-words-0.1.0-r1.ebuild:
diff --git a/dev-python/twisted-words/twisted-words-0.1.0-r1.ebuild b/dev-python/twisted-words/twisted-words-0.1.0-r1.ebuild
index 665b2a521de2..0007e30d4219 100644
--- a/dev-python/twisted-words/twisted-words-0.1.0-r1.ebuild
+++ b/dev-python/twisted-words/twisted-words-0.1.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-words/twisted-words-0.1.0-r1.ebuild,v 1.4 2006/05/03 23:04:51 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-0.1.0-r1.ebuild,v 1.5 2006/05/26 17:51:06 marienz Exp $
 
 MY_PACKAGE=Words
 
@@ -11,5 +11,6 @@ DESCRIPTION="Twisted Words contains Instant Messaging implementations."
 KEYWORDS="~amd64 ~ppc sparc x86"
 
 DEPEND=">=dev-python/twisted-2
+	<dev-python/twisted-2.4
 	dev-python/twisted-web
 	dev-python/twisted-xish"
diff --git a/dev-python/twisted-words/twisted-words-0.3.0.ebuild b/dev-python/twisted-words/twisted-words-0.3.0.ebuild
index 6a66b020fd0b..5d89bcd411f2 100644
--- a/dev-python/twisted-words/twisted-words-0.3.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-0.3.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-words/twisted-words-0.3.0.ebuild,v 1.3 2006/04/14 09:11:38 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-0.3.0.ebuild,v 1.4 2006/05/26 17:51:06 marienz Exp $
 
 MY_PACKAGE=Words
 
@@ -11,4 +11,5 @@ DESCRIPTION="Twisted Words contains Instant Messaging implementations."
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND=">=dev-python/twisted-2.1
+	<dev-python/twisted-2.4
 	dev-python/twisted-web"