diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-06-03 15:48:44 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-06-03 15:48:44 +0000 |
| commit | 9b6ece1f6bdb8d8ee9e7de8e702f5ac5605a6169 (patch) | |
| tree | b7a316a43df183d6c0d612a715b11287612159a4 /eclass | |
| parent | whitespace (diff) | |
| download | gentoo-2-9b6ece1f6bdb8d8ee9e7de8e702f5ac5605a6169.tar.gz gentoo-2-9b6ece1f6bdb8d8ee9e7de8e702f5ac5605a6169.tar.bz2 gentoo-2-9b6ece1f6bdb8d8ee9e7de8e702f5ac5605a6169.zip | |
Sync elisp.eclass from Emacs overlay (revision 1083):
Remove SIMPLE_ELISP variable.
In src_unpack, always move ${P}.el to ${PN}.el if the former exists.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/elisp.eclass | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 2ecd6a718995..a5360d0455ac 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.29 2008/03/03 15:21:47 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.30 2008/06/03 15:48:44 ulm Exp $ # # Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org> # Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com> @@ -19,13 +19,10 @@ # Emacs support for other than pure elisp packages is handled by # elisp-common.eclass where you won't have a dependency on Emacs itself. # All elisp-* functions are documented there. - -# @ECLASS-VARIABLE: SIMPLE_ELISP -# @DESCRIPTION: -# Setting SIMPLE_ELISP=t in an ebuild means, that the package's source -# is a single (in whatever way) compressed elisp file with the file name -# ${PN}-${PV}. This eclass will then redefine ${S}, and move -# ${PN}-${PV}.el to ${PN}.el in src_unpack(). +# +# If the package's source is a single (in whatever way) compressed elisp +# file with the file name ${P}.el, then this eclass will move ${P}.el to +# ${PN}.el in src_unpack(). # @ECLASS-VARIABLE: DOCS # @DESCRIPTION: @@ -45,10 +42,6 @@ DEPEND=">=virtual/emacs-${VERSION}" RDEPEND=">=virtual/emacs-${VERSION}" IUSE="" -if [ "${SIMPLE_ELISP}" = 't' ]; then - S="${WORKDIR}" -fi - elisp_pkg_setup() { local emacs_version="$(elisp-emacs-version)" if ! version_is_at_least "${VERSION}" "${emacs_version}"; then @@ -60,7 +53,7 @@ elisp_pkg_setup() { elisp_src_unpack() { unpack ${A} - if [ "${SIMPLE_ELISP}" = 't' ]; then + if [ -f ${P}.el ]; then mv ${P}.el ${PN}.el || die "mv ${P}.el ${PN}.el failed" fi } |