fix pari doesn't compile

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 36 insertions, 6 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index 4730fa49f042..ea32e4df6809 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/clisp
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.88 2009/01/07 13:12:02 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.89 2009/01/08 15:20:03 hkbst Exp $
+
+  08 Jan 2009; Marijn Schouten <hkBst@gentoo.org> +files/pari.patch,
+  clisp-2.47-r1.ebuild:
+  fix pari doesn't compile
 
 *clisp-2.47-r1 (07 Jan 2009)
 
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 418c52b802fb..7b3c628d3a85 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -9,6 +9,7 @@ AUX 2.39/install-clc.lisp 501 RMD160 c4848c195ef194fce8ec73eb4aceeb5f34b919ac SH
 AUX 2.41-fastcgi-Makefile-gentoo.patch 681 RMD160 be7c10a9996175e1df81d456f79a3260bcae50cd SHA1 a5c431859588af51f671d8275b7fe99b03c0f063 SHA256 affc6b7687d035130ac7ac172d50096d21c06a7098379fe47de1dde659c6ad12
 AUX 2.41-fastcgi-build.patch 523 RMD160 8d9248b447e46958baa076d31eb433c16aeb92f0 SHA1 fb1823ac2bce084c12e0a5b87e3e95126a2fc748 SHA256 fdab3b155eed12e39a727364293be1ef81d5af969c1f816117e879977b8042fe
 AUX 2.41-linux-headers.patch 1444 RMD160 609c269738a096cf2120c65fe1979d6c5a775c65 SHA1 b8f658c6e058fe43b6a575b3e171d6f602cc93e6 SHA256 cbf3bd75cc5a9457f34e81c8071865af64310c4f664b1b64b3658cd22abe0e59
+AUX pari.patch 885 RMD160 ddbc96af09a7226de3aae5b7f53568f31e9e28d3 SHA1 7e6d5a7574d3266cc75d02dd8f8de8d2ae4785e7 SHA256 3283c5ada9664925617e9b41deb2b7bda5961ff9237ff0d1144b36db4c953b4e
 DIST clisp-2.43.tar.bz2 8143871 RMD160 3088132543c920e02b482c9031742ba34f2fe017 SHA1 85e3e8f626b31dfb158100e631ea17bf48364fad SHA256 b5213ccc59d65c190f47c0e4f04d568a1a66bcb28ae5ed59705e59c6b8b11e83
 DIST clisp-2.44.1.tar.gz 8950346 RMD160 adf762a6df98a677da9393a52ee9a02c0e1ead09 SHA1 08cbf5a2f94fa1e6f29e1563e10e200f8dee8690 SHA256 4112ef1f4e1eb7640415a1b878357baea745e23dd045a6522b9ac0988d347766
 DIST clisp-2.46.tar.bz2 7470350 RMD160 5d692d88c28445ee9a3b316d7207b4dd31b96d79 SHA1 c9ca48fc1e72dc66ba103f28c7214a42690524a5 SHA256 6c0fabe882efa50559385482d078510e3ce8c94e4ffa4ffb6538d499b22a9efd
@@ -17,9 +18,7 @@ EBUILD clisp-2.43-r1.ebuild 2845 RMD160 8f0776894c6f7b6da1ca8dc26f7c5f555b2321d0
 EBUILD clisp-2.44.1-r1.ebuild 3401 RMD160 ef4c41fa78890e3699f64bc562ccfb57b2991bfd SHA1 d65d3becb4dfefe110b6b250cff1487f1f1f03de SHA256 a89cd3c3def138f9e4085967cafd1444533d2d1a9db5ab2dc30b8ad418b85c2f
 EBUILD clisp-2.44.1.ebuild 3219 RMD160 39a19cff5646f18449e525b23117fb47c4e1b3b9 SHA1 4fef8483a553f6ad9583380921ba8ffe9ac4afe4 SHA256 9775fdad4fbbdad6ed8c1c5f587442e4219ac5330795adc185e34b2a3f751ad1
 EBUILD clisp-2.46.ebuild 4081 RMD160 394fdeb14dfadcff4603afbbe02f8f8c04e3d732 SHA1 ff2db84971773ec5b235c5e20f7ca7a4ced47fd0 SHA256 f356cb43e89b3357c3023ec1c30d5454a916b4ae436e6870126bc56d8a374b65
-EBUILD clisp-2.47-r1.ebuild 4178 RMD160 7e7a739ec328bdc3de0dad96bba03d68c07bbcc5 SHA1 ab05ee642f510f1baec7dfad7590d3b45410a7c9 SHA256 40a6465377a3cee874bfb5e70908c68494374482e84ce729f0edeb4edde100c3
+EBUILD clisp-2.47-r1.ebuild 4224 RMD160 d0e5b2f1aea12ed5494ba325d83e5f91654f9117 SHA1 7439d5a2e2c92c59a7b34baad204acd40ebf6d07 SHA256 5f1a036b15ec298ee50c6224a6e39d2b220a253aed818cc704746d80e2918188
 EBUILD clisp-2.47.ebuild 4078 RMD160 fa968b5da15acd7f1eeccdc97b61de8d54094e6d SHA1 1ebbbb7d143cb258b68db4ab5d2e1ea3db7b4d4a SHA256 dbcd84f7c01aeca780db8792f157e6453305090fd88b68ac85b1a547a55341fd
-MISC ChangeLog 22430 RMD160 5022b85de82f71e41e1a276dceef55d1060ed441 SHA1 09be8d77d65e9b5947766054e7ca91362673f5ee SHA256 771cd288a6a569c5ae4e35a6cb955a3c51d5b1421cfd918f9a1d1c88ac39bd7f
-MISC clisp-2.47-r1.ebuild.orig 4078 RMD160 fa968b5da15acd7f1eeccdc97b61de8d54094e6d SHA1 1ebbbb7d143cb258b68db4ab5d2e1ea3db7b4d4a SHA256 dbcd84f7c01aeca780db8792f157e6453305090fd88b68ac85b1a547a55341fd
-MISC clisp-2.47-r1.ebuild.rej 1268 RMD160 eab37a804c80cf7b83997b9ca9d531e49092444c SHA1 646bff524b68960f9e44bc9abec25a9fe2445a95 SHA256 c81a4bc07d83c4d04cc838f6755d64b429e59aa910cf4b6c2c449a84d3959149
+MISC ChangeLog 22551 RMD160 947459dcb10f0298e6f61d120fa310ee7ab40299 SHA1 dcd293607b2ccb7e6a84a9553394eecb1b8cd138 SHA256 6373703974f1f3ecdb5f486b3f98e6d0c700ac490a0450855cdcc3d73f3a34ab
 MISC metadata.xml 1264 RMD160 919dd3d373822e37d5c9c3556eddfa32101c559f SHA1 809e0602f6c76e269a0c0eee612297fdfed389c6 SHA256 971d7ef431c0a5fc95a4366c07220c32db56aa3d22960dc8acb77d7110db10dc
diff --git a/dev-lisp/clisp/clisp-2.47-r1.ebuild b/dev-lisp/clisp/clisp-2.47-r1.ebuild
index b477b52f0289..76d4b9e59aec 100644
--- a/dev-lisp/clisp/clisp-2.47-r1.ebuild
+++ b/dev-lisp/clisp/clisp-2.47-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.47-r1.ebuild,v 1.1 2009/01/07 13:12:02 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.47-r1.ebuild,v 1.2 2009/01/08 15:20:03 hkbst Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -58,6 +58,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/pari.patch #bug 246074
+
 	# More than -O1 breaks alpha/ia64
 	use alpha || use ia64 && sed -i -e 's/-O2//g' src/makemake.in
 }
diff --git a/dev-lisp/clisp/files/pari.patch b/dev-lisp/clisp/files/pari.patch
new file mode 100644
index 000000000000..420dd0a5b2fb
--- /dev/null
+++ b/dev-lisp/clisp/files/pari.patch
@@ -0,0 +1,25 @@
+commit d6d89b33bee20879c4cef3b7fcc9c4d42c4b6eff
+Author: sds <sds>
+Date:   Thu Jan 8 02:56:33 2009 +0000
+
+    fix bug #[ 2492106 ]: CLISP 2.47/amd64 can't build "pari" module
+    (new_galois_format, factor_add_primes): fix type declarations
+
+diff --git a/modules/pari/pari.lisp b/modules/pari/pari.lisp
+index d5cf89d..d5586d3 100644
+--- a/modules/pari/pari.lisp
++++ b/modules/pari/pari.lisp
+@@ -165,9 +165,9 @@
+     (and e (foreign-value e))))
+ 
+ ;; extern int new_galois_format;
+-(def-c-var new_galois_format (:type (c-ptr int)))
++(def-c-var new_galois_format (:type int))
+ ;; extern int factor_add_primes;
+-(def-c-var factor_add_primes (:type (c-ptr int)))
++(def-c-var factor_add_primes (:type int))
+ 
+ ;; extern ulong DEBUGFILES, DEBUGLEVEL, DEBUGMEM
+ (def-c-var debugfiles (:name "DEBUGFILES") (:type ulong))
+diff --git a/src/ChangeLog b/src/ChangeLog
+index 4f386a3..410b02b 100644