From b390c75967aa6e7dc67aaf488d980f692d9a6a8d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 2 Sep 2014 07:27:51 -0300 Subject: vim-runtime: remove parabola suffix, add complex pkgrel and add vim-runtime in provides array with the same pkgrel than Arch to solve requirements of the vim packages --- libre/vim-runtime-parabola/PKGBUILD | 107 -------------------------------- libre/vim-runtime-parabola/parabola.vim | 26 -------- libre/vim-runtime-parabola/vimrc | 16 ----- libre/vim-runtime/PKGBUILD | 107 ++++++++++++++++++++++++++++++++ libre/vim-runtime/parabola.vim | 26 ++++++++ libre/vim-runtime/vimrc | 16 +++++ 6 files changed, 149 insertions(+), 149 deletions(-) delete mode 100644 libre/vim-runtime-parabola/PKGBUILD delete mode 100644 libre/vim-runtime-parabola/parabola.vim delete mode 100644 libre/vim-runtime-parabola/vimrc create mode 100644 libre/vim-runtime/PKGBUILD create mode 100644 libre/vim-runtime/parabola.vim create mode 100644 libre/vim-runtime/vimrc diff --git a/libre/vim-runtime-parabola/PKGBUILD b/libre/vim-runtime-parabola/PKGBUILD deleted file mode 100644 index a3a410e6f..000000000 --- a/libre/vim-runtime-parabola/PKGBUILD +++ /dev/null @@ -1,107 +0,0 @@ -# Maintainer (Arch): Thomas Dziedzic -# Contributor (Arch): Jan "heftig" Steffens -# Contributor (Arch): tobias [ tobias at archlinux org ] -# Contributor (Arch): Daniel J Griffiths -# Maintainer: André Silva -# Contributor: Márcio Silva - -pkgbase=vim -_pkgname=vim-runtime -pkgname=vim-runtime-parabola -_topver=7.4 -_patchlevel=410 -__hgrev=7af530381fec -_versiondir="vim${_topver//./}" -pkgver=${_topver}.${_patchlevel} -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -license=('custom:vim') -url="http://www.vim.org" -makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') -source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" - "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" - 'vimrc' - 'parabola.vim') -md5sums=('8e9722fbd9ddc3c05d21210939c23f23' - 'SKIP' - '27820c2bdc34624674c561ae6476bc6a' - '41c9a52bbd972f009437450a003ad3cd') - -build() { - # define the place for the global (g)vimrc file (set to /etc/vimrc) - sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ - ${pkgbase}-${pkgver}/src/feature.h - sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ - ${pkgbase}-${pkgver}/src/feature.h - - cp -a ${pkgbase}-${pkgver} ${pkgbase}-build - - cd "${srcdir}"/vim-build - - ./configure \ - --prefix=/usr \ - --localstatedir=/var/lib/vim \ - --with-features=huge \ - --with-compiledby='Parabola GNU/Linux-libre' \ - --enable-gpm \ - --enable-acl \ - --with-x=yes \ - --enable-gui=gtk2 \ - --enable-multibyte \ - --enable-cscope \ - --enable-netbeans \ - --enable-perlinterp \ - --enable-pythoninterp \ - --disable-python3interp \ - --enable-rubyinterp \ - --enable-luainterp - - make -} - -package_vim-runtime-parabola() { - pkgdesc='Runtime for vim and gvim (Parabola rebranded)' - depends=('perl' 'gawk') - backup=('etc/vimrc') - replaces=($_pkgname) - conflicts=($_pkgname) - provides=($_pkgname=$pkgver) - - cd "${srcdir}"/vim-build - - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # delete binaries and manual files - rm -vr "${pkgdir}"/usr/bin - rm -vr "${pkgdir}"/usr/share/man - - # Don't forget logtalk.dict - install -Dm644 "${srcdir}"/vim-build/runtime/ftplugin/logtalk.dict \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict - - # fix FS#17216 - sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ - "${pkgdir}"/usr/share/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/${_versiondir}/filetype.vim - sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim - - # rc files - install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc - install -Dm644 "${srcdir}"/parabola.vim \ - "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim - - # rgb.txt file - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ - "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt - - # license - install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime - ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt -} - -# vim:set sw=2 sts=2 et: diff --git a/libre/vim-runtime-parabola/parabola.vim b/libre/vim-runtime-parabola/parabola.vim deleted file mode 100644 index 3db882946..000000000 --- a/libre/vim-runtime-parabola/parabola.vim +++ /dev/null @@ -1,26 +0,0 @@ -" The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults -" -" Maintainer: Thomas Dziedzic [gostrc@gmail.com] -" Maintainer for Parabola rebranding: André Silva [emulatorman@parabola.nu] -" -" 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 - map! -endif diff --git a/libre/vim-runtime-parabola/vimrc b/libre/vim-runtime-parabola/vimrc deleted file mode 100644 index fc67e7eb0..000000000 --- a/libre/vim-runtime-parabola/vimrc +++ /dev/null @@ -1,16 +0,0 @@ -" All system-wide defaults are set in $VIMRUNTIME/parabola.vim (usually just -" /usr/share/vim/vimfiles/parabola.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 parabola.vim will be overwritten -" everytime an upgrade of the vim packages is performed. It is recommended to -" make changes after sourcing parabola.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! parabola.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! - diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD new file mode 100644 index 000000000..2a3d40b03 --- /dev/null +++ b/libre/vim-runtime/PKGBUILD @@ -0,0 +1,107 @@ +# Maintainer (Arch): Thomas Dziedzic +# Contributor (Arch): Jan "heftig" Steffens +# Contributor (Arch): tobias [ tobias at archlinux org ] +# Contributor (Arch): Daniel J Griffiths +# Maintainer: André Silva +# Contributor: Márcio Silva + +pkgbase=vim +pkgname=vim-runtime +_topver=7.4 +_patchlevel=410 +__hgrev=7af530381fec +_versiondir="vim${_topver//./}" +pkgver=${_topver}.${_patchlevel} +_pkgrel=1 +pkgrel=1.parabola1 +arch=('i686' 'x86_64' 'mips64el') +license=('custom:vim') +url="http://www.vim.org" +makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') +source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" + "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" + 'vimrc' + 'parabola.vim') +md5sums=('8e9722fbd9ddc3c05d21210939c23f23' + 'SKIP' + '27820c2bdc34624674c561ae6476bc6a' + '41c9a52bbd972f009437450a003ad3cd') + +build() { + # define the place for the global (g)vimrc file (set to /etc/vimrc) + sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ + ${pkgbase}-${pkgver}/src/feature.h + sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ + ${pkgbase}-${pkgver}/src/feature.h + + cp -a ${pkgbase}-${pkgver} ${pkgbase}-build + + cd "${srcdir}"/vim-build + + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Parabola GNU/Linux-libre' \ + --enable-gpm \ + --enable-acl \ + --with-x=yes \ + --enable-gui=gtk2 \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp \ + --enable-pythoninterp \ + --disable-python3interp \ + --enable-rubyinterp \ + --enable-luainterp + + make +} + +package_vim-runtime() { + pkgdesc='Runtime for vim and gvim (Parabola rebranded)' + depends=('perl' 'gawk') + backup=('etc/vimrc') + replaces=(${pkgname}-parabola) + conflicts=(${pkgname}-parabola) + provides=(${pkgname}=${pkgver}-${_pkgrel}) + + cd "${srcdir}"/vim-build + + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # delete binaries and manual files + rm -vr "${pkgdir}"/usr/bin + rm -vr "${pkgdir}"/usr/share/man + + # Don't forget logtalk.dict + install -Dm644 "${srcdir}"/vim-build/runtime/ftplugin/logtalk.dict \ + "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict + + # fix FS#17216 + sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ + "${pkgdir}"/usr/share/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/${_versiondir}/filetype.vim + sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ + "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim + + # rc files + install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc + install -Dm644 "${srcdir}"/parabola.vim \ + "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim + + # rgb.txt file + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ + "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt + + # license + install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt +} + +# vim:set sw=2 sts=2 et: diff --git a/libre/vim-runtime/parabola.vim b/libre/vim-runtime/parabola.vim new file mode 100644 index 000000000..3db882946 --- /dev/null +++ b/libre/vim-runtime/parabola.vim @@ -0,0 +1,26 @@ +" The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults +" +" Maintainer: Thomas Dziedzic [gostrc@gmail.com] +" Maintainer for Parabola rebranding: André Silva [emulatorman@parabola.nu] +" +" 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 + map! +endif diff --git a/libre/vim-runtime/vimrc b/libre/vim-runtime/vimrc new file mode 100644 index 000000000..fc67e7eb0 --- /dev/null +++ b/libre/vim-runtime/vimrc @@ -0,0 +1,16 @@ +" All system-wide defaults are set in $VIMRUNTIME/parabola.vim (usually just +" /usr/share/vim/vimfiles/parabola.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 parabola.vim will be overwritten +" everytime an upgrade of the vim packages is performed. It is recommended to +" make changes after sourcing parabola.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! parabola.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! + -- cgit v1.2.3-54-g00ecf