Fix the rest of the ebuilds wrt tcl and test suite.

Package-Manager: portage-2.1.2.9

5 files changed, 60 insertions, 35 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 450c147e0af5..c5ce0569afba 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.150 2007/06/14 17:31:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.151 2007/06/14 17:37:58 betelgeuse Exp $
+
+  14 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  sqlite-2.8.16-r4.ebuild, sqlite-3.3.5-r1.ebuild, sqlite-3.3.12.ebuild:
+  Fix the rest of the ebuilds wrt tcl and test suite.
 
   14 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> sqlite-3.3.17.ebuild:
   Fix the test broken RESTRICT atom that Cardoe added. The tcl use flag must
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 77c8397cddd5..2af535a90129 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -41,26 +41,26 @@ DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136
 DIST sqlite-3.3.12.tar.gz 2021696 RMD160 98154b3e8663b6c7ec11a7094a51781ee8384317 SHA1 4c6e3cd29e4e1c49857033918b0e227926edd4bb SHA256 e005781cb0356f65200c05979c04fea533b9a7d873e0060672a4d384468b7186
 DIST sqlite-3.3.17.tar.gz 2111281 RMD160 a948306fc45f7baa8cb241a6cf7e4a57c9c6468c SHA1 6c968e3c608be4ab137577411869abdeffb0c3f7 SHA256 ee667dcc41c001229b93efff4ae489236934fd590c7c3d6664105ed50d6f899c
 DIST sqlite-3.3.5.tar.gz 1651536 RMD160 7dd7c1d2a2f10132a4ef0f6972ddca4d5767b9d6 SHA1 015fe7b3992c9db97bb40cfd9958b31d457f7c33 SHA256 e81d1176960a14459f9ff492b2c4fb1e2b55d0b2c82fd225dbc37afd02334256
-EBUILD sqlite-2.8.16-r4.ebuild 2515 RMD160 a2db749c54fa33dc472b7e748718452c11530003 SHA1 12493bb14b05bae5b82cc8685e3c478083213fd2 SHA256 dbacd3ee8783cc9138246a42ff266dccd7322cc8a742dfd020654bda854eda28
-MD5 a4660517a74e1a9559c14da9eaa5a408 sqlite-2.8.16-r4.ebuild 2515
-RMD160 a2db749c54fa33dc472b7e748718452c11530003 sqlite-2.8.16-r4.ebuild 2515
-SHA256 dbacd3ee8783cc9138246a42ff266dccd7322cc8a742dfd020654bda854eda28 sqlite-2.8.16-r4.ebuild 2515
-EBUILD sqlite-3.3.12.ebuild 2198 RMD160 eb569fcb1db8889b1620407cbd6dc9a4a3feacf9 SHA1 b76801b5ffa7d18ee9dcdd42867b006d839be6f7 SHA256 d0c7a4f35a3c0e45c08d9fc053c52414161ad66b19998f9197938cd2db8c9d82
-MD5 5473339249db5e0eb5d95c5f4c718704 sqlite-3.3.12.ebuild 2198
-RMD160 eb569fcb1db8889b1620407cbd6dc9a4a3feacf9 sqlite-3.3.12.ebuild 2198
-SHA256 d0c7a4f35a3c0e45c08d9fc053c52414161ad66b19998f9197938cd2db8c9d82 sqlite-3.3.12.ebuild 2198
+EBUILD sqlite-2.8.16-r4.ebuild 2690 RMD160 ff04948d5eedf4f039aadcfc7478a7d26473f566 SHA1 466c3736e0924f2bcb76254f593347c41e85d80f SHA256 1723fd6791f2b31aa428bba3ac7d6c8a08e5097ecea3ba4ad0a45eca4c7d021c
+MD5 b48dccc514183ff7fd6106bf6e729b1a sqlite-2.8.16-r4.ebuild 2690
+RMD160 ff04948d5eedf4f039aadcfc7478a7d26473f566 sqlite-2.8.16-r4.ebuild 2690
+SHA256 1723fd6791f2b31aa428bba3ac7d6c8a08e5097ecea3ba4ad0a45eca4c7d021c sqlite-2.8.16-r4.ebuild 2690
+EBUILD sqlite-3.3.12.ebuild 2372 RMD160 01b9ab0a23ff98453ac4570cf159699ba9aa5b69 SHA1 204050aa4d25aa9f1a9f3c8db43aec06d5b7148e SHA256 913093b552037242724201b454622093879981a378e86bdee9e69be17d961540
+MD5 60e1b68d15cb8a8d3cfadd1c3b66305d sqlite-3.3.12.ebuild 2372
+RMD160 01b9ab0a23ff98453ac4570cf159699ba9aa5b69 sqlite-3.3.12.ebuild 2372
+SHA256 913093b552037242724201b454622093879981a378e86bdee9e69be17d961540 sqlite-3.3.12.ebuild 2372
 EBUILD sqlite-3.3.17.ebuild 2394 RMD160 0985b1d3d293239dd9f66ce606b1f97c5aee57a9 SHA1 1684cba0e204ec43931acad77ac43efe44e5f9af SHA256 4a6f2b6b08f413e3085e4319d5a6824176f66c4cee0de0241af5edd869d88c3c
 MD5 c82cfda397556f5cc3a3f5d0709e426f sqlite-3.3.17.ebuild 2394
 RMD160 0985b1d3d293239dd9f66ce606b1f97c5aee57a9 sqlite-3.3.17.ebuild 2394
 SHA256 4a6f2b6b08f413e3085e4319d5a6824176f66c4cee0de0241af5edd869d88c3c sqlite-3.3.17.ebuild 2394
-EBUILD sqlite-3.3.5-r1.ebuild 2075 RMD160 18dcea89bc5a6d77baebe0b145bc9fe4e859c7e9 SHA1 bd3d528c5eb4bd0f873ed2a3af9b7cad89d6a496 SHA256 fb0351aa23d23c86335adee54209c4a14c693fec796eabf98322ee7ffe4afa8b
-MD5 d81a225dd871877636b525b1f3bb1318 sqlite-3.3.5-r1.ebuild 2075
-RMD160 18dcea89bc5a6d77baebe0b145bc9fe4e859c7e9 sqlite-3.3.5-r1.ebuild 2075
-SHA256 fb0351aa23d23c86335adee54209c4a14c693fec796eabf98322ee7ffe4afa8b sqlite-3.3.5-r1.ebuild 2075
-MISC ChangeLog 21661 RMD160 04f1158d1e5274683f51953423e92ab7fa44c0e4 SHA1 5567ae545c9f1e51056a2e7f45ee22c7a3545218 SHA256 1e8e12485a382ee2889c9fd60eb35cb6dd6beadf6920c8c4a42311a8a4993c7e
-MD5 704bd5e5faa24d5de1efc9bc4620c1eb ChangeLog 21661
-RMD160 04f1158d1e5274683f51953423e92ab7fa44c0e4 ChangeLog 21661
-SHA256 1e8e12485a382ee2889c9fd60eb35cb6dd6beadf6920c8c4a42311a8a4993c7e ChangeLog 21661
+EBUILD sqlite-3.3.5-r1.ebuild 2250 RMD160 ef8870d30b855ec809046a96f9f6208927959c18 SHA1 df6f090badf65098da8e92a113fa24a118cbb8da SHA256 60371a428a893b7e8d6b603ffeeb13bac38131c9fffa014cbcd0f57404399dfe
+MD5 c83a96b1e69abe89773fc458958e2db1 sqlite-3.3.5-r1.ebuild 2250
+RMD160 ef8870d30b855ec809046a96f9f6208927959c18 sqlite-3.3.5-r1.ebuild 2250
+SHA256 60371a428a893b7e8d6b603ffeeb13bac38131c9fffa014cbcd0f57404399dfe sqlite-3.3.5-r1.ebuild 2250
+MISC ChangeLog 21842 RMD160 44bf04e01c75175b7c4adb59eb87c142a7d80708 SHA1 141a2e83805b64133017c3ef6555ada174ae7e5a SHA256 83fcf6ac6d9af9e57a473bd194f317867e22a841c92757bc8259b05c781d51ed
+MD5 af462f7f892cbf7dba7ece1cbd639e06 ChangeLog 21842
+RMD160 44bf04e01c75175b7c4adb59eb87c142a7d80708 ChangeLog 21842
+SHA256 83fcf6ac6d9af9e57a473bd194f317867e22a841c92757bc8259b05c781d51ed ChangeLog 21842
 MISC metadata.xml 278 RMD160 cb266116d64b539a40af5efb4f6734dd0d506b6a SHA1 3eb088ba0a7736d19ca4dbe560de06a5e2b0bd3a SHA256 143dace3d40b3fe072c2f845bc932a6578944b42df26a6da3febfd1746f05617
 MD5 43d326b37dc346b7efedf7a2fc7127d5 metadata.xml 278
 RMD160 cb266116d64b539a40af5efb4f6734dd0d506b6a metadata.xml 278
@@ -80,7 +80,7 @@ SHA256 7df838b716f888b046669bcdb56533c9015172b269212fd91fee98793d7e00aa files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGcXtxcxLzpIGCsLQRAs5uAJ9IDDVg0eK01kGm5G+ocugmoi+k1QCfSzda
-NrACWcZKCM89M4OJciei+aE=
-=5u/p
+iD8DBQFGcXzncxLzpIGCsLQRArwwAKCHx2nFmzyUmvGaOl2h0u98TrQ6WQCdEdGc
+oS6qbUMpHtz9OwjKoYl+U1c=
+=nxxo
 -----END PGP SIGNATURE-----
diff --git a/dev-db/sqlite/sqlite-2.8.16-r4.ebuild b/dev-db/sqlite/sqlite-2.8.16-r4.ebuild
index a000f0a60b65..51b8f823d493 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-2007 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.18 2007/05/23 01:14:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild,v 1.19 2007/06/14 17:37:58 betelgeuse Exp $
 
 inherit eutils alternatives toolchain-funcs
 
@@ -21,13 +21,20 @@ RDEPEND="tcl? ( dev-lang/tcl )"
 SOURCE="/usr/bin/lemon"
 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
 
-RESTRICT="tcl? ( test )"
+RESTRICT="!tcl? ( test )"
 
 src_unpack() {
 	# test
-	if has test ${FEATURES} && ! has userpriv ${FEATURES}; then
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
+	if has test ${FEATURES}; then
+		if ! has userpriv ${FEATURES}; then
+			ewarn "The userpriv feature must be enabled to run tests."
+			eerror "Testsuite will not be run."
+		fi
+		if ! use tcl; then
+			ewarn "You must enable the tcl use flag if you want to run the test"
+			ewarn "suite."
+			eerror "Testsuite will not be run."
+		fi
 	fi
 
 	unpack ${A}
diff --git a/dev-db/sqlite/sqlite-3.3.12.ebuild b/dev-db/sqlite/sqlite-3.3.12.ebuild
index 5039043f22f9..48c4c13aa76e 100644
--- a/dev-db/sqlite/sqlite-3.3.12.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.12.ebuild,v 1.12 2007/06/14 09:43:43 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.12.ebuild,v 1.13 2007/06/14 17:37:58 betelgeuse Exp $
 
 inherit eutils alternatives libtool
 
@@ -21,13 +21,20 @@ RDEPEND="tcl? ( dev-lang/tcl )"
 SOURCE="/usr/bin/lemon"
 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
 
-RESTRICT="tcl? ( test )"
+RESTRICT="!tcl? ( test )"
 
 src_unpack() {
 	# test
-	if has test ${FEATURES} && ! has userpriv ${FEATURES}; then
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
+	if has test ${FEATURES}; then
+		if ! has userpriv ${FEATURES}; then
+			ewarn "The userpriv feature must be enabled to run tests."
+			eerror "Testsuite will not be run."
+		fi
+		if ! use tcl; then
+			ewarn "You must enable the tcl use flag if you want to run the test"
+			ewarn "suite."
+			eerror "Testsuite will not be run."
+		fi
 	fi
 
 	unpack ${A}
diff --git a/dev-db/sqlite/sqlite-3.3.5-r1.ebuild b/dev-db/sqlite/sqlite-3.3.5-r1.ebuild
index 21d2cb42c015..298ccba1c1eb 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-2007 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.18 2007/05/23 01:14:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.5-r1.ebuild,v 1.19 2007/06/14 17:37:58 betelgeuse Exp $
 
 inherit eutils alternatives
 
@@ -21,13 +21,20 @@ RDEPEND="tcl? ( dev-lang/tcl )"
 SOURCE="/usr/bin/lemon"
 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
 
-RESTRICT="tcl? ( test )"
+RESTRICT="!tcl? ( test )"
 
 src_unpack() {
 	# test
-	if has test ${FEATURES} && ! has userpriv ${FEATURES}; then
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
+	if has test ${FEATURES}; then
+		if ! has userpriv ${FEATURES}; then
+			ewarn "The userpriv feature must be enabled to run tests."
+			eerror "Testsuite will not be run."
+		fi
+		if ! use tcl; then
+			ewarn "You must enable the tcl use flag if you want to run the test"
+			ewarn "suite."
+			eerror "Testsuite will not be run."
+		fi
 	fi
 
 	unpack ${A}