Mon Mar 31 03:50:18 UTC 2014

18 files changed, 387 insertions, 323 deletions

diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index 7ab4fafb8..75f68b666 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 108149 2014-03-24 05:54:46Z fyan $
+# $Id: PKGBUILD 108617 2014-03-30 14:15:46Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +7,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.18.4
+pkgver=1.18.5
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64')
@@ -15,7 +16,7 @@ license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
 checkdepends=('cppunit')
 source=(http://downloads.sourceforge.net/aria2/aria2-$pkgver.tar.xz)
-sha256sums=('bc6b9d1eb215bba1948ebb7725301658f7125c7345d2a25f971cb8e11204c88d')
+sha256sums=('90a15959498673ebe6a964f8f9fe840f4adbb0a1904a9810cd7da6743c0b619b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD
index cfc22754a..fbc0d31dd 100644
--- a/community/desmume/PKGBUILD
+++ b/community/desmume/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 101801 2013-12-01 11:51:18Z schuay $
+# $Id: PKGBUILD 108630 2014-03-30 18:34:19Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Jonathan Conder <jonno dot conder at gmail dot com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -13,7 +13,7 @@
 
 pkgname=desmume
 pkgver=0.9.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Nintendo DS emulator"
 arch=('i686' 'x86_64')
 url="http://desmume.org/"
@@ -21,7 +21,7 @@ license=('GPL')
 depends=('desktop-file-utils' 'libpcap' 'soundtouch' 'alsa-lib' 'glu' 'sdl' 'gtk2' 'zziplib')
 makedepends=('intltool' 'mesa')
 install=desmume.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.tar"
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
         "glx_3Demu.patch")
 
 build() {
@@ -34,7 +34,7 @@ build() {
   # https://sourceforge.net/tracker/?func=detail&aid=3612768&group_id=164579&atid=832291
   sed -i 's/@GETTEXT_PACKAGE@/desmume/' po/Makefile.in.in
 
-  ./configure --prefix=/usr --enable-wifi
+  ./configure --prefix=/usr --enable-wifi --enable-openal
   make
 }
 
diff --git a/community/fbterm/PKGBUILD b/community/fbterm/PKGBUILD
index d2ebdb0d7..5d7928410 100644
--- a/community/fbterm/PKGBUILD
+++ b/community/fbterm/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 81466 2012-12-21 12:36:51Z fyan $
+# $Id: PKGBUILD 108611 2014-03-30 05:06:34Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: noonov <noonov@gmail.com>
 
 pkgname=fbterm
 pkgver=1.7.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A fast terminal emulator for linux with frame buffer device or VESA video card"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fbterm/"
 license=('GPL2')
+makedepends=('gpm')
 depends=('gcc-libs' 'fontconfig')
-optdepends=('libx86: for VESA video card support')
+optdepends=('libx86: for VESA video card support'
+            'gpm: for mouse support')
 install=fbterm.install
 source=("http://fbterm.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver%.?}"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --enable-gpm
   make
 }
 
diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD
index aad5cd3a3..20320b54e 100644
--- a/community/mpv/PKGBUILD
+++ b/community/mpv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 108557 2014-03-28 15:46:57Z bpiotrowski $
+# $Id: PKGBUILD 108621 2014-03-30 17:03:31Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Eivind Uggedal <eivind@uggedal.com>
 
 pkgname=mpv
-pkgver=0.3.6
-pkgrel=2
+pkgver=0.3.7
+pkgrel=1
 pkgdesc='Video player based on MPlayer/mplayer2'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,25 +14,30 @@ depends=(
   'libxinerama' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils' 'wayland'
   'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua' 'libdvdnav'
 )
-makedepends=('mesa' 'python-docutils' 'waf' 'ladspa')
+makedepends=('mesa' 'python-docutils' 'ladspa')
 options=('!emptydirs' '!buildflags')
 install=mpv.install
 source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz)
-md5sums=('11a8bb5f10056b7cc0dbedd38fe6e581')
+md5sums=('0e1398c324775998b0e60fdb11b9e06d')
+
+prepare() {
+  cd $pkgname-$pkgver
+  ./bootstrap.py
+}
 
 build() {
   cd $pkgname-$pkgver
 
-  waf configure --prefix=/usr \
+  ./waf configure --prefix=/usr \
     --confdir=/etc/mpv \
     --enable-joystick
 
-  waf build
+  ./waf build
 }
 
 package() {
   cd $pkgname-$pkgver
-  waf install --destdir="$pkgdir"
+  ./waf install --destdir="$pkgdir"
 
   install -d "$pkgdir"/usr/share/doc/mpv/examples
   install -m644 etc/{input,example}.conf \
diff --git a/community/playpen/PKGBUILD b/community/playpen/PKGBUILD
index 450d7b9d8..3e5d7a9f4 100644
--- a/community/playpen/PKGBUILD
+++ b/community/playpen/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 pkgname=playpen
-pkgver=2
+pkgver=3
 pkgrel=1
 epoch=1
 pkgdesc='A secure application sandbox using namespaces, cgroups and seccomp'
 arch=(i686 x86_64)
 url='https://github.com/thestinger/playpen/'
 license=(MIT)
-depends=(libseccomp)
+depends=(libseccomp systemd)
 makedepends=(git clang)
 source=(git://github.com/thestinger/playpen#tag=$pkgver)
 md5sums=(SKIP)
diff --git a/community/profanity/PKGBUILD b/community/profanity/PKGBUILD
index b1707d6b8..106d00854 100644
--- a/community/profanity/PKGBUILD
+++ b/community/profanity/PKGBUILD
@@ -3,25 +3,17 @@
 # Contributor: jason ryan <jasonwryan@gmail.com>
 
 pkgname=profanity
-pkgver=0.4.0.rc1
-pkgrel=2
+pkgver=0.4.0
+pkgrel=1
+epoch=1
 pkgdesc='Console based XMPP client'
 arch=('i686' 'x86_64')
 url='http://www.profanity.im'
 license=('GPL3')
 depends=('curl' 'expat' 'glib2' 'libotr')
 makedepends=('doxygen' 'libstrophe')
-source=(https://github.com/boothj5/profanity/archive/$pkgver.tar.gz
-        0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch)
-md5sums=('1b96b279bced5896c223d088c99c0ca6'
-         'e957a737bb9d9f456f0b602815e6fe1e')
-
-prepare() {
-  cd $pkgname-$pkgver
-  sed -i '21s/development/release/' configure.ac
-  patch -p1 -i ../0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch
-  autoreconf -fi
-}
+source=(http://www.profanity.im/profanity-$pkgver.tar.gz)
+md5sums=('1ac10474d7c36eb546f7085003049ec5')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD
index 0bd5f7e58..613cac784 100644
--- a/community/v8/PKGBUILD
+++ b/community/v8/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106071 2014-02-21 22:59:53Z anatolik $
+# $Id: PKGBUILD 108609 2014-03-30 02:00:54Z anatolik $
 # Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com>
 # Contributor:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=v8
 # use http://omahaproxy.appspot.com/ to find stable v8 version
-pkgver=3.23.17.13
+pkgver=3.23.17.23
 pkgrel=1
 pkgdesc='Fast and modern Javascript engine'
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@ makedepends=(subversion python2)
 # unfortunately https://github.com/$pkgname/$pkgname does not contain all tags
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2
         v8.pc)
-sha256sums=('4b826735d182e9615fd9259e3f5d008c4f53d98c9f3531a6af75f00bd07be0b1'
+sha256sums=('b6702e68755adab3457d4e066957356c7a4e5eab3624edd39daad82818eb870e'
             '2b054309df9af9fb2e3e14527e88360b44745649b4866e592fb357ac90935f5d')
 
 [[ "$CARCH" = 'i686' ]]   && ARCH=ia32
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index 424ad5050..9a1078524 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 206107 2014-02-18 08:08:06Z andrea $
+# $Id: PKGBUILD 209251 2014-03-30 17:32:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libindi
-pkgver=0.9.7
+pkgver=0.9.8
 pkgrel=1
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
 license=('GPL2')
 arch=('i686' 'x86_64')
-depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat')
+depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat' 'libjpeg' 'gsl')
 makedepends=('cmake' 'boost')
 options=('staticlibs') # libindiclient builds as static only
-source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz")
-md5sums=('3e457c4226d7a445a0d89c044cced6b7')
+source=("http://www.indilib.org/jdownloads/Source/${pkgname}_${pkgver}.tar.gz")
+md5sums=('2d31a15911d018d0cdf5f9da92a87f0f')
 
 prepare() {
   mkdir build
@@ -23,16 +23,12 @@ build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DUDEVRULES_INSTALL_DIR=/usr/lib/udev/rules.d
   make
 }
 
 package() {
   cd build
   make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}"/usr/lib/udev/rules.d
-  mv "${pkgdir}"/lib/udev/rules.d/99-gpusb.rules \
-    "${pkgdir}"/usr/lib/udev/rules.d/
-  rmdir "${pkgdir}"/lib/udev/rules.d "${pkgdir}"/lib/udev "${pkgdir}"/lib
 }
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
new file mode 100644
index 000000000..2436be818
--- /dev/null
+++ b/extra/vim/PKGBUILD
@@ -0,0 +1,227 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: tobias [ tobias at archlinux org ]
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgbase=vim
+pkgname=('vim' 'gvim' 'vim-runtime')
+_topver=7.4
+_patchlevel=214
+__hgrev=d2ef98a43b5d
+_versiondir="vim${_topver//./}"
+pkgver=${_topver}.${_patchlevel}
+pkgrel=1
+arch=('i686' 'x86_64')
+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'
+        'archlinux.vim'
+        'gvim.desktop')
+md5sums=('5ec7d7f84955dacfef88e52ebc79b267'
+         'SKIP'
+         'b9d4dcb9d3ee2e151dc4be1e94934f6a'
+         '10353a61aadc3f276692d0e17db1478e'
+         'd90413bd21f400313a785bb4010120cd')
+
+# source PKGBUILD && mksource
+mksource() {
+  [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1)
+
+  __hgroot='http://vim.googlecode.com/hg/'
+  __hgrepo='vim'
+  __hgbranch='default'
+
+  hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo}
+
+  pushd ${__hgrepo}
+  if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then
+    printf 'You are not building the latest revision!\n'
+    printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n"
+  fi
+  popd
+
+  mv vim ${pkgname}-${pkgver}
+  find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \;
+  rm ${pkgname}-${pkgver}/{.hgignore,.hgtags}
+  tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
+  rm -r ${pkgname}-${pkgver}
+
+  gpg --detach-sign ${pkgname}-${pkgver}.tar.xz
+
+  scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/
+  scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/
+}
+
+build() {
+  cp -a ${pkgname}-${pkgver} vim-build
+
+  # define the place for the global (g)vimrc file (set to /etc/vimrc)
+  sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
+    vim-build/src/feature.h
+  sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \
+    vim-build/src/feature.h
+
+  (cd vim-build/src && autoconf)
+
+  cp -a vim-build gvim-build
+
+  cd "${srcdir}"/vim-build
+
+  ./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 \
+    --disable-netbeans \
+    --enable-perlinterp \
+    --disable-pythoninterp \
+    --disable-python3interp \
+    --disable-rubyinterp \
+    --disable-luainterp
+
+  make
+
+  cd "${srcdir}"/gvim-build
+
+  ./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 \
+    --enable-pythoninterp \
+    --disable-python3interp \
+    --enable-rubyinterp \
+    --enable-luainterp
+
+  make
+}
+
+check() {
+  # disable tests because they seem to freeze
+
+  cd "${srcdir}"/vim-build
+
+  #make test
+
+  cd "${srcdir}"/gvim-build
+
+  #make test
+}
+
+package_vim() {
+  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm')
+  conflicts=('gvim')
+
+  cd "${srcdir}"/vim-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 "${srcdir}"/vim-${pkgver}/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')
+  provides=("vim=${pkgver}-${pkgrel}")
+  conflicts=('vim')
+  install=gvim.install
+
+  cd "${srcdir}"/gvim-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
+
+  # Move the runtime for later packaging
+  mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
+
+  # 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 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+}
+
+package_vim-runtime() {
+  pkgdesc='Runtime for vim and gvim'
+  depends=('perl' 'gawk')
+  backup=('etc/vimrc')
+
+  # Install the runtime split from gvim
+  install -dm755 "${pkgdir}"/usr/share
+  mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
+
+  # Don't forget logtalk.dict
+  install -Dm644 "${srcdir}"/gvim-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}"/archlinux.vim \
+    "${pkgdir}"/usr/share/vim/vimfiles/archlinux.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/extra/vim/archlinux.vim b/extra/vim/archlinux.vim
new file mode 100644
index 000000000..148bb930f
--- /dev/null
+++ b/extra/vim/archlinux.vim
@@ -0,0 +1,26 @@
+" The ArchLinux global vimrc - setting only a few sane defaults
+"
+" Maintainer:      Tobias Kieslich [tobias funnychar archlinux dot org]
+"
+" 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
+
+
+if has('gui_running')
+  " Make shift-insert work like in Xterm
+  map <S-Insert> <MiddleMouse>
+  map! <S-Insert> <MiddleMouse>
+endif
diff --git a/extra/vim/gvim.desktop b/extra/vim/gvim.desktop
new file mode 100644
index 000000000..675357da5
--- /dev/null
+++ b/extra/vim/gvim.desktop
@@ -0,0 +1,63 @@
+[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;
diff --git a/extra/vim/gvim.install b/extra/vim/gvim.install
new file mode 100644
index 000000000..2eaa60550
--- /dev/null
+++ b/extra/vim/gvim.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/extra/vim/vimrc b/extra/vim/vimrc
new file mode 100644
index 000000000..3642e25c9
--- /dev/null
+++ b/extra/vim/vimrc
@@ -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!
+
diff --git a/libre/python-reportlab-libre/ChangeLog b/libre/python-reportlab-libre/ChangeLog
deleted file mode 100644
index 85b5db51f..000000000
--- a/libre/python-reportlab-libre/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-
-2009-02-17  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.3
-
-2008-11-03  Giovanni Scafora           <giovanni@archlinux.org>
-
-	* Rebuilt against python 2.6
-
-2008-09-14  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updating for x86_64: 2.2
-
-2008-09-13  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Adding ChangeLog
-	* Updating for i686: 2.2
-
diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD
deleted file mode 100644
index 401d61c9f..000000000
--- a/libre/python-reportlab-libre/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 106308 2014-02-27 10:52:25Z jelle $
-# Maintainer:
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor: borgo <nomail>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgbase=python-reportlab-libre
-pkgname=(python2-reportlab-libre python-reportlab-libre)
-_origname=reportlab
-pkgver=3.0
-pkgrel=1
-pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support"
-arch=('i686' 'x86_64')
-url="http://www.reportlab.org/rl_toolkit.html"
-depends=('freetype2')
-checkdepends=('python' 'python2')
-license=('custom')
-source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz
-        free-fonts.patch)
-md5sums=('a4fd40abcfb604aa3bd907181133c071'
-         'eb3ac47734efb05b939fb88026aff8ed')
-
-prepare() {
-    cd $srcdir
-    cp -rf ${_origname}-$pkgver "${_origname}2-$pkgver"
-
-    _reportlab_source=("${_origname}-$pkgver" "${_origname}2-$pkgver")
-
-    for x in ${_reportlab_source[@]}; do
-      cd $srcdir/$x
-
-      # remove nonfree Adobe T1 fonts support
-      patch -p1 -i $srcdir/free-fonts.patch
-
-      # Parabola contains those fonts from the ttf-bitstream-vera package
-      rm -fv src/reportlab/fonts/{bitstream-vera-license.txt,Vera*}
-    done
-}
-
-package_python2-reportlab-libre() {
-    conflicts+=('python2-reportlab' 'python-reportlab<=2.5-2')
-    replaces+=('python2-reportlab' 'python-reportlab<=2.5-2')
-    provides=("python2-reportlab=$pkgver")
-    depends=('python2')
-    cd "$srcdir/${_origname}2-$pkgver"
-    python2 setup.py install --root=$pkgdir --optimize=1
-    install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/license.txt
-}
-
-package_python-reportlab-libre() {
-    conflicts+=('python-reportlab' 'python-reportlab-libre<=2.5-2')
-    replaces+=('python-reportlab' 'python-reportlab-libre<=2.5-2')
-    provides=("python-reportlab=$pkgver")
-    depends=('python3')
-    cd "$srcdir/${_origname}-$pkgver"
-    python3 setup.py install --root=$pkgdir --optimize=1
-    install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/license.txt
-}
-
-
-check() {
-    cd ${srcdir}/${_origname}-${pkgver}
-    python2 setup.py tests
-    python setup.py tests
-}
diff --git a/libre/python-reportlab-libre/free-fonts.patch b/libre/python-reportlab-libre/free-fonts.patch
deleted file mode 100644
index d88b3b31b..000000000
--- a/libre/python-reportlab-libre/free-fonts.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nur reportlab-3.0.orig/setup.py reportlab-3.0/setup.py
---- reportlab-3.0.orig/setup.py	2014-02-14 12:22:37.000000000 -0200
-+++ reportlab-3.0/setup.py	2014-02-27 22:46:48.998702565 -0200
-@@ -254,11 +254,6 @@
-         infoline('not downloading T1 font curve files')
-         return
-     try:
--        infoline("Downloading standard T1 font curves")
--
--        remotehandle = ureq.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip")
--        zipdata = io.BytesIO(remotehandle.read())
--        remotehandle.close()
-         archive = zipfile.ZipFile(zipdata)
-         dst = pjoin(rl_dir, 'fonts')
- 
-@@ -271,7 +266,6 @@
-     except:
-         xitmsg = "Failed to download standard T1 font curves"
-     reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))]
--    infoline(xitmsg)
- 
- def main():
-     #test to see if we've a special command
-diff -Nur reportlab-3.0.orig/src/reportlab/pdfbase/_fontdata.py reportlab-3.0/src/reportlab/pdfbase/_fontdata.py
---- reportlab-3.0.orig/src/reportlab/pdfbase/_fontdata.py	2014-02-14 12:22:37.000000000 -0200
-+++ reportlab-3.0/src/reportlab/pdfbase/_fontdata.py	2014-02-27 22:26:55.438002204 -0200
-@@ -72,20 +72,20 @@
-                     }
- if sys.platform in ('linux2',):
-     _font2fnrMapLinux2 ={
--                'symbol': 'Symbol',
--                'zapfdingbats': 'ZapfDingbats',
--                'helvetica': 'Arial',
--                'helvetica-bold': 'Arial-Bold',
--                'helvetica-boldoblique': 'Arial-BoldItalic',
--                'helvetica-oblique': 'Arial-Italic',
--                'times-bold': 'TimesNewRoman-Bold',
--                'times-bolditalic':'TimesNewRoman-BoldItalic',
--                'times-italic': 'TimesNewRoman-Italic',
--                'times-roman': 'TimesNewRoman',
--                'courier-bold': 'Courier-Bold',
--                'courier-boldoblique': 'Courier-BoldOblique',
--                'courier': 'Courier',
--                'courier-oblique': 'Courier-Oblique',
-+                'symbol': 's050000l.pfb',
-+                'zapfdingbats': 'd050000l.pfb',
-+                'helvetica': 'n019003l.pfb',
-+                'helvetica-bold': 'n019004l.pfb',
-+                'helvetica-boldoblique': 'n019024l.pfb',
-+                'helvetica-oblique': 'n019023l.pfb',
-+                'times-bold': 'n021004l.pfb',
-+                'times-bolditalic':'n021024l.pfb',
-+                'times-italic': 'n021023l.pfb',
-+                'times-roman': 'n021003l.pfb',
-+                'courier-bold': 'n022004l.pfb',
-+                'courier-boldoblique': 'n022024l.pfb',
-+                'courier': 'n022003l.pfb',
-+                'courier-oblique': 'n022023l.pfb',
-                 }
-     _font2fnrMap = _font2fnrMapLinux2
-     for k, v in _font2fnrMap.items():
diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD
deleted file mode 100644
index c1ea8c449..000000000
--- a/libre/spectrwm-libre/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 106288 2014-02-26 16:09:20Z kkeen $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-_pkgname=spectrwm
-pkgname=spectrwm-libre
-pkgver=2.5.0
-pkgrel=1
-pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.spectrwm.org"
-_watch="https://opensource.conformal.com/snapshots/spectrwm/"
-license=('custom:ISC')
-depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor')
-replaces=('spectrwm' 'scrotwm')
-conflicts=('spectrwm')
-provides=("spectrwm=$pkgver")
-makedepends=('libxt')
-optdepends=('scrot: screenshots' 'xlockmore: great screenlocker' 'terminus-font: great font')
-backup=(etc/spectrwm.conf)
-source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \
-	LICENSE \
-        baraction.sh \
-        spectrwm-no-preload)
-md5sums=('22355256693393779b2d366d312c4577'
-         'a67cfe51079481e5b0eab1ad371379e3'
-         '950d663692e1da56e0ac864c6c3ed80e'
-         '974d109ce0af39cc73936d5efd682480')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  
-  sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c
-  sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c
-  sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf
-  # crashes if defaults can't be found, use less massive defaults
-  sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf
-  #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf
-
-  # see spectrwm FS#403
-  sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c
-
-  cd linux
-  make PREFIX="/usr"
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver/linux"
-  make PREFIX="/usr" DESTDIR="$pkgdir" install
-  install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop"
-  cd ..
-  install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf"
-  install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh"
-  mkdir -p "$pkgdir/etc/spectrwm"
-  cp spectrwm_*.conf "$pkgdir/etc/spectrwm/"
-  cd "$srcdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-  install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh"
-  install -Dm755 spectrwm-no-preload "$pkgdir/usr/bin/spectrwm-no-preload"
-
-  #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0"
-  #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so"
-
-  # fix this for real in the makefile
-  rm "$pkgdir/usr/bin/scrotwm"
-  ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm"
-  mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/
-  mv "$pkgdir/usr/share/man/man1/spectrwm_es.1" "$pkgdir/usr/share/man/es/man1/"
-  mv "$pkgdir/usr/share/man/man1/spectrwm_it.1" "$pkgdir/usr/share/man/it/man1/"
-  mv "$pkgdir/usr/share/man/man1/spectrwm_pt.1" "$pkgdir/usr/share/man/pt/man1/"
-  mv "$pkgdir/usr/share/man/man1/spectrwm_ru.1" "$pkgdir/usr/share/man/ru/man1/"
-}
diff --git a/pcr/pybitmessage-git/PKGBUILD b/pcr/pybitmessage-git/PKGBUILD
deleted file mode 100644
index a62d45523..000000000
--- a/pcr/pybitmessage-git/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Maintainer: Andreas Wagner <AndreasBWagner@pointfree.net>
-# Maintainer: Andy Weidenbaum <archbaum@gmail.com>
-# Contributor: Asta <gatien.bovyn@gmail.com>
-# Contributor: ptrv <mail@petervasil.net>
-
-_pkgname=pybitmessage
-pkgname=${_pkgname}-git
-pkgver=0.4.2.r7.g44f31d7
-pkgrel=1
-pkgdesc="Bitcoin inspired P2P encrypted messenger"
-arch=('any')
-depends=('hicolor-icon-theme' 'python2' 'python2-pyqt' 'qt4')
-makedepends=('git')
-optdepends=('python2-gevent')
-url="https://github.com/Bitmessage/PyBitmessage"
-license=('MIT')
-source=($pkgname::git+https://github.com/Bitmessage/PyBitmessage
-        pybitmessage.sh)
-sha256sums=('SKIP'
-            'c20eeeffd4931d8bcd50de5e6e1a974323ebbd3f5ad1d34483c6adeb3b5f3ae1')
-provides=('pybitmessage')
-conflicts=('pybitmessage')
-
-pkgver() {
-  cd $pkgname
-  git describe --long --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
-}
-
-prepare() {
-  cd $pkgname
-
-  msg 'Fixing Python version...'
-  find . -type f -print0 | xargs -0 sed -i 's#/usr/bin/python#/usr/bin/python2#g'
-  find . -type f -print0 | xargs -0 sed -i 's#/usr/bin/env python#/usr/bin/env python2#g'
-}
-
-package() {
-  cd $pkgname
-
-  msg 'Installing shared files...'
-  mkdir -p "$pkgdir"/usr/share/${_pkgname}
-  cp -R src/* "$pkgdir"/usr/share/${_pkgname}
-
-  msg 'Installing desktop icons...'
-  install -D -m644 desktop/${_pkgname}.desktop "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-  install -D -m644 src/images/can-icon-24px.png "${pkgdir}/usr/share/icons/hicolor/24x24/apps/${_pkgname}.png"
-  install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
-  install -D -m644 desktop/can-icon.svg "${pkgdir}/usr/share/pixmaps/${_pkgname}.svg"
-
-  msg 'Installing executable...'
-  install -D -m755 ${srcdir}/pybitmessage.sh "${pkgdir}/usr/bin/pybitmessage"
-
-  msg 'Cleaning up pkgdir...'
-  find "$pkgdir" -type d -name .git -exec rm -r '{}' +
-  find "$pkgdir" -type f -name .gitignore -exec rm -r '{}' +
-}
-