Version bump.

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

9 files changed, 26 insertions, 301 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index d204616e5e61..d689859615ad 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,16 @@
 # 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.256 2009/06/27 15:48:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.257 2009/06/27 21:31:00 arfrever Exp $
+
+*sqlite-3.6.16 (27 Jun 2009)
+
+  27 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/sandbox-fix1.patch, -files/sqlite-3.3.3-tcl-fix.patch,
+  -sqlite-3.6.12.ebuild, -sqlite-3.6.14.ebuild,
+  -files/sqlite-3-test-fix-3.3.4.patch, -sqlite-3.6.14.1.ebuild,
+  +sqlite-3.6.16.ebuild, -files/sqlite-64bit-test-fix.patch,
+  -files/sqlite-64bit-test-fix2.patch:
+  Version bump.
 
   27 Jun 2009; Brent Baude <ranger@gentoo.org> sqlite-3.6.14.2.ebuild:
   Marking sqlite-3.6.14.2 ppc64 for bug 275592
diff --git a/dev-db/sqlite/files/sandbox-fix1.patch b/dev-db/sqlite/files/sandbox-fix1.patch
deleted file mode 100644
index 38e4256f8012..000000000000
--- a/dev-db/sqlite/files/sandbox-fix1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- test/capi3.test~	2006-01-30 23:35:44.000000000 +0100
-+++ test/capi3.test	2006-02-05 19:41:12.000000000 +0100
-@@ -140,18 +140,6 @@
- do_test capi3-3.2 {
-   sqlite3_close $db2
- } {SQLITE_OK}
--do_test capi3-3.3 {
--  catch {
--    set db2 [sqlite3_open /bogus/path/test.db {}]
--  }
--  sqlite3_errcode $db2
--} {SQLITE_CANTOPEN}
--do_test capi3-3.4 {
--  sqlite3_errmsg $db2
--} {unable to open database file}
--do_test capi3-3.5 {
--  sqlite3_close $db2
--} {SQLITE_OK}
- do_test capi3-3.6.1 {
-   sqlite3_close $db2
- } {SQLITE_MISUSE}
-@@ -176,18 +164,6 @@
- do_test capi3-4.2 {
-   sqlite3_close $db2
- } {SQLITE_OK}
--do_test capi3-4.3 {
--  catch {
--    set db2 [sqlite3_open16 [utf16 /bogus/path/test.db] {}]
--  }
--  sqlite3_errcode $db2
--} {SQLITE_CANTOPEN}
--do_test capi3-4.4 {
--  utf8 [sqlite3_errmsg16 $db2]
--} {unable to open database file}
--do_test capi3-4.5 {
--  sqlite3_close $db2
--} {SQLITE_OK}
- } ;# utf16
- 
- # This proc is used to test the following API calls:
diff --git a/dev-db/sqlite/files/sqlite-3-test-fix-3.3.4.patch b/dev-db/sqlite/files/sqlite-3-test-fix-3.3.4.patch
deleted file mode 100644
index 5429fbbd051c..000000000000
--- a/dev-db/sqlite/files/sqlite-3-test-fix-3.3.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.old	2006-02-13 15:20:42.000000000 +0100
-+++ Makefile.in	2006-02-13 15:21:02.000000000 +0100
-@@ -242,7 +242,7 @@
- # of the most recently modified source code file
- #
- last_change:	$(SRC)
--	cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
-+	cat $(SRC) | grep '$$Id: ' | sort -k 5 | tail -1 \
-           | $(NAWK) '{print $$5,$$6}' >last_change
- 
- libsqlite3.la:	$(LIBOBJ)
-@@ -338,7 +338,7 @@
- 	$(LTCOMPILE) -c opcodes.c
- 
- opcodes.c:	opcodes.h $(TOP)/mkopcodec.awk
--	sort -n -b +2 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
-+	sort -n -b -k 3 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
- 
- opcodes.h:	parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
- 	cat parse.h $(TOP)/src/vdbe.c | $(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h
diff --git a/dev-db/sqlite/files/sqlite-3.3.3-tcl-fix.patch b/dev-db/sqlite/files/sqlite-3.3.3-tcl-fix.patch
deleted file mode 100644
index 2d4356db741b..000000000000
--- a/dev-db/sqlite/files/sqlite-3.3.3-tcl-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tclinstaller.tcl.old	2006-02-05 21:44:20.000000000 +0100
-+++ tclinstaller.tcl	2006-02-05 21:49:50.000000000 +0100
-@@ -7,14 +7,17 @@
- set VERSION [lindex $argv 0]
- set LIBFILE .libs/libtclsqlite3[info sharedlibextension]
- if { ![info exists env(DESTDIR)] } { set env(DESTDIR) "" }
--set LIBDIR $env(DESTDIR)[lindex $auto_path 0]
-+if { ![info exists env(TCLLIBDIR)] } { set env(TCLLIBDIR) [lindex $auto_path 0] }
-+set LIBDIR $env(DESTDIR)$env(TCLLIBDIR)
-+set LIBDIR_INSTALL $env(TCLLIBDIR)
- set LIBNAME [file tail $LIBFILE]
- set LIB $LIBDIR/sqlite3/$LIBNAME
-+set LIB_INSTALL $LIBDIR_INSTALL/sqlite3/$LIBNAME
- 
- file delete -force $LIBDIR/sqlite3
- file mkdir $LIBDIR/sqlite3
- set fd [open $LIBDIR/sqlite3/pkgIndex.tcl w]
--puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB sqlite3\]"
-+puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB_INSTALL sqlite3\]"
- close $fd
- 
- # We cannot use [file copy] because that will just make a copy of
diff --git a/dev-db/sqlite/files/sqlite-64bit-test-fix.patch b/dev-db/sqlite/files/sqlite-64bit-test-fix.patch
deleted file mode 100644
index f121e5293849..000000000000
--- a/dev-db/sqlite/files/sqlite-64bit-test-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- test/printf.test~	2005-12-19 18:31:01.000000000 +0100
-+++ test/printf.test	2006-02-05 18:12:33.000000000 +0100
-@@ -130,12 +130,6 @@
-   sqlite3_mprintf_scaled {A double: %g} 1.0e307 100.0
- } {A double: NaN}
- 
--do_test printf-8.1 {
--  sqlite3_mprintf_int {%u %u %u} 0x7fffffff 0x80000000 0xffffffff
--} {2147483647 2147483648 4294967295}
--do_test printf-8.2 {
--  sqlite3_mprintf_int {%lu %lu %lu} 0x7fffffff 0x80000000 0xffffffff
--} {2147483647 2147483648 4294967295}
- do_test printf-8.3 {
-   sqlite3_mprintf_int64 {%llu %llu %llu} 2147483647 2147483648 4294967296
- } {2147483647 2147483648 4294967296}
diff --git a/dev-db/sqlite/files/sqlite-64bit-test-fix2.patch b/dev-db/sqlite/files/sqlite-64bit-test-fix2.patch
deleted file mode 100644
index 08d93f0bc7d0..000000000000
--- a/dev-db/sqlite/files/sqlite-64bit-test-fix2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- test/types3.test~	2006-01-21 15:32:32.000000000 +0100
-+++ test/types3.test	2006-02-05 18:14:04.000000000 +0100
-@@ -30,10 +30,6 @@
-   set V [expr {1+2}]
-   concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}]
- } {int integer}
--do_test types3-1.3 {
--  set V [expr {1+123456789012345}]
--  concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}]
--} {wideInt integer}
- 
- # A double variable comes in as REAL
- do_test types3-1.4 {
diff --git a/dev-db/sqlite/sqlite-3.6.12.ebuild b/dev-db/sqlite/sqlite-3.6.12.ebuild
deleted file mode 100644
index 6a061e6a55be..000000000000
--- a/dev-db/sqlite/sqlite-3.6.12.ebuild
+++ /dev/null
@@ -1,88 +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.12.ebuild,v 1.7 2009/05/22 15:40:18 armin76 Exp $
-
-EAPI="1"
-
-inherit eutils flag-o-matic multilib versionator
-
-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() {
-	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}"
-
-	# note: this sandbox fix is no longer needed with sandbox-1.3+
-	epatch "${FILESDIR}"/sandbox-fix2.patch
-
-	epunt_cxx
-}
-
-src_compile() {
-	# not available via configure and requested in bug #143794
-	use soundex && append-cppflags -DSQLITE_SOUNDEX=1
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable threadsafe) \
-		$(use_enable threadsafe cross-thread-connections) \
-		$(use_enable tcl)
-	emake TCLLIBDIR="/usr/$(get_libdir)/${P}" || die "emake failed"
-}
-
-src_test() {
-	if has userpriv ${FEATURES} ; then
-		local test=test
-		use debug && test=fulltest
-		emake ${test} || die "some test(s) failed"
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		TCLLIBDIR="/usr/$(get_libdir)/${P}" \
-		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.14.ebuild b/dev-db/sqlite/sqlite-3.6.14.ebuild
deleted file mode 100644
index cc873caaf9bc..000000000000
--- a/dev-db/sqlite/sqlite-3.6.14.ebuild
+++ /dev/null
@@ -1,87 +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.14.ebuild,v 1.3 2009/05/22 15:40:18 armin76 Exp $
-
-EAPI="1"
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-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() {
-	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}"
-
-	# note: this sandbox fix is no longer needed with sandbox-1.3+
-	epatch "${FILESDIR}"/sandbox-fix2.patch
-
-	epunt_cxx
-	eautoreconf
-}
-
-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-cppflags -DSQLITE_SOUNDEX=1
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable threadsafe) \
-		$(use_enable threadsafe cross-thread-connections) \
-		$(use_enable tcl)
-	emake TCLLIBDIR="/usr/$(get_libdir)/${P}" || die "emake failed"
-}
-
-src_test() {
-	if has userpriv ${FEATURES} ; then
-		local test=test
-		use debug && test=fulltest
-		emake ${test} || die "some test(s) failed"
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		TCLLIBDIR="/usr/$(get_libdir)/${P}" \
-		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
-}
diff --git a/dev-db/sqlite/sqlite-3.6.14.1.ebuild b/dev-db/sqlite/sqlite-3.6.16.ebuild
index 495f62aa6d3e..32b336f55899 100644
--- a/dev-db/sqlite/sqlite-3.6.14.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.16.ebuild
@@ -1,8 +1,8 @@
 # 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.14.1.ebuild,v 1.2 2009/05/22 15:40:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.16.ebuild,v 1.1 2009/06/27 21:31:00 arfrever Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit eutils flag-o-matic multilib versionator
 
@@ -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,29 +24,26 @@ DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )"
 
 pkg_setup() {
-	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
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# note: this sandbox fix is no longer needed with sandbox-1.3+
 	epatch "${FILESDIR}"/sandbox-fix2.patch
 
 	epunt_cxx
 }
 
-src_compile() {
+src_configure() {
 	# Enable column metadata, bug #266651
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 
@@ -58,11 +55,14 @@ src_compile() {
 		$(use_enable threadsafe) \
 		$(use_enable threadsafe cross-thread-connections) \
 		$(use_enable tcl)
+}
+
+src_compile() {
 	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 && test=fulltest
 		emake ${test} || die "some test(s) failed"
@@ -76,11 +76,11 @@ src_install() {
 		install \
 		|| die "emake install failed"
 
-	doman sqlite3.1 || die
+	doman sqlite3.1 || die "doman sqlite3.1 failed"
 
-	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
+		dohtml -r "${WORKDIR}"/${PN}-${DOC_PV}-docs/* || die "dohtml failed"
 	fi
 }