From 6b1d9a0ae8fd903b1d864a9795e18dbf2c9aa444 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 24 May 2019 14:45:30 +0200
Subject: set _pkgname in all python-* packages

---
 python-asteval/PKGBUILD | 19 ++++++++++---------
 python-certipy/PKGBUILD | 16 ++++++++--------
 python-hpilo/PKGBUILD   |  1 +
 python-ipympl           |  2 +-
 python-postpic          |  2 +-
 python-pyepics/PKGBUILD | 13 +++++++------
 python-pyfftw/PKGBUILD  |  8 ++++----
 python-wxmplot/PKGBUILD | 13 +++++++------
 python-wxutils/PKGBUILD |  9 +++++----
 9 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/python-asteval/PKGBUILD b/python-asteval/PKGBUILD
index f30c2ca5..00332ff5 100644
--- a/python-asteval/PKGBUILD
+++ b/python-asteval/PKGBUILD
@@ -3,6 +3,7 @@
 
 pkgbase=python-asteval
 pkgname=('python-asteval' 'python2-asteval')
+_pkgname="${pkgbase#*-}"
 pkgver=0.9.13
 pkgrel=1
 pkgdesc='Minimal Python AST Evaluator'
@@ -29,27 +30,27 @@ makedepends=(
 checkdepends=(
   "${_checkdepends[@]}" "${_checkdepends[@]/python/python2}"
   )
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/newville/asteval/archive/${pkgver}.tar.gz")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/newville/${_pkgname}/archive/${pkgver}.tar.gz")
 sha512sums=('f58d80ee67d35cc20a1627e320af696cc9045ee3fa1678d571b2ab304e8c98be30f7844574b6c1c2af0a2454909f58924af53f46ead76fd4d44008342eae4bde')
 
 prepare() {
-  mv "asteval-${pkgver}" "asteval-py-${pkgver}"
-  cp -a "asteval-py-${pkgver}" "asteval-py2-${pkgver}"
+  mv "${_pkgname}-${pkgver}" "${_pkgname}-py-${pkgver}"
+  cp -a "${_pkgname}-py-${pkgver}" "${_pkgname}-py2-${pkgver}"
 }
 
 build() {
-  cd "$srcdir/asteval-py-$pkgver"
+  cd "$srcdir/${_pkgname}-py-$pkgver"
   python setup.py build
   
-  cd "$srcdir/asteval-py2-$pkgver"
+  cd "$srcdir/${_pkgname}-py2-$pkgver"
   python2 setup.py build
 }
 
 check() {
-  cd "$srcdir/asteval-py-$pkgver"
+  cd "$srcdir/${_pkgname}-py-$pkgver"
   nosetests3 tests
 
-  cd "$srcdir/asteval-py2-$pkgver"
+  cd "$srcdir/${_pkgname}-py2-$pkgver"
   nosetests2 tests
 }
 
@@ -58,7 +59,7 @@ package_python-asteval(){
     "${_deppy[@]}"
     "${_depends[@]}"
   )
-  cd "$srcdir/asteval-py-$pkgver"
+  cd "$srcdir/${_pkgname}-py-$pkgver"
   python setup.py install --root="$pkgdir/" --optimize=1
 }
 
@@ -67,7 +68,7 @@ package_python2-asteval(){
     "${_deppy2[@]}"
     "${_depends[@]/python/python2}"
   )
-  cd "$srcdir/asteval-py2-$pkgver"
+  cd "$srcdir/${_pkgname}-py2-$pkgver"
   python2 setup.py install --root="$pkgdir/" --optimize=1
 }
 
diff --git a/python-certipy/PKGBUILD b/python-certipy/PKGBUILD
index 3ce5469d..aacc24dd 100644
--- a/python-certipy/PKGBUILD
+++ b/python-certipy/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Tommy Li <ttoo74@gmail.com>
 pkgbase=python-certipy
 pkgname=(python-certipy python2-certipy)
-_name=${pkgbase#python-}
+_pkgname="${pkgbase#*-}"
 pkgver=0.1.3
 pkgrel=1
 pkgdesc="A simple python tool for creating certificate authorities and certificates on the fly"
@@ -31,24 +31,24 @@ makedepends=(
   "${_makedepends[@]}"
   "${_makedepends[@]/ython/ython2}"
 )
-source=("${pkgbase}-${pkgver}.tar.gz::https://pypi.python.org/packages/3a/b3/f9228354c1eac06cd3577a981571b9188392d73d583fcaa7a8f3fb374a56/$_name-$pkgver.tar.gz")
+source=("${pkgbase}-${pkgver}.tar.gz::https://pypi.python.org/packages/3a/b3/f9228354c1eac06cd3577a981571b9188392d73d583fcaa7a8f3fb374a56/${_pkgname}-$pkgver.tar.gz")
 sha512sums=('6168146b60900883e4901920b354e17e341a87cf7dbdf674f0fbcbbb12067aa324d1dc7bf0817b5539873f883ac130f6b199fbab61222d2e06bde70e02019e95')
 
 prepare() {
 	# fix permission error
-	chmod -R u+rwX,go+rX,go-w "$_name-$pkgver"
-  cp -a "$_name-$pkgver"{,-py2}
+	chmod -R u+rwX,go+rX,go-w "${_pkgname}-$pkgver"
+  cp -a "${_pkgname}-$pkgver"{,-py2}
 }
 
 build() {
   echo "Building python..."
   (
-		cd "$_name-$pkgver"
+		cd "${_pkgname}-$pkgver"
 		python setup.py build
   )
   echo "Building python2..."
   (
-		cd "$_name-$pkgver-py2"
+		cd "${_pkgname}-$pkgver-py2"
 		python2 setup.py build
   )
 }
@@ -58,7 +58,7 @@ package_python-certipy() {
     "${_deppy[@]}"
     "${_depends[@]}"
   )
-	cd "$_name-$pkgver"
+	cd "${_pkgname}-$pkgver"
 	python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
 }
 
@@ -67,7 +67,7 @@ package_python2-certipy() {
     "${_deppy2[@]}"
     "${_depends[@]/python/python2}"
   )
-	cd "$_name-$pkgver-py2"
+	cd "${_pkgname}-$pkgver-py2"
 	python2 setup.py install --root="$pkgdir/" --optimize=1 --skip-build
 	find "$pkgdir/" -type f -exec sed -i '1 s,/python$,\02,' {} +
 	mv "$pkgdir/usr/bin/certipy" "$pkgdir/usr/bin/certipy2"
diff --git a/python-hpilo/PKGBUILD b/python-hpilo/PKGBUILD
index 6bbc71aa..9483169f 100644
--- a/python-hpilo/PKGBUILD
+++ b/python-hpilo/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Erich Eckner <arch at eckner dot net>
 pkgbase=python-hpilo
 pkgname=(python2-hpilo python-hpilo)
+_pkgname="${pkgbase#*-}"
 pkgver=4.3
 pkgrel=1
 pkgdesc='Accessing the HP iLO XML interface from python'
diff --git a/python-ipympl b/python-ipympl
index e434fb7f..f8aa98c2 160000
--- a/python-ipympl
+++ b/python-ipympl
@@ -1 +1 @@
-Subproject commit e434fb7f31cbef8a1b1be828eb9c51e34ec66903
+Subproject commit f8aa98c23f99c91b7fcc606b1ebd91aa022dea0f
diff --git a/python-postpic b/python-postpic
index ab2b16e1..51cc2769 160000
--- a/python-postpic
+++ b/python-postpic
@@ -1 +1 @@
-Subproject commit ab2b16e1e4587efca275158ccc5a1bbc72f277fe
+Subproject commit 51cc2769b2181857a46a303f68497534807e5331
diff --git a/python-pyepics/PKGBUILD b/python-pyepics/PKGBUILD
index fa425cc8..f6634a3a 100755
--- a/python-pyepics/PKGBUILD
+++ b/python-pyepics/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Erich Eckner <arch at eckner dot net>
 pkgbase=python-pyepics
 pkgname=(python2-pyepics python-pyepics)
+_pkgname="${pkgbase#*-}"
 pkgver=3.3.3
 pkgrel=2
 pkgdesc='Python Interface to the Epics Channel Access protocol of the Epics control system'
@@ -26,23 +27,23 @@ makedepends=(
   "${_makedepends[@]/ython/ython2}"
 )
 source=(
-    "${pkgname}-${pkgver}.tar.gz::https://pypi.python.org/packages/e6/9a/68dbcdd21c857c396384343dddb7a2939cd7b61f3e851dda287e458e2e42/${pkgname#*-}-${pkgver}.tar.gz"
+    "${pkgname}-${pkgver}.tar.gz::https://pypi.python.org/packages/e6/9a/68dbcdd21c857c396384343dddb7a2939cd7b61f3e851dda287e458e2e42/${_pkgname}-${pkgver}.tar.gz"
 )
 sha512sums=('522b59f678b2491ab4ddfa3863feac170c027a5abc545b93a82f73e4006f5b79544656e1f0fcb7bd080288cc271837b9cdd719c0104672bb70024d497a3f9c33')
 
 prepare() {
-  cp -a ${pkgname#*-}-${pkgver}{,-py2}
+  cp -a ${_pkgname}-${pkgver}{,-py2}
 }
 
 build() {
   echo "Building python..."
   (
-    cd ${pkgname#*-}-${pkgver}
+    cd ${_pkgname}-${pkgver}
     python setup.py build
   )
   echo "Building python2..."
   (
-    cd ${pkgname#*-}-${pkgver}-py2
+    cd ${_pkgname}-${pkgver}-py2
     python2 setup.py build
   )
 }
@@ -51,7 +52,7 @@ package_python-pyepics() {
   depends=(
     "${_deppy[@]}"
   )
-  cd ${pkgname#*-}-${pkgver}
+  cd ${_pkgname}-${pkgver}
   python setup.py install --skip-build --root="${pkgdir}" --prefix=/usr
 }
 
@@ -59,7 +60,7 @@ package_python2-pyepics() {
   depends=(
     "${_deppy2[@]}"
   )
-  cd ${pkgname#*-}-${pkgver}-py2
+  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#' {} +
 }
diff --git a/python-pyfftw/PKGBUILD b/python-pyfftw/PKGBUILD
index 8c8e5543..035149b4 100644
--- a/python-pyfftw/PKGBUILD
+++ b/python-pyfftw/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Erich Eckner <arch at eckner dot net>
 # Contributor: Antony Lee <anntzer dot lee at gmail dot com>
 
-_pyname=pyFFTW
+_pkgname=pyFFTW
 pkgname=("python-pyfftw" "python2-pyfftw")
 pkgbase="python-pyfftw"
 pkgver=0.11.1
@@ -39,7 +39,7 @@ source=("https://pypi.python.org/packages/fa/7f/e65fe8b9f1b66aab22c8d76c2f031807
 sha512sums=('2dab5d6c2c28731a096122ca7013c56469b8cd0509cb37abb7571290efc96925034e8c30833014c9f4d9db62234b4cb0e92cdc3b41880ac02bfa790370ee3f94')
 
 build() {
-  cd $srcdir/$_pyname-$pkgver
+  cd $srcdir/$_pkgname-$pkgver
   python setup.py build_ext --inplace
   python setup.py test
 }
@@ -49,7 +49,7 @@ package_python-pyfftw() {
     "${_deppy[@]}"
     "${_depends[@]}"
   )
-  cd $srcdir/$_pyname-$pkgver
+  cd $srcdir/$_pkgname-$pkgver
   python setup.py install --root="$pkgdir" --optimize=1 
   install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
@@ -59,7 +59,7 @@ package_python2-pyfftw() {
     "${_deppy2[@]}"
     "${_depends[@]/python-/python2-}"
   )
-  cd $srcdir/$_pyname-$pkgver
+  cd $srcdir/$_pkgname-$pkgver
   python2 setup.py install --root="$pkgdir" --optimize=1 
   install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/python-wxmplot/PKGBUILD b/python-wxmplot/PKGBUILD
index 2cb56a5e..06c8139b 100755
--- a/python-wxmplot/PKGBUILD
+++ b/python-wxmplot/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Erich Eckner <arch at eckner dot net>
 pkgbase=python-wxmplot
 pkgname=(python2-wxmplot python-wxmplot)
+_pkgname="${pkgbase#*-}"
 pkgver=0.9.34
 pkgrel=1
 pkgdesc='A library for plotting in wxPython using matplotlib'
@@ -32,23 +33,23 @@ makedepends=(
   "${_makedepends[@]/ython/ython2}"
 )
 source=(
-    "${pkgname}-${pkgver}.tar.gz::https://pypi.python.org/packages/99/6a/52f701942cc87fdf205f9720d9190cf119c5cf50dbf7e3031b74f1ce144a/${pkgname#*-}-${pkgver}.tar.gz"
+    "${pkgname}-${pkgver}.tar.gz::https://pypi.python.org/packages/99/6a/52f701942cc87fdf205f9720d9190cf119c5cf50dbf7e3031b74f1ce144a/${_pkgname}-${pkgver}.tar.gz"
 )
 sha512sums=('3b53cf427f6016e468206fb503707f6615114f81a8c741c2e425f91fcc6efa5497c608c16afef9a8602ff21fd0af25fdc7322702f931ef1286f9f3a7452ce0f0')
 
 prepare() {
-  cp -a ${pkgname#*-}-${pkgver}{,-py2}
+  cp -a ${_pkgname}-${pkgver}{,-py2}
 }
 
 build() {
   echo "Building python..."
   (
-    cd ${pkgname#*-}-${pkgver}
+    cd ${_pkgname}-${pkgver}
     python setup.py build
   )
   echo "Building python2..."
   (
-    cd ${pkgname#*-}-${pkgver}-py2
+    cd ${_pkgname}-${pkgver}-py2
     python2 setup.py build
   )
 }
@@ -58,7 +59,7 @@ package_python2-wxmplot() {
     "${_deppy2[@]}"
     "${_depends[@]/python/python2}"
   )
-  cd ${pkgname#*-}-${pkgver}-py2
+  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#' {} +
 }
@@ -68,6 +69,6 @@ package_python-wxmplot() {
     "${_deppy[@]}"
     "${_depends[@]}"
   )
-  cd ${pkgname#*-}-${pkgver}
+  cd ${_pkgname}-${pkgver}
   python setup.py install --skip-build --root="${pkgdir}" --prefix=/usr
 }
diff --git a/python-wxutils/PKGBUILD b/python-wxutils/PKGBUILD
index 9069fcf8..f5043c45 100755
--- a/python-wxutils/PKGBUILD
+++ b/python-wxutils/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Erich Eckner <arch at eckner dot net>
 pkgbase=python-wxutils
 pkgname=(python2-wxutils python-wxutils)
+_pkgname="${pkgbase#*-}"
 pkgver=0.2.3
 pkgrel=1
 pkgdesc='A library of convenience functions for wxPython'
@@ -39,11 +40,11 @@ prepare() {
 build() {
 
     echo "Building python2..."
-    cd "${srcdir}/${pkgbase#*-}-${pkgver}-py2"
+    cd "${srcdir}/${_pkgname}-${pkgver}-py2"
     python2 setup.py build
 
     echo "Building python..."
-    cd "${srcdir}/${pkgbase#*-}-${pkgver}"
+    cd "${srcdir}/${_pkgname}-${pkgver}"
     python setup.py build
 
 }
@@ -53,7 +54,7 @@ package_python2-wxutils() {
     depends=(
       "${_deppy2[@]}"
     )
-    cd ${pkgname#*-}-${pkgver}-py2
+    cd ${_pkgname}-${pkgver}-py2
     python2 setup.py install --skip-build --root="${pkgdir}" --prefix=/usr
     find "${pkgdir}" -type f -exec sed -i '1 s@^\(#!/usr/bin\(/env\s\+\)\?python\)\s*$@\12@' {} \;
 
@@ -64,7 +65,7 @@ package_python-wxutils() {
     depends=(
       "${_deppy[@]}"
     )
-    cd ${pkgname#*-}-${pkgver}
+    cd ${_pkgname}-${pkgver}
     python setup.py install --skip-build --root="${pkgdir}" --prefix=/usr
 
 }
-- 
cgit v1.2.3-54-g00ecf