Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	libre/thunderbird-libre/PKGBUILD

7 files changed, 69 insertions, 17 deletions

diff --git a/community/ctpl/PKGBUILD b/community/ctpl/PKGBUILD
index 72fa74e38..0c797fec9 100644
--- a/community/ctpl/PKGBUILD
+++ b/community/ctpl/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 60331 2011-12-11 14:46:35Z arodseth $
+# $Id: PKGBUILD 60598 2011-12-14 19:59:50Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>   
 # Contributor: Patrick Melo <patrick@patrickmelo.eti.br>
 pkgname=ctpl
 pkgver=0.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Template engine library written in C"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ctpl.tuxfamily.org/"
 license=('GPL')
-depends=('glib2' 'gvfs')
+depends=('glib2')
 options=(!libtool)
 source=("http://download.tuxfamily.org/ctpl/releases/$pkgname-$pkgver.tar.gz")
 sha256sums=('7da73e7d8f10d222f5685b8eb80541d7e4d342aa74673039692fa5c4e8b120a7')
@@ -26,4 +26,5 @@ package() {
 
   make DESTDIR="$pkgdir" install
 }
+
 # vim:set ts=2 sw=2 et:
diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD
index d66a9f285..d5541d676 100644
--- a/community/lilypond/PKGBUILD
+++ b/community/lilypond/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 53180 2011-07-31 18:44:33Z spupykin $
+# $Id: PKGBUILD 60441 2011-12-14 09:14:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=lilypond
 pkgver=2.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An automated music engraving system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lilypond.org"
@@ -15,6 +15,7 @@ depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
 makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
 	     'gsfonts' 'texi2html')
 options=('emptydirs')
+install=lilypond.install
 source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz
 	http://arch.p5n.pp.ru/~sergej/dl/lilypond-fonts.tar.bz2
 	texlive-workaround.patch)
@@ -41,5 +42,5 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  cp -a $srcdir/lilypond-fonts/usr/share/lilypond/current/fonts/* $pkgdir/usr/share/lilypond/$pkgver/fonts/
+#  cp -a $srcdir/lilypond-fonts/usr/share/lilypond/current/fonts/* $pkgdir/usr/share/lilypond/$pkgver/fonts/
 }
diff --git a/community/lilypond/lilypond.install b/community/lilypond/lilypond.install
new file mode 100644
index 000000000..934e7b435
--- /dev/null
+++ b/community/lilypond/lilypond.install
@@ -0,0 +1,48 @@
+infodir=usr/share/info
+filelist=(music-glossary.info
+	lilypond-web.info
+	lilypond-contributor.info
+	lilypond-contributor.info-1
+	lilypond-contributor.info-2
+	lilypond-internals.info-1
+	lilypond-internals.info-2
+	lilypond-internals.info-3
+	lilypond-internals.info-4
+	lilypond-internals.info-5
+	lilypond-notation.info-1
+	lilypond-notation.info-2
+	lilypond-notation.info-3
+	lilypond-notation.info-4
+	lilypond-notation.info-5
+	lilypond-notation.info-6
+	lilypond-usage.info
+	lilypond-learning.info
+	lilypond-web.info-1
+	lilypond-web.info-2
+	lilypond-internals.info
+	lilypond-essay.info
+	lilypond-notation.info
+	lilypond-learning.info-1
+	lilypond-learning.info-2
+	lilypond-extending.info
+	lilypond-changes.info)
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info "$infodir/$file.gz" "$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.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 34a55480c..e937af513 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.0.1
-pkgrel=4
+pkgver=2.0.2
+pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
@@ -18,7 +18,7 @@ install="mongodb.install"
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'mongodb.rc'
         'mongodb.conf')
-md5sums=('cb8579074b7c9752eb382a2094ac4523'
+md5sums=('5dcf819249955a3e9cc61a341e45403a'
          '9c67e00f4626ad761a8f7d4e037a54d7'
          '4839fe1d638187ca3226e8267b947318')
 
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index c6f2c3af8..ee2fe3538 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59404 2011-11-24 12:19:55Z spupykin $
+# $Id: PKGBUILD 60455 2011-12-14 15:02:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
 pkgver=2011.11.20
 _pkgsubver=535097
-pkgrel=1
+pkgrel=2
 pkgdesc="kernel modules for the open source implementation of VMware Tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://open-vm-tools.sourceforge.net/"
diff --git a/community/openarena/PKGBUILD b/community/openarena/PKGBUILD
index e0f845ca4..6a730239b 100644
--- a/community/openarena/PKGBUILD
+++ b/community/openarena/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60141 2011-12-05 22:52:51Z svenstaro $
+# $Id: PKGBUILD 60611 2011-12-14 23:55:11Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -6,13 +6,14 @@
 pkgname=openarena
 pkgver=0.8.5
 _oldver=0.8.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A violent, sexy, multiplayer first person shooter based on the ioquake3 engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openarena.ws/"
 license=('GPL')
 depends=('sdl' 'libvorbis' 'curl' 'openarena-data')
 makedepends=('openal' 'mesa')
+optdepends=('openal')
 source=(http://download.tuxfamily.org/$pkgname/rel/081/oa081.zip
         http://download.tuxfamily.org/$pkgname/rel/085/oa085p.zip
         $url/svn/source/081/$pkgname-engine-$_oldver-1.tar.bz2
@@ -38,6 +39,7 @@ build() {
     cd $srcdir/$pkgname-engine-$_oldver
 
     patch -Np0 < $srcdir/strcpy-memmove.patch
+    sed -i 's/#define ALDRIVER_DEFAULT "libopenal.so.0"/#define ALDRIVER_DEFAULT "libopenal.so.1"/g' code/client/snd_openal.c
 
     make DEFAULT_BASEDIR=/usr/share/$pkgname \
         BUILD_CLIENT_SMP=0 \
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 728107bbb..2c5c22cce 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60371 2011-12-12 11:39:44Z svenstaro $
+# $Id: PKGBUILD 60602 2011-12-14 21:38:30Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -7,8 +7,8 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname="qtcreator"
-pkgver=2.4.0rc
-_pkgver=2.4.0-rc
+pkgver=2.4.0
+_pkgver=2.4.0
 pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ options=('docs')
 install=qtcreator.install
 source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz"
         'qtcreator.desktop')
-md5sums=('1967144101796674ce6e994e66213f81'
+md5sums=('80c1a2be4c685ce147c42424ad977e1a'
          'f1f4680b9838ff0b8f4cf11eb850d662')
 
 build() {