removed cytoolz and added python2-toolz

3 files changed, 49 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ccb42b2e49ac..0701272fe1a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
 pkgbase = python-toolz
 	pkgdesc = A set of utility functions for iterators, functions, and dictionaries.
 	pkgver = 0.9.0
-	pkgrel = 4
-	url = https://github.com/pytoolz
+	pkgrel = 5
+	url = https://github.com/pytoolz/toolz
 	arch = any
 	license = BSD
 	makedepends = python-setuptools
-	makedepends = cython
-	makedepends = gcc
-	depends = python
-	source = https://pypi.org/packages/source/t/toolz/toolz-0.9.0.tar.gz
-	source = https://github.com/pytoolz/cytoolz/archive/0.9.0.tar.gz
-	sha256sums = 929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9
-	sha256sums = 177d6bcf76d60efeb5fa04c151e8c2e53a2679d380f1d316b0fd3a1cdffd75fb
+	makedepends = python2-setuptools
+	source = https://github.com/pytoolz/toolz/archive/0.9.0.tar.gz
+	sha256sums = 9173e5e9450ded2d1d177cae610e523228cf6c8c19e2f9d0394ca93284f1de43
 
 pkgname = python-toolz
+	depends = python
 
-pkgname = python-cytoolz
+pkgname = python2-toolz
+	depends = python2
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..1e606006a388
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.log
+*.tar.gz
+*.pkg*
+*/
diff --git a/PKGBUILD b/PKGBUILD
index d2fd254721da..d3cae48b0c88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,51 @@
+# Maintainer: Jingbei Li <i@jingbei.li>
 # Contributor: Francois Boulogne <fboulogne at april dot org>
-# Maintainer: Francois Boulogne <fboulogne at april dot org>
 # Contributor: Gaël Donval <gdonval+aur at google mail>
-
-
 pkgbase='python-toolz'
-pkgname=('python-toolz' 'python-cytoolz')
+pkgname=('python-toolz' 'python2-toolz')
+_pkgname=toolz
 pkgver=0.9.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A set of utility functions for iterators, functions, and dictionaries."
 arch=('any')
-url="https://github.com/pytoolz"
+url="https://github.com/pytoolz/toolz"
 license=('BSD')
-depends=('python')
-makedepends=('python-setuptools' 'cython' 'gcc')
-conflict=('python-cytoolz')
-source=("https://pypi.org/packages/source/t/toolz/toolz-${pkgver}.tar.gz"
-        "https://github.com/pytoolz/cytoolz/archive/${pkgver}.tar.gz")
-sha256sums=('929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9'
-            '177d6bcf76d60efeb5fa04c151e8c2e53a2679d380f1d316b0fd3a1cdffd75fb')
+makedepends=('python-setuptools' 'python2-setuptools')
+source=("$url/archive/0.9.0.tar.gz")
+sha256sums=('9173e5e9450ded2d1d177cae610e523228cf6c8c19e2f9d0394ca93284f1de43')
 
-package_python-toolz() {
-  cd "${srcdir}"/toolz-$pkgver
-  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-toolz/LICENSE"
-  install -D -m644 README.rst "${pkgdir}/usr/share/doc/python-toolz/README"
+prepare() {
+  cd "$srcdir/"
+  cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-py2"
+  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|" \
+    -i $(find . -name '*.py')
+}
+
+build() {
+  msg "Building Python 2"
+  cd "$srcdir/${_pkgname}-${pkgver}-py2"
+  python2 setup.py build
+
+  msg "Building Python 3"
+  cd "$srcdir/${_pkgname}-${pkgver}"
+  python setup.py build
 }
 
-package_python-cytoolz() {
-  cd "${srcdir}"/cytoolz-$pkgver
+package_python2-toolz() {
+  depends=('python2')
+  cd "$srcdir/${_pkgname}-${pkgver}-py2"
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python-toolz() {
+  depends=('python')
+  cd "$srcdir/${_pkgname}-${pkgver}"
   python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-cytoolz/LICENSE"
-  install -D -m644 README.rst "${pkgdir}/usr/share/doc/python-cytoolz/README"
+  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:ts=2:sw=2:et: