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/xsb: ChangeLog xsb-3.2-r1.ebuild
Date: Tue, 02 Nov 2010 05:59:55
Message-Id: 20101102055946.94AB72004B@flycatcher.gentoo.org
1 keri 10/11/02 05:59:46
2
3 Modified: ChangeLog xsb-3.2-r1.ebuild
4 Log:
5 QA - remove calls to die from econf; add calls to die to do... functions
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.28 dev-lang/xsb/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/ChangeLog?rev=1.28&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/ChangeLog?rev=1.28&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/ChangeLog?r1=1.27&r2=1.28
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v
18 retrieving revision 1.27
19 retrieving revision 1.28
20 diff -u -r1.27 -r1.28
21 --- ChangeLog 1 Nov 2010 05:39:35 -0000 1.27
22 +++ ChangeLog 2 Nov 2010 05:59:46 -0000 1.28
23 @@ -1,6 +1,9 @@
24 # ChangeLog for dev-lang/xsb
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.27 2010/11/01 05:39:35 keri Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.28 2010/11/02 05:59:46 keri Exp $
28 +
29 + 02 Nov 2010; <keri@g.o> xsb-3.2-r1.ebuild:
30 + QA - remove calls to die from econf; add calls to die to do... functions
31
32 01 Nov 2010; <keri@g.o> -xsb-3.0.1.ebuild,
33 -files/xsb-3.0.1-chr_d.patch, -files/xsb-3.0.1-configure.patch,
34
35
36
37 1.5 dev-lang/xsb/xsb-3.2-r1.ebuild
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/xsb-3.2-r1.ebuild?rev=1.5&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/xsb-3.2-r1.ebuild?rev=1.5&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/xsb-3.2-r1.ebuild?r1=1.4&r2=1.5
42
43 Index: xsb-3.2-r1.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.2-r1.ebuild,v
46 retrieving revision 1.4
47 retrieving revision 1.5
48 diff -u -r1.4 -r1.5
49 --- xsb-3.2-r1.ebuild 31 Oct 2010 19:41:11 -0000 1.4
50 +++ xsb-3.2-r1.ebuild 2 Nov 2010 05:59:46 -0000 1.5
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/xsb/xsb-3.2-r1.ebuild,v 1.4 2010/10/31 19:41:11 hwoarang Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.2-r1.ebuild,v 1.5 2010/11/02 05:59:46 keri Exp $
56
57 MY_P="XSB"
58
59 @@ -54,28 +54,28 @@
60 $(use_with odbc) \
61 $(use_with iodbc) \
62 $(use_enable threads mt) \
63 - $(use_enable debug) \
64 - || die "econf failed"
65 + $(use_enable debug)
66 +
67 emake || die "emake failed"
68
69 if use libwww ; then
70 cd "${S}"/packages/libwww
71 - econf --with-libwww=/usr || die "econf libwww package failed"
72 + econf --with-libwww=/usr
73 fi
74
75 if use mysql ; then
76 cd "${S}"/packages/dbdrivers/mysql
77 - econf || die "econf mysql package failed"
78 + econf
79 fi
80
81 if use odbc ; then
82 cd "${S}"/packages/dbdrivers/odbc
83 - econf || die "econf odbc package failed"
84 + econf
85 fi
86
87 if use xml ; then
88 cd "${S}"/packages/xpath
89 - econf || die "econf xpath package failed"
90 + econf
91 fi
92
93 # All XSB Packages are compiled using a single Prolog engine.
94 @@ -108,98 +108,98 @@
95
96 src_install() {
97 cd "${S}"/build
98 - make DESTDIR="${D}" install || die "make install failed"
99 + emake DESTDIR="${D}" install || die "make install failed"
100
101 local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
102 - dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
103 + dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb || die
104
105 cd "${S}"/packages
106 local PACKAGES=${XSB_INSTALL_DIR}/packages
107 insinto ${PACKAGES}
108 - doins *.xwam
109 + doins *.xwam || die
110
111 insinto ${PACKAGES}/chr
112 - doins chr/*.xwam
113 + doins chr/*.xwam || die
114
115 insinto ${PACKAGES}/chr_d
116 - doins chr_d/*.xwam
117 + doins chr_d/*.xwam || die
118
119 insinto ${PACKAGES}/gap
120 - doins gap/*.xwam
121 + doins gap/*.xwam || die
122
123 insinto ${PACKAGES}/justify
124 - doins justify/*.xwam
125 - doins justify/*.H
126 + doins justify/*.xwam || die
127 + doins justify/*.H || die
128
129 insinto ${PACKAGES}/regmatch
130 - doins regmatch/*.xwam
131 + doins regmatch/*.xwam || die
132 insinto ${PACKAGES}/regmatch/cc
133 - doins regmatch/cc/*.H
134 + doins regmatch/cc/*.H || die
135
136 insinto ${PACKAGES}/sgml
137 - doins sgml/*.xwam
138 + doins sgml/*.xwam || die
139 insinto ${PACKAGES}/sgml/cc
140 - doins sgml/cc/*.H
141 + doins sgml/cc/*.H || die
142 insinto ${PACKAGES}/sgml/cc/dtd
143 - doins sgml/cc/dtd/*
144 + doins sgml/cc/dtd/* || die
145
146 insinto ${PACKAGES}/slx
147 - doins slx/*.xwam
148 + doins slx/*.xwam || die
149
150 insinto ${PACKAGES}/wildmatch
151 - doins wildmatch/*.xwam
152 + doins wildmatch/*.xwam || die
153 insinto ${PACKAGES}/wildmatch/cc
154 - doins wildmatch/cc/*.H
155 + doins wildmatch/cc/*.H || die
156
157 if use libwww ; then
158 insinto ${PACKAGES}/libwww
159 - doins libwww/*.xwam
160 + doins libwww/*.xwam || die
161 insinto ${PACKAGES}/libwww/cc
162 - doins libwww/cc/*.H
163 + doins libwww/cc/*.H || die
164 fi
165
166 if use mysql || use odbc ; then
167 insinto ${PACKAGES}/dbdrivers
168 - doins dbdrivers/*.xwam
169 - doins dbdrivers/*.H
170 + doins dbdrivers/*.xwam || die
171 + doins dbdrivers/*.H || die
172 insinto ${PACKAGES}/dbdrivers/cc
173 - doins dbdrivers/cc/*.H
174 + doins dbdrivers/cc/*.H || die
175 if use mysql ; then
176 insinto ${PACKAGES}/dbdrivers/mysql
177 - doins dbdrivers/mysql/*.xwam
178 + doins dbdrivers/mysql/*.xwam || die
179 insinto ${PACKAGES}/dbdrivers/mysql/cc
180 - doins dbdrivers/mysql/cc/*.H
181 + doins dbdrivers/mysql/cc/*.H || die
182 fi
183 if use odbc ; then
184 insinto ${PACKAGES}/dbdrivers/odbc
185 - doins dbdrivers/odbc/*.xwam
186 + doins dbdrivers/odbc/*.xwam || die
187 insinto ${PACKAGES}/dbdrivers/odbc/cc
188 - doins dbdrivers/odbc/cc/*.H
189 + doins dbdrivers/odbc/cc/*.H || die
190 fi
191 fi
192
193 if use perl ; then
194 insinto ${PACKAGES}/perlmatch
195 - doins perlmatch/*.xwam
196 + doins perlmatch/*.xwam || die
197 insinto ${PACKAGES}/perlmatch/cc
198 - doins perlmatch/cc/*.H
199 + doins perlmatch/cc/*.H || die
200 fi
201
202 if use xml ; then
203 insinto ${PACKAGES}/xpath
204 - doins xpath/*xwam
205 + doins xpath/*xwam || die
206 insinto ${PACKAGES}/xpath/cc
207 - doins xpath/cc/*.H
208 + doins xpath/cc/*.H || die
209 fi
210
211 if use examples ; then
212 cd "${S}"/build
213 - make \
214 + emake \
215 DESTDIR="${D}" \
216 install_examples="${D}"/usr/share/doc/${PF}/examples \
217 install_examples || die "make install_examples failed"
218 fi
219
220 cd "${S}"
221 - dodoc FAQ README
222 + dodoc FAQ README || die
223 }
Report Message
Find on MARC Find on Google Groups