moved optdepends, updated download link, fixed typo where we turn python files into python2 accidentally

1 files changed, 20 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f423e86f191e..644a872b6ab2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,29 +4,14 @@ pkgbase="python-theano"
 pkgname=("python-theano" "python2-theano")
 _pkgname="Theano"
 pkgver="1.0.4"
-pkgrel="1"
+pkgrel="2"
 pkgdesc='Definition and optimized evaluation of mathematical expressions on Numpy arrays.'
 arch=('any')
 url='http://www.deeplearning.net/software/theano/'
 license=('BSD')
 makedepends=('python-distribute' 'python2-distribute')
 checkdepends=('python-nose' 'python-parameterized' 'python2-nose' 'python2-parameterized')
-optdepends=('python-sympy: Recommended'
-            'python-scipy: Recommended'
-            'python-pycuda'
-            'python-pydot-ng: Preferred over python-pydot'
-            'python-pydot'
-            'python-pygpu-git'
-            'python-scikit-sparse'
-            'python-mpi4py: minimal support for opencl'
-            'python2-sympy'
-            'python2-scipy'
-            'python2-pycuda'
-            'python2-pydot-ng'
-            'python2-pygpu-git'
-            'python2-pydot'
-            'python2-mpi4py')
-source=("https://pypi.python.org/packages/7d/c4/6341148ad458b6cd8361b774d7ee6895c38eab88f05331f22304c484ed5d/Theano-${pkgver}.tar.gz")
+source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz")
 sha256sums=('35c9bbef56b61ffa299265a42a4e8f8cb5a07b2997dabaef0f8830b397086913')
 
 prepare() {
@@ -36,7 +21,7 @@ prepare() {
   chmod -R a+r ./
   cd "$srcdir/"
   cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-py2"
-  cd "${_pkgname}-${pkgver}"
+  cd "${_pkgname}-${pkgver}-py2"
   sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
       -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
       -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
@@ -69,8 +54,15 @@ build() {
 
 package_python2-theano() {
   depends=('python2-numpy')
+  optdepends=('python2-sympy: Recommended'
+              'python2-scipy: Recommended'
+              'python2-pycuda'
+              'python2-pydot-ng: Preferred over python-pydot'
+              'python2-pydot'
+              'python2-pygpu-git'
+              'python2-mpi4py: minimal support for opencl')
   cd "$srcdir/${_pkgname}-${pkgver}-py2"
-  python2 setup.py install --root="$pkgdir"/ --optimize=1
+  python2 setup.py install --root="$pkgdir"/ --optimize=1 --skip-build
   mv "${pkgdir}/usr/bin/theano-cache" "${pkgdir}/usr/bin/theano2-cache"
   mv "${pkgdir}/usr/bin/theano-nose" "${pkgdir}/usr/bin/theano2-nose"
   install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-theano/LICENSE.txt"
@@ -78,7 +70,15 @@ package_python2-theano() {
 
 package_python-theano() {
   depends=('python-numpy')
+  optdepends=('python-sympy: Recommended'
+             'python-scipy: Recommended'
+             'python-pycuda'
+             'python-pydot-ng: Preferred over python-pydot'
+             'python-pydot'
+             'python-pygpu-git'
+             'python-scikit-sparse'
+             'python-mpi4py: minimal support for opencl')
   cd "$srcdir/${_pkgname}-${pkgver}"
-  python setup.py install --root="$pkgdir"/ --optimize=1
+  python setup.py install --root="$pkgdir"/ --optimize=1 --skip-build
   install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-theano/LICENSE.txt"
 }