Fix building and dependencies (bug #296245).

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

3 files changed, 19 insertions, 37 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 9f6424949864..e7154694bdb7 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # 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.297 2009/12/08 11:30:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.298 2009/12/12 20:47:55 arfrever Exp $
+
+  12 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  sqlite-3.6.21.ebuild:
+  Fix building and dependencies (bug #296245).
 
 *sqlite-3.6.21 (08 Dec 2009)
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 78f14e14d060..d12b9cc5de08 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -10,7 +10,6 @@ DIST sqlite-3.6.20.tar.gz 2965878 RMD160 d08cb8d39526ca3a85d4bc2dba6ba88ac62211c
 DIST sqlite-3.6.21.tar.gz 2970751 RMD160 f555c5aa117f07435b2535a2ca9018602a7f5c27 SHA1 d020e000e94d53cf96471d304111559018ce4f1b SHA256 675bd7b2fbdbbfbbcb44b8567d3b43237003f1fba8047639646d101699f24d21
 DIST sqlite3.h-3.6.19.bz2 55962 RMD160 22315fc99b41b4aea0a437da82db269a81f38943 SHA1 c1d8588c3746da8c870202ac5f21d8e4164500e1 SHA256 29b5c53b260384075b2ca819ae52ee415bd968ea51d2774782da0342385b1e09
 DIST sqlite3.h-3.6.20.bz2 56081 RMD160 172e399c1b617d238f8b80eff985d48d06583bbd SHA1 f813b6999f0dcbec4c7a0dd16cb5a08c52fc2b97 SHA256 99cec74600291fd41d94b1076715d4a710ab3862241a7a25d5f374c96d3b79e3
-DIST sqlite3.h-3.6.21.bz2 56104 RMD160 a5342e19f29f60235c0612f6012f00d1479d8a4b SHA1 f2a5d65597aac343095334a15ae582193f34dcbd SHA256 d374c7ba7f4a5cb5c2aabdf88dccef04628aa074c6f904691e5805d7fe15f611
 DIST sqlite_docs_3_6_19.zip 2429959 RMD160 c210fa6c9d09e531d8679be55585c42c233042b2 SHA1 418aa0066ca64e7157d49c868d63107eadc073e0 SHA256 65e198b7dbaba193ecc4350666402fa20a46b1f3e4dd7fa3403fbb4ad15e906f
 DIST sqlite_docs_3_6_20.zip 2463481 RMD160 0c03c44f1315b1554653ee5d0daa16da91d22406 SHA1 4a53e6d2ff934e0c9db15ffa16e8fa5bc913698f SHA256 bb814863f61b8aba6f480004dff0ee17c61f6cebdf1f9c8f187e08f8a1f520ed
 DIST sqlite_docs_3_6_21.zip 2726288 RMD160 ecdfd0389d3472670612230ab6002eae7e7f86ef SHA1 d1b77bd898ba6d2693b277484d61d85e1f9c8937 SHA256 6812b5f2812530388c7e41d5b99d8fd958526ed6b8d1da92196c0fe817badd2a
@@ -18,6 +17,6 @@ EBUILD sqlite-2.8.16-r4.ebuild 2691 RMD160 84aeeda2955daa547583a9d995b1baf0de601
 EBUILD sqlite-3.6.19.ebuild 2968 RMD160 8d6939e082cca47993fa9d0794dcca8ae1271579 SHA1 cef5f063436522cc9bc73de30f77b9c20ea14109 SHA256 2b5b3b9e76bbe1c0de8c88fd110c61c96a7b965cdb234087d830e31da43b491c
 EBUILD sqlite-3.6.20-r1.ebuild 3276 RMD160 60be12a735688fd47b052a1a7290c1e5e8c087d8 SHA1 aac8dd9c6793e792d7a31608c685d67429700b63 SHA256 b169b1fb8bf10f8426cd732d2e7f501e7185e717caef71cb472f75df774b01bf
 EBUILD sqlite-3.6.20.ebuild 2937 RMD160 479da23a696b1d2048fbe58db687198c5806bcf2 SHA1 a17d2a7f25ec11f0192cf970ed90cbab182c3f6f SHA256 723397d073859ca4027a22175d8d16c8789d9275797b444fc966e7267d59617b
-EBUILD sqlite-3.6.21.ebuild 3232 RMD160 29f7f19597001a6e034b82cf6af7cc32249c5564 SHA1 561897e0795412597823a13830419d20a02dfb29 SHA256 32b2751c3b1ef92598de5a074af9e308152fb65ed9105219c00c4bb2389de99c
-MISC ChangeLog 40612 RMD160 12be162630b5d748bbd672dc58ee904d5130ce40 SHA1 6c4954908492a100d0e13aebc91b466c597ce21b SHA256 e8168a8ee6592bbf5fe11af8832d58fe8f1682a9d8f69c7557a092b5fda429e2
+EBUILD sqlite-3.6.21.ebuild 2420 RMD160 ddb749bacf8b4ec9fc689692194d8388ba691eb6 SHA1 fe3aaa1727092fe5553d10729da95f0d764a69be SHA256 1efb44566617d99e2890dd2e919cf3bb206f6b1dfce41ad21e320974a5644b4e
+MISC ChangeLog 40757 RMD160 7d6e43f953f9f8cf3e56cc2ec66ee985d6338b1f SHA1 58ac4e4a34780a63ab1f7779197466c6971a6eb8 SHA256 b5f75cbab0de827c7f9939a2372bf100c7cef40b37cb2dd0ae383e6e6ea452b4
 MISC metadata.xml 643 RMD160 ea04328f1133181b162ab919c6c221fbbf85c808 SHA1 76bc55999b5481e28cfe13c97eac54f039e0ea0c SHA256 edbc4a70b6504db4a408c5081439ab5055af567e1f222216bd52560fe92487de
diff --git a/dev-db/sqlite/sqlite-3.6.21.ebuild b/dev-db/sqlite/sqlite-3.6.21.ebuild
index f20304fc0ad6..0729f8ce61f6 100644
--- a/dev-db/sqlite/sqlite-3.6.21.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.21.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.21.ebuild,v 1.1 2009/12/08 11:30:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.21.ebuild,v 1.2 2009/12/12 20:47:55 arfrever Exp $
 
 EAPI="2"
 
@@ -11,41 +11,25 @@ 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 )"
+	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 ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="debug doc fts3 icu +readline soundex tcl +threadsafe"
-RESTRICT="!tcl? ( test )"
 
 RDEPEND="icu? ( dev-libs/icu )
 	readline? ( sys-libs/readline )
 	tcl? ( dev-lang/tcl )"
 DEPEND="${RDEPEND}
+	dev-lang/tcl
 	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() {
 	if use icu; then
 		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
 }
 
@@ -54,21 +38,22 @@ src_configure() {
 	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_RTREE
 
-	if use icu && use tcl; then
+	if use icu; 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
+	if use soundex; then
+		append-cppflags -DSQLITE_SOUNDEX
+	fi
 
-	# http://bugs.gentoo.org/show_bug.cgi?id=207701
-	use fts3 && append-cppflags -DSQLITE_ENABLE_FTS3=1
+	# Support FTS3, bug #207701
+	if use fts3; then
+		append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
+	fi
 
 	econf \
 		$(use_enable debug) \
@@ -79,7 +64,6 @@ src_configure() {
 }
 
 src_compile() {
-	use tcl || cp "${WORKDIR}/sqlite3.h-${PV}" sqlite3.h
 	emake TCLLIBDIR="/usr/$(get_libdir)/${P}" || die "emake failed"
 }
 
@@ -92,11 +76,6 @@ src_test() {
 		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() {