Fix a runtime error on amd64

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 21 insertions, 14 deletions

diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog
index 0a3e5bcc2f49..9fdc3bb48c1a 100644
--- a/app-misc/geneweb/ChangeLog
+++ b/app-misc/geneweb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/geneweb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.15 2011/09/28 08:09:15 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.16 2011/09/29 07:02:31 tupone Exp $
+
+  29 Sep 2011; Alfredo Tupone <tupone@gentoo.org> geneweb-5.02.ebuild,
+  +files/geneweb-5.02-amd64.patch:
+  Fix a runtime error on amd64
 
   28 Sep 2011; Alfredo Tupone <tupone@gentoo.org> files/geneweb.initd:
   Updated the initd file, avoiding warning at startup
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 9da7fd00f3b1..f440d1bd7b4d 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX geneweb-5.01-gentoo.patch 781 RMD160 08685f5705220be0109ad6bd34d1cef646d3caf7 SHA1 67d237ffc2d0c3493bc81c4aecaa393b86c2d92d SHA256 350e51a521ccac1790b5fc901b9ba51c2f884d16063ae7520cc4f7d2545a4545
+AUX geneweb-5.02-amd64.patch 447 RMD160 1f89936c184b1b6e16846c39583b6060dd9e2d0f SHA1 7114a89ac8b4cb35e6be1c71becc73586852994c SHA256 b72d2102a72ac38871e12833652e1b784e898aa5e668b913c237c2e4c0de06b5
 AUX geneweb-5.02-gentoo.patch 781 RMD160 08685f5705220be0109ad6bd34d1cef646d3caf7 SHA1 67d237ffc2d0c3493bc81c4aecaa393b86c2d92d SHA256 350e51a521ccac1790b5fc901b9ba51c2f884d16063ae7520cc4f7d2545a4545
 AUX geneweb-5.02-parallellbuild.patch 368 RMD160 71e529b9b69d5619cb5f13dd9857e00384ddaf07 SHA1 370045d1391942ef13f2bc3b269f091f495a1687 SHA256 1f2c2c95b25c25f22566662e0463131e37775c43504df0d224a8b4cfe0e7d071
 AUX geneweb.confd 67 RMD160 4de8a9e76c426dc7435d197bef470ea369be3b1d SHA1 a20103555d17633fc08dfc442e746d4fe117867b SHA256 0b2044dc633d95f953b9af6964a54c07d60784dda03c970dba97ca1026c016f1
@@ -9,13 +7,6 @@ AUX geneweb.initd 539 RMD160 28836a9cec76c55686914cc6dbfacde87805c7ca SHA1 43b04
 DIST geneweb-5.01.tgz 1388008 RMD160 75507bb35df74b92becc8514c9ad82c8f4ef886e SHA1 4443b12d88cc8a6fa04ae903ace3f7bdb384d40e SHA256 dcc6b2ea4659e8dc816ab3ea573d9177bdd83597c36d8628f9ce1dbc30a28e6c
 DIST geneweb-5.02.tgz 1419164 RMD160 fd284630e11957cf1265bfce9207e46d449a83ec SHA1 e040496b3ce106cc7a508360cd0e4268bcb3e7b1 SHA256 8be9ce98883043d5e6e1e473e3bb3c2c18920cd6ad60192e859101f472385704
 EBUILD geneweb-5.01-r1.ebuild 2250 RMD160 8ad5c91171d2002c3212661e5f00355c63d05d95 SHA1 ac21cd20862dc25b387bfaa987cfa164d291f827 SHA256 64f1ab7e7ce1e4ec7acdeed1d91059e0e88867e7fdf524b3c48a01b7977f2a88
-EBUILD geneweb-5.02.ebuild 2284 RMD160 e95efde2358907cba8a0b2df8098f27af9005ffe SHA1 4054774322e6c9638e329006486c0d3f1ceecadb SHA256 c3d8dca213ca3ddb49f3f60672b11e0b27f16db9069ef317cbbcc6b288f0b5c0
-MISC ChangeLog 2595 RMD160 5dff30913b09447d473bd724f3a5d94f69acd386 SHA1 7aaf2e8b53828642fb9cc93e464ce23498f21ffa SHA256 2eecc8c9251d54d322229701a4ea92a83783cce50f4736fbb2923c9fe7f678ae
+EBUILD geneweb-5.02.ebuild 2319 RMD160 749874860cb689d52586a735e83bce3ba592f913 SHA1 dd0da91547ff40ecca3d981147581bf40900b766 SHA256 c6d5a400c019b06c17ded32e170031a82911dbcdd89810777c8933388d6801c3
+MISC ChangeLog 2733 RMD160 93529daffacf65035661e4b434b98f201f27cc95 SHA1 df8a1f6990ab16feb96d2d6804d110d511fdf411 SHA256 ab4026138ba8c78490aa58c403007b2d1bb470d672b883f1cb301f11697165fe
 MISC metadata.xml 663 RMD160 83586164bec6dcdafa748a7013595fd8abfd00e6 SHA1 672a9f2999c3b016b9e28e643842fb8f739041e1 SHA256 3fbb6788d796221795bb8ed0cfbe45d19d0dc6eec5bdc2a3c22b5420bbb4a6b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk6C1jQACgkQIY77eQFFFC0zfQCeOSY640Y+4hGrdHvC9bub5C2Z
-Ym0AoJsrxEPdy/0y/1I+JdnhaK2MQAbF
-=kZx/
------END PGP SIGNATURE-----
diff --git a/app-misc/geneweb/files/geneweb-5.02-amd64.patch b/app-misc/geneweb/files/geneweb-5.02-amd64.patch
new file mode 100644
index 000000000000..6ca0c3197a9f
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-5.02-amd64.patch
@@ -0,0 +1,11 @@
+--- src/iovalue.ml.old	2011-09-29 08:55:02.000000000 +0200
++++ src/iovalue.ml	2011-09-29 08:55:42.000000000 +0200
+@@ -10,7 +10,7 @@
+    read inside a value output by output_value (no headers) must
+    match OCaml's input_value system (intern.c) *)
+ 
+-value sizeof_long = Sys.word_size / 8;
++value sizeof_long = 32 / 8;
+ value sign_extend_shift = (sizeof_long - 1) * 8 - 1;
+ value sign_extend x = (x lsl sign_extend_shift) asr sign_extend_shift;
+ 
diff --git a/app-misc/geneweb/geneweb-5.02.ebuild b/app-misc/geneweb/geneweb-5.02.ebuild
index 73fe59814651..8bd592cc3f2c 100644
--- a/app-misc/geneweb/geneweb-5.02.ebuild
+++ b/app-misc/geneweb/geneweb-5.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-5.02.ebuild,v 1.2 2011/03/24 13:08:04 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-5.02.ebuild,v 1.3 2011/09/29 07:02:31 tupone Exp $
 
 EAPI=2
 inherit eutils
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-amd64.patch \
 		"${FILESDIR}"/${P}-parallellbuild.patch
 	sed -i -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
 		setup/setup.ml || die "Failed sed for gentoo path"