vim-7.4.1063-1.parabola1: updating version

* merge python3 support into {g,}vim package; FS#47500 -> https://bugs.archlinux.org/task/47500
* this allows to move Perl, Lua and Ruby into package optional dependencies. in the future it allows to eliminate vim-minimal package as its list of dependencies is the same as for vim.

2 files changed, 39 insertions, 200 deletions

diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index 2fd675401..589a211ad 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 257342 2015-12-28 22:05:35Z foutrelis $
+# $Id: PKGBUILD 257650 2016-01-08 21:26:32Z anatolik $
 # Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>
 # Contributor (Arch): Thomas Dziedzic <gostrc@gmail.com>
 # Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com>
@@ -8,22 +8,20 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=vim
-pkgname=(vim-minimal vim vim-python3 gvim gvim-python3 vim-runtime)
-pkgver=7.4.944
+pkgname=(vim-minimal vim gvim vim-runtime)
+pkgver=7.4.1063
 _versiondir=74
-pkgrel=2.parabola1
+pkgrel=1.parabola1
 arch=(i686 x86_64)
 license=('custom:vim')
 url='http://www.vim.org'
-makedepends=(gpm python2 python ruby libxt desktop-file-utils gtk2 lua)
+makedepends=(gpm python2 python ruby libxt desktop-file-utils gtk2 lua gawk)
 source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz
         vimrc
-        parabola.vim
-        gvim.desktop)
-sha1sums=('a670bd0a8417363d757341e1435474b42dd3ca75'
+        parabola.vim)
+sha1sums=('2efe8f5454b37ff234d93d1e146db2e616732753'
           '7bacf26cb66f6c36184a62bc306ef33bfe892686'
-          'a72ca0f8d941ff221598091338d9c1bf75a3494b'
-          '4a579cf66590d711f49c5dfb4a25e5df116ff7ba')
+          'a72ca0f8d941ff221598091338d9c1bf75a3494b')
 
 prepare() {
   cd vim-$pkgver
@@ -58,7 +56,7 @@ build() {
     --enable-multibyte \
     --enable-cscope \
     --disable-netbeans \
-    --enable-perlinterp \
+    --disable-perlinterp \
     --disable-pythoninterp \
     --disable-python3interp \
     --disable-rubyinterp \
@@ -80,7 +78,7 @@ build() {
     --enable-multibyte \
     --enable-cscope \
     --disable-netbeans \
-    --enable-perlinterp \
+    --disable-perlinterp \
     --disable-pythoninterp \
     --disable-python3interp \
     --disable-rubyinterp \
@@ -102,33 +100,11 @@ build() {
     --enable-multibyte \
     --enable-cscope \
     --enable-netbeans \
-    --enable-perlinterp \
-    --enable-pythoninterp \
-    --disable-python3interp \
-    --enable-rubyinterp \
-    --enable-luainterp
-
-  make
-
-  cd "${srcdir}"/vim-python3-build
-
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var/lib/vim \
-    --with-features=huge \
-    --with-compiledby='Parabola GNU/Linux-libre' \
-    --enable-gpm \
-    --enable-acl \
-    --with-x=no \
-    --disable-gui \
-    --enable-multibyte \
-    --enable-cscope \
-    --enable-netbeans \
-    --enable-perlinterp \
-    --disable-pythoninterp \
-    --enable-python3interp \
-    --enable-rubyinterp \
-    --enable-luainterp
+    --enable-perlinterp=dynamic \
+    --enable-pythoninterp=dynamic \
+    --enable-python3interp=dynamic \
+    --enable-rubyinterp=dynamic \
+    --enable-luainterp=dynamic
 
   make
 
@@ -146,33 +122,11 @@ build() {
     --enable-multibyte \
     --enable-cscope \
     --enable-netbeans \
-    --enable-perlinterp \
-    --enable-pythoninterp \
-    --disable-python3interp \
-    --enable-rubyinterp \
-    --enable-luainterp
-
-  make
-
-  cd "${srcdir}"/gvim-python3-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 \
-    --disable-pythoninterp \
-    --enable-python3interp \
-    --enable-rubyinterp \
-    --enable-luainterp
+    --enable-perlinterp=dynamic \
+    --enable-pythoninterp=dynamic \
+    --enable-python3interp=dynamic \
+    --enable-rubyinterp=dynamic \
+    --enable-luainterp=dynamic
 
   make
 }
@@ -189,7 +143,7 @@ check() {
 package_vim-minimal() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with a minimal set of dependencies)'
   depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl')
-  conflicts=('vim' 'vim-python3' 'gvim' 'gvim-python3')
+  conflicts=('vim' 'gvim')
   provides=("vim=${pkgver}-${pkgrel}" "xxd")
 
   cd "${srcdir}"/vim-minimal-build
@@ -216,9 +170,15 @@ package_vim-minimal() {
 
 package_vim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with support for additional scripting languages)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'python2' 'acl')
-  conflicts=('vim-minimal' 'vim-python3' 'gvim' 'gvim-python3')
-  provides=("xxd")
+  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')
+  conflicts=('vim-minimal' 'gvim')
+  provides=('xxd')
+  replaces=('vim-python3')
 
   cd "${srcdir}"/vim-build
   make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
@@ -242,40 +202,17 @@ package_vim() {
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
-package_vim-python3() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with support for additional scripting languages)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'lua' 'python' 'acl')
-  conflicts=('vim-minimal' 'vim' 'gvim' 'gvim-python3')
-  provides=("vim=${pkgver}-${pkgrel}" "xxd")
-
-  cd "${srcdir}"/vim-python3-build
-  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' 'ruby' 'libxt'
-           'desktop-file-utils' 'gtk2' 'lua' 'python2')
+  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')
   provides=("vim=${pkgver}-${pkgrel}" "xxd")
-  conflicts=('vim-minimal' 'vim' 'vim-python3' 'gvim-python3')
+  conflicts=('vim-minimal' 'vim')
+  replaces=('gvim-python3')
   install=gvim.install
 
   cd "${srcdir}"/gvim-build
@@ -295,42 +232,7 @@ package_gvim() {
   rm -r "${pkgdir}"/usr/share/vim
 
   # freedesktop links
-  install -Dm644 "${srcdir}"/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
-}
-
-package_gvim-python3() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI) with python 3 support'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
-           'desktop-file-utils' 'gtk2' 'lua' 'python')
-  provides=("vim=${pkgver}-${pkgrel}" "gvim=${pkgver}-${pkgrel}" "xxd")
-  conflicts=('vim-minimal' 'vim' 'vim-python3' 'gvim')
-  install=gvim.install
-
-  cd "${srcdir}"/gvim-python3-build
-  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 "${srcdir}"/gvim.desktop \
-    "${pkgdir}"/usr/share/applications/gvim.desktop
+  install -Dm644 runtime/gvim.desktop "${pkgdir}"/usr/share/applications/gvim.desktop
   install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
 
   # license
diff --git a/libre/vim/gvim.desktop b/libre/vim/gvim.desktop
deleted file mode 100644
index 675357da5..000000000
--- a/libre/vim/gvim.desktop
+++ /dev/null
@@ -1,63 +0,0 @@
-[Desktop Entry]
-Name=Vi IMproved
-Name[bg]=Vi Ðåäàêòîð
-Name[ca]=Vi Millorat
-Name[da]=Vi forbedret
-Name[eo]=VIM
-Name[et]=Täiustatud Vi (vim)
-Name[fr]=Vi étendu (VIM)
-Name[he]=רפושמ Vi
-Name[hu]=Vi
-Name[is]=Vi IMproved ritillinn
-Name[it]=Vi iMproved
-Name[no]=Vi IMproved (forbedret VI)
-Name[pl]=Poprawiony VI (vim)
-Name[ro]=VIM
-Name[ru]=Улучшенный VI
-Name[sk]=Vi IMpreved
-Name[sl]=Izboljšani vi (vim)
-Name[sv]=Förbättrad Vi
-Name[zh_CN.GB2312]=改进的 Vi
-Comment=Powerful text editor with scripting functions and macro recorder
-Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
-Comment[ca]=Editor vi potent
-Comment[cs]=Mocný textový editor vi
-Comment[da]=En kraftig vi tekstbehandler
-Comment[de]=Ein leistungsfähiger vi-Editor
-Comment[el]=Πανίσχυρος διορθωτής vi
-Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
-Comment[es]=Una versión mejorada del editor vi
-Comment[et]=Võimas tekstiredaktor vi
-Comment[fi]=Tehokas vi-tekstieditori
-Comment[fr]=Éditeur vi puissant
-Comment[gl]=Potente editor vi
-Comment[he]=Vi המצועה בר ךרועה
-Comment[hr]=Napredni vi uređivač
-Comment[hu]=Vi szövegszerkesztő
-Comment[is]=Öflug útgáfa vi ritilsins
-Comment[it]=Un editor vi potenziato
-Comment[ja]=強力なViエディタ
-Comment[lt]=Galingas vi redaktorius
-Comment[mk]=Моќен VI уредувач
-Comment[nl]=Krachtige vi-editor
-Comment[no]=En kraftig vi-redigerer
-Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
-Comment[pl]=Edytor vi
-Comment[pt]=Um poderoso editor de texto
-Comment[ro]=Un editor de texte VI, puternic
-Comment[ru]=Мощный текстовый редактор vi
-Comment[sk]=Silný textový procesor vi
-Comment[sl]=Zmogljivi urejevalnik vi
-Comment[sr]=Moćni vi editor
-Comment[sv]=En kraftfull texteditor
-Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
-Comment[tr]=Güçlü vi düzenleyicisi
-Comment[uk]=Потужний редактор vi
-Comment[zh_CN.GB2312]=功能强大的 vi 编辑器
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=gvim -f %F
-Icon=gvim
-Type=Application
-Terminal=false
-X-XClassHintResName=VIM
-Categories=Utility;TextEditor;