providing virtual/editor

49 files changed, 159 insertions, 1576 deletions

diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog
index 661009d03b23..8cc44948957c 100644
--- a/app-editors/elvis/ChangeLog
+++ b/app-editors/elvis/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for app-editors/elvis
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.4 2002/12/13 10:56:05 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.5 2003/01/06 10:41:54 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *elvis-2.1.4-r1 (1 Feb 2002)
 
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  PROVIDE virtual/editor
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
   Added ppc to keywords
 
diff --git a/app-editors/elvis/elvis-2.1.4-r1.ebuild b/app-editors/elvis/elvis-2.1.4-r1.ebuild
index e00e060cadbb..5b2333511482 100644
--- a/app-editors/elvis/elvis-2.1.4-r1.ebuild
+++ b/app-editors/elvis/elvis-2.1.4-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.1.4-r1.ebuild,v 1.11 2002/12/09 04:17:38 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.1.4-r1.ebuild,v 1.12 2003/01/06 10:41:54 seemant Exp $
+
+IUSE="X"
 
 MY_P="${PN}-2.1_4"
 S=${WORKDIR}/${MY_P}
@@ -11,19 +13,23 @@ HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
 SLOT="0"
 LICENSE="Artistic"
 KEYWORDS="x86 ppc sparc "
-IUSE="X"
 
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2
+DEPEND=">=sys-libs/ncurses-5.2
 	X? ( virtual/x11 )"
-RDEPEND=""
+
+PROVIDE="virtual/editor"
 
 src_compile() {
 	local myconf
 	use X \
 		&& myconf="--with-x" \
 		|| myconf="--without-x"
-	./configure --bindir=${D}/usr/bin --datadir=${D}/usr/share/elvis ${myconf} || die
+
+	./configure \
+		--bindir=${D}/usr/bin \
+		--datadir=${D}/usr/share/elvis \
+		${myconf} || die
+
 	cp Makefile Makefile.orig
 	sed -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile.orig > Makefile
 	cp config.h config.h.orig
diff --git a/app-editors/elvis/elvis-2.1.4.ebuild b/app-editors/elvis/elvis-2.1.4.ebuild
index 9f91fdf45202..7f87b4297990 100644
--- a/app-editors/elvis/elvis-2.1.4.ebuild
+++ b/app-editors/elvis/elvis-2.1.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.1.4.ebuild,v 1.10 2002/12/09 04:17:38 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.1.4.ebuild,v 1.11 2003/01/06 10:41:54 seemant Exp $
+
+IUSE="X"
 
 MY_P="${PN}-2.1_4"
 S=${WORKDIR}/${MY_P}
@@ -11,19 +13,22 @@ HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
 SLOT="0"
 LICENSE="Artistic"
 KEYWORDS="x86 ppc sparc "
-IUSE="X"
 
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2
+DEPEND=">=sys-libs/ncurses-5.2
 	X? ( virtual/x11 )"
-RDEPEND=""
+
+PROVIDE="virtual/editor"
 
 src_compile() {
 	local myconf
 	use X \
 		&& myconf="--with-x" \
 		|| myconf="--without-x"
-	./configure --bindir=${D}/usr/bin --datadir=${D}/usr/share/elvis ${myconf} || die
+	./configure \
+		--bindir=${D}/usr/bin \
+		--datadir=${D}/usr/share/elvis \
+		${myconf} || die
+
 	cp Makefile Makefile.orig
 	cat Makefile.orig | sed -e "s:gcc -O2:gcc ${CFLAGS}:" > Makefile
 	make || die
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index a7ce28d0a8a5..a3920ad24541 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.5 2002/12/13 10:56:05 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.6 2003/01/06 10:41:54 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *emacs-cvs-21.3.50 (22 Nov 2002)
 
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> emacs-cvs-21.3.50.ebuild :
+
+  PROVIDE virtual/editor in addition to virtual/emacs
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   06 Dec 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
   emacs-cvs-21.3.50.ebuild :
 
diff --git a/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild
index 204bee46cc19..d7ac42d88342 100644
--- a/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild,v 1.4 2002/12/09 04:17:39 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild,v 1.5 2003/01/06 10:41:54 seemant Exp $
 
 ECVS_SERVER="subversions.gnu.org:/cvsroot/emacs"
 ECVS_MODULE="emacs"
@@ -30,9 +30,8 @@ DEPEND=">=sys-libs/ncurses-5.3
 		>=media-libs/libpng-1.2.5
 		>=x11-libs/Xaw3d-1.5-r1 )
 	nls? ( >=sys-devel/gettext-0.11.5 )"
-RDEPEND=""
 
-PROVIDE="virtual/emacs"
+PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 4c5b7bcd51d2..a3ae7454e099 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.10 2002/12/13 10:56:05 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.11 2003/01/06 10:41:54 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *emacs-21.2-r2 (14 Sep 2002)
 
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  PROVIDE virtual/editor as well as virtual/emacs now
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   14 Sep 2002; Matthew Kennedy <mkennedy@gentoo.org>
   emacs-21.2-r2.ebuild, files/digest-emacs-21.2-r2.ebuild :
 
diff --git a/app-editors/emacs/emacs-21.1-r4.ebuild b/app-editors/emacs/emacs-21.1-r4.ebuild
index 53a0094fbd79..22d5e07709f9 100644
--- a/app-editors/emacs/emacs-21.1-r4.ebuild
+++ b/app-editors/emacs/emacs-21.1-r4.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.1-r4.ebuild,v 1.13 2002/12/09 04:17:38 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.1-r4.ebuild,v 1.14 2003/01/06 10:41:54 seemant Exp $
 
 IUSE="X nls motif"
 
-
 S=${WORKDIR}/${P}
 DESCRIPTION="An incredibly powerful, extensible text editor"
 SRC_URI="ftp://ftp.codefactory.se/pub/gnu/${PN}/${P}.tar.gz"
@@ -22,9 +21,8 @@ DEPEND=">=sys-libs/ncurses-5.2
 		>=media-libs/libpng-1.2.1 ) 
 	motif? ( >=x11-libs/openmotif-2.1.30 ) 
 	nls? ( >=sys-devel/gettext-0.10.35 )"
-RDEPEND=""
 
-PROVIDE="virtual/emacs"
+PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="0"
 KEYWORDS="x86 ppc sparc"
diff --git a/app-editors/emacs/emacs-21.2-r1.ebuild b/app-editors/emacs/emacs-21.2-r1.ebuild
index 1104c89d1723..e9c3f58555cf 100644
--- a/app-editors/emacs/emacs-21.2-r1.ebuild
+++ b/app-editors/emacs/emacs-21.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.2-r1.ebuild,v 1.10 2002/12/09 04:17:38 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.2-r1.ebuild,v 1.11 2003/01/06 10:41:54 seemant Exp $
 
 IUSE="X nls motif"
 
@@ -21,9 +21,8 @@ DEPEND=">=sys-libs/ncurses-5.2
 		>=media-libs/libpng-1.2.1 ) 
 	motif? ( >=x11-libs/openmotif-2.1.30 ) 
 	nls? ( >=sys-devel/gettext-0.10.35 )"
-RDEPEND=""
 
-PROVIDE="virtual/emacs"
+PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-editors/emacs/emacs-21.2-r2.ebuild b/app-editors/emacs/emacs-21.2-r2.ebuild
index 3b4e352b2de2..f8c282347801 100644
--- a/app-editors/emacs/emacs-21.2-r2.ebuild
+++ b/app-editors/emacs/emacs-21.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.2-r2.ebuild,v 1.8 2002/12/15 10:44:10 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.2-r2.ebuild,v 1.9 2003/01/06 10:41:54 seemant Exp $
 
 IUSE="X nls motif leim"
 
@@ -22,9 +22,8 @@ DEPEND=">=sys-libs/ncurses-5.2
 		>=media-libs/libpng-1.2.1 ) 
 	motif? ( >=x11-libs/openmotif-2.1.30 ) 
 	nls? ( >=sys-devel/gettext-0.10.35 )"
-RDEPEND=""
 
-PROVIDE="virtual/emacs"
+PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-editors/emacs/emacs-21.2.ebuild b/app-editors/emacs/emacs-21.2.ebuild
index edfb760409c4..e13987fb0acc 100644
--- a/app-editors/emacs/emacs-21.2.ebuild
+++ b/app-editors/emacs/emacs-21.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.2.ebuild,v 1.10 2002/12/09 04:17:38 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.2.ebuild,v 1.11 2003/01/06 10:41:54 seemant Exp $
 
 IUSE="X nls motif"
 
@@ -21,9 +21,8 @@ DEPEND=">=sys-libs/ncurses-5.2
 		>=media-libs/libpng-1.2.1 ) 
 	motif? ( >=x11-libs/openmotif-2.1.30 ) 
 	nls? ( >=sys-devel/gettext-0.10.35 )"
-RDEPEND=""
 
-PROVIDE="virtual/emacs"
+PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-editors/joe/ChangeLog b/app-editors/joe/ChangeLog
index 2019ef4288e0..8e04539e53d0 100644
--- a/app-editors/joe/ChangeLog
+++ b/app-editors/joe/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for app-editors/joe
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/ChangeLog,v 1.6 2002/12/13 10:56:05 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/ChangeLog,v 1.7 2003/01/06 10:41:54 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *joe-2.9.8_pre1 (18 Oct 2002)
 
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  PROVIDE virtual/editor
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   18 Oct 2002; Seemant Kulleen <seemant@gentoo.org> joe-2.9.8_pre1.ebuild
   files/digest-joe-2.9.8_pre1 :
 
diff --git a/app-editors/joe/joe-2.9.5.ebuild b/app-editors/joe/joe-2.9.5.ebuild
index 780274f5e062..ea91bda847e7 100644
--- a/app-editors/joe/joe-2.9.5.ebuild
+++ b/app-editors/joe/joe-2.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-2.9.5.ebuild,v 1.9 2002/12/09 04:17:39 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-2.9.5.ebuild,v 1.10 2003/01/06 10:41:54 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
@@ -8,7 +8,8 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tgz"
 HOMEPAGE="http://sourceforge.net/projects/joe-editor/"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
-RDEPEND=""
+
+PROVIDE="virtual/editor"
 
 SLOT="0"
 KEYWORDS="x86 ppc sparc "
diff --git a/app-editors/joe/joe-2.9.8_pre1.ebuild b/app-editors/joe/joe-2.9.8_pre1.ebuild
index 11ba3c64fd55..c4d5b988c7ac 100644
--- a/app-editors/joe/joe-2.9.8_pre1.ebuild
+++ b/app-editors/joe/joe-2.9.8_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-2.9.8_pre1.ebuild,v 1.4 2002/12/09 04:17:39 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-2.9.8_pre1.ebuild,v 1.5 2003/01/06 10:41:54 seemant Exp $
 
 MY_P=${P/_/-}
 S=${WORKDIR}/${MY_P}
@@ -14,6 +14,8 @@ LICENSE="GPL-1"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
 
+PROVIDE="virtual/editor"
+
 src_compile() {                           
 	econf
 	make || die
diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index dcad93b209be..fc515eaeb04b 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for app-editors/nano
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.11 2002/12/13 10:56:06 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.12 2003/01/06 10:41:54 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *nano-1.0.9-r2 (01 Dec 2002)
 
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> nano-1.0.9-r2.ebuild :
+
+  PROVIDE virtual/editor
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   01 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
   Added a symlink for /usr/bin/nano to /bin/nano #10916
 
diff --git a/app-editors/nano/nano-1.0.9-r2.ebuild b/app-editors/nano/nano-1.0.9-r2.ebuild
index a7fb853c3f93..60b14ab5e5ea 100644
--- a/app-editors/nano/nano-1.0.9-r2.ebuild
+++ b/app-editors/nano/nano-1.0.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.0.9-r2.ebuild,v 1.3 2002/12/15 10:44:10 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.0.9-r2.ebuild,v 1.4 2003/01/06 10:41:54 seemant Exp $
 
 DESCRIPTION="clone of Pico with more functions in a smaller size"
 SRC_URI="http://www.nano-editor.org/dist/v1.0/${P}.tar.gz"
@@ -11,10 +11,11 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc alpha"
 IUSE="nls build slang"
 
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2
+DEPEND=">=sys-libs/ncurses-5.2
 	nls? ( sys-devel/gettext )"
 
+PROVIDE="virtual/editor"
+
 src_compile() {
 	local myconf="--bindir=/bin --enable-extra"
 	use nls   || myconf="${myconf} --disable-nls"
diff --git a/app-editors/nedit/files/digest-nedit-5.3-r2 b/app-editors/nedit/files/digest-nedit-5.3-r2
new file mode 100644
index 000000000000..8ad5b649f10d
--- /dev/null
+++ b/app-editors/nedit/files/digest-nedit-5.3-r2
@@ -0,0 +1 @@
+MD5 47afb4e07698f45e95d49c27f3d2f9e1 nedit-5.3-source.tar.gz 991690
diff --git a/app-editors/nedit/nedit-5.3-r1.ebuild b/app-editors/nedit/nedit-5.3-r1.ebuild
index 570e4fedff84..19093ac9ec01 100644
--- a/app-editors/nedit/nedit-5.3-r1.ebuild
+++ b/app-editors/nedit/nedit-5.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.3-r1.ebuild,v 1.2 2002/12/09 04:17:40 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.3-r1.ebuild,v 1.3 2003/01/06 10:41:54 seemant Exp $
 
 S=${WORKDIR}/${P}
 MY_PV=${PV/./_}
-DESCRIPTION="NEdit is a multi-purpose text editor for the X Window System"
+DESCRIPTION="NEdit is a multi-purpose Motif-based text editor for the X Window System"
 SRC_URI="http://www.nedit.org/ftp/v${MY_PV}/${P}-source.tar.gz"
 HOMEPAGE="http://nedit.org/"
 
@@ -18,23 +18,18 @@ DEPEND="${RDEPEND}
 	dev-util/yacc"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}/makefiles
 	cp Makefile.linux Makefile.orig
 	sed -e "s:-O:${CFLAGS}:" -e "s/-lm/-lm -lXmu/" \
 	Makefile.orig > Makefile.linux || die
-
 }
 
 src_compile() {
-
 	make linux || die
-
 }
 
 src_install () {
-
 	into /usr
 	dobin source/nedit
 	exeinto /usr/bin
@@ -46,5 +41,4 @@ src_install () {
 	cd doc
 	dodoc *.txt nedit.doc README.FAQ NEdit.ad
 	dohtml *.{dtd,xsl,xml,html,awk}
-
 }
diff --git a/app-editors/nvi/nvi-1.81.4.ebuild b/app-editors/nvi/nvi-1.81.4.ebuild
index f3392cc4b0d5..ea5883e38f27 100644
--- a/app-editors/nvi/nvi-1.81.4.ebuild
+++ b/app-editors/nvi/nvi-1.81.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.4.ebuild,v 1.10 2002/12/09 04:17:40 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.4.ebuild,v 1.11 2003/01/06 10:41:54 seemant Exp $
 
 DESCRIPTION="Vi clone"
 SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
@@ -11,7 +11,8 @@ LICENSE="Sleepycat"
 KEYWORDS="x86 ppc sparc "
 
 DEPEND=">=sys-libs/db-3.1"
-RDEPEND=""
+
+PROVIDE="virtual/editor"
 
 src_compile() {
 	cd build.unix
diff --git a/app-editors/nvi/nvi-1.81.5.ebuild b/app-editors/nvi/nvi-1.81.5.ebuild
index d2cd9cacda60..eac60602fe05 100644
--- a/app-editors/nvi/nvi-1.81.5.ebuild
+++ b/app-editors/nvi/nvi-1.81.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5.ebuild,v 1.3 2002/12/09 04:17:40 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5.ebuild,v 1.4 2003/01/06 10:41:54 seemant Exp $
 
 DESCRIPTION="Vi clone"
 SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
@@ -12,6 +12,8 @@ KEYWORDS="~x86 ~ppc ~sparc "
 
 DEPEND="sys-libs/db"
 
+PROVIDE="virtual/editor"
+
 src_compile() {
 	cd build.unix
 	../dist/configure \
diff --git a/app-editors/pico/ChangeLog b/app-editors/pico/ChangeLog
index 14fb2a877bca..7d25d232dba9 100644
--- a/app-editors/pico/ChangeLog
+++ b/app-editors/pico/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for app-editors/pico
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/pico/ChangeLog,v 1.5 2002/12/13 10:56:06 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/pico/ChangeLog,v 1.6 2003/01/06 10:41:54 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *pico-0.0.1 (09 June 2002)
 
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> pico-0.0.1.ebuild :
+
+  PROVIDE virtual/editor
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
   06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
   Updated keywords, * is depreciated
 
diff --git a/app-editors/pico/pico-0.0.1.ebuild b/app-editors/pico/pico-0.0.1.ebuild
index ef8d559b045e..bc2a47d9d3a6 100644
--- a/app-editors/pico/pico-0.0.1.ebuild
+++ b/app-editors/pico/pico-0.0.1.ebuild
@@ -1,13 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/pico/pico-0.0.1.ebuild,v 1.5 2002/12/09 04:17:40 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/pico/pico-0.0.1.ebuild,v 1.6 2003/01/06 10:41:54 seemant Exp $
 
 HOMEPAGE="http://www.washington.edu/pine"
 DESCRIPTION="Pico text editor"
-LICENSE="as-is"
+
 SLOT="0"
+LICENSE="as-is"
 KEYWORDS="x86 ppc sparc "
 
+DEPEND="virtual/glibc"
+
+PROVIDE="virtual/editor"
+
 pkg_setup () {
 	einfo "There is no real Pico here."
 	einfo ""
diff --git a/app-editors/vi/ChangeLog b/app-editors/vi/ChangeLog
index 6de3d1b4d78d..34ed81f30e89 100644
--- a/app-editors/vi/ChangeLog
+++ b/app-editors/vi/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for app-editors/vi
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/ChangeLog,v 1.9 2002/12/13 10:56:06 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/ChangeLog,v 1.10 2003/01/06 10:41:54 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *vi-3.7-r3 (05 Sep 2002)
 
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  PROVIDE virtual/editor
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   05 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
   Add libtermcap-compat to DEPEND.
 
diff --git a/app-editors/vi/vi-3.7-r2.ebuild b/app-editors/vi/vi-3.7-r2.ebuild
index 7096435d0ea5..248ca81e9577 100644
--- a/app-editors/vi/vi-3.7-r2.ebuild
+++ b/app-editors/vi/vi-3.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7-r2.ebuild,v 1.5 2002/12/09 04:17:41 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7-r2.ebuild,v 1.6 2003/01/06 10:41:54 seemant Exp $
 
 MY_P=ex-020403
 S=${WORKDIR}/${MY_P}
@@ -13,7 +13,9 @@ LICENSE="Caldera"
 SLOT="0"
 KEYWORDS="x86 ppc sparc "
 
-DEPEND="virtual/glibc sys-libs/ncurses"
+DEPEND="sys-libs/ncurses"
+
+PROVIDE="virtual/editor"
 
 src_compile() {
 	addpredict /dev/ptys/*
diff --git a/app-editors/vi/vi-3.7-r3.ebuild b/app-editors/vi/vi-3.7-r3.ebuild
index 7a4150c5eb8a..c5e29c447502 100644
--- a/app-editors/vi/vi-3.7-r3.ebuild
+++ b/app-editors/vi/vi-3.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7-r3.ebuild,v 1.4 2002/12/09 04:17:41 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vi/vi-3.7-r3.ebuild,v 1.5 2003/01/06 10:41:54 seemant Exp $
 
 # NOTE: vi needs /etc/termcap to function properly with TERM=linux.
 
@@ -14,10 +14,11 @@ LICENSE="Caldera"
 SLOT="0"
 KEYWORDS="x86 ppc sparc "
 
-DEPEND="virtual/glibc
-	sys-libs/ncurses
+DEPEND="sys-libs/ncurses
 	sys-libs/libtermcap-compat"
 
+PROVIDE="virtual/editor"
+
 src_compile() {
 	addpredict /dev/ptys/*
 
diff --git a/app-editors/vile/ChangeLog b/app-editors/vile/ChangeLog
index e51c61cac3b8..2293ab7877a3 100644
--- a/app-editors/vile/ChangeLog
+++ b/app-editors/vile/ChangeLog
@@ -1,15 +1,19 @@
 # ChangeLog for app-editors/vile
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/ChangeLog,v 1.6 2002/12/27 17:18:11 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/ChangeLog,v 1.7 2003/01/06 10:41:54 seemant Exp $
+
+
+*vile-9.3h (22 Dec 2002)
+
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  PROVIDE virtual/editor
 
   27 Dec 2002; Michael Cummings <mcummings@gentoo.org> :
   vile-9.3h.ebuild:
 
   Unmasking for x86 - this version works with perl 5.8, now unmasked.
     
-
-*vile-9.3h (22 Dec 2002)
-
   22 Dec 2002; Michael Cummings <mcummings@gentoo.org> :
   vile-9.3h.ebuild:
 
diff --git a/app-editors/vile/vile-9.2p.ebuild b/app-editors/vile/vile-9.2p.ebuild
index 7bccff2f3942..bb4d0df7929c 100644
--- a/app-editors/vile/vile-9.2p.ebuild
+++ b/app-editors/vile/vile-9.2p.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.2p.ebuild,v 1.8 2002/12/09 04:17:41 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.2p.ebuild,v 1.9 2003/01/06 10:41:54 seemant Exp $
 
 IUSE="perl"
 
@@ -25,13 +25,11 @@ SRC_URI="ftp://ftp.phred.org/pub/vile/vile-9.2.tgz
 	ftp://ftp.phred.org/pub/vile/patches/vile-9.2p.patch.gz"
 HOMEPAGE="http://invisible-island.net/vile/"
 
-DEPEND="virtual/glibc
-	sys-devel/flex
+DEPEND="sys-devel/flex
 	>=sys-libs/ncurses-5.2
 	perl? ( sys-devel/perl )"
 
-RDEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2"
+PROVIDE="virtual/editor"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-editors/vile/vile-9.2r.ebuild b/app-editors/vile/vile-9.2r.ebuild
index b97ab925baef..6c4b2efc016f 100644
--- a/app-editors/vile/vile-9.2r.ebuild
+++ b/app-editors/vile/vile-9.2r.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.2r.ebuild,v 1.8 2002/12/22 18:34:32 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.2r.ebuild,v 1.9 2003/01/06 10:41:54 seemant Exp $
 
 IUSE="perl"
 
@@ -27,13 +27,13 @@ SRC_URI="ftp://ftp.phred.org/pub/vile/vile-9.2.tgz
 	ftp://ftp.phred.org/pub/vile/patches/vile-9.2r.patch.gz"
 HOMEPAGE="http://invisible-island.net/vile/"
 
-DEPEND="virtual/glibc
-	sys-devel/flex
+DEPEND="sys-devel/flex
 	>=sys-libs/ncurses-5.2
 	perl? ( <sys-devel/perl-5.8.0 )"
 
-RDEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2"
+RDEPEND=">=sys-libs/ncurses-5.2"
+
+PROVIDE="virtual/editor"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-editors/vile/vile-9.2z.ebuild b/app-editors/vile/vile-9.2z.ebuild
index 54872058fc3c..1b33a2fc755d 100644
--- a/app-editors/vile/vile-9.2z.ebuild
+++ b/app-editors/vile/vile-9.2z.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.2z.ebuild,v 1.2 2002/12/09 04:17:41 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.2z.ebuild,v 1.3 2003/01/06 10:41:54 seemant Exp $
 
 IUSE="perl"
 
@@ -39,10 +39,11 @@ HOMEPAGE="http://www.clark.net/pub/dickey/vile/vile.html"
 DEPEND="${RDEPEND}
 	sys-devel/flex"
 
-RDEPEND="virtual/glibc
- 	>=sys-libs/ncurses-5.2
+RDEPEND=">=sys-libs/ncurses-5.2
  	perl? ( sys-devel/perl )"
 
+PROVIDE="virtual/editor"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc "
diff --git a/app-editors/vile/vile-9.3h.ebuild b/app-editors/vile/vile-9.3h.ebuild
index d8457ecf3ef2..a17eb06af9ee 100644
--- a/app-editors/vile/vile-9.3h.ebuild
+++ b/app-editors/vile/vile-9.3h.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.3h.ebuild,v 1.2 2002/12/27 17:18:11 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.3h.ebuild,v 1.3 2003/01/06 10:41:54 seemant Exp $
 
 IUSE="perl"
 
@@ -21,10 +21,11 @@ HOMEPAGE="http://www.clark.net/pub/dickey/vile/vile.html"
 DEPEND="${RDEPEND}
 	sys-devel/flex"
 
-RDEPEND="virtual/glibc
- 	>=sys-libs/ncurses-5.2
+RDEPEND=">=sys-libs/ncurses-5.2
  	perl? ( sys-devel/perl )"
 
+PROVIDE="virtual/editor"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 212c88613921..516c70dc389d 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for app-editors/vim
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.34 2002/12/16 21:15:48 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.35 2003/01/06 10:41:54 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *vim-6.1-r17.ebuild (06 Dec 2002)
 
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  PROVIDE=virtual/editor
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   16 Dec 2002; Ryan Phillips <rphillips@gentoo.org> vim-6.1-r17.ebuild :
   Added sandbox violation fix. Fixes #10049. Submitted by Leonardo Boshell.
 
diff --git a/app-editors/vim/files/digest-vim-6.1-r10 b/app-editors/vim/files/digest-vim-6.1-r10
deleted file mode 100644
index db4e9cbae0be..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 47bca33d09261779066fe4dac36a1896 vimpatch-1-146.tar.bz2 107280
diff --git a/app-editors/vim/files/digest-vim-6.1-r11 b/app-editors/vim/files/digest-vim-6.1-r11
deleted file mode 100644
index db4e9cbae0be..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r11
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 47bca33d09261779066fe4dac36a1896 vimpatch-1-146.tar.bz2 107280
diff --git a/app-editors/vim/files/digest-vim-6.1-r12 b/app-editors/vim/files/digest-vim-6.1-r12
deleted file mode 100644
index db4e9cbae0be..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 47bca33d09261779066fe4dac36a1896 vimpatch-1-146.tar.bz2 107280
diff --git a/app-editors/vim/files/digest-vim-6.1-r13 b/app-editors/vim/files/digest-vim-6.1-r13
deleted file mode 100644
index db4e9cbae0be..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r13
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 47bca33d09261779066fe4dac36a1896 vimpatch-1-146.tar.bz2 107280
diff --git a/app-editors/vim/files/digest-vim-6.1-r14 b/app-editors/vim/files/digest-vim-6.1-r14
deleted file mode 100644
index 6dc32bfc2c5c..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r14
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 cbbec4728fcee63ce994339340e4769b vimpatch-1-200.tar.bz2 152558
diff --git a/app-editors/vim/files/digest-vim-6.1-r7 b/app-editors/vim/files/digest-vim-6.1-r7
deleted file mode 100644
index db4a28a83cb1..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
diff --git a/app-editors/vim/files/digest-vim-6.1-r8 b/app-editors/vim/files/digest-vim-6.1-r8
deleted file mode 100644
index db4a28a83cb1..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
diff --git a/app-editors/vim/files/digest-vim-6.1-r9 b/app-editors/vim/files/digest-vim-6.1-r9
deleted file mode 100644
index 6d79c8d46d12..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 2461430c2ca19a7ec2d6e2edcda567d1 vimpatch-1-142.tar.bz2 187947
diff --git a/app-editors/vim/vim-6.1-r10.ebuild b/app-editors/vim/vim-6.1-r10.ebuild
deleted file mode 100644
index af022d5649d4..000000000000
--- a/app-editors/vim/vim-6.1-r10.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r10.ebuild,v 1.9 2002/12/15 10:44:10 bjb Exp $
-
-IUSE="gpm nls gnome python X gtk ruby perl"
-
-# Please name the ebuild as follows.  If this is followed, there
-# should be no need to modify this ebuild when the Vim version is
-# updated.  (Yes it's overkill, but it was fun!)
-#
-#   vim-6.0, when 6.0 is finally released
-#   vim-6.0_pre9, where 9 = (i), for vim-6.0i
-#   vim-6.0_pre47, where 47 = 26(a) + 21(u), for vim-6.0au
-#   vim-6.0_pre72, where 72 = 52(b) + 20(t), for vim-6.0bt
-#
-# Quick reference:
-#   a=1   e=5   i=9   m=13  q=17  u=21  y=25
-#   b=2   f=6   j=10  n=14  r=18  v=22  z=26
-#   c=3   g=7   k=11  o=15  s=19  w=23 aa=27
-#   d=4   h=8   l=12  p=16  t=20  x=24 ab=28 (etc.)
-#
-# (08 Sep 2001 agriffis)
-
-# Calculate the version based on the name of the ebuild
-vim_version="${PV%_pre*}"
-vim_pre="${PV##*_pre}"
-VIMPATCH="vimpatch-1-146.tar.bz2"
-
-if [ "$vim_version" = "$vim_pre" ]; then
-	# Final releases prior to 6.0 include a dash and decimal point in
-	# the directory name
-	if [ "${vim_version%%.*}" -lt 6 ]; then
-		S="$WORKDIR/vim-$vim_version"
-	else
-		S="$WORKDIR/vim${vim_version//.}"
-	fi
-	vim_letters=
-	A="vim-$vim_version.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-elif [ "$vim_pre" -lt 27 ]; then
-	# Handle (prerelease) versions with one trailing letter
-	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-
-elif [ "$vim_pre" -lt 703 ]; then
-	# Handle (prerelease) versions with two trailing letters
-	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-else
-	die "Eek!  I don't know how to interpret the version!"
-fi
-
-DESCRIPTION="Vi IMproved!"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	gnome?	( gnome-base/gnome-libs )
-	gtk?	( =x11-libs/gtk+-1.2* )
-	X?		( x11-base/xfree )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-# It appears that the tclinterp stuff in Vim is broken right now (at
-# least on Linux... it works on BSD).  When you --enable-tclinterp
-# flag, then the following command never returns:
-#
-#   VIMINIT='let OS = system("uname -s")' vim
-#
-# Please don't re-enable the tclinterp flag without verifying first
-# that the above works.  Thanks.  (08 Sep 2001 agriffis)
-
-
-src_unpack() {
-	unpack ${A}
-	# Fixup a script to use awk instead of nawk
-	cd ${S}/runtime/tools
-	mv mve.awk mve.awk.old
-	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
-	# Another set of patch's borrowed from src rpm to fix syntax error's etc.
-	cd ${WORKDIR}
-	tar xvjf  ${FILESDIR}/vimpatch.tar.bz2 
-	cd $S
-	patch -p1 < ${WORKDIR}/vim-4.2-speed_t.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.1-vimnotvi.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.6a-paths.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-fixkeys.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-gcc31.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-specsyntax.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0r-crv.patch || die
-			
-	cd ${WORKDIR}
-	tar xvjf ${DISTDIR}/${VIMPATCH}
-	cd ${S}
-	
-	# Apply any patches available for this version
-	local patches=`echo ${WORKDIR}/${PV}.[0-9][0-9][0-9]`
-	case "$patches" in
-		*\]) 
-			;; # globbing didn't work; no patches available
-		*)
-			cd $S
-			for a in $patches; do
-				patch -p0 < $a
-			done
-			;;
-	esac
-	
-	# Also apply the ebuild syntax patch, until this is in Vim proper
-	cd $S/runtime
-	patch -f -p0 < ${FILESDIR}/ebuild.patch
-
-}
-
-src_compile() {
-	local myconf
-	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-
-	#
-	# First, build a gui version, this will install as /usr/bin/gvim
-	#
-	if use gnome; then
-		guiconf="--enable-gui=gnome --with-x"
-	elif use gtk; then
-		guiconf="--enable-gui=gtk --with-x"
-	elif use X; then
-		guiconf="--enable-gui=athena --with-x"
-	else
-		# No gui version will be built
-		guiconf=""
-	fi
-	
-	# This should fix a sandbox violation. 
-	addwrite /dev/pty/*
-	
-	if [ -n "$guiconf" ]; then
-		./configure \
-			--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-			--with-features=huge --enable-cscope $myconf $guiconf \
-			|| die "gvim configure failed"
-		# Parallel make does not work
-		make || die "gvim make failed"
-		mv src/vim src/gvim
-	fi
-
-	#
-	# Second, build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --with-cscope $myconf \
-		--enable-gui=no \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	# Install the nogui version
-	mkdir -p $D/usr/{bin,share/man/man1,share/vim}
-	make install STRIP=true DESTDIR=$D \
-		BINDIR=/usr/bin MANDIR=/usr/share/man DATADIR=/usr/share
-	# Install the gui version, if it was built
-	if [ -f src/gvim ]; then
-		install -m755 src/gvim $D/usr/bin/gvim
-		ln -s gvim $D/usr/bin/gvimdiff
-	fi
-	# Docs
-	dodoc README*
-	cd $D/usr/share/doc/$PF
-	ln -s ../../vim/*/doc $P
-	# Default vimrc and gvimrc (who cares if gvim wasn't built)
-	insinto /usr/share/vim
-	doins ${FILESDIR}/vimrc ${FILESDIR}/gvimrc
-
-	#fix problems with vim not finding its data files.
-	dodir /etc/env.d
-	echo "VIMRUNTIME=/usr/share/vim/vim${vim_version/.}" \
-		>${D}/etc/env.d/40vim
-}
diff --git a/app-editors/vim/vim-6.1-r11.ebuild b/app-editors/vim/vim-6.1-r11.ebuild
deleted file mode 100644
index ac9bb33ffa07..000000000000
--- a/app-editors/vim/vim-6.1-r11.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r11.ebuild,v 1.6 2002/12/15 10:44:10 bjb Exp $
-
-IUSE="python gpm nls ruby perl"
-
-# Please name the ebuild as follows.  If this is followed, there
-# should be no need to modify this ebuild when the Vim version is
-# updated.  (Yes it's overkill, but it was fun!)
-#
-#   vim-6.0, when 6.0 is finally released
-#   vim-6.0_pre9, where 9 = (i), for vim-6.0i
-#   vim-6.0_pre47, where 47 = 26(a) + 21(u), for vim-6.0au
-#   vim-6.0_pre72, where 72 = 52(b) + 20(t), for vim-6.0bt
-#
-# Quick reference:
-#   a=1   e=5   i=9   m=13  q=17  u=21  y=25
-#   b=2   f=6   j=10  n=14  r=18  v=22  z=26
-#   c=3   g=7   k=11  o=15  s=19  w=23 aa=27
-#   d=4   h=8   l=12  p=16  t=20  x=24 ab=28 (etc.)
-#
-# (08 Sep 2001 agriffis)
-
-# Calculate the version based on the name of the ebuild
-vim_version="${PV%_pre*}"
-vim_pre="${PV##*_pre}"
-VIMPATCH="vimpatch-1-146.tar.bz2"
-
-if [ "$vim_version" = "$vim_pre" ]; then
-	# Final releases prior to 6.0 include a dash and decimal point in
-	# the directory name
-	if [ "${vim_version%%.*}" -lt 6 ]; then
-		S="$WORKDIR/vim-$vim_version"
-	else
-		S="$WORKDIR/vim${vim_version//.}"
-	fi
-	vim_letters=
-	A="vim-$vim_version.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-elif [ "$vim_pre" -lt 27 ]; then
-	# Handle (prerelease) versions with one trailing letter
-	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-
-elif [ "$vim_pre" -lt 703 ]; then
-	# Handle (prerelease) versions with two trailing letters
-	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-else
-	die "Eek!  I don't know how to interpret the version!"
-fi
-
-DESCRIPTION="Vi IMproved!"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="=app-editors/vim-core-6.1
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-# It appears that the tclinterp stuff in Vim is broken right now (at
-# least on Linux... it works on BSD).  When you --enable-tclinterp
-# flag, then the following command never returns:
-#
-#   VIMINIT='let OS = system("uname -s")' vim
-#
-# Please don't re-enable the tclinterp flag without verifying first
-# that the above works.  Thanks.  (08 Sep 2001 agriffis)
-
-
-src_unpack() {
-	unpack ${A}
-	# Fixup a script to use awk instead of nawk
-	cd ${S}/runtime/tools
-	mv mve.awk mve.awk.old
-	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
-	# Another set of patch's borrowed from src rpm to fix syntax error's etc.
-	cd ${WORKDIR}
-	tar xvjf  ${FILESDIR}/vimpatch.tar.bz2 
-	cd $S
-	patch -p1 < ${WORKDIR}/vim-4.2-speed_t.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.1-vimnotvi.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.6a-paths.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-fixkeys.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-gcc31.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-specsyntax.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0r-crv.patch || die
-			
-	cd ${WORKDIR}
-	tar xvjf ${DISTDIR}/${VIMPATCH}
-	cd ${S}
-	
-	# Apply any patches available for this version
-	local patches=`echo ${WORKDIR}/${PV}.[0-9][0-9][0-9]`
-	case "$patches" in
-		*\]) 
-			;; # globbing didn't work; no patches available
-		*)
-			cd $S
-			for a in $patches; do
-				patch -p0 < $a
-			done
-			;;
-	esac
-}
-
-src_compile() {
-
-	local myconf
-	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-
-	# This should fix a sandbox violation. 
-	addwrite /dev/pty/*
-	
-	#
-	# Build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --with-cscope $myconf \
-		--enable-gui=no \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	dobin src/vim
-	ln -s vimdiff ${D}/usr/bin/vimdiff
-	# Default vimrc
-	insinto /usr/share/vim
-	doins ${FILESDIR}/vimrc
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
-}
diff --git a/app-editors/vim/vim-6.1-r12.ebuild b/app-editors/vim/vim-6.1-r12.ebuild
deleted file mode 100644
index 89fc00fb17d8..000000000000
--- a/app-editors/vim/vim-6.1-r12.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r12.ebuild,v 1.7 2002/12/15 10:44:10 bjb Exp $
-
-IUSE="python gpm nls ruby perl"
-
-# Please name the ebuild as follows.  If this is followed, there
-# should be no need to modify this ebuild when the Vim version is
-# updated.  (Yes it's overkill, but it was fun!)
-#
-#   vim-6.0, when 6.0 is finally released
-#   vim-6.0_pre9, where 9 = (i), for vim-6.0i
-#   vim-6.0_pre47, where 47 = 26(a) + 21(u), for vim-6.0au
-#   vim-6.0_pre72, where 72 = 52(b) + 20(t), for vim-6.0bt
-#
-# Quick reference:
-#   a=1   e=5   i=9   m=13  q=17  u=21  y=25
-#   b=2   f=6   j=10  n=14  r=18  v=22  z=26
-#   c=3   g=7   k=11  o=15  s=19  w=23 aa=27
-#   d=4   h=8   l=12  p=16  t=20  x=24 ab=28 (etc.)
-#
-# (08 Sep 2001 agriffis)
-
-# Calculate the version based on the name of the ebuild
-vim_version="${PV%_pre*}"
-vim_pre="${PV##*_pre}"
-VIMPATCH="vimpatch-1-146.tar.bz2"
-
-if [ "$vim_version" = "$vim_pre" ]; then
-	# Final releases prior to 6.0 include a dash and decimal point in
-	# the directory name
-	if [ "${vim_version%%.*}" -lt 6 ]; then
-		S="$WORKDIR/vim-$vim_version"
-	else
-		S="$WORKDIR/vim${vim_version//.}"
-	fi
-	vim_letters=
-	A="vim-$vim_version.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-elif [ "$vim_pre" -lt 27 ]; then
-	# Handle (prerelease) versions with one trailing letter
-	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-
-elif [ "$vim_pre" -lt 703 ]; then
-	# Handle (prerelease) versions with two trailing letters
-	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-else
-	die "Eek!  I don't know how to interpret the version!"
-fi
-
-DESCRIPTION="Vi IMproved!"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="=app-editors/vim-core-6.1
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-# It appears that the tclinterp stuff in Vim is broken right now (at
-# least on Linux... it works on BSD).  When you --enable-tclinterp
-# flag, then the following command never returns:
-#
-#   VIMINIT='let OS = system("uname -s")' vim
-#
-# Please don't re-enable the tclinterp flag without verifying first
-# that the above works.  Thanks.  (08 Sep 2001 agriffis)
-
-
-src_unpack() {
-	unpack ${A}
-	# Fixup a script to use awk instead of nawk
-	cd ${S}/runtime/tools
-	mv mve.awk mve.awk.old
-	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
-	# Another set of patch's borrowed from src rpm to fix syntax error's etc.
-	cd ${WORKDIR}
-	tar xvjf  ${FILESDIR}/vimpatch.tar.bz2 
-	cd $S
-	patch -p1 < ${WORKDIR}/vim-4.2-speed_t.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.1-vimnotvi.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.6a-paths.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-fixkeys.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-gcc31.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-specsyntax.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0r-crv.patch || die
-			
-	cd ${WORKDIR}
-	tar xvjf ${DISTDIR}/${VIMPATCH}
-	cd ${S}
-	
-	# Apply any patches available for this version
-	local patches=`echo ${WORKDIR}/${PV}.[0-9][0-9][0-9]`
-	case "$patches" in
-		*\]) 
-			;; # globbing didn't work; no patches available
-		*)
-			cd $S
-			for a in $patches; do
-				patch -p0 < $a
-			done
-			;;
-	esac
-}
-
-src_compile() {
-
-	local myconf
-	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-
-	# This should fix a sandbox violation. 
-	addwrite "${SSH_TTY}"
-	
-	#
-	# Build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --with-cscope $myconf \
-		--enable-gui=no \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	dobin src/vim
-	ln -s vim ${D}/usr/bin/vimdiff
-	# Default vimrc
-	insinto /usr/share/vim
-	doins ${FILESDIR}/vimrc
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
-}
diff --git a/app-editors/vim/vim-6.1-r13.ebuild b/app-editors/vim/vim-6.1-r13.ebuild
deleted file mode 100644
index a5d18851adcd..000000000000
--- a/app-editors/vim/vim-6.1-r13.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r13.ebuild,v 1.5 2002/12/15 10:44:10 bjb Exp $
-
-IUSE="python gpm nls ruby perl"
-
-# Please name the ebuild as follows.  If this is followed, there
-# should be no need to modify this ebuild when the Vim version is
-# updated.  (Yes it's overkill, but it was fun!)
-#
-#   vim-6.0, when 6.0 is finally released
-#   vim-6.0_pre9, where 9 = (i), for vim-6.0i
-#   vim-6.0_pre47, where 47 = 26(a) + 21(u), for vim-6.0au
-#   vim-6.0_pre72, where 72 = 52(b) + 20(t), for vim-6.0bt
-#
-# Quick reference:
-#   a=1   e=5   i=9   m=13  q=17  u=21  y=25
-#   b=2   f=6   j=10  n=14  r=18  v=22  z=26
-#   c=3   g=7   k=11  o=15  s=19  w=23 aa=27
-#   d=4   h=8   l=12  p=16  t=20  x=24 ab=28 (etc.)
-#
-# (08 Sep 2001 agriffis)
-
-set -e
-
-# Calculate the version based on the name of the ebuild
-vim_version="${PV%_pre*}"
-vim_pre="${PV##*_pre}"
-VIMPATCH="vimpatch-1-146.tar.bz2"
-
-if [ "$vim_version" = "$vim_pre" ]; then
-	# Final releases prior to 6.0 include a dash and decimal point in
-	# the directory name
-	if [ "${vim_version%%.*}" -lt 6 ]; then
-		S="$WORKDIR/vim-$vim_version"
-	else
-		S="$WORKDIR/vim${vim_version//.}"
-	fi
-	vim_letters=
-	A="vim-$vim_version.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-elif [ "$vim_pre" -lt 27 ]; then
-	# Handle (prerelease) versions with one trailing letter
-	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-
-elif [ "$vim_pre" -lt 703 ]; then
-	# Handle (prerelease) versions with two trailing letters
-	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-else
-	die "Eek!  I don't know how to interpret the version!"
-fi
-
-DESCRIPTION="Vi IMproved!"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="=app-editors/vim-core-6.1
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-# It appears that the tclinterp stuff in Vim is broken right now (at
-# least on Linux... it works on BSD).  When you --enable-tclinterp
-# flag, then the following command never returns:
-#
-#   VIMINIT='let OS = system("uname -s")' vim
-#
-# Please don't re-enable the tclinterp flag without verifying first
-# that the above works.  Thanks.  (08 Sep 2001 agriffis)
-
-
-src_unpack() {
-	unpack ${A}
-	# Fixup a script to use awk instead of nawk
-	cd ${S}/runtime/tools
-	mv mve.awk mve.awk.old
-	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
-	# Another set of patch's borrowed from src rpm to fix syntax error's etc.
-	cd ${WORKDIR}
-	tar xvjf  ${FILESDIR}/vimpatch.tar.bz2 
-	cd $S
-	patch -p1 < ${WORKDIR}/vim-4.2-speed_t.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.1-vimnotvi.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.6a-paths.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-fixkeys.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-gcc31.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-specsyntax.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0r-crv.patch || die
-			
-	cd ${WORKDIR}
-	tar xvjf ${DISTDIR}/${VIMPATCH}
-	cd ${S}
-
-	if test -f ${WORKDIR}/6.1.080; then rm -f ${WORKDIR}/6.1.080; fi
-	if test -f ${WORKDIR}/6.1.084; then rm -f ${WORKDIR}/6.1.084; fi
-	# Apply any patches available for this version
-	local patches=`echo ${WORKDIR}/${PV}.[0-9][0-9][0-9]`
-	case "$patches" in
-		*\]) 
-			;; # globbing didn't work; no patches available
-		*)
-			cd $S
-			for a in $patches; do
-				echo -n "Applying patch $a..."
-				patch -p0 < $a > /dev/null || die
-				echo "OK"
-			done
-			;;
-	esac
-	patch -p0 < ${FILESDIR}/6.1_patches.80.84.diff || die
-}
-
-src_compile() {
-	local myconf
-	myconf="--without-x"
-	use nls    && myconf="$myconf --enable-multibyte"
-	use nls    || myconf="$myconf --disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-
-	# This should fix a sandbox violation. 
-	addwrite "${SSH_TTY}"
-	
-	#
-	# Build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --with-cscope $myconf \
-		--enable-gui=no \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	dobin src/vim
-	ln -s vim ${D}/usr/bin/vimdiff
-	# Default vimrc
-	insinto /usr/share/vim
-	doins ${FILESDIR}/vimrc
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
-}
diff --git a/app-editors/vim/vim-6.1-r14.ebuild b/app-editors/vim/vim-6.1-r14.ebuild
deleted file mode 100644
index 0422bf1df136..000000000000
--- a/app-editors/vim/vim-6.1-r14.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r14.ebuild,v 1.6 2002/12/15 10:44:10 bjb Exp $
-
-IUSE="python gpm nls ruby perl"
-
-# Please name the ebuild as follows.  If this is followed, there
-# should be no need to modify this ebuild when the Vim version is
-# updated.  (Yes it's overkill, but it was fun!)
-#
-#   vim-6.0, when 6.0 is finally released
-#   vim-6.0_pre9, where 9 = (i), for vim-6.0i
-#   vim-6.0_pre47, where 47 = 26(a) + 21(u), for vim-6.0au
-#   vim-6.0_pre72, where 72 = 52(b) + 20(t), for vim-6.0bt
-#
-# Quick reference:
-#   a=1   e=5   i=9   m=13  q=17  u=21  y=25
-#   b=2   f=6   j=10  n=14  r=18  v=22  z=26
-#   c=3   g=7   k=11  o=15  s=19  w=23 aa=27
-#   d=4   h=8   l=12  p=16  t=20  x=24 ab=28 (etc.)
-#
-# (08 Sep 2001 agriffis)
-
-set -e
-
-# Calculate the version based on the name of the ebuild
-vim_version="${PV%_pre*}"
-vim_pre="${PV##*_pre}"
-VIMPATCH="vimpatch-1-200.tar.bz2"
-
-if [ "$vim_version" = "$vim_pre" ]; then
-	# Final releases prior to 6.0 include a dash and decimal point in
-	# the directory name
-	if [ "${vim_version%%.*}" -lt 6 ]; then
-		S="$WORKDIR/vim-$vim_version"
-	else
-		S="$WORKDIR/vim${vim_version//.}"
-	fi
-	vim_letters=
-	A="vim-$vim_version.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-elif [ "$vim_pre" -lt 27 ]; then
-	# Handle (prerelease) versions with one trailing letter
-	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-
-elif [ "$vim_pre" -lt 703 ]; then
-	# Handle (prerelease) versions with two trailing letters
-	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-else
-	die "Eek!  I don't know how to interpret the version!"
-fi
-
-DESCRIPTION="Vi IMproved!"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="app-editors/vim-core
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-# It appears that the tclinterp stuff in Vim is broken right now (at
-# least on Linux... it works on BSD).  When you --enable-tclinterp
-# flag, then the following command never returns:
-#
-#   VIMINIT='let OS = system("uname -s")' vim
-#
-# Please don't re-enable the tclinterp flag without verifying first
-# that the above works.  Thanks.  (08 Sep 2001 agriffis)
-
-
-src_unpack() {
-	unpack ${A}
-	# Fixup a script to use awk instead of nawk
-	cd ${S}/runtime/tools
-	mv mve.awk mve.awk.old
-	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
-	# Another set of patch's borrowed from src rpm to fix syntax error's etc.
-	cd ${WORKDIR}
-	tar xvjf  ${FILESDIR}/vimpatch.tar.bz2 
-	cd $S
-	patch -p1 < ${WORKDIR}/vim-4.2-speed_t.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.1-vimnotvi.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.6a-paths.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-fixkeys.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-specsyntax.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0r-crv.patch || die
-			
-	cd ${WORKDIR}
-	tar xvjf ${DISTDIR}/${VIMPATCH}
-	cd ${S}
-
-	# Apply any patches available for this version
-	local patches=`echo ${WORKDIR}/${PV}.[0-9][0-9][0-9]`
-	case "$patches" in
-		*\]) 
-			;; # globbing didn't work; no patches available
-		*)
-			cd $S
-			for a in $patches; do
-				echo -n "Applying patch $a..."
-				patch -p0 < $a > /dev/null || die
-				echo "OK"
-			done
-			;;
-	esac
-}
-
-src_compile() {
-	local myconf
-	myconf="--without-x"
-	use nls    && myconf="$myconf --enable-multibyte"
-	use nls    || myconf="$myconf --disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-
-	# This should fix a sandbox violation. 
-	addwrite "${SSH_TTY}"
-	
-	#
-	# Build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --with-cscope $myconf \
-		--enable-gui=no \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	dobin src/vim
-	ln -s vim ${D}/usr/bin/vimdiff
-	# Default vimrc
-	insinto /usr/share/vim
-	doins ${FILESDIR}/vimrc
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
-}
diff --git a/app-editors/vim/vim-6.1-r15.ebuild b/app-editors/vim/vim-6.1-r15.ebuild
index adcb2f34f7b2..5118584ab480 100644
--- a/app-editors/vim/vim-6.1-r15.ebuild
+++ b/app-editors/vim/vim-6.1-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r15.ebuild,v 1.5 2002/12/15 10:44:10 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r15.ebuild,v 1.6 2003/01/06 10:41:54 seemant Exp $
 
 # Please name the ebuild as follows.  If this is followed, there
 # should be no need to modify this ebuild when the Vim version is
@@ -86,6 +86,8 @@ DEPEND="app-editors/vim-core
 # that the above works.  Thanks.  (08 Sep 2001 agriffis)
 
 
+PROVIDE="virtual/editor"
+
 src_unpack() {
 	unpack ${A}
 	# Fixup a script to use awk instead of nawk
diff --git a/app-editors/vim/vim-6.1-r16.ebuild b/app-editors/vim/vim-6.1-r16.ebuild
index b5be5f7f6cb1..3514d45bf29d 100644
--- a/app-editors/vim/vim-6.1-r16.ebuild
+++ b/app-editors/vim/vim-6.1-r16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r16.ebuild,v 1.7 2002/12/15 10:44:10 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r16.ebuild,v 1.8 2003/01/06 10:41:54 seemant Exp $
 
 VIMPATCH="vimpatch-1-245.tar.bz2"
 inherit vim
@@ -17,6 +17,9 @@ DEPEND="app-editors/vim-core
 	ruby?	( >=dev-lang/ruby-1.6.4 )"
 #	tcltk?	( dev-lang/tcl )"
 
+
+PROVIDE="virtual/editor"
+
 src_compile() {
 	local myconf
 	myconf="--without-x"
diff --git a/app-editors/vim/vim-6.1-r17.ebuild b/app-editors/vim/vim-6.1-r17.ebuild
index f1122c608d8b..d053c0b5f67b 100644
--- a/app-editors/vim/vim-6.1-r17.ebuild
+++ b/app-editors/vim/vim-6.1-r17.ebuild
@@ -1,6 +1,8 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r17.ebuild,v 1.12 2002/12/27 17:38:35 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r17.ebuild,v 1.13 2003/01/06 10:41:54 seemant Exp $
+
+IUSE="nls perl python ruby tcltk gpm X"
 
 VIMPATCH="vimpatch-1-263.tar.bz2"
 inherit vim
@@ -16,7 +18,8 @@ DEPEND="app-editors/vim-core
 	python? ( dev-lang/python )
 	ruby?	( >=dev-lang/ruby-1.6.4 )"
 #	tcltk?	( dev-lang/tcl )"
-IUSE="nls perl python ruby tcltk gpm X"
+
+PROVIDE="virtual/editor"
 
 src_compile() {
 	local myconf
diff --git a/app-editors/vim/vim-6.1-r7.ebuild b/app-editors/vim/vim-6.1-r7.ebuild
deleted file mode 100644
index ce814b88cdb9..000000000000
--- a/app-editors/vim/vim-6.1-r7.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r7.ebuild,v 1.11 2002/12/09 04:17:41 manson Exp $
-
-IUSE="gpm nls gnome python X gtk ruby perl"
-
-# Please name the ebuild as follows.  If this is followed, there
-# should be no need to modify this ebuild when the Vim version is
-# updated.  (Yes it's overkill, but it was fun!)
-#
-#   vim-6.0, when 6.0 is finally released
-#   vim-6.0_pre9, where 9 = (i), for vim-6.0i
-#   vim-6.0_pre47, where 47 = 26(a) + 21(u), for vim-6.0au
-#   vim-6.0_pre72, where 72 = 52(b) + 20(t), for vim-6.0bt
-#
-# Quick reference:
-#   a=1   e=5   i=9   m=13  q=17  u=21  y=25
-#   b=2   f=6   j=10  n=14  r=18  v=22  z=26
-#   c=3   g=7   k=11  o=15  s=19  w=23 aa=27
-#   d=4   h=8   l=12  p=16  t=20  x=24 ab=28 (etc.)
-#
-# (08 Sep 2001 agriffis)
-
-# Calculate the version based on the name of the ebuild
-vim_version="${PV%_pre*}"
-vim_pre="${PV##*_pre}"
-if [ "$vim_version" = "$vim_pre" ]; then
-	# Final releases prior to 6.0 include a dash and decimal point in
-	# the directory name
-	if [ "${vim_version%%.*}" -lt 6 ]; then
-		S="$WORKDIR/vim-$vim_version"
-	else
-		S="$WORKDIR/vim${vim_version//.}"
-	fi
-	vim_letters=
-	A="vim-$vim_version.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unix/$A"
-elif [ "$vim_pre" -lt 27 ]; then
-	# Handle (prerelease) versions with one trailing letter
-	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A"
-elif [ "$vim_pre" -lt 703 ]; then
-	# Handle (prerelease) versions with two trailing letters
-	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A"
-else
-	die "Eek!  I don't know how to interpret the version!"
-fi
-
-DESCRIPTION="Vi IMproved!"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	gnome?	( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	gtk?	( =x11-libs/gtk+-1.2* )
-	X?		( x11-base/xfree )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-# It appears that the tclinterp stuff in Vim is broken right now (at
-# least on Linux... it works on BSD).  When you --enable-tclinterp
-# flag, then the following command never returns:
-#
-#   VIMINIT='let OS = system("uname -s")' vim
-#
-# Please don't re-enable the tclinterp flag without verifying first
-# that the above works.  Thanks.  (08 Sep 2001 agriffis)
-
-
-src_unpack() {
-	unpack $A
-	# Fixup a script to use awk instead of nawk
-	cd $S/runtime/tools
-	mv mve.awk mve.awk.old
-	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
-	# Apply any patches available for this version
-	local patches=`echo $FILESDIR/$PV.[0-9][0-9][0-9]`
-	case "$patches" in
-		*\]) 
-			;; # globbing didn't work; no patches available
-		*)
-			cd $S
-			for a in $patches; do
-				patch -p0 < $a
-			done
-			;;
-	esac
-	# Also apply the ebuild syntax patch, until this is in Vim proper
-	cd $S/runtime
-	patch -f -p0 < ${FILESDIR}/ebuild.patch
-}
-
-src_compile() {
-
-	local myconf
-	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# gpm is broken according to Gentoo bug #1808.  Disabling it for now
-# until somebody complains (how many people actually use vim+gpm?)
-#	use gpm    || myconf="$myconf --disable-gpm"
-	myconf="$myconf --disable-gpm"
-
-	#
-	# First, build a gui version, this will install as /usr/bin/gvim
-	#
-	if use gnome; then
-		guiconf="--enable-gui=gnome --with-x"
-	elif use gtk; then
-		guiconf="--enable-gui=gtk --with-x"
-	elif use X; then
-		guiconf="--enable-gui=athena --with-x"
-	else
-		# No gui version will be built
-		guiconf=""
-	fi
-	if [ -n "$guiconf" ]; then
-		./configure \
-			--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-			--with-features=huge --enable-cscope $myconf $guiconf \
-			|| die "gvim configure failed"
-		# Parallel make does not work
-		make || die "gvim make failed"
-		mv src/vim src/gvim
-	fi
-
-	#
-	# Second, build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --with-cscope $myconf \
-		--enable-gui=no --without-x \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	# Install the nogui version
-	mkdir -p $D/usr/{bin,share/man/man1,share/vim}
-	make install STRIP=true DESTDIR=$D \
-		BINDIR=/usr/bin MANDIR=/usr/share/man DATADIR=/usr/share
-	# Install the gui version, if it was built
-	if [ -f src/gvim ]; then
-		install -m755 src/gvim $D/usr/bin/gvim
-		ln -s gvim $D/usr/bin/gvimdiff
-	fi
-	# Docs
-	dodoc README*
-	cd $D/usr/share/doc/$PF
-	ln -s ../../vim/*/doc $P
-	# Default vimrc and gvimrc (who cares if gvim wasn't built)
-	insinto /usr/share/vim
-	doins ${FILESDIR}/vimrc ${FILESDIR}/gvimrc
-
-	#fix problems with vim not finding its data files.
-	dodir /etc/env.d
-	echo "VIMRUNTIME=/usr/share/vim/vim${vim_version/.}" \
-		>${D}/etc/env.d/40vim
-}
diff --git a/app-editors/vim/vim-6.1-r8.ebuild b/app-editors/vim/vim-6.1-r8.ebuild
deleted file mode 100644
index b8df1d922be2..000000000000
--- a/app-editors/vim/vim-6.1-r8.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r8.ebuild,v 1.11 2002/12/09 04:17:41 manson Exp $
-
-IUSE="gpm nls gnome python X gtk ruby perl"
-
-# Please name the ebuild as follows.  If this is followed, there
-# should be no need to modify this ebuild when the Vim version is
-# updated.  (Yes it's overkill, but it was fun!)
-#
-#   vim-6.0, when 6.0 is finally released
-#   vim-6.0_pre9, where 9 = (i), for vim-6.0i
-#   vim-6.0_pre47, where 47 = 26(a) + 21(u), for vim-6.0au
-#   vim-6.0_pre72, where 72 = 52(b) + 20(t), for vim-6.0bt
-#
-# Quick reference:
-#   a=1   e=5   i=9   m=13  q=17  u=21  y=25
-#   b=2   f=6   j=10  n=14  r=18  v=22  z=26
-#   c=3   g=7   k=11  o=15  s=19  w=23 aa=27
-#   d=4   h=8   l=12  p=16  t=20  x=24 ab=28 (etc.)
-#
-# (08 Sep 2001 agriffis)
-
-# Calculate the version based on the name of the ebuild
-vim_version="${PV%_pre*}"
-vim_pre="${PV##*_pre}"
-if [ "$vim_version" = "$vim_pre" ]; then
-	# Final releases prior to 6.0 include a dash and decimal point in
-	# the directory name
-	if [ "${vim_version%%.*}" -lt 6 ]; then
-		S="$WORKDIR/vim-$vim_version"
-	else
-		S="$WORKDIR/vim${vim_version//.}"
-	fi
-	vim_letters=
-	A="vim-$vim_version.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unix/$A"
-elif [ "$vim_pre" -lt 27 ]; then
-	# Handle (prerelease) versions with one trailing letter
-	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A"
-elif [ "$vim_pre" -lt 703 ]; then
-	# Handle (prerelease) versions with two trailing letters
-	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A"
-else
-	die "Eek!  I don't know how to interpret the version!"
-fi
-
-DESCRIPTION="Vi IMproved!"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	gnome?	( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	gtk?	( =x11-libs/gtk+-1.2* )
-	X?		( x11-base/xfree )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-# It appears that the tclinterp stuff in Vim is broken right now (at
-# least on Linux... it works on BSD).  When you --enable-tclinterp
-# flag, then the following command never returns:
-#
-#   VIMINIT='let OS = system("uname -s")' vim
-#
-# Please don't re-enable the tclinterp flag without verifying first
-# that the above works.  Thanks.  (08 Sep 2001 agriffis)
-
-
-src_unpack() {
-	unpack $A
-	# Fixup a script to use awk instead of nawk
-	cd $S/runtime/tools
-	mv mve.awk mve.awk.old
-	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
-	# Another set of patch's borrowed from src rpm to fix syntax error's etc.
-	cd ${WORKDIR}
-	tar xvjf  ${FILESDIR}/vimpatch.tar.bz2 
-	cd $S
-	patch -p1 < ${WORKDIR}/vim-4.2-speed_t.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.1-vimnotvi.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.6a-paths.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-fixkeys.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-gcc31.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-specsyntax.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0r-crv.patch || die
-											  
-	# Apply any patches available for this version
-	local patches=`echo $FILESDIR/$PV.[0-9][0-9][0-9]`
-	case "$patches" in
-		*\]) 
-			;; # globbing didn't work; no patches available
-		*)
-			cd $S
-			for a in $patches; do
-				patch -p0 < $a
-			done
-			;;
-	esac
-	# Also apply the ebuild syntax patch, until this is in Vim proper
-	cd $S/runtime
-	patch -f -p0 < ${FILESDIR}/ebuild.patch
-}
-
-src_compile() {
-
-	local myconf
-	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-
-	#
-	# First, build a gui version, this will install as /usr/bin/gvim
-	#
-	if use gnome; then
-		guiconf="--enable-gui=gnome --with-x"
-	elif use gtk; then
-		guiconf="--enable-gui=gtk --with-x"
-	elif use X; then
-		guiconf="--enable-gui=athena --with-x"
-	else
-		# No gui version will be built
-		guiconf=""
-	fi
-	
-	# This should fix a sandbox violation. 
-	addwrite /dev/pty/*
-	
-	if [ -n "$guiconf" ]; then
-		./configure \
-			--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-			--with-features=huge --enable-cscope $myconf $guiconf \
-			|| die "gvim configure failed"
-		# Parallel make does not work
-		make || die "gvim make failed"
-		mv src/vim src/gvim
-	fi
-
-	#
-	# Second, build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --with-cscope $myconf \
-		--enable-gui=no --without-x \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	# Install the nogui version
-	mkdir -p $D/usr/{bin,share/man/man1,share/vim}
-	make install STRIP=true DESTDIR=$D \
-		BINDIR=/usr/bin MANDIR=/usr/share/man DATADIR=/usr/share
-	# Install the gui version, if it was built
-	if [ -f src/gvim ]; then
-		install -m755 src/gvim $D/usr/bin/gvim
-		ln -s gvim $D/usr/bin/gvimdiff
-	fi
-	# Docs
-	dodoc README*
-	cd $D/usr/share/doc/$PF
-	ln -s ../../vim/*/doc $P
-	# Default vimrc and gvimrc (who cares if gvim wasn't built)
-	insinto /usr/share/vim
-	doins ${FILESDIR}/vimrc ${FILESDIR}/gvimrc
-
-	#fix problems with vim not finding its data files.
-	dodir /etc/env.d
-	echo "VIMRUNTIME=/usr/share/vim/vim${vim_version/.}" \
-		>${D}/etc/env.d/40vim
-}
diff --git a/app-editors/vim/vim-6.1-r9.ebuild b/app-editors/vim/vim-6.1-r9.ebuild
deleted file mode 100644
index a89bbdd1c58f..000000000000
--- a/app-editors/vim/vim-6.1-r9.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r9.ebuild,v 1.6 2002/12/09 04:17:41 manson Exp $
-
-IUSE="gpm nls gnome python X gtk ruby perl"
-
-# Please name the ebuild as follows.  If this is followed, there
-# should be no need to modify this ebuild when the Vim version is
-# updated.  (Yes it's overkill, but it was fun!)
-#
-#   vim-6.0, when 6.0 is finally released
-#   vim-6.0_pre9, where 9 = (i), for vim-6.0i
-#   vim-6.0_pre47, where 47 = 26(a) + 21(u), for vim-6.0au
-#   vim-6.0_pre72, where 72 = 52(b) + 20(t), for vim-6.0bt
-#
-# Quick reference:
-#   a=1   e=5   i=9   m=13  q=17  u=21  y=25
-#   b=2   f=6   j=10  n=14  r=18  v=22  z=26
-#   c=3   g=7   k=11  o=15  s=19  w=23 aa=27
-#   d=4   h=8   l=12  p=16  t=20  x=24 ab=28 (etc.)
-#
-# (08 Sep 2001 agriffis)
-
-# Calculate the version based on the name of the ebuild
-vim_version="${PV%_pre*}"
-vim_pre="${PV##*_pre}"
-if [ "$vim_version" = "$vim_pre" ]; then
-	# Final releases prior to 6.0 include a dash and decimal point in
-	# the directory name
-	if [ "${vim_version%%.*}" -lt 6 ]; then
-		S="$WORKDIR/vim-$vim_version"
-	else
-		S="$WORKDIR/vim${vim_version//.}"
-	fi
-	vim_letters=
-	A="vim-$vim_version.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/vimpatch-1-142.tar.bz2"
-elif [ "$vim_pre" -lt 27 ]; then
-	# Handle (prerelease) versions with one trailing letter
-	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/vimpatch-1-142.tar.bz2"
-
-elif [ "$vim_pre" -lt 703 ]; then
-	# Handle (prerelease) versions with two trailing letters
-	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/vimpatch-1-142.tar.bz2"
-else
-	die "Eek!  I don't know how to interpret the version!"
-fi
-
-DESCRIPTION="Vi IMproved!"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	gnome?	( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	gtk?	( =x11-libs/gtk+-1.2* )
-	X?		( x11-base/xfree )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-# It appears that the tclinterp stuff in Vim is broken right now (at
-# least on Linux... it works on BSD).  When you --enable-tclinterp
-# flag, then the following command never returns:
-#
-#   VIMINIT='let OS = system("uname -s")' vim
-#
-# Please don't re-enable the tclinterp flag without verifying first
-# that the above works.  Thanks.  (08 Sep 2001 agriffis)
-
-
-src_unpack() {
-	unpack $A
-	# Fixup a script to use awk instead of nawk
-	cd $S/runtime/tools
-	mv mve.awk mve.awk.old
-	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
-	# Another set of patch's borrowed from src rpm to fix syntax error's etc.
-	cd ${WORKDIR}
-	tar xvjf  ${FILESDIR}/vimpatch.tar.bz2 
-	cd $S
-	patch -p1 < ${WORKDIR}/vim-4.2-speed_t.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.1-vimnotvi.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.6a-paths.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-fixkeys.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-gcc31.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-specsyntax.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0r-crv.patch || die
-			
-	cd ${WORKDIR}
-	tar xvjf ${DISTDIR}/vimpatch-1-142.tar.bz2
-	cd $S
-	
-	# Apply any patches available for this version
-	local patches=`echo ${WORKDIR}/${PV}.[0-9][0-9][0-9]`
-	case "$patches" in
-		*\]) 
-			;; # globbing didn't work; no patches available
-		*)
-			cd $S
-			for a in $patches; do
-				patch -p0 < $a
-			done
-			;;
-	esac
-	
-	# rphillips at gentoo.org
-	# latest patches do not compile. Here is a fix
-	patch -p0 < ${FILESDIR}/rphillips-invalcolorpatch.diff
-	
-	# Also apply the ebuild syntax patch, until this is in Vim proper
-	cd $S/runtime
-	patch -f -p0 < ${FILESDIR}/ebuild.patch
-
-}
-
-src_compile() {
-
-	local myconf
-	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-
-	#
-	# First, build a gui version, this will install as /usr/bin/gvim
-	#
-	if use gnome; then
-		guiconf="--enable-gui=gnome --with-x"
-	elif use gtk; then
-		guiconf="--enable-gui=gtk --with-x"
-	elif use X; then
-		guiconf="--enable-gui=athena --with-x"
-	else
-		# No gui version will be built
-		guiconf=""
-	fi
-	
-	# This should fix a sandbox violation. 
-	addwrite /dev/pty/*
-	
-	if [ -n "$guiconf" ]; then
-		./configure \
-			--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-			--with-features=huge --enable-cscope $myconf $guiconf \
-			|| die "gvim configure failed"
-		# Parallel make does not work
-		make || die "gvim make failed"
-		mv src/vim src/gvim
-	fi
-
-	#
-	# Second, build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --with-cscope $myconf \
-		--enable-gui=no --without-x \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	# Install the nogui version
-	mkdir -p $D/usr/{bin,share/man/man1,share/vim}
-	make install STRIP=true DESTDIR=$D \
-		BINDIR=/usr/bin MANDIR=/usr/share/man DATADIR=/usr/share
-	# Install the gui version, if it was built
-	if [ -f src/gvim ]; then
-		install -m755 src/gvim $D/usr/bin/gvim
-		ln -s gvim $D/usr/bin/gvimdiff
-	fi
-	# Docs
-	dodoc README*
-	cd $D/usr/share/doc/$PF
-	ln -s ../../vim/*/doc $P
-	# Default vimrc and gvimrc (who cares if gvim wasn't built)
-	insinto /usr/share/vim
-	doins ${FILESDIR}/vimrc ${FILESDIR}/gvimrc
-
-	#fix problems with vim not finding its data files.
-	dodir /etc/env.d
-	echo "VIMRUNTIME=/usr/share/vim/vim${vim_version/.}" \
-		>${D}/etc/env.d/40vim
-}