Version bump. Add support for R-trees (bug #257646). Add "icu" USE flag.

Package-Manager: portage-14221-svn/cvs/Linux x86_64

3 files changed, 123 insertions, 2 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 4ce33f6d19d3..025e1835ec8c 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.274 2009/09/07 22:08:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.275 2009/09/11 21:16:56 arfrever Exp $
+
+*sqlite-3.6.18 (11 Sep 2009)
+
+  11 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +sqlite-3.6.18.ebuild:
+  Version bump. Add support for R-trees (bug #257646). Add "icu" USE flag.
 
   08 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   sqlite-3.6.17.ebuild:
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 5f6b428f2196..33329fd0ba95 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -9,13 +9,17 @@ DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136
 DIST sqlite-3.6.14.2.tar.gz 2896850 RMD160 219833d61a2e0bf5fde136528b9725c0589d2491 SHA1 19206a419e39bb2de01ed12c2d95c928e97e7252 SHA256 94a5b9dcc841baeb000971b15c6b66f50add7bc160030de5aea8622db3e7060e
 DIST sqlite-3.6.16.tar.gz 2822505 RMD160 ad354b48bbb0b46ff59c27708bd0a6e7ebebffbb SHA1 70ef5ab724816cd6c755f21e6e9d8a9c6b517045 SHA256 0c6f3889da54767900bd5d434700ab5a289407ebd831d0f689a30bc44afb4dcd
 DIST sqlite-3.6.17.tar.gz 2926671 RMD160 401e09545bf335aca38a749ec54115b9220e232a SHA1 fa71b93563809ce666c3d6ccd7b6bcaaafc433b3 SHA256 490385689cf8113499a9f66bd96f64824b597ba77be54dd7a0fdf744483a2ef8
+DIST sqlite-3.6.18.tar.gz 2892622 RMD160 d8a5ce4ef7f8de9efad263cff1ea8248f96737a3 SHA1 d1d0c6cbdc1bafc1b3e48dd4492b1ac37a15c6d5 SHA256 9708670e5dd80e4580a67caa28aa904c7bac42fb8781be393b97569399a422b9
 DIST sqlite3.h-3.6.17.bz2 54804 RMD160 1bcedacbc127b533651fded752d4f37805406c7c SHA1 0e4e7f85360ed8ff2127f5a43d774565d0f910bb SHA256 cc463ffd0fc1a83ce89be1ca23e0e46bc6028215a5abfe287245f229a6581e84
+DIST sqlite3.h-3.6.18.bz2 55936 RMD160 097447cf96a353b5a2d9d6d886e6964522d54e60 SHA1 729dd3ab842f03b4d67bbfcdc812308f92af2e9b SHA256 a32b6d5be2cc0be082e4756209f959322e87ebdfd832504580d6c4915cb6c551
 DIST sqlite_docs_3_6_14.zip 2301548 RMD160 4b82f1ced5177b948824f2e0a99778ee80f62785 SHA1 21e504057bb051314e1bd7af1ab29e71ed9ecd73 SHA256 2106a41ec15d8acb759ab06dcefc729a53ab7e8ab8e7e6891621863f46d51bad
 DIST sqlite_docs_3_6_16.zip 2405277 RMD160 58e37c32cfc5d69fddd95b2cd4b5638494123c63 SHA1 5bda817af869028f1fa9954b6b3f7c749b06ee63 SHA256 24dc9d6ae775888008e4f49df00b34f64acb94538e13f3e52a594c306699f0d2
 DIST sqlite_docs_3_6_17.zip 2418652 RMD160 5552d3eace7817ac760db13a92cd323373674114 SHA1 3e6e88e873d87ba39d31f67b4e8727734d9c2698 SHA256 12381d23c6997b4d4f888daf99f4229cea2a3822b79b13997ca9557ca0aaa19e
+DIST sqlite_docs_3_6_18.zip 2433086 RMD160 a9be84867fec419f576c4ec2f1c8ceefc07bf6ce SHA1 cd8f318cbe1920ffb4490f80bab007d57406487d SHA256 e3e1885c722d117d5663d7c8f1b1ae9ed3f5ab973252f6dabd54a34493f0d830
 EBUILD sqlite-2.8.16-r4.ebuild 2691 RMD160 84aeeda2955daa547583a9d995b1baf0de601ab6 SHA1 e33619ca7b88d29bd37e10f54156fd8b0339b8d3 SHA256 b2474871c4299d3e7c947921adfe74f18302903b7f6c2d193b966b56ee8d0981
 EBUILD sqlite-3.6.14.2.ebuild 2299 RMD160 29d0105f277cfbe7e88b5185eb94b4f8947a40cd SHA1 646c18ad222ac6ce33cf5c4ab84cf7a37e87f295 SHA256 988be9e9ff102866685bb1f00ff67a3243a08445f6744fa55132728dcec39383
 EBUILD sqlite-3.6.16.ebuild 2238 RMD160 785ac2663e9ab23150de2716044e6de1f9b09789 SHA1 a86f4549b94f883b2454402dedc8d82b584bd067 SHA256 c9dd2d4f8f0ea9a6c76fc7f3082f6c65db9a87029471d905a7e872035b49f457
 EBUILD sqlite-3.6.17.ebuild 2475 RMD160 5d0635c46fd1837f5532c5fcc282e9a0e55a5200 SHA1 82d32b161bcd4b0596794251045e7009a44f5f02 SHA256 e7265fd0d74cd463e15dbf8c082b5ad791eeb74567afe22f8e4e78a94d0e0538
-MISC ChangeLog 37514 RMD160 d3000dd2c6e83b831ab27fc71b3a7a1075ac5893 SHA1 796cf46f835fbea15350fa9d0512de6941a0a3f0 SHA256 411d2532902c620c98192aacb2991074007065af585d68b515e6cb7b9c7e7b1e
+EBUILD sqlite-3.6.18.ebuild 3042 RMD160 1b433baa0285a3f7a2d7f1dd09ab45ddc5f1c3a8 SHA1 d696978d3e2b1c80ccfcb1d584b907e4de6593c3 SHA256 f89a827aa1b65da2bea03172686b0d0bb4e9b4f6eb17db58aaab0dc1fd0add74
+MISC ChangeLog 37718 RMD160 ec8776915890c8255a7b27f458f6e346027a14e9 SHA1 9f97061b79cf47ae2ac08fb928dfb9269ad4aa98 SHA256 ec838612538faafb52730d2452e4d4c5a919425d845ff0247b8cbbf843a54a8d
 MISC metadata.xml 577 RMD160 a745dafa141324b8328d6b154f31f1d01dfadd03 SHA1 bb56f3d690313b6fe5aacd5435cfe43cb98c9c7d SHA256 591c8bef421f7fae9a8a0ad17f23cfc44de90f113c39e143adb17ea84925492f
diff --git a/dev-db/sqlite/sqlite-3.6.18.ebuild b/dev-db/sqlite/sqlite-3.6.18.ebuild
new file mode 100644
index 000000000000..a3490bb2501a
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.6.18.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.18.ebuild,v 1.1 2009/09/11 21:16:56 arfrever Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic multilib versionator
+
+DESCRIPTION="an 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="http://www.sqlite.org/${P}.tar.gz
+	doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )
+	!tcl? ( mirror://gentoo/sqlite3.h-${PV}.bz2 )"
+
+LICENSE="as-is"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug doc icu +readline soundex tcl +threadsafe"
+RESTRICT="!tcl? ( test )"
+
+RDEPEND="icu? ( dev-libs/icu )
+	readline? ( sys-libs/readline )
+	tcl? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )"
+
+pkg_setup() {
+	if ! use tcl; then
+		ewarn "Installation of SQLite with \"tcl\" USE flag enabled provides more (TCL-unrelated) functionality."
+
+		if use icu; then
+			ewarn "Support for ICU is enabled only when \"tcl\" USE flag is enabled."
+		fi
+
+		ebeep 1
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.6.16-tkt3922.test.patch"
+
+	# http://www.sqlite.org/src/tktview/65bbb65a47ce115ecb0ea9e1c64c65fb8628f327
+	fperms +x configure
+
+	epunt_cxx
+}
+
+src_configure() {
+	# Support column metadata, bug #266651
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support R-trees, bug #257646
+	# Avoid "./.libs/libsqlite3.so: undefined reference to `sqlite3RtreeInit'" during non-amalgamation building.
+	if use tcl; then
+		append-cppflags -DSQLITE_ENABLE_RTREE
+	fi
+
+	if use icu && use tcl; then
+		append-cppflags -DSQLITE_ENABLE_ICU
+		sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+	fi
+
+	# Support soundex, bug #143794
+	use soundex && append-cppflags -DSQLITE_SOUNDEX
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable readline) \
+		$(use_enable threadsafe) \
+		$(use_enable threadsafe cross-thread-connections) \
+		$(use_enable tcl)
+}
+
+src_compile() {
+	use tcl || cp "${WORKDIR}/sqlite3.h-${PV}" sqlite3.h
+	emake TCLLIBDIR="/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
+
+	if ! use tcl; then
+		ewarn "You must enable the tcl USE flag if you want to run the testsuite."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		TCLLIBDIR="/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
+}