[arch-commits] Commit in python/trunk (PKGBUILD.3.4)

[Felix Yan]

    Date: Friday, March 7, 2014 @ 18:54:47
  Author: fyan
Revision: 207145

update 3.4 PKGBUILD, use --with-system-libmpdec and --without-ensurepip

Modified:
  python/trunk/PKGBUILD.3.4

--------------+
 PKGBUILD.3.4 |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

Modified: PKGBUILD.3.4
===================================================================
--- PKGBUILD.3.4	2014-03-07 17:07:29 UTC (rev 207144)
+++ PKGBUILD.3.4	2014-03-07 17:54:47 UTC (rev 207145)
@@ -12,14 +12,15 @@
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.python.org/"
-depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
+depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib' 'mpdecimal')
 makedepends=('tk>=8.6.0' 'sqlite' 'valgrind' 'bluez-libs')
-optdepends=('tk: for tkinter' 'sqlite')
+optdepends=('tk: for tkinter'
+            'python-setuptools'
+            'python-pip'
+            'sqlite')
 options=('!makeflags')
-# Should we provide setuptools & pip this way, or just remove them from python package and
-# keep them as seperated packages, for easier upgrades?
-provides=('python3' 'python-setuptools' 'python-pip')
-replaces=('python3' 'python-setuptools' 'python-pip')
+provides=('python3')
+replaces=('python3')
 source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
 sha1sums=('f03216f4b537c284afacb1e8308a52b9a62368e9')
 
@@ -29,17 +30,18 @@
   # 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
   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 \
@@ -48,7 +50,9 @@
               --with-valgrind \
               --with-system-expat \
               --with-dbmliborder=gdbm:ndbm \
-              --with-system-ffi
+              --with-system-ffi \
+              --with-system-libmpdec \
+              --without-ensurepip
 
   make
 }
@@ -68,8 +72,6 @@
   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 pip3                  "${pkgdir}"/usr/bin/pip
-  ln -sf easy_install-3.4      "${pkgdir}"/usr/bin/easy_install
   ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python3.1
   ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1