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

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

ulm         07/12/04 13:11:15

  Modified:             elisp.eclass
  Log:
  Move handling of SIMPLE_ELISP into elisp_pkg_setup, otherwise it fails
  with portage-2.1.4_rc7.
  Die in elisp_src_unpack if mv fails.

Revision  Changes    Path
1.25                 eclass/elisp.eclass

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

Index: elisp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- elisp.eclass	14 Oct 2007 22:12:30 -0000	1.24
+++ elisp.eclass	4 Dec 2007 13:11:15 -0000	1.25
@@ -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.24 2007/10/14 22:12:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.25 2007/12/04 13:11:15 ulm Exp $
 #
 # Copyright 2007 Christian Faulhammer <opfer@gentoo.org>
 # Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org>
@@ -45,10 +45,6 @@
 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
@@ -56,12 +52,17 @@
 		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
+		cd "${S}" && mv ${P}.el ${PN}.el \
+			|| die "mv ${P}.el ${PN}.el failed"
 	fi
 }
 



-- 
gentoo-commits@gentoo.org mailing list