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

32 files changed, 55 insertions, 54 deletions

diff --git a/pcr/aqsis/PKGBUILD b/pcr/aqsis/PKGBUILD
index 89998fc84..f7de71f6f 100644
--- a/pcr/aqsis/PKGBUILD
+++ b/pcr/aqsis/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Former contributor: Gino Pezzin <pezzin@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 pkgname=aqsis
 pkgver=1.8.2
diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD
index 5fd846220..d1115a448 100644
--- a/pcr/blender-addon-ogre/PKGBUILD
+++ b/pcr/blender-addon-ogre/PKGBUILD
@@ -1,13 +1,13 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _bldname=blender
-_bldver=2.69
-_bldep=10
+_bldver=2.70
+_bldep=11
 
 _pkgname=ogre
 pkgname=$_bldname-addon-$_pkgname
 pkgver=0.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="${_bldname}2$_pkgname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname-libre package)"
 arch=any
 url=https://code.google.com/p/${_bldname}2$_pkgname
diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD
index da085729f..db6c02b4f 100644
--- a/pcr/cinepaint-lts/PKGBUILD
+++ b/pcr/cinepaint-lts/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 pkgname=cinepaint-lts
 pkgver=1.0
diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD
index 7fceb3678..e663ccc37 100644
--- a/pcr/collada-dom/PKGBUILD
+++ b/pcr/collada-dom/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 pkgname=collada-dom
 pkgver=2.4.0
diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD
index efa005071..94e32a211 100644
--- a/pcr/ganglia/PKGBUILD
+++ b/pcr/ganglia/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=ganglia
 pkgver=3.6.0
diff --git a/pcr/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD
index cd38b329d..dbf9ed51f 100644
--- a/pcr/gimp-art/PKGBUILD
+++ b/pcr/gimp-art/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=gimp-art
 pkgver=2.8.2
diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license
index 22b83f32c..0600f3f76 100644
--- a/pcr/gimp-art/gimp-splash-artwork.license
+++ b/pcr/gimp-art/gimp-splash-artwork.license
@@ -1,6 +1,6 @@
 GIMP LIBRE SPLASH LICENSE
 
-Logo and Effects is created by Zé Lara <ze.miguel.lara@gmail.com> and Márcio Silva <coadde@lavabit.com>
+Logo and Effects is created by Zé Lara <ze.miguel.lara@gmail.com> and Márcio Silva <coadde@parabola.nu>
 Idea by André Silva <emulatorman@parabola.nu>
 
 The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. 
diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD
index d9d553531..0e7bee853 100644
--- a/pcr/imagemagick-srv/PKGBUILD
+++ b/pcr/imagemagick-srv/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id$
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 pkgbase=imagemagick
 pkgname=imagemagick-srv
diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD
index 2ff97dc46..caa060d1c 100644
--- a/pcr/jitsi/PKGBUILD
+++ b/pcr/jitsi/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
 # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
 
 pkgname=jitsi
 pkgver=2.4.4997
diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD
index 6b27ff5f4..9e099e854 100644
--- a/pcr/lcmc/PKGBUILD
+++ b/pcr/lcmc/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=lcmc
 pkgver=1.5.1
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index 2d5c09ec0..75b6ef8c3 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=libav
 pkgver=9.10
diff --git a/pcr/libglu-git/PKGBUILD b/pcr/libglu-git/PKGBUILD
index 46ff7a358..d779980eb 100644
--- a/pcr/libglu-git/PKGBUILD
+++ b/pcr/libglu-git/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=libglu-git
 pkgver=20120908
diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD
index 85b3ff082..1e7d53c79 100644
--- a/pcr/libqb/PKGBUILD
+++ b/pcr/libqb/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=libqb
 pkgver=0.14.4
diff --git a/pcr/librevpn-git/PKGBUILD b/pcr/librevpn-git/PKGBUILD
index 551a984e2..6703c1864 100644
--- a/pcr/librevpn-git/PKGBUILD
+++ b/pcr/librevpn-git/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
  _branch=master
 #_branch=feature/empaquetable
diff --git a/pcr/librevpn/PKGBUILD b/pcr/librevpn/PKGBUILD
index 71a3a2f7c..39c381808 100644
--- a/pcr/librevpn/PKGBUILD
+++ b/pcr/librevpn/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=lvpn
 pkgname=librevpn
diff --git a/pcr/libspnav/PKGBUILD b/pcr/libspnav/PKGBUILD
index da0272ed7..01325c1cf 100644
--- a/pcr/libspnav/PKGBUILD
+++ b/pcr/libspnav/PKGBUILD
@@ -1,5 +1,5 @@
 # Contributor: Jan Hambrecht <jaham at gmx dot net>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 pkgname=libspnav
 pkgver=0.2.2
diff --git a/pcr/luabind/PKGBUILD b/pcr/luabind/PKGBUILD
index da47f927b..25b556e64 100644
--- a/pcr/luabind/PKGBUILD
+++ b/pcr/luabind/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: rayte <rabyte.at.gmail.dot.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 pkgname=luabind
 pkgver=0.9.1
diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD
index 9968dde38..103eda26e 100644
--- a/pcr/mednafen-server/PKGBUILD
+++ b/pcr/mednafen-server/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=mednafen-server
 _pkgname=${pkgname%-server}
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 01fb7a47f..3b3496ab6 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -1,19 +1,19 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=mitsuba
-_pkgver=0.4.4
-_pkgrel=5.1
+_pkgver=0.5.0
+_pkgrel=1
 _bldname=blender
-_bldver=2.69
-_bldep=10
+_bldver=2.70
+_bldep=11
 _addname=$_pkgname-$_bldname
-_adddat=20130320
-_addrev=47
+_adddat=20140325
+_addrev=55
 _addrel=1
 _pyver=3.3
 
-# Thu May 09 22:07:37 2013 +0200 - rev:47:8689e0896cf6 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version)
-_addver=0.2.1
+# Tue Mar 25 02:35:10 2014 +0100 - rev:55:2e925643723b ($srcdir/$_addname/mtsblend/__init__.py:bl_info>version)
+_addver=0.3.0
 
 pkgname=(
   $_pkgname
@@ -54,8 +54,8 @@ source=(
   $_addname-$_addver-$_addrev.tar.bz2::${url}repos/exporters/$_addname/archive/$_addrev.tar.bz2
 )
 sha512sums=(
-  01967fb84884fbab0ada3775c8f8c54b5523a97ebc9dedd559da3cb54543ecc919d3251c09718358405c19133218048fdb1c64f83d0637cf7b98acccb7564a1c
-  514cbb1300229599c536183ec300c3074aca349e0ddaa36ae7ae868a2c6b466116d9373a8d9ea89dcd1d09685e9a97bbd5c11121860da1a1bf45b921bcd21ca7
+  cb30ca95ada36bec56aca3af55af19511ae64f05631d3e221308dee6fe04a1de08daab6e89c9025c8f6492731ed586d40d92f2168c5d49a060f31cd0afc7d0a7
+  d8b1b1fb33e94f6acc843fabec7479b0f1cb186b37e20e0bf176c0b7e9562b0f7fda5b14f870160dd370ccfdce37c1912817825ec1b3783624c05f23acdcf7ed
 )
 
 prepare() {
@@ -108,6 +108,7 @@ package_mitsuba() {
   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/{m{itsuba,ts{gui,srv,util}},bin}
   mv -v $a/lib{$pkgname-{bidir,core,hw,render}.so,}
   mv -v $a/{{data,plugins},share/$_pkgname}
   mv -v $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
@@ -132,13 +133,13 @@ package_blender-addon-mitsuba() {
 
   msg 'fixing binary path'
   sed -i 's|'"'default'"': efutil.find_config_value('"'mitsuba', 'defaults', 'binary_path', ''"')|'"'default'"': '"'/usr/bin'"'|
-         ' $_pkgname/properties/engine.py
+         ' mtsblend/properties/engine.py
 
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
   b=$pkgdir/usr/share/licenses/$pkgname
   c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
 
-  install -vd $a && cp -a $_pkgname $a
+  install -vd $a && cp -a mtsblend $a/$_pkgname
   install -vd $b && install -m644 $c $b/LICENSE
 }
 
diff --git a/pcr/mozilla-devscripts/PKGBUILD b/pcr/mozilla-devscripts/PKGBUILD
index ef7ea7641..65344e997 100644
--- a/pcr/mozilla-devscripts/PKGBUILD
+++ b/pcr/mozilla-devscripts/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Michał Masłowski  <mtjm@mtjm.eu>
-# Contributor: Márcio Silva <coadde@lavabit.com>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgname=mozilla-devscripts
 pkgver=0.32
diff --git a/pcr/perl-expect/PKGBUILD b/pcr/perl-expect/PKGBUILD
index fefa03a0b..298cb623b 100644
--- a/pcr/perl-expect/PKGBUILD
+++ b/pcr/perl-expect/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Max Roder <maxroder@web.de>
 # Contributor: DarkHeart
 # Generator  : CPANPLUS::Dist::Arch 1.19
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva    <coadde@parabola.nu>
 
 pkgname='perl-expect'
 pkgver='1.21'
diff --git a/pcr/python-pygame-hg/PKGBUILD b/pcr/python-pygame-hg/PKGBUILD
index c48317b19..a0c2773ca 100644
--- a/pcr/python-pygame-hg/PKGBUILD
+++ b/pcr/python-pygame-hg/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=pygame
 _pkgver=1.9.2
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index db2a94428..a637bc5ff 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=renpy
 pkgname=python2-renpy
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index 61874b5ba..645259d58 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: AlexanderR <rvacheva at nxt dot ru>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 pkgname=renpy
 pkgver=6.16.2
diff --git a/pcr/ruby1-bundler/PKGBUILD b/pcr/ruby1-bundler/PKGBUILD
index d06f7af08..b7a42287b 100644
--- a/pcr/ruby1-bundler/PKGBUILD
+++ b/pcr/ruby1-bundler/PKGBUILD
@@ -1,5 +1,5 @@
 # Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 _pkgname=bundler
 pkgname=ruby1-$_pkgname
diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD
index fb1229ae4..36257da5c 100644
--- a/pcr/spacenav-daemon/PKGBUILD
+++ b/pcr/spacenav-daemon/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=spacenav-daemon
 _pkgname=${pkgname%-daemon}
diff --git a/pcr/spnavcfg/PKGBUILD b/pcr/spnavcfg/PKGBUILD
index cbea06d01..c1fea3d17 100644
--- a/pcr/spnavcfg/PKGBUILD
+++ b/pcr/spnavcfg/PKGBUILD
@@ -1,5 +1,5 @@
 # Contributor: Jan Hambrecht <jaham at gmx dot net>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 pkgname=spnavcfg
 pkgver=0.2.1
diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD
index 850aa3b7d..2d35202e0 100644
--- a/pcr/torque/PKGBUILD
+++ b/pcr/torque/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=torque
 pkgver=4.2.2
diff --git a/pcr/xcftools/PKGBUILD b/pcr/xcftools/PKGBUILD
index 414149f85..12bc05bd6 100644
--- a/pcr/xcftools/PKGBUILD
+++ b/pcr/xcftools/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Jonathan Frawley <jonathanfrawley@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 pkgname=xcftools
 pkgver=1.0.7
 pkgrel=2
diff --git a/pcr/xf86-input-wizardpen/PKGBUILD b/pcr/xf86-input-wizardpen/PKGBUILD
index dfad17f34..96547f842 100644
--- a/pcr/xf86-input-wizardpen/PKGBUILD
+++ b/pcr/xf86-input-wizardpen/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=xf86-input-wizardpen
 _pkgname=${pkgname:11}
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index c27f6c587..2dfd4ccea 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,22 +1,22 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=yafaray
 _pkgver=1.5
-_pkgrel=1.1
+_pkgrel=2
 _pkgdate=20130921
 _bldname=blender
-_bldver=2.69
-_bldep=10
+_bldver=2.70
+_bldep=11
 _gitname=Core
 _addname=${_bldname^}-Exporter
 _addrel=1
-_adddate=20130918
+_adddate=20131119
 _pyver=3.3
 
 # Sat Sep 21 00:41:17 2013 -0700 - Merge pull request #70 from YafaRay/bidirectional_cleanup
 _srcver=caef0fc92078871a5dcd2b9f547d954eca2941f1
-# Fri Oct 18 19:07:53 2013 +0200 - Fix AO issue (wizofboz): -Fixed error of indentation in 'yaf_integrator.py' causer of the error in the use of Ambient Occlusion.
-_addver=1874704e44c57bcea478d652563639e79b00a766
+# Tue Nov 19 20:56:44 2013 +0100 - Delete unused presets item
+_addver=f6b0cd3d43177bd36f7580f904cec55bad0b3348
 
 pkgname=(
   $_pkgname
@@ -56,7 +56,7 @@ source=(
 )
 sha512sums=(
   0470e26e2c7956f2d2dc18888cffaf7c2916df42c8208d6e0f4e1d5c438660dd6ae99a1e5f06a118175a8b2a97c89e482b1b069ced2abf3916bbfc60fac54e75
-  3c2207dbca7a70ba82ea6d835785401a24c7813d65380bf8c46a527fff6e65a0a7c101b60b5e8b88163ab07d3d42ec9f9aacbcf090f73062d3643c1c314c97d8
+  a64dedad93cab0f82b7f7234140a7d83dc59d0f76905db7b95bbf2a96bbaf038f50739ec2352961903e1e22ee67a6f5c9d651fa25edbabaf14de906bdfe70d73
 )
 
 prepare() {
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index 29cf5ae8c..ff5fb1cd8 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Vojtech Aschenbrenner     <v@asch.cz>
 # Contributor: Jason Gardner             <buhrietoe@gmail.com>
 # Contributor: Ross melin                <rdmelin@gmail.com>
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva    <coadde@parabola.nu>
 # Contributor (Parabola): André Silva    <emulatorman@parabola.nu>
 
 # based of debian squeeze package