diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-08-25 15:37:26 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-08-25 15:37:26 +0000 |
| commit | 5f9a80fb5dcc7a57bb1cf526a67e3fba55f5c981 (patch) | |
| tree | 318dcc601d0e4670bd523ea645a668651c3c4be5 /dev-python/psycopg | |
| parent | Add ~x86 wrt #281315 (diff) | |
| download | gentoo-2-5f9a80fb5dcc7a57bb1cf526a67e3fba55f5c981.tar.gz gentoo-2-5f9a80fb5dcc7a57bb1cf526a67e3fba55f5c981.tar.bz2 gentoo-2-5f9a80fb5dcc7a57bb1cf526a67e3fba55f5c981.zip | |
Fix automagic dependency on dev-python/egenix-mx-base.
(Portage version: 14155-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/psycopg')
| -rw-r--r-- | dev-python/psycopg/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/psycopg/files/psycopg-2.0.12-setup.py.patch | 11 | ||||
| -rw-r--r-- | dev-python/psycopg/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-python/psycopg/psycopg-2.0.12.ebuild | 6 |
4 files changed, 21 insertions, 5 deletions
diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog index 94a177989ee8..c5206c53f1cc 100644 --- a/dev-python/psycopg/ChangeLog +++ b/dev-python/psycopg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/psycopg # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.79 2009/08/25 13:07:52 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.80 2009/08/25 15:37:26 arfrever Exp $ + + 25 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + psycopg-2.0.12.ebuild, +files/psycopg-2.0.12-setup.py.patch, metadata.xml: + Fix automagic dependency on dev-python/egenix-mx-base. *psycopg-2.0.12 (25 Aug 2009) diff --git a/dev-python/psycopg/files/psycopg-2.0.12-setup.py.patch b/dev-python/psycopg/files/psycopg-2.0.12-setup.py.patch new file mode 100644 index 000000000000..9da7ed8c0694 --- /dev/null +++ b/dev-python/psycopg/files/psycopg-2.0.12-setup.py.patch @@ -0,0 +1,11 @@ +--- setup.py ++++ setup.py +@@ -344,7 +344,7 @@ + mxincludedir = parser.get('build_ext', 'mx_include_dir') + else: + mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx") +-if os.path.exists(mxincludedir): ++if not use_pydatetime and os.path.exists(mxincludedir): + include_dirs.append(mxincludedir) + define_macros.append(('HAVE_MXDATETIME','1')) + sources.append('adapter_mxdatetime.c') diff --git a/dev-python/psycopg/metadata.xml b/dev-python/psycopg/metadata.xml index 907100883edc..521df76158f7 100644 --- a/dev-python/psycopg/metadata.xml +++ b/dev-python/psycopg/metadata.xml @@ -3,7 +3,6 @@ <pkgmetadata> <herd>python</herd> <use> - <flag name='mxdatetime'>choose MX DateTime support instead of built-in - datetime</flag> + <flag name='mxdatetime'>Enable support for MX DateTime and use it instead of Python's built-in datetime module</flag> </use> </pkgmetadata> diff --git a/dev-python/psycopg/psycopg-2.0.12.ebuild b/dev-python/psycopg/psycopg-2.0.12.ebuild index 64715ab8b9f3..a7885f62f80f 100644 --- a/dev-python/psycopg/psycopg-2.0.12.ebuild +++ b/dev-python/psycopg/psycopg-2.0.12.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0.12.ebuild,v 1.1 2009/08/25 13:07:52 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0.12.ebuild,v 1.2 2009/08/25 15:37:26 arfrever Exp $ EAPI="2" NEED_PYTHON="2.4" SUPPORT_PYTHON_ABIS="1" -inherit distutils +inherit distutils eutils MY_P=${PN}2-${PV} @@ -30,6 +30,8 @@ S=${WORKDIR}/${MY_P} PYTHON_MODNAME="${PN}2" src_prepare() { + epatch "${FILESDIR}/${P}-setup.py.patch" + if use debug; then sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die "sed failed" fi |