use vim.eclass

11 files changed, 11 insertions, 639 deletions

diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 9a2ddb15d7f4..140f499cf60d 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,6 @@
 # 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.15 2003/03/14 17:43:07 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.16 2003/03/15 00:44:40 seemant Exp $
 
   08 Feb 2003; Guy Martin <gmsoft@gentoo.org> vim-core-6.1-r4.ebuild :
   Added hppa to keywords.
@@ -16,6 +16,12 @@
 
 *vim-core-6.1-r4 (21 Jan 2003)
 
+  14 Mar 2003; Seemant Kulleen <seemant@gentoo.org> vim-core-6.1-r1.ebuild,
+  vim-core-6.1-r1.ebuild, vim-core-6.1-r2.ebuild, vim-core-6.1-r2.ebuild,
+  vim-core-6.1-r3.ebuild, vim-core-6.1-r3.ebuild, vim-core-6.1-r4.ebuild,
+  vim-core-6.1.ebuild, vim-core-6.1.ebuild:
+  uses the vim.eclass now
+
   14 Mar 2003; Jan Seidel <tuxus@gentoo.org> vim-core-6.1-r4.ebuild :
   Added mips to KEYWORDS
 
diff --git a/app-editors/vim-core/files/digest-vim-core-6.1 b/app-editors/vim-core/files/digest-vim-core-6.1
deleted file mode 100644
index db4e9cbae0be..000000000000
--- a/app-editors/vim-core/files/digest-vim-core-6.1
+++ /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-core/files/digest-vim-core-6.1-r1 b/app-editors/vim-core/files/digest-vim-core-6.1-r1
deleted file mode 100644
index 6dc32bfc2c5c..000000000000
--- a/app-editors/vim-core/files/digest-vim-core-6.1-r1
+++ /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-core/files/digest-vim-core-6.1-r2 b/app-editors/vim-core/files/digest-vim-core-6.1-r2
deleted file mode 100644
index bb72db297329..000000000000
--- a/app-editors/vim-core/files/digest-vim-core-6.1-r2
+++ /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-core/files/digest-vim-core-6.1-r3 b/app-editors/vim-core/files/digest-vim-core-6.1-r3
deleted file mode 100644
index 8b71488833aa..000000000000
--- a/app-editors/vim-core/files/digest-vim-core-6.1-r3
+++ /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-core/files/digest-vim-core-6.1-r4 b/app-editors/vim-core/files/digest-vim-core-6.1-r4
index 5bcad15a6311..a5fb23e1e02b 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,3 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 9ead3eaf912e0b63aae3ee5b55b70f25 vimpatch-1-300.tar.bz2 220361
+MD5 317606a613f68d03f381dba377a20031 vim-6.1-patches-001-300.tar.bz2 407085
+MD5 81071e861e9f07b06f18b29ee03769d3 vim-6.1-gentoo-patches.tar.bz2 3572
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim-core/vim-core-6.1-r1.ebuild b/app-editors/vim-core/vim-core-6.1-r1.ebuild
deleted file mode 100644
index a2eddcdf50c1..000000000000
--- a/app-editors/vim-core/vim-core-6.1-r1.ebuild
+++ /dev/null
@@ -1,176 +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-core/vim-core-6.1-r1.ebuild,v 1.9 2003/03/11 21:11:44 seemant 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-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="vim, gvim and kvim shared files"
-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 )
-	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)
-
-
-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
-	
-	# 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"
-
-	# 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"
-	cd ${S}
-	rm src/vim
-}
-
-src_install() {
-	mkdir -p $D/usr/{bin,share/man/man1,share/vim}
-	cd src
-	make installruntime installhelplinks installmacros installtutor installtools install-languages install-icons DESTDIR=$D \
-		BINDIR=/usr/bin MANDIR=/usr/share/man DATADIR=/usr/share
-	# Docs
-	dodoc README*
-	cd $D/usr/share/doc/$PF
-	ln -s ../../vim/*/doc $P
-
-	#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-core/vim-core-6.1-r2.ebuild b/app-editors/vim-core/vim-core-6.1-r2.ebuild
deleted file mode 100644
index 62d743718277..000000000000
--- a/app-editors/vim-core/vim-core-6.1-r2.ebuild
+++ /dev/null
@@ -1,174 +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-core/vim-core-6.1-r2.ebuild,v 1.7 2003/03/11 21:11:44 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
-# 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-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="vim, gvim and kvim shared files"
-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 )
-	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)
-
-
-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
-	
-	# 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"
-
-	# 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"
-	cd ${S}
-	rm src/vim
-}
-
-src_install() {
-	mkdir -p $D/usr/{bin,share/man/man1,share/vim}
-	cd src
-	make installruntime installhelplinks installmacros installtutor installtools install-languages install-icons DESTDIR=$D \
-		BINDIR=/usr/bin MANDIR=/usr/share/man DATADIR=/usr/share
-	# Docs
-	dodoc README*
-	cd $D/usr/share/doc/$PF
-	ln -s ../../vim/*/doc $P
-
-	#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-core/vim-core-6.1-r3.ebuild b/app-editors/vim-core/vim-core-6.1-r3.ebuild
deleted file mode 100644
index 0a8b3ae5ee9e..000000000000
--- a/app-editors/vim-core/vim-core-6.1-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-r3.ebuild,v 1.11 2003/03/11 21:11:44 seemant Exp $
-
-VIMPATCH="vimpatch-1-263.tar.bz2"
-inherit vim
-
-DESCRIPTION="vim, gvim and kvim shared files"
-KEYWORDS="~x86 ppc ~sparc ~alpha"
-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 )"
-
-src_compile() {
-
-	local myconf
-	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
-	myconf="$myconf --disable-perlinterp --disable-pythoninterp --disable-rubyinterp"
-	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=tiny $myconf \
-		--enable-gui=no --without-x \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make tools || die "vim make failed"
-	cd ${S}
-	rm src/vim
-}
-
-src_install() {
-	mkdir -p $D/usr/{bin,share/man/man1,share/vim}
-	cd src
-	make installruntime installhelplinks installmacros installtutor installtools install-languages install-icons DESTDIR=$D \
-		BINDIR=/usr/bin MANDIR=/usr/share/man DATADIR=/usr/share || die "make install failed"
-	# Docs
-	dodoc README*
-	cd $D/usr/share/doc/$PF
-	ln -s ../../vim/*/doc $P
-
-	#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-core/vim-core-6.1-r4.ebuild b/app-editors/vim-core/vim-core-6.1-r4.ebuild
index ca9738bd8a5a..565b5d3cd899 100644
--- a/app-editors/vim-core/vim-core-6.1-r4.ebuild
+++ b/app-editors/vim-core/vim-core-6.1-r4.ebuild
@@ -1,8 +1,8 @@
 # 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.8 2003/03/14 17:43:07 tuxus Exp $
+# $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 $
 
-VIMPATCH="vimpatch-1-300.tar.bz2"
+VIMPATCH="300"
 inherit vim
 
 DESCRIPTION="vim, gvim and kvim shared files"
@@ -14,47 +14,3 @@ DEPEND="dev-util/cscope
 	perl?	( dev-lang/perl )
 	python? ( dev-lang/python )
 	ruby?	( >=dev-lang/ruby-1.6.4 )"
-
-src_compile() {
-
-	local myconf
-	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
-	myconf="$myconf --disable-perlinterp --disable-pythoninterp --disable-rubyinterp"
-	myconf="$myconf --disable-gpm"
-
-	# 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=tiny $myconf \
-		--enable-gui=no --without-x \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make tools || die "vim make failed"
-	cd ${S}
-	rm src/vim
-}
-
-src_install() {
-	mkdir -p $D/usr/{bin,share/man/man1,share/vim}
-	cd src
-	make installruntime installhelplinks installmacros installtutor installtools install-languages install-icons DESTDIR=$D \
-		BINDIR=/usr/bin MANDIR=/usr/share/man DATADIR=/usr/share || die "make install failed"
-	# Docs
-	dodoc README*
-	cd $D/usr/share/doc/$PF
-	ln -s ../../vim/*/doc $P
-
-	#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-core/vim-core-6.1.ebuild b/app-editors/vim-core/vim-core-6.1.ebuild
deleted file mode 100644
index 4dc216604c91..000000000000
--- a/app-editors/vim-core/vim-core-6.1.ebuild
+++ /dev/null
@@ -1,175 +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-core/vim-core-6.1.ebuild,v 1.9 2003/03/11 21:11:44 seemant 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="vim, gvim and kvim shared files"
-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 )
-	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)
-
-
-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"
-
-	# 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"
-	cd ${S}
-	rm src/vim
-}
-
-src_install() {
-	mkdir -p $D/usr/{bin,share/man/man1,share/vim}
-	cd src
-	make installruntime installhelplinks installmacros installtutor installtools install-languages install-icons DESTDIR=$D \
-		BINDIR=/usr/bin MANDIR=/usr/share/man DATADIR=/usr/share
-	# Docs
-	dodoc README*
-	cd $D/usr/share/doc/$PF
-	ln -s ../../vim/*/doc $P
-
-	#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
-}
-