[arch-commits] Commit in python/trunk (PKGBUILD python-internal-expat.patch)

[Stéphane Gaudreault]

    Date: Sunday, February 20, 2011 @ 20:21:12
  Author: stephane
Revision: 110651

update to 3.2

Modified:
  python/trunk/PKGBUILD
Deleted:
  python/trunk/python-internal-expat.patch

-----------------------------+
 PKGBUILD                    |   58 ++++++++++++++++++------------------------
 python-internal-expat.patch |   33 -----------------------
 2 files changed, 25 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-21 01:06:01 UTC (rev 110650)
+++ PKGBUILD	2011-02-21 01:21:12 UTC (rev 110651)
@@ -1,77 +1,69 @@
 # $Id$
+# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
 # Maintainer: Allan McRae <allan at archlinux.org>
 # Contributer: Jason Chu <jason at archlinux.org>
 
 pkgname=python
-pkgver=3.1.3
-pkgrel=2
-_pybasever=3.1
+pkgver=3.2
+pkgrel=1
+_pybasever=3.2
 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' 'sqlite3')
+makedepends=('tk' 'sqlite3' 'valgrind')
 optdepends=('tk: for tkinter')
 provides=('python3')
 replaces=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
-        python-internal-expat.patch)
-md5sums=('ad5e5f1c07e829321e0a015f8cafe245'
-         '57fa26dd3353a697e8262d926aa035ad')
+source=(http://www.python.org/ftp/python/${_pybasever}/Python-${pkgver}.tar.xz)
+sha1sums=('55a3a9d39f31563370d0c494373bb6d38e4d1a00')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
   # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
   # rather than copies shipped in the tarball
-  patch -Np0 -i ../python-internal-expat.patch
   rm -r Modules/expat
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
 
-  export OPT="${CFLAGS}"
-  export CPPFLAGS+="`pkg-config --cflags-only-I libffi`"
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
               --with-computed-gotos \
               --enable-ipv6 \
+              --with-valgrind \
               --with-wide-unicode \
+              --with-system-expat \
               --with-system-ffi
 
   make
 
   # Run the upstream test suite
-  LD_LIBRARY_PATH=${srcdir}/Python-${pkgver}:${LD_LIBRARY_PATH} PYTHON=./python \
-     ./runtests.sh -x test_distutils
-  for testname in $(cat BAD); do
-     echo "== ${testname} =="
-     cat OUT/${testname}.out
-  done
+#  LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+#     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils
 }
 
 package() {
   cd "${srcdir}/Python-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  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
+  # 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"
 
-  # fix FS#22552
-  ln -sf ../../libpython${_pybasever}.so \
-    ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+  # Fix FS#22552
+  ln -sf ../../libpython${_pybasever}mu.so \
+    "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so"
 
-  # clean-up reference to build directory
-  sed -i "s#$srcdir/Python-${pkgver}:##" $pkgdir/usr/lib/python3.1/config/Makefile
+  # Clean-up reference to build directory
+  sed -i "s#$srcdir/Python-${pkgver}:##" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile"
 
-  # Fix conflicts with python2 - python2 version is newer...
-  rm ${pkgdir}/usr/bin/2to3
-
-  # license
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  # License
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: python-internal-expat.patch
===================================================================
--- python-internal-expat.patch	2011-02-21 01:06:01 UTC (rev 110650)
+++ python-internal-expat.patch	2011-02-21 01:21:12 UTC (rev 110651)
@@ -1,33 +0,0 @@
---- setup.py	2010-11-26 06:56:26.000000000 -0500
-+++ setup.py	2010-11-29 07:51:25.000000031 -0500
-@@ -1227,18 +1227,15 @@
-         #
-         # More information on Expat can be found at www.libexpat.org.
-         #
--        expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
--        define_macros = [
--            ('HAVE_EXPAT_CONFIG_H', '1'),
--        ]
-+        # Use system expat
-+        expatinc = '/usr/include'
-+        define_macros = []
- 
-         exts.append(Extension('pyexpat',
-                               define_macros = define_macros,
-                               include_dirs = [expatinc],
-+                              libraries = ['expat'],
-                               sources = ['pyexpat.c',
--                                         'expat/xmlparse.c',
--                                         'expat/xmlrole.c',
--                                         'expat/xmltok.c',
-                                          ],
-                               ))
- 
-@@ -1250,6 +1247,7 @@
-             exts.append(Extension('_elementtree',
-                                   define_macros = define_macros,
-                                   include_dirs = [expatinc],
-+                                  libraries = ['expat'],
-                                   sources = ['_elementtree.c'],
-                                   ))
-         else: