From f45450e516c7856ccf0cae9109132748de4dfa30 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 26 Mar 2010 10:59:52 +0100
Subject: [PATCH] python: update to 2.6.5.
--HG--
extra : convert_revision : 33ae03732da5e3cd271b1d450d561e54a3f4bb54
---
srcpkgs/python/patches/python-2.6-gdbm.patch | 11 ---------
.../python/patches/python-2.6-readline.patch | 23 -------------------
srcpkgs/python/python-devel.template | 2 --
srcpkgs/python/template | 5 ++--
4 files changed, 2 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/python/patches/python-2.6-gdbm.patch
delete mode 100644 srcpkgs/python/patches/python-2.6-readline.patch
diff --git a/srcpkgs/python/patches/python-2.6-gdbm.patch b/srcpkgs/python/patches/python-2.6-gdbm.patch
deleted file mode 100644
index f0920d1ea19..00000000000
--- a/srcpkgs/python/patches/python-2.6-gdbm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py 2008-09-30 10:15:45.000000000 +1000
-+++ setup.py 2008-12-07 16:04:01.000000000 +1000
-@@ -1013,7 +1013,7 @@
- if self.compiler.find_library_file(lib_dirs, 'ndbm'):
- ndbm_libs = ['ndbm']
- else:
-- ndbm_libs = []
-+ ndbm_libs = ['gdbm', 'gdbm_compat']
- exts.append( Extension('dbm', ['dbmmodule.c'],
- define_macros=[('HAVE_NDBM_H',None)],
- libraries = ndbm_libs ) )
diff --git a/srcpkgs/python/patches/python-2.6-readline.patch b/srcpkgs/python/patches/python-2.6-readline.patch
deleted file mode 100644
index 60a3f3b45f8..00000000000
--- a/srcpkgs/python/patches/python-2.6-readline.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Modules/readline.c 2008-11-04 12:43:31.000000000 -0800
-+++ Modules/readline.c 2009-04-22 15:50:49.000000000 -0700
-@@ -759,6 +759,10 @@
- static char **
- flex_complete(char *text, int start, int end)
- {
-+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
-+ rl_completion_append_character ='\0';
-+ rl_completion_suppress_append = 0;
-+#endif
- Py_XDECREF(begidx);
- Py_XDECREF(endidx);
- begidx = PyInt_FromLong((long) start);
-@@ -799,11 +803,8 @@
- rl_completer_word_break_characters =
- strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
- /* All nonalphanums except '.' */
--#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
-- rl_completion_append_character ='\0';
--#endif
-
- begidx = PyInt_FromLong(0L);
- endidx = PyInt_FromLong(0L);
diff --git a/srcpkgs/python/python-devel.template b/srcpkgs/python/python-devel.template
index a4e04c23941..cd4ffe133ff 100644
--- a/srcpkgs/python/python-devel.template
+++ b/srcpkgs/python/python-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
-revision=2
-
Add_dependency run libffi-devel
Add_dependency run zlib-devel
Add_dependency run readline-devel
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index e4d9ae1810a..03f0f35db10 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,7 +1,6 @@
# Template build file for 'python'.
pkgname=python
-version=2.6.4
-revision=2
+version=2.6.5
wrksrc="Python-$version"
distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.bz2"
configure_args="--with-threads --enable-ipv6 --with-signal-module
@@ -9,7 +8,7 @@ configure_args="--with-threads --enable-ipv6 --with-signal-module
build_style=gnu_configure
short_desc="Interpreted, interactive, object-oriented programming language"
maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=dad8d5575144a210d5cc4fdbc40b8a26386e9cdb1ef58941bec0be02c7cb9d89
+checksum=62da62eb685621ede2be1275f11b89fa0e0be578db8daa5320d0a7855c0a9ebc
long_desc="
Python is an interpreted, interactive, object-oriented programming language
that combines remarkable power with very clear syntax. For an introduction