diff options
| -rw-r--r-- | sci-mathematics/singular/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-mathematics/singular/files/singular-3.0.4.4-emacs-22.patch | 31 | ||||
| -rw-r--r-- | sci-mathematics/singular/singular-3.0.4.4.ebuild | 19 |
3 files changed, 53 insertions, 4 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/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 |