Version bump.

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

5 files changed, 28 insertions, 158 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 6168461353d2..14b4faf578ec 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,13 @@
 # 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.239 2009/05/07 15:58:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.240 2009/05/08 23:02:59 arfrever Exp $
+
+*sqlite-3.6.14 (08 May 2009)
+
+  08 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -sqlite-3.6.6.2.ebuild, -sqlite-3.6.10.ebuild,
+  -files/sqlite-3.6.10-tcl-install.patch, +sqlite-3.6.14.ebuild:
+  Version bump.
 
   07 May 2009; Raúl Porcel <armin76@gentoo.org> sqlite-3.6.13.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #267528
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 939a3d8b309d..be26d1265dc5 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -5,26 +5,22 @@ AUX sqlite-2.8.15-alignement-fix.patch 538 RMD160 12407bbe5f1bcae243d4247b43bf63
 AUX sqlite-2.8.16-multilib.patch 4038 RMD160 0e074a3ebac7c188dbbf9b86be87a79e0c23390a SHA1 8d38fd5820fd1037b35194d33666be19dcce9e98 SHA256 4ccbef245ea50f317e34bad5ed07e6917fc08d718c6e57884255799980d6e765
 AUX sqlite-3-test-fix-3.3.4.patch 761 RMD160 5c1dc771d1dbe5dc0138145ddc169a8aa2305c3b SHA1 3e2c30622e387d002bfc5e49a49781ca9cc63c82 SHA256 f26cc9b97c6240f5e3f595b6be57309044be44e9f865f7596b4e85d77eef82d4
 AUX sqlite-3.3.3-tcl-fix.patch 955 RMD160 74965942daef0fe667bd866c9ebf5b2ff999c1d9 SHA1 c15e2a86f476dcab72b8a38ff89d6535ec0bbfd0 SHA256 b36bbb78a7c35a0c457e4cbdbc1b925fc4ffa07e0c60eb2230f1aff874a45403
-AUX sqlite-3.6.10-tcl-install.patch 1515 RMD160 a0fed96df2f2cf9e4875e485e186017c21a6482f SHA1 28f902ee5cc48077b11e179ce2edb76de0ed279b SHA256 0dce01127b61eb47fa49e54599c382638054eac5dce03cafa8acea18377df7b6
 AUX sqlite-3.6.11-reference.patch 737 RMD160 8644a6649bae0c41be39ca4179b4ef6c721ca9ca SHA1 c397b32d297907595b0c1f4c96ac5153e3a623f9 SHA256 88f420203bd4769a65ec0fc8781e273879d1117760fb87e510554cf48070d777
 AUX sqlite-64bit-test-fix.patch 604 RMD160 58b1df9e9f6593d41fa17541eb3b429c70da384a SHA1 f20d6c33a0a26829e2c3eb14b5c21c259166938d SHA256 5310357cd2658333a5a76860dc87a5f98977878ffae6a9e11c5e1ec4c73ccc15
 AUX sqlite-64bit-test-fix2.patch 438 RMD160 83904019c277fdf24c8299b0e6aba7184cd8b56f SHA1 15512752ca2eefeab7daad22a76d767692dac3b5 SHA256 87c47559f891736006050f0a3a4e4393084cf314a7bc44cc0e09f57efc0de23b
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
-DIST sqlite-3.6.10.tar.gz 2763053 RMD160 531e72853003b5e5a87ca617bb0f2ecb414aadc4 SHA1 75ad0e233cbbda2e7c487f7772f57d16ac9f3fb7 SHA256 2157db34aa0aace8d5a1a5c723280f2840b3383498a225cab36014f0a45faa01
 DIST sqlite-3.6.11.tar.gz 2804714 RMD160 c38d82c83f5d64cfb302e3232c507bafb0b64e74 SHA1 bd1c371784d990f7b5e99c841e58deb87fbf4b6e SHA256 fd07be79b4d4e8453675e142907a777d07776ec2b3e2a9f4dd7645a27fcd28a1
 DIST sqlite-3.6.12.tar.gz 2769510 RMD160 c455dd7f5dac3ab75b1c0e58ca9a766e7fb19378 SHA1 05ffb484d264030de41ee4bde0915bf1900d5f32 SHA256 96c23c1e90808f06e4000e1e325f3547da1c38b164a237aab1184fa0da329201
 DIST sqlite-3.6.13.tar.gz 2780584 RMD160 2a9b3be1f087f63560ba63784b090b4fcf847d57 SHA1 632b5661ba7f59e92ce805ebcdf2cc3e9b28a051 SHA256 2ca2591847df72224dd6f99c8fffe35bb63bf41a8519d8e15ad48141aa841bfa
-DIST sqlite-3.6.6.2.tar.gz 2303256 RMD160 5ac51f8f8e473dc964232ccd450626a6d28be630 SHA1 4cd87fa954da5b11d7ee230e1003a23a68f68397 SHA256 09d261aa15f16ff97b2fdbc9883d85fa5f0a09d5509f8904fc1d1574dc0edda8
-DIST sqlite_docs_3_6_10.zip 2168787 RMD160 5ad343631f0c3ce62421ea86046fafb6fabb45c7 SHA1 20bdd744b449049f4549b88371c9362502864efc SHA256 7d8127d5b35c6cfb2ecdcead58df99f571ad29258aa8e073e88bcc4f751eff29
+DIST sqlite-3.6.14.tar.gz 2894263 RMD160 a77bcc1daf35ef45d497d076d4a8d6945a2e5f39 SHA1 0e22b901fe905826c192f305b7934eb4fefcb15b SHA256 3d0429c50ff188fd7f30e54ae389eb87f77e74b2da4fdf68f3e8283d0937b19d
 DIST sqlite_docs_3_6_11.zip 2199886 RMD160 fb03c7299a77d6ee1c8af0db51c88c3948561d9b SHA1 cc8764b22a53b026ee95e554078bd536b426e339 SHA256 4acc5b4aae8fd63013bb3e13b7c006780681a53002e9ff0818f276a5345729be
 DIST sqlite_docs_3_6_12.zip 2230626 RMD160 c92c896a973cafe6dbfbd73824c84b3efc90a00b SHA1 7ecef637b64160681774e000399aec7e7fd13dff SHA256 b8cd8f82ba53d23863b96f51a5d7a58cc9fc1d2c928eae7009f8c5e9ed0e359d
 DIST sqlite_docs_3_6_13.zip 2234760 RMD160 d9246269030b3f8a9c00700f1d23140d499eb221 SHA1 92238762805019582d94398a19e7cd582932449f SHA256 9a9a76a0722f130d5c0a1b42d5f9cff4f8635e9ddbffa0c31960a31bf9ac5313
-DIST sqlite_docs_3_6_6.zip 2213432 RMD160 d23672a3074d38ae1501dce57cc0558abc6d57fa SHA1 fc3418a48d46dfc9e271c3819714ae7d5b984107 SHA256 792cc2ec5e207b92101d0adb37c2f8a453f7054c91282852eebed325a33ec815
+DIST sqlite_docs_3_6_14.zip 2301548 RMD160 4b82f1ced5177b948824f2e0a99778ee80f62785 SHA1 21e504057bb051314e1bd7af1ab29e71ed9ecd73 SHA256 2106a41ec15d8acb759ab06dcefc729a53ab7e8ab8e7e6891621863f46d51bad
 EBUILD sqlite-2.8.16-r4.ebuild 2691 RMD160 84aeeda2955daa547583a9d995b1baf0de601ab6 SHA1 e33619ca7b88d29bd37e10f54156fd8b0339b8d3 SHA256 b2474871c4299d3e7c947921adfe74f18302903b7f6c2d193b966b56ee8d0981
-EBUILD sqlite-3.6.10.ebuild 2274 RMD160 c22044a11c39165a6fa45b25a71e724c86944e76 SHA1 ebce0a5b596cfd52506fbb9437ddf8baa4ea7826 SHA256 730af85a2607415f246a5a4ba9dd1ed3d7af7db11320cec78c66c1ed2322c19d
 EBUILD sqlite-3.6.11.ebuild 2431 RMD160 18e16a805353be9b3d83d0e3e9e82dc6535a9e9d SHA1 009d1bec94df2df9fedba94c7544f7223dbf8557 SHA256 c11c32967c85833df3fd8823b7370ea0a70b3fe094afc1a00f52c5e597194141
 EBUILD sqlite-3.6.12.ebuild 2320 RMD160 cd766818f1f4d2c3c41c3c6381422bf46f2faa57 SHA1 2eeca57e0e39869a9703e4daa93ffa563e90fdc0 SHA256 5b4849644bb79184c436a80d538c99222266fecf0c14e1f3167af1b669741672
 EBUILD sqlite-3.6.13.ebuild 2409 RMD160 87515c24b4115194e35cabcb5c4a872bf6fb0261 SHA1 02913504a016c569a82f7a7cff59ebca7508232d SHA256 c57a5654450f8370704f864009fb8544b5086ad5639f105936bf14a2e1cc3394
-EBUILD sqlite-3.6.6.2.ebuild 2232 RMD160 4c0b3dac6af0243e70b659a4eb9bea0f5d82c1c2 SHA1 c97ce01dd8c85a02634fa8b3d0746279f3300d3b SHA256 5b5d878d39697ce036a4b9043b6d3de8dd54f9d8b4ff4f195f78d3bf35fb4651
-MISC ChangeLog 32577 RMD160 bcd871283dfd022ac0ebc8594510d8b1580b10da SHA1 92ee11b97ce7c576dfbdaa02981ace5b4864f0b1 SHA256 f16e81c6988a7708322480e076c6d6d61f12c7da4afc6484266be6dedc1a264b
+EBUILD sqlite-3.6.14.ebuild 2263 RMD160 da70de4cb83887bf7f92e0ec654cf84ab4cee0d5 SHA1 9101b34f5cdb1180e67398527805a825b34520d7 SHA256 f7a56165ccf75506a2f0afa2cdb8705aff9b8b63219cd84ba77948e9d5eb5b6e
+MISC ChangeLog 32812 RMD160 18970f645939c9bf185456edbb00e61fb3d8099b SHA1 dff3fcb9e80177c3cfca4a03b8362bf24c011add SHA256 b197b81d3863a9b09650d5536b239122c3a659123a20edeeee51a534a80ee356
 MISC metadata.xml 577 RMD160 a745dafa141324b8328d6b154f31f1d01dfadd03 SHA1 bb56f3d690313b6fe5aacd5435cfe43cb98c9c7d SHA256 591c8bef421f7fae9a8a0ad17f23cfc44de90f113c39e143adb17ea84925492f
diff --git a/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch b/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch
deleted file mode 100644
index b390c2fd36d7..000000000000
--- a/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -457,7 +457,7 @@
- libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
- 	$(LTLINK) -o $@ tclsqlite.lo \
- 		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
--                -rpath "$(libdir)/sqlite" \
-+		-rpath "$(libdir)/sqlite3" \
- 		-module -avoid-version
- 
- sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la sqlite3.h
-@@ -754,9 +754,11 @@
- 		$(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL)
- 
- 
--install:	sqlite3$(BEXE) libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
-+lib_install:	libsqlite3.la
- 	$(INSTALL) -d $(DESTDIR)$(libdir)
- 	$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
-+
-+install:	sqlite3$(BEXE) lib_install sqlite3.h ${HAVE_TCL:1=tcl_install}
- 	$(INSTALL) -d $(DESTDIR)$(bindir)
- 	$(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir)
- 	$(INSTALL) -d $(DESTDIR)$(includedir)
-@@ -765,8 +767,13 @@
- 	$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
- 	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
- 
--tcl_install:	libtclsqlite3.la
--	$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(RELEASE)
-+pkgIndex.tcl:
-+	echo 'package ifneeded sqlite3 $(RELEASE) [list load $(libdir)/sqlite3/libtclsqlite3.so sqlite3]' > $@
-+tcl_install:	lib_install libtclsqlite3.la pkgIndex.tcl
-+	$(INSTALL) -d $(DESTDIR)$(libdir)/sqlite3
-+	$(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(libdir)/sqlite3
-+	rm -f $(DESTDIR)$(libdir)/sqlite3/libtclsqlite3.a $(DESTDIR)$(libdir)/sqlite3/libtclsqlite3.la
-+	$(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(libdir)/sqlite3
- 
- clean:	
- 	rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
diff --git a/dev-db/sqlite/sqlite-3.6.10.ebuild b/dev-db/sqlite/sqlite-3.6.10.ebuild
deleted file mode 100644
index 1567365a8bbd..000000000000
--- a/dev-db/sqlite/sqlite-3.6.10.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.10.ebuild,v 1.7 2009/02/26 20:03:46 ranger Exp $
-
-EAPI="1"
-
-inherit versionator eutils flag-o-matic libtool
-
-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 )"
-
-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 soundex tcl +threadsafe"
-RESTRICT="!tcl? ( test )"
-
-RDEPEND="tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )"
-
-pkg_setup() {
-	# test
-	if has test ${FEATURES}; then
-		if ! has userpriv ${FEATURES}; then
-			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
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/sandbox-fix2.patch
-	epatch "${FILESDIR}"/${P}-tcl-install.patch
-
-	elibtoolize
-	epunt_cxx
-}
-
-src_compile() {
-	# not available via configure and requested in bug #143794
-	use soundex && append-flags -DSQLITE_SOUNDEX=1
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable threadsafe) \
-		$(use_enable threadsafe cross-thread-connections) \
-		$(use_enable tcl)
-	emake all || die "emake all failed"
-}
-
-src_test() {
-	if has userpriv ${FEATURES}; then
-		local test=test
-		use debug && tets=fulltest
-		emake ${test} || die "some test(s) failed"
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		TCLLIBDIR="/usr/$(get_libdir)" \
-		install \
-		|| die "emake install failed"
-
-	doman sqlite3.1 || die
-
-	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
-	fi
-}
-
-pkg_postinst() {
-	elog "sqlite-3.6.X is not totally backwards compatible, see"
-	elog "http://www.sqlite.org/releaselog/3_6_0.html for full details."
-}
diff --git a/dev-db/sqlite/sqlite-3.6.6.2.ebuild b/dev-db/sqlite/sqlite-3.6.14.ebuild
index 9aa3ea8648a3..fa5151176b55 100644
--- a/dev-db/sqlite/sqlite-3.6.6.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.14.ebuild
@@ -1,10 +1,10 @@
 # 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.6.2.ebuild,v 1.10 2009/01/31 20:11:20 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.14.ebuild,v 1.1 2009/05/08 23:02:59 arfrever Exp $
 
 EAPI="1"
 
-inherit versionator eutils flag-o-matic libtool
+inherit eutils flag-o-matic multilib versionator
 
 DESCRIPTION="an SQL Database Engine in a C Library"
 HOMEPAGE="http://www.sqlite.org/"
@@ -15,7 +15,7 @@ SRC_URI="http://www.sqlite.org/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="debug doc soundex tcl +threadsafe"
 RESTRICT="!tcl? ( test )"
 
@@ -24,13 +24,12 @@ DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )"
 
 pkg_setup() {
-	# test
-	if has test ${FEATURES}; then
-		if ! has userpriv ${FEATURES}; then
+	if has test ${FEATURES} ; then
+		if ! has userpriv ${FEATURES} ; then
 			ewarn "The userpriv feature must be enabled to run tests."
 			eerror "Testsuite will not be run."
 		fi
-		if ! use tcl; then
+		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
@@ -41,28 +40,31 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# note: this sandbox fix is no longer needed with sandbox-1.3+
 	epatch "${FILESDIR}"/sandbox-fix2.patch
 
-	elibtoolize
 	epunt_cxx
 }
 
 src_compile() {
+	# Enable column metadata, bug #266651
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
 	# not available via configure and requested in bug #143794
-	use soundex && append-flags -DSQLITE_SOUNDEX=1
+	use soundex && append-cppflags -DSQLITE_SOUNDEX=1
 
 	econf \
 		$(use_enable debug) \
 		$(use_enable threadsafe) \
 		$(use_enable threadsafe cross-thread-connections) \
 		$(use_enable tcl)
-	emake all || die "emake all failed"
+	emake TCLLIBDIR="/usr/$(get_libdir)/${P}" || die "emake failed"
 }
 
 src_test() {
-	if has userpriv ${FEATURES}; then
+	if has userpriv ${FEATURES} ; then
 		local test=test
-		use debug && tets=fulltest
+		use debug && test=fulltest
 		emake ${test} || die "some test(s) failed"
 	fi
 }
@@ -70,20 +72,15 @@ src_test() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		TCLLIBDIR="/usr/$(get_libdir)" \
+		TCLLIBDIR="/usr/$(get_libdir)/${P}" \
 		install \
 		|| die "emake install failed"
 
 	doman sqlite3.1 || die
 
-	if use doc; then
+	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
 	fi
 }
-
-pkg_postinst() {
-	elog "sqlite-3.6.X is not totally backwards compatible, see"
-	elog "http://www.sqlite.org/releaselog/3_6_0.html for full details."
-}