Added enhancements to pari ebuild needed for future sage ebuild (see bug #220521).

Package-Manager: portage-2.1.5_rc7

4 files changed, 83 insertions, 17 deletions

diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index 2e7ba1828d7f..2aec28588630 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,10 +1,22 @@
 # ChangeLog for sci-mathematics/pari
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.59 2008/05/12 16:04:21 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.60 2008/05/13 01:44:37 markusle Exp $
+
+  13 May 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/pari-2.3.3-alglin.patch, pari-2.3.3.ebuild:
+  Added enhancements to pari ebuild needed for future sage ebuild (see 
+  bug #220521). Thanks much to Francois Bissey 
+  <f.r.bissey@massey.ac.nz> for his patches.
 
   12 May 2008; Markus Rothe <corsair@gentoo.org> pari-2.3.2-r1.ebuild:
   Stable on ppc64
 
+  07 May 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/pari-2.3.3-alglin.patch, pari-2.3.3.ebuild:
+  Added additional bits eventually needed by sage (see bug #220521). Many
+  thanks go to Francois Bissey <f.r.bissey@massey.ac.nz> for providing the
+  necessary patches.
+
 *pari-2.3.3 (04 May 2008)
 
   04 May 2008; Markus Dittrich <markusle@gentoo.org> -pari-2.1.5-r4.ebuild,
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 384121a99856..a3792ee22131 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -2,9 +2,12 @@ AUX 50pari-gentoo.el 271 RMD160 e71ae40ba7bc2179bdb963d4300020d6a5f8bf76 SHA1 69
 AUX docs.patch 915 RMD160 3e5cf3712d9f22678ab3bad2e541e04c11405a04 SHA1 ddc4e17185936d5a40e47254415ce94c15227ddc SHA256 00237da12482a4f292ddf358f269c9e28531da172aa130b07a26c9e125e45d1c
 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.3-alglin.patch 696 RMD160 727ffea2a828adb6dd35bf95e569b7e4f21b9999 SHA1 34c02dce440437ece67d5d47d50b7fb616d8e9e5 SHA256 d2d8f3a959259a6528bab4793b2c4371f4de656b7e91932b0a1644fc00df2445
 AUX pari-non-exec-stack-x86-gentoo.patch 345 RMD160 34d513eded3f15d058c7e2da0497f2b7f519b044 SHA1 a76ba8da7530419dc3ebe779035b14a9d55e8fc9 SHA256 e2574f58eb385c3dc76f5f5eff4fb075090d37bbd078bbbf68e95e09539f31d5
 AUX wrong_functype-r1.patch 1498 RMD160 ede78c0c8e3e1e2873aa1b61efe2515f92c2575f SHA1 85d0ebe7093a9cba9f00fb5694f8d1c15bf8f03a SHA256 f4b2ae857a9e8b5ab99640e343bb962297bbca49f5425749ef919ba953a29c9e
 AUX wrong_functype.patch 1946 RMD160 e38655b53030eecc3c7520cd4a0fc48ea174fd0e SHA1 2da2d4eca4adf4b44970b94cf308243c82d1bcde SHA256 a2ae7109f8f292393c80b710c0da4f1079ebe64f480d8f99d4ca2c9b6325e27b
+DIST elldata.tgz 14185595 RMD160 ddac2454fc65b7f5ddfbf1d39d96a3e51b8eef5c SHA1 f9705a2a11f1622ebcc4e6b8f3780af8a178da9e SHA256 4102c23fdbeadc89b47ba31d05fc58cd3c3e0cca216b11ec5c3be1330d4a5218
+DIST galdata.tgz 53229 RMD160 488afbddf7026dd6d0c9ebbed72cb14c8c37173e SHA1 0fe78ed49e197066708a3fc3753b2651107a1264 SHA256 b7c1650099b24a20bdade47a85a928351c586287f0d4c73933313873e63290dd
 DIST pari-2.1.6.tgz 1541464 RMD160 6b79e84b639d1862df148b253136deacd73bf4f0 SHA1 54bd40fa70a02e76d78d0ea19c0f56f7da62de8e SHA256 6150700432e2cbd08567aeaa62b2f7f92f350b83f2cac8e747b1d581883a4227
 DIST pari-2.1.7.tgz 1542137 RMD160 6d7ca649cdd457d96c12e1f9333143d496a78b7e SHA1 dca15bb3ac6dfdcc7934569fe3a65cb16f812a4e SHA256 9142f2cdaf3083c8962f1a5c2bb0e9fe8915f7d9490c03312ac2361c7ea155fa
 DIST pari-2.3.2.tar.gz 2015734 RMD160 d2394fd31bfa6efcbfce25081d75234ccb1005be SHA1 e7c823d393b513ba84bb66b400cbe3811a75a60f SHA256 514799c0722376ba7d163588f091662731bca0a4b3cd2a93d01eb6bec9d1f47a
@@ -13,6 +16,6 @@ EBUILD pari-2.1.6.ebuild 2490 RMD160 94f196d096f2ce6ba66c958e0087757c20b38424 SH
 EBUILD pari-2.1.7-r1.ebuild 2749 RMD160 47956f86a6ec165eb84d83c1ae849a95baab70d0 SHA1 517fbe2b654f316803c819de2e2098165138c2a2 SHA256 15b0ca5d7f225c987fe538d42a7765265d17aed24482ca30483fc3cf35fce79f
 EBUILD pari-2.3.2-r1.ebuild 3028 RMD160 b6da3d341bb192ba124a74584ccfcac23d138b29 SHA1 e1dec3e078e53e606e7b67e2596054f640cc5245 SHA256 eb1c00a05ed8dce3ed68d298f6884e1d20fbd386cba6339d41d084be4af481fa
 EBUILD pari-2.3.2.ebuild 2990 RMD160 64d1807ad5fef220da62db8df3f99c7c4e14cb92 SHA1 88b65d5c4a0a136d334a99904acf0a2b8ca916e1 SHA256 344f393da4ae540a2602793d5cb95585f25e36741686fc790c93185c5dcfe7bd
-EBUILD pari-2.3.3.ebuild 3042 RMD160 8a2023b8a10d03e9a3f3e4b6e8eaf9a112b84550 SHA1 fd6a9bd4bba4836854b15722324ac4547689e9cd SHA256 93c915fa2dff734750f42e8394cb42b24659ebaecd99f6da2b4bd04547331aef
-MISC ChangeLog 11021 RMD160 04b0f83d7b387722a819771cea5b6aeb7ec7e80f SHA1 1283e5033c39dd0bab7d87f40d8a43ef9490d734 SHA256 8ab5fd5cd22950a1a23c5721f20799ec64cdd8c9f22d9e68f2f9e65246d1cdcd
+EBUILD pari-2.3.3.ebuild 3871 RMD160 5f9d56f22e971cf9067765557feff493c6b39492 SHA1 530a64f20e2a0a2954ffc454367eddfde36be3b3 SHA256 cf90d664708cba5436df233334d55e31ad41fb24a89221378f8f5da2ca82d289
+MISC ChangeLog 11571 RMD160 a3a09490a0bc1318637cd244fe89df22f99b493e SHA1 468d7855f149888c8e9c8501eb53fcc7f28467a1 SHA256 a5c5ebc991d4b38b1170af78e78caece2e7aa4fd0e04d41459226533cc9be2e7
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
diff --git a/sci-mathematics/pari/files/pari-2.3.3-alglin.patch b/sci-mathematics/pari/files/pari-2.3.3-alglin.patch
new file mode 100644
index 000000000000..f0a9acc0fcb9
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.3.3-alglin.patch
@@ -0,0 +1,17 @@
+diff -Naur pari-2.3.3/src/basemath/alglin2.c pari-2.3.3.new/src/basemath/alglin2.c
+--- pari-2.3.3/src/basemath/alglin2.c	2006-10-03 19:15:33.000000000 -0400
++++ pari-2.3.3.new/src/basemath/alglin2.c	2008-05-06 21:05:06.000000000 -0400
+@@ -3082,11 +3082,9 @@
+     for (i=h[j]; i; i--)
+     {
+       a = gcoeff(A,i,j);
+-      if (!signe(a)) continue;
+-
+       k = c[i];
+-      ZV_elem(a,gcoeff(A,i,k), A,B, j,k);
+-      ZM_reduce(A,B, i,k);
++      if (signe(a)) ZV_elem(a,gcoeff(A,i,k), A,B, j,k);
++      ZM_reduce(A,B, i,k); /* ensure non-negative entries, even if a = 0 */
+       if (low_stack(lim, stack_lim(av1,1)))
+       {
+         if (DEBUGMEM>1) pari_warn(warnmem,"hnfall[3], j = %ld", j);
diff --git a/sci-mathematics/pari/pari-2.3.3.ebuild b/sci-mathematics/pari/pari-2.3.3.ebuild
index 5ddfd4d87fa5..53c7cd4c2ec5 100644
--- a/sci-mathematics/pari/pari-2.3.3.ebuild
+++ b/sci-mathematics/pari/pari-2.3.3.ebuild
@@ -1,22 +1,26 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.3.ebuild,v 1.1 2008/05/04 16:34:52 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.3.ebuild,v 1.2 2008/05/13 01:44:37 markusle Exp $
 
 inherit elisp-common eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A software package for computer-aided number theory"
 HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/${P}.tar.gz"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz
+	elliptic? ( http://pari.math.u-bordeaux.fr/pub/${PN}/packages/elldata.tgz )
+	galois? ( http://pari.math.u-bordeaux.fr/pub/${PN}/packages/galdata.tgz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc emacs X"
+IUSE="doc emacs X elliptic galois gmp static"
 
 DEPEND="doc? ( virtual/tetex )
 		sys-libs/readline
 		X? ( x11-libs/libX11 )
-		emacs? ( virtual/emacs )"
+		emacs? ( virtual/emacs )
+		gmp? ( dev-libs/gmp )"
+
 SITEFILE=50${PN}-gentoo.el
 
 get_compile_dir() {
@@ -31,8 +35,15 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# move data into place
+	if ( use galois || use elliptic ); then
+		mv "${WORKDIR}"/data "${S}" \
+			|| die "failed to move data"
+	fi
+
 	epatch "${FILESDIR}/"${PN}-2.3.2-strip.patch
 	epatch "${FILESDIR}/"${PN}-2.3.2-ppc-powerpc-arch-fix.patch
+	epatch "${FILESDIR}/"${P}-alglin.patch
 
 	# disable default building of docs during install
 	sed -e "s:install-doc install-examples:install-examples:" \
@@ -47,26 +58,37 @@ src_compile() {
 		append-flags -O2
 	fi
 
+	local myconf="--with-readline"
+	use gmp && myconf="${myconf} --kernel=gmp"
+
 	./Configure \
 		--prefix=/usr \
 		--datadir=/usr/share/${P} \
 		--libdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man/man1 || die "./Configure failed"
+		--mandir=/usr/share/man/man1 \
+		${myconf} \
+			|| die "./Configure failed"
 
 	if use hppa; then
 		mymake=DLLD\=/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
 	fi
 
-	# Shared libraries should be PIC on ALL architectures.
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/31
-	# Fixes BUG #49583
 	local installdir=$(get_compile_dir)
-	einfo "Building shared library..."
 	cd "${installdir}" || die "Bad directory. File a BUG!"
-	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
+
+	einfo "Building shared library..."
+	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn \
+		|| die "Building shared library failed!"
+
+	if use static; then
+		einfo "Building static library..."
+		emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE" lib-sta \
+			|| die "Building static library failed!"
+	fi
 
 	einfo "Building executables..."
-	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building executables failed!"
+	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp \
+		|| die "Building executables failed!"
 
 	if use doc; then
 		cd "${S}"
@@ -84,11 +106,12 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install || \
-		die "Install failed"
+	emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install \
+		|| die "Install failed"
 
 	if use emacs; then
-		elisp-install ${PN} emacs/*.el emacs/*.elc || die "elisp-install failed"
+		elisp-install ${PN} emacs/*.el emacs/*.elc \
+			|| die "elisp-install failed"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
@@ -100,6 +123,17 @@ src_install() {
 		doins doc/*.pdf || die "Failed to install pdf docs"
 	fi
 
+	if (use galois || use elliptic); then
+		emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install-data \
+			|| die "Failed to install data files"
+	fi
+
+	if use static; then
+		emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install-lib-sta || \
+			die "Install of static library failed"
+	fi
+
+
 	#remove superfluous doc directory
 	rm -fr "${D}/usr/share/${P}/doc" || \
 		die "Failed to clean up doc directory"