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

Conflicts:
	community-staging/mythtv/PKGBUILD
	community-staging/mythtv/mythbackend.rc
	community-staging/mythtv/mythtv.install
	community/sigil/PKGBUILD
	extra/pixman/PKGBUILD
	staging/vlc/PKGBUILD

9 files changed, 39 insertions, 37 deletions

diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 2d25a79d8..f88d2b1e3 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159763 2012-05-26 15:34:45Z bisson $
+# $Id: PKGBUILD 162785 2012-06-30 13:48:37Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=3.2.3
+pkgver=3.2.4
 pkgrel=1
 pkgdesc='Lightweight, advanced audio player focused on audio quality'
 url='http://audacious-media-player.org/'
@@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
          'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
 optdepends=('unzip-libre: zipped skins support')
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('23be0fcb0a7d5ec2bc4d4fee436e77f2138903ef')
+sha1sums=('24aa75e0a15d2327641c81c6ec7ea153a8df1ae0')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/lbreakout2/PKGBUILD b/extra/lbreakout2/PKGBUILD
index 6b89b083a..35042f76b 100644
--- a/extra/lbreakout2/PKGBUILD
+++ b/extra/lbreakout2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148808 2012-02-05 11:51:24Z ibiru $
+# $Id: PKGBUILD 162793 2012-06-30 14:10:06Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=lbreakout2
-pkgver=2.6.3
-pkgrel=3
+pkgver=2.6.4
+pkgrel=1
 pkgdesc="A breakout game with nice effects, graphics, and sounds"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lgames.sourceforge.net"
@@ -14,7 +14,7 @@ backup=('var/games/lbreakout2/lbreakout2.hscr')
 source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz"
         'lbreakout2.desktop'
 	'lbreakout2.png')
-md5sums=('43900187bc935475cd6489569cd2230a'
+md5sums=('4849af72225a304267eb71a9c100cd48'
          '14cd34a72a8f4e3b8f385f9023625241'
          '94e2fa393eb2a7d4494641dec580573b')
 
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 473ae3876..545cc6ac2 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162236 2012-06-24 06:52:55Z giovanni $
+# $Id: PKGBUILD 162789 2012-06-30 13:56:05Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.06.23
+pkgver=2012.06.26
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('c1e6a597c8259a1c9d86a15605277a02')
+md5sums=('8b0a51ee8aaa5f065c547b35f8d30dfd')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index 7d206a3fa..58782f157 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160261 2012-05-31 17:12:14Z andyrtr $
+# $Id: PKGBUILD 162772 2012-06-30 07:29:52Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=pixman
-pkgver=0.26.0
+pkgver=0.26.2
 pkgrel=1
 pkgdesc="The pixel-manipulation library for X and cairo"
 arch=(i686 x86_64 'mips64el')
@@ -11,10 +11,8 @@ url="http://xorg.freedesktop.org"
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
-        test_failures_on_x86-32.diff)
-sha1sums=('d772cf794ec5da0966eba3cb360919a0a5e0d23f'
-          '24a688271d5cf2c4137a147deaa2975122c01aa8')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('1daf014714cc29147726abada12359345d156705')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,7 +20,6 @@ build() {
 #    patch -Np1 -i $srcdir/pixman-loongson2f.patch
 #    autoreconf -i
 #  }
-  patch -Np1 -i ${srcdir}/test_failures_on_x86-32.diff
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index fa3893cdf..ac3dafa31 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 162765 2012-06-29 20:58:34Z ronald $
+# $Id: PKGBUILD 162770 2012-06-30 07:08:33Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
 pkgver=2.15.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url=('http://www.r-project.org/')
 depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
          'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
-         'libxt' 'libxmu' 'pango' 'xz' 'texlive-bin' 'desktop-file-utils')
+         'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils')
 makedepends=('openjdk6' 'gcc-fortran' 'tk')
-optdepends=('tk: tcl/tk interface')
+optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
 backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
 options=('!makeflags' '!emptydirs')
 source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
diff --git a/extra/r/r.install b/extra/r/r.install
index 89fea599b..522ce52e7 100644
--- a/extra/r/r.install
+++ b/extra/r/r.install
@@ -1,7 +1,9 @@
 post_install() {
   update-desktop-database -q
-  echo ">>> updating the filename database for texlive..."
-  mktexlsr --quiet usr/share/texmf
+  if [[ -x /usr/bin/mktexlsr ]]; then
+     echo ">>> updating the filename database for texlive..."
+     mktexlsr --quiet usr/share/texmf
+  fi
 }
 
 post_upgrade() {
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index e879e6e6c..a987ebcfa 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153975 2012-03-21 06:31:40Z giovanni $
+# $Id: PKGBUILD 162797 2012-06-30 14:35:56Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
-pkgver=3.1.6
-pkgrel=3
+pkgver=3.1.7
+pkgrel=1
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
@@ -14,7 +14,7 @@ makedepends=('ctags' 'boost')
 options=('!libtool')
 install=$pkgname.install
 source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
-md5sums=('44856c15a5dc8694e30d92f640ed348f')
+md5sums=('0ff81588d3536b4c4e571122ba940595')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 143f5a2b7..d505b0ee8 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 157183 2012-04-25 11:45:58Z andrea $
+# $Id: PKGBUILD 162805 2012-06-30 17:32:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=virtuoso
-pkgver=6.1.5
+pkgver=6.1.5.20120630
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
 depends=('libldap')
-makedepends=('bison' 'flex')
+makedepends=('bison' 'flex' 'gperf')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz")
-md5sums=('61b53395e14a11dd7e7715b50261b9eb')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz")
+#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz")
+md5sums=('1364679ffdbc6b0c16eadf6dee0e2676')
 
 build() {
   cd ${srcdir}/${pkgname}-opensource-${pkgver}
 
+  ./autogen.sh
   ./configure --prefix=/usr \
     --localstatedir=/var \
     --sysconfdir=/etc \
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 73f5b0def..dd1465417 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160375 2012-06-01 12:58:51Z dreisner $
+# $Id: PKGBUILD 162781 2012-06-30 12:58:20Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=2.0.1
-pkgrel=2
+pkgver=2.0.2
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
@@ -46,7 +46,8 @@ optdepends+=('libcaca: for colored ASCII art video output'
             'aalib: for ASCII art plugin'
             'libmtp: for MTP devices support'
             'fluidsynth: for synthesizer MIDI FluidSynth'
-            'smbclient: for SMB access plugin')
+            'smbclient: for SMB access plugin'
+            'libcdio: for audio CD playback support')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
@@ -54,7 +55,7 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!libtool' '!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('5ad114755670e4881a2b35354e2f79bc')
+md5sums=('93e729cc970a4535b3213dbef0e69528')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"