Fix compatibility with Python 3.1.3 (bug #344831).

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)

3 files changed, 98 insertions, 1 deletions

diff --git a/dev-python/pycxx/ChangeLog b/dev-python/pycxx/ChangeLog
index f9d42f756d2e..9b6980f704b4 100644
--- a/dev-python/pycxx/ChangeLog
+++ b/dev-python/pycxx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pycxx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/ChangeLog,v 1.18 2010/11/04 12:37:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/ChangeLog,v 1.19 2010/11/28 17:40:18 arfrever Exp $
+
+*pycxx-6.2.1-r1 (28 Nov 2010)
+
+  28 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pycxx-6.1.0.ebuild, +pycxx-6.2.1-r1.ebuild,
+  +files/pycxx-6.2.1-python-3.1.3.patch:
+  Fix compatibility with Python 3.1.3 (bug #344831).
 
   04 Nov 2010; Markus Meier <maekke@gentoo.org> pycxx-6.2.1.ebuild:
   x86 stable, bug #343381
diff --git a/dev-python/pycxx/files/pycxx-6.2.1-python-3.1.3.patch b/dev-python/pycxx/files/pycxx-6.2.1-python-3.1.3.patch
new file mode 100644
index 000000000000..0fc8871efff3
--- /dev/null
+++ b/dev-python/pycxx/files/pycxx-6.2.1-python-3.1.3.patch
@@ -0,0 +1,47 @@
+http://cxx.svn.sourceforge.net/viewvc?view=revision&revision=250
+
+--- CXX/Python3/IndirectPythonInterface.hxx
++++ CXX/Python3/IndirectPythonInterface.hxx
+@@ -78,8 +78,6 @@
+ PyObject * _Exc_WindowsError();
+ #endif
+ 
+-PyObject * _Exc_MemoryErrorInst();
+-
+ PyObject * _Exc_IndentationError();
+ PyObject * _Exc_TabError();
+ PyObject * _Exc_UnboundLocalError();
+--- Src/Python3/IndirectPythonInterface.cxx
++++ Src/Python3/IndirectPythonInterface.cxx
+@@ -80,7 +80,6 @@
+ static PyObject *ptr__Exc_KeyError = NULL;
+ static PyObject *ptr__Exc_LookupError = NULL;
+ static PyObject *ptr__Exc_MemoryError = NULL;
+-static PyObject *ptr__Exc_MemoryErrorInst = NULL;
+ static PyObject *ptr__Exc_NameError = NULL;
+ static PyObject *ptr__Exc_NotImplementedError = NULL;
+ static PyObject *ptr__Exc_OSError = NULL;
+@@ -245,7 +244,6 @@
+     ptr__Exc_KeyError           = GetPyObjectPointer_As_PyObjectPointer( "PyExc_KeyError" );
+     ptr__Exc_LookupError        = GetPyObjectPointer_As_PyObjectPointer( "PyExc_LookupError" );
+     ptr__Exc_MemoryError        = GetPyObjectPointer_As_PyObjectPointer( "PyExc_MemoryError" );
+-    ptr__Exc_MemoryErrorInst    = GetPyObjectPointer_As_PyObjectPointer( "PyExc_MemoryErrorInst" );
+     ptr__Exc_NameError          = GetPyObjectPointer_As_PyObjectPointer( "PyExc_NameError" );
+     ptr__Exc_NotImplementedError= GetPyObjectPointer_As_PyObjectPointer( "PyExc_NotImplementedError" );
+     ptr__Exc_OSError            = GetPyObjectPointer_As_PyObjectPointer( "PyExc_OSError" );
+@@ -318,7 +316,6 @@
+ PyObject *_Exc_KeyError()               { return ptr__Exc_KeyError; }
+ PyObject *_Exc_LookupError()            { return ptr__Exc_LookupError; }
+ PyObject *_Exc_MemoryError()            { return ptr__Exc_MemoryError; }
+-PyObject *_Exc_MemoryErrorInst()        { return ptr__Exc_MemoryErrorInst; }
+ PyObject *_Exc_NameError()              { return ptr__Exc_NameError; }
+ PyObject *_Exc_NotImplementedError()    { return ptr__Exc_NotImplementedError; }
+ PyObject *_Exc_OSError()                { return ptr__Exc_OSError; }
+@@ -449,7 +446,6 @@
+ PyObject *_Exc_KeyError()               { return ::PyExc_KeyError; }
+ PyObject *_Exc_LookupError()            { return ::PyExc_LookupError; }
+ PyObject *_Exc_MemoryError()            { return ::PyExc_MemoryError; }
+-PyObject *_Exc_MemoryErrorInst()        { return ::PyExc_MemoryErrorInst; }
+ PyObject *_Exc_NameError()              { return ::PyExc_NameError; }
+ PyObject *_Exc_NotImplementedError()    { return ::PyExc_NotImplementedError; }
+ PyObject *_Exc_OSError()                { return ::PyExc_OSError; }
diff --git a/dev-python/pycxx/pycxx-6.2.1-r1.ebuild b/dev-python/pycxx/pycxx-6.2.1-r1.ebuild
new file mode 100644
index 000000000000..91682dd4a2bd
--- /dev/null
+++ b/dev-python/pycxx/pycxx-6.2.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/pycxx-6.2.1-r1.ebuild,v 1.1 2010/11/28 17:40:18 arfrever 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="doc examples"
+
+PYTHON_MODNAME="CXX"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-6.1.0-setup.py.patch"
+	epatch "${FILESDIR}/${PN}-6.1.0-python-3.patch"
+	epatch "${FILESDIR}/${PN}-6.1.0-C_compatible_headers.patch"
+	epatch "${FILESDIR}/${P}-python-3.1.3.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
+}