Added patch to fix compile problems with python-2.5 (see bug #148727).

Package-Manager: portage-2.1.2_pre1

4 files changed, 32 insertions, 10 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index b380b6c75d6f..86366272de73 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.23 2006/09/08 15:15:13 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.24 2006/09/24 16:47:49 markusle Exp $
+
+  23 Sep 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/vtk-5.0.1-python2.5-gentoo.patch, vtk-5.0.1.ebuild:
+  Added patch to fix compile problems with python-2.5 
+  (see bug #148727).
 
   08 Sep 2006; Markus Dittrich <markusle@gentoo.org>
   +files/vtk-qt-gentoo.patch, -files/vtk-qt3-qt4-gentoo.patch,
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index cd223b65012f..cbb589c3a19a 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,3 +1,7 @@
+AUX vtk-5.0.1-python2.5-gentoo.patch 419 RMD160 1efc90044670b8b57903a5374a73e566bf11879f SHA1 fb686e6d3f64a297cfcfc8375ee7e3d7e01146d2 SHA256 b548640a70834ef8d8d6e738b5d407d133135903789de35ef7e9fcf9ef1314d2
+MD5 789db4f040cbaffcc7a92a835bb24d2c files/vtk-5.0.1-python2.5-gentoo.patch 419
+RMD160 1efc90044670b8b57903a5374a73e566bf11879f files/vtk-5.0.1-python2.5-gentoo.patch 419
+SHA256 b548640a70834ef8d8d6e738b5d407d133135903789de35ef7e9fcf9ef1314d2 files/vtk-5.0.1-python2.5-gentoo.patch 419
 AUX vtk-qt-gentoo.patch 593 RMD160 29e308fb44d79c8f204c47e508da909a390637af SHA1 769b7bffa534ce66be373e04bad169beeca2c3a9 SHA256 7976a5a10bb8f9621077841f8582fcc309837976266f353b3a3e9880d208eefd
 MD5 ad3de5a28c8340c62a91d856af824772 files/vtk-qt-gentoo.patch 593
 RMD160 29e308fb44d79c8f204c47e508da909a390637af files/vtk-qt-gentoo.patch 593
@@ -10,14 +14,14 @@ EBUILD vtk-5.0.0.ebuild 8300 RMD160 8d2f670facc686f412bf3ae84a1605254fe38fbc SHA
 MD5 b451e375708d756200e6f0d3932ae0d0 vtk-5.0.0.ebuild 8300
 RMD160 8d2f670facc686f412bf3ae84a1605254fe38fbc vtk-5.0.0.ebuild 8300
 SHA256 6809be0190b7d68febf77f8c44d6d0d90bbb4c6e7f58033e3de23de0c7daeffd vtk-5.0.0.ebuild 8300
-EBUILD vtk-5.0.1.ebuild 8354 RMD160 25cb06a4af04042bc934f6a011be065092ea74c3 SHA1 f674ac2bf48f68a8e83634026daa64e09f9e1f2a SHA256 06de68d13340fc2f3be40ce4d0739cd01fd076611c8c3a84405a4cd240a1d49f
-MD5 b9d893e60af5140ceb228bb8a31f6e08 vtk-5.0.1.ebuild 8354
-RMD160 25cb06a4af04042bc934f6a011be065092ea74c3 vtk-5.0.1.ebuild 8354
-SHA256 06de68d13340fc2f3be40ce4d0739cd01fd076611c8c3a84405a4cd240a1d49f vtk-5.0.1.ebuild 8354
-MISC ChangeLog 4347 RMD160 a76163df105e471869c544f7d101d4f6c3e469be SHA1 f4bfdd2fd09befcbf42b7211df06ef1ea9d40310 SHA256 8518add4489ff9be3552788b824a4814e8d1df0d08b1be1abfee983275d0d6fa
-MD5 23c7666df2123eb45c735f163c066d7d ChangeLog 4347
-RMD160 a76163df105e471869c544f7d101d4f6c3e469be ChangeLog 4347
-SHA256 8518add4489ff9be3552788b824a4814e8d1df0d08b1be1abfee983275d0d6fa ChangeLog 4347
+EBUILD vtk-5.0.1.ebuild 8404 RMD160 bf98cf02340b5fdc1dffd9faab837a38ac641ade SHA1 0c58d2221350a9198ee3479c78718935ffa5a0e6 SHA256 a85d41f01bb4ca7f37c973e4d1a4cd5c1d2a13d29a951e83f5117fd6ce65890d
+MD5 45d3bcca2965055bcd9ac5f5ff8998d3 vtk-5.0.1.ebuild 8404
+RMD160 bf98cf02340b5fdc1dffd9faab837a38ac641ade vtk-5.0.1.ebuild 8404
+SHA256 a85d41f01bb4ca7f37c973e4d1a4cd5c1d2a13d29a951e83f5117fd6ce65890d vtk-5.0.1.ebuild 8404
+MISC ChangeLog 4538 RMD160 cbc7088714072ba08f362112feda9e0c87a47a71 SHA1 904dd68b4146c366f80fa51d5b305d7436b82f0d SHA256 db99c64c867fbb9f57ff78f7fd0164bab21dd087850c43e313ba5321474ae819
+MD5 9015b985919eee15d79dd4337497f0fc ChangeLog 4538
+RMD160 cbc7088714072ba08f362112feda9e0c87a47a71 ChangeLog 4538
+SHA256 db99c64c867fbb9f57ff78f7fd0164bab21dd087850c43e313ba5321474ae819 ChangeLog 4538
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254
 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254
diff --git a/sci-libs/vtk/files/vtk-5.0.1-python2.5-gentoo.patch b/sci-libs/vtk/files/vtk-5.0.1-python2.5-gentoo.patch
new file mode 100644
index 000000000000..c1abcd7254ad
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.0.1-python2.5-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Naur VTK/Common/vtkPythonUtil.cxx VTK-new/Common/vtkPythonUtil.cxx
+--- VTK/Common/vtkPythonUtil.cxx	2005-08-04 12:19:14.000000000 -0400
++++ VTK-new/Common/vtkPythonUtil.cxx	2006-09-23 11:16:06.000000000 -0400
+@@ -768,7 +768,7 @@
+     }
+   if (strcmp(name, "__doc__") == 0)
+     {
+-    char *doc = t->tp_doc;
++    const char *doc = t->tp_doc;
+     if (doc != NULL)
+       {
+       return PyString_FromString(doc);
diff --git a/sci-libs/vtk/vtk-5.0.1.ebuild b/sci-libs/vtk/vtk-5.0.1.ebuild
index 90c6937ba214..7f1e75064621 100644
--- a/sci-libs/vtk/vtk-5.0.1.ebuild
+++ b/sci-libs/vtk/vtk-5.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.1.ebuild,v 1.3 2006/09/08 15:15:13 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.1.ebuild,v 1.4 2006/09/24 16:47:49 markusle Exp $
 
 # TODO: need to fix Examples/CMakeLists.txt to build other examples
 
@@ -53,6 +53,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-qt-gentoo.patch
+	epatch "${FILESDIR}"/${P}-python2.5-gentoo.patch
 }
 
 src_compile() {