[arch-commits] Commit in blender/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Thursday, April 18, 2013 @ 11:50:17
  Author: svenstaro
Revision: 88460

upgpkg: blender 7:2.66a.56125-1

Restructure PKGBUILD

Modified:
  blender/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-18 09:05:42 UTC (rev 88459)
+++ PKGBUILD	2013-04-18 09:50:17 UTC (rev 88460)
@@ -6,10 +6,11 @@
 # Sometimes blender.org takes some time to release patch releases and because Arch users
 # are impatient, we sometimes need to build from svn directly.
 
-_svn=true
+_svnrev=56125
 
 pkgname=blender
 pkgver=2.66a
+[[ -n $_svnrev ]] && pkgver=2.66a.$_svnrev
 pkgrel=1
 epoch=7
 pkgdesc="A fully integrated 3D graphics creation suite"
@@ -24,27 +25,16 @@
 optdepends=('cuda: cycles renderer cuda support')
 options=(!strip)
 install=blender.install
-if $_svn; then
-  source=("${pkgname}::svn+https://svn.blender.org/svnroot/bf-blender/trunk/blender")
+if [[ -n $_svnrev ]]; then
+  source=("${pkgname}-${pkgver}::svn+https://svn.blender.org/svnroot/bf-blender/trunk/blender#revision=56125")
   md5sums=(SKIP)
 else
   source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
   md5sums=('dde8211818e35b00a1c01a11efef4533')
 fi
 
-if $_svn; then
-pkgver() {
-  cd "${SRCDEST}"/${pkgname}
-  echo "${pkgver}.$(svnversion)"
-}
-fi
-
 build() {
-  if $_svn == true; then
-    cd "$srcdir"/$pkgname
-  else
-    cd "$srcdir/$pkgname-$pkgver"
-  fi
+  cd "$srcdir/$pkgname-$pkgver"
 
   mkdir build
   cd build
@@ -82,11 +72,7 @@
 }
 
 package() {
-  if $_svn; then
-    cd "$srcdir/$pkgname/build"
-  else
-    cd "$srcdir/$pkgname-$pkgver/build"
-  fi
+  cd "$srcdir/$pkgname-$pkgver/build"
 
   make DESTDIR="${pkgdir}" install
   python -m compileall "${pkgdir}/usr/share/blender"