1 |
keri 10/10/30 04:14:00 |
2 |
|
3 |
Modified: ChangeLog mercury-10.04.2-r1.ebuild |
4 |
Log: |
5 |
QA - add die to do... function calls, add die to sed calls, remove die from econf call |
6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.122 dev-lang/mercury/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.122&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.122&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.121&r2=1.122 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v |
18 |
retrieving revision 1.121 |
19 |
retrieving revision 1.122 |
20 |
diff -u -r1.121 -r1.122 |
21 |
--- ChangeLog 22 Oct 2010 22:23:30 -0000 1.121 |
22 |
+++ ChangeLog 30 Oct 2010 04:14:00 -0000 1.122 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for dev-lang/mercury |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.121 2010/10/22 22:23:30 keri Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.122 2010/10/30 04:14:00 keri Exp $ |
28 |
+ |
29 |
+ 30 Oct 2010; <keri@g.o> mercury-10.04.2-r1.ebuild: |
30 |
+ QA - add die to do... function calls, add die to sed calls, remove die |
31 |
+ from econf call |
32 |
|
33 |
*mercury-10.04.2-r1 (22 Oct 2010) |
34 |
|
35 |
|
36 |
|
37 |
|
38 |
1.2 dev-lang/mercury/mercury-10.04.2-r1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?rev=1.2&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?rev=1.2&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?r1=1.1&r2=1.2 |
43 |
|
44 |
Index: mercury-10.04.2-r1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v |
47 |
retrieving revision 1.1 |
48 |
retrieving revision 1.2 |
49 |
diff -u -r1.1 -r1.2 |
50 |
--- mercury-10.04.2-r1.ebuild 22 Oct 2010 22:23:30 -0000 1.1 |
51 |
+++ mercury-10.04.2-r1.ebuild 30 Oct 2010 04:14:00 -0000 1.2 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2010 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.1 2010/10/22 22:23:30 keri Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.2 2010/10/30 04:14:00 keri Exp $ |
57 |
|
58 |
inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib |
59 |
|
60 |
@@ -49,7 +49,8 @@ |
61 |
"${S}"/compiler/libs.file_util.c \ |
62 |
"${S}"/compiler/make.program_target.m \ |
63 |
"${S}"/compiler/make.program_target.c \ |
64 |
- "${S}"/scripts/Mmake.vars.in |
65 |
+ "${S}"/scripts/Mmake.vars.in \ |
66 |
+ || die "sed libdir failed" |
67 |
|
68 |
touch "${S}"/compiler/*.date |
69 |
touch "${S}"/compiler/*.date0 |
70 |
@@ -86,9 +87,7 @@ |
71 |
$(use_enable !minimal most-grades) \ |
72 |
$(use_with readline)" |
73 |
|
74 |
- econf \ |
75 |
- ${myconf} \ |
76 |
- || die "econf failed" |
77 |
+ econf ${myconf} |
78 |
|
79 |
emake \ |
80 |
PARALLEL=${MAKEOPTS} \ |
81 |
@@ -123,7 +122,8 @@ |
82 |
fi |
83 |
|
84 |
cd "${TESTDIR}" |
85 |
- sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws |
86 |
+ sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \ |
87 |
+ || die "sed WORKSPACE failed" |
88 |
|
89 |
PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \ |
90 |
TERM="" \ |
91 |
@@ -164,28 +164,28 @@ |
92 |
dodoc \ |
93 |
BUGS HISTORY LIMITATIONS NEWS README README.Linux \ |
94 |
README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ |
95 |
- RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS |
96 |
+ RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die |
97 |
|
98 |
if use erlang; then |
99 |
- dodoc README.Erlang |
100 |
+ dodoc README.Erlang || die |
101 |
fi |
102 |
|
103 |
if use java; then |
104 |
- dodoc README.Java |
105 |
+ dodoc README.Java || die |
106 |
fi |
107 |
|
108 |
if use examples; then |
109 |
insinto /usr/share/doc/${PF}/samples |
110 |
- doins samples/{*.m,README,Mmakefile} |
111 |
+ doins samples/{*.m,README,Mmakefile} || die |
112 |
doins -r samples/c_interface \ |
113 |
samples/diff \ |
114 |
samples/muz \ |
115 |
samples/rot13 \ |
116 |
samples/solutions \ |
117 |
- samples/solver_types |
118 |
+ samples/solver_types || die |
119 |
|
120 |
if use java; then |
121 |
- doins -r samples/java_interface |
122 |
+ doins -r samples/java_interface || die |
123 |
fi |
124 |
|
125 |
rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \ |