Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/virtualbox/PKGBUILD

4 files changed, 40 insertions, 39 deletions

diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index 9eabbf7e3..f4709bf19 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131761 2011-07-14 17:10:17Z remy $
+# $Id: PKGBUILD 144094 2011-12-03 17:46:02Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Firmicus <francois.archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=asymptote
-pkgver=2.13
+pkgver=2.15
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -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=('b4f2b72c0a4e7a02b716bfd0ad64bab45c567bbd')
+sha1sums=('e0fb336c195fb21a39e3d0f3acd4881ce5e170a7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 77c52b0f7..d20eeb882 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143010 2011-11-20 20:58:22Z dan $
+# $Id: PKGBUILD 144099 2011-12-03 18:17:43Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.7.4
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -80,7 +80,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('5b6920989480a37ec65977e756b24961578795dd'
-          'cb21e55ae793865453c165a0e666348f2db8c740'
+sha1sums=('7453e737e008f7319a5eca24a9ef3c5fb1f13398'
+          '93315f7f51d7f27d3e421c9b0d64afa27f3d16df'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index 373444048..8653eac60 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,42 +1,42 @@
-# $Id: PKGBUILD 140175 2011-10-08 12:02:46Z ibiru $
+# $Id: PKGBUILD 144089 2011-12-03 12:24:56Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.81
+pkgver=0.82
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
 url="http://www.bitwizard.nl/mtr/"
-md5sums=('b7a7914f1fc1b5a21ab10bdca44356e1')
+md5sums=('10601ea543fda3e51545c4bce195b64c')
 
 build() {
-    install -d  "${srcdir}/"{mtr-cli,mtr-gtk}
-    cd "${srcdir}/mtr-cli"
-    ../${pkgbase}-${pkgver}/configure --prefix=/usr --disable-gtktest --without-gtk
+    install -d  "$srcdir/"{mtr-cli,mtr-gtk}
+    cd "$srcdir/mtr-cli"
+    ../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk
     make
 
-    cd "${srcdir}/mtr-gtk"
-    ../${pkgbase}-${pkgver}/configure --prefix=/usr
+    cd "$srcdir/mtr-gtk"
+    ../$pkgbase-$pkgver/configure --prefix=/usr
     make
 }
 
 package_mtr() {
     pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)"
     depends=('ncurses')
-    cd "${srcdir}/mtr-cli"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/mtr-cli"
+    make DESTDIR="$pkgdir" install
 }
 
 package_mtr-gtk() {
     pkgdesc="Combines the functionality of traceroute and ping into one tool (GTK version)"
     depends=('ncurses' "gtk2")
     conflicts=("mtr")
-    provides=("mtr=${pkgver}")
+    provides=("mtr=$pkgver")
 
-    cd "${srcdir}/mtr-gtk"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/mtr-gtk"
+    make DESTDIR="$pkgdir" install
 }
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index fb2ee89fc..4ded98b7e 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 142640 2011-11-12 17:15:38Z ibiru $
+# $Id: PKGBUILD 144087 2011-12-03 09:31:31Z 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.3.1
-pkgrel=2
+pkgver=2.3.1_a
+_realver=2.3.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030'
+depends=('jasper' 'gstreamer0.10-base' 'openexr'
          'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
 makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
-optdepends=('python2-numpy: Python 2.x interface'
-            'eigen2')
+optdepends=('opencv-docs'
+            'opencv-samples'
+            'eigen2'
+            'python2-numpy: Python 2.x interface')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2")
-md5sums=('827c9f8aa14384c531c73aa165f9b777')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2")
+md5sums=('82e4b6bfa349777233eea09b075e931e')
 
 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
@@ -45,7 +48,7 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D USE_FAST_MATH=ON')
 
 build() {
-  cd "$srcdir/$_realname-$pkgver"
+  cd "$srcdir/$_realname-$_realver"
 
   # x64, i.e "Athlon64" and upwards, can use SSE3
   [ $CARCH = x86_64 ] && \
@@ -57,14 +60,12 @@ build() {
 }
 
 package_opencv() {
-  install=$pkgname.install
-
-  cd "$srcdir/$_realname-$pkgver"
+  cd "$srcdir/$_realname-$_realver"
 
   make DESTDIR="$pkgdir" install
 
   # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   cd "$pkgdir/usr/share"
@@ -85,8 +86,8 @@ package_opencv() {
 
 package_opencv-docs() {
   pkgdesc+=" (documentation)"
-  depends=()
-  optdepends=()
+  unset depends
+  unset optdepends
   options=('docs')
 
   cd "$srcdir"
@@ -97,9 +98,9 @@ package_opencv-docs() {
 
 package_opencv-samples() {
   pkgdesc+=" (samples)"
-  depends=()
-  optdepends=()
-  options=()
+  depends=('bash')
+  unset optdepends
+  unset options
 
   cd "$srcdir"