update to 8.2.3412

5 files changed, 43 insertions, 140 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f807eaf86021..c57e58c9a25e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vim-clipboard
 	pkgdesc = Vi Improved, a highly configurable, improved version of the vi text editor
-	pkgver = 8.2.2891
+	pkgver = 8.2.3412
 	pkgrel = 1
 	url = https://www.vim.org
 	arch = x86_64
@@ -17,26 +17,12 @@ pkgbase = vim-clipboard
 	makedepends = tcl
 	makedepends = pcre
 	makedepends = zlib
-	source = https://github.com/vim/vim/archive/v8.2.2891/vim-clipboard-8.2.2891.tar.gz
-	source = vimrc
-	source = archlinux.vim
-	source = vimdoc.hook
-	sha256sums = 3d0a424f637e4920dc514b124782d7e1f29a7b819031924989ca69e231ee686a
-	sha256sums = b16e85e457397ab2043a7ee0a3c84307c6b4eac157fd0b721694761f25b3ed5b
-	sha256sums = cc3d931129854c298eb22e993ec14c2ad86cc1e70a08a64496f5e06559289972
-	sha256sums = 8e9656934d9d7793063230d15a689e10455e6db9b9fe73afa0f294792795d8ae
-	sha512sums = a16f73720925f59db305f149f5d9bdea9fb2a4a993e7c07d4e83fdca5617ebb17b2e63b77a0d2ea05f8014f14edb0a41e6be633d848b81fce36162a45c23ccca
-	sha512sums = 4b5bed0813f22af9e158ea9aa56a4a9862dd786ba2d201f20159ccf652da6190164aaed0b6b7217d578f7b25c33a8adcc307bfcf3caa8d173a7ff29e2a00fee7
-	sha512sums = fe091d289d876f45319c898f6021ef86d6a238b540c225a279c46efc5c36fa7d868cd0cee73a111811c4be90df160f85340bb251be3a437727dbe5c699950363
-	sha512sums = a02ad0d66f300160911aeb81d8886c6c558436ac4ee3fcd161dd65c6b1e5d1f41b9005a7f5bb5ba68d57027fc1c8e43daabf055bd6207fb5a216a67f758df8d1
-
-pkgname = vim-clipboard
-	depends = vim-runtime=8.2.2891-1
+	depends = vim-runtime=8.2.3412-1
 	depends = gpm
 	depends = acl
 	depends = glibc
+	depends = libxt
 	depends = libgcrypt
-	depends = pcre
 	depends = zlib
 	optdepends = python2: Python 2 language support
 	optdepends = python: Python 3 language support
@@ -57,3 +43,8 @@ pkgname = vim-clipboard
 	replaces = vim-python3
 	replaces = vim-minimal
 	replaces = gvim
+	source = https://github.com/vim/vim/archive/v8.2.3412/vim-8.2.3412.tar.gz
+	sha256sums = 91f60e143860c6e7fc4d4b377c798de0cdbea98f3edd6035bf66694eeaa8bac8
+	sha512sums = 170e76440c06548440c921129da52b806468b97708dc0487029ffcaa83b73af1d2e4662328d3a8bee7b27c173447015b4356a413dcfd39bf9c11323e3b42a148
+
+pkgname = vim-clipboard
diff --git a/PKGBUILD b/PKGBUILD
index 617ef20aec93..5275638f5967 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,29 +5,28 @@
 
 # Directly based off of the official package
 
-pkgbase=vim-clipboard
 pkgname=vim-clipboard
-pkgver=8.2.2891
-_versiondir=82
+pkgver=8.2.3412
 pkgrel=1
 pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
 url='https://www.vim.org'
 arch=('x86_64')
 license=('custom:vim')
+depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl' 'glibc' 'libxt' 'libgcrypt' 'zlib')
 makedepends=('glibc' 'libgcrypt' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'lua'
              'gawk' 'tcl' 'pcre' 'zlib')
-source=(https://github.com/vim/vim/archive/v${pkgver}/${pkgbase}-${pkgver}.tar.gz
-        vimrc
-        archlinux.vim
-        vimdoc.hook)
-sha256sums=('3d0a424f637e4920dc514b124782d7e1f29a7b819031924989ca69e231ee686a'
-            'b16e85e457397ab2043a7ee0a3c84307c6b4eac157fd0b721694761f25b3ed5b'
-            'cc3d931129854c298eb22e993ec14c2ad86cc1e70a08a64496f5e06559289972'
-            '8e9656934d9d7793063230d15a689e10455e6db9b9fe73afa0f294792795d8ae')
-sha512sums=('a16f73720925f59db305f149f5d9bdea9fb2a4a993e7c07d4e83fdca5617ebb17b2e63b77a0d2ea05f8014f14edb0a41e6be633d848b81fce36162a45c23ccca'
-            '4b5bed0813f22af9e158ea9aa56a4a9862dd786ba2d201f20159ccf652da6190164aaed0b6b7217d578f7b25c33a8adcc307bfcf3caa8d173a7ff29e2a00fee7'
-            'fe091d289d876f45319c898f6021ef86d6a238b540c225a279c46efc5c36fa7d868cd0cee73a111811c4be90df160f85340bb251be3a437727dbe5c699950363'
-            'a02ad0d66f300160911aeb81d8886c6c558436ac4ee3fcd161dd65c6b1e5d1f41b9005a7f5bb5ba68d57027fc1c8e43daabf055bd6207fb5a216a67f758df8d1')
+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=('vim' 'gvim' 'vim-minimal' 'vim-python3')
+provides=('xxd' 'vim' 'vim-minimal' 'vim-python3' 'vim-plugin-runtime')
+replaces=('vim' 'vim-python3' 'vim-minimal' 'gvim')
+source=(https://github.com/vim/vim/archive/v${pkgver}/vim-${pkgver}.tar.gz)
+sha256sums=('91f60e143860c6e7fc4d4b377c798de0cdbea98f3edd6035bf66694eeaa8bac8')
+sha512sums=('170e76440c06548440c921129da52b806468b97708dc0487029ffcaa83b73af1d2e4662328d3a8bee7b27c173447015b4356a413dcfd39bf9c11323e3b42a148')
 
 prepare() {
   cd vim-${pkgver}/src
@@ -39,43 +38,31 @@ prepare() {
 
 build() {
   cd vim-${pkgver}
-    ./configure \
-      --prefix=/usr \
-      --localstatedir=/var/lib/vim \
-      --with-features=huge \
-      --with-compiledby='Arch Linux' \
-      --enable-gpm \
-      --enable-acl \
-      --with-x=yes \
-      --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 \
-      --disable-canberra
-    make
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var/lib/vim \
+    --with-features=huge \
+    --with-compiledby='Arch Linux' \
+    --enable-gpm \
+    --enable-acl \
+    --with-x=yes \
+    --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 \
+    --disable-canberra
+  make
 }
 
 package() {
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl' 'glibc' 'libgcrypt' 'pcre'
-           'zlib')
-  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=('vim' 'gvim' 'vim-minimal' 'vim-python3')
-  provides=('xxd' 'vim' 'vim-minimal' 'vim-python3' 'vim-plugin-runtime')
-  replaces=('vim' 'vim-python3' 'vim-minimal' 'gvim')
-
   cd vim-${pkgver}
-  make VIMRCLOC=/etc DESTDIR="${pkgdir}" install
+  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
   rm "${pkgdir}"/usr/bin/{ex,view}
diff --git a/archlinux.vim b/archlinux.vim
deleted file mode 100644
index 2b71ccbe275d..000000000000
--- a/archlinux.vim
+++ /dev/null
@@ -1,46 +0,0 @@
-" The Arch Linux global vimrc - setting only a few sane defaults
-"
-" DO NOT EDIT THIS FILE. IT'S OVERWRITTEN UPON UPGRADES.
-"
-" Use /etc/vimrc for system-wide and $HOME/.vimrc for personal configuration
-" (for details see ':help initialization').
-"
-" Use :help '<option>' to see the documentation for the given option.
-
-" Use Vim defaults instead of 100% vi compatibility
-" Avoid side-effects when nocompatible has already been set.
-if &compatible
-  set nocompatible
-endif
-
-set backspace=indent,eol,start
-set ruler
-set suffixes+=.aux,.bbl,.blg,.brf,.cb,.dvi,.idx,.ilg,.ind,.inx,.jpg,.log,.out,.png,.toc
-set suffixes-=.h
-set suffixes-=.obj
-
-" Move temporary files to a secure location to protect against CVE-2017-1000382
-if exists('$XDG_CACHE_HOME')
-  let &g:directory=$XDG_CACHE_HOME
-else
-  let &g:directory=$HOME . '/.cache'
-endif
-let &g:undodir=&g:directory . '/vim/undo//'
-let &g:backupdir=&g:directory . '/vim/backup//'
-let &g:directory.='/vim/swap//'
-" Create directories if they doesn't exist
-if ! isdirectory(expand(&g:directory))
-  silent! call mkdir(expand(&g:directory), 'p', 0700)
-endif
-if ! isdirectory(expand(&g:backupdir))
-  silent! call mkdir(expand(&g:backupdir), 'p', 0700)
-endif
-if ! isdirectory(expand(&g:undodir))
-  silent! call mkdir(expand(&g:undodir), 'p', 0700)
-endif
-
-" Make shift-insert work like in Xterm
-if has('gui_running')
-  map <S-Insert> <MiddleMouse>
-  map! <S-Insert> <MiddleMouse>
-endif
diff --git a/vimdoc.hook b/vimdoc.hook
deleted file mode 100644
index 07af3cc50234..000000000000
--- a/vimdoc.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Operation = Install
-Operation = Upgrade
-Operation= Remove
-Type = Path
-Target = usr/share/vim/vimfiles/doc/
-
-[Action]
-Description = Updating Vim help tags...
-Exec = /usr/bin/vim -es --cmd ":helptags /usr/share/vim/vimfiles/doc" --cmd ":q"
-When = PostTransaction
diff --git a/vimrc b/vimrc
deleted file mode 100644
index ee36a5269244..000000000000
--- a/vimrc
+++ /dev/null
@@ -1,18 +0,0 @@
-" 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/vim80/vimrc_example.vim or the vim manual
-" and configure vim to your own liking!
-
-" do not load defaults if ~/.vimrc is missing
-"let skip_defaults_vim=1