main/py-paramiko: improve abuild and fix to not silently fail

1 files changed, 15 insertions, 13 deletions

diff --git a/main/py-paramiko/APKBUILD b/main/py-paramiko/APKBUILD
index f1a2157522..aba16ff223 100644
--- a/main/py-paramiko/APKBUILD
+++ b/main/py-paramiko/APKBUILD
@@ -3,23 +3,21 @@
 pkgname=py-paramiko
 _pkgname=paramiko
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An SSH2 protocol library for Python"
 url="https://github.com/paramiko/paramiko/"
 arch="noarch"
 license="LGPL2+"
-depends=""
-depends_dev=""
+depends="py-crypto py-cryptography py-ecdsa"
 makedepends="python2-dev python3-dev py-setuptools"
-install=""
 subpackages="$pkgname-doc $pkgname-demos py3-$_pkgname:_py3 py2-$_pkgname:_py2"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
 
-builddir="$srcdir"/$_pkgname-$pkgver
 build() {
 	cd "$builddir"
 	python2 setup.py build || return 1
-	python3 setup.py build || return 1	
+	python3 setup.py build || return 1
 }
 
 package() {
@@ -27,32 +25,36 @@ package() {
 }
 
 _py() {
-	local python=$1
-	pkgdesc="$pkgdesc - $python"
+	local python="$1"
+	pkgdesc="$pkgdesc ${python#python}"
+	depends="$depends $python"
 	install_if="$pkgname=$pkgver-r$pkgrel $python"
+
 	cd "$builddir"
 	$python setup.py install --prefix=/usr --root="$subpkgdir"
 }
 
 _py2() {
-	_py python2
-	depends="$depends py2-crypto py2-ecdsa py2-cryptography"
 	replaces="$pkgname"
+	depends="${depends//py-/py2-}"
+	_py python2
 }
 
 _py3() {
+	depends="${depends//py-/py3-}"
 	_py python3
-	depends="$depends py3-crypto py3-ecdsa py3-cryptography"
 }
 
 demos() {
-	# Put the demo files into a separate package
+	pkgdesc="$pkgdesc (demos)"
+
 	mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/demos || return 1
 	mv "$builddir"/demos "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1
 }
 
 doc() {
-	# Put the documentation files into a separate package
+	pkgdesc="$pkgdesc (documentation)"
+
 	mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/docs || return 1
 	mv "$builddir"/docs "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1
 }