Date: Wednesday, March 23, 2016 @ 19:49:09 Author: anatolik Revision: 262457
archrelease: copy trunk to testing-i686, testing-x86_64 Added: vim/repos/testing-i686/ vim/repos/testing-i686/PKGBUILD (from rev 262456, vim/trunk/PKGBUILD) vim/repos/testing-i686/archlinux.vim (from rev 262456, vim/trunk/archlinux.vim) vim/repos/testing-i686/gvim.install (from rev 262456, vim/trunk/gvim.install) vim/repos/testing-i686/vimrc (from rev 262456, vim/trunk/vimrc) vim/repos/testing-x86_64/ vim/repos/testing-x86_64/PKGBUILD (from rev 262456, vim/trunk/PKGBUILD) vim/repos/testing-x86_64/archlinux.vim (from rev 262456, vim/trunk/archlinux.vim) vim/repos/testing-x86_64/gvim.install (from rev 262456, vim/trunk/gvim.install) vim/repos/testing-x86_64/vimrc (from rev 262456, vim/trunk/vimrc) ------------------------------+ testing-i686/PKGBUILD | 201 +++++++++++++++++++++++++++++++++++++++++ testing-i686/archlinux.vim | 25 +++++ testing-i686/gvim.install | 15 +++ testing-i686/vimrc | 16 +++ testing-x86_64/PKGBUILD | 201 +++++++++++++++++++++++++++++++++++++++++ testing-x86_64/archlinux.vim | 25 +++++ testing-x86_64/gvim.install | 15 +++ testing-x86_64/vimrc | 16 +++ 8 files changed, 514 insertions(+) Copied: vim/repos/testing-i686/PKGBUILD (from rev 262456, vim/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-03-23 18:49:09 UTC (rev 262457) @@ -0,0 +1,201 @@ +# $Id$ +# Maintainer: Anatol Pomozov <anatol.pomo...@gmail.com> +# Contributor: Thomas Dziedzic <gos...@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> +# Contributor: tobias [ tobias at archlinux org ] +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgbase=vim +pkgname=(vim gvim vim-runtime) +pkgver=7.4.1639 +_versiondir=74 +pkgrel=1 +arch=(i686 x86_64) +license=('custom:vim') +url='http://www.vim.org' +makedepends=(gpm python2 python ruby libxt desktop-file-utils gtk2 gtk3 lua gawk tcl) +source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz + vimrc + archlinux.vim) +sha1sums=('b116ce38e00b6d93e1f76bdcda52f93f3e8dee6c' + '15ebf3f48693f1f219fe2d8edb7643683139eb6b' + '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2') + +prepare() { + cd vim-$pkgver/src + + # define the place for the global (g)vimrc file (set to /etc/vimrc) + sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' feature.h + sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' feature.h + + autoconf + + cd "$srcdir" + cp -a vim-$pkgver gvim-$pkgver +} + +build() { + cd "${srcdir}"/vim-$pkgver + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Arch Linux' \ + --enable-gpm \ + --enable-acl \ + --with-x=no \ + --disable-gui \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp=dynamic \ + --enable-pythoninterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp=dynamic \ + --enable-luainterp=dynamic \ + --enable-tclinterp=dynamic + make + + cd "${srcdir}"/gvim-$pkgver + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Arch Linux' \ + --enable-gpm \ + --enable-acl \ + --with-x=yes \ + --enable-gui=gtk2 \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp=dynamic \ + --enable-pythoninterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp=dynamic \ + --enable-luainterp=dynamic \ + --enable-tclinterp=dynamic + make +} + +check() { + # disable tests because they seem to freeze + cd "${srcdir}"/vim-$pkgver + #make test + + cd "${srcdir}"/gvim-$pkgver + #make test +} + +package_vim-runtime() { + pkgdesc='Runtime for vim and gvim' + backup=('etc/vimrc') + + cd "${srcdir}"/vim-$pkgver + + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + # man and bin files belong to 'vim' + rm -r "${pkgdir}"/usr/share/man/ "${pkgdir}"/usr/bin/ + + # Don't forget logtalk.dict + install -Dm644 runtime/ftplugin/logtalk.dict \ + "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/logtalk.dict + + # fix FS#17216 + sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ + "${pkgdir}"/usr/share/vim/vim${_versiondir}/filetype.vim + + # patch filetype.vim for better handling of pacman related files + sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ + "${pkgdir}"/usr/share/vim/vim${_versiondir}/filetype.vim + sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ + "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/changelog.vim + + # rc files + install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc + install -Dm644 "${srcdir}"/archlinux.vim \ + "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim + + # rgb.txt file + install -Dm644 runtime/rgb.txt \ + "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt + + # license + install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime + ln -s /usr/share/vim/vim${_versiondir}/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt +} + +package_vim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl') + optdepends=('python2: Python 2 language support' + 'python: Python 3 language support' + 'ruby: Ruby language support' + 'lua: Lua language support' + 'perl: Perl language support' + 'tcl: Tcl language support') + conflicts=('gvim' 'vim-minimal' 'vim-python3') + provides=('xxd' 'vim-minimal' 'vim-python3') + replaces=('vim-python3' 'vim-minimal') + + cd "${srcdir}"/vim-$pkgver + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + rm -f evim.1 # this does not make sense if we have no GUI + done + + # Runtime provided by runtime package + rm -r "${pkgdir}"/usr/share/vim + + # license + install -Dm644 runtime/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} + +package_gvim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'desktop-file-utils' 'gtk2') + optdepends=('python2: Python 2 language support' + 'python: Python 3 language support' + 'ruby: Ruby language support' + 'lua: Lua language support' + 'perl: Perl language support' + 'tcl: Tcl language support') + provides=("vim=${pkgver}-${pkgrel}" "xxd") + conflicts=('vim-minimal' 'vim') + replaces=('gvim-python3') + install=gvim.install + + cd "${srcdir}"/gvim-$pkgver + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + done + + # need to remove since this is provided by vim-runtime + rm -r "${pkgdir}"/usr/share/vim + + # freedesktop links + install -Dm644 runtime/gvim.desktop "${pkgdir}"/usr/share/applications/gvim.desktop + install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png + + # license + install -Dm644 runtime/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} Copied: vim/repos/testing-i686/archlinux.vim (from rev 262456, vim/trunk/archlinux.vim) =================================================================== --- testing-i686/archlinux.vim (rev 0) +++ testing-i686/archlinux.vim 2016-03-23 18:49:09 UTC (rev 262457) @@ -0,0 +1,25 @@ +" The ArchLinux global vimrc - setting only a few sane defaults +" +" Maintainer: Thomas Dziedzic [gos...@gmail.com] +" +" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION +" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc + +" Normally we use vim-extensions. If you want true vi-compatibility +" remove change the following statements +set nocompatible " Use Vim defaults instead of 100% vi compatibility +set backspace=indent,eol,start " more powerful backspacing + +" Now we set some defaults for the editor +set history=50 " keep 50 lines of command line history +set ruler " show the cursor position all the time + +" Suffixes that get lower priority when doing tab completion for filenames. +" These are files we are not likely to want to edit or read. +set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc,.png,.jpg + +if has('gui_running') + " Make shift-insert work like in Xterm + map <S-Insert> <MiddleMouse> + map! <S-Insert> <MiddleMouse> +endif Copied: vim/repos/testing-i686/gvim.install (from rev 262456, vim/trunk/gvim.install) =================================================================== --- testing-i686/gvim.install (rev 0) +++ testing-i686/gvim.install 2016-03-23 18:49:09 UTC (rev 262457) @@ -0,0 +1,15 @@ +update_desktop_database() { + update-desktop-database --quiet +} + +post_install() { + update_desktop_database +} + +post_upgrade() { + update_desktop_database +} + +post_remove() { + update_desktop_database +} Copied: vim/repos/testing-i686/vimrc (from rev 262456, vim/trunk/vimrc) =================================================================== --- testing-i686/vimrc (rev 0) +++ testing-i686/vimrc 2016-03-23 18:49:09 UTC (rev 262457) @@ -0,0 +1,16 @@ +" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just +" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime +" you can find below. If you wish to change any of those settings, you should +" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten +" everytime an upgrade of the vim packages is performed. It is recommended to +" make changes after sourcing archlinux.vim since it alters the value of the +" 'compatible' option. + +" This line should not be removed as it ensures that various options are +" properly set to work with the Vim-related packages. +runtime! archlinux.vim + +" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' +" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual +" and configure vim to your own liking! + Copied: vim/repos/testing-x86_64/PKGBUILD (from rev 262456, vim/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-03-23 18:49:09 UTC (rev 262457) @@ -0,0 +1,201 @@ +# $Id$ +# Maintainer: Anatol Pomozov <anatol.pomo...@gmail.com> +# Contributor: Thomas Dziedzic <gos...@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> +# Contributor: tobias [ tobias at archlinux org ] +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgbase=vim +pkgname=(vim gvim vim-runtime) +pkgver=7.4.1639 +_versiondir=74 +pkgrel=1 +arch=(i686 x86_64) +license=('custom:vim') +url='http://www.vim.org' +makedepends=(gpm python2 python ruby libxt desktop-file-utils gtk2 gtk3 lua gawk tcl) +source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz + vimrc + archlinux.vim) +sha1sums=('b116ce38e00b6d93e1f76bdcda52f93f3e8dee6c' + '15ebf3f48693f1f219fe2d8edb7643683139eb6b' + '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2') + +prepare() { + cd vim-$pkgver/src + + # define the place for the global (g)vimrc file (set to /etc/vimrc) + sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' feature.h + sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' feature.h + + autoconf + + cd "$srcdir" + cp -a vim-$pkgver gvim-$pkgver +} + +build() { + cd "${srcdir}"/vim-$pkgver + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Arch Linux' \ + --enable-gpm \ + --enable-acl \ + --with-x=no \ + --disable-gui \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp=dynamic \ + --enable-pythoninterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp=dynamic \ + --enable-luainterp=dynamic \ + --enable-tclinterp=dynamic + make + + cd "${srcdir}"/gvim-$pkgver + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Arch Linux' \ + --enable-gpm \ + --enable-acl \ + --with-x=yes \ + --enable-gui=gtk2 \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp=dynamic \ + --enable-pythoninterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp=dynamic \ + --enable-luainterp=dynamic \ + --enable-tclinterp=dynamic + make +} + +check() { + # disable tests because they seem to freeze + cd "${srcdir}"/vim-$pkgver + #make test + + cd "${srcdir}"/gvim-$pkgver + #make test +} + +package_vim-runtime() { + pkgdesc='Runtime for vim and gvim' + backup=('etc/vimrc') + + cd "${srcdir}"/vim-$pkgver + + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + # man and bin files belong to 'vim' + rm -r "${pkgdir}"/usr/share/man/ "${pkgdir}"/usr/bin/ + + # Don't forget logtalk.dict + install -Dm644 runtime/ftplugin/logtalk.dict \ + "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/logtalk.dict + + # fix FS#17216 + sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ + "${pkgdir}"/usr/share/vim/vim${_versiondir}/filetype.vim + + # patch filetype.vim for better handling of pacman related files + sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ + "${pkgdir}"/usr/share/vim/vim${_versiondir}/filetype.vim + sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ + "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/changelog.vim + + # rc files + install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc + install -Dm644 "${srcdir}"/archlinux.vim \ + "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim + + # rgb.txt file + install -Dm644 runtime/rgb.txt \ + "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt + + # license + install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime + ln -s /usr/share/vim/vim${_versiondir}/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt +} + +package_vim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl') + optdepends=('python2: Python 2 language support' + 'python: Python 3 language support' + 'ruby: Ruby language support' + 'lua: Lua language support' + 'perl: Perl language support' + 'tcl: Tcl language support') + conflicts=('gvim' 'vim-minimal' 'vim-python3') + provides=('xxd' 'vim-minimal' 'vim-python3') + replaces=('vim-python3' 'vim-minimal') + + cd "${srcdir}"/vim-$pkgver + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + rm -f evim.1 # this does not make sense if we have no GUI + done + + # Runtime provided by runtime package + rm -r "${pkgdir}"/usr/share/vim + + # license + install -Dm644 runtime/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} + +package_gvim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'desktop-file-utils' 'gtk2') + optdepends=('python2: Python 2 language support' + 'python: Python 3 language support' + 'ruby: Ruby language support' + 'lua: Lua language support' + 'perl: Perl language support' + 'tcl: Tcl language support') + provides=("vim=${pkgver}-${pkgrel}" "xxd") + conflicts=('vim-minimal' 'vim') + replaces=('gvim-python3') + install=gvim.install + + cd "${srcdir}"/gvim-$pkgver + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + done + + # need to remove since this is provided by vim-runtime + rm -r "${pkgdir}"/usr/share/vim + + # freedesktop links + install -Dm644 runtime/gvim.desktop "${pkgdir}"/usr/share/applications/gvim.desktop + install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png + + # license + install -Dm644 runtime/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} Copied: vim/repos/testing-x86_64/archlinux.vim (from rev 262456, vim/trunk/archlinux.vim) =================================================================== --- testing-x86_64/archlinux.vim (rev 0) +++ testing-x86_64/archlinux.vim 2016-03-23 18:49:09 UTC (rev 262457) @@ -0,0 +1,25 @@ +" The ArchLinux global vimrc - setting only a few sane defaults +" +" Maintainer: Thomas Dziedzic [gos...@gmail.com] +" +" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION +" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc + +" Normally we use vim-extensions. If you want true vi-compatibility +" remove change the following statements +set nocompatible " Use Vim defaults instead of 100% vi compatibility +set backspace=indent,eol,start " more powerful backspacing + +" Now we set some defaults for the editor +set history=50 " keep 50 lines of command line history +set ruler " show the cursor position all the time + +" Suffixes that get lower priority when doing tab completion for filenames. +" These are files we are not likely to want to edit or read. +set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc,.png,.jpg + +if has('gui_running') + " Make shift-insert work like in Xterm + map <S-Insert> <MiddleMouse> + map! <S-Insert> <MiddleMouse> +endif Copied: vim/repos/testing-x86_64/gvim.install (from rev 262456, vim/trunk/gvim.install) =================================================================== --- testing-x86_64/gvim.install (rev 0) +++ testing-x86_64/gvim.install 2016-03-23 18:49:09 UTC (rev 262457) @@ -0,0 +1,15 @@ +update_desktop_database() { + update-desktop-database --quiet +} + +post_install() { + update_desktop_database +} + +post_upgrade() { + update_desktop_database +} + +post_remove() { + update_desktop_database +} Copied: vim/repos/testing-x86_64/vimrc (from rev 262456, vim/trunk/vimrc) =================================================================== --- testing-x86_64/vimrc (rev 0) +++ testing-x86_64/vimrc 2016-03-23 18:49:09 UTC (rev 262457) @@ -0,0 +1,16 @@ +" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just +" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime +" you can find below. If you wish to change any of those settings, you should +" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten +" everytime an upgrade of the vim packages is performed. It is recommended to +" make changes after sourcing archlinux.vim since it alters the value of the +" 'compatible' option. + +" This line should not be removed as it ensures that various options are +" properly set to work with the Vim-related packages. +runtime! archlinux.vim + +" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' +" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual +" and configure vim to your own liking! +