Use new conditional syntax for DEPEND

7 files changed, 60 insertions, 61 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index ed59897c7dc9..86bfd2f432f0 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.57 2004/02/16 18:04:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.58 2004/02/17 01:54:38 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:
+  Use new conditional syntax for DEPEND
 
   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,
diff --git a/app-editors/gvim/gvim-6.2-r1.ebuild b/app-editors/gvim/gvim-6.2-r1.ebuild
index 88471d124bb9..4c08ca1bb9e5 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.9 2004/02/16 18:42:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r1.ebuild,v 1.10 2004/02/17 01:54:38 agriffis Exp $
 
 inherit vim
 
@@ -21,12 +21,11 @@ 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 ) :
-				( =x11-libs/gtk+-1.2* )
-			)
-		) :
-		( motif? ( x11-libs/openmotif ) )"
+	gtk? (
+		gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft )
+		!gtk2? (
+			gnome? ( gnome-base/gnome-libs )
+			!gnome? ( =x11-libs/gtk+-1.2* )
+		)
+	)
+	!gtk? ( 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 e0b473b3d4e2..0ec2fd3278e2 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.8 2004/02/16 18:42:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r2.ebuild,v 1.9 2004/02/17 01:54:38 agriffis Exp $
 
 inherit vim
 
@@ -21,12 +21,11 @@ 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 ) :
-				( =x11-libs/gtk+-1.2* )
-			)
-		) :
-		( motif? ( x11-libs/openmotif ) )"
+	gtk? (
+		gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft )
+		!gtk2? (
+			gnome? ( gnome-base/gnome-libs )
+			!gnome? ( =x11-libs/gtk+-1.2* )
+		)
+	)
+	!gtk? ( 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 07328594bca3..03d04575b338 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.7 2004/02/16 18:42:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r3.ebuild,v 1.8 2004/02/17 01:54:38 agriffis Exp $
 
 inherit vim
 
@@ -21,12 +21,11 @@ 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 ) :
-				( =x11-libs/gtk+-1.2* )
-			)
-		) :
-		( motif? ( x11-libs/openmotif ) )"
+	gtk? (
+		gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft )
+		!gtk2? (
+			gnome? ( gnome-base/gnome-libs )
+			!gnome? ( =x11-libs/gtk+-1.2* )
+		)
+	)
+	!gtk? ( 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 1a7c69afacf7..91125fdf5976 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.14 2004/02/16 18:42:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r5.ebuild,v 1.15 2004/02/17 01:54:38 agriffis Exp $
 
 inherit vim
 
@@ -21,12 +21,11 @@ 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 ) :
-				( =x11-libs/gtk+-1.2* )
-			)
-		) :
-		( motif? ( x11-libs/openmotif ) )"
+	gtk? (
+		gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft )
+		!gtk2? (
+			gnome? ( gnome-base/gnome-libs )
+			!gnome? ( =x11-libs/gtk+-1.2* )
+		)
+	)
+	!gtk? ( 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 20391a47ca1b..84e22c075de0 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.4 2004/02/16 18:42:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r6.ebuild,v 1.5 2004/02/17 01:54:38 agriffis Exp $
 
 inherit vim
 
@@ -21,12 +21,11 @@ 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 ) :
-				( =x11-libs/gtk+-1.2* )
-			)
-		) :
-		( motif? ( x11-libs/openmotif ) )"
+	gtk? (
+		gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft )
+		!gtk2? (
+			gnome? ( gnome-base/gnome-libs )
+			!gnome? ( =x11-libs/gtk+-1.2* )
+		)
+	)
+	!gtk? ( motif? ( x11-libs/openmotif ) )"
diff --git a/app-editors/gvim/gvim-6.2.ebuild b/app-editors/gvim/gvim-6.2.ebuild
index deeeb902aeb4..e3f5de60e602 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.10 2004/02/16 18:42:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2.ebuild,v 1.11 2004/02/17 01:54:38 agriffis Exp $
 
 inherit vim
 
@@ -21,12 +21,11 @@ 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 ) :
-				( =x11-libs/gtk+-1.2* )
-			)
-		) :
-		( motif? ( x11-libs/openmotif ) )"
+	gtk? (
+		gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft )
+		!gtk2? (
+			gnome? ( gnome-base/gnome-libs )
+			!gnome? ( =x11-libs/gtk+-1.2* )
+		)
+	)
+	!gtk? ( motif? ( x11-libs/openmotif ) )"