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

Gentoo Archives: gentoo-commits

From: "Petteri Raty (betelgeuse)" <betelgeuse@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/sqlite: sqlite-3.5.3.ebuild sqlite-3.5.4.ebuild ChangeLog
Date: Tue, 08 Jan 2008 00:34:53
Message-Id: E1JC2Qc-0003C1-Bd@stork.gentoo.org
1 betelgeuse 08/01/08 00:34:50
2
3 Modified: sqlite-3.5.3.ebuild sqlite-3.5.4.ebuild ChangeLog
4 Log:
5 Fix doc use flag. The documentation comes in a separate tarball since 3.5. Fixes bug #203107.
6 (Portage version: 2.1.4_rc14)
7
8 Revision Changes Path
9 1.2 dev-db/sqlite/sqlite-3.5.3.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/sqlite/sqlite-3.5.3.ebuild?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/sqlite/sqlite-3.5.3.ebuild?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/sqlite/sqlite-3.5.3.ebuild?r1=1.1&r2=1.2
14
15 Index: sqlite-3.5.3.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.3.ebuild,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- sqlite-3.5.3.ebuild 7 Dec 2007 18:14:18 -0000 1.1
22 +++ sqlite-3.5.3.ebuild 8 Jan 2008 00:34:49 -0000 1.2
23 @@ -1,14 +1,16 @@
24 -# Copyright 1999-2007 Gentoo Foundation
25 +# Copyright 1999-2008 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.3.ebuild,v 1.1 2007/12/07 18:14:18 betelgeuse Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.3.ebuild,v 1.2 2008/01/08 00:34:49 betelgeuse Exp $
29
30 EAPI="1"
31
32 -inherit alternatives eutils flag-o-matic libtool
33 +inherit versionator alternatives eutils flag-o-matic libtool
34
35 DESCRIPTION="an SQL Database Engine in a C Library"
36 HOMEPAGE="http://www.sqlite.org/"
37 -SRC_URI="http://www.sqlite.org/${P}.tar.gz"
38 +DOC_PV=$(replace_all_version_separators _)
39 +SRC_URI="http://www.sqlite.org/${P}.tar.gz
40 + doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )"
41
42 LICENSE="as-is"
43 SLOT="3"
44 @@ -16,9 +18,8 @@
45 IUSE="debug doc soundex tcl +threadsafe"
46 RESTRICT="!tcl? ( test )"
47
48 -DEPEND="doc? ( dev-lang/tcl )
49 - tcl? ( dev-lang/tcl )"
50 -RDEPEND="tcl? ( dev-lang/tcl )"
51 +DEPEND="tcl? ( dev-lang/tcl )"
52 +RDEPEND="${DEPEND}"
53
54 SOURCE="/usr/bin/lemon"
55 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
56 @@ -57,10 +58,6 @@
57 $(use_enable tcl)
58
59 emake all || die "emake all failed"
60 -
61 - if use doc ; then
62 - emake doc || die "emake doc failed"
63 - fi
64 }
65
66 src_test() {
67 @@ -80,12 +77,16 @@
68 DESTDIR="${D}" \
69 TCLLIBDIR="/usr/$(get_libdir)" \
70 install \
71 - || die "make install failed"
72 + || die "emake install failed"
73
74 newbin lemon lemon-${SLOT} || die
75
76 dodoc README VERSION || die
77 doman sqlite3.1 || die
78
79 - use doc && dohtml doc/* art/*.gif
80 + dohtml doc/*.html art/*.gif || die
81 +
82 + if use doc; then
83 + dohtml -r "${WORKDIR}"/${PN}-docs-${PV}/* || die
84 + fi
85 }
86
87
88
89 1.2 dev-db/sqlite/sqlite-3.5.4.ebuild
90
91 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/sqlite/sqlite-3.5.4.ebuild?rev=1.2&view=markup
92 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/sqlite/sqlite-3.5.4.ebuild?rev=1.2&content-type=text/plain
93 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/sqlite/sqlite-3.5.4.ebuild?r1=1.1&r2=1.2
94
95 Index: sqlite-3.5.4.ebuild
96 ===================================================================
97 RCS file: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.4.ebuild,v
98 retrieving revision 1.1
99 retrieving revision 1.2
100 diff -u -r1.1 -r1.2
101 --- sqlite-3.5.4.ebuild 17 Dec 2007 19:05:32 -0000 1.1
102 +++ sqlite-3.5.4.ebuild 8 Jan 2008 00:34:49 -0000 1.2
103 @@ -1,14 +1,16 @@
104 -# Copyright 1999-2007 Gentoo Foundation
105 +# Copyright 1999-2008 Gentoo Foundation
106 # Distributed under the terms of the GNU General Public License v2
107 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.4.ebuild,v 1.1 2007/12/17 19:05:32 betelgeuse Exp $
108 +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.4.ebuild,v 1.2 2008/01/08 00:34:49 betelgeuse Exp $
109
110 EAPI="1"
111
112 -inherit alternatives eutils flag-o-matic libtool
113 +inherit versionator alternatives eutils flag-o-matic libtool
114
115 DESCRIPTION="an SQL Database Engine in a C Library"
116 HOMEPAGE="http://www.sqlite.org/"
117 -SRC_URI="http://www.sqlite.org/${P}.tar.gz"
118 +DOC_PV=$(replace_all_version_separators _)
119 +SRC_URI="http://www.sqlite.org/${P}.tar.gz
120 + doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )"
121
122 LICENSE="as-is"
123 SLOT="3"
124 @@ -16,9 +18,8 @@
125 IUSE="debug doc soundex tcl +threadsafe"
126 RESTRICT="!tcl? ( test )"
127
128 -DEPEND="doc? ( dev-lang/tcl )
129 - tcl? ( dev-lang/tcl )"
130 -RDEPEND="tcl? ( dev-lang/tcl )"
131 +DEPEND="tcl? ( dev-lang/tcl )"
132 +RDEPEND="${DEPEND}"
133
134 SOURCE="/usr/bin/lemon"
135 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
136 @@ -57,10 +58,6 @@
137 $(use_enable tcl)
138
139 emake all || die "emake all failed"
140 -
141 - if use doc ; then
142 - emake doc || die "emake doc failed"
143 - fi
144 }
145
146 src_test() {
147 @@ -80,12 +77,16 @@
148 DESTDIR="${D}" \
149 TCLLIBDIR="/usr/$(get_libdir)" \
150 install \
151 - || die "make install failed"
152 + || die "emake install failed"
153
154 newbin lemon lemon-${SLOT} || die
155
156 dodoc README VERSION || die
157 doman sqlite3.1 || die
158
159 - use doc && dohtml doc/* art/*.gif
160 + dohtml doc/*.html art/*.gif || die
161 +
162 + if use doc; then
163 + dohtml -r "${WORKDIR}"/${PN}-docs-${PV}/* || die
164 + fi
165 }
166
167
168
169 1.172 dev-db/sqlite/ChangeLog
170
171 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/sqlite/ChangeLog?rev=1.172&view=markup
172 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/sqlite/ChangeLog?rev=1.172&content-type=text/plain
173 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/sqlite/ChangeLog?r1=1.171&r2=1.172
174
175 Index: ChangeLog
176 ===================================================================
177 RCS file: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v
178 retrieving revision 1.171
179 retrieving revision 1.172
180 diff -u -r1.171 -r1.172
181 --- ChangeLog 8 Jan 2008 00:21:48 -0000 1.171
182 +++ ChangeLog 8 Jan 2008 00:34:49 -0000 1.172
183 @@ -1,6 +1,11 @@
184 # ChangeLog for dev-db/sqlite
185 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
186 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.171 2008/01/08 00:21:48 betelgeuse Exp $
187 +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.172 2008/01/08 00:34:49 betelgeuse Exp $
188 +
189 + 08 Jan 2008; Petteri Räty <betelgeuse@g.o> sqlite-3.5.3.ebuild,
190 + sqlite-3.5.4.ebuild:
191 + Fix doc use flag. The documentation comes in a separate tarball since 3.5.
192 + Fixes bug #203107.
193
194 08 Jan 2008; Petteri Räty <betelgeuse@g.o> -sqlite-3.3.12.ebuild,
195 -sqlite-3.4.2.ebuild:
196
197
198
199 --
200 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups