1 |
gienah 12/01/09 13:49:21 |
2 |
|
3 |
Modified: ChangeLog isabelle-2011.1.ebuild |
4 |
Log: |
5 |
Thanks to few_ and xarthisius for reviewing, remove pdf use flag, add || die to cd/pushd and tests. Require polyml with -portable. |
6 |
|
7 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 sci-mathematics/isabelle/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/ChangeLog?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/ChangeLog?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/ChangeLog?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- ChangeLog 8 Jan 2012 12:35:43 -0000 1.1 |
23 |
+++ ChangeLog 9 Jan 2012 13:49:21 -0000 1.2 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for sci-mathematics/isabelle |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v 1.1 2012/01/08 12:35:43 gienah Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v 1.2 2012/01/09 13:49:21 gienah Exp $ |
29 |
+ |
30 |
+ 09 Jan 2012; Mark Wright <gienah@g.o> isabelle-2011.1.ebuild: |
31 |
+ Thanks to few_ and xarthisius for reviewing, remove pdf use flag, add || die |
32 |
+ to cd/pushd and tests. Require polyml with -portable. |
33 |
|
34 |
*isabelle-2011.1 (08 Jan 2012) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 sci-mathematics/isabelle/isabelle-2011.1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: isabelle-2011.1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- isabelle-2011.1.ebuild 8 Jan 2012 12:35:43 -0000 1.1 |
52 |
+++ isabelle-2011.1.ebuild 9 Jan 2012 13:49:21 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2012 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1.ebuild,v 1.1 2012/01/08 12:35:43 gienah Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1.ebuild,v 1.2 2012/01/09 13:49:21 gienah Exp $ |
58 |
|
59 |
EAPI="4" |
60 |
|
61 |
@@ -8,7 +8,6 @@ |
62 |
inherit eutils java-pkg-opt-2 multilib versionator |
63 |
|
64 |
MY_PN="Isabelle" |
65 |
-typeset -u MY_PV |
66 |
MY_PV=$(replace_all_version_separators '-') |
67 |
MY_P="${MY_PN}${MY_PV}" |
68 |
|
69 |
@@ -20,26 +19,19 @@ |
70 |
SLOT="0" |
71 |
KEYWORDS="~x86 ~amd64" |
72 |
ALL_LOGICS="Pure FOL +HOL ZF CCL CTT Cube FOLP LCF Sequents" |
73 |
-IUSE="${ALL_LOGICS} doc graphbrowsing +pdf +proofgeneral" |
74 |
+IUSE="${ALL_LOGICS} doc graphbrowsing +proofgeneral test" |
75 |
|
76 |
#upstream says |
77 |
#bash 2.x/3.x, Poly/ML 5.x, Perl 5.x, |
78 |
#for document preparation: complete LaTeX |
79 |
DEPEND=">=app-shells/bash-3.0 |
80 |
- >=dev-lang/polyml-5.4.1 |
81 |
+ >=dev-lang/polyml-5.4.1[-portable] |
82 |
>=dev-lang/perl-5.8.8-r2" |
83 |
|
84 |
RDEPEND="doc? ( |
85 |
virtual/latex-base |
86 |
dev-tex/rail |
87 |
) |
88 |
- pdf? ( || ( app-text/xpdf |
89 |
- app-text/gv |
90 |
- app-text/gsview |
91 |
- app-text/epdfview |
92 |
- app-text/acroread |
93 |
- app-text/zathura ) |
94 |
- ) |
95 |
proofgeneral? ( |
96 |
app-emacs/proofgeneral |
97 |
) |
98 |
@@ -67,9 +59,11 @@ |
99 |
polymlver=$(poly -v | cut -d' ' -f2) |
100 |
polymlarch=$(poly -v | cut -d' ' -f9 | cut -d'-' -f1) |
101 |
sed -e "s@5.4.0@${polymlver}@g" \ |
102 |
- -i "${S}/etc/settings" || die "Could not configure polyml version in etc/settings" |
103 |
+ -i "${S}/etc/settings" \ |
104 |
+ || die "Could not configure polyml version in etc/settings" |
105 |
sed -e "s@x86_64@${polymlarch}@g" \ |
106 |
- -i "${S}/etc/settings" || die "Could not configure polyml arch in etc/settings" |
107 |
+ -i "${S}/etc/settings" \ |
108 |
+ || die "Could not configure polyml arch in etc/settings" |
109 |
fi |
110 |
if use graphbrowsing; then |
111 |
epatch "${FILESDIR}/${PN}-2011.1-graphbrowser.patch" |
112 |
@@ -88,16 +82,18 @@ |
113 |
./bin/isabelle makeall || die "isabelle makeall failed" |
114 |
if use graphbrowsing |
115 |
then |
116 |
- rm -f "${S}/lib/browser/GraphBrowser.jar" || die "failed cleaning graph browser directory" |
117 |
- cd "${S}/lib/browser" |
118 |
+ rm -f "${S}/lib/browser/GraphBrowser.jar" \ |
119 |
+ || die "failed cleaning graph browser directory" |
120 |
+ pushd "${S}/lib/browser" \ |
121 |
+ || die "Could not change directory to lib/browser" |
122 |
./build || die "failed building the graph browser" |
123 |
- cd "${S}" |
124 |
+ popd |
125 |
fi |
126 |
} |
127 |
|
128 |
src_test() { |
129 |
einfo "Running tests. A test run can take up to several hours!" |
130 |
- ./build -b -t |
131 |
+ ./build -b -t || die "tests failed" |
132 |
} |
133 |
|
134 |
src_install() { |
135 |
@@ -139,10 +135,8 @@ |
136 |
|
137 |
pkg_postinst() { |
138 |
elog "You will need to re-emerge Isabelle after emerging polyml." |
139 |
- if use pdf; then |
140 |
- einfo "Please configure your preferred pdf viewer by editing" |
141 |
- einfo "the PDF_VIEWER variable in the system settings file" |
142 |
- einfo "/etc/conf/isabelle and/or the user settings file" |
143 |
- einfo "\$HOME/.isabelle/${MY_P}" |
144 |
- fi |
145 |
+ elog "Please configure your preferred pdf viewer by editing" |
146 |
+ elog "the PDF_VIEWER variable in the system settings file" |
147 |
+ elog "/etc/isabelle/settings and/or the user settings file" |
148 |
+ elog "\$HOME/.isabelle/${MY_P}/etc/settings" |
149 |
} |