diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-04-27 19:51:52 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-04-27 19:51:52 +0000 |
| commit | 189e9786993d85348f0f841b09ade67e8f4dfc8d (patch) | |
| tree | 8a36ddcae7ad5054e307b9797a4301c72d639d82 | |
| parent | Remove python_convert_shebangs, not needed on wrapper script (diff) | |
| download | gentoo-2-189e9786993d85348f0f841b09ade67e8f4dfc8d.tar.gz gentoo-2-189e9786993d85348f0f841b09ade67e8f4dfc8d.tar.bz2 gentoo-2-189e9786993d85348f0f841b09ade67e8f4dfc8d.zip | |
Sync from Emacs overlay: Require GNU Emacs in elisp-need-emacs().
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/elisp-common.eclass | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index ff0a007eac30..f868edbc60e2 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.224 2012/04/25 17:43:50 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.225 2012/04/27 19:51:52 ulm Exp $ + + 27 Apr 2012; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass: + Sync from Emacs overlay: Require GNU Emacs in elisp-need-emacs(). 25 Apr 2012; Fabian Groffen <grobian@gentoo.org> qt4-build.eclass: fix_includes: create relative symlinks for header directories, such that diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index fc2833442137..387c1c65149a 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.79 2012/02/11 12:20:33 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.80 2012/04/27 19:51:52 ulm Exp $ # # @ECLASS: elisp-common.eclass # @MAINTAINER: @@ -159,7 +159,7 @@ EMACS=${EPREFIX}/usr/bin/emacs # @ECLASS-VARIABLE: EMACSFLAGS # @DESCRIPTION: # Flags for executing Emacs in batch mode. -# These work for Emacs versions 18-23, so don't change them. +# These work for Emacs versions 18-24, so don't change them. EMACSFLAGS="-batch -q --no-site-file" # @ECLASS-VARIABLE: BYTECOMPFLAGS @@ -173,7 +173,7 @@ BYTECOMPFLAGS="-L ." elisp-emacs-version() { local ret - # The following will work for at least versions 18-23. + # The following will work for at least versions 18-24. echo "(princ emacs-version)" >"${T}"/emacs-version.el ${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el ret=$? @@ -195,6 +195,10 @@ elisp-need-emacs() { local need_emacs=$1 have_emacs have_emacs=$(elisp-emacs-version) || return einfo "Emacs version: ${have_emacs}" + if [[ ${have_emacs} =~ XEmacs|Lucid ]]; then + eerror "This package needs GNU Emacs." + return 1 + fi if ! [[ ${have_emacs%%.*} -ge ${need_emacs%%.*} ]]; then eerror "This package needs at least Emacs ${need_emacs%%.*}." eerror "Use \"eselect emacs\" to select the active version." |