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

[Alexander Rødseth]

    Date: Monday, December 23, 2013 @ 22:30:35
  Author: arodseth
Revision: 102910

Updated to latest version + fix FS#38216

Modified:
  waf/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-23 21:00:35 UTC (rev 102909)
+++ PKGBUILD	2013-12-23 21:30:35 UTC (rev 102910)
@@ -2,10 +2,8 @@
 # Maintainer: Alexander Rødseth <rodseth at gmail.com>
 # Contributor: Sebastien Binet <binet at cern.ch>
 
-# TODO: See if the waf python files can be placed elsewhere
-
 pkgname=waf
-pkgver=1.7.13
+pkgver=1.7.14
 pkgrel=1
 pkgdesc='General-purpose build system modelled after Scons'
 url='http://code.google.com/p/waf/'
@@ -12,9 +10,11 @@
 arch=('any')
 license=('BSD')
 depends=('python')
+makedepends=('setconf')
 provides=('python-waf')
+options=('!emptydirs')
 source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2")
-sha256sums=('21a6220e9c4be50716157222d5be5f19b87916e8087cd6b42e583a83a955dd5b')
+sha256sums=('843e9f716d99b54c3b00e1b6cae7c754f0a608b7ae253a42b602cfe73561b6ce')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -45,9 +45,10 @@
   "$pkgdir/usr/bin/waf" configure build >& /dev/null
   cd ../..
 
-  # Fixing permissions
-  #chmod -R 0644 "$pkgdir/usr/bin/.waf*/waflib/Tools/"*
-  #chown -R root:root "$pkgdir/usr/"*
+  # Fix weird directory placement (FS#38216)
+  mkdir -p "$pkgdir/usr/lib/waf"
+  mv "$pkgdir/usr/bin/.waf3-$pkgver-e013a2208e0c1f997a9c8d543692d171" "$pkgdir/usr/lib/waf/"
+  setconf "$pkgdir/usr/bin/waf" base '"/usr/lib/waf"'
 
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }