python-pymca: 5.5.4-1 -> 5.5.4-2

1 files changed, 9 insertions, 56 deletions

diff --git a/python-pymca/PKGBUILD b/python-pymca/PKGBUILD
index 81020414..5c8d3283 100755
--- a/python-pymca/PKGBUILD
+++ b/python-pymca/PKGBUILD
@@ -1,22 +1,15 @@
 # Maintainer: Erich Eckner <arch at eckner dot net>
-pkgbase=python-pymca
-pkgname=(python2-pymca python-pymca)
-_pkgname="${pkgbase#*-}"
+pkgname=python-pymca
+_pkgname="${pkgname#*-}"
 pkgver=5.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Stand-alone application and Python tools for interactive and/or batch processing analysis of X-Ray Fluorescence Spectra'
 arch=('i686' 'pentium4' 'x86_64')
 url='http://pymca.sourceforge.net/index.html'
 license=('MIT License')
-_deppy2=(
-  'python2>=2.7'
-  'python2<2.8'
-)
-_deppy=(
+depends=(
   'python>=3.8'
   'python<3.9'
-)
-_depends=(
   'python-fisx>=1.1.5'
   'python-h5py'
   'python-matplotlib>1.0'
@@ -26,62 +19,22 @@ _depends=(
 #  'python-pyqt4'
   'python-pyqt5'
   'python-qtconsole')
-_makedepends=(
+makedepends=(
   'python-setuptools')
-_optdepends=(
+optdepends=(
   'python-pyqt5: gui'
   'python-matplotlib: gui')
-makedepends=(
-  "${_deppy[@]}"
-  "${_deppy2[@]}"
-  "${_depends[@]}"
-  "${_depends[@]/python/python2}"
-  "${_makedepends[@]}"
-  "${_makedepends[@]/ython/ython2}"
-)
 source=(
     "${_pkgname}-v${pkgver}.tar.gz::https://github.com/vasole/${_pkgname}/archive/v${pkgver}.tar.gz"
 )
 sha512sums=('f9623bab9e44c1a38bc597f70fbea70fc0d493be7f2a83737e6b284c89bbb1e5dcdf2fb6d29b0cfbf87c8bad5fc55ced990917ce7306218b411247885c78fea4')
 
-prepare() {
-  cp -a ${_pkgname}-${pkgver}{,-py2}
-}
-
 build() {
-  echo "Building python..."
-  (
-    cd ${_pkgname}-${pkgver}
-    python setup.py build
-  )
-  echo "Building python2..."
-  (
-    cd ${_pkgname}-${pkgver}-py2
-    python2 setup.py build
-  )
-}
-
-package_python2-pymca() {
-  depends=(
-    "${_deppy2[@]}"
-    "${_depends[@]/python/python2}"
-  )
-  optdepends=(
-    "${_optdepends[@]/python/python2}"
-  )
-  cd ${_pkgname}-${pkgver}-py2
-  python2 setup.py install --skip-build --root="${pkgdir}" --prefix=/usr
-  find "${pkgdir}" -type f -exec sed -si '1 s#[/ ]python\s*$# python2#' {} +
+  cd ${_pkgname}-${pkgver}
+  python setup.py build
 }
 
-package_python-pymca() {
-  depends=(
-    "${_deppy[@]}"
-    "${_depends[@]}"
-  )
-  optdepends=(
-    "${_optdepends[@]}"
-  )
+package() {
   cd ${_pkgname}-${pkgver}
   python setup.py install --skip-build --root="${pkgdir}" --prefix=/usr
 }