| 1 |
ulm 09/08/25 12:53:55 |
| 2 |
|
| 3 |
Modified: elisp.eclass |
| 4 |
Log: |
| 5 |
Sync elisp.eclass from Emacs overlay (revision 1432): |
| 6 |
Don't inherit versionator.eclass. |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.42 eclass/elisp.eclass |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?rev=1.42&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?rev=1.42&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?r1=1.41&r2=1.42 |
| 14 |
|
| 15 |
Index: elisp.eclass |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v |
| 18 |
retrieving revision 1.41 |
| 19 |
retrieving revision 1.42 |
| 20 |
diff -u -r1.41 -r1.42 |
| 21 |
--- elisp.eclass 29 Mar 2009 20:27:19 -0000 1.41 |
| 22 |
+++ elisp.eclass 25 Aug 2009 12:53:55 -0000 1.42 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.41 2009/03/29 20:27:19 ulm Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.42 2009/08/25 12:53:55 ulm Exp $ |
| 28 |
# |
| 29 |
# Copyright 2002-2003 Matthew Kennedy <mkennedy@g.o> |
| 30 |
# Copyright 2003 Jeremy Maitin-Shepard <jbms@×××××.com> |
| 31 |
@@ -50,7 +50,7 @@ |
| 32 |
# reserved for internal use. "50${PN}-gentoo.el" is a reasonable choice |
| 33 |
# in most cases. |
| 34 |
|
| 35 |
-inherit elisp-common eutils versionator |
| 36 |
+inherit elisp-common eutils |
| 37 |
|
| 38 |
case "${EAPI:-0}" in |
| 39 |
0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \ |
| 40 |
@@ -66,8 +66,8 @@ |
| 41 |
elisp_pkg_setup() { |
| 42 |
local need_emacs=${NEED_EMACS:-21} |
| 43 |
local have_emacs=$(elisp-emacs-version) |
| 44 |
- if ! version_is_at_least "${need_emacs}" "${have_emacs}"; then |
| 45 |
- eerror "This package needs at least Emacs ${need_emacs}." |
| 46 |
+ if [ "${have_emacs%%.*}" -lt "${need_emacs%%.*}" ]; then |
| 47 |
+ eerror "This package needs at least Emacs ${need_emacs%%.*}." |
| 48 |
eerror "Use \"eselect emacs\" to select the active version." |
| 49 |
die "Emacs version ${have_emacs} is too low." |
| 50 |
fi |
Archives