Fix dependencies as noted by Paul de Vrieze in http://marc.theaimsgroup.com/?l=gentoo-dev&m=107661470328423&w=2

8 files changed, 77 insertions, 41 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/Manifest b/app-editors/gvim/Manifest
index ec041c8e8dab..92e353b0a3b5 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,15 +1,15 @@
-MD5 e03d1acf3adb0868746e9269c2ad91a2 gvim-6.2-r3.ebuild 941
-MD5 2be7c204640e2e44fd0062d9bcae9137 gvim-6.2-r5.ebuild 959
-MD5 625d7f8908455fe8c1dd82231c3ea667 gvim-6.2-r2.ebuild 943
-MD5 57ab9d5e8da1830bf2adc9a8fce1b827 gvim-6.2-r6.ebuild 964
-MD5 f125f2e4fca57f7f3c87ab96984843d9 gvim-6.2-r1.ebuild 945
-MD5 1fce882b0cffa780042d5ba0b6d57a1a ChangeLog 9079
-MD5 5d8d41b86b6784149fa56987494f2677 gvim-6.2.ebuild 940
+MD5 d3371e59a9c49e368a08ef1681310245 gvim-6.2.ebuild 946
+MD5 6b19e9a668482fbe37f7f5bb333308c7 gvim-6.2-r2.ebuild 949
+MD5 9772d0427443c21e538c51997fa19bf9 ChangeLog 9367
+MD5 8cd7f7d2e6820711faeb775b280ec9e8 gvim-6.2-r5.ebuild 965
+MD5 701e2db761e7f25e9447c9ff1af32afc gvim-6.2-r3.ebuild 947
+MD5 a8a841fc52cc9f5e79f4893b8f439b01 gvim-6.2-r1.ebuild 951
+MD5 a9d8040befaf060c851fdba4e81a893c gvim-6.2-r6.ebuild 970
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
-MD5 9e6738a1dd0f4e78cf1b0c8dc0866af7 files/digest-gvim-6.2 274
+MD5 b55c47a253613f757d8fb0bdd9008660 files/digest-gvim-6.2-r6 275
+MD5 e92de6be4fb936ce511bfd13594c2cc5 files/digest-gvim-6.2-r5 275
 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
+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
-MD5 b55c47a253613f757d8fb0bdd9008660 files/digest-gvim-6.2-r6 275
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 ) )"