Fix tcl/tk slotting

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

15 files changed, 103 insertions, 73 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index ecd3597c2fca..08b7a6defcb4 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.455 2015/02/07 02:25:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.456 2015/03/19 15:44:37 jlec Exp $
+
+  19 Mar 2015; Justin Lecher <jlec@gentoo.org> gvim-7.4.273.ebuild,
+  gvim-7.4.488.ebuild, gvim-7.4.527.ebuild, gvim-7.4.542.ebuild,
+  gvim-7.4.560.ebuild, gvim-7.4.591.ebuild, gvim-7.4.622.ebuild,
+  gvim-9999.ebuild:
+  Fix tcl/tk slotting
 
   07 Feb 2015; Tim Harder <radhermit@gentoo.org> gvim-9999.ebuild:
   Use python-r1 instead of python-single-r1.
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 05129fb1c805..ab3bec8d941e 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gvim-completion 1219 SHA256 5786b55da26ee0c5973f6e2b366d304f30cc3801f70c7ac26c515856413b8938 SHA512 08bb32a3c9fcbdd00977b7343dda9cda44b389a13b1717ebddb462e22b6cf9d4db37d5b49ff752b931e305bf57e8f9f4a7d6e32ea25f8acd1b00e5f8320ac132 WHIRLPOOL a080164530c604ae384721356a7b51b60ba401948b3d0ffec386cb9b78320147e9d01118c8538a65815e43f9d432c84185c42032e987f3d8c367745b6638c5db
 AUX gvim.desktop-r2 171 SHA256 840e4bcac0b448566e26e53b8292f31a9e187360b6aaf75f37929e43c46f22ce SHA512 1e4ceb7776100d00cb4ea70039cc4e7342decffd392c0c8633254c6c0ffa6c0816acbe56b8b03b9302119c473d2e4618b4df0e6e1e2031282e21a66063a1ec3b WHIRLPOOL fd085e75deaecd336f23c784929d6b95b8889cd5aba3c8c0777adc6aaf5a484881bd11d5d7a291972a75b527e82240a9d48ac7668550ddfbe25c903665e54e6a
@@ -15,24 +15,32 @@ DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f
 DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66
 DIST vim-patches-7.4.527.patch.bz2 791537 SHA256 18cc9809e5322ea121c0326246d268bd7e8a56457fa00c12756538f0efa4d80b SHA512 55cfe5be9a4f356c8053450b55c79a8ecb38a64a77a97613e020de6ff9149508f7298a9ac3adb2b830e7cc1d68e183986ceb894401a8cce011e020371286f8cc WHIRLPOOL a7d443387705bd89ff7ea17b915842f8d055640546715836555361de0d7d6bfc82b9211cedfa51ebf2b4b8fbb294dcb6940007e1884a53e5ad7dc4f352ede4df
 DIST vim-patches-7.4.542.patch.bz2 819067 SHA256 b4bce59981be70daf11e28c92b958e4dcfce1b2d57d57ea6aabc5c0c8d50bdfb SHA512 f47a27cad1ebd7e7ba4664cf1698ea1781eb148f49f492b0579c354b224dd3a725ffa39fc4430da0de4890851bc22b9e9a2ff7a70217d46653446b796ef763b8 WHIRLPOOL 61bd9ffa831fd87e68fbd3d4450dea5b655590b9a9a15e0918085d15f09060e01014dd8467e26362e873ac5b94d671eb827720a706a11ee5ed78645d1b917d41
-EBUILD gvim-7.4.273.ebuild 12242 SHA256 7274038e826623944a35c4d4b396cd10509e6132d35dfc82a63bb05094490614 SHA512 a9c2ce26964a1b7d2c7a13e1ff57a6ae04b11e0528ba99e499aa586153f75905ce1c9b69de943917ba3d05b494bd9beb00a1fbde5ece26912fe5b4181d389817 WHIRLPOOL 78198ff39e8c755ad38821354ad03cf10b3441b57a12e6400a320ddd124361182d6c6a11663bb049389cab7e8f627d2f2ff79b57dd0b9bbf3b4af50f9b38b740
-EBUILD gvim-7.4.488.ebuild 12501 SHA256 e310aab40f3e9aeac9d090bd7b0f31498c53bd39fd41be0d58b27ed5044c040e SHA512 a241f40144e3f0d7cf09095694502fd10df1ef9472391b7c91e4d4cb7f078f58b52229ad07d7afe88860c892e4377607c26dbc624be1e521ac0a09ae35f3c148 WHIRLPOOL 15d95903380208806f3dfc8b1dae459e75c46f6fbc7baf44923b42e2222ce1202387d71289d5024ffa5a8e4457114c8bc682829a6979d4395faabcb02a7f5711
-EBUILD gvim-7.4.527.ebuild 12501 SHA256 c208c8777b8127eb4c57f6add60afeaf8f1404148bafeabe7530082e7554aec5 SHA512 0e703f35517dcfa7677f6c8c28f79e103086637225900fb300a42543328ab56d93c0777f278c4b32a138af76339edff45ea80ff43651b6e2b23fcab0da670b09 WHIRLPOOL ba5aaf23db506711541a8262a0d4a33799190de4cef0c41ebce1166df1f9c48deac53a5305e49d00430a4ea740734ad37250240ca6d335cfe3bef8eeada39d25
-EBUILD gvim-7.4.542.ebuild 12492 SHA256 2e7bf0cb9190f2b052cea32b2227ca53542646c101d2c79a2fcdf6586c76a386 SHA512 a082a237bbfb5bfbeecc6bd4a0688790cf7f2bc6c75a2aa645b42e751fd0912d6f4b9a43a2ae15a5fa681eb4ea2ae9e28335af51d793451d76b144008309f46f WHIRLPOOL 3555c34aadd70cca7305893ee5c9aa5ed712319c5fffa49467a47a720b8e44b4d5ce16da61b08d56c90e5c34f32acbc6f3918a8c39fea47ba61822317876e5af
-EBUILD gvim-7.4.560.ebuild 12375 SHA256 ba3c230d7fe2e8fc2757a9c2e55eafc6e1fb23fa1d25be3590deaa87f19f0950 SHA512 be43518842526937d6239a207072da2dc74ef5d225029994c757722a5cc2a5cc6969bc6a6508a9f97c5254712326138225b85ab6d8d2bcaf456e560b1d80feb2 WHIRLPOOL 699b694d6ed8cf8c3eacbaef201bf47c8e7dde19571ac0dfc7ef78042d3329ef21abc5d2619f50f285db2b9dc768eb0c6b1d1d1f47206c862847df311f59f862
-EBUILD gvim-7.4.591.ebuild 12317 SHA256 1acb962cd79a13b11b36eb2bfe89cdee606d231876ff638c033436c55fd14723 SHA512 0a911433f81459efee5a365140ed41734c59e751f903909d650e8439a0f7072399e09659d2fcc31d7c70c67b8c1ade7ef19bb7cfe17ace3ac3f347f834a41ac3 WHIRLPOOL 48bc1f3c690429800ef5721dffe8d245386e8d2b0e991a079828fa49d40c81c9f065be39e60af7d9ed32b8f35076185e77f9391198c4e64de2095f74874c7d26
-EBUILD gvim-7.4.622.ebuild 12356 SHA256 ed4a9a601ac27d0a802263bdc83658f9a6ecb49ac7749f1534b908f1b901cb22 SHA512 0642ed81fc67bd8e70058505f4364110122f30d4e13d20d20c86bb5d93493761b13369519c78b44073c9decefb1e0e485b145a1f822e671c836474c24f073671 WHIRLPOOL aebb97d5c3dc0d6e3da1d04c7a57cabe15c69ffc952e59501ce785805dc21df8e30f0214f121e571b749ba2c16d8ecb47fcd93c115712acca71dd0814db310c9
-EBUILD gvim-9999.ebuild 12352 SHA256 f9ace42ae6db316d87c45b649da064b03f5b4b25a2670f4772c200e9cb4b48dc SHA512 9ddf7fa9a6193b30b7d6f79b9160e885dd9c37a916297968df1fc32dd681b0b3936f26035764fa3bfef4d440d962f7bfaddf701161b72374d3d8d9be9e3f405a WHIRLPOOL 9d1435ca002c006556dff3a2f7ba5029b2490bc9c94a49a412347d7f0bbbe30dcd3cc517874eb1cbea9b7975b8b6ec6f65580af8ec75aad54d8c91d7e9695c5b
-MISC ChangeLog 62600 SHA256 73fd4fcbecca859b383fd28bd256e6c76f8d4a1de2ea4e3851f42d7b943a9b89 SHA512 bcb5a70617f389c0deab4fb23128096b2e67e01bd69110288ba162dc57673907f08d99efe175172e387c5f6a9c1f2402b5e96f473a87f988fa98841104e9b6e9 WHIRLPOOL 63e48b2cc6cd210fe236dd2386919f28f9d43d1aa0ece42e0baae6f7145ed68ec9b692ee2a179479647dc294a8f5598522b95470e4550e3f43061e455fc8a5b9
+EBUILD gvim-7.4.273.ebuild 12245 SHA256 9ca5236763b19305ba905e2ed8dfb13726bf1970651a6a0b8ed66cbca4d23f3e SHA512 4e01ff2daeac0959abadbf5589f7b8e48bc6704496f39440e5ad89671f993086c87098a4d80cc6c31742550e08312c19c4b33a6bbb6eaed0d29dcbb5680504ab WHIRLPOOL 8367dec4ea58dc26583e08c5308994b777a6aebfb94d9dbb1aebd635cb1a7a6ab09b8fbb766417c0c25754b0ec98feab21364bc038710f843095f4f9e132d1c4
+EBUILD gvim-7.4.488.ebuild 12504 SHA256 3630fe5c4e7b04cbcfc81e44c32005852928abd9ef25b8d3dc2855a9fe3bb666 SHA512 44442d568cddfaefa6f1ca727b1d7021b4e4c06bd627c03bce69fd65471a2c18ec6e5cef4215b0576c24dce795e3da7058cec5a1d157168448ef28d9891e1ae7 WHIRLPOOL 3a31b8f0fabd30921650d18f88075ef9663ba2bf16086e6010499df1acd2032af154ac1f302927164b802eff0bd68da389f10d00e96d6ead21771540580dd249
+EBUILD gvim-7.4.527.ebuild 12504 SHA256 43e4402df14f971066176e6cfb36e4ba5e4814922532f55054c22117b614abbb SHA512 f8ad278604bd451f727ad93f70946c9c18aa6d86a33947c5e0a27a8e781ac166dbc3c910526acb7ed31018456c9a17193e89eed4dc5d7d0ef91819805d4c6912 WHIRLPOOL d75c28c47dfb2e1edbe008d61c355a48fc5eb5cfb50c2798ee81fab413dabafdb018d8c2b3d530b311bc7e970eaeaf8caacf99959b726c104e7ff5244021f741
+EBUILD gvim-7.4.542.ebuild 12495 SHA256 5d3ba9e0911086a066c1cfcb9cf1576f79fe97277abf295001f352b074593525 SHA512 ebb3f58f56bb137b345e5256321ccb8a6d4e77e1b2d6f812c7d7e8ea822152aaa7435f9e5136ae21269cd477498a8ca3d93a340fddcb973f88f161410da86894 WHIRLPOOL e714e4dfc54b6352eaba4135a3799fc4cee61fd55ebdfd86152d8f2767c3d5e4ce21cb7f5091c699b08bb1e5fd152307c918cb01d0a369258c5c6f961d8c0736
+EBUILD gvim-7.4.560.ebuild 12378 SHA256 f5e977b99676bbc31aec6c04935c7bd3b8adf837154be8507680cb3b5593d748 SHA512 9ccf48e6e684f0ce2d5f4cc8948d968a02c9e535b0b4650f4063b324210d9f49ac0752191a2a3ef0acb68b976db88a605b7bfb7eef1544f931759698a1e6b52a WHIRLPOOL 07a5cd6ae629dfe7290d561f1356991fba09f464c687f8dea416a8b59706369aa9df949728b3646537a73180550e22c374ae4ab7627355fc8c5757c79caaa8d9
+EBUILD gvim-7.4.591.ebuild 12320 SHA256 faf28d0f64af63886dd8ee8b620d609af1320fa07b956345d4522d73e9a08f45 SHA512 fca07cd0e9e4d6c21a2e6eed748145d3dbf0d05bb3890e1e515a6aa677635d8c5551a4fec7b71e83bdb137622de387fa9311c47a4af93b42fda6177499462828 WHIRLPOOL b875a07182342480268d7cb006ed7a6cf33a25a71d06d4a9ff799ccba7a92393da5fb2d7b59e0681c1d47e74bd71d56b51fe7ac5aae571e3d2a86132dfb5152b
+EBUILD gvim-7.4.622.ebuild 12359 SHA256 0781e3907311fce05ce1e2c0098050dc641c0c3184a307b36afa6f9a81f97b62 SHA512 603ba652f2dbea3cc9aa6e201fbe54c5c12cd5a356f5cd15893b94ad3fdd6b5c9a00a9f3a87e09c62910b3b62458770bbebde784c12c9102e2eba1dffe779942 WHIRLPOOL 21f73aefb38f3644c158f1117c70d158bd58e8ad9ad52ef6c992dc963d4eca9a53201143fd9bf2d9f21af7396cfaea5dba39e84927ce6235fc08b644d0c30d27
+EBUILD gvim-9999.ebuild 12355 SHA256 262a6a189572a048f45a74eb53c646d64da123eb32b603687fc20428e52d6355 SHA512 3bb588a9e990f50d39567091a18dded44befd73015c7f146250693a362c42ae69279fb9812c95112ce8007d34c8dca5661c14e433fa518307208b4229680d23d WHIRLPOOL df700683cb84c1319a5db55b793fc36b4aa0d81ad11b8d25f0ebac7f3d42afc91e864919e252288ff920b71de4571531e023bc5db96c6785d4e672f5f22d99c3
+MISC ChangeLog 62836 SHA256 6d3b797a50413443d738dddfd4271ac23a5ac47bae1ba64785c0ea2a9254b8b0 SHA512 3dd58dbf744ff291883cb2379b1732ae3dd4c72210a2f9e9dbc53a33633df9b2c17b4ce10734be4a774069a2e9078663fd7b07bb1cd0798f2b5ae5e7555d898e WHIRLPOOL 14aa4dfff51559d0b5272a89ef958c8579d2f0b363fbdcc03626382676289aff879f57735cd98d60216979308dd344bc697ded9bcd4217dc6367e5d0e3809b8b
 MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJU1XeLAAoJEEqz6FtPBkyjf2YIALp6YZHamTwKr1eqhSq8Didf
-aZYGQbKBuB/5q2BAwvrMsHNE9o3GOvb4T3OOPmsQEhWL3ExCqcd8qJr40xd3Alpd
-aiH8D2JN3Jcy6dbpC8tA1u+NKuC8u3oOkN17Av0/+5pRpJIsoNUprUJ5/j0Ly/gY
-Wz7NWNQYv4WnUTvzAZFxZNJwCJspODIhHu6/m57ybsYGFHUgcNHBUPrEIM38KiD1
-PF7sV8eTRfxLvF2k1HYgL2hYozkoEY1jPwl76FicfD1SKAmZqAp8LAAKS9wk/Wej
-rMaySAd0a6NsFsnL9S9ke3/GNakoAVG/VDuWLEk8sK86+A3AfPZn+G/i500LkXg=
-=ON+3
+iQJ8BAEBCgBmBQJVCu7nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirN3wP/RKgWDeR1EOmx7PFAd8fI3RF
+yr56B0sqA9roRg+8kybfC6Y9gGU09Pp4KCeQxwsgs5Xjjju5Bg2tEQnA5cHjKGV5
+l9HV2Kw51Kl02v8uyQ5foJGf2rf9eqwR7zfwU+g3yGU3IEu9wi4c6NuHg9HuMJDR
+LXmBBd0PBFJc3PrLm+pNo0NCxu2z/5l12rhARt0GW0T4oWJ2rn5z3hPXLCnKx2qk
+BNo1K4xjcyM5rP7wnrfhzHxxftZnoNIu54rbBto856XWOPOX/qMYed1tPxnfdPx6
+1hcgVrCqaZUM5oKaZeriafxf/E0DZ7WBZBEh+9TPSKVZfvQQpOxG5f8B6cTz8Qbs
+KYQUZ6ZF1aBIbMKGV0/SX9IX+UaX5HUy5SrU5e1SZH41uiP6+hOc8YQJ/Gmgj5Gf
+NzPR6BTfEFRxf5sRC0UhTZZOlF0V4ODUErNrYfxZWxfZgewAyOsrNzmr1V1/YOws
+IbJHw2BNkMmeJDZtJrvAmbF9USrFoasdnvCpaSzcUHxasIU7gM+XoP5ZK+HNCh0T
+K62cDxUb6uQiPwjJbQUzrqJDMenNkc0jFYmOQzbtAnpvKdXBH38aNIT9YvFfG+sm
+CPmzyLOPIw+FqkLUIibVpCHasEp8Gi8ZQKJSkfYvxfVp9vMhWhFBgx5Gd1W/o7dF
+85inRMpKf2c16ljunzri
+=gI85
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.273.ebuild b/app-editors/gvim/gvim-7.4.273.ebuild
index e4af12697b46..7b234e40014c 100644
--- a/app-editors/gvim/gvim-7.4.273.ebuild
+++ b/app-editors/gvim/gvim-7.4.273.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.273.ebuild,v 1.11 2014/12/14 10:58:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.273.ebuild,v 1.12 2015/03/19 15:44:37 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -54,8 +54,8 @@ RDEPEND="
 	)
 	cscope? ( dev-util/cscope )
 	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] )
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
@@ -64,7 +64,7 @@ RDEPEND="
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
 	selinux? ( sys-libs/libselinux )
 	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-vi-1.1
diff --git a/app-editors/gvim/gvim-7.4.488.ebuild b/app-editors/gvim/gvim-7.4.488.ebuild
index 7df52eb60e64..f1ba4353772f 100644
--- a/app-editors/gvim/gvim-7.4.488.ebuild
+++ b/app-editors/gvim/gvim-7.4.488.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.488.ebuild,v 1.2 2014/12/14 10:58:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.488.ebuild,v 1.3 2015/03/19 15:44:37 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -54,8 +54,8 @@ RDEPEND="
 	)
 	cscope? ( dev-util/cscope )
 	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] )
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
@@ -64,7 +64,7 @@ RDEPEND="
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
 	selinux? ( sys-libs/libselinux )
 	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-vi-1.1
diff --git a/app-editors/gvim/gvim-7.4.527.ebuild b/app-editors/gvim/gvim-7.4.527.ebuild
index 1930e7e31710..ab789f30440c 100644
--- a/app-editors/gvim/gvim-7.4.527.ebuild
+++ b/app-editors/gvim/gvim-7.4.527.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.527.ebuild,v 1.2 2014/12/14 10:58:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.527.ebuild,v 1.3 2015/03/19 15:44:37 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -54,8 +54,8 @@ RDEPEND="
 	)
 	cscope? ( dev-util/cscope )
 	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] )
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
@@ -64,7 +64,7 @@ RDEPEND="
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
 	selinux? ( sys-libs/libselinux )
 	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-vi-1.1
diff --git a/app-editors/gvim/gvim-7.4.542.ebuild b/app-editors/gvim/gvim-7.4.542.ebuild
index 16b2bda40229..f7a98568ccc9 100644
--- a/app-editors/gvim/gvim-7.4.542.ebuild
+++ b/app-editors/gvim/gvim-7.4.542.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.542.ebuild,v 1.2 2014/12/14 10:58:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.542.ebuild,v 1.3 2015/03/19 15:44:37 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -54,8 +54,8 @@ RDEPEND="
 	)
 	cscope? ( dev-util/cscope )
 	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] )
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
@@ -64,7 +64,7 @@ RDEPEND="
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
 	selinux? ( sys-libs/libselinux )
 	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-vi-1.1
diff --git a/app-editors/gvim/gvim-7.4.560.ebuild b/app-editors/gvim/gvim-7.4.560.ebuild
index 7113852657b8..7017da248e01 100644
--- a/app-editors/gvim/gvim-7.4.560.ebuild
+++ b/app-editors/gvim/gvim-7.4.560.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.560.ebuild,v 1.1 2015/01/04 05:46:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.560.ebuild,v 1.2 2015/03/19 15:44:37 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -54,8 +54,8 @@ RDEPEND="
 	)
 	cscope? ( dev-util/cscope )
 	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] )
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
@@ -64,7 +64,7 @@ RDEPEND="
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
 	selinux? ( sys-libs/libselinux )
 	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
 	dev-util/ctags
diff --git a/app-editors/gvim/gvim-7.4.591.ebuild b/app-editors/gvim/gvim-7.4.591.ebuild
index b34939f92fd2..43e4abbb47d1 100644
--- a/app-editors/gvim/gvim-7.4.591.ebuild
+++ b/app-editors/gvim/gvim-7.4.591.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.591.ebuild,v 1.1 2015/01/26 23:27:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.591.ebuild,v 1.2 2015/03/19 15:44:37 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -54,8 +54,8 @@ RDEPEND="
 	)
 	cscope? ( dev-util/cscope )
 	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] )
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
@@ -64,7 +64,7 @@ RDEPEND="
 	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
 	selinux? ( sys-libs/libselinux )
 	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
 	dev-util/ctags
diff --git a/app-editors/gvim/gvim-7.4.622.ebuild b/app-editors/gvim/gvim-7.4.622.ebuild
index 928cec232b3f..2e7a1cda9b94 100644
--- a/app-editors/gvim/gvim-7.4.622.ebuild
+++ b/app-editors/gvim/gvim-7.4.622.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.622.ebuild,v 1.1 2015/02/07 02:21:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.622.ebuild,v 1.2 2015/03/19 15:44:37 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -58,8 +58,8 @@ RDEPEND="
 	)
 	cscope? ( dev-util/cscope )
 	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] )
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
@@ -68,7 +68,7 @@ RDEPEND="
 	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
 	selinux? ( sys-libs/libselinux )
 	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
 	dev-util/ctags
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index a9e3f7aaa526..a57e934357ab 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.28 2015/02/07 02:25:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.29 2015/03/19 15:44:37 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -58,8 +58,8 @@ RDEPEND="
 	)
 	cscope? ( dev-util/cscope )
 	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] )
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
@@ -68,7 +68,7 @@ RDEPEND="
 	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
 	selinux? ( sys-libs/libselinux )
 	session? ( x11-libs/libSM )
-	tcl? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
 	dev-util/ctags
diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index 4ca81b26ffb0..c9680fa40be1 100644
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/nvi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.97 2015/02/19 02:45:24 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.98 2015/03/19 15:47:35 jlec Exp $
+
+  19 Mar 2015; Justin Lecher <jlec@gentoo.org> nvi-1.81.6-r3.ebuild,
+  nvi-1.81.6-r4.ebuild, nvi-1.81.6-r5.ebuild:
+  Fix tcl/tk slotting
 
 *nvi-1.81.6-r5 (18 Feb 2015)
 
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index 344923ccbea0..4bde75b6e3d8 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX nvi-1.81.6-ac_config_header.patch 410 SHA256 3aeb0d4b109f8fc75065cad73b906b29a7fa2f5db9dc403f82044845e59785d3 SHA512 ef4fb4869b8dbf0a1677aba99f00de5730dc64f48aab35de113f91d22aea769054d2ce875af7c084d1fa3c3a526f2695fbba9ad248c86a296e6c2580c682f8d4 WHIRLPOOL e40552495127f5129cdfd7cea41e1c1b6e2321dd185710c276ecc391c28120308bea07786e95f3eff6516ff70b86523428d69b0c0fa5084cd4ead102c62b9b53
 AUX nvi-1.81.6-db.patch 686 SHA256 4d39930b1b3f84bb047dccc5629105379088255d2e1fbc3fad4b9f39376c6471 SHA512 3098baf54f1a9c9056bedcba83132dfc4c9a7a1a03946c9e5e30b3df8edc25abf2c6ff5acdc3e9d5c5fb364a1fec344f3593a0a3292fa02d56b0ea1080f65781 WHIRLPOOL 696a83ead77dd40a4692b1cfbe44313f168a0643ed29138ea79581c482729c83649f36e48700a9b39e5e7d2a36b3e86747dd7d1ff9eb1d1b9f2a1194721c1aea
@@ -9,15 +9,27 @@ AUX nvi-1.81.6-perl-shortnames.patch 376 SHA256 a2fd1baec1d9efa2b201abd1705c667e
 AUX nvi-1.81.6-strlen-macro-renaming.patch 18467 SHA256 5803bc981ff835c7f76f1ae23f8709f39b6907fba56f4e9d72a0172aed5a599a SHA512 af3470a3f56ede588439153ca84db331a418eecc08787ce89680e5614020418bfa0cb806530525d08ce65af189cb338162a5d77444c14f36036df3bb0327b196 WHIRLPOOL 14df3913b291c98c7d3d4d4332a94e447c2328409efdba6e81db00a492a889929321e763bea6cdd720d94654af84e344eedeb962100dcd321dbcd773f88631da
 AUX nvi-1.81.6-use_pkgconfig_for_ncurses.patch 945 SHA256 d42027a4ed66cd63d34fe09c38cad2efd0aaafb6b2d84764c55cc76d014d87a7 SHA512 15d524acfc98bfef4d490a5bb985be6d620487b82b997ffc6fae3e0ad90e7c3a392dd67ebe9fb247c758976485937102dd14422d6218ccbb0491018af5c21906 WHIRLPOOL 490bd5d534110e7c193ab91a6d941f3b58a812fe73a251edbfb2e7cf23bc55e71098dad75ff713dcb2c1fa0286dc620616d4ddd8e89955bf9be39b9e97f6ce42
 DIST nvi-1.81.6.tar.bz2 1758309 SHA256 3441b8e3247b2b6dd19b5fd38355fe6593b2a92e960ecb3dd00d676f63d06b59 SHA512 7e203f7ea6723427d18ff55361254991f50d395f89aab2ea52d0902c474acb24c289da7c35d9e907d652145f13483d8a8270f5c8ee72bd723a3b1eaeecc4f9fd WHIRLPOOL e349a09c281bc41b1ff404a9bfa6bc16b7e4b70c45a91efe231e4e766f72f83f5bbae9a901ffc448b8badae21a494fafd3292028f1a3234d8b92085206772375
-EBUILD nvi-1.81.6-r3.ebuild 2314 SHA256 3ac15c789ec2f65b661f1f321dd43bd15a016fea78de1b0c7001bc770577fc55 SHA512 950c37d104a6814af77d24ff6838c136bae83fb63375bbd011e1698a512473f9cf988e903b55afe1ccf506ef20024171c4cb6c992ef53fe185da57570460dd75 WHIRLPOOL c7f8c512f419e6bb8bffaf6574dcd2895181db95271d3d9e3b2a8ff289645160d0ada4361541e3ff9f47528a44808fbc49f3cee7e22767af66448d2fd6107f33
-EBUILD nvi-1.81.6-r4.ebuild 2372 SHA256 a8de357014bffa684edb543447fea8748f433993e192a28c094660504111ca80 SHA512 8e3f360dd308cc8391ba7415c98b16d60609b1ffe0061dff42b61fee9236d8445be60ecd131a4c8d5b05340b633ad85d11134719a4fd376596a35114703a260f WHIRLPOOL 4d2f079b30c1c239e7334d676a8bc8b55aa8ba9bf82dbb519efc2434f9f9b1dbd27e50a5153a57a4321954809263864b5581c607ecd8ce043d843cbf8e59568a
-EBUILD nvi-1.81.6-r5.ebuild 2440 SHA256 8d4083848dfa8bbbb04f9a323de6e752e91449ae88eeba01f9308215520dd89a SHA512 33bd859bd63a5322a43b8daf8362fce2a398556e7304e4c65ee1bcabd50a1da6e5dddf82ca19790a13835ada4a4f5d377e921897e41b633a7ef2a54823d4bc6a WHIRLPOOL f76afe50a9028ec63383b8f34cf837856dfb284388d8aee81bd9902f690834d553853bec19f29ba31db7733aec67afafd77629990108d13c3542ae6a2751744f
-MISC ChangeLog 13693 SHA256 68b62b4be32fe5156a08a7d329cdb73e8654067280851814ae7a631d1b13163b SHA512 c16ebf133dc832ebecc700901d43cb6c80630de0a571b1870eaebd1437cb6d4d7cfadd024088778ed8d05d96d109b7f3911565bf521629b81993682206aa9003 WHIRLPOOL 912ee474e0191a73d70d7f9cf378da6fd0a37a4d1652f60fa90739126d2056d76eaf774bbd25d7f9e0aee852973c86593d40d5710f6e3de10e079a8f59266f03
+EBUILD nvi-1.81.6-r3.ebuild 2311 SHA256 5628e9818a0570c815d8837c17bb157c85c0618bf16df6dddfc4d34176d9db18 SHA512 fb01c81adf41a2dba1051f72b8d9d4a857b4a2b1fadadb4dec185def9a39908a288370fa198f00b76cd91d559086232221d50980e1e7a4485a19296fc84535a6 WHIRLPOOL 2b065347463edbbf53940616eacfaf520521f0bb52192c0e5677db2eb88de843df0a469542c5b355e0671578c6731baeb0e61113623011e071b2bd37fa72d0bc
+EBUILD nvi-1.81.6-r4.ebuild 2375 SHA256 461287c08b699991fa454c5aee9f30a41acd1e392563fc516d14b848f0f1bb5f SHA512 d7aeb4e20d6748c42b7a0134ccd3c0a3f5b7a7de90d9fcb960c4215f7c782ba325f4258f4b60006bbacae920dfa6eb4ea11f0614394bcc30d5453adcd9d1449b WHIRLPOOL 21d969ee4ab645ae0399981a53dcfba064a20b5c4b6672425799dc43cac3f2a6f1919b6ed422221633f75421da58b1eebb4a57c73ef163e6d36f873bedd2ec61
+EBUILD nvi-1.81.6-r5.ebuild 2437 SHA256 5ab172e09f369b502ea49a84f16e97e774d80434571305fc593853738e297212 SHA512 5830d03b745ddb3c35f84e86c6f63a159d5d68d5b13be54de1ac335c8fe9c8a4976e7e2d417e76fd6e98e265e90df0dc3cc211acc01cdf10fad2c73a06a239d0 WHIRLPOOL 6ae180b51dcb85b8a7124c71895ecc548bb2caca0cc935e116a7aa8bb9d1177e0b7488903c5cfeaaccae0a933dea4816a96c5b1dc20edee631c963a1ef3d60ce
+MISC ChangeLog 13826 SHA256 e1c10f05fd2c2161da8592dc22e05c0967f96cc2df77d0a1048df68db18f314f SHA512 69e1039835125cf1002a52efcd187851885ae9cba48ae688fc84a8d5a2c18dba8e7cee22981dba630cb67bf0739ea31f696c2e507e9184b969e5453a321e69c7 WHIRLPOOL 0bdbc6e3b75d6a6941e599cdefa076a84d189f576942855a6f61c2174f851fad0c0a4d62ba0a8ec7f7f9098f967d37b015b97fa0de1b03ccc683e15a3381ab23
 MISC metadata.xml 234 SHA256 02f0cc57d2e1027d594d1686ac8f5d9cb992854b3e895beb7bd4c16d67cb90e9 SHA512 211ec5e95c3c4e23bcd28ce39518ffff08105334652f58ece6768229bd06623b5b6549445ebdcd2bc787f1be65e05d79f7fab5a53e7cd69774be22b593b7c71e WHIRLPOOL 1b91186683e7f17c9edca1c2bf4e295c6f5b3cd3e5179df4afc254e6efcd1d957b3e673dbee3666b01a627634905426a19949b755b18d18ef3a46864856b57bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEUEAREIAAYFAlTlB/0ACgkQdIssYB9vBoPiVgCYiz+E6RP2Ma3S0Brghu5xFI8j
-uACfTN0X6gH8wTOA3Je6K3fitrgxwJM=
-=MxgM
+iQJ8BAEBCgBmBQJVCu+YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirozoP/j05CDsc6lyNONHYku/B+3Os
+1TuKyNj4lbMgz7Wesot8l0+a9i3cEjBL4P9ZNn7xRewlZ5bEa10mLTnatqsnezqX
++54aORnVmqzhBrkkiSJIc9E9hHU99Af9A61HNQGJDm5RffeoHhefsJVPOeszjnn6
+Zg4+RNdeYZVt82+TLx/hXbd9N1uEcxYFe/kfsVDpu85z/0eNop9ZnzGl3TWa/iJL
+HV7pcD5dNQDYkoI/TDZB5EytTuxlkZzyEA3ULUM0yMdklw8t5MBIA/uhlxbXO/JC
+sOQBtU7gyNCeiXw3FbX3KPchEoSD5zyLrZSWpnIEuRSXQemiHqe9OCTLhzAY342h
+YDH82oSBdqx8rN/Lw9nQ1smJ7BBEhozrVht9de8tm/EvB4jBd8OVS8G1ZT6fc4gn
+OsY5OHx/ZR1OixF7oO14521XHxyc96tObxABFai7ZDw7eR05FbX3i5BXZVllf03R
+xyLLGxw2J6M0nlyee1rDS3h3ETPe0l6gWSGhJjNfZX95c0DNZmi5efeUGNLLysCK
+f0UXpSkdHLMMLpxra04q7iiTyVYYX+Eu0p2iim0v2OTJAQLlxEttcSwB/UcV3CcU
+09Y5uhD84p78ufuAiguhWycLB5bfPACcAF5hzWrcgNvnDkJdGwKRQuzQXNsLjt1l
+KcVqMFop5gR3TVHh70eC
+=Esg7
 -----END PGP SIGNATURE-----
diff --git a/app-editors/nvi/nvi-1.81.6-r3.ebuild b/app-editors/nvi/nvi-1.81.6-r3.ebuild
index 099cc77efa27..1f308a15b5d5 100644
--- a/app-editors/nvi/nvi-1.81.6-r3.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.15 2013/07/09 22:23:51 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.16 2015/03/19 15:47:35 jlec Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ IUSE="perl tcl unicode"
 DEPEND="|| ( ${DBDEPENDS} )
 	>=sys-libs/ncurses-5.6-r2[tinfo]
 	perl? ( dev-lang/perl )
-	tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) )"
+	tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) )"
 RDEPEND="${DEPEND}
 	app-admin/eselect-vi"
 
diff --git a/app-editors/nvi/nvi-1.81.6-r4.ebuild b/app-editors/nvi/nvi-1.81.6-r4.ebuild
index 9989c7b644c3..461e33eacc33 100644
--- a/app-editors/nvi/nvi-1.81.6-r4.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r4.ebuild,v 1.8 2014/01/26 12:20:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r4.ebuild,v 1.9 2015/03/19 15:47:35 jlec Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ IUSE="perl tcl unicode"
 CDEPEND="|| ( ${DBDEPENDS} )
 	>=sys-libs/ncurses-5.6-r2
 	perl? ( dev-lang/perl )
-	tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) )"
+	tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) )"
 
 DEPEND="${CDEPEND}
 		virtual/pkgconfig"
diff --git a/app-editors/nvi/nvi-1.81.6-r5.ebuild b/app-editors/nvi/nvi-1.81.6-r5.ebuild
index e7a84b275308..0dcf0089e4bd 100644
--- a/app-editors/nvi/nvi-1.81.6-r5.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r5.ebuild,v 1.1 2015/02/19 02:45:24 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r5.ebuild,v 1.2 2015/03/19 15:47:35 jlec Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ IUSE="perl tcl unicode"
 CDEPEND="|| ( ${DBDEPENDS} )
 	>=sys-libs/ncurses-5.6-r2
 	perl? ( dev-lang/perl )
-	tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) )"
+	tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) )"
 
 DEPEND="${CDEPEND}
 		virtual/pkgconfig"