depend on virtual/x11 instead of xfree

8 files changed, 25 insertions, 20 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 6d55e2a8e04b..bfd5be4ab27d 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.55 2004/01/28 23:22:25 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.56 2004/02/07 03:44:26 agriffis Exp $
+
+  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,
+  gvim-6.2-r6.ebuild, gvim-6.2.ebuild:
+  Depend on virtual/x11 in lieu of x11-base/xfree
 
 *gvim-6.2-r6 (28 Jan 2004)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 4daa814a09ec..ec041c8e8dab 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,10 +1,10 @@
-MD5 f368c288cabe78f89dccb7bc654eeb2d gvim-6.2-r3.ebuild 942
-MD5 393f29796599d326ecc9f1f7048a2739 gvim-6.2-r5.ebuild 960
-MD5 06956b0d527e5286f0af3fceb43e77c7 gvim-6.2-r2.ebuild 944
-MD5 026bd5ee3d5d4d9d292a2062bfff6f33 gvim-6.2-r6.ebuild 968
-MD5 3756846f9968cfbe36549d251bfbe935 gvim-6.2-r1.ebuild 946
-MD5 26c5228e018d5ad588cfae13d07696ab ChangeLog 8858
-MD5 f80ba9ce9c07c43a2c7e421ff7bf2cba gvim-6.2.ebuild 941
+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 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 9e6738a1dd0f4e78cf1b0c8dc0866af7 files/digest-gvim-6.2 274
 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
diff --git a/app-editors/gvim/gvim-6.2-r1.ebuild b/app-editors/gvim/gvim-6.2-r1.ebuild
index 0dfb2b70ccad..bbf0dd2d1280 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.6 2004/01/11 13:31:14 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r1.ebuild,v 1.7 2004/02/07 03:44:26 agriffis Exp $
 
 inherit vim
 
@@ -20,7 +20,7 @@ KEYWORDS="~alpha ~ppc ~sparc ~x86"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	x11-base/xfree
+	virtual/x11
 	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :
diff --git a/app-editors/gvim/gvim-6.2-r2.ebuild b/app-editors/gvim/gvim-6.2-r2.ebuild
index 8d83991fed2a..f986da4b7851 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.5 2004/01/11 13:31:14 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r2.ebuild,v 1.6 2004/02/07 03:44:26 agriffis Exp $
 
 inherit vim
 
@@ -20,7 +20,7 @@ KEYWORDS="alpha ~ppc ~sparc x86"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	x11-base/xfree
+	virtual/x11
 	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :
diff --git a/app-editors/gvim/gvim-6.2-r3.ebuild b/app-editors/gvim/gvim-6.2-r3.ebuild
index 625bf888bd81..1f970c0a63ce 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.4 2004/01/11 13:31:14 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r3.ebuild,v 1.5 2004/02/07 03:44:26 agriffis Exp $
 
 inherit vim
 
@@ -20,7 +20,7 @@ KEYWORDS="alpha ppc sparc x86"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	x11-base/xfree
+	virtual/x11
 	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :
diff --git a/app-editors/gvim/gvim-6.2-r5.ebuild b/app-editors/gvim/gvim-6.2-r5.ebuild
index 3d2d407dea1c..114716bcc461 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.11 2004/01/12 11:21:31 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r5.ebuild,v 1.12 2004/02/07 03:44:26 agriffis Exp $
 
 inherit vim
 
@@ -20,7 +20,7 @@ KEYWORDS="alpha ~ppc sparc x86 amd64 ia64 hppa"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	x11-base/xfree
+	virtual/x11
 	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :
diff --git a/app-editors/gvim/gvim-6.2-r6.ebuild b/app-editors/gvim/gvim-6.2-r6.ebuild
index 4af25a4baf74..21e9bd10698e 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.1 2004/01/28 23:22:25 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2-r6.ebuild,v 1.2 2004/02/07 03:44:26 agriffis Exp $
 
 inherit vim
 
@@ -20,7 +20,7 @@ KEYWORDS="~alpha ~ppc ~sparc ~x86 ~amd64 ~ia64 ~hppa"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	x11-base/xfree
+	virtual/x11
 	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :
diff --git a/app-editors/gvim/gvim-6.2.ebuild b/app-editors/gvim/gvim-6.2.ebuild
index 369f89ddfdfc..bce140a41cdc 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.7 2004/01/11 13:31:14 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2.ebuild,v 1.8 2004/02/07 03:44:26 agriffis Exp $
 
 inherit vim
 
@@ -20,7 +20,7 @@ KEYWORDS="alpha ~ppc ~sparc x86"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	x11-base/xfree
+	virtual/x11
 	gtk? ( gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) ) :
 		( gnome? ( gnome-base/gnome-libs ) :
 			( gtk? ( =x11-libs/gtk+-1.2* ) :