--- /var/abs/extra/python-urwid/PKGBUILD	2011-12-21 23:04:05.000000000 -0600
+++ PKGBUILD	2011-12-22 10:26:53.903148429 -0600
@@ -3,21 +3,39 @@
 # Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 
-pkgname=python-urwid
-pkgver=0.9.9.2
+pkgname=('python-urwid' 'python2-urwid')
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="Urwid is a curses-based user interface library."
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('python2')
+# python-distribute only needed for 2to3
+makedepends=('python2' 'python-distribute')
 url="http://excess.org/urwid/"
-source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('e58b86a983fe5474a07749501748b728')
+source=("http://excess.org/urwid/urwid-$pkgver.tar.gz")
+md5sums=('828f7144b94920205e755c249d2e297f')
 
 build() {
-  cd $startdir/src/urwid-$pkgver
+  cp -r urwid-$pkgver python2-urwid-$pkgver
+
+  cd $srcdir/urwid-$pkgver
+  python setup.py build
+
+  cd $srcdir/python2-urwid-$pkgver
   sed -i 's#bin/python#bin/python2#' urwid/*.py
-  python2 setup.py install --prefix=/usr --root=$startdir/pkg || return 1
+  python2 setup.py build
+}
+
+package_python-urwid() {
+  depends=('python')
+
+  cd $srcdir/urwid-$pkgver
+  python setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+}
+
+package_python2-urwid() {
+  depends=('python2')
 
-  rm -rf $startdir/src/$_hgname-build
+  cd $srcdir/python2-urwid-$pkgver
+  python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
 }