diff options
author | Ulrich Müller <ulm@gentoo.org> | 2011-10-20 00:08:11 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2011-10-20 00:08:11 +0000 |
commit | 4f4f9400ab6c55c2bcd77b182848c62fb2b59f52 (patch) | |
tree | 15d476bd6e01249e3990a50e15dacd4e4a5e8c99 | |
parent | aspectj4emacs removed 2010-02-09 bug 175570 (diff) | |
download | emacs-4f4f9400ab6c55c2bcd77b182848c62fb2b59f52.tar.gz emacs-4f4f9400ab6c55c2bcd77b182848c62fb2b59f52.tar.bz2 emacs-4f4f9400ab6c55c2bcd77b182848c62fb2b59f52.zip |
calc removed 2011-05-18 bug 358351
svn path=/emacs-graveyard/; revision=1711
-rw-r--r-- | app-emacs/calc/ChangeLog | 38 | ||||
-rw-r--r-- | app-emacs/calc/Manifest | 17 | ||||
-rw-r--r-- | app-emacs/calc/calc-2.02f.ebuild | 42 | ||||
-rw-r--r-- | app-emacs/calc/files/50calc-gentoo.el | 16 | ||||
-rw-r--r-- | app-emacs/calc/files/calc-2.02f-emacs-21.patch | 260 | ||||
-rw-r--r-- | app-emacs/calc/files/calc-2.02f-info-dir.patch | 13 | ||||
-rw-r--r-- | app-emacs/calc/metadata.xml | 28 |
7 files changed, 414 insertions, 0 deletions
diff --git a/app-emacs/calc/ChangeLog b/app-emacs/calc/ChangeLog new file mode 100644 index 0000000..612de70 --- /dev/null +++ b/app-emacs/calc/ChangeLog @@ -0,0 +1,38 @@ +# ChangeLog for app-emacs/calc +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emacs/calc/ChangeLog,v 1.8 2010/06/26 12:31:38 ulm Exp $ + + 26 Jun 2010; Ulrich Mueller <ulm@gentoo.org> calc-2.02f.ebuild: + Don't inherit versionator.eclass. + + 29 Mar 2009; Ulrich Mueller <ulm@gentoo.org> calc-2.02f.ebuild: + Use autopatch feature of elisp.eclass. + + 30 Nov 2007; Ulrich Mueller <ulm@gentoo.org> calc-2.02f.ebuild: + Move message to pkg_setup, so that it is also seen if build fails. + + 27 Oct 2007; Christian Faulhammer <opfer@gentoo.org> calc-2.02f.ebuild: + stable x86, bug 197184 + + 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 + + 10 Dec 2006; Peter Weller <welp@gentoo.org> calc-2.02f.ebuild: + Added ~amd64 keyword wrt bug #127269 + +*calc-2.02f (05 Mar 2006) + + 05 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org> + +files/calc-2.02f-emacs-21.patch, +files/50calc-gentoo.el, + +files/calc-2.02f-info-dir.patch, +calc-2.02f.ebuild: + Initial port. Ebuild contributed by Ulrich Mueller <ulm@kph.uni-mainz.de>; + Resolves Bug #124076. + diff --git a/app-emacs/calc/Manifest b/app-emacs/calc/Manifest new file mode 100644 index 0000000..f8fb57b --- /dev/null +++ b/app-emacs/calc/Manifest @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 50calc-gentoo.el 906 RMD160 2bc992f0aeacb9d375b2891d0091d52f4f55f6ea SHA1 45e9080f32e1b4dea1f161a1b54078c5280d3a49 SHA256 3e6d661b92db4b2a9382d28a08c798fcd8a5e5f1f17edf76f8a0e59841400fd9 +AUX calc-2.02f-emacs-21.patch 8642 RMD160 1915e1f5f571b92d9cc67ced09085b7a862155e5 SHA1 50c38fbbfa3112bded1ace696fcce942dfdc7d90 SHA256 9c5fd5b410a43c0586a46b69c8f81e4f1ee372291bf76e9c37067bd6f4b68b59 +AUX calc-2.02f-info-dir.patch 301 RMD160 56a619a319f036ccbbc5fc8f21a8380b807cf68e SHA1 3f8e5242b93a598bcb453ac3c09e678df99a9299 SHA256 cac6ee1a91324f2001c1d991bb7b9bba24ae6eae36ee554fbbc9e252fdbabbaf +DIST calc-2.02f.tar.gz 831865 RMD160 4ca65723de4a5c3f8ebb3c61191185b48ddb1009 SHA1 1a1d54fb90725aacaf1c9308a94be4b813ac4880 SHA256 774231cdf06999d3a7cbfae69a1afe469497a6bc7d2e6cb90de922dd3ae5e67d +EBUILD calc-2.02f.ebuild 1242 RMD160 4d2964000229d36c94b784da3916202e8c63a628 SHA1 5beaf7b3ad5b20deb131e9f7b8e708ebaffee083 SHA256 bef5368ae45a2e3f5959e71a5f5a00b59b4dff7b95d8fece388b5a4f61e1c928 +MISC ChangeLog 1494 RMD160 2e752a51909f3d3c88c850cbbadd1df380fbac72 SHA1 cd4fe0b7e203deac46b963579d22735608568344 SHA256 62e0545154d46cf0685262f3282649a8c562b5549f9ade0fd17b953e4d646b54 +MISC metadata.xml 1515 RMD160 b82c1d081fecab8d22e6303b719d8003660a4d79 SHA1 9890c29254cdf634d4ebac0856521068dd2c2173 SHA256 185ba60afb4cb0b53abbd53268adf38bd73c9ff58b74dbecfea11fd0542e411e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkwl84wACgkQOeoy/oIi7uxDCwCePjC6SqSm0ALBmCOXH1ab8rN9 +/pgAnj5+H/TsKGfBzCz+N2mkmz8PROq5 +=aqqx +-----END PGP SIGNATURE----- diff --git a/app-emacs/calc/calc-2.02f.ebuild b/app-emacs/calc/calc-2.02f.ebuild new file mode 100644 index 0000000..a30320c --- /dev/null +++ b/app-emacs/calc/calc-2.02f.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2010 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.8 2010/06/26 12:31:38 ulm Exp $ + +inherit elisp + +DESCRIPTION="Advanced calculator and mathematical tool within Emacs" +HOMEPAGE="http://www.gnu.org/software/emacs/calc.html" +SRC_URI="mirror://gnu/calc/${P}.tar.gz" + +LICENSE="GPL-1" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +ELISP_PATCHES="${P}-emacs-21.patch ${P}-info-dir.patch" +SITEFILE="50${PN}-gentoo.el" + +pkg_setup() { + local have_emacs=$(elisp-emacs-version) + if [ "${have_emacs%%.*}" -ge 22 ]; 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 +} + +src_compile() { + emake compile info || die "emake failed" +} + +src_install() { + 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 +} diff --git a/app-emacs/calc/files/50calc-gentoo.el b/app-emacs/calc/files/50calc-gentoo.el new file mode 100644 index 0000000..6edd80a --- /dev/null +++ b/app-emacs/calc/files/50calc-gentoo.el @@ -0,0 +1,16 @@ +;; 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)) diff --git a/app-emacs/calc/files/calc-2.02f-emacs-21.patch b/app-emacs/calc/files/calc-2.02f-emacs-21.patch new file mode 100644 index 0000000..cb31e9a --- /dev/null +++ b/app-emacs/calc/files/calc-2.02f-emacs-21.patch @@ -0,0 +1,260 @@ +Taken from: /usr/share/emacs/21.4/etc/PROBLEMS +* The Calc package fails to build and signals errors with Emacs 21. + +Apply the following patches which reportedly fix several problems: + +--- calc-ext.el.~1~ Sun Apr 3 02:26:34 1994 ++++ calc-ext.el Wed Sep 18 17:35:01 1996 +@@ -1354,6 +1354,25 @@ + (calc-fancy-prefix 'calc-inverse-flag "Inverse..." n) + ) + ++(defconst calc-fancy-prefix-map ++ (let ((map (make-sparse-keymap))) ++ (define-key map [t] 'calc-fancy-prefix-other-key) ++ (define-key map (vector meta-prefix-char t) 'calc-fancy-prefix-other-key) ++ (define-key map [switch-frame] nil) ++ (define-key map [?\C-u] 'universal-argument) ++ (define-key map [?0] 'digit-argument) ++ (define-key map [?1] 'digit-argument) ++ (define-key map [?2] 'digit-argument) ++ (define-key map [?3] 'digit-argument) ++ (define-key map [?4] 'digit-argument) ++ (define-key map [?5] 'digit-argument) ++ (define-key map [?6] 'digit-argument) ++ (define-key map [?7] 'digit-argument) ++ (define-key map [?8] 'digit-argument) ++ (define-key map [?9] 'digit-argument) ++ map) ++ "Keymap used while processing calc-fancy-prefix.") ++ + (defun calc-fancy-prefix (flag msg n) + (let (prefix) + (calc-wrapper +@@ -1364,6 +1383,8 @@ + (message (if prefix msg ""))) + (and prefix + (not calc-is-keypad-press) ++ (if (boundp 'overriding-terminal-local-map) ++ (setq overriding-terminal-local-map calc-fancy-prefix-map) + (let ((event (calc-read-key t))) + (if (eq (setq last-command-char (car event)) ?\C-u) + (universal-argument) +@@ -1376,9 +1397,18 @@ + (if (or (not (integerp last-command-char)) + (eq last-command-char ?-)) + (calc-unread-command) +- (digit-argument n)))))) ++ (digit-argument n))))))) + ) + (setq calc-is-keypad-press nil) ++ ++(defun calc-fancy-prefix-other-key (arg) ++ (interactive "P") ++ (if (or (not (integerp last-command-char)) ++ (and (>= last-command-char 0) (< last-command-char ? ) ++ (not (eq last-command-char meta-prefix-char)))) ++ (calc-wrapper)) ; clear flags if not a Calc command. ++ (calc-unread-command) ++ (setq overriding-terminal-local-map nil)) + + (defun calc-invert-func () + (save-excursion + +Index: Makefile +--- Makefile.~1~ Sun Dec 15 23:50:45 1996 ++++ Makefile Thu Nov 30 15:09:45 2000 +@@ -41,7 +41,7 @@ + + # Other macros. + EFLAGS = -batch +-MAINT = -l calc-maint.elc ++MAINT = -l calc-maint.el + + # Control whether intermediate files are kept. + PURGE = -rm -f +@@ -154,10 +154,7 @@ + + + # All this because "-l calc-maint" doesn't work. +-maint: calc-maint.elc +-calc-maint.elc: calc-maint.el +- cp calc-maint.el calc-maint.elc +- ++maint: calc-maint.el + + # Create an Emacs TAGS file + tags: TAGS + +Index: calc-aent.el +--- calc-aent.el.~1~ Sun Dec 15 23:50:36 1996 ++++ calc-aent.el Tue Nov 21 18:34:33 2000 +@@ -385,7 +385,7 @@ + (calc-minibuffer-contains + "\\`\\([^\"]*\"[^\"]*\"\\)*[^\"]*\"[^\"]*\\'")) + (insert "`") +- (setq alg-exp (buffer-string)) ++ (setq alg-exp (field-string)) + (and (> (length alg-exp) 0) (setq calc-previous-alg-entry alg-exp)) + (exit-minibuffer)) + ) +@@ -393,14 +393,14 @@ + + (defun calcAlg-enter () + (interactive) +- (let* ((str (buffer-string)) ++ (let* ((str (field-string)) + (exp (and (> (length str) 0) + (save-excursion + (set-buffer calc-buffer) + (math-read-exprs str))))) + (if (eq (car-safe exp) 'error) + (progn +- (goto-char (point-min)) ++ (goto-char (field-beginning)) + (forward-char (nth 1 exp)) + (beep) + (calc-temp-minibuffer-message +@@ -455,14 +455,14 @@ + (interactive) + (if (calc-minibuffer-contains ".*[@oh] *[^'m ]+[^'m]*\\'") + (calcDigit-key) +- (setq calc-digit-value (buffer-string)) ++ (setq calc-digit-value (field-string)) + (exit-minibuffer)) + ) + + (defun calcDigit-edit () + (interactive) + (calc-unread-command) +- (setq calc-digit-value (buffer-string)) ++ (setq calc-digit-value (field-string)) + (exit-minibuffer) + ) + +Index: calc.el +--- calc.el.~1~ Sun Dec 15 23:50:47 1996 ++++ calc.el Wed Nov 22 13:08:49 2000 +@@ -2051,11 +2051,11 @@ + ;; Exercise for the reader: Figure out why this is a good precaution! + (or (boundp 'calc-buffer) + (use-local-map minibuffer-local-map)) +- (let ((str (buffer-string))) ++ (let ((str (field-string))) + (setq calc-digit-value (save-excursion + (set-buffer calc-buffer) + (math-read-number str)))) +- (if (and (null calc-digit-value) (> (buffer-size) 0)) ++ (if (and (null calc-digit-value) (> (field-end) (field-beginning))) + (progn + (beep) + (calc-temp-minibuffer-message " [Bad format]")) +@@ -2071,7 +2071,7 @@ + + (defun calc-minibuffer-contains (rex) + (save-excursion +- (goto-char (point-min)) ++ (goto-char (field-end (point-min))) + (looking-at rex)) + ) + +@@ -2158,10 +2158,8 @@ + (upcase last-command-char)))) + (and dig + (< dig radix))))))) +- (save-excursion +- (goto-char (point-min)) +- (looking-at +- "[-+]?\\(.*\\+/- *\\|.*mod *\\)?\\([0-9]+\\.?0*[@oh] *\\)?\\([0-9]+\\.?0*['m] *\\)?[0-9]*\\(\\.?[0-9]*\\(e[-+]?[0-3]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?\\)?\\|[0-9]:\\([0-9]+:\\)?[0-9]*\\)?[\"s]?\\'"))) ++ (calc-minibuffer-contains ++ "[-+]?\\(.*\\+/- *\\|.*mod *\\)?\\([0-9]+\\.?0*[@oh] *\\)?\\([0-9]+\\.?0*['m] *\\)?[0-9]*\\(\\.?[0-9]*\\(e[-+]?[0-3]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?[0-9]?\\)?\\|[0-9]:\\([0-9]+:\\)?[0-9]*\\)?[\"s]?\\'")) + (if (and (memq last-command-char '(?@ ?o ?h ?\' ?m)) + (string-match " " calc-hms-format)) + (insert " ")) +@@ -2190,7 +2188,7 @@ + ((eq last-command 'calcDigit-start) + (erase-buffer)) + (t (backward-delete-char 1))) +- (if (= (buffer-size) 0) ++ (if (= (field-beginning) (field-end)) + (progn + (setq last-command-char 13) + (calcDigit-nondigit))) + +* TeX'ing the Calc manual fails. + +The following patches allow to build the Calc manual using texinfo.tex +from Emacs 19.34 distribution: + +*** calc-maint.e~0 Mon Dec 16 07:11:26 1996 +--- calc-maint.el Sun Dec 10 14:32:38 2000 +*************** +*** 308,314 **** + (insert "@tex\n" + "\\global\\advance\\appendixno2\n" + "\\gdef\\xref#1.{See ``#1.''}\n") +! (setq midpos (point)) + (insert "@end tex\n") + (insert-buffer-substring srcbuf sumpos endpos) + (insert "@bye\n") +--- 308,314 ---- + (insert "@tex\n" + "\\global\\advance\\appendixno2\n" + "\\gdef\\xref#1.{See ``#1.''}\n") +! (setq midpos (point-marker)) + (insert "@end tex\n") + (insert-buffer-substring srcbuf sumpos endpos) + (insert "@bye\n") +*** Makefile.~0 Mon Dec 16 07:11:24 1996 +--- Makefile Sun Dec 10 14:44:00 2000 +*************** +*** 98,106 **** + # Format the Calc manual as one printable volume using TeX. + tex: + $(REMOVE) calc.aux +! $(TEX) calc.texinfo + $(TEXINDEX) calc.[cfkptv]? +! $(TEX) calc.texinfo + $(PURGE) calc.cp calc.fn calc.pg calc.tp calc.vr + $(PURGE) calc.cps calc.fns calc.kys calc.pgs calc.tps calc.vrs + $(PURGE) calc.toc +--- 98,106 ---- + # Format the Calc manual as one printable volume using TeX. + tex: + $(REMOVE) calc.aux +! -$(TEX) calc.texinfo + $(TEXINDEX) calc.[cfkptv]? +! -$(TEX) calc.texinfo + $(PURGE) calc.cp calc.fn calc.pg calc.tp calc.vr + $(PURGE) calc.cps calc.fns calc.kys calc.pgs calc.tps calc.vrs + $(PURGE) calc.toc +*** calc.texinfo.~1~ Thu Oct 10 18:18:56 1996 +--- calc.texinfo Mon Dec 11 08:25:00 2000 +*************** +*** 12,17 **** +--- 12,19 ---- + % Because makeinfo.c exists, we can't just define new commands. + % So instead, we take over little-used existing commands. + % ++ % Suggested by Karl Berry <karl@@freefriends.org> ++ \gdef\!{\mskip-\thinmuskip} + % Redefine @cite{text} to act like $text$ in regular TeX. + % Info will typeset this same as @samp{text}. + \gdef\goodtex{\tex \let\rm\goodrm \let\t\ttfont \turnoffactive} +*************** +*** 23686,23692 **** + a vector of the actual parameter values, written as equations: + @cite{[a = 3, b = 2]}, in case you'd rather read them in a list + than pick them out of the formula. (You can type @kbd{t y} +! to move this vector to the stack; @pxref{Trail Commands}.) + + Specifying a different independent variable name will affect the + resulting formula: @kbd{a F 1 k RET} produces @kbd{3 + 2 k}. +--- 23689,23695 ---- + a vector of the actual parameter values, written as equations: + @cite{[a = 3, b = 2]}, in case you'd rather read them in a list + than pick them out of the formula. (You can type @kbd{t y} +! to move this vector to the stack; see @ref{Trail Commands}.) + + Specifying a different independent variable name will affect the + resulting formula: @kbd{a F 1 k RET} produces @kbd{3 + 2 k}. diff --git a/app-emacs/calc/files/calc-2.02f-info-dir.patch b/app-emacs/calc/files/calc-2.02f-info-dir.patch new file mode 100644 index 0000000..e629778 --- /dev/null +++ b/app-emacs/calc/files/calc-2.02f-info-dir.patch @@ -0,0 +1,13 @@ +--- calc.texinfo~ ++++ calc.texinfo +@@ -5,6 +5,10 @@ + @c [title] + @settitle GNU Emacs Calc 2.02 Manual + @setchapternewpage odd ++@dircategory Emacs ++@direntry ++* Calc: (calc). The GNU Emacs Calculator. ++@end direntry + @comment %**end of header (This is for running Texinfo on a region.) + + @tex diff --git a/app-emacs/calc/metadata.xml b/app-emacs/calc/metadata.xml new file mode 100644 index 0000000..32a4e4f --- /dev/null +++ b/app-emacs/calc/metadata.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>emacs</herd> +<longdescription> + Calc is an advanced calculator and mathematical tool that runs as part of + the GNU Emacs environment. Very roughly based on the HP-28/48 series of + calculators, its many features include: + * Choice of algebraic or RPN (stack-based) entry of calculations. + * Arbitrary precision integers and floating-point numbers. + * Arithmetic on rational numbers, complex numbers (rectangular and polar), + error forms with standard deviations, open and closed intervals, vectors + and matrices, dates and times, infinities, sets, quantities with units, + and algebraic formulas. + * Mathematical operations such as logarithms and trigonometric functions. + * Programmer's features (bitwise operations, non-decimal numbers). + * Financial functions such as future value and internal rate of return. + * Number theoretical features such as prime factorization and arithmetic + modulo M for any M. + * Algebraic manipulation features, including symbolic calculus. + * Moving data to and from regular editing buffers. + * "Embedded mode" for manipulating Calc formulas and data directly inside + any editing buffer. + * Graphics using GNUPLOT, a versatile (and free) plotting program. + * Easy programming using keyboard macros, algebraic formulas, algebraic + rewrite rules, or extended Emacs Lisp. +</longdescription> +</pkgmetadata> |