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

Conflicts:
	community/hostapd/PKGBUILD
	community/polipo/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libssh/PKGBUILD
	extra/m17n-lib/PKGBUILD

6 files changed, 34 insertions, 39 deletions

diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index 3d9646fda..32429c737 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157815 2012-04-30 04:19:24Z foutrelis $
+# $Id: PKGBUILD 172469 2012-12-03 11:51:15Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=exo
-pkgver=0.8.0
+pkgver=0.10.0
 pkgrel=1
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
 optdepends=('perl-uri: for mail-compose helper script')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0')
+source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('bd5342f5d56a86521315d3ed5834973f28ab58d4f3d76351b590bebbb87afc66')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libotf/PKGBUILD b/extra/libotf/PKGBUILD
index 44bbb862d..0003de2dd 100644
--- a/extra/libotf/PKGBUILD
+++ b/extra/libotf/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 149040 2012-02-05 15:14:11Z bisson $
+# $Id: PKGBUILD 172457 2012-12-03 05:46:28Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Ashish Shukla <wahjava.ml@gmail.com>
 
 pkgname=libotf
-pkgver=0.9.12
-pkgrel=2.1
+pkgver=0.9.13
+pkgrel=1
 pkgdesc='OpenType Font library'
-url='http://www.m17n.org/libotf/'
+url='http://www.nongnu.org/m17n/'
 license=('LGPL')
 options=('!libtool')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libxaw' 'freetype2')
-source=("http://www.m17n.org/libotf/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('47872f696a62e8f111960143f3f36b5366398e20')
+source=("http://download.savannah.gnu.org/releases/m17n//${pkgname}-${pkgver}.tar.gz")
+sha1sums=('66bb81958f5f07ee1f8917d3cb7e359ae559d873')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index 3a5d57db1..ed8bb0695 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 138141 2011-09-17 12:41:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 172472 2012-12-03 12:34:31Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: ice-man <icemanf@gmail.com>
 # Contributor: sergeantspoon <sergeantspoon@archlinux.us>
 
 pkgname=libssh
-pkgver=0.5.2
-pkgrel=1.1
+pkgver=0.5.3
+pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl')
 makedepends=('cmake' 'doxygen')
-source=("https://red.libssh.org/attachments/download/27/${pkgname}-${pkgver}.tar.gz")
-md5sums=('38b67c48af7a9204660a3e08f97ceba6')
+source=("https://red.libssh.org/attachments/download/38/${pkgname}-${pkgver}.tar.gz")
 
 build() {
   cd "${srcdir}"
@@ -29,3 +29,4 @@ package(){
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('9ad01838d3b89d98e900e0f6260a88cc')
diff --git a/extra/m17n-lib/PKGBUILD b/extra/m17n-lib/PKGBUILD
index a50806ff2..afa11f8f3 100644
--- a/extra/m17n-lib/PKGBUILD
+++ b/extra/m17n-lib/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 140555 2011-10-17 07:25:46Z bisson $
+# $Id: PKGBUILD 172459 2012-12-03 05:46:31Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Camille Moncelier <pix@devlife.org>
 
 pkgname=m17n-lib
-pkgver=1.6.3
-pkgrel=1.2
+pkgver=1.6.4
+pkgrel=1
 pkgdesc='Multilingual text processing library (runtimes)'
+url='http://www.nongnu.org/m17n/'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.m17n.org/m17n-lib/'
 license=('GPL')
 depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf')
 optdepends=('anthy: to use the anthy input method')
-options=('!libtool' '!emptydirs' '!distcc' '!makeflags')
-source=("http://www.m17n.org/m17n-lib-download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('b3a725b1c417f167f6b2c6b7889b7d728a1e6b8f')
+options=('!makeflags' '!libtool' '!emptydirs')
+source=("http://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('83f2fc4facfd70a580bb95d9381eac7472d85171')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index ac3dafa31..1550da603 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162770 2012-06-30 07:08:33Z ronald $
+# $Id: PKGBUILD 172476 2012-12-03 18:59: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=2
+pkgver=2.15.2
+pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -22,7 +22,7 @@ source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.png'
 	'R.conf')
 install=r.install
-sha1sums=('f0e6912be6dfc0d1fdc4be66048304d8befe8424'
+sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978'
           '43668da6cfd1b4455a99f23e79e2059294dddac9')
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index e9df5b0bd..f7ac04f41 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170254 2012-11-06 11:47:03Z foutrelis $
+# $Id: PKGBUILD 172467 2012-12-03 11:50:24Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
-pkgver=1.4.0
-pkgrel=4
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://thunar.xfce.org"
@@ -22,19 +22,12 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems
             'thunar-media-tags-plugin: view/edit id3/ogg tags')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2
-        thunar-1.4.0-show-loop-devices-hack.patch)
-sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba'
-            '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e')
+source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
+sha256sums=('354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a')
 
 build() {
   cd "$srcdir/Thunar-$pkgver"
 
-  # Fix: Loop devices not appearing in Thunar side pane
-  # https://bugs.archlinux.org/task/29894
-  # https://bugzilla.xfce.org/show_bug.cgi?id=8947
-  patch -Np1 -i "$srcdir/thunar-1.4.0-show-loop-devices-hack.patch"
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \