python-upnpc: splittable package, some refinements on makedeps and architectures

2 files changed, 22 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3b8a060f982..a657a74b0b4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,11 @@
 pkgbase = python-miniupnpc
-	pkgdesc = A small UPnP client library/tool to access Internet Gateway Devices
+	pkgdesc = A small UPnP client library/tool to access Internet Gateway Devices (python2 module only)
 	pkgver = 2.0.20180203
 	pkgrel = 3
 	url = http://miniupnp.free.fr
+	arch = i686
 	arch = x86_64
 	license = BSD
-	makedepends = python
-	makedepends = python-setuptools
-	makedepends = python2
-	makedepends = python2-setuptools
-	makedepends = sh
 	source = http://miniupnp.free.fr/files/miniupnpc-2.0.20180203.tar.gz
 	md5sums = 48fd9c899f77e898c74d2166590da076
 
diff --git a/PKGBUILD b/PKGBUILD
index fff1f7a4e6da..8946bb405731 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,38 @@
 # Maintainer: Kewl <xrjy@nygb.rh.bet(rot13)>
+# Maintainer: robertfoster
 # Contributor: Techmeology <techmeology@techmeology.co.uk>
+# Contributor: Andy Weidenbaum <archbaum@gmail.com>
 
 pkgbase=python-miniupnpc
 pkgname=('python-miniupnpc' 'python2-miniupnpc')
 pkgver=2.0.20180203
 pkgrel=3
-pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices"
-arch=('x86_64')
-makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools' 'sh')
+pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices (python2 module only)"
+arch=('i686' 'x86_64')
 url="http://miniupnp.free.fr"
 license=('BSD')
-source=(http://miniupnp.free.fr/files/miniupnpc-${pkgver}.tar.gz)
-md5sums=('48fd9c899f77e898c74d2166590da076')
+source=("http://miniupnp.free.fr/files/${pkgbase#python-}-$pkgver.tar.gz")
 
-prepare () {
-    cp -a miniupnpc{,-py2}-$pkgver 
-    find miniupnpc-py2-$pkgver -name \*.py -exec sed -r 's|^#!(.*)python$|#!\1python2|' -i {} +
-}
+package_python2-miniupnpc() {
+	depends=('python2')
+	makedepends=('python2-setuptools')
 
-build() {
-  echo "Building Python3"
-  cd miniupnpc-$pkgver
-  make
-  python setup.py build
+	cd $srcdir/${pkgbase#python-}-$pkgver
 
-  echo "Building Python2"
-  cd ../miniupnpc-py2-$pkgver
-  make
-  python2 setup.py build
+	python2 setup.py build
+	python2 setup.py install --root="$pkgdir" --optimize=1
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_python-miniupnpc() {
-  depends=('python')
-
-  cd miniupnpc-$pkgver
-  python setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
+	depends=('python')
+	makedepends=('python-setuptools')
 
-package_python2-miniupnpc() {
-  depends=('python2')
+	cd $srcdir/${pkgbase#python-}-$pkgver
 
-  cd miniupnpc-py2-$pkgver
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	python setup.py build
+	python setup.py install --root="$pkgdir" --optimize=1
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+md5sums=('48fd9c899f77e898c74d2166590da076')