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

[Ulrich Mueller (ulm)]

ulm         07/12/07 13:52:20

  Modified:             elisp.eclass
  Log:
  Undo the change of 2007-12-04. Remove cd command in elisp_src_unpack.

Revision  Changes    Path
1.27                 eclass/elisp.eclass

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

Index: elisp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- elisp.eclass	7 Dec 2007 00:16:24 -0000	1.26
+++ elisp.eclass	7 Dec 2007 13:52:20 -0000	1.27
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.26 2007/12/07 00:16:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.27 2007/12/07 13:52:20 ulm Exp $
 #
 # Copyright 2007 Christian Faulhammer <opfer@g.o>
 # Copyright 2002-2003 Matthew Kennedy <mkennedy@g.o>
@@ -45,6 +45,10 @@
 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 @@
 		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 "${WORKDIR}" && 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
 }
 



-- 
gentoo-commits@g.o mailing list