[gentoo-commits] gentoo-x86 commit in eclass: elisp.eclass

["Ulrich Mueller (ulm)" <ulm@gentoo.org>]

ulm         09/08/25 12:53:55

  Modified:             elisp.eclass
  Log:
  Sync elisp.eclass from Emacs overlay (revision 1432):
  Don't inherit versionator.eclass.

Revision  Changes    Path
1.42                 eclass/elisp.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?r1=1.41&r2=1.42

Index: elisp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- elisp.eclass	29 Mar 2009 20:27:19 -0000	1.41
+++ elisp.eclass	25 Aug 2009 12:53:55 -0000	1.42
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.41 2009/03/29 20:27:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.42 2009/08/25 12:53:55 ulm Exp $
 #
 # Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003      Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -50,7 +50,7 @@
 # reserved for internal use.  "50${PN}-gentoo.el" is a reasonable choice
 # in most cases.
 
-inherit elisp-common eutils versionator
+inherit elisp-common eutils
 
 case "${EAPI:-0}" in
 	0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \
@@ -66,8 +66,8 @@
 elisp_pkg_setup() {
 	local need_emacs=${NEED_EMACS:-21}
 	local have_emacs=$(elisp-emacs-version)
-	if ! version_is_at_least "${need_emacs}" "${have_emacs}"; then
-		eerror "This package needs at least Emacs ${need_emacs}."
+	if [ "${have_emacs%%.*}" -lt "${need_emacs%%.*}" ]; then
+		eerror "This package needs at least Emacs ${need_emacs%%.*}."
 		eerror "Use \"eselect emacs\" to select the active version."
 		die "Emacs version ${have_emacs} is too low."
 	fi