64bit compilation fixes; bug 133872; thanks to Denis Gubanov for the initial patch

Package-Manager: portage-2.1.2_pre2-r3

4 files changed, 62 insertions, 11 deletions

diff --git a/dev-db/metakit/ChangeLog b/dev-db/metakit/ChangeLog
index 6a4a12d57413..ff756589b47a 100644
--- a/dev-db/metakit/ChangeLog
+++ b/dev-db/metakit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/metakit
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.31 2006/07/13 02:22:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.32 2006/10/07 13:19:32 blubb Exp $
+
+  07 Oct 2006; Simon Stelling <blubb@gentoo.org>
+  +files/metakit-2.4.9.3-64bit.patch, metakit-2.4.9.3-r2.ebuild:
+  64bit compilation fixes; bug 133872; thanks to Denis Gubanov for the initial
+  patch
 
   13 Jul 2006; Aron Griffis <agriffis@gentoo.org> metakit-2.4.9.3-r2.ebuild:
   Mark 2.4.9.3-r2 stable on ia64
diff --git a/dev-db/metakit/Manifest b/dev-db/metakit/Manifest
index ec14039756db..5a1973fdd72d 100644
--- a/dev-db/metakit/Manifest
+++ b/dev-db/metakit/Manifest
@@ -1,3 +1,7 @@
+AUX metakit-2.4.9.3-64bit.patch 1402 RMD160 a62370b09168ae6420bb5c109aaf354a1409c869 SHA1 f074f989818addd8a5345f9a148e0893563facdd SHA256 28884685e4627cfbd8e6bf0c2f0d7304f7d9495b2d63da435a64376779c74093
+MD5 431f7768422602d6f9265b71321fdab9 files/metakit-2.4.9.3-64bit.patch 1402
+RMD160 a62370b09168ae6420bb5c109aaf354a1409c869 files/metakit-2.4.9.3-64bit.patch 1402
+SHA256 28884685e4627cfbd8e6bf0c2f0d7304f7d9495b2d63da435a64376779c74093 files/metakit-2.4.9.3-64bit.patch 1402
 DIST metakit-2.4.7-37.tar.gz 881371
 DIST metakit-2.4.9.2.tar.gz 869805
 DIST metakit-2.4.9.3.tar.gz 894808 RMD160 ea2cbec5247dde58ff657de9908db5229ae0e5f5 SHA1 466f062cbe467bc06a07f47a818af9ecfe4d121f SHA256 4d6c46289b1f1dea4e8bbc78332901491bde0c552727c27431ca9cb0234658da
@@ -9,14 +13,14 @@ EBUILD metakit-2.4.9.2-r1.ebuild 1499 RMD160 fffa6e339d1ca95200690d6aa4dd8851a98
 MD5 86ee030c6cbd46ef7c65f70265b45f67 metakit-2.4.9.2-r1.ebuild 1499
 RMD160 fffa6e339d1ca95200690d6aa4dd8851a98c855c metakit-2.4.9.2-r1.ebuild 1499
 SHA256 b8f492ee613e17d5faaebe49f7047704388fc1ec9b0e30269199bbfd43da5a49 metakit-2.4.9.2-r1.ebuild 1499
-EBUILD metakit-2.4.9.3-r2.ebuild 1625 RMD160 a1abb3bfcea3b742e1f846b85b1321701f7f6a02 SHA1 4effd178ea57d9514445240bc43c5bb9cf3c9b03 SHA256 949fe6b421b1cc06b153b504fb40588d57d7a94f1ad5014fa9375c18aa72c426
-MD5 9cb96fb79b47c2ea2b0d5fdfa8787ffb metakit-2.4.9.3-r2.ebuild 1625
-RMD160 a1abb3bfcea3b742e1f846b85b1321701f7f6a02 metakit-2.4.9.3-r2.ebuild 1625
-SHA256 949fe6b421b1cc06b153b504fb40588d57d7a94f1ad5014fa9375c18aa72c426 metakit-2.4.9.3-r2.ebuild 1625
-MISC ChangeLog 3704 RMD160 13417f0b73e6942e451d0e2b99384c059193786c SHA1 1e08b6c48639c390ca447bfe8dd31295db0157f1 SHA256 e1e4fb2396c669ee8f39461a03fcd3fd8f1c9915439ba5e9b940c1764d2d93c8
-MD5 a9e789c1bf2a753c359a38b23f867d2f ChangeLog 3704
-RMD160 13417f0b73e6942e451d0e2b99384c059193786c ChangeLog 3704
-SHA256 e1e4fb2396c669ee8f39461a03fcd3fd8f1c9915439ba5e9b940c1764d2d93c8 ChangeLog 3704
+EBUILD metakit-2.4.9.3-r2.ebuild 1669 RMD160 e19c1207ea600c49872a2b7dcc03c21804e0f248 SHA1 f0728091a006744552c74202743744862e316ef6 SHA256 c0619bfa8a5d7f40835a7d6f5a35026242fce294d57b790f5d0182d2f137f61f
+MD5 d5d31fdd08080354f68e372916e52e89 metakit-2.4.9.3-r2.ebuild 1669
+RMD160 e19c1207ea600c49872a2b7dcc03c21804e0f248 metakit-2.4.9.3-r2.ebuild 1669
+SHA256 c0619bfa8a5d7f40835a7d6f5a35026242fce294d57b790f5d0182d2f137f61f metakit-2.4.9.3-r2.ebuild 1669
+MISC ChangeLog 3903 RMD160 fdeaf0b842580964dc734d23c4de65c9b815d532 SHA1 c75222b18be73f30a2b5332852cb4fe1ada27ed8 SHA256 6fb7f7d36915a3a6e3bc2694bc7a799261f6d85e266c1cb95539afb48e49ffda
+MD5 3ea526288a98438bbc23d4435e4181f9 ChangeLog 3903
+RMD160 fdeaf0b842580964dc734d23c4de65c9b815d532 ChangeLog 3903
+SHA256 6fb7f7d36915a3a6e3bc2694bc7a799261f6d85e266c1cb95539afb48e49ffda ChangeLog 3903
 MD5 e045e605eab23d2201a5ba644558f6e7 files/digest-metakit-2.4.7.37 68
 RMD160 e364e2b9067b5ca90bb60100bb0a1dac27a67f74 files/digest-metakit-2.4.7.37 68
 SHA256 df74104be326823708343eec57991b1ffcdd703def50cff66abc094ec857452f files/digest-metakit-2.4.7.37 68
diff --git a/dev-db/metakit/files/metakit-2.4.9.3-64bit.patch b/dev-db/metakit/files/metakit-2.4.9.3-64bit.patch
new file mode 100644
index 000000000000..5b91a8995cf3
--- /dev/null
+++ b/dev-db/metakit/files/metakit-2.4.9.3-64bit.patch
@@ -0,0 +1,40 @@
+diff -Nur metakit-2.4.9.3-orig/python/PyRowRef.cpp metakit-2.4.9.3/python/PyRowRef.cpp
+--- metakit-2.4.9.3-orig/python/PyRowRef.cpp	2004-01-20 17:46:06.000000000 -0800
++++ metakit-2.4.9.3/python/PyRowRef.cpp	2006-07-03 23:40:57.000000000 -0700
+@@ -24,12 +24,12 @@
+ }
+ 
+ static int PyRowRef_print(PyRowRef *o, FILE *f, int) {
+-  fprintf(f, "<PyRowRef object at %x>", (int)o);
++  fprintf(f, "<PyRowRef object at %p>", (long)o);
+   return 0;
+ }
+ 
+ static int PyRORowRef_print(PyRowRef *o, FILE *f, int) {
+-  fprintf(f, "<PyRORowRef object at %x>", (int)o);
++  fprintf(f, "<PyRORowRef object at %p>", (long)o);
+   return 0;
+ }
+ 
+diff -Nur metakit-2.4.9.3-orig/python/PyView.cpp metakit-2.4.9.3/python/PyView.cpp
+--- metakit-2.4.9.3-orig/python/PyView.cpp	2004-01-20 17:46:06.000000000 -0800
++++ metakit-2.4.9.3/python/PyView.cpp	2006-07-03 23:40:57.000000000 -0700
+@@ -971,15 +971,15 @@
+ }
+ 
+ static int PyView_print(PyView *o, FILE *f, int) {
+-  fprintf(f, "<PyView object at %x>", (int)o);
++  fprintf(f, "<PyView object at %p", (long)o);
+   return 0;
+ }
+ static int PyViewer_print(PyView *o, FILE *f, int) {
+-  fprintf(f, "<PyViewer object at %x>", (int)o);
++  fprintf(f, "<PyViewer object at %p>", (long)o);
+   return 0;
+ }
+ static int PyROViewer_print(PyView *o, FILE *f, int) {
+-  fprintf(f, "<PyROViewer object at %x>", (int)o);
++  fprintf(f, "<PyROViewer object at %p>", (long)o);
+   return 0;
+ }
+ 
diff --git a/dev-db/metakit/metakit-2.4.9.3-r2.ebuild b/dev-db/metakit/metakit-2.4.9.3-r2.ebuild
index e8add1282698..7dea4a01fdad 100644
--- a/dev-db/metakit/metakit-2.4.9.3-r2.ebuild
+++ b/dev-db/metakit/metakit-2.4.9.3-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.3-r2.ebuild,v 1.19 2006/07/13 02:22:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.3-r2.ebuild,v 1.20 2006/10/07 13:19:32 blubb Exp $
 
-inherit python multilib
+inherit python multilib eutils
 
 DESCRIPTION="Embedded database library"
 HOMEPAGE="http://www.equi4.com/metakit/"
@@ -29,6 +29,8 @@ src_unpack() {
 	done
 	sed -i -e "s:python2.3:python${PYVER}:" unix/configure
 	sed -i -e "s:^\(CXXFLAGS = \).*:\1${CXXFLAGS}:" unix/Makefile.in
+
+	epatch "${FILESDIR}"/${P}-64bit.patch
 }
 
 src_compile() {