vim 6.2a update

25 files changed, 246 insertions, 206 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index d0a242d45cf1..f2d0e241abd4 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.25 2003/04/02 14:43:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.26 2003/04/23 22:05:16 agriffis Exp $
+
+*gvim-6.2_pre1 (23 Apr 2003)
+
+  23 Apr 2003; Aron Griffis <agriffis@gentoo.org> gvim-6.1-r6.ebuild,
+  gvim-6.1-r7.ebuild, gvim-6.1-r8.ebuild, gvim-6.2_pre1.ebuild:
+  Update all ebuilds to work with new eclass. Add version 6.2a with support for
+  motif (bug 18919).
 
 *gvim-6.1-r8 (22 Mar 2003)
 
diff --git a/app-editors/gvim/files/digest-gvim-6.1-r6 b/app-editors/gvim/files/digest-gvim-6.1-r6
index 8d205edb620a..e544216bd96a 100644
--- a/app-editors/gvim/files/digest-gvim-6.1-r6
+++ b/app-editors/gvim/files/digest-gvim-6.1-r6
@@ -1,4 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 317606a613f68d03f381dba377a20031 vim-6.1-patches-001-300.tar.bz2 407085
-MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
+MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
+MD5 317606a613f68d03f381dba377a20031 vim-6.1-patches-001-300.tar.bz2 407085
diff --git a/app-editors/gvim/files/digest-gvim-6.1-r7 b/app-editors/gvim/files/digest-gvim-6.1-r7
index 572e12563af2..cff3cccd6d4d 100644
--- a/app-editors/gvim/files/digest-gvim-6.1-r7
+++ b/app-editors/gvim/files/digest-gvim-6.1-r7
@@ -1,4 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 41036a29f848a33bc2903224f2b4f6e6 vim-6.1-patches-001-390.tar.bz2 714902
-MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
+MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
+MD5 41036a29f848a33bc2903224f2b4f6e6 vim-6.1-patches-001-390.tar.bz2 714902
diff --git a/app-editors/gvim/files/digest-gvim-6.1-r8 b/app-editors/gvim/files/digest-gvim-6.1-r8
index 98143868eb94..827070d4dac0 100644
--- a/app-editors/gvim/files/digest-gvim-6.1-r8
+++ b/app-editors/gvim/files/digest-gvim-6.1-r8
@@ -1,4 +1,4 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 289004
-MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 86697
-MD5 71932d38e43dad63d5d39de792d7ed4d vim-6.1-patches-001-411.tar.bz2 75693
-MD5 76999e6185b11a083061df23560e3a0c vim-6.1-411-gentoo-patches.tar.bz2 14480
+MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
+MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
+MD5 76999e6185b11a083061df23560e3a0c vim-6.1-411-gentoo-patches.tar.bz2 144808
+MD5 71932d38e43dad63d5d39de792d7ed4d vim-6.1-patches-001-411.tar.bz2 756933
diff --git a/app-editors/gvim/files/digest-gvim-6.2_pre1 b/app-editors/gvim/files/digest-gvim-6.2_pre1
new file mode 100644
index 000000000000..8187297ae712
--- /dev/null
+++ b/app-editors/gvim/files/digest-gvim-6.2_pre1
@@ -0,0 +1,3 @@
+MD5 ffdb8a9463c39f8e3a4806e4c2f86f24 vim-6.2a.tar.bz2 3151500
+MD5 0c85c8948bb2355e9584ad16040defdd vim-6.2a-lang.tar.gz 959573
+MD5 e9c600232ab98d985b1bc84d0d524646 vim-6.2a-gentoo-patches.tar.bz2 4020
diff --git a/app-editors/gvim/gvim-6.1-r6.ebuild b/app-editors/gvim/gvim-6.1-r6.ebuild
index cef1da282bd7..67c6f388be22 100644
--- a/app-editors/gvim/gvim-6.1-r6.ebuild
+++ b/app-editors/gvim/gvim-6.1-r6.ebuild
@@ -1,29 +1,26 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.1-r6.ebuild,v 1.7 2003/03/14 07:55:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.1-r6.ebuild,v 1.8 2003/04/23 22:05:16 agriffis Exp $
 
-VIMPATCH="300"
 inherit vim
 
+VIM_VERSION="6.1"
+VIM_GENTOO_PATCHES="vim-6.1-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.1-patches-001-300.tar.bz2"
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-6.1.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-6.1-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
 DESCRIPTION="Graphical Vim"
-KEYWORDS="x86 ppc sparc alpha"
-DEPEND="dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	sys-libs/libtermcap-compat
-	app-editors/vim-core
+KEYWORDS="alpha ppc sparc x86"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-6.1
 	x11-base/xfree
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	gnome?	( gnome-base/gnome-libs )
-	gtk?	( =x11-libs/gtk+-1.2* )
-	perl?	( dev-lang/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)
+	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.1-r7.ebuild b/app-editors/gvim/gvim-6.1-r7.ebuild
index a6b05b3706d1..bd36a5ed0e30 100644
--- a/app-editors/gvim/gvim-6.1-r7.ebuild
+++ b/app-editors/gvim/gvim-6.1-r7.ebuild
@@ -1,39 +1,29 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.1-r7.ebuild,v 1.3 2003/03/19 13:15:39 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.1-r7.ebuild,v 1.4 2003/04/23 22:05:16 agriffis Exp $
 
-VIMPATCH="390"
-
-EXCLUDE_PATCH="093 100 119 121 126 138 152 164 258 \
-304 314 322 334 335 340 346 352 353 354 355 356 374"
+inherit vim
 
-use nls || EXCLUDE_PATCH="${EXCLUDE_PATCH} 295 301"
+VIM_VERSION="6.1"
+VIM_GENTOO_PATCHES="vim-6.1-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.1-patches-001-390.tar.bz2"
 
-inherit vim
+S=${WORKDIR}/vim${VIM_VERSION/.}
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-6.1.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-6.1-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
 
 DESCRIPTION="Graphical Vim"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-DEPEND="dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	app-editors/vim-core
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-6.1
 	x11-base/xfree
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	gnome?	( gnome-base/gnome-libs )
-	gtk?	( =x11-libs/gtk+-1.2* )
-	gtk2?	( >=x11-libs/gtk+-2.1
-				virtual/xft )
-	perl?	( dev-lang/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)
+	gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) :
+		( gnome? ( gnome-base/gnome-libs ) : 
+			( gtk? ( =x11-libs/gtk+-1.2* ) ) )"
 
 src_unpack() {
 	vim_src_unpack
diff --git a/app-editors/gvim/gvim-6.1-r8.ebuild b/app-editors/gvim/gvim-6.1-r8.ebuild
index 457d0d86c2da..eff5dc508fca 100644
--- a/app-editors/gvim/gvim-6.1-r8.ebuild
+++ b/app-editors/gvim/gvim-6.1-r8.ebuild
@@ -1,15 +1,25 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.1-r8.ebuild,v 1.2 2003/04/02 14:40:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.1-r8.ebuild,v 1.3 2003/04/23 22:05:16 agriffis Exp $
 
-IUSE="gnome gpm gtk gtk2 ncurses nls perl python ruby X"
-VIMPATCH="411"
 inherit vim
 
+VIM_VERSION="6.1"
+VIM_GENTOO_PATCHES="vim-6.1-411-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.1-patches-001-411.tar.bz2"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-6.1.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-6.1-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
+
 DESCRIPTION="Graphical Vim"
-KEYWORDS="x86 ~ppc ~sparc alpha"
+KEYWORDS="alpha ~ppc ~sparc x86"
+PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
-	>=app-editors/vim-core-6.1-r5
+	~app-editors/vim-core-6.1
 	x11-base/xfree
 	gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) :
 		( gnome? ( gnome-base/gnome-libs ) : 
diff --git a/app-editors/gvim/gvim-6.2_pre1.ebuild b/app-editors/gvim/gvim-6.2_pre1.ebuild
new file mode 100644
index 000000000000..794c2d94cb11
--- /dev/null
+++ b/app-editors/gvim/gvim-6.2_pre1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.2_pre1.ebuild,v 1.1 2003/04/23 22:05:16 agriffis Exp $
+
+inherit vim
+
+VIM_VERSION="6.2a"
+VIM_GENTOO_PATCHES="vim-6.2a-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES=""  # no patches available for 6.2a
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unstable/unix/vim-6.2a.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/unstable/extra/vim-6.2a-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}"
+#	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+DESCRIPTION="Graphical Vim"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-6.2_pre1
+	x11-base/xfree
+	gtk2? ( >=x11-libs/gtk+-2.1 virtual/xft ) :
+		( gnome? ( gnome-base/gnome-libs ) : 
+			( gtk? ( =x11-libs/gtk+-1.2* ) :
+				( motif? ( virtual/motif ) ) ) )"
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 420f7fb60c86..7db0bf604338 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.20 2003/04/16 02:14:56 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.21 2003/04/23 22:05:16 agriffis Exp $
+
+*vim-core-6.2_pre1 (23 Apr 2003)
+
+  23 Apr 2003; Aron Griffis <agriffis@gentoo.org> vim-core-6.1-r4.ebuild,
+  vim-core-6.1-r5.ebuild, vim-core-6.2_pre1.ebuild:
+  Update all ebuilds to work with new eclass.  Add version 6.2a.
 
 *vim-core-6.1-r5 (22 Mar 2003)
 
diff --git a/app-editors/vim-core/files/digest-vim-core-6.1-r4 b/app-editors/vim-core/files/digest-vim-core-6.1-r4
index 8d205edb620a..e544216bd96a 100644
--- a/app-editors/vim-core/files/digest-vim-core-6.1-r4
+++ b/app-editors/vim-core/files/digest-vim-core-6.1-r4
@@ -1,4 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 317606a613f68d03f381dba377a20031 vim-6.1-patches-001-300.tar.bz2 407085
-MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
+MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
+MD5 317606a613f68d03f381dba377a20031 vim-6.1-patches-001-300.tar.bz2 407085
diff --git a/app-editors/vim-core/files/digest-vim-core-6.1-r5 b/app-editors/vim-core/files/digest-vim-core-6.1-r5
index 98143868eb94..827070d4dac0 100644
--- a/app-editors/vim-core/files/digest-vim-core-6.1-r5
+++ b/app-editors/vim-core/files/digest-vim-core-6.1-r5
@@ -1,4 +1,4 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 289004
-MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 86697
-MD5 71932d38e43dad63d5d39de792d7ed4d vim-6.1-patches-001-411.tar.bz2 75693
-MD5 76999e6185b11a083061df23560e3a0c vim-6.1-411-gentoo-patches.tar.bz2 14480
+MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
+MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
+MD5 76999e6185b11a083061df23560e3a0c vim-6.1-411-gentoo-patches.tar.bz2 144808
+MD5 71932d38e43dad63d5d39de792d7ed4d vim-6.1-patches-001-411.tar.bz2 756933
diff --git a/app-editors/vim-core/files/digest-vim-core-6.2_pre1 b/app-editors/vim-core/files/digest-vim-core-6.2_pre1
new file mode 100644
index 000000000000..8187297ae712
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-6.2_pre1
@@ -0,0 +1,3 @@
+MD5 ffdb8a9463c39f8e3a4806e4c2f86f24 vim-6.2a.tar.bz2 3151500
+MD5 0c85c8948bb2355e9584ad16040defdd vim-6.2a-lang.tar.gz 959573
+MD5 e9c600232ab98d985b1bc84d0d524646 vim-6.2a-gentoo-patches.tar.bz2 4020
diff --git a/app-editors/vim-core/vim-core-6.1-r4.ebuild b/app-editors/vim-core/vim-core-6.1-r4.ebuild
index 565b5d3cd899..469f74530816 100644
--- a/app-editors/vim-core/vim-core-6.1-r4.ebuild
+++ b/app-editors/vim-core/vim-core-6.1-r4.ebuild
@@ -1,16 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-6.1-r4.ebuild,v 1.9 2003/03/15 00:44:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-6.1-r4.ebuild,v 1.10 2003/04/23 22:05:16 agriffis Exp $
 
-VIMPATCH="300"
 inherit vim
 
+VIM_VERSION="6.1"
+VIM_GENTOO_PATCHES="vim-6.1-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.1-patches-001-300.tar.bz2"
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-6.1.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-6.1-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
 DESCRIPTION="vim, gvim and kvim shared files"
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
-DEPEND="dev-util/cscope
-	sys-libs/libtermcap-compat
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
+KEYWORDS="alpha arm hppa mips ppc sparc x86"
+DEPEND="${DEPEND}"  # all the deps for vim-core are in vim.eclass
diff --git a/app-editors/vim-core/vim-core-6.1-r5.ebuild b/app-editors/vim-core/vim-core-6.1-r5.ebuild
index cb5756e18018..9d43be101ba4 100644
--- a/app-editors/vim-core/vim-core-6.1-r5.ebuild
+++ b/app-editors/vim-core/vim-core-6.1-r5.ebuild
@@ -1,10 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-6.1-r5.ebuild,v 1.4 2003/04/16 02:14:56 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-6.1-r5.ebuild,v 1.5 2003/04/23 22:05:16 agriffis Exp $
 
-IUSE="ncurses gpm nls perl python ruby"
-VIMPATCH="411"
 inherit vim
 
+VIM_VERSION="6.1"
+VIM_GENTOO_PATCHES="vim-6.1-411-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.1-patches-001-411.tar.bz2"
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-6.1.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-6.1-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
 DESCRIPTION="vim, gvim and kvim shared files"
-KEYWORDS="x86 ~ppc sparc alpha hppa ~arm ~mips"
+KEYWORDS="alpha ~arm hppa ~mips ~ppc sparc x86"
+DEPEND="${DEPEND}"  # all the deps for vim-core are in vim.eclass
diff --git a/app-editors/vim-core/vim-core-6.2_pre1.ebuild b/app-editors/vim-core/vim-core-6.2_pre1.ebuild
new file mode 100644
index 000000000000..211904739332
--- /dev/null
+++ b/app-editors/vim-core/vim-core-6.2_pre1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-6.2_pre1.ebuild,v 1.1 2003/04/23 22:05:16 agriffis Exp $
+
+inherit vim
+
+VIM_VERSION="6.2a"
+VIM_GENTOO_PATCHES="vim-6.2a-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES=""  # no patches available for 6.2a
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unstable/unix/vim-6.2a.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/unstable/extra/vim-6.2a-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}"
+#	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+DESCRIPTION="vim, gvim and kvim shared files"
+KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+DEPEND="${DEPEND}"  # all the deps for vim-core are in vim.eclass
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 62659480dc34..a8e217ecdffc 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/vim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.51 2003/04/16 02:18:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.52 2003/04/23 22:05:16 agriffis Exp $
+
+*vim-6.2_pre1 (23 Apr 2003)
+
+  23 Apr 2003; Aron Griffis <agriffis@gentoo.org> vim-6.1-r19.ebuild,
+  vim-6.1-r20.ebuild, vim-6.1-r21.ebuild, vim-6.2_pre1.ebuild:
+  Update all ebuilds to work with new eclass. Add version 6.2a. Disable linking
+  against X libraries (see bug 19115).
 
 *vim-6.1-r21 (22 Mar 2003)
 
diff --git a/app-editors/vim/files/digest-vim-6.1-r19 b/app-editors/vim/files/digest-vim-6.1-r19
index 8d205edb620a..883af79cf347 100644
--- a/app-editors/vim/files/digest-vim-6.1-r19
+++ b/app-editors/vim/files/digest-vim-6.1-r19
@@ -1,4 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 317606a613f68d03f381dba377a20031 vim-6.1-patches-001-300.tar.bz2 407085
-MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
+MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
+MD5 9ead3eaf912e0b63aae3ee5b55b70f25 vimpatch-1-300.tar.bz2 220361
diff --git a/app-editors/vim/files/digest-vim-6.1-r20 b/app-editors/vim/files/digest-vim-6.1-r20
index 572e12563af2..bfb9a6d6a7f8 100644
--- a/app-editors/vim/files/digest-vim-6.1-r20
+++ b/app-editors/vim/files/digest-vim-6.1-r20
@@ -1,4 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 41036a29f848a33bc2903224f2b4f6e6 vim-6.1-patches-001-390.tar.bz2 714902
-MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
+MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
+MD5 d20926d27e44787f71ceee2a49ab096f vimpatch-1-390.tar.bz2 690825
diff --git a/app-editors/vim/files/digest-vim-6.1-r21 b/app-editors/vim/files/digest-vim-6.1-r21
index 98143868eb94..827070d4dac0 100644
--- a/app-editors/vim/files/digest-vim-6.1-r21
+++ b/app-editors/vim/files/digest-vim-6.1-r21
@@ -1,4 +1,4 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 289004
-MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 86697
-MD5 71932d38e43dad63d5d39de792d7ed4d vim-6.1-patches-001-411.tar.bz2 75693
-MD5 76999e6185b11a083061df23560e3a0c vim-6.1-411-gentoo-patches.tar.bz2 14480
+MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
+MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
+MD5 76999e6185b11a083061df23560e3a0c vim-6.1-411-gentoo-patches.tar.bz2 144808
+MD5 71932d38e43dad63d5d39de792d7ed4d vim-6.1-patches-001-411.tar.bz2 756933
diff --git a/app-editors/vim/files/digest-vim-6.2_pre1 b/app-editors/vim/files/digest-vim-6.2_pre1
new file mode 100644
index 000000000000..8187297ae712
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-6.2_pre1
@@ -0,0 +1,3 @@
+MD5 ffdb8a9463c39f8e3a4806e4c2f86f24 vim-6.2a.tar.bz2 3151500
+MD5 0c85c8948bb2355e9584ad16040defdd vim-6.2a-lang.tar.gz 959573
+MD5 e9c600232ab98d985b1bc84d0d524646 vim-6.2a-gentoo-patches.tar.bz2 4020
diff --git a/app-editors/vim/vim-6.1-r19.ebuild b/app-editors/vim/vim-6.1-r19.ebuild
index a6f8ea19543a..0fb544d03c65 100644
--- a/app-editors/vim/vim-6.1-r19.ebuild
+++ b/app-editors/vim/vim-6.1-r19.ebuild
@@ -1,93 +1,22 @@
 # Copyright 1999-2003 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-r19.ebuild,v 1.9 2003/03/14 15:59:13 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r19.ebuild,v 1.10 2003/04/23 22:05:16 agriffis Exp $
 
-IUSE="nls perl python ruby tcltk gpm X"
-
-VIMPATCH="300"
-EXCLUDE_PATCH="093 100 119 121 126 138 152 164 258 \
-304 314 322 334 335 340 346 352 353 354 355 356 374"
+inherit vim
 
-use nls || EXCLUDE_PATCH="${EXCLUDE_PATCH} 295 301"
+VIM_VERSION="6.1"
+VIM_GENTOO_PATCHES="vim-6.1-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.1-patches-001-300.tar.bz2"
 
-inherit vim
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-6.1.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-6.1-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
 
+S=${WORKDIR}/vim${VIM_VERSION/.}
 DESCRIPTION="Vi IMproved!"
-KEYWORDS="x86 ppc sparc alpha hppa arm mips"
-DEPEND="app-editors/vim-core
-	sys-libs/libtermcap-compat
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-
+KEYWORDS="alpha arm hppa mips ppc sparc x86"
 PROVIDE="virtual/editor"
-
-src_compile() {
-	local myconf
-	myconf="--with-features=big --enable-multibyte"
-	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"
-	
-	# the console vim will change the caption of a terminal in X.
-	# the configure script should autodetect X being installed, so
-	# we'll specifically turn it off if X is not in the USE vars.
-	# -rphillips
-	use X      && myconf="$myconf --with-x" || myconf="$myconf --without-x"
-
-	# This should fix a sandbox violation. 
- 	for file in /dev/pty/s*
- 	do
- 		addwrite $file
- 	done
-
-	#
-	# Build a nogui version, this will install as /usr/bin/vim
-	#
-	econf \
-		--enable-gui=no \
-		--with-features=huge \
-		--enable-cscope ${myconf} \
-		|| die "vim configure failed"
-
-	# move config files to /etc/vim/
-	echo "#define SYS_VIMRC_FILE \"/etc/vim/vimrc\"" \
-		>>${WORKDIR}/vim61/src/feature.h
-	echo "#define SYS_GVIMRC_FILE \"/etc/vim/gvimrc\"" \
-		>>${WORKDIR}/vim61/src/feature.h
-
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	dobin src/vim
-	ln -s vim ${D}/usr/bin/vimdiff
-	ln -s vim ${D}/usr/bin/rvim
-	ln -s vim  ${D}/usr/bin/ex
-	ln -s vim  ${D}/usr/bin/view
-	ln -s vim  ${D}/usr/bin/rview
-	
-	# Default vimrc
-	insinto /etc/vim/
-	doins ${WORKDIR}/gentoo/vimrc
-}
-
-pkg_postinst() {
-	einfo
-	einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
-	einfo
-}
+DEPEND="${DEPEND}
+	~app-editors/vim-core-6.1"
diff --git a/app-editors/vim/vim-6.1-r20.ebuild b/app-editors/vim/vim-6.1-r20.ebuild
index 8f002b818226..0c5a3e4e7d39 100644
--- a/app-editors/vim/vim-6.1-r20.ebuild
+++ b/app-editors/vim/vim-6.1-r20.ebuild
@@ -1,28 +1,22 @@
 # Copyright 1999-2003 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-r20.ebuild,v 1.1 2003/03/13 22:18:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r20.ebuild,v 1.2 2003/04/23 22:05:16 agriffis Exp $
 
-IUSE="nls perl python ruby tcltk gpm X"
-
-VIMPATCH="390"
+inherit vim
 
-EXCLUDE_PATCH="093 100 119 121 126 138 152 164 258 \
-304 314 322 334 335 340 346 352 353 354 355 356 374"
+VIM_VERSION="6.1"
+VIM_GENTOO_PATCHES="vim-6.1-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.1-patches-001-390.tar.bz2"
 
-use nls || EXCLUDE_PATCH="${EXCLUDE_PATCH} 295 301"
-
-inherit vim
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-6.1.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-6.1-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
 
+S=${WORKDIR}/vim${VIM_VERSION/.}
 DESCRIPTION="Vi IMproved!"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm"
-DEPEND="app-editors/vim-core
-	sys-libs/libtermcap-compat
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-
+KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
 PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-6.1"
diff --git a/app-editors/vim/vim-6.1-r21.ebuild b/app-editors/vim/vim-6.1-r21.ebuild
index 190533e70d39..16958f123806 100644
--- a/app-editors/vim/vim-6.1-r21.ebuild
+++ b/app-editors/vim/vim-6.1-r21.ebuild
@@ -1,14 +1,22 @@
 # Copyright 1999-2003 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-r21.ebuild,v 1.4 2003/04/16 02:18:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r21.ebuild,v 1.5 2003/04/23 22:05:16 agriffis Exp $
 
-IUSE="gpm ncurses nls perl python ruby tcltk X"
-VIMPATCH="411"
 inherit vim
 
-DESCRIPTION="Vi IMproved!"
-KEYWORDS="x86 ~ppc sparc alpha hppa ~arm ~mips"
-DEPEND="${DEPEND}
-	>=app-editors/vim-core-6.1-r5"
+VIM_VERSION="6.1"
+VIM_GENTOO_PATCHES="vim-6.1-411-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES="vim-6.1-patches-001-411.tar.bz2"
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-6.1.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-6.1-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
 
+S=${WORKDIR}/vim${VIM_VERSION/.}
+DESCRIPTION="Vi IMproved!"
+KEYWORDS="alpha ~arm hppa ~mips ~ppc sparc x86"
 PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-6.1"
diff --git a/app-editors/vim/vim-6.2_pre1.ebuild b/app-editors/vim/vim-6.2_pre1.ebuild
new file mode 100644
index 000000000000..77ada67b0f61
--- /dev/null
+++ b/app-editors/vim/vim-6.2_pre1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.2_pre1.ebuild,v 1.1 2003/04/23 22:05:16 agriffis Exp $
+
+inherit vim
+
+VIM_VERSION="6.2a"
+VIM_GENTOO_PATCHES="vim-6.2a-gentoo-patches.tar.bz2"
+VIM_ORG_PATCHES=""  # no patches available for 6.2a
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unstable/unix/vim-6.2a.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/unstable/extra/vim-6.2a-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}"
+#	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+DESCRIPTION="Vi IMproved!"
+KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+PROVIDE="virtual/editor"
+DEPEND="${DEPEND}
+	~app-editors/vim-core-6.2_pre1"