From 02fa584d4041026a6446980f0ba787d9ff7fe85b Mon Sep 17 00:00:00 2001 From: Jesus Rivero Date: Sat, 14 Apr 2012 11:25:13 +0000 Subject: Version bump Package-Manager: portage-2.2.0_alpha95/cvs/Linux i686 --- dev-python/pyodbc/ChangeLog | 8 +- dev-python/pyodbc/Manifest | 13 ++- .../pyodbc/files/pyodbc-3.0.3-py25-compat.patch | 114 +++++++++++++++++++++ dev-python/pyodbc/pyodbc-3.0.3.ebuild | 30 ++++++ 4 files changed, 159 insertions(+), 6 deletions(-) create mode 100644 dev-python/pyodbc/files/pyodbc-3.0.3-py25-compat.patch create mode 100644 dev-python/pyodbc/pyodbc-3.0.3.ebuild (limited to 'dev-python/pyodbc') diff --git a/dev-python/pyodbc/ChangeLog b/dev-python/pyodbc/ChangeLog index 04eb394a02d3..8174e57d7ba3 100644 --- a/dev-python/pyodbc/ChangeLog +++ b/dev-python/pyodbc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/pyodbc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyodbc/ChangeLog,v 1.3 2012/02/20 14:44:32 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyodbc/ChangeLog,v 1.4 2012/04/14 11:25:13 neurogeek Exp $ + +*pyodbc-3.0.3 (14 Apr 2012) + + 14 Apr 2012; Jesus Rivero +pyodbc-3.0.3.ebuild, + +files/pyodbc-3.0.3-py25-compat.patch: + Version bump 20 Feb 2012; Patrick Lauer pyodbc-2.1.11.ebuild, pyodbc-2.1.8.ebuild: diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest index 04111b958e44..ba6a428200cd 100644 --- a/dev-python/pyodbc/Manifest +++ b/dev-python/pyodbc/Manifest @@ -1,16 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 +AUX pyodbc-3.0.3-py25-compat.patch 4549 RMD160 ddc751be432d4b03f8298d95301f975a7265aa6c SHA1 d97a1bf917bf8c29a74599b7975c6f5fb3745de5 SHA256 01af23c59ab5257aea6d2b57a8af7836a1e062d6de4f62a5b42daccbc860fbd7 DIST pyodbc-2.1.11.zip 148490 RMD160 3d8a78ff4a9a24cb2810dbb24f41c04e07bf0b1c SHA1 df7c4aeca8e0ef96af83c51c7ff8c44ef361cc67 SHA256 ecfcb76f5ebb5e2115278dd5cc0e2f4cb4f21e7d42ea57463241e643138b9e9b DIST pyodbc-2.1.8.zip 137810 RMD160 7bca24bf603f840c2f3253909254bc46a1fd3c92 SHA1 3b2a066a609f920225987ed18dfcbed95704a4bf SHA256 e40f667933bc3efe3233049c5695a6bbc97277615b6d32803b7b736e6e8a1813 +DIST pyodbc-3.0.3.zip 86152 RMD160 3a1730d5a1066b1b43588e916b5c5a3af6c94db2 SHA1 0bc2969760061790761f218b7b73727c34410e94 SHA256 e8dfc31e1ed7ebe86517bf4ec1664249b44151f12cbd1649affdba9429fc1434 EBUILD pyodbc-2.1.11.ebuild 781 RMD160 aa86217b941ce2242e9da527beab9e7b09731c2f SHA1 7e6d100645dc5e3d1abe39d62d83efe792d626fc SHA256 b3984966fe852a22b471de6b453e50a059b6a6017342894925bece351eccb5cc EBUILD pyodbc-2.1.8.ebuild 931 RMD160 f7dcf4c354095997105aaa08ae96bfdce1dde69f SHA1 1faf67af47f03390cb3ecf39cf2d38fc54ef47bd SHA256 cd3064a755dfccaa81222e3d08e6336a296e116f557660f6c71e122ad3062b59 -MISC ChangeLog 655 RMD160 44d64754abf08bf03f5cdca34c898119c9f97cf9 SHA1 3e5c055925d89ffa2e266c8b728212cd559831fd SHA256 0531f5531fc12c120e3539a914859936575949fb9e7ee2390dfa4db607c4e11e +EBUILD pyodbc-3.0.3.ebuild 794 RMD160 9bbf5b3e415cc6a44e3afa1727f9f501cc4db24a SHA1 c54ff1d3093913dc195da7687d27d67ea3778dc8 SHA256 eb749940c59f245390f5ea0142279ea3081a92e12b3fb5bcc81065b8c0ea5e09 +MISC ChangeLog 816 RMD160 43df575439573526a1386290a22982dad2b5b358 SHA1 47fbb91c72316b1a082007a98a7ebc4ab8e9227f SHA256 811a85821cbe9ce842eb01fe6862ef87616d3be69296c5524399ba4b40fa764f MISC metadata.xml 331 RMD160 2c85a1b05f1941227884cdc84c9d47135cd5c36e SHA1 7d9ff66bdee4b8bb7ac47fdfe0fc08147096cc1a SHA256 d16881ddaac0b8a51645e571bb7ec1ec06d5a2545e348c722bf88e7205af31b1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREKAAYFAk93TA4ACgkQuUQtlDBCeQJrzACfT8t4/ljNMObWleQXDVTcs/o/ -WAQAn3xde7QrP+xlYvDDqEtYIQAhS80M -=4v3i +iEYEARECAAYFAk+JJl4ACgkQdIssYB9vBoMZPgCfV5TvSygxc7dO9XebY45COKm1 +d50AnAnmrYOHThFTY01ZvLjMYzJDbZBx +=b7zS -----END PGP SIGNATURE----- diff --git a/dev-python/pyodbc/files/pyodbc-3.0.3-py25-compat.patch b/dev-python/pyodbc/files/pyodbc-3.0.3-py25-compat.patch new file mode 100644 index 000000000000..a023f8834c49 --- /dev/null +++ b/dev-python/pyodbc/files/pyodbc-3.0.3-py25-compat.patch @@ -0,0 +1,114 @@ +# Added by Jesus Rivero +# We can get rid of this when bumping 3.0.5 (source not released yet) +# 2012-04-14 +--- org/src/pyodbccompat.h 2011-12-23 15:44:54.000000000 -0500 ++++ new/src/pyodbccompat.h 2012-04-14 02:37:29.000000000 -0400 +@@ -16,6 +16,19 @@ + #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) + #endif + ++// Macros were introduced in 2.6 to map "bytes" to "str" in Python 2. Back port to 2.5. ++#if PY_VERSION_HEX >= 0x02060000 ++ #include ++#else ++ #define PyBytes_AS_STRING PyString_AS_STRING ++ #define PyBytes_Check PyString_Check ++ #define PyBytes_CheckExact PyString_CheckExact ++ #define PyBytes_FromStringAndSize PyString_FromStringAndSize ++ #define PyBytes_GET_SIZE PyString_GET_SIZE ++ #define PyBytes_Size PyString_Size ++ #define _PyBytes_Resize _PyString_Resize ++#endif ++ + // Used for items that are ANSI in Python 2 and Unicode in Python 3 or in int 2 and long in 3. + + #if PY_MAJOR_VERSION >= 3 +--- org/src/pyodbc.h 2012-01-03 18:04:08.000000000 -0500 ++++ new/src/pyodbc.h 2012-04-14 02:37:29.000000000 -0400 +@@ -44,7 +44,6 @@ + #include + #include + #include +-#include + + #include + #include +--- org/setup.py 2012-01-03 18:04:24.000000000 -0500 ++++ new/setup.py 2012-04-14 02:37:29.000000000 -0400 +@@ -67,39 +67,45 @@ + if exists('MANIFEST'): + os.remove('MANIFEST') + +- options = {} ++ kwargs = { ++ 'name': "pyodbc", ++ 'version': version_str, ++ 'description': "DB API Module for ODBC", ++ ++ 'long_description': ('A Python DB API 2 module for ODBC. This project provides an up-to-date, ' ++ 'convenient interface to ODBC using native data types like datetime and decimal.'), ++ ++ 'maintainer': "Michael Kleehammer", ++ 'maintainer_email': "michael@kleehammer.com", ++ ++ 'ext_modules': [Extension('pyodbc', files, **settings)], ++ ++ 'license': 'MIT', ++ ++ 'classifiers': ['Development Status :: 5 - Production/Stable', ++ 'Intended Audience :: Developers', ++ 'Intended Audience :: System Administrators', ++ 'License :: OSI Approved :: MIT License', ++ 'Operating System :: Microsoft :: Windows', ++ 'Operating System :: POSIX', ++ 'Programming Language :: Python', ++ 'Programming Language :: Python :: 2', ++ 'Programming Language :: Python :: 3', ++ 'Topic :: Database', ++ ], ++ ++ 'url': 'http://code.google.com/p/pyodbc', ++ 'download_url': 'http://code.google.com/p/pyodbc/downloads/list', ++ 'cmdclass': { 'version' : VersionCommand, ++ 'tags' : TagsCommand } ++ } ++ + if sys.hexversion >= 0x02060000: +- options['bdist_wininst'] = {'user_access_control' : 'auto'} +- +- setup (name = "pyodbc", +- version = version_str, +- description = "DB API Module for ODBC", +- +- long_description = ('A Python DB API 2 module for ODBC. This project provides an up-to-date, ' +- 'convenient interface to ODBC using native data types like datetime and decimal.'), +- +- maintainer = "Michael Kleehammer", +- maintainer_email = "michael@kleehammer.com", +- +- ext_modules = [Extension('pyodbc', files, **settings)], +- +- options = options, +- +- classifiers = ['Development Status :: 5 - Production/Stable', +- 'Intended Audience :: Developers', +- 'Intended Audience :: System Administrators', +- 'License :: OSI Approved :: MIT License', +- 'Operating System :: Microsoft :: Windows', +- 'Operating System :: POSIX', +- 'Programming Language :: Python', +- 'Topic :: Database', +- ], +- +- url = 'http://code.google.com/p/pyodbc', +- download_url = 'http://code.google.com/p/pyodbc/downloads/list', +- cmdclass = { 'version' : VersionCommand, +- 'tags' : TagsCommand }) ++ kwargs['options'] = { ++ 'bdist_wininst': {'user_access_control' : 'auto'} ++ } + ++ setup(**kwargs) + + + def get_compiler_settings(version_str): diff --git a/dev-python/pyodbc/pyodbc-3.0.3.ebuild b/dev-python/pyodbc/pyodbc-3.0.3.ebuild new file mode 100644 index 000000000000..c2c5063bb4ec --- /dev/null +++ b/dev-python/pyodbc/pyodbc-3.0.3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyodbc/pyodbc-3.0.3.ebuild,v 1.1 2012/04/14 11:25:13 neurogeek Exp $ + +EAPI="3" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*" + +inherit distutils eutils + +DESCRIPTION="python ODBC module to connect to almost any database" +HOMEPAGE="http://code.google.com/p/pyodbc" +SRC_URI="http://pyodbc.googlecode.com/files/${P}.zip" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="mssql" + +RDEPEND=">=dev-db/unixODBC-2.3.0 + mssql? ( >=dev-db/freetds-0.64[odbc] )" +DEPEND="${RDEPEND} + app-arch/unzip + dev-python/setuptools" + +PYTHON_CXXFLAGS=("* + -fno-strict-aliasing") + +src_prepare() { + epatch "${FILESDIR}"/${P}-py25-compat.patch +} -- cgit v1.2.3-65-gdbad