python-fabio, python-pyfai, python-silx: clean up source names

3 files changed, 17 insertions, 15 deletions

diff --git a/python-fabio/PKGBUILD b/python-fabio/PKGBUILD
index 96fe7bec..81647e8d 100644
--- a/python-fabio/PKGBUILD
+++ b/python-fabio/PKGBUILD
@@ -3,6 +3,7 @@
 # Upstream contact: silx at esrf dot fr
 pkgbase=python-fabio
 pkgname=(python2-fabio python-fabio)
+_pkgname=fabio
 pkgver=0.7.0
 pkgrel=1
 pkgdesc="I/O library for images produced by 2D X-ray detectors."
@@ -12,7 +13,7 @@ license=('MIT' 'LGPL' 'Apache')
 _depends=('python-numpy' 'python-pillow' 'python-lxml')
 _optdepends=('python-pyqt4: for the fabio_viewer program')
 _makedepends=('cython')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/${pkgname#*-}/archive/v${pkgver}.tar.gz")
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/${_pkgname}/archive/v${pkgver}.tar.gz")
 sha256sums=('f2ba37584fe39e051cff89a61f13615a973e4bdc6f35979011057a1f9305d784')
 
 makedepends=(
@@ -23,15 +24,15 @@ makedepends=(
 )
 
 prepare() {
-  cp -r "${pkgname#*-}-${pkgver}" "py2-${pkgname#*-}-${pkgver}"
-  mv "${pkgname#*-}-${pkgver}" "py-${pkgname#*-}-${pkgver}"
+  cp -r "${_pkgname}-${pkgver}" "py2-${_pkgname}-${pkgver}"
+  mv "${_pkgname}-${pkgver}" "py-${_pkgname}-${pkgver}"
 }
 
 build() {
-  cd "${srcdir}/py-${pkgname#*-}-${pkgver}"
+  cd "${srcdir}/py-${_pkgname}-${pkgver}"
   python setup.py build
 
-  cd "${srcdir}/py2-${pkgname#*-}-${pkgver}"
+  cd "${srcdir}/py2-${_pkgname}-${pkgver}"
   python2 setup.py build
 }
 
@@ -42,7 +43,7 @@ package_python2-fabio() {
   optdepends=(
     "${_optdepends[@]//python/python2}"
   )
-  cd "${srcdir}/py2-${pkgname#*-}-${pkgver}"
+  cd "${srcdir}/py2-${_pkgname}-${pkgver}"
   python2 setup.py install --root="${pkgdir}/" --optimize=1
   install -D copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   for suffix in '-convert' '_viewer'; do
@@ -58,7 +59,7 @@ package_python-fabio() {
   optdepenends=(
     "${_optdepends[@]}"
   )
-  cd "${srcdir}/py-${pkgname#*-}-${pkgver}"
+  cd "${srcdir}/py-${_pkgname}-${pkgver}"
   python setup.py install --root="${pkgdir}/" --optimize=1
   install -D copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/python-pyfai/PKGBUILD b/python-pyfai/PKGBUILD
index 06b862cd..7b321fd2 100644
--- a/python-pyfai/PKGBUILD
+++ b/python-pyfai/PKGBUILD
@@ -14,7 +14,7 @@ _depends=('python-numpy' 'python-scipy' 'python-matplotlib' 'python-fabio'
           'python-h5py' 'python-pyopencl' 'python-pyqt5' 'fftw' 'opencl-driver')
 _makedepends=('cython')
 _optdepends=()
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/pyFAI/archive/v${pkgver}.tar.gz")
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/${_pkgname}/archive/v${pkgver}.tar.gz")
 sha256sums=('d72ae3b81ee4350e3768fd9ddc7a03ede4e33dbccddcba449cf1d563757c4726')
 
 makedepends=(
diff --git a/python-silx/PKGBUILD b/python-silx/PKGBUILD
index 586edb22..71605cf7 100644
--- a/python-silx/PKGBUILD
+++ b/python-silx/PKGBUILD
@@ -3,6 +3,7 @@
 # Upstream contact: silx at esrf dot fr
 pkgbase=python-silx
 pkgname=(python2-silx python-silx)
+_pkgname=silx
 pkgver=0.8.0
 pkgrel=1
 pkgdesc="A collection of Python packages for data analysis at synchrotron radiation facilities."
@@ -16,7 +17,7 @@ _optdepends=('python-h5py: for HDF5 input/output'
             'python-pyopencl: for sift - OpenCL implementation'
             'opencl-driver: for sift - OpenCL implementation')
 _makedepends=('cython')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/${pkgname#*-}/archive/v${pkgver}.tar.gz")
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/${_pkgname}/archive/v${pkgver}.tar.gz")
 sha256sums=('991250e242d4be6b5e6eae4d9267b5ba1e70d3abdd2aa4244bd55ce0fe4d0a49')
 
 makedepends=(
@@ -27,15 +28,15 @@ makedepends=(
 )
 
 prepare() {
-  cp -r "${pkgname#*-}-${pkgver}" "py2-${pkgname#*-}-${pkgver}"
-  mv "${pkgname#*-}-${pkgver}" "py-${pkgname#*-}-${pkgver}"
+  cp -r "${_pkgname}" "py2-${_pkgname}-${pkgver}"
+  mv "${_pkgname}-${pkgver}" "py-${_pkgname}-${pkgver}"
 }
 
 build() {
-  cd "${srcdir}/py-${pkgname#*-}-${pkgver}"
+  cd "${srcdir}/py-${_pkgname}-${pkgver}"
   python setup.py build
 
-  cd "${srcdir}/py2-${pkgname#*-}-${pkgver}"
+  cd "${srcdir}/py2-${_pkgname}-${pkgver}"
   python2 setup.py build
 }
 
@@ -46,7 +47,7 @@ package_python2-silx() {
   optdepends=(
     "${_optdepends[@]//python/python2}"
   )
-  cd "${srcdir}/py2-${pkgname#*-}-${pkgver}"
+  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"
@@ -63,7 +64,7 @@ package_python-silx() {
   optdepenends=(
     "${_optdepends[@]}"
   )
-  cd "${srcdir}/py-${pkgname#*-}-${pkgver}"
+  cd "${srcdir}/py-${_pkgname}-${pkgver}"
   python setup.py install --root="${pkgdir}/" --optimize=1
   install -D copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }