diff options
author | 2006-12-28 13:35:46 +0000 | |
---|---|---|
committer | 2006-12-28 13:35:46 +0000 | |
commit | 2093a4ed22a39a82a5fa1cb45340658ca73d7d8b (patch) | |
tree | 951856ef3110ddd54bff9efcfd1033848fcd1095 /dev-db | |
parent | Committed to main. (diff) | |
download | betelgeuse-2093a4ed22a39a82a5fa1cb45340658ca73d7d8b.tar.gz betelgeuse-2093a4ed22a39a82a5fa1cb45340658ca73d7d8b.tar.bz2 betelgeuse-2093a4ed22a39a82a5fa1cb45340658ca73d7d8b.zip |
Added a version bump for sqlite-3.3.8.
svn path=/; revision=122
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/sqlite/Manifest | 32 | ||||
-rw-r--r-- | dev-db/sqlite/files/digest-sqlite-3.3.8 | 3 | ||||
-rw-r--r-- | dev-db/sqlite/files/sandbox-fix1.patch | 40 | ||||
-rw-r--r-- | dev-db/sqlite/files/sandbox-fix2.patch | 14 | ||||
-rw-r--r-- | dev-db/sqlite/files/sqlite-3-test-fix-3.3.4.patch | 20 | ||||
-rw-r--r-- | dev-db/sqlite/files/sqlite-3.3.3-tcl-fix.patch | 22 | ||||
-rw-r--r-- | dev-db/sqlite/files/sqlite-64bit-test-fix.patch | 15 | ||||
-rw-r--r-- | dev-db/sqlite/files/sqlite-64bit-test-fix2.patch | 13 | ||||
-rw-r--r-- | dev-db/sqlite/sqlite-3.3.8.ebuild | 108 |
9 files changed, 267 insertions, 0 deletions
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest new file mode 100644 index 0000000..c3fd054 --- /dev/null +++ b/dev-db/sqlite/Manifest @@ -0,0 +1,32 @@ +AUX sandbox-fix1.patch 960 RMD160 751c8327b36ebdc60c4138a10e4c2e145e225455 SHA1 5998db43539b15e878e0ed806af2eeee072dc5fc SHA256 ab348a7803767d6aa0ee50eb68db75267667b336d4e995a1d378919703b1c448 +MD5 243b5d38d7a42f47aea10f9386b3227a files/sandbox-fix1.patch 960 +RMD160 751c8327b36ebdc60c4138a10e4c2e145e225455 files/sandbox-fix1.patch 960 +SHA256 ab348a7803767d6aa0ee50eb68db75267667b336d4e995a1d378919703b1c448 files/sandbox-fix1.patch 960 +AUX sandbox-fix2.patch 432 RMD160 778fe532561642dbae6d1a3f572f6703828af42b SHA1 1b0eee83c7d6d2e36ffdf0265c8bdd14d1574a61 SHA256 21552219c14daad788380ae7e1ba6c665bb1ef9eadb611f676bd6249e3bde02d +MD5 c56bcbb1c837001efcb36185429ac673 files/sandbox-fix2.patch 432 +RMD160 778fe532561642dbae6d1a3f572f6703828af42b files/sandbox-fix2.patch 432 +SHA256 21552219c14daad788380ae7e1ba6c665bb1ef9eadb611f676bd6249e3bde02d files/sandbox-fix2.patch 432 +AUX sqlite-3-test-fix-3.3.4.patch 761 RMD160 5c1dc771d1dbe5dc0138145ddc169a8aa2305c3b SHA1 3e2c30622e387d002bfc5e49a49781ca9cc63c82 SHA256 f26cc9b97c6240f5e3f595b6be57309044be44e9f865f7596b4e85d77eef82d4 +MD5 47dbf777bcdf0cc3e5e97a60814b8469 files/sqlite-3-test-fix-3.3.4.patch 761 +RMD160 5c1dc771d1dbe5dc0138145ddc169a8aa2305c3b files/sqlite-3-test-fix-3.3.4.patch 761 +SHA256 f26cc9b97c6240f5e3f595b6be57309044be44e9f865f7596b4e85d77eef82d4 files/sqlite-3-test-fix-3.3.4.patch 761 +AUX sqlite-3.3.3-tcl-fix.patch 955 RMD160 74965942daef0fe667bd866c9ebf5b2ff999c1d9 SHA1 c15e2a86f476dcab72b8a38ff89d6535ec0bbfd0 SHA256 b36bbb78a7c35a0c457e4cbdbc1b925fc4ffa07e0c60eb2230f1aff874a45403 +MD5 798bdd07506f713c72a1578b14bbd36d files/sqlite-3.3.3-tcl-fix.patch 955 +RMD160 74965942daef0fe667bd866c9ebf5b2ff999c1d9 files/sqlite-3.3.3-tcl-fix.patch 955 +SHA256 b36bbb78a7c35a0c457e4cbdbc1b925fc4ffa07e0c60eb2230f1aff874a45403 files/sqlite-3.3.3-tcl-fix.patch 955 +AUX sqlite-64bit-test-fix.patch 604 RMD160 58b1df9e9f6593d41fa17541eb3b429c70da384a SHA1 f20d6c33a0a26829e2c3eb14b5c21c259166938d SHA256 5310357cd2658333a5a76860dc87a5f98977878ffae6a9e11c5e1ec4c73ccc15 +MD5 d35b21872efe5925225672ab7dcd7307 files/sqlite-64bit-test-fix.patch 604 +RMD160 58b1df9e9f6593d41fa17541eb3b429c70da384a files/sqlite-64bit-test-fix.patch 604 +SHA256 5310357cd2658333a5a76860dc87a5f98977878ffae6a9e11c5e1ec4c73ccc15 files/sqlite-64bit-test-fix.patch 604 +AUX sqlite-64bit-test-fix2.patch 438 RMD160 83904019c277fdf24c8299b0e6aba7184cd8b56f SHA1 15512752ca2eefeab7daad22a76d767692dac3b5 SHA256 87c47559f891736006050f0a3a4e4393084cf314a7bc44cc0e09f57efc0de23b +MD5 619a169ced11eef8b06756518cfc8a4f files/sqlite-64bit-test-fix2.patch 438 +RMD160 83904019c277fdf24c8299b0e6aba7184cd8b56f files/sqlite-64bit-test-fix2.patch 438 +SHA256 87c47559f891736006050f0a3a4e4393084cf314a7bc44cc0e09f57efc0de23b files/sqlite-64bit-test-fix2.patch 438 +DIST sqlite-3.3.8.tar.gz 1921871 RMD160 9d05a43c3adb5bbdf50713637f31a356f5772807 SHA1 821dc16c8eb4d4625faa4f5fe9b0800c4bbcdc47 SHA256 25ad20114cbf9821249b9e383f2af5ca447ea5382149519c0a84bf9fb37f0f0a +EBUILD sqlite-3.3.8.ebuild 2308 RMD160 e0c1709f1d47b1a275b95d7d76e298d7b49afdec SHA1 04fa404cd9c60005cb096e536e258323a38cb5fa SHA256 8e725a68c9c763420f15727f9d592bf885cd8d520bda0e925365356ee460f31f +MD5 72541bd028ab59660f95165e9a5a0cbb sqlite-3.3.8.ebuild 2308 +RMD160 e0c1709f1d47b1a275b95d7d76e298d7b49afdec sqlite-3.3.8.ebuild 2308 +SHA256 8e725a68c9c763420f15727f9d592bf885cd8d520bda0e925365356ee460f31f sqlite-3.3.8.ebuild 2308 +MD5 190cf97b57bf2043dd1153b7c71152c0 files/digest-sqlite-3.3.8 241 +RMD160 912b047c04cf396b168beb4da5968cdef202f07f files/digest-sqlite-3.3.8 241 +SHA256 af635b853cf74ddd74e849582bd6ba377d324232aab5754af25703dbd6b57dcd files/digest-sqlite-3.3.8 241 diff --git a/dev-db/sqlite/files/digest-sqlite-3.3.8 b/dev-db/sqlite/files/digest-sqlite-3.3.8 new file mode 100644 index 0000000..b808e4b --- /dev/null +++ b/dev-db/sqlite/files/digest-sqlite-3.3.8 @@ -0,0 +1,3 @@ +MD5 2b2b0f967b6c5df1a5d495067c092d11 sqlite-3.3.8.tar.gz 1921871 +RMD160 9d05a43c3adb5bbdf50713637f31a356f5772807 sqlite-3.3.8.tar.gz 1921871 +SHA256 25ad20114cbf9821249b9e383f2af5ca447ea5382149519c0a84bf9fb37f0f0a sqlite-3.3.8.tar.gz 1921871 diff --git a/dev-db/sqlite/files/sandbox-fix1.patch b/dev-db/sqlite/files/sandbox-fix1.patch new file mode 100644 index 0000000..38e4256 --- /dev/null +++ b/dev-db/sqlite/files/sandbox-fix1.patch @@ -0,0 +1,40 @@ +--- 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/sandbox-fix2.patch b/dev-db/sqlite/files/sandbox-fix2.patch new file mode 100644 index 0000000..cf051c4 --- /dev/null +++ b/dev-db/sqlite/files/sandbox-fix2.patch @@ -0,0 +1,14 @@ +--- test/attach3.test~ 2005-03-29 05:11:00.000000000 +0200 ++++ test/attach3.test 2006-02-05 19:30:45.000000000 +0100 +@@ -226,11 +226,6 @@ + # Failure to attach leaves us in a workable state. + # Ticket #811 + # +-do_test attach3-11.0 { +- catchsql { +- ATTACH DATABASE '/nodir/nofile.x' AS notadb; +- } +-} {1 {unable to open database: /nodir/nofile.x}} + do_test attach3-11.1 { + catchsql { + ATTACH DATABASE ':memory:' AS notadb; 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 new file mode 100644 index 0000000..5429fbb --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3-test-fix-3.3.4.patch @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 0000000..2d4356d --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.3.3-tcl-fix.patch @@ -0,0 +1,22 @@ +--- 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 new file mode 100644 index 0000000..f121e52 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-64bit-test-fix.patch @@ -0,0 +1,15 @@ +--- 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 new file mode 100644 index 0000000..08d93f0 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-64bit-test-fix2.patch @@ -0,0 +1,13 @@ +--- 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.3.8.ebuild b/dev-db/sqlite/sqlite-3.3.8.ebuild new file mode 100644 index 0000000..1cd64fd --- /dev/null +++ b/dev-db/sqlite/sqlite-3.3.8.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.6.ebuild,v 1.7 2006/11/15 22:08:12 flameeyes Exp $ + +inherit eutils alternatives libtool + +DESCRIPTION="SQLite: An SQL Database Engine in a C Library" +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/${P}.tar.gz" + +LICENSE="as-is" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="nothreadsafe doc tcl debug" + +DEPEND="virtual/libc + doc? ( dev-lang/tcl ) + tcl? ( dev-lang/tcl )" + +SOURCE="/usr/bin/lemon" +ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0" + +src_unpack() { + # test + if has test ${FEATURES}; then + if ! has userpriv ${FEATURES}; then + ewarn "The userpriv feature must be enabled to run tests." + ewarn "Testsuite will not be run." + fi + if ! use tcl; then + ewarn "The tcl useflag must be enabled to run tests." + ewarn "Testsuite will not be run." + fi + fi + + unpack ${A} + + cd ${P} + epatch ${FILESDIR}/sqlite-3.3.3-tcl-fix.patch + #epatch ${FILESDIR}/sqlite-3-test-fix-3.3.4.patch + + epatch ${FILESDIR}/sandbox-fix1.patch + epatch ${FILESDIR}/sandbox-fix2.patch + + # Fix broken tests that are not portable to 64 arches + epatch ${FILESDIR}/sqlite-64bit-test-fix.patch + epatch ${FILESDIR}/sqlite-64bit-test-fix2.patch + + elibtoolize + epunt_cxx +} + +src_compile() { + local myconf + + myconf="--enable-incore-db --enable-tempdb-in-ram --enable-cross-thread-connections" + + if ! use nothreadsafe; then + myconf="${myconf} --enable-threadsafe" + else + myconf="${myconf} --disable-threadsafe" + fi + + if ! use tcl; then + myconf="${myconf} --disable-tcl" + fi + + if use debug; then + myconf="${myconf} --enable-debug" + fi + + econf ${myconf} || die + emake all || die + + if use doc; then + emake doc + fi +} + +src_test() { + if use tcl ; then + if has userpriv ${FEATURES} ; then + cd ${S} + if use debug; then + emake fulltest || die "some test failed" + else + emake test || die "some test failed" + fi + fi + fi +} + +src_install () { + make \ + DESTDIR="${D}" \ + TCLLIBDIR="/usr/$(get_libdir)" \ + install || die + + newbin lemon lemon-${SLOT} + + dodoc README VERSION + doman sqlite3.1 + + if use doc; then + docinto html + dohtml doc/*.html doc/*.txt doc/*.png + fi +} |