fix bug

(Portage version: 2.0.51.19)

5 files changed, 98 insertions, 1 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 0d60e9062245..2f54b3bbc050 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # 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.83 2005/04/24 14:48:05 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.84 2005/04/24 20:53:44 arj Exp $
+
+  24 Apr 2005; Anders Rune Jensen <arj@gentoo.org>
+  +sqlite-3.2.1-r3.ebuild, +files/sqlite-3.2.1-tcl-fix:
+  Fix #90258. Thanks to Ferris McCormick for suggestions.
 
   24 Apr 2005; Anders Rune Jensen <arj@gentoo.org> files/sqlite-3.2.1-data-corruption.patch:
   Fix patch to work with cvs.
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 393503ce79c7..c4b54bf7cd52 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -3,11 +3,13 @@ MD5 1dbd3dee8a51bfd7c6c1a26bccb848ca sqlite-2.8.16-r1.ebuild 1765
 MD5 78d3fa35ae4558e4a5add1fd47fd814f sqlite-2.8.15.ebuild 969
 MD5 fdbecebdb331496cd81f02ea4487e430 sqlite-2.8.13.ebuild 843
 MD5 24edb8a3c90a6472b29391bf3155c72b sqlite-3.2.1-r1.ebuild 1681
+MD5 7b78319104ea11e703418f5a0bcdbac3 sqlite-3.2.1-r3.ebuild 1791
 MD5 8cda692208b4f43344d30e5bfa2ee396 sqlite-2.8.16.ebuild 1402
 MD5 27bdc422710c6b45c3be91dd423373fe ChangeLog 11666
 MD5 99bf2a671c91f7499255003439d5eac0 sqlite-2.8.14.ebuild 862
 MD5 435dd0c88d047f6048dc4a0f4c4000a2 sqlite-3.2.1-r2.ebuild 1752
 MD5 c9c200833c7c14eb4d750bb00455199e files/digest-sqlite-2.8.14 65
+MD5 0473fa5a1fcc0a84af76122d016070e7 files/sqlite-3.2.1-tcl-fix.patch 915
 MD5 c35f34620d18893001720951f8ea0c73 files/digest-sqlite-2.8.13 65
 MD5 60fec205107aa53f0cf83d62c2300183 files/sqlite-2.8.16-multilib.patch 4038
 MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r2 65
@@ -16,5 +18,6 @@ MD5 46cefa8dc3aa8a97c973f54cd08f0ace files/sqlite-3.2.1-data-corruption.patch 65
 MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r1 65
 MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r1 65
 MD5 b4031f19b8a32fa2b9dd4dfaf4b57ad0 files/digest-sqlite-2.8.15 65
+MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r3 65
 MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16 65
 MD5 d0fc4c53a61d386992d16680140548d0 files/maketcllib.sh 879
diff --git a/dev-db/sqlite/files/digest-sqlite-3.2.1-r3 b/dev-db/sqlite/files/digest-sqlite-3.2.1-r3
new file mode 100644
index 000000000000..8c837fc3ade7
--- /dev/null
+++ b/dev-db/sqlite/files/digest-sqlite-3.2.1-r3
@@ -0,0 +1 @@
+MD5 ccf3831c2f67452d444c5e5e2c7ca6f0 sqlite-3.2.1.tar.gz 1351842
diff --git a/dev-db/sqlite/files/sqlite-3.2.1-tcl-fix.patch b/dev-db/sqlite/files/sqlite-3.2.1-tcl-fix.patch
new file mode 100644
index 000000000000..6b724fe0495f
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.2.1-tcl-fix.patch
@@ -0,0 +1,20 @@
+diff -uNr sqlite-3.2.1/tclinstaller.tcl sqlite-3.2.1-tcl-fix/tclinstaller.tcl
+--- sqlite-3.2.1/tclinstaller.tcl	2005-03-23 17:08:39.000000000 +0100
++++ sqlite-3.2.1-tcl-fix/tclinstaller.tcl	2005-04-24 22:48:12.000000000 +0200
+@@ -8,13 +8,15 @@
+ set LIBFILE .libs/libtclsqlite3[info sharedlibextension]
+ if { ![info exists env(DESTDIR)] } { set env(DESTDIR) "" }
+ set LIBDIR $env(DESTDIR)[lindex $auto_path 0]
++set LIBDIR_INSTALL [lindex $auto_path 0]
+ 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/sqlite-3.2.1-r3.ebuild b/dev-db/sqlite/sqlite-3.2.1-r3.ebuild
new file mode 100644
index 000000000000..b5167b2cdcc3
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.2.1-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.1-r3.ebuild,v 1.1 2005/04/24 20:53:44 arj Exp $
+
+inherit eutils
+
+IUSE="nothreadsafe doc"
+
+DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
+SRC_URI="http://www.sqlite.org/${P}.tar.gz"
+HOMEPAGE="http://www.sqlite.org"
+
+# Adding glibc as dependency for USE !nothreadsafe until someone can tell me
+#   if all virtual/libc's provide POSIX threads (pthread.h)
+#   - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
+DEPEND="virtual/libc
+	!nothreadsafe? ( !ppc-macos? ( sys-libs/glibc ) )
+	doc? (dev-lang/tcl)"
+SLOT="3"
+LICENSE="as-is"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86 ~ppc64"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-data-corruption.patch
+	epatch ${FILESDIR}/${P}-tcl-fix.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="--enable-incore-db --enable-tempdb-in-ram"
+	# Yes, this is ridiculous, but I'm not the maintainer for this ebuild,
+	#   and yet it's broken w/o thread support, so this has to do for now
+	#   - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
+	if ! use nothreadsafe; then
+		myconf="${myconf} --enable-threadsafe"
+	else
+		myconf="${myconf} --disable-threadsafe"
+	fi
+	econf ${myconf} || die
+	emake all || die
+
+	if use doc; then
+	emake doc
+	fi
+}
+
+# In case we ever want testing support; note: this needs more work, as
+#   as it causes some sandbox issues.
+#   - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
+#src_test() {
+#	cd ${S}
+#	emake fulltest || die "some test failed"
+#}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+
+	dobin lemon
+	dodoc README VERSION
+	doman sqlite3.1
+
+	if use doc; then
+	docinto html
+	dohtml doc/*.html doc/*.txt doc/*.png
+	fi
+}