new fixed versions

(Portage version: 2.0.51.19)

25 files changed, 126 insertions, 532 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 013872437a11..eeed073f5958 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,7 +1,16 @@
 # 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.71 2005/03/29 16:22:23 arj Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.72 2005/04/02 20:11:34 arj Exp $
+
+  02 Apr 2005; Anders Rune Jensen <arj@gentoo.org> -sqlite-3.2.1.ebuild,
+  -sqlite-3.1.6.ebuild, -sqlite-3.1.5.ebuild, -sqlite-3.1.3.ebuild,
+  -sqlite-3.1.2.ebuild, -sqlite-3.0.8-r1.ebuild, -sqlite-3.0.8.ebuild,
+  -sqlite-3.0.7.ebuild, -sqlite-3.0.6.ebuild, -sqlite-3.2.0.ebuild, 
+  +sqlite-2.8.16-r1, +sqlite-3.2.1-r1:
+  Mark 2.8.16-r1 stable on x86 and amd64. Fix #85744. Remove old broken 
+  sqlite3 versions. Fix manpage installation with sqlite3. Fix #36076 by
+  including patch from Sean Woods to build TCL libs.
+	
 *sqlite-3.2.1 (29 Mar 2005)
 
   29 Mar 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.2.1.ebuild:
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 37a7fb4898f1..709cdbb8c111 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,32 +1,16 @@
 MD5 4d4bfa913883e6229573e79b6f02aa3b metadata.xml 275
+MD5 d01cfadb21d41794b97ea471730c7f3f sqlite-2.8.16-r1.ebuild 1402
 MD5 78d3fa35ae4558e4a5add1fd47fd814f sqlite-2.8.15.ebuild 969
 MD5 fdbecebdb331496cd81f02ea4487e430 sqlite-2.8.13.ebuild 843
-MD5 53101d0aba85e7f9f18c84aada8466cf sqlite-3.0.8.ebuild 1020
-MD5 7952f271c0a054604a64ddd21aa51d87 sqlite-3.2.1.ebuild 1889
-MD5 529fd03eceab183a8c3dea72741c7266 sqlite-3.0.6.ebuild 1046
-MD5 5cbea2bc70699b7a68bf442f4d6a2622 sqlite-3.1.3.ebuild 1890
-MD5 c2c8c2607bf7e784464bf8b6c17f5972 sqlite-3.1.5.ebuild 1889
+MD5 834170468aabc788359b50ab3b4f7b5b sqlite-3.2.1-r1.ebuild 1846
 MD5 8cda692208b4f43344d30e5bfa2ee396 sqlite-2.8.16.ebuild 1402
-MD5 5cf76e968d81934b743afaf41a9d1266 ChangeLog 9743
-MD5 c0c61638e3f6d70263748a5db601414d sqlite-3.1.2.ebuild 1882
+MD5 50ace9f36c013b42073fb0cb19a06b70 ChangeLog 10193
 MD5 99bf2a671c91f7499255003439d5eac0 sqlite-2.8.14.ebuild 862
-MD5 f29cd1d06dca071985256cb325d2b380 sqlite-3.0.7.ebuild 995
-MD5 8c6d9f1b14b238affe69ab822d635cd8 sqlite-3.1.6.ebuild 1889
-MD5 006d5e8c0eb41234ac90294b6fd93f2d sqlite-3.0.8-r1.ebuild 1817
-MD5 1713c41127f7021bfab73771fa38e323 sqlite-3.2.0.ebuild 1889
-MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1 65
 MD5 c9c200833c7c14eb4d750bb00455199e files/digest-sqlite-2.8.14 65
-MD5 2a35fca391c8617c26b2934d02b8fcb5 files/digest-sqlite-3.1.3 65
 MD5 c35f34620d18893001720951f8ea0c73 files/digest-sqlite-2.8.13 65
-MD5 75a2393c72ba5dc03f5cd3840fc06d35 files/digest-sqlite-3.1.5 65
 MD5 60fec205107aa53f0cf83d62c2300183 files/sqlite-2.8.16-multilib.patch 4038
-MD5 e92b7000fca35af325e2ac65bce666e0 files/digest-sqlite-3.0.7 65
 MD5 217c8f27a3185a30858423e31e1aa4d9 files/sqlite-2.8.15-alignement-fix.patch 538
-MD5 5996eb85e8aa0e99c1aade856f6c373e files/digest-sqlite-3.1.2 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 572dbaa55a4dd1cec17ee827911ee243 files/digest-sqlite-3.0.8 65
 MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16 65
-MD5 5aeb0a32e55ac5562756134561b39dae files/digest-sqlite-3.0.6 65
-MD5 86d89fb5b928cd8eaf535a520f5989a5 files/digest-sqlite-3.2.0 65
-MD5 4943d36d9f7038f8ea32136b3a7d5f1e files/digest-sqlite-3.1.6 65
-MD5 572dbaa55a4dd1cec17ee827911ee243 files/digest-sqlite-3.0.8-r1 65
diff --git a/dev-db/sqlite/files/digest-sqlite-2.8.16-r1 b/dev-db/sqlite/files/digest-sqlite-2.8.16-r1
new file mode 100644
index 000000000000..f63e1aac46f1
--- /dev/null
+++ b/dev-db/sqlite/files/digest-sqlite-2.8.16-r1
@@ -0,0 +1 @@
+MD5 9c79b461ff30240a6f9d70dd67f8faea sqlite-2.8.16.tar.gz 981834
diff --git a/dev-db/sqlite/files/digest-sqlite-3.0.6 b/dev-db/sqlite/files/digest-sqlite-3.0.6
deleted file mode 100644
index 579f25d4367e..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d128db3c11398d02097fd9f168eca9f0 sqlite-3.0.6.tar.gz 1225106
diff --git a/dev-db/sqlite/files/digest-sqlite-3.0.7 b/dev-db/sqlite/files/digest-sqlite-3.0.7
deleted file mode 100644
index 114c6d07d209..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a41d760045fef3768cce65b50a4d0f8 sqlite-3.0.7.tar.gz 1262818
diff --git a/dev-db/sqlite/files/digest-sqlite-3.0.8 b/dev-db/sqlite/files/digest-sqlite-3.0.8
deleted file mode 100644
index 518958876be2..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7dff1ec9bf4d08928c039b278630ba7 sqlite-3.0.8.tar.gz 1288859
diff --git a/dev-db/sqlite/files/digest-sqlite-3.0.8-r1 b/dev-db/sqlite/files/digest-sqlite-3.0.8-r1
deleted file mode 100644
index 518958876be2..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.0.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7dff1ec9bf4d08928c039b278630ba7 sqlite-3.0.8.tar.gz 1288859
diff --git a/dev-db/sqlite/files/digest-sqlite-3.1.2 b/dev-db/sqlite/files/digest-sqlite-3.1.2
deleted file mode 100644
index 406753a24de0..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d9c52489aa95d618842bf97778c17f04 sqlite-3.1.2.tar.gz 1311838
diff --git a/dev-db/sqlite/files/digest-sqlite-3.1.3 b/dev-db/sqlite/files/digest-sqlite-3.1.3
deleted file mode 100644
index 7fe167777016..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 032273f53d0508e21b1d50d82a34268d sqlite-3.1.3.tar.gz 1315439
diff --git a/dev-db/sqlite/files/digest-sqlite-3.1.5 b/dev-db/sqlite/files/digest-sqlite-3.1.5
deleted file mode 100644
index 2179fbb1f7d0..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bdc71db73a79b5a50686bce5b7fdb101 sqlite-3.1.5.tar.gz 1333608
diff --git a/dev-db/sqlite/files/digest-sqlite-3.1.6 b/dev-db/sqlite/files/digest-sqlite-3.1.6
deleted file mode 100644
index e86113623f4d..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34e77a82ca7c1a7f5ff00a1939075fa8 sqlite-3.1.6.tar.gz 1337475
diff --git a/dev-db/sqlite/files/digest-sqlite-3.2.0 b/dev-db/sqlite/files/digest-sqlite-3.2.0
deleted file mode 100644
index 2edf66f2376c..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16d5ecaaa9eaccf2a9102bb9610f8c60 sqlite-3.2.0.tar.gz 1347197
diff --git a/dev-db/sqlite/files/digest-sqlite-3.2.1 b/dev-db/sqlite/files/digest-sqlite-3.2.1-r1
index 8c837fc3ade7..8c837fc3ade7 100644
--- a/dev-db/sqlite/files/digest-sqlite-3.2.1
+++ b/dev-db/sqlite/files/digest-sqlite-3.2.1-r1
diff --git a/dev-db/sqlite/files/maketcllib.sh b/dev-db/sqlite/files/maketcllib.sh
new file mode 100644
index 000000000000..ad87ce1fcafb
--- /dev/null
+++ b/dev-db/sqlite/files/maketcllib.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# This script was adapted from the one used by Hwaci to build it's 
+# documentation and binaries for shipping to their website. 
+#
+# Any similarity to the original has probably been trampled into
+# oblivion modifying everything for Gentoo.
+#
+echo "Starting TCL Build"
+
+# Set srcdir to the name of the directory that contains the publish.sh
+# script.
+#
+srcdir=`echo "$0" | sed 's%\(^.*\)/[^/][^/]*$%\1%'`
+
+#
+# Build the tclsqlite.so shared library for import into tclsh or wish
+# under Linux
+#
+make target_source
+source /etc/make.conf
+cd tsrc
+rm shell.c
+
+OPTS='-DUSE_TCL_STUBS=1 -DNDEBUG=1'
+TCLSTUBLIB=${TCL_BUILD_STUB_LIB_PATH}
+
+export CFLAGS
+gcc -fPIC $CFLAGS $OPTS -I. -shared *.c $TCLSTUBLIB -o tclsqlite.so
+
+strip tclsqlite.so
+cp tclsqlite.so ..
+
+cd ..
+
+echo "pkg_mkIndex [pwd] tclsqlite.so" >> make_pkgIndex.tcl
+tclsh make_pkgIndex.tcl
+
+echo "Done TCL Build"
+
diff --git a/dev-db/sqlite/sqlite-2.8.16-r1.ebuild b/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
new file mode 100644
index 000000000000..dcfbc7293544
--- /dev/null
+++ b/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
@@ -0,0 +1,66 @@
+# 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-2.8.16-r1.ebuild,v 1.1 2005/04/02 20:11:34 arj Exp $
+
+inherit eutils toolchain-funcs
+
+IUSE="nls"
+
+DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
+SRC_URI="http://www.sqlite.org/${P}.tar.gz"
+HOMEPAGE="http://www.sqlite.org"
+DEPEND="virtual/libc
+	dev-lang/tcl"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~ppc64 amd64 ~ppc-macos"
+
+src_unpack() {
+	unpack ${A}
+
+	use hppa && epatch ${FILESDIR}/${PN}-2.8.15-alignement-fix.patch
+
+	epatch ${FILESDIR}/${P}-multilib.patch
+
+	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`"
+	econf ${myconf} || die
+	emake all doc || die
+
+	cp -P ${FILESDIR}/maketcllib.sh ${S}
+	chmod +x ./maketcllib.sh
+	./maketcllib.sh
+}
+
+src_install () {
+	dodir /usr/{bin,include,$(get_libdir)}
+
+	make DESTDIR="${D}" install || die
+
+	dobin lemon
+	dodoc README VERSION
+	doman sqlite.1
+	docinto html
+	dohtml doc/*.html doc/*.txt doc/*.png
+
+	mkdir ${D}/usr/lib/tclsqlite${PV}
+	cp ${S}/tclsqlite.so ${D}/usr/lib/tclsqlite${PV}/
+	cp ${S}/pkgIndex.tcl ${D}/usr/lib/tclsqlite${PV}/
+}
diff --git a/dev-db/sqlite/sqlite-3.0.6.ebuild b/dev-db/sqlite/sqlite-3.0.6.ebuild
deleted file mode 100644
index 99364203a40b..000000000000
--- a/dev-db/sqlite/sqlite-3.0.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.0.6.ebuild,v 1.4 2005/01/01 17:43:22 eradicator Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/sqlite
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
-SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-HOMEPAGE="http://www.sqlite.org"
-DEPEND="virtual/libc
-	dev-lang/tcl"
-SLOT="3"
-LICENSE="as-is"
-# ~ppc ~sparc ~alpha ~mips ~hppa ~ppc64 ~amd64
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-src_compile() {
-	# sqlite includes a doc directory making it impossible to generate docs, 
-	# which are very important to people adding support for sqlite3 to their
-	# programs.
-	rm -rf doc/
-
-	local myconf
-	myconf="--enable-incore-db --enable-tempdb-in-ram"
-	myconf="${myconf} `use_with nls utf8`"
-	econf ${myconf} || die
-	emake all doc || die
-}
-
-src_install () {
-	dodir /usr/{bin,include,lib}
-
-	einstall || die
-
-	dobin lemon
-	dodoc README VERSION
-	doman sqlite.1
-	docinto html
-	dohtml doc/*.html doc/*.txt doc/*.png
-}
diff --git a/dev-db/sqlite/sqlite-3.0.7.ebuild b/dev-db/sqlite/sqlite-3.0.7.ebuild
deleted file mode 100644
index 5823ab340cba..000000000000
--- a/dev-db/sqlite/sqlite-3.0.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.0.7.ebuild,v 1.3 2005/01/01 17:43:22 eradicator Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/sqlite
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
-SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-HOMEPAGE="http://www.sqlite.org"
-DEPEND="virtual/libc
-	dev-lang/tcl"
-SLOT="3"
-LICENSE="as-is"
-
-KEYWORDS="~x86 ~sparc"
-
-src_compile() {
-	# sqlite includes a doc directory making it impossible to generate docs, 
-	# which are very important to people adding support for sqlite3 to their
-	# programs.
-	rm -rf doc/
-
-	local myconf
-	myconf="--enable-incore-db --enable-tempdb-in-ram"
-	myconf="${myconf} `use_with nls utf8`"
-	econf ${myconf} || die
-	emake all doc || die
-}
-
-src_install () {
-	dodir /usr/{bin,include,lib}
-
-	einstall || die
-
-	dobin lemon
-	dodoc README VERSION
-	doman sqlite.1
-	docinto html
-	dohtml doc/*.html doc/*.txt doc/*.png
-}
diff --git a/dev-db/sqlite/sqlite-3.0.8-r1.ebuild b/dev-db/sqlite/sqlite-3.0.8-r1.ebuild
deleted file mode 100644
index 5013363194b4..000000000000
--- a/dev-db/sqlite/sqlite-3.0.8-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.0.8-r1.ebuild,v 1.2 2005/01/01 17:43:22 eradicator Exp $
-
-IUSE="nls nothreadsafe"
-
-S=${WORKDIR}/sqlite
-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? ( sys-libs/glibc )
-	dev-lang/tcl"
-SLOT="3"
-LICENSE="as-is"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-
-src_compile() {
-	# sqlite includes a doc directory making it impossible to generate docs, 
-	# which are very important to people adding support for sqlite3 to their
-	# programs.
-	rm -rf doc/
-
-	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
-	myconf="${myconf} `use_with nls utf8`"
-	econf ${myconf} || die
-	emake all doc || die
-}
-
-# 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 () {
-	dodir /usr/{bin,include,lib}
-
-	einstall || die
-
-	dobin lemon
-	dodoc README VERSION
-	doman sqlite.1
-	docinto html
-	dohtml doc/*.html doc/*.txt doc/*.png
-}
diff --git a/dev-db/sqlite/sqlite-3.0.8.ebuild b/dev-db/sqlite/sqlite-3.0.8.ebuild
deleted file mode 100644
index 6f1856aa9e2a..000000000000
--- a/dev-db/sqlite/sqlite-3.0.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.0.8.ebuild,v 1.4 2005/01/01 17:43:22 eradicator Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/sqlite
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
-SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-HOMEPAGE="http://www.sqlite.org"
-DEPEND="virtual/libc
-	dev-lang/tcl"
-SLOT="3"
-LICENSE="as-is"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-
-src_compile() {
-	# sqlite includes a doc directory making it impossible to generate docs, 
-	# which are very important to people adding support for sqlite3 to their
-	# programs.
-	rm -rf doc/
-
-	local myconf
-	myconf="--enable-incore-db --enable-tempdb-in-ram"
-	myconf="${myconf} `use_with nls utf8`"
-	econf ${myconf} || die
-	emake all doc || die
-}
-
-src_install () {
-	dodir /usr/{bin,include,lib}
-
-	einstall || die
-
-	dobin lemon
-	dodoc README VERSION
-	doman sqlite.1
-	docinto html
-	dohtml doc/*.html doc/*.txt doc/*.png
-}
diff --git a/dev-db/sqlite/sqlite-3.1.2.ebuild b/dev-db/sqlite/sqlite-3.1.2.ebuild
deleted file mode 100644
index 8274814f7f0f..000000000000
--- a/dev-db/sqlite/sqlite-3.1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.1.2.ebuild,v 1.3 2005/02/18 19:23:20 arj Exp $
-
-inherit eutils
-
-IUSE="nls nothreadsafe"
-
-S=${WORKDIR}/sqlite
-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? ( sys-libs/glibc )
-	dev-lang/tcl"
-SLOT="3"
-LICENSE="as-is"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-
-src_compile() {
-	# sqlite includes a doc directory making it impossible to generate docs, 
-	# which are very important to people adding support for sqlite3 to their
-	# programs.
-	rm -rf doc/
-
-	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
-	myconf="${myconf} `use_with nls utf8`"
-	myconf="--with-tcl=/usr/$(get_libdir)/"
-	econf ${myconf} || die
-	emake all || die # doc is not working yet in 3.1.2
-}
-
-# 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 sqlite.1
-	docinto html
-	dohtml doc/*.html doc/*.txt doc/*.png
-}
diff --git a/dev-db/sqlite/sqlite-3.1.3.ebuild b/dev-db/sqlite/sqlite-3.1.3.ebuild
deleted file mode 100644
index 25538dcd8168..000000000000
--- a/dev-db/sqlite/sqlite-3.1.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.1.3.ebuild,v 1.2 2005/03/04 20:56:42 kito Exp $
-
-inherit eutils
-
-IUSE="nls nothreadsafe"
-
-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 ) )
-	dev-lang/tcl"
-SLOT="3"
-LICENSE="as-is"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
-
-src_compile() {
-	# sqlite includes a doc directory making it impossible to generate docs, 
-	# which are very important to people adding support for sqlite3 to their
-	# programs.
-	rm -rf doc/
-
-	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
-	myconf="${myconf} `use_with nls utf8`"
-	myconf="--with-tcl=/usr/$(get_libdir)/"
-	econf ${myconf} || die
-	emake all || die # doc is not working yet in 3.1.2
-}
-
-# 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 sqlite.1
-	docinto html
-	dohtml doc/*.html doc/*.txt doc/*.png
-}
diff --git a/dev-db/sqlite/sqlite-3.1.5.ebuild b/dev-db/sqlite/sqlite-3.1.5.ebuild
deleted file mode 100644
index 14e866549b70..000000000000
--- a/dev-db/sqlite/sqlite-3.1.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.1.5.ebuild,v 1.1 2005/03/12 21:21:59 arj Exp $
-
-inherit eutils
-
-IUSE="nls nothreadsafe"
-
-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 ) )
-	dev-lang/tcl"
-SLOT="3"
-LICENSE="as-is"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
-
-src_compile() {
-	# sqlite includes a doc directory making it impossible to generate docs, 
-	# which are very important to people adding support for sqlite3 to their
-	# programs.
-	rm -rf doc/
-
-	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
-	myconf="${myconf} `use_with nls utf8`"
-	myconf="--with-tcl=/usr/$(get_libdir)/"
-	econf ${myconf} || die
-	emake all || die # doc is not working yet in 3.1.2
-}
-
-# 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 sqlite.1
-	docinto html
-	dohtml doc/*.html doc/*.txt doc/*.png
-}
diff --git a/dev-db/sqlite/sqlite-3.1.6.ebuild b/dev-db/sqlite/sqlite-3.1.6.ebuild
deleted file mode 100644
index 6a856ff77349..000000000000
--- a/dev-db/sqlite/sqlite-3.1.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.1.6.ebuild,v 1.1 2005/03/19 11:32:37 arj Exp $
-
-inherit eutils
-
-IUSE="nls nothreadsafe"
-
-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 ) )
-	dev-lang/tcl"
-SLOT="3"
-LICENSE="as-is"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
-
-src_compile() {
-	# sqlite includes a doc directory making it impossible to generate docs, 
-	# which are very important to people adding support for sqlite3 to their
-	# programs.
-	rm -rf doc/
-
-	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
-	myconf="${myconf} `use_with nls utf8`"
-	myconf="--with-tcl=/usr/$(get_libdir)/"
-	econf ${myconf} || die
-	emake all || die # doc is not working yet in 3.1.2
-}
-
-# 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 sqlite.1
-	docinto html
-	dohtml doc/*.html doc/*.txt doc/*.png
-}
diff --git a/dev-db/sqlite/sqlite-3.2.0.ebuild b/dev-db/sqlite/sqlite-3.2.1-r1.ebuild
index 420f6ed3268d..fd0dbcf0da96 100644
--- a/dev-db/sqlite/sqlite-3.2.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.2.1-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.0.ebuild,v 1.1 2005/03/24 15:55:23 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.1-r1.ebuild,v 1.1 2005/04/02 20:11:34 arj Exp $
 
 inherit eutils
 
-IUSE="nls nothreadsafe"
+IUSE="nothreadsafe"
 
 DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
 SRC_URI="http://www.sqlite.org/${P}.tar.gz"
@@ -37,7 +37,6 @@ src_compile() {
 	else
 		myconf="${myconf} --disable-threadsafe"
 	fi
-	myconf="${myconf} `use_with nls utf8`"
 	myconf="--with-tcl=/usr/$(get_libdir)/"
 	econf ${myconf} || die
 	emake all || die # doc is not working yet in 3.1.2
@@ -56,7 +55,7 @@ src_install () {
 
 	dobin lemon
 	dodoc README VERSION
-	doman sqlite.1
+	doman sqlite3.1
 	docinto html
 	dohtml doc/*.html doc/*.txt doc/*.png
 }
diff --git a/dev-db/sqlite/sqlite-3.2.1.ebuild b/dev-db/sqlite/sqlite-3.2.1.ebuild
deleted file mode 100644
index 3c51d1a04191..000000000000
--- a/dev-db/sqlite/sqlite-3.2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.ebuild,v 1.1 2005/03/29 16:22:23 arj Exp $
-
-inherit eutils
-
-IUSE="nls nothreadsafe"
-
-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 ) )
-	dev-lang/tcl"
-SLOT="3"
-LICENSE="as-is"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
-
-src_compile() {
-	# sqlite includes a doc directory making it impossible to generate docs, 
-	# which are very important to people adding support for sqlite3 to their
-	# programs.
-	rm -rf doc/
-
-	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
-	myconf="${myconf} `use_with nls utf8`"
-	myconf="--with-tcl=/usr/$(get_libdir)/"
-	econf ${myconf} || die
-	emake all || die # doc is not working yet in 3.1.2
-}
-
-# 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 sqlite.1
-	docinto html
-	dohtml doc/*.html doc/*.txt doc/*.png
-}