git » python-tornado.git » commit 0fd5a67

diff --git a/use_system_ca_certificates.patch b/0001-use_system_ca_certificates.patch
similarity index 100%
rename from use_system_ca_certificates.patch
rename to 0001-use_system_ca_certificates.patch
diff --git a/0002-get-rid-of-backports-ssl-match-hostname.patch b/0002-get-rid-of-backports-ssl-match-hostname.patch
new file mode 100644
index 0000000..d88c123
--- /dev/null
+++ b/0002-get-rid-of-backports-ssl-match-hostname.patch
@@ -0,0 +1,23 @@
+From f8f2ffca1928aeca2fa9771093436dba49baa538 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@gmail.com>
+Date: Fri, 12 Dec 2014 23:10:15 +0800
+Subject: [PATCH] Don't depend on backports.ssl-match-hostname with python
+ >=2.7.9, <3.0
+
+---
+ setup.py               | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f09169f..f795807 100644
+--- a/setup.py
++++ b/setup.py
+@@ -121,7 +121,7 @@ def build_extension(self, ext):
+ if setuptools is not None:
+     # If setuptools is not available, you're on your own for dependencies.
+     install_requires = []
+-    if sys.version_info < (3, 2):
++    if sys.version_info < (2, 7, 9) or (3, 0) <= sys.version_info < (3, 2):
+         install_requires.append('backports.ssl_match_hostname')
+     kwargs['install_requires'] = install_requires
+ 
diff --git a/PKGBUILD b/PKGBUILD
index e462e10..368a41f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,26 @@
-# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 
 pkgname=('python-tornado' 'python2-tornado')
 pkgver=4.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='open source version of the scalable, non-blocking web server and tools'
 arch=('i686' 'x86_64')
 url='http://www.tornadoweb.org/'
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools' 'python2-backports.ssl_match_hostname' 'git')
+makedepends=('python-setuptools' 'python2-setuptools' 'git')
 checkdepends=('python-pycurl' 'python2-pycurl' 'python-mock' 'python2-mock' 'python-twisted' 'python2-twisted')
 source=("git+https://github.com/facebook/tornado.git#tag=v$pkgver"
-        use_system_ca_certificates.patch)
+        0001-use_system_ca_certificates.patch
+        0002-get-rid-of-backports-ssl-match-hostname.patch)
 sha512sums=('SKIP'
-            '6e50e9ecf361d54d9f67e1f12185cf58863ad0eae72fbe7cc24e8eaf94874255009a030249bb51adf06e98c7ed0b17d8c6d9ee65190ebc341d6857c0efbc7840')
+            '6e50e9ecf361d54d9f67e1f12185cf58863ad0eae72fbe7cc24e8eaf94874255009a030249bb51adf06e98c7ed0b17d8c6d9ee65190ebc341d6857c0efbc7840'
+            '798f1c5f659138aa4d775edde7c962ec6410671f528b7ec44ca12ac342ddf9ec51d998c676b9025292a58c2140ba8492fcc76759b63adaf08320f96b11bcbfea')
 
 prepare() {
   cd tornado
-  patch -p1 -i ../use_system_ca_certificates.patch
+  patch -p1 -i ../0001-use_system_ca_certificates.patch
+  patch -p1 -i ../0002-get-rid-of-backports-ssl-match-hostname.patch
 
   cd "$srcdir"
   cp -a tornado{,-py2}
@@ -48,12 +51,14 @@ check() {
 }
 
 package_python-tornado() {
+  depends=('python')
+
   cd tornado
   python setup.py install --root="${pkgdir}" --optimize=1
 }
 
 package_python2-tornado() {
-  depends=('python2-backports.ssl_match_hostname')
+  depends=('python2>=2.7.9')
 
   cd tornado-py2
   python2 setup.py install --root="${pkgdir}" --optimize=1