diff options
author | Matthew Kennedy <mkennedy@gentoo.org> | 2006-03-05 23:35:38 +0000 |
---|---|---|
committer | Matthew Kennedy <mkennedy@gentoo.org> | 2006-03-05 23:35:38 +0000 |
commit | 0cf33ee759aa40db5ac783f4e0632506afa00b70 (patch) | |
tree | 61efd68c43e34c89232070582f76ec7c9b04f9dd | |
parent | move gok 1.0.6 to gnome overlay since it needs newer libwnck. fixes #124896 (diff) | |
download | gentoo-2-0cf33ee759aa40db5ac783f4e0632506afa00b70.tar.gz gentoo-2-0cf33ee759aa40db5ac783f4e0632506afa00b70.tar.bz2 gentoo-2-0cf33ee759aa40db5ac783f4e0632506afa00b70.zip |
Initial port. Ebuild contributed by Ulrich Mueller <ulm@kph.uni-mainz.de>; Resolves Bug #124076.
(Portage version: 2.1_pre5-r1)
-rw-r--r-- | app-emacs/calc/ChangeLog | 12 | ||||
-rw-r--r-- | app-emacs/calc/Manifest | 15 | ||||
-rw-r--r-- | app-emacs/calc/calc-2.02f.ebuild | 34 | ||||
-rw-r--r-- | app-emacs/calc/files/50calc-gentoo.el | 19 | ||||
-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/files/digest-calc-2.02f | 3 | ||||
-rw-r--r-- | app-emacs/calc/metadata.xml | 5 |
8 files changed, 361 insertions, 0 deletions
diff --git a/app-emacs/calc/ChangeLog b/app-emacs/calc/ChangeLog new file mode 100644 index 000000000000..fb83605c739a --- /dev/null +++ b/app-emacs/calc/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for app-emacs/calc +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emacs/calc/ChangeLog,v 1.1 2006/03/05 23:35:38 mkennedy Exp $ + +*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 000000000000..355b6938b6e9 --- /dev/null +++ b/app-emacs/calc/Manifest @@ -0,0 +1,15 @@ +MD5 5080d9604eda7966444453f928133bd1 calc-2.02f.ebuild 705 +RMD160 6eeb349ade516ed409f17a8283f07aed52f567e1 calc-2.02f.ebuild 705 +SHA256 fe78feb785b9ee24ee9ef53ca2995baae0169de61f8a717f29fd53db2e41f18d calc-2.02f.ebuild 705 +MD5 aed87816cba8039ddb67c700227a60dd files/50calc-gentoo.el 838 +RMD160 34e9e0ef6be937eb446fe60a9dd154512925c184 files/50calc-gentoo.el 838 +SHA256 af9421de7a52ee54d5643a16d2391bc7b870c19f5845eb05b439e3142fa0ea90 files/50calc-gentoo.el 838 +MD5 f057e004f138025d5560c0f71b379e79 files/calc-2.02f-emacs-21.patch 8642 +RMD160 1915e1f5f571b92d9cc67ced09085b7a862155e5 files/calc-2.02f-emacs-21.patch 8642 +SHA256 9c5fd5b410a43c0586a46b69c8f81e4f1ee372291bf76e9c37067bd6f4b68b59 files/calc-2.02f-emacs-21.patch 8642 +MD5 74b73dc3b5dffde70424a19d6f477a83 files/calc-2.02f-info-dir.patch 301 +RMD160 56a619a319f036ccbbc5fc8f21a8380b807cf68e files/calc-2.02f-info-dir.patch 301 +SHA256 cac6ee1a91324f2001c1d991bb7b9bba24ae6eae36ee554fbbc9e252fdbabbaf files/calc-2.02f-info-dir.patch 301 +MD5 e10f23f7a31da2d7fe3a093d10c735c0 files/digest-calc-2.02f 232 +RMD160 a91f6b5456a5c0d178a58835dbd79142804537ac files/digest-calc-2.02f 232 +SHA256 35229710c01ffb4714853ed35d29eed785f41c37f1c413cf753ddbcba864b505 files/digest-calc-2.02f 232 diff --git a/app-emacs/calc/calc-2.02f.ebuild b/app-emacs/calc/calc-2.02f.ebuild new file mode 100644 index 000000000000..58ef1f69f119 --- /dev/null +++ b/app-emacs/calc/calc-2.02f.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2006 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.1 2006/03/05 23:35:38 mkennedy Exp $ + +inherit elisp eutils + +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="~x86" +IUSE="" + +SITEFILE="50calc-gentoo.el" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-emacs-21.patch + epatch ${FILESDIR}/${P}-info-dir.patch +} + +src_compile() { + emake compile info || die +} + +src_install() { + elisp-install ${PN} calc*.el calc*.elc + elisp-site-file-install ${FILESDIR}/${SITEFILE} + 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 000000000000..e00353a6a555 --- /dev/null +++ b/app-emacs/calc/files/50calc-gentoo.el @@ -0,0 +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) 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 000000000000..cb31e9a951bc --- /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 000000000000..e6297780f35d --- /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/files/digest-calc-2.02f b/app-emacs/calc/files/digest-calc-2.02f new file mode 100644 index 000000000000..7d4c652b703b --- /dev/null +++ b/app-emacs/calc/files/digest-calc-2.02f @@ -0,0 +1,3 @@ +MD5 fbeb5535bdc35a8dbca3a8482ea2984a calc-2.02f.tar.gz 831865 +RMD160 4ca65723de4a5c3f8ebb3c61191185b48ddb1009 calc-2.02f.tar.gz 831865 +SHA256 774231cdf06999d3a7cbfae69a1afe469497a6bc7d2e6cb90de922dd3ae5e67d calc-2.02f.tar.gz 831865 diff --git a/app-emacs/calc/metadata.xml b/app-emacs/calc/metadata.xml new file mode 100644 index 000000000000..bc306fe58224 --- /dev/null +++ b/app-emacs/calc/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>emacs</herd> +</pkgmetadata> |