diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-10-11 09:20:18 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-10-11 09:20:18 +0000 |
| commit | ac1667cabf7b4cdf0c4735f2864c26ed36317b28 (patch) | |
| tree | ee1c94b7fc08bf6b56b6aa86d17de5d64b35284c /dev-python/psycopg | |
| parent | Unused USE flags. (diff) | |
| download | gentoo-2-ac1667cabf7b4cdf0c4735f2864c26ed36317b28.tar.gz gentoo-2-ac1667cabf7b4cdf0c4735f2864c26ed36317b28.tar.bz2 gentoo-2-ac1667cabf7b4cdf0c4735f2864c26ed36317b28.zip | |
Merge from Prefix
(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'dev-python/psycopg')
| -rw-r--r-- | dev-python/psycopg/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/psycopg/files/psycopg-2.0.9-round-solaris.patch | 13 | ||||
| -rw-r--r-- | dev-python/psycopg/psycopg-2.0.12.ebuild | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog index c2ee5dc73b75..96d38e15e49f 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.85 2009/10/07 17:48:42 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.86 2009/10/11 09:20:18 grobian Exp $ + + 11 Oct 2009; Fabian Groffen <grobian@gentoo.org> + +files/psycopg-2.0.9-round-solaris.patch, psycopg-2.0.12.ebuild: + Merge from Prefix 07 Oct 2009; nixnut <nixnut@gentoo.org> psycopg-2.0.12.ebuild: ppc stable #286257 diff --git a/dev-python/psycopg/files/psycopg-2.0.9-round-solaris.patch b/dev-python/psycopg/files/psycopg-2.0.9-round-solaris.patch new file mode 100644 index 000000000000..49d230c3b842 --- /dev/null +++ b/dev-python/psycopg/files/psycopg-2.0.9-round-solaris.patch @@ -0,0 +1,13 @@ +round() is available on Solaris + +--- psycopg/config.h ++++ psycopg/config.h +@@ -102,7 +102,7 @@ + #define inline + #endif + +-#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun) ++#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) + /* what's this, we have no round function either? */ + static double round(double num) + { diff --git a/dev-python/psycopg/psycopg-2.0.12.ebuild b/dev-python/psycopg/psycopg-2.0.12.ebuild index 46c4f692e046..81cddd1aff4b 100644 --- a/dev-python/psycopg/psycopg-2.0.12.ebuild +++ b/dev-python/psycopg/psycopg-2.0.12.ebuild @@ -1,6 +1,6 @@ # 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.5 2009/10/07 17:48:42 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0.12.ebuild,v 1.6 2009/10/11 09:20:18 grobian Exp $ EAPI="2" @@ -15,7 +15,7 @@ DESCRIPTION="PostgreSQL database adapter for Python." SRC_URI="http://initd.org/pub/software/psycopg/${MY_P}.tar.gz" HOMEPAGE="http://initd.org/projects/psycopg2" SLOT="2" -KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" LICENSE="GPL-2" IUSE="debug doc examples mxdatetime" @@ -31,6 +31,7 @@ PYTHON_MODNAME="${PN}2" src_prepare() { epatch "${FILESDIR}/${P}-setup.py.patch" + epatch "${FILESDIR}"/${PN}-2.0.9-round-solaris.patch if use debug; then sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die "sed failed" |