python-pyfai: 0.19.0-3 -> 0.19.0-4

1 files changed, 8 insertions, 63 deletions

diff --git a/python-pyfai/PKGBUILD b/python-pyfai/PKGBUILD
index fea50583..8da51cf9 100644
--- a/python-pyfai/PKGBUILD
+++ b/python-pyfai/PKGBUILD
@@ -1,24 +1,17 @@
 # Maintainer: Erich Eckner <arch at eckner dot net>
 # Contributor: Leonid B <leonid dot bloch at esrf dot fr>
 # Upstream contact: silx at esrf dot fr
-pkgbase=python-pyfai
-pkgname=(python2-pyfai python-pyfai)
+pkgname=python-pyfai
 _pkgname=pyFAI
 pkgver=0.19.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Fast Azimuthal Integration in Python."
 arch=('i686' 'pentium4' 'x86_64')
 url="http://www.silx.org"
 license=('GPLv3' 'BSD' 'MIT')
-_deppy2=(
-  'python2>=2.7'
-  'python2<2.8'
-)
-_deppy=(
+depends=(
   'python>=3.8'
   'python<3.9'
-)
-_depends=(
   'python-bash_kernel'
   'cython'
   'python-fabio'
@@ -31,75 +24,27 @@ _depends=(
   'python-pyqt5'
   'python-scipy'
   'python-silx')
-_makedepends=(
+makedepends=(
   'python-setuptools')
 checkdepends=(
   'python-pyopencl'
   'xorg-server-xvfb'
 )
-_optdepends=()
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/${_pkgname}/archive/v${pkgver}.tar.gz")
 sha512sums=('32960083e23977de860aad58b502814b8d2bf2045207c4065d4db7ac89e832fce7bb3e41a2110b62a903db40460e5490d0f25f0d79968b0005f8122539591639')
 
-makedepends=(
-  "${_deppy[@]}"
-  "${_deppy2[@]}"
-  "${_depends[@]}"
-  "${_depends[@]//python/python2}"
-  "${_makedepends[@]}"
-  "${_makedepends[@]//ython/ython2}"
-)
-
-prepare() {
-  cp -r "${_pkgname}-${pkgver}" "py2-${_pkgname}-${pkgver}"
-  mv "${_pkgname}-${pkgver}" "py-${_pkgname}-${pkgver}"
-}
-
 build() {
-  cd "${srcdir}/py2-${_pkgname}-${pkgver}"
-  python2 setup.py build
-
-  cd "${srcdir}/py-${_pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   python setup.py build
 }
 
 check() {
-  return
-  cd "${srcdir}/py2-${_pkgname}-${pkgver}"
-  xvfb-run python2 setup.py test
-
-  cd "${srcdir}/py-${_pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   xvfb-run python setup.py test
 }
 
-package_python2-pyfai() {
-  depends=(
-    "${_deppy2[@]}"
-    "${_depends[@]//python/python2}"
-  )
-  optdepends=(
-    "${_optdepends[@]//python/python2}"
-  )
-  cd "${srcdir}/py2-${_pkgname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-  install -D LICENSES.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
-  find "${pkgdir}/usr/bin" -maxdepth 1 -type f -printf '%f\n' | \
-    while read -r f; do
-      mv "${pkgdir}/usr/bin/${f}" "${pkgdir}/usr/bin/python2-${f}"
-      sed -i '1 s/python/python2/' "${pkgdir}/usr/bin/python2-${f}"
-    done
-}
-
-package_python-pyfai() {
-  depends=(
-    "${_deppy[@]}"
-    "${_depends[@]}"
-  )
-  optdepends=(
-    "${_optdepends[@]}"
-  )
-  cd "${srcdir}/py-${_pkgname}-${pkgver}"
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   python setup.py install --root="${pkgdir}/" --optimize=1
   install -D LICENSES.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -D copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"