USE flag change. tcltk -> tcl per bug #17808

Package-Manager: portage-2.1.1_pre3-r5

9 files changed, 89 insertions, 84 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 3dd7beadbabb..e3b5b6691c12 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.119 2006/07/22 20:25:32 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.120 2006/07/28 19:28:30 cardoe Exp $
+
+  28 Jul 2006; <dougg@gentoo.org> sqlite-2.8.16-r1.ebuild,
+  sqlite-2.8.16-r3.ebuild, sqlite-2.8.16-r4.ebuild, sqlite-3.3.4.ebuild,
+  sqlite-3.3.5.ebuild, sqlite-3.3.5-r1.ebuild, sqlite-3.3.6.ebuild:
+  USE flag change. tcltk -> tcl per bug #17808
 
   22 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   sqlite-2.8.16-r4.ebuild, sqlite-3.3.5-r1.ebuild:
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 57123a3ced13..80136f2d90a7 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -56,23 +56,23 @@ DIST sqlite-3.2.1.tar.gz 1351842 RMD160 3b4cfc1fca27d4df369220d15eb5e28777bd99da
 DIST sqlite-3.2.7.tar.gz 1521075
 DIST sqlite-3.3.4.tar.gz 1644139 RMD160 09ef8bc8bd21ff96ebcba4053f8d18b7276bedca SHA256 e61f85a18443cad333257f8d8fd4c211a4c4ffd9bf66b36c4050fa7207f8898a
 DIST sqlite-3.3.5.tar.gz 1651536 RMD160 7dd7c1d2a2f10132a4ef0f6972ddca4d5767b9d6 SHA1 015fe7b3992c9db97bb40cfd9958b31d457f7c33 SHA256 e81d1176960a14459f9ff492b2c4fb1e2b55d0b2c82fd225dbc37afd02334256
-DIST sqlite-3.3.6.tar.gz 1671437 RMD160 37d140d5670b39a7da79f9f3d2ac31c521d90676 SHA256 32be612f762338fa61ec41a566ca56fb989416df99380acadbf37a5e16a05796
+DIST sqlite-3.3.6.tar.gz 1671437 RMD160 37d140d5670b39a7da79f9f3d2ac31c521d90676 SHA1 0db38ab2df86946a5059f09b6a8758026d9eab59 SHA256 32be612f762338fa61ec41a566ca56fb989416df99380acadbf37a5e16a05796
 EBUILD sqlite-2.8.15.ebuild 982 RMD160 d8e0ef58c28c6f9e9bf8456238c5bf2b124a3be9 SHA1 d089f8f1b0244740f3013466582f9f91dfcef37a SHA256 fae861b41efa07f6793fbe462149671b7922d3eb1af821a1da2b171339496459
 MD5 bd439cea4f334f6d1aa57eed87c251ca sqlite-2.8.15.ebuild 982
 RMD160 d8e0ef58c28c6f9e9bf8456238c5bf2b124a3be9 sqlite-2.8.15.ebuild 982
 SHA256 fae861b41efa07f6793fbe462149671b7922d3eb1af821a1da2b171339496459 sqlite-2.8.15.ebuild 982
-EBUILD sqlite-2.8.16-r1.ebuild 1785 RMD160 faaecf13c8e4a05091808d33355515b6216e7e0d SHA1 0dc3d9d342ab14c0d0725c51ec16cfa45cffa29f SHA256 ae7d1cc05e9976dbb6bcfe7775bdea56bbf94ebf719078771d874fea367e5b20
-MD5 f76eae0621d0f5fd0149ad9108554d8d sqlite-2.8.16-r1.ebuild 1785
-RMD160 faaecf13c8e4a05091808d33355515b6216e7e0d sqlite-2.8.16-r1.ebuild 1785
-SHA256 ae7d1cc05e9976dbb6bcfe7775bdea56bbf94ebf719078771d874fea367e5b20 sqlite-2.8.16-r1.ebuild 1785
-EBUILD sqlite-2.8.16-r3.ebuild 2551 RMD160 6f6704125155f42162e79945285e7c1f4ad4a031 SHA1 09e0747179a62fd7dee14bbcf0a5276ebd2288e8 SHA256 f856c3ec4f43760981b0b79b584810bdac53d51a234d32dcdb39247b34a5fa91
-MD5 2d100831520cc48f3fb2ef7d88405b40 sqlite-2.8.16-r3.ebuild 2551
-RMD160 6f6704125155f42162e79945285e7c1f4ad4a031 sqlite-2.8.16-r3.ebuild 2551
-SHA256 f856c3ec4f43760981b0b79b584810bdac53d51a234d32dcdb39247b34a5fa91 sqlite-2.8.16-r3.ebuild 2551
-EBUILD sqlite-2.8.16-r4.ebuild 2559 RMD160 d8b12167bf15e611f353ba0431f409fbe37b8b98 SHA1 c05e768cb37a88fa0b35fa77af15d1aecd6a646d SHA256 ea68563411aa8a36157fafd33f1f71f96e21e11f617da6dc400b7c7ebc9b1d03
-MD5 21610ba737fa67bf8786402e68828bee sqlite-2.8.16-r4.ebuild 2559
-RMD160 d8b12167bf15e611f353ba0431f409fbe37b8b98 sqlite-2.8.16-r4.ebuild 2559
-SHA256 ea68563411aa8a36157fafd33f1f71f96e21e11f617da6dc400b7c7ebc9b1d03 sqlite-2.8.16-r4.ebuild 2559
+EBUILD sqlite-2.8.16-r1.ebuild 1776 RMD160 c22f3e9c70a14704881ca7f723180fc74a2ae88e SHA1 24106b007c195b0735ef1ab6b692b295f0653b4a SHA256 c605c40224fb7e08c6cd6b9ee9bb7ba4aec4e0e1eed9f1872675ef6233fbe746
+MD5 bd637155ee248397472a39101bee146c sqlite-2.8.16-r1.ebuild 1776
+RMD160 c22f3e9c70a14704881ca7f723180fc74a2ae88e sqlite-2.8.16-r1.ebuild 1776
+SHA256 c605c40224fb7e08c6cd6b9ee9bb7ba4aec4e0e1eed9f1872675ef6233fbe746 sqlite-2.8.16-r1.ebuild 1776
+EBUILD sqlite-2.8.16-r3.ebuild 2536 RMD160 030c33c278ac63f0dbf731128e56324cf620bc91 SHA1 3da9b70b9f59d415272dcc8f1ce2b591396a5adb SHA256 6eca2fdadf1095ff44b0d33efdee46fc32036430d8f5be701dceec8d432f7f32
+MD5 4bb66458fed8a1ca837a871a89b0c457 sqlite-2.8.16-r3.ebuild 2536
+RMD160 030c33c278ac63f0dbf731128e56324cf620bc91 sqlite-2.8.16-r3.ebuild 2536
+SHA256 6eca2fdadf1095ff44b0d33efdee46fc32036430d8f5be701dceec8d432f7f32 sqlite-2.8.16-r3.ebuild 2536
+EBUILD sqlite-2.8.16-r4.ebuild 2539 RMD160 029d364ee3cbf007faeac93e7197d142ebe7e1bd SHA1 3be7851802eb792fe2148b2284338a21754db3f2 SHA256 afe5d64fd2970b63e6a4ce2fb96c8fcafe443dfad23fce61770b82991a73ef23
+MD5 133898347620b720bbd984a1cb35891b sqlite-2.8.16-r4.ebuild 2539
+RMD160 029d364ee3cbf007faeac93e7197d142ebe7e1bd sqlite-2.8.16-r4.ebuild 2539
+SHA256 afe5d64fd2970b63e6a4ce2fb96c8fcafe443dfad23fce61770b82991a73ef23 sqlite-2.8.16-r4.ebuild 2539
 EBUILD sqlite-3.2.1-r3.ebuild 1576 RMD160 6658f320844f1a7041f824ae26c04fc894232dbd SHA1 b16d51aa290ee6a817ea376f8f459ce9b81d5193 SHA256 079e2b16556b66114cccd005c4f3568bcf7076713a0b977c418d3d2c18fcbfa8
 MD5 1041e20dae935fba256ac55ae98601b4 sqlite-3.2.1-r3.ebuild 1576
 RMD160 6658f320844f1a7041f824ae26c04fc894232dbd sqlite-3.2.1-r3.ebuild 1576
@@ -81,26 +81,26 @@ EBUILD sqlite-3.2.7-r1.ebuild 1604 RMD160 0436f775bf64aede506bd1e4b0c1f7c85c6332
 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
-EBUILD sqlite-3.3.4.ebuild 2306 RMD160 aeae20ce8b4464feb97540aaf8607d16ff6671c5 SHA1 8c6048e4128006a2627d9458af1448e4d00a84d4 SHA256 165f2463626637452e34ffc8452362e959dca01b3e603f2b9acd91624b3d4ea2
-MD5 fd33cd4b9cb29f7af9c0b70e4e9c4aa3 sqlite-3.3.4.ebuild 2306
-RMD160 aeae20ce8b4464feb97540aaf8607d16ff6671c5 sqlite-3.3.4.ebuild 2306
-SHA256 165f2463626637452e34ffc8452362e959dca01b3e603f2b9acd91624b3d4ea2 sqlite-3.3.4.ebuild 2306
-EBUILD sqlite-3.3.5-r1.ebuild 2271 RMD160 a3eb3980d99e6419e5e8d786d2867ca18963bf76 SHA1 e5e21e5c25dc43cb6d6eae6670c56ac74fea57bf SHA256 8f55e93b468a745b46b9a019d6f717e773681dd568c3806d001160a1ae62398c
-MD5 0222086fbe83288b9509e04a14106fb5 sqlite-3.3.5-r1.ebuild 2271
-RMD160 a3eb3980d99e6419e5e8d786d2867ca18963bf76 sqlite-3.3.5-r1.ebuild 2271
-SHA256 8f55e93b468a745b46b9a019d6f717e773681dd568c3806d001160a1ae62398c sqlite-3.3.5-r1.ebuild 2271
-EBUILD sqlite-3.3.5.ebuild 2273 RMD160 4790ca21b11bd387ad1af1144c39a63b2306a0f0 SHA1 7707076a1b54d97788a1e1fa994343c1bd86d24d SHA256 d87d1feba1194a6ea87314de2a3a54715efeed3916666746109fc74e7d4b40c8
-MD5 a8415ee707474913286926b3106b3e95 sqlite-3.3.5.ebuild 2273
-RMD160 4790ca21b11bd387ad1af1144c39a63b2306a0f0 sqlite-3.3.5.ebuild 2273
-SHA256 d87d1feba1194a6ea87314de2a3a54715efeed3916666746109fc74e7d4b40c8 sqlite-3.3.5.ebuild 2273
-EBUILD sqlite-3.3.6.ebuild 2277 RMD160 c1078fa44d6578e09216a90922136d6fc9d8a746 SHA1 3932bdceb29c6559c140c08d42cd7244cd22e310 SHA256 23114aeae3643ee7976bbe82febe9c17b7604ef7460fc0d5d1ea8ddc0d8ba0ac
-MD5 9eb810105dce0268f9ca90e583a2008a sqlite-3.3.6.ebuild 2277
-RMD160 c1078fa44d6578e09216a90922136d6fc9d8a746 sqlite-3.3.6.ebuild 2277
-SHA256 23114aeae3643ee7976bbe82febe9c17b7604ef7460fc0d5d1ea8ddc0d8ba0ac sqlite-3.3.6.ebuild 2277
-MISC ChangeLog 16955 RMD160 03721f64f54dedc2dc3426868edc33b0d9b85737 SHA1 7807d547ab1f52faf11f6b5fd4f35bb7dafaf9fa SHA256 aebea379b97bb1a37b0899ea5a4c0c0a0d658f402e04a2c0069b1cb0cd33b3ce
-MD5 07e836b373894a50133424fbaf09c875 ChangeLog 16955
-RMD160 03721f64f54dedc2dc3426868edc33b0d9b85737 ChangeLog 16955
-SHA256 aebea379b97bb1a37b0899ea5a4c0c0a0d658f402e04a2c0069b1cb0cd33b3ce ChangeLog 16955
+EBUILD sqlite-3.3.4.ebuild 2293 RMD160 f149621150203cf7ad3d942c425407f8a05b0fa0 SHA1 e663dfd514f1a6e8ac1687d56eb8be9fbe2e346b SHA256 2b3af5db614afaa19ec68df568e1a6d993680c03662d01a2a2b061e0a8507a30
+MD5 357bd9a4fff48b61b94903726b391c08 sqlite-3.3.4.ebuild 2293
+RMD160 f149621150203cf7ad3d942c425407f8a05b0fa0 sqlite-3.3.4.ebuild 2293
+SHA256 2b3af5db614afaa19ec68df568e1a6d993680c03662d01a2a2b061e0a8507a30 sqlite-3.3.4.ebuild 2293
+EBUILD sqlite-3.3.5-r1.ebuild 2255 RMD160 dc419a0e4b1238405ff01a5f17ddd3ecc3a2ede8 SHA1 7096770781cce90664740ac99e267c87752d6561 SHA256 1aec4fd62b569acb7c77c14fb5fb6e0f38753144d8cc1de2ef7523f1dc58769e
+MD5 b820e33fc14ee603596297cdcb0ebd52 sqlite-3.3.5-r1.ebuild 2255
+RMD160 dc419a0e4b1238405ff01a5f17ddd3ecc3a2ede8 sqlite-3.3.5-r1.ebuild 2255
+SHA256 1aec4fd62b569acb7c77c14fb5fb6e0f38753144d8cc1de2ef7523f1dc58769e sqlite-3.3.5-r1.ebuild 2255
+EBUILD sqlite-3.3.5.ebuild 2260 RMD160 5a5f79bfb1b2620199c69842bbb15862cfcc9ee7 SHA1 813397585ccf80fc7f2029c9c61bbecdeb05332e SHA256 6353349325c67960d8d82dc35dd0fc3adcd7aea727cd7b81eea467394c842a0c
+MD5 c12a00648a9f6f0db731803717cac83c sqlite-3.3.5.ebuild 2260
+RMD160 5a5f79bfb1b2620199c69842bbb15862cfcc9ee7 sqlite-3.3.5.ebuild 2260
+SHA256 6353349325c67960d8d82dc35dd0fc3adcd7aea727cd7b81eea467394c842a0c sqlite-3.3.5.ebuild 2260
+EBUILD sqlite-3.3.6.ebuild 2263 RMD160 31fba075e736574d5c651df8ae58a46f508552ab SHA1 d6fb7e456bd3c1158f32ad79642be11ede7394f1 SHA256 60f6c56a0a8f2e58a83dff4a2e81f51c477ad3ea643ebcc91b0fe3317e34b4fe
+MD5 9ac78f50624f5a9d71b1586db680ff76 sqlite-3.3.6.ebuild 2263
+RMD160 31fba075e736574d5c651df8ae58a46f508552ab sqlite-3.3.6.ebuild 2263
+SHA256 60f6c56a0a8f2e58a83dff4a2e81f51c477ad3ea643ebcc91b0fe3317e34b4fe sqlite-3.3.6.ebuild 2263
+MISC ChangeLog 17199 RMD160 01f8d58ea9f306b9b8ec57af653b10e9a7c611d0 SHA1 47fad414f90f049eb9073a96c10a092f84a950a4 SHA256 c51c86ac979116251721dbab848aad6780c8667df8950ef6000cee52cbc1e799
+MD5 6f1bd554dce0bb740852bb1afac850ec ChangeLog 17199
+RMD160 01f8d58ea9f306b9b8ec57af653b10e9a7c611d0 ChangeLog 17199
+SHA256 c51c86ac979116251721dbab848aad6780c8667df8950ef6000cee52cbc1e799 ChangeLog 17199
 MISC metadata.xml 215 RMD160 393ad11a7ed92426bb0c3e44f9bf3a9d4e25246e SHA1 8e66d2013069e51e4e703d4fd56d35342ac4a76d SHA256 268bcaa7dbd534b681bc5b342c38bf491e083f641ef426a86976086ef2e23358
 MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
 RMD160 393ad11a7ed92426bb0c3e44f9bf3a9d4e25246e metadata.xml 215
diff --git a/dev-db/sqlite/sqlite-2.8.16-r1.ebuild b/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
index 2ea337cf4850..4b4d3d8d9f0c 100644
--- a/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.16-r1.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-2.8.16-r1.ebuild,v 1.12 2006/06/11 18:28:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r1.ebuild,v 1.13 2006/07/28 19:28:30 cardoe Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,10 +11,10 @@ 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"
+IUSE="nls doc tcl"
 
 DEPEND="doc? ( dev-lang/tcl )
-	tcltk? ( dev-lang/tcl )"
+	tcl? ( dev-lang/tcl )"
 
 src_unpack() {
 	unpack ${A}
@@ -53,7 +53,7 @@ src_compile() {
 	emake doc || die
 	fi
 
-	if use tcltk; then
+	if use tcl; then
 	cp -P ${FILESDIR}/maketcllib.sh ${S}
 	chmod +x ./maketcllib.sh
 	./maketcllib.sh
@@ -74,7 +74,7 @@ src_install () {
 	dohtml doc/*.html doc/*.txt doc/*.png
 	fi
 
-	if use tcltk; then
+	if use tcl; 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}/
diff --git a/dev-db/sqlite/sqlite-2.8.16-r3.ebuild b/dev-db/sqlite/sqlite-2.8.16-r3.ebuild
index 4351ddd16d58..350d000a524c 100644
--- a/dev-db/sqlite/sqlite-2.8.16-r3.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.16-r3.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-2.8.16-r3.ebuild,v 1.3 2006/05/06 20:46:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r3.ebuild,v 1.4 2006/07/28 19:28:30 cardoe Exp $
 
 inherit eutils toolchain-funcs alternatives
 
@@ -12,10 +12,10 @@ 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"
+IUSE="nls doc tcl"
 
 DEPEND="doc? ( dev-lang/tcl )
-	tcltk? ( dev-lang/tcl )"
+	tcl? ( dev-lang/tcl )"
 
 SOURCE="/usr/bin/lemon"
 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
@@ -27,8 +27,8 @@ src_unpack() {
 			ewarn "The userpriv feature must be enabled to run tests."
 			ewarn "The testsuite will be skipped."
 		fi
-		if ! use tcltk; then
-			ewarn "The tcltk useflag must be enabled to run tests."
+		if ! use tcl; then
+			ewarn "The tcl useflag must be enabled to run tests."
 			ewarn "The testsuite will be skipped."
 		fi
 	fi
@@ -61,7 +61,7 @@ src_compile() {
 	myconf="--enable-incore-db --enable-tempdb-in-ram"
 	myconf="${myconf} `use_enable nls utf8`"
 
-	if ! use tcltk; then
+	if ! use tcl; then
 		myconf="${myconf} --without-tcl"
 	fi
 
@@ -72,7 +72,7 @@ src_compile() {
 		emake doc || die
 	fi
 
-	if use tcltk; then
+	if use tcl; then
 		cp -P ${FILESDIR}/maketcllib.sh ${S}
 		chmod +x ./maketcllib.sh
 		./maketcllib.sh
@@ -106,7 +106,7 @@ src_install () {
 		dohtml doc/*.html doc/*.txt doc/*.png
 	fi
 
-	if use tcltk; then
+	if use tcl; 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}/
diff --git a/dev-db/sqlite/sqlite-2.8.16-r4.ebuild b/dev-db/sqlite/sqlite-2.8.16-r4.ebuild
index ec690760f2a4..cae94012a507 100644
--- a/dev-db/sqlite/sqlite-2.8.16-r4.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.16-r4.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-2.8.16-r4.ebuild,v 1.7 2006/07/22 20:25:32 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild,v 1.8 2006/07/28 19:28:30 cardoe Exp $
 
 inherit eutils toolchain-funcs alternatives
 
@@ -12,10 +12,10 @@ 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 ~x86-fbsd"
-IUSE="nls doc tcltk"
+IUSE="nls doc tcl"
 
 DEPEND="doc? ( dev-lang/tcl )
-	tcltk? ( dev-lang/tcl )"
+	tcl? ( dev-lang/tcl )"
 
 SOURCE="/usr/bin/lemon"
 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
@@ -27,8 +27,8 @@ src_unpack() {
 			ewarn "The userpriv feature must be enabled to run tests."
 			ewarn "The testsuite will be skipped."
 	fi
-		if ! use tcltk; then
-			ewarn "The tcltk useflag must be enabled to run tests."
+		if ! use tcl; then
+			ewarn "The tcl useflag must be enabled to run tests."
 			ewarn "The testsuite will be skipped."
 		fi
 	fi
@@ -61,7 +61,7 @@ src_compile() {
 	myconf="--enable-incore-db --enable-tempdb-in-ram"
 	myconf="${myconf} `use_enable nls utf8`"
 
-	if ! use tcltk; then
+	if ! use tcl; then
 		myconf="${myconf} --without-tcl"
 	fi
 
@@ -72,7 +72,7 @@ src_compile() {
 		emake doc || die
 	fi
 
-	if use tcltk; then
+	if use tcl; then
 		cp -P ${FILESDIR}/maketcllib.sh ${S}
 		chmod +x ./maketcllib.sh
 		./maketcllib.sh
@@ -80,7 +80,7 @@ src_compile() {
 }
 
 src_test() {
-	if use tcltk ; then
+	if use tcl ; then
 		if has userpriv ${FEATURES} ; then
 			einfo "sqlite 2.x is known to have problems on 64 bit architectures"
 			einfo "if you observe segmentation faults please use 3.x instead"
@@ -106,7 +106,7 @@ src_install () {
 		dohtml doc/*.html doc/*.txt doc/*.png
 	fi
 
-	if use tcltk; then
+	if use tcl; 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}/
diff --git a/dev-db/sqlite/sqlite-3.3.4.ebuild b/dev-db/sqlite/sqlite-3.3.4.ebuild
index c27d95b42406..4dd85cd1cc70 100644
--- a/dev-db/sqlite/sqlite-3.3.4.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.4.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.4.ebuild,v 1.3 2006/05/06 20:46:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.4.ebuild,v 1.4 2006/07/28 19:28:30 cardoe Exp $
 
 inherit eutils
 
@@ -11,11 +11,11 @@ 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"
+IUSE="nothreadsafe doc tcl debug"
 
 DEPEND="virtual/libc
 	doc? ( dev-lang/tcl )
-	tcltk? ( dev-lang/tcl )"
+	tcl? ( dev-lang/tcl )"
 
 src_unpack() {
 	# test
@@ -24,8 +24,8 @@ src_unpack() {
 			ewarn "The userpriv feature must be enabled to run tests."
 			ewarn "The testsuite will not be run."
 		fi
-		if ! use tcltk; then
-			ewarn "The tcltk useflag must be enabled to run tests."
+		if ! use tcl; then
+			ewarn "The tcl useflag must be enabled to run tests."
 			ewarn "The testsuite will not be run."
 		fi
 	fi
@@ -60,7 +60,7 @@ src_compile() {
 		myconf="${myconf} --disable-threadsafe"
 	fi
 
-	if ! use tcltk; then
+	if ! use tcl; then
 		myconf="${myconf} --disable-tcl"
 	fi
 
@@ -77,7 +77,7 @@ src_compile() {
 }
 
 src_test() {
-	if use tcltk ; then
+	if use tcl ; then
 		if has userpriv ${FEATURES} ; then
 			cd ${S}
 			if use debug; then
diff --git a/dev-db/sqlite/sqlite-3.3.5-r1.ebuild b/dev-db/sqlite/sqlite-3.3.5-r1.ebuild
index 0564503b5024..e3c9354e81e1 100644
--- a/dev-db/sqlite/sqlite-3.3.5-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.5-r1.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.5-r1.ebuild,v 1.8 2006/07/22 20:25:32 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.5-r1.ebuild,v 1.9 2006/07/28 19:28:30 cardoe Exp $
 
 inherit eutils alternatives
 
@@ -11,11 +11,11 @@ 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 ~x86"
-IUSE="nothreadsafe doc tcltk debug"
+IUSE="nothreadsafe doc tcl debug"
 
 DEPEND="virtual/libc
 	doc? ( dev-lang/tcl )
-	tcltk? ( dev-lang/tcl )"
+	tcl? ( dev-lang/tcl )"
 
 SOURCE="/usr/bin/lemon"
 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
@@ -27,8 +27,8 @@ src_unpack() {
 			ewarn "The userpriv feature must be enabled to run tests."
 			ewarn "Testsuite will not be run."
 		fi
-		if ! use tcltk; then
-			ewarn "The tcltk useflag must be enabled to run tests."
+		if ! use tcl; then
+			ewarn "The tcl useflag must be enabled to run tests."
 			ewarn "Testsuite will not be run."
 		fi
 	fi
@@ -59,7 +59,7 @@ src_compile() {
 		myconf="${myconf} --disable-threadsafe"
 	fi
 
-	if ! use tcltk; then
+	if ! use tcl; then
 		myconf="${myconf} --disable-tcl"
 	fi
 
@@ -76,7 +76,7 @@ src_compile() {
 }
 
 src_test() {
-	if use tcltk ; then
+	if use tcl ; then
 		if has usepriv ${FEATURES} ; then
 			cd ${S}
 			if use debug; then
diff --git a/dev-db/sqlite/sqlite-3.3.5.ebuild b/dev-db/sqlite/sqlite-3.3.5.ebuild
index 4428b1ffaebb..69b41a1e74c1 100644
--- a/dev-db/sqlite/sqlite-3.3.5.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.5.ebuild,v 1.5 2006/05/06 20:46:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.5.ebuild,v 1.6 2006/07/28 19:28:30 cardoe Exp $
 
 inherit eutils alternatives
 
@@ -11,11 +11,11 @@ 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"
+IUSE="nothreadsafe doc tcl debug"
 
 DEPEND="virtual/libc
 	doc? ( dev-lang/tcl )
-	tcltk? ( dev-lang/tcl )"
+	tcl? ( dev-lang/tcl )"
 
 SOURCE="/usr/bin/lemon"
 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
@@ -27,8 +27,8 @@ src_unpack() {
 			ewarn "The userpriv feature must be enabled to run tests."
 			ewarn "The testsuite will not be run.
 		fi
-		if ! use tcltk; then
-			ewarn "The tcltk useflag must be enabled to run tests."
+		if ! use tcl; then
+			ewarn "The tcl useflag must be enabled to run tests."
 			ewarn "The testsuite will not be run.
 		fi
 	fi
@@ -59,7 +59,7 @@ src_compile() {
 		myconf="${myconf} --disable-threadsafe"
 	fi
 
-	if ! use tcltk; then
+	if ! use tcl; then
 		myconf="${myconf} --disable-tcl"
 	fi
 
@@ -76,7 +76,7 @@ src_compile() {
 }
 
 src_test() {
-	if use tcltk ; then
+	if use tcl ; then
 		if has userpriv ${FEATURES} ; then
 			cd ${S}
 			if use debug; then
diff --git a/dev-db/sqlite/sqlite-3.3.6.ebuild b/dev-db/sqlite/sqlite-3.3.6.ebuild
index 5eaa3340c1ff..bae559019390 100644
--- a/dev-db/sqlite/sqlite-3.3.6.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.6.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.6.ebuild,v 1.2 2006/06/26 03:13:12 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.6.ebuild,v 1.3 2006/07/28 19:28:30 cardoe Exp $
 
 inherit eutils alternatives
 
@@ -11,11 +11,11 @@ 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 ~x86-fbsd"
-IUSE="nothreadsafe doc tcltk debug"
+IUSE="nothreadsafe doc tcl debug"
 
 DEPEND="virtual/libc
 	doc? ( dev-lang/tcl )
-	tcltk? ( dev-lang/tcl )"
+	tcl? ( dev-lang/tcl )"
 
 SOURCE="/usr/bin/lemon"
 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
@@ -27,8 +27,8 @@ src_unpack() {
 			ewarn "The userpriv feature must be enabled to run tests."
 			ewarn "Testsuite will not be run."
 		fi
-		if ! use tcltk; then
-			ewarn "The tcltk useflag must be enabled to run tests."
+		if ! use tcl; then
+			ewarn "The tcl useflag must be enabled to run tests."
 			ewarn "Testsuite will not be run."
 		fi
 	fi
@@ -59,7 +59,7 @@ src_compile() {
 		myconf="${myconf} --disable-threadsafe"
 	fi
 
-	if ! use tcltk; then
+	if ! use tcl; then
 		myconf="${myconf} --disable-tcl"
 	fi
 
@@ -76,7 +76,7 @@ src_compile() {
 }
 
 src_test() {
-	if use tcltk ; then
+	if use tcl ; then
 		if has usepriv ${FEATURES} ; then
 			cd ${S}
 			if use debug; then