Add patch to fix the hash_handler prototype under python-3.2. Should resolve bug 369329.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 88 insertions, 7 deletions

diff --git a/dev-python/pycxx/ChangeLog b/dev-python/pycxx/ChangeLog
index 339b2ac97587..3b030ce484b0 100644
--- a/dev-python/pycxx/ChangeLog
+++ b/dev-python/pycxx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pycxx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/ChangeLog,v 1.35 2011/11/29 11:04:25 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/ChangeLog,v 1.36 2011/12/23 05:30:44 floppym Exp $
+
+*pycxx-6.2.3-r3 (23 Dec 2011)
+
+  23 Dec 2011; Mike Gilbert <floppym@gentoo.org>
+  +files/pycxx-6.2.3-python-3.2-Py_hash_t.patch, +pycxx-6.2.3-r3.ebuild:
+  Add patch to fix the hash_handler prototype under python-3.2. Should resolve
+  bug 369329.
 
   29 Nov 2011; Naohiro Aota <naota@gentoo.org> pycxx-6.2.3-r2.ebuild:
   Add ~x86-fbsd
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index fc47e8c13404..04200136b918 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX pycxx-6.2.3-installation.patch 1248 RMD160 ec0d6925e21af0c1e2125a1f90da50bb09040202 SHA1 0c47e86288c3134377aa8cd17966c3ac8031ddc8 SHA256 f6c47b1d613b01511e55cefbc0e0564c402374fc0a4340848f712011b416f7de
+AUX pycxx-6.2.3-python-3.2-Py_hash_t.patch 789 RMD160 e3718fc6e050a63962cfcfa78fdcde82d51d3a3a SHA1 eee7adbaaaea5a291332dc607783c461d11abd71 SHA256 23bd9b924315ea9b644989da2a674aa5272d499aca479188b636fb55a087a322
 AUX pycxx-6.2.3-python-3.2.patch 10198 RMD160 088351084a352d79ab8702ff98f5cb81543d5f01 SHA1 9cbca97c6868225cf6b47179306551e93d4c7d13 SHA256 9a7cd9946a815d27631cb92afead183adf2652798df5c92058518f999164dbbc
 AUX pycxx-6.2.3-python-3.patch 1063 RMD160 23aed53bf8e04df6171306c2e398b6c0676b854e SHA1 7177044874e96d270c10ae3313cf61e1f02c9d8a SHA256 3a06d5841d2f8e1dfa65b7d7197e8d72df652688956bc22d724aa89064612792
 DIST pycxx-6.2.3.tar.gz 140787 RMD160 8f39efc0dc86f75a394172be232b10f5aead1368 SHA1 12245dd18e3bd1d5dc4190d01eba6dd31ff39c07 SHA256 74b89aec29f3fc40ce08b402f05bb6955f6546a796d2aeb3193737a268f6a4f2
 EBUILD pycxx-6.2.3-r2.ebuild 1132 RMD160 c73317bbb467530cfe2d5eab13b5e8f3abe6e453 SHA1 2c23b638e23c7011a6a82d089daae081f1295a5e SHA256 254137f264ed7a93e8ce451db639f0fc52f86cbe5df99d1ecabf62fd3a382a92
-MISC ChangeLog 4755 RMD160 147311125be7c87e0925147459c7a15a661447f8 SHA1 aaea8d706bbe9b33691761a1b1ec21d6934743a8 SHA256 87cc18db19026c35afb2d0e0a95b3e39ea532540e76101e33c85ec7b4eb0a48a
+EBUILD pycxx-6.2.3-r3.ebuild 1207 RMD160 53a89428b4276b4f78f264578280939fad3e131e SHA1 c00dd7e3a8860d7c726da8458f9410a8f7cd51fb SHA256 a5b63e0992a7853c8dc1c5180a1e005814af1e1a94df8645df0848a66f3e781b
+MISC ChangeLog 5004 RMD160 66ede1407667de62a21121bc96aa6673e5cf1a09 SHA1 e24e1426629b5d64e10d8168f6e059ee1ef17ca5 SHA256 0a5cb80b03e2a5c0f7a4afe304df6bb1ccee765f5d661f6d5e6d2cd9ff355aef
 MISC metadata.xml 556 RMD160 58bf795f79850d5844f4c324bb9b01e5a7f3cfe6 SHA1 240a0b1d1f74321c3eb5eab5676dd0eafe824911 SHA256 cb33179b683664b2fdfce0dbc687c7816bc2d15417aeb7025db6c50063cdc3ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (FreeBSD)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7UvEMACgkQGpDnPLSHuMDoIwCgrKCQ3kpJaCZ5LwABJywfQFgQ
-7RcAn2sCLibKokTPjjOH+gk8OL/w5Sim
-=cVSH
+iF4EAREIAAYFAk70EgoACgkQC77qH+pIQ6S/VQD/Tdo4ERBp8MMD1Gly3M2TZE4R
+pROgLpahtsMjU8AJzhwA/jpImVh7gbitmBkM8zamznJaLzRBS7PTVP9eeN9gOj1Q
+=2aDl
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycxx/files/pycxx-6.2.3-python-3.2-Py_hash_t.patch b/dev-python/pycxx/files/pycxx-6.2.3-python-3.2-Py_hash_t.patch
new file mode 100644
index 000000000000..6b9d54d3a477
--- /dev/null
+++ b/dev-python/pycxx/files/pycxx-6.2.3-python-3.2-Py_hash_t.patch
@@ -0,0 +1,26 @@
+--- Src/Python3/cxx_extensions.cxx
++++ Src/Python3/cxx_extensions.cxx
+@@ -225,7 +225,11 @@
+     static PyObject *rich_compare_handler( PyObject *, PyObject *, int );
+     static PyObject *repr_handler( PyObject * );
+     static PyObject *str_handler( PyObject * );
++#if PY_VERSION_HEX >= 0x03020000
++    static Py_hash_t hash_handler( PyObject * );
++#else
+     static long hash_handler( PyObject * );
++#endif
+     static PyObject *call_handler( PyObject *, PyObject *, PyObject * );
+     static PyObject *iter_handler( PyObject * );
+     static PyObject *iternext_handler( PyObject * );
+@@ -714,7 +718,11 @@
+     }
+ }
+ 
++#if PY_VERSION_HEX >= 0x03020000
++extern "C" Py_hash_t hash_handler( PyObject *self )
++#else
+ extern "C" long hash_handler( PyObject *self )
++#endif
+ {
+     try
+     {
diff --git a/dev-python/pycxx/pycxx-6.2.3-r3.ebuild b/dev-python/pycxx/pycxx-6.2.3-r3.ebuild
new file mode 100644
index 000000000000..8d6fc612fe6d
--- /dev/null
+++ b/dev-python/pycxx/pycxx-6.2.3-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/pycxx-6.2.3-r3.ebuild,v 1.1 2011/12/23 05:30:44 floppym Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit eutils distutils
+
+DESCRIPTION="Set of facilities to extend Python with C++"
+HOMEPAGE="http://cxx.sourceforge.net"
+SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="doc examples"
+
+PYTHON_MODNAME="CXX"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python-3.patch"
+	epatch "${FILESDIR}/${P}-installation.patch"
+	epatch "${FILESDIR}/${P}-python-3.2.patch"
+
+	# Bug 369329.
+	epatch "${FILESDIR}/${P}-python-3.2-Py_hash_t.patch"
+
+	sed -e "/^#include/s:/Python[23]/:/:" -i CXX/*/*.hxx || die "sed failed"
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r Doc/ || die "dohtml failed"
+	fi
+
+	if use examples; then
+		docinto examples/python-2
+		dodoc Demo/Python2/* || die "dodoc failed"
+		docinto examples/python-3
+		dodoc Demo/Python3/* || die "dodoc failed"
+	fi
+}