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

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

11 files changed, 71 insertions, 29 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/Manifest b/dev-util/git/Manifest
index f205984293c2..d0f527b511ba 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -26,14 +26,14 @@ DIST git-manpages-1.6.4.2.tar.bz2 248508 RMD160 80aac9a3bef03ca9973ab3e7dd03cd02
 DIST git-manpages-1.6.4.3.tar.bz2 248228 RMD160 27699b3d7a5e2088099c7695e3f4d1214c6f5ed8 SHA1 3186ed5a5e14496842c8389b4a3704c57a7e9569 SHA256 99489e55548dd1898d866bdc90dc94942396eebf42dde0d446f1eb7195c83d29
 DIST git-manpages-1.6.4.tar.bz2 246610 RMD160 0b008edd9b120a82973a7caed380e2a13f4af478 SHA1 34c8afef3e03283585edb1093b517f697f18a47b SHA256 b7ed025920594dff4ab9dc959bbefd99fa4ce3ebadef81fc92aad4d66065b7d5
 DIST git-manpages-1.6.5.rc1.tar.bz2 252098 RMD160 6e7b2b6c78c494c2c4e6ba5fff1c6af26dbd588e SHA1 ca612c39d80b4e7b6629c15f99923a1a35ed99c0 SHA256 bb8e6b08ae70449aca656e81afd12946889757c5bfa8cfc989d6919cf5ce4b17
-EBUILD git-1.6.3.1.ebuild 9724 RMD160 6fddcdf02259023d7a4f67403a35e5909601962d SHA1 8090d2005f692080a415c57d361fb6b48eac8d19 SHA256 4655efe55cdd5d971484b7136b2caad0ec29b4cebe105e6654a6709f07d5678d
-EBUILD git-1.6.3.3.ebuild 9713 RMD160 d367039cbed3a1ec31c533346617015d6d69b26d SHA1 391c05e3ca74826b2fa9dc53b1ecf7cead379596 SHA256 32b7c69cb27067266afc364eb77518907ada751c466218bf7a649a2e82db5600
-EBUILD git-1.6.3.4.ebuild 9724 RMD160 a5cf211e25ca71511b80ad29a3e21968bea45312 SHA1 a4d42bd78026062229e202b0f109a77ea83b3d61 SHA256 5a8ecc65fb71765a9081036022918d453fa6869c83df2f9c7c8c405eca31a236
-EBUILD git-1.6.4.1.ebuild 9724 RMD160 794d7ddae75f98e954553224ab69cf333cfe970d SHA1 245cb8e49c961d1fe8d792f31bd1b5f6cb0cab93 SHA256 84095d9ef910ec29cccac545a4bea2d05d3384e66497558b389b6be87a28d760
-EBUILD git-1.6.4.2.ebuild 9724 RMD160 65461fc1ec8f9d0265f2ba3fe54f130e9d2ea4b2 SHA1 06e39d9b7bdd74832770471d238ac72b140c666a SHA256 c1dfa7daf1d304198e2556524235d413ac956986dd490e7caaa486069f214239
-EBUILD git-1.6.4.3.ebuild 9724 RMD160 71bd8d66d133e3200a48f2213f541f32036953ff SHA1 65ad0d4bdc3fef9ed58144c2d5c91ab05440f3dc SHA256 925be34e641e7ade4ec2bdc12b2e0237ab8560812743340ebfb5d6d70e099f5b
-EBUILD git-1.6.4.ebuild 9722 RMD160 d48e5409837de2fe9f365031d977da4b0d05067a SHA1 d3100ab37dc1448ab99e6f86886947a6ed55d8fc SHA256 33ed0281eec8df57f0f598b7a20be07b66a795f5c8d846e6aeead29287ef1a80
-EBUILD git-1.6.5_rc1.ebuild 9726 RMD160 c4759e17361d4aedbd3c10c8f1d853f49fa8e73a SHA1 3bc5910175c8a546b414121bbe6b33c72827de08 SHA256 b6eaf618fdfec49cc802624f9d6a5b17d110d31eaf55c4cac4005f9cd94f0259
-EBUILD git-9999.ebuild 9629 RMD160 2d406fe0e19369f9cf92b53374a95cbab9a25614 SHA1 b6370c0dbb237b408e329c60264418ad8e1e4ea1 SHA256 ed80bc83221d42cc7c6ddb9f5a186e0067827db8018e8b6e916d5ec9f3949aac
-MISC ChangeLog 54609 RMD160 124d8576ab04495dbd716e79fbb1c93e9723f68a SHA1 d5e5d19c5e303fe1fa8117e6d61343d3ecf7aca3 SHA256 fa742defc2a477963590741fe356fd4f3b79ecafb43678086b56de8e93fc40f2
+EBUILD git-1.6.3.1.ebuild 9767 RMD160 2afc511a6838283ea9f33cf301352697479e4fdc SHA1 c8ce22d43275f4bc74dd33c2594c099aecb76496 SHA256 455050383ed5b252baaa8ce01c9b3e29c2ea673bb389f819fa1aa999b3aee385
+EBUILD git-1.6.3.3.ebuild 9756 RMD160 9e07e7f260da1e4b3571104fd5ff56a52a6ae32d SHA1 cba492b9adc784f55ef2ce1abd154e6cafccad9c SHA256 8fa5b774a9600175893ec8d0060b3cf2c7ef7209303a6b6ec9ee34ba19d95bf0
+EBUILD git-1.6.3.4.ebuild 9767 RMD160 db61d7cac282e65687deb0c7f58f59c789b87fd9 SHA1 fccfe5af34e846ea2bf6368df9009259833b3a3e SHA256 d34461c8d51ca0fb72361137bc4527558c32e655714f7ca277e3c3274a8999ab
+EBUILD git-1.6.4.1.ebuild 9767 RMD160 93208dcd15229edc0e10d2e498ef067cf23b44d1 SHA1 c9233e5c97c560830b79aad231650b16aa58c1a2 SHA256 7cc7b7d5eb047a085c1100289b110b781541c90879d7d89bb4440e68c2323a2e
+EBUILD git-1.6.4.2.ebuild 9767 RMD160 2679f333923ee109157110e784d4d7939d0fe736 SHA1 216311d9827f5cd2b82899337369232259f73d06 SHA256 eb6be2aceb407901f3197b535a41b18d008cb9ee05c51aa39aaa92e636dae3cc
+EBUILD git-1.6.4.3.ebuild 9767 RMD160 b4aebaa81d8f3f0e17b751df7cd51e5752e884e7 SHA1 096fc32b7ffd84afaf30622b4a21d74e00dc84f8 SHA256 4a458e32d20648a8614d7752c0b58e4fb60f8d0d696379d34b45e1826916888a
+EBUILD git-1.6.4.ebuild 9765 RMD160 8de80a58d615c31961952f3cd834d174eb68f603 SHA1 500f6770e384c3abca7749c0b24ba8f41e32ebae SHA256 bf815647d0ebc9d0989ec841a30745a93c0f0a12d87bbc85ae1d80bef75f879d
+EBUILD git-1.6.5_rc1.ebuild 9769 RMD160 69ffcd2611117241076ae8d145ee6e41b3d08af6 SHA1 53409b0d8fe513e7aeee54431217823be2c3dc43 SHA256 e7b86e277136fa33456d63171cfa18f9127a4908d3a7018b7784bf79a63c646a
+EBUILD git-9999.ebuild 9672 RMD160 6b8b374cec5dc32b507d49c959004254eccdfa21 SHA1 25929390984017d3c301c1cb7edcaa4f46c3b413 SHA256 5dee39f4c10a9bd30093cae9811632e2c5e560b840c4f5fb78f2ae461b75eb01
+MISC ChangeLog 54911 RMD160 933a88c35db0b077e77b98dc0ecdcac1200347e1 SHA1 2c1bf546674e06d9ee3dc72f3ae2b7fef40e221d SHA256 53480476d4319b99bce13a8af54c6cea36aceb3b715439536ea9c6dd816dbe60
 MISC metadata.xml 1535 RMD160 1117b90f1e7550ce3a47f844ac17db78ed803cc3 SHA1 223d8e6b2faf20bf290d90d0d6322473daa49b0c SHA256 58d9f467528fee5c7062d0a2344a3b61ff0b8b7a0a84dffc9f56557f7eadd70b
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}"