--- /var/abs/extra/python-markupsafe/PKGBUILD	2011-12-20 23:05:20.000000000 -0600
+++ PKGBUILD	2011-12-21 16:56:31.852557916 -0600
@@ -2,21 +2,40 @@
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alex Anthony <alex.anthony28991@gmail.com>
 
-pkgname=python-markupsafe
-pkgver=0.12
-pkgrel=0
+pkgname=('python-markupsafe' 'python2-markupsafe')
+pkgver=0.15
+pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
 arch=('i686' 'x86_64')
 url="http://pypi.python.org/pypi/MarkupSafe"
 license=('custom')
-depends=('python2')
-makedepends=('setuptools')
-source=(http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz)
-md5sums=('edd4b6950f6d4ddc6e23fa322f8f0f53')
+makedepends=('python-distribute' 'python2-distribute')
+source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
+md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186')
 
 build() {
+  cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
   cd ${srcdir}/MarkupSafe-${pkgver}
+  python setup.py build
+
+  cd ${srcdir}/python2-MarkupSafe-${pkgver}
+  python2 setup.py build
+}
+
+package_python-markupsafe() {
+  depends=('python')
+
+  cd ${srcdir}/MarkupSafe-${pkgver}
+  python setup.py install --root=${pkgdir} --optimize=1
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE
+}
+
+package_python2-markupsafe() {
+  depends=('python2')
+
+  cd ${srcdir}/python2-MarkupSafe-${pkgver}
   python2 setup.py install --root=${pkgdir} --optimize=1
 
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE
 }