diff --git a/srcpkgs/python/depends b/srcpkgs/python/depends index 17cfb5e7e10..1ea9976a2b9 100644 --- a/srcpkgs/python/depends +++ b/srcpkgs/python/depends @@ -1,2 +1,2 @@ -abi_depends=">=2.6.0<3.0" +abi_depends=">=2.7<3.0" api_depends="${abi_depends}" diff --git a/srcpkgs/python/patches/python-2.6-db-4.8.patch b/srcpkgs/python/patches/python-2.6-db-4.8.patch deleted file mode 100644 index 2032f924c4b..00000000000 --- a/srcpkgs/python/patches/python-2.6-db-4.8.patch +++ /dev/null @@ -1,123 +0,0 @@ -Index: setup.py -=================================================================== ---- setup.py (revision 74955) -+++ setup.py (working copy) -@@ -695,7 +695,7 @@ - # a release. Most open source OSes come with one or more - # versions of BerkeleyDB already installed. - -- max_db_ver = (4, 7) -+ max_db_ver = (4, 8) - min_db_ver = (3, 3) - db_setup_debug = False # verbose debug prints from this script? - -Index: Modules/_bsddb.c -=================================================================== ---- Modules/_bsddb.c (revision 74955) -+++ Modules/_bsddb.c (working copy) -@@ -215,7 +215,11 @@ - #define DB_BUFFER_SMALL ENOMEM - #endif - -+#if (DBVER < 48) -+#define DB_GID_SIZE DB_XIDDATASIZE -+#endif - -+ - /* --------------------------------------------------------------------- */ - /* Structure definitions */ - -@@ -4501,7 +4505,11 @@ - DBTxnObject *txn; - #define PREPLIST_LEN 16 - DB_PREPLIST preplist[PREPLIST_LEN]; -+#if (DBVER < 48) - long retp; -+#else -+ u_int32_t retp; -+#endif - - CHECK_ENV_NOT_CLOSED(self); - -@@ -4522,7 +4530,7 @@ - flags=DB_NEXT; /* Prepare for next loop pass */ - for (i=0; i= 42) - {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS}, -@@ -7089,6 +7101,7 @@ - ADD_INT(d, DB_MAX_PAGES); - ADD_INT(d, DB_MAX_RECORDS); - -+#if (DBVER < 48) - #if (DBVER >= 42) - ADD_INT(d, DB_RPCCLIENT); - #else -@@ -7096,7 +7109,11 @@ - /* allow apps to be written using DB_RPCCLIENT on older Berkeley DB */ - _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT); - #endif -+#endif -+ -+#if (DBVER < 48) - ADD_INT(d, DB_XA_CREATE); -+#endif - - ADD_INT(d, DB_CREATE); - ADD_INT(d, DB_NOMMAP); -@@ -7113,7 +7130,13 @@ - ADD_INT(d, DB_INIT_TXN); - ADD_INT(d, DB_JOINENV); - -+#if (DBVER >= 48) -+ ADD_INT(d, DB_GID_SIZE); -+#else - ADD_INT(d, DB_XIDDATASIZE); -+ /* Allow new code to work in old BDB releases */ -+ _addIntToDict(d, "DB_GID_SIZE", DB_XIDDATASIZE); -+#endif - - ADD_INT(d, DB_RECOVER); - ADD_INT(d, DB_RECOVER_FATAL); diff --git a/srcpkgs/python/patches/python-2.6-internal-expat.patch b/srcpkgs/python/patches/python-2.6-internal-expat.patch deleted file mode 100644 index 86252abef00..00000000000 --- a/srcpkgs/python/patches/python-2.6-internal-expat.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- setup.py 2008-04-22 12:12:24.613554757 +0300 -+++ setup.py 2008-04-22 12:13:09.276544063 +0300 -@@ -1035,18 +1035,15 @@ - # - # More information on Expat can be found at www.libexpat.org. - # -- expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat') -- define_macros = [ -- ('HAVE_EXPAT_CONFIG_H', '1'), -- ] -+ # Use system expat -+ expatinc = '/usr/include' -+ define_macros = [] - - exts.append(Extension('pyexpat', - define_macros = define_macros, - include_dirs = [expatinc], -+ libraries = ['expat'], - sources = ['pyexpat.c', -- 'expat/xmlparse.c', -- 'expat/xmlrole.c', -- 'expat/xmltok.c', - ], - )) - -@@ -1058,6 +1055,7 @@ - exts.append(Extension('_elementtree', - define_macros = define_macros, - include_dirs = [expatinc], -+ libraries = ['expat'], - sources = ['_elementtree.c'], - )) - diff --git a/srcpkgs/python/python-devel.template b/srcpkgs/python/python-devel.template index cd4ffe133ff..f81dc3b1107 100644 --- a/srcpkgs/python/python-devel.template +++ b/srcpkgs/python/python-devel.template @@ -19,7 +19,14 @@ Add_dependency run python do_install() { - mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/bin + install -d ${DESTDIR}/usr/{lib,bin} + install -d ${DESTDIR}/usr/include/python2.7 + mv ${SRCPKGDESTDIR}/usr/bin/python*-config ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + + mv ${SRCPKGDESTDIR}/usr/include/python2.7/* \ + ${DESTDIR}/usr/include/python2.7 + mv ${DESTDIR}/usr/include/python2.7/pyconfig.h \ + ${SRCPKGDESTDIR}/usr/include/python2.7 } diff --git a/srcpkgs/python/template b/srcpkgs/python/template index e3498c565f7..73c3484f530 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -1,14 +1,15 @@ # Template build file for 'python'. pkgname=python -version=2.6.6 +version=2.7 wrksrc="Python-$version" distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.bz2" configure_args="--with-threads --enable-ipv6 --with-signal-module - --enable-shared --with-system-ffi" +--enable-shared --with-system-ffi --enable-unicode=ucs4 --with-system-expat +--with-wctype-functions" build_style=gnu_configure short_desc="Interpreted, interactive, object-oriented programming language" maintainer="Juan RP " -checksum=134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83 +checksum=935d3316edfec5eb98c2f6930756b47b00dc27192541e62d6fd0077ffa008af8 long_desc=" Python is an interpreted, interactive, object-oriented programming language that combines remarkable power with very clear syntax. For an introduction @@ -33,7 +34,7 @@ Add_dependency run gdbm Add_dependency run libssl Add_dependency run expat Add_dependency run db -Add_dependency run ncursesw +Add_dependency run ncurses-libs Add_dependency run sqlite Add_dependency build libffi-devel @@ -44,7 +45,7 @@ Add_dependency build gdbm-devel Add_dependency build openssl-devel Add_dependency build expat-devel Add_dependency build db-devel -Add_dependency build ncursesw-devel +Add_dependency build ncurses-devel Add_dependency build sqlite-devel pre_configure()