Conform to Spider's description of gtk/gtk2 in http://marc.theaimsgroup.com/?l=gentoo-dev&m=106642560411112&w=2

7 files changed, 24 insertions, 19 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index d43829b8b157..d12e07153a21 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.45 2003/11/12 17:07:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.46 2003/11/12 22:44:28 agriffis Exp $
+
+  12 Nov 2003; Aron Griffis <agriffis@gentoo.org> gvim-6.2-r1.ebuild,
+  gvim-6.2-r2.ebuild, gvim-6.2-r3.ebuild, gvim-6.2-r5.ebuild, gvim-6.2.ebuild:
+  Conform to Spider's description of gtk/gtk2 in
+  http://marc.theaimsgroup.com/?l=gentoo-dev&m=106642560411112&w=2
 
   12 Nov 2003; Aron Griffis <agriffis@gentoo.org> gvim-6.1-r6.ebuild,
   gvim-6.1-r7.ebuild, gvim-6.1-r8.ebuild:
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 67c1b415ede4..83344301ea41 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,13 +1,13 @@
-MD5 d8cd489e7277486a16866f7703e85c55 gvim-6.2-r3.ebuild 930
-MD5 56fa7fb831aeb87cc766b75a885e4457 gvim-6.2-r5.ebuild 942
-MD5 c4f9c5f9afd0587e056327b51a98562f gvim-6.2-r2.ebuild 932
-MD5 ba6de0b72017b2a1e5cf9a18b471e9fc gvim-6.2-r1.ebuild 934
-MD5 fcdb2bcaafc9239f7a2d1593309cc5eb ChangeLog 7256
-MD5 279c187f04873ccf322f266550829b2e gvim-6.2.ebuild 929
+MD5 e3c57a81c035f056da9ec0bc740115ee gvim-6.2.ebuild 938
+MD5 ce7c84ed7b2d35c6982b83fc38f22d39 gvim-6.2-r2.ebuild 941
+MD5 800e56c106d84b9d33b4c8acd46d893b ChangeLog 7522
+MD5 8c72fbdeee54f98de6ad23871a429009 gvim-6.2-r5.ebuild 950
+MD5 f2ecc233a892f599d2b98949b9124ea7 gvim-6.2-r3.ebuild 939
+MD5 62fa78205f3d84dd8ecb79e8cc0e5fec gvim-6.2-r1.ebuild 943
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 9e6738a1dd0f4e78cf1b0c8dc0866af7 files/digest-gvim-6.2 274
+MD5 e92de6be4fb936ce511bfd13594c2cc5 files/digest-gvim-6.2-r5 275
 MD5 b8f9d11544c511f3387281fa88f36a03 files/gvimrc 640
+MD5 9e6738a1dd0f4e78cf1b0c8dc0866af7 files/digest-gvim-6.2 274
 MD5 38a359b4a00f99fcecd10986eb83a691 files/digest-gvim-6.2-r1 274
 MD5 581974f7e2a2c4054b563db39720cc32 files/digest-gvim-6.2-r2 274
 MD5 7872d6ce1d0728653a5d0ebd09d069ae files/digest-gvim-6.2-r3 275
-MD5 e92de6be4fb936ce511bfd13594c2cc5 files/digest-gvim-6.2-r5 275
diff --git a/app-editors/gvim/gvim-6.2-r1.ebuild b/app-editors/gvim/gvim-6.2-r1.ebuild
index 2b735900cb04..656038f54acb 100644
--- a/app-editors/gvim/gvim-6.2-r1.ebuild
+++ b/app-editors/gvim/gvim-6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r1.ebuild,v 1.4 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r1.ebuild,v 1.5 2003/11/12 22:44:28 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,7 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	x11-base/xfree
-	gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) :
+	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :
 				( motif? ( virtual/motif ) ) ) )"
diff --git a/app-editors/gvim/gvim-6.2-r2.ebuild b/app-editors/gvim/gvim-6.2-r2.ebuild
index 6fef1144c348..22e459ac4a92 100644
--- a/app-editors/gvim/gvim-6.2-r2.ebuild
+++ b/app-editors/gvim/gvim-6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r2.ebuild,v 1.3 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r2.ebuild,v 1.4 2003/11/12 22:44:28 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,7 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	x11-base/xfree
-	gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) :
+	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :
 				( motif? ( virtual/motif ) ) ) )"
diff --git a/app-editors/gvim/gvim-6.2-r3.ebuild b/app-editors/gvim/gvim-6.2-r3.ebuild
index 60b533aacb96..e80029c6aa31 100644
--- a/app-editors/gvim/gvim-6.2-r3.ebuild
+++ b/app-editors/gvim/gvim-6.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r3.ebuild,v 1.2 2003/10/01 15:20:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r3.ebuild,v 1.3 2003/11/12 22:44:28 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,7 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	x11-base/xfree
-	gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) :
+	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :
 				( motif? ( virtual/motif ) ) ) )"
diff --git a/app-editors/gvim/gvim-6.2-r5.ebuild b/app-editors/gvim/gvim-6.2-r5.ebuild
index 95f11d0f0e3c..27f5fee04863 100644
--- a/app-editors/gvim/gvim-6.2-r5.ebuild
+++ b/app-editors/gvim/gvim-6.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r5.ebuild,v 1.2 2003/11/08 17:44:40 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r5.ebuild,v 1.3 2003/11/12 22:44:28 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,7 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	x11-base/xfree
-	gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) :
+	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :
 				( motif? ( virtual/motif ) ) ) )"
diff --git a/app-editors/gvim/gvim-6.2.ebuild b/app-editors/gvim/gvim-6.2.ebuild
index a1ded978a750..a97599fdf27b 100644
--- a/app-editors/gvim/gvim-6.2.ebuild
+++ b/app-editors/gvim/gvim-6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2.ebuild,v 1.5 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2.ebuild,v 1.6 2003/11/12 22:44:28 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,7 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	x11-base/xfree
-	gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) :
+	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :
 				( motif? ( virtual/motif ) ) ) )"