Added X useflag since X is optional for building pari-2.3.0 (see bug 141231). Also fixed up the install process such that latex is only used and needed for USE='doc'

Package-Manager: portage-2.1.2_pre1-r1

3 files changed, 31 insertions, 23 deletions

diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index c5386eb673bd..cf0bf2465d68 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/pari
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.39 2006/08/24 22:20:23 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.40 2006/09/26 15:18:10 markusle Exp $
+
+  26 Sep 2006; Markus Dittrich <markusle@gentoo.org> pari-2.3.0.ebuild:
+  Added X useflag since X is optional for building pari-2.3.0
+  (see bug 141231). Also fixed up the install process such that 
+  latex is only used and needed for USE="doc".
 
   24 Aug 2006; Herbie Hopkins <herbs@gentoo.org> pari-2.3.0.ebuild:
   Removing fPIC workaround as the cause of this was resolved, see bug #114722.
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 09947eab9ca8..3f45fd168ffb 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX docs.patch 915 RMD160 3e5cf3712d9f22678ab3bad2e541e04c11405a04 SHA1 ddc4e17185936d5a40e47254415ce94c15227ddc SHA256 00237da12482a4f292ddf358f269c9e28531da172aa130b07a26c9e125e45d1c
 MD5 c3f89da5ddbdb73646e3d64ee31ea887 files/docs.patch 915
 RMD160 3e5cf3712d9f22678ab3bad2e541e04c11405a04 files/docs.patch 915
@@ -37,14 +34,14 @@ EBUILD pari-2.1.7.ebuild 2451 RMD160 42e5a48c8a08b8d17e6175e24f6988e1dfb12ba4 SH
 MD5 fa51888dcaf06d7e6c4bb42f290e222e pari-2.1.7.ebuild 2451
 RMD160 42e5a48c8a08b8d17e6175e24f6988e1dfb12ba4 pari-2.1.7.ebuild 2451
 SHA256 3698882f048cd81b711cf8372c3148a9a9e9012e2bb52df39bbdf933a56f9ebb pari-2.1.7.ebuild 2451
-EBUILD pari-2.3.0.ebuild 2363 RMD160 a0af3e51a2a70eabbfaa826cd5a94fc6f755c3a0 SHA1 5827a45545e09aafd01f7ac8d9cfb58bbf61de52 SHA256 356c04ca9e567f0d5a7d38349feb6d13a336bad7abd175165710f80d80795502
-MD5 5b5f58f3d5ad7c3db9d9c8de7ce778be pari-2.3.0.ebuild 2363
-RMD160 a0af3e51a2a70eabbfaa826cd5a94fc6f755c3a0 pari-2.3.0.ebuild 2363
-SHA256 356c04ca9e567f0d5a7d38349feb6d13a336bad7abd175165710f80d80795502 pari-2.3.0.ebuild 2363
-MISC ChangeLog 7937 RMD160 498f7a26390d1449d25a1734248f427b12daa1e8 SHA1 4da77f678ee4bc0301509671685fd98466ab0160 SHA256 13c2d1bf2b06fc9261ba4af3b5050774daa054952135256d5f7509ca42eaa324
-MD5 475efaa4558fbc9de1820c2569e3366f ChangeLog 7937
-RMD160 498f7a26390d1449d25a1734248f427b12daa1e8 ChangeLog 7937
-SHA256 13c2d1bf2b06fc9261ba4af3b5050774daa054952135256d5f7509ca42eaa324 ChangeLog 7937
+EBUILD pari-2.3.0.ebuild 2707 RMD160 c543cf49774447dbdecc3c072a14276ee2321246 SHA1 6b1decab54c3d212f69c88e3f9787093cf78839d SHA256 c5d553a3ec9362ceb811298bb9771af82336145c13439201409aea46dc83eeb2
+MD5 6e5a804e929d181353bcc2aa1c1e3e58 pari-2.3.0.ebuild 2707
+RMD160 c543cf49774447dbdecc3c072a14276ee2321246 pari-2.3.0.ebuild 2707
+SHA256 c5d553a3ec9362ceb811298bb9771af82336145c13439201409aea46dc83eeb2 pari-2.3.0.ebuild 2707
+MISC ChangeLog 8187 RMD160 602e5b79bb747e22ac52b5962465e45e5c6496d2 SHA1 d154f21d1f344ff43c2931a73506e15073995b86 SHA256 74b8d36805e63f6fb8a056f59864a84a0ddf19a6383ebc7d90a54b7c3287c7d5
+MD5 47544656780a55b617cda913367fcefe ChangeLog 8187
+RMD160 602e5b79bb747e22ac52b5962465e45e5c6496d2 ChangeLog 8187
+SHA256 74b8d36805e63f6fb8a056f59864a84a0ddf19a6383ebc7d90a54b7c3287c7d5 ChangeLog 8187
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
@@ -64,10 +61,3 @@ SHA256 677ddf7806dfd620db0256a9dc90607881bd91e5a918a39eb6d7eb53354d90b0 files/di
 MD5 a2ae025cf063e0921e9808328247d59f files/digest-pari-2.3.0 235
 RMD160 e6addbee75c3fbade71bcd093eb63ba375325035 files/digest-pari-2.3.0 235
 SHA256 42f3f981d8c664f9939ffd55fcd2132e6e715a966fd44a9671e0cf00458e5461 files/digest-pari-2.3.0 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE7iZI2G5bA0cA/ScRAhexAJsEefuTCRcLPbo0V3S/twjTkIDo9QCdE5yC
-deuI6SuxYJNp6zaGJaPmTOA=
-=HKtx
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/pari/pari-2.3.0.ebuild b/sci-mathematics/pari/pari-2.3.0.ebuild
index 231774275bd7..14739c48942a 100644
--- a/sci-mathematics/pari/pari-2.3.0.ebuild
+++ b/sci-mathematics/pari/pari-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.0.ebuild,v 1.3 2006/08/24 22:20:23 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.0.ebuild,v 1.4 2006/09/26 15:18:10 markusle Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -11,11 +11,20 @@ SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="doc emacs"
+IUSE="doc emacs X"
 
 DEPEND="doc? ( virtual/tetex )
 		sys-libs/readline
-		|| ( x11-libs/libX11 virtual/x11 )"
+		X? ( || ( x11-libs/libX11 virtual/x11 ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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"
+}
 
 src_compile() {
 	# Special handling for sparc
@@ -67,7 +76,9 @@ src_test() {
 }
 
 src_install() {
-	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
+	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || \
+		die "Install failed"
+
 	if use emacs; then
 		insinto /usr/share/emacs/site-lisp
 		doins emacs/pari.el
@@ -75,6 +86,8 @@ src_install() {
 
 	dodoc AUTHORS Announce.2.1 CHANGES README TODO
 	if use doc; then
+		make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install-doc \
+			|| die "Failed to install docs"
 		insinto /usr/share/doc/${PF}
 		doins doc/*.pdf || die "Failed to install pdf docs"
 	fi