Added improved emacs integration (fixes bug #225119).

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-SENTINEL-2 i686

4 files changed, 56 insertions, 6 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 1a618a395441..778e3ae5cb7f 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.24 2008/10/20 12:30:00 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.25 2008/11/08 03:53:08 markusle Exp $
+
+  08 Nov 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/singular-3.0.4.4-emacs-22.patch, singular-3.0.4.4.ebuild:
+  Added improved emacs integration (fixes bug #225119). Thanks much to
+  Thomas Kahle for his help.
 
 *singular-3.0.4.4 (20 Oct 2008)
 
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 0c4f19f6dc5e..2d9bb1cd9f1c 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -3,6 +3,7 @@ AUX fake_ssh 150 RMD160 2dad828186e9d00663b87b38ebacc7bbbdd81057 SHA1 6a43ea25d6
 AUX singular-3.0.1-gentoo.diff 4566 RMD160 cbfcd5c402b753c9a09b6e2961f2eaecf56b573e SHA1 0ed6038f3dbfc9fe8ff03e7107e95693eaf92346 SHA256 212be39ee18d42a20bdb57f4036746d6a8551456e89f168816ce557e054beac3
 AUX singular-3.0.1.2-gcc4.1-gentoo.patch 2603 RMD160 2b8ba6154bdd6e1a57f1093d966cb11874c05390 SHA1 45c479d1424993c8dc5a040dcaf58b91fc45d073 SHA256 748752eaddcbbcd181f50e497c8bdcb714f7a2f4434ddeacac679c6c0bc842e3
 AUX singular-3.0.4.2-gentoo.diff 4581 RMD160 9e775a3993730d88d1302679cfb38ca6c2121024 SHA1 b234a5047999dc6622965b13f8e25b1316ed4ceb SHA256 eb994b2a78c13e1a98c04d66b9a4ed980bcdfec828e6d1cc249d94b3a6bb5e9e
+AUX singular-3.0.4.4-emacs-22.patch 1482 RMD160 6f417ab3461219127358140c51d1352c34dabe99 SHA1 e9bad40cf79154870527498a1e2059a138aa6674 SHA256 0e17723d39a7b1ba395361dff2dc132b2b8463c4f41f7d7836539c99c64c8684
 AUX singular-3.0.4.4-nostrip.patch 453 RMD160 396d1c318ee76767b9dff9de7db516f988950962 SHA1 c1e154ecadd31286a1c2c6dc4d51170b7ecc62e9 SHA256 70d6972d7bddd1d8d601f715465a46c92eba1edf2c5608bbd01ae65c6fd64553
 DIST Singular-3-0-1-2.tar.gz 10741252 RMD160 bcfb83fe7a57658865aa69fc526e01413fb3da81 SHA1 a95aa909bfa20145df0eb1a345ae1476116af5fd SHA256 3d50427b17cef0a2ac36d302bf7421a4cb06df24139d5386c64d14a07e7cd399
 DIST Singular-3-0-1-share.tar.gz 3909236 RMD160 f1a1792cbb0688e1353285f898a2e40bc88fd4f6 SHA1 d7c07192707dbc6f916b3c5d704bae216f0834ff SHA256 5b8647886e15ca0a296a7d08a4161ecdc6fe5ef558cd9b36acda95a21a0883a2
@@ -11,6 +12,6 @@ DIST Singular-3-0-4-2.tar.gz 323584 RMD160 da24286756318dfdba9f968cb30543e1bf56e
 DIST Singular-3-0-4-4.tar.gz 15388216 RMD160 2a1b8a78411c1fb4f884389143dff2fb52e6b92d SHA1 29fccaabc269e8e2816a397c22bd61c48cbcf651 SHA256 c579489f57a7f0838d475c2b6e63d3459089ddedd93d783168439cfaaf2c4cec
 EBUILD singular-3.0.1.2.ebuild 3128 RMD160 4ebd0c64c63d0d57acd09baa88cf0ced8313744e SHA1 c27755d3098c4f0a66f1f429cfdbdee0327d51c5 SHA256 609495d0f8407cd5908cbbdc4ae28f03fced50d9b7411f4d4bc3a6ebf1ca9204
 EBUILD singular-3.0.4.2.ebuild 3827 RMD160 e8ffe96a6de0f85a18dadc85ef9e79f07c08bebe SHA1 edb2429e84b5048d5f6dc361b5c89dfe62efd031 SHA256 c1cef308acd2e6dd44287115f0f4f1b273c5e21406e487ed0759d95fdab103d1
-EBUILD singular-3.0.4.4.ebuild 4044 RMD160 7bf53759ba4f3075d50b679e5f0b45e330ff8f04 SHA1 ea30437cf0fc2b5ee08a9c0dcbb339a1ec21b0ab SHA256 653365f302c69b6e08a5533a80d455db09f401675726c35833bbfd1d201f7a0d
-MISC ChangeLog 7160 RMD160 7576bb71fffe10de21c80106c424dd6baf48e5b2 SHA1 46d2cdbcd8f9b0fee158829726d80a98c8ed5b0f SHA256 2ee3efabc1743246d55cadb05be78118268957975c99df0ba86815c23b2f0253
+EBUILD singular-3.0.4.4.ebuild 4474 RMD160 410d48823c5dc4ea69628783cab2c0c354c0dba9 SHA1 deef0ae2eb5c82715b1f93e13d8b4b798714012f SHA256 cbe383a2f15720998f5a3e0838e2edda9d7990d525527aa6e49ed337ace233fd
+MISC ChangeLog 7381 RMD160 c7b12a43206e0dfee4975baf730393bcd647948d SHA1 2bccbd766207327a7dd6920d1153f6ed88f7ff8a SHA256 4f49ad358e4707b146fd55f8c83428795fd632ced5075a00b89e89bf66bdab84
 MISC metadata.xml 280 RMD160 2d367099d0325ec0cc6c6bc330d90c0c9ca8aca6 SHA1 d97bcf8e217b23d35fad5c7d4d3fa6c3b6c3d5e7 SHA256 56cb53caa58cda2146b3292101a68724ee15efa78563b33fff3e7b0c1ba47718
diff --git a/sci-mathematics/singular/files/singular-3.0.4.4-emacs-22.patch b/sci-mathematics/singular/files/singular-3.0.4.4-emacs-22.patch
new file mode 100644
index 000000000000..f05db402ea1b
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.0.4.4-emacs-22.patch
@@ -0,0 +1,31 @@
+diff -Naur Singular-3-0-4/emacs/.emacs-singular Singular-3-0-4.new/emacs/.emacs-singular
+--- Singular-3-0-4/emacs/.emacs-singular	2004-12-09 11:27:54.000000000 -0500
++++ Singular-3-0-4.new/emacs/.emacs-singular	2008-11-07 18:06:50.000000000 -0500
+@@ -96,10 +96,10 @@
+        ;; unix stuff 
+ 
+        ;; lazy-lock seems to be broken under mswindows:
+-       ;; causes delay of input (only reacts after mouse click), or even total 
++       ;; causes delay of input (only reacts after mouse click), or even total
+        ;; hang
+-       (add-hook 'font-lock-mode-hook 'lazy-lock-mode)
+-       (setq font-lock-support-mode 'lazy-lock-mode)
++       ;(add-hook 'font-lock-mode-hook 'lazy-lock-mode)
++       ;(setq font-lock-support-mode 'lazy-lock-mode)
+        
+        ;; somewhat nicer scrolling This causes a core dump with 21.1.9
+        ;; under cygwin, when a file is opened with a button 
+diff -Naur Singular-3-0-4/emacs/singular.el Singular-3-0-4.new/emacs/singular.el
+--- Singular-3-0-4/emacs/singular.el	2000-12-18 10:44:32.000000000 -0500
++++ Singular-3-0-4.new/emacs/singular.el	2008-11-07 18:06:02.000000000 -0500
+@@ -865,7 +865,9 @@
+   (add-hook 'singular-post-output-filter-functions 'singular-prompt-remove-filter nil t)
+ 
+   ;; some relict from Comint mode
+-  (setq comint-prompt-regexp singular-comint-prompt-regexp))
++  (setq comint-prompt-regexp singular-comint-prompt-regexp)
++  (setq comint-use-prompt-regexp-instead-of-fields 1)
++  )
+ ;;}}}
+ 
+ ;;{{{ Miscellaneous
diff --git a/sci-mathematics/singular/singular-3.0.4.4.ebuild b/sci-mathematics/singular/singular-3.0.4.4.ebuild
index 07a88c8ed509..af8d6072c649 100644
--- a/sci-mathematics/singular/singular-3.0.4.4.ebuild
+++ b/sci-mathematics/singular/singular-3.0.4.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.4.4.ebuild,v 1.1 2008/10/20 12:30:00 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.4.4.ebuild,v 1.2 2008/11/08 03:53:08 markusle Exp $
 
-inherit eutils elisp-common flag-o-matic autotools multilib
+inherit eutils elisp-common flag-o-matic autotools multilib versionator
 
 PV_MAJOR=${PV%.*}
 MY_PV=${PV//./-}
@@ -21,17 +21,30 @@ IUSE="doc emacs boost"
 
 DEPEND=">=dev-lang/perl-5.6
 		>=dev-libs/gmp-4.1-r1
-		emacs? ( virtual/emacs )
+		emacs? ( >=virtual/emacs-22 )
 		boost? ( dev-libs/boost )"
 
 S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR}
 SITEFILE=60${PN}-gentoo.el
 
+pkg_setup() {
+	# we need at least emacs-22 in order for our emacs patches
+	# to work
+	need_emacs=22
+	have_emacs=$(elisp-emacs-version)
+	if ! version_is_at_least "${need_emacs}" "${have_emacs}"; then
+		eerror "This package needs at least emacs version ${need_emacs}."
+		eerror "Use \"eselect emacs\" to select the active version."
+		die "Emacs version is too low."
+	fi
+}
+
 src_unpack () {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-3.0.4.2-gentoo.diff
 	epatch "${FILESDIR}"/${P}-nostrip.patch
+	epatch "${FILESDIR}"/${P}-emacs-22.patch
 
 	# for some unknown reason this ldflag causes the
 	# build system to choke