2 files changed, 26 insertions, 24 deletions
diff --git a/abs/core/python_modules/python-markupsafe/PKGBUILD b/abs/core/python_modules/python-markupsafe/PKGBUILD
index 17725d0..ec6d6f9 100644
--- a/abs/core/python_modules/python-markupsafe/PKGBUILD
+++ b/abs/core/python_modules/python-markupsafe/PKGBUILD
@@ -1,50 +1,53 @@
 # $Id$
-# Maintainer : Felix Yan <felixonmars@gmail.com>
+# Maintainer : Felix Yan <felixonmars@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alex Anthony <alex.anthony28991@gmail.com>
 
-pkgname=('python2-markupsafe')
-pkgver=0.21
+pkgname=('python-markupsafe' 'python2-markupsafe')
+pkgver=1.0
 pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://pypi.python.org/pypi/MarkupSafe"
 license=('custom')
-makedepends=('python2-setuptools')
-source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
-sha512sums=('ecedf56be7ad1723c4d7bf799e1aefb8ceb0a28840a1b8ffdc2dee0f734149430cf5dfd5d335591e9934cf223255475e9c04da5ab34ed69e7845298f599d81bc')
+makedepends=('python-setuptools' 'python2-setuptools')
+source=("https://pypi.io/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
+sha512sums=('7437a02cb1b9c1d6d6c20b13d394f24a1cd1cb8c743f832d8b1cbb6ab8846f70f54d924dd693423b33c4d592e772983ae38fd4a35961e233457c48bd3584ecb8')
+
+prepare() {
+  cp -a MarkupSafe-$pkgver{,-py2}
+}
 
 build() {
-  cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
-#  cd "${srcdir}/MarkupSafe-${pkgver}"
-#  python setup.py build
+  cd "$srcdir"/MarkupSafe-$pkgver
+  python setup.py build
 
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+  cd "$srcdir"/MarkupSafe-$pkgver-py2
   python2 setup.py build
 }
 
 check() {
-#  cd "${srcdir}/MarkupSafe-${pkgver}"
-#  python setup.py test
+  cd "$srcdir"/MarkupSafe-$pkgver
+  python setup.py test
 
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+  cd "$srcdir"/MarkupSafe-$pkgver-py2
   python2 setup.py test
 }
 
-#package_python-markupsafe() {
-#  depends=('python')
+package_python-markupsafe() {
+  depends=('python')
 
-#  cd MarkupSafe-${pkgver}
-#  python setup.py install --root="${pkgdir}" --optimize=1
+  cd MarkupSafe-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
 
-#  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE"
-#}
+  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/python-markupsafe/LICENSE
+}
 
 package_python2-markupsafe() {
   depends=('python2')
 
-  cd python2-MarkupSafe-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
+  cd MarkupSafe-$pkgver-py2
+  python2 setup.py install --root="$pkgdir" --optimize=1
 
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE"
+  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/python2-markupsafe/LICENSE
 }
diff --git a/abs/core/python_modules/python-markupsafe/__changelog b/abs/core/python_modules/python-markupsafe/__changelog
deleted file mode 100644
index 488d3cf..0000000
--- a/abs/core/python_modules/python-markupsafe/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-PKGBUILD: rm py 3 stuff