Fri Mar 28 03:32:00 UTC 2014

2 files changed, 19 insertions, 100 deletions

diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 9c8783dc4..9c658ee23 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,29 +1,32 @@
-# $Id: PKGBUILD 207597 2014-03-12 17:46:22Z fyan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Maintainer: Felix Yan <felixonmars@gmail.com>
+# $Id: PKGBUILD 208835 2014-03-27 14:43:22Z fyan $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 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' 'valgrind' '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}"
@@ -31,7 +34,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
@@ -42,6 +48,7 @@ prepare() {
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
+  # Disable bundled pip & setuptools
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
@@ -51,7 +58,8 @@ build() {
               --with-system-expat \
               --with-dbmliborder=gdbm:ndbm \
               --with-system-ffi \
-              --with-system-libmpdec
+              --with-system-libmpdec \
+              --without-ensurepip
 
   make
 }
diff --git a/extra/python/PKGBUILD.3.4 b/extra/python/PKGBUILD.3.4
deleted file mode 100644
index e3d66ee1f..000000000
--- a/extra/python/PKGBUILD.3.4
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 205852 2014-02-11 19:50:22Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=python
-pkgver=3.4.0rc2
-pkgrel=1
-_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' 'valgrind' 'bluez-libs')
-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=('f03216f4b537c284afacb1e8308a52b9a62368e9')
-
-prepare() {
-  cd "${srcdir}/Python-${pkgver}"
-
-  # 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, libffi, and libmpdec),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-  rm -r Modules/_decimal/libmpdec
-}
-
-build() {
-  cd "${srcdir}/Python-${pkgver}"
-
-  # Disable bundled pip & setuptools
-  ./configure --prefix=/usr \
-              --enable-shared \
-              --with-threads \
-              --with-computed-gotos \
-              --enable-ipv6 \
-              --with-valgrind \
-              --with-system-expat \
-              --with-dbmliborder=gdbm:ndbm \
-              --with-system-ffi \
-              --with-system-libmpdec \
-              --without-ensurepip
-
-  make
-}
-
-check() {
-  cd "${srcdir}/Python-${pkgver}"
-  LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging test_uuid
-}
-
-package() {
-  cd "${srcdir}/Python-${pkgver}"
-  make DESTDIR="${pkgdir}" install maninstall
-
-  # Why are these not done by default...
-  ln -sf python3               "${pkgdir}"/usr/bin/python
-  ln -sf python3-config        "${pkgdir}"/usr/bin/python-config
-  ln -sf idle3                 "${pkgdir}"/usr/bin/idle
-  ln -sf pydoc3                "${pkgdir}"/usr/bin/pydoc
-  ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python3.1
-  ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1
-
-  # Fix FS#22552
-  ln -sf ../../libpython${_pybasever}m.so \
-    "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so"
-
-  # Clean-up reference to build directory
-  sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile"
-
-  # License
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}