Version bump.

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

3 files changed, 54 insertions, 20 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/Manifest b/dev-db/sqlite/Manifest
index df2eade48c48..13cfa63dfc7b 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -7,19 +7,20 @@ AUX sqlite-3.6.16-tkt3922.test.patch 549 RMD160 711f26307a1df64813035831aad30537
 AUX sqlite-3.6.17-fix_installation.patch 3635 RMD160 8ab60122e4b1fdc64182d7fc86a7516a8cb36a36 SHA1 b6848c7f5fa1787e8d938a7c2bf450d0deefc166 SHA256 ee5f675fecbb392ca13a9fc7bf8ae489d9497951ebacd28d71205e8eb9fce175
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
 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 2892345 RMD160 6894127ae650cf9745709338b57754681c0863cd SHA1 0200f366657b00396bdc45ebd5b9ab6891ff825e SHA256 6239e12ab86644072e9dbd5e85b8656813690254dae2c2762da127b569b5ca0e
+DIST sqlite-3.6.19.tar.gz 2942005 RMD160 119db76399eca04f21051c6ff156ccbb0c8d35b5 SHA1 1f85a324edfb42ec00bb6dbbec5a178346c950ee SHA256 7d8649c44fb97b874aa59144faaeb2356ec1fc6a8a7baa1d16e9ff5f1e097003
 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 sqlite3.h-3.6.19.bz2 55962 RMD160 22315fc99b41b4aea0a437da82db269a81f38943 SHA1 c1d8588c3746da8c870202ac5f21d8e4164500e1 SHA256 29b5c53b260384075b2ca819ae52ee415bd968ea51d2774782da0342385b1e09
 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
+DIST sqlite_docs_3_6_19.zip 2429959 RMD160 c210fa6c9d09e531d8679be55585c42c233042b2 SHA1 418aa0066ca64e7157d49c868d63107eadc073e0 SHA256 65e198b7dbaba193ecc4350666402fa20a46b1f3e4dd7fa3403fbb4ad15e906f
 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 2469 RMD160 bba4a89557f718396e862caf501cd2e83473215a SHA1 107d40626bd4b6d79238b993e718fa4ff61d6c10 SHA256 10a190c56a35015a52081e9b2c37996b5dbf2ed75d3ce369d5ca9e8c3b492168
-EBUILD sqlite-3.6.18.ebuild 2942 RMD160 88b080b132d9016d8e53154cb0d2c19ab0b7882e SHA1 20f9e3c1db8111b129e67711c9098651e98b5061 SHA256 14b31cb821297ca54bf2b6a279ffe5fbc9deba11f9419e8c3f2996bc84e44199
-MISC ChangeLog 38336 RMD160 26ae436a3811a369b765d1f15ed20f37a3b5fe68 SHA1 d0927a6c528032357f0fb5fc93dbd70657ad118a SHA256 73e819460b078d56679c80b73e9fc2c6e42999841eacdb39a777a8d31ca4b4c8
+EBUILD sqlite-3.6.18.ebuild 2933 RMD160 62d9b69d538f82ac2a777c94441deb1986da8d3b SHA1 d2c4f2a9e02af6e5d574d96896229a4d6b10f3a3 SHA256 a1a512d8dd7caf71f1034965b5756d99ee58bd5f7f13356c23a3dae6480b93b6
+EBUILD sqlite-3.6.19.ebuild 2937 RMD160 4a6166531ae7a99bc5fc3b14ac0e6dbef28c2e45 SHA1 6a2eb25c676df1e8ef2a9a671a63514e134edffe SHA256 c82f4d949851c3d3f39327139c94d20bc24f3a6e10db119a348acf33b02b2fc5
+MISC ChangeLog 38504 RMD160 657690d7632b609a5a56302b230be1b7ec8260b7 SHA1 7509a525bb1e1f9013178df3d005e13876b415a0 SHA256 ff0b3df4f2563ad4d5bcf4e680ce605e73d52336a9c3ca7c9c6acee2ed90b202
 MISC metadata.xml 577 RMD160 a745dafa141324b8328d6b154f31f1d01dfadd03 SHA1 bb56f3d690313b6fe5aacd5435cfe43cb98c9c7d SHA256 591c8bef421f7fae9a8a0ad17f23cfc44de90f113c39e143adb17ea84925492f
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."