2 files changed, 54 insertions, 31 deletions
diff --git a/community/py-typing/APKBUILD b/community/py-typing/APKBUILD
new file mode 100644
index 0000000000..2b8613b14c
--- /dev/null
+++ b/community/py-typing/APKBUILD
@@ -0,0 +1,54 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=py-typing
+_pkgname=typing
+pkgver=3.6.4
+pkgrel=0
+pkgdesc="Typing – Type Hints for Python"
+url="https://pypi.python.org/pypi/typing/"
+arch="noarch"
+license="PSF"
+makedepends="python2-dev python3-dev py-setuptools"
+subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
+source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	python2 setup.py build
+	python3 setup.py build
+}
+
+check() {
+	cd "$builddir"
+	python2 setup.py test
+	python3 setup.py test
+}
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+_py2() {
+	replaces="$pkgname"
+	depends="${depends//py-/py2-}"
+	_py python2
+}
+
+_py3() {
+	depends="${depends//py-/py3-}"
+	_py python3
+}
+
+_py() {
+	local python="$1"
+	pkgdesc="$pkgdesc (for $python)"
+	depends="$depends $python"
+	install_if="$pkgname=$pkgver-r$pkgrel $python"
+
+	cd "$builddir"
+	$python setup.py install --prefix=/usr --root="$subpkgdir"
+}
+
+
+sha512sums="f595e0fc395ba13a129ae45681faca7b199fd5c23e8f1573f49e2a6f162b7f2aef680306e76cbf50b978de9f047c674323219981e89c476474295bb8c02211ce  py-typing-3.6.4.tar.gz"
diff --git a/community/py2-typing/APKBUILD b/community/py2-typing/APKBUILD
deleted file mode 100644
index 10dee94a3a..0000000000
--- a/community/py2-typing/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py2-typing
-_pkgname=typing
-pkgver=3.6.2
-pkgrel=0
-pkgdesc="Backport of stdlib's typing module from Python 3.5"
-url="https://pypi.python.org/pypi/typing/"
-arch="noarch"
-license="PSF"
-depends="python2"
-makedepends="python2-dev py-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-check() {
-	cd "$builddir"
-	python2 setup.py check
-}
-
-build() {
-	cd "$builddir"
-	python2 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python2 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="a975980e7ba6ec3e15c938336877071785bec7212443da079770348ab9441c8d918cd806e85ebea8af66a5d94f684566ea07b55e7623ab11e7d922c8c3dfe981  py2-typing-3.6.2.tar.gz"