Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/sqlite: sqlite-2.8.16-r4.ebuild metadata.xml ChangeLog sqlite-3.6.23.1-r1.ebuild
Date: Sat, 26 Jun 2010 10:46:58
Message-Id: 20100626104655.57E362CF76@corvid.gentoo.org
1 polynomial-c 10/06/26 10:46:55
2
3 Modified: sqlite-2.8.16-r4.ebuild metadata.xml ChangeLog
4 Added: sqlite-3.6.23.1-r1.ebuild
5 Log:
6 non-maintainer commit: Added new local "unlock-notify" USE flag (bug #323651).
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.21 dev-db/sqlite/sqlite-2.8.16-r4.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild?rev=1.21&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild?rev=1.21&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild?r1=1.20&r2=1.21
15
16 Index: sqlite-2.8.16-r4.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild,v
19 retrieving revision 1.20
20 retrieving revision 1.21
21 diff -u -r1.20 -r1.21
22 --- sqlite-2.8.16-r4.ebuild 11 Mar 2008 18:24:52 -0000 1.20
23 +++ sqlite-2.8.16-r4.ebuild 26 Jun 2010 10:46:54 -0000 1.21
24 @@ -1,6 +1,6 @@
25 -# Copyright 1999-2007 Gentoo Foundation
26 +# Copyright 1999-2010 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild,v 1.20 2008/03/11 18:24:52 betelgeuse Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild,v 1.21 2010/06/26 10:46:54 polynomial-c Exp $
30
31 inherit eutils alternatives toolchain-funcs
32
33
34
35
36 1.14 dev-db/sqlite/metadata.xml
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/metadata.xml?rev=1.14&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/metadata.xml?rev=1.14&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/metadata.xml?r1=1.13&r2=1.14
41
42 Index: metadata.xml
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/dev-db/sqlite/metadata.xml,v
45 retrieving revision 1.13
46 retrieving revision 1.14
47 diff -u -r1.13 -r1.14
48 --- metadata.xml 11 Feb 2010 18:36:05 -0000 1.13
49 +++ metadata.xml 26 Jun 2010 10:46:54 -0000 1.14
50 @@ -17,5 +17,7 @@
51 <flag name='soundex'>Enable the soundex function to compute soundex
52 encodings of strings</flag>
53 <flag name='threadsafe'>Enable thread safe operation of sqlite</flag>
54 + <flag name='unlock-notify'>Adds API for notifications when a database is
55 + unlocked in shared-cache mode</flag>
56 </use>
57 </pkgmetadata>
58
59
60
61 1.337 dev-db/sqlite/ChangeLog
62
63 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/ChangeLog?rev=1.337&view=markup
64 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/ChangeLog?rev=1.337&content-type=text/plain
65 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/ChangeLog?r1=1.336&r2=1.337
66
67 Index: ChangeLog
68 ===================================================================
69 RCS file: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v
70 retrieving revision 1.336
71 retrieving revision 1.337
72 diff -u -r1.336 -r1.337
73 --- ChangeLog 4 Jun 2010 19:25:54 -0000 1.336
74 +++ ChangeLog 26 Jun 2010 10:46:54 -0000 1.337
75 @@ -1,6 +1,15 @@
76 # ChangeLog for dev-db/sqlite
77 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
78 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.336 2010/06/04 19:25:54 phajdan.jr Exp $
79 +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.337 2010/06/26 10:46:54 polynomial-c Exp $
80 +
81 +*sqlite-3.6.23.1-r1 (26 Jun 2010)
82 +
83 + 26 Jun 2010; Lars Wendler <polynomial-c@g.o>
84 + +sqlite-3.6.23.1-r1.ebuild, metadata.xml:
85 + non-maintainer commit: Added new local "unlock-notify" USE flag which
86 + enables SQLITE_ENABLE_UNLOCK_NOTIFY (bug #323651). This is needed by
87 + future mozilla products. Change added with kind permission from
88 + Betelgeuse.
89
90 04 Jun 2010; Pawel Hajdan jr <phajdan.jr@g.o>
91 sqlite-3.6.23.1.ebuild:
92
93
94
95 1.1 dev-db/sqlite/sqlite-3.6.23.1-r1.ebuild
96
97 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/sqlite-3.6.23.1-r1.ebuild?rev=1.1&view=markup
98 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlite/sqlite-3.6.23.1-r1.ebuild?rev=1.1&content-type=text/plain
99
100 Index: sqlite-3.6.23.1-r1.ebuild
101 ===================================================================
102 # Copyright 1999-2010 Gentoo Foundation
103 # Distributed under the terms of the GNU General Public License v2
104 # $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.23.1-r1.ebuild,v 1.1 2010/06/26 10:46:54 polynomial-c Exp $
105
106 EAPI="3"
107
108 inherit autotools eutils flag-o-matic multilib versionator
109
110 DESCRIPTION="A SQL Database Engine in a C Library"
111 HOMEPAGE="http://www.sqlite.org/"
112 DOC_BASE="$(get_version_component_range 1-3)"
113 DOC_PV="$(replace_all_version_separators _ ${DOC_BASE})"
114
115 SRC_URI="
116 tcl? ( http://www.sqlite.org/${P}.tar.gz )
117 !tcl? (
118 test? ( http://www.sqlite.org/${P}.tar.gz )
119 !test? ( http://www.sqlite.org/${PN}-amalgamation-${PV}.tar.gz )
120 )
121 doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )"
122
123 LICENSE="as-is"
124 SLOT="3"
125 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
126 IUSE="debug doc extensions +fts3 icu +readline secure-delete soundex tcl +threadsafe test unlock-notify"
127
128 RDEPEND="icu? ( dev-libs/icu )
129 readline? ( sys-libs/readline )
130 tcl? ( dev-lang/tcl )"
131 DEPEND="${RDEPEND}
132 test? ( dev-lang/tcl )
133 doc? ( app-arch/unzip )"
134
135 src_prepare() {
136 if use icu; then
137 rm -f test/like.test
138 fi
139
140 if use tcl || use test; then
141 epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes.patch"
142 epatch "${FILESDIR}/${PN}-3.6.22-dlopen.patch" # bug 300836
143 eautoreconf # dlopen.patch patches configure.ac
144 else
145 epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes-amalgamation.patch"
146 fi
147
148 eautoreconf # for MiNT and interix
149 epunt_cxx
150 }
151
152 src_configure() {
153 # Support column metadata, bug #266651
154 append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
155
156 # Support R-trees, bug #257646
157 append-cppflags -DSQLITE_ENABLE_RTREE
158
159 if use icu; then
160 append-cppflags -DSQLITE_ENABLE_ICU
161 if use tcl || use test; then
162 # Normal tarball.
163 sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
164 else
165 # Amalgamation tarball.
166 sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
167 fi
168 fi
169
170 # Support FTS3, bug #207701
171 if use fts3; then
172 append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
173 fi
174
175 # Enable secure_delete pragma by default
176 if use secure-delete; then
177 append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
178 fi
179
180 # Support soundex, bug #143794
181 if use soundex; then
182 append-cppflags -DSQLITE_SOUNDEX
183 fi
184
185 # The amalgamation source doesn't have these via Makefile
186 if use debug; then
187 append-cppflags -DSQLITE_DEBUG
188 else
189 append-cppflags -DNDEBUG
190 fi
191
192 # Needed for >=net-libs/xulrunner-1.9.3,
193 # >=www-client/mozilla-firefox-3.6_alpha6 and
194 # >=www-client/seamonkey-2.1_alpha2
195 if use unlock-notify ; then
196 append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
197 fi
198
199 local extensions_option
200 if use tcl || use test; then
201 extensions_option="load-extension"
202 else
203 extensions_option="dynamic-extensions"
204 fi
205
206 # Starting from 3.6.23, SQLite has locking strategies that are specific to
207 # OSX. By default they are enabled, and use semantics that only make sense
208 # on OSX. However, they require gethostuuid() function for that, which is
209 # only available on OSX starting from 10.6 (Snow Leopard). For earlier
210 # versions of OSX we have to disable all this nifty locking options, as
211 # suggested by upstream.
212 if [[ "${CHOST}" == *-darwin[56789] ]] ; then
213 append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE=0
214 fi
215
216 # `configure` from amalgamation tarball doesn't support
217 # --with-readline-inc and --(enable|disable)-tcl options.
218 econf \
219 $(use_enable extensions ${extensions_option}) \
220 $(use_enable readline) \
221 $({ use tcl || use test; } && echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
222 $(use_enable threadsafe) \
223 $(use tcl && echo --enable-tcl) \
224 $(use !tcl && use test && echo --enable-tcl)
225 }
226
227 src_compile() {
228 emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" || die "emake failed"
229 }
230
231 src_test() {
232 if [[ "${EUID}" -ne "0" ]]; then
233 local test="test"
234 use debug && test="fulltest"
235 emake ${test} || die "Some test(s) failed"
236 else
237 ewarn "The userpriv feature must be enabled to run tests."
238 eerror "Testsuite will not be run."
239 fi
240 }
241
242 src_install() {
243 emake \
244 DESTDIR="${D}" \
245 TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" \
246 install \
247 || die "emake install failed"
248
249 doman sqlite3.1 || die "doman sqlite3.1 failed"
250
251 if use doc; then
252 # Naming scheme changes randomly between - and _ in releases
253 # http://www.sqlite.org/cvstrac/tktview?tn=3523
254 dohtml -r "${WORKDIR}"/${PN}-${DOC_PV}-docs/* || die "dohtml failed"
255 fi
256 }