Finally the right patches by Francois Bissey

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

6 files changed, 143 insertions, 136 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/Manifest b/sci-mathematics/pari/Manifest
index a3fd28855d24..541165e1c488 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -5,9 +5,9 @@ AUX 50pari-gentoo.el 271 RMD160 e71ae40ba7bc2179bdb963d4300020d6a5f8bf76 SHA1 69
 AUX pari-2.3.2-ppc-powerpc-arch-fix.patch 453 RMD160 2522cab3f5a862d6fcf13d6b30b00a420b62d809 SHA1 2861b205fa4b7d7a0adc5fe9f4ec7dd4c728c331 SHA256 3796b8e994f6dda107dd3733ec0769dbe020debc8f24db89f4f740cd3939f64f
 AUX pari-2.3.2-strip.patch 293 RMD160 49660a3edcfd8f73ce5fe78f832262f98348a804 SHA1 85012664fd4c1f092ca08c4a1e174cc05ff09b72 SHA256 e4a63e53734295dbbdcf9ade59c12d49a36317be3b25a223c684221086fce21b
 AUX pari-2.3.5-doc-make.patch 1358 RMD160 3ce51d8a71d75902c79c1c24c4e65f6b20b73c9b SHA1 55c9be7b74131e7b49d7cb54f71a6a7474831d3e SHA256 9a68848f4b2818f2bbdfc49063af94eb6b54049563ca0d5137d6bfce2450b35b
-AUX pari-2.5.0-doc-make.patch 2362 RMD160 b56f788d86a73a8c771268e21d6bebb0419c7b74 SHA1 9d8136b235fd7428d6a0588d0f8cd1a62f23f461 SHA256 9c4d6d32c5bcb8ad4707020357f0b37f9bb44ded9f4fdc780579c89a3ee5ab82
-AUX pari-2.5.0-macos.patch 848 RMD160 7919a5d9d78e3a655ed038369db52954ab0b0cd2 SHA1 a2c6758ca3e401a0deb570534c0da2990fe0eb76 SHA256 79f7f5dc4ed3ca468ea1baa04cdb07583dc4d5c924da720f97b99b6baf014dbc
-AUX pari-2.5.0-mp.c.patch 696 RMD160 f721782d42684d70212979fd088928a3c0dd73ee SHA1 35f28d593aabf62cb3320ab8066e6dc64b144cac SHA256 07be1cbe6a8022794690c26348d3266c56341fb6bd9045b537c453e358ab41f1
+AUX pari-2.5.0-doc-make.patch 2280 RMD160 7db274a387b81a57620329b6dc117eee990ce648 SHA1 25f001a0e0552f97f20ad56ba158f995c5a72df2 SHA256 e28a0c8db09f02c30499f606fafa9ebaa5e09bbc25dd87f1ff9ba6cf316b5338
+AUX pari-2.5.0-macos.patch 827 RMD160 f1e25cc609f509952373221bcb0a349787b1e498 SHA1 81c0b4fbf4cea073d16219944d3622dc8094dc71 SHA256 0ababf5c7c182b8f8fb46d35f2064a517d5487811e77743b7f64d12c075ed6ac
+AUX pari-2.5.0-mp.c.patch 673 RMD160 552aba40307a314b14d0623c4b042c36f60d9931 SHA1 29c78c99e666e58917e9a31ca6376280d7f7a7e7 SHA256 78db2dcf22cd8f6231926402b69e6b29683fed46c06468d661e6d94d39e07fa8
 DIST elldata.tgz 14185595 RMD160 ddac2454fc65b7f5ddfbf1d39d96a3e51b8eef5c SHA1 f9705a2a11f1622ebcc4e6b8f3780af8a178da9e SHA256 4102c23fdbeadc89b47ba31d05fc58cd3c3e0cca216b11ec5c3be1330d4a5218
 DIST galdata.tgz 53229 RMD160 488afbddf7026dd6d0c9ebbed72cb14c8c37173e SHA1 0fe78ed49e197066708a3fc3753b2651107a1264 SHA256 b7c1650099b24a20bdade47a85a928351c586287f0d4c73933313873e63290dd
 DIST nftables.tgz 8393731 RMD160 48a9c48246f91c1983712682937d666ba1ae6458 SHA1 90df66222346b0dbca68925671a374f5e286daeb SHA256 8dd3393ce6b3cfcf599f094f7b22bdffe17c3ba25deb912513d54676bd7cfe92
@@ -17,13 +17,13 @@ DIST pari-2.5.0.tar.gz 2714449 RMD160 f9b5375da10bfc5672fbe8b4ab4ac1eb0772b572 S
 DIST seadata.tgz 19214199 RMD160 e88637426f74c5223068fc2d916741c10d8279e4 SHA1 fa3deb36df0ce71a466eb0ff0d4a18d48d44e8b9 SHA256 c9282a525ea3f92c1f9c6c69e37ac5a87b48fb9ccd943cfd7c881a3851195833
 EBUILD pari-2.3.4-r1.ebuild 4223 RMD160 86b57d4c795fa2eea90363da83828aec98cd96fd SHA1 94eac2f9c2d3c6f20c1a1b0c5ba2e51da813250d SHA256 9e4257bd9ddb0a0a564f234cf36246ec115b63d61279a26d6fe329fbd23fd2be
 EBUILD pari-2.3.5.ebuild 4487 RMD160 98c55182f27da23196285a2b7defbf738b54015c SHA1 18b42289a75d7d71af3539a69e23b733a6e08780 SHA256 4496e8b1f23ebd02ea28655618e73f8755ea28a93515dd025cb8f5968e2878bc
-EBUILD pari-2.5.0-r2.ebuild 4025 RMD160 bf3c32a8432e24f636f1a6b4d6835333b3b2efb3 SHA1 0cf472b298cb2ddc120c693801ec2fbbf1823e2a SHA256 097f2c9761942914cf731b047a15c9deb6716d9501f40ea3493a606ce28c22d5
-MISC ChangeLog 15860 RMD160 834b7938a734d3b100d857ddecbaafa2de5745f1 SHA1 a90e07baebb99bf7549a1e5d7cc84cacd5e3026c SHA256 a52a2535fc4e8b5fc08311f17b8b56bb35a7f129131a8dceb26f28740ab4d16e
+EBUILD pari-2.5.0-r3.ebuild 4025 RMD160 7a8a65657caabfb76132c8a16542aca9b7b4e992 SHA1 b980265f507a1512a72a6dc8aaba33c50bb188b1 SHA256 f1a7aab704a92ee750695e9537e87d1ba1c53eee9f462adc812350d88e193feb
+MISC ChangeLog 16135 RMD160 84bf81c42a585700d90ace32a583ff246dec7bea SHA1 570a08dc4d615a756678f50e9729ce6b565525d6 SHA256 761408e03cf7fa0eb3325090d90e00b5481daa9371bb0ccde6e6fe160e2ea7ad
 MISC metadata.xml 1110 RMD160 9f77b92fc473dc18364cda6049ae65c01656d14d SHA1 643003b3881bb599e57c8346073b2c4dc185ee15 SHA256 6efe59c37d2ff1b960324b5f0736e25ce2a8b3e9dc67d9b5482a9d808ba44d0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4xorkACgkQ1ycZbhPLE2ArDgCgmxNGitmLaayXk3Wrq1uiKdJs
-+LoAn3VyjZRrmITPMf+wZEZtdheBCKHn
-=91ez
+iEUEARECAAYFAk455qcACgkQ1ycZbhPLE2CI6wCggLALbnOFiYDP5N9SXsxphJYN
+ijAAmJE29jEJOfWo1iAUcFrls46rgZA=
+=MYgV
 -----END PGP SIGNATURE-----
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"