2 files changed, 36 insertions, 33 deletions
diff --git a/abs/core/python_modules/python-mako/PKGBUILD b/abs/core/python_modules/python-mako/PKGBUILD
index 71440e4..b662825 100644
--- a/abs/core/python_modules/python-mako/PKGBUILD
+++ b/abs/core/python_modules/python-mako/PKGBUILD
@@ -1,54 +1,58 @@
 # $Id$
-# Maintainer : 
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
 
-pkgname=('python2-mako')
-pkgver=0.9.1
-pkgrel=2
-pkgdesc="Hyperfast and lightweight templating for the Python2 platform"
+pkgbase=python-mako
+pkgname=('python-mako' 'python2-mako')
+pkgver=1.0.7
+pkgrel=1
+pkgdesc="A super-fast templating language that borrows the best ideas from the existing templating languages"
 arch=('any')
 url="http://www.makotemplates.org/"
 license=('MIT')
-makedepends=('python2-setuptools')
-checkdepends=('python2-nose')
-source=(https://pypi.python.org/packages/source/M/Mako/Mako-$pkgver.tar.gz{,.asc})
-sha1sums=('aa01bafca5a835eb92a9048be92414fa83da102b'
-          'SKIP')
+makedepends=('python-setuptools' 'python2-setuptools' 'python-markupsafe' 'python2-markupsafe'
+             'python-beaker' 'python2-beaker')
+checkdepends=('python-pytest-runner' 'python2-pytest-runner' 'python-mock' 'python2-mock'
+              'python-babel' 'python2-babel' 'python-pygments' 'python2-pygments'
+              'python-dogpile.cache' 'python2-dogpile.cache')
+source=("https://pypi.io/packages/source/M/Mako/Mako-$pkgver.tar.gz"{,.asc})
+sha512sums=('d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571'
+            'SKIP')
+validpgpkeys=('83AF7ACE251C13E6BB7DEFBD330239C1C4DAFEE1')  # Michael Bayer
 
 prepare() {
-    cp -r Mako-$pkgver python2-Mako-$pkgver
-    mv Mako-$pkgver/scripts/mako-render Mako-$pkgver/scripts/python3-mako-render
-#    2to3 -nw Mako-$pkgver/scripts/python3-mako-render
-    sed -i 's/mako-render/python3-mako-render/' Mako-$pkgver/setup.py
+  cp -a Mako-$pkgver{,-py2}
 }
 
 build() {
-    cd Mako-$pkgver
-#    python3 setup.py build
+  cd "$srcdir"/Mako-$pkgver
+  python setup.py build
 
-    cd ../python2-Mako-$pkgver
-    python2 setup.py build
+  cd "$srcdir"/Mako-$pkgver-py2
+  python2 setup.py build
 }
 
 check() {
-    cd Mako-$pkgver
-#    python3 setup.py test
+  cd "$srcdir"/Mako-$pkgver
+  python setup.py ptr
 
-    cd ../python2-Mako-$pkgver
-    python2 setup.py test
+  cd "$srcdir"/Mako-$pkgver-py2
+  python2 setup.py ptr
 }
 
-#package_python-mako() {
-#    depends=('python-markupsafe' 'python-beaker')
+package_python-mako() {
+  depends=('python-markupsafe' 'python-beaker' 'python-setuptools')
 
-#    cd Mako-$pkgver
-#    python3 setup.py install --root="$pkgdir" --optimize=1
-#    install -D LICENSE "$pkgdir/usr/share/licenses/python-mako/COPYING"
-#}
+  cd Mako-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
+  install -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
 
 package_python2-mako() {
-    depends=('python2-markupsafe' 'python2-beaker')
+  depends=('python2-markupsafe' 'python2-beaker' 'python2-setuptools')
+
+  cd Mako-$pkgver-py2
+  python2 setup.py install --root="$pkgdir" --optimize=1
+  install -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 
-    cd python2-Mako-$pkgver
-    python2 setup.py install --root="$pkgdir" --optimize=1
-    install -D LICENSE "$pkgdir/usr/share/licenses/python2-mako/COPYING"
+  mv "$pkgdir"/usr/bin/mako-render{,2}
 }
diff --git a/abs/core/python_modules/python-mako/__changelog b/abs/core/python_modules/python-mako/__changelog
deleted file mode 100644
index 9715c21..0000000
--- a/abs/core/python_modules/python-mako/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-PKGBUILD - comment out all python 3 stuff and only build for py 2