Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

3 files changed, 31 insertions, 23 deletions

diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD
index 6df1b2e34..6dbe466e2 100644
--- a/pcr/blender-addon-ogre/PKGBUILD
+++ b/pcr/blender-addon-ogre/PKGBUILD
@@ -1,23 +1,25 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
+_pkgname=ogre
+_pkgver=0.6.0
+_pkgverM=${_pkgver%.*}
 _bldname=blender
 _bldver=2.71
 _bldep=14
+_srcname=${_bldname}2$_pkgname
 
-_pkgname=ogre
 pkgname=$_bldname-addon-$_pkgname
-pkgver=0.6.0
-pkgrel=6
-pkgdesc="${_bldname}2$_pkgname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname package)"
-arch=any
-url=https://code.google.com/p/${_bldname}2$_pkgname
-license=LGPL2.1
-depends=(
-  "$_bldname>=$_bldep:$_bldver"
-  "$_bldname<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))"
-)
-source=https://${_bldname}2$_pkgname.googlecode.com/files/${_bldname}2$_pkgname-$pkgver.zip
-sha512sums=15609a6dc3f5901ec59193acb6944017cc426fa12ce658715006ba781b6c39a09f38a64c858b28f7e662dff50eccf06ec6ef6efc22e0d2876c6c77fb18c04712
+pkgver=$_pkgver
+pkgrel=7
+pkgdesc="$_srcname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname package)"
+arch=('any')
+url="https://code.google.com/p/${_bldname}2$_pkgname"
+license=('LGPL2.1')
+depends=("$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver/.*/}.$((${_bldver/*./}+1))")
+source=("https://${_bldname}2$_pkgname.googlecode.com/files/${_bldname}2$_pkgname-$pkgver.zip"
+        'http://www.gnu.org/licenses/lgpl-2.1.txt')
+sha512sums=('15609a6dc3f5901ec59193acb6944017cc426fa12ce658715006ba781b6c39a09f38a64c858b28f7e662dff50eccf06ec6ef6efc22e0d2876c6c77fb18c04712'
+            '1bca76c9f2f559a7851c278650125cd4f44a7ae4a96ceee6a6ba81d34d28fe7d6125c5ee459fef729b6a2a0eba3075c0841c8a156b3a26f66194f77f7d49151c')
 
 prepare() {
   msg 'renaming wrong OS name'
@@ -26,6 +28,10 @@ prepare() {
 
 package() {
   cd $srcdir
+
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname
+  b=$pkgdir/usr/share/licenses/$pkgname
+
   install -vd $a && cp -va io_export_${_pkgname}DotScene.py $a/__init__.py
+  install -vd $b && install -vm644 $startdir/lgpl-2.1.txt $b/LGPL-v2.1
 }
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index c0116cd21..b030691a6 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -9,6 +9,7 @@ _build_add=yes
 
 _pkgname=mitsuba
 _pkgver=0.5.0
+_pkgverM=${_pkgver%.*}
 _pkgdat=20140225
 _pkgrev=2030
 _pkgrel=5
@@ -25,7 +26,7 @@ _pyver=3.4
 pkgbase=$_pkgname
 [[ $_build_pkg == yes ]] && pkgname+=("$_pkgname")
 [[ $_build_add == yes ]] && pkgname+=("$_bldname-addon-$_pkgname")
-pkgver=$_pkgver.$_pkgdat
+pkgver=$_pkgver.$_pkgrev
 pkgrel=$_pkgrel
 arch=('i686' 'x86_64' 'mips64el')
 url="https://www.$_pkgname-renderer.org"
@@ -98,7 +99,7 @@ package_mitsuba() {
 
   b=$pkgdir/usr/share/licenses/$pkgname
 
-  install -vd $b && install -m644 ../doc/license.txt $b/GPL-v3.0
+  install -vd $b && install -vm644 ../doc/license.txt $b/GPL-v3.0
 
   msg 'fixing files and folders location'
   a=$pkgdir/usr
@@ -120,7 +121,7 @@ package_blender-addon-mitsuba() {
   pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname package)"
   arch=('any')
   license=('GPL2')
-  depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver::1}.$((${_pkgver:2:1}+1)).$((${_pkgver:4}==0))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::1}.$((${_bldver:2}+1))")
+  depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver/.*/}.$((${_pkgverM#*.}+1)).$((${_pkgver/*./}==0))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver/.*/}.$((${_bldver/*./}+1))")
   makedepends=()
 
   cd $srcdir/$_addname-$_addver.$_addrev
@@ -132,8 +133,8 @@ package_blender-addon-mitsuba() {
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
   b=$pkgdir/usr/share/licenses/$pkgname
 
-  install -vd $a && cp -a mtsblend $a/$_pkgname
-  install -vd $b && install -m644 $startdir/gpl-2.0.txt $b/GPL-v2.0
+  install -vd $a && cp -va mtsblend $a/$_pkgname
+  install -vd $b && install -vm644 $startdir/gpl-2.0.txt $b/GPL-v2.0
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index 71674f2ac..105db9293 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -9,6 +9,7 @@ _build_add=yes
 
 _pkgname=yafaray
 _pkgver=0.1.5
+_pkgverM=${_pkgver%.*}
 _pkgdat=20140508
 _pkgrev=ff262af4b50a90dcf39da04040b53509d7dc789d
 _pkgrel=1
@@ -19,7 +20,7 @@ _addname=$_bldname-addon-$_pkgname
 _addver=$_pkgver # __init__.py:bl_info>version
 _adddat=20140425
 _addrev=c3d4ff74593d5bd9552306f597f6b36e342687da
-_addrel=2
+_addrel=3
 _pyver=3.4
 
 pkgbase=$_pkgname
@@ -84,7 +85,7 @@ package_yafaray() {
 
   b=$pkgdir/usr/share/licenses/$pkgname
 
-  install -vd $b && install -m644 ../LICENSE $b/LGPL-v2.1
+  install -vd $b && install -vm644 ../LICENSE $b/LGPL-v2.1
 }
 
 package_blender-addon-yafaray() {
@@ -93,7 +94,7 @@ package_blender-addon-yafaray() {
   pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname package)"
   arch=('any')
   license=('GPL2')
-  depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver::1}.$((${_pkgver:2:1}+1)).$((${_pkgver:4}==0))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::1}.$((${_bldver:2}+1))")
+  depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver/.*/}.$((${_pkgverM#*.}+1)).$((${_pkgver/*./}==0))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver/.*/}.$((${_bldver/*./}+1))")
   makedepends=()
 
   cd $srcdir/$_addname-$_addver.$_addrev
@@ -101,8 +102,8 @@ package_blender-addon-yafaray() {
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
   b=$pkgdir/usr/share/licenses/$pkgname
 
-  install -vd $a && cp -a ../$_addname-$_addver.$_addrev $a/$_pkgname
-  install -vd $b && install -m644  GPL-license.txt $b/GPL-v2.0
+  install -vd $a && cp -va ../$_addname-$_addver.$_addrev $a/$_pkgname
+  install -vd $b && install -vm644  GPL-license.txt $b/GPL-v2.0
 
   install -vd $a/$_pkgname/bin
   ln -vsf /usr/lib/lib${_pkgname}core.so   $a/$_pkgname/bin/lib${_pkgname}core.so