7 files changed, 67 insertions, 31 deletions
diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index bfd5be4ab27d..ed59897c7dc9 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.56 2004/02/07 03:44:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.57 2004/02/16 18:04:03 agriffis Exp $
+
+  16 Feb 2004; 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-r6.ebuild, gvim-6.2.ebuild:
+  Fix dependencies as noted by Paul de Vrieze in
+  http://marc.theaimsgroup.com/?l=gentoo-dev&m=107661470328423&w=2
 
   06 Feb 2004; 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,
diff --git a/app-editors/gvim/gvim-6.2-r1.ebuild b/app-editors/gvim/gvim-6.2-r1.ebuild
index bbf0dd2d1280..9934351239ab 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-2004 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.7 2004/02/07 03:44:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r1.ebuild,v 1.8 2004/02/16 18:04:03 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,12 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	virtual/x11
-	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
-		( gnome? ( gnome-base/gnome-libs ) :
-			( gtk? ( =x11-libs/gtk+-1.2* ) :
-				( motif? ( x11-libs/openmotif ) ) ) )"
+	gtk?
+		( gtk2? 
+			( >=x11-libs/gtk+-2.1 virtual/xft ) :
+			( gnome?
+				( gnome-base/gnome-libs ) :
+				( =x11-libs/gtk+-1.2* )
+			)
+		) :
+		( motif? ( x11-libs/openmotif ) )"
diff --git a/app-editors/gvim/gvim-6.2-r2.ebuild b/app-editors/gvim/gvim-6.2-r2.ebuild
index f986da4b7851..1355a60afc05 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-2004 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.6 2004/02/07 03:44:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r2.ebuild,v 1.7 2004/02/16 18:04:03 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,12 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	virtual/x11
-	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
-		( gnome? ( gnome-base/gnome-libs ) :
-			( gtk? ( =x11-libs/gtk+-1.2* ) :
-				( motif? ( x11-libs/openmotif ) ) ) )"
+	gtk?
+		( gtk2? 
+			( >=x11-libs/gtk+-2.1 virtual/xft ) :
+			( gnome?
+				( gnome-base/gnome-libs ) :
+				( =x11-libs/gtk+-1.2* )
+			)
+		) :
+		( motif? ( x11-libs/openmotif ) )"
diff --git a/app-editors/gvim/gvim-6.2-r3.ebuild b/app-editors/gvim/gvim-6.2-r3.ebuild
index 1f970c0a63ce..5b4efadafa6b 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-2004 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.5 2004/02/07 03:44:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r3.ebuild,v 1.6 2004/02/16 18:04:03 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,12 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	virtual/x11
-	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
-		( gnome? ( gnome-base/gnome-libs ) :
-			( gtk? ( =x11-libs/gtk+-1.2* ) :
-				( motif? ( x11-libs/openmotif ) ) ) )"
+	gtk?
+		( gtk2? 
+			( >=x11-libs/gtk+-2.1 virtual/xft ) :
+			( gnome?
+				( gnome-base/gnome-libs ) :
+				( =x11-libs/gtk+-1.2* )
+			)
+		) :
+		( motif? ( x11-libs/openmotif ) )"
diff --git a/app-editors/gvim/gvim-6.2-r5.ebuild b/app-editors/gvim/gvim-6.2-r5.ebuild
index 114716bcc461..fc4ecf07af63 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-2004 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.12 2004/02/07 03:44:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r5.ebuild,v 1.13 2004/02/16 18:04:03 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,12 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	virtual/x11
-	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
-		( gnome? ( gnome-base/gnome-libs ) :
-			( gtk? ( =x11-libs/gtk+-1.2* ) :
-				( motif? ( x11-libs/openmotif ) ) ) )"
+	gtk?
+		( gtk2? 
+			( >=x11-libs/gtk+-2.1 virtual/xft ) :
+			( gnome?
+				( gnome-base/gnome-libs ) :
+				( =x11-libs/gtk+-1.2* )
+			)
+		) :
+		( motif? ( x11-libs/openmotif ) )"
diff --git a/app-editors/gvim/gvim-6.2-r6.ebuild b/app-editors/gvim/gvim-6.2-r6.ebuild
index 21e9bd10698e..2463ac360e9d 100644
--- a/app-editors/gvim/gvim-6.2-r6.ebuild
+++ b/app-editors/gvim/gvim-6.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r6.ebuild,v 1.2 2004/02/07 03:44:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r6.ebuild,v 1.3 2004/02/16 18:04:03 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,12 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	virtual/x11
-	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
-		( gnome? ( gnome-base/gnome-libs ) :
-			( gtk? ( =x11-libs/gtk+-1.2* ) :
-				( motif? ( x11-libs/openmotif ) ) ) )"
+	gtk?
+		( gtk2? 
+			( >=x11-libs/gtk+-2.1 virtual/xft ) :
+			( gnome?
+				( gnome-base/gnome-libs ) :
+				( =x11-libs/gtk+-1.2* )
+			)
+		) :
+		( motif? ( x11-libs/openmotif ) )"
diff --git a/app-editors/gvim/gvim-6.2.ebuild b/app-editors/gvim/gvim-6.2.ebuild
index bce140a41cdc..5fb2c91f79c4 100644
--- a/app-editors/gvim/gvim-6.2.ebuild
+++ b/app-editors/gvim/gvim-6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8 2004/02/07 03:44:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2.ebuild,v 1.9 2004/02/16 18:04:03 agriffis Exp $
 
 inherit vim
 
@@ -21,7 +21,12 @@ PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	virtual/x11
-	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
-		( gnome? ( gnome-base/gnome-libs ) :
-			( gtk? ( =x11-libs/gtk+-1.2* ) :
-				( motif? ( x11-libs/openmotif ) ) ) )"
+	gtk?
+		( gtk2? 
+			( >=x11-libs/gtk+-2.1 virtual/xft ) :
+			( gnome?
+				( gnome-base/gnome-libs ) :
+				( =x11-libs/gtk+-1.2* )
+			)
+		) :
+		( motif? ( x11-libs/openmotif ) )"