Thu May 22 04:02:47 UTC 2014

1 files changed, 21 insertions, 28 deletions

diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 56a86041f..4712a6cb9 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211814 2014-04-27 16:13:15Z fyan $
+# $Id: PKGBUILD 213366 2014-05-21 15:56:05Z fyan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
@@ -6,15 +6,16 @@
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
-pkgver=3.4.0
-pkgrel=3
+pkgver=3.4.1
+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' 'mpdecimal')
+makedepends=('tk' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal')
+checkdepends=('gdb')
 optdepends=('python-setuptools'
             'python-pip'
             'sqlite'
@@ -24,26 +25,15 @@ optdepends=('python-setuptools'
 options=('!makeflags')
 provides=('python3')
 replaces=('python3')
-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
-        issue21207.patch::http://hg.python.org/cpython/raw-rev/a66524ce9551)
-sha1sums=('f54d7cf6af5dbd9bddbe31cf4772f39711381dbe'
-          'b13a0b728d8e1fe1d81dea501b064cb1032f183b'
-          '67486ae413698d6bd3c32de10a9a1e885d0097b8')
+source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
+sha1sums=('143e098efe7ee7bec8a4904ec4b322f28a067a03')
 
 prepare() {
-  cd "${srcdir}/Python-${pkgver}"
+  cd Python-${pkgver}
 
   # FS#23997
   sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
 
-  # http://bugs.python.org/issue20901
-  patch -p1 -i "$srcdir/python3.4-test_sqlite.patch"
-
-  # http://bugs.python.org/issue21207 FS#40108
-  sed -i "62,74d" "$srcdir/issue21207.patch" # Remove conflicting NEWS part
-  patch -p1 -i "$srcdir/issue21207.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
@@ -53,7 +43,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/Python-${pkgver}"
+  cd Python-${pkgver}
 
   # Disable bundled pip & setuptools
   ./configure --prefix=/usr \
@@ -72,22 +62,25 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/Python-${pkgver}"
+  # test_site: http://bugs.python.org/issue21535
+  # test_urllib2_localnet: domain "blackhole.snakebite.net" not exist ?!
+
+  cd 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
+  TERM=screen \
+     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -uall -x test_posixpath test_uuid test_site test_urllib2_localnet
 }
 
 package() {
-  cd "${srcdir}/Python-${pkgver}"
+  cd 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
+  ln -s python3               "${pkgdir}"/usr/bin/python
+  ln -s python3-config        "${pkgdir}"/usr/bin/python-config
+  ln -s idle3                 "${pkgdir}"/usr/bin/idle
+  ln -s pydoc3                "${pkgdir}"/usr/bin/pydoc
+  ln -s python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1
 
   # Fix FS#22552
   ln -sf ../../libpython${_pybasever}m.so \