| 1 |
ulm 07/10/27 08:23:41 |
| 2 |
|
| 3 |
Modified: calc-2.02f.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Deactivate calc for Emacs 22. amd64 stable, bug 197184. |
| 6 |
(Portage version: 2.1.3.16) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 app-emacs/calc/calc-2.02f.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/calc/calc-2.02f.ebuild?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/calc/calc-2.02f.ebuild?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/calc/calc-2.02f.ebuild?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: calc-2.02f.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-emacs/calc/calc-2.02f.ebuild,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- calc-2.02f.ebuild 4 Jul 2007 22:42:11 -0000 1.3 |
| 22 |
+++ calc-2.02f.ebuild 27 Oct 2007 08:23:40 -0000 1.4 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/calc/calc-2.02f.ebuild,v 1.3 2007/07/04 22:42:11 opfer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/calc/calc-2.02f.ebuild,v 1.4 2007/10/27 08:23:40 ulm Exp $ |
| 28 |
|
| 29 |
-inherit elisp eutils |
| 30 |
+inherit elisp eutils versionator |
| 31 |
|
| 32 |
DESCRIPTION="Advanced calculator and mathematical tool within Emacs" |
| 33 |
HOMEPAGE="http://www.gnu.org/software/emacs/calc.html" |
| 34 |
@@ -10,7 +10,7 @@ |
| 35 |
|
| 36 |
LICENSE="GPL-1" |
| 37 |
SLOT="0" |
| 38 |
-KEYWORDS="~amd64 ~x86" |
| 39 |
+KEYWORDS="amd64 ~x86" |
| 40 |
IUSE="" |
| 41 |
|
| 42 |
SITEFILE="50calc-gentoo.el" |
| 43 |
@@ -27,8 +27,23 @@ |
| 44 |
} |
| 45 |
|
| 46 |
src_install() { |
| 47 |
- elisp-install ${PN} calc*.el calc*.elc |
| 48 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 49 |
+ elisp-install ${PN} calc*.el calc*.elc || die "elisp-install failed" |
| 50 |
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ |
| 51 |
+ || die "elisp-site-file-install failed" |
| 52 |
+ # prevent inclusion of package dir by subdirs.el |
| 53 |
+ touch "${D}${SITELISP}/${PN}/.nosearch" |
| 54 |
+ |
| 55 |
doinfo calc.info* |
| 56 |
dodoc README README.prev |
| 57 |
} |
| 58 |
+ |
| 59 |
+pkg_postinst() { |
| 60 |
+ elisp-site-regen |
| 61 |
+ |
| 62 |
+ if version_is_at_least 22 "$(elisp-emacs-version)"; then |
| 63 |
+ echo |
| 64 |
+ elog "Please note that \"${PN}\" is already included with Emacs 22 or" |
| 65 |
+ elog "later, so ${CATEGORY}/${PN} is only needed for lower versions." |
| 66 |
+ elog "You may select the active Emacs version with \"eselect emacs\"." |
| 67 |
+ fi |
| 68 |
+} |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.4 app-emacs/calc/ChangeLog |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/calc/ChangeLog?rev=1.4&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/calc/ChangeLog?rev=1.4&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/calc/ChangeLog?r1=1.3&r2=1.4 |
| 77 |
|
| 78 |
Index: ChangeLog |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/app-emacs/calc/ChangeLog,v |
| 81 |
retrieving revision 1.3 |
| 82 |
retrieving revision 1.4 |
| 83 |
diff -u -r1.3 -r1.4 |
| 84 |
--- ChangeLog 4 Jul 2007 22:42:11 -0000 1.3 |
| 85 |
+++ ChangeLog 27 Oct 2007 08:23:40 -0000 1.4 |
| 86 |
@@ -1,6 +1,14 @@ |
| 87 |
# ChangeLog for app-emacs/calc |
| 88 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 89 |
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/calc/ChangeLog,v 1.3 2007/07/04 22:42:11 opfer Exp $ |
| 90 |
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/calc/ChangeLog,v 1.4 2007/10/27 08:23:40 ulm Exp $ |
| 91 |
+ |
| 92 |
+ 27 Oct 2007; Ulrich Mueller <ulm@g.o> calc-2.02f.ebuild: |
| 93 |
+ amd64 stable, bug 197184 |
| 94 |
+ |
| 95 |
+ 27 Oct 2007; Ulrich Mueller <ulm@g.o> files/50calc-gentoo.el, |
| 96 |
+ calc-2.02f.ebuild: |
| 97 |
+ Deactivate calc for Emacs 22 where it is already included. Output a |
| 98 |
+ corresponding message in pkg_postinst. Add die commands in src_install. |
| 99 |
|
| 100 |
04 Jul 2007; Christian Faulhammer <opfer@g.o> calc-2.02f.ebuild: |
| 101 |
added some quotes; added die comment |
| 102 |
|
| 103 |
|
| 104 |
|
| 105 |
-- |
| 106 |
gentoo-commits@g.o mailing list |
Archives