Added more data which can be merged with a data flag. Fixed doc help (bug #264579) and display doc with default dvi viewer launched by xdg-open

(Portage version: 2.2_rc28/cvs/Linux x86_64)

3 files changed, 88 insertions, 54 deletions

diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index 800c8b3021cb..a0b89a352f9f 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/pari
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.66 2009/01/15 17:19:08 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.67 2009/04/06 21:40:16 bicatali Exp $
+
+*pari-2.3.4-r1 (06 Apr 2009)
+
+  06 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  -pari-2.3.3.ebuild, +pari-2.3.4-r1.ebuild:
+  Added more data which can be merged with a data flag. Fixed doc help (bug
+  #264579) and display doc with default dvi viewer launched by xdg-open
 
 *pari-2.3.4 (15 Jan 2009)
 
diff --git a/sci-mathematics/pari/metadata.xml b/sci-mathematics/pari/metadata.xml
index ae46f07ce559..2a3550abe510 100644
--- a/sci-mathematics/pari/metadata.xml
+++ b/sci-mathematics/pari/metadata.xml
@@ -2,9 +2,27 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-mathematics</herd>
+<longdescription lang="en">
+  PARI is a widely used computer algebra system designed for fast
+  computations in number theory (factorizations, algebraic number
+  theory, elliptic curves...), but also contains a large number of other
+  useful functions to compute with mathematical entities such as
+  matrices, polynomials, power series, algebraic numbers, etc., and a
+  lot of transcendental functions.
+  The extra data is avaialable through use flag:
+  * elldata is PARI/GP version of J. E. Cremona Elliptic Curve Data,
+    needed by ellsearch and ellidentify.
+  * galdata is needed by polgalois to compute Galois group in degrees
+    8 through 11.
+  * seadata is needed by ellap for large primes.
+  * nftables is a repackaging of the historical megrez number field
+tables (errors fixed, 1/10th the size, easier to use).
+
+</longdescription>
 <use>
   <flag name='elliptic'>Add additional elliptic curve data</flag>
   <flag name='galois'>Add additional data to compute Galois groups of degree
     8 to 11</flag>
+  <flag name='data'>Add additional data (elldata, galdata, seadata, nftables)</flag>  
 </use>
 </pkgmetadata>
diff --git a/sci-mathematics/pari/pari-2.3.3.ebuild b/sci-mathematics/pari/pari-2.3.4-r1.ebuild
index 421a96cacdde..4d8d7ef327d1 100644
--- a/sci-mathematics/pari/pari-2.3.3.ebuild
+++ b/sci-mathematics/pari/pari-2.3.4-r1.ebuild
@@ -1,25 +1,34 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.7 2008/08/27 20:04:42 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.4-r1.ebuild,v 1.1 2009/04/06 21:40:16 bicatali Exp $
 
-inherit elisp-common eutils flag-o-matic multilib toolchain-funcs
+EAPI=2
+inherit elisp-common eutils flag-o-matic
 
 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/${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 )"
+
+SRC_COM="http://pari.math.u-bordeaux.fr/pub/${PN}"
+SRC_URI="${SRC_COM}/unix/${P}.tar.gz
+	data? (	${SRC_COM}/packages/elldata.tgz
+			${SRC_COM}/packages/galdata.tgz
+			${SRC_COM}/packages/seadata.tgz
+			${SRC_COM}/packages/nftables.tgz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc emacs X elliptic galois gmp static"
-
-DEPEND="doc? ( virtual/latex-base )
-		sys-libs/readline
-		X? ( x11-libs/libX11 )
-		emacs? ( virtual/emacs )
-		gmp? ( dev-libs/gmp )"
+IUSE="doc data emacs gmp static X"
+
+RDEPEND="sys-libs/readline
+	emacs? ( virtual/emacs )
+	fltk? ( x11-libs/fltk )
+	gmp? ( dev-libs/gmp )
+	qt3? ( x11-libs/qt:3 )
+	X? ( x11-libs/libX11 )
+	doc? ( X? ( x11-misc/xdg-utils ) )"
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )"
 
 SITEFILE=50${PN}-gentoo.el
 
@@ -31,62 +40,65 @@ get_compile_dir() {
 	echo "O${osname}-${arch}"
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# move data into place
-	if ( use galois || use elliptic ); then
-		mv "${WORKDIR}"/data "${S}" \
-			|| die "failed to move data"
+	if use data; 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:" \
-		-i config/Makefile.SH || die "Failed to fix makefile"
+	sed -i \
+		-e "s:install-doc install-examples:install-examples:" \
+		config/Makefile.SH || die "Failed to fix makefile"
+	# propagate ldflags
+	sed -i \
+		-e 's/-shared $extra/-shared $extra \\$(LDFLAGS)/' \
+		config/get_dlld || die "Failed to fix LDFLAGS"
+	# move doc dir to a gentoo doc dir and replace hardcoded xdvi by xdg-open
+	sed -i \
+		-e "s:\$d = \$0:\$d = '/usr/share/doc/${PF}':" \
+		-e 's:"xdvi":"xdg-open":' \
+		-e 's:xdvi -paper 29.7x21cm:xdg-open:' \
+		doc/gphelp.in || die "Failed to fix doc dir"
 }
 
-src_compile() {
-	#need to force optimization here, as it breaks without
+src_configure() {
+	# need to force optimization here, as it breaks without
 	if   is-flag -O0; then
 		replace-flags -O0 -O2
 	elif ! is-flag -O?; then
 		append-flags -O2
 	fi
-
-	local myconf="--with-readline"
-	use gmp && myconf="${myconf} --kernel=gmp"
-
+	# sysdatadir installs a pari.cfg stuff which is informative only
 	./Configure \
 		--prefix=/usr \
-		--datadir=/usr/share/${P} \
+		--datadir=/usr/share/${PN} \
 		--libdir=/usr/$(get_libdir) \
+		--sysdatadir=/usr/share/doc/${PF} \
 		--mandir=/usr/share/man/man1 \
-		${myconf} \
-			|| die "./Configure failed"
+		--with-readline \
+		$(use_with gmp) \
+		|| die "./Configure failed"
+}
 
+src_compile() {
 	if use hppa; then
 		mymake=DLLD\=/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
 	fi
 
 	local installdir=$(get_compile_dir)
-	cd "${installdir}" || die "Bad directory. File a BUG!"
+	cd "${installdir}" || die "Bad directory"
 
-	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!"
 
@@ -96,7 +108,6 @@ src_compile() {
 		VARTEXFONTS="${T}"/fonts emake docpdf \
 			|| die "Failed to generate docs"
 	fi
-
 	if use emacs; then
 		cd "${S}/emacs"
 		elisp-compile *.el || die "elisp-compile failed"
@@ -104,12 +115,11 @@ src_compile() {
 }
 
 src_test() {
-	make test-kernel
+	emake test-kernel || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install \
-		|| die "Install failed"
+	emake DESTDIR="${D}" install || die "Install failed"
 
 	if use emacs; then
 		elisp-install ${PN} emacs/*.el emacs/*.elc \
@@ -117,27 +127,26 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
-	dodoc AUTHORS Announce.2.1 CHANGES README TODO NEW
+	dodoc AUTHORS Announce.2.1 CHANGES README NEW MACHINES COMPAT
 	if use doc; then
-		emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install-doc \
-			|| die "Failed to install docs"
+		emake \
+			DESTDIR="${D}" \
+			EXDIR="${D}/usr/share/doc/${PF}/examples" \
+			DOCDIR="${D}/usr/share/doc/${PF}" \
+			install-doc || die "Failed to install docs"
 		insinto /usr/share/doc/${PF}
 		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"
+	if use data; then
+		emake DESTDIR="${D}" 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"
+		emake \
+			DESTDIR="${D}" \
+			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"
 }
 
 pkg_postinst() {