vim patches 1-200... Fixes #8400. Submitted by Bret Towe

3 files changed, 181 insertions, 41 deletions

diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 1e77436c27ed..09621b381167 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,50 +1,16 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.1 2002/09/13 09:16:58 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.2 2002/09/30 04:45:30 rphillips Exp $
 
-*vim-core-6.1.ebuild (12 Sep 2002)
+*vim-core-6.1-r1 (29 Sep 2002)
 
-  12 Sep 2002; Hannes Mehnert <hannes@gentoo.org> vim-core-6.1.ebuild:
-  splitted vim into gvim, vim and vim-core
-
-*<PACKAGE_NAME>-<PACKAGE_VERSION>-<PACKAGE_RELEASE> (DD MMM YYYY)
+  29 Sep 2002; Ryan Phillips <rphillips@gentoo.org> vim-core-6.1-r1.ebuild :
 
-  DD MMM YYYY; YOUR_NAME <YOUR_EMAIL> changed_file1, changed_file2: Initial
-  import. Ebuild submitted by submitter_name <submitter_email>.  Note that the
-  "changed_file" listing is optional if you are simply bumping the rev of the
-  ebuild and are only making changes to the .ebuild file itself.  Also note
-  that we now have a single unified paragraph rather than having the first line
-  separated from the rest by a newline.  Everything should be in one block like
-  this. (note by drobbins, 16 Jul 2002)
+  Added patches 1-200. Submitted by Bret Towe. Fixes #8400
 
-  DD MMM YYYY; YOUR_NAME <YOUR_EMAIL> changed_file1, changed_file2: this is
-  an earlier ChangeLog enty.
- 
--- Explanation of ChangeLog format:
+*vim-core-6.1 (12 Sep 2002)
 
-  This changelog is targetted to users. This means that the comments should be
-  well explained and written in clean English.
- 
-  Every new version or revision of the package should be marked by a '*'
-  seperator line as above. Changes since the last revision have to be added to
-  the top of the file, underneath the initial copyright and cvs header
-  comments, in exactly the same format as this comment.
-  
-  This means that you start with header line that has the following format,
-  indented two spaces:
-  
-  DD MMM YYYY; your_name <your_email> changed_file1, changed_file2: Your
-  explanation should follow. It should be indented and wrapped at a line width
-  of 80 characters.  The changed_files can be omitted if they are obvious; for
-  example, if you are only modifying the .ebuild file and committing a new rev
-  of a package.  Any details about what exactly changed in the code should be
-  added as a message when the changes are committed to cvs, not in this file.
-
--- A word regarding credit:
+  12 Sep 2002; Hannes Mehnert <hannes@gentoo.org> vim-core-6.1.ebuild:
 
-  Please add credit information ("ebuild submitted by ...", "patch submitted
-  by ...") to the ChangeLog. Do not add this information to the ebuilds
-  themselves.
+  splitted vim into gvim, vim and vim-core
 
-  And remember: Give credit where credit is due. We're all doing this for
-  free, so the best we can hope (and expect!) to receive is credit.
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
new file mode 100644
index 000000000000..6dc32bfc2c5c
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-6.1-r1
@@ -0,0 +1,2 @@
+MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
+MD5 cbbec4728fcee63ce994339340e4769b vimpatch-1-200.tar.bz2 152558
diff --git a/app-editors/vim-core/vim-core-6.1-r1.ebuild b/app-editors/vim-core/vim-core-6.1-r1.ebuild
new file mode 100644
index 000000000000..9d955d067814
--- /dev/null
+++ b/app-editors/vim-core/vim-core-6.1-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 2002 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-r1.ebuild,v 1.1 2002/09/30 04:45:30 rphillips 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-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 sparc64 alpha"
+
+DEPEND="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
+				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
+}
+