testing/python3.4: update to 3.4.5, update abuild, claim maintainership

1 files changed, 29 insertions, 30 deletions

diff --git a/testing/python3.4/APKBUILD b/testing/python3.4/APKBUILD
index ee374bac15..0dfedac8b5 100644
--- a/testing/python3.4/APKBUILD
+++ b/testing/python3.4/APKBUILD
@@ -1,18 +1,18 @@
-# Contributor: Gus Monod <gustave.monod@insa-lyon.fr>
-
-pkgname=python3.4
-pkgver=3.4.3
-pkgrel=1
+# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+_basever=3.4
+pkgname=python$_basever
+pkgver=$_basever.5
+pkgrel=0
 pkgdesc="A high-level scripting language"
 url="http://www.python.org"
 arch="all"
 license="custom"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tests"
 depends=""
 makedepends="expat-dev libressl-dev zlib-dev ncurses-dev bzip2-dev xz-dev
 	sqlite-dev libffi-dev tcl-dev linux-headers gdbm-dev readline-dev"
-subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz"
-
 builddir="$srcdir/Python-$pkgver"
 
 prepare() {
@@ -24,7 +24,6 @@ prepare() {
 		Modules/zlib \
 		Modules/_ctypes/darwin* \
 		Modules/_ctypes/libffi* \
-		|| return 1
 }
 
 build() {
@@ -48,42 +47,42 @@ build() {
 
 package() {
 	cd "$builddir"
+
 	make -j1 DESTDIR="$pkgdir" EXTRA_CFLAGS="$CFLAGS" install maninstall \
 		|| return 1
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE || return 1
 
-	local _basever="${pkgver%.*}"
 	ln -sf ../../libpython${_basever}m.so \
-		"${pkgdir}/usr/lib/python${_basever}/config-${_basever}m/libpython${_basever}m.so"
-}
+		"${pkgdir}/usr/lib/python${_basever}/config-${_basever}m/libpython${_basever}m.so" \
+		|| return 1
 
-_mv_files() {
-	cd "$pkgdir"/usr/lib/python${pkgver%.*}
-	for i in */test */tests; do
-		mkdir -p "$subpkgdir"/usr/lib/python${pkgver%.*}/"$i"
-		mv "$i"/* "$subpkgdir"/usr/lib/python${pkgver%.*}/"$i"
-		rm -rf "$i"
-	done
-	mv "$pkgdir"/usr/lib/python${pkgver%.*}/test \
-		"$subpkgdir"/usr/lib/python${pkgver%.*}
+	# Remove symlinks without _basever to avoid conflict with python3 package.
+	find "$pkgdir"/usr/bin ! -name "*$_basever*" -delete
 }
 
 dev() {
+	default_dev || return 1
+
 	# pyconfig.h is needed runtime so we move it back
-	default_dev
-	mkdir -p "$pkgdir"/usr/include/python${pkgver%.*}m
-	mv "$subpkgdir"/usr/include/python${pkgver%.*}m/pyconfig.h \
-		"$pkgdir"/usr/include/python${pkgver%.*}m/
+	mkdir -p "$pkgdir"/usr/include/python${_basever}m
+	mv "$subpkgdir"/usr/include/python${_basever}m/pyconfig.h \
+		"$pkgdir"/usr/include/python${_basever}m/
 }
 
 tests() {
 	pkgdesc="The test modules from the main python package"
 	arch="noarch"
 
-	cd "$pkgdir"
-	_mv_files
+	cd "$pkgdir"/usr/lib/python$_basever
+	local i; for i in */test */tests; do
+		mkdir -p "$subpkgdir"/usr/lib/python$_basever/"$i"
+		mv "$i"/* "$subpkgdir"/usr/lib/python$_basever/"$i" || return 1
+		rm -rf "$i"
+	done
+	mv "$pkgdir"/usr/lib/python$_basever/test \
+		"$subpkgdir"/usr/lib/python$_basever/
 }
 
-md5sums="7d092d1bba6e17f0d9bd21b49e441dd5  Python-3.4.3.tar.xz"
-sha256sums="b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8  Python-3.4.3.tar.xz"
-sha512sums="55b2d7c07da8ad3a3971b4687da2e45809c6f1474732e93b0432f121f287d0b63ad8a9bf381987ea70f47a03d9474c3e55b7d86d14800bf7ef29b3324d8d35b9  Python-3.4.3.tar.xz"
+md5sums="5caaca47eead170070a856fae5f6e78c  Python-3.4.5.tar.xz"
+sha256sums="ee64b1c8a47461009abf25252332d29a4e587cb4f0c1c96aa793a3732e9d898a  Python-3.4.5.tar.xz"
+sha512sums="b548a5338d141b3086dea372fa2cc245ba5350ee9f0d1304ef6222dc45380b66d380b092e547d54206d56ca68563b95036f445f97f72bb0ef1d48f81a74a3d4c  Python-3.4.5.tar.xz"