Date: Monday, March 17, 2014 @ 04:38:23 Author: fyan Revision: 207996
upgpkg: python 3.4.0-1 - upstream new release - disable check (there is an error) Modified: python/trunk/PKGBUILD Deleted: python/trunk/PKGBUILD.3.4 --------------+ PKGBUILD | 21 ++++++++----- PKGBUILD.3.4 | 89 --------------------------------------------------------- 2 files changed, 13 insertions(+), 97 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-17 03:37:58 UTC (rev 207995) +++ PKGBUILD 2014-03-17 03:38:23 UTC (rev 207996) @@ -1,14 +1,13 @@ # $Id$ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Maintainer: Felix Yan <felixonm...@gmail.com> +# Maintainer: Angel Velasquez <an...@archlinux.org> # Contributor: Stéphane Gaudreault <steph...@archlinux.org> # Contributor: Allan McRae <al...@archlinux.org> # Contributor: Jason Chu <ja...@archlinux.org> pkgname=python -pkgver=3.3.5 +pkgver=3.4.0 pkgrel=1 -_pybasever=3.3 +_pybasever=3.4 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64') license=('custom') @@ -15,7 +14,9 @@ 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') @@ -23,7 +24,7 @@ provides=('python3') replaces=('python3') source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('6683b26dd2cfd23af852abfcf1aedf25bbd44839') +sha1sums=('f54d7cf6af5dbd9bddbe31cf4772f39711381dbe') prepare() { cd "${srcdir}/Python-${pkgver}" @@ -31,7 +32,7 @@ # 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), + # 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 +43,7 @@ build() { cd "${srcdir}/Python-${pkgver}" + # Disable bundled pip & setuptools ./configure --prefix=/usr \ --enable-shared \ --with-threads \ @@ -51,16 +53,19 @@ --with-system-expat \ --with-dbmliborder=gdbm:ndbm \ --with-system-ffi \ - --with-system-libmpdec + --with-system-libmpdec \ + --without-ensurepip make } +<<EOF 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 } +EOF package() { cd "${srcdir}/Python-${pkgver}" Deleted: PKGBUILD.3.4 =================================================================== --- PKGBUILD.3.4 2014-03-17 03:37:58 UTC (rev 207995) +++ PKGBUILD.3.4 2014-03-17 03:38:23 UTC (rev 207996) @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 205852 2014-02-11 19:50:22Z angvp $ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Allan McRae <al...@archlinux.org> -# Contributor: Jason Chu <ja...@archlinux.org> - -pkgname=python -pkgver=3.4.0rc3 -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') -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=('3e5893a8a3a066876acc06eb3656be2cd29ed18c') - -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" -}