From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1IzXYX-0007xT-A9 for garchives@archives.gentoo.org; Tue, 04 Dec 2007 13:11:21 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.2/8.14.0) with SMTP id lB4DBIpN004544; Tue, 4 Dec 2007 13:11:18 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.2/8.14.0) with ESMTP id lB4DBHeW004539 for ; Tue, 4 Dec 2007 13:11:17 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id D06306524D for ; Tue, 4 Dec 2007 13:11:16 +0000 (UTC) Received: from ulm by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1IzXYR-0007uU-Jp for gentoo-commits@lists.gentoo.org; Tue, 04 Dec 2007 13:11:15 +0000 From: "Ulrich Mueller (ulm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ulm@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: elisp.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: elisp.eclass X-VCS-Directories: eclass X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Ulrich Mueller Date: Tue, 04 Dec 2007 13:11:15 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: d8ba670b-1ae8-4ff1-ae07-9a799bb1a1a1 X-Archives-Hash: 851d9993c8735071bdd255df79425a3b 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 # Copyright 2002-2003 Matthew Kennedy @@ -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