Version bump. Enables extensions use flag by default as that's the upstream default. Fixes bug #341257 and bug #335506. Tests still fail with icu use flag like in 3.7.2.

Package-Manager: portage-2.2_rc99/cvs/Linux i686

3 files changed, 174 insertions, 5 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index c977f2ccfff6..9510e51906f6 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.353 2010/10/30 18:15:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.354 2010/10/31 09:27:03 betelgeuse Exp $
+
+*sqlite-3.7.3 (31 Oct 2010)
+
+  31 Oct 2010; Petteri Räty <betelgeuse@gentoo.org> +sqlite-3.7.3.ebuild:
+  Version bump. Enables extensions use flag by default as that's the
+  upstream default. Fixes bug #341257 and bug #335506. Tests still fail with
+  icu use flag like in 3.7.2.
 
   30 Oct 2010; Markus Meier <maekke@gentoo.org> sqlite-3.7.2.ebuild:
   arm stable, bug #342323
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 903266587652..fb477b2e3653 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -13,26 +13,30 @@ DIST sqlite-3.6.22.tar.gz 2999137 RMD160 3de220362e58589649b068519b9d2aa021371ca
 DIST sqlite-3.6.23.1.tar.gz 3086807 RMD160 03847176d21391cc44d2275fc685d556c56ab9d8 SHA1 718615fc37a5ef57fb4e7d06fc56ee7bda391d6f SHA256 1a0517438a573a68ab73e8ed75d194086d55d75883542ab1d5ae1080bbddd492
 DIST sqlite-3.7.0.tar.gz 3263369 RMD160 c97253a57f50cc234af0b66da5545e55077a1458 SHA1 7ad917b1732d53526db876cada21704baa0a9e6e SHA256 5668c25f5f0dace2b9a443d4b7b70a520e07916e7b64a52cd2868dd25abd417c
 DIST sqlite-3.7.2.tar.gz 3309139 RMD160 8f831cebeec41b21a0e009df1966822ab0546ff4 SHA1 b5e66d8d52ad7ef4761d0b10590bc24442b965be SHA256 bb53cad58f1c502662644d88e24a552dc8de982d650f80d8debaf13b15bb3b8a
+DIST sqlite-3.7.3.tar.gz 3410714 RMD160 c7f5f026a972d8ea03818cfc1f348dc4b62fc062 SHA1 2951de8f1e4a05172eb91710b7d3628fe3ea20a3 SHA256 dbf352e8fbb74829f5e7a88f9f6ceeb80a709537f668c36e4b6cdfb271309ef6
 DIST sqlite-amalgamation-3.6.22.tar.gz 1413926 RMD160 67452387486081a99107900eb14c816ba970f4ed SHA1 b0b87bd1945528723083f6830094f5c676829164 SHA256 68e2841b83b90252f51ccc41e7c00b87da9b2358bbef7de0bc8e78b101f5b8cc
 DIST sqlite-amalgamation-3.6.23.1.tar.gz 1421265 RMD160 6ab83f464a51b9862970f3473f25839319cdb7d5 SHA1 0f4a1390f6405b8f00ecc3694c99ba4e87b40308 SHA256 d080d724836fb8453dc9f3d5826c097b61e39d121b6c5da7b967764ca1523558
 DIST sqlite-amalgamation-3.7.0.tar.gz 1486712 RMD160 d2376d516645fd3b44783a92458bb557999aa460 SHA1 5ed43977c5682908ae05eb27841e4191635a4a96 SHA256 7ca87301c9a868a5c66b223e68c9e62268bc9a352ac4111a1ca83be30cd1798e
 DIST sqlite-amalgamation-3.7.2.tar.gz 1499007 RMD160 9f1fd0658b0f6df2288214cd7aebef533f3a6b00 SHA1 12aed8fc9c729444e82a27644ceb6d6a0e695cfc SHA256 74eb7f0299179ae3979f6630dd730b603f6e21889fc60cef56f06076fd02258a
+DIST sqlite-amalgamation-3.7.3.tar.gz 1512409 RMD160 9a09db08c40226a09a700cb2b6cea79d04a0bab9 SHA1 af3740819547f0dba52e096045525329f645c54f SHA256 3186631378474575dd766f46583219903db2b26af1f78cb15318e79c227a0080
 DIST sqlite_docs_3_6_22.zip 2642221 RMD160 b96d9c4f499aef46fc2dd751633ba11be5946327 SHA1 e287700c79145aad0b3409215af0446c23c1d1e1 SHA256 8a8b92893cf4dd623a5ad4e75fe39524b29e368bbff7c6e2a069d79cce32f859
 DIST sqlite_docs_3_6_23.zip 2788665 RMD160 ca2674800fcb552af93e37c6cbf41b13d3c1facc SHA1 caef3584c8050a135f11d8809fa9ac7ff9696708 SHA256 21e3ad71475a65c2d14d02c9ed8a7bdc5ed6620d6cc1696e245f9d0bb8b26136
 DIST sqlite_docs_3_7_0.zip 2919734 RMD160 2db2782af30eeee5e2c704ed8bb14c2434333a35 SHA1 33e16d4f693796a7bd53f984b5fbb60893fe1cc8 SHA256 320081cc40a72d569e59fddd2e9d2cdeb9eb199897a0dc285899c7d1d03df5c7
 DIST sqlite_docs_3_7_2.zip 3290342 RMD160 71dbd088d155c2b56d7e45f30cede09516e4193e SHA1 4a2ea2078ee9721a1d7e172e7ed02eecc8470412 SHA256 f78e8d24a3cb6b713370b4ff26ae60b770064526b67d20e6b0efbc109e3818c7
+DIST sqlite_docs_3_7_3.zip 3277639 RMD160 f44e79c0b299942c1351765c6cd5ac693261e3ed SHA1 49ef65bfd52f9dc275dd94c3cf10c5720c2de7e5 SHA256 94bd6143ff280a60474ecdc5faff29d339aa78b8c266c16d62259b3eea61ff5a
 EBUILD sqlite-2.8.16-r4.ebuild 2693 RMD160 f0d7c0c813b135e75e32bc5489080d6d32492d17 SHA1 3d8b88705e097b77f4d05104ff47b942afe758d2 SHA256 c691b6a7628a48f1c446fe016970cc0cbde0dd0e0d019d28603b5f54b860c364
 EBUILD sqlite-3.6.22-r2.ebuild 3995 RMD160 dbcc04546e194034dbb9cc94a7107229c53d94e3 SHA1 2e9565d9b1a3d23cb8d500410db135ddace897c3 SHA256 cbe1303a57cb3f2baa88ec3d03467570ac1745a88ad219305d8849edcdbb7f93
 EBUILD sqlite-3.6.23.1-r1.ebuild 4628 RMD160 4dbd0d3e0722f330319d45cc98102cf64b70378c SHA1 8d48db0d080f87e715b9eb6316a3aae7c3ca891f SHA256 ec2ee6e3a403a84ce8daf01718582e06b9e7a296b7d0726d7e2c6980ffded8c8
 EBUILD sqlite-3.6.23.1.ebuild 4487 RMD160 931e98508b18497e9544f380d7e4546796d6fa50 SHA1 0e2983f87a66a67594b992576cd9470a2fc71b61 SHA256 7d2f76798f61658e357ce069ce6928e190a40cfea27d49f9848b80c2a6d8786a
 EBUILD sqlite-3.7.0.ebuild 4622 RMD160 591d6721b8843297a364583d4ca90fe83b743300 SHA1 63eb5d3268527761025303140c7e62d65b2f90ed SHA256 1c3e4504ce5ab13d50ac9dc65b01a7c3ad592304d3b46ce4b410b55ceb9ded74
 EBUILD sqlite-3.7.2.ebuild 4709 RMD160 14ec3fb4dbfd759c6641145df0e540ba012e6396 SHA1 c3192fd551374a5c4cce12cd18c18ee3a3f2da04 SHA256 2a7417cc78a69d4b4950500724c368d4b69a3e392981efb24bdbace67f41d404
-MISC ChangeLog 48487 RMD160 1c4633426d99bc28bed266978f7e021035cca0cf SHA1 08374223555be8a66b4d96f16811a8a268ae5e23 SHA256 61e7794b7a3620aa522a4c796ec30c1e9f193d15ed49453dba4110f1290c7ab9
+EBUILD sqlite-3.7.3.ebuild 4720 RMD160 a4f342009a900228e28266c83526482d0695ae91 SHA1 f060f541105a29db173de842a7622cef0bb09132 SHA256 83b52935c1bd0944cc0171e9a3339cc8469746a58593ce45944df13b8d989e8f
+MISC ChangeLog 48772 RMD160 933b61019ec4320c1ec4d12a618cb13da8084aa7 SHA1 d0f437ae46e37ed91f8cb66bc81ce258715ec0e4 SHA256 517da159cd08f6f1bd2d206dda103460d4abd13bf053d9174f8a5b094d01c7d2
 MISC metadata.xml 1011 RMD160 02768455c7a2f2e980fcd51e16105d1a030a69cf SHA1 98ba789e4120f8d0a1e2f49285f6dbf49e0a35d0 SHA256 4b2dc7fa04d3909cac1f4b764daaddb237e5c4f9a05998d7fd04dc42a5775aae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzMYSwACgkQkKaRLQcq0GIH3wCgkl+53x8wUOifGpRNiPy0IyZY
-kekAnRV7h4I4ebuaq0LEHuei6ZPfLTA7
-=rWCZ
+iEYEARECAAYFAkzNNvoACgkQcxLzpIGCsLTyNQCdGmpuBa9QEyUvkz89CJsSjd0v
+/dgAn1Vw0DMg4AzWZThvPW61yYBgIps5
+=8NJj
 -----END PGP SIGNATURE-----
diff --git a/dev-db/sqlite/sqlite-3.7.3.ebuild b/dev-db/sqlite/sqlite-3.7.3.ebuild
new file mode 100644
index 000000000000..0728ffb0dadb
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.7.3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.3.ebuild,v 1.1 2010/10/31 09:27:03 betelgeuse Exp $
+
+EAPI="3"
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="http://www.sqlite.org/"
+DOC_BASE="$(get_version_component_range 1-3)"
+DOC_PV="$(replace_all_version_separators _ ${DOC_BASE})"
+
+SRC_URI="
+	tcl? ( http://www.sqlite.org/${P}.tar.gz )
+	!tcl? (
+		test? ( http://www.sqlite.org/${P}.tar.gz )
+		!test? ( http://www.sqlite.org/${PN}-amalgamation-${PV}.tar.gz )
+	)
+	doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )"
+
+LICENSE="as-is"
+SLOT="3"
+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"
+IUSE="debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify"
+
+RDEPEND="icu? ( dev-libs/icu )
+	readline? ( sys-libs/readline )
+	tcl? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/tcl )
+	doc? ( app-arch/unzip )"
+
+src_prepare() {
+	if use icu; then
+		rm -f test/like.test
+	fi
+
+	if use tcl || use test; then
+		epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes.patch"
+		epatch "${FILESDIR}/${PN}-3.6.22-dlopen.patch"  # bug 300836
+		eautoreconf  # dlopen.patch patches configure.ac
+	else
+		epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes-amalgamation.patch"
+	fi
+
+	eautoreconf  # for MiNT and interix
+	epunt_cxx
+}
+
+src_configure() {
+	local amalgamation=false
+	use !tcl && use !test && amalgamation=true
+
+	# Support column metadata, bug #266651
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support R-trees, bug #257646
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	if use icu; then
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if use tcl || use test; then
+			# Normal tarball.
+			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			# Amalgamation tarball.
+			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# Support FTS3, bug #207701
+	if use fts3; then
+		append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
+	fi
+
+	# Enable secure_delete pragma by default
+	if use secure-delete; then
+		append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
+	fi
+
+	# Support soundex, bug #143794
+	if use soundex; then
+		append-cppflags -DSQLITE_SOUNDEX
+	fi
+
+	# The amalgamation source doesn't have these via Makefile
+	if ${amalgamation}; then
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# Enable unlock notification
+	if use unlock-notify; then
+		append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+	fi
+
+	local extensions_option
+	if ${amalgamation}; then
+		extensions_option="dynamic-extensions"
+	else
+		extensions_option="load-extension"
+	fi
+
+	# Starting from 3.6.23, SQLite has locking strategies that are specific to
+	# OSX.  By default they are enabled, and use semantics that only make sense
+	# on OSX.  However, they require gethostuuid() function for that, which is
+	# only available on OSX starting from 10.6 (Snow Leopard).  For earlier
+	# versions of OSX we have to disable all this nifty locking options, as
+	# suggested by upstream.
+	if [[ "${CHOST}" == *-darwin[56789] ]] ; then
+		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE=0
+	fi
+
+	# `configure` from amalgamation tarball doesn't support
+	# --with-readline-inc and --(enable|disable)-tcl options.
+	econf \
+		$(use_enable extensions ${extensions_option}) \
+		$(use_enable readline) \
+		$(use_enable threadsafe) \
+		$(${amalgamation} || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
+		$(${amalgamation} || use_enable debug) \
+		$(${amalgamation} || echo --enable-tcl)
+}
+
+src_compile() {
+	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" || die "emake failed"
+}
+
+src_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		local test="test"
+		use debug && test="fulltest"
+		emake ${test} || die "Some test(s) failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" \
+		install \
+		|| die "emake install failed"
+
+	doman sqlite3.1 || die "doman sqlite3.1 failed"
+
+	if use doc; then
+		# Naming scheme changes randomly between - and _ in releases
+		# http://www.sqlite.org/cvstrac/tktview?tn=3523
+		dohtml -r "${WORKDIR}"/${PN}-${DOC_PV}-docs/* || die "dohtml failed"
+	fi
+}