Added proper emacs support (see bug #193411).

Package-Manager: portage-2.1.3.9

4 files changed, 57 insertions, 21 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 1b975ccd9c3c..83af77bd4157 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.18 2007/08/08 13:50:04 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.19 2007/09/25 12:26:50 markusle Exp $
+
+  24 Sep 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/60singular-gentoo.el, singular-3.0.3.ebuild:
+  Added proper emacs support (see bug #193411). Thanks much to
+  Christian Faulhammer <opfer@gentoo.org> for his patches.
 
   08 Aug 2007; Markus Dittrich <markusle@gentoo.org> singular-3.0.3.ebuild:
   Disabled building of MP for now since configure fails on amd64
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 911684a2d1ea..94308926f467 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,3 +1,7 @@
+AUX 60singular-gentoo.el 298 RMD160 6bd931435ad813a3a63c02ea68d90e768a685d88 SHA1 ffd1cb26719d6745f2e9463952f125769b8ca5a1 SHA256 b05a83af5a80fc1240e77d1cd036f4c9ca00907d11fb90d7f0ffb0c92ff7d235
+MD5 1a98f96e1177b195d9d95ff36b5a1c95 files/60singular-gentoo.el 298
+RMD160 6bd931435ad813a3a63c02ea68d90e768a685d88 files/60singular-gentoo.el 298
+SHA256 b05a83af5a80fc1240e77d1cd036f4c9ca00907d11fb90d7f0ffb0c92ff7d235 files/60singular-gentoo.el 298
 AUX fake_ssh 150 RMD160 2dad828186e9d00663b87b38ebacc7bbbdd81057 SHA1 6a43ea25d66d89cbc906086f796eeff61fce7341 SHA256 b8983f7d6e1ffeb7fa402f737f18ac61225ea8eae86272b9961859614d0737a3
 MD5 b1383ace2a0b30413341982e4e34341f files/fake_ssh 150
 RMD160 2dad828186e9d00663b87b38ebacc7bbbdd81057 files/fake_ssh 150
@@ -52,14 +56,14 @@ EBUILD singular-3.0.2.1.ebuild 3235 RMD160 daad978eb71b2905212b250dd2fe015bf0309
 MD5 52b419eeeebc4c707b276fba350a0f23 singular-3.0.2.1.ebuild 3235
 RMD160 daad978eb71b2905212b250dd2fe015bf030989a singular-3.0.2.1.ebuild 3235
 SHA256 b0ca1f35cf005b5f4c9c81011f99bcec89f7ad597b9341f6eeaa971966fa9d2b singular-3.0.2.1.ebuild 3235
-EBUILD singular-3.0.3.ebuild 3195 RMD160 59e48ea08b11cb96e4f81286fb6e143f877e2531 SHA1 069857f973a5eb360a0df56f2811ba465345a6c9 SHA256 27d57bcda8632d3dbbd4f89b733eefd4cd3e792735547f8a2e2163d495532dc8
-MD5 fec45327fd2e73481bd6d4a50f64b1de singular-3.0.3.ebuild 3195
-RMD160 59e48ea08b11cb96e4f81286fb6e143f877e2531 singular-3.0.3.ebuild 3195
-SHA256 27d57bcda8632d3dbbd4f89b733eefd4cd3e792735547f8a2e2163d495532dc8 singular-3.0.3.ebuild 3195
-MISC ChangeLog 5858 RMD160 6ad011ae63b5711f417074c7724978fa25ea3085 SHA1 6a4e601161468e67616bcc97219501226c8da072 SHA256 41775dd0fe3da1b2e77064068a7a85fd6ff5fef2b78b0150ea14ed853d2e1a08
-MD5 f07e6eee9510263c9635579d23f3f1bb ChangeLog 5858
-RMD160 6ad011ae63b5711f417074c7724978fa25ea3085 ChangeLog 5858
-SHA256 41775dd0fe3da1b2e77064068a7a85fd6ff5fef2b78b0150ea14ed853d2e1a08 ChangeLog 5858
+EBUILD singular-3.0.3.ebuild 3721 RMD160 b123f1d00b0dfab732a5dba1424d70e0440d51e8 SHA1 3a4958cad2889fa5de5ff51716ab89a79434b2d8 SHA256 39456c4b3bda1ab441fe8fbce9ddee9c3b1120bbee48dc3cefdf83ebd0f0f097
+MD5 aaff5a738be2eb9d1f53d4b71fa5468b singular-3.0.3.ebuild 3721
+RMD160 b123f1d00b0dfab732a5dba1424d70e0440d51e8 singular-3.0.3.ebuild 3721
+SHA256 39456c4b3bda1ab441fe8fbce9ddee9c3b1120bbee48dc3cefdf83ebd0f0f097 singular-3.0.3.ebuild 3721
+MISC ChangeLog 6088 RMD160 11d4d6daf71570e3a4cebe2271a26d06a91ab030 SHA1 8eb3f4a6021c8197399e2950ba0a6f51122a791b SHA256 b1a5d936c47694acd9ee3d1f25cac801af329d53367486eb842df9f947331aa8
+MD5 5e71aa2e7dc1964c1eddd522e5f52b90 ChangeLog 6088
+RMD160 11d4d6daf71570e3a4cebe2271a26d06a91ab030 ChangeLog 6088
+SHA256 b1a5d936c47694acd9ee3d1f25cac801af329d53367486eb842df9f947331aa8 ChangeLog 6088
 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/singular/files/60singular-gentoo.el b/sci-mathematics/singular/files/60singular-gentoo.el
new file mode 100644
index 000000000000..7be8c08ef7e9
--- /dev/null
+++ b/sci-mathematics/singular/files/60singular-gentoo.el
@@ -0,0 +1,10 @@
+
+;; site-file for sci-mathematics/singular
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'singular "singular"
+  "Start Singular using default values." t)
+(autoload 'singular-other "singular"
+  "Ask for arguments and start Singular." t)
+
+(add-to-list 'auto-mode-alist '("\\.sing\\'" . c++-mode))
diff --git a/sci-mathematics/singular/singular-3.0.3.ebuild b/sci-mathematics/singular/singular-3.0.3.ebuild
index 538d96847f23..fe58e927565f 100644
--- a/sci-mathematics/singular/singular-3.0.3.ebuild
+++ b/sci-mathematics/singular/singular-3.0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.3.ebuild,v 1.2 2007/08/08 13:50:04 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.3.ebuild,v 1.3 2007/09/25 12:26:50 markusle Exp $
 
-inherit eutils flag-o-matic autotools multilib
+inherit eutils elisp-common flag-o-matic autotools multilib
 
 PV_MAJOR=${PV%.*}
 MY_PV=${PV//./-}
@@ -21,11 +21,11 @@ IUSE="doc emacs boost"
 
 DEPEND=">=dev-lang/perl-5.6
 		>=dev-libs/gmp-4.1-r1
-		emacs? ( || ( virtual/xemacs
-					virtual/emacs ) )
+		emacs? ( virtual/emacs )
 		boost? ( dev-libs/boost )"
 
 S="${WORKDIR}"/${MY_PN}-${MY_PV}
+SITEFILE=60${PN}-gentoo.el
 
 src_unpack () {
 	unpack ${A}
@@ -54,6 +54,11 @@ src_compile() {
 	econf $(use_enable emacs) \
 		${myconf} || die "econf failed"
 	emake -j1 || die "make failed"
+
+	if use emacs; then
+		cd "${WORKDIR}"/${MY_PN}/${MY_PV}/emacs/
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
 }
 
 src_install () {
@@ -76,10 +81,6 @@ src_install () {
 	dobin ${MY_PN}* gen_test change_cost solve_IP \
 		toric_ideal LLL || die "failed to install binaries"
 
-	if use emacs; then
-		dobin E${MY_PN} || die "failed to install ESingular"
-	fi
-
 	# install libraries
 	insinto /usr/$(get_libdir)/${PN}
 	doins *.so || die "failed to install libraries"
@@ -102,15 +103,31 @@ src_install () {
 		die "failed to install info files"
 	fi
 
-	# install emacs specific stuff
+	# install emacs specific stuff here, as we did a directory change
+	# some lines above!
 	if use emacs; then
-		insinto /usr/share/${PN}/emacs
-		doins emacs/* && doins emacs/.emacs* || \
-		die "failed to set up emacs files"
+		elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* || \
+		die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 }
 
 pkg_postinst() {
 	einfo "The authors ask you to register as a SINGULAR user."
 	einfo "Please check the license file for details."
+
+	if use emacs; then
+		echo
+		ewarn "Please note that the ESingular emacs wrapper has been"
+		ewarn "removed in favor of full fledged singular support within"
+		ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
+		ewarn "and you should be good to go! See bug #193411 for more info."
+		echo
+	fi
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }