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

Conflicts:
	community/libfm/PKGBUILD
	community/lxlauncher/PKGBUILD
	community/mrtg/PKGBUILD
	core/glib2/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD

5 files changed, 18 insertions, 19 deletions

diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD
index b88eec362..c379ab0e3 100644
--- a/core/gettext/PKGBUILD
+++ b/core/gettext/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 180089 2013-03-16 12:44:48Z tpowa $
+# $Id: PKGBUILD 189899 2013-07-11 06:27:56Z tpowa $
 # Maintainer:
 
 pkgname=gettext
-pkgver=0.18.2.1
+pkgver=0.18.3
 pkgrel=1
 pkgdesc="GNU internationalization library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,9 +14,8 @@ optdepends=('cvs: for autopoint tool')
 options=(!libtool !docs)
 install=gettext.install
 source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('034c8103b14654ebd300fadac44d6f14'
-         'e4658c307333395a12f8d0b4d95fbb0f')
-
+md5sums=('3fa4236c41b7e837355de144210207ec'
+         'SKIP')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 95a60fd8d..a60e5c790 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188618 2013-06-17 01:21:11Z heftig $
+# $Id: PKGBUILD 189879 2013-07-10 14:29:53Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=glib2
@@ -16,16 +16,16 @@ sha256sums=('5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e'
 
 prepare() {
   cd glib-$pkgver
-
   patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
 
 # doc building fail "automake-1.13 probably too old"
-  autoreconf -i
-}
+#  autoreconf -i
 
+  touch -r NEWS gtk-doc.make
+}
+  
 build() {
   cd glib-$pkgver
-
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
       --sysconfdir=/etc \
       --with-pcre=system \
diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index b452839e3..be4cba731 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184779 2013-05-08 13:18:12Z tpowa $
+# $Id: PKGBUILD 189898 2013-07-11 06:27:55Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=gpgme
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="A C wrapper library for GnuPG"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('libgpg-error' 'pth' 'gnupg>=2')
 install=${pkgname}.install
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('07f1c0eb6596a94efa3ffb75e74bfbba'
+md5sums=('c8cb345ba7c0353e47bdf3c5c05e49be'
          'SKIP')
 
 build() {
diff --git a/core/libassuan/PKGBUILD b/core/libassuan/PKGBUILD
index 2fc03d0e8..86047c79b 100644
--- a/core/libassuan/PKGBUILD
+++ b/core/libassuan/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 180088 2013-03-16 12:44:19Z tpowa $
+# $Id: PKGBUILD 189897 2013-07-11 06:27:54Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libassuan
-pkgver=2.1.0
+pkgver=2.1.1
 pkgrel=1
 pkgdesc="A IPC library used by some GnuPG related software"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libgpg-error')
 options=('!libtool')
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
 install=libassuan.install
-md5sums=('b3231eec8e567f4f9294474a387378f5')
+md5sums=('757243cc4a71b30ed8d8dbe784035d36')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD
index 395f0c2d0..7cd99eb0a 100644
--- a/core/libnl/PKGBUILD
+++ b/core/libnl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 179637 2013-03-08 23:40:40Z foutrelis $
+# $Id: PKGBUILD 189873 2013-07-10 08:18:16Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=libnl
-pkgver=3.2.21
+pkgver=3.2.22
 pkgrel=1
 pkgdesc="Library for applications dealing with netlink sockets"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=(glibc)
 backup=(etc/libnl/classid etc/libnl/pktloc)
 options=(!libtool)
 source=("$url/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('2dc80f043116ec8610d9d418f5f5e9283f3d9a3a48b8d51a8cb0146b3f279604')
+sha256sums=('c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"