Merge branch 'master' of ssh://gparabola/abslibre-mips64el

Conflicts:
	libre/unarchiver/PKGBUILD

21 files changed, 138 insertions, 299 deletions

diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD
index 987d952af..5e24f32ea 100644
--- a/community/bullet/PKGBUILD
+++ b/community/bullet/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 64798 2012-02-18 05:40:50Z svenstaro $
+# $Id: PKGBUILD 68719 2012-04-01 00:16:22Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgbase=bullet
 pkgname=('bullet' 'bullet-docs')
-pkgver=2.79
-pkgrel=2
+pkgver=2.80
+pkgrel=1
 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bulletphysics.com/Bullet/"
 license=('custom:zlib')
 depends=('freeglut')
 makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu')
-source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2440.tgz \
+source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2531.tgz
         ${pkgbase}.pc)
-md5sums=('29d6f43964d8494f0366cd69e4883dd1'
+md5sums=('d1eec0332110264a21d0fc0f2fb127c3'
          'd1da06deba3b08b884d2212f6838905c')
 
 build() {
-  cd ${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}-rev2531
 
   # get a clean build dir
   [[ -d build ]] && rm -rf build
@@ -46,11 +46,15 @@ build() {
 package_bullet() {
   optdepends=('bullet-docs: documentation')
 
-  cd ${pkgbase}-${pkgver}/build
+  cd ${pkgbase}-${pkgver}-rev2531/build
 
   # install it
   make DESTDIR=${pkgdir} install
 
+  # fix #29012
+  install -Dm644 ../Extras/HACD/hacdVector.inl ${pkgdir}/usr/include/bullet/HACD/hacdVector.inl
+  install -Dm644 ../Extras/HACD/hacdCircularList.inl ${pkgdir}/usr/include/bullet/HACD/hacdCircularList.inl
+
   # manually handle pkgconfig file
   mkdir -p "${pkgdir}"/usr/lib/pkgconfig
   sed "s|VERSION|${pkgver}|g" ${srcdir}/bullet.pc > ${pkgdir}/usr/lib/pkgconfig/bullet.pc
@@ -63,7 +67,7 @@ package_bullet-docs() {
   pkgdesc="Documentation for bullet"
   depends=()
 
-  cd ${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}-rev2531
 
   # install docs
   install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
deleted file mode 100644
index ee7aad937..000000000
--- a/community/calibre/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 68373 2012-03-23 10:53:05Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Petrov Roman <nwhisper@gmail.com>
-# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
-
-pkgname=calibre
-pkgver=0.8.44
-pkgrel=1
-pkgdesc="Ebook management application"
-arch=('i686' 'x86_64' 'mips64el') 
-url="http://calibre-ebook.com/"
-license=('GPL3')
-depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
-         'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 
-         'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusb' 
-         'python-imaging' 'shared-mime-info' 'python-dnspython' 
-         'python2-pyqt' 'icu')
-makedepends=('python2-pycountry')
-optdepends=('ipython2: to use calibre-debug')
-install=calibre.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        'desktop_integration.patch'
-        'calibre-mount-helper')
-md5sums=('7cb3983a0458d20df982300b310df3be'
-         'c7eaa8ed3d2b0a09345aecffa1402ff4'
-         '675cd87d41342119827ef706055491e7')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  #rm -rf src/{cherrypy,pyPdf}
-  rm -rf src/cherrypy
-  sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
-  sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
-    $(find . -regex ".*.py\|.*.recipe")
-
-  python2 setup.py build
-#  python2 setup.py resources
-  python2 setup.py translations
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  
-  patch -Np1 -i "${srcdir}/desktop_integration.patch"
-
-  # More on desktop integration (e.g. enforce arch defaults)
-  sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
-      -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
-      -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
-      -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
-      -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
-
-  # Fix the environment module location
-  sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
-
-  install -d "${pkgdir}/usr/lib/python2.7/site-packages"
-  python2 setup.py install --root="${pkgdir}" --prefix=/usr \
-    --staging-bindir="${pkgdir}/usr/bin" \
-    --staging-libdir="${pkgdir}/usr/lib" \
-    --staging-sharedir="${pkgdir}/usr/share"
-
-  find "${pkgdir}" -type d -empty -delete
-
-  # Decompress the man pages so makepkg will do it for us.
-  for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do
-    bzip2 -d "${decom}"
-  done
-
-  # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/
-  rm -rf ${pkgdir}/usr/bin/calibre-mount-helper
-  install -m 755 ${srcdir}/calibre-mount-helper "${pkgdir}/usr/bin"
-}
diff --git a/community/calibre/calibre-mount-helper b/community/calibre/calibre-mount-helper
deleted file mode 100755
index 00cac4270..000000000
--- a/community/calibre/calibre-mount-helper
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-# Replacement for upstream mount helper using udisks/eject
-# (C) 2010 Martin Pitt <mpitt@debian.org>
-
-ACTION="$1"
-DEV="$2"
-
-case "$ACTION" in
-    mount)
-	udisks --mount "$DEV"
-    
-	# check if mount worked. If not, fail
-	# udisks does return 0 even if mount failed
-	mount | grep -q "$DEV" || exit 0
-	;;
-
-    eject)
-	eject "$DEV"
-	;;
-
-    cleanup)
-	;;
-
-    *)
-	echo "unknown action" >&2
-	exit 1
-esac
-
diff --git a/community/calibre/calibre.install b/community/calibre/calibre.install
deleted file mode 100644
index 6210bd0ab..000000000
--- a/community/calibre/calibre.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch
deleted file mode 100644
index 73037b6a7..000000000
--- a/community/calibre/desktop_integration.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- a/src/calibre/linux.py	2012-03-16 03:42:45.000000000 +0100
-+++ b/src/calibre/linux.py	2012-03-21 08:06:35.000000000 +0100
-@@ -140,18 +140,6 @@
-         self.install_man_pages()
-         if islinux or isbsd:
-             self.setup_desktop_integration()
--        self.create_uninstaller()
--
--        from calibre.utils.config import config_dir
--        if os.path.exists(config_dir):
--            os.chdir(config_dir)
--            if islinux or isbsd:
--                for f in os.listdir('.'):
--                    if os.stat(f).st_uid == 0:
--                        import shutil
--                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
--                if os.stat(config_dir).st_uid == 0:
--                    os.rmdir(config_dir)
- 
-         if warn is None and self.warnings:
-             self.info('There were %d warnings'%len(self.warnings))
-@@ -198,7 +186,7 @@
-                 if isnetbsd:
-                     f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
-                 else:
--                    f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
-+                    f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
-             if not os.path.exists(os.path.dirname(f)):
-                 os.makedirs(os.path.dirname(f))
-             self.manifest.append(f)
-@@ -305,7 +293,7 @@
-             if isbsd:
-                 manpath = os.path.join(self.opts.staging_root, 'man/man1')
-             else:
--                manpath = os.path.join(self.opts.staging_sharedir, 'man/man1')
-+                manpath = os.path.join(self.opts.staging_root, 'usr/share/man/man1')
-             if not os.path.exists(manpath):
-                 os.makedirs(manpath)
-             self.info('Installing MAN pages...')
-@@ -321,7 +309,7 @@
-                 if isbsd:
-                     manfile = os.path.join(manpath, prog+'.1')
-                 else:
--                    manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
-+                    manfile = os.path.join(manpath, prog+'.1'+'.bz2')
-                 self.info('\tInstalling MAN page for', prog)
-                 open(manfile, 'wb').write(raw)
-                 self.manifest.append(manfile)
-@@ -339,51 +327,39 @@
- 
-             with TemporaryDirectory() as tdir:
-                 with CurrentDir(tdir):
--                    render_img('mimetypes/lrf.png', 'calibre-lrf.png')
--                    check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
--                    self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
--                    check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
--                    self.icon_resources.append(('mimetypes', 'application-lrs',
--                    '128'))
--                    render_img('lt.png', 'calibre-gui.png')
--                    check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True)
--                    self.icon_resources.append(('apps', 'calibre-gui', '128'))
--                    render_img('viewer.png', 'calibre-viewer.png')
--                    check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
--                    self.icon_resources.append(('apps', 'calibre-viewer', '128'))
-+                    dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+                    os.mkdir(dir)
-+                    render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+                    render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+                    render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
- 
-                     mimetypes = set([])
-                     for x in all_input_formats():
-                         mt = guess_type('dummy.'+x)[0]
--                        if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
-+                        if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
-                             mimetypes.add(mt)
- 
-                     def write_mimetypes(f):
-                         f.write('MimeType=%s;\n'%';'.join(mimetypes))
- 
--                    f = open('calibre-lrfviewer.desktop', 'wb')
-+                    dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+                    os.mkdir(dir)
-+                    f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
-                     f.write(VIEWER)
-                     f.close()
--                    f = open('calibre-ebook-viewer.desktop', 'wb')
-+                    f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
-                     f.write(EVIEWER)
-                     write_mimetypes(f)
-                     f.close()
--                    f = open('calibre-gui.desktop', 'wb')
-+                    f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
-                     f.write(GUI)
-                     write_mimetypes(f)
-                     f.close()
--                    des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
--                            'calibre-ebook-viewer.desktop')
--                    for x in des:
--                        cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
--                        check_call(' '.join(cmd), shell=True)
--                        self.menu_resources.append(x)
--                    check_call(['xdg-desktop-menu', 'forceupdate'])
--                    f = open('calibre-mimetypes', 'wb')
-+                    dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+                    os.makedirs(dir)
-+                    f = open(os.path.join(dir, 'calibre.xml'), 'wb')
-                     f.write(MIME)
-                     f.close()
--                    self.mime_resources.append('calibre-mimetypes')
--                    check_call('xdg-mime install ./calibre-mimetypes', shell=True)
-         except Exception:
-             if self.opts.fatal_errors:
-                 raise
-@@ -521,7 +497,7 @@
- [Desktop Entry]
- Version=1.0
- Type=Application
--Name=calibre
-+Name=Calibre
- GenericName=E-book library management
- Comment=E-book library management: Convert, view, share, catalogue all your e-books
- TryExec=calibre
diff --git a/community/esdl/PKGBUILD b/community/esdl/PKGBUILD
new file mode 100644
index 000000000..d488c8ad8
--- /dev/null
+++ b/community/esdl/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: kappa <kappacurve@gmail.com>
+
+pkgname=esdl
+pkgver=1.2
+pkgrel=2
+arch=('x86_64' 'i686')
+pkgdesc="SDL and OpenGL bindings for the Erlang programming language"
+url="http://esdl.sourceforge.net/"
+license=('custom')
+depends=('erlang' 'sdl' 'mesa')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.src.tar.gz")
+md5sums=('3e96c1d47bd7c1e23285360d88ce1bea')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  find -type f -print0 | xargs -0 chmod 644
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" install
+
+  # to make wings3d compile
+  ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \
+    "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/glu.hrl"
+  ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \
+    "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/gl.hrl"
+
+  install -Dm644 "$srcdir/$pkgname-$pkgver/license.terms" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/expac/PKGBUILD b/community/expac/PKGBUILD
index e4cdc270b..b767fc161 100644
--- a/community/expac/PKGBUILD
+++ b/community/expac/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 62143 2012-01-16 19:53:09Z dreisner $
+# $Id: PKGBUILD 68721 2012-04-01 00:18:57Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=expac
-pkgver=0.07
+pkgver=1
 pkgrel=1
 pkgdesc="pacman database extraction utility"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,16 +11,14 @@ license=('GPL')
 depends=('pacman')
 makedepends=('perl')
 source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('1bc637b733051827982db12db84643f2')
+md5sums=('be8348f18e6af9db250437b14a91e443')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
+  make -C "$pkgname-$pkgver"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install
 }
 
 # vim: ft=sh syn=sh
diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD
index a14415418..4ee0ba194 100644
--- a/community/gendesk/PKGBUILD
+++ b/community/gendesk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 68634 2012-03-30 15:35:07Z arodseth $
+# $Id: PKGBUILD 68693 2012-03-31 21:00:41Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Thanks to Moonprincessluna at DeviantArt for the default icon:
 # http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a
 
 pkgname=gendesk
-pkgver=0.4
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Utility to generate .desktop files and download icons"
 arch=('x86_64' 'i686')
@@ -15,7 +15,7 @@ makedepends=('go>=2:1-2')
 conflicts=('go-hg')
 source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.gz"
         "http://roboticoverlords.org/images/default.png")
-sha256sums=('33f95ce4b48ffb194693b0c35f8b9728a6d9c961f365a0c38bbd128c0d851993'
+sha256sums=('09961d689f78b766dbdb6faaa78712589a384e6fb1ff6bf77def3a6319e4ec6a'
             '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837')
 
 build() {
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index c835cc950..ea5fafe3f 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 68608 2012-03-29 13:28:45Z arodseth $
+# $Id: PKGBUILD 68691 2012-03-31 19:33:32Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andres Perera <andres87p gmail>
 # Contributor: Matthew Bauer <mjbauer95@gmail.com>
 # Contributor: Christian Himpel <chressie at gmail dot com>
@@ -7,34 +8,34 @@
 
 pkgname=go
 pkgver=1
-pkgrel=2
+pkgrel=3
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('x86_64' 'i686')
 url="http://golang.org/"
 license=('custom')
 depends=('perl' 'ed' 'gawk')
 makedepends=('mercurial' 'inetutils')
 options=('!strip' '!emptydirs')
-install=$pkgname.install
-source=($pkgname.sh)
-md5sums=('e7087d190fd519db3be5adb3a51194cc')
+source=("$pkgname"
+        "$pkgname.sh")
+md5sums=('fb4d2508c44b3823e05ed360c2976322'
+         'e7087d190fd519db3be5adb3a51194cc')
 
 build() {
   _hgroot="https://go.googlecode.com/hg/"
   _hgrepo="release"
 
   cd "$srcdir"
-  msg "Connecting to Mercurial server...."
 
-  if [ -d $_hgrepo ] ; then
+  msg "Connecting to Mercurial server...."
+  if [[ -d $_hgrepo ]] ; then
     cd $_hgrepo
     hg pull -u
     msg "The local files are updated."
   else
     hg clone $_hgroot $_hgrepo
   fi
-
   msg "Mercurial checkout done or server timeout"
 
   rm -rf "$srcdir/$_hgrepo-build"
@@ -91,6 +92,9 @@ package() {
     $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
 
   install $srcdir/go.sh $pkgdir/etc/profile.d/
+
+  mv "$pkgdir/usr/bin/go" "$pkgdir/usr/bin/go.elf"
+  install -Dm755 "$srcdir/go" "$pkgdir/usr/bin/go"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/go/go b/community/go/go
new file mode 100644
index 000000000..c284ec45c
--- /dev/null
+++ b/community/go/go
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [[ -z $GOROOT ]]; then
+    export GOROOT=/usr/lib/go
+fi
+/usr/bin/go.elf "$@"
diff --git a/community/hatari/PKGBUILD b/community/hatari/PKGBUILD
index 4b0bbf1bb..e1cfd759a 100644
--- a/community/hatari/PKGBUILD
+++ b/community/hatari/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 63626 2012-02-05 12:01:45Z ibiru $
+# $Id: PKGBUILD 68675 2012-03-31 12:26:15Z lcarlier $
 # Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 pkgname=hatari
-pkgver=1.5.0
-pkgrel=2
+pkgver=1.6.1
+pkgrel=1
 pkgdesc='An Atari ST and STE emulator'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://hatari.sourceforge.net/'
 license=('GPL')
 depends=('sdl' 'libpng')
 makedepends=('cmake')
-source=("http://download.berlios.de/hatari/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('16277cff73ec3a342b87b7b7ea3932f4')
+source=("http://download.tuxfamily.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('14f6af33734c971cb4f349a38c6981a1')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/libgringotts/PKGBUILD b/community/libgringotts/PKGBUILD
index 837c1c7a1..d50b7dda0 100644
--- a/community/libgringotts/PKGBUILD
+++ b/community/libgringotts/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 67534 2012-03-13 11:05:54Z lcarlier $
+# $Id: PKGBUILD 68667 2012-03-31 08:24:10Z stativ $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=libgringotts
 pkgver=1.2.1
-pkgrel=8
+pkgrel=9
 pkgdesc="Encryption backend for Gringotts."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.berlios.de/projects/gringotts"
@@ -21,10 +21,11 @@ build() {
   ./configure --prefix=/usr
   make
 }
-pckage() {
+
+package() {
   cd ${srcdir}/$pkgname-$pkgver
 
   make DESTDIR=${pkgdir} install
 
-  rm -fr ${pkgdir}/usr/share || return 1
+  rm -fr ${pkgdir}/usr/share
 }
diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD
index 129627884..fa2f55d2e 100644
--- a/community/me-tv/PKGBUILD
+++ b/community/me-tv/PKGBUILD
@@ -5,7 +5,7 @@
 #Previous Contributor: Jeff Bailes <thepizzaking@gmail.com>
 
 pkgname=me-tv
-pkgver=1.4.0.7
+pkgver=1.4.0.9
 pkgrel=1
 epoch=1
 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard"
@@ -42,4 +42,4 @@ package() {
 
 }
 
-md5sums=('1f7e10b063b869afcb00c6570061c1ef')
+md5sums=('4d097d8893bc8c5dec0811e6cdcf4d7b')
diff --git a/community/me-tv/me-tv.install b/community/me-tv/me-tv.install
index f701b4754..ca1279c14 100644
--- a/community/me-tv/me-tv.install
+++ b/community/me-tv/me-tv.install
@@ -10,6 +10,7 @@ pre_upgrade() {
 
 post_upgrade() {
 	post_install $1
+	echo "If you run into errors after upgrading, try deleting ~/.local/share/me-tv/"
 }
 
 pre_remove() {
diff --git a/community/osmo/PKGBUILD b/community/osmo/PKGBUILD
index ac547d633..cf5854876 100644
--- a/community/osmo/PKGBUILD
+++ b/community/osmo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 67694 2012-03-14 00:29:40Z giovanni $
+# $Id: PKGBUILD 68669 2012-03-31 08:29:38Z stativ $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor: Benzo <mb_benzo@yahoo.es>
 
 pkgname=osmo
 pkgver=0.2.10
-pkgrel=6
+pkgrel=7
 pkgdesc="A handy personal organizer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clayo.org/osmo/"
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index e8b132726..9527951b5 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 63833 2012-02-06 00:38:50Z giovanni $
+# $Id: PKGBUILD 68679 2012-03-31 14:28:34Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
-pkgver=1.8.2
+pkgver=1.8.3
 pkgrel=1
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://alioth.debian.org/projects/pcsclite/"
 license=('BSD')
-depends=('udev')
+depends=('python')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
-source=("https://alioth.debian.org/frs/download.php/3695/pcsc-lite-${pkgver}.tar.bz2"
+source=("https://alioth.debian.org/frs/download.php/3706/pcsc-lite-${pkgver}.tar.bz2"
         'pcscd')
-md5sums=('cb7156346e9478c19085c918b605ed43'
+md5sums=('7ad8c97c89f77aab7a00317eb7e811e9'
          'c97b6bce695222efb0f003d8e8369010')
 
 build() {
@@ -33,7 +33,7 @@ build() {
 package() {
   cd "${srcdir}/pcsc-lite-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
   install -D -m644 ${srcdir}/pcsc-lite-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
   install -D -m755 ${srcdir}/pcscd ${pkgdir}/etc/rc.d/pcscd
diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD
index 4827be4e4..ea12e6cd3 100644
--- a/community/setconf/PKGBUILD
+++ b/community/setconf/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 64357 2012-02-11 23:24:08Z allan $
+# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
+
 pkgname=setconf
-pkgver=0.3.2
-pkgrel=4
+pkgver=0.4
+pkgrel=1
 pkgdesc="Utility to easily change settings in Makefiles and configuration files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://setconf.roboticoverlords.org/"
 license=('GPL')
 depends=('pcre' 'gc')
-makedepends=('shedskin>=0.9.1')
+makedepends=('shedskin')
 source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2")
-sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03')
+sha256sums=('dca9d6e829f3247da8cb78434dd18d96f3439fc83a32626ff83d4a5c16099d31')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index 6c7466e05..3913c16fa 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67475 2012-03-11 23:32:18Z svenstaro $
+# $Id: PKGBUILD 68697 2012-03-31 21:54:47Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ondrej Martinak <omartinak@gmail.com>
 
@@ -7,7 +7,7 @@ pkgname=sfml
 _git=true
 
 if [[ "${_git}" = "true" ]]; then
-    pkgver=1.99.git20120312
+    pkgver=1.99.git20120331
 fi
 
 pkgrel=1
diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD
index eb69eeed3..069fd02bd 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 62241 2012-01-18 17:54:17Z tdziedzic $
+# $Id: PKGBUILD 68673 2012-03-31 10:11:37Z rvanharen $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mrshpot <mrshpot at gmail dot com>
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=smalltalk
 pkgver=3.2.4
-pkgrel=4
+pkgrel=5
 pkgdesc='A free implementation of Smalltalk-80 by the GNU project'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
@@ -18,7 +18,7 @@ optdepends=('tk: for gst-blox'
             'sqlite3'
             'sed: for examples'
             'gtk2')
-
+install=smalltalk.install
 source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('a36a7c9beddca08dc492b500738efc82')
 
@@ -41,7 +41,7 @@ build() {
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make check
+#  make check
 }
 
 package() {
diff --git a/community/smalltalk/smalltalk.install b/community/smalltalk/smalltalk.install
new file mode 100644
index 000000000..992e4edfb
--- /dev/null
+++ b/community/smalltalk/smalltalk.install
@@ -0,0 +1,21 @@
+infodir=usr/share/info
+filelist=(gst-base.info{,-1,-2,-3,-4,-5}.gz gst-libs.info{,-1,-2,-3}.gz gst.info{,-1,-2}.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD
index 35d08d4f9..8b1f78842 100644
--- a/community/task/PKGBUILD
+++ b/community/task/PKGBUILD
@@ -5,17 +5,17 @@
 # Contributor: coolkehon <coolkehon@gmail.com>
 
 pkgname=task
-pkgver=1.9.4
-pkgrel=3
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="A command-line todo list manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://taskwarrior.org/projects/show/taskwarrior/"
-license=('GPL')
+license=('MIT')
 depends=()
 makedepends=('cmake')
-optdepends=('bash-completion: for bash completion', 'python: for python export addon', 'ruby: for ruby export addon', 'perl: for perl export addon')
+optdepends=('bash-completion: for bash completion', 'python: for python export addon', 'ruby: for ruby export addon', 'perl: for perl export addon', 'lua: for luaexport addon')
 source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz)
-sha1sums=('b9bae255f4fa03970eced3ac0876935271d1d7a1')
+sha256sums=('78971e366c2395de1cc4b0c4fc41dd950c309d3bc2f6e9594b4c5821ad6775bd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,7 +28,7 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 "$pkgdir/usr/share/doc/task/scripts/bash/task_completion.sh" "$pkgdir/etc/bash_completion.d/task_completion.sh"
+  install -Dm644 "$pkgdir/usr/share/doc/task/scripts/bash/task_completion.sh" "$pkgdir/usr/share/bash_completion/completions/task_completion.sh"
   install -Dm644 "$pkgdir/usr/share/doc/task/scripts/fish/task.fish" "$pkgdir/usr/share/fish/completions/task.fish"
   install -Dm644 "$pkgdir/usr/share/doc/task/scripts/zsh/_task" "$pkgdir/usr/share/zsh/site-functions/_task"
 
@@ -36,4 +36,6 @@ package() {
   install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskdata.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskdata.vim"
   install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskedit.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskedit.vim"
   install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskrc.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskrc.vim"
+
+  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/task/LICENSE"
 }