Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Keri Harris (keri)" <keri@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras: ChangeLog mercury-extras-10.04.2-r1.ebuild
Date: Sat, 30 Oct 2010 04:40:40
Message-Id: 20101030044034.E0C8120051@flycatcher.gentoo.org
1 keri 10/10/30 04:40:34
2
3 Modified: ChangeLog mercury-extras-10.04.2-r1.ebuild
4 Log:
5 QA - add die to do... function calls, add die to sed calls
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.80 dev-lang/mercury-extras/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.80&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.80&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?r1=1.79&r2=1.80
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v
18 retrieving revision 1.79
19 retrieving revision 1.80
20 diff -u -r1.79 -r1.80
21 --- ChangeLog 23 Oct 2010 03:48:49 -0000 1.79
22 +++ ChangeLog 30 Oct 2010 04:40:34 -0000 1.80
23 @@ -1,6 +1,9 @@
24 # ChangeLog for dev-lang/mercury-extras
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.79 2010/10/23 03:48:49 keri Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.80 2010/10/30 04:40:34 keri Exp $
28 +
29 + 30 Oct 2010; <keri@g.o> mercury-extras-10.04.2-r1.ebuild:
30 + QA - add die to do... function calls, add die to sed calls
31
32 23 Oct 2010; <keri@g.o>
33 files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch:
34
35
36
37 1.2 dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.2&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.2&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?r1=1.1&r2=1.2
42
43 Index: mercury-extras-10.04.2-r1.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v
46 retrieving revision 1.1
47 retrieving revision 1.2
48 diff -u -r1.1 -r1.2
49 --- mercury-extras-10.04.2-r1.ebuild 22 Oct 2010 23:54:39 -0000 1.1
50 +++ mercury-extras-10.04.2-r1.ebuild 30 Oct 2010 04:40:34 -0000 1.2
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2010 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.1 2010/10/22 23:54:39 keri Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.2 2010/10/30 04:40:34 keri Exp $
56
57 inherit eutils
58
59 @@ -46,25 +46,46 @@
60
61 sed -i -e "s:posix:posix quickcheck:" \
62 -e "s:references:solver_types/library:" \
63 - -e "s:windows_installer_generator ::" Mmakefile
64 + -e "s:windows_installer_generator ::" \
65 + Mmakefile || die "sed default packages failed"
66
67 - use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
68 - use tcl && use tk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
69 - use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
70 + if use glut; then
71 + sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile \
72 + || die "sed glut failed"
73 + fi
74 +
75 + if use tcl && use tk; then
76 + sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile \
77 + || die "sed tcltk failed"
78 + fi
79 +
80 + if use opengl; then
81 + sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile \
82 + || die "sed opengl failed"
83 + fi
84
85 if use odbc || use iodbc; then
86 - sed -i -e "s:moose:moose odbc:" Mmakefile
87 + sed -i -e "s:moose:moose odbc:" Mmakefile \
88 + || die "sed odbc failed"
89 + fi
90 +
91 + if ! use ncurses; then
92 + sed -i -e "s:curs curses::" Mmakefile \
93 + || die "sed ncurses failed"
94 fi
95
96 - ! use ncurses && sed -i -e "s:curs curses::" Mmakefile
97 - ! use xml && sed -i -e "s:xml::" Mmakefile
98 + if ! use xml; then
99 + sed -i -e "s:xml::" Mmakefile \
100 + || die "sed xml failed"
101 + fi
102
103 sed -i -e "s:@libdir@:$(get_libdir):" \
104 - dynamic_linking/Mmakefile posix/Mmakefile
105 + dynamic_linking/Mmakefile posix/Mmakefile \
106 + || die "sed libdir failed"
107
108 # disable broken packages
109 - sed -i -e "s:lazy_evaluation ::" \
110 - -e "s:quickcheck::" Mmakefile
111 + sed -i -e "s:lazy_evaluation ::" -e "s:quickcheck::" Mmakefile \
112 + || die "sed broken packages failed"
113 }
114
115 src_compile() {
116 @@ -92,71 +113,71 @@
117 cd "${S}"
118 if use examples; then
119 insinto /usr/share/doc/${PF}/samples/base64
120 - doins base64/*.m
121 + doins base64/*.m || die
122
123 insinto /usr/share/doc/${PF}/samples/complex_numbers
124 - doins complex_numbers/samples/*
125 + doins complex_numbers/samples/* || die
126
127 insinto /usr/share/doc/${PF}/samples/concurrency
128 - doins concurrency/*
129 + doins concurrency/* || die
130
131 insinto /usr/share/doc/${PF}/samples/dynamic_linking
132 - doins dynamic_linking/hello.m
133 + doins dynamic_linking/hello.m || die
134
135 insinto /usr/share/doc/${PF}/samples/error
136 - doins error/*
137 + doins error/* || die
138
139 insinto /usr/share/doc/${PF}/samples/fixed
140 - doins fixed/*.m
141 + doins fixed/*.m || die
142
143 insinto /usr/share/doc/${PF}/samples/gator
144 - doins -r gator/*
145 + doins -r gator/* || die
146
147 insinto /usr/share/doc/${PF}/samples/lex
148 - doins lex/samples/*
149 + doins lex/samples/* || die
150
151 insinto /usr/share/doc/${PF}/samples/log4m
152 - doins log4m/*.m
153 + doins log4m/*.m || die
154
155 insinto /usr/share/doc/${PF}/samples/moose
156 - doins moose/samples/*
157 + doins moose/samples/* || die
158
159 insinto /usr/share/doc/${PF}/samples/net
160 - doins net/*.m
161 + doins net/*.m || die
162
163 if use ncurses; then
164 insinto /usr/share/doc/${PF}/samples/curs
165 - doins curs/samples/*
166 + doins curs/samples/* || die
167
168 insinto /usr/share/doc/${PF}/samples/curses
169 - doins curses/sample/*
170 + doins curses/sample/* || die
171 fi
172
173 if use X; then
174 insinto /usr/share/doc/${PF}/samples/graphics
175 - doins graphics/easyx/samples/*.m
176 + doins graphics/easyx/samples/*.m || die
177 fi
178
179 if use glut && use opengl; then
180 insinto /usr/share/doc/${PF}/samples/graphics
181 - doins graphics/samples/calc/*
182 - doins graphics/samples/gears/*
183 - doins graphics/samples/maze/*
184 - doins graphics/samples/pent/*
185 + doins graphics/samples/calc/* || die
186 + doins graphics/samples/gears/* || die
187 + doins graphics/samples/maze/* || die
188 + doins graphics/samples/pent/* || die
189 fi
190
191 if use opengl && use tcl && use tk; then
192 insinto /usr/share/doc/${PF}/samples/graphics
193 - doins graphics/samples/pent/*.m
194 + doins graphics/samples/pent/*.m || die
195 fi
196
197 if use ssl; then
198 insinto /usr/share/doc/${PF}/samples/mopenssl
199 - doins mopenssl/*.m
200 + doins mopenssl/*.m || die
201 fi
202 fi
203
204 rm -rf $(find "${D}"/usr/share/doc/${PF}/samples -name CVS)
205
206 - dodoc README
207 + dodoc README || die
208 }
Report Message
Find on MARC Find on Google Groups