diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2007-12-07 08:15:28 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2007-12-07 08:15:28 +0000 |
| commit | 6c468fd8d946ce1276d2e1fb3266199a460700a6 (patch) | |
| tree | 9b6e0a1386a203ee14508c166995a7aecf623a39 /eclass | |
| parent | No need for a site-init file. (diff) | |
| download | emacs-6c468fd8d946ce1276d2e1fb3266199a460700a6.tar.gz emacs-6c468fd8d946ce1276d2e1fb3266199a460700a6.tar.bz2 emacs-6c468fd8d946ce1276d2e1fb3266199a460700a6.zip | |
Undo previous change. Do not change dir.
svn path=/emacs-overlay/; revision=838
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/elisp.eclass | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 06e2231..4ce6443 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ +2007-12-07 Ulrich Mueller <ulm@gentoo.org> + + * elisp.eclass (S, elisp_pkg_setup): Moved back to global scope. + (elisp_src_unpack): Do not change dir, we are in WORKDIR already. + 2007-12-04 Ulrich Mueller <ulm@gentoo.org> - * elisp.eclass (elisp_pkg_setup): Move handling of SIMPLE_ELISP + * elisp.eclass (S, elisp_pkg_setup): Move handling of SIMPLE_ELISP into pkg_setup function, otherwise it fails with portage-2.1.4. (elisp_src_unpack): Die if mv fails. diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 41f927e..eff2ddc 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -45,6 +45,10 @@ 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 @@ -52,17 +56,12 @@ elisp_pkg_setup() { eerror "Use \"eselect emacs\" to select the active version." die "Emacs version ${emacs_version} is too low." fi - - if [ "${SIMPLE_ELISP}" = 't' ]; then - S="${WORKDIR}" - fi } elisp_src_unpack() { unpack ${A} if [ "${SIMPLE_ELISP}" = 't' ]; then - cd "${S}" && mv ${P}.el ${PN}.el \ - || die "mv ${P}.el ${PN}.el failed" + mv ${P}.el ${PN}.el || die "mv ${P}.el ${PN}.el failed" fi } |