From ffcceb29f2bce09e10d381113cb62e4926ef4169 Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman@gmail.com>
Date: Thu, 3 Feb 2011 19:02:49 -0500
Subject: testing/python3: new aport

---
 testing/python3/APKBUILD | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 testing/python3/APKBUILD

(limited to 'testing/python3')

diff --git a/testing/python3/APKBUILD b/testing/python3/APKBUILD
new file mode 100644
index 000000000..fc13a83e8
--- /dev/null
+++ b/testing/python3/APKBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+pkgname=python3
+pkgver=3.1.3
+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 openssl-dev zlib-dev ncurses-dev bzip2-dev
+	sqlite-dev libffi-dev tcl-dev"
+source="http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.bz2"
+
+build() {
+	cd "$srcdir/Python-$pkgver"
+	./configure --prefix=/usr \
+		--enable-shared \
+		--with-threads \
+		--with-system-ffi \
+		--enable-unicode=ucs4 \
+                --with-dbmliborder=ndbm \
+		|| return 1
+
+	make || return 1
+}
+
+package() {
+	cd "$srcdir/Python-$pkgver"
+	make -j1 DESTDIR="$pkgdir" install
+	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+#_mv_files() {
+#	local i
+#	for i in "$@"; do
+#		mkdir -p "$subpkgdir"/${i%/*}
+#		mv -f "$pkgdir"/$i "$subpkgdir"/$i || return 1
+#	done
+#}
+#
+#tests() {
+#	pkgdesc="The test modules from the main python package"
+#	cd "$pkgdir"
+#	_mv_files $(find usr/lib -type d -name 'test*')
+#}
+
+md5sums="ad5e5f1c07e829321e0a015f8cafe245  Python-3.1.3.tar.bz2"
-- 
cgit v1.3


From 06088d0dfdfc192afecbce687e8e22876d3eec9d Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman@gmail.com>
Date: Fri, 4 Feb 2011 01:52:35 -0500
Subject: testing/python3: move 2to3 to 2to3-3.1

---
 testing/python3/APKBUILD | 1 +
 1 file changed, 1 insertion(+)

(limited to 'testing/python3')

diff --git a/testing/python3/APKBUILD b/testing/python3/APKBUILD
index fc13a83e8..e8c9f9f35 100644
--- a/testing/python3/APKBUILD
+++ b/testing/python3/APKBUILD
@@ -28,6 +28,7 @@ build() {
 package() {
 	cd "$srcdir/Python-$pkgver"
 	make -j1 DESTDIR="$pkgdir" install
+        mv "$pkgdir"/usr/bin/2to3 "$pkgdir"/usr/bin/2to3-3.1
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-- 
cgit v1.3


From 75ab76f83f871dda97d69483c2e5b2938a568aa2 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 4 Feb 2011 15:29:57 -0600
Subject: testing/python3: whitespace cleanups

---
 testing/python3/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'testing/python3')

diff --git a/testing/python3/APKBUILD b/testing/python3/APKBUILD
index e8c9f9f35..c3cc5477a 100644
--- a/testing/python3/APKBUILD
+++ b/testing/python3/APKBUILD
@@ -19,7 +19,7 @@ build() {
 		--with-threads \
 		--with-system-ffi \
 		--enable-unicode=ucs4 \
-                --with-dbmliborder=ndbm \
+		--with-dbmliborder=ndbm \
 		|| return 1
 
 	make || return 1
@@ -28,7 +28,7 @@ build() {
 package() {
 	cd "$srcdir/Python-$pkgver"
 	make -j1 DESTDIR="$pkgdir" install
-        mv "$pkgdir"/usr/bin/2to3 "$pkgdir"/usr/bin/2to3-3.1
+	mv "$pkgdir"/usr/bin/2to3 "$pkgdir"/usr/bin/2to3-3.1
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-- 
cgit v1.3


From 02cb2292b4791f81f5d367ea4688745d4d105b93 Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <aphrael@alpinelinux.org>
Date: Thu, 23 Jun 2011 09:32:02 -0400
Subject: testing/python3: Upgrade to 3.2.0, now with working python3-tests
 subpkg.

---
 testing/python3/APKBUILD | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

(limited to 'testing/python3')

diff --git a/testing/python3/APKBUILD b/testing/python3/APKBUILD
index c3cc5477a..489562fc3 100644
--- a/testing/python3/APKBUILD
+++ b/testing/python3/APKBUILD
@@ -1,19 +1,21 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 pkgname=python3
-pkgver=3.1.3
+pkgver=3.2.0
+_pkgver=3.2
 pkgrel=0
 pkgdesc="A high-level scripting language"
 url="http://www.python.org"
 arch="all"
 license="custom"
-subpackages="$pkgname-dev $pkgname-doc" #$pkgname-tests"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tests"
 depends=
 makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev
 	sqlite-dev libffi-dev tcl-dev"
-source="http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.bz2"
+source="http://www.python.org/ftp/python/$_pkgver/Python-$_pkgver.tar.bz2"
 
+_builddir="$srcdir"/Python-$_pkgver
 build() {
-	cd "$srcdir/Python-$pkgver"
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--enable-shared \
 		--with-threads \
@@ -26,24 +28,27 @@ build() {
 }
 
 package() {
-	cd "$srcdir/Python-$pkgver"
+	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 	mv "$pkgdir"/usr/bin/2to3 "$pkgdir"/usr/bin/2to3-3.1
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-#_mv_files() {
-#	local i
-#	for i in "$@"; do
-#		mkdir -p "$subpkgdir"/${i%/*}
-#		mv -f "$pkgdir"/$i "$subpkgdir"/$i || return 1
-#	done
-#}
-#
-#tests() {
-#	pkgdesc="The test modules from the main python package"
-#	cd "$pkgdir"
-#	_mv_files $(find usr/lib -type d -name 'test*')
-#}
+_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
+}
+
+tests() {
+	pkgdesc="The test modules from the main python package"
+	arch="noarch"
+	cd "$pkgdir"
+	_mv_files
+}
 
-md5sums="ad5e5f1c07e829321e0a015f8cafe245  Python-3.1.3.tar.bz2"
+md5sums="92e94b5b6652b96349d6362b8337811d  Python-3.2.tar.bz2"
-- 
cgit v1.3