Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

5 files changed, 75 insertions, 70 deletions

diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD
index 1b42c921c..7fceb3678 100644
--- a/pcr/collada-dom/PKGBUILD
+++ b/pcr/collada-dom/PKGBUILD
@@ -1,15 +1,15 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=collada-dom
 pkgver=2.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An API that provides a C++ object representation of a ${pkgname::7} XML instance document"
 url=http://sourceforge.net/projects/$pkgname
 license=MIT
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
 depends=(
   boost-libs
@@ -26,23 +26,23 @@ sha512sums=4c8cdc159acc89564b46615a0bc73a5ba84a1a5aa41d38661cd0e33a705ce5fd032e9
 prepare() {
   cd $srcdir/$pkgname-$pkgver-libsrc
 
-  [[ -d build ]] && rm -r build
-  mkdir build
+  [[ -d build ]] && rm -vr build
+  mkdir -v build
 }
 
 build() {
   cd $srcdir/$pkgname-$pkgver-libsrc/build
-  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-  setarch $CARCH make
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver-libsrc/build
-  setarch $CARCH make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install
 
   a=$pkgdir/usr/share/licenses/$pkgname
 
-  install -d $a && cp -a ../{dom/license.txt,License_Folder/license_e.txt} $a
+  install -vd $a && cp -va ../{dom/license.txt,License_Folder/license_e.txt} $a
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index f2d7f83b0..e0d8e24fd 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -1,25 +1,28 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-pkgname=(
-  mitsuba
-  blender-addon-mitsuba
-)
-_pkgname=${pkgname[0]}
-_bldname=${pkgname[1]::7}
+_pkgname=mitsuba
+_bldname=blender
 _addname=$_pkgname-$_bldname
-pkgver=0.4.4
 _bldver=2.67
-_addver=0.2.1 # Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version)
 _adddat=20130320
 _addrev=40
 _bldep=8
 _pyver=3.3
+
+# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version)
+_addver=0.2.1
+
+pkgname=(
+  $_pkgname
+  $_bldname-addon-$_pkgname
+)
+pkgver=0.4.4
 pkgrel=3
 pkgdesc='A physically based renderer'
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
 url=https://www.$_pkgname-renderer.org/
 license=GPL3
@@ -59,8 +62,8 @@ prepare() {
 
   cd $srcdir/$_pkgname-v$pkgver
 
-  [[ -d build ]] && rm -r build
-  mkdir build
+  [[ -d build ]] && rm -vr build
+  mkdir -v build
 
   cd $startdir/../srcdest/$_addname
 
@@ -74,44 +77,43 @@ build() {
 
   [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF'
 
-  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     $DMTS_SSE\
     -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\
     -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\
     -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so
-  setarch $CARCH make
+  make
 }
 
 package_mitsuba() {
   cd $srcdir/$_pkgname-v$pkgver/build
-  setarch $CARCH make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install
 
   #fixing files and folders location
   a=$pkgdir/usr
   b=$srcdir/$_pkgname-v$pkgver
-  install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}}
-  install -m644 $b/data/linux/$_pkgname.desktop           $a/share/applications
-  install -m644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps
-  install -m644 $b/doc/license.txt                        $a/share/licenses/$_pkgname/LICENSE
-  mv $a/{m{itsuba,ts{gui,import,srv,util}},bin}
-  mv $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,}
-  mv $a/{{data,plugins},share/$_pkgname}
-  mv $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
-  mv $a/{sdk/include,}
-  rmdir $a/{python,sdk}
+  install -vd $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}}
+  install -vm644 $b/data/linux/$_pkgname.desktop           $a/share/applications
+  install -vm644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps
+  install -vm644 $b/doc/license.txt                        $a/share/licenses/$_pkgname/LICENSE
+  mv -v $a/{m{itsuba,ts{gui,import,srv,util}},bin}
+  mv -v $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,}
+  mv -v $a/{{data,plugins},share/$_pkgname}
+  mv -v $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
+  mv -v $a/{sdk/include,}
+  rmdir -v $a/{python,sdk}
 }
 
 package_blender-addon-mitsuba() {
-  _pkgname=${pkgname:14}
-  _pkgver=$pkgver
-  pkgver=$_addver.r$_addrev.v$_bldver
   pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname-libre package)"
   arch=any
   depends=(
-    $_pkgname=$_pkgver
+    $_pkgname=$pkgver
     "$_bldname>=$(($_bldep-1)):$_bldver"
     "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
   )
+  _pkgver=$pkgver
+  pkgver=$_addver.r$_addrev.v$_bldver
   optdepends=
   install=$pkgname.install
 
@@ -121,8 +123,8 @@ package_blender-addon-mitsuba() {
   b=$pkgdir/usr/share/licenses/$pkgname
   c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
 
-  install -d $a && cp -a $_pkgname $a
-  install -d $b && install -m644 $c $b/LICENSE
+  install -vd $a && cp -a $_pkgname $a
+  install -vd $b && install -m644 $c $b/LICENSE
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/otf-stix/PKGBUILD b/pcr/otf-stix/PKGBUILD
index 60fc88680..6a9b2d62c 100644
--- a/pcr/otf-stix/PKGBUILD
+++ b/pcr/otf-stix/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=otf-stix
 pkgver=1.1.0
 #_pkgver=${pkgver//_/-}
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='A comprehensive set of fonts that serve the scientific and 
 engineering community.'
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index e3c0381d8..511f2b93e 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,27 +1,32 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-pkgname=(
-  yafaray
-  blender-addon-yafaray
-)
-_pkgname=${pkgname[0]}
-_bldname=${pkgname[1]::7}
+_pkgname=yafaray
+_bldname=blender
 _gitname=Core
 _addname=${_bldname^}-Exporter
 _pkgdate=20130510
-pkgver=1.5.$_pkgdate
-_srcver=44323def5b3866ff601fd401ef2160b80ced8141 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
 _bldver=2.67
 _bldep=8
 _pyver=3.3
-pkgrel=1
+
+# Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
+_srcver=44323def5b3866ff601fd401ef2160b80ced8141                                  
+# Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes
+_addver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169
+
+pkgname=(
+  $_pkgname
+  $_bldname-addon-$_pkgname
+)
+pkgver=1.5.$_pkgdate
+pkgrel=2
 pkgdesc='A libre software raytracing engine'
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
-url="http://www.$_pkgname.org"
+url=http://www.$_pkgname.org
 license=LGPL2.1
 depends=(
   freetype2
@@ -52,34 +57,32 @@ prepare() {
 
   git checkout $_srcver
 
-  [[ -d build ]] && rm -r build
-  mkdir build
+  [[ -d build ]] && rm -vr build
+  mkdir -v build
 }
 
 build() {
   cd $srcdir/$_gitname/build
-
-  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     -DYAF_PY_VERSION=$_pyver\
     -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
-  setarch $CARCH make
+  make
 }
 
 package_yafaray() {
   cd $srcdir/$_gitname/build
-  setarch $CARCH make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install
 }
 
 package_blender-addon-yafaray() {
-  pkgver=$pkgver.v$_bldver
-  _srcver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 # Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes
   pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
   arch=any
   depends=(
-    ${pkgname:14}=${pkgver%.v$_bldver}
+    $_pkgname=$pkgver
     "$_bldname>=$(($_bldep-1)):$_bldver"
     "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
   )
+  pkgver=$pkgver.v$_bldver
   optdepends=
 
   cd $srcdir/$_addname
@@ -87,13 +90,13 @@ package_blender-addon-yafaray() {
   a=/usr/lib
   b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
 
-  git checkout $_srcver
+  git checkout $_addver
   git checkout-index -a -f --prefix=${b%bin}
 
-  install -d $b
-  ln -sf $a/lib${_pkgname}core.so   $b/lib${_pkgname}core.so
-  ln -sf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so
-  ln -sf $a/$_pkgname               $b/plugins
+  install -vd $b
+  ln -vsf $a/lib${_pkgname}core.so   $b/lib${_pkgname}core.so
+  ln -vsf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so
+  ln -vsf $a/$_pkgname               $b/plugins
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 1fb918903..71517f39b 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.07.17.1
+pkgver=2013.07.18
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('689d7d2507a0a452e53c2c40957220dc'
+md5sums=('a644d8419f5387a91387d1e9db97d00f'
           'SKIP')
 
 prepare() {