Mon Mar 19 00:01:09 UTC 2012

1 files changed, 12 insertions, 15 deletions

diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index a062110dc..0d96246c0 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66402 2012-02-24 13:09:02Z seblu $
+# $Id: PKGBUILD 68068 2012-03-17 16:12:56Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=python-psutil
 pkgname=('python-psutil' 'python2-psutil')
 pkgver=0.4.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/psutil/'
 license=('custom: BSD')
@@ -13,16 +13,11 @@ source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz")
 sha1sums=('2705862e00280a7fa76cfb687dbd61623d5e236e')
 
 build() {
-  'cp' -a psutil-$pkgver psutil2-$pkgver
-  # build python
   cd psutil-$pkgver
-  python setup.py build
-  
-  cd ../psutil2-$pkgver
-  # change python interpreter
-  find -name '*.py' -exec \
-     sed -i '1s,^#!/usr/bin/env python$,#!/usr/bin/python2,' {} \; -print
-  python2 setup.py build
+  python setup.py build --build-lib=build/python
+  python2 setup.py build --build-lib=build/python2
+  find build/python2 -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
 }
 
 package_python-psutil() {
@@ -30,16 +25,18 @@ package_python-psutil() {
   depends=('glibc' 'python')
 
   cd psutil-$pkgver
-  python setup.py install --root="$pkgdir"
+  python setup.py build --build-lib=build/python \
+                  install --root="$pkgdir" --optimize=1
   install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
 }
 
 package_python2-psutil() {
-  pkgdesc='A cross-platform process and system utilities module for Python 2'
+  pkgdesc='A cross-platform process and system utilities module for Python2'
   depends=('glibc' 'python2')
 
-  cd psutil2-$pkgver
-  python2 setup.py install --root="$pkgdir"
+  cd psutil-$pkgver
+  python2 setup.py build --build-lib=build/python2 \
+                   install --root="$pkgdir" --optimize=1
   install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
 }