Change dependencies to accept twisted-2. See bug #123104 and bug #128688.

(Portage version: 2.1_pre10-r2)

4 files changed, 26 insertions, 7 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index ab365f90eb17..acf9b5209ddb 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/freevo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.32 2006/04/28 00:57:42 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.33 2006/05/03 22:32:37 marienz Exp $
+
+  03 May 2006; Marien Zwart <marienz@gentoo.org> freevo-1.5.1.ebuild,
+  freevo-1.5.2.ebuild, freevo-1.5.3.ebuild:
+  Change dependencies to accept twisted-2. See bug #123104 and bug #128688.
 
   28 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-freevo-1.5.1,
   files/digest-freevo-1.5.2, files/digest-freevo-1.5.3, Manifest:
diff --git a/media-tv/freevo/freevo-1.5.1.ebuild b/media-tv/freevo/freevo-1.5.1.ebuild
index dda50ed63aa8..c89961488fa1 100644
--- a/media-tv/freevo/freevo-1.5.1.ebuild
+++ b/media-tv/freevo/freevo-1.5.1.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/media-tv/freevo/freevo-1.5.1.ebuild,v 1.6 2006/04/07 23:07:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.1.ebuild,v 1.7 2006/05/03 22:32:37 marienz Exp $
 
 inherit distutils
 
@@ -17,7 +17,12 @@ KEYWORDS="x86 ~amd64"
 DEPEND=">=dev-python/pygame-1.5.6
 	>=dev-python/imaging-1.1.3
 	>=dev-python/pyxml-0.8.2
-	=dev-python/twisted-1*
+	|| ( (
+			>=dev-python/twisted-2
+			dev-python/twisted-web
+		)
+		=dev-python/twisted-1*
+	)
 	>=dev-python/mmpython-0.4.5
 	>=media-video/mplayer-0.92
 	>=media-libs/freetype-2.1.4
diff --git a/media-tv/freevo/freevo-1.5.2.ebuild b/media-tv/freevo/freevo-1.5.2.ebuild
index 8588c0d9d5b8..ed5a3a4d0d5b 100644
--- a/media-tv/freevo/freevo-1.5.2.ebuild
+++ b/media-tv/freevo/freevo-1.5.2.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/media-tv/freevo/freevo-1.5.2.ebuild,v 1.6 2006/04/07 23:07:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.2.ebuild,v 1.7 2006/05/03 22:32:37 marienz Exp $
 
 inherit distutils
 
@@ -17,7 +17,12 @@ KEYWORDS="x86 ~amd64"
 DEPEND=">=dev-python/pygame-1.5.6
 	>=dev-python/imaging-1.1.3
 	>=dev-python/pyxml-0.8.2
-	=dev-python/twisted-1*
+	|| ( (
+			>=dev-python/twisted-2
+			dev-python/twisted-web
+		)
+		=dev-python/twisted-1*
+	)
 	>=dev-python/mmpython-0.4.5
 	>=media-video/mplayer-0.92
 	>=media-libs/freetype-2.1.4
diff --git a/media-tv/freevo/freevo-1.5.3.ebuild b/media-tv/freevo/freevo-1.5.3.ebuild
index afb0fd75f103..69614ec912a1 100644
--- a/media-tv/freevo/freevo-1.5.3.ebuild
+++ b/media-tv/freevo/freevo-1.5.3.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/media-tv/freevo/freevo-1.5.3.ebuild,v 1.5 2006/04/07 23:07:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.3.ebuild,v 1.6 2006/05/03 22:32:37 marienz Exp $
 
 inherit distutils
 
@@ -17,7 +17,12 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 DEPEND=">=dev-python/pygame-1.5.6
 	>=dev-python/imaging-1.1.3
 	>=dev-python/pyxml-0.8.2
-	=dev-python/twisted-1*
+	|| ( (
+			>=dev-python/twisted-2
+			dev-python/twisted-web
+		)
+		=dev-python/twisted-1*
+	)
 	>=dev-python/mmpython-0.4.5
 	>=media-video/mplayer-0.92
 	>=media-libs/freetype-2.1.4