Fixed pari's emacs support (see bug #193378).

Package-Manager: portage-2.1.3.9

4 files changed, 52 insertions, 18 deletions

diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index ab7c619e78ba..44e11ac5fe40 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/pari
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.44 2007/09/15 12:38:36 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.45 2007/09/22 12:44:21 markusle Exp $
+
+  22 Sep 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/50pari-gentoo.el, pari-2.3.2.ebuild:
+  Fixed pari's emacs support (see bug #193378). Thanks much to 
+  Christian Faulhammer <opfer@gentoo.org> for his patches.
 
   15 Sep 2007; Markus Dittrich <markusle@gentoo.org> pari-2.3.2.ebuild:
   Added fix to allow test routines to pass on sparc (see bug #141206).
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 4e8b48ce1142..87721a8274df 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,3 +1,7 @@
+AUX 50pari-gentoo.el 271 RMD160 e71ae40ba7bc2179bdb963d4300020d6a5f8bf76 SHA1 6956b8771d0bcf632ab59a6cca0a2282368bd03f SHA256 787e2c797c42645de8429cd449040b81563e07681c557bc9433cc4ef287ffe12
+MD5 69598fa2cc22cdf27e9426f68ab84c6c files/50pari-gentoo.el 271
+RMD160 e71ae40ba7bc2179bdb963d4300020d6a5f8bf76 files/50pari-gentoo.el 271
+SHA256 787e2c797c42645de8429cd449040b81563e07681c557bc9433cc4ef287ffe12 files/50pari-gentoo.el 271
 AUX docs.patch 915 RMD160 3e5cf3712d9f22678ab3bad2e541e04c11405a04 SHA1 ddc4e17185936d5a40e47254415ce94c15227ddc SHA256 00237da12482a4f292ddf358f269c9e28531da172aa130b07a26c9e125e45d1c
 MD5 c3f89da5ddbdb73646e3d64ee31ea887 files/docs.patch 915
 RMD160 3e5cf3712d9f22678ab3bad2e541e04c11405a04 files/docs.patch 915
@@ -39,14 +43,14 @@ EBUILD pari-2.3.0.ebuild 2689 RMD160 570bc3462b07feab4d0d21d1323949f837e14a66 SH
 MD5 f7401926157d44c66bc9a4001118bac0 pari-2.3.0.ebuild 2689
 RMD160 570bc3462b07feab4d0d21d1323949f837e14a66 pari-2.3.0.ebuild 2689
 SHA256 2b0c1384ba4017ca1db4cdc72b730080ec03831d23a7c1ea440b260d82a842f3 pari-2.3.0.ebuild 2689
-EBUILD pari-2.3.2.ebuild 2692 RMD160 51b803484154b4113fcab8db4da5b16740642302 SHA1 674f1ec9126de6745c56d29a38b763458a2ef82a SHA256 fc0c161f3aa4051bbfefc44ef2f080e954f7de34c0a5254a0bdedabf5edc7903
-MD5 5b2a43a70ed15e7363f478db4ecf3291 pari-2.3.2.ebuild 2692
-RMD160 51b803484154b4113fcab8db4da5b16740642302 pari-2.3.2.ebuild 2692
-SHA256 fc0c161f3aa4051bbfefc44ef2f080e954f7de34c0a5254a0bdedabf5edc7903 pari-2.3.2.ebuild 2692
-MISC ChangeLog 8713 RMD160 cfe2b5081948daaa121f6da6e2b94e5eb965d182 SHA1 07f0204b9dc9407518d633cf3864f4d1b6583c52 SHA256 71fc5bc53bd08fbdd5fc5e845fb36c77d1a13ead33832b0885a8bb92779a2e1b
-MD5 a525de1e55e85dd0ccc896228c2621f7 ChangeLog 8713
-RMD160 cfe2b5081948daaa121f6da6e2b94e5eb965d182 ChangeLog 8713
-SHA256 71fc5bc53bd08fbdd5fc5e845fb36c77d1a13ead33832b0885a8bb92779a2e1b ChangeLog 8713
+EBUILD pari-2.3.2.ebuild 3016 RMD160 081ced0a47f93aa5fcc56392a246e9dd06a0e4a2 SHA1 269030f09e699c25b4ee67638a1a32d015c68b44 SHA256 d3e782472540087e68067afccec1ed1a382f423e8ae69d440c21b206ad8c7c33
+MD5 f60ac00447ef2086594502b5a4b5e847 pari-2.3.2.ebuild 3016
+RMD160 081ced0a47f93aa5fcc56392a246e9dd06a0e4a2 pari-2.3.2.ebuild 3016
+SHA256 d3e782472540087e68067afccec1ed1a382f423e8ae69d440c21b206ad8c7c33 pari-2.3.2.ebuild 3016
+MISC ChangeLog 8936 RMD160 058561eb11811d74804f50687c814887cfe28bbf SHA1 0ba4310818d1e1c27c3729e3cfff8cb5bbd20624 SHA256 4ec5ae873393fc03ae68463d504af16eb3d4e59820cdbc2980af01eed2a96f51
+MD5 20e3cb937b7e38578cad4730771971e2 ChangeLog 8936
+RMD160 058561eb11811d74804f50687c814887cfe28bbf ChangeLog 8936
+SHA256 4ec5ae873393fc03ae68463d504af16eb3d4e59820cdbc2980af01eed2a96f51 ChangeLog 8936
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
diff --git a/sci-mathematics/pari/files/50pari-gentoo.el b/sci-mathematics/pari/files/50pari-gentoo.el
new file mode 100644
index 000000000000..2f5b4da9084e
--- /dev/null
+++ b/sci-mathematics/pari/files/50pari-gentoo.el
@@ -0,0 +1,10 @@
+
+;; site-init for sci-mathematics/pari
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'gp-mode "pari" nil t)
+(autoload 'gp-script-mode "pari" nil t)
+(autoload 'gp "pari" nil t)
+(autoload 'gpman "pari" nil t)
+(add-to-list 'auto-mode-alist '("\\.gp$" . gp-script-mode))
diff --git a/sci-mathematics/pari/pari-2.3.2.ebuild b/sci-mathematics/pari/pari-2.3.2.ebuild
index 9f889e9f99f1..bef9370d8ed8 100644
--- a/sci-mathematics/pari/pari-2.3.2.ebuild
+++ b/sci-mathematics/pari/pari-2.3.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.2.ebuild,v 1.3 2007/09/15 12:38:36 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.3.2.ebuild,v 1.4 2007/09/22 12:44:21 markusle Exp $
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit elisp-common eutils flag-o-matic multilib toolchain-funcs
 
-DESCRIPTION="pari (or pari-gp) : a software package for computer-aided number theory"
+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"
 
@@ -15,7 +15,9 @@ IUSE="doc emacs X"
 
 DEPEND="doc? ( virtual/tetex )
 		sys-libs/readline
-		X? ( x11-libs/libX11 )"
+		X? ( x11-libs/libX11 )
+		emacs? ( virtual/emacs )"
+SITEFILE=50${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
@@ -66,6 +68,11 @@ src_compile() {
 		cd "${S}"
 		emake docpdf || die "Failed to generate docs"
 	fi
+
+	if use emacs; then
+		cd "${S}/emacs"
+		elisp-comp *.el || die "elisp-comp failed"
+	fi
 }
 
 src_test() {
@@ -76,23 +83,31 @@ src_test() {
 }
 
 src_install() {
-	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || \
+	emake 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
+		elisp-install ${PN} emacs/*.el emacs/*.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
 	dodoc AUTHORS Announce.2.1 CHANGES README TODO NEW
 	if use doc; then
-		make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install-doc \
+		emake 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
 
 	#remove superfluous doc directory
-	rm -fr ${D}/usr/share/${P}/doc || \
+	rm -fr "${D}/usr/share/${P}/doc" || \
 		die "Failed to clean up doc directory"
 }
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}