[arch-commits] Commit in python2/trunk (PKGBUILD python-2.7-db51.patch)

[Stéphane Gaudreault]

    Date: Wednesday, June 29, 2011 @ 11:22:59
  Author: stephane
Revision: 129895

upgpkg: python2 2.7.2-2
drop db support

Modified:
  python2/trunk/PKGBUILD
Deleted:
  python2/trunk/python-2.7-db51.patch

-----------------------+
 PKGBUILD              |   14 +++++---------
 python-2.7-db51.patch |   42 ------------------------------------------
 2 files changed, 5 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-29 13:43:11 UTC (rev 129894)
+++ PKGBUILD	2011-06-29 15:22:59 UTC (rev 129895)
@@ -5,27 +5,23 @@
 
 pkgname=python2
 pkgver=2.7.2
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
 license=('PSF')
 url="http://www.python.org/"
-depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
 makedepends=('tk')
 optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
-        python-2.7-db51.patch)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
-         '9667a2a2f8594902b352793e649f78696a77bd13')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
-  patch -Np1 -i ../python-2.7-db51.patch
-
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
@@ -33,7 +29,7 @@
   # Enable built-in SQLite3 module to load extensions (fix FS#22122)
   sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
 
-  # FS#2399
+  # 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),

Deleted: python-2.7-db51.patch
===================================================================
--- python-2.7-db51.patch	2011-06-29 13:43:11 UTC (rev 129894)
+++ python-2.7-db51.patch	2011-06-29 15:22:59 UTC (rev 129895)
@@ -1,42 +0,0 @@
-diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c
---- Python-2.7-orig//Modules/_bsddb.c	2010-05-10 00:46:46.000000000 +1000
-+++ Python-2.7/Modules/_bsddb.c	2010-10-20 13:19:26.436669911 +1000
-@@ -9765,8 +9765,11 @@
- 
-     ADD_INT(d, DB_REP_PERMANENT);
- 
--#if (DBVER >= 44)
-+#if (DBVER >= 44) && (DBVER <= 48)
-     ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
-+#endif
-+    
-+#if (DBVER >= 44)
-     ADD_INT(d, DB_REP_CONF_DELAYCLIENT);
-     ADD_INT(d, DB_REP_CONF_BULK);
-     ADD_INT(d, DB_REP_CONF_NOWAIT);
-diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py
---- Python-2.7-orig//setup.py	2010-06-27 22:36:16.000000000 +1000
-+++ Python-2.7/setup.py	2010-10-20 13:10:48.256670026 +1000
-@@ -765,7 +765,7 @@
-         # a release.  Most open source OSes come with one or more
-         # versions of BerkeleyDB already installed.
- 
--        max_db_ver = (4, 8)
-+        max_db_ver = (5, 1)
-         min_db_ver = (4, 1)
-         db_setup_debug = False   # verbose debug prints from this script?
- 
-@@ -787,8 +787,12 @@
-             return True
- 
-         def gen_db_minor_ver_nums(major):
--            if major == 4:
-+            if major == 5:
-                 for x in range(max_db_ver[1]+1):
-+                    if allow_db_ver((5, x)):
-+                        yield x
-+            if major == 4:
-+                for x in range(9):
-                     if allow_db_ver((4, x)):
-                         yield x
-             elif major == 3: