python-silx: 0.12.0-3 -> 0.12.0-4

1 files changed, 8 insertions, 59 deletions

diff --git a/python-silx/PKGBUILD b/python-silx/PKGBUILD
index baf8bf6bc..86418f118 100644
--- a/python-silx/PKGBUILD
+++ b/python-silx/PKGBUILD
@@ -1,28 +1,19 @@
 # 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-silx
-pkgname=(python2-silx python-silx)
+pkgname=python-silx
 _pkgname=silx
 pkgver=0.12.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A collection of Python packages for data analysis at synchrotron radiation facilities."
 arch=('i686' 'pentium4' 'x86_64')
 url="http://www.silx.org"
 license=('MIT' 'LGPL')
-_deppy2=(
-  'python2>=2.7'
-  'python2<2.8'
-  'python2-enum34'
-  'python2-futures'
-)
-_deppy=(
+depends=(
+  'cython>=0.21.1'
   'python>=3.8'
   'python<3.9'
   'python-pyopencl'
-)
-_depends=(
-  'cython>=0.21.1'
   'python-fabio>=0.7'
   'python-h5py'
   'python-mako'
@@ -35,9 +26,9 @@ _depends=(
   'python-scipy'
   'python-setuptools'
   'python-six')
-_makedepends=(
+makedepends=(
   'python-setuptools')
-_optdepends=('python-h5py: for HDF5 input/output'
+optdepends=('python-h5py: for HDF5 input/output'
             'ipython: for interactive console'
             'python-qtconsole: for GUI console'
             'python-pyopencl: for sift - OpenCL implementation'
@@ -45,55 +36,13 @@ _optdepends=('python-h5py: for HDF5 input/output'
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/${_pkgname}/archive/v${pkgver}.tar.gz")
 sha512sums=('aef69bedfda6826486ad6b4fdff4369d82b28ede2c225e60334927826979a7dcf8199a01072e7b663c01daf857d16c88a31e1ce1a8867146dd875e6c0c941bea')
 
-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}/py-${_pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   python setup.py build
-
-  cd "${srcdir}/py2-${_pkgname}-${pkgver}"
-  python2 setup.py build
-}
-
-package_python2-silx() {
-  depends=(
-    "${_deppy2[@]}"
-    "${_depends[@]//python/python2}"
-  )
-  optdepends=(
-    "${_optdepends[@]//python/python2}"
-  )
-  cd "${srcdir}/py2-${_pkgname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-  install -D copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  mv "${pkgdir}/usr/bin/silx" "${pkgdir}/usr/bin/silx2"
-  sed -i '1 s/python/python2/' "${pkgdir}/usr/bin/silx2"
-  mv \
-    "${pkgdir}/usr/silx/third_party/_local/scipy_spatial/qhull/COPYING.txt" \
-    "${pkgdir}/usr/silx/third_party/_local/scipy_spatial/qhull/COPYING2.txt"
 }
 
 package_python-silx() {
-  depends=(
-    "${_deppy[@]}"
-    "${_depends[@]}"
-  )
-  optdepenends=(
-    "${_optdepends[@]}"
-  )
-  cd "${srcdir}/py-${_pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   python setup.py install --root="${pkgdir}/" --optimize=1
   install -D copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }