mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-28 09:01:55 +02:00
Upgraded the gentoo-syntax, vim-core Portage packages
Upgraded app-editors/vim-core to version 7.3.266 on amd64, arm, x86 Upgraded app-vim/gentoo-syntax to version 20101212 on amd64, arm, x86 BUG=chromium-os:21547 TEST=trybot chromiumos-sdk Also open ebuild file using vi in chroot. Change-Id: Ia6e1ba09f2ab750063f0533ba53640e8ba3e3077 Reviewed-on: http://gerrit.chromium.org/gerrit/9898 Tested-by: Matt Tennant <mtennant@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> Commit-Ready: Matt Tennant <mtennant@chromium.org>
This commit is contained in:
Matt Tennant
parent
fb8e4178e8
commit
f0ce64d092
200
sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vimrc-r4
vendored
Normal file
200
sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vimrc-r4
vendored
Normal file
@ -0,0 +1,200 @@
|
||||
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-r4,v 1.3 2010/04/15 19:30:32 darkside 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"
|
||||
" If we have to add this, the default encoding is not Unicode.
|
||||
" We use this fact later to revert to the default encoding in plaintext/empty
|
||||
" files.
|
||||
let g:added_fenc_utf8 = 1
|
||||
set fileencodings+=utf-8
|
||||
endif
|
||||
|
||||
" Make sure we have a sane fallback for encoding detection
|
||||
if &fileencodings !~? "default"
|
||||
set fileencodings+=default
|
||||
endif
|
||||
" }}}
|
||||
|
||||
" {{{ 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("@GENTOO_PORTAGE_EPREFIX@/bin/bash")
|
||||
set shell=@GENTOO_PORTAGE_EPREFIX@/bin/bash
|
||||
elseif executable("@GENTOO_PORTAGE_EPREFIX@/bin/sh")
|
||||
set shell=@GENTOO_PORTAGE_EPREFIX@/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
|
||||
|
||||
" If we previously detected that the default encoding is not UTF-8
|
||||
" (g:added_fenc_utf8), assume that a file with only ASCII characters (or no
|
||||
" characters at all) isn't a Unicode file, but is in the default encoding.
|
||||
" Except of course if a byte-order mark is in effect.
|
||||
autocmd BufReadPost *
|
||||
\ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" &&
|
||||
\ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
|
||||
\ set fileencoding= |
|
||||
\ endif
|
||||
|
||||
augroup END
|
||||
|
||||
endif " has("autocmd")
|
||||
" }}}
|
||||
|
||||
" {{{ vimrc.local
|
||||
if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local")
|
||||
source @GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local
|
||||
endif
|
||||
" }}}
|
||||
|
||||
" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker :
|
||||
|
||||
25
sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/xxd-completion
vendored
Normal file
25
sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/xxd-completion
vendored
Normal file
@ -0,0 +1,25 @@
|
||||
# Author: Ciaran McCreesh <ciaranm@gentoo.org>
|
||||
#
|
||||
# completion for xxd
|
||||
|
||||
_xxd()
|
||||
{
|
||||
local cur prev cmd args
|
||||
|
||||
COMPREPLY=()
|
||||
cur=${COMP_WORDS[COMP_CWORD]}
|
||||
prev=${COMP_WORDS[COMP_CWORD-1]}
|
||||
cmd=${COMP_WORDS[0]}
|
||||
|
||||
if [[ "${cur}" == -* ]] ; then
|
||||
args='-a -b -c -E -g -h -i -l -ps -r -s -u -v'
|
||||
COMPREPLY=( $( compgen -W "${args}" -- $cur ) )
|
||||
else
|
||||
_filedir
|
||||
fi
|
||||
}
|
||||
|
||||
complete -F _xxd xxd
|
||||
|
||||
# vim: set ft=sh sw=4 et sts=4 :
|
||||
|
||||
20
sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.3.266.ebuild
vendored
Normal file
20
sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.3.266.ebuild
vendored
Normal file
@ -0,0 +1,20 @@
|
||||
# Copyright 1999-2011 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.3.266.ebuild,v 1.5 2011/10/08 19:01:29 armin76 Exp $
|
||||
|
||||
EAPI=3
|
||||
VIM_VERSION="7.3"
|
||||
inherit vim
|
||||
|
||||
VIM_CORE_GENTOO_PATCHES="vim-core-${VIM_VERSION}-gentoo-patches.tar.bz2"
|
||||
VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
|
||||
VIMRC_FILE_SUFFIX="-r4"
|
||||
|
||||
SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
|
||||
http://dev.gentoo.org/~lack/vim/${VIM_CORE_GENTOO_PATCHES}
|
||||
http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
|
||||
|
||||
S="${WORKDIR}/vim${VIM_VERSION/.}"
|
||||
DESCRIPTION="vim and gvim shared files"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
47
sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-20101212.ebuild
vendored
Normal file
47
sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-20101212.ebuild
vendored
Normal file
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/gentoo-syntax-20101212.ebuild,v 1.3 2011/05/03 09:34:13 grobian Exp $
|
||||
|
||||
inherit eutils vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: Gentoo Ebuild, Eclass, GLEP, ChangeLog and Portage Files syntax highlighting, filetype and indent settings"
|
||||
HOMEPAGE="http://www.gentoo.org/"
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2"
|
||||
|
||||
LICENSE="vim"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="ignore-glep31"
|
||||
|
||||
VIM_PLUGIN_HELPFILES="gentoo-syntax"
|
||||
VIM_PLUGIN_MESSAGES="filetype"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
if use ignore-glep31 ; then
|
||||
for f in ftplugin/*.vim ; do
|
||||
ebegin "Removing UTF-8 rules from ${f} ..."
|
||||
sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
|
||||
|| die "waah! bad sed voodoo. need more goats."
|
||||
eend $?
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
vim-plugin_pkg_postinst
|
||||
if use ignore-glep31 1>/dev/null ; then
|
||||
ewarn "You have chosen to disable the rules which ensure GLEP 31"
|
||||
ewarn "compliance. When editing ebuilds, please make sure you get"
|
||||
ewarn "the character set correct."
|
||||
else
|
||||
elog "Note for developers and anyone else who edits ebuilds:"
|
||||
elog " This release of gentoo-syntax now contains filetype rules to set"
|
||||
elog " fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
|
||||
elog " If you find this feature breaks things, please submit a bug and"
|
||||
elog " assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
|
||||
elog " flag to remove these rules."
|
||||
fi
|
||||
echo
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user