extra/python to 3.4.0-2

extra/python/PKGBUILD

@@ -1,6 +1,5 @@
 # $Id$
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
@@ -10,24 +9,28 @@
 #  - removed --with-valgrind from configure line
 
 pkgname=python
-pkgver=3.3.5
-pkgrel=1
-_pybasever=3.3
+pkgver=3.4.0
+pkgrel=2
+_pybasever=3.4
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.python.org/"
 depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
 makedepends=('tk>=8.6.0' 'sqlite' 'bluez-libs' 'mpdecimal')
-optdepends=('sqlite'
+optdepends=('python-setuptools'
+            'python-pip'
+            'sqlite'
             'mpdecimal: for decimal'
             'xz: for lzma'
             'tk: for tkinter')
 options=('!makeflags')
 provides=('python3')
 replaces=('python3')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('6683b26dd2cfd23af852abfcf1aedf25bbd44839')
+source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
+        python3.4-test_sqlite.patch::http://hg.python.org/cpython/raw-rev/4d626a9df062)
+sha1sums=('f54d7cf6af5dbd9bddbe31cf4772f39711381dbe'
+          'b13a0b728d8e1fe1d81dea501b064cb1032f183b')
 
 prepare() {
   cd "${srcdir}/Python-${pkgver}"
@@ -35,7 +38,10 @@ prepare() {
   # FS#23997
   sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
 
-  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
+  # http://bugs.python.org/issue20901
+  patch -p1 -i "$srcdir/python3.4-test_sqlite.patch"
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib, libffi, and libmpdec),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
   rm -r Modules/zlib
@@ -46,6 +52,7 @@ prepare() {
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
+  # Disable bundled pip & setuptools
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
@@ -54,7 +61,8 @@ build() {
               --with-system-expat \
               --with-dbmliborder=gdbm:ndbm \
               --with-system-ffi \
-              --with-system-libmpdec
+              --with-system-libmpdec \
+              --without-ensurepip
 
   make
 }