summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-06-26 12:31:39 +0000
committerUlrich Müller <ulm@gentoo.org>2010-06-26 12:31:39 +0000
commitceb5db2bfdc5c6e2d15c83472876a8ea4a0b99b9 (patch)
treefa1b0c31f75ef0f086521f6cc6c186612cda19a3 /app-emacs/calc
parentppc stable #322909 (diff)
downloadgentoo-2-ceb5db2bfdc5c6e2d15c83472876a8ea4a0b99b9.tar.gz
gentoo-2-ceb5db2bfdc5c6e2d15c83472876a8ea4a0b99b9.tar.bz2
gentoo-2-ceb5db2bfdc5c6e2d15c83472876a8ea4a0b99b9.zip
Don't inherit versionator.eclass.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-emacs/calc')
-rw-r--r--app-emacs/calc/ChangeLog7
-rw-r--r--app-emacs/calc/calc-2.02f.ebuild11
-rw-r--r--app-emacs/calc/files/50calc-gentoo.el3
3 files changed, 11 insertions, 10 deletions
diff --git a/app-emacs/calc/ChangeLog b/app-emacs/calc/ChangeLog
index 4585ab4ade57..612de700a3a6 100644
--- a/app-emacs/calc/ChangeLog
+++ b/app-emacs/calc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emacs/calc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/calc/ChangeLog,v 1.7 2009/03/29 21:16:30 ulm Exp $
+# 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.
diff --git a/app-emacs/calc/calc-2.02f.ebuild b/app-emacs/calc/calc-2.02f.ebuild
index c6d4ccde9b69..a30320cc8484 100644
--- a/app-emacs/calc/calc-2.02f.ebuild
+++ b/app-emacs/calc/calc-2.02f.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.7 2009/03/29 21:16:30 ulm Exp $
+# $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 versionator
+inherit elisp
DESCRIPTION="Advanced calculator and mathematical tool within Emacs"
HOMEPAGE="http://www.gnu.org/software/emacs/calc.html"
@@ -14,10 +14,11 @@ KEYWORDS="amd64 x86"
IUSE=""
ELISP_PATCHES="${P}-emacs-21.patch ${P}-info-dir.patch"
-SITEFILE="50calc-gentoo.el"
+SITEFILE="50${PN}-gentoo.el"
pkg_setup() {
- if version_is_at_least 22 "$(elisp-emacs-version)"; then
+ 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."
diff --git a/app-emacs/calc/files/50calc-gentoo.el b/app-emacs/calc/files/50calc-gentoo.el
index 4c727c760c3a..6edd80a2fb2a 100644
--- a/app-emacs/calc/files/50calc-gentoo.el
+++ b/app-emacs/calc/files/50calc-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; calc site-lisp configuration
-
;; Emacs 22 and later include the calc package
(unless (fboundp 'calc-dispatch)
(add-to-list 'load-path "@SITELISP@")