Added patch to fix python-2.5 compile issues on amd64 (fixes bug #192902).

Package-Manager: portage-2.1.3.9

4 files changed, 58 insertions, 10 deletions

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index cd7f9e797d4d..e9842e40110a 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/vmd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.16 2007/07/22 07:20:11 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.17 2007/09/20 21:44:50 markusle Exp $
+
+  20 Sep 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/vmd-1.8.6-python-2.5.patch, vmd-1.8.6.ebuild:
+  Added patch to fix python-2.5 compile issues on amd64 (fixes bug
+  #192902). Thanks much to milan hodoscek <milan@cmm.ki.si> for his
+  patch.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vmd-1.8.5.ebuild,
   vmd-1.8.6.ebuild:
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index 8cc0f385edde..ebde2af1ce02 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -6,20 +6,24 @@ AUX vmd-1.8.6-config-gentoo.patch 4666 RMD160 1fb149ab58292f42abbe4d658aff0334d3
 MD5 f71b1bfc5279a8654b3366e9d24f3ccf files/vmd-1.8.6-config-gentoo.patch 4666
 RMD160 1fb149ab58292f42abbe4d658aff0334d3fe73f9 files/vmd-1.8.6-config-gentoo.patch 4666
 SHA256 6dc232ee1c01a56bb94bdf193f024e868f957a22b6c1c8666d2d443801a36f03 files/vmd-1.8.6-config-gentoo.patch 4666
+AUX vmd-1.8.6-python-2.5.patch 860 RMD160 4f9f83800e0f5083fcd32a016404c909da4042a6 SHA1 bb401cccbb18428cc0fdce5cf4b5fd3a910a9cea SHA256 652e5dbb44d2c14c13886e9e7bc2677287bfdd520e7489547cffc2331b39d7ec
+MD5 fef2a5b1364f08f40ff28e2d6a1eea60 files/vmd-1.8.6-python-2.5.patch 860
+RMD160 4f9f83800e0f5083fcd32a016404c909da4042a6 files/vmd-1.8.6-python-2.5.patch 860
+SHA256 652e5dbb44d2c14c13886e9e7bc2677287bfdd520e7489547cffc2331b39d7ec files/vmd-1.8.6-python-2.5.patch 860
 DIST vmd-1.8.5.src.tar.gz 17106456 RMD160 70087a42ae20180f2ed18cc4492764ed24b19aa4 SHA1 c3da36d75262b75423ddd2a07c17415b9859504a SHA256 208d7829e4fc2744e30c778e1485b96d35018b1e0dbc02388630ce4a2733c30b
 DIST vmd-1.8.6.src.tar.gz 18045341 RMD160 66f8ee5a0313000ea8dd3cb79881fd26a2836a79 SHA1 62ceaab06c7fec7c2c8e9a2d7f08c83ba662679d SHA256 fe2bcf7ffea1ed6b3a7f2402d6e1cb1d6def588a8b09a5d0943c0a9f3426ead2
 EBUILD vmd-1.8.5.ebuild 4093 RMD160 b1a9eab2a380ae1b98d03fd8eea86821e0e55cde SHA1 5a0103ad70e513c7b0c87d2fc4a0f38d80ef589f SHA256 2d3773665703ac9dda1b8d51c9ab37f6e8baf48328a300d5e19c23a8dd7c0347
 MD5 78bf753d233a00ff3f71a94bc7937e02 vmd-1.8.5.ebuild 4093
 RMD160 b1a9eab2a380ae1b98d03fd8eea86821e0e55cde vmd-1.8.5.ebuild 4093
 SHA256 2d3773665703ac9dda1b8d51c9ab37f6e8baf48328a300d5e19c23a8dd7c0347 vmd-1.8.5.ebuild 4093
-EBUILD vmd-1.8.6.ebuild 3931 RMD160 a85e0a961b3d82c24c8a080a43f24f458a786871 SHA1 84d06d055cbeefba84c1f86a21196616ae393043 SHA256 9f4f60a30ceb1f7248fcc4b7c56350b35cf1e03b83c00ffce69cfedb155576e2
-MD5 0ab7634e0804e30bf59e30a14fb9858a vmd-1.8.6.ebuild 3931
-RMD160 a85e0a961b3d82c24c8a080a43f24f458a786871 vmd-1.8.6.ebuild 3931
-SHA256 9f4f60a30ceb1f7248fcc4b7c56350b35cf1e03b83c00ffce69cfedb155576e2 vmd-1.8.6.ebuild 3931
-MISC ChangeLog 3014 RMD160 2853f321ba27087b8a4f86948aeb8016b7f39854 SHA1 f7c6d0a4f6af2772be65f9c494517a13db67ad7d SHA256 f0f1c6edd5505ec3d535d8f99ceece7eada18dcb0ddc9d15ee6454e90bde1563
-MD5 b82919a555ead5f5164c8d8eab4f54b4 ChangeLog 3014
-RMD160 2853f321ba27087b8a4f86948aeb8016b7f39854 ChangeLog 3014
-SHA256 f0f1c6edd5505ec3d535d8f99ceece7eada18dcb0ddc9d15ee6454e90bde1563 ChangeLog 3014
+EBUILD vmd-1.8.6.ebuild 3974 RMD160 5f2b5f7352ea1f10e0e20d6012c635da021fb107 SHA1 c8c194384933492950f08b8b8e7725ce5689629d SHA256 1fc52ba568296d1d5e6a6f9b643fd61a28349802c5fc81833a0d492c563f2a87
+MD5 dd97f37c91977ad59ca4a31cd7607924 vmd-1.8.6.ebuild 3974
+RMD160 5f2b5f7352ea1f10e0e20d6012c635da021fb107 vmd-1.8.6.ebuild 3974
+SHA256 1fc52ba568296d1d5e6a6f9b643fd61a28349802c5fc81833a0d492c563f2a87 vmd-1.8.6.ebuild 3974
+MISC ChangeLog 3266 RMD160 a1b90a1a91b9ef92d0b63aa0efcf32b3ebcd2900 SHA1 c7008e765c09183020919c9ae29e2d8fcb9d8f62 SHA256 262483c189777096c46bae90fdf6ec4c04699f5cbb572d21040a8db1b1876a73
+MD5 14e8e54010690c4884df2c359c0a3464 ChangeLog 3266
+RMD160 a1b90a1a91b9ef92d0b63aa0efcf32b3ebcd2900 ChangeLog 3266
+SHA256 262483c189777096c46bae90fdf6ec4c04699f5cbb572d21040a8db1b1876a73 ChangeLog 3266
 MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349
 MD5 cf7436fe44a27481d1001082eb06326e metadata.xml 282
 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 metadata.xml 282
diff --git a/sci-chemistry/vmd/files/vmd-1.8.6-python-2.5.patch b/sci-chemistry/vmd/files/vmd-1.8.6-python-2.5.patch
new file mode 100644
index 000000000000..ad8d0ae9b51a
--- /dev/null
+++ b/sci-chemistry/vmd/files/vmd-1.8.6-python-2.5.patch
@@ -0,0 +1,37 @@
+--- vmd-1.8.6/src/py_atomsel.C	2007-04-08 07:04:03.000000000 +0200
++++ vmd-1.8.6.new/src/py_atomsel.C	2007-09-20 19:30:41.000000000 +0200
+@@ -25,6 +25,10 @@
+ #include "py_commands.h"
+ #include "BondSearch.h"
+ 
++#if PY_VERSION_HEX < ((2<<24)|(5<<16))
++typedef int Py_ssize_t;
++#endif
++
+ typedef struct {
+   PyObject_HEAD
+   AtomSel *atomSel;
+@@ -915,9 +919,11 @@
+  * Support for mapping protocol 
+  */
+ 
+-static int
+-atomselection_length( PyAtomSelObject *a ) {
+-  return a->atomSel->selected;
++
++static Py_ssize_t
++atomselection_length(PyObject *a)
++{
++  return ((PyAtomSelObject *)a)->atomSel->selected;
+ }
+ 
+ // for integer argument, return True or False if index in in selection
+@@ -935,7 +941,7 @@
+ }
+ 
+ static PyMappingMethods atomsel_mapping = {
+-  (inquiry)atomselection_length,
++  atomselection_length,
+   (binaryfunc)atomselection_subscript,
+   0
+ };
diff --git a/sci-chemistry/vmd/vmd-1.8.6.ebuild b/sci-chemistry/vmd/vmd-1.8.6.ebuild
index bb30cb8352c3..79718275dac0 100644
--- a/sci-chemistry/vmd/vmd-1.8.6.ebuild
+++ b/sci-chemistry/vmd/vmd-1.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.6.ebuild,v 1.4 2007/07/22 07:20:11 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.6.ebuild,v 1.5 2007/09/20 21:44:50 markusle Exp $
 
 inherit eutils toolchain-funcs python
 
@@ -41,6 +41,7 @@ src_unpack() {
 
 	# apply LINUX-arch patches to vmd configure
 	epatch "${FILESDIR}"/${P}-config-gentoo.patch
+	epatch "${FILESDIR}"/${P}-python-2.5.patch
 
 	# prepare the plugins