dev-lang/tcl: Version Bump, #444296; Cleaned old

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

12 files changed, 80 insertions, 644 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 422c45e23afa..d3dc4cf0b49d 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.158 2012/06/07 16:36:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.159 2012/11/29 14:01:36 jlec Exp $
+
+*tcl-8.5.13 (29 Nov 2012)
+
+  29 Nov 2012; Justin Lecher <jlec@gentoo.org>
+  -files/tcl-8.4.11-multilib.patch, -tcl-8.4.18.ebuild, -tcl-8.5.7.ebuild,
+  -tcl-8.5.8-r1.ebuild, -tcl-8.5.8-r2.ebuild, -files/tcl-8.5.8-fortify.patch,
+  -tcl-8.5.9.ebuild, +files/tcl-8.5.10-conf.patch, -tcl-8.5.11.ebuild,
+  +tcl-8.5.13.ebuild, +files/tcl-8.5.13-autopath.patch:
+  Version Bump, #444296; Cleaned old
 
 *tcl-8.5.11-r1 (07 Jun 2012)
 
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 67b03e900ac2..1a3f9192a02d 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,27 +1,29 @@
-AUX tcl-8.4.11-multilib.patch 1808 SHA256 4925265d9fc72077d94ac23420671a4a0403cb0bad1be1dcc5d945e7bef5629a SHA512 024603fc80bf1a201e42102cbb7c1632c1e651f64e475f5bfb3f1a680dc3882e9a6f823cddd60cbb1e73e8c44ea7dd1c080e268e3b0a3d3951de07686084d0c1 WHIRLPOOL 5982cbb275af9bb653e4e91de34c952db99243a5d3a6c28f9e42c38eed881d8152f6daacbb8e409afee0062b9e48d31dcbab1a60ec440a1fbfdbff29156827e7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tcl-8.4.15-tclm4-soname.patch 477 SHA256 2130b8b5fdddadfca35b74e9432d2651733e4f1c7b13d66ffc87b6995865076b SHA512 280295134a053469defb095ccc447bbdd96b75a415eec099bf8aae8b9e5f271766a0228d6646dea564501f697454eb8ffa32d6f0682825f6073f110aa22644b5 WHIRLPOOL bab6dd5ee47af6498d528a9766ae74ab820156f1f4fea987b1e41e5f01da9e4d1176111e806b2afc5db54bc0a563eae05aa712343424ffe711e363fbe73bc23d
 AUX tcl-8.4.16-multilib.patch 988 SHA256 6df0027ee02c1f458e8ae5f07538e0838317d72d028c6e1af97e8433d866b0ce SHA512 a86803a3d676bdea8c601dde47806ab0516dd421f4cf6a375b16d12bc4a68130dc1d5ec4c8de0088b385a17d8bbc0289b08cded6d1c0fa78f686615b1006865a WHIRLPOOL 1768af16e193aa99f24b868586bf8f4b40b0d76a2cfb403269c63c891c11d3832fca4560cb9c61a3f9a11d431f8d3e59b9ad92e32989550dbd4b5b0333c88db1
 AUX tcl-8.4.9-strtod.patch 362 SHA256 93fad4cd880492430d5d55730b96a12697a58e951d8145b2b66025bceca10386 SHA512 add67c1b818c045c25202cb59424788824c68925a376ff89dfeaf2beb1cd1c459b392a8dc83bf9277effe454cc6a4a06dd3fb0cdc25e42dfd02e38408612ce0d WHIRLPOOL 8ea1a92f8a0842f8b5fc0ffb728ae41ebe8a2fabad82f181344fa7a1d3fda3fb6ed39af89eef784d22f844d0d3b3c5e73dc7b32903dbd315030f7c12d41bcb9e
-AUX tcl-8.5.8-fortify.patch 633 SHA256 c0d05495bc75c283acd631140eed61eec278f305637940398b1714c1e0570408 SHA512 e99685b1812e90944d107f5b7dd885b2c209e423bbc792069f68aab653e1a3f9e422bf8eaefb1a1a9adbc2fb9099c56e1ee48cee9538e1998241104206bdc996 WHIRLPOOL 658cc810234e924b62648cdb14d9578f113d7af89e0271844ad680b2786951c91c9a173c38affc3c6810993e4fd719a8d7fc72fac5d7017083d4f507b4967002
+AUX tcl-8.5.10-conf.patch 1046 SHA256 8e2d45102bf125a1d263030032610e153219dc8a709fb115a09f1b6468ac3623 SHA512 e4936ee8162c675afdd4ac2f633bf65a895f2ad6171b3d34d11283363b117951ca5b8a741c8db00c81e34d8eeb4b7a92d06b8285e386e1578b9226fb4364a14d WHIRLPOOL 107343389e76761b54dda20e0a32a25e345ed1449885989a2ee95186cd8c476384b39a2ef5ac1a06f6afa8621ec3501c3d02cf607f89944ad49f26f703410251
+AUX tcl-8.5.13-autopath.patch 869 SHA256 5b57c1581ae495a2348059f61fbc3dda5e8428432e6c3c4223165297ac6fb3c5 SHA512 e28f5a3e9718c294b7df7055b8a51281c1c0f8382018500f7779379d74a4b15d3e9615f32a1d0a2ee3a826559c98092fdfc37be76bc0da867b1bae4f8c1e7dc0 WHIRLPOOL 7b2d681878832db263ffe558bce7586a1290618def7886c9c8e4fa3a3b2a982988aa58e62352a0779b70b6efb639233409ed891e750d0a420617413d08f998f7
 AUX tcl-8.5.9-gentoo-fbsd.patch 475 SHA256 5f7c415260c124f7515b8621535ba277add91b584149283543a92f5f2613dc75 SHA512 4cab5fefca03337a9f74e0df330d055ff9ebb930a3a84ef84aa45399faf9685f4a7c5c9f86b1bc71dd8a13b7ed7b42ac4485081f358f5fd28892e6ff277a2a63 WHIRLPOOL 02454a19ac2c1a25306676306b4c13fb882463c577545b65a3e3aaf93f6b3e0eb5b91c6e2c86fae601c5a7b1dc2bf6ec99be75aa4b335a16008a55427cd27d4d
 AUX tcl-8.5_alpha6-multilib.patch 830 SHA256 5686025ce4e685afcf06cafac591a91a5ccd10f952c422cf01b4f72263023d55 SHA512 1a999bd61f8ce4f07c3e985380aa38de36e336e4fcb58170a02f198fcb61416eb57f1b2bf611c4dbb76cee4f617903edb46fb9241d86910d5765ae1cd564f635 WHIRLPOOL 7771c42a89c65e1adf3bd2b95f89fa3d1700a37847b77da0ac961886406aa1842ec4e85f70f0042ea3389df635dc2555d2cf4c820aa241c0c3497a866ac877f4
 AUX tcl-8.5_alpha6-tclm4-soname.patch 486 SHA256 af3c3ea0b0d6c37c666d2fb54cd9891c273c90ebaea4a4707583076faffb2925 SHA512 6d884f34672a523c17c55b770bb4c94e360f56109908aa59c4a0721edbff1ab443dbc97a7ce0f2f3b0f7e290de23ace70b337c8b9aea719be4fa8e4d4d698f3e WHIRLPOOL cc651da9d5e10dfe969612c3e25b0e4452da0867348f13fc8c8d61e18bc6c34b855ac789aecc65a0bf9e2438aa59ec9078ec858cf5562a2cffdf34a308a1dbcb
 AUX tcl-configure-LANG.patch 1686 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea SHA512 6b097d9406f0faf5d0332c48a72d5654063fe29e37ec2d3bc2f425e98f26d117d39769c43ae39ee731f094a47912bf1dd24259fcc4a5b5326b1e2c4313c89c56 WHIRLPOOL 40cf52a3a9c97012be36a6e11054c3c418c692cb9292350baefecee621ecbff12b65f7b0edcde86e14600aea4c43daf607806c374b650d3f82142870b0da4da2
-DIST tcl8.4.18-src.tar.gz 3653369 SHA256 dee273cba588ec9190f0ee3dfe917be49c52ae847f20c3aa72461546451df0a4 SHA512 1029f85ec517d0c54525265effedf29335f7ee4927aac561870ecf2fa0defac4dedced998786ada324c4fad15a596096cee8c484b74cad69afa6d24dc105b75c WHIRLPOOL 83dd042886649304fa842a43238a0c1df6db348b7ba91fcbce37b3467e9d62698b3d733183249393d9cb4a28d4c0de310aade104d579f325894c5fca5fd05849
 DIST tcl8.4.19-src.tar.gz 3658647 SHA256 1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9 SHA512 9a3d17ff952e7f6184ee3849e7f8212cf5d917f112b53c72df03bedfc33014a46d2603bcbbb82458e4ae91364a02e976f38a9ce96299d89fab45b192f5097a7f WHIRLPOOL 0559329820d68670a8903895af37a37c7cda9b46449d4bcaf07f230762d0b8e4445e61ad2e8ec902579d23e91a5151e983e04d3b7334e74a81fbdfbcc35ed0ca
 DIST tcl8.5.10-src.tar.gz 4498413 SHA256 f582063edd5419a39ee8f7b5c8f95d557b5daad13efb0ed2f0967ca185613bb7 SHA512 d48c5e74e1dcdae92cf71d9f557eee581fadbc552b458d50034d412a07434b58a3302f64d4ef0af91e92cab10f3f86a18cd64bc9e5be906e1807f40cc20cb344 WHIRLPOOL 0e7d2ae1a275c1f0e669beaf5a55dceced34829f43c0e3e275e1cbb99b4fd2325a1fa43993959dcbed2abd27d6317a0eca2702115068a2d35ebacda9d5e56a8c
 DIST tcl8.5.11-src.tar.gz 4484001 SHA256 8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a SHA512 1696a3375de2f1ee436d475ada39c6d3c2aac4128bf7c0410650cbecdc11dddb77282c4fe2882692e50c70cdbe3b2dd9970082b812c3b2c27d34f76de2776bfc WHIRLPOOL ff3b40952fccac2e5f82f7adbd1e9aaf25ea4f665947cb569ae0c1809558325ec3c8b72027a71ca5174bbf95a6a531eedfe29b6892bbfd777fb9ad2397720b39
-DIST tcl8.5.7-src.tar.gz 4421720 SHA256 67d28d51a8d04c37114030276503bc8859a4b291bc33133556ab2d11303e66f2 SHA512 374c457324dff568b849e558d7360949c23f01e824f8e47b7af648b469c3b6738daecd44bd8d5d65f356e57c263b4008e138606919013e11d5be81a6bc7d8973 WHIRLPOOL 03c0a666b3079ee1bec603cf5ba3901b78b0eade4740573a0a20967f932df7c954ad747d07276df623f29418d2184d92c8eabf99d7f3312773edc95044cef73a
-DIST tcl8.5.8-src.tar.gz 4452127 SHA256 6b090c1024038d0381e1ccfbd6d5c0f0e6ef205269ceb9d28bd7bd7ac5bbf4a7 SHA512 b84869dea1b4f6e78dd4b066cc38f9a2b87211f02ffed4751976998aa55d768efdb733f3ed9a6736f718a046210616b6d384b7288193ee81c2b0b955abe501aa WHIRLPOOL 796219df5486f20431fae164abb0c376df2f95e3cdc2c2a75ffe7b7068c48908361f715e3829eeed9ef234ad8e1cff944b6486a8ccd8ba2afeff66806bac7bc8
-DIST tcl8.5.9-src.tar.gz 4469603 SHA256 3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d SHA512 ee79ad6e4e2c87b1749e71b2e5f8b5ce2020e056433dfec73e8f16d6427d938fbde3f3f3330ba8268ba2c0d02518b2b8d79646d6996a465d5c0ffd8967204a4a WHIRLPOOL 5e42d3a2308f8604864eb3ebb093c0a36ae3d3ba5ac0a3bdbe03fecdeba11fc94973b1fab2c6f2fd3800be51d200ce5fa21d5ed9046cd7336ea167a2ff8476ad
-EBUILD tcl-8.4.18.ebuild 3590 SHA256 f95cd847bef526d992d8a7fab0473c29d411292b32a509cf0fd1924e06d898ab SHA512 59e3c73c079af6a6f2fd7901c326dd3ed1c71a2452aaeb049358bd3493dd74696a07d27094631a6ce589c6f9fbd4e3a6c8ffaa9fe551641166c74accb9adcb88 WHIRLPOOL bc048e9e72e8c29570b59cf810b265df3ae352c084a3f8a9b019e8b2ec61625c49f35339e2b792d320154ed13518f2f213ca7b00126bf99c0b1189698c348792
+DIST tcl8.5.13-src.tar.gz 4513204 SHA256 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a SHA512 e1c9f36dd0e1afd81f42d249fe0191f10d6e0eab73042e32c9c0af09063ebf19bc2a24364743fa7b6798c588e77fa81654e6e7eb7591e1aaf4b222e20ecc6c84 WHIRLPOOL f1c1b67508c5d5c85de7d76d075a577ef14b5df05ca5bb0a0d0d78261134e8d85accb82a27f135877585820d52f0d363ebde74cfd890dbfafbf3766985315b61
 EBUILD tcl-8.4.19.ebuild 3601 SHA256 43167a1314f2e33222c22121ddcb2fd15fbcc8dfd925238f74b7fea4cbe90208 SHA512 0b78952bed0540231f41c273003b2f178b61b1a55ea7e920d6b57388850992b94f4ab74969bcab9c0868514503794c2fa24901b16b7bfc371e69f17ded0ee0e2 WHIRLPOOL c31eee31c636d3343019aa3618d26158df96c872dddfb517fa1919406ef3c5e0d4b9564858dc5ce9024435f76fa28d8afc36ec1d22a816eb9f184248a773cdaa
 EBUILD tcl-8.5.10-r1.ebuild 3802 SHA256 fdf10b6d9d68066567f7220e120e3ac8332070ff68c7569e2a2e86f7f33e85c5 SHA512 fb1598845470192da78efbfa22d632e7027d7c52a2066e365e4659da80e1c0796ae4482b989a7902c0de3a000777ec8a23357adb111068df0747431ac570263f WHIRLPOOL 0c019f2b80373797a137aaac7ced8fd2d8d8db00ac74130caa75c5e3396f0fd7e59cf422a13d3013f9fcede28d3f5728c6eb633d6119dc89235e0ba31d3cf89f
 EBUILD tcl-8.5.11-r1.ebuild 3985 SHA256 e2239e49a35ee5ac86e8e6e0dc88e48a10a22eb9a596905d8dad754086c34022 SHA512 419e3dbdd2e3b7d4bbdfb37653412101be0ab3290176d31fe5075cc941d3846c568b8056677e8060a8591c5bd2571e8b1ae9d7b17cf62096601e7c7742204a0f WHIRLPOOL 5573b5c06de78bbd7d8c9c7bd22378f146969ad54664cabb75d130e91dcf547e96991d8f305d83208e06e53b3b5f6375c1808dce12bb5b0941253a260281f34d
-EBUILD tcl-8.5.11.ebuild 3797 SHA256 f2f01c769ccceab147af1deb0ba99bae7f9f99bbad4c6803353b20adfc12b4c4 SHA512 8d5033a57afb80b5efc64942ae965aaffb832717fd809da4384dd09d4d04df471d56b9c60f85911bf0129a617e7cfbe1bdcd8fdda5cb7410e0357329863eee8e WHIRLPOOL e80f27cc449bc51d960b4c340a2a17b912b0459b6e4535adc7d61ab97cd3fb5a810935ecf1b23bd82e933ee1bce5d9cda5245767f06af1539d00aecfdaa7c777
-EBUILD tcl-8.5.7.ebuild 3268 SHA256 ac4b0d10918aba4fbbdc8574fe83b49f365f726ce2dd1fe54d07044d642a0750 SHA512 8d215a193f15f1899bf9e8bfbcb22ee9ced79702ffb27be068f70d342f84685af72ad2813927ef54c35707378895d309712dd215f715d392e9c23a121040fd96 WHIRLPOOL f356bc2810b70abbb64aa358249d65cd69df3b8f9d5b931b90ee4cf0fcc6e99a49c6e389be0571b6c23fb592d8ba516dd7d7d52837d71d6275494cd1f2cc2fe9
-EBUILD tcl-8.5.8-r1.ebuild 3559 SHA256 8b1f31c94e6073af9e313edaf5eb4505402e22767b6a12293f8536e9ac84c28d SHA512 33cc9c73b162064f4fc624ba49ec11f6766faa706cde76ee9f8fb60eed26fde3d3f476fe0455d5269eafb88f220bf0eed422c2defcca6add0f2aed497f6d1174 WHIRLPOOL a93ca36373ca620e04ce3a9cedf829f3cea7a7e6af88047cd7470b85a34665334089c3a8bbca46dfe8aa81dface73b3a464c3cc92b4d7dcc034626d0d4249275
-EBUILD tcl-8.5.8-r2.ebuild 3631 SHA256 e0e18149683a7357409d49b438254d92d4290c2d3fdea169bcc7fbb1241c29e8 SHA512 09784463c174791988dd4af402232be873eb0c3a95c1cb08b7a9619f52e078c0a7d01877b03dbfa67b6a82844236e02bd21ca829130068fb7d6ec3539c6bcc36 WHIRLPOOL 86da1b472d1fc110558dc1b6a61c8abe564cb0ca673827c2559322ad50eb3b0ff55ea46d4508e29034bce80da2487a7fcd6e40c714009fbf3100c33edf35d34e
-EBUILD tcl-8.5.9.ebuild 3637 SHA256 2eac249ebc62f2ea0e58ee0734b505c9350440e2dc716ee18c6fb81c241012e4 SHA512 86ba7f6533924bdab9d98e5695bc4e97653755569a9ff6fb4fde0e0663089e12e3dde24479af4b28718b18113e9086fe3c6a703b1c1ec32113ac6ad97fb8b935 WHIRLPOOL 532fd78fdf9a424fb726f786df9cb0cd912637b9429ecb22fb7ba610d9d516e307f551fd4206fad442e68afe2d5c82b58d7d2dd7bc9d1e6393c006f478d0b524
-MISC ChangeLog 20236 SHA256 b3fa9eba09d31d203293d951d618ef4509b296daab0efa2e09fa353fbcbb82fb SHA512 405b6d238b514803b78bedaa8d3fa9e61f0df5ad425ca204ca57d0a4e358a0b15e5659111f9fed180ab18e33c81f2cb96c8f35dad15e029e9a6bc61161c8ccae WHIRLPOOL 6d1310ce65e17516f0018931211b1e7dbc7fc5ce76bee786dca71faf388e3c84b80d578d5ddf4ab0832913873cf068ba6ddfa9033a1ad1b92aba9ecb03464516
+EBUILD tcl-8.5.13.ebuild 4013 SHA256 8b80fda2a9e2ae443db886c48c5110e7a94d00a6a80a818012c1f8de6d4e68d3 SHA512 5a14d4f803172314779a580f8ea84c475fbce5269e6492bfa0b4eff2a52014023b3f5d3870942f5497b3a5914f50a0d17a6e388556fb7dac82ba953a56a06592 WHIRLPOOL 8a86dd405ffed45586e90e54b21375bd829b394fd614d5c5763e12b6a1d2b50cc3443a36d2c7a177c7f10d5687d31c9239908698fe199e81177321772e030d99
+MISC ChangeLog 20628 SHA256 27f6bf0cbfdcffc49e9c4feed09e3a968e5dd0ae07011c0ee30e21192367b0a4 SHA512 702feee06c8c66aca7fffbf4ce283b48030ac9477756ffdd4964b0ffbc64939ffba3799d8dbda0791504c6d53c93581014d69f46cd7587a888c87ccce4bc8db8 WHIRLPOOL b55b95d11b71e03c7dab741007d897f9e8385b1cce867e450261387f4935de0cdc85933ea433669c1f7c956e5d2cf1c6cbd4678b6f25c520ab351291d26b2f9d
 MISC metadata.xml 264 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee SHA512 cc2af42208bde17fcf6c9e6c92d7e61b476b0885a87dff97827a47f411d7d3fe8fae0432a3aef3308bbdfe6c57e3eb3f436d5eb4b61f22168032f7a04e491d5c WHIRLPOOL e305bf9fd49aae01d76aa91347fcad9641b7a1d8c4697d9000d79a18a8100e94c6520869b131cfc97b2d782fe8603ac1e8ae66448541399529487fb321c15d46
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlC3asEACgkQgAnW8HDreRZBwACcCqCwOFAsXk4wiEy08RWrJOTW
+xcwAn262zl4SobH0I9/CRh5ojgkh9iuA
+=jwXM
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/files/tcl-8.4.11-multilib.patch b/dev-lang/tcl/files/tcl-8.4.11-multilib.patch
deleted file mode 100644
index 8ada22d8f93e..000000000000
--- a/dev-lang/tcl/files/tcl-8.4.11-multilib.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur tcl8.4.11.orig/unix/configure tcl8.4.11/unix/configure
---- tcl8.4.11.orig/unix/configure	2005-06-30 01:40:33.000000000 +0900
-+++ tcl8.4.11/unix/configure	2005-07-02 20:23:23.000000000 +0900
-@@ -7664,7 +7664,7 @@
- DBGX='${TCL_DBGX}'
- eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
- 
--TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
-+TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
- PRIVATE_INCLUDE_DIR='$(includedir)'
- HTML_DIR='$(DISTDIR)/html'
- 
-@@ -7788,7 +7788,7 @@
- 
- if test "$FRAMEWORK_BUILD" = "1" ; then
-     TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
--elif test "$prefix" != "$exec_prefix"; then
-+elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
-     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
- else
-     TCL_PACKAGE_PATH="${prefix}/lib"
-diff -Naur tcl8.4.11.orig/unix/configure.in tcl8.4.11/unix/configure.in
---- tcl8.4.11.orig/unix/configure.in	2005-06-30 01:40:33.000000000 +0900
-+++ tcl8.4.11/unix/configure.in	2005-07-02 20:23:12.000000000 +0900
-@@ -459,7 +459,7 @@
- DBGX='${TCL_DBGX}'
- eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
- 
--TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
-+TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
- PRIVATE_INCLUDE_DIR='$(includedir)'
- HTML_DIR='$(DISTDIR)/html'
- 
-@@ -552,7 +552,7 @@
- 
- if test "$FRAMEWORK_BUILD" = "1" ; then
-     TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
--elif test "$prefix" != "$exec_prefix"; then
-+elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
-     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
- else
-     TCL_PACKAGE_PATH="${prefix}/lib"
diff --git a/dev-lang/tcl/files/tcl-8.5.10-conf.patch b/dev-lang/tcl/files/tcl-8.5.10-conf.patch
new file mode 100644
index 000000000000..dd90b06a6e55
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.5.10-conf.patch
@@ -0,0 +1,26 @@
+--- tcl8.5.0/unix/tcl.m4.conf	2007-12-20 10:48:05.000000000 +0100
++++ tcl8.5.0/unix/tcl.m4	2007-12-20 10:48:52.000000000 +0100
+@@ -1427,12 +1427,12 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
++	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 	    AS_IF([test $doRpath = yes], [
+-		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
++		CC_SEARCH_FLAGS=''])
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
+ 	    AS_IF([test $do64bit = yes], [
+@@ -1464,7 +1464,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_SUFFIX=".so"
+ 
+-	    SHLIB_LD='${CC} -shared'
++	    SHLIB_LD='${CC} ${CFLAGS} -shared -fPIC'
+ 	    DL_OBJS=""
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-lang/tcl/files/tcl-8.5.13-autopath.patch b/dev-lang/tcl/files/tcl-8.5.13-autopath.patch
new file mode 100644
index 000000000000..77f0ca6ced0c
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.5.13-autopath.patch
@@ -0,0 +1,19 @@
+ unix/configure.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/unix/configure.in b/unix/configure.in
+index 65f712a..b606b74 100755
+--- a/unix/configure.in
++++ b/unix/configure.in
+@@ -840,9 +840,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+     test -z "$TCL_MODULE_PATH"  && \
+ 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
+ else
+-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
+ fi
+ 
+ #--------------------------------------------------------------------
diff --git a/dev-lang/tcl/files/tcl-8.5.8-fortify.patch b/dev-lang/tcl/files/tcl-8.5.8-fortify.patch
deleted file mode 100644
index 0cfce74f0cc0..000000000000
--- a/dev-lang/tcl/files/tcl-8.5.8-fortify.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix buffer overflow with GCC 4.5 -D_FORTIFY_SOURCE=2.
-https://bugs.gentoo.org/317727
-
-https://sourceforge.net/tracker/?func=detail&aid=3048354&group_id=10894&atid=310894
-
---- a/generic/tclTrace.c
-+++ b/generic/tclTrace.c
-@@ -909,7 +909,7 @@ TraceVariableObjCmd(
- 	    }
- 	    ctvarPtr->traceCmdInfo.length = length;
- 	    flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT;
--	    strcpy(ctvarPtr->traceCmdInfo.command, command);
-+	    memcpy(ctvarPtr->traceCmdInfo.command, command, length + 1);
- 	    ctvarPtr->traceInfo.traceProc = TraceVarProc;
- 	    ctvarPtr->traceInfo.clientData = (ClientData)
- 		    &ctvarPtr->traceCmdInfo;
diff --git a/dev-lang/tcl/tcl-8.4.18.ebuild b/dev-lang/tcl/tcl-8.4.18.ebuild
deleted file mode 100644
index 24fd6c306b9e..000000000000
--- a/dev-lang/tcl/tcl-8.4.18.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.18.ebuild,v 1.13 2010/12/23 18:37:30 mattst88 Exp $
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug threads"
-
-S="${WORKDIR}/${PN}${PV}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-8.4.16-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
-	# cross-compile fix from buildroot.
-	epatch "${FILESDIR}"/${PN}-8.4.9-strtod.patch
-
-	local d
-	for d in */configure ; do
-		cd "${S}"/${d%%/*}
-		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
-		epatch "${FILESDIR}"/tcl-configure-LANG.patch
-	done
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_compile() {
-	tc-export CC
-	local local_config_use=""
-
-	if use threads ; then
-		local_config_use="--enable-threads"
-	fi
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L$/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-		"${D}"/usr/${mylibdir}/tclConfig.sh || die
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	if use debug ; then
-		dosym libtcl${v1}g.so /usr/${mylibdir}/libtcl${v1}.so
-		dosym libtclstub${v1}g.a /usr/${mylibdir}/libtclstub${v1}.a
-	fi
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	dosym tclsh${v1} /usr/bin/tclsh
-
-	cd "${S}"
-	dodoc ChangeLog* README changes
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from tcl-8.3, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}
diff --git a/dev-lang/tcl/tcl-8.5.11.ebuild b/dev-lang/tcl/tcl-8.5.13.ebuild
index 2ca6c9593dec..5a0a0c682dce 100644
--- a/dev-lang/tcl/tcl-8.5.11.ebuild
+++ b/dev-lang/tcl/tcl-8.5.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild,v 1.6 2012/04/26 16:15:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13.ebuild,v 1.1 2012/11/29 14:01:36 jlec Exp $
 
 EAPI=4
 
@@ -35,11 +35,13 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
 
 	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
+	epatch "${FILESDIR}"/${PN}-8.5.10-conf.patch
 
 	# Bug 354067
 	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
 
+	epatch "${FILESDIR}"/${P}-autopath.patch
+
 	cd "${S}"/unix
 	eautoreconf
 }
@@ -71,13 +73,16 @@ src_install() {
 	S= emake DESTDIR="${D}" install
 
 	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir)
+	# and drop unnecessary -L inclusion to default system libdir
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
 	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix ,TCL_BUILD_LIB_SPEC='," \
 		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix ,TCL_BUILD_STUB_LIB_SPEC='," \
 		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
 		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
+		-e "s,^TCL_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TCL_STUB_LIB_SPEC='," \
+		-e "s,^TCL_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TCL_LIB_SPEC='," \
 		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
 	if [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
 		sed -i \
diff --git a/dev-lang/tcl/tcl-8.5.7.ebuild b/dev-lang/tcl/tcl-8.5.7.ebuild
deleted file mode 100644
index 24b3eeda4bd4..000000000000
--- a/dev-lang/tcl/tcl-8.5.7.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.7.ebuild,v 1.15 2010/12/23 18:37:30 mattst88 Exp $
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug threads"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_compile() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L$/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-		"${D}"/usr/${mylibdir}/tclConfig.sh || die
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	dosym tclsh${v1} /usr/bin/tclsh
-
-	cd "${S}"
-	dodoc ChangeLog* README changes
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}
diff --git a/dev-lang/tcl/tcl-8.5.8-r1.ebuild b/dev-lang/tcl/tcl-8.5.8-r1.ebuild
deleted file mode 100644
index 7b3309426b1e..000000000000
--- a/dev-lang/tcl/tcl-8.5.8-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8-r1.ebuild,v 1.13 2011/01/13 20:02:06 xarthisius Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	[[ ${CHOST} != *-darwin* ]] && sed -i \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
-
-	dosym tclsh${v1} /usr/bin/tclsh || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}
diff --git a/dev-lang/tcl/tcl-8.5.8-r2.ebuild b/dev-lang/tcl/tcl-8.5.8-r2.ebuild
deleted file mode 100644
index 66a2551eb419..000000000000
--- a/dev-lang/tcl/tcl-8.5.8-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8-r2.ebuild,v 1.4 2010/12/23 18:37:30 mattst88 Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-	epatch "${FILESDIR}"/${P}-fortify.patch # 317727
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	[[ ${CHOST} != *-darwin* ]] && sed -i \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
-
-	dosym tclsh${v1} /usr/bin/tclsh || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}
diff --git a/dev-lang/tcl/tcl-8.5.9.ebuild b/dev-lang/tcl/tcl-8.5.9.ebuild
deleted file mode 100644
index af33196a68e9..000000000000
--- a/dev-lang/tcl/tcl-8.5.9.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.9.ebuild,v 1.9 2011/08/05 08:20:20 naota Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	# Bug 354067
-	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	[[ ${CHOST} != *-darwin* ]] && sed -i \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
-
-	dosym tclsh${v1} /usr/bin/tclsh || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}