main/py-asn1-modules: upgrade to 16.0.0, added py3 support and py2/py3 subpackages

1 files changed, 29 insertions, 19 deletions

diff --git a/main/py-asn1-modules/APKBUILD b/main/py-asn1-modules/APKBUILD
index 8dd464e4748..abdfeea2943 100644
--- a/main/py-asn1-modules/APKBUILD
+++ b/main/py-asn1-modules/APKBUILD
@@ -2,39 +2,49 @@
 pkgname=py-asn1-modules
 _pkgname=pyasn1-modules
 pkgver=0.0.8
-pkgrel=0
+pkgrel=1
 pkgdesc="A collection of ASN.1-based protocols modules"
 url="http://pypi.python.org/pypi/pyasn1-modules"
 arch="noarch"
 license="BSD"
-depends="python py-openssl py-asn1"
-depends_dev=""
-makedepends="python-dev"
+depends=""
+makedepends="python-dev python3-dev"
 install=""
-subpackages=""
+subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
-_builddir="$srcdir"/$_pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$_builddir"
-	python setup.py build || return 1
+	cd "$builddir"
+	python2 setup.py build || return 1
+	python3 setup.py build || return 1	
 }
 
 package() {
-	cd "$_builddir"
-	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+	mkdir -p "$pkgdir"
+}
+
+_py() {
+	local python=$1
+	pkgdesc="$pkgdesc - $python"
+	install_if="$pkgname=$pkgver-r$pkgrel $python" 	
+	cd "$builddir"
+	$python setup.py install --prefix=/usr --root="$subpkgdir"
+}
+
+_py2() {
+	_py python2
+	depends="py2-openssl py2-asn1"
+	replaces="$pkgname"
+}
+
+_py3() {
+	_py python3
+	depends="py3-openssl py3-asn1"
 }
 
+
 md5sums="178129bc7fbf07215c25230c5f053f81  pyasn1-modules-0.0.8.tar.gz"
 sha256sums="10561934f1829bcc455c7ecdcdacdb4be5ffd3696f26f468eb6eb41e107f3837  pyasn1-modules-0.0.8.tar.gz"
 sha512sums="6040d4f83c6b00f7a0e6ba0e1264090d0fa96fc39e97b04d624721cef200b6cf4dabfe550127ade4edc181187ca1b4219fb46a95082a39e6291d0e2e08f36d78  pyasn1-modules-0.0.8.tar.gz"