make test work

(Portage version: 2.1_pre3-r1)

13 files changed, 376 insertions, 2 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 9015ffb5106d..03292bc55004 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.102 2006/02/02 18:24:59 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.103 2006/02/05 22:05:04 arj Exp $
+
+  05 Feb 2006; Anders Rune Jensen <arj@gentoo.org>
+  +sqlite-3.3.3-r1.ebuild, +sqlite-2.8.16-r3.ebuild:
+  Make test work. Fixes #121489, #118429, #111774, #105524, #69640,
+  #36076. Fixed multilib-strict problems in 3.3.3 and enabled thread
+  sharing (new feature in 3.3)
 
 *sqlite-3.3.3 (02 Feb 2006)
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index e69c285587a3..a4ebcbd0c0f5 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,25 +1,36 @@
-MD5 e4c314915563cb827c35a8576496bbe2 ChangeLog 14072
+MD5 b1c2c5fdab3c1ee768779db0d17f4d25 ChangeLog 14345
 MD5 c35f34620d18893001720951f8ea0c73 files/digest-sqlite-2.8.13 65
 MD5 c9c200833c7c14eb4d750bb00455199e files/digest-sqlite-2.8.14 65
 MD5 b4031f19b8a32fa2b9dd4dfaf4b57ad0 files/digest-sqlite-2.8.15 65
 MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r1 65
 MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r2 65
+MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r3 65
 MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r3 65
 MD5 b30bbb90979fff71122f08b8cbee4013 files/digest-sqlite-3.2.7 65
 MD5 b30bbb90979fff71122f08b8cbee4013 files/digest-sqlite-3.2.7-r1 65
 MD5 964e2a0bb38e1ec5b8be6459970b55b9 files/digest-sqlite-3.3.3 65
+MD5 964e2a0bb38e1ec5b8be6459970b55b9 files/digest-sqlite-3.3.3-r1 65
 MD5 d0fc4c53a61d386992d16680140548d0 files/maketcllib.sh 879
+MD5 243b5d38d7a42f47aea10f9386b3227a files/sandbox-fix1.patch 960
+MD5 c56bcbb1c837001efcb36185429ac673 files/sandbox-fix2.patch 432
 MD5 217c8f27a3185a30858423e31e1aa4d9 files/sqlite-2.8.15-alignement-fix.patch 538
 MD5 60fec205107aa53f0cf83d62c2300183 files/sqlite-2.8.16-multilib.patch 4038
+MD5 715d143591b5938b4bc0c3cb8cfe1ce1 files/sqlite-3-test-fix.patch 906
 MD5 46cefa8dc3aa8a97c973f54cd08f0ace files/sqlite-3.2.1-data-corruption.patch 6529
 MD5 0473fa5a1fcc0a84af76122d016070e7 files/sqlite-3.2.1-tcl-fix.patch 915
+MD5 798bdd07506f713c72a1578b14bbd36d files/sqlite-3.3.3-tcl-fix.patch 955
+MD5 d35b21872efe5925225672ab7dcd7307 files/sqlite-64bit-test-fix.patch 604
+MD5 619a169ced11eef8b06756518cfc8a4f files/sqlite-64bit-test-fix2.patch 438
+MD5 af95b217c2b3c2364e666a772a29be8a files/sqlite3-configure-debug.patch 274
 MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
 MD5 fdbecebdb331496cd81f02ea4487e430 sqlite-2.8.13.ebuild 843
 MD5 99bf2a671c91f7499255003439d5eac0 sqlite-2.8.14.ebuild 862
 MD5 bd439cea4f334f6d1aa57eed87c251ca sqlite-2.8.15.ebuild 982
 MD5 7882c50758ad52018f654a9fe3c0f316 sqlite-2.8.16-r1.ebuild 1785
 MD5 a128a8faa4099cc920954ef2865a30b8 sqlite-2.8.16-r2.ebuild 1843
+MD5 ea65f68497121236939a1a3a612fa6cd sqlite-2.8.16-r3.ebuild 2382
 MD5 1041e20dae935fba256ac55ae98601b4 sqlite-3.2.1-r3.ebuild 1576
 MD5 7eee6b1abc84d8dc4188e7fe52080359 sqlite-3.2.7-r1.ebuild 1604
 MD5 48e1d74027ff233b6e0aee6f346fa82b sqlite-3.2.7.ebuild 1552
+MD5 3e04343ed1972a2a71e8a9b78ab74e71 sqlite-3.3.3-r1.ebuild 2132
 MD5 4be9905d44577a6954e6eaae03d8a3b3 sqlite-3.3.3.ebuild 1598
diff --git a/dev-db/sqlite/files/digest-sqlite-2.8.16-r3 b/dev-db/sqlite/files/digest-sqlite-2.8.16-r3
new file mode 100644
index 000000000000..f63e1aac46f1
--- /dev/null
+++ b/dev-db/sqlite/files/digest-sqlite-2.8.16-r3
@@ -0,0 +1 @@
+MD5 9c79b461ff30240a6f9d70dd67f8faea sqlite-2.8.16.tar.gz 981834
diff --git a/dev-db/sqlite/files/digest-sqlite-3.3.3-r1 b/dev-db/sqlite/files/digest-sqlite-3.3.3-r1
new file mode 100644
index 000000000000..0db440ade028
--- /dev/null
+++ b/dev-db/sqlite/files/digest-sqlite-3.3.3-r1
@@ -0,0 +1 @@
+MD5 eb5d9d7e7853b3af78e767d709b7fced sqlite-3.3.3.tar.gz 1642834
diff --git a/dev-db/sqlite/files/sandbox-fix1.patch b/dev-db/sqlite/files/sandbox-fix1.patch
new file mode 100644
index 000000000000..38e4256f8012
--- /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 000000000000..cf051c427d1f
--- /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.patch b/dev-db/sqlite/files/sqlite-3-test-fix.patch
new file mode 100644
index 000000000000..2f07b2ab8bb5
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3-test-fix.patch
@@ -0,0 +1,30 @@
+=== modified file 'Makefile.in'
+--- Makefile.in	
++++ Makefile.in	
+@@ -186,6 +186,7 @@
+   $(TOP)/src/btree.c \
+   $(TOP)/src/date.c \
+   $(TOP)/src/func.c \
++  $(TOP)/src/os.c \
+   $(TOP)/src/os_unix.c \
+   $(TOP)/src/os_win.c \
+   $(TOP)/src/pager.c \
+@@ -237,7 +238,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)
+@@ -333,7 +334,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 000000000000..2d4356db741b
--- /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 000000000000..f121e5293849
--- /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 000000000000..08d93f0bc7d0
--- /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/files/sqlite3-configure-debug.patch b/dev-db/sqlite/files/sqlite3-configure-debug.patch
new file mode 100644
index 000000000000..3cbeca0691bb
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite3-configure-debug.patch
@@ -0,0 +1,11 @@
+--- configure~	2006-01-23 19:06:53.000000000 +0100
++++ configure	2006-02-05 20:51:01.000000000 +0100
+@@ -20440,7 +20440,7 @@
+   use_debug=no
+ fi;
+ if test "${use_debug}" = "yes" ; then
+-  TARGET_DEBUG=""
++  TARGET_DEBUG="-DSQLITE_DEBUG"
+ else
+   TARGET_DEBUG="-DNDEBUG"
+ fi
diff --git a/dev-db/sqlite/sqlite-2.8.16-r3.ebuild b/dev-db/sqlite/sqlite-2.8.16-r3.ebuild
new file mode 100644
index 000000000000..5d8f4cc974d9
--- /dev/null
+++ b/dev-db/sqlite/sqlite-2.8.16-r3.ebuild
@@ -0,0 +1,109 @@
+# 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-2.8.16-r3.ebuild,v 1.1 2006/02/05 22:05:04 arj Exp $
+
+inherit eutils toolchain-funcs
+
+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="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
+IUSE="nls doc tcltk"
+
+DEPEND="doc? ( dev-lang/tcl )
+	tcltk? ( dev-lang/tcl )"
+
+src_unpack() {
+	# test
+	if has test ${FEATURES}; then
+	   if ! has userpriv ${FEATURES}; then
+	      die "The userpriv feature must be enabled to run tests"
+	fi
+	   if ! use tcltk; then
+	      die "The tcltk useflag must be enabled to run tests"
+	   fi
+	fi
+
+	unpack ${A}
+
+	cd ${S}
+
+	use hppa && epatch ${FILESDIR}/${PN}-2.8.15-alignement-fix.patch
+
+	epatch ${FILESDIR}/${P}-multilib.patch
+
+	epunt_cxx
+
+	if use nls; then
+		ENCODING=${ENCODING-"UTF8"}
+	else
+		ENCODING="ISO8859"
+	fi
+
+	sed -i -e "s:@@S@@:${S}:g" \
+	       -e "s:@@CC@@:$(tc-getCC):g" \
+	       -e "s:@@CFLAGS@@:${CFLAGS}:g" \
+	       -e "s:@@AR@@:$(tc-getAR):g" \
+	       -e "s:@@RANLIB@@:$(tc-getRANLIB):g" \
+	       -e "s:@@ENCODING@@:${ENCODING}:g" \
+	       ${S}/Makefile.linux-gcc
+}
+
+src_compile() {
+	local myconf
+	myconf="--enable-incore-db --enable-tempdb-in-ram"
+	myconf="${myconf} `use_enable nls utf8`"
+
+	if ! use tcltk; then
+	   myconf="${myconf} --without-tcl"
+	fi
+
+	econf ${myconf} || die
+	emake all || die
+
+	if use doc; then
+	emake doc || die
+	fi
+
+	if use tcltk; then
+	cp -P ${FILESDIR}/maketcllib.sh ${S}
+	chmod +x ./maketcllib.sh
+	./maketcllib.sh
+	fi
+}
+
+src_test() {
+	einfo "sqlite 2.x is known to have problems on 64 bit architectures"
+	einfo "if you observe segmentation faults please use 3.x instead"
+
+	cd ${S}
+	emake test || die "some test failed"
+}
+
+src_install () {
+	dodir /usr/{bin,include,$(get_libdir)}
+
+	make DESTDIR="${D}" install || die
+
+	if ! [ -e ${DESTDIR}/usr/bin/lemon ]
+	then
+	dobin lemon
+	fi
+
+	dodoc README VERSION
+	doman sqlite.1
+
+	if use doc; then
+	docinto html
+	dohtml doc/*.html doc/*.txt doc/*.png
+	fi
+
+	if use tcltk; then
+	mkdir ${D}/usr/$(get_libdir)/tclsqlite${PV}
+	cp ${S}/tclsqlite.so ${D}/usr/$(get_libdir)/tclsqlite${PV}/
+	cp ${S}/pkgIndex.tcl ${D}/usr/$(get_libdir)/tclsqlite${PV}/
+	fi
+}
diff --git a/dev-db/sqlite/sqlite-3.3.3-r1.ebuild b/dev-db/sqlite/sqlite-3.3.3-r1.ebuild
new file mode 100644
index 000000000000..10ca9dc50291
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.3.3-r1.ebuild
@@ -0,0 +1,101 @@
+# 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.3-r1.ebuild,v 1.1 2006/02/05 22:05:04 arj Exp $
+
+inherit eutils
+
+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 ~sh ~sparc ~x86"
+IUSE="nothreadsafe doc tcltk debug"
+
+DEPEND="virtual/libc
+	doc? ( dev-lang/tcl )
+	tcltk? ( dev-lang/tcl )"
+
+src_unpack() {
+	# test
+	if has test ${FEATURES}; then
+	   if ! has userpriv ${FEATURES}; then
+	      die "The userpriv feature must be enabled to run tests"
+	fi
+	   if ! use tcltk; then
+	      die "The tcltk useflag must be enabled to run tests"
+	   fi
+	fi
+
+	unpack ${A}
+
+	cd ${P}
+	epatch ${FILESDIR}/sqlite-3.3.3-tcl-fix.patch
+	epatch ${FILESDIR}/sqlite-3-test-fix.patch
+
+	epatch ${FILESDIR}/sandbox-fix1.patch
+	epatch ${FILESDIR}/sandbox-fix2.patch
+
+	if use debug; then
+	   epatch ${FILESDIR}/sqlite3-configure-debug.patch
+	fi
+
+	# Fix broken tests that are not portable to 64 arches
+	epatch ${FILESDIR}/sqlite-64bit-test-fix.patch
+	epatch ${FILESDIR}/sqlite-64bit-test-fix2.patch
+	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 tcltk; 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() {
+	cd ${S}
+	if use debug; then
+	   emake fulltest || die "some test failed"
+	else
+	   emake test || die "some test failed"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" TCLLIBDIR="/usr/$(get_libdir)" install || die
+
+	if ! [ -e ${DESTDIR}/usr/bin/lemon ]
+	then
+	dobin lemon
+	fi
+
+	dodoc README VERSION
+	doman sqlite3.1
+
+	if use doc; then
+	docinto html
+	dohtml doc/*.html doc/*.txt doc/*.png
+	fi
+}