Finally the right patches by Francois Bissey

(Portage version: 2.1.10.10/cvs/Linux x86_64)

5 files changed, 135 insertions, 128 deletions

diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index 15dbc5a09d39..a56419f78f6b 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/pari
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.85 2011/07/28 17:56:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.86 2011/08/04 00:23:54 bicatali Exp $
+
+*pari-2.5.0-r3 (04 Aug 2011)
+
+  04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> -pari-2.5.0-r2.ebuild,
+  +pari-2.5.0-r3.ebuild, files/pari-2.5.0-doc-make.patch,
+  files/pari-2.5.0-macos.patch, files/pari-2.5.0-mp.c.patch:
+  Finally the right patches by Francois Bissey
 
 *pari-2.5.0-r2 (28 Jul 2011)
 
diff --git a/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch b/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch
index b5fb6c5548c4..0882da03e6a4 100644
--- a/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch
+++ b/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch
@@ -1,82 +1,82 @@
---- config/DOC_Make.SH.orig	2011-07-28 14:11:34.430896929 +1200

-+++ config/DOC_Make.SH	2011-07-28 14:11:39.832738158 +1200

-@@ -21,7 +21,8 @@

- 

- doc all: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi

- docps: develop.ps libpari.ps refcard.ps tutorial.ps users.ps INSTALL.ps

--docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf

-+#docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf

-+docpdf: \$(PARI_TEX) \$(MACROS) pass1 pass2 indexing refcard.pdf INSTALL.pdf

- 

- .SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html

- 

-@@ -37,27 +38,49 @@

- %.dvi: %.tex \$(MACROS)

- 	tex \$<

- 

-+pass1: \$(PARI_TEX) \$(USERS_TEX) develop.tex tutorial.tex \$(MACROS)

-+	-rm -f *.std

-+	pdftex libpari

-+	pdftex develop

-+	pdftex tutorial

-+	pdftex users

-+

-+pass2: pass1

-+	pdftex libpari

-+	pdftex develop

-+	pdftex tutorial

-+	pdftex users

-+

-+indexing: pass2

-+	\$(MAKE) libpari.std

-+	\$(MAKE) develop.std

-+	\$(MAKE) users.std

-+	pdftex libpari

-+	pdftex develop

-+	pdftex users

-+	-rm -f *.std

-+

- libpari.pdf: \$(PARI_TEX) \$(MACROS)

- 	-rm -f libpari.std

- 	pdftex libpari

- 	pdftex libpari

--	make libpari.std; pdftex libpari; rm -f libpari.std

-+	\$(MAKE) libpari.std; pdftex libpari; rm -f libpari.std

- libpari.dvi: \$(PARI_TEX) \$(MACROS)

- 	-rm -f libpari.std

- 	tex libpari

- 	tex libpari

--	make libpari.std; tex libpari; rm -f libpari.std

-+	\$(MAKE) libpari.std; tex libpari; rm -f libpari.std

- 

- develop.pdf: develop.tex \$(MACROS)

- 	-rm -f develop.std

- 	pdftex develop

- 	pdftex develop

--	make develop.std; pdftex develop; rm -f develop.std

-+	\$(MAKE)make develop.std; pdftex develop; rm -f develop.std

- develop.dvi: develop.tex \$(MACROS)

- 	-rm -f develop.std

- 	tex develop

- 	tex develop

--	make develop.std; tex develop; rm -f develop.std

-+	\$(MAKE) develop.std; tex develop; rm -f develop.std

- 

- tutorial.pdf: tutorial.tex \$(MACROS)

- 	-rm -f tutorial.std

-@@ -85,13 +108,13 @@

- 	-rm -f users.std

- 	tex users

- 	tex users

--	make users.std; tex users; rm -f users.std

-+	\$(MAKE) users.std; tex users; rm -f users.std

- 

- users.pdf: \$(USERS_TEX)

- 	-rm -f users.std

- 	pdftex users

- 	pdftex users

--	make users.std; pdftex users; rm -f users.std

-+	\$(MAKE) users.std; pdftex users; rm -f users.std

- 

- gpman: gp.1

- 	nroff -man gp.1 | unix2dos -ascii > gp.man

+--- config/DOC_Make.SH.orig	2011-07-28 14:11:34.430896929 +1200
++++ config/DOC_Make.SH	2011-07-28 14:11:39.832738158 +1200
+@@ -21,7 +21,8 @@
+ 
+ doc all: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi
+ docps: develop.ps libpari.ps refcard.ps tutorial.ps users.ps INSTALL.ps
+-docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
++#docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
++docpdf: \$(PARI_TEX) \$(MACROS) pass1 pass2 indexing refcard.pdf INSTALL.pdf
+ 
+ .SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html
+ 
+@@ -37,27 +38,49 @@
+ %.dvi: %.tex \$(MACROS)
+ 	tex \$<
+ 
++pass1: \$(PARI_TEX) \$(USERS_TEX) develop.tex tutorial.tex \$(MACROS)
++	-rm -f *.std
++	pdftex libpari
++	pdftex develop
++	pdftex tutorial
++	pdftex users
++
++pass2: pass1
++	pdftex libpari
++	pdftex develop
++	pdftex tutorial
++	pdftex users
++
++indexing: pass2
++	\$(MAKE) libpari.std
++	\$(MAKE) develop.std
++	\$(MAKE) users.std
++	pdftex libpari
++	pdftex develop
++	pdftex users
++	-rm -f *.std
++
+ libpari.pdf: \$(PARI_TEX) \$(MACROS)
+ 	-rm -f libpari.std
+ 	pdftex libpari
+ 	pdftex libpari
+-	make libpari.std; pdftex libpari; rm -f libpari.std
++	\$(MAKE) libpari.std; pdftex libpari; rm -f libpari.std
+ libpari.dvi: \$(PARI_TEX) \$(MACROS)
+ 	-rm -f libpari.std
+ 	tex libpari
+ 	tex libpari
+-	make libpari.std; tex libpari; rm -f libpari.std
++	\$(MAKE) libpari.std; tex libpari; rm -f libpari.std
+ 
+ develop.pdf: develop.tex \$(MACROS)
+ 	-rm -f develop.std
+ 	pdftex develop
+ 	pdftex develop
+-	make develop.std; pdftex develop; rm -f develop.std
++	\$(MAKE)make develop.std; pdftex develop; rm -f develop.std
+ develop.dvi: develop.tex \$(MACROS)
+ 	-rm -f develop.std
+ 	tex develop
+ 	tex develop
+-	make develop.std; tex develop; rm -f develop.std
++	\$(MAKE) develop.std; tex develop; rm -f develop.std
+ 
+ tutorial.pdf: tutorial.tex \$(MACROS)
+ 	-rm -f tutorial.std
+@@ -85,13 +108,13 @@
+ 	-rm -f users.std
+ 	tex users
+ 	tex users
+-	make users.std; tex users; rm -f users.std
++	\$(MAKE) users.std; tex users; rm -f users.std
+ 
+ users.pdf: \$(USERS_TEX)
+ 	-rm -f users.std
+ 	pdftex users
+ 	pdftex users
+-	make users.std; pdftex users; rm -f users.std
++	\$(MAKE) users.std; pdftex users; rm -f users.std
+ 
+ gpman: gp.1
+ 	nroff -man gp.1 | unix2dos -ascii > gp.man
diff --git a/sci-mathematics/pari/files/pari-2.5.0-macos.patch b/sci-mathematics/pari/files/pari-2.5.0-macos.patch
index 17c34e7041e3..1b4076009379 100644
--- a/sci-mathematics/pari/files/pari-2.5.0-macos.patch
+++ b/sci-mathematics/pari/files/pari-2.5.0-macos.patch
@@ -1,21 +1,21 @@
---- config/get_dlld.orig	2011-07-28 14:27:13.341072367 +1200

-+++ config/get_dlld	2011-07-28 14:27:46.225178023 +1200

-@@ -94,7 +94,7 @@

-       *) extra=;;

-     esac

-     case "$osname" in

--      darwin) shared=-dynamiclib;;

-+      darwin) shared="-dynamiclib -install_name \$(PURELIBDIR)/\$(LIBPARI_DYN)";;

-       *) shared=-shared;;

-     esac

-     DLLDFLAGS="$shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS"

---- config/Makefile.SH.orig	2011-07-28 14:29:06.753681364 +1200

-+++ config/Makefile.SH	2011-07-28 14:29:10.589276933 +1200

-@@ -234,6 +234,7 @@

- # DESTDIR is used to install to a false hierachy (to build a Debian package)

- INCLUDEDIR= "\$(DESTDIR)$includedir"

- LIBDIR    = "\$(DESTDIR)$libdir"

-+PURELIBDIR= $libdir

- BINDIR    = "\$(DESTDIR)$bindir"

- MANDIR    = "\$(DESTDIR)$mandir"

- DATADIR   = "\$(DESTDIR)$datadir"

+--- config/get_dlld.orig	2011-07-28 14:27:13.341072367 +1200
++++ config/get_dlld	2011-07-28 14:27:46.225178023 +1200
+@@ -94,7 +94,7 @@
+       *) extra=;;
+     esac
+     case "$osname" in
+-      darwin) shared=-dynamiclib;;
++      darwin) shared="-dynamiclib -install_name \$(PURELIBDIR)/\$(LIBPARI_DYN)";;
+       *) shared=-shared;;
+     esac
+     DLLDFLAGS="$shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS"
+--- config/Makefile.SH.orig	2011-07-28 14:29:06.753681364 +1200
++++ config/Makefile.SH	2011-07-28 14:29:10.589276933 +1200
+@@ -234,6 +234,7 @@
+ # DESTDIR is used to install to a false hierachy (to build a Debian package)
+ INCLUDEDIR= "\$(DESTDIR)$includedir"
+ LIBDIR    = "\$(DESTDIR)$libdir"
++PURELIBDIR= $libdir
+ BINDIR    = "\$(DESTDIR)$bindir"
+ MANDIR    = "\$(DESTDIR)$mandir"
+ DATADIR   = "\$(DESTDIR)$datadir"
diff --git a/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch b/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch
index 6c80e1597ec4..0bcfffc08176 100644
--- a/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch
+++ b/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch
@@ -1,23 +1,23 @@
-Index: src/kernel/gmp/mp.c

-===================================================================

---- src/kernel/gmp/mp.c	(revision 13151)

-+++ src/kernel/gmp/mp.c	(working copy)

-@@ -45,18 +45,8 @@

- /*We need PARI invmod renamed to invmod_pari*/

- #define INVMOD_PARI

- 

--static void *gmp_realloc(void *ptr, size_t old_size, size_t new_size) {

--  (void)old_size; return (void *) pari_realloc(ptr,new_size);

--}

--

--static void gmp_free(void *ptr, size_t old_size){

--  (void)old_size; pari_free(ptr);

--}

--

- int pari_kernel_init(void)

- {

--  /* Use pari_malloc instead of malloc */

--  mp_set_memory_functions((void *(*)(size_t)) pari_malloc, gmp_realloc, gmp_free);

-   return 0;

- }

- 

+Index: src/kernel/gmp/mp.c
+===================================================================
+--- src/kernel/gmp/mp.c	(revision 13151)
++++ src/kernel/gmp/mp.c	(working copy)
+@@ -45,18 +45,8 @@
+ /*We need PARI invmod renamed to invmod_pari*/
+ #define INVMOD_PARI
+ 
+-static void *gmp_realloc(void *ptr, size_t old_size, size_t new_size) {
+-  (void)old_size; return (void *) pari_realloc(ptr,new_size);
+-}
+-
+-static void gmp_free(void *ptr, size_t old_size){
+-  (void)old_size; pari_free(ptr);
+-}
+-
+ int pari_kernel_init(void)
+ {
+-  /* Use pari_malloc instead of malloc */
+-  mp_set_memory_functions((void *(*)(size_t)) pari_malloc, gmp_realloc, gmp_free);
+   return 0;
+ }
+ 
diff --git a/sci-mathematics/pari/pari-2.5.0-r2.ebuild b/sci-mathematics/pari/pari-2.5.0-r3.ebuild
index 0c0840e40740..ffbe2470555e 100644
--- a/sci-mathematics/pari/pari-2.5.0-r2.ebuild
+++ b/sci-mathematics/pari/pari-2.5.0-r3.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/sci-mathematics/pari/pari-2.5.0-r2.ebuild,v 1.1 2011/07/28 17:56:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.5.0-r3.ebuild,v 1.1 2011/08/04 00:23:54 bicatali Exp $
 
 EAPI="4"