python-jinja: update to 2.10

3 files changed, 13 insertions, 40 deletions

diff --git a/abs/core/python_modules/python-jinja/Fix-PrefixLoader-does-not-pass-globals-to-load.patch b/abs/core/python_modules/python-jinja/Fix-PrefixLoader-does-not-pass-globals-to-load.patch
deleted file mode 100644
index 8100449..0000000
--- a/abs/core/python_modules/python-jinja/Fix-PrefixLoader-does-not-pass-globals-to-load.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 478983594423dcdb85e26ea7a02b8d1d72215db6 Mon Sep 17 00:00:00 2001
-From: Morris Jobke <morris.jobke@gmail.com>
-Date: Mon, 27 May 2013 00:54:52 +0300
-Subject: [PATCH] Fix "PrefixLoader does not pass globals to load"
-
-Fix mitsuhiko/jinja2#225
----
- jinja2/loaders.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jinja2/loaders.py b/jinja2/loaders.py
-index a9a2625..cc9c683 100644
---- a/jinja2/loaders.py
-+++ b/jinja2/loaders.py
-@@ -349,7 +349,7 @@ def get_source(self, environment, template):
-     def load(self, environment, name, globals=None):
-         loader, local_name = self.get_loader(name)
-         try:
--            return loader.load(environment, local_name)
-+            return loader.load(environment, local_name, globals)
-         except TemplateNotFound:
-             # re-raise the exception with the correct fileame here.
-             # (the one that includes the prefix)
--- 
-1.8.1.6
-
diff --git a/abs/core/python_modules/python-jinja/PKGBUILD b/abs/core/python_modules/python-jinja/PKGBUILD
index a7e3b6d..1bcd44e 100644
--- a/abs/core/python_modules/python-jinja/PKGBUILD
+++ b/abs/core/python_modules/python-jinja/PKGBUILD
@@ -2,23 +2,23 @@
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Peter Baldwin <bald_pete@hotmail.com>
 
-pkgname=('python2-jinja')
-pkgver=2.7.2
-pkgrel=2
+pkgname=('python-jinja' 'python2-jinja')
+pkgver=2.10
+pkgrel=1
 pkgdesc="A simple pythonic template language written in Python"
 arch=('any')
 url="http://jinja.pocoo.org/"
 license=('BSD')
-makedepends=('python2-setuptools'
+makedepends=('python-setuptools' 'python2-setuptools' 'python-markupsafe'
              'python2-markupsafe')
-source=(http://pypi.python.org/packages/source/J/Jinja2/Jinja2-$pkgver.tar.gz)
-sha256sums=('310a35fbccac3af13ebf927297f871ac656b9da1d248b1fe6765affa71b53235')
+source=(https://pypi.org/packages/source/J/Jinja2/Jinja2-$pkgver.tar.gz)
+sha256sums=('f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4')
 
 build() {
   cd "$srcdir"
 
   rm -rf python{2,3}-build
-  for builddir in python2-build; do
+  for builddir in python{2,3}-build; do
     cp -r Jinja2-$pkgver $builddir
     pushd $builddir
     ${builddir%-build} setup.py build
@@ -26,15 +26,15 @@ build() {
   done
 }
 
-#package_python-jinja() {
-#  depends=('python-setuptools' 'python-markupsafe')
+package_python-jinja() {
+  depends=('python-setuptools' 'python-markupsafe')
 
-#  cd "$srcdir/python3-build"
+  cd "$srcdir/python3-build"
 
-#  python3 setup.py install --root="$pkgdir" -O1
+  python3 setup.py install --root="$pkgdir" -O1
 
-#  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-#}
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
 
 package_python2-jinja() {
   depends=('python2-setuptools' 'python2-markupsafe')
diff --git a/abs/core/python_modules/python-jinja/__changelog b/abs/core/python_modules/python-jinja/__changelog
deleted file mode 100644
index 3439597..0000000
--- a/abs/core/python_modules/python-jinja/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-PKGBUILD: rm python 3 stuff