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

Conflicts:
	community/mingw32-gcc/PKGBUILD
	extra/transmission/PKGBUILD

13 files changed, 102 insertions, 58 deletions

diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 11539d3bd..069770de6 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 127014 2011-06-09 16:03:48Z giovanni $
+# $Id: PKGBUILD 129995 2011-06-30 18:10:17Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10576
+pkgver=10587
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('1a1f01d356b3d2d5c01004018ffa79c6')
+md5sums=('94228cf3fa58178a84c24658a06022bd')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 0c630fdcd..286cdc9ac 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128038 2011-06-21 06:55:54Z bisson $
+# $Id: PKGBUILD 129963 2011-06-30 17:15:51Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=2.5.2
+pkgver=2.5.3
 pkgrel=1
 pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,21 +12,21 @@ url='http://audacious-media-player.org/'
 license=('GPL3')
 depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('unzip: zipped skins support')
-source=("http://distfiles.atheme.org/$pkgname-$pkgver.tar.gz")
-sha1sums=('48b2662d1513959479ae561465b41df08369a689')
+source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('b40f140ebeb5d767bd865945b7eb5527c265beb7')
 
 provides=('audacious-player')
 replaces=('audacious-player')
 install=install
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	[[ $CARCH == x86_64 ]] && extraopts='' || extraopts='--disable-sse2'
-	./configure --prefix=/usr $extraopts
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	[[ ${CARCH} == x86_64 ]] && extraopts='' || extraopts='--disable-sse2'
+	./configure --prefix=/usr ${extraopts}
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index ea3fa63b9..ba344c666 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 129477 2011-06-28 06:24:10Z schiv $
+# $Id: PKGBUILD 130010 2011-06-30 20:37:27Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=jack
 _longname=jack-audio-connection-kit
-pkgver=0.121.1
+pkgver=0.121.2
 pkgrel=1
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ provides=("$_longname=$pkgver")
 replaces=("$_longname")
 changelog=$pkgname.changelog
 source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz")
-md5sums=('a51005bfd6e993af8517e19e823cf3c6')
+md5sums=('06c080349455afd4d217d6a8f9393e01')
 
 build() {
   cd "$srcdir/$_longname-$pkgver"
diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD
index c426289e3..764976794 100644
--- a/extra/libebml/PKGBUILD
+++ b/extra/libebml/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 108561 2011-02-01 17:18:01Z giovanni $
+# $Id: PKGBUILD 129933 2011-06-30 13:52:37Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=libebml
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="Extensible Binary Meta Language library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dl.matroska.org/downloads/libebml/"
 license=('LGPL')
 depends=('gcc-libs')
-source=("${url}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('26fbaa556bb497c1134d33b84ab34443')
+source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('13c5a10e260e703d3a7f003fdc995183')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
-  make || return 1
+
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
-  make prefix="${pkgdir}/usr" install || return 1
+
+  make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD
index c92aaafb2..4febacedf 100644
--- a/extra/libmatroska/PKGBUILD
+++ b/extra/libmatroska/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 108572 2011-02-01 18:22:49Z giovanni $
+# $Id: PKGBUILD 129938 2011-06-30 14:07:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor 03/08/04 <lefungus@altern.org>
 
 pkgname=libmatroska
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Matroska library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dl.matroska.org/downloads/libmatroska/"
 license=('LGPL')
 depends=('libebml')
-source=("${url}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('21e5ee3e2573f0ae99db195348bdfb98')
+source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('a4f967f9ade56d5181714f3199ffa241')
 
 build() {
- cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
- make sharedlib || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
+
+  make sharedlib
 }
 
 package() {
- cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
- make prefix="${pkgdir}/usr" install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
+
+  make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index f3eb81f78..17b6a7845 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 116022 2011-03-22 15:58:44Z giovanni $
+# $Id: PKGBUILD 129953 2011-06-30 15:40:13Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2011.03.14
+pkgver=2011.06.16
 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=('ff65b2c598e970b4b6c8219a1811de00')
+md5sums=('9895e723ee9fe87422f120dc646875d5')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 79b1e0abf..457e176f9 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127788 2011-06-18 10:58:55Z giovanni $
+# $Id: PKGBUILD 129948 2011-06-30 15:26:18Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=mkvtoolnix
 pkgver=4.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/mtools/PKGBUILD b/extra/mtools/PKGBUILD
index 9f90d79a2..1e9924ca9 100644
--- a/extra/mtools/PKGBUILD
+++ b/extra/mtools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120053 2011-04-18 22:34:00Z giovanni $
+# $Id: PKGBUILD 130005 2011-06-30 19:10:40Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=mtools
-pkgver=4.0.16
+pkgver=4.0.17
 pkgrel=1
 pkgdesc="A collection of utilities to access MS-DOS disks"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('libx11: required by floppyd'
 backup=('etc/mtools.conf')
 install=mtools.install
 source=("http://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('e9b07f35272210f407012abaf5d1b9b5')
+md5sums=('15571c615d8f75f5f6d294272f80c7fa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,12 +26,12 @@ build() {
               --mandir=/usr/share/man \
               --infodir=/usr/share/info \
 	      --sysconfdir=/etc
-  make || return 1
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make -j 1 DESTDIR="${pkgdir}" install || return 1
-  install -Dm644 mtools.conf "${pkgdir}/etc/mtools.conf" || return 1
+  make -j 1 DESTDIR="${pkgdir}" install
+  install -Dm644 mtools.conf "${pkgdir}/etc/mtools.conf"
 }
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 510afc089..5d73e1d73 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127700 2011-06-17 17:59:14Z andrea $
+# $Id: PKGBUILD 130000 2011-06-30 19:02:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
@@ -6,15 +6,20 @@
 pkgbase=sip
 pkgname=('sip' 'python2-sip')
 pkgver=4.12.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('d0f1fa60494db04b4d115d4c2d92f79e')
+source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz"
+        'fix-regression.patch')
+md5sums=('d0f1fa60494db04b4d115d4c2d92f79e'
+         '598ffc65ebaf1c0e8855a352b02c43e7')
 
 build() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-regression.patch
+
   cd "${srcdir}"
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
 
diff --git a/extra/sip/fix-regression.patch b/extra/sip/fix-regression.patch
new file mode 100644
index 000000000..d4dc794ad
--- /dev/null
+++ b/extra/sip/fix-regression.patch
@@ -0,0 +1,26 @@
+
+# HG changeset patch
+# User Phil Thompson <phil@riverbankcomputing.com>
+# Date 1308852953 -3600
+# Node ID f9f4b161c94021c117e995eccba945d4dd3d0ed4
+# Parent  df42f6bf92c8cd12dd7cc5a30231728a4c23ead4
+Fixed a regression introduced in the recent sipIsPyMethod() changes in the
+handling of special methods implemented by object (eg. __lt__).
+
+diff -r df42f6bf92c8 -r f9f4b161c940 siplib/siplib.c.in
+--- a/siplib/siplib.c.in	Thu Jun 23 17:24:41 2011 +0100
++++ b/siplib/siplib.c.in	Thu Jun 23 19:15:53 2011 +0100
+@@ -7604,9 +7604,10 @@
+ #endif
+ 
+         /*
+-         * Check any possible reimplementation is not the wrapped C++ method.
++         * Check any possible reimplementation is not the wrapped C++ method or
++         * a default special method implementation..
+          */
+-        if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type)
++        if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type && Py_TYPE(cls_attr) != &PyWrapperDescr_Type)
+         {
+             reimp = cls_attr;
+             break;
+
diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD
index 1c93e7143..ab1bbfafd 100644
--- a/extra/telepathy-salut/PKGBUILD
+++ b/extra/telepathy-salut/PKGBUILD
@@ -1,24 +1,30 @@
-# $Id: PKGBUILD 94337 2010-10-06 16:43:18Z ibiru $
+# $Id: PKGBUILD 129928 2011-06-30 10:52:28Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 pkgname=telepathy-salut
-pkgver=0.4.0
+pkgver=0.5.0
 pkgrel=1
 pkgdesc="A link-local XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 groups=('telepathy')
 license=('LGPL')
-depends=('telepathy-glib>=0.12.0' 'avahi' 'libsoup')
-makedepends=('libxslt' 'python2')
+depends=('telepathy-glib' 'avahi' 'libsoup')
+makedepends=('libxslt' 'python2' 'xmldiff')
 install=telepathy-salut.install
 source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('95f0cf9681912104474b0f4c4d00807f')
+md5sums=('0642bd33d5d5e8e50087ace1faa769cd')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure --prefix=/usr \
-    	--libexecdir=/usr/lib/telepathy
+    	--libexecdir=/usr/lib/telepathy \
+        --disable-plugins --disable-Werror \
+        --with-tls=openssl
     make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 429869265..5e27ee382 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 124261 2011-05-18 07:05:56Z ibiru $
+# $Id: PKGBUILD 129943 2011-06-30 15:04:13Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
-pkgname=('transmission-cli' 'transmission-gtk')
-pkgver=2.31
+pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
+pkgver=2.32
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.transmissionbt.com/"
 license=('MIT')
-makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'desktop-file-utils' 'libevent' 'libcanberra' 'dbus-glib')
+makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'qt' 'libevent' 'libcanberra' 'dbus-glib')
 source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.bz2
         transmissiond transmissiond.conf)
-md5sums=('2785016d74bbecf842cef04883e56400'
+md5sums=('cac5d0e07b92e563b34b61de5a6235c7'
          '08875299e3fbb68fc546c1f350ac1f06'
          'be39806c35b7544856fa4070b00fc960')
 build() {
@@ -21,6 +21,9 @@ build() {
 
   ./configure --prefix=/usr --disable-gconf2
   make
+  pushd qt
+  qmake qtr.pro
+  make
 }
 package_transmission-cli() {
   pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index c861b3ac6..43d28f429 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 129407 2011-06-27 11:36:20Z stephane $
+# $Id: PKGBUILD 129958 2011-06-30 16:26:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=1.1.10
-pkgrel=5
+pkgrel=6
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -45,7 +45,7 @@ build() {
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
 
   # FS#24872
-  patch -Np1 -i ../vlc-1.1.10-libavformat.patch
+  patch -Np1 -i ${srcdir}/vlc-1.1.10-libavformat.patch
 
   ./configure --prefix=/usr \
               --disable-rpath \