1 files changed, 47 insertions, 68 deletions
diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray-git/PKGBUILD
index 22465488c..1c6c72281 100644
--- a/pcr/yafaray-git/PKGBUILD
+++ b/pcr/yafaray-git/PKGBUILD
@@ -1,16 +1,18 @@
-# $Id$
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-pkgbase=yafaray
 pkgname=(
   yafaray-git
-  yafaray-blender-exporter-git
+  blender-addon-yafaray-git
 )
 _pkgflag=git
+_pkgname=${pkgname[0]%-$_pkgflag}
+_bldname=${pkgname[1]::7}
+_gitname=Core
+_addname=${_bldname^}-Exporter
 pkgver=$(LC_ALL=C date -u +%Y%m%d)
 _pkgver=1.2
 _bldver=2.66
-_bldepoch=6
+_bldep=7
 _pyver=3.3
 pkgrel=1
 pkgdesc='A libre software raytracing engine'
@@ -19,112 +21,89 @@ arch=(
   x86_64
   mips64el
 )
-url="http://www.$pkgbase.org"
+url="http://www.$_pkgname.org"
 license=LGPL2.1
 depends=(
   freetype2
   libjpeg
   libxml2
-  openexr
+  'openexr=2.0.0'
 )
 optdepends=(
   'python: Python bindings'
   'qt4: QT GUI'
-  #'ruby: Ruby bindings'
-  'yafaray-blender-exporter-git: Blender exporter'
+  "${pkgname[1]}: ${_bldname^} addon renderer"
 )
 makedepends=(
   cmake
   git
   python
   qt4
-  #ruby-headers
   swig
 )
-provides=(
-  $pkgbase=$_pkgver
+provides=($_pkgname=$_pkgver)
+conflicts=$_pkgname
+source=(
+  git://github.com/YafaRay/$_gitname.$_pkgflag
+  git://github.com/YafaRay/$_addname.$_pkgflag
 )
-conflicts=$pkgbase
+sha512sums=(SKIP SKIP)
 
-_gitroot="https://github.com/YafaRay/Core.git"
-_gitname=$pkgbase
-_gitrootexport="https://github.com/YafaRay/Blender-Exporter.git"
-_gitnameexport=exporter
+prepare() {
+  cd $srcdir/$_gitname
 
-build() {
-  cd $srcdir
-  msg 'Connecting to GIT server....'
-
-  # core
-  if [[ -d $_gitname ]]; then
-    cd $_gitname && git pull origin
-    cd ..
-    msg 'The local files are updated.'
-  else
-    git clone $_gitroot $_gitname
-  fi
-  # exporter
-  if [[ -d $_gitnameexport ]]; then
-    cd $_gitnameexport && git pull origin
-    cd ..
-    msg 'The local files are updated.'
-  else
-    git clone $_gitrootexport $_gitnameexport
-  fi
-
-  msg 'GIT checkout done or server timeout'
-  msg 'Starting build...'
+  [[ -d build ]] && rm -r build
+  mkdir build
+}
 
-  if [ -e $srcdir/$_gitname-build ]; then
-      rm -rf $srcdir/$_gitname-build
-  fi
-  mkdir $srcdir/$_gitname-build
-  cd $srcdir/$_gitname-build
+build() {
+  cd $srcdir/$_gitname/build
 
-  setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr\
+  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     -DYAF_PY_VERSION=$_pyver\
-    -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver\
-    ../$_gitname
-
-    #-DWITH_YAF_PY_BINDINGS=ON\
-    #-DBLENDER_ADDON=ON\
-    #-DBLENDER_EXPORTER_BRANCH=master\
-    #-DWITH_YAF_RUBY_BINDINGS=ON\
-    #-DYAF_USER_INCLUDE_DIRS=/usr/include/ruby-1.9.1/$CARCH-linux\
+    -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
 
   setarch $CARCH make
 }
 
 package_yafaray-git() {
-  cd $srcdir/$_gitname-build
+  cd $srcdir/$_gitname/build
   setarch $CARCH make DESTDIR=$pkgdir install
 }
 
-package_yafaray-blender-exporter-git() {
+package_blender-addon-yafaray-git() {
   pkgver=$pkgver.v$_bldver
-  pkgdesc='YafaRay exporter for Blender'
+  pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
   arch=any
   depends=(
-    ${pkgname[0]}=$pkgver
-    "blender>=$_bldepoch:$_bldver"
+    ${pkgname:14}=${pkgver%.v$_bldver}
+    "$_bldname>=$(($_bldep-1)):$_bldver"
+    "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
   )
-  optdepends=""
+  optdepends=''
   provides=(
-    ${pkgname[1]%-$_pkgflag}=$_pkgver.v$_bldver
+    ${pkgname%-$_pkgflag}=$_pkgver.v$_bldver
+    $_pkgname-$_bldname-exporter=$_pkgver.v$_bldver
+    $_pkgname-$_bldname-exporter-$_pkgflag=$pkgver
+  )
+  conflicts=(
+    ${pkgname%-$_pkgflag}
+    $_pkgname-$_bldname-exporter
+    $_pkgname-$_bldname-exporter-$_pkgflag
   )
-  conflicts=${pkgname[1]%-$_pkgflag}
+  replaces=$_pkgname-$_bldname-exporter-$_pkgflag
 
-  cd $srcdir/$_gitnameexport
+  cd $srcdir/$_addname
 
   a=/usr/lib
-  b=usr/share/blender/$_bldver/scripts/addons/$pkgbase/bin
+  b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
 
-  git checkout-index -a -f --prefix=$pkgdir/${b%bin}
+  git checkout-index -a -f --prefix=${b%bin}
 
-  install -d -m755 $pkgdir/$b
-  ln -sf $a/lib${pkgbase}core.so   $pkgdir/$b/lib${pkgbase}core.so
-  ln -sf $a/lib${pkgbase}plugin.so $pkgdir/$b/lib${pkgbase}plugin.so
-  ln -sf $a/$pkgbase               $pkgdir/$b/plugins
+  install -d -m755 $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
 }
 
 # vim:set ts=2 sw=2 et: