9 files changed, 4 insertions, 420 deletions
diff --git a/app-editors/vim/files/digest-vim-6.1-r15 b/app-editors/vim/files/digest-vim-6.1-r15
deleted file mode 100644
index bb72db297329..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r15
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 3b5a00da4fec4f3e5cbd3fba9940d153 vimpatch-1-213.tar.bz2 158015
diff --git a/app-editors/vim/files/digest-vim-6.1-r16 b/app-editors/vim/files/digest-vim-6.1-r16
deleted file mode 100644
index e291896c3990..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 80747ac21d83777aeefb714f7a385b11 vimpatch-1-245.tar.bz2 191362
-MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim/files/digest-vim-6.1-r17 b/app-editors/vim/files/digest-vim-6.1-r17
deleted file mode 100644
index 8b71488833aa..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 d4cb5c1c11783af6c31f6c5b9ed61695 vimpatch-1-263.tar.bz2 202289
-MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim/files/digest-vim-6.1-r18 b/app-editors/vim/files/digest-vim-6.1-r18
deleted file mode 100644
index 634730dab224..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 ce7f14e0f526220c85da6262661658e3 vimpatch-1-289.tar.bz2 216360
-MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim/files/digest-vim-6.1-r20 b/app-editors/vim/files/digest-vim-6.1-r20
new file mode 100644
index 000000000000..fdc355f9f02d
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-6.1-r20
@@ -0,0 +1,4 @@
+MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
+MD5 3c743967e2d9ed45ce2228525a408d32 vimpatch-1-386.tar.bz2 543181
+MD5 fe2996fdbb3f072109c2fbc7bbbf0c05 vimpatch-gentoo.tar.bz2 3156
+MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim/vim-6.1-r15.ebuild b/app-editors/vim/vim-6.1-r15.ebuild
deleted file mode 100644
index 33d21c6aacf5..000000000000
--- a/app-editors/vim/vim-6.1-r15.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# 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-r15.ebuild,v 1.7 2003/02/13 06:59:53 vapier 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
-# 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-213.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
-	sys-libs/libtermcap-compat
-	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)
-
-
-PROVIDE="virtual/editor"
-
-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-r16.ebuild b/app-editors/vim/vim-6.1-r16.ebuild
deleted file mode 100644
index bd3aeb3701ae..000000000000
--- a/app-editors/vim/vim-6.1-r16.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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-r16.ebuild,v 1.9 2003/02/13 06:59:59 vapier Exp $
-
-VIMPATCH="vimpatch-1-245.tar.bz2"
-inherit vim
-
-DESCRIPTION="Vi IMproved!"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-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?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-
-
-PROVIDE="virtual/editor"
-
-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-r17.ebuild b/app-editors/vim/vim-6.1-r17.ebuild
deleted file mode 100644
index 271dea638b8c..000000000000
--- a/app-editors/vim/vim-6.1-r17.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-r17.ebuild,v 1.15 2003/02/13 07:00:04 vapier Exp $
-
-IUSE="nls perl python ruby tcltk gpm X"
-
-VIMPATCH="vimpatch-1-263.tar.bz2"
-inherit vim
-
-DESCRIPTION="Vi IMproved!"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
-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?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-
-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"
-
-	# 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
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --enable-cscope $myconf \
-		--enable-gui=no \
-		|| 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 ${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-r18.ebuild b/app-editors/vim/vim-6.1-r18.ebuild
deleted file mode 100644
index 3e2062ac5a3b..000000000000
--- a/app-editors/vim/vim-6.1-r18.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-r18.ebuild,v 1.3 2003/02/13 07:00:09 vapier Exp $
-
-IUSE="nls perl python ruby tcltk gpm X"
-
-VIMPATCH="vimpatch-1-289.tar.bz2"
-inherit vim
-
-DESCRIPTION="Vi IMproved!"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
-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?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-
-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"
-
-	# 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
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --enable-cscope $myconf \
-		--enable-gui=no \
-		|| 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 ${FILESDIR}/vimrc
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
-}