Fix compatibility with Python 3.1.3 (bug #344831).

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

4 files changed, 101 insertions, 14 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/Manifest b/dev-python/pycxx/Manifest
index 6c3b95b8e430..f734ea9adb6d 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pycxx-6.1.0-C_compatible_headers.patch 1213 RMD160 a12fc8aef17e1ddac6cb653a4eb1014461a59852 SHA1 c13d9459ba7397985b26b1beddc5ba5fa1067609 SHA256 83bd693b9b293a90e81cfa6af23421165faf04a4f7849472d42b72acb9a23efa
 AUX pycxx-6.1.0-python-3.patch 398 RMD160 0610322f137c6a587b581b9681fe0712ebdacdb9 SHA1 0a98ac0686f363d3f44d1235ce6f6ecd3e7e70e2 SHA256 6d23ce38343e86c62edf56e08837a199bd71f2b686446e3399be5ac4b7dd2ed4
 AUX pycxx-6.1.0-setup.py.patch 1390 RMD160 7fbf6530f49bb97614fdc69c3a8e751e6b602526 SHA1 2cfed58ab995cf34bc29f74fc11774e3f9613c1b SHA256 7571d6c99d464bfb92a8eaeafec59610bb50fcea147b71722ff94fd90e3a4aa9
-DIST pycxx-6.1.0.tar.gz 147567 RMD160 41b6a3f276e9bcb4f089ac5dc172c2ab9a6d8adc SHA1 136d14218927cbd455279f0272c19760ba2846d4 SHA256 42e96818f48339a131bffe524ab86ccdaf3d28dfc02247fbad216b9cb01f3bb0
+AUX pycxx-6.2.1-python-3.1.3.patch 2572 RMD160 130ce76aad330389ccccc0473fc5b2acbf28f03f SHA1 810c8a3dd8929eaef42f5c7901b188396e4222a1 SHA256 ad459013befc38a5166d635822b08b8f7979c2b55719360fec4d83fe02bd62bc
 DIST pycxx-6.1.1.tar.gz 148764 RMD160 4898500c37eed095149e14e975c0aa0eb6f32809 SHA1 99e6ad2e09c4ff282504ee1719425ed2f63fdc71 SHA256 9df98052f33ef75ff0f756b184b54d8c65595a1394e580eeade7fcf31242ba9f
 DIST pycxx-6.2.1.tar.gz 144162 RMD160 5549ec039b66d9c20d5fce8e16e38c81bedfbc88 SHA1 ec260197805c19e7cd9af7a371b5c4585554e566 SHA256 2f6c8b49a29aeece56c226d419998dca8f99af4d24b4092fa09f4878c72135a5
-EBUILD pycxx-6.1.0.ebuild 1067 RMD160 53aff6b761610b64295dc8a63ea69e19b39344cd SHA1 7e6d432eb5525811f5257a778af1f73dca5ea19c SHA256 955130e858cff25e2b29c81f8e815ffc8d7df540608adfc68a8acd58f9fd702f
 EBUILD pycxx-6.1.1.ebuild 1103 RMD160 2c60007abcbc17a70af50fe3a4b43d5c9b88b6ce SHA1 92914f820d01be2662b5ca6fbb763a619dbdd5c9 SHA256 56013da733f2dc138c0ef86297ad6327420ddd305065b342a14faf4c8e1a8442
+EBUILD pycxx-6.2.1-r1.ebuild 1195 RMD160 44950c43682c76186a7ae3419e85f1a29130b29e SHA1 317a9922ccc7b514798c31c07d0533fb96bca503 SHA256 1a074995e912e9d094dae21addccb1cf15f1e622cf8e7967655d806f8448b45b
 EBUILD pycxx-6.2.1.ebuild 1110 RMD160 ed95d4b50bc16945d8e8193334b2099ae36593a0 SHA1 f59769125569517d42dd532f295d972131918020 SHA256 3a2dd07f07398399bc3037556fc04cf06e296979a7318beee41dc5f06866c628
-MISC ChangeLog 2402 RMD160 0ece28ec83379a724332d9869bd2501e3d821236 SHA1 5e995a51b85fc091c1d4128cc24618adaada20e4 SHA256 10c3233c460b4a629eb12ac18b422a15774512bf0789be3e279a40e728382f0e
+MISC ChangeLog 2650 RMD160 918385c21236960bfe7fb705a2ee3a99073cb587 SHA1 85053bd6fb2ae0edfc0627d2821b28144465ed86 SHA256 3bf4ec08cbe3d255e4f472be3770c7f75d3f394a8d86709db2af85414c7f24d3
 MISC metadata.xml 556 RMD160 58bf795f79850d5844f4c324bb9b01e5a7f3cfe6 SHA1 240a0b1d1f74321c3eb5eab5676dd0eafe824911 SHA256 cb33179b683664b2fdfce0dbc687c7816bc2d15417aeb7025db6c50063cdc3ab
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzSqLMACgkQkKaRLQcq0GJfWACeIl8colRa3MuPYOgnqYUuA2RJ
-QvEAoJVky7xW+4TsWa3YYpOqEP8w60UK
-=sL/Z
------END PGP SIGNATURE-----
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
+}