[arch-commits] Commit in python2/repos (6 files)

[Pierre Schmitz]

Date: Saturday, February 11, 2017 @ 11:46:59
  Author: pierre
Revision: 288656

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  python2/repos/staging-i686/
  python2/repos/staging-i686/PKGBUILD
(from rev 288655, python2/trunk/PKGBUILD)
  python2/repos/staging-i686/descr_ref.patch
(from rev 288655, python2/trunk/descr_ref.patch)
  python2/repos/staging-x86_64/
  python2/repos/staging-x86_64/PKGBUILD
(from rev 288655, python2/trunk/PKGBUILD)
  python2/repos/staging-x86_64/descr_ref.patch
(from rev 288655, python2/trunk/descr_ref.patch)

+
 staging-i686/PKGBUILD  |  122 +++
 staging-i686/descr_ref.patch   |   58 ++
 staging-x86_64/PKGBUILD|  122 +++
 staging-x86_64/descr_ref.patch |   58 ++
 4 files changed, 360 insertions(+)

Copied: python2/repos/staging-i686/PKGBUILD (from rev 288655, 
python2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2017-02-11 11:46:59 UTC (rev 288656)
@@ -0,0 +1,122 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Stéphane Gaudreault 
+# Contributor: Allan McRae 
+# Contributor: Jason Chu 
+
+pkgname=python2
+pkgver=2.7.13
+pkgrel=2
+_pybasever=2.7
+pkgdesc="A high-level scripting language"
+arch=('i686' 'x86_64')
+license=('PSF')
+url="http://www.python.org/;
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+makedepends=('tk' 'bluez-libs' 'hardening-wrapper')
+checkdepends=('gdb' 'file' 'xorg-server-xvfb')
+optdepends=('tk: for IDLE'
+'python2-setuptools'
+'python2-pip')
+conflicts=('python<3')
+source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
+descr_ref.patch)
+sha1sums=('18a8f30a0356c751b8d0ea6f76e764cab13ee046'
+  'SKIP'
+  '8cc6ac63e909063eb16bbdabc0f0eac7d24ff0c1')
+validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson
+
+prepare() {
+  cd Python-${pkgver}
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+
+  # Enable built-in SQLite module to load extensions (fix FS#22122)
+  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
+  # FS#23997
+  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+
+  sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
+Lib/distutils/tests/test_install_scripts.py
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+
+  # clean up #!s
+  find . -name '*.py' | \
+xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+  # Workaround asdl_c.py/makeopcodetargets.py errors after we touched the 
shebangs
+  touch Include/Python-ast.h Python/Python-ast.c Python/opcode_targets.h
+
+  # FS#48761
+  # http://bugs.python.org/issue25750
+  patch -p1 -i ../descr_ref.patch
+}
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  export OPT="${CFLAGS}"
+  ./configure --prefix=/usr \
+  --enable-shared \
+  --with-threads \
+  --enable-ipv6 \
+  --enable-unicode=ucs4 \
+  --with-system-expat \
+  --with-system-ffi \
+  --with-dbmliborder=gdbm:ndbm \
+  --without-ensurepip
+
+  make
+}
+
+check() {
+  # Since 2.7.13,
+  # test_replace_overflow (present in test_bytes, test_str, test_string, 
test_unicode, test_userstring) segfault on i686
+  # test_bigrepeat (present in test_tuple) segfault on i686
+
+  cd Python-${pkgver}
+  LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_bytes test_str test_string test_tuple test_unicode test_userstring
+}
+
+package() {
+  cd Python-${pkgver}
+  make DESTDIR="${pkgdir}" altinstall maninstall
+
+  rm "${pkgdir}"/usr/share/man/man1/python.1
+
+  ln -sf python${_pybasever}"${pkgdir}"/usr/bin/python2
+  ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config
+  ln -sf python${_pybasever}.1  "${pkgdir}"/usr/share/man/man1/python2.1
+
+  # FS#33954
+  ln -sf python-${_pybasever}.pc"${pkgdir}"/usr/lib/pkgconfig/python2.pc
+
+  ln -sf ../../libpython${_pybasever}.so 
"${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+
+  mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/
+
+  # some useful "stuff"
+  install -dm755 

[arch-commits] Commit in python2/repos (6 files)

[Felix Yan]

Date: Wednesday, December 21, 2016 @ 07:33:11
  Author: felixonmars
Revision: 284367

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  python2/repos/testing-i686/
  python2/repos/testing-i686/PKGBUILD
(from rev 284366, python2/trunk/PKGBUILD)
  python2/repos/testing-i686/descr_ref.patch
(from rev 284366, python2/trunk/descr_ref.patch)
  python2/repos/testing-x86_64/
  python2/repos/testing-x86_64/PKGBUILD
(from rev 284366, python2/trunk/PKGBUILD)
  python2/repos/testing-x86_64/descr_ref.patch
(from rev 284366, python2/trunk/descr_ref.patch)

+
 testing-i686/PKGBUILD  |  122 +++
 testing-i686/descr_ref.patch   |   58 ++
 testing-x86_64/PKGBUILD|  122 +++
 testing-x86_64/descr_ref.patch |   58 ++
 4 files changed, 360 insertions(+)

Copied: python2/repos/testing-i686/PKGBUILD (from rev 284366, 
python2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-12-21 07:33:11 UTC (rev 284367)
@@ -0,0 +1,122 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Stéphane Gaudreault 
+# Contributor: Allan McRae 
+# Contributor: Jason Chu 
+
+pkgname=python2
+pkgver=2.7.13
+pkgrel=1
+_pybasever=2.7
+pkgdesc="A high-level scripting language"
+arch=('i686' 'x86_64')
+license=('PSF')
+url="http://www.python.org/;
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+makedepends=('tk' 'bluez-libs' 'hardening-wrapper')
+checkdepends=('gdb' 'file' 'xorg-server-xvfb')
+optdepends=('tk: for IDLE'
+'python2-setuptools'
+'python2-pip')
+conflicts=('python<3')
+source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
+descr_ref.patch)
+sha1sums=('18a8f30a0356c751b8d0ea6f76e764cab13ee046'
+  'SKIP'
+  '8cc6ac63e909063eb16bbdabc0f0eac7d24ff0c1')
+validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson
+
+prepare() {
+  cd Python-${pkgver}
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+
+  # Enable built-in SQLite module to load extensions (fix FS#22122)
+  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
+  # FS#23997
+  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+
+  sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
+Lib/distutils/tests/test_install_scripts.py
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+
+  # clean up #!s
+  find . -name '*.py' | \
+xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+  # Workaround asdl_c.py/makeopcodetargets.py errors after we touched the 
shebangs
+  touch Include/Python-ast.h Python/Python-ast.c Python/opcode_targets.h
+
+  # FS#48761
+  # http://bugs.python.org/issue25750
+  patch -p1 -i ../descr_ref.patch
+}
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  export OPT="${CFLAGS}"
+  ./configure --prefix=/usr \
+  --enable-shared \
+  --with-threads \
+  --enable-ipv6 \
+  --enable-unicode=ucs4 \
+  --with-system-expat \
+  --with-system-ffi \
+  --with-dbmliborder=gdbm:ndbm \
+  --without-ensurepip
+
+  make
+}
+
+check() {
+  # Since 2.7.13,
+  # test_replace_overflow (present in test_bytes, test_str, test_string, 
test_unicode, test_userstring) segfault on i686
+  # test_bigrepeat (present in test_tuple) segfault on i686
+
+  cd Python-${pkgver}
+  LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_bytes test_str test_string test_tuple test_unicode test_userstring
+}
+
+package() {
+  cd Python-${pkgver}
+  make DESTDIR="${pkgdir}" altinstall maninstall
+
+  rm "${pkgdir}"/usr/share/man/man1/python.1
+
+  ln -sf python${_pybasever}"${pkgdir}"/usr/bin/python2
+  ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config
+  ln -sf python${_pybasever}.1  "${pkgdir}"/usr/share/man/man1/python2.1
+
+  # FS#33954
+  ln -sf python-${_pybasever}.pc"${pkgdir}"/usr/lib/pkgconfig/python2.pc
+
+  ln -sf ../../libpython${_pybasever}.so 
"${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+
+  mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/
+
+  # some useful "stuff"
+  install -dm755 

[arch-commits] Commit in python2/repos (6 files)

[Bartłomiej Piotrowski]

Date: Monday, November 7, 2016 @ 11:04:46
  Author: bpiotrowski
Revision: 280027

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  python2/repos/staging-i686/
  python2/repos/staging-i686/PKGBUILD
(from rev 280026, python2/trunk/PKGBUILD)
  python2/repos/staging-i686/descr_ref.patch
(from rev 280026, python2/trunk/descr_ref.patch)
  python2/repos/staging-x86_64/
  python2/repos/staging-x86_64/PKGBUILD
(from rev 280026, python2/trunk/PKGBUILD)
  python2/repos/staging-x86_64/descr_ref.patch
(from rev 280026, python2/trunk/descr_ref.patch)

+
 staging-i686/PKGBUILD  |  129 +++
 staging-i686/descr_ref.patch   |   58 +
 staging-x86_64/PKGBUILD|  129 +++
 staging-x86_64/descr_ref.patch |   58 +
 4 files changed, 374 insertions(+)

Copied: python2/repos/staging-i686/PKGBUILD (from rev 280026, 
python2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2016-11-07 11:04:46 UTC (rev 280027)
@@ -0,0 +1,129 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Stéphane Gaudreault 
+# Contributor: Allan McRae 
+# Contributor: Jason Chu 
+
+pkgname=python2
+pkgver=2.7.12
+pkgrel=2
+_pybasever=2.7
+pkgdesc="A high-level scripting language"
+arch=('i686' 'x86_64')
+license=('PSF')
+url="http://www.python.org/;
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+makedepends=('tk' 'bluez-libs' 'hardening-wrapper')
+checkdepends=('gdb' 'file')
+optdepends=('tk: for IDLE'
+'python2-setuptools'
+'python2-pip')
+conflicts=('python<3')
+source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
+descr_ref.patch)
+sha1sums=('05360b8ade117b35e266b2004a7f1f11250c6dcd'
+  'SKIP'
+  '8cc6ac63e909063eb16bbdabc0f0eac7d24ff0c1')
+validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson
+
+prepare() {
+  cd Python-${pkgver}
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+
+  # Enable built-in SQLite module to load extensions (fix FS#22122)
+  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
+  # FS#23997
+  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+
+  sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
+Lib/distutils/tests/test_install_scripts.py
+
+  # TODO: Still not passed
+  # Silent test_gdb failures on 'no symbol table loaded'.
+  #sed -i '/ignore_patterns = (/a "No symbol table is loaded.  Use the 
\\"file\\" command.",' \
+  #  Lib/test/test_gdb.py
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+
+  # clean up #!s
+  find . -name '*.py' | \
+xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+  # Workaround asdl_c.py/makeopcodetargets.py errors after we touched the 
shebangs
+  touch Include/Python-ast.h Python/Python-ast.c Python/opcode_targets.h
+
+  # FS#48761
+  # http://bugs.python.org/issue25750
+  patch -p1 -i ../descr_ref.patch
+}
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  export OPT="${CFLAGS}"
+  ./configure --prefix=/usr \
+  --enable-shared \
+  --with-threads \
+  --enable-ipv6 \
+  --enable-unicode=ucs4 \
+  --with-system-expat \
+  --with-system-ffi \
+  --with-dbmliborder=gdbm:ndbm \
+  --without-ensurepip
+
+  make
+}
+
+check() {
+  # As of 2.7.12, 1 test failed:
+  # test_gdb
+  # Besides, test_thread disabled as it will stuck
+  
+  # $SHELL was set to avoid a test failure in test_gdb (it still fails due to 
other reasons, though)
+
+  cd Python-${pkgver}
+  SHELL=/bin/sh 
LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+"${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_thread || warning "Tests failed"
+}
+
+package() {
+  cd Python-${pkgver}
+  make DESTDIR="${pkgdir}" altinstall maninstall
+
+  rm "${pkgdir}"/usr/share/man/man1/python.1
+
+  ln -sf python${_pybasever}"${pkgdir}"/usr/bin/python2
+  ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config
+  ln -sf python${_pybasever}.1  "${pkgdir}"/usr/share/man/man1/python2.1
+
+  # FS#33954
+  ln -sf python-${_pybasever}.pc"${pkgdir}"/usr/lib/pkgconfig/python2.pc
+
+  ln -sf ../../libpython${_pybasever}.so 

[arch-commits] Commit in python2/repos (6 files)

[Felix Yan]

Date: Tuesday, June 28, 2016 @ 08:45:16
  Author: felixonmars
Revision: 270753

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  python2/repos/testing-i686/
  python2/repos/testing-i686/PKGBUILD
(from rev 270752, python2/trunk/PKGBUILD)
  python2/repos/testing-i686/descr_ref.patch
(from rev 270752, python2/trunk/descr_ref.patch)
  python2/repos/testing-x86_64/
  python2/repos/testing-x86_64/PKGBUILD
(from rev 270752, python2/trunk/PKGBUILD)
  python2/repos/testing-x86_64/descr_ref.patch
(from rev 270752, python2/trunk/descr_ref.patch)

+
 testing-i686/PKGBUILD  |  127 +++
 testing-i686/descr_ref.patch   |   58 +
 testing-x86_64/PKGBUILD|  127 +++
 testing-x86_64/descr_ref.patch |   58 +
 4 files changed, 370 insertions(+)

Copied: python2/repos/testing-i686/PKGBUILD (from rev 270752, 
python2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-06-28 08:45:16 UTC (rev 270753)
@@ -0,0 +1,127 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Stéphane Gaudreault 
+# Contributor: Allan McRae 
+# Contributor: Jason Chu 
+
+pkgname=python2
+pkgver=2.7.12
+pkgrel=1
+_pybasever=2.7
+pkgdesc="A high-level scripting language"
+arch=('i686' 'x86_64')
+license=('PSF')
+url="http://www.python.org/;
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+makedepends=('tk' 'bluez-libs' 'hardening-wrapper')
+checkdepends=('gdb' 'file')
+optdepends=('tk: for IDLE'
+'python2-setuptools'
+'python2-pip')
+conflicts=('python<3')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+descr_ref.patch)
+sha1sums=('05360b8ade117b35e266b2004a7f1f11250c6dcd'
+  '8cc6ac63e909063eb16bbdabc0f0eac7d24ff0c1')
+
+prepare() {
+  cd Python-${pkgver}
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+
+  # Enable built-in SQLite module to load extensions (fix FS#22122)
+  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
+  # FS#23997
+  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+
+  sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
+Lib/distutils/tests/test_install_scripts.py
+
+  # TODO: Still not passed
+  # Silent test_gdb failures on 'no symbol table loaded'.
+  #sed -i '/ignore_patterns = (/a "No symbol table is loaded.  Use the 
\\"file\\" command.",' \
+  #  Lib/test/test_gdb.py
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+
+  # clean up #!s
+  find . -name '*.py' | \
+xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+  # Workaround asdl_c.py/makeopcodetargets.py errors after we touched the 
shebangs
+  touch Include/Python-ast.h Python/Python-ast.c Python/opcode_targets.h
+
+  # FS#48761
+  # http://bugs.python.org/issue25750
+  patch -p1 -i ../descr_ref.patch
+}
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  export OPT="${CFLAGS}"
+  ./configure --prefix=/usr \
+  --enable-shared \
+  --with-threads \
+  --enable-ipv6 \
+  --enable-unicode=ucs4 \
+  --with-system-expat \
+  --with-system-ffi \
+  --with-dbmliborder=gdbm:ndbm \
+  --without-ensurepip
+
+  make
+}
+
+check() {
+  # As of 2.7.12, 1 test failed:
+  # test_gdb
+  # Besides, test_thread disabled as it will stuck
+  
+  # $SHELL was set to avoid a test failure in test_gdb (it still fails due to 
other reasons, though)
+
+  cd Python-${pkgver}
+  SHELL=/bin/sh 
LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+"${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_thread || warning "Tests failed"
+}
+
+package() {
+  cd Python-${pkgver}
+  make DESTDIR="${pkgdir}" altinstall maninstall
+
+  rm "${pkgdir}"/usr/share/man/man1/python.1
+
+  ln -sf python${_pybasever}"${pkgdir}"/usr/bin/python2
+  ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config
+  ln -sf python${_pybasever}.1  "${pkgdir}"/usr/share/man/man1/python2.1
+
+  # FS#33954
+  ln -sf python-${_pybasever}.pc"${pkgdir}"/usr/lib/pkgconfig/python2.pc
+
+  ln -sf ../../libpython${_pybasever}.so 
"${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+
+  mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/
+
+  # some useful 

[arch-commits] Commit in python2/repos (6 files)

[Felix Yan]

Date: Thursday, March 31, 2016 @ 08:43:46
  Author: fyan
Revision: 263482

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  python2/repos/extra-i686/PKGBUILD
(from rev 263481, python2/trunk/PKGBUILD)
  python2/repos/extra-i686/descr_ref.patch
(from rev 263481, python2/trunk/descr_ref.patch)
  python2/repos/extra-x86_64/PKGBUILD
(from rev 263481, python2/trunk/PKGBUILD)
  python2/repos/extra-x86_64/descr_ref.patch
(from rev 263481, python2/trunk/descr_ref.patch)
Deleted:
  python2/repos/extra-i686/PKGBUILD
  python2/repos/extra-x86_64/PKGBUILD

--+
 /PKGBUILD|  254 +
 extra-i686/PKGBUILD  |  121 ---
 extra-i686/descr_ref.patch   |   58 +
 extra-x86_64/PKGBUILD|  121 ---
 extra-x86_64/descr_ref.patch |   58 +
 5 files changed, 370 insertions(+), 242 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-03-31 06:43:03 UTC (rev 263481)
+++ extra-i686/PKGBUILD 2016-03-31 06:43:46 UTC (rev 263482)
@@ -1,121 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan 
-# Contributor: Stéphane Gaudreault 
-# Contributor: Allan McRae 
-# Contributor: Jason Chu 
-
-pkgname=python2
-pkgver=2.7.11
-pkgrel=2
-_pybasever=2.7
-pkgdesc="A high-level scripting language"
-arch=('i686' 'x86_64')
-license=('PSF')
-url="http://www.python.org/;
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk' 'bluez-libs' 'hardening-wrapper')
-checkdepends=('gdb' 'file')
-optdepends=('tk: for IDLE'
-'python2-setuptools'
-'python2-pip')
-conflicts=('python<3')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff')
-
-prepare() {
-  cd Python-${pkgver}
-
-  # Temporary workaround for FS#22322
-  # See http://bugs.python.org/issue10835 for upstream report
-  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
-
-  # Enable built-in SQLite module to load extensions (fix FS#22122)
-  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
-
-  # FS#23997
-  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
-
-  sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
-Lib/distutils/tests/test_install_scripts.py
-
-  # TODO: Still not passed
-  # Silent test_gdb failures on 'no symbol table loaded'.
-  #sed -i '/ignore_patterns = (/a "No symbol table is loaded.  Use the 
\\"file\\" command.",' \
-  #  Lib/test/test_gdb.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  # clean up #!s
-  find . -name '*.py' | \
-xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  # Workaround asdl_c.py/makeopcodetargets.py errors after we touched the 
shebangs
-  touch Include/Python-ast.h Python/Python-ast.c Python/opcode_targets.h
-}
-
-build() {
-  cd "${srcdir}/Python-${pkgver}"
-
-  export OPT="${CFLAGS}"
-  ./configure --prefix=/usr \
-  --enable-shared \
-  --with-threads \
-  --enable-ipv6 \
-  --enable-unicode=ucs4 \
-  --with-system-expat \
-  --with-system-ffi \
-  --with-dbmliborder=gdbm:ndbm \
-  --without-ensurepip
-
-  make
-}
-
-check() {
-  # As of 2.7.11, 2 tests failed:
-  # test_doctest test_gdb
-  # Besides, test_thread disabled as it will stuck
-  
-  # $SHELL was set to avoid a test failure in test_gdb (it still fails due to 
other reasons, though)
-
-  cd Python-${pkgver}
-  SHELL=/bin/sh 
LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-"${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_thread || warning "Tests failed"
-}
-
-package() {
-  cd Python-${pkgver}
-  make DESTDIR="${pkgdir}" altinstall maninstall
-
-  rm "${pkgdir}"/usr/share/man/man1/python.1
-
-  ln -sf python${_pybasever}"${pkgdir}"/usr/bin/python2
-  ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config
-  ln -sf python${_pybasever}.1  "${pkgdir}"/usr/share/man/man1/python2.1
-
-  # FS#33954
-  ln -sf python-${_pybasever}.pc"${pkgdir}"/usr/lib/pkgconfig/python2.pc
-
-  ln -sf ../../libpython${_pybasever}.so 
"${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
-
-  mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/
-
-  # some useful "stuff"
-  install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
-  install -m755 Tools/i18n/{msgfmt,pygettext}.py 
"${pkgdir}"/usr/lib/python${_pybasever}/Tools/i18n/
-  

[arch-commits] Commit in python2/repos (6 files)

[Bartłomiej Piotrowski]

Date: Friday, September 6, 2013 @ 10:06:17
  Author: bpiotrowski
Revision: 193929

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  python2/repos/extra-i686/PKGBUILD
(from rev 193928, python2/trunk/PKGBUILD)
  python2/repos/extra-i686/python-2.7.5-CVE-2013-4238.patch
(from rev 193928, python2/trunk/python-2.7.5-CVE-2013-4238.patch)
  python2/repos/extra-x86_64/PKGBUILD
(from rev 193928, python2/trunk/PKGBUILD)
  python2/repos/extra-x86_64/python-2.7.5-CVE-2013-4238.patch
(from rev 193928, python2/trunk/python-2.7.5-CVE-2013-4238.patch)
Deleted:
  python2/repos/extra-i686/PKGBUILD
  python2/repos/extra-x86_64/PKGBUILD

---+
 /PKGBUILD |  194 +
 extra-i686/PKGBUILD   |   88 ---
 extra-i686/python-2.7.5-CVE-2013-4238.patch   |  267 
 extra-x86_64/PKGBUILD |   88 ---
 extra-x86_64/python-2.7.5-CVE-2013-4238.patch |  267 
 5 files changed, 728 insertions(+), 176 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-09-06 08:06:06 UTC (rev 193928)
+++ extra-i686/PKGBUILD 2013-09-06 08:06:17 UTC (rev 193929)
@@ -1,88 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributer: Allan McRae al...@archlinux.org
-# Contributer: Jason Chu ja...@archlinux.org
-
-pkgname=python2
-pkgver=2.7.5
-pkgrel=1
-_pybasever=2.7
-pkgdesc=A high-level scripting language
-arch=('i686' 'x86_64')
-license=('PSF')
-url=http://www.python.org/;
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk=8.6.0' 'bluez')
-optdepends=('tk: for IDLE')
-conflicts=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf')
-
-build() {
-  cd ${srcdir}/Python-${pkgver}
-
-  # Temporary workaround for FS#22322
-  # See http://bugs.python.org/issue10835 for upstream report
-  sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
-
-  # Enable built-in SQLite module to load extensions (fix FS#22122)
-  sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
-
-  # FS#23997
-  sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
-
-  sed -i s/python2.3/python2/g Lib/distutils/tests/test_build_scripts.py \
- Lib/distutils/tests/test_install_scripts.py Tools/scripts/gprof2html.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  export OPT=${CFLAGS}
-  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
-  --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
-  --with-dbmliborder=gdbm:ndbm
-
-  make
-}
-
-package() {
-  cd ${srcdir}/Python-${pkgver}
-  make DESTDIR=${pkgdir} altinstall maninstall
-
-  rm ${pkgdir}/usr/share/man/man1/python.1
-
-  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
-  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
-  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
-
-  # FS#33954
-  ln -sf python-${_pybasever}.pc${pkgdir}/usr/lib/pkgconfig/python2.pc
-
-  ln -sf ../../libpython${_pybasever}.so 
${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
-
-  mv ${pkgdir}/usr/bin/smtpd.py ${pkgdir}/usr/lib/python${_pybasever}/
-
-  # some useful stuff
-  install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
-  install -m755 Tools/i18n/{msgfmt,pygettext}.py 
${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
-  install -m755 Tools/scripts/{README,*py} 
${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
-
-  # fix conflicts with python
-  mv ${pkgdir}/usr/bin/idle{,2}
-  mv ${pkgdir}/usr/bin/pydoc{,2}
-  mv ${pkgdir}/usr/bin/2to3{,-2.7}
-
-  # clean up #!s
-  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
-xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
-
-  # clean-up reference to build directory
-  sed -i s#${srcdir}/Python-${pkgver}:## 
${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
-
-  # license
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: python2/repos/extra-i686/PKGBUILD (from rev 193928, 
python2/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-09-06 08:06:17 UTC (rev 193929)
@@ -0,0 +1,97 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributer: Allan McRae al...@archlinux.org
+# Contributer: Jason Chu ja...@archlinux.org
+
+pkgname=python2
+pkgver=2.7.5

[arch-commits] Commit in python2/repos (6 files)

[Stéphane Gaudreault]

Date: Friday, May 17, 2013 @ 13:13:51
  Author: stephane
Revision: 185697

db-move: moved python2 from [testing] to [extra] (i686, x86_64)

Added:
  python2/repos/extra-i686/PKGBUILD
(from rev 185696, python2/repos/testing-i686/PKGBUILD)
  python2/repos/extra-x86_64/PKGBUILD
(from rev 185696, python2/repos/testing-x86_64/PKGBUILD)
Deleted:
  python2/repos/extra-i686/PKGBUILD
  python2/repos/extra-x86_64/PKGBUILD
  python2/repos/testing-i686/
  python2/repos/testing-x86_64/

---+
 /PKGBUILD |  176 
 extra-i686/PKGBUILD   |   88 
 extra-x86_64/PKGBUILD |   88 
 3 files changed, 176 insertions(+), 176 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-05-17 11:13:34 UTC (rev 185696)
+++ extra-i686/PKGBUILD 2013-05-17 11:13:51 UTC (rev 185697)
@@ -1,88 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributer: Allan McRae al...@archlinux.org
-# Contributer: Jason Chu ja...@archlinux.org
-
-pkgname=python2
-pkgver=2.7.4
-pkgrel=1
-_pybasever=2.7
-pkgdesc=A high-level scripting language
-arch=('i686' 'x86_64')
-license=('PSF')
-url=http://www.python.org/;
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk=8.6.0' 'bluez')
-optdepends=('tk: for IDLE')
-conflicts=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e')
-
-build() {
-  cd ${srcdir}/Python-${pkgver}
-
-  # Temporary workaround for FS#22322
-  # See http://bugs.python.org/issue10835 for upstream report
-  sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
-
-  # Enable built-in SQLite module to load extensions (fix FS#22122)
-  sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
-
-  # FS#23997
-  sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
-
-  sed -i s/python2.3/python2/g Lib/distutils/tests/test_build_scripts.py \
- Lib/distutils/tests/test_install_scripts.py Tools/scripts/gprof2html.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  export OPT=${CFLAGS}
-  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
-  --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
-  --with-dbmliborder=gdbm:ndbm
-
-  make
-}
-
-package() {
-  cd ${srcdir}/Python-${pkgver}
-  make DESTDIR=${pkgdir} altinstall maninstall
-
-  rm ${pkgdir}/usr/share/man/man1/python.1
-
-  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
-  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
-  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
-
-  # FS#33954
-  ln -sf python-${_pybasever}.pc${pkgdir}/usr/lib/pkgconfig/python2.pc
-
-  ln -sf ../../libpython${_pybasever}.so 
${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
-
-  mv ${pkgdir}/usr/bin/smtpd.py ${pkgdir}/usr/lib/python${_pybasever}/
-
-  # some useful stuff
-  install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
-  install -m755 Tools/i18n/{msgfmt,pygettext}.py 
${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
-  install -m755 Tools/scripts/{README,*py} 
${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
-
-  # fix conflicts with python
-  mv ${pkgdir}/usr/bin/idle{,2}
-  mv ${pkgdir}/usr/bin/pydoc{,2}
-  mv ${pkgdir}/usr/bin/2to3{,-2.7}
-
-  # clean up #!s
-  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
-xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
-
-  # clean-up reference to build directory
-  sed -i s#${srcdir}/Python-${pkgver}:## 
${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
-
-  # license
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: python2/repos/extra-i686/PKGBUILD (from rev 185696, 
python2/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-05-17 11:13:51 UTC (rev 185697)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributer: Allan McRae al...@archlinux.org
+# Contributer: Jason Chu ja...@archlinux.org
+
+pkgname=python2
+pkgver=2.7.5
+pkgrel=1
+_pybasever=2.7
+pkgdesc=A high-level scripting language
+arch=('i686' 'x86_64')
+license=('PSF')
+url=http://www.python.org/;
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+makedepends=('tk=8.6.0' 'bluez')
+optdepends=('tk: for IDLE')
+conflicts=('python3')
+options=('!makeflags')

[arch-commits] Commit in python2/repos (6 files)

[Stéphane Gaudreault]

Date: Monday, April 8, 2013 @ 12:27:26
  Author: stephane
Revision: 182151

db-move: moved python2 from [testing] to [extra] (i686, x86_64)

Added:
  python2/repos/extra-i686/PKGBUILD
(from rev 182149, python2/repos/testing-i686/PKGBUILD)
  python2/repos/extra-x86_64/PKGBUILD
(from rev 182149, python2/repos/testing-x86_64/PKGBUILD)
Deleted:
  python2/repos/extra-i686/PKGBUILD
  python2/repos/extra-x86_64/PKGBUILD
  python2/repos/testing-i686/
  python2/repos/testing-x86_64/

---+
 /PKGBUILD |  176 
 extra-i686/PKGBUILD   |   84 --
 extra-x86_64/PKGBUILD |   84 --
 3 files changed, 176 insertions(+), 168 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-04-08 10:27:25 UTC (rev 182150)
+++ extra-i686/PKGBUILD 2013-04-08 10:27:26 UTC (rev 182151)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributer: Allan McRae al...@archlinux.org
-# Contributer: Jason Chu ja...@archlinux.org
-
-pkgname=python2
-pkgver=2.7.3
-pkgrel=4
-_pybasever=2.7
-pkgdesc=A high-level scripting language
-arch=('i686' 'x86_64')
-license=('PSF')
-url=http://www.python.org/;
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk=8.6.0' 'bluez')
-optdepends=('tk: for IDLE')
-conflicts=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
-
-build() {
-  cd ${srcdir}/Python-${pkgver}
-
-  # Temporary workaround for FS#22322
-  # See http://bugs.python.org/issue10835 for upstream report
-  sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
-
-  # Enable built-in SQLite module to load extensions (fix FS#22122)
-  sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
-
-  # FS#23997
-  sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  export OPT=${CFLAGS}
-  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
-  --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
-  --with-dbmliborder=gdbm:ndbm
-
-  make
-}
-
-package() {
-  cd ${srcdir}/Python-${pkgver}
-  make DESTDIR=${pkgdir} altinstall maninstall
-
-  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
-  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
-  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
-
-  ln -sf ../../libpython${_pybasever}.so \
-${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
-
-  mv ${pkgdir}/usr/bin/smtpd.py ${pkgdir}/usr/lib/python${_pybasever}/
-
-  # some useful stuff
-  install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
-  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
-${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
-  install -m755 Tools/scripts/{README,*py} \
-${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
-
-  # fix conflicts with python
-  mv ${pkgdir}/usr/bin/idle{,2}
-  mv ${pkgdir}/usr/bin/pydoc{,2}
-  mv ${pkgdir}/usr/bin/2to3{,-2.7}
-
-  # clean up #!s
-  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
-xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
-
-  # clean-up reference to build directory
-  sed -i s#${srcdir}/Python-${pkgver}:## \
-${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
-
-  # license
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: python2/repos/extra-i686/PKGBUILD (from rev 182149, 
python2/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-04-08 10:27:26 UTC (rev 182151)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributer: Allan McRae al...@archlinux.org
+# Contributer: Jason Chu ja...@archlinux.org
+
+pkgname=python2
+pkgver=2.7.4
+pkgrel=1
+_pybasever=2.7
+pkgdesc=A high-level scripting language
+arch=('i686' 'x86_64')
+license=('PSF')
+url=http://www.python.org/;
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+makedepends=('tk=8.6.0' 'bluez')
+optdepends=('tk: for IDLE')
+conflicts=('python3')
+options=('!makeflags')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e')
+
+build() {
+  cd ${srcdir}/Python-${pkgver}
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i 

[arch-commits] Commit in python2/repos (6 files)

[Evangelos Foutras]

Date: Monday, December 24, 2012 @ 19:34:35
  Author: foutrelis
Revision: 173846

db-move: moved python2 from [testing] to [extra] (i686, x86_64)

Added:
  python2/repos/extra-i686/PKGBUILD
(from rev 173837, python2/repos/testing-i686/PKGBUILD)
  python2/repos/extra-x86_64/PKGBUILD
(from rev 173837, python2/repos/testing-x86_64/PKGBUILD)
Deleted:
  python2/repos/extra-i686/PKGBUILD
  python2/repos/extra-x86_64/PKGBUILD
  python2/repos/testing-i686/
  python2/repos/testing-x86_64/

---+
 extra-i686/PKGBUILD   |  168 
 extra-x86_64/PKGBUILD |  168 
 2 files changed, 168 insertions(+), 168 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-12-25 00:34:33 UTC (rev 173845)
+++ extra-i686/PKGBUILD 2012-12-25 00:34:35 UTC (rev 173846)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributer: Allan McRae al...@archlinux.org
-# Contributer: Jason Chu ja...@archlinux.org
-
-pkgname=python2
-pkgver=2.7.3
-pkgrel=3
-_pybasever=2.7
-pkgdesc=A high-level scripting language
-arch=('i686' 'x86_64')
-license=('PSF')
-url=http://www.python.org/;
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk' 'bluez')
-optdepends=('tk: for IDLE')
-conflicts=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
-
-build() {
-  cd ${srcdir}/Python-${pkgver}
-
-  # Temporary workaround for FS#22322
-  # See http://bugs.python.org/issue10835 for upstream report
-  sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
-
-  # Enable built-in SQLite module to load extensions (fix FS#22122)
-  sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
-
-  # FS#23997
-  sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  export OPT=${CFLAGS}
-  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
-  --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
-  --with-dbmliborder=gdbm:ndbm
-
-  make
-}
-
-package() {
-  cd ${srcdir}/Python-${pkgver}
-  make DESTDIR=${pkgdir} altinstall maninstall
-
-  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
-  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
-  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
-
-  ln -sf ../../libpython${_pybasever}.so \
-${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
-
-  mv ${pkgdir}/usr/bin/smtpd.py ${pkgdir}/usr/lib/python${_pybasever}/
-
-  # some useful stuff
-  install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
-  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
-${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
-  install -m755 Tools/scripts/{README,*py} \
-${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
-
-  # fix conflicts with python
-  mv ${pkgdir}/usr/bin/idle{,2}
-  mv ${pkgdir}/usr/bin/pydoc{,2}
-  mv ${pkgdir}/usr/bin/2to3{,-2.7}
-
-  # clean up #!s
-  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
-xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
-
-  # clean-up reference to build directory
-  sed -i s#${srcdir}/Python-${pkgver}:## \
-${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
-
-  # license
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: python2/repos/extra-i686/PKGBUILD (from rev 173837, 
python2/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-12-25 00:34:35 UTC (rev 173846)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributer: Allan McRae al...@archlinux.org
+# Contributer: Jason Chu ja...@archlinux.org
+
+pkgname=python2
+pkgver=2.7.3
+pkgrel=4
+_pybasever=2.7
+pkgdesc=A high-level scripting language
+arch=('i686' 'x86_64')
+license=('PSF')
+url=http://www.python.org/;
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+makedepends=('tk=8.6.0' 'bluez')
+optdepends=('tk: for IDLE')
+conflicts=('python3')
+options=('!makeflags')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
+
+build() {
+  cd ${srcdir}/Python-${pkgver}
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i /progname 

[arch-commits] Commit in python2/repos (6 files)

[Evangelos Foutras]

Date: Sunday, December 23, 2012 @ 21:20:52
  Author: foutrelis
Revision: 173811

db-move: moved python2 from [staging] to [testing] (i686, x86_64)

Added:
  python2/repos/testing-i686/
  python2/repos/testing-i686/PKGBUILD
(from rev 173802, python2/repos/staging-i686/PKGBUILD)
  python2/repos/testing-x86_64/
  python2/repos/testing-x86_64/PKGBUILD
(from rev 173802, python2/repos/staging-x86_64/PKGBUILD)
Deleted:
  python2/repos/staging-i686/
  python2/repos/staging-x86_64/

-+
 testing-i686/PKGBUILD   |   84 ++
 testing-x86_64/PKGBUILD |   84 ++
 2 files changed, 168 insertions(+)

Copied: python2/repos/testing-i686/PKGBUILD (from rev 173802, 
python2/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-12-24 02:20:52 UTC (rev 173811)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributer: Allan McRae al...@archlinux.org
+# Contributer: Jason Chu ja...@archlinux.org
+
+pkgname=python2
+pkgver=2.7.3
+pkgrel=4
+_pybasever=2.7
+pkgdesc=A high-level scripting language
+arch=('i686' 'x86_64')
+license=('PSF')
+url=http://www.python.org/;
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+makedepends=('tk=8.6.0' 'bluez')
+optdepends=('tk: for IDLE')
+conflicts=('python3')
+options=('!makeflags')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
+
+build() {
+  cd ${srcdir}/Python-${pkgver}
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
+
+  # Enable built-in SQLite module to load extensions (fix FS#22122)
+  sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
+
+  # FS#23997
+  sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+
+  export OPT=${CFLAGS}
+  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
+  --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
+  --with-dbmliborder=gdbm:ndbm
+
+  make
+}
+
+package() {
+  cd ${srcdir}/Python-${pkgver}
+  make DESTDIR=${pkgdir} altinstall maninstall
+
+  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
+  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
+  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
+
+  ln -sf ../../libpython${_pybasever}.so \
+${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+
+  mv ${pkgdir}/usr/bin/smtpd.py ${pkgdir}/usr/lib/python${_pybasever}/
+
+  # some useful stuff
+  install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
+  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
+${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
+  install -m755 Tools/scripts/{README,*py} \
+${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
+
+  # fix conflicts with python
+  mv ${pkgdir}/usr/bin/idle{,2}
+  mv ${pkgdir}/usr/bin/pydoc{,2}
+  mv ${pkgdir}/usr/bin/2to3{,-2.7}
+
+  # clean up #!s
+  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
+xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
+
+  # clean-up reference to build directory
+  sed -i s#${srcdir}/Python-${pkgver}:## \
+${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
+
+  # license
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Copied: python2/repos/testing-x86_64/PKGBUILD (from rev 173802, 
python2/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-12-24 02:20:52 UTC (rev 173811)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributer: Allan McRae al...@archlinux.org
+# Contributer: Jason Chu ja...@archlinux.org
+
+pkgname=python2
+pkgver=2.7.3
+pkgrel=4
+_pybasever=2.7
+pkgdesc=A high-level scripting language
+arch=('i686' 'x86_64')
+license=('PSF')
+url=http://www.python.org/;
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+makedepends=('tk=8.6.0' 'bluez')
+optdepends=('tk: for IDLE')
+conflicts=('python3')
+options=('!makeflags')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
+
+build() {
+  cd ${srcdir}/Python-${pkgver}
+
+  # Temporary workaround for FS#22322
+  # See 

[arch-commits] Commit in python2/repos (6 files)

[Stéphane Gaudreault]

Date: Thursday, December 13, 2012 @ 07:39:26
  Author: stephane
Revision: 173214

db-move: moved python2 from [testing] to [extra] (i686, x86_64)

Added:
  python2/repos/extra-i686/PKGBUILD
(from rev 173212, python2/repos/testing-i686/PKGBUILD)
  python2/repos/extra-x86_64/PKGBUILD
(from rev 173212, python2/repos/testing-x86_64/PKGBUILD)
Deleted:
  python2/repos/extra-i686/PKGBUILD
  python2/repos/extra-x86_64/PKGBUILD
  python2/repos/testing-i686/
  python2/repos/testing-x86_64/

---+
 extra-i686/PKGBUILD   |  168 
 extra-x86_64/PKGBUILD |  168 
 2 files changed, 168 insertions(+), 168 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-12-13 12:39:25 UTC (rev 173213)
+++ extra-i686/PKGBUILD 2012-12-13 12:39:26 UTC (rev 173214)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributer: Allan McRae al...@archlinux.org
-# Contributer: Jason Chu ja...@archlinux.org
-
-pkgname=python2
-pkgver=2.7.3
-pkgrel=2
-_pybasever=2.7
-pkgdesc=A high-level scripting language
-arch=('i686' 'x86_64')
-license=('PSF')
-url=http://www.python.org/;
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk')
-optdepends=('tk: for IDLE')
-conflicts=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
-
-build() {
-  cd ${srcdir}/Python-${pkgver}
-
-  # Temporary workaround for FS#22322
-  # See http://bugs.python.org/issue10835 for upstream report
-  sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
-
-  # Enable built-in SQLite module to load extensions (fix FS#22122)
-  sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
-
-  # FS#23997
-  sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  export OPT=${CFLAGS}
-  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
-  --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
-  --with-dbmliborder=gdbm:ndbm
-
-  make
-}
-
-package() {
-  cd ${srcdir}/Python-${pkgver}
-  make DESTDIR=${pkgdir} altinstall maninstall
-
-  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
-  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
-  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
-
-  ln -sf ../../libpython${_pybasever}.so \
-${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
-
-  mv ${pkgdir}/usr/bin/smtpd.py ${pkgdir}/usr/lib/python${_pybasever}/
-
-  # some useful stuff
-  install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
-  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
-${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
-  install -m755 Tools/scripts/{README,*py} \
-${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
-
-  # fix conflicts with python
-  mv ${pkgdir}/usr/bin/idle{,2}
-  mv ${pkgdir}/usr/bin/pydoc{,2}
-  mv ${pkgdir}/usr/bin/2to3{,-2.7}
-
-  # clean up #!s
-  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
-xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
-
-  # clean-up reference to build directory
-  sed -i s#${srcdir}/Python-${pkgver}:## \
-${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
-
-  # license
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: python2/repos/extra-i686/PKGBUILD (from rev 173212, 
python2/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-12-13 12:39:26 UTC (rev 173214)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributer: Allan McRae al...@archlinux.org
+# Contributer: Jason Chu ja...@archlinux.org
+
+pkgname=python2
+pkgver=2.7.3
+pkgrel=3
+_pybasever=2.7
+pkgdesc=A high-level scripting language
+arch=('i686' 'x86_64')
+license=('PSF')
+url=http://www.python.org/;
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+makedepends=('tk' 'bluez')
+optdepends=('tk: for IDLE')
+conflicts=('python3')
+options=('!makeflags')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
+
+build() {
+  cd ${srcdir}/Python-${pkgver}
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i /progname =/s/python/python${_pybasever}/ 

[arch-commits] Commit in python2/repos (6 files)

[Allan McRae]

Date: Saturday, April 28, 2012 @ 05:27:12
  Author: allan
Revision: 157412

db-move: moved python2 from [testing] to [extra] (i686)

Added:
  python2/repos/extra-i686/PKGBUILD
(from rev 157383, python2/repos/testing-i686/PKGBUILD)
Deleted:
  python2/repos/extra-i686/13156-revert-tls-changeset-subinterpreter.patch
  python2/repos/extra-i686/PKGBUILD
  python2/repos/extra-i686/gdbm-magic-values.patch
  python2/repos/extra-i686/linux2.patch
  python2/repos/testing-i686/

-+
 13156-revert-tls-changeset-subinterpreter.patch |   61 ---
 PKGBUILD|  168 +++---
 gdbm-magic-values.patch |   12 -
 linux2.patch|   23 ---
 4 files changed, 84 insertions(+), 180 deletions(-)

Deleted: extra-i686/13156-revert-tls-changeset-subinterpreter.patch
===
--- extra-i686/13156-revert-tls-changeset-subinterpreter.patch  2012-04-28 
09:27:08 UTC (rev 157411)
+++ extra-i686/13156-revert-tls-changeset-subinterpreter.patch  2012-04-28 
09:27:12 UTC (rev 157412)
@@ -1,61 +0,0 @@
-
-# HG changeset patch
-# User Charles-François Natali neolo...@free.fr
-# Date 1318446474 -7200
-# Node ID ee4fe16d9b4822457ad855ea6c44e65030166304
-# Parent  f6feed6ec3f9b024cecd0fd587595c403f55624f
-Issue #13156: revert changeset f6feed6ec3f9, which was only relevant for native
-TLS implementations, and fails with the ad-hoc TLS implementation when a thread
-doesn't have an auto thread state (e.g. a thread created outside of Python
-calling into a subinterpreter).
-
-diff --git a/Include/pystate.h b/Include/pystate.h
 a/Include/pystate.h
-+++ b/Include/pystate.h
-@@ -111,7 +111,6 @@ PyAPI_FUNC(void) PyThreadState_Clear(PyT
- PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
- #ifdef WITH_THREAD
- PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
--PyAPI_FUNC(void) _PyGILState_Reinit(void);
- #endif
- 
- PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
-diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
 a/Modules/signalmodule.c
-+++ b/Modules/signalmodule.c
-@@ -976,7 +976,6 @@ void
- PyOS_AfterFork(void)
- {
- #ifdef WITH_THREAD
--_PyGILState_Reinit();
- PyEval_ReInitThreads();
- main_thread = PyThread_get_thread_ident();
- main_pid = getpid();
-diff --git a/Python/pystate.c b/Python/pystate.c
 a/Python/pystate.c
-+++ b/Python/pystate.c
-@@ -537,23 +537,6 @@ void
- autoInterpreterState = NULL;
- }
- 
--/* Reset the TLS key - called by PyOS_AfterFork.
-- * This should not be necessary, but some - buggy - pthread implementations
-- * don't flush TLS on fork, see issue #10517.
-- */
--void
--_PyGILState_Reinit(void)
--{
--PyThreadState *tstate = PyGILState_GetThisThreadState();
--PyThread_delete_key(autoTLSkey);
--if ((autoTLSkey = PyThread_create_key()) == -1)
--Py_FatalError(Could not allocate TLS entry);
--
--/* re-associate the current thread state with the new key */
--if (PyThread_set_key_value(autoTLSkey, (void *)tstate)  0)
--Py_FatalError(Couldn't create autoTLSkey mapping);
--}
--
- /* When a thread state is created for a thread by some mechanism other than
-PyGILState_Ensure, it's important that the GILState machinery knows about
-it so it doesn't try to create another thread state for the thread (this is
-

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-04-28 09:27:08 UTC (rev 157411)
+++ extra-i686/PKGBUILD 2012-04-28 09:27:12 UTC (rev 157412)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributer: Allan McRae al...@archlinux.org
-# Contributer: Jason Chu ja...@archlinux.org
-
-pkgname=python2
-pkgver=2.7.3
-pkgrel=1
-_pybasever=2.7
-pkgdesc=A high-level scripting language
-arch=('i686' 'x86_64')
-license=('PSF')
-url=http://www.python.org/;
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk')
-optdepends=('tk: for IDLE')
-conflicts=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
-
-build() {
-  cd ${srcdir}/Python-${pkgver}
-
-  # Temporary workaround for FS#22322
-  # See http://bugs.python.org/issue10835 for upstream report
-  sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
-
-  # Enable built-in SQLite module to load extensions (fix FS#22122)
-  sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
-
-  # FS#23997
-  sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  

[arch-commits] Commit in python2/repos (6 files)

[Allan McRae]

Date: Saturday, April 28, 2012 @ 05:27:14
  Author: allan
Revision: 157413

db-move: moved python2 from [testing] to [extra] (x86_64)

Added:
  python2/repos/extra-x86_64/PKGBUILD
(from rev 157383, python2/repos/testing-x86_64/PKGBUILD)
Deleted:
  python2/repos/extra-x86_64/13156-revert-tls-changeset-subinterpreter.patch
  python2/repos/extra-x86_64/PKGBUILD
  python2/repos/extra-x86_64/gdbm-magic-values.patch
  python2/repos/extra-x86_64/linux2.patch
  python2/repos/testing-x86_64/

-+
 13156-revert-tls-changeset-subinterpreter.patch |   61 ---
 PKGBUILD|  168 +++---
 gdbm-magic-values.patch |   12 -
 linux2.patch|   23 ---
 4 files changed, 84 insertions(+), 180 deletions(-)

Deleted: extra-x86_64/13156-revert-tls-changeset-subinterpreter.patch
===
--- extra-x86_64/13156-revert-tls-changeset-subinterpreter.patch
2012-04-28 09:27:12 UTC (rev 157412)
+++ extra-x86_64/13156-revert-tls-changeset-subinterpreter.patch
2012-04-28 09:27:14 UTC (rev 157413)
@@ -1,61 +0,0 @@
-
-# HG changeset patch
-# User Charles-François Natali neolo...@free.fr
-# Date 1318446474 -7200
-# Node ID ee4fe16d9b4822457ad855ea6c44e65030166304
-# Parent  f6feed6ec3f9b024cecd0fd587595c403f55624f
-Issue #13156: revert changeset f6feed6ec3f9, which was only relevant for native
-TLS implementations, and fails with the ad-hoc TLS implementation when a thread
-doesn't have an auto thread state (e.g. a thread created outside of Python
-calling into a subinterpreter).
-
-diff --git a/Include/pystate.h b/Include/pystate.h
 a/Include/pystate.h
-+++ b/Include/pystate.h
-@@ -111,7 +111,6 @@ PyAPI_FUNC(void) PyThreadState_Clear(PyT
- PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
- #ifdef WITH_THREAD
- PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
--PyAPI_FUNC(void) _PyGILState_Reinit(void);
- #endif
- 
- PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
-diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
 a/Modules/signalmodule.c
-+++ b/Modules/signalmodule.c
-@@ -976,7 +976,6 @@ void
- PyOS_AfterFork(void)
- {
- #ifdef WITH_THREAD
--_PyGILState_Reinit();
- PyEval_ReInitThreads();
- main_thread = PyThread_get_thread_ident();
- main_pid = getpid();
-diff --git a/Python/pystate.c b/Python/pystate.c
 a/Python/pystate.c
-+++ b/Python/pystate.c
-@@ -537,23 +537,6 @@ void
- autoInterpreterState = NULL;
- }
- 
--/* Reset the TLS key - called by PyOS_AfterFork.
-- * This should not be necessary, but some - buggy - pthread implementations
-- * don't flush TLS on fork, see issue #10517.
-- */
--void
--_PyGILState_Reinit(void)
--{
--PyThreadState *tstate = PyGILState_GetThisThreadState();
--PyThread_delete_key(autoTLSkey);
--if ((autoTLSkey = PyThread_create_key()) == -1)
--Py_FatalError(Could not allocate TLS entry);
--
--/* re-associate the current thread state with the new key */
--if (PyThread_set_key_value(autoTLSkey, (void *)tstate)  0)
--Py_FatalError(Couldn't create autoTLSkey mapping);
--}
--
- /* When a thread state is created for a thread by some mechanism other than
-PyGILState_Ensure, it's important that the GILState machinery knows about
-it so it doesn't try to create another thread state for the thread (this is
-

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-04-28 09:27:12 UTC (rev 157412)
+++ extra-x86_64/PKGBUILD   2012-04-28 09:27:14 UTC (rev 157413)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributer: Allan McRae al...@archlinux.org
-# Contributer: Jason Chu ja...@archlinux.org
-
-pkgname=python2
-pkgver=2.7.3
-pkgrel=1
-_pybasever=2.7
-pkgdesc=A high-level scripting language
-arch=('i686' 'x86_64')
-license=('PSF')
-url=http://www.python.org/;
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk')
-optdepends=('tk: for IDLE')
-conflicts=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
-
-build() {
-  cd ${srcdir}/Python-${pkgver}
-
-  # Temporary workaround for FS#22322
-  # See http://bugs.python.org/issue10835 for upstream report
-  sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
-
-  # Enable built-in SQLite module to load extensions (fix FS#22122)
-  sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
-
-  # FS#23997
-  sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib