1 |
ulm 07/12/04 13:11:15 |
2 |
|
3 |
Modified: elisp.eclass |
4 |
Log: |
5 |
Move handling of SIMPLE_ELISP into elisp_pkg_setup, otherwise it fails |
6 |
with portage-2.1.4_rc7. |
7 |
Die in elisp_src_unpack if mv fails. |
8 |
|
9 |
Revision Changes Path |
10 |
1.25 eclass/elisp.eclass |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?rev=1.25&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?rev=1.25&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclass?r1=1.24&r2=1.25 |
15 |
|
16 |
Index: elisp.eclass |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v |
19 |
retrieving revision 1.24 |
20 |
retrieving revision 1.25 |
21 |
diff -u -r1.24 -r1.25 |
22 |
--- elisp.eclass 14 Oct 2007 22:12:30 -0000 1.24 |
23 |
+++ elisp.eclass 4 Dec 2007 13:11:15 -0000 1.25 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2007 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.24 2007/10/14 22:12:30 ulm Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.25 2007/12/04 13:11:15 ulm Exp $ |
29 |
# |
30 |
# Copyright 2007 Christian Faulhammer <opfer@g.o> |
31 |
# Copyright 2002-2003 Matthew Kennedy <mkennedy@g.o> |
32 |
@@ -45,10 +45,6 @@ |
33 |
RDEPEND=">=virtual/emacs-${VERSION}" |
34 |
IUSE="" |
35 |
|
36 |
-if [ "${SIMPLE_ELISP}" = 't' ]; then |
37 |
- S="${WORKDIR}" |
38 |
-fi |
39 |
- |
40 |
elisp_pkg_setup() { |
41 |
local emacs_version="$(elisp-emacs-version)" |
42 |
if ! version_is_at_least "${VERSION}" "${emacs_version}"; then |
43 |
@@ -56,12 +52,17 @@ |
44 |
eerror "Use \"eselect emacs\" to select the active version." |
45 |
die "Emacs version ${emacs_version} is too low." |
46 |
fi |
47 |
+ |
48 |
+ if [ "${SIMPLE_ELISP}" = 't' ]; then |
49 |
+ S="${WORKDIR}" |
50 |
+ fi |
51 |
} |
52 |
|
53 |
elisp_src_unpack() { |
54 |
unpack ${A} |
55 |
if [ "${SIMPLE_ELISP}" = 't' ]; then |
56 |
- cd "${S}" && mv ${P}.el ${PN}.el |
57 |
+ cd "${S}" && mv ${P}.el ${PN}.el \ |
58 |
+ || die "mv ${P}.el ${PN}.el failed" |
59 |
fi |
60 |
} |
61 |
|
62 |
|
63 |
|
64 |
|
65 |
-- |
66 |
gentoo-commits@g.o mailing list |