Vim update, commit for ciaranm, thanks to Ed Catmur, bug 122562

(Portage version: 2.1_pre6-r6)

5 files changed, 230 insertions, 4 deletions

diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 2d6367788297..72e513723cb3 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.199 2006/03/06 01:39:45 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.200 2006/03/25 20:26:27 genstef Exp $
+
+*vim-core-7.0_beta (25 Mar 2006)
+
+  25 Mar 2006; Stefan Schweizer <genstef@gentoo.org> +files/vimrc-r3,
+  +vim-core-7.0_beta.ebuild:
+  Vim update, commit for ciaranm, thanks to Ed Catmur, bug 122562
 
 *vim-core-7.0_alpha20060306 (06 Mar 2006)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index a97ecc90b766..d267eb12106b 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,6 +1,6 @@
-MD5 d2d5b9cf795e9cc219eb87b6350e82b2 ChangeLog 28179
-RMD160 f7c82a6b0d4621e149540cfaf915a2b5d87dfb20 ChangeLog 28179
-SHA256 477ff8c4ccde57a767830aa4896a07137d95afcfca1a24a470145664c03b2fe4 ChangeLog 28179
+MD5 81fafa4870b1669df13fd53051357262 ChangeLog 28379
+RMD160 a12ff60eccee4aa34069f36516faa72eff667293 ChangeLog 28379
+SHA256 ed7ec08c0d7c1c33af6f92dc380334e793c3ac90392b519ae465b950aeaa24c4 ChangeLog 28379
 MD5 f06702e38dc279aee7ca16c7283d67cb files/digest-vim-core-6.4 200
 RMD160 014d9ccd650cea6e0d82df48c5957899449330bb files/digest-vim-core-6.4 200
 SHA256 c27a598441e79ed0b5dcbbb2e12a08d7ecd1b10fae342c4f5109e22fcd2ca522 files/digest-vim-core-6.4 200
@@ -13,6 +13,9 @@ SHA256 b9623daa69077c32c976265133f9d5018dece36cacdcf1fa4cc7c680222061ca files/di
 MD5 a6607e3b9101790ba7897afda2e6694e files/digest-vim-core-7.0_alpha20060320 578
 RMD160 c2d589e63db420d5b6b53f426dc6f9f8380e1edc files/digest-vim-core-7.0_alpha20060320 578
 SHA256 6e1479bce894d65f9a15d5141d9605e0660f67416951142272da7ccf84528f5d files/digest-vim-core-7.0_alpha20060320 578
+MD5 17f3e50d50a8d403fa26b069247ed24e files/digest-vim-core-7.0_beta 551
+RMD160 364e8688ac4095738011e13b4e31423445548b7d files/digest-vim-core-7.0_beta 551
+SHA256 50825d7a728239537942ab91acf3e39758cfaad51b3ce460bd7a4fe1cbea106c files/digest-vim-core-7.0_beta 551
 MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
 RMD160 3051c7877483b00ff6bb43c9136bbb4b784c5f3d files/rphillips-invalcolorpatch.diff 722
 SHA256 6678f6dd8b84d9b2c2454b346eb1febb17548f3e17b9f33ca6fc877a250660a1 files/rphillips-invalcolorpatch.diff 722
@@ -25,6 +28,9 @@ SHA256 5ec737b4ca59ecd63c0c595cfa6dbf31f3933c9122e8efdb7e36ed49d0e306fb files/vi
 MD5 bf7ffc1fe1d1852f15eb7e5f15c17482 files/vimrc-r2 6094
 RMD160 6c89b3ba4ba80ac5c9ca5af9ebf8985d00ac9ee3 files/vimrc-r2 6094
 SHA256 3425d156e71e0215599c64853f90ed9e8712b5564b3d58da2503b89ab0b0b792 files/vimrc-r2 6094
+MD5 a330f8fdee38f0c988b845f99112cb36 files/vimrc-r3 6047
+RMD160 c7d9e4bab18f3f6d5440f74a88ec077534a07d17 files/vimrc-r3 6047
+SHA256 220ac07a67acbbf28e00c9464c12947cdc0ea0677e45429e8816c815f03ed1ca files/vimrc-r3 6047
 MD5 ba542e54d91a04a85435253ae35301b6 files/xxd-completion 461
 RMD160 504f96c4b37a770678a74b16b871d410a3fcb82d files/xxd-completion 461
 SHA256 580064ca4db3ac149fd89c743bd9946241220c211721f978f7a3ef97b3c171df files/xxd-completion 461
@@ -43,3 +49,6 @@ SHA256 e28a72f2201a53369a05522dbb4869264fb469b89fc2f2b45db5aff05ac222c3 vim-core
 MD5 c8a021610911791b0d8c4d42147b1623 vim-core-7.0_alpha20060320.ebuild 762
 RMD160 eceb524a3f1281793c732e9450e52192624baa5f vim-core-7.0_alpha20060320.ebuild 762
 SHA256 e2825e935f91725e13ee41e9ae7b20a89ff261a78137e5a5c2c36c2501892dda vim-core-7.0_alpha20060320.ebuild 762
+MD5 1e80f84feb7e69c2af1ed5de228d0a2e vim-core-7.0_beta.ebuild 682
+RMD160 8490d22fc654e674f100959f6893e55e5cdf2626 vim-core-7.0_beta.ebuild 682
+SHA256 c42d0beadf64e67fe7a6741b4aa2ca451357c342662e525565e2f277c3f08ca4 vim-core-7.0_beta.ebuild 682
diff --git a/app-editors/vim-core/files/digest-vim-core-7.0_beta b/app-editors/vim-core/files/digest-vim-core-7.0_beta
new file mode 100644
index 000000000000..a3ae7914f761
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-7.0_beta
@@ -0,0 +1,6 @@
+MD5 da66bcb149beab6c5d08ef86793f4ceb vim-7.0_alpha20051207-gentoo-patches.tar.bz2 7738
+RMD160 aeeb658a9942e3925050b4f7a52214d878982f75 vim-7.0_alpha20051207-gentoo-patches.tar.bz2 7738
+SHA256 e9565a5369764307b8272771c3323f3fa8a9f7a851a4719bb3efdeae385f5778 vim-7.0_alpha20051207-gentoo-patches.tar.bz2 7738
+MD5 60bfbacc67afb8d6dba9fda2c79c723c vim-7.0_beta.tar.bz2 5857250
+RMD160 47c21211a3be0bee25ea2ad3f5c07a3fba2a21eb vim-7.0_beta.tar.bz2 5857250
+SHA256 42fce43da146be591102d0398ba0d7e0b1285f2d6f148291d8dace1db9a2542f vim-7.0_beta.tar.bz2 5857250
diff --git a/app-editors/vim-core/files/vimrc-r3 b/app-editors/vim-core/files/vimrc-r3
new file mode 100644
index 000000000000..2a0a13c70faa
--- /dev/null
+++ b/app-editors/vim-core/files/vimrc-r3
@@ -0,0 +1,184 @@
+scriptencoding utf-8
+" ^^ Please leave the above line at the start of the file.
+
+" Default configuration file for Vim
+" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r3,v 1.1 2006/03/25 20:26:27 genstef Exp $
+
+" Written by Aron Griffis <agriffis@gentoo.org>
+" Modified by Ryan Phillips <rphillips@gentoo.org>
+" Modified some more by Ciaran McCreesh <ciaranm@gentoo.org>
+" Added Redhat's vimrc info by Seemant Kulleen <seemant@gentoo.org>
+
+" You can override any of these settings on a global basis via the
+" "/etc/vim/vimrc.local" file, and on a per-user basis via "~/.vimrc". You may
+" need to create these.
+
+" {{{ General settings
+" The following are some sensible defaults for Vim for most users.
+" We attempt to change as little as possible from Vim's defaults,
+" deviating only where it makes sense
+set nocompatible        " Use Vim defaults (much better!)
+set bs=2                " Allow backspacing over everything in insert mode
+set ai                  " Always set auto-indenting on
+set history=50          " keep 50 lines of command history
+set ruler               " Show the cursor position all the time
+
+set viminfo='20,\"500   " Keep a .viminfo file.
+
+" Don't use Ex mode, use Q for formatting
+map Q gq
+
+" When doing tab completion, give the following files lower priority. You may
+" wish to set 'wildignore' to completely ignore files, and 'wildmenu' to enable
+" enhanced tab completion. These can be done in the user vimrc file.
+set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo
+
+" When displaying line numbers, don't use an annoyingly wide number column. This
+" doesn't enable line numbers -- :set number will do that. The value given is a
+" minimum width to use for the number column, not a fixed size.
+if v:version >= 700
+  set numberwidth=3
+endif
+" }}}
+
+" {{{ Modeline settings
+" We don't allow modelines by default. See bug #14088 and bug #73715.
+" If you're not concerned about these, you can enable them on a per-user
+" basis by adding "set modeline" to your ~/.vimrc file.
+set nomodeline
+" }}}
+
+" {{{ Locale settings
+" Try to come up with some nice sane GUI fonts. Also try to set a sensible
+" value for fileencodings based upon locale. These can all be overridden in
+" the user vimrc file.
+if v:lang =~? "^ko"
+  set fileencodings=euc-kr
+  set guifontset=-*-*-medium-r-normal--16-*-*-*-*-*-*-*
+elseif v:lang =~? "^ja_JP"
+  set fileencodings=euc-jp
+  set guifontset=-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*
+elseif v:lang =~? "^zh_TW"
+  set fileencodings=big5
+  set guifontset=-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1,-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0
+elseif v:lang =~? "^zh_CN"
+  set fileencodings=gb2312
+  set guifontset=*-r-*
+endif
+
+" If we have a BOM, always honour that rather than trying to guess.
+if &fileencodings !~? "ucs-bom"
+  set fileencodings^=ucs-bom
+endif
+
+" Always check for UTF-8 when trying to determine encodings.
+if &fileencodings !~? "utf-8"
+  set fileencodings+=utf-8
+endif
+
+" Make sure we have a sane fallback for encoding detection
+set fileencodings+=default
+" }}}
+
+" {{{ Syntax highlighting settings
+" Switch syntax highlighting on, when the terminal has colors
+" Also switch on highlighting the last used search pattern.
+if &t_Co > 2 || has("gui_running")
+  syntax on
+  set hlsearch
+endif
+" }}}
+
+" {{{ Terminal fixes
+if &term ==? "xterm"
+  set t_Sb=^[4%dm
+  set t_Sf=^[3%dm
+  set ttymouse=xterm2
+endif
+
+if &term ==? "gnome" && has("eval")
+  " Set useful keys that vim doesn't discover via termcap but are in the
+  " builtin xterm termcap. See bug #122562. We use exec to avoid having to
+  " include raw escapes in the file.
+  exec "set <C-Left>=\eO5D"
+  exec "set <C-Right>=\eO5C"
+endif
+" }}}
+
+" {{{ Filetype plugin settings
+" Enable plugin-provided filetype settings, but only if the ftplugin
+" directory exists (which it won't on livecds, for example).
+if isdirectory(expand("$VIMRUNTIME/ftplugin"))
+  filetype plugin on
+
+  " Uncomment the next line (or copy to your ~/.vimrc) for plugin-provided
+  " indent settings. Some people don't like these, so we won't turn them on by
+  " default.
+  " filetype indent on
+endif
+" }}}
+
+" {{{ Fix &shell, see bug #101665.
+if "" == &shell
+  if executable("/bin/bash")
+    set shell=/bin/bash
+  elseif executable("/bin/sh")
+    set shell=/bin/sh
+  endif
+endif
+"}}}
+
+" {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh
+" files should default to bash. See :help sh-syntax and bug #101819.
+if has("eval")
+  let is_bash=1
+endif
+" }}}
+
+" {{{ Autocommands
+if has("autocmd")
+
+augroup gentoo
+  au!
+
+  " Gentoo-specific settings for ebuilds.  These are the federally-mandated
+  " required tab settings.  See the following for more information:
+  " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml
+  " Note that the rules below are very minimal and don't cover everything.
+  " Better to emerge app-vim/gentoo-syntax, which provides full syntax,
+  " filetype and indent settings for all things Gentoo.
+  au BufRead,BufNewFile *.e{build,class} let is_bash=1|setfiletype sh
+  au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
+
+  " In text files, limit the width of text to 78 characters, but be careful
+  " that we don't override the user's setting.
+  autocmd BufNewFile,BufRead *.txt
+        \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") |
+        \     setlocal textwidth=78 |
+        \ endif
+
+  " When editing a file, always jump to the last cursor position
+  autocmd BufReadPost *
+        \ if ! exists("g:leave_my_cursor_position_alone") |
+        \     if line("'\"") > 0 && line ("'\"") <= line("$") |
+        \         exe "normal g'\"" |
+        \     endif |
+        \ endif
+
+  " When editing a crontab file, set backupcopy to yes rather than auto. See
+  " :help crontab and bug #53437.
+  autocmd FileType crontab set backupcopy=yes
+
+augroup END
+
+endif " has("autocmd")
+" }}}
+
+" {{{ vimrc.local
+if filereadable("/etc/vim/vimrc.local")
+  source /etc/vim/vimrc.local
+endif
+" }}}
+
+" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker :
+
diff --git a/app-editors/vim-core/vim-core-7.0_beta.ebuild b/app-editors/vim-core/vim-core-7.0_beta.ebuild
new file mode 100644
index 000000000000..7d8e85d5df5c
--- /dev/null
+++ b/app-editors/vim-core/vim-core-7.0_beta.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.0_beta.ebuild,v 1.1 2006/03/25 20:26:27 genstef Exp $
+
+inherit vim
+
+VIM_VERSION="7.0b"
+VIM_SNAPSHOT="vim-7.0_beta.tar.bz2"
+VIM_GENTOO_PATCHES="vim-7.0_alpha20051207-gentoo-patches.tar.bz2"
+VIMRC_FILE_SUFFIX="-r3"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${VIM_SNAPSHOT}
+	mirror://gentoo/${VIM_GENTOO_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.*}
+DESCRIPTION="vim and gvim shared files"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc-macos ~x86"
+IUSE=""
+DEPEND="${DEPEND}"
+PDEPEND="!livecd? ( app-vim/gentoo-syntax )"