Fixing segfault on start with gcc 3.4

8 files changed, 86 insertions, 19 deletions

diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index 7988f5af8848..d2c2084704e4 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-mathematics/pari
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.3 2004/12/29 21:36:59 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.4 2005/01/06 10:34:52 phosphan Exp $
+
+*pari-2.1.6 (06 Jan 2005)
+
+  06 Jan 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +files/wrong_functype.patch, -pari-2.1.5-r2.ebuild, pari-2.1.5-r3.ebuild,
+  +pari-2.1.6.ebuild:
+  Fixing bug #74431 (gp segfaults on start). Patch from 
+  http://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=133
+  (development branch).
+  Declaring fixed version as stable for x86.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 40208c8df6e7..9b653806e4fa 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,9 +1,11 @@
-MD5 846fee1f79b382cfdf9af55657ff41a4 ChangeLog 2880
-MD5 f8598af429b160527fde6eed721809bd pari-2.1.5-r3.ebuild 1842
+MD5 2c2c6c3ca6f8befca5aeb92cb8b52307 pari-2.1.6.ebuild 1855
 MD5 7cb19e9e55e31a5a0aad5b50e9b1ee0e pari-2.1.5-r1.ebuild 953
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 f8598af429b160527fde6eed721809bd pari-2.1.5-r3.ebuild 1842
 MD5 a1e409bb3cc4b92c3f2cf48b5820e868 pari-2.1.5-r2.ebuild 1370
+MD5 846fee1f79b382cfdf9af55657ff41a4 ChangeLog 2880
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 c3f89da5ddbdb73646e3d64ee31ea887 files/docs.patch 915
-MD5 ee951aeeb2122fab2aaf9803097fad76 files/digest-pari-2.1.5-r3 63
-MD5 ee951aeeb2122fab2aaf9803097fad76 files/digest-pari-2.1.5-r2 63
 MD5 ee951aeeb2122fab2aaf9803097fad76 files/digest-pari-2.1.5-r1 63
+MD5 ee951aeeb2122fab2aaf9803097fad76 files/digest-pari-2.1.5-r2 63
+MD5 ee951aeeb2122fab2aaf9803097fad76 files/digest-pari-2.1.5-r3 63
+MD5 2fd9906f2bf293fdad42d572846508de files/digest-pari-2.1.6 60
diff --git a/sci-mathematics/pari/files/digest-pari-2.1.5-r2 b/sci-mathematics/pari/files/digest-pari-2.1.5-r2
deleted file mode 100644
index 2e0d53a28384..000000000000
--- a/sci-mathematics/pari/files/digest-pari-2.1.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 194e9d1cc11926e457028c6a7cba15f0 pari-2.1.5.tar.gz 1540679
diff --git a/sci-mathematics/pari/files/digest-pari-2.1.6 b/sci-mathematics/pari/files/digest-pari-2.1.6
new file mode 100644
index 000000000000..270158de59fa
--- /dev/null
+++ b/sci-mathematics/pari/files/digest-pari-2.1.6
@@ -0,0 +1 @@
+MD5 506a061c8dcdec33d18876f3c551e951 pari-2.1.6.tgz 1541464
diff --git a/sci-mathematics/pari/files/wrong_functype.patch b/sci-mathematics/pari/files/wrong_functype.patch
new file mode 100644
index 000000000000..5eb95e622c7a
--- /dev/null
+++ b/sci-mathematics/pari/files/wrong_functype.patch
@@ -0,0 +1,35 @@
+diff -ru src/gp/gp_rl.c src.new/gp/gp_rl.c
+--- src/gp/gp_rl.c	2001-04-27 15:55:38.000000000 +0200
++++ src.new/gp/gp_rl.c	2005-01-06 11:04:45.198086689 +0100
+@@ -79,11 +79,13 @@
+ #endif
+ 
+ #ifdef HAS_RL_COMPLETION_MATCHES
+-#  define COMPLETION_MATCHES ((CF)rl_completion_matches)
++#  define COMPLETION_MATCHES(a,b) \
++ (completion_matches((char *)(a),(b)))
+ #  define FILE_COMPLETION ((GF)rl_filename_completion_function)
+ #  define USER_COMPLETION ((GF)rl_username_completion_function)
+ #else
+-#  define COMPLETION_MATCHES ((CF)completion_matches)
++#  define COMPLETION_MATCHES(a,b) \
++  (completion_matches((char *)(a),(b)))
+ #  define FILE_COMPLETION ((GF)filename_completion_function)
+ #  define USER_COMPLETION ((GF)username_completion_function)
+ #endif
+diff -ru src.old/gp/gp_rl.c src/gp/gp_rl.c
+--- src.old/gp/gp_rl.c	2005-01-06 11:07:18.000000000 +0100
++++ src/gp/gp_rl.c	2005-01-06 11:15:10.509112328 +0100
+@@ -625,10 +625,8 @@
+   /* we always want the whole list of completions under emacs */
+   if (under_emacs) rl_completion_query_items = 0x8fff;
+ 
+-#define Bind(a,b,c) (((void(*)(int,Function*,Keymap)) rl_bind_key_in_map)\
+-  ((a), (Function*)(b), (c)))
+-#define Defun(a,b,c) (((void(*)(const char*,Function*,int)) rl_add_defun)\
+-  ((a), (Function*)(b), (c)))
++#define Bind(a,b,c) (rl_bind_key_in_map((a), (Function*)(b), (c)))
++#define Defun(a,b,c) (rl_add_defun((char*)(a), (Function*)(b), (c)))
+ 
+   Defun("short-help", rl_short_help, -1);
+   Defun("long-help", rl_long_help, -1);
diff --git a/sci-mathematics/pari/pari-2.1.5-r1.ebuild b/sci-mathematics/pari/pari-2.1.5-r1.ebuild
index 79cbcfe9d731..9f0390df42a9 100644
--- a/sci-mathematics/pari/pari-2.1.5-r1.ebuild
+++ b/sci-mathematics/pari/pari-2.1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.5-r1.ebuild,v 1.1 2004/12/28 15:08:39 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.5-r1.ebuild,v 1.2 2005/01/06 10:34:52 phosphan Exp $
 
 DESCRIPTION="pari (or pari-gp) : a software package for computer-aided number theory"
 HOMEPAGE="http://www.parigp-home.de/"
diff --git a/sci-mathematics/pari/pari-2.1.5-r3.ebuild b/sci-mathematics/pari/pari-2.1.5-r3.ebuild
index 945238fae747..33585facc208 100644
--- a/sci-mathematics/pari/pari-2.1.5-r3.ebuild
+++ b/sci-mathematics/pari/pari-2.1.5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.5-r3.ebuild,v 1.1 2004/12/28 15:08:39 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.5-r3.ebuild,v 1.2 2005/01/06 10:34:52 phosphan Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.gn-50uma.de/ftp/pari-2.1/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha ~mips ~hppa amd64"
+KEYWORDS="x86 ~ppc ~sparc alpha ~mips ~hppa amd64"
 
 IUSE="doc emacs"
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/docs.patch
+	epatch ${FILESDIR}/wrong_functype.patch
 }
 
 src_compile() {
diff --git a/sci-mathematics/pari/pari-2.1.5-r2.ebuild b/sci-mathematics/pari/pari-2.1.6.ebuild
index b6219223b43b..851cb4c49f22 100644
--- a/sci-mathematics/pari/pari-2.1.5-r2.ebuild
+++ b/sci-mathematics/pari/pari-2.1.6.ebuild
@@ -1,19 +1,28 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.5-r2.ebuild,v 1.1 2004/12/28 15:08:39 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.6.ebuild,v 1.1 2005/01/06 10:34:52 phosphan Exp $
+
+inherit eutils
 
 DESCRIPTION="pari (or pari-gp) : a software package for computer-aided number theory"
-HOMEPAGE="http://www.parigp-home.de/"
-SRC_URI="http://www.gn-50uma.de/ftp/pari-2.1/${P}.tar.gz"
+HOMEPAGE="http://pari.math.u-bordeaux.fr/"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha ~mips ~hppa ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
 
-IUSE="doc"
+IUSE="doc emacs"
 
 DEPEND="doc? ( virtual/tetex )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/docs.patch
+	epatch ${FILESDIR}/wrong_functype.patch
+}
+
 src_compile() {
 	./Configure \
 		--host="$(echo ${CHOST} | cut -f "1 3" -d '-')" \
@@ -31,6 +40,12 @@ src_compile() {
 		emake CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
 		einfo "Building executables..."
 		emake CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building exectuables failed!"
+	elif use alpha; then
+		einfo "Building shared library..."
+		cd Olinux-alpha
+		emake CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
+		einfo "Building executables..."
+		emake CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building exec  tu  ables failed!"
 	else
 		emake CFLAGS="${CFLAGS} -DGCC_INLINE" gp || die
 	fi
@@ -40,5 +55,9 @@ src_compile() {
 
 src_install () {
 	make DESTDIR=${D} install || die
+	if use emacs; then
+		insinto /usr/share/emacs/site-lisp
+		doins emacs/pari.el
+	fi
 	dodoc AUTHORS Announce.2.1 CHANGES README TODO
 }