diff options
Diffstat (limited to 'app-emacs')
| -rw-r--r-- | app-emacs/calc/ChangeLog | 10 | ||||
| -rw-r--r-- | app-emacs/calc/calc-2.02f.ebuild | 25 | ||||
| -rw-r--r-- | app-emacs/calc/files/50calc-gentoo.el | 32 |
3 files changed, 45 insertions, 22 deletions
diff --git a/app-emacs/calc/ChangeLog b/app-emacs/calc/ChangeLog index 54d9ac382435..f80407d2e6d1 100644 --- a/app-emacs/calc/ChangeLog +++ b/app-emacs/calc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-emacs/calc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/calc/ChangeLog,v 1.3 2007/07/04 22:42:11 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/calc/ChangeLog,v 1.4 2007/10/27 08:23:40 ulm Exp $ + + 27 Oct 2007; Ulrich Mueller <ulm@gentoo.org> calc-2.02f.ebuild: + amd64 stable, bug 197184 + + 27 Oct 2007; Ulrich Mueller <ulm@gentoo.org> files/50calc-gentoo.el, + calc-2.02f.ebuild: + Deactivate calc for Emacs 22 where it is already included. Output a + corresponding message in pkg_postinst. Add die commands in src_install. 04 Jul 2007; Christian Faulhammer <opfer@gentoo.org> calc-2.02f.ebuild: added some quotes; added die comment diff --git a/app-emacs/calc/calc-2.02f.ebuild b/app-emacs/calc/calc-2.02f.ebuild index d52cef0a6609..e5ba70e2009c 100644 --- a/app-emacs/calc/calc-2.02f.ebuild +++ b/app-emacs/calc/calc-2.02f.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/app-emacs/calc/calc-2.02f.ebuild,v 1.3 2007/07/04 22:42:11 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/calc/calc-2.02f.ebuild,v 1.4 2007/10/27 08:23:40 ulm Exp $ -inherit elisp eutils +inherit elisp eutils versionator DESCRIPTION="Advanced calculator and mathematical tool within Emacs" HOMEPAGE="http://www.gnu.org/software/emacs/calc.html" @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/calc/${P}.tar.gz" LICENSE="GPL-1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" SITEFILE="50calc-gentoo.el" @@ -27,8 +27,23 @@ src_compile() { } src_install() { - elisp-install ${PN} calc*.el calc*.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" + elisp-install ${PN} calc*.el calc*.elc || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ + || die "elisp-site-file-install failed" + # prevent inclusion of package dir by subdirs.el + touch "${D}${SITELISP}/${PN}/.nosearch" + doinfo calc.info* dodoc README README.prev } + +pkg_postinst() { + elisp-site-regen + + if version_is_at_least 22 "$(elisp-emacs-version)"; then + echo + elog "Please note that \"${PN}\" is already included with Emacs 22 or" + elog "later, so ${CATEGORY}/${PN} is only needed for lower versions." + elog "You may select the active Emacs version with \"eselect emacs\"." + fi +} diff --git a/app-emacs/calc/files/50calc-gentoo.el b/app-emacs/calc/files/50calc-gentoo.el index e00353a6a555..4c727c760c3a 100644 --- a/app-emacs/calc/files/50calc-gentoo.el +++ b/app-emacs/calc/files/50calc-gentoo.el @@ -1,19 +1,19 @@ ;;; calc site-lisp configuration -(add-to-list 'load-path "@SITELISP@") - -(autoload 'calc-dispatch "calc" "Calculator Options" t) -(autoload 'full-calc "calc" "Full-screen Calculator" t) -(autoload 'full-calc-keypad "calc" "Full-screen X Calculator" t) -(autoload 'calc-eval "calc" "Use Calculator from Lisp") -(autoload 'defmath "calc" nil t t) -(autoload 'calc "calc" "Calculator Mode" t) -(autoload 'quick-calc "calc" "Quick Calculator" t) -(autoload 'calc-keypad "calc" "X windows Calculator" t) -(autoload 'calc-embedded "calc" "Use Calc inside any buffer" t) -(autoload 'calc-embedded-activate "calc" "Activate =>'s in buffer" t) -(autoload 'calc-grab-region "calc" "Grab region of Calc data" t) -(autoload 'calc-grab-rectangle "calc" "Grab rectangle of data" t) - -(global-set-key "\e#" 'calc-dispatch) +;; Emacs 22 and later include the calc package +(unless (fboundp 'calc-dispatch) + (add-to-list 'load-path "@SITELISP@") + (autoload 'calc-dispatch "calc" "Calculator Options" t) + (autoload 'full-calc "calc" "Full-screen Calculator" t) + (autoload 'full-calc-keypad "calc" "Full-screen X Calculator" t) + (autoload 'calc-eval "calc" "Use Calculator from Lisp") + (autoload 'defmath "calc" nil t t) + (autoload 'calc "calc" "Calculator Mode" t) + (autoload 'quick-calc "calc" "Quick Calculator" t) + (autoload 'calc-keypad "calc" "X windows Calculator" t) + (autoload 'calc-embedded "calc" "Use Calc inside any buffer" t) + (autoload 'calc-embedded-activate "calc" "Activate =>'s in buffer" t) + (autoload 'calc-grab-region "calc" "Grab region of Calc data" t) + (autoload 'calc-grab-rectangle "calc" "Grab rectangle of data" t) + (global-set-key "\e#" 'calc-dispatch)) |