RDEPEND only in dev-python/pygtksourceview:2 as dev-python/gtksourceview-python will be dropped soon (bug #355049 with Robin Johnson authorization).

(Portage version: 2.1.9.45/cvs/Linux x86_64)

15 files changed, 38 insertions, 29 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index a4107ef699a5..159567a0f39b 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.87 2011/02/12 23:26:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.88 2011/04/04 08:58:41 pacho Exp $
+
+  04 Apr 2011; Pacho Ramos <pacho@gentoo.org> git-1.6.4.5.ebuild,
+  git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild, git-1.7.3.5.ebuild,
+  git-1.7.3.5-r1.ebuild, git-1.7.3.5-r2.ebuild, git-1.7.4_rc1.ebuild,
+  git-1.7.4_rc1-r1.ebuild, git-1.7.4_rc1-r2.ebuild, git-1.7.4_rc2.ebuild,
+  git-1.7.4_rc3.ebuild, git-1.7.4.ebuild, git-1.7.4.1.ebuild, git-9999.ebuild:
+  RDEPEND only in dev-python/pygtksourceview:2 as
+  dev-python/gtksourceview-python will be dropped soon (bug #355049 with Robin
+  Johnson authorization).
 
   12 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> -git-1.6.4.4.ebuild,
   -git-1.6.4.4-r1.ebuild, -files/git-1.6.4.5-gitweb-cve-2010-3906.patch,
diff --git a/dev-vcs/git/git-1.6.4.5.ebuild b/dev-vcs/git/git-1.6.4.5.ebuild
index 70fe8de6827c..63ce7fa65293 100644
--- a/dev-vcs/git/git-1.6.4.5.ebuild
+++ b/dev-vcs/git/git-1.6.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.5.ebuild,v 1.9 2011/01/07 15:11:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.5.ebuild,v 1.10 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=2
 
@@ -55,7 +55,7 @@ RDEPEND="${CDEPEND}
 	gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	)"
 
 DEPEND="${CDEPEND}"
diff --git a/dev-vcs/git/git-1.7.2.5.ebuild b/dev-vcs/git/git-1.7.2.5.ebuild
index ffb4c3f624cb..984fbb191aa1 100644
--- a/dev-vcs/git/git-1.7.2.5.ebuild
+++ b/dev-vcs/git/git-1.7.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.5.ebuild,v 1.11 2011/01/07 15:11:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.5.ebuild,v 1.12 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -55,7 +55,7 @@ RDEPEND="${CDEPEND}
 	gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	)"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.3.4-r1.ebuild b/dev-vcs/git/git-1.7.3.4-r1.ebuild
index dd58e424783c..3d45213fd5d8 100644
--- a/dev-vcs/git/git-1.7.3.4-r1.ebuild
+++ b/dev-vcs/git/git-1.7.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.15 2011/01/08 06:27:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.16 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -55,7 +55,7 @@ RDEPEND="${CDEPEND}
 	gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	)"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.3.5-r1.ebuild b/dev-vcs/git/git-1.7.3.5-r1.ebuild
index 6a38a26a805b..925f6d10ceee 100644
--- a/dev-vcs/git/git-1.7.3.5-r1.ebuild
+++ b/dev-vcs/git/git-1.7.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.5-r1.ebuild,v 1.3 2011/01/07 09:00:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.5-r1.ebuild,v 1.4 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -56,7 +56,7 @@ RDEPEND="${CDEPEND}
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	) )"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.3.5-r2.ebuild b/dev-vcs/git/git-1.7.3.5-r2.ebuild
index 60c4a822ba13..7c74fe655afd 100644
--- a/dev-vcs/git/git-1.7.3.5-r2.ebuild
+++ b/dev-vcs/git/git-1.7.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.5-r2.ebuild,v 1.5 2011/01/10 18:44:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.5-r2.ebuild,v 1.6 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -59,7 +59,7 @@ RDEPEND="${CDEPEND}
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	) )"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.3.5.ebuild b/dev-vcs/git/git-1.7.3.5.ebuild
index e17e69787b31..ed1c35be4b8f 100644
--- a/dev-vcs/git/git-1.7.3.5.ebuild
+++ b/dev-vcs/git/git-1.7.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.5.ebuild,v 1.1 2011/01/06 03:37:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.5.ebuild,v 1.2 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -55,7 +55,7 @@ RDEPEND="${CDEPEND}
 	gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	)"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.4.1.ebuild b/dev-vcs/git/git-1.7.4.1.ebuild
index 88cccbf3dc55..98d05ca4d822 100644
--- a/dev-vcs/git/git-1.7.4.1.ebuild
+++ b/dev-vcs/git/git-1.7.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4.1.ebuild,v 1.1 2011/02/12 22:52:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4.1.ebuild,v 1.2 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -59,7 +59,7 @@ RDEPEND="${CDEPEND}
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	) )"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.4.ebuild b/dev-vcs/git/git-1.7.4.ebuild
index 05c42eccb031..7bcc0d3f1fa0 100644
--- a/dev-vcs/git/git-1.7.4.ebuild
+++ b/dev-vcs/git/git-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4.ebuild,v 1.1 2011/02/01 01:24:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4.ebuild,v 1.2 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -59,7 +59,7 @@ RDEPEND="${CDEPEND}
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	) )"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.4_rc1-r1.ebuild b/dev-vcs/git/git-1.7.4_rc1-r1.ebuild
index c9d826e96a6c..01dbde68cc59 100644
--- a/dev-vcs/git/git-1.7.4_rc1-r1.ebuild
+++ b/dev-vcs/git/git-1.7.4_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc1-r1.ebuild,v 1.3 2011/01/07 21:51:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc1-r1.ebuild,v 1.4 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -56,7 +56,7 @@ RDEPEND="${CDEPEND}
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	) )"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.4_rc1-r2.ebuild b/dev-vcs/git/git-1.7.4_rc1-r2.ebuild
index 30d021198772..15c178698b6c 100644
--- a/dev-vcs/git/git-1.7.4_rc1-r2.ebuild
+++ b/dev-vcs/git/git-1.7.4_rc1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc1-r2.ebuild,v 1.6 2011/01/12 10:11:27 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc1-r2.ebuild,v 1.7 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -59,7 +59,7 @@ RDEPEND="${CDEPEND}
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	) )"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.4_rc1.ebuild b/dev-vcs/git/git-1.7.4_rc1.ebuild
index 6ccd1301fe48..86661b86a661 100644
--- a/dev-vcs/git/git-1.7.4_rc1.ebuild
+++ b/dev-vcs/git/git-1.7.4_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc1.ebuild,v 1.1 2011/01/06 04:01:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc1.ebuild,v 1.2 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -55,7 +55,7 @@ RDEPEND="${CDEPEND}
 	gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	)"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.4_rc2.ebuild b/dev-vcs/git/git-1.7.4_rc2.ebuild
index 7cafbc6b67f6..0b5d5f57a0bd 100644
--- a/dev-vcs/git/git-1.7.4_rc2.ebuild
+++ b/dev-vcs/git/git-1.7.4_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc2.ebuild,v 1.1 2011/01/15 07:58:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc2.ebuild,v 1.2 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -59,7 +59,7 @@ RDEPEND="${CDEPEND}
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	) )"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-1.7.4_rc3.ebuild b/dev-vcs/git/git-1.7.4_rc3.ebuild
index f7f6bd73e619..db738ac5f9bc 100644
--- a/dev-vcs/git/git-1.7.4_rc3.ebuild
+++ b/dev-vcs/git/git-1.7.4_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc3.ebuild,v 1.1 2011/01/24 23:45:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc3.ebuild,v 1.2 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -59,7 +59,7 @@ RDEPEND="${CDEPEND}
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	) )"
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 778e2acfac33..41db5a8dd999 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.17 2011/01/15 07:58:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.18 2011/04/04 08:58:41 pacho Exp $
 
 EAPI=3
 
@@ -59,7 +59,7 @@ RDEPEND="${CDEPEND}
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8
-		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+		dev-python/pygtksourceview:2
 	) )"
 
 # This is how info docs are created with Git: