Bug #267853: Update deps for gtksourceviewer with newer GNOME.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

10 files changed, 61 insertions, 19 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 73acf8ccdece..cd21c14b3a48 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.357 2009/09/13 21:30:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.358 2009/09/16 01:27:57 robbat2 Exp $
+
+  16 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.3.1.ebuild,
+  git-1.6.3.3.ebuild, git-1.6.3.4.ebuild, git-1.6.4.ebuild,
+  git-1.6.4.1.ebuild, git-1.6.4.2.ebuild, git-1.6.4.3.ebuild,
+  git-1.6.5_rc1.ebuild, git-9999.ebuild:
+  Bug #267853: Update deps for gtksourceviewer with newer GNOME.
 
 *git-1.6.5_rc1 (13 Sep 2009)
 
diff --git a/dev-util/git/git-1.6.3.1.ebuild b/dev-util/git/git-1.6.3.1.ebuild
index ae2f60151af3..2027b1518fc0 100644
--- a/dev-util/git/git-1.6.3.1.ebuild
+++ b/dev-util/git/git-1.6.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.1.ebuild,v 1.1 2009/05/18 05:11:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.1.ebuild,v 1.2 2009/09/16 01:27:57 robbat2 Exp $
 
 EAPI=2
 
@@ -52,7 +52,11 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	gtk?  ( >=dev-python/pygtk-2.8 dev-python/gtksourceview-python )"
+	gtk?
+	(
+		>=dev-python/pygtk-2.8 
+		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+	)"
 
 DEPEND="${CDEPEND}"
 
diff --git a/dev-util/git/git-1.6.3.3.ebuild b/dev-util/git/git-1.6.3.3.ebuild
index ea8547264dd3..0cf27138f4e6 100644
--- a/dev-util/git/git-1.6.3.3.ebuild
+++ b/dev-util/git/git-1.6.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.3.ebuild,v 1.7 2009/06/30 13:34:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.3.ebuild,v 1.8 2009/09/16 01:27:57 robbat2 Exp $
 
 EAPI=2
 
@@ -52,7 +52,11 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	gtk?  ( >=dev-python/pygtk-2.8 dev-python/gtksourceview-python )"
+	gtk?
+	(
+		>=dev-python/pygtk-2.8 
+		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+	)"
 
 DEPEND="${CDEPEND}"
 
diff --git a/dev-util/git/git-1.6.3.4.ebuild b/dev-util/git/git-1.6.3.4.ebuild
index ebf6a1766ba1..c1805d88b2e8 100644
--- a/dev-util/git/git-1.6.3.4.ebuild
+++ b/dev-util/git/git-1.6.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.4.ebuild,v 1.1 2009/07/29 23:50:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.4.ebuild,v 1.2 2009/09/16 01:27:57 robbat2 Exp $
 
 EAPI=2
 
@@ -52,7 +52,11 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	gtk?  ( >=dev-python/pygtk-2.8 dev-python/gtksourceview-python )"
+	gtk?
+	(
+		>=dev-python/pygtk-2.8 
+		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+	)"
 
 DEPEND="${CDEPEND}"
 
diff --git a/dev-util/git/git-1.6.4.1.ebuild b/dev-util/git/git-1.6.4.1.ebuild
index b811beb6c44e..e78b22c0f422 100644
--- a/dev-util/git/git-1.6.4.1.ebuild
+++ b/dev-util/git/git-1.6.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.1.ebuild,v 1.1 2009/08/27 00:03:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.1.ebuild,v 1.2 2009/09/16 01:27:57 robbat2 Exp $
 
 EAPI=2
 
@@ -52,7 +52,11 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	gtk?  ( >=dev-python/pygtk-2.8 dev-python/gtksourceview-python )"
+	gtk?
+	(
+		>=dev-python/pygtk-2.8 
+		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+	)"
 
 DEPEND="${CDEPEND}"
 
diff --git a/dev-util/git/git-1.6.4.2.ebuild b/dev-util/git/git-1.6.4.2.ebuild
index bebdbe9045ce..d55cc2bb66a6 100644
--- a/dev-util/git/git-1.6.4.2.ebuild
+++ b/dev-util/git/git-1.6.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.2.ebuild,v 1.1 2009/08/30 08:44:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.2.ebuild,v 1.2 2009/09/16 01:27:57 robbat2 Exp $
 
 EAPI=2
 
@@ -52,7 +52,11 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	gtk?  ( >=dev-python/pygtk-2.8 dev-python/gtksourceview-python )"
+	gtk?
+	(
+		>=dev-python/pygtk-2.8 
+		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+	)"
 
 DEPEND="${CDEPEND}"
 
diff --git a/dev-util/git/git-1.6.4.3.ebuild b/dev-util/git/git-1.6.4.3.ebuild
index 10f9d0b194c1..dee3b0dbfa63 100644
--- a/dev-util/git/git-1.6.4.3.ebuild
+++ b/dev-util/git/git-1.6.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.3.ebuild,v 1.1 2009/09/13 21:21:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.3.ebuild,v 1.2 2009/09/16 01:27:57 robbat2 Exp $
 
 EAPI=2
 
@@ -52,7 +52,11 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	gtk?  ( >=dev-python/pygtk-2.8 dev-python/gtksourceview-python )"
+	gtk?
+	(
+		>=dev-python/pygtk-2.8 
+		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+	)"
 
 DEPEND="${CDEPEND}"
 
diff --git a/dev-util/git/git-1.6.4.ebuild b/dev-util/git/git-1.6.4.ebuild
index b7e251d81020..c324574c0487 100644
--- a/dev-util/git/git-1.6.4.ebuild
+++ b/dev-util/git/git-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.ebuild,v 1.1 2009/07/29 23:50:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.ebuild,v 1.2 2009/09/16 01:27:57 robbat2 Exp $
 
 EAPI=2
 
@@ -52,7 +52,11 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	gtk?  ( >=dev-python/pygtk-2.8 dev-python/gtksourceview-python )"
+	gtk?
+	(
+		>=dev-python/pygtk-2.8 
+		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+	)"
 
 DEPEND="${CDEPEND}"
 
diff --git a/dev-util/git/git-1.6.5_rc1.ebuild b/dev-util/git/git-1.6.5_rc1.ebuild
index ef9f91a8b480..81a16399abc3 100644
--- a/dev-util/git/git-1.6.5_rc1.ebuild
+++ b/dev-util/git/git-1.6.5_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5_rc1.ebuild,v 1.1 2009/09/13 21:30:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5_rc1.ebuild,v 1.2 2009/09/16 01:27:57 robbat2 Exp $
 
 EAPI=2
 
@@ -52,7 +52,11 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	gtk?  ( >=dev-python/pygtk-2.8 dev-python/gtksourceview-python )"
+	gtk?
+	(
+		>=dev-python/pygtk-2.8 
+		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+	)"
 
 DEPEND="${CDEPEND}"
 
diff --git a/dev-util/git/git-9999.ebuild b/dev-util/git/git-9999.ebuild
index 5c77cd3ba212..58e66832df3f 100644
--- a/dev-util/git/git-9999.ebuild
+++ b/dev-util/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-9999.ebuild,v 1.8 2009/05/10 02:33:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-9999.ebuild,v 1.9 2009/09/16 01:27:57 robbat2 Exp $
 
 EAPI=2
 
@@ -52,7 +52,11 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	gtk?  ( >=dev-python/pygtk-2.8 dev-python/gtksourceview-python )"
+	gtk?
+	(
+		>=dev-python/pygtk-2.8 
+		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+	)"
 
 DEPEND="${CDEPEND}"