Version bump psycopg to 2.4.2 (bug 379601).

Package-Manager: portage-2.1.10.15/cvs/Linux x86_64

5 files changed, 144 insertions, 6 deletions

diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index a9d7750e683d..6ec51dfa3e95 100644
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/psycopg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.131 2011/09/10 17:39:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.132 2011/09/14 07:43:04 djc Exp $
+
+*psycopg-2.4.2 (14 Sep 2011)
+
+  14 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> +psycopg-2.4.2.ebuild,
+  +files/psycopg-2.4.2-begin-segfault.patch,
+  +files/psycopg-2.4.2-setup.py.patch:
+  Version bump to 2.4.2 (fixes bug 379601, thanks jbergstroem and David
+  Butler).
 
   10 Sep 2011; Jeroen Roovers <jer@gentoo.org> psycopg-2.4.1.ebuild:
   Marked ~hppa (bug #381709).
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 1126dd098f22..ba3c89a25588 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX psycopg-2.0.12-setup.py.patch 412 RMD160 e41c9f6c00225ad9a498bf76768ec77c7fe0d6ed SHA1 a03211413db7aaf85283092684af280092d2cca9 SHA256 adf69fd37c12e2d6fe39fd9a785535108d409486835e2750430f97f4cb26c65d
 AUX psycopg-2.0.9-round-solaris.patch 449 RMD160 1915c539e6ed5341d4b198e404a97a2953edfc79 SHA1 837d650b0c296df3a80b0d6771cdaf2b1f8ba9cf SHA256 d7334adca500aea1b09d3ee809cedb0c719659db95398175f4354939e2dd5b55
+AUX psycopg-2.4.2-begin-segfault.patch 1370 RMD160 f71b91439e8c665cc0993a590ba905a3ffb8a17a SHA1 2e7b6c4efa1aac4df801533ae9e47bda7b7e8ef0 SHA256 83566d6bb66fd09acb0bdb8982c60d8f4e98e5065fdf9380718c0d51fe237278
+AUX psycopg-2.4.2-setup.py.patch 568 RMD160 fd334f20f713a494183af9f1157dc39fa5ba0de6 SHA1 cae030520023055036d62a2ee42b761fab8564a0 SHA256 9dbdab62bf2018efe48afe72170daff494d6fbcace00da911b44066e2b31b847
 DIST psycopg-1.1.21.tar.gz 213753 RMD160 de74a70b16353f69de7e898059a7a1d8418ad2ee SHA1 02d8a8b5dd682306117896c7c63a9a1b518997b6 SHA256 f487d02e8e8837ec7e62e4e0f50bcb974e73b7765333b032ac50c07bf12ce240
 DIST psycopg2-2.4.1.tar.gz 398200 RMD160 8dba50c654995e8c13da877450cd4cc4467e88da SHA1 a87ac467e853405d9a8eb69f78509bcc16473e0b SHA256 f8ee9a4004afbd1ff1a1db8df7910475d6ec26e102aa92c9214cbeb1ef39ff49
+DIST psycopg2-2.4.2.tar.gz 667192 RMD160 2543f7d025434defcc66c69f7ae19737f6417a69 SHA1 d1515b43de3923180268a8b29c0a8c7eb04c2ae3 SHA256 c5f0f853aeeefc7b2aa73b08579e5d74c4c32ad5fca87e058bf04e08273a41a1
 EBUILD psycopg-1.1.21.ebuild 1373 RMD160 fe43655a7b81984c552c10622729a243b5370742 SHA1 cb9dbeed4ae051eeae77b9e69292822c00c2b964 SHA256 bee6f7e8f272ede1d0a8b90ffe2acc2b78354c9863c81592361a4cc209419237
 EBUILD psycopg-2.4.1.ebuild 2010 RMD160 3d4036dff731a48c5823a10471d1d1ac16651812 SHA1 2341972ae1955ab4e4c2d46e70db70d7dc87b60d SHA256 bda33c6bbe7143f1c2ed9a17d7f17d729aee29b722a6a145389bfacce4bf9ac3
-MISC ChangeLog 16879 RMD160 63af3a9f3cfeb3544a927cd8867257a1c102013c SHA1 fe3cebe34bfd5439bfc286920981346ece3b8a5b SHA256 dd60c042b3da502830a6e33607f66e7888dd28f1c64e4c023124f20985c35393
+EBUILD psycopg-2.4.2.ebuild 2057 RMD160 1a326c76b7cf62f9467b33f6a3370c7ca4f25456 SHA1 406e3932a1de69d2712d7849f647e7b1df3a37cf SHA256 2dbdc13dec18c7867f01c0d146071bf5673b62788a3ff70bd3aa496fef00d2ee
+MISC ChangeLog 17148 RMD160 d8dd977b864fa2d23c7b9f2c4defd434a7590440 SHA1 e9a44cb4d6faf2a150c0a7edfe92c623d82e8108 SHA256 456e88dc89012fddd4e0db63376c4792f1ab9460ea800d3bff2b9d747258a9f4
 MISC metadata.xml 291 RMD160 317ee3d63279acd6a3cbf6ef622d4b77a2044036 SHA1 0c71c2432c961aa486238f5de43d08d0696d8341 SHA256 9a4e3c2e6caca640df7a6d7b8accbdde21f715f0c98dc6bb09735b5463da7ad9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5roPUACgkQVWmRsqeSphNyrQCeKV4pfZny4+lFKIXI7kOlLpGn
-WGoAn14bZNtf0TfgBhuGwH8UUChp+4Fi
-=GLcK
+iEYEAREKAAYFAk5wWxAACgkQxeMuLWsGW/vkPwCgvqmUtRbtgw7fTLBMlzs2gSy4
+tX4An36S81kaNFKqbduI3/gXSM59Agi9
+=U344
 -----END PGP SIGNATURE-----
diff --git a/dev-python/psycopg/files/psycopg-2.4.2-begin-segfault.patch b/dev-python/psycopg/files/psycopg-2.4.2-begin-segfault.patch
new file mode 100644
index 000000000000..cbf2278d0bfa
--- /dev/null
+++ b/dev-python/psycopg/files/psycopg-2.4.2-begin-segfault.patch
@@ -0,0 +1,34 @@
+X-Git-Url: https://dndg.it/cgi-bin/gitweb.cgi?p=public%2Fpsycopg2.git;a=blobdiff_plain;f=psycopg%2Fpqpath.c;h=1f0d5da95bd88aa4d5468874047e4b0139ffadd3;hp=cee5ce4c9c053981710959ca28b7e68702c44a97;hb=de6f2ac387231fcd57c05031c82471ea57255e2b;hpb=d9fce1f837151e6eadfd8ca761ef328a721198bd
+
+diff --git a/psycopg/pqpath.c b/psycopg/pqpath.c
+index cee5ce4..1f0d5da 100644
+--- a/psycopg/pqpath.c
++++ b/psycopg/pqpath.c
+@@ -344,11 +344,13 @@ pq_execute_command_locked(connectionObject *conn, const char *query,
+     }
+     if (*pgres == NULL) {
+         Dprintf("pq_execute_command_locked: PQexec returned NULL");
++        PyEval_RestoreThread(*tstate);
+         if (!PyErr_Occurred()) {
+             const char *msg;
+             msg = PQerrorMessage(conn->pgconn);
+             if (msg && *msg) { *error = strdup(msg); }
+         }
++        *tstate = PyEval_SaveThread();
+         goto cleanup;
+     }
+ 
+@@ -635,11 +637,13 @@ pq_get_guc_locked(
+ 
+     if (*pgres == NULL) {
+         Dprintf("pq_get_guc_locked: PQexec returned NULL");
++        PyEval_RestoreThread(*tstate);
+         if (!PyErr_Occurred()) {
+             const char *msg;
+             msg = PQerrorMessage(conn->pgconn);
+             if (msg && *msg) { *error = strdup(msg); }
+         }
++        *tstate = PyEval_SaveThread();
+         goto cleanup;
+     }
+     if (PQresultStatus(*pgres) != PGRES_TUPLES_OK) {
\ No newline at end of file
diff --git a/dev-python/psycopg/files/psycopg-2.4.2-setup.py.patch b/dev-python/psycopg/files/psycopg-2.4.2-setup.py.patch
new file mode 100644
index 000000000000..a35502270e1f
--- /dev/null
+++ b/dev-python/psycopg/files/psycopg-2.4.2-setup.py.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index e03876a..f5ec2ac 100644
+--- a/setup.py
++++ b/setup.py
+@@ -461,7 +461,7 @@ if parser.has_option('build_ext', 'mx_include_dir'):
+     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):
+     # Build the support for mx: we will check at runtime if it can be imported
+     include_dirs.append(mxincludedir)
+     define_macros.append(('HAVE_MXDATETIME', '1'))
\ No newline at end of file
diff --git a/dev-python/psycopg/psycopg-2.4.2.ebuild b/dev-python/psycopg/psycopg-2.4.2.ebuild
new file mode 100644
index 000000000000..6d838178d888
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.4.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.4.2.ebuild,v 1.1 2011/09/14 07:43:04 djc Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit distutils eutils
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ http://pypi.python.org/pypi/psycopg2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples mxdatetime"
+
+RDEPEND=">=dev-db/postgresql-base-8.1
+	mxdatetime? ( dev-python/egenix-mx-base )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+DOCS="AUTHORS doc/HACKING doc/SUCCESS"
+PYTHON_MODNAME="${PN}2"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-setup.py.patch"
+	epatch "${FILESDIR}/${P}-begin-segfault.patch"
+	epatch "${FILESDIR}/${PN}-2.0.9-round-solaris.patch"
+
+	python_convert_shebangs 2 doc/src/tools/stitch_text.py
+
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die "sed failed"
+	fi
+
+	if use mxdatetime; then
+		sed -i 's/\(use_pydatetime=\)1/\10/' setup.cfg || die "sed failed"
+	fi
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd doc > /dev/null
+		emake -j1 html text || die "Generation of documentation failed"
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dodoc doc/psycopg2.txt || die "dodoc failed"
+
+		pushd doc/html > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _static || die "Installation of documentation failed"
+		popd > /dev/null
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/* || die "Installation of examples failed"
+	fi
+}