Update runtime snapshot to 20050809. Include grub syntax highlighting fix from Toralf Förster, bug #96155. Include check for empty &shell, bug #101665. Default sh syntax highlighting mode is now bash rather than ksh, bug #101819.

(Portage version: 2.0.51.22-r2 flaming goat edition)

5 files changed, 234 insertions, 20 deletions

diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 07ced50ed380..3c0a009ae4bd 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.164 2005/07/23 21:59:06 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.165 2005/08/09 16:26:02 ciaranm Exp $
+
+*vim-core-6.3.084-r1 (09 Aug 2005)
+
+  09 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org> +files/vimrc-r2,
+  +vim-core-6.3.084-r1.ebuild:
+  Update runtime snapshot to 20050809. Include grub syntax highlighting fix
+  from Toralf Förster, bug #96155. Include check for empty &shell, bug
+  #101665. Default sh syntax highlighting mode is now bash rather than ksh,
+  bug #101819.
 
   23 Jul 2005; Hardave Riar <hardave@gentoo.org> vim-core-6.3.084.ebuild:
   Stable on mips, bug #99578.
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 4b4beaaef58e..ced3ece6dd30 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,28 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3dc6ecd27c606a420beb6f7a8f3c76b6 vim-core-7.0_alpha20050622.ebuild 827
-MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
+MD5 e3bd3fbd47b779a02d6977dc95fda06b vim-core-6.3.075.ebuild 1049
+MD5 fc0e948688cb0090641f55c6664e0752 vim-core-6.3.084-r1.ebuild 1058
+MD5 fcc1e01f80bdca4b49cd8a54bbafe814 vim-core-6.3.068.ebuild 1046
+MD5 88911c9921b102652a3232483dcfc0bb vim-core-7.0_alpha20050721.ebuild 828
 MD5 d508e596b3e60137b87bd13e79b547a3 vim-core-6.3.074.ebuild 1059
+MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 MD5 ba6cf7f0e3d94d0e42bf15179b05aa69 vim-core-6.3.084.ebuild 1047
-MD5 88911c9921b102652a3232483dcfc0bb vim-core-7.0_alpha20050721.ebuild 828
-MD5 e3bd3fbd47b779a02d6977dc95fda06b vim-core-6.3.075.ebuild 1049
 MD5 226025732f3ce8d1e1427755c7abd873 ChangeLog 22292
-MD5 fcc1e01f80bdca4b49cd8a54bbafe814 vim-core-6.3.068.ebuild 1046
-MD5 ba542e54d91a04a85435253ae35301b6 files/xxd-completion 461
-MD5 19ec579aa1b1e8a0a37abee13838267c files/digest-vim-core-6.3.074 418
+MD5 791270327501321f14a4d1f0d4ffd953 files/vimrc-r2 6071
 MD5 5d338faaea218fdda249b4725aa31f82 files/digest-vim-core-6.3.084 419
+MD5 19ec579aa1b1e8a0a37abee13838267c files/digest-vim-core-6.3.074 418
+MD5 7c733202ff77d34df50039b42d153521 files/digest-vim-core-6.3.084-r1 425
+MD5 2ad354160ca3635ea115beb56e237e7c files/vimrc 3879
+MD5 ba542e54d91a04a85435253ae35301b6 files/xxd-completion 461
+MD5 266f8b682476da0ec6c4d39de5a79264 files/vimrc-r1 5728
 MD5 09ddb27b09622238519d236eee139298 files/digest-vim-core-7.0_alpha20050721 156
 MD5 49f34fea09c3041dba7daa3a6cb05c85 files/digest-vim-core-6.3.075 418
+MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
 MD5 ee43986336dcd1bd970b36075692c1a1 files/digest-vim-core-6.3.068 418
 MD5 99a85c2440380af0bbf6b80277429940 files/digest-vim-core-7.0_alpha20050622 157
-MD5 2ad354160ca3635ea115beb56e237e7c files/vimrc 3879
-MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
-MD5 266f8b682476da0ec6c4d39de5a79264 files/vimrc-r1 5728
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC41qUgIKl8Uu19MoRAo7DAJ9lm1kuVX183eLhzdQDpzINbzM8agCdFsRX
-fiPrN8VzUQ/9jI6hJuUmHyg=
-=HhZH
------END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/files/digest-vim-core-6.3.084-r1 b/app-editors/vim-core/files/digest-vim-core-6.3.084-r1
new file mode 100644
index 000000000000..8751f4ab1b1d
--- /dev/null
+++ b/app-editors/vim-core/files/digest-vim-core-6.3.084-r1
@@ -0,0 +1,6 @@
+MD5 821fda8f14d674346b87e3ef9cb96389 vim-6.3.tar.bz2 3699397
+MD5 5395c4dacbf1c5008b22c4b86794e8a7 vim-6.3-lang.tar.gz 1057792
+MD5 8975fba453dbc1e417afa37ca2ee0d51 vim-6.3.084-r1-gentoo-patches.tar.bz2 14856
+MD5 d174031e95005c77b465b1b6337da9b8 vim-runtime-20050809.tar.bz2 2204695
+MD5 8435211dac0c5a483c8503c48bcfd1de vim-6.3.084-r1-netrw.tar.bz2 37900
+MD5 6e31a11e8b0daf4b2583ffce04455c6b vim-6.3.084-patches.tar.bz2 108605
diff --git a/app-editors/vim-core/files/vimrc-r2 b/app-editors/vim-core/files/vimrc-r2
new file mode 100644
index 000000000000..21a1c72627ec
--- /dev/null
+++ b/app-editors/vim-core/files/vimrc-r2
@@ -0,0 +1,179 @@
+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-r2,v 1.1 2005/08/09 16:26:02 ciaranm 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
+
+" 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"
+  " Previously we would unset t_RV to prevent gnome-terminal from beeping as
+  " vim started.  These days it appears that gnome-terminal has been repaired,
+  " so re-enable this, and don't restrict t_Co=8.  (21 Jun 2004 agriffis)
+  "set t_RV=			" don't check terminal version
+  "set t_Co=8
+  set t_Sb=^[4%dm
+  set t_Sf=^[3%dm
+  set ttymouse=xterm2	" only works for >=xfree86-3.3.3, should be okay
+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.
+let is_bash=1
+" }}}
+
+" {{{ 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-6.3.084-r1.ebuild b/app-editors/vim-core/vim-core-6.3.084-r1.ebuild
new file mode 100644
index 000000000000..cf7f170dc626
--- /dev/null
+++ b/app-editors/vim-core/vim-core-6.3.084-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-6.3.084-r1.ebuild,v 1.1 2005/08/09 16:26:02 ciaranm Exp $
+
+inherit vim
+
+VIM_VERSION="6.3"
+VIM_ORG_PATCHES="vim-${PV}-patches.tar.bz2"
+VIM_RUNTIME_SNAP="vim-runtime-20050809.tar.bz2"
+VIM_NETRW_SNAP="vim-${PVR}-netrw.tar.bz2"
+VIM_GENTOO_PATCHES="vim-${PVR}-gentoo-patches.tar.bz2"
+VIMRC_FILE_SUFFIX="-r2"
+
+SRC_URI="${SRC_URI}
+	ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+	nls? ( ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz )
+	mirror://gentoo/${VIM_GENTOO_PATCHES}
+	mirror://gentoo/${VIM_RUNTIME_SNAP}
+	mirror://gentoo/${VIM_NETRW_SNAP}
+	mirror://gentoo/${VIM_ORG_PATCHES}"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+DESCRIPTION="vim and gvim shared files"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nls"
+DEPEND="${DEPEND}"  # all the deps for vim-core are in vim.eclass
+PDEPEND="!livecd? ( >=app-vim/gentoo-syntax-20050515 )"