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

Conflicts:
	extra/postgresql/PKGBUILD
	libre/gstreamer0.10-bad-libre/PKGBUILD

4 files changed, 16 insertions, 16 deletions

diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index 3097354dd..862be193a 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 155758 2012-04-06 07:00:20Z remy $
+# $Id: PKGBUILD 160750 2012-06-04 21:42:23Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Firmicus <francois.archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=asymptote
-pkgver=2.15
-pkgrel=2
+pkgver=2.16
+pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://asymptote.sourceforge.net/"
@@ -17,7 +17,7 @@ optdepends=('python2:           for the xasy GUI'
             'tix:               for the xasy GUI')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install=texlive.install
-sha1sums=('e0fb336c195fb21a39e3d0f3acd4881ce5e170a7')
+sha1sums=('ca110698b8c710eb93830f0fa55d29503c39e92a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index ac3920d41..e91f781b2 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158091 2012-05-02 18:12:22Z schiv $
+# $Id: PKGBUILD 160732 2012-06-04 18:03:37Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.0
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ optdepends=('opencv-docs'
             'python2-numpy: Python 2.x interface')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2")
-md5sums=('1fcda4ed3d0655f033ac30be8bad4882')
+md5sums=('144aafa12260150490ce77d8debc1a23')
 
 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD
index 0e8c1874f..af1a2f3fd 100644
--- a/extra/postgresql-old-upgrade/PKGBUILD
+++ b/extra/postgresql-old-upgrade/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 151565 2012-02-27 18:03:37Z dan $
+# $Id: PKGBUILD 160728 2012-06-04 17:55:37Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=postgresql-old-upgrade
-pkgver=9.0.7
+pkgver=9.0.8
 _majorver=${pkgver%.*}
 pkgrel=1
 pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade"
@@ -37,5 +37,5 @@ package() {
   rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/"
 }
 
-md5sums=('27e67f48607c29df8ca6aab2a6fdf0b8')
-sha256sums=('dabe26d71d8b595f9514da1363dc20c3f4b90b6908026dd06984cac448a6d833')
+md5sums=('0e830b0f6538e04b788c3208060256ef')
+sha256sums=('a2981ba8a64b396e2111fee5a9216275e49a2e79e839152a5e4367afd44c0bc2')
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 85d3efa56..0fe507e95 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160571 2012-06-02 10:28:50Z bluewind $
+# $Id: PKGBUILD 160730 2012-06-04 17:58:05Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.1.3
+pkgver=9.1.4
 _majorver=${pkgver%.*}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
@@ -134,12 +134,12 @@ package_postgresql() {
     "${pkgdir}/etc/logrotate.d/postgresql"
 }
 
-md5sums=('641e1915f7ebfdc9f138e4c55b6aec0e'
+md5sums=('a8035688dba988b782725ac1aec60186'
          '1ddd1df8010549f237e7983bb326025e'
          'a54d09a20ab1672adf08f037df188d53'
          '96f82c38f3f540b53f3e5144900acf17'
          'd28e443f9f65a5712c52018b84e27137')
-sha256sums=('7a79800a624031c1d9bc9cdce73cb40050100ac50a82050cbf7bbbd16ac4d5d5'
+sha256sums=('a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712'
             '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45'
             '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'