1 files changed, 27 insertions, 30 deletions
diff --git a/abs/core/python_modules/python-pycurl/PKGBUILD b/abs/core/python_modules/python-pycurl/PKGBUILD
index 10f640e..a7ef90a 100644
--- a/abs/core/python_modules/python-pycurl/PKGBUILD
+++ b/abs/core/python_modules/python-pycurl/PKGBUILD
@@ -1,31 +1,31 @@
 # $Id$
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 
-_pypiname=pycurl
-pkgbase=python-$_pypiname
-pkgname=('python2-pycurl')
-pkgver=7.43.0
+pkgbase=python-pycurl
+pkgname=('python-pycurl' 'python2-pycurl')
+pkgver=7.43.0.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://pycurl.sourceforge.net/"
 license=('LGPL' 'MIT')
-makedepends=('python2' 'curl' 'git')
-checkdepends=('python2-bottle' 'python2-nose-show-skipped'
-              'vsftpd' 'python2-flaky' 'python2-pyflakes')
-source=("git+https://github.com/pycurl/pycurl.git#tag=REL_${pkgver//./_}")
-sha1sums=('SKIP')
+makedepends=('python' 'python2' 'curl')
+checkdepends=('python-bottle' 'python2-bottle' 'python-nose-show-skipped' 'python2-nose-show-skipped'
+              'vsftpd' 'python-flaky' 'python2-flaky' 'python-pyflakes' 'python2-pyflakes')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/pycurl/pycurl/archive/REL_${pkgver//./_}.tar.gz")
+sha512sums=('304212ec704dda0f630abb67c14478098f8609c64a2ccc041e519af2237d803885a27d18aac1dd77ec7526cdc7bc1fab046f3be6c94b10a2e1ae43500d2c2ffe')
 
 prepare() {
-  cp -a $_pypiname{,-py2}
+  mv pycurl-REL_${pkgver//./_} pycurl-$pkgver
+  cp -a pycurl-$pkgver{,-py2}
 
-  cd "$srcdir/$_pypiname"
+  cd "$srcdir"/pycurl-$pkgver
   find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python3|" {} +
     sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py
   sed -e "s/nosetests/nosetests3/" -e "s/python/python3/" -i tests/run.sh
 
-  cd "$srcdir/$_pypiname-py2"
+  cd "$srcdir"/pycurl-$pkgver-py2
   find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python2|" {} +
     sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py
   sed -e "s/nosetests/nosetests2/" -e "s/python/python2/" -i tests/run.sh
@@ -33,11 +33,11 @@ prepare() {
 }
 
 build() {
-#  cd "$srcdir/$_pypiname"
-#  make
-#  python3 setup.py build --with-ssl
+  cd "$srcdir"/pycurl-$pkgver
+  make
+  python3 setup.py build --with-ssl
 
-  cd "$srcdir/$_pypiname-py2"
+  cd "$srcdir"/pycurl-$pkgver-py2
   make
   python2 setup.py build --with-ssl
 }
@@ -46,10 +46,10 @@ check() {
   export PYCURL_VSFTPD_PATH=vsftpd
   # We don't have HTTP2 enabled
 
-  cd "$srcdir/$_pypiname"
-  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.5:$PYTHONPATH" make test || warning "Tests failed"
+  cd "$srcdir"/pycurl-$pkgver
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.6:$PYTHONPATH" make test || warning "Tests failed"
 
-  cd "$srcdir/$_pypiname-py2"
+  cd "$srcdir"/pycurl-$pkgver-py2
   PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" make PYTHON=python2 NOSETESTS=nosetests2 test || warning "Tests failed"
 }
 
@@ -57,19 +57,16 @@ package_python-pycurl() {
   pkgdesc="A Python 3.x interface to libcurl"
   depends=('python' 'curl')
 
-  cd $_pypiname
-  python setup.py install -O1 --root="${pkgdir}"
-  install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd pycurl-$pkgver
+  python setup.py install -O1 --root="$pkgdir"
+  install -D -m644 COPYING-MIT "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_python2-pycurl() {
   pkgdesc="A Python 2.x interface to libcurl"
   depends=('python2' 'curl')
-  provides=('python-pycurl')
-  replaces=('python-pycurl')
-  conflicts=('python-pycurl')
 
-  cd $_pypiname-py2
-  python2 setup.py install -O1 --root="${pkgdir}"
-  install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd pycurl-$pkgver-py2
+  python2 setup.py install -O1 --root="$pkgdir"
+  install -D -m644 COPYING-MIT "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }