1 |
bicatali 07/09/13 22:28:03 |
2 |
|
3 |
Modified: ChangeLog maxima-5.13.0.ebuild |
4 |
Log: |
5 |
updated sbcl as default lisp and some cleanup |
6 |
(Portage version: 2.1.2.12) |
7 |
|
8 |
Revision Changes Path |
9 |
1.31 sci-mathematics/maxima/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/ChangeLog?rev=1.31&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/ChangeLog?rev=1.31&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/ChangeLog?r1=1.30&r2=1.31 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v |
18 |
retrieving revision 1.30 |
19 |
retrieving revision 1.31 |
20 |
diff -u -r1.30 -r1.31 |
21 |
--- ChangeLog 13 Sep 2007 14:08:30 -0000 1.30 |
22 |
+++ ChangeLog 13 Sep 2007 22:28:03 -0000 1.31 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for sci-mathematics/maxima |
25 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.30 2007/09/13 14:08:30 bicatali Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.31 2007/09/13 22:28:03 bicatali Exp $ |
28 |
+ |
29 |
+ 13 Sep 2007; Sébastien Fabbro <bicatali@g.o> maxima-5.13.0.ebuild: |
30 |
+ updated sbcl as default lisp and some cleanup |
31 |
|
32 |
*maxima-5.13.0 (13 Sep 2007) |
33 |
|
34 |
|
35 |
|
36 |
|
37 |
1.2 sci-mathematics/maxima/maxima-5.13.0.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0.ebuild?rev=1.2&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0.ebuild?rev=1.2&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0.ebuild?r1=1.1&r2=1.2 |
42 |
|
43 |
Index: maxima-5.13.0.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0.ebuild,v |
46 |
retrieving revision 1.1 |
47 |
retrieving revision 1.2 |
48 |
diff -u -r1.1 -r1.2 |
49 |
--- maxima-5.13.0.ebuild 13 Sep 2007 14:08:30 -0000 1.1 |
50 |
+++ maxima-5.13.0.ebuild 13 Sep 2007 22:28:03 -0000 1.2 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2007 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0.ebuild,v 1.1 2007/09/13 14:08:30 bicatali Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0.ebuild,v 1.2 2007/09/13 22:28:03 bicatali Exp $ |
56 |
|
57 |
inherit eutils elisp-common autotools |
58 |
|
59 |
@@ -21,23 +21,20 @@ |
60 |
tetex? ( || ( app-emacs/auctex app-xemacs/auctex ) ) ) |
61 |
clisp? ( >=dev-lisp/clisp-2.33.2-r1 ) |
62 |
gcl? ( >=dev-lisp/gcl-2.6.7 ) |
63 |
- sbcl? ( >=dev-lisp/sbcl-0.9.4 app-misc/rlwrap ) |
64 |
+ sbcl? ( >=dev-lisp/sbcl-1.0 app-misc/rlwrap ) |
65 |
cmucl? ( >=dev-lisp/cmucl-19a app-misc/rlwrap ) |
66 |
- !clisp? ( !sbcl? ( !cmucl? ( >=dev-lisp/gcl-2.6.7 ) ) ) |
67 |
+ !clisp? ( !gcl? ( !cmucl? ( >=dev-lisp/gcl-2.6.7 ) ) ) |
68 |
tk? ( >=dev-lang/tk-8.3.3 )" |
69 |
|
70 |
DEPEND="${RDEPEND} >=sys-apps/texinfo-4.3" |
71 |
-# the make install already strips maxima exec. |
72 |
-RESTRICT="strip" |
73 |
|
74 |
LANGS="es pt pt_BR" |
75 |
- |
76 |
for lang in ${LANGS}; do |
77 |
IUSE="${IUSE} linguas_${lang}" |
78 |
done |
79 |
|
80 |
pkg_setup() { |
81 |
-# Don't install in the main tree, as this may cause file collisions |
82 |
+ # Don't install in the main tree, as this may cause file collisions |
83 |
if use tetex; then |
84 |
local TEXMFPATH="$(kpsewhich -var-value=TEXMFSITE)" |
85 |
local TEXMFCONFIGFILE="$(kpsewhich texmf.cnf)" |
86 |
@@ -53,8 +50,7 @@ |
87 |
# the output to a generic format, so IFS has to be redefined. |
88 |
local IFS="${IFS}:" |
89 |
|
90 |
- for strippedpath in ${TEXMFPATH} |
91 |
- do |
92 |
+ for strippedpath in ${TEXMFPATH}; do |
93 |
if [ -d ${strippedpath} ]; then |
94 |
MAXIMA_TEXMFDIR="${strippedpath}" |
95 |
break |
96 |
@@ -79,37 +75,46 @@ |
97 |
fi |
98 |
|
99 |
# enable gcl if no other lisp selected |
100 |
- if use gcl || (! use cmucl && ! use clisp && ! use sbcl ); then |
101 |
+ if use sbcl || (! use cmucl && ! use clisp && ! use gcl ); then |
102 |
+ ENABLE_SBCL="--enable-sbcl" |
103 |
+ fi |
104 |
+ |
105 |
+ if use gcl; then |
106 |
+ einfo "Using gcl: it might break, recompile with another lisp, or use default (sbcl)." |
107 |
if ! built_with_use dev-lisp/gcl ansi; then |
108 |
eerror "GCL must be installed with ANSI." |
109 |
eerror "Try USE=\"ansi\" emerge gcl" |
110 |
die "This package needs gcl with USE=ansi" |
111 |
fi |
112 |
- enablegcl="--enable-gcl --enable-gcl-alt-link" |
113 |
fi |
114 |
} |
115 |
|
116 |
src_unpack() { |
117 |
unpack ${A} |
118 |
# use xdg-open to view ps, pdf |
119 |
- epatch "${FILESDIR}/${P}-xdg-utils.patch" |
120 |
+ epatch "${FILESDIR}"/${P}-xdg-utils.patch |
121 |
} |
122 |
|
123 |
src_compile() { |
124 |
eautoreconf |
125 |
|
126 |
# remove rmaxima if neither cmucl nor sbcl |
127 |
- if ! use sbcl && ! use cmucl ; then |
128 |
- sed -i -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' src/Makefile.in |
129 |
+ if !use sbcl && ! use cmucl && [[ -z ${ENABLE_SBCL} ]]; then |
130 |
+ sed -i \ |
131 |
+ -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \ |
132 |
+ src/Makefile.in || die "sed for rmaxima failed" |
133 |
fi |
134 |
|
135 |
+ local myconf=${ENABLE_SBCL} |
136 |
+ |
137 |
# remove xmaxima if no tk |
138 |
- local myconf="${enablegcl}" |
139 |
if use tk; then |
140 |
myconf="${myconf} --with-wish=wish" |
141 |
else |
142 |
myconf="${myconf} --with-wish=none" |
143 |
- sed -i -e '/^SUBDIRS/s/xmaxima//' interfaces/Makefile.in |
144 |
+ sed -i \ |
145 |
+ -e '/^SUBDIRS/s/xmaxima//' \ |
146 |
+ interfaces/Makefile.in || die "sed for tk failed" |
147 |
fi |
148 |
|
149 |
# enable existing translated doc |
150 |
@@ -125,7 +130,7 @@ |
151 |
econf \ |
152 |
$(use_enable cmucl) \ |
153 |
$(use_enable clisp) \ |
154 |
- $(use_enable sbcl) \ |
155 |
+ $(use_enable gcl) \ |
156 |
${myconf} \ |
157 |
|| die "econf failed" |
158 |
emake || die "emake failed" |
159 |
@@ -138,17 +143,19 @@ |
160 |
/usr/share/${PN}/${PV}/xmaxima/maxima-new.png |
161 |
|
162 |
use emacs && \ |
163 |
- elisp-site-file-install "${FILESDIR}/50maxima-gentoo.el" |
164 |
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el |
165 |
|
166 |
if use tetex; then |
167 |
- insinto "${MAXIMA_TEXMFDIR}/tex/latex/emaxima" |
168 |
+ insinto "${MAXIMA_TEXMFDIR}"/tex/latex/emaxima |
169 |
doins interfaces/emacs/emaxima/emaxima.sty |
170 |
fi |
171 |
|
172 |
- insinto "/usr/share/${PN}/${PV}/doc" |
173 |
- doins AUTHORS ChangeLog COPYING NEWS README* |
174 |
+ # do not use dodoc because interfaces can't read compressed files |
175 |
+ # read COPYING before attempt to remove it |
176 |
+ insinto /usr/share/${PN}/${PV}/doc |
177 |
+ doins AUTHORS COPYING ChangeLog-${PV} README README.lisps |
178 |
dodir /usr/share/doc |
179 |
- dosym "/usr/share/${PN}/${PV}/doc" "/usr/share/doc/${PF}" |
180 |
+ dosym /usr/share/${PN}/${PV}/doc /usr/share/doc/${PF} |
181 |
} |
182 |
|
183 |
pkg_preinst() { |
184 |
|
185 |
|
186 |
|
187 |
-- |
188 |
gentoo-commits@g.o mailing list |