Version bump.

(Portage version: 14615-svn/cvs/Linux x86_64)

2 files changed, 48 insertions, 15 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 4f30d5c318dd..bcc3cb2f83ac 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.281 2009/09/30 17:11:04 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.282 2009/10/17 01:45:27 arfrever Exp $
+
+*sqlite-3.6.19 (17 Oct 2009)
+
+  17 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -sqlite-3.6.16.ebuild, +sqlite-3.6.19.ebuild:
+  Version bump.
 
   30 Sep 2009; Tobias Klausmann <klausman@gentoo.org> sqlite-3.6.17.ebuild:
   Stable on alpha, bug #284340
diff --git a/dev-db/sqlite/sqlite-3.6.16.ebuild b/dev-db/sqlite/sqlite-3.6.19.ebuild
index 8feaeb0794bf..119b4e234831 100644
--- a/dev-db/sqlite/sqlite-3.6.16.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.19.ebuild
@@ -1,6 +1,6 @@
 # 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.16.ebuild,v 1.8 2009/09/05 23:20:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.19.ebuild,v 1.1 2009/10/17 01:45:27 arfrever Exp $
 
 EAPI="2"
 
@@ -11,50 +11,77 @@ 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 )"
+	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 x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc soundex tcl +threadsafe"
+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="tcl? ( dev-lang/tcl )"
+RDEPEND="icu? ( dev-libs/icu )
+	readline? ( sys-libs/readline )
+	tcl? ( dev-lang/tcl )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )"
 
-src_prepare() {
-	# note: this sandbox fix is no longer needed with sandbox-1.3+
-	epatch "${FILESDIR}"/sandbox-fix2.patch
+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
+}
 
-	epatch "${FILESDIR}"/${P}-tkt3922.test.patch
+src_prepare() {
+	if use icu; then
+		rm -f test/like.test
+	fi
 
 	epunt_cxx
 }
 
 src_configure() {
-	# Enable column metadata, bug #266651
+	# Support column metadata, bug #266651
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 
-	# not available via configure and requested in bug #143794
+	# 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"
+		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."