--- a/sqlite-3.6.21.ebuild	2009-12-08 05:30:35.000000000 -0600
+++ a/sqlite-3.6.21.ebuild	2009-12-09 16:56:51.614216092 -0600
@@ -22,7 +22,7 @@ 
 
 RDEPEND="icu? ( dev-libs/icu )
 	readline? ( sys-libs/readline )
-	tcl? ( dev-lang/tcl )"
+	dev-lang/tcl"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )"
 
@@ -43,21 +43,12 @@ 
 		rm -f test/like.test
 	fi
 
-	# Needed to compile without tcl installed but fails to compile when it is installed, bug #293405
-	use fts3 && ! has_version dev-lang/tcl && epatch "${FILESDIR}/sqlite-3.6.20-fts3.patch"
-
 	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
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_RTREE
 
 	if use icu && use tcl; then
 		append-cppflags -DSQLITE_ENABLE_ICU
@@ -68,7 +59,7 @@ 
 	use soundex && append-cppflags -DSQLITE_SOUNDEX
 
 	# http://bugs.gentoo.org/show_bug.cgi?id=207701
-	use fts3 && append-cppflags -DSQLITE_ENABLE_FTS3=1
+	use fts3 && append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
 
 	econf \
 		$(use_enable debug) \