15 files changed, 22 insertions, 338 deletions
diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index d49d37dd9d1e..96aa8fed37a3 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,13 @@
 # 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.104 2006/02/13 18:56:56 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.105 2006/04/12 19:40:03 arj Exp $
+
+*sqlite-3.3.5 (12 Apr 2006)
+
+  12 Apr 2006; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.3.5.ebuild,
+  -sqlite-3.3.3.ebuild, -sqlite-3.3.3-r1.ebuild, -sqlite-2.8.13.ebuild,
+  -sqlite-2.8.14.ebuild, -sqlite-2.8.16-r2.ebuild, -sqlite-3.2.7.ebuild:
+  New version. Remove old versions.
 
 *sqlite-3.3.4 (13 Feb 2006)
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index bc0bc8a63c51..130eed2f865a 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,42 +1,27 @@
-MD5 5d5ca478da8f91363dc73043cdb51ea9 ChangeLog 14479
-RMD160 31fd64ee39f8f31766719326e6d16411326789f0 ChangeLog 14479
-SHA256 d1d0cdf81892dbad20d35eaa70e282027e3786df717fc3923f14300ce9ee87c9 ChangeLog 14479
-MD5 c35f34620d18893001720951f8ea0c73 files/digest-sqlite-2.8.13 65
-RMD160 5d433b108afa23ea030ae319e253d69ba42fafcf files/digest-sqlite-2.8.13 65
-SHA256 0c7ba7bc19dc6b8083821e88551cac763de71a430b9f75dd6a6ca64c25d93458 files/digest-sqlite-2.8.13 65
-MD5 c9c200833c7c14eb4d750bb00455199e files/digest-sqlite-2.8.14 65
-RMD160 b6d73d1c76d5031d2bcc67d745def6d9b077b927 files/digest-sqlite-2.8.14 65
-SHA256 8debd85b1a100c3489306cf0cbd79a2d23d49f7f33c9cded4d431927c001c87e files/digest-sqlite-2.8.14 65
+MD5 7ba7d0e5a7f6502ad56879591c436bf0 ChangeLog 14763
+RMD160 88ce9d9a9252674c5e25ed61e9dcd1d349d9d3e8 ChangeLog 14763
+SHA256 150bf716203592a7e063e4ad054a1aa30996f87fd18b5a36c2db4f78bfce1fa1 ChangeLog 14763
 MD5 b4031f19b8a32fa2b9dd4dfaf4b57ad0 files/digest-sqlite-2.8.15 65
 RMD160 2c54ae05b013f8c53d0e417c07d9deb0f344e62c files/digest-sqlite-2.8.15 65
 SHA256 89ab258b0a2ec863541bac45f9230242ea584591acbbbdfde3894c24d5b373f1 files/digest-sqlite-2.8.15 65
 MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r1 65
 RMD160 5e197ac33e016d443dd5446d5c834e2d077afc1a files/digest-sqlite-2.8.16-r1 65
 SHA256 c2668d0e0c28c531b504694a8103ef9639a84c567ee5fde9e5cdbc4aa6151b3a files/digest-sqlite-2.8.16-r1 65
-MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r2 65
-RMD160 5e197ac33e016d443dd5446d5c834e2d077afc1a files/digest-sqlite-2.8.16-r2 65
-SHA256 c2668d0e0c28c531b504694a8103ef9639a84c567ee5fde9e5cdbc4aa6151b3a files/digest-sqlite-2.8.16-r2 65
 MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r3 65
 RMD160 5e197ac33e016d443dd5446d5c834e2d077afc1a files/digest-sqlite-2.8.16-r3 65
 SHA256 c2668d0e0c28c531b504694a8103ef9639a84c567ee5fde9e5cdbc4aa6151b3a files/digest-sqlite-2.8.16-r3 65
 MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r3 65
 RMD160 457e870ca1af5e4216c4647ce803812f92e34d1b files/digest-sqlite-3.2.1-r3 65
 SHA256 4975d96cd18ba9b3d5c601a19ea81fde847f6f7727c7d5f86f65703b9c894234 files/digest-sqlite-3.2.1-r3 65
-MD5 b30bbb90979fff71122f08b8cbee4013 files/digest-sqlite-3.2.7 65
-RMD160 e945aa79241e41d949bc1cde7727755e1f00467b files/digest-sqlite-3.2.7 65
-SHA256 211dc542fb8398a38c1f70f159c2632175c9f7cf869c1f699eb4bf74a4949b78 files/digest-sqlite-3.2.7 65
 MD5 b30bbb90979fff71122f08b8cbee4013 files/digest-sqlite-3.2.7-r1 65
 RMD160 e945aa79241e41d949bc1cde7727755e1f00467b files/digest-sqlite-3.2.7-r1 65
 SHA256 211dc542fb8398a38c1f70f159c2632175c9f7cf869c1f699eb4bf74a4949b78 files/digest-sqlite-3.2.7-r1 65
-MD5 964e2a0bb38e1ec5b8be6459970b55b9 files/digest-sqlite-3.3.3 65
-RMD160 7633d83fb34262e47c989653ff973545ccb61e3a files/digest-sqlite-3.3.3 65
-SHA256 762088197889819460f9d35e7ce51e7e8da2bb0b42b16814ce3cfe0bd6549fca files/digest-sqlite-3.3.3 65
-MD5 964e2a0bb38e1ec5b8be6459970b55b9 files/digest-sqlite-3.3.3-r1 65
-RMD160 7633d83fb34262e47c989653ff973545ccb61e3a files/digest-sqlite-3.3.3-r1 65
-SHA256 762088197889819460f9d35e7ce51e7e8da2bb0b42b16814ce3cfe0bd6549fca files/digest-sqlite-3.3.3-r1 65
 MD5 604c8f3b91fdaffa9ed1b971e7a6c563 files/digest-sqlite-3.3.4 241
 RMD160 5c11a1d8016f6da4596dadf5de57268d8f7238b3 files/digest-sqlite-3.3.4 241
 SHA256 d292f7febacab9b7aaafba37dc0b80e86ad0405a7069964148138f140a5e2224 files/digest-sqlite-3.3.4 241
+MD5 13dd48aa4038e5b5f30fee8f04961702 files/digest-sqlite-3.3.5 241
+RMD160 11f2591a398d66b08427c15bb05e6c42bda11b2e files/digest-sqlite-3.3.5 241
+SHA256 7df838b716f888b046669bcdb56533c9015172b269212fd91fee98793d7e00aa files/digest-sqlite-3.3.5 241
 MD5 d0fc4c53a61d386992d16680140548d0 files/maketcllib.sh 879
 RMD160 6d9a0e79a79d5a2efd6074e6b439d4634600980e files/maketcllib.sh 879
 SHA256 e101ed11d908bfb7f57519a99674160b0273d6500d191f758f8a0d1e6ed78120 files/maketcllib.sh 879
@@ -79,21 +64,12 @@ SHA256 5006350e728787794ec4fe89b5772bbc068efb98f176abe93d83a9e9c5e5b5be files/sq
 MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
 RMD160 393ad11a7ed92426bb0c3e44f9bf3a9d4e25246e metadata.xml 215
 SHA256 268bcaa7dbd534b681bc5b342c38bf491e083f641ef426a86976086ef2e23358 metadata.xml 215
-MD5 fdbecebdb331496cd81f02ea4487e430 sqlite-2.8.13.ebuild 843
-RMD160 581142d5692612573eb073350b2c81dbe5b11e8e sqlite-2.8.13.ebuild 843
-SHA256 9f0b678ee79888e13526158d2f68844eb2748e9a4e2014b0f587171fdc20f3e9 sqlite-2.8.13.ebuild 843
-MD5 99bf2a671c91f7499255003439d5eac0 sqlite-2.8.14.ebuild 862
-RMD160 c50fc653731b8ed61e0441b8f289889298a03976 sqlite-2.8.14.ebuild 862
-SHA256 0ca899afad13683f23e9657ca22e379d4df628686754a00346df28847a049174 sqlite-2.8.14.ebuild 862
 MD5 bd439cea4f334f6d1aa57eed87c251ca sqlite-2.8.15.ebuild 982
 RMD160 d8e0ef58c28c6f9e9bf8456238c5bf2b124a3be9 sqlite-2.8.15.ebuild 982
 SHA256 fae861b41efa07f6793fbe462149671b7922d3eb1af821a1da2b171339496459 sqlite-2.8.15.ebuild 982
 MD5 7882c50758ad52018f654a9fe3c0f316 sqlite-2.8.16-r1.ebuild 1785
 RMD160 943345441d414fa1101af1422ddad3c4de93eb54 sqlite-2.8.16-r1.ebuild 1785
 SHA256 49304e796ce80b24a1a0fafc699ba88e07fd87966cc5417367ad417ab0c82aa9 sqlite-2.8.16-r1.ebuild 1785
-MD5 a128a8faa4099cc920954ef2865a30b8 sqlite-2.8.16-r2.ebuild 1843
-RMD160 1fd2975790c9038e0a696bda733b05bfd4edba2e sqlite-2.8.16-r2.ebuild 1843
-SHA256 252bb3621d2b35ef7212c94b5c70f69fceae43d421e944b19b6b26cc676f7bee sqlite-2.8.16-r2.ebuild 1843
 MD5 0004549fec7752b4669d3f4f7f550f7d sqlite-2.8.16-r3.ebuild 2379
 RMD160 87ddac58c5008d40bec1868391159d75978f8bb7 sqlite-2.8.16-r3.ebuild 2379
 SHA256 3fb5942f5b57f8254568e6153f74b88c06242992f8b01c4b6ed9dbab53c37091 sqlite-2.8.16-r3.ebuild 2379
@@ -103,15 +79,9 @@ SHA256 079e2b16556b66114cccd005c4f3568bcf7076713a0b977c418d3d2c18fcbfa8 sqlite-3
 MD5 7eee6b1abc84d8dc4188e7fe52080359 sqlite-3.2.7-r1.ebuild 1604
 RMD160 0436f775bf64aede506bd1e4b0c1f7c85c633201 sqlite-3.2.7-r1.ebuild 1604
 SHA256 166b9954dc551ab0a1c806a295d2c3d3052d040188277f841a8a4aa5a27204a8 sqlite-3.2.7-r1.ebuild 1604
-MD5 48e1d74027ff233b6e0aee6f346fa82b sqlite-3.2.7.ebuild 1552
-RMD160 02ec8e8fe4f2c4686dc5161faeea09ad16c7cff2 sqlite-3.2.7.ebuild 1552
-SHA256 fed440f526942a897c5e25a5c1a453c35b87bda43eab0f6ee9097cb0d1c0b4ab sqlite-3.2.7.ebuild 1552
-MD5 dff02d524f00d079fe6145f5ce1ab648 sqlite-3.3.3-r1.ebuild 2135
-RMD160 ea1fad7a696d5eed4f6f028df74d08c3ad71850a sqlite-3.3.3-r1.ebuild 2135
-SHA256 d6d191f4a80abd13c0f82870c51ac16740390eb47ffbdf3c302397c9cf07e815 sqlite-3.3.3-r1.ebuild 2135
-MD5 4be9905d44577a6954e6eaae03d8a3b3 sqlite-3.3.3.ebuild 1598
-RMD160 f0e89ea8de0e413fc0478be046ead6935dc4db1d sqlite-3.3.3.ebuild 1598
-SHA256 d3dbcd3a17662e142b0cca53ed4ca9e282b02c16888664ff7adae1ffed603140 sqlite-3.3.3.ebuild 1598
 MD5 2769c18044507b4ef0029d805275c012 sqlite-3.3.4.ebuild 2138
 RMD160 7bbeaddb44666b10634f863b44d1046b8cd7efc7 sqlite-3.3.4.ebuild 2138
 SHA256 682ea3b53c05156b23f0701008b3b0d32e50f1cdd51ab76b8231ebc08cf3aa5e sqlite-3.3.4.ebuild 2138
+MD5 9d84d52ff14869b1b3434def76d46121 sqlite-3.3.5.ebuild 2138
+RMD160 a13fdecd1203e1718e43fdda57029ae605799dcf sqlite-3.3.5.ebuild 2138
+SHA256 837a0e1afee48e19e4077b01d18c55a9ea75d7e98811f34e5418ba1546d31f25 sqlite-3.3.5.ebuild 2138
diff --git a/dev-db/sqlite/files/digest-sqlite-2.8.13 b/dev-db/sqlite/files/digest-sqlite-2.8.13
deleted file mode 100644
index 046ad1f4d699..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-2.8.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 628fa52b5580b38ade75985dd4ba46dd sqlite-2.8.13.tar.gz 956008
diff --git a/dev-db/sqlite/files/digest-sqlite-2.8.14 b/dev-db/sqlite/files/digest-sqlite-2.8.14
deleted file mode 100644
index a6b4591d723a..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-2.8.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 113ce31cc31e0ab671bab590122e272a sqlite-2.8.14.tar.gz 955231
diff --git a/dev-db/sqlite/files/digest-sqlite-2.8.16-r2 b/dev-db/sqlite/files/digest-sqlite-2.8.16-r2
deleted file mode 100644
index f63e1aac46f1..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-2.8.16-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c79b461ff30240a6f9d70dd67f8faea sqlite-2.8.16.tar.gz 981834
diff --git a/dev-db/sqlite/files/digest-sqlite-3.2.7 b/dev-db/sqlite/files/digest-sqlite-3.2.7
deleted file mode 100644
index 5bb8bb3f1a83..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34c92821b3b46380f192c0aaf2b2b217 sqlite-3.2.7.tar.gz 1521075
diff --git a/dev-db/sqlite/files/digest-sqlite-3.3.3 b/dev-db/sqlite/files/digest-sqlite-3.3.3
deleted file mode 100644
index 0db440ade028..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb5d9d7e7853b3af78e767d709b7fced sqlite-3.3.3.tar.gz 1642834
diff --git a/dev-db/sqlite/files/digest-sqlite-3.3.3-r1 b/dev-db/sqlite/files/digest-sqlite-3.3.3-r1
deleted file mode 100644
index 0db440ade028..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.3.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb5d9d7e7853b3af78e767d709b7fced sqlite-3.3.3.tar.gz 1642834
diff --git a/dev-db/sqlite/files/digest-sqlite-3.3.5 b/dev-db/sqlite/files/digest-sqlite-3.3.5
new file mode 100644
index 000000000000..12d99a9330a8
--- /dev/null
+++ b/dev-db/sqlite/files/digest-sqlite-3.3.5
@@ -0,0 +1,3 @@
+MD5 dd2a7b6f2a07a4403a0b5e17e8ed5b88 sqlite-3.3.5.tar.gz 1651536
+RMD160 7dd7c1d2a2f10132a4ef0f6972ddca4d5767b9d6 sqlite-3.3.5.tar.gz 1651536
+SHA256 e81d1176960a14459f9ff492b2c4fb1e2b55d0b2c82fd225dbc37afd02334256 sqlite-3.3.5.tar.gz 1651536
diff --git a/dev-db/sqlite/sqlite-2.8.13.ebuild b/dev-db/sqlite/sqlite-2.8.13.ebuild
deleted file mode 100644
index 8088e315b48b..000000000000
--- a/dev-db/sqlite/sqlite-2.8.13.ebuild
+++ /dev/null
@@ -1,35 +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-2.8.13.ebuild,v 1.6 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="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha mips hppa ppc64"
-
-src_compile() {
-	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-2.8.14.ebuild b/dev-db/sqlite/sqlite-2.8.14.ebuild
deleted file mode 100644
index 736ff0ea7fcc..000000000000
--- a/dev-db/sqlite/sqlite-2.8.14.ebuild
+++ /dev/null
@@ -1,35 +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-2.8.14.ebuild,v 1.9 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="0"
-LICENSE="as-is"
-KEYWORDS="x86 ~ppc sparc alpha arm ~mips ~hppa ~ppc64 amd64 ia64"
-
-src_compile() {
-	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-2.8.16-r2.ebuild b/dev-db/sqlite/sqlite-2.8.16-r2.ebuild
deleted file mode 100644
index 677eb1ecbc77..000000000000
--- a/dev-db/sqlite/sqlite-2.8.16-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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-r2.ebuild,v 1.3 2006/01/14 18:19:29 vapier 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() {
-	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`"
-	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_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/lib/tclsqlite${PV}
-	cp ${S}/tclsqlite.so ${D}/usr/lib/tclsqlite${PV}/
-	cp ${S}/pkgIndex.tcl ${D}/usr/lib/tclsqlite${PV}/
-	fi
-}
diff --git a/dev-db/sqlite/sqlite-3.2.7.ebuild b/dev-db/sqlite/sqlite-3.2.7.ebuild
deleted file mode 100644
index 933ed0597e92..000000000000
--- a/dev-db/sqlite/sqlite-3.2.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.2.7.ebuild,v 1.4 2006/01/14 18:19:29 vapier 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"
-
-DEPEND="virtual/libc
-	doc? ( dev-lang/tcl )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${P}
-	epatch ${FILESDIR}/sqlite-3.2.1-tcl-fix.patch
-	epunt_cxx
-}
-
-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
-}
diff --git a/dev-db/sqlite/sqlite-3.3.3.ebuild b/dev-db/sqlite/sqlite-3.3.3.ebuild
deleted file mode 100644
index e26f9c8488b8..000000000000
--- a/dev-db/sqlite/sqlite-3.3.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.ebuild,v 1.1 2006/02/02 18:24:59 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"
-
-DEPEND="virtual/libc
-	doc? ( dev-lang/tcl )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${P}
-	epatch ${FILESDIR}/sqlite-3.2.1-tcl-fix.patch
-	epunt_cxx
-}
-
-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
-
-	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
-}
diff --git a/dev-db/sqlite/sqlite-3.3.3-r1.ebuild b/dev-db/sqlite/sqlite-3.3.5.ebuild
index 10ca9dc50291..4b3beed85566 100644
--- a/dev-db/sqlite/sqlite-3.3.3-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.5.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.5.ebuild,v 1.1 2006/04/12 19:40:04 arj Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ src_unpack() {
 
 	cd ${P}
 	epatch ${FILESDIR}/sqlite-3.3.3-tcl-fix.patch
-	epatch ${FILESDIR}/sqlite-3-test-fix.patch
+	epatch ${FILESDIR}/sqlite-3-test-fix-3.3.4.patch
 
 	epatch ${FILESDIR}/sandbox-fix1.patch
 	epatch ${FILESDIR}/sandbox-fix2.patch